diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml index 640b04c7da9..4314df5c9df 100644 --- a/doc/languages-frameworks/coq.xml +++ b/doc/languages-frameworks/coq.xml @@ -12,8 +12,8 @@ Some extensions (plugins) might require OCaml and sometimes other OCaml - packages. The coq.ocamlPackages attribute can be used - to depend on the same package set Coq was built against. + packages. The coq.ocamlPackages attribute can be used to + depend on the same package set Coq was built against. diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 1b235dbb52f..2cec1543a24 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -23,6 +23,7 @@ Adding custom .vimrc lines can be done using the following code: ``` vim_configurable.customize { + # `name` specifies the name of the executable and package name = "vim-with-plugins"; vimrcConfig.customRC = '' @@ -31,6 +32,8 @@ vim_configurable.customize { } ``` +This configuration is used when vim is invoked with the command specified as name, in this case `vim-with-plugins`. + For Neovim the `configure` argument can be overridden to achieve the same: ``` @@ -83,6 +86,7 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n { packageOverrides = pkgs: with pkgs; { myVim = vim_configurable.customize { + # `name` specifies the name of the executable and package name = "vim-with-plugins"; # add here code from the example section }; diff --git a/doc/stdenv.xml b/doc/stdenv.xml index cc0c13c5447..b2f30bf08db 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -372,7 +372,7 @@ let f(h, h + 1, i) = i + h They are programs/libraries used at build time that furthermore produce programs/libraries also used at build time. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), - put it in nativeBuildInputsinstead. The most common + put it in nativeBuildInputs instead. The most common use for this buildPackages.stdenv.cc, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries. @@ -2099,13 +2099,13 @@ someVar=$(stripHash $name) - In order to alleviate this burden, the setup - hook>mechanism was written, where any package can include a - shell script that [by convention rather than enforcement by Nix], any - downstream reverse-dependency will source as part of its build process. That - allows the downstream dependency to merely specify its dependencies, and - lets those dependencies effectively initialize themselves. No boilerplate - mirroring the list of dependencies is needed. + In order to alleviate this burden, the setup hook + mechanism was written, where any package can include a shell script that [by + convention rather than enforcement by Nix], any downstream + reverse-dependency will source as part of its build process. That allows the + downstream dependency to merely specify its dependencies, and lets those + dependencies effectively initialize themselves. No boilerplate mirroring the + list of dependencies is needed. @@ -2445,6 +2445,28 @@ addEnvHooks "$hostOffset" myBashFunction + + + breakpointHook + + + + This hook will make a build pause instead of stopping when a failure + happen. It prevents nix to cleanup the build environment immediatly and + allows the user to attach to a build environment using the + cntr command. On build error it will print the + instruction that are neccessary for cntr. Installing + cntr and running the command will provide shell access to the build + sandbox of failed build. At /var/lib/cntr the + sandbox filesystem is mounted. All commands and files of the system are + still accessible within the shell. To execute commands from the sandbox + use the cntr exec subcommand. Note that cntr also + needs to be executed on the machine that is doing the build, which might + be not the case when remote builders are enabled. + cntr is only supported on linux based platforms. + + + diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 426e1666a81..137ee243813 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -266,7 +266,7 @@ let (mkIf config.isNormalUser { group = mkDefault "users"; createHome = mkDefault true; - home = mkDefault "/home/${name}"; + home = mkDefault "/home/${config.name}"; useDefaultShell = mkDefault true; isSystemUser = mkDefault false; }) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ae7a3a783d3..bd921f230bd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -120,6 +120,7 @@ ./programs/sysdig.nix ./programs/systemtap.nix ./programs/sway.nix + ./programs/sway-beta.nix ./programs/thefuck.nix ./programs/tmux.nix ./programs/udevil.nix @@ -233,6 +234,7 @@ ./services/desktops/dleyna-server.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix + ./services/desktops/gsignond.nix ./services/desktops/pipewire.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/chrome-gnome-shell.nix @@ -503,6 +505,7 @@ ./services/networking/dnsmasq.nix ./services/networking/ejabberd.nix ./services/networking/epmd.nix + ./services/networking/eternal-terminal.nix ./services/networking/fakeroute.nix ./services/networking/ferm.nix ./services/networking/firefox/sync-server.nix diff --git a/nixos/modules/programs/sway-beta.nix b/nixos/modules/programs/sway-beta.nix new file mode 100644 index 00000000000..04f2e0662b8 --- /dev/null +++ b/nixos/modules/programs/sway-beta.nix @@ -0,0 +1,54 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.sway-beta; + swayPackage = cfg.package; +in { + options.programs.sway-beta = { + enable = mkEnableOption '' + Sway, the i3-compatible tiling Wayland compositor. This module will be removed after the final release of Sway 1.0 + ''; + + package = mkOption { + type = types.package; + default = pkgs.sway-beta; + defaultText = "pkgs.sway-beta"; + description = '' + The package to be used for `sway`. + ''; + }; + + extraPackages = mkOption { + type = with types; listOf package; + default = with pkgs; [ + xwayland dmenu + ]; + defaultText = literalExample '' + with pkgs; [ xwayland dmenu ]; + ''; + example = literalExample '' + with pkgs; [ + xwayland + i3status i3status-rust + termite rofi light + ] + ''; + description = '' + Extra packages to be installed system wide. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ swayPackage ] ++ cfg.extraPackages; + security.pam.services.swaylock = {}; + hardware.opengl.enable = mkDefault true; + fonts.enableDefaultFonts = mkDefault true; + programs.dconf.enable = mkDefault true; + }; + + meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ]; +} + diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix index 3a1ffc55e5f..81e04a44b11 100644 --- a/nixos/modules/security/rngd.nix +++ b/nixos/modules/security/rngd.nix @@ -30,7 +30,7 @@ with lib; description = "Hardware RNG Entropy Gatherer Daemon"; - serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f -v" + + serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v" + (if config.services.tcsd.enable then " --no-tpm=1" else ""); }; }; diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix new file mode 100644 index 00000000000..cf26e05d5c1 --- /dev/null +++ b/nixos/modules/services/desktops/gsignond.nix @@ -0,0 +1,43 @@ +# Accounts-SSO gSignOn daemon + +{ config, lib, pkgs, ... }: + +with lib; + +let + package = pkgs.gsignond.override { plugins = config.services.gsignond.plugins; }; +in +{ + + ###### interface + + options = { + + services.gsignond = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable gSignOn daemon, a DBus service + which performs user authentication on behalf of its clients. + ''; + }; + + plugins = mkOption { + type = types.listOf types.package; + default = []; + description = '' + What plugins to use with the gSignOn daemon. + ''; + }; + }; + }; + + ###### implementation + config = mkIf config.services.gsignond.enable { + environment.etc."gsignond.conf".source = "${package}/etc/gsignond.conf"; + services.dbus.packages = [ package ]; + }; + +} diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index dfefc1171e6..c06a0665d02 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -27,13 +27,13 @@ in { destination = "/etc/udev/rules.d/51-trezor.rules"; text = '' # TREZOR v1 (One) - SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" - KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl" + SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0660", GROUP="trezord", TAG+="uaccess" # TREZOR v2 (T) - SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" - SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" - KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl" + SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n" + SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="trezord", TAG+="uaccess" ''; }); diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 9a2e13e9553..a70967820b3 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -182,9 +182,10 @@ with lib; serviceConfig = rec { DynamicUser = true; RuntimeDirectory = StateDirectory; + RuntimeDirectoryMode = "0750"; StateDirectory = builtins.baseNameOf dataDir; Type = "oneshot"; - ExecStartPre = "!${lib.getBin pkgs.coreutils}/bin/install -m666 ${cfg.configFile} /run/${RuntimeDirectory}/ddclient.conf"; + ExecStartPre = "!${lib.getBin pkgs.coreutils}/bin/install -m660 ${cfg.configFile} /run/${RuntimeDirectory}/ddclient.conf"; ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -file /run/${RuntimeDirectory}/ddclient.conf"; }; }; diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix new file mode 100644 index 00000000000..be7337ece7e --- /dev/null +++ b/nixos/modules/services/networking/eternal-terminal.nix @@ -0,0 +1,89 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.eternal-terminal; + +in + +{ + + ###### interface + + options = { + + services.eternal-terminal = { + + enable = mkEnableOption "Eternal Terminal server"; + + port = mkOption { + default = 2022; + type = types.int; + description = '' + The port the server should listen on. Will use the server's default (2022) if not specified. + ''; + }; + + verbosity = mkOption { + default = 0; + type = types.enum (lib.range 0 9); + description = '' + The verbosity level (0-9). + ''; + }; + + silent = mkOption { + default = false; + type = types.bool; + description = '' + If enabled, disables all logging. + ''; + }; + + logSize = mkOption { + default = 20971520; + type = types.int; + description = '' + The maximum log size. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + # We need to ensure the et package is fully installed because + # the (remote) et client runs the `etterminal` binary when it + # connects. + environment.systemPackages = [ pkgs.eternal-terminal ]; + + systemd.services = { + eternal-terminal = { + description = "Eternal Terminal server."; + wantedBy = [ "multi-user.target" ]; + after = [ "syslog.target" "network.target" ]; + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.eternal-terminal}/bin/etserver --daemon --cfgfile=${pkgs.writeText "et.cfg" '' + ; et.cfg : Config file for Eternal Terminal + ; + + [Networking] + port = ${toString cfg.port} + + [Debug] + verbose = ${toString cfg.verbosity} + silent = ${if cfg.silent then "1" else "0"} + logsize = ${toString cfg.logSize} + ''}"; + Restart = "on-failure"; + KillMode = "process"; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 797d410dbeb..c7e97bbeba9 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -192,7 +192,7 @@ in { type = types.nullOr types.str; default = null; description = '' - Database password. Use adminpassFile to avoid this + Admin password. Use adminpassFile to avoid this being world-readable in the /nix/store. ''; }; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index e999672f4ab..034d2059283 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -4,7 +4,7 @@ , gobjectIntrospection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { - version = "0.9.605"; + version = "0.9.607"; name = "lollypop-${version}"; format = "other"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "10d9k7ssh4snrrjy1hb3y39by6175493cmn50aq88xby2mdy3p74"; + sha256 = "04giwp4i7j1qad41fiqlb8s3w03f1ww0p2mhi8n162sajnflr1rd"; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 546a47118a0..3649a0a6886 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.27.1"; + version = "3.28.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "00qlvfwfn7kybrx6rlj5h862syw3d5yak4sjqpxvacp7i5n1arsk"; + sha256 = "0yph01z8lw0r5bw3aa14w0l7z1ymxvpmb131gbaw3ib0srssgz64"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index f7463207045..a5dae1d0560 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -44,13 +44,13 @@ let ]; in stdenv.mkDerivation rec { name = "pulseeffects-${version}"; - version = "4.3.7"; + version = "4.3.9"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1x1jnbpbc9snya9k2xq39gssf0k4lnd1hr4cjrnwscg5rqybxqsk"; + sha256 = "1vir05hy2n0nk0gaqbn680bx53ixcyi2y0hq4grgm73bbb1jzqq6"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index c9fd4f9c4ab..3de4067f55d 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.17.0"; + version = "0.18.0"; in mkDerivation rec { name = "sddm-${version}"; @@ -13,12 +13,11 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq"; + sha256 = "16xnm02iqgy4hydzd6my0widq981glbazbhxnihhclgsaczh8mfq"; }; patches = [ ./sddm-ignore-config-mtime.patch - ./qt511.patch ]; postPatch = diff --git a/pkgs/applications/display-managers/sddm/qt511.patch b/pkgs/applications/display-managers/sddm/qt511.patch deleted file mode 100644 index 6430e60ed41..00000000000 --- a/pkgs/applications/display-managers/sddm/qt511.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 005c9ad..71b46d7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -93,7 +93,7 @@ find_package(XCB REQUIRED) - find_package(XKB REQUIRED) - - # Qt 5 --find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools) -+find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test) - - # find qt5 imports dir - get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index c9d935a..bb85ddd 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE) - - include_directories(../src/common) - -- - set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp) - add_executable(ConfigurationTest ${ConfigurationTest_SRCS}) - add_test(NAME Configuration COMMAND ConfigurationTest) - --qt5_use_modules(ConfigurationTest Test) -+target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test) diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix new file mode 100644 index 00000000000..dbdc13ece2a --- /dev/null +++ b/pkgs/applications/editors/featherpad/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, qt5, fetchFromGitHub }: + +with qt5; + +stdenv.mkDerivation rec { + version = "0.9.1"; + name = "featherpad-${version}"; + src = fetchFromGitHub { + owner = "tsujan"; + repo = "FeatherPad"; + rev = "V${version}"; + sha256 = "053j14f6fw31cdnfr8hqpxw6jh2v65z43qchdsymbrk5zji8gxla"; + }; + nativeBuildInputs = [ qmake pkgconfig qttools ]; + buildInputs = [ qtbase qtsvg qtx11extras ]; + meta = with stdenv.lib; { + description = "Lightweight Qt5 Plain-Text Editor for Linux"; + homepage = https://github.com/tsujan/FeatherPad; + platforms = platforms.linux; + maintainers = [ maintainers.flosse ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 259c319c70f..494ad686ee3 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,6 +1,6 @@ { mkDerivation , lib -, fetchgit +, fetchurl , extra-cmake-modules , kdoctools , wrapGAppsHook @@ -22,13 +22,11 @@ }: mkDerivation rec { - name = "kile-${version}"; - version = "2017-02-09"; + name = "kile-2.9.92"; - src = fetchgit { - url = git://anongit.kde.org/kile.git; - rev = "f77f6e627487c152f111e307ad6dc71699ade746"; - sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib"; + src = fetchurl { + url = "mirror://sourceforge/kile/${name}.tar.bz2"; + sha256 = "177372dc25b1d109e037a7dbfc64b5dab2efe538320c87f4a8ceada21e9097f2"; }; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index b0c834934f9..8e99005bbf6 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonPackage rec { pname = "neovim-remote"; - version = "2.0.5"; + version = "2.1.0"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "08qsi61ba5d69ca77layypzvi7nalx4niy97xn4w88jibnbmbrxw"; + sha256 = "0gri4d8gg5hvywffvj8r123d06x006qhink7d54yk6lvplw64gyc"; }; propagatedBuildInputs = with pythonPackages; [ neovim psutil ]; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index dcec9fdfef9..6d92c047157 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.1.0450"; + version = "8.1.0490"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1zhggpn4i704apfqn2kqr717kz9dvkjwnbmc3ydza621zjyrnxb2"; + sha256 = "0gmlz2w066pcrn0jzpv3gk1qwx148f33gvgf5nkfy4nl1ljki81r"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index 4032e2e3fee..51156dea4a1 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -15,5 +15,11 @@ stdenv.mkDerivation { homepage = https://xmlgraphics.apache.org/batik; license = licenses.asl20; platforms = platforms.unix; + knownVulnerabilities = [ + # vulnerabilities as of 16th October 2018 from https://xmlgraphics.apache.org/security.html: + "CVE-2018-8013" + "CVE-2017-5662" + "CVE-2015-0250" + ]; }; } diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix new file mode 100644 index 00000000000..20c6ff57b24 --- /dev/null +++ b/pkgs/applications/misc/dmrconfig/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub +, libusb1, systemd }: + +stdenv.mkDerivation rec { + name = "dmrconfig-${version}"; + version = "2018-10-20"; + + src = fetchFromGitHub { + owner = "sergev"; + repo = "dmrconfig"; + rev = "a4c5f893d2749727493427320c7f01768966ba51"; + sha256 = "0h7hv6fv6v5g922nvgrb0w7hsqbhaw7xmdc6vydh2p3l7sp31vg2"; + }; + + buildInputs = [ + libusb1 systemd + ]; + + preConfigure = '' + substituteInPlace Makefile --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with stdenv.lib; { + description = "Configuration utility for DMR radios"; + longDescription = '' + DMRconfig is a utility for programming digital radios via USB programming cable. + ''; + homepage = https://github.com/sergev/dmrconfig; + license = licenses.asl20; + maintainers = [ maintainers.etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 8d095b78cdb..9ea8210e67e 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -103,5 +103,8 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ robbinch ]; + knownVulnerabilities = [ + "CVE-2015-1032" + ]; }; } diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 7df4007cf40..cc9133257a0 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -33,7 +33,7 @@ let in stdenv.mkDerivation rec { name = "slic3r-prusa-edition-${version}"; - version = "1.41.0"; + version = "1.41.1"; enableParallelBuilding = true; @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "Slic3r"; - sha256 = "1al60hrqbhl05dnsr99hzbmxmn26fyx19sc5zxv816x3q6px9n2d"; + sha256 = "0068wwsjwmnxql7653vy3labcyslzf17kr8xdr4lg2jplm022hvy"; rev = "version_${version}"; }; diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix index 6230f2f6f6a..90639fc5705 100644 --- a/pkgs/applications/misc/soapysdr/default.nix +++ b/pkgs/applications/misc/soapysdr/default.nix @@ -6,7 +6,7 @@ } : let - version = "0.6.1"; + version = "0.7.0"; in stdenv.mkDerivation { name = "soapysdr-${version}"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapySDR"; rev = "soapy-sdr-${version}"; - sha256 = "1azbb2j6dv0b2dd5ks6yqd31j17sdhi9p82czwc8zy2isymax0l9"; + sha256 = "14fjwnfj7jz9ixvim2gy4f52y6s7d4xggzxn2ck7g4q35d879x13"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index dba492ca8dd..2d370113873 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "1n105lwz8w5fiw93w9amasq0f4gknihl3x9kj0q77lw7ha1lvdfz"; + sha256 = "0cwbqcv0yffg6fa3g4zknwffa6119i6827w6jm74fhlfa9kwy34c"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c18f77f8f99..4cbd44c100d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -92,11 +92,6 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; - freetype_source = fetchurl { - url = http://anduin.linuxfromscratch.org/BLFS/other/chromium-freetype.tar.xz; - sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77"; - }; - versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; @@ -132,22 +127,26 @@ let ++ optional pulseSupport libpulseaudio ++ optional (versionAtLeast version "71") at-spi2-core; - patches = [ - # As major versions are added, you can trawl the gentoo and arch repos at - # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ - # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium - # for updated patches and hints about build flags - # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") - ./patches/fix-freetype.patch + patches = optional enableWideVine ./patches/widevine.patch ++ [ ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch - ] ++ optional enableWideVine ./patches/widevine.patch - ++ optional ((versionRange "69" "70") && stdenv.isAarch64) - (fetchpatch { - url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch; - sha256 = "0f37rsjx7jcvdngkj8y6600091nwgn4jci0ny7bxlapq0zx2a4x7"; - }) - ++ optional stdenv.isAarch64 + # Unfortunately, chromium regularly breaks on major updates and + # then needs various patches backported. Good sources for such patches and other hints: + # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ + # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium + # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits + # + # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) + ] ++ optionals (versionOlder version "71") [ + ( githubPatch "cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4" "0258qlffp6f6izswczb11p8zdpn550z5yqa9z7gdg2rg5171n5i8" ) + ( githubPatch "e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d" "1ky5xrzch6aya87kn0bgb31lksl3g8kh2v8k676ks7pdl2v132p9" ) + ( githubPatch "a4de8da116585357c123d71e5f54d1103824c6df" "1y7afnjrsz6j2l3vy1ms8mrkbb51xhcafw9r371algi48il7rajm" ) + ( githubPatch "b033d2ba32da5ea237656568c25908d4f12b7bac" "008dg8vk822wyrinirx4nh92yq9bki4mwfwvcwnxdjmvz3y0jfcc" ) + ( githubPatch "2f9563e49f6c28dfe52940901417a4031b95a49b" "1q8qhpzx611yzrxa8lgpw0bad9bxx84rsrvczl4xvk5qh93zna7i" ) + ( githubPatch "a66e0a3f3f57eb045639e2752a99ade348dc17e9" "1c5x9856b167z270357wr8l6m1wrznxcx89ykj6kfz5djqmv251g" ) + ( githubPatch "4d9714247f617bf9e1cf95f735148f5e598a9529" "1423jf3lzbljzgbcwvfrrfyhyl3fab988hsyjvk95zyclxff7iij" ) + ( githubPatch "87902b3202f81d689dd314c17006ffc907fe12a1" "15q37cd26s73girq1imcs52fb1irh0qlfvhksh6g0l0jjrdyzk6r" ) + ] ++ optional stdenv.isAarch64 (if (versionOlder version "71") then fetchpatch { url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; @@ -193,11 +192,6 @@ let mkdir -p third_party/node/linux/node-linux-x64/bin ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node - # use patched freetype - # FIXME https://bugs.chromium.org/p/pdfium/issues/detail?id=733 - # FIXME http://savannah.nongnu.org/bugs/?51156 - tar -xJf ${freetype_source} - # remove unused third-party # in third_party/crashpad third_party/zlib contains just a header-adapter for lib in ${toString gnSystemLibraries}; do @@ -243,8 +237,6 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; google_default_client_id = "404761575300.apps.googleusercontent.com"; google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; - } // optionalAttrs (versionRange "60" "70") { - use_gtk3 = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch deleted file mode 100644 index cc380a55abe..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/third_party/freetype/BUILD.gn -+++ b/third_party/freetype/BUILD.gn -@@ -63,10 +63,12 @@ source_set("freetype_source") { - "src/src/base/ftbase.c", - "src/src/base/ftbbox.c", - "src/src/base/ftbitmap.c", -+ "src/src/base/ftfntfmt.c", - "src/src/base/ftfstype.c", - "src/src/base/ftgasp.c", - "src/src/base/ftglyph.c", - "src/src/base/ftinit.c", -+ "src/src/base/ftlcdfil.c", - "src/src/base/ftmm.c", - "src/src/base/ftstroke.c", - "src/src/base/fttype1.c", diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch index 3c80dbcec00..da6a4c92b46 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch @@ -50,15 +50,6 @@ index f4e119d..d9775bd 100644 return false; cur = cur.Append(kPepperFlashBaseDirectory); break; -@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; @@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { cur = cur.DirName(); } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index a26c8b8ddde..bca9231e866 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "16biicw86mnjrmjazfbml2pf4rykhbvsz854cyfnpjhcvmlh24jp"; - sha256bin64 = "07jr1sqsxfdy3rymylkbpbgi79j9b2pax4igdzj943d0nbka84y5"; - version = "70.0.3538.35"; + sha256 = "0dqfwghl73gcmbnl9wb3i5wz8q65y1vhg7n0m2nh0hv33w1w4mp9"; + sha256bin64 = "0x7npns1ng7p4w1qswcj889v9lplvy2wv1ccxrk4ilyqiwzvwy1z"; + version = "70.0.3538.67"; }; dev = { - sha256 = "0fmkhvvydinv5f543n7rrmsv99rf0skwwhlpmszvspx6y4wz9smv"; - sha256bin64 = "0plr8ph78kfg2dpyacjy3aw3msfif95fqpb8xx0n8whkkpbl9968"; - version = "71.0.3559.6"; + sha256 = "1kw0rn58s4nd43z2qkjph7aid0s3jnmm650d7k1yxppgmfsal246"; + sha256bin64 = "0518qrghjk5jlzhmynk6nngp5i81bpxi3880gimpbd7bblj6dg7y"; + version = "71.0.3578.10"; }; stable = { - sha256 = "0dcyzsb70ssx5hd2b25ab3ydpqh7crhxab9zzi5gn99ywxh1afg3"; - sha256bin64 = "0w56k7hmdi9knjaw67kdmyz0fdkjmk2ldh2n4l1c6szkr66vq30q"; - version = "69.0.3497.100"; + sha256 = "0dqfwghl73gcmbnl9wb3i5wz8q65y1vhg7n0m2nh0hv33w1w4mp9"; + sha256bin64 = "0ihs2xfb2zn8aq11kg7miw9rnjwc6l4k5jgf24dm661463xmd3ha"; + version = "70.0.3538.67"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 6c6e05133bd..54b588fb097 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0.3"; + version = "63.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ach/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ach/firefox-63.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "bcf519e0080aca1cf232ec327ea65973e71230dd60204bc1fef3284dd94fa123f4a60421b647a3f64352829b1ef3b0e0b689a1fa7a06f6b1848c5acb1d33b917"; + sha512 = "0557937473fe8758371d21ec4b0d983ac2db59e8b9d3d627a318d3adf9a0cd0712f3e9b375f0cd6d9acf3f39b0c42fbcdb31364c5973916c7287f618a5f074ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/af/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/af/firefox-63.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "5b145ab068216846169303dd75ad3b5a40e82129234cee35cd7a559cde0dcbc6abb1d6ce50680b9a8180828db82f3c23d62e9dc46015a88b0a3c75eb164c17df"; + sha512 = "4b0d715ba2a7edd648bcc2c396ea764e8a29fce69d526803e6621053f3886df44d758fdbf2c8af8a9e3acd307e10dcdcf3e13eff0e60bce28885b699cf2426d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/an/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/an/firefox-63.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "92a7b8eda43a1d6323e058d285e5b599b14ff8a7275d8e900d9ad8d5dc8160ddbfeb8134b877cbd078b3e3ce9919c2906f4cf7f9224f807f6c0ebf0c6e906be3"; + sha512 = "79665a9586e0fceacb0a49560d0fc2a72a76187799563b0f8ef972043020744dafc971cb94b52b30df6056673aea4e0885f994d55c99c7976f9f7805c30e5796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ar/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ar/firefox-63.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2592b6808abd04054ab6d71b8f44d94eb040c92f53c755b2258e4a10a3c8cd80241dedc2e57924e9410717cc8943947248b27c753c6223aa57352b0a08cd64dd"; + sha512 = "d338b5fdf1dc4bb920bd372ba69934ddf39bdc7e37b725a010fbc9fd71ff487181d898e863c7ce9a21039d51d256c4ec1ca2cdcf0da078788243e867b0bc151f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/as/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/as/firefox-63.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "224c3d09c1122f2444d2bc75833d6db60a7cbdacc819d16d40a3d5e6537e275a5720f1b6d4616ed318868683b99547d03aedc21175781eab0b32ec8c6be87495"; + sha512 = "2022a993455456d0c900ddaf8e6a74a3d5478edec456df0cba627dfa1ad41f0274053c21b9c1ca4ca6b640e26993d60ffcc2f879c68143699f6e31d43f7acc19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ast/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ast/firefox-63.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "26b316efd6d4d238726e5a1fef3a6ad00af3f42cd45846598e4562b9c5b2d35af3372e283efd30713464c440715de82ce49ce3d73569ff528d90ec479264110b"; + sha512 = "1eca2ca8385215a886a16de77988d76e41b7257a41fceacd3df18e21ba82c8c67df045aa8201a2b18032f1690997b4b8bfb55a80c47341335aab45cbb15eefd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/az/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/az/firefox-63.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "29935c406c955692a469762a9c53762d6a8f7ccd4555b53c31283f4767db2547a17819f7e55aafd011b3570c30839e350dfe74a52d322047647ddaae58b23919"; + sha512 = "3788f68a69a8605e3185e5e776edf3339a650e010fc4810f574e5c0a62c9aaf30c84151ea169c005c1f381c3eaa4c3a8f6758c336a9423cfeaffb83aef96dc73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/be/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/be/firefox-63.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "e4a438ff8a9100126f0fac456bd6aa7d0713bf2e22e7ce6490c4f3ec5643087b668bb5d8d867c9466a289a964f957ce958dd9545ada53b207bf026f3f8200373"; + sha512 = "f538b9f8d566f7f3c5bc92a24127966d618b47dd368ecbb4fae0e5c90045bb75cb1b921edd865227ca6c34e3e2e037acb81d9f7368cfdee59cbdcf6ff2798ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bg/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bg/firefox-63.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "3b17536b1bd6cbb94548b7b2b0d05ced711ef116acc4687309c3392f77ec0b51cb4814efbeee26ceb51328a4ae5b5ee1c4d8e69e57c2580be8cb1989bb082cba"; + sha512 = "497a95b4309e60093ec3f1b0a72ac05d1b9a47d78799ca33492394c7bf0b81e64e60103218c479b4ff3a3b2acfcf95493f43be23feb89fbdfebe42ec8a124132"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-BD/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bn-BD/firefox-63.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "d9969a8d0fda1bc4d108f0c24e934235186420734df1be38db9608e303d7928b45007b40857681d0b29826bc26628b3b86388c81925059ebb23b6ccbeb80f375"; + sha512 = "3c2123b34ebb2e3c6def220c679069b31b3d7a2110ec2eadea88a930b6582fcab0452bce97f0302a39af324ca1b58ec49ed49aa865ade7d814152bf16fd1cadc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bn-IN/firefox-63.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "7e449679b8bece1eed95ca5e3bfbe1a303d9dfa8bd4b9e53d14f99198e01a4dc4367112de48ad50b61c3cc54eaaba8caf143c36336da3c86c2815828ca5a2a80"; + sha512 = "55fdb9a3efe54db994706fb8345918f5c19f1a24f77107e6819dd1272a09900ef3534897c1d3b38c331c94813446694b2422356ae6ca2356338d6253e15a37e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/br/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/br/firefox-63.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "328deff7045bfa2187c19a66ca03a0c8f25e266eb6ea9c19715c201702245a0c338458254297974aa18466350231dc800f20b72c552f4633d5eea176f45adf80"; + sha512 = "c35e40bfd6b1fb06c8426c6f9f834f8a6d658ced8892c575079d852dbb2e24f09657b1f37bc8af3588cc2c8b9ba1924cf5a85c7be0d6db4334c592f03abeb142"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bs/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bs/firefox-63.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "20f85e5ca5f7a7be5079778b426e252c98112550849fb6e16e3b0d52a15570e638c8a664976a9252891a2254be59fe436dcda0d65b1f9ad5cdbe0cc5636cb93f"; + sha512 = "ea63659f3a930b4d0a8add69cd8ca1a3d98e015aab1b6bc607c8e0fbd610de8fdc49ac290c61bcd762092d4f56554f70f029a18be4bcf426cafffc6fe9677699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ca/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ca/firefox-63.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7abd7b7220c6a5b1cbb4c8f9ee6c55d15682bba5bc1e1356a038f9b1ae7ec351c57ef4dd19a02f8216f6789342d5d91cf76a00ecf13e71c8fad0f1fbc315e775"; + sha512 = "10993691fe9072706f1c092199dadea2f1ffbcfecede53771326dd03b88387133aa23e75f96bebe7117eb02ea2775e5758c36064c5ddd72f7aab441feca659e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cak/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cak/firefox-63.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2a8070bcd971261d994ae2ded0366b9e07961e1b98aa76c117d1e949a8f9990a22ba461ebda223b76f33c7ca94e1862a888b000642a4f874b8b92d2b5f470736"; + sha512 = "0413afe78e4c8ca1af3edad09c801607c73069366a255d4d1d9e6d4589ba3757c732a2cd691b8f223ab10cc99cdcc322e98d8daca49b3107082a8cb41cd278ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cs/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cs/firefox-63.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "8beb5c0ee3a0b2a556b455e41887dda126a0892df50aba4e283f0db819c99c4601427370c70c09d176f1a6ee8d629e1ec5f8b803d51b9444237e56c7a273cc0a"; + sha512 = "d4ee0844c1587ed0d65d40a444fd130022f99831749f721523b0f594d4967e723fd8af10c363f53b4fdca91f676962882e93327dd5b1529d3d66c27f17bf29a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cy/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cy/firefox-63.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "ec1a4fb0c8f753454aea88fdcfb3a340d0328d9c059653d9390a71841098573d667c2329c0c8dc88a2fc52eedfd8dbc584df2fe44fff273f8aeec8a3f1eaa0f6"; + sha512 = "103177bdcb204d0da7dc8fbfcd82a52bbf3956b13f716de1547252a076d68b21f9bf4684ed63a62aa4635fa39cb776a64942d81333ebf41dfc5f12d6087261af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/da/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/da/firefox-63.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "79532e1cf94447797d9d816cdc342fe0f8c37915494ff000bbc7148c2d42a1adeb7226887d51999774b6068f62d71bbb54b0951bc606003a91df12e9f24e7691"; + sha512 = "38cc06165c713ffdb5a2bcef9b8e6c7f55c2e821c4e4c87d30b613cd78aa6320761e709f3a784a0f55da283dd7088ab67d0e58a16a90bbd182985d29691bd50e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/de/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/de/firefox-63.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "5f0d10736912f6ad4bd38538601ceb8db10cf97dd414446366218ccb03ae010037114d688409cd724e194126524bdd442f71b1cf646f1f3ac46499afecc082d6"; + sha512 = "076276ef8556922e80bf74aaf3624e6604eb904ec6dda35df7f91edf99c62015d1309ea1a5cc28d84ce96f9924dc908c81f959ecf93f2419156d07bb303fcbd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/dsb/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/dsb/firefox-63.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "2cafc29c75b055e4c21e12fe2b2ca3c974ad53fed43c8b082e09323bd1854ae7179da13c7d33edf41f783fe0016053d52292bafbccdcff79cc69d8ffedf01ab9"; + sha512 = "979013e2bc62db710891d95d8898857e51bc1a2073e3a56948af57c9676fdbc87b6a9d827177a5a1d7926f71d83e9df706c42ea98bca98fab998815daf50458d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/el/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/el/firefox-63.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "b1246b56eb0d61d5ac874383ee279d3c9dfe559127052c4d4403ab0009d702a76711d05f1ebb781f972d9cbe6cee9a6b3c1aea9cb74866e497f2569480a2cbf1"; + sha512 = "1f4e5983ca94ecd9da6d65ec7c39ef7e01296f957cbe3812a20981bafdd9a2c0e07bb5814b5caab781ed1f2f6fb2ce2079557e3b9bbc1422b2fb7d882b921ffb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-CA/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-CA/firefox-63.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "8d344a08fce1be002b5710031250aa0f13d237bd38386cb31d5f6a75cc29ee17dffd01e1375e4a26b1a136d268db6ebaa591fc23789b3fbd7771f42a6bb59979"; + sha512 = "77a9038b33a15a2f12db383039f89d29f1e855aad6354375517726d28c5e1984fe77993cb802f17975488441ef36ac143c1e4e2d29c7104143db511229e9b28a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-GB/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-GB/firefox-63.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "88899808190f9013eba157345adc740fbd1889fd1ac963209cf093e9bd9f1e9b3f35126e85c5d3a1590e02ff1da8c09fa390ec519bc0ab01bab7c37d9b5d4bed"; + sha512 = "62f5374d07b90e80d9f67b04a647f68fc75af267e9b9c04674d754b0d023ed9d78241a693f11504d5b74902328c68414be394923493c17c551a62d06621edf4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-US/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-US/firefox-63.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "577cdf1e1c4845e0b22c174833b0e20375443121e429a57d16f1f0e3af86533a6c27d35d8451ab25b3f7ba10ee9385d0f497866b50d4f37a81f9663137aa3395"; + sha512 = "906376e344b9f01c5eca8a6e24386927a68613a74202062fe52de5bc1b9d1073103e9c59d19f40f33efabf0f5e4852210195691a73f1bd05db790e7c1eac5f28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-ZA/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-ZA/firefox-63.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "ee679b5bab64492bd069cd9b3b7509db7a5296a019d8712afd12a5b6ffeb1911fc4daaf63483b895b79652f67f9095b66be780a2b0dce3e7b9b57fb5fcda316a"; + sha512 = "895f9dbd5ef281a48e5c3124dcb668b9fe4d6b41a3402850e68e138190b756ab10292bd002c36a1f8391ff3598c48a8623552ac35d18d0948dbe194b28684f81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eo/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/eo/firefox-63.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "32e54f1a83e4b3cf8f7296fad200abedafb5c7d4bd409c7acd2806944a241b6923794a33a7999754e4d2010f2788ea3a3d08ee72a9354713b6cc2ee1dc73a665"; + sha512 = "defe31badc0ce4c41785abf6aef543584778e5c6f373300c2fc3582c89daaa500cc9aedac55e1a1569abd8eb0de207268e31b9eae61565e76a43eecf41ef774f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-AR/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-AR/firefox-63.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ce740d773ecc016eb89e9fe4370e199294f8c51c4f5f74bbe7f09a5ac060b374d23e80fd8a27b63c6149bcaec2b93d58a892ba7f53c08628c141b406838e2d58"; + sha512 = "bfe81fbc669fa156c6741c62b00c9ebcf74fb2f49c92206c5ca79986358e7b8ec29d98d206c4d0e21e81a781ed8216fde5b072f0f1a19604ed7c3784b82829c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-CL/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-CL/firefox-63.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "9ea5c06200091975c98587627ca371bb492cef91ec200a52409b4b30092aeeda64360913b8950ce56031aef34e66364bea71bb071df5549736dc0900ac54f7f2"; + sha512 = "cd3bc97552a30c9eabf8627ef97db2d4f48f2fbce4c72b5e6b41000a623ab1782f87ee8ac61dde5e3fccc59a91f87b4a3b279b90de3b08e90293329bc85976d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-ES/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-ES/firefox-63.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "df71790d420798b17e64aaeb007f7f8585037d48b7c8933f5760b75385c945ef16e815c84b5872cfef8a2ebafd3293cbb4910befc4844b166f16774947a9b32b"; + sha512 = "1d761d479df22483c576598db8248b3ab6a7b838c518058c6903d7097452c4027b9c38cacd206063816669ce664501c138741044369de04eafcd40087ccc3688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-MX/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-MX/firefox-63.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "02e0948d3f4855a9c9e502627cf5d199364c0f0a7ee7f4314d69c9977f8504e43c3dc1cb8e80c9aa6bb6f4d75609108f6aafa8c9acdac31aedb908b5df26e1a1"; + sha512 = "934aabdcb204dcdc80d9e35cf19aaf83dc235f95d597f5b2a6302635275aa68245932f4b5f1b2725ec84711e8d0f2c830aaa45406ada91efa2d21c8b31995939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/et/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/et/firefox-63.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "776bed6ba54f1ac29836681a99ec673741dd439501b7859a68c1d6645693f566fb3dbaf2e827cb23d3ab993ff4ca290008de7256aa28cc6e29625eda4048db27"; + sha512 = "5b669b4adb7d14eb4550fcbcd05a1e7a1a186954bfba39d491248b177d057662227b672d2902273315c12e9d57bb944ea2df41d7cb35514fa00d79d235c178c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eu/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/eu/firefox-63.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "7e95ac325fd4726def5aed67ee110693dbeb7953aa5672913c18cb1b91f8a884500e6096a5100e89d9266c28ede9d677be91fb00227944d379a946938ffc752e"; + sha512 = "c8555e93e6cc7d4fe179ad68ad1b2fe3f0735134c8a30bb9911b0bf5475e169e07640eee85afa2c7193b27d96c8cebe2227d38e1ff7499b3470b68a04bff2953"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fa/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fa/firefox-63.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "6cc8d99ddd690f7dac9da19d23666e655aa65a576cf912b195ec3f83ece9b5a6677d656a1d187930897adfc021ee3d16e3113a8d8454fb9b4a9f878c615b49ab"; + sha512 = "c607251f6b855fd86504fec3780ba66d8d451d76a16d0541fe5b96ba5b8d809ecd7d591209f3320bfb044463470b394862a6c0717cd9398048a154d6c2b93bad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ff/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ff/firefox-63.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "026976b48352d2c292d27b0df8f17f75f2bbdc0822d89b722bd1e58d9189ce35c925da6de287f0f89e18ac9f64134a1bf5dbd3b6da609da823686acfcea5b05b"; + sha512 = "d9850e4d78d6bebb9d342898bea876d66a9811ac62ffcd56ab8ca662a4db6bd872a643ac233e02fdebb9dc107349d7f0f258ad790ac11bfdd791a2d8336197a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fi/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fi/firefox-63.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8d7621858ba33c340248df277f3822c120b4beea5cfb9811afd61b85fc2b5dfdb100c475d0b291c9bedeffae4ba52bea653d925571af8c68bafae6c997beba74"; + sha512 = "8be60c2bc3c175aedc3a1c062107c5368f503bbea245e87f5f269c9faed3832ff8c93f221815637b3947c474b44be31f3ea09955e7a87d2be67454dbb4d4e9b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fr/firefox-63.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "23f73a32cfa388bc21c1e202886d83a36c21a8b4fd83f7001ce72a911be800d9dd2d49e21cdd9d9cf48a82121d4684802dcaa7d97b3bb47b762ec4c95be49011"; + sha512 = "ac559deff6caa20f40bb561e350129e765ba7f63ee8758dc01542fb5f685262c0bd6ec0d13fd65c196aecb352b72b62d10335d121edcca11500684fdb1be8be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fy-NL/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fy-NL/firefox-63.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "2d3c4d546d1d8f03ab407c2bf481e23bb4bf191b84e9e0da533b2b00a0c8f7cea7c5730fcadd777b909c9515981e61a1fef25fd1037d75bdab15901a877c9fb6"; + sha512 = "c6a19730d2861a20a69ec8a7ded79377849554f21143e3b55ef0b009519b52d9ba2fa0f2e58ef592f3eba00305d0e2dcf44df958ed22043a83a86ed7fa72362a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ga-IE/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ga-IE/firefox-63.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "7f52631104ef48631d2d2d5434a50d1f62447b314329e9571915bf16b246c9910a8875500077474303806edc05993d79c72b60a2b6f3a64389446609092320d0"; + sha512 = "28c68d871e4e025eb22f19fc1c4d786185934bd6254f03061b95eea8459776c9c28a903e30edbcd53f6e0cc5b24b6c65e2311a6483e18620b246ca8ce2fc5470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gd/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gd/firefox-63.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "98b9275029ad64dbebebeb697ccfeb1dfd2b0d51e437899a8417292f2a14421a5a83f07164cd4158250aa08d5e45bbe4c97e1fc7ebf3fa02cf42d7dac740aa0d"; + sha512 = "d6e9b226b893050925259a7de5dfc67104b6defc76778272adb8e5b41427a646549ddf6e38d58d9ee4bd27c476406ac9e65244fc57f78a3ef54d7c7bc758df80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gl/firefox-63.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "6abd8e3d990983094880056924fa60c14efb6c133f05ef129294c7cd83725df1e32a85bc08ddffc22f3e3d4414744345f67ca5f055af74a93a0eaf8838f38f8e"; + sha512 = "3f73ec82235a8345c2e1e86b521f062a5f45bf0fdb884533c22f1661bff430c1a3c440c5fa5c209474c2eb542d1be25ab2c6a4aa50b872ffe34bb66ef2da6e0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gn/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gn/firefox-63.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "043471a8b62dc300f1c719ea33a6c8b3690f38876697cf57625e26bf1d66ec2a4b6f952c836359da19f9b346851c3fc20525fad32596c9e91b9f5b23ca1672d3"; + sha512 = "4be814c72579653264990737b7eefed0ed7f332da1317bbff3a0a1d6f45aecdac12552eb0e6897ac0bae64f261de6b46b36588623a8523a51b880d1bde5d763c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gu-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gu-IN/firefox-63.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ae849a0f9350fd0382e859ae9fde0217d73014c3fb7a7974b635b3bb2f7d62087c7b40c62707ff64eabd37ca700faa0f392e737b1ace15494d44fd6a87599b69"; + sha512 = "00670cb7caec8f841f17e613a86554182512e0aa49ff7c8298c9d3c9d364d7fd391063b890461cc41966e5facde0a8a325ac97e08bd0bd9d25858b32c348fa81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/he/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/he/firefox-63.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "49a350f95858916d73aa71be60bc3f162bee24556c06524ccc5d10eb7658e91affe4c8945d92c7c6958eb7c8bb3879211d6096a1912bc4b50a9e35b465ddd219"; + sha512 = "653538026ba533c7446108a2277dc7f87a2e519583d27c028be2b056c67299ceb9b2296dd83f94c3a043a2bb9fbb05de2260248d408f3279a7c8fc49e0e84416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hi-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hi-IN/firefox-63.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a55d2647fa5ffe06fc479675676700edf460c7d7600fe18ae468fc3e13a8cb3cc025dd64bff244b61724ee213835a64c71e51e2d59a0ac2eaaca0a29a692dfaa"; + sha512 = "a4989edea0edf4f509d4387b225340a4b67805b3f8cd7af67b575b1b3b5a8cc98f9a8d6d2a05ee878e15dd8ac2b0c35f43fae52917a8b667098f1812e361fbef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hr/firefox-63.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6d961a7936c46dbdeb4d66a6ba91414a158593120a58f9f454ae77839cfedd5af2dc9d3dde02bd2d36e21f946b5ff9de0727abf44c2ea78f6e618cb84242892a"; + sha512 = "b762c1bf922e72a9cd8570012962fb63c5658de25fa08ce4532c6c96b7b06c0e13bc71b2306219a6e0219a8ef7aef168a8523cf39b1cc1e6362198fac0696545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hsb/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hsb/firefox-63.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "eba4e20491a61d9de7a25373bec43fac62b9ac3b461be5e593117ff4d31884acee63c2c6bbb56cc7eeef67bd36b7d3bfc748169fd7fc49877efdf7656813ee5d"; + sha512 = "22ea6afb26555d88680cea7bc1fba6570aa7e0b8517b23f4f5a7d3f2fee285315e29e818954dacd29768642e62a57adea282fa35116a7733c1012d2578647bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hu/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hu/firefox-63.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d78c29d57143a3aa443ff79718afcc9c7ddd72b8f9fa3dfebcd6c19279947685a7560fbc4ba2de42589cdf4d9a71de94e335fd6641ce284fc60418e483895b97"; + sha512 = "cbd0d026cfb693c7eda3f58f0954bad41ec260e307b8a4a9d4e774e2277786420f99c8afab9ee0fc9f7cf7f9e4542904c6d1c1b92c1c3bffa62f8dd9aedd8a73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hy-AM/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hy-AM/firefox-63.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "e7239c2f90870322c16e9af03da9156d8d36b6ef5b71053006f78f94af9da068e81521eb155abfa74195a83a63f7181cafba270c9bda2d4bea63f9cedf9aabef"; + sha512 = "59315b0561ccccfc031b240b699b019c3b6d2769cda6d816bd60c359ca1a4076c4fcd8342bbff6cd4cf66243dc5164e1c0066bc7821275cf5c11caff0e86a6e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ia/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ia/firefox-63.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e614f2a89feb9b2555d2d3de019c1c6b74b6891eb4e9b7d9e055444ec923689442e6c7ec8f2d8605236e0556c79827a031a870989635234439e678eaf1846e39"; + sha512 = "2addd61131770c825227639d5d7790bc0c9f0be430077fa31cb11cf74f6ec191f6dbdd88c4e0b2fc199eeee7ecc39c6dce8c790924224ab0603e0af41e082a63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/id/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/id/firefox-63.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "2e5e40dbe997459c14432f80d50075029ef79d1fbcf64fffa527bfffbd5c348ad84a2f2909045ddf98f2b268c26a20b1bec0c00ca753e64782a0e7dda972727a"; + sha512 = "81a68f78f003685e1a06d242ca3c24df27b7a0b28d0a5df2f41cbe9b92e312b32a35608c7e094ca136d6f6356e523c62baded1cc027d19342ba44cf88b479843"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/is/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/is/firefox-63.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "77875a40aa36692f594ee0e714ad9cffcca0d036669f10dc31ce8492c1b372a885642b9a3f9cb85ab94833cd7accd425ea673535fbbcb93d3255ae74711b0ccf"; + sha512 = "cabbb8d0f7b5009aa6e889c983046a5c806f1c077c8e27f7cd148b54a25c9cadb5010acb97b2cdbe6480463f205bd7a4edb966fae0a92a8380439082542dd9bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/it/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/it/firefox-63.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "6e737a1911bc5a97c6bc3ccdf33d72b5b964b2e155672ae583268393b3d9ec785765d55a0cbbdb0deb4fd4bd8bbd2bdd0849ed27ab782116f3d09293f441f40f"; + sha512 = "8d3eb041fccf54dfe389566cd11b2dad4276fee3b902914bdb4a8cf06c6613a39f4ebe7d00d33a1873bcee32f398b0527d4807d08ee91e0accabb92205eff51f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ja/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ja/firefox-63.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "eb69cae70ef52c96b21f74fcf339ae031c4dde08817b211b4deed493d0ed63c87b28cea1d67123fc2f36ec4ff375f8d8a4f6eb07f0e55be87e1ae74d001dff77"; + sha512 = "facf7aa7f639104956f44dd4f2a6f4064ac4474d3c3bf2e355f1934c68831bb774172b719b2f0685435e3f3cd56ed589980d06a1d2dbb6e405a5f5c32395136f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ka/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ka/firefox-63.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "87c7a6872de8829615834706fc76f1eb093c57f9c7866a45a4a43f2974288f05d7a98a3b563b65b2464e649c8a34972a9d779b6386bd904283db907981064f58"; + sha512 = "c8d5407fd932d83fe6d55fa012c9fab70a4d67fc6043dc4c9e18c6f6e25bd4fb8feb0dba97ec7a8a3f1cccfa37c46cae482b9fab90ac29c34b57a35387742b66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kab/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kab/firefox-63.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "c65d155fcc48d9b57590bc09ccea6303b85c1a7bffb8ab6783e39408ea271c341f558ca6800eae145baef263af54ed19b882b0aa39ed75b38bfa8a4f5b3842a7"; + sha512 = "0949d40892060b97c1fdf69d9777893b2456d5c936d29876832aa41492c01c1a07c88665fb669d53b8cb91f23757cd14636f87ecfae7aa112384658288afd4e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kk/firefox-63.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "2858283a1721fffac6af65505c26d3c761331df82a7a17d5e107d3b9151cb08e448cf7d80eb3bef29068b9a4d0bc2f268207f86e0afa692a50b8c9e6623bf835"; + sha512 = "30d3e966ebad9eca27d255c20bf11bdc5c6073f0cec8954c568c4abda86f689e5a9c4c2f508cbe09687e0efdd2ea8f5f8ef5de781c3fde399f39bd9b229bd187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/km/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/km/firefox-63.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "fb77850dbdbd2078ca6b7933fd630550d52ddc57615a789265756b460840cf6389dbe138be82136612762f48fcc8da2f8aecf94c3ffbf8962b6c1dd6f60cf52f"; + sha512 = "f9514178a460bc3f1a6e56878f951208d6afe92de893ff1861e38ece04909535d9a5de8d59359b6de32f0bf4ad462c6958b0b881c3678da074cddcc5a6ad8150"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kn/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kn/firefox-63.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "cea7b6c2c1c82b6d5ab14bbcd9345325c826600bb1c736ac898358e9a5d96f0e58eefdbc03190a51d21b4e3ecdc477e6b2e88f493e3a787219dab6970cc3eb40"; + sha512 = "cc229a04e851f479f785d1abc0e2b486f20797ae0269d62cb64aa6bf8a3925958b9271bcbaf0acc3dcd7fe7f39b9077b1a8a7650055d2fceeb2ca6db676240e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ko/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ko/firefox-63.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1f8b2af8a153d1b166ca62cdbb652e255653e8ecca33eb10d81b71007f5f6d3645cb33613f3def21f6384137ddd54697a880f9acf77908ab0b800a88b4420813"; + sha512 = "6d7ccf3e6d062014af2c59abf03b3f9300a1045855cd6f6c37d8a9c9733ec7c2775fb702ce219b96d6c0aea4dc1121188805324e1f65e5b222190c5fe34a9fd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lij/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lij/firefox-63.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "0806dce8a381741d7df769e87061c15df57b6839fe3230be30936be5406939d79502602b02202654d78fa45f284e33aaa88c1d62b4cead4230e7368737105761"; + sha512 = "3ab2e904fd162bada37cb2536c928fb2f5bec09d8023556b42c9b0a77395f1288f65cec792d0bb6def19952e0d49dc6e3ae7a8398697ba2341750d7707c89fef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lt/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lt/firefox-63.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "5184b3525d094e80bb16acbacd9e8323f83f25a3a1652d82f0bad6a78f6750081140a6c007a4c2fad8c2955fad2aea07577642341dbef01bde1f7c06947a87c7"; + sha512 = "3e821ba12956af86bedc0d179542cff85631fd20bec53c34c410f5e3315be076634548ea512041241d82c46a88387a830af483fcb35cc6a4d897f09f3fb93be8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lv/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lv/firefox-63.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "49f878a62d140a6667a76e89b129f28cef1a56e02212aaadf6eaceed2c776e54f4ad23bbe58c6e013a16c29bf81c06ef942451c726b7372a20391cf75e08b1ae"; + sha512 = "21d5e0fad3bd77c2e414044dae95e8464d33fa41badaa0049294a142b04ccdeb62708f209b5ad8c07d7eb5064479b6f4a58433b0ca7fd0436e62ccbb5ff52786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mai/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mai/firefox-63.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "4b24b433fd5c695960476fff3ad678e094bab5d81f9e7cd2d1c6a3c56075f0bdbd4f24f6c6009e0ac5b5a4a25a7e72b2d566fca0f08e6cbada8131b9b5700be4"; + sha512 = "c3e34de39bf5c77cf1c61d3e691b838ac4a560ce098540d6e58be13d7b1760a670f00aff505bbbb417b37190e494e48426bba73cee3e8e2454a73c15975465ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mk/firefox-63.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "2c500c446c3ba9aa6735df3fca9673e056d04b8d8a059ed50bcb4cd7b5819fb224e12fffde3d33d5658adab93eb9f53c296bb422556264eb3bdc08e4a386e238"; + sha512 = "9a26b08ba538caf677e1a2f3f3c98e5c67e51e7dec72e73097036c6f34bbab2d5b77ec9bcc96679bd3ab7ae83c3bd94d2c3307843d82f8b1e9ea95455ec91308"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ml/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ml/firefox-63.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "3e743c899e60cea9010c28355f0b1d3f5f34da6c4865f7c284edfa81ae835bb8ba21e378c3aef36310cdecffcb1be3cc0d06b9e7c9ce2ff15482db3bfee93bcc"; + sha512 = "924193b490fb8d65604fc7f61a6f00b79074b61ba437060fc35efdfa117d5014144c285ab149fe7b9dcdb75486ffe516ef1109eb751a6951c88e317d0c3bf222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mr/firefox-63.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "53864ac115e5f84f50b4f33103d549942b4c19286bdb4c236a794239bd9f40bceded9272c43aa808405eabc2a75ad36d2e643caaf30732a57bfa7d2de4c908a4"; + sha512 = "163b3aee29777bef44bdfb56a637c3fd06c435acd05294818f3993f32f8062d0f1ae4fce96c48c05d99a9d97521e58230fa7ee7a9129b63956fd5522722b5c8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ms/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ms/firefox-63.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8820b20add1fcfe14f30a4b54428008cf770feb321b0e9aa27a0896c94bfca84aa1b4d3c4c7acaa30ea5a615c94259837bc9539c0b96f6702a3a5b093842dcde"; + sha512 = "7eb5b0f2d0b69e56e01c3aed184a995e3634853a267d30fb5149850269c3f1efcabdda8625a367ffd0b70282d5853158084e5890c1e79078818c19a94630d9e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/my/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/my/firefox-63.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "6a34963674a7448a2454e2b84cd732cf679b65db568f165d13c699651efaf1ca4804b0602181a9dbb301aad7e5dd39646b19fb3dc73469792d82f02220a7d9c7"; + sha512 = "41eda41795d4db0198bf3b603ce097cafcab58e37bb58678aaef7ffad424fb6b9bf462801052a78c9d02092fef58a845cff5ab5640714efaf7eb94adeae2a669"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nb-NO/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nb-NO/firefox-63.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "cffe42d175570493c853044e0bf774155e1b7020d4d26aec7e578a6bc5cbaad057c125d30c7fe92f818bd9b2c982c775f19ac5535f606346b46bab095dd99b18"; + sha512 = "d87d4b281238d8c54468196c3a3ac55a2774fc4d04a4e9939cb47f526c57fbc1366c2ffc590d01767bdb14448edf9a11a21e8e221044529d0b0bb83532476040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ne-NP/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ne-NP/firefox-63.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "72ae1ef7e071b665abb92dd07add0b4023cefb64aeed09638768152a0c15d7370686849199771e7f19272b5df8042f72f76bb02e57f9a304c6dc930d49c2d04b"; + sha512 = "3cb49431e5831d63dd849aec87affb63e170f4feabd6701d520fbebe9ca16aafe448152231b4823c494d0595d23eae81fa79e5b9778a1c1a08d5011e7ad25908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nl/firefox-63.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "b290a26a41a6fa0b0d1d89076aa5beec4a250ad2ff053e83c19108164c95c78ccb50ad1fdc6e1091605bfdb1a829d108fdd4528747309682fbe472b1332ab741"; + sha512 = "d29c06e0829eb07930605ac1c438175c65029f9635d0feda571c944e91e93332c99a697c47acd55f27f0adab49f46fae5f81955e783ae70cb1247029b0687de8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nn-NO/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nn-NO/firefox-63.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "9f4ea82b06102744696c1c842cec65250e4361c6e37607ef5cb8e03abb31bf97ac8032de7120f369362199d4aaae1274563a09f61f04dec07d50aa94358e13b4"; + sha512 = "2f9acb29eeba9aaff86ebec0de7e67a6b17ec48607b5bd1c9c9466d465fba2825d41c86e0ae7492873e093f7ac36ffaaf1c744a5e3ffe0f3b2b5ac468aa43c33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/oc/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/oc/firefox-63.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "e75d1a8c0af6424f7cb7575797c70b230919d840086f4bfef850febe36b863d9663d0dd45c6488528794f7f7356e0042c21dbac8e607689989d55b51cc64f3d8"; + sha512 = "bad2f0d5f7a9a7013d74002ead12768d16cf949b7bb5ac3a130c5cfd1a8911a68da27d4682a7cfb31ba20f4d826ece3578aa46258c8773def49449e21d0bdbd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/or/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/or/firefox-63.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "563dc60168a9e686c6058117ec12ab84f55836ff442f606f0a7ae6af663cf73228956c8d12141a0dce0a80d75386623002ede2fdf89c07b6a00379c08d00b544"; + sha512 = "aca0bdc501ca0d4de6f8036b3aa3670ac6044563d54aac931fdeb154f796b2814a420432644a53329d46677cf7b77d5d3a8e4a3f6aab5469708ef9e4364590ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pa-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pa-IN/firefox-63.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "2fca31b8ec096191733a1a7ee6ecca37b3ce2acec56be01e23556f68ca7e6d3cc56fd1ff0a3dec7b2bb090d28606d545690f567d6432e25e8b335d7b238fd601"; + sha512 = "e20d542fc62d4610f85c0c02737c294f4ffe14f88da9f15f557ae170c332f131900a59718cd725dccaf282fe29c22c85c8466267f6b0d16464f5992e9876b536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pl/firefox-63.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "0c2f125b0aca823fb2a99567ede66e18ce9ebe1dfb649f9d6ef5bb4683c61813d9f9efe94c2224dc7ad441fe0f2b3136a3d090ac1335246ea4c4304229c106a0"; + sha512 = "e3848d7706e78f36ff41ad10656976b11ca12c98285bd5b18afb13dae9cfd43f2a38378ccdbbd741b6a2603daa1b3ed72eda4e8f47153e2eedcb066cf073877e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-BR/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pt-BR/firefox-63.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "15563039e10ae5a6464ed0d20c0afab6d6a3bb5e54bea507db87fa03c48be22d7f325af22f776d052e49b9ebf9659c36ad77e92a22f884a0c443e3d49462b003"; + sha512 = "9848181304658218d4bc0e2c21dbd878f40d3ec5a7d93d9ca6c7e1efc803f957e845344b15f697f347da0a743b7f25bce2e5b822a81c4e0f038380ea95509605"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-PT/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pt-PT/firefox-63.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "93eb9f47254a1119074e462c892698de6339bf68ecb3c1f3d4ccc9c97758ee3a0ce54cc026b8084b50283f7ad7960245efa9f345761ec8a50b4363ec52d86aee"; + sha512 = "8d9e9f52b80bd790a919442a970dc8e0f19f8ed5b64de22c4756fa9c0f7d1b72998a62aa249a9e8f3dc1caed1e74a07cc91ea15ee5b3f5ed1e5e340cf148eec7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/rm/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/rm/firefox-63.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "96295dfe17a2e066f838add7f3002e6307d1ef7e0212c0c3bc543bf7e3ae3be9da5a49bc6850b3c4b5f5bf46e112bc690824e528eb90f15864d43c7ab55d0eaa"; + sha512 = "ea7cfa4dcf6b3cd3a483b73c8360b525d8002773a5c766887306320d99183b035f6acb9761384cd44cf5cf3391e3fc06d554e68cc95814ddd3548de5ff2e311b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ro/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ro/firefox-63.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2782b44a49d116e8d15c0df9de710f432195a56cb46934e3d5659e9c91a190dfa49289cac64c738323fc2399058dd9e3bf607fb01d52cc9ee671499c4c29e10c"; + sha512 = "97271af95125b146c4d3655daa99e59c2b3f1dba57e9c947b7337cfacebdda5517be62f14a5a3eda723bd1dbba6437c0825e0f5200f9895fe678ae80708b53ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ru/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ru/firefox-63.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "fec5ece757f19a19e5dd4d92a073c8e1fbde56757e12e038a7247edef11e4fc9daf27264b560ea9bf8f37008432df4d306f8209baf826c537360ed8c6ffbb538"; + sha512 = "e8e3fefa17ae3ff51bec782b163049eb10398cb1a46b2fbc8124e9000ea0a37a0adaeb71794ef392fbad501bb4c04b0f98765cb94f90cdee4a46a30fa07dd925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/si/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/si/firefox-63.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "cceac95143d3444e6b4a589d6685ef6740ece81b4ea26c0b31b4253a117b4ee239468d404bdd9caec9543e645e9e985304eb8a354000796e2124d71e23b74921"; + sha512 = "d16d3ae7c5b5ef04b09b6c0afcf4fc55f8e47b20729bef33d2278bcf4727703710f27cfc610b78ebf8e9d45f80bdb3119f438da2598a4922a43cdd88967485f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sk/firefox-63.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "1e4b31480a5c75bdd350cc17b159e2e14fcb53ba39215d565510ed54cd7d12d4e9d6901b1ed0909140e03e31f7c1005ba8e1a48a3a2f6d91bca1e51490cb30d0"; + sha512 = "3d23ce446b62314b5b6281aa4e8fa7e38ae3ea9ed7be7ae3d37d223b69ab8ab20a2e2d772d278538db8a572b839d59ebf4b7aa40211049f81641784c523e6fcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sl/firefox-63.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6ce2f2c338ac8481224518bfaae55ff66e8005ef40ca7a13cec294e1b797723b6c3874f96b6c2e4fb78ae526232ad267cfa407b8952d454fa5f4eb40bbcd19a8"; + sha512 = "25e2bb9a9e92ebe5507ecea35302792acb7be4666fcbfe3dc7b0cd8ffe77ccfd514f92b9762346a5a71d55e28ed654ad55752b4ca82686d3e8fba97473afb6b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/son/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/son/firefox-63.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "24ad351629771a6f3ad8d381508bad99094ae441f6ffaff9ec19d8018fc711ab852a42b9d1d0f447e8a4da79c1fc177ee9368940f15b1e89344dc7beff49946f"; + sha512 = "13f167d22fb355b90b02c4d8fd8f9aa38e7f6e626c633276a34088d5ea83e410cf3a0c00d33560c4ab48aac4613cb0d422751f8c8b7440c0fd59b8e8be0ef204"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sq/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sq/firefox-63.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "d8c80ea61e545f29a8a2b0bb4ee2be81650c131123693f1d6955d00364d67c4bd78ee6c85903d84d62c2405bc0df4f45f08301d1a13c30f6f33cb24ce4e9d7c6"; + sha512 = "f57dc4ec2cd1b8a45ac114b7f838d34f766f4f1f4fa9308504e6c9bfce05fb977e2982c1d83f433a957098d9069b58dc0c578af948b38f3d5f53ed59ecd3ef24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sr/firefox-63.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "c9455bec9df85347e6aff71b252f57f4859bbb8f378d274010ce402da0ba6931d9bb0a6d0f2dfdd4d87700ac68b039ada9fe7f673f5fbc7d95aeff738980e68f"; + sha512 = "89ab6e7a42ccc21b0a2c3c2a55b0e3920d0addb4505dcdb98ff6d93e995f18130b31dc92c55a0f72301c59cccbd142f439a24962e19ae24ee25af59c6611c668"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sv-SE/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sv-SE/firefox-63.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7b80caa0fafdd82fe1d0e1909656f894515439fe21f6c41a05455a06c89afcd72fed37c846c8168e874da47598d1eb87c676637ed9047943d0483322acb027ab"; + sha512 = "e5e1e25d4c5d1c97e715bb984c0862237602329a786776b3b3a5407e585399fc3d5ea7c8e6927292f25b97924a568c95bcd758e23b74ce71cb7592877a5da3ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ta/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ta/firefox-63.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "47a13f1bb090ea5271aea1add660f765e330b351ea6c77edacb380c74d5dd1939428b98ddd4f4cceaed38af9ca99f6f499298289f44c5f5d7c78c9ee3fceb9d1"; + sha512 = "4f9e44175061339559ee743528f4e7dbe4e9b0a3d92cc178879aa71f1a30fb260be307ff75722a2f69259e3fb13e509228ab86d4a6e9708564c3696ac3531afe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/te/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/te/firefox-63.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "7d0c21a749be9d7bdca8a7b6baae2044335244ce35932d913575cfba1eb63b4cc2a41ab79a5e19b6d3ef0607eaccb0e6303f57cfa9d44fa21deca86a34b52843"; + sha512 = "99e52a537ec1048b63dd77a9a9ccd1e44e8a00af256ad8b0f61ecd4e2767591550a000e66cfc1b3db4819580cb05dd7a76f2d64a4839a9e72dc43e65940afb73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/th/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/th/firefox-63.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "d02a77da738db455e419fb2bc519650d911b4612e5d5e282c54100e719d8b119b5e3119cb458f652ae532128ca64afad1153cf4b3434bffecf2cdbdd67cfc029"; + sha512 = "2db11524432184bff0646b86f665431cf71a1f3389185e1e85312af7cc75be26f55f0d899262405db411acc21a549a8d451b63d1c060fb892040c72b996c0b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/tr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/tr/firefox-63.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "87ec0311160aac012e601ed753599019b499b08e73f256d78c68a695ed6c1ecab53095ff16b007a4be08ffe54feb0dcdf31e7465271a3f48928abbcc5b80d5ac"; + sha512 = "90b2543238e92f66981c0aa6cc0e563eb1bd623c7bfcc9a72aa3f158b52ddf8fc7c0b550312cdb279dbb192c3cb5d2f9019817435a17d79b31239564771ea644"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/uk/firefox-63.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d80c098d00c9681220c9ababf0f62b69607ab6b71ba34d177941332450ec51a5b9120e0c3e629e0eaef91c64beb9b10aaafce2fd094f931cb976a99266d63a10"; + sha512 = "cc3973e6ebcc956a626292e09629a5041bdab89e92c94c4ef461e01f2384021b39057c04981d61deaae238bcfc6cbf0eda2ac19e271fb7fecc4c22f42808ed36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ur/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ur/firefox-63.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "98d1553710997d61efa48c7d84fbad2fba5d730d0259b9213811b7a5f47ef1e4ca8940f4e17708e8dfb7949b4fd908bf80dd5e9faaa86b3e3d2c3a07b3a3d7e9"; + sha512 = "0efd6d37984445601e5076cfd19e345c2f0d038d4eb88e4543c90b27c468164ee16bf7695fe8a8f1d6fc2fdec1c8ff6525886da5b84ccb8ee6ceee8d751884b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uz/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/uz/firefox-63.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "7a6074c2d7f1d40c41a5969fb33839df065fb398e7161ca7bf4d6aabf22a87deaeec7d623f0d36f992f8907d696c5aa53136cdee33bb623dfed94cc402b1fc46"; + sha512 = "61ff04342906c902710dae18b8c83e40e14120bba2276aa677543032bb0667b12ff7c9df70ed5e478eb3fe79fcc1ba306b738ec5ea2b3bed2728698f49f7b1c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/vi/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/vi/firefox-63.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "013c9210066a5b72f9640a5d7d647312391daeadf757e5b13484a035d5bffe2405f80d4fd750e7afe81990daf14baa49c6c4d77cce7e1a60a3483340aa115524"; + sha512 = "615754da0770dc5ac5347f7fd3ab5d4ef7aad96167deb5e7b22714595ad96e59069794abb676bc553b8aff226fe37f3db84c63ee2f662a71bd3f9163698beb0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/xh/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/xh/firefox-63.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b104815968385980a7bb297d83fea2dba4ec18bd853ecb70ac7065f30e0fcf5fd3708376f8202840d71c2d9e6bb3c48dcfa866594d334dc7a5ae3cbf3b83c888"; + sha512 = "4f82fe26348a515871f1c5775dc0ef4b31fff9a3bf48944379d08aed499bab55b314227e354ca17fe644807f1d2b1f732b8204c3179907c05f9c6d168c7fca3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-CN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/zh-CN/firefox-63.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "7961e947a3c34343c54d06e62e522f503375d83c8fda6648197b1408ec0916e54dadf6da982650c99d4b7215889eba015b5f1c8e5ddc0a48b9aa6c0925286540"; + sha512 = "2d13d782b2988389d2bbdb5560d494c77d2ef0ec479289ab683a3a7336200d2775577b2508f23587bcc8d3441693c07593c3f040fa767ea19a8adf29ed9b9b0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-TW/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/zh-TW/firefox-63.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "e09fdc1b84093c49fa8918310fc2a44b0285247548941bb5150a5a64ebff12c1ceacd6e8e397137da14ca6d8336bb2411dac9f4d1126c266da679d1214ba6974"; + sha512 = "af0c5f6d98fa4cd4556c46740edbbaa76653630d1b8fe265e63caa54e51977e6eacfbe4523ab29d3b9c9af466775dae5f62b00468cc644d6e84332d59605d6e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ach/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ach/firefox-63.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f0544809f924d264af750456abd6331af1b4116710ee9149604bbc11745070a76d84cb50f4810307a078e8ae4d2966b6771c318243215a3eef8ad957b8127414"; + sha512 = "d4b255e6675e460c80df56aac8a81a531d90c4b6ebeab018a1c5d333da440d780a89ece811f2a24616949bd71e7471925059b13fd32a3376b636012b0b035f84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/af/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/af/firefox-63.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "3c96ed1cb9408d888478fdce554d577930d2d365d10dba7c3fb7ce93db8032df25ccfad1f055ae849dfc63428afb9935dde013ffdc737f364704d4b693d9d751"; + sha512 = "61ce8c74d62b9b2e35d7a46e0b1284ffcc3837247b12e8e5ae0242049631b5c8050b353ea07ecf7a925e237dec111d10fe10c86e49fada11f007db0b3ef3c29d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/an/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/an/firefox-63.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "87038254a3f4a6e200b5de6b6269adc0eca198e9f2739bb810f00fb028f746a989b50b5433fe3577bf63250893b69b45bc7a5184d2a6c050818e86213b1b64be"; + sha512 = "eeb42821c1e94ab24cb4438245aa018d44b84c89afcbbf271e4905929e6908ddc922768868b3c9bb4e6a83ccb266ea6b4f2d82f4a3a35c527130f3bb2aab88cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ar/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ar/firefox-63.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a7f2231f026fa90f53952bb9cc7c36663226c87afc6629466fe1d15e379048bb9e464876b0d8c79382536bed850c2f806c1e8b06fbbbaa1c02551f778767ca89"; + sha512 = "068310cf06b3149b8c54cbc8f56f4334eb1a5b0cab1ba5d7bcb899f507836240528d48c3762af4f37e4d5a9a1eb7bb0a5610d66e0911aba47c3e1ead3a0281b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/as/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/as/firefox-63.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "9a101cbb2d9b689d05b976035e524f2026154508a3c18a9f1e238e600be0924d36573a951ef3a54a28e62311f661008f66ca8438d40e985357e537bfb7b71d33"; + sha512 = "1487c99d76cf37a4a53b6849501670fa8a80c6f7431f6b9503bd493dceb4786697685bb6d3970c4f47b121c8cf83299225112421217a314640ea7027cfc2c0bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ast/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ast/firefox-63.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3305cd08c09726e04ee0d3a3f0228092e596641d1f80e5703c869ce5d3588fb37bec2d80a2db5690e5fee5517c8745f13e9bf723627a03b499e59c7672ce932e"; + sha512 = "cd8205327bcef45ef0610c4c8e5010c6eb3b488401b776186350351f433a3dd3639f9c8c7a2fc26c3a3d578f85f49a1f3525a84b40a473443ca81d8d8823454a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/az/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/az/firefox-63.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "138b35496601a577752dc1362dab7a5c8dc8b3a78b0c252748dbd15b1bb1013e304aff8d8ef1a9f5138e4e26dee74149c7f66eef752fb77ea75a6dfb8d388895"; + sha512 = "0a7f11ea5f476e0a45e70bf8a1c6779ba32b96f81bff2f88c8cfd6ff29b6951456dc9aba4146ff13faaa35481c1fdb26ca944709dbbc72e4c11d9854cfc2476e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/be/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/be/firefox-63.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "7f6608f932f96bd84f57902482b691aca966814f1475bbb0479356c792a16e4698a289f944d7462db71e77552f368df1dad3181280e3d0e07a5261ad90c2bf63"; + sha512 = "8e34c1b191e2d2cae88c94d99dc3d5bf6afd8a658601fb723d1b0f75f3dc7dc85b9f3bb6ecf24bb75e94a411f82c56fc88dd8a548c670351f19fc4137ad77751"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bg/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bg/firefox-63.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c284d6ddc03c3bcaf82756a8f9909e12ca193b9b2a21096f84383c71e1dd5ca7369a4eb6c02876ce741ee38e6418e45fec2ad4936e7c6d48ef270ea45ada462d"; + sha512 = "b7ba0be703e7e52abd61e8e27a25ee7a8868c1872f4babf82b3b1775abfd073c4112f738eb1ff9f341c56a15bbce5d5663895f342618e7b81fea0cfa35f3ae2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-BD/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bn-BD/firefox-63.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "eb9b3e070e6a2882a6b43d2a0fa7792f2b8700df9f64ca70e6f616e6237e0cb15c5d5a642db8f7b236c7cb2f4392dbc553072c544e81e0223c8f4d6d85c36be1"; + sha512 = "ccf789ace9b1e5b378a8e37fa8e1c68e52f70247305e369c536981424f6baa9d8bb132475b4af512780a6b881d5e2090ee985c9fc9481c0a0718b0028b516dd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bn-IN/firefox-63.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "73c4c67bb9f4fbc47509c53820319456c614a74dabe8ba14d05b365a3ba9429d1d9ad9ebbc6d1edc7bf18f4a387ed9dd92850478268f2eea3541929558f14e6e"; + sha512 = "4ca51c703f5a394b149e7c9fec038a84558fc2eab0f8ac7a2b7109e5e73207b94cfa998c9fa8f4d2ac4bec65e7f6ebdee804c5f0801bc815dc5aaa50aeda3db5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/br/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/br/firefox-63.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "78921d68f06c26f029f29fea01a15c5dd54f55f59150e08d38e05f640612355a494f72d88c0e80bbb2ea6f54ec26b3a5716c3249f1118202843c4ab1ef05f891"; + sha512 = "750480cb435134377e0d09a1c0b342e104903bcec9c68ba08827ea20027754f55cde63b0d44bc248800f85f26747f5d5552bffb7f5344bd5848d6fd7d72d0269"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bs/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bs/firefox-63.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "643d5ebb610d3e83a6ed85a3239a8631c150a86925ddfaf5a4adc87d0a8add022a5e35ed20fafe5e6f1a6835b3ec105ae1734cac6552d79d95b83bd34c1e73ce"; + sha512 = "1d8fdd486341c623b46a93d36bce8ce71e92269348f7e344122b9f8908c6db882d79f5d46b2498e3177df73b5344747f809b6938ee5f59f4fee43a3e1b116624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ca/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ca/firefox-63.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ceb8f81f3fde233be921da104d993546b1200ee348b19340f43dc697685b87c80a4377d406dc72080701614896f7b1cdcc27f364a89a92e433639603e08a6611"; + sha512 = "760d086dec533bd4bd98760a9de99557591c9916bfd930de061105bccf97420d2662b9286287f6d92d5d81f37a08bc30fa57874d992592eca0c531faa61f98eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cak/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cak/firefox-63.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "04f5dbdcfcfc2b996a912130335ed855612e5fd2f27bd4cc615a369be2fc2dad14ba43511dfb2bf47a9fde3d28b8b5913cefbbf34b89383eb36bfdcdb96cfb3a"; + sha512 = "e6238a1dd0ce26d80b3237f70ee822bcde3ec9149a55a152f24d4f9a44021044b8e15a2a386f731a4d7b026391fa72f3a28055f1f02dcae11d6feff670581f00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cs/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cs/firefox-63.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "b82cfd9dc6b57e0bd147f508a38bf41bedbf8fd9c6725434fcbdc8871cf6f683898ff0507e0e2fc202077d234096cea252acce56e6faaca738e60512b3b9e1d7"; + sha512 = "e96e451f5ad543bdcc44b87227190716f0e864408a006043dfebb37d6f5d464e08ace9c98c0fb9e51531c7aba364532a2b3147519bf6d521336d6950e4d54078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cy/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cy/firefox-63.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8f9d4ea520c99d3595d8ebfbb8732e1bbb73b7d39ab707e0a3f86d3cb928231e1b7d84c7ef017d9f685a2d2893c0b486f27cd4a704f05cd7518465452010df97"; + sha512 = "0ea943b9b5156f4e814e501c8b7a589d888e1a2f9340f0c064b134d2299e40fc766e5fb8ac89ba82e3c5c586b410af16cc86caeb71285b94efde9e171652f57f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/da/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/da/firefox-63.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "28ad6674fdb830d07837b826ead67503a943b7cb2330655b75ae7bdb5f348458f19af37ab775d820a0f0131a6f7d5dda52bdabdedb5b0deccc1605912e46b9c1"; + sha512 = "6e2b71137d36912e6c4f28907b251a19bcb1f6a3f9d830b6c7b3e90fd28c5d4dfd5f31496ec45728141596b6b37c78b3c29fcf07b85fe0facf1e47c4953edf31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/de/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/de/firefox-63.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "b94ebbfaa81bea44e452d0ae69c3069bf100178c82bc28b3d2841ee14dfb4bc2c55b99d325fa4d8049afad93e674d24160f6bdc235e329e9575b49842c731d5a"; + sha512 = "def2445efecbd7a998cf846c438e85e4b751655d36212b46227aa95483b474a78249e46e5d44beeb8a2ceb4baaf1e0ea84cb742993941fa2ec0f90f13f11f098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/dsb/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/dsb/firefox-63.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c292abb164b948ba76b13548c44fb41033ec9d394b3d3d710dadb72f666c56d16fa7d72dc5c3aa4543b81ccfd2ff76bd5e94cefaf88f537bfa7c8b16b9290f71"; + sha512 = "3cf731e4247dfc99ac7eaf85001b70413447a5409518a8aa7791e8affe85efa703c607ee9b2c3896b1ab3c640e0d80610bcca3600b057c8d0c09cedcc9e3b93e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/el/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/el/firefox-63.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "35e01baea98785db080f801b911023c6ef3d5bc6c61d8e3a5e8ea1ecf7e51153e4f2646db7a8fd32dd1f778e1804cd2065efc28e8d79e8475105d9f12c9b0a7a"; + sha512 = "8ac061359a5806661eabe8c5e22c30ce795b0e019abf6f2d6b673d37b2842887525a4ced40b6aecc6fb2f02ec841d309866fe638f105ffef8576af5d3fc6cb9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-CA/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-CA/firefox-63.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "ccf68a4f05f4c5b0dbaec25c69fe66eb9d1c23f3ad21e6fa2be14704fd5227fbfbac8d46dbd036a6e17f0e94b58a4fecbe91520da45d56a2901074bcd7031516"; + sha512 = "9d62cfe7f055db10bdb8dd152d6dbbc40ce12b9ef4fe59086fe9818f87d95c9ea79092d25d3bf8a34cf2977b28a505f3ded4406a864d493a6f4bf2d625bf124e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-GB/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-GB/firefox-63.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "49eda2efa176054adc5579ec26a9da92df9903c16d989d761b8b566568740b135f851e5c2b983512b644e80074171895431b3c1689708dda9d86c757dd7d2599"; + sha512 = "ce98acdad497391f8872ee0c41d2fed73a51c0d52e8e812aa7a426684bc0f39103f95cbda3bde1006aeb95d8662275211efd32cfe82609a344178089153db2bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-US/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-US/firefox-63.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "08e3ca5f859a531b2895a5442734112de9c450bc8bdc2eea9a8fe3231f3b97b8a243cfb408311c56c1703dce63fc2f5201026719fa01b9c76061a204d59942d4"; + sha512 = "06d5c79c57ac5b46cbd452a3a095ff0b87ed9a4cdfdb02d73d90947c29a8ab4c34f2bfc3f537a0dc2e60c83350531aae07f58d1808a08bd57a79bf2881144ee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-ZA/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-ZA/firefox-63.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "7629e33144c955d015a17bbed4d1e570ae74045511c6ea1db9131b711ac58c67e76748e22ecfaee5b594651f7c736cb0d6d87697ba9dca46705e5328bdfbdb2f"; + sha512 = "a162dc2aaa5f2036849bd73bf0014f073235c853b3fab0e3571c08a85f6fefcbd9a7d3c033d5515126e72eb1cb54ad9f68241201ca9bbc786253f0c84f6e3590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eo/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/eo/firefox-63.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "13430d5a4462e8e00467f0d39d2ad03ac684e0cdebb21901cd0ee4f2411794794cf5024ec51d915e3917660de6077d6dfc08aef30fe6c342f5b8588f07883f33"; + sha512 = "1639bf250506d4dc4aff272ab0517c76eff75cc3fb4e8e9fadd2028f877e204d0bf19e3eccd7107fe448f1372e3f6dd19c99ad2f8aa1891b1c3b2dbb4b8c34ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-AR/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-AR/firefox-63.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "44ca9daf57afbf9dccbb158712e9218d87db4254855838604250b8a4254fed7adadc266e3e1fd49d23b34ba0176dfe5f25fca42dd5fd6d1c322c857337de35b9"; + sha512 = "b9afb2474208530ca83b4d8bbd59176f02558d21143227f695a8705a70b16e6089d86316105deff2c89b857fd14a5c5bbd6c057aa9b66e9ebaaaff763321a86a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-CL/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-CL/firefox-63.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "09e43c14a99c54ae123364ceea46ba7b1b38e30da8d15bdb734b873a63e37b6b4292edb6f8ec4ee731e97bd12194ea76ec35e710d29ebbdfcf7fb41b1997934e"; + sha512 = "134eefbb975dc1ad3f98cf340b0c544f084bd2a1bd1432594bf228e0a23e402461e936e777ee3fe0c9a86bfc59947c35f6c6d7cd74deaf6cdbf1224c9fbdf4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-ES/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-ES/firefox-63.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "cc1f5b4e421813c9b044c50f66a28f9204196f9ba2574ae537dc3040d04ffb6eafcdca971536387cf2d79c4c35de5ae3a5335f4796aed878aa5ba817dd7bb308"; + sha512 = "66fac925408ea40d3348f207716e732f878bf5bf5837499a9a27a9b1e8e4a9210c3400fe90faf2807aa30d49f67dae2324e7b41d80a21daeb531e907bbdb35b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-MX/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-MX/firefox-63.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "5ca49c92ea11127ed80fc48c5699ef541287bb6f53ea7ac96df990e7a82854cf8bfa8c61f21d0bea2fa245a3b0ded7aa7b3afb662b1639c421525900f8e7d688"; + sha512 = "e1dd051782b59f9b2601b051459e4f23bbf949b0d257dd70cd8bd171429f661274f3b7bd5d8d16a5daacf5a08a488db85b462c667c3c3ce0ea280648c5b2820c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/et/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/et/firefox-63.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "074986b9e80ccf1dea362bc7a28f7e44d2fcb9c19878a8456e63b64bb1e0abad293b6dceb6672bae200cff1aac1c774cc99faeb7ce52d7e6a4b3a154dccdf4ab"; + sha512 = "9b46809e42acaa8dbbcdce1df8f7471d20cf40b0a84384edafaad1a0afd17a1f2385c6d41d7eb5b472205e80c528e3408282ba0d81cd19b8d92c7f0550c4a5a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eu/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/eu/firefox-63.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b823fa6c5aeced11c6e0878e11cba561a18893e531c28e9d7713e449905225ce8aed35e1240876976c4335e958e6a68d5e39037fdc59e9f0e900d5d822236c89"; + sha512 = "790dcd461764cad902cba93054c35539d2aeb30bb5fd3a6f940ae125368944e20fdbdba9899f3b52b6774fd27fe73a13c0eed7e269b20a7b73dc4fa123122a1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fa/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fa/firefox-63.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "e842e26e5095f008fee36f7b84a9932cc9ab868e9145d92f8069d2f7f24017ecf538db7d0525f7233bc7cae8a2709fa2da8bade077e864cc05c1813ba4a1ff57"; + sha512 = "4e0608da711a17faa10b5a043192b52e6d88360752d9c388e173bbee3de86bddf9693dfc75cba7ac42153e95a8056c6d0ba48141cde476b524d1fadfe3a3bc10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ff/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ff/firefox-63.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "0eb63c6a996dd29ade92ce88f2f9065da63737cea459d8b2e7c79356b51b43eddcb639af9efa85476f500885a249b77347964982ac297cb22adc501590dbb8f5"; + sha512 = "1f50eae02bed18b0230c824c9768b13e2ede4c622e42120f6cc684f7cdfae4753eb31f867cfb272710b2fb2ad9e649a99d2187eeefa74a5afc1999e002b6cfaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fi/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fi/firefox-63.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "db4da21885411214805a45bf4279776144c3270845a6dba20da95a54ddc5cf3205132ce2762ee997895b7a6f83e2f31cc618c17668df4d4211646a1e3b24edf6"; + sha512 = "5f089861d3a67b754e5ddad49858789d6d6ee309507baf9ff5198e011c26f970cef54ed37398458a3729beebfe9451fb16981ef32607cf1635cc40b7556a7f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fr/firefox-63.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "12f3fbcd0f085f4547a4406b25d83858425a4653ea9bb2bd5700e21687c2d2ec8e1a032f76a242edd72be99813cabea3332c18921f16c54edd8c430a017e4948"; + sha512 = "5f8963809cc8cc33dfce49b2ce7e44c8351d8a3d193766eea99c668533abdea89d53233ced42c9a8d57356195a3f31f549a486a42f9f06c8ee6d32720856ab1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fy-NL/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fy-NL/firefox-63.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "033bc2ffed09faa76e67258bed77597bdebbe20eb0a8c17765c7f3261e9abb7cec558aeb8dc913344e4d0179b85928ad49c71979eb6f20c6a092fb7d68b9b8a6"; + sha512 = "50e1a6c68daa2d330ce9f8b070413e100bfc29f7a0f1a7794c58473de04961ff62f776e2c343452ed6ddc3cb309f615ebdada91e4d259e60f066398068141e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ga-IE/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ga-IE/firefox-63.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "5481287ee60e87e9f71baebe196254f30f6fd793be8b07e4c216bbb9af3d81c321f0cdf77d4459ef6e50c3fbcd7ea6929eaff38bdda2f8ec18acaf44495f7b9f"; + sha512 = "42b2b796a5ab27137e5207ead28daec4d9a0a0fdd58336064c30a56f13a4389d49188c91b6d2101d49550b071584ebefb81d1c3fcc3d9948e2b14f00a7c0feb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gd/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gd/firefox-63.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "5ab61163854e8255e8cfef5ed8674f6de79cd084839c65b5e2758530135acea5dc159f7001f3ee26f9bbc6d931bf1fd0fbe360a3a570add9560493a8b7e18629"; + sha512 = "794193059ee643092981491b0c32886e77be4faef7948c5db2b79a76e3ad4baf30dc149cc63d935a9210c02ccaa843521398e9274dacfa6f98ef4f49caf65c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gl/firefox-63.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "ce59c0e9cef75ad9b762d9d8c31f5c3606c047736ef20fca91a12376ee15bd67a46016d0d84da7303af61e78f1ebb6be0d99f343dd2cced01cdbcac536b0fb87"; + sha512 = "3a494f60eefef37ad8b62b30d1e32ce9e783bbea29e594668839bceb416d6cc16786a95f9cba06f31b027b4bd40528738ad26c955adac3a433ac083e49642b90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gn/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gn/firefox-63.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "c73b5e5b2ea49fc13f2acf0397d0f98d0178f25ee2ee303fc0647ee4f939eaa465d329affb2e3a41eb6a0d46f413918b01cb7e01b3776f42712d81472e1cb325"; + sha512 = "ddc555b5f0aeefd9fd435442a457c7c37d4bf4e338b16bf10e1f1798735c52a758b30beab270f03d425dae187bf9d83f828afee627c7d0eb3dc7615bf22f684d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gu-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gu-IN/firefox-63.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "3a98d619ddfaaa94d0696d05b940d82d12c6696c98dc4356190a6c6a45a602abe14e84888a2282f6b685f26d8954e3efbbd0778b594ac63ed629e922d91549dd"; + sha512 = "a3b67578d9ab00920489d088d59f3ff1845319d9b4467ae3854ad9b08df72a07be94f2436f93db7524bed13a467ed0acf1d271dd6faa86ba9ce74535aee3d35d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/he/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/he/firefox-63.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9e5fd865c107b2b9daf9ebac3ffc1d0c41b35e5d2b10c930e2cbb1da4aabe1040d4c522940b63e42c2cb2dc0923b851dd6a8ad9fd65da73026d9bf2d44dcd238"; + sha512 = "a6da54477d9a4ba632ab0c077904ead3f83c1e268781ca2bd8fbeecf15da62a3d1393c8cf316716c3c22f7c949a48e2cc7e90bf6d394b5dbf5559cb8c92c8097"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hi-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hi-IN/firefox-63.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "0d625b2ba90172d4e42e17ed7daf1b030ddbaa4327f9d321c67beb0c71e20572705bc54b9ac709fce67384dc6d188fb6832ff7d6e85c79acba8c975cf06455c2"; + sha512 = "708c9f75ff02efca7cbc7a2483aba15cbe1b22fcc5d4a743633d027afcb22a0ca5778fa05ce40786279a1d145f75c4b9bb64a16bdcad87c9f6f6a439ff748fd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hr/firefox-63.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "317c6fe9bb37418cfa8fe2d48d5afde58a3e5c192d2feef515865ad4669d65010ff5ca0f82efe22003f9ca763cb132798e1c86216f3ef2875178d367b894d651"; + sha512 = "6cc028e94748d9133887398299e21f70abffa4df216ab629eb579270be8c5ff9b600fbc2094b9d47ec60c577a2158ef3d3e81d63492954260d4b53bc19868769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hsb/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hsb/firefox-63.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "298dd184b47db389e1b40872dec2c40814c063ef6eda8582fa6fbef647b6f91e11d49026806aa7b5f735ddd02dd48128adf8c5f9bfe17f4b9bc9e6c01ceb302c"; + sha512 = "81e8f54353a6279041694ff9e95eeb730d3ccf7438cf0b1c4c45425144b3f9e655656b9ac912405f85b9206ddd37ea31bcd6e975b25a14b179849a33368c0693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hu/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hu/firefox-63.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "53df50c2e877dab2bf1d7ee40312f77bfac977ba3a041f98c350c1b9d188b539d409f460134f0e79d07c6a3d53fe063e53b1451fd84e7a817b98d6f5b2564717"; + sha512 = "cbdc13d964387f0a5add945cb5f5f71fe2d4c6da9d37f77883074a5ffb22121c293e7c665580bea27a43d98547e2459c7d42cec60af80f44b0d5650b3b6d9042"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hy-AM/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hy-AM/firefox-63.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "eec4295b544ccf4ddd46176e3b391b42c04d2ebba73edbde24a6cd0043c31d5f06e7a1e6cb03d7ed02327a07f2aaecce7d8c55f09156f413ae3e8f2c18f08649"; + sha512 = "16aa31cd906a9dcc41cdee45e00df6fbffd1fc83fe9fe5a7c10e0b6007f3ab542bfe328b456f8ec68283a6633d63457ce61dde4661283e75917a0198b38c1a72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ia/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ia/firefox-63.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "b9bafd5b616722d5e0b19abe9e2080ede9c0e3d2e971cc1c00f0e3d2678489e5e4268837341fa7eed34e2076c69880e7ec726814729ede4731fc1336f4b5269f"; + sha512 = "f622f1a1c95bff1b68beb21398fc22e88e05350a2ca1d6d0c018db4d30962f1b5ee4bcc0b9fee7484b02bf06326596f702a1a9e5b0acad5e0fdb73be1c1dab45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/id/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/id/firefox-63.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "07a271e3c9b479018de9184b32bb5a164d3ac2ce5431bf714f3b53ff7bf5c324e6e9413b514748b6ef84e2e57b66145ae775b5116e88d1b695f5c9dd001ad530"; + sha512 = "9d44617bac45ccfc191ee02a3c6f994734c9a1bbd5f6cb160808361522430a57798493a33b774eeb331846c99ac09b46788e06abfc716a0a634324b2992085ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/is/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/is/firefox-63.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "f101472751e16e29c2928e3d19acd25afeca20abf7f943be14297e6e03762f67edab1ba59db5e22b8ffeac398208083f91ad97772905fe3436e7daac6d554fcf"; + sha512 = "6c64320f40b41fc0ba93b94302d83cfdeaa90992681a5ef810399b35fb1f1d40406b2ed80148cecbf6603bd9dc1298dc6b3b334b98a13ffcbdc0b2e19615051f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/it/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/it/firefox-63.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "dfa7a5f9cc4c53f392d061b8bc9491dc541deecb6ef5bc7386a2bda353a8980dfbbccbd16b5a2c167cd523b4f52a9993403bd44ab05b38e03b9b0308a61da261"; + sha512 = "deaf12ee7fa25a650116dc21b2507df41ed0535821f43cf7e469d870154f4e0d9d66ade3ed3463742e1c5b28d4526f4cccecba4f3995178ad7f6b82d29ea0e88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ja/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ja/firefox-63.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "b84f5317b7917be27d1d93d39b0b3ce0143396642d3f5c2a41a656f16074b31aaa549690bfba0675b3ec8cc2ada383929745ed2823ae6afa399bb7407557ca24"; + sha512 = "e4c1a5724c77bd99d9d10bff3f9e011f35bc130aa711e629df458e7ee46a3bdf1fcfb4bdeba4852bd0dda773b8327bb3ddeba2115406517c77d0f4d224267af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ka/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ka/firefox-63.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "5d56a8f8cfa5132c3cd5cc3c1bbc56cf3c076eabbf21f98747c493c3b64076c8506150262ad65cb62880e31cc37ad7a9ab5728094a8d8e1f704fcea145c3a049"; + sha512 = "1040735b4e1f6616ac9b2676b7007435c7423116e5fdcf8a0a9b472c5cb0c17c089dda5d711fa10129d6bb1c84082602adf20161f5d6d560fbfa12f6225635c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kab/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kab/firefox-63.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "d86d69559d9e7eec6bb111fe05ffb380ba49c2f47a957e6eac8470f81213a544ca44ae685456e22644b08958c54ffe5f815b0812bd045514d1f70a08a5fe9790"; + sha512 = "511ccb5a8745fb1b93fdd49ec9369498b577a155fe5134b9990e6740505f342e76b0da136cb3ebfd2a15921b677be7cab6099cdc8cdea9d6040b989cb12672db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kk/firefox-63.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0cab56f34acb5df1b9a83c48f1a1d2f41c68e79c7896ee4da8ba11bd44e3477214e59697c9e9efec802f633171177ed2653e3184c000d145b7d73089a33930d5"; + sha512 = "1e5d5aec9db2fc36a56acd1d9e723659c3425ab4f048966f0550eb1723ffa27b0b91acf8daf8cac9bd6f9929a5fd880edbb4ec1aa4359282f4d4c4532bd6636d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/km/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/km/firefox-63.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4fe39d6a89138111c2e98d1f449adaf474d3011a966c4e17627f9793d599eeef04cc1081c6cac85df235d8854db6b57de1548834abcf3a96baabb30c797e9073"; + sha512 = "76063e3d83454f4850849af7084d9489baf4d354001277a9f606a28db089e589147033c132320b34c59032b2dfc7611ee52786c960bd280b5426781a0a0b7be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kn/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kn/firefox-63.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "563dca7d5874717937747a1771a9ff32d2012205e2da9274f4cff76ae29782d92d7a20eec8c792564d3a4929458cc5c2722fa38d8b08edcc879dc9ea184c67b4"; + sha512 = "14fdec60154ffe181f00808f8877de3b045c72b91b0a6c017951033eae786ee26e4f96555034b8161318edafb8ff07ac41203a9bce91ddc20215be87571c5e11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ko/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ko/firefox-63.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "69d10aa7d2b91197bb9062ea5bcf1b89e08cd474003e4d9c203f9f4c7df14dac5b991a15c74fad38843d2534ecc5b08878536ca45c2b80e83ec4c8f6168c5acb"; + sha512 = "7990af9dc0df8f9fae35d928ee5b476dde1e12db6294f5a3033d37e73e44fb8d0bcbf7916f79459dcc6c8f05ef065ff4b0dea95bc2c342ae81f2161fd61b2fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lij/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lij/firefox-63.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "01bb7b7bea7e528e2fb4ad910e591642539e68a8a3771be2b2d28c3f1b54e95d74394f3d9411d8ae9bd13f991ac4dc788e98cbc8532a552fd70e83b6b3cae38b"; + sha512 = "42faccbb1029df56f17b94c7a5d9e6f6d5fcd7c5e6b623a6fe8f89f143c909961dba135e02d0ade1bd57399bed1279a61ae16381402ca391aeb55761428f97dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lt/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lt/firefox-63.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "0bb6582347ccdf31dee98a09577380f7a66e8b3222127fb222000d64cb09c4d0ab19d4084d98be2b47ecccfaed51793c1b4fa263634f61eed059da27da0e42bb"; + sha512 = "b4079f36c1a4788f8da2a4e1efd0ab4bb166ec45dcda1ff0077746a85ed5d34b8cd498a0f1d12463349d4fcfae820db39946caf7e55f4ae9ff1c9ec587a95fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lv/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lv/firefox-63.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "3357a5fdf0e41b88e13c24c37243bb8bcefe75134df4944f286364d4f926efb9188e66a91ead78c7d9228275b394a8375ff9f24ac83489c987b42e34132d9224"; + sha512 = "5a8eeb1274c30e57f7ecaf307e23eddaabbd7272128063ece88f480c7a8bdf96efbf8d2db2416e0232773457b10474a531ace2eac264175e590050662c8d606b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mai/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mai/firefox-63.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "172783f25dacda040e65ac980d6f3d33125cb6721c2c3568255a27f494e6d80beae3d61783171448caaca89358735a4c3b64dd9be47ca5c904d5727a3e0ab419"; + sha512 = "b2ff3a58ff0216df0d980c941648e143a3dea87e1c90c4ef1367a3a75d5052b1c1e54b07476602a91adb691bca2fe4e9b70d89895773b3a021944257b0429518"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mk/firefox-63.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8f3b31e48b1b423df1cdca1c240db88978f8d03a7409727842339096f5c1c6099e87c2fe1d6a122a6874c080b61ae59bcba1303479d80b944b4cc8d938eb7a00"; + sha512 = "4ee9b4744ed73d866d6d2e73d0a9aae983d063af3fb4e313e8c6a2fec055b10bb1d414cbf87c0909119f1f804cd64eacb981b5c17ecc87e29ab246d736b6f9df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ml/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ml/firefox-63.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "dec1bae8329c9f8498fa9d95547abb2c2ec737df03b63ab44600b5132fe6037454070ab3bdb2ec0be1de48bb97c014d985fdc8530b97803c4202793a14e5e6d7"; + sha512 = "9bdd87f047491ba138796e48e46dd4fefbccac03adb4d652978d51b933327f007ca89d41929c075dc61353584cfb5a3fbd94986ca791750117b55a4ed65b7994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mr/firefox-63.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "1e876518b8c73eea6aa4f51384e6ba9d7dfa983e7ea878bbc26becc248e2badd4647f3a44d273e33a742e5b6f99ed5ad364d621eff314c830612e0971ff268cb"; + sha512 = "7680c9af0d556599120b3d8a2883a4bfb9bd0dca47a2d2b3dec669fe2852de39c134cfaec0f53082b269245a28588bc699250d438668264c778c7cbf3037a50f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ms/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ms/firefox-63.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "3c72bd0536ada586d31d02cb0b59184889a064d09cf30f73bcb93417064fc6e7905fe084c554d249d0a29cc6ef6c57dfddde7d97d658c14958861397455f267f"; + sha512 = "ae78016ae552d10f4220e68259b464097464081cc2b3c114648a6e36e4381df7e9333f7c13c08e0346bdaaaaaadbbc9a111dea55cb6b4daafef29ff0b0db5afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/my/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/my/firefox-63.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "1118b4d8caf8dc2b4a4aa6ee01805bef409e9238e38182ad8561bd8cd1885c22e2462b7baa00355aadbd103279ac0aa008299beca0157356f49773040916c3bf"; + sha512 = "e682f1e998a946053672d61f880a75472d692ea9f7232df9e2a51c6b3d27f7d5496138144dc17a56cd07378b20bde48450a27157782e9ff0463ce922c08c6e3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nb-NO/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nb-NO/firefox-63.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b0243d6642d51e9a81d58951e9251cf586080a7c90849adefef1678c856a34c0cac710752efa4f3cf1f9d099461968d0a15327d9610bf1792e451bfb38296c56"; + sha512 = "b6b68de70089bc3f02741de04138922b3a4b6ea760d5b43c00bc636a3f60fdc510886e76b989facbc4db23e72e0659db9ed38705c8c56851ef9cb9209524d58a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ne-NP/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ne-NP/firefox-63.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "668498eb589927f92fc53806111c47b7b130d08c53c8a3d997edab4efe52ac7aa1388dedaf976fe46cc45603249b99922b803f32b5306888df194bf4d6547aa9"; + sha512 = "057ba9953a8ff6824567de1d3629b7d995924a7da49f9b03e1b5e872cafe750dfafe05a74b72cc360c932237445712bddb646cad2a961523d29a8b5327ca3bc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nl/firefox-63.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c6db81626bfb20724faadc34e113eba0cc3da7e251d1ea9e859ea4b1c82e2d8ecdc01ae3b60c12eab5b071e62c3cfb85a28cddb43573a9da39d3a07cbe78b7ac"; + sha512 = "abfa808668e527940d7f344522650cccb4272555b67e4d90398faeb7aa31766002287c5e73f259b2ebeafdba890b0ca9940fe0bd12926f8b748ce172ff786abd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nn-NO/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nn-NO/firefox-63.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "dcac12899163fac3d191104542f1d834a2406388f69faa78b871106408772a0cf01f73caf267cda6731e557cb872c341d6ddcaa1be9c972007e7a3cd9c0781a4"; + sha512 = "e5048346227c41b20534e71042a911a74348e403283ecbcd3a90f1ecf3154907e0c7c21eb26b67f2ba09a6e8d04200c990f7a4babe4ea5782a847a31a6a880ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/oc/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/oc/firefox-63.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1318631847b588dcf4662a3a82a80fb8bd1eac1fe1e78cd4bb5b1bb8990bc7c2adceef1dc057df1ff54cfb195a05612fc5957ddf22bf8355341d6744e1938df6"; + sha512 = "ec1f24de15020cd6a16d95d47db8e2e73d1b3aa269e27d30421c15e3d71b57625c10e7c20427fb1fcf2ca7b2e1aeb0f16b254c1107aee28c2e8522fb535d4a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/or/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/or/firefox-63.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "6d9a2af2ab431eaa6205958239e33d336f11ff789ee2cd62b90533153ce41b9e17ce3c8204d679c8949c1edbbf493efbc96d009b463e5ac96b3200ab8ab7d707"; + sha512 = "c55f10e0a9a3cd3403eb9167139b4c6f0e8a5f66e3f33b12efb40bb6b2bbb7d1dc2aa365b1ab375f41da34e7d21d2848223934ffd2ab61fa93220bccbe9fc720"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pa-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pa-IN/firefox-63.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e7a0b4ff68c428d0028eb098dc0f1da82e14de691ae77d2d94e32465ef50c8af70dc9abe21f92db4606ce4a42d443b181e11bf2157363faad874b07f9c0e0110"; + sha512 = "f74dd4d54680d94ea270bb7755f6ea4fe058899cea2472c08ebe5f34b8323be7157b060abc83ec80aef8f2ca63f3c806a7a4d831a4e72025ad25d4ca40783cd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pl/firefox-63.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "780886f9fa3136ea6d3981e2b63124e3c625acc971c144978840e254e1fb77da5e65fbc7b6b7edc6a363e5f24fbb09bfe16bcd89d3171e6e92efe18a58946e54"; + sha512 = "05c82b2e08f65e37d4e82fd93d3d2ebe6a5d5441ab11069cbc66b18af0ed93e877466daf1d804c53ac3c712307aea475c99f922b5064cb551d136e5378e23765"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-BR/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pt-BR/firefox-63.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d922b1294bb2aea2019034e7af38b9f01cc7aac316a223ddc54137219f01fa1a6d34b23830d82dc9ce816024532cf0535d2753a55b36e952da1f867e487924d2"; + sha512 = "c8f2d36ada67a2fa7717527355a0e083ca5891ece1de70505efeac51dad5f6985666e2be0bdf23ad0f4402d6ee96fa2e12af50369297a3e46b9804cb0b830c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-PT/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pt-PT/firefox-63.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "86760623c1aa85efb05fe66929f1668fc6c7b2f631b77c9c93d1b12a23c6409345caebc25a70a6891f480dff2112966f283e3658e08951a49bac700de754c975"; + sha512 = "5e4478ab220636c747ce9c5564a1b71554b1c67999722bc55204f747d0ad430eb2a0b71336997e80ca391d7680ebf92c66ea7ef4d25dc568f8c6860cd31ee26b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/rm/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/rm/firefox-63.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b66f542b8ce0e878fb9ad599233adc136a20e09f1b77a82050273e16903b56b6f3f8f94a33fdc7a2a1ff0eae94d20cccd4ec6ade8c2ddaabad3c32547303d5ee"; + sha512 = "67438f3cb1a89a0258890448de6d16be5f79291d4c0989691d9c8f38966a7a4ba2f8eaccb26ee4458a81a733ae9513555a22f8b57652b4fce1eb1e3ab2368848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ro/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ro/firefox-63.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "393fdf5d1ffe51694b50f5027243d19c2f1d5d25daf9ad88f14f21ce3bc3e0d5bece8cce2f3192d263e873a8e55e1fdd6ec22ce014c43c71ae9fe9833a7b0df9"; + sha512 = "3cdc7f593af3bbd858285237a9ffaa07aa76cbfc67c0f7d22d5cf261a19756ba3aa8971d54a10b820344beb509810b601faf0cc89c86636bc60ea1a6d8421873"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ru/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ru/firefox-63.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "a1af73215c8e3151e45e8a0a7b1c4eee51301065b3a724f904005f41101018eb11313319c1b8206432c4958d5a415575baebc64ff782b4e3b993b71d4a66e829"; + sha512 = "7b6b03cca2fe3887d7ee86eeb8ee699157a6cd828108737e26724a48af72cf3fe326024f41c6afc13f7e332c262a4e991728ad5d46ac6fb6942c5c3b4ea93a9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/si/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/si/firefox-63.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ee3a7b6b1e9a5b10661390b7f1d1fa61ef9589d59e4f869ef8ff6c4a1719fb15014e2abcd8472769c4a17b3f74ab7ae2671f3f79ad94a1d3d875f2fbdd03eb8b"; + sha512 = "10f9fe43304931dbce1d0073ec4e827f369291b3705b322a3f3ba8f7002a974c019be8f5a594d8c88add527667d9295a27e85f2b1072e16ef1720e9e433111b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sk/firefox-63.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "478eefc7afb725496e3a17615c8458d29e44dc200dfb4534c32cd15d3c45ec15ddf9f5b1fcaad312e00d693a06d9bcd116038177d9844273a64f81b531b6e676"; + sha512 = "6b90fd21c51d48ca997ad47025aef3a4280e30152a0f18d0ab8948e055b80e5aa7cf1374b2eeeb1432d8892fb07de505adb9ae6c57e776ced4c429859577f040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sl/firefox-63.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f07fae5f52528899ef3dc680ecc551311496125d9c10c2117e35d0ac8af387d99236ac9a3f921a9ad2e40102d70df91fcb43526ccb8910d5ded1379a42bf5914"; + sha512 = "55faeb2d5310266395a442d0d9ce4a1020197d0ce7655caa8d00efd022db9e1c9926b7418f4cfa380d04e1971ed47e7025d434a36ca0fe6f58f02be7f0e26a69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/son/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/son/firefox-63.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "f20dbcdea88828cdaa4d9bc2e8ffd2792e06929495b0268814808f842c1bb9ccd87f86df16b005af989edd3c470d53ef6254288664ea192d15620ed10ef2682d"; + sha512 = "63f104da43ff4103b40e271de6c962fae3d77891f50fe5b39698d3c2e382b4234dad41a3a64794015ad88d34a7e2b819c0ecb62b1bb44a4d8e83eadbc1803151"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sq/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sq/firefox-63.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "9a548ee02d1290c112ac3a72be6cf96163cb67448a8a5ae00a88e3e115f907945899cfb5a5edbf3e37a13c16550ebe7b6f67f94c05be6659c168a5e0043adc04"; + sha512 = "534ce38e5dec85de50e9dd541f6d8445e95fdfac074a51866c993e97d020b9a310abebffa2162fc513572d202f9fec8e3a267207bf9c401b27c8541534ee2aaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sr/firefox-63.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ff081635cf761293ca77ce7d3574e0a1b6a57d7dfd5649089e9554c27b85de544a39b2973205e293152a33d69137ae373110a884f6427dd58788c5832caa7773"; + sha512 = "1174da8c998cdd62370bb8c80c6a47360cdcc84144b03ab33f10367b5622ecf6ff3058e4f525e46ddb523f13e29b6fe557b7442dfec92956b34eaf507bd5f8c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sv-SE/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sv-SE/firefox-63.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "28686a08fc1c4cc63a084cbfa094e6f1b8ace446a5746f3892ea37d1b916806a15641875ef08c850c316059078a116a2060294f754e722d84d1fdc2817ed7618"; + sha512 = "7c24f0d4552ca7bc3076b9b0485c757e0547713a58d09cd568e506e37dd6133c5c7a7ad3edcffdd387cc0c5661d3602f4252d778174bf78812788ad1daa9384a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ta/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ta/firefox-63.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "43b3db7262fc43b19f66cc586af56a404b6b0feaa98d31b53766deaa8d4f5314279dd6aaee5e3373f8c1bb9f4c152e2ae6d7aa5b9e4b1123a5dec7b42c6b68ae"; + sha512 = "4387b1cfd77da777a3257e714b014c686ad8c5ff1edb7ba0e2d01f62621eaec92766ccc3bbeb93be45c0b414b9b31676692e75b366a7ed0fb8e0526f95126807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/te/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/te/firefox-63.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "05936a5de6d723edf72c1155aa0f18c9a6eb5275dac4f4de58fe93cfd9a814e7ef349fa6c630d043d6b39ca5dab6fe5f3c92c45c36d5b515b4748bff6493063f"; + sha512 = "8ad96e47cfc1066d27560a5ad26659dba098724374605520198d580867be3bcc05a63120865745055ef00163b8c7cb97ac35f18bfcdc3d171e7eed6a05f50855"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/th/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/th/firefox-63.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "5ececcf6b3404f1010b48956bb2423907261f7d544a695e775900e1a3cbc09e71b008b94118ee39651ff6469cf8c456afc5ab9c9fdf0b9fa4a9c41f76e16788b"; + sha512 = "74272739144c6ae69dba8229420894b10e0dd9d75ae386f1221b17f8e54baf8c3d921591c5707ab5d8847deedad2daa3061fff03add11a2e450fdf691dd49f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/tr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/tr/firefox-63.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "29cc67dc15acf77589fe72d0e28591b5f4403de5cdfc6cfa7cd9f16ccf7315ed19c2d38872b5c76c1f4a78b2688e9401417b6e6ccba1985c27becb54baba4d22"; + sha512 = "0cddf14cd7a7cd4594ca04d1416b3ab32db42a287e62b68197fe8e08078999028e47074e563302c77e480d02563932d20ceffdd89c53b53c79221f3cc309e802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/uk/firefox-63.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "e7814a55b835051c8d02b74e4343739241ea60d69b8060a496f60b6b323b81d8628541d346281e0080d83d9ef4183640c907c144743d3d444499c887c34709ef"; + sha512 = "17e3d498e900ddfc4b00e3ea99b7b2f55c0252e88eede45b47b020293131d6adf5642c1bf94c39bba5b9042e2f9e20ba5399e6717e6965e65d90c4717a236832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ur/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ur/firefox-63.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e6323528d7a916473a62edd9565ed8d67832e3298fba51c7aca32f9d0c2d401ac74d2df5770962e191f7fc79fbbe6f22ae242475075423a23f09c8f11c26afa9"; + sha512 = "cef0ade8282d3360e27d51b4c5487882ae8dc78c598b4150cd3053cc442843cd58f5c362ed6c5ea8362517633dfbb2751a894c6cbc45bac796c181f32f095dc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uz/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/uz/firefox-63.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "759e63deb63e59166d137e109f81ecd57a314aa045eb97a54ae82fe04a418bc3ac73c83bb663d65fc1b66233ed49e43ba7ba5a8db1bce5138fc6b65b7377b230"; + sha512 = "e8dc2b26f35f5ddbc93e4891d7b9b4dfd932ba6c7d1da19a6bec1f5c259f78c1c3105d9f2c89cd97c91f4032489f95a339ba5a22dc4daf3c948a968bf580d4bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/vi/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/vi/firefox-63.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "cdd1e2fb71043fa628bc9653a1be4c7a4d64779383b25d2b1812ea7af2eea3711cc2777c09be1acaf2fcba9c931cd212c99bde69d067d331a294825b89c2addb"; + sha512 = "6dc0945c634052824326cfe8558d1eddb192dbb4eca9eac458b8cfb3680cb1cf5537dd8ff4237ed32264d730e95287d9504fd0b1528fa33907dc1a2b4558ea61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xh/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/xh/firefox-63.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "97eb405cc8379cd803af5db55166b9db1e489c5a0e29fc316cdeeb49e2c2beca2ba87f7f01e9117dd22639d0cbfddc26ca90aa4187a522462a1b42126bee89a7"; + sha512 = "3792ce77db9de5080437b2aad6537f00963593ff98cdd47a145ffef8243a5ea23e8cd42f82e217885601b04df4c17d833aa88b9d15cad7a6840978af3a756b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-CN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/zh-CN/firefox-63.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7559ae148ce548d2b766be291667e7f04d9c28bca0de467cb36f37772736d2f44cb3724e0bf0c95bdd11ac2a84ab07238e14902d6f8f23280796505cf5b9e471"; + sha512 = "8043f8900ef35f85cb05f2092829899d119e079210dcb8bd9d369c7d73ff901e80afc4eecb25421058b65e5e267f7cf671c62cdec5849c2ff0da104f4ec12ad2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-TW/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/zh-TW/firefox-63.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "95829dba29e96497f047e2f03a4bcbe36d61c0a36637087e56300f889f9b191c7b6c4ce936604283145f4a8be8ee4b129fefdeba7efd201cd0a647a0016ebde1"; + sha512 = "614b7835c82f80dd27c841023aca6aa8580bdadac8241f08fc053fe7657f069d6337e3edbe0bebcc4018d47f3d9f2d328176add89aacd9847393ebd21f3e9230"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index b72e3703ef7..16c9b548325 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -10,6 +10,7 @@ , hunspell, libevent, libstartup_notification, libvpx , icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages +, rust-cbindgen, nodejs , debugBuild ? false ### optionals @@ -111,7 +112,6 @@ stdenv.mkDerivation rec { "-I${glib.dev}/include/gio-unix-2.0" ] ++ lib.optionals (!isTorBrowserLike) [ - "-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss" ] ++ lib.optional stdenv.isDarwin [ @@ -121,12 +121,15 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0 + '' + lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) '' + substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' ''; nativeBuildInputs = [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] + ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] ++ extraNativeBuildInputs; preConfigure = '' diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index bd42cf2d9d0..826956eb564 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -26,10 +26,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "62.0.3"; + ffversion = "63.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0kvb664s47bmmdq2ppjsnyqy8yaiig1xj81r25s36c3i8igfq3zxvws10k2dlmmmrwyc5k4g9i9imgkxj7r3xwwqxc72dl429wvfys8"; + sha512 = "095nn50g72l4ihbv26qqqs2jg4ahnmd54vxvm7nxwrnkx901aji7pph6c91zfpf7df26ib1b0pqyir9vsac40sdxc8yrzm6d0lyl1m2"; }; patches = nixpkgsPatches ++ [ diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 70d27218783..fd9fe0bdfbf 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.16.5"; + version = "0.17.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1b82d82pfv4kjdxghc8y78zwmnc89hi7arvql2bx0zyfhzxj6drl"; + sha256 = "1ffbwz7wp1xhfv8a5nhrhw97nl5ybf0j97dkk2sy9cdlribzxs04"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 29a65b5d9bc..f123770197f 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0daxp8ychvvr4lqz8wni8lkalk3w409pzwnikvf92f1whxs76xj0"; + sha256 = "1cvgjllnbdsr61pz6r4dkbbz58cf69k7p8wriyp1vpzkdi7k5bpl"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 513407a0b71..7ed237ce6aa 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -30,12 +30,12 @@ let weechat = assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.2"; + version = "2.3"; name = "weechat-${version}"; src = fetchurl { - url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0p4nhh7f7w4q77g7jm9i6fynndqlgjkc9dk5g1xb4gf9imiisqlg"; + url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; + sha256 = "0mi4pfnyny0vqc35r0scn6yy21y790a5iwq8ms7kch7b7z11jn9w"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; @@ -70,13 +70,6 @@ let done ''; - # remove when bumping to the latest version. - # This patch basically rebases `fcf7469d7664f37e94d5f6d0b3fe6fce6413f88c` - # from weechat upstream to weechat-2.2. - patches = [ - ./aggregate-commands.patch - ]; - meta = { homepage = http://www.weechat.org/; description = "A fast, light and extensible chat client"; diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index 9523059b42f..88bd0b9f10d 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.125.0"; + version = "0.125.1"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "14a4qgpnspzw9cjqh6gbw3771bxfm789ibvmvb8jc4pklvbyl4mi"; + sha256 = "0vbxjqjs1r5c350r67812andasby5zk25xlaqp201lmlvamiv0ni"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 16acf2a91d7..3fab965bf54 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchFromGitLab, git, go }: + stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "6.1.1"; + version = "7.0.0"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1dwvk86bfsqgkp0mwz71yis3i7aypjf96r3hsjkgpd27hwbjgxbr"; + sha256 = "1mmfb7h5sbva2kv9h9cxfg7dyksxrwwikq7jwggfawqaadzwm677"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index c1a4392ec0e..ba37091c433 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -11,29 +11,29 @@ let groups = [ "default" "unicorn" "ed25519" "metrics" ]; }; - version = "11.3.4"; + version = "11.4.0"; sources = if gitlabEnterprise then { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb"; - sha256 = "1cgwm6g1mij1958mdyds8f76qjw39nllsr23dvsqgf60h4vbsdfd"; + sha256 = "1y2a8acgsgrgcjazijsflhxq4fwqvd9yhrjx5pcncb24vl0x6dg4"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ee"; rev = "v${version}-ee"; - sha256 = "1ifaa879l85d4yfzrgszrgj04bfjxjh3n7v31zfb6lsqmh87xbm4"; + sha256 = "1pyqk1c5bml7chs4pq1fcxkrhk5r327xx9my6zmp2cb503s5m590"; }; } else { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb"; - sha256 = "0hls81ns9n10xrzw0b9pn1916445irqrysbicsdl8kdn83ds35p7"; + sha256 = "0wiizjihn1a6hg6a2wpwmnh5a34n102va4djac3sgx74mwx4bniq"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ce"; rev = "v${version}"; - sha256 = "0dymr706yn917niybg2gj1pkgrzgiirbv4ib9pkgs140kbf3hn0c"; + sha256 = "1a8pavqc9bblss5z9ikc9b0k0ra33vw73zy7rvn0v1wgvbqpc24k"; }; }; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index f14e05d43e0..ecbfba0827d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -80,16 +80,14 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' # Git Wiki -# Required manually in config/initializers/gollum.rb to control load order +# Only used to compute wiki page slugs gem 'gitlab-gollum-lib', '~> 4.2', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false - # Language detection gem 'github-linguist', '~> 5.3.3', require: 'linguist' # API -gem 'grape', '~> 1.0' +gem 'grape', '~> 1.1' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' @@ -112,9 +110,6 @@ gem 'hamlit', '~> 2.8.8' gem 'carrierwave', '= 1.2.3' gem 'mini_magick' -# Drag and Drop UI -gem 'dropzonejs-rails', '~> 0.7.1' - # for backups gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' @@ -137,6 +132,7 @@ gem 'seed-fu', '~> 2.3.7' gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.0.0' gem 'gitlab-markup', '~> 1.6.4' +gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' @@ -170,10 +166,9 @@ gem 'state_machines-activerecord', '~> 0.5.1' gem 'acts-as-taggable-on', '~> 5.0' # Background jobs -gem 'sidekiq', '~> 5.1' +gem 'sidekiq', '~> 5.2.1' gem 'sidekiq-cron', '~> 0.6.0' gem 'redis-namespace', '~> 1.6.0' -gem 'sidekiq-limit_fetch', '~> 3.4', require: false # Cron Parser gem 'rufus-scheduler', '~> 3.4' @@ -300,7 +295,7 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -gem 'peek-sidekiq', '~> 1.0.3' +gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch' # Metrics group :metrics do @@ -425,7 +420,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' gem 'grpc', '~> 1.11.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index e41719ec79d..9837a195d8c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -86,7 +86,7 @@ GEM bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootsnap (1.3.1) + bootsnap (1.3.2) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -133,14 +133,14 @@ GEM concurrent-ruby (1.0.5) concurrent-ruby-ext (1.0.5) concurrent-ruby (= 1.0.5) - connection_pool (2.2.1) + connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) creole (0.5.0) css_parser (1.5.0) addressable - daemons (1.2.3) + daemons (1.2.6) database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) @@ -175,8 +175,6 @@ GEM doorkeeper-openid_connect (1.5.0) doorkeeper (~> 4.3) json-jwt (~> 1.6) - dropzonejs-rails (0.7.2) - rails (> 3.1) ed25519 (1.2.4) email_reply_trimmer (0.1.6) email_spec (2.2.0) @@ -189,7 +187,7 @@ GEM escape_utils (1.1.1) et-orbi (1.0.3) tzinfo - eventmachine (1.0.8) + eventmachine (1.2.7) excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) @@ -276,7 +274,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.117.0) + gitaly-proto (0.118.1) google-protobuf (~> 3.1) grpc (~> 1.10) github-linguist (5.3.3) @@ -297,15 +295,14 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.1) - mime-types (>= 1.15) - rugged (~> 0.25) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) gitlab-markup (1.6.4) + gitlab-sidekiq-fetcher (0.3.0) + sidekiq (~> 5) gitlab-styles (2.4.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) @@ -343,7 +340,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.3) + grape (1.1.0) activesupport builder mustermann-grape (~> 1.0.0) @@ -493,7 +490,7 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_magick (4.8.0) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) @@ -501,7 +498,7 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.2) + mustermann (1.0.3) mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) @@ -605,10 +602,6 @@ GEM atomic (>= 1.0.0) peek redis - peek-sidekiq (1.0.3) - atomic (>= 1.0.0) - peek - sidekiq pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) @@ -633,9 +626,9 @@ GEM pry-byebug (3.4.3) byebug (>= 9.0, < 9.1) pry (~> 0.10) - pry-rails (0.3.5) - pry (>= 0.9.10) - public_suffix (3.0.2) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) pyu-ruby-sasl (0.0.3.3) rack (1.6.10) rack-accept (0.4.5) @@ -649,7 +642,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.1) + rack-protection (2.0.3) rack rack-proxy (0.6.0) rack @@ -735,7 +728,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.2.1) + rouge (3.3.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -843,16 +836,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.1.3) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.1) + connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) - sidekiq-limit_fetch (3.4.0) - sidekiq (>= 4) signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) @@ -865,7 +855,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slack-notifier (1.5.1) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -895,7 +885,7 @@ GEM test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) - thin (1.7.0) + thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) @@ -954,7 +944,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpack-rails (0.9.10) + webpack-rails (0.9.11) railties (>= 3.2.0) wikicloth (0.8.1) builder @@ -1013,7 +1003,6 @@ DEPENDENCIES diffy (~> 3.1.0) doorkeeper (~> 4.3) doorkeeper-openid_connect (~> 1.5) - dropzonejs-rails (~> 0.7.1) ed25519 (~> 1.2) email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) @@ -1038,19 +1027,20 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.117.0) + gitaly-proto (~> 0.118.1) github-linguist (~> 5.3.3) + github-markup (~> 1.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) - gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-markup (~> 1.6.4) + gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (= 3.5.1) gpgme - grape (~> 1.0) + grape (~> 1.1) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.0) grape_logging (~> 1.7) @@ -1114,7 +1104,6 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) @@ -1166,9 +1155,8 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.1) + sidekiq (~> 5.2.1) sidekiq-cron (~> 0.6.0) - sidekiq-limit_fetch (~> 3.4) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index 65aac989103..ee262b6b5d9 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -301,10 +301,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9"; + sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; bootstrap_form = { source = { @@ -504,10 +504,10 @@ connection_pool = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7"; + sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; crack = { dependencies = ["safe_yaml"]; @@ -546,10 +546,10 @@ daemons = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg"; + sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.6"; }; database_cleaner = { source = { @@ -695,15 +695,6 @@ }; version = "1.5.0"; }; - dropzonejs-rails = { - dependencies = ["rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64"; - type = "gem"; - }; - version = "0.7.2"; - }; ed25519 = { source = { remotes = ["https://rubygems.org"]; @@ -773,10 +764,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.0.8"; + version = "1.2.7"; }; excon = { source = { @@ -1078,10 +1069,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i"; + sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki"; type = "gem"; }; - version = "0.117.0"; + version = "0.118.1"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1118,15 +1109,6 @@ }; version = "4.2.7.5"; }; - gitlab-gollum-rugged_adapter = { - dependencies = ["mime-types" "rugged"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; - type = "gem"; - }; - version = "0.4.4.1"; - }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { @@ -1144,6 +1126,15 @@ }; version = "1.6.4"; }; + gitlab-sidekiq-fetcher = { + dependencies = ["sidekiq"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dvrp4iapwfaakc3qgf7mw05blxzfywpjfr7bhswwflih0pm67l7"; + type = "gem"; + }; + version = "0.3.0"; + }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { @@ -1237,10 +1228,10 @@ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427"; + sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1779,10 +1770,10 @@ mini_mime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8"; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; mini_portile2 = { source = { @@ -1843,10 +1834,10 @@ mustermann = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g"; + sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; mustermann-grape = { dependencies = ["mustermann"]; @@ -2207,15 +2198,6 @@ }; version = "1.2.0"; }; - peek-sidekiq = { - dependencies = ["atomic" "peek" "sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x"; - type = "gem"; - }; - version = "1.0.3"; - }; pg = { source = { remotes = ["https://rubygems.org"]; @@ -2314,18 +2296,18 @@ dependencies = ["pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6"; + sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; pyu-ruby-sasl = { source = { @@ -2382,10 +2364,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7"; + sha256 = "1z5598qipilmnf45428jnxi63ykrgvnyywa5ckpr52zv2vpd8jdp"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.3"; }; rack-proxy = { dependencies = ["rack"]; @@ -2699,10 +2681,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; + sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -3072,13 +3054,13 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh"; + sha256 = "0s57vl2hwfaga73yiscak2rs7byg1q0z44wa9si9vl92qcmbik2j"; type = "gem"; }; - version = "5.1.3"; + version = "5.2.1"; }; sidekiq-cron = { dependencies = ["rufus-scheduler" "sidekiq"]; @@ -3089,15 +3071,6 @@ }; version = "0.6.0"; }; - sidekiq-limit_fetch = { - dependencies = ["sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr"; - type = "gem"; - }; - version = "3.4.0"; - }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { @@ -3144,10 +3117,10 @@ dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x"; + sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -3288,10 +3261,10 @@ dependencies = ["daemons" "eventmachine" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q"; + sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.2"; }; thor = { source = { @@ -3518,10 +3491,10 @@ dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv"; + sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr"; type = "gem"; }; - version = "0.9.10"; + version = "0.9.11"; }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"]; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index 86502db9d26..ef14aace277 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -83,16 +83,14 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' # Git Wiki -# Required manually in config/initializers/gollum.rb to control load order +# Only used to compute wiki page slugs gem 'gitlab-gollum-lib', '~> 4.2', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false - # Language detection gem 'github-linguist', '~> 5.3.3', require: 'linguist' # API -gem 'grape', '~> 1.0' +gem 'grape', '~> 1.1' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' @@ -115,9 +113,6 @@ gem 'hamlit', '~> 2.8.8' gem 'carrierwave', '= 1.2.3' gem 'mini_magick' -# Drag and Drop UI -gem 'dropzonejs-rails', '~> 0.7.1' - # for backups gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' @@ -147,6 +142,7 @@ gem 'faraday_middleware-aws-signers-v4' gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.0.0' gem 'gitlab-markup', '~> 1.6.4' +gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' @@ -180,10 +176,9 @@ gem 'state_machines-activerecord', '~> 0.5.1' gem 'acts-as-taggable-on', '~> 5.0' # Background jobs -gem 'sidekiq', '~> 5.1' +gem 'sidekiq', '~> 5.2.1' gem 'sidekiq-cron', '~> 0.6.0' gem 'redis-namespace', '~> 1.6.0' -gem 'sidekiq-limit_fetch', '~> 3.4', require: false # Cron Parser gem 'rufus-scheduler', '~> 3.4' @@ -312,7 +307,7 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -gem 'peek-sidekiq', '~> 1.0.3' +gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch' # Metrics group :metrics do @@ -440,7 +435,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' gem 'grpc', '~> 1.11.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index d7c4f80efd1..4355b3ae271 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -94,7 +94,7 @@ GEM bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootsnap (1.3.1) + bootsnap (1.3.2) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -141,14 +141,14 @@ GEM concurrent-ruby (1.0.5) concurrent-ruby-ext (1.0.5) concurrent-ruby (= 1.0.5) - connection_pool (2.2.1) + connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) creole (0.5.0) css_parser (1.5.0) addressable - daemons (1.2.3) + daemons (1.2.6) database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) @@ -183,8 +183,6 @@ GEM doorkeeper-openid_connect (1.5.0) doorkeeper (~> 4.3) json-jwt (~> 1.6) - dropzonejs-rails (0.7.2) - rails (> 3.1) ed25519 (1.2.4) elasticsearch (5.0.3) elasticsearch-api (= 5.0.3) @@ -210,7 +208,7 @@ GEM escape_utils (1.1.1) et-orbi (1.0.3) tzinfo - eventmachine (1.0.8) + eventmachine (1.2.7) excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) @@ -300,7 +298,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.117.0) + gitaly-proto (0.118.1) google-protobuf (~> 3.1) grpc (~> 1.10) github-linguist (5.3.3) @@ -321,9 +319,6 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.1) - mime-types (>= 1.15) - rugged (~> 0.25) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) @@ -331,6 +326,8 @@ GEM posix-spawn (~> 0.3) gitlab-license (1.0.0) gitlab-markup (1.6.4) + gitlab-sidekiq-fetcher (0.3.0) + sidekiq (~> 5) gitlab-styles (2.4.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) @@ -368,7 +365,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.3) + grape (1.1.0) activesupport builder mustermann-grape (~> 1.0.0) @@ -521,7 +518,7 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_magick (4.8.0) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) @@ -529,7 +526,7 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.2) + mustermann (1.0.3) mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) @@ -634,10 +631,6 @@ GEM atomic (>= 1.0.0) peek redis - peek-sidekiq (1.0.3) - atomic (>= 1.0.0) - peek - sidekiq pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) @@ -662,9 +655,9 @@ GEM pry-byebug (3.4.3) byebug (>= 9.0, < 9.1) pry (~> 0.10) - pry-rails (0.3.5) - pry (>= 0.9.10) - public_suffix (3.0.2) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) pyu-ruby-sasl (0.0.3.3) rack (1.6.10) rack-accept (0.4.5) @@ -678,7 +671,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.1) + rack-protection (2.0.3) rack rack-proxy (0.6.0) rack @@ -764,7 +757,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.2.1) + rouge (3.3.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -872,16 +865,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.1.3) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.1) + connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) - sidekiq-limit_fetch (3.4.0) - sidekiq (>= 4) signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) @@ -894,7 +884,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slack-notifier (1.5.1) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -924,7 +914,7 @@ GEM test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) - thin (1.7.0) + thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) @@ -983,7 +973,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpack-rails (0.9.10) + webpack-rails (0.9.11) railties (>= 3.2.0) wikicloth (0.8.1) builder @@ -1043,7 +1033,6 @@ DEPENDENCIES diffy (~> 3.1.0) doorkeeper (~> 4.3) doorkeeper-openid_connect (~> 1.5) - dropzonejs-rails (~> 0.7.1) ed25519 (~> 1.2) elasticsearch-api (= 5.0.3) elasticsearch-model (~> 0.1.9) @@ -1072,20 +1061,21 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.117.0) + gitaly-proto (~> 0.118.1) github-linguist (~> 5.3.3) + github-markup (~> 1.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) - gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-license (~> 1.0) gitlab-markup (~> 1.6.4) + gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (= 3.5.1) gpgme - grape (~> 1.0) + grape (~> 1.1) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.0) grape_logging (~> 1.7) @@ -1151,7 +1141,6 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) @@ -1203,9 +1192,8 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.1) + sidekiq (~> 5.2.1) sidekiq-cron (~> 0.6.0) - sidekiq-limit_fetch (~> 3.4) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index a067d1e4272..03efc4e9600 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -336,10 +336,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9"; + sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; bootstrap_form = { source = { @@ -539,10 +539,10 @@ connection_pool = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7"; + sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; crack = { dependencies = ["safe_yaml"]; @@ -581,10 +581,10 @@ daemons = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg"; + sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.6"; }; database_cleaner = { source = { @@ -730,15 +730,6 @@ }; version = "1.5.0"; }; - dropzonejs-rails = { - dependencies = ["rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64"; - type = "gem"; - }; - version = "0.7.2"; - }; ed25519 = { source = { remotes = ["https://rubygems.org"]; @@ -852,10 +843,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.0.8"; + version = "1.2.7"; }; excon = { source = { @@ -1166,10 +1157,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i"; + sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki"; type = "gem"; }; - version = "0.117.0"; + version = "0.118.1"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1206,15 +1197,6 @@ }; version = "4.2.7.5"; }; - gitlab-gollum-rugged_adapter = { - dependencies = ["mime-types" "rugged"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; - type = "gem"; - }; - version = "0.4.4.1"; - }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { @@ -1240,6 +1222,15 @@ }; version = "1.6.4"; }; + gitlab-sidekiq-fetcher = { + dependencies = ["sidekiq"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dvrp4iapwfaakc3qgf7mw05blxzfywpjfr7bhswwflih0pm67l7"; + type = "gem"; + }; + version = "0.3.0"; + }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { @@ -1333,10 +1324,10 @@ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427"; + sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1892,10 +1883,10 @@ mini_mime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8"; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; mini_portile2 = { source = { @@ -1956,10 +1947,10 @@ mustermann = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g"; + sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; mustermann-grape = { dependencies = ["mustermann"]; @@ -2328,15 +2319,6 @@ }; version = "1.2.0"; }; - peek-sidekiq = { - dependencies = ["atomic" "peek" "sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x"; - type = "gem"; - }; - version = "1.0.3"; - }; pg = { source = { remotes = ["https://rubygems.org"]; @@ -2435,18 +2417,18 @@ dependencies = ["pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6"; + sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; pyu-ruby-sasl = { source = { @@ -2503,10 +2485,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7"; + sha256 = "1z5598qipilmnf45428jnxi63ykrgvnyywa5ckpr52zv2vpd8jdp"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.3"; }; rack-proxy = { dependencies = ["rack"]; @@ -2820,10 +2802,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; + sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -3193,13 +3175,13 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh"; + sha256 = "0s57vl2hwfaga73yiscak2rs7byg1q0z44wa9si9vl92qcmbik2j"; type = "gem"; }; - version = "5.1.3"; + version = "5.2.1"; }; sidekiq-cron = { dependencies = ["rufus-scheduler" "sidekiq"]; @@ -3210,15 +3192,6 @@ }; version = "0.6.0"; }; - sidekiq-limit_fetch = { - dependencies = ["sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr"; - type = "gem"; - }; - version = "3.4.0"; - }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { @@ -3265,10 +3238,10 @@ dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x"; + sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -3409,10 +3382,10 @@ dependencies = ["daemons" "eventmachine" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q"; + sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.2"; }; thor = { source = { @@ -3639,10 +3612,10 @@ dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv"; + sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr"; type = "gem"; }; - version = "0.9.10"; + version = "0.9.11"; }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"]; diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index c44bd25b91a..4dd2e019d1d 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -57,6 +57,8 @@ mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.erictapen ]; platforms = platforms.linux; + # binary segfaults at the moment + broken = true; }; } diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix new file mode 100644 index 00000000000..79dbddfab55 --- /dev/null +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "cntr-${version}"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "cntr"; + rev = version; + sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg"; + }; + + cargoSha256 = "0gainr5gfy0bbhr6078zvgx0kzp53slxjp37d3da091ikgzgfn51"; + + meta = with stdenv.lib; { + description = "A container debugging tool based on FUSE"; + homepage = https://github.com/Mic92/cntr; + license = licenses.mit; + # aarch64 support will be fixed soon + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index a1ff9bde3ed..bd44b4fcbfe 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "1.1.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "1d4qnviv20zi3zk17zz8271mlfqqgfrxblw86izwwfvj3cvsyrah"; + sha256 = "03d244v85975bavmlg66kd283jdb22yyvwkwcgy91n63jhvvbadk"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/build-support/setup-hooks/breakpoint-hook.sh b/pkgs/build-support/setup-hooks/breakpoint-hook.sh new file mode 100644 index 00000000000..6bef786ac3a --- /dev/null +++ b/pkgs/build-support/setup-hooks/breakpoint-hook.sh @@ -0,0 +1,9 @@ +breakpointHook() { + local red='\033[0;31m' + local no_color='\033[0m' + + echo -e "${red}build failed in ${curPhase} with exit code ${exitCode}${no_color}" + printf "To attach install cntr and run the following command as root:\n\n" + sh -c "echo ' cntr attach -t command cntr-${out}'; while true; do sleep 99999999; done" +} +failureHooks+=(breakpointHook) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 079fccadfcb..0be9abba71d 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/70f02ad82349a18e1eff41eea4949be532486f7b.tar.gz"; - sha256 = "1ajqybsl8hfzbhziww57zp9a8kgypj96ngxrargk916v3xpf3x15"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/420a405e4dbccd78b2a471b632b9fe1a1e04502b.tar.gz"; + sha256 = "01vdbp1yh2s0afijz9ap4590mlpiica7l6k0mpfc0jwzymn9w86n"; } diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix index c9312c22882..68193bad583 100644 --- a/pkgs/desktops/gnome-3/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo -, libarchive, freetype, libjpeg, libtiff, gnome3 +, libarchive, freetype, libjpeg, libtiff, gnome3, fetchpatch }: let @@ -13,6 +13,19 @@ in stdenv.mkDerivation rec { sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-10733-1.patch"; + url = https://gitlab.gnome.org/GNOME/libgxps/commit/b458226e162fe1ffe7acb4230c114a52ada5131b.patch; + sha256 = "0pqg9iwkg69qknj7vkgn26c32fndy55byxivd4km0vjfhfyx69hd"; + }) + (fetchpatch { + name = "CVE-2018-10733-2.patch"; + url = https://gitlab.gnome.org/GNOME/libgxps/commit/133fe2a96e020d4ca65c6f64fb28a404050ebbfd.patch; + sha256 = "19n01x8zs05wf801mkz4mypvapph7h941md3hr3rj0ry6r88pkir"; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; buildInputs = [ glib cairo freetype libjpeg libtiff ]; propagatedBuildInputs = [ libarchive ]; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 566245c4441..1659ebaae65 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "python-caja-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0bcgg3p01zik53l5ns48575yw0k88fyc044yvp9fvwy5jqqg1ykk"; + sha256 = "16y9xri92x7a40db2qakf20c80a6vqy21nwnjhwrki5rqk7nwbgx"; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 62ea39791b9..2363953e35b 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -215,7 +215,7 @@ stdenv.mkDerivation (rec { inherit enableShared; # Our Cabal compiler name - haskellCompilerName = "ghc-8.4.3"; + haskellCompilerName = "ghc-8.6.1"; }; meta = { diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index 9665f5006ed..12f833f5525 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -86,7 +86,5 @@ stdenv.mkDerivation rec { platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; license = licenses.free; # Combination of LGPL/X11/GPL ? - # 2018-08-21: mono 5.x is broken on aarch64 since at least 2017-07-06 - broken = stdenv.isAarch64 && (versionAtLeast version "5"); }; } diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 55348c5795a..e738dd7acae 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.28.0"; + version = "1.29.2"; - # fetch hashes by running `print-hashes.sh 1.24.1` + # fetch hashes by running `print-hashes.sh 1.29.2` hashes = { - i686-unknown-linux-gnu = "de7cdb4e665e897ea9b10bf6fd545f900683296456d6a11d8510397bb330455f"; - x86_64-unknown-linux-gnu = "2a1390340db1d24a9498036884e6b2748e9b4b057fc5219694e298bdaa37b810"; - armv7-unknown-linux-gnueabihf = "346558d14050853b87049e5e1fbfae0bf0360a2f7c57433c6985b1a879c349a2"; - aarch64-unknown-linux-gnu = "9b6fbcee73070332c811c0ddff399fa31965bec62ef258656c0c90354f6231c1"; - i686-apple-darwin = "752e2c9182e057c4a54152d1e0b3949482c225d02bb69d9d9a4127dc2a65fb68"; - x86_64-apple-darwin = "5d7a70ed4701fe9410041c1eea025c95cad97e5b3d8acc46426f9ac4f9f02393"; + i686-unknown-linux-gnu = "fd67338c32348fc0cf09dd066975acc221e062fdc3b052912baef93b39a0b27e"; + x86_64-unknown-linux-gnu = "e9809825c546969a9609ff94b2793c9107d7d9bed67d557ed9969e673137e8d8"; + armv7-unknown-linux-gnueabihf = "943ee757d96be97baccb84b0c2a5da368f8f3adf082805b0f0323240e80975c0"; + aarch64-unknown-linux-gnu = "e11461015ca7106ef8ebf00859842bf4be518ee170226cb8eedaaa666946509f"; + i686-apple-darwin = "aadec39efcbc476e00722b527dcc587003ab05194efd06ba1b91c1e0f7512d3f"; + x86_64-apple-darwin = "63f54e3013406b39fcb5b84bcf5e8ce85860d0b97a1e156700e467bf5fb5d5f2"; }; platform = diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 25a71965e0b..02ea7ebbbfb 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,13 +1,10 @@ { stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib -, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin +, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 +, CoreFoundation, Security , version , patches ? [] , src }: -let - inherit (darwin.apple_sdk.frameworks) CoreFoundation; -in - rustPlatform.buildRustPackage rec { name = "cargo-${version}"; inherit version src patches; @@ -24,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG=1; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7d785093f9b..a925127596d 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,4 +1,5 @@ { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl +, CoreFoundation, Security , targets ? [] , targetToolchains ? [] , targetPatches ? [] @@ -6,11 +7,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.29.1"; - cargoVersion = "1.29.1"; + version = "1.30.0"; + cargoVersion = "1.30.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i"; + sha256 = "1vh8q5i273xyjvpipqisny11iz0xfgz30cgjr7068nx5rhzsh2yd"; }; in rec { rustc = callPackage ./rustc.nix { @@ -44,8 +45,7 @@ in rec { cargo = callPackage ./cargo.nix rec { version = cargoVersion; - inherit src; - inherit stdenv; + inherit src stdenv CoreFoundation Security; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index a054ed0eb55..decf14a3294 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -92,15 +92,15 @@ stdenv.mkDerivation { #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ # Disable fragile tests. - rm -vr src/test/run-make/linker-output-non-utf8 || true - rm -vr src/test/run-make/issue-26092 || true + rm -vr src/test/run-make-fulldeps/linker-output-non-utf8 || true + rm -vr src/test/run-make-fulldeps/issue-26092 || true # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 - rm -vr src/test/run-pass/issue-36023.rs || true + rm -vr src/test/ui/run-pass/issue-36023.rs || true # Disable test getting stuck on hydra - possible fix: # https://reviews.llvm.org/rL281650 - rm -vr src/test/run-pass/issue-36474.rs || true + rm -vr src/test/ui/run-pass/issue-36474.rs || true # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)' sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs @@ -116,18 +116,18 @@ stdenv.mkDerivation { # Disable all lldb tests. # error: Can't run LLDB test because LLDB's python path is not set rm -vr src/test/debuginfo/* - rm -v src/test/run-pass/backtrace-debuginfo.rs + rm -v src/test/run-pass/backtrace-debuginfo.rs || true # error: No such file or directory - rm -v src/test/run-pass/issue-45731.rs + rm -v src/test/ui/run-pass/issues/issue-45731.rs || true # Disable tests that fail when sandboxing is enabled. substituteInPlace src/libstd/sys/unix/ext/net.rs \ --replace '#[test]' '#[test] #[ignore]' substituteInPlace src/test/run-pass/env-home-dir.rs \ --replace 'home_dir().is_some()' true - rm -v src/test/run-pass/fds-are-cloexec.rs # FIXME: pipes? - rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ??? + rm -v src/test/run-pass/fds-are-cloexec.rs || true # FIXME: pipes? + rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ??? ''; # rustc unfortunately need cmake for compiling llvm-rt but doesn't diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2cb95a397c6..33f498d922b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1147,9 +1147,6 @@ self: super: { arbtt = doJailbreak super.arbtt; - # https://github.com/yesodweb/yesod/issues/1563 - yesod-core = self.yesod-core_1_6_8_1; - # https://github.com/danfran/cabal-macosx/issues/13 cabal-macosx = dontCheck super.cabal-macosx; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 8d0669ca2ac..213651405f3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -56,8 +56,19 @@ self: super: { }; in appendPatch super.hadoop-rpc patch; - # Version 1.9.1 needs Cabal 2.4.x or later, so - # we use the one from the ghc-8.6.1 package set. - stack = markBroken super.stack; + # stack-1.9.1 needs Cabal 2.4.x, a recent version of hpack, and a non-recent + # version of yaml. Go figure. We avoid overrideScope here because using it to + # change Cabal would re-compile every single package instead of just those + # that have it as an actual library dependency. The explicit overrides are + # more verbose but friendlier for Hydra. + stack = (doJailbreak super.stack).override { + Cabal = self.Cabal_2_4_0_1; + hpack = self.hpack_0_31_0.override { Cabal = self.Cabal_2_4_0_1; }; + yaml = self.yaml_0_11_0_0; + hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; }; + }; + hpack_0_31_0 = super.hpack_0_31_0.override { + yaml = self.yaml_0_11_0_0; + }; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index ca2c8849dc6..61f188aeddb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -90,7 +90,6 @@ self: super: { data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x Diff = dontCheck super.Diff; http-api-data = doJailbreak super.http-api-data; - lucid = doJailbreak super.lucid; persistent-sqlite = dontCheck super.persistent-sqlite; psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" @@ -109,10 +108,7 @@ self: super: { # https://github.com/skogsbaer/HTF/issues/69 HTF = markBrokenVersion "0.13.2.4" super.HTF; - # https://github.com/jgm/pandoc-types/issues/52 - pandoc-types = doJailbreak super.pandoc-types; - - # + # https://github.com/jgm/skylighting/issues/55 skylighting-core = dontCheck super.skylighting-core; # https://github.com/joelburget/easytest/issues/12 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8b469e6c0f5..b5f5e1f3675 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.13 + # LTS Haskell 12.14 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -78,7 +78,7 @@ default-package-overrides: - alarmclock ==0.5.0.2 - alerts ==0.1.0.0 - alex ==3.2.4 - - alg ==0.2.7.0 + - alg ==0.2.8.0 - algebra ==4.3.1 - algebraic-graphs ==0.2 - Allure ==0.8.3.0 @@ -233,7 +233,7 @@ default-package-overrides: - base64-bytestring ==1.0.0.1 - base64-bytestring-type ==1 - base64-string ==0.2 - - base-compat ==0.10.4 + - base-compat ==0.10.5 - base-compat-batteries ==0.10.1 - basement ==0.0.8 - base-orphans ==0.7 @@ -253,7 +253,7 @@ default-package-overrides: - bimap ==0.3.3 - bimap-server ==0.1.0.1 - binary-bits ==0.5 - - binary-conduit ==1.3 + - binary-conduit ==1.3.1 - binary-ext ==2.0.4 - binary-ieee754 ==0.1.0.0 - binary-list ==1.1.1.2 @@ -335,7 +335,7 @@ default-package-overrides: - Cabal ==2.2.0.1 - cabal2spec ==2.1.1 - cabal-doctest ==1.0.6 - - cabal-rpm ==0.12.5 + - cabal-rpm ==0.12.6 - cache ==0.1.1.1 - cachix ==0.1.2 - cachix-api ==0.1.0.2 @@ -404,7 +404,7 @@ default-package-overrides: - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.0 - ClustalParser ==1.2.3 - - cmark-gfm ==0.1.5 + - cmark-gfm ==0.1.6 - cmdargs ==0.10.20 - code-builder ==0.1.3 - codec ==0.2.1 @@ -461,7 +461,7 @@ default-package-overrides: - contravariant ==1.4.1 - contravariant-extras ==0.3.4 - control-bool ==0.2.1 - - control-dsl ==0.2.1.1 + - control-dsl ==0.2.1.3 - control-monad-free ==0.6.2 - control-monad-omega ==0.3.1 - convertible ==1.1.1.0 @@ -486,7 +486,7 @@ default-package-overrides: - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 - cryptocompare ==0.1.1 - - crypto-enigma ==0.0.2.13 + - crypto-enigma ==0.0.2.14 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -576,7 +576,7 @@ default-package-overrides: - dhall ==1.15.1 - dhall-bash ==1.0.15 - dhall-json ==1.2.3 - - dhall-text ==1.0.12 + - dhall-text ==1.0.13 - di ==1.0.1 - diagrams ==1.4 - diagrams-builder ==0.8.0.3 @@ -659,7 +659,7 @@ default-package-overrides: - eliminators ==0.4.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - email-validate ==2.3.2.7 + - email-validate ==2.3.2.8 - enclosed-exceptions ==1.0.3 - entropy ==0.4.1.3 - enummapset ==0.5.2.2 @@ -702,7 +702,7 @@ default-package-overrides: - exp-pairs ==0.1.6.0 - extensible ==0.4.9 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.12 + - extra ==1.6.13 - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - facts ==0.0.1.0 @@ -784,7 +784,7 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy-dates ==0.1.1.1 - fuzzyset ==0.1.0.6 - - gauge ==0.2.3 + - gauge ==0.2.4 - gc ==0.0.2 - gd ==3000.7.3 - gdax ==0.6.0.0 @@ -896,7 +896,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.6.0 + - hapistrano ==0.3.6.1 - happstack-server ==7.5.1.1 - happy ==1.19.9 - hasbolt ==0.1.3.0 @@ -982,7 +982,7 @@ default-package-overrides: - hmpfr ==0.4.4 - Hoed ==0.5.1 - hoopl ==3.10.2.2 - - hOpenPGP ==2.7.3 + - hOpenPGP ==2.7.4.1 - hopenpgp-tools ==0.21.2 - hopfli ==0.2.2.1 - hostname ==1.0 @@ -1004,8 +1004,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.6 - hs-functors ==0.1.3.0 - hs-GeoIP ==0.3 @@ -1044,7 +1044,7 @@ default-package-overrides: - htaglib ==1.2.0 - HTF ==0.13.2.4 - html ==1.0.1.2 - - html-conduit ==1.3.1 + - html-conduit ==1.3.2 - html-email-validate ==0.2.0.0 - html-entities ==1.1.4.2 - html-entity-map ==0.1.0.0 @@ -1118,7 +1118,7 @@ default-package-overrides: - Imlib ==0.1.2 - immortal ==0.3 - include-file ==0.1.0.3 - - incremental-parser ==0.3.1.1 + - incremental-parser ==0.3.2 - indentation-core ==0.0.0.2 - indentation-parsec ==0.0.0.2 - indents ==0.5.0.0 @@ -1136,7 +1136,7 @@ default-package-overrides: - integration ==0.2.1 - intern ==0.9.2 - interpolate ==0.2.0 - - interpolatedstring-perl6 ==1.0.0 + - interpolatedstring-perl6 ==1.0.1 - interpolation ==0.1.0.3 - IntervalMap ==0.6.0.0 - intervals ==0.8.1 @@ -1154,7 +1154,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.0.2 - ip ==1.3.0 - ip6addr ==1.0.0 - - iproute ==1.7.5 + - iproute ==1.7.6 - IPv6Addr ==1.1.1 - IPv6DB ==0.3.1 - ipython-kernel ==0.9.1.0 @@ -1228,7 +1228,7 @@ default-package-overrides: - lawful ==0.1.0.0 - lazyio ==0.1.0.4 - lca ==0.3.1 - - leancheck ==0.7.5 + - leancheck ==0.7.7 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.3 - lens ==4.16.1 @@ -1283,7 +1283,7 @@ default-package-overrides: - loop ==0.3.0 - lrucache ==1.2.0.0 - lrucaching ==0.3.3 - - lucid ==2.9.10 + - lucid ==2.9.11 - lucid-extras ==0.1.0.1 - lxd-client-config ==0.1.0.1 - lz4 ==0.2.3.1 @@ -1303,7 +1303,7 @@ default-package-overrides: - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - marvin-interpolate ==1.1.2 - - massiv ==0.2.1.0 + - massiv ==0.2.2.0 - massiv-io ==0.1.4.0 - mathexpr ==0.3.0.0 - math-functions ==0.2.1.0 @@ -1351,7 +1351,7 @@ default-package-overrides: - mintty ==0.1.2 - miso ==0.21.2.0 - missing-foreign ==0.1.1 - - MissingH ==1.4.0.1 + - MissingH ==1.4.1.0 - mixed-types-num ==0.3.1.4 - mltool ==0.2.0.1 - mmap ==0.5.9 @@ -1370,7 +1370,7 @@ default-package-overrides: - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - monadlist ==0.0.2 - - monad-logger ==0.3.29 + - monad-logger ==0.3.30 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.10 - monad-logger-syslog ==0.1.4.0 @@ -1522,8 +1522,8 @@ default-package-overrides: - pagination ==0.2.1 - palette ==0.3.0.1 - pandoc ==2.2.1 - - pandoc-citeproc ==0.14.5 - - pandoc-types ==1.17.5.1 + - pandoc-citeproc ==0.14.8 + - pandoc-types ==1.17.5.2 - pango ==0.13.5.0 - papillon ==0.1.0.6 - parallel ==3.2.2.0 @@ -1754,7 +1754,7 @@ default-package-overrides: - rethinkdb-client-driver ==0.0.25 - retry ==0.7.7.0 - rev-state ==0.1.2 - - rfc5051 ==0.1.0.3 + - rfc5051 ==0.1.0.4 - rhine ==0.4.0.1 - riak ==1.1.2.5 - riak-protobuf ==0.23.0.0 @@ -1841,7 +1841,7 @@ default-package-overrides: - servant-streaming ==0.3.0.0 - servant-streaming-client ==0.3.0.0 - servant-streaming-server ==0.3.0.0 - - servant-swagger ==1.1.5 + - servant-swagger ==1.1.6 - servant-swagger-ui ==0.3.0.3.13.2 - servant-swagger-ui-core ==0.3.1 - servant-tracing ==0.1.0.2 @@ -1859,7 +1859,7 @@ default-package-overrides: - SHA ==1.6.4.4 - shake ==0.16.4 - shake-language-c ==0.12.0 - - shakespeare ==2.0.18 + - shakespeare ==2.0.19 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - shelltestrunner ==1.9 @@ -1871,6 +1871,7 @@ default-package-overrides: - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 + - simple-cmd ==0.1.1 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.27 - simplest-sqlite ==0.1.0.0 @@ -1880,11 +1881,11 @@ default-package-overrides: - singleton-nats ==0.4.2 - singletons ==2.4.1 - siphash ==1.0.3 - - size-based ==0.1.1.0 + - size-based ==0.1.2.0 - skein ==1.0.9.4 - skylighting ==0.7.4 - skylighting-core ==0.7.4 - - slack-web ==0.2.0.6 + - slack-web ==0.2.0.7 - slave-thread ==1.0.2 - smallcheck ==1.1.5 - smoothie ==0.4.2.9 @@ -2152,7 +2153,7 @@ default-package-overrides: - unicode-show ==0.1.0.3 - unicode-transforms ==0.3.4 - unification-fd ==0.10.0.1 - - union ==0.1.1.2 + - union ==0.1.2 - union-find ==0.2 - uniplate ==1.6.12 - uniprot-kb ==0.1.2.0 @@ -2332,29 +2333,29 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.8.32 - yeshql ==4.1.0.1 - - yeshql-core ==4.1.0.1 - - yeshql-hdbc ==4.1.0.1 + - yeshql-core ==4.1.0.2 + - yeshql-hdbc ==4.1.0.2 - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - - yesod-auth ==1.6.4.1 + - yesod-auth ==1.6.5 - yesod-auth-fb ==1.9.1 - yesod-auth-hashdb ==1.7 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.8 + - yesod-core ==1.6.8.1 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - - yesod-form ==1.6.2 + - yesod-form ==1.6.3 - yesod-form-bootstrap4 ==1.0.2 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.0.0 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==1.1.0.1 - - yesod-persistent ==1.6.0 + - yesod-persistent ==1.6.0.1 - yesod-recaptcha2 ==0.2.4 - yesod-sitemap ==1.6.0 - - yesod-static ==1.6.0 - - yesod-test ==1.6.5 + - yesod-static ==1.6.0.1 + - yesod-test ==1.6.5.1 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.1 - yes-precure5-command ==5.5.3 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fd19a506d15..fe488d0447e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12291,31 +12291,6 @@ self: { }) {}; "MissingH" = callPackage - ({ mkDerivation, array, base, containers, directory - , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , old-locale, old-time, parsec, process, QuickCheck, random - , regex-compat, testpack, time, unix - }: - mkDerivation { - pname = "MissingH"; - version = "1.4.0.1"; - sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8"; - revision = "1"; - editedCabalFile = "04syc14nz11fay6fm6nlixyflrfhpg4jiyxx6mnxrl6asd3cl989"; - libraryHaskellDepends = [ - array base containers directory filepath hslogger HUnit mtl network - old-locale old-time parsec process random regex-compat time unix - ]; - testHaskellDepends = [ - array base containers directory errorcall-eq-instance filepath - hslogger HUnit mtl network old-locale old-time parsec process - QuickCheck random regex-compat testpack time unix - ]; - description = "Large utility library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "MissingH_1_4_1_0" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network , old-locale, old-time, parsec, process, QuickCheck, random @@ -12336,7 +12311,6 @@ self: { ]; description = "Large utility library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MissingK" = callPackage @@ -18676,8 +18650,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.2.14"; - sha256 = "0hwlm91dlhbl0g6axpqx3pbr89icaqmrgnnn6lhcwd7sd8rzycbg"; + version = "0.1.2.16"; + sha256 = "00ngq1i7f1sqksfl9cg1qzhp4fxv9h6mmjfljj3cahcw50h4al64"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -18687,7 +18661,7 @@ self: { transformers unix uri-encode ]; executableHaskellDepends = [ - base HDBC HDBC-sqlite3 random scotty split text time + base HDBC HDBC-sqlite3 mtl random scotty split text time ]; testHaskellDepends = [ base concurrent-extra HDBC HDBC-sqlite3 hspec mtl QuickCheck @@ -19634,8 +19608,8 @@ self: { ({ mkDerivation, base, deepseq, random }: mkDerivation { pname = "Yampa"; - version = "0.11.1"; - sha256 = "0zzhp0h9z9xz7ipiyd6ygnhb6h50dwh268zamx6qdf6zzpywsya1"; + version = "0.12"; + sha256 = "077fnazzcv7gckpklmdgk4hz6nnfnims11c1r4dwpnb0z6n31wcg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq random ]; @@ -23137,17 +23111,6 @@ self: { }) {}; "alg" = callPackage - ({ mkDerivation, base, util }: - mkDerivation { - pname = "alg"; - version = "0.2.7.0"; - sha256 = "00ih68mh1494s856ygkc887m0vhrs2sfchjgqrsgw8v7lqcqjsx6"; - libraryHaskellDepends = [ base util ]; - description = "Algebraic structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alg_0_2_8_0" = callPackage ({ mkDerivation, base, util }: mkDerivation { pname = "alg"; @@ -23156,7 +23119,6 @@ self: { libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -29163,6 +29125,8 @@ self: { pname = "ascii"; version = "0.0.5.1"; sha256 = "06z63pr5g1wcsyii3pr8svz23cl9n4srspbkvby595pxfcbzkirn"; + revision = "1"; + editedCabalFile = "1v8pgvhl47c4sf226pg175wydw5a60lssz0876haqkqm5h7bjm7g"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive hashable semigroups text @@ -29677,8 +29641,8 @@ self: { pname = "ast-monad"; version = "0.1.0.0"; sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i"; - revision = "3"; - editedCabalFile = "0lj9g3vhlx42hsirxcwfjksy5w6981gpyms7r5xpih7bnz91cxk7"; + revision = "4"; + editedCabalFile = "131ynmpy5y0c4maj0cp0n3sbbs4k40j7dybgcsad5kv58i63kw23"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A library for constructing AST by using do-notation"; @@ -33029,17 +32993,6 @@ self: { }) {invalid-cabal-flag-settings = null;}; "base-compat" = callPackage - ({ mkDerivation, base, unix }: - mkDerivation { - pname = "base-compat"; - version = "0.10.4"; - sha256 = "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d"; - libraryHaskellDepends = [ base unix ]; - description = "A compatibility layer for base"; - license = stdenv.lib.licenses.mit; - }) {}; - - "base-compat_0_10_5" = callPackage ({ mkDerivation, base, unix }: mkDerivation { pname = "base-compat"; @@ -33048,7 +33001,6 @@ self: { libraryHaskellDepends = [ base unix ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-compat-batteries" = callPackage @@ -34234,8 +34186,8 @@ self: { }: mkDerivation { pname = "bench-show"; - version = "0.2.0"; - sha256 = "17d7dk5r697r9fls14labciwp3rwykv6n5mkhljrjszf2z2c6j65"; + version = "0.2.1"; + sha256 = "1afx5vck4b57r6kanr5g46rk5n8hf9vw4vg2sfqgdb3fhc9979g5"; libraryHaskellDepends = [ ansi-wl-pprint base Chart Chart-diagrams csv directory filepath mwc-random split statistics transformers vector @@ -34925,27 +34877,6 @@ self: { }) {}; "binary-conduit" = callPackage - ({ mkDerivation, base, binary, bytestring, conduit, exceptions - , hspec, QuickCheck, quickcheck-assertions, resourcet, vector - }: - mkDerivation { - pname = "binary-conduit"; - version = "1.3"; - sha256 = "1kfc421r8p0zxn5dkm9kzj4n9pharnl809hkjnr55dbrnr3vvya3"; - revision = "1"; - editedCabalFile = "0y08nw3y5jgrw5waa25b75iwsibnd1m9rbpqrvz5j4xq6baqw6kx"; - libraryHaskellDepends = [ - base binary bytestring conduit exceptions vector - ]; - testHaskellDepends = [ - base binary bytestring conduit hspec QuickCheck - quickcheck-assertions resourcet - ]; - description = "data serialization/deserialization conduit library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "binary-conduit_1_3_1" = callPackage ({ mkDerivation, base, binary, bytestring, conduit, exceptions , hspec, QuickCheck, quickcheck-assertions, resourcet, vector }: @@ -34962,7 +34893,6 @@ self: { ]; description = "data serialization/deserialization conduit library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-derive" = callPackage @@ -41935,17 +41865,18 @@ self: { "cabal-rpm" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, process, time, unix + , http-client, http-client-tls, http-conduit, process, simple-cmd + , time, unix }: mkDerivation { pname = "cabal-rpm"; - version = "0.12.5"; - sha256 = "0xz2qjj52m8pkazy3dbkh0pqhsg3727x9blka24naibgfl1h7vaa"; + version = "0.12.6"; + sha256 = "1k602v7v87w6xcd9a5m8n5grnjbkyn79rdi9azl7djna0rs129ns"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring Cabal directory filepath http-client - http-client-tls http-conduit process time unix + http-client-tls http-conduit process simple-cmd time unix ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; @@ -46622,8 +46553,8 @@ self: { ({ mkDerivation, base, criterion, QuickCheck, random }: mkDerivation { pname = "cl3"; - version = "1.0.0.3"; - sha256 = "16jllcyqdd6i0gq730c88ls47d2334ywr317pm7q6d6vgrjc4gjj"; + version = "1.0.0.4"; + sha256 = "18q5r2m4sr7h8z35nivq2fndmxamyw3217j11na4gq361rq1340v"; libraryHaskellDepends = [ base random ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -48361,23 +48292,6 @@ self: { }) {}; "cmark-gfm" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cheapskate - , criterion, discount, HUnit, markdown, sundown, text - }: - mkDerivation { - pname = "cmark-gfm"; - version = "0.1.5"; - sha256 = "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base HUnit text ]; - benchmarkHaskellDepends = [ - base blaze-html cheapskate criterion discount markdown sundown text - ]; - description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cmark-gfm_0_1_6" = callPackage ({ mkDerivation, base, blaze-html, bytestring, cheapskate , criterion, discount, HUnit, markdown, sundown, text }: @@ -48392,7 +48306,6 @@ self: { ]; description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmark-highlight" = callPackage @@ -52952,8 +52865,8 @@ self: { ({ mkDerivation, base, deepseq, primitive }: mkDerivation { pname = "contiguous"; - version = "0.3.0.0"; - sha256 = "15v53w85f8bxnnrjsj46nfnjshf91b8sld76jcqffzj5nfjxkv28"; + version = "0.3.1.0"; + sha256 = "1x1rv1r05v725xbax2qig36h03gah7mx8r8vd1dcdcy6lm6lsc4i"; libraryHaskellDepends = [ base deepseq primitive ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; @@ -53141,24 +53054,6 @@ self: { }) {}; "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-dsl_0_2_1_3" = callPackage ({ mkDerivation, base, containers, doctest, doctest-discover , temporary }: @@ -53172,7 +53067,6 @@ self: { ]; description = "An alternative to monads for control flow DSLs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-event" = callPackage @@ -55482,20 +55376,6 @@ self: { }) {}; "crypto-enigma" = callPackage - ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck - , split - }: - mkDerivation { - pname = "crypto-enigma"; - version = "0.0.2.13"; - sha256 = "0w82f9hbhhksqkgj3d846l3cgg210ra5133rji2k41mc74l0r0dl"; - libraryHaskellDepends = [ base containers MissingH mtl split ]; - testHaskellDepends = [ base HUnit QuickCheck ]; - description = "An Enigma machine simulator with display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "crypto-enigma_0_0_2_14" = callPackage ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck , split }: @@ -55507,7 +55387,6 @@ self: { testHaskellDepends = [ base HUnit QuickCheck ]; description = "An Enigma machine simulator with display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-multihash" = callPackage @@ -59381,15 +59260,15 @@ self: { }) {}; "data-timeout" = callPackage - ({ mkDerivation, base, data-textual, parsers, tagged, text-printer - , transformers-base + ({ mkDerivation, base, data-textual, parsers, stm, tagged + , text-printer, transformers-base }: mkDerivation { pname = "data-timeout"; - version = "0.3"; - sha256 = "1b6af2x19hb1kynsv7ypc2q6b71cazcg86gf1yhq0rr0fjj478ah"; + version = "0.3.1"; + sha256 = "1pnynkk99d2bhg2l2qd9x4ksp8nc2l7zii3gk6sch1svnbg0liv6"; libraryHaskellDepends = [ - base data-textual parsers tagged text-printer transformers-base + base data-textual parsers stm tagged text-printer transformers-base ]; description = "64-bit timeouts of nanosecond precision"; license = stdenv.lib.licenses.bsd3; @@ -62196,8 +62075,8 @@ self: { }: mkDerivation { pname = "dfinity-radix-tree"; - version = "0.5.0"; - sha256 = "0c721d4vcar7h5alrigi9q63pwwvp0xqwwrvfh6pa9p2y90p820b"; + version = "0.5.2"; + sha256 = "16w7na8sh5fvwrps0wa3m80yzrdg7znx8jgw2i64glvjjs7d5c61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62507,21 +62386,6 @@ self: { }) {}; "dhall-text" = callPackage - ({ mkDerivation, base, dhall, optparse-applicative, text }: - mkDerivation { - pname = "dhall-text"; - version = "1.0.12"; - sha256 = "1k68s83cqlwgivliag9n2vhin385k08f8vd506dcbix5farv9dp6"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base dhall optparse-applicative text - ]; - description = "Template text using Dhall"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dhall-text_1_0_13" = callPackage ({ mkDerivation, base, dhall, optparse-applicative, text }: mkDerivation { pname = "dhall-text"; @@ -62534,7 +62398,6 @@ self: { ]; description = "Template text using Dhall"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-to-cabal" = callPackage @@ -64322,6 +64185,8 @@ self: { pname = "discord-gateway"; version = "0.2.2"; sha256 = "1pc8j2pqrpmgvf31kx24gwj6n96npxdjj6mjf2w9wzh500rdrrzy"; + revision = "1"; + editedCabalFile = "0aw47024gk2hvj0zzy7h01rvv6wxhnjqqjg8prb4x1pajjalg9l5"; libraryHaskellDepends = [ aeson base discord-types hslogger transformers url websockets wuss ]; @@ -64377,6 +64242,8 @@ self: { pname = "discord-rest"; version = "0.2.2"; sha256 = "02sg05zf2m83d6hq5z51cjvw7ycarrmwx9y00c71wiw3hvb84fb3"; + revision = "1"; + editedCabalFile = "0hwiwzgh359cha0j97mwhdjmg1y2zppppbn538pn4ggfn6i7ma11"; libraryHaskellDepends = [ aeson base bytestring comonad data-default discord-types hashable hslogger http-client mtl req stm text time url @@ -64394,6 +64261,8 @@ self: { pname = "discord-types"; version = "0.2.2"; sha256 = "12smb4z6mrj9hhk7jc9r2cz6p4lcix2016ahwp9qapklrql539sc"; + revision = "1"; + editedCabalFile = "015i65pzkxrx6pring1q0fv772r54xrbrbrwa339yqjgzm7c7z7w"; libraryHaskellDepends = [ aeson base hashable text time transformers unordered-containers vector @@ -67425,6 +67294,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dunai-core" = callPackage + ({ mkDerivation, base, MonadRandom, transformers, transformers-base + }: + mkDerivation { + pname = "dunai-core"; + version = "0.5.1.0"; + sha256 = "1p8161m671dgf13q0rnpp797nymdxpi5nf6xl9mh9zj495libbzz"; + libraryHaskellDepends = [ + base MonadRandom transformers transformers-base + ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "duplo" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , base64-bytestring, bytestring, containers, directory @@ -69856,22 +69739,6 @@ self: { }) {}; "email-validate" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "email-validate"; - version = "2.3.2.7"; - sha256 = "1qdl0g8nbngr6kz4xrgi06rn1zf1np55ipk3wwdrg9hpfaaazcs3"; - libraryHaskellDepends = [ - attoparsec base bytestring template-haskell - ]; - testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; - description = "Email address validation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "email-validate_2_3_2_8" = callPackage ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec , QuickCheck, template-haskell }: @@ -69885,7 +69752,6 @@ self: { testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; description = "Email address validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-validate-json" = callPackage @@ -73452,8 +73318,8 @@ self: { }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.5.0.1"; - sha256 = "00gr2x00byfc842p8b5apzc4qi8l0fx8cgrvsi73f1mshkiqs9sp"; + version = "0.6.2"; + sha256 = "11cqk78c0lfsa8mkq7ymxsral0g24p1im4r1ndqsf7rxczjmc37c"; libraryHaskellDepends = [ base containers data-default deepseq directory extensible-effects filepath lens logging-effect monad-control mtl parallel process @@ -73504,22 +73370,6 @@ self: { }) {}; "extra" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.6.12"; - sha256 = "177m9f3hdc8sy6m791q6bmns01avzb0j9wj113rm4748k0bnqngz"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ base directory filepath QuickCheck unix ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_6_13" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, time, unix }: @@ -73533,7 +73383,6 @@ self: { testHaskellDepends = [ base directory filepath QuickCheck unix ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -75299,8 +75148,8 @@ self: { }: mkDerivation { pname = "fficxx"; - version = "0.5"; - sha256 = "16r7pbfxr1xf5jxwyk2qv50yishpk0mzndl88hv9bwpz7gbj55yy"; + version = "0.5.0.1"; + sha256 = "01rvg7y9c0jczypjgrq7b6cbl79n10flsllkbgm9z5hhymwga38s"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring Cabal containers data-default directory either errors filepath hashable haskell-src-exts lens mtl @@ -77693,6 +77542,8 @@ self: { pname = "fmt"; version = "0.6"; sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy"; + revision = "1"; + editedCabalFile = "0xmi4qxq12qfj4ry1ifb0za7jdlvj65v16bzdqi8r7p1xrxy5cki"; libraryHaskellDepends = [ base base64-bytestring bytestring containers formatting microlens text time time-locale-compat @@ -81101,8 +80952,8 @@ self: { }: mkDerivation { pname = "gauge"; - version = "0.2.3"; - sha256 = "0slsimv2zn9yhakxy2wdyfj6bgjd1p65wp6nr8j0ba7df64xykjs"; + version = "0.2.4"; + sha256 = "1p8accsrv0njiqgybz2plwiglg90nazibggc270j7gmqxqna0zr9"; libraryHaskellDepends = [ base basement deepseq directory process vector ]; @@ -82098,6 +81949,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generics-sop_0_4_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core + , template-haskell + }: + mkDerivation { + pname = "generics-sop"; + version = "0.4.0.0"; + sha256 = "0blx09k173qgaghqnsvz6v2r6san1kn62k5c57wilya94l1996ra"; + libraryHaskellDepends = [ + base ghc-prim sop-core template-haskell + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Generic Programming using True Sums of Products"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generics-sop-lens" = callPackage ({ mkDerivation, base, generics-sop, lens }: mkDerivation { @@ -82935,8 +82806,8 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.1.1.2"; - sha256 = "1kggbm3hdg1x0ci3lfps1nglr5hk56ws96yfrv257zaz8kq64s1d"; + version = "0.2.1"; + sha256 = "15dhxhqswi9h8zas0x27hma7pz4c7rn40pppjraax29pi4alaiq9"; libraryHaskellDepends = [ base bytestring mtl transformers vector ]; @@ -85446,6 +85317,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gingersnap" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-types + , postgresql-simple, resource-pool, snap-core + }: + mkDerivation { + pname = "gingersnap"; + version = "0.1.1.0"; + sha256 = "0aqb9ikh21q13mnwf6vcg6chv73vphyag62zhkd4mkhbnlpr816i"; + libraryHaskellDepends = [ + aeson base bytestring http-types postgresql-simple resource-pool + snap-core + ]; + description = "snap-core + aeson + postgresql-simple = delicious"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ginsu" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, containers , directory, hashable, hashtables, mtl, network, old-locale @@ -86019,8 +85906,8 @@ self: { }: mkDerivation { pname = "githash"; - version = "0.1.1.0"; - sha256 = "14532rljfzlkcbqpi69wj31cqlzid0rwwy0kzlwvxp06zh8lq2a0"; + version = "0.1.2.0"; + sha256 = "0pwh0s4gfddy0ixx92ww00v9qam2cx047ivqcm373fw5h2h1vrq8"; libraryHaskellDepends = [ base bytestring directory filepath process template-haskell ]; @@ -90683,8 +90570,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.1.0.3"; - sha256 = "0yinjcd74hdxfvph760cvf319hnrb5skkc174ih7fqjjllrp5din"; + version = "0.1.0.4"; + sha256 = "1ivdh8l6snb2d3g1f7fb46fd9fz6ib2i94b1596pmp38hryl8in0"; libraryHaskellDepends = [ base containers json text ]; description = "Haskell GraphQL query parser-interpreter-data processor"; license = stdenv.lib.licenses.isc; @@ -92667,56 +92554,6 @@ self: { }) {}; "hOpenPGP" = callPackage - ({ mkDerivation, aeson, asn1-encoding, attoparsec, base - , base16-bytestring, base64-bytestring, bifunctors, binary - , binary-conduit, bytestring, bzlib, conduit, conduit-extra - , containers, criterion, crypto-cipher-types, cryptonite, errors - , hashable, incremental-parser, ixset-typed, lens, memory - , monad-loops, nettle, network, network-uri, newtype - , openpgp-asciiarmor, prettyprinter, QuickCheck - , quickcheck-instances, resourcet, semigroups, split, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , transformers, unliftio-core, unordered-containers, zlib - }: - mkDerivation { - pname = "hOpenPGP"; - version = "2.7.3"; - sha256 = "0qxqq46p4l61chkxk7c6lhnscik3gzsgcvszp6ywspk8zp1yhbi8"; - libraryHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring - base64-bytestring bifunctors binary binary-conduit bytestring bzlib - conduit conduit-extra containers crypto-cipher-types cryptonite - errors hashable incremental-parser ixset-typed lens memory - monad-loops nettle network-uri newtype openpgp-asciiarmor - prettyprinter resourcet semigroups split text time - time-locale-compat transformers unliftio-core unordered-containers - zlib - ]; - testHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring bifunctors - binary binary-conduit bytestring bzlib conduit conduit-extra - containers crypto-cipher-types cryptonite errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype prettyprinter QuickCheck - quickcheck-instances resourcet semigroups split tasty tasty-hunit - tasty-quickcheck text time time-locale-compat transformers - unliftio-core unordered-containers zlib - ]; - benchmarkHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bifunctors binary - binary-conduit bytestring bzlib conduit conduit-extra containers - criterion crypto-cipher-types cryptonite errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype openpgp-asciiarmor prettyprinter - resourcet semigroups split text time time-locale-compat - transformers unliftio-core unordered-containers zlib - ]; - description = "native Haskell implementation of OpenPGP (RFC4880)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hOpenPGP_2_7_4_1" = callPackage ({ mkDerivation, aeson, asn1-encoding, attoparsec, base , base16-bytestring, base64-bytestring, bifunctors, binary , binary-conduit, bytestring, bzlib, conduit, conduit-extra @@ -95564,32 +95401,6 @@ self: { }) {}; "hapistrano" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, stm, temporary, time, transformers, yaml - }: - mkDerivation { - pname = "hapistrano"; - version = "0.3.6.0"; - sha256 = "094jv3plkh515mn49hp5bylpxfn7c74n9bdk4843bm88q5hxlnk2"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base filepath formatting gitrev mtl path process time transformers - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process temporary - ]; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hapistrano_0_3_6_1" = callPackage ({ mkDerivation, aeson, async, base, directory, filepath , formatting, gitrev, hspec, mtl, optparse-applicative, path , path-io, process, stm, temporary, time, transformers, yaml @@ -95613,7 +95424,6 @@ self: { ]; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -97721,8 +97531,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.8.0"; - sha256 = "1zj1lkvxhn7l9pgivl7bgzs5mzg8kbzriixwpf8si2nrfx20avkf"; + version = "0.0.9.0"; + sha256 = "1flsz93wbhd61yfydbfbb3q8brhh0d0gzfsdd3xscwvcbdzgw9qr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -114589,8 +114399,8 @@ self: { }: mkDerivation { pname = "html-conduit"; - version = "1.3.1"; - sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi"; + version = "1.3.2"; + sha256 = "0l5hc7bf57p5jiqh3wvnqapc27ibnlv00zm6szc0nqbvknzvvz85"; libraryHaskellDepends = [ attoparsec base bytestring conduit conduit-extra containers resourcet text transformers xml-conduit xml-types @@ -117054,17 +116864,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-json_0_9_0_0" = callPackage + "hw-json_0_9_0_1" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, containers, criterion, directory, dlist, generic-lens - , hspec, hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim + , bytestring, containers, criterion, directory, dlist, hspec + , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim , hw-rankselect, hw-rankselect-base, lens, mmap - , optparse-applicative, resourcet, text, vector, word8 + , optparse-applicative, text, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "0.9.0.0"; - sha256 = "0465pc8k4wvvih4z5klq3ign2cznrb837ivqxg9nrzbx8szsnsc7"; + version = "0.9.0.1"; + sha256 = "00prvi3jrb02g92vq1ghyxpdpqangj482x1k3l13s385804grgqw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117073,9 +116883,9 @@ self: { hw-rankselect-base mmap text vector word8 ]; executableHaskellDepends = [ - 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 + base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery + hw-prim hw-rankselect hw-rankselect-base lens mmap + optparse-applicative vector ]; testHaskellDepends = [ attoparsec base bytestring containers hspec hw-balancedparens @@ -120490,28 +120300,6 @@ self: { }) {}; "incremental-parser" = callPackage - ({ mkDerivation, base, bytestring, checkers, criterion, deepseq - , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text - }: - mkDerivation { - 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 - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq monoid-subclasses text - ]; - description = "Generic parser library capable of providing partial results from partial input"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "incremental-parser_0_3_2" = callPackage ({ mkDerivation, base, bytestring, checkers, criterion, deepseq , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text }: @@ -121900,22 +121688,6 @@ self: { }) {}; "interpolatedstring-perl6" = callPackage - ({ mkDerivation, base, bytestring, haskell-src-meta - , template-haskell, text - }: - mkDerivation { - pname = "interpolatedstring-perl6"; - version = "1.0.0"; - sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring haskell-src-meta template-haskell text - ]; - description = "QuasiQuoter for Perl6-style multi-line interpolated strings"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "interpolatedstring-perl6_1_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, haskell-src-meta, process , template-haskell, text }: @@ -121930,7 +121702,6 @@ self: { ]; description = "QuasiQuoter for Perl6-style multi-line interpolated strings"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpolatedstring-qq" = callPackage @@ -122477,8 +122248,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.0.2"; sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp"; - revision = "3"; - editedCabalFile = "03pwnb66mlx1b8z2d4mn262i2s5mprfr49m0crnssd2nlvm82ifa"; + revision = "4"; + editedCabalFile = "06c51a057n5bc9xfbp2m4jz5ds4z1xvmsx5mppch6qfwbz7x5i9l"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -122788,25 +122559,6 @@ self: { }) {}; "iproute" = callPackage - ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec - , network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; - version = "1.7.5"; - sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd"; - libraryHaskellDepends = [ - appar base byteorder containers network - ]; - testHaskellDepends = [ - appar base byteorder containers doctest hspec network QuickCheck - safe - ]; - description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "iproute_1_7_6" = callPackage ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec , network, QuickCheck, safe }: @@ -122823,7 +122575,6 @@ self: { ]; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -126416,8 +126167,8 @@ self: { }: mkDerivation { pname = "jvm-binary"; - version = "0.1.0"; - sha256 = "0s64cwr86ipl7gpcgdgx50l7mm5h91njgir4mn2d82fzzq08x881"; + version = "0.2.0"; + sha256 = "1pq4v3xzbb9673rvr8qbvyln155v5ric712pf08vvkw1aihwgpa4"; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 deepseq deriving-compat mtl template-haskell text vector @@ -129702,6 +129453,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "language-docker_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process + , QuickCheck, split, template-haskell, text, th-lift, time + }: + mkDerivation { + pname = "language-docker"; + version = "7.0.0"; + sha256 = "0c63la3739fbcf50vy1cp245fk7x723gviyykd3dmggm1jwgm515"; + libraryHaskellDepends = [ + base bytestring containers free megaparsec mtl prettyprinter split + template-haskell text th-lift time + ]; + testHaskellDepends = [ + base bytestring containers directory filepath free Glob hspec HUnit + megaparsec mtl prettyprinter process QuickCheck split + template-haskell text th-lift time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -131386,18 +131160,6 @@ self: { }) {}; "leancheck" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "leancheck"; - version = "0.7.5"; - sha256 = "01hmbcp5kn4k0mgv7y5jap54d65ljdd3sm954s5y28h4xvk6dn7g"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base ]; - description = "Enumerative property-based testing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "leancheck_0_7_7" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; @@ -131407,7 +131169,6 @@ self: { testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leankit-api" = callPackage @@ -133413,8 +133174,8 @@ self: { }: mkDerivation { pname = "lifted-stm"; - version = "0.1"; - sha256 = "1rjz8mkj17w9b7b10qx1ijj4x45abkgzp4khyl3gjmzb654zzym0"; + version = "0.2"; + sha256 = "115yh4rpm7z97jrc088g5jb49amr31kz5sdllpydq3h1yi1wlmbq"; libraryHaskellDepends = [ array base monad-finally stm transformers transformers-abort transformers-base transformers-compat @@ -135137,8 +134898,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.8"; - sha256 = "0gy7zl3ln64aypkci5gc1bxy1j98zfj9wj7z07lk9n07s6ddm9k2"; + version = "0.8.0.1"; + sha256 = "0hnad3cqrvaijnczjy0krbf0szxf0573c5g37746xspwsjy42srd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137280,10 +137041,8 @@ self: { }: mkDerivation { pname = "lucid"; - version = "2.9.10"; - sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0"; - revision = "1"; - editedCabalFile = "0n94x2havrvks85z8azsa4pvz33amhb444cias3kfxmkyvypn5ah"; + version = "2.9.11"; + sha256 = "13xz21hf9ywbyqwm33z8pfrjq03rzffhqswi30xsi13rrawj99cc"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -139179,6 +138938,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; + revision = "1"; + editedCabalFile = "1qfjficc7b6hbg44r3czk8iqgkjmgnp14wmzcdcz4ai93kx8dp44"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -139651,27 +139412,6 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, data-default, data-default-class - , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions - , vector - }: - mkDerivation { - pname = "massiv"; - version = "0.2.1.0"; - sha256 = "0x5qf5hp6ncrjc28xcjd2v4w33wpyy69whmgvvp163y0q3v1n3q7"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq ghc-prim primitive - vector - ]; - testHaskellDepends = [ - base bytestring data-default deepseq hspec QuickCheck - safe-exceptions vector - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv_0_2_2_0" = callPackage ({ mkDerivation, base, bytestring, data-default, data-default-class , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions , vector @@ -139690,7 +139430,6 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "massiv-io" = callPackage @@ -140952,7 +140691,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_7_0_1" = callPackage + "megaparsec_7_0_2" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers @@ -140960,8 +140699,8 @@ self: { }: mkDerivation { pname = "megaparsec"; - version = "7.0.1"; - sha256 = "0b60gyd58n5ql7fnwmxvdz2n3h1nxmxjad52vh9b3ddzm1g3ifvb"; + version = "7.0.2"; + sha256 = "1ny54saxiz0md50mp24gz267gmqjbl8d8b1zi74hi6bcxyhzd278"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -144237,8 +143976,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.29"; - sha256 = "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv"; + version = "0.3.30"; + sha256 = "102l0v75hbvkmrypiyg4ybb6rbc7nij5nxs1aihmqfdpg04rkkp7"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -145666,6 +145405,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monus" = callPackage + ({ mkDerivation, base, containers, smallcheck, tasty + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "monus"; + version = "0.2.0.0"; + sha256 = "1iyzq3ivw6brjf45d3023n8x7hq0ihy8gvjh8hjdsmc6pnm26gw9"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers smallcheck tasty tasty-quickcheck tasty-smallcheck + ]; + description = "a 'Monus' is a commutative monoid that allows a notion of substraction"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monzo" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, hspec, http-client, http-client-tls, mtl, network @@ -146140,22 +145895,20 @@ self: { }) {inherit (pkgs) mpg123;}; "mpi-hs" = callPackage - ({ mkDerivation, base, c2hs, criterion, monad-loops, openmpi, tasty - , tasty-hspec, tasty-hunit, unix + ({ mkDerivation, base, bytestring, c2hs, criterion, monad-loops + , openmpi, store }: mkDerivation { pname = "mpi-hs"; - version = "0.1.0.1"; - sha256 = "19by906z7ccfai23dr61ckzcvv3ccd8l1slf21r7g07zlmjkdrvf"; + version = "0.3.0.0"; + sha256 = "1a8vlsrpvgyzq4p0qa90l4ck3v9a0pncy9bmmn6kjf6j2wa5j9qx"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ]; + libraryHaskellDepends = [ base bytestring monad-loops store ]; librarySystemDepends = [ openmpi ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base monad-loops tasty tasty-hspec tasty-hunit unix - ]; + testHaskellDepends = [ base monad-loops ]; benchmarkHaskellDepends = [ base criterion ]; description = "MPI bindings for Haskell"; license = stdenv.lib.licenses.asl20; @@ -148593,8 +148346,8 @@ self: { }: mkDerivation { pname = "nakadi-client"; - version = "0.6.0.0"; - sha256 = "15hcaccm25frzar2fwyrrhai9kpja7xdcpi2ibl6gf3drp6z65jy"; + version = "0.6.1.0"; + sha256 = "0y6mvw10cbiqib309v38ldjq14xryccs8mhi41zkwpnqldmkyd1x"; libraryHaskellDepends = [ aeson aeson-casing async async-timer base bytestring conduit conduit-extra containers exceptions hashable http-client @@ -151051,8 +150804,8 @@ self: { ({ mkDerivation, base, doctest, network-uri, template-haskell }: mkDerivation { pname = "network-uri-static"; - version = "0.1.0.0"; - sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9"; + version = "0.1.1.0"; + sha256 = "1fjw3a9ypmqf7kl8s9mgwa9jlswz98igp830f1hsyc1hdh9xlrqw"; libraryHaskellDepends = [ base network-uri template-haskell ]; testHaskellDepends = [ base doctest ]; description = "A small utility to declare type-safe static URIs"; @@ -151807,6 +151560,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nixpkgs-update" = callPackage + ({ mkDerivation, base, directory, doctest, errors, filepath, github + , mtl, neat-interpolation, optparse-applicative, regex-applicative + , shelly, text, time, unix, vector + }: + mkDerivation { + pname = "nixpkgs-update"; + version = "0.2.0"; + sha256 = "1vlvkyvvykzcss5w4snmwa9lrd50rss8d2gsv36a69w4y0k2ms5z"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory errors filepath github mtl neat-interpolation + optparse-applicative regex-applicative shelly text time unix vector + ]; + testHaskellDepends = [ + base directory doctest errors filepath github mtl + neat-interpolation optparse-applicative regex-applicative shelly + text time unix vector + ]; + description = "Tool for semi-automatic updating of nixpkgs repository"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "nkjp" = callPackage ({ mkDerivation, base, bytestring, containers, data-named, filepath , polysoup, tar, text, zlib @@ -156894,8 +156671,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.14.5"; - sha256 = "0iiai5f2n8f29p52h4fflhngbh8fj9rrgwfz4nnfhjbrdc0irmz8"; + version = "0.14.8"; + sha256 = "1zxd6n6lsfqdm5w64v2w6wnm70jj9d4n9nqw5pxnmclad1hc38zl"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -156919,41 +156696,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_14_7" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, containers, data-default, directory, filepath, hs-bibutils - , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.14.7"; - sha256 = "18r0pqv170yrsvgarj4xlpgmanydycqq9akxlnp1pkinqhs24iyd"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath mtl pandoc - pandoc-types process temporary text yaml - ]; - doCheck = false; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -157243,8 +156985,8 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.17.5.1"; - sha256 = "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717"; + version = "1.17.5.2"; + sha256 = "0hppl6drhl4xqav35jybji8g8cpy336mqkp0zb66kdsjya9inpqb"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -157258,6 +157000,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-types_1_17_5_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.17.5.3"; + sha256 = "1yrbad67jz8mgdyhl2hvah42g31iwnbvldp16jw87v96y0cbdl72"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Types for representing a structured document"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -158944,8 +158710,8 @@ self: { }: mkDerivation { pname = "patch-image"; - version = "0.3.2"; - sha256 = "00zjpbhw5886zc4cmflqw4721kvndyc7r3i7p5493visqr0d1hvk"; + version = "0.3.2.1"; + sha256 = "1z8m3lfdd2izb6riqzscc40kk8wc7588l24214sg0bkampss1ysg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160825,6 +160591,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-mysql-haskell_0_5_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-logger, mysql-haskell, network, persistent + , persistent-template, resource-pool, resourcet, text, time, tls + , transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.5.0"; + sha256 = "047mlzrav06pm7fpz2x6v6il1gbbm8g0f5s1lvsa2kzmmbvbl4fg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-logger + mysql-haskell network persistent resource-pool resourcet text time + tls transformers unliftio-core + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + description = "A pure haskell backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -161650,8 +161441,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.26.0"; - sha256 = "168qshbiawj1i7d676y2x5l2bmkhfvnf0fs2abr75v8g7hsa8imq"; + version = "0.0.27.0"; + sha256 = "1kx06kf700a849ivfnr36zs1sk7a5al71hx1h7w8b1agklf1kvzn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -163699,52 +163490,73 @@ self: { ({ mkDerivation, aeson, aeson-pretty, aeson-qq, ansi-terminal , approximate, array, async, atomic-primops, base, base-orphans , base16-bytestring, bits, bytestring, bytestring-lexing - , case-insensitive, cborg, comonad, compact, constraints - , containers, contravariant, contravariant-extras, deepseq - , distributive, dlist, double-conversion, Earley, envparse, erf - , exceptions, extra, fgl, filepath, foldl, free, gauge - , generic-aeson, half, hashable, heaps, hedgehog + , case-insensitive, cborg, comonad, compact, compactable + , constraints, containers, contravariant, contravariant-extras + , deepseq, Diff, distributive, dlist, double-conversion, Earley + , email-validate, erf, exact-pi, exceptions, extra, fast-digits + , fgl, filepath, foldl, free, generic-aeson, generic-lens, half + , hashable, heaps, ilist, insert-ordered-containers , integer-logarithms, lens, lens-aeson, list-transformer, logict , managed, megaparsec, mmorph, monad-ste, mtl, multiset, mwc-random - , network, network-info, network-uri, nf, optparse-applicative - , parallel, parser-combinators, pointed, prettyprinter - , prettyprinter-ansi-terminal, primitive, profunctors, psqueues - , reactive-banana, reflection, regex-applicative, scientific + , neat-interpolation, network, network-info, network-uri, nf + , optparse-applicative, parallel, parser-combinators, pointed + , prettyprinter, prettyprinter-ansi-terminal, primitive + , profunctors, psqueues, random-bytestring, reactive-banana + , reflection, regex-applicative, safe, say, scientific , semigroupoids, semigroups, semilattices, serialise, split, stm - , stm-chans, stm-containers, tagged, text, text-short, time - , transformers, transformers-base, transformers-compat - , typed-process, unagi-chan, unix, unliftio, unordered-containers - , utf8-string, uuid, uuid-types, vault, vector, vector-builder - , weigh, writer-cps-mtl + , stm-chans, stm-containers, stringsearch, tagged, text + , text-metrics, text-short, time, transformers, transformers-base + , transformers-compat, typed-process, unagi-chan, unique, unix + , unliftio, unordered-containers, utf8-string, uuid, uuid-types + , vault, vector, vector-builder, writer-cps-mtl }: mkDerivation { pname = "planet-mitchell"; - version = "0.0.0"; - sha256 = "1grz5vbcz169bw9w4b85w7g59hfsif99qg11x0nwm5jb9a6chkhp"; + version = "0.1.0"; + sha256 = "0i9fhv17q6i7gim7k3kklivyg5c4kmxfhlfsdljpdv5sy8hl3jh1"; libraryHaskellDepends = [ aeson aeson-pretty aeson-qq ansi-terminal approximate array async atomic-primops base base-orphans base16-bytestring bits bytestring bytestring-lexing case-insensitive cborg comonad compact - constraints containers contravariant contravariant-extras deepseq - distributive dlist double-conversion Earley envparse erf exceptions - extra fgl filepath foldl free gauge generic-aeson half hashable - heaps hedgehog integer-logarithms lens lens-aeson list-transformer - logict managed megaparsec mmorph monad-ste mtl multiset mwc-random - network network-info network-uri nf optparse-applicative parallel - parser-combinators pointed prettyprinter - prettyprinter-ansi-terminal primitive profunctors psqueues - reactive-banana reflection regex-applicative scientific - semigroupoids semigroups semilattices serialise split stm stm-chans - stm-containers tagged text text-short time transformers - transformers-base transformers-compat typed-process unagi-chan unix - unliftio unordered-containers utf8-string uuid uuid-types vault - vector vector-builder weigh writer-cps-mtl + compactable constraints containers contravariant + contravariant-extras deepseq Diff distributive dlist + double-conversion Earley email-validate erf exact-pi exceptions + extra fast-digits fgl filepath foldl free generic-aeson + generic-lens half hashable heaps ilist insert-ordered-containers + integer-logarithms lens lens-aeson list-transformer logict managed + megaparsec mmorph monad-ste mtl multiset mwc-random + neat-interpolation network network-info network-uri nf + optparse-applicative parallel parser-combinators pointed + prettyprinter prettyprinter-ansi-terminal primitive profunctors + psqueues random-bytestring reactive-banana reflection + regex-applicative safe say scientific semigroupoids semigroups + semilattices serialise split stm stm-chans stm-containers + stringsearch tagged text text-metrics text-short time transformers + transformers-base transformers-compat typed-process unagi-chan + unique unix unliftio unordered-containers utf8-string uuid + uuid-types vault vector vector-builder writer-cps-mtl ]; description = "Planet Mitchell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "planet-mitchell-test" = callPackage + ({ mkDerivation, gauge, hedgehog, hspec-expectations, tasty + , tasty-hedgehog, tasty-hunit, tasty-rerun, weigh + }: + mkDerivation { + pname = "planet-mitchell-test"; + version = "0.0.0"; + sha256 = "09nmdz34nz7gdq7x48pmimn966vrnlicg3q74a6m3r29vn9wh47d"; + libraryHaskellDepends = [ + gauge hedgehog hspec-expectations tasty tasty-hedgehog tasty-hunit + tasty-rerun weigh + ]; + description = "Planet Mitchell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plankton" = callPackage ({ mkDerivation, adjunctions, base, protolude }: mkDerivation { @@ -168981,8 +168793,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.4.1"; - sha256 = "13adj770k3awgsdipjkwgfja6b1hkxdphf0aa4jayxm2jz9gkpbd"; + version = "5.5.0"; + sha256 = "0mcj3xsi125vcxf605h8fm4swg84b79iv01qnhv5vmp872dhmwbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173761,8 +173573,10 @@ self: { ({ mkDerivation, base, stm, time, time-units }: mkDerivation { pname = "rate-limit"; - version = "1.4.0"; - sha256 = "0p0bnfnn790kkpgj6v6646fbczznf28a65zsf92xyiab00jw6ilb"; + version = "1.4.1"; + sha256 = "0gm5jmi779niqsbgmkqqx6dsfw6yvfp4wlfibg9fzzmcc4i968g2"; + revision = "1"; + editedCabalFile = "01f3wf7q6117g2q5b9pp2rranxqyccmyl961r81151dpx21fiar7"; libraryHaskellDepends = [ base stm time time-units ]; description = "A basic library for rate-limiting IO actions"; license = stdenv.lib.licenses.bsd3; @@ -175077,8 +174891,8 @@ self: { }: mkDerivation { pname = "records-sop"; - version = "0.1.0.1"; - sha256 = "1832cgh1ry1slj10ff2qpxr6ibbvii7z1hvvdcwhyj55c31zrhlc"; + version = "0.1.0.2"; + sha256 = "187x3cq7h1rkmbv8qp810fcnr5y4byqwgw329v7f0s0px2vmg4h5"; libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ]; testHaskellDepends = [ base deepseq generics-sop hspec should-not-typecheck @@ -179199,19 +179013,6 @@ self: { }) {}; "rfc5051" = callPackage - ({ mkDerivation, base, bytestring, containers }: - mkDerivation { - pname = "rfc5051"; - version = "0.1.0.3"; - sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring containers ]; - description = "Simple unicode collation as per RFC5051"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rfc5051_0_1_0_4" = callPackage ({ mkDerivation, base, bytestring, containers }: mkDerivation { pname = "rfc5051"; @@ -179222,7 +179023,6 @@ self: { libraryHaskellDepends = [ base bytestring containers ]; description = "Simple unicode collation as per RFC5051"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rgb-color-model" = callPackage @@ -186548,6 +186348,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-http2-client" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring + , case-insensitive, containers, data-default-class, exceptions + , http-media, http-types, http2, http2-client, mtl, servant + , servant-client-core, text, tls, transformers + }: + mkDerivation { + pname = "servant-http2-client"; + version = "0.1.0.1"; + sha256 = "0jlbczbgbkjx4hai24csnd07r074s36g5hbpizhdxiqr3dcjk8pw"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive containers exceptions + http-media http-types http2 http2-client mtl servant-client-core + text transformers + ]; + testHaskellDepends = [ + aeson async base binary bytestring case-insensitive containers + data-default-class exceptions http-media http-types http2 + http2-client mtl servant servant-client-core text tls transformers + ]; + description = "Generate HTTP2 clients from Servant API descriptions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-iCalendar" = callPackage ({ mkDerivation, base, data-default, http-media, iCalendar, servant }: @@ -187329,34 +187153,6 @@ self: { }) {}; "servant-swagger" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal - , cabal-doctest, directory, doctest, filepath, hspec - , hspec-discover, http-media, insert-ordered-containers, lens - , QuickCheck, servant, singleton-bool, swagger2, text, time - , unordered-containers - }: - mkDerivation { - pname = "servant-swagger"; - version = "1.1.5"; - sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg"; - revision = "5"; - editedCabalFile = "1c160wf4q0jyjg03w7hkwkbz0aprvmvzpwa5m944msik2kbvnyl5"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base bytestring hspec http-media insert-ordered-containers - lens QuickCheck servant singleton-bool swagger2 text - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-qq base directory doctest filepath hspec lens - QuickCheck servant swagger2 text time - ]; - testToolDepends = [ hspec-discover ]; - description = "Generate Swagger specification for your servant API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger_1_1_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , Cabal, cabal-doctest, directory, doctest, filepath, hspec , hspec-discover, http-media, insert-ordered-containers, lens @@ -187380,7 +187176,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui" = callPackage @@ -188883,31 +188678,6 @@ self: { }) {}; "shakespeare" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.0.18"; - sha256 = "1ny9j1p12c134q5y7k2lg8qgf8sqa328vrb8md9ib44w3xwy6wjr"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_19" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec , process, scientific, template-haskell, text, time, transformers @@ -188929,7 +188699,6 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -191378,23 +191147,6 @@ self: { }) {}; "size-based" = callPackage - ({ mkDerivation, base, dictionary-sharing, template-haskell - , testing-type-modifiers - }: - mkDerivation { - pname = "size-based"; - version = "0.1.1.0"; - sha256 = "1z6w3qdx34c6y4gbs0b9zshn5al55lxzc7mfyywm91vcwi361xki"; - revision = "1"; - editedCabalFile = "1rw9ddw1vyv9k47p0d79qbvngym005fmz00hqrg3p1rq2vlfjdv2"; - libraryHaskellDepends = [ - base dictionary-sharing template-haskell testing-type-modifiers - ]; - description = "Sized functors, for size-based enumerations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "size-based_0_1_2_0" = callPackage ({ mkDerivation, base, dictionary-sharing, template-haskell , testing-type-modifiers }: @@ -191407,7 +191159,6 @@ self: { ]; description = "Sized functors, for size-based enumerations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sized" = callPackage @@ -191863,30 +191614,6 @@ self: { }) {}; "slack-web" = callPackage - ({ mkDerivation, aeson, base, containers, errors, hspec - , http-api-data, http-client, http-client-tls, megaparsec, mtl - , servant, servant-client, servant-client-core, text, time - , transformers - }: - mkDerivation { - pname = "slack-web"; - version = "0.2.0.6"; - sha256 = "1rydw71na7qninys7nqyn36mld5a5csvlsf01yzansnn2gvpdh2a"; - libraryHaskellDepends = [ - aeson base containers errors http-api-data http-client - http-client-tls megaparsec mtl servant servant-client - servant-client-core text time transformers - ]; - testHaskellDepends = [ - aeson base containers errors hspec http-api-data megaparsec text - time - ]; - description = "Bindings for the Slack web API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "slack-web_0_2_0_7" = callPackage ({ mkDerivation, aeson, base, containers, errors, hspec , http-api-data, http-client, http-client-tls, megaparsec, mtl , servant, servant-client, servant-client-core, text, time @@ -194652,6 +194379,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sop-core" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "sop-core"; + version = "0.4.0.0"; + sha256 = "07ci2mh8cbjvipb576rxsj3iyhkj5c5dnsns4xkdppp2p3pv10d3"; + libraryHaskellDepends = [ base deepseq ]; + description = "True Sums of Products"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sophia" = callPackage ({ mkDerivation, base, binary, bindings-sophia, bytestring , criterion, directory, tasty, tasty-hunit @@ -199102,6 +198840,58 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store_0_5_0_1" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, network, primitive, resourcet, safe, semigroups + , smallcheck, store-core, syb, template-haskell, text, th-lift + , th-lift-instances, th-orphans, th-reify-many, th-utilities, time + , transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.5.0.1"; + sha256 = "0dpm7752p8lhlwq5nlhqxwq1c5nyi97rnj83j2im3i9wvs2qb3i3"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable network primitive + resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector clock containers contravariant + criterion cryptohash deepseq directory filepath free ghc-prim + hashable hspec hspec-smallcheck integer-gmp lifted-base + monad-control mono-traversable network primitive resourcet safe + semigroups smallcheck store-core syb template-haskell text th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unordered-containers vector vector-binary-instances + void weigh + ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant criterion cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable network + primitive resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -207331,8 +207121,8 @@ self: { }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.5.1"; - sha256 = "14hmzsxhbqr95r7sbpziv897akdw8p54fhwh56j0h9hqnpwxxwgd"; + version = "0.1.5.2"; + sha256 = "1rzzdbi16zndbsbsc83zd24ni2z1g6ndvjn3ylwagxr9xhh0iwp5"; libraryHaskellDepends = [ base bytestring containers data-default parsec text time ]; @@ -211412,6 +211202,8 @@ self: { pname = "toodles"; version = "0.1.0.9"; sha256 = "01gjxd4pclilm19iw7nkr23pmyavd7d9k0wa1c63hwhdzm1591f7"; + revision = "3"; + editedCabalFile = "08zadf5r79dpw9g0hg6lsnyvcnpprzb9d0lfs67kpyigm5ih9w8w"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -216497,22 +216289,6 @@ self: { }) {}; "union" = callPackage - ({ mkDerivation, base, criterion, deepseq, lens, profunctors - , tagged, vinyl - }: - mkDerivation { - pname = "union"; - version = "0.1.1.2"; - sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw"; - revision = "5"; - editedCabalFile = "0mphzzvvr8lh1x8mb6n9nzzskx32cmr6ycihdy68qw35ybrqb0aj"; - libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; - benchmarkHaskellDepends = [ base criterion deepseq lens ]; - description = "Extensible type-safe unions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "union_0_1_2" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, lens , profunctors, tagged, vinyl }: @@ -216526,7 +216302,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "union-find" = callPackage @@ -229632,8 +229407,8 @@ self: { pname = "yampa-canvas"; version = "0.2.2"; sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n"; - revision = "6"; - editedCabalFile = "05bfjzmfvy4ir1bkky8iq4m988z4yww2k7h8s1na5i9w60c26d20"; + revision = "7"; + editedCabalFile = "1bj5ncrkwjpvjvrx0s23ksvwwsrybj7zl3sghl1d034wd9r89mxx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -229696,6 +229471,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yampa-test" = callPackage + ({ mkDerivation, base, Cabal, cabal-test-quickcheck + , normaldistribution, QuickCheck, random, Yampa + }: + mkDerivation { + pname = "yampa-test"; + version = "0.1.0.0"; + sha256 = "1d69qa8dzwsj6pawlg88vwv1r2ig2vnx11zbaq0pbl5hczfnknpd"; + libraryHaskellDepends = [ + base normaldistribution QuickCheck Yampa + ]; + testHaskellDepends = [ + base Cabal cabal-test-quickcheck QuickCheck random Yampa + ]; + description = "Testing library for Yampa"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yampa2048" = callPackage ({ mkDerivation, base, gloss, random, Yampa }: mkDerivation { @@ -229974,24 +229767,6 @@ self: { }) {}; "yeshql-core" = callPackage - ({ mkDerivation, base, containers, convertible, filepath, parsec - , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell - }: - mkDerivation { - pname = "yeshql-core"; - version = "4.1.0.1"; - sha256 = "1v15n7h69j6v3zgvdbvy08l8in9z3yl9cbbfny4998i4p7fl2nzn"; - libraryHaskellDepends = [ - base containers convertible filepath parsec template-haskell - ]; - testHaskellDepends = [ - base containers stm tasty tasty-hunit tasty-quickcheck - ]; - description = "YesQL-style SQL database abstraction (core)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yeshql-core_4_1_0_2" = callPackage ({ mkDerivation, base, containers, convertible, filepath, parsec , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell }: @@ -230007,30 +229782,9 @@ self: { ]; description = "YesQL-style SQL database abstraction (core)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yeshql-hdbc" = callPackage - ({ mkDerivation, base, containers, convertible, filepath, HDBC - , parsec, stm, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, yeshql-core - }: - mkDerivation { - pname = "yeshql-hdbc"; - version = "4.1.0.1"; - sha256 = "0a5wkjkq1lfqk5cv7wmxbx28j6r3xqj8bbkafxfjvs2s02x4qvvc"; - libraryHaskellDepends = [ - base containers convertible filepath HDBC parsec template-haskell - yeshql-core - ]; - testHaskellDepends = [ - base containers HDBC stm tasty tasty-hunit tasty-quickcheck - ]; - description = "YesQL-style SQL database abstraction (HDBC backend)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yeshql-hdbc_4_1_0_2" = callPackage ({ mkDerivation, base, containers, convertible, filepath, HDBC , parsec, stm, tasty, tasty-hunit, tasty-quickcheck , template-haskell, yeshql-core @@ -230048,7 +229802,6 @@ self: { ]; description = "YesQL-style SQL database abstraction (HDBC backend)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yeshql-postgresql-simple" = callPackage @@ -230196,34 +229949,6 @@ self: { }) {}; "yesod-auth" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers - , cryptonite, data-default, email-validate, file-embed, http-client - , http-client-tls, http-conduit, http-types, memory, network-uri - , nonce, persistent, random, safe, shakespeare, template-haskell - , text, time, transformers, unliftio, unliftio-core - , unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.6.4.1"; - sha256 = "1s1z39j7csp57py15w0il5bhi60y05b81abwfmccjllzzgs97m7j"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-client-tls http-conduit http-types - memory network-uri nonce persistent random safe shakespeare - template-haskell text time transformers unliftio unliftio-core - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth_1_6_5" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers @@ -230249,7 +229974,6 @@ self: { ]; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -230782,42 +230506,6 @@ self: { }) {}; "yesod-core" = 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.8"; - sha256 = "010wjhf053bhivxascvlrxfmsqirhx6mf54aph3xblrkq8sx64hy"; - 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; - }) {}; - - "yesod-core_1_6_8_1" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie @@ -230851,7 +230539,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -231113,28 +230800,6 @@ self: { }) {}; "yesod-form" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, text, time, transformers, wai - , xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; - version = "1.6.2"; - sha256 = "1p1x1hffvarplc82ykdk7rm6p5isqgqf78bvxzpfhncxs4kwx057"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare text time - transformers wai xss-sanitize yesod-core yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_6_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -231154,7 +230819,6 @@ self: { testHaskellDepends = [ base hspec text time ]; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bootstrap4" = callPackage @@ -231520,27 +231184,6 @@ self: { }) {}; "yesod-persistent" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent - , persistent-sqlite, persistent-template, resource-pool, resourcet - , text, transformers, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-persistent"; - version = "1.6.0"; - sha256 = "1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2"; - libraryHaskellDepends = [ - base blaze-builder conduit persistent persistent-template - resource-pool resourcet transformers yesod-core - ]; - testHaskellDepends = [ - base blaze-builder conduit hspec persistent persistent-sqlite text - wai-extra yesod-core - ]; - description = "Some helpers for using Persistent from Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-persistent_1_6_0_1" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet , text, transformers, wai-extra, yesod-core @@ -231559,7 +231202,6 @@ self: { ]; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-platform" = callPackage @@ -231985,40 +231627,6 @@ self: { }) {}; "yesod-static" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, byteable, bytestring, conduit, containers - , cryptonite, cryptonite-conduit, css-text, data-default, directory - , exceptions, file-embed, filepath, hashable, hjsmin, hspec - , http-types, HUnit, memory, mime-types, old-time, process - , resourcet, template-haskell, text, transformers, unix-compat - , unordered-containers, wai, wai-app-static, wai-extra, yesod-core - , yesod-test - }: - mkDerivation { - pname = "yesod-static"; - version = "1.6.0"; - sha256 = "03l8jjn3pw7j38i91hakf1lgr4lf2lc610a783i7zhmr9f9ga2xx"; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder byteable - bytestring conduit containers cryptonite cryptonite-conduit - css-text data-default directory exceptions file-embed filepath - hashable hjsmin http-types memory mime-types old-time process - resourcet template-haskell text transformers unix-compat - unordered-containers wai wai-app-static yesod-core - ]; - testHaskellDepends = [ - async base base64-bytestring byteable bytestring conduit containers - cryptonite cryptonite-conduit data-default directory exceptions - file-embed filepath hjsmin hspec http-types HUnit memory mime-types - old-time process resourcet template-haskell text transformers - unix-compat unordered-containers wai wai-app-static wai-extra - yesod-core yesod-test - ]; - description = "Static file serving subsite for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-static_1_6_0_1" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, conduit, containers, cryptonite , cryptonite-conduit, css-text, data-default, directory, file-embed @@ -232048,7 +231656,6 @@ self: { ]; description = "Static file serving subsite for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-static-angular" = callPackage @@ -232131,31 +231738,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , bytestring, case-insensitive, conduit, containers, cookie, hspec - , hspec-core, html-conduit, http-types, HUnit, network, pretty-show - , semigroups, text, time, transformers, unliftio, wai, wai-extra - , xml-conduit, xml-types, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.6.5"; - sha256 = "1n03h7rx9ixgvlf8isnr7b1g73fkpg8paiklr20b40x0yzvlc0my"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit network pretty-show semigroups text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai wai-extra xml-conduit yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_5_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , bytestring, case-insensitive, conduit, containers, cookie, hspec , hspec-core, html-conduit, http-types, HUnit, network, pretty-show @@ -232178,7 +231760,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -233928,6 +233509,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zip-stream_0_2_0_1" = callPackage + ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit + , conduit-extra, digest, directory, exceptions, filepath, mtl + , primitive, resourcet, text, time, transformers, transformers-base + , zlib + }: + mkDerivation { + pname = "zip-stream"; + version = "0.2.0.1"; + sha256 = "11x58s5w1lr8hw86grxijd94sw5r8k376b8n4dlm8lqz5xhmri5p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary binary-conduit bytestring conduit conduit-extra digest + exceptions mtl primitive resourcet text time transformers-base zlib + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-extra directory filepath resourcet + text time transformers + ]; + description = "ZIP archive streaming using conduits"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zipedit" = callPackage ({ mkDerivation, base, directory, mtl, process }: mkDerivation { diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 6155e158e9d..f4ebe549c50 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -245,12 +245,13 @@ rec { on hackage. This can be used as a test for the source distribution, assuming the build fails when packaging mistakes are in the cabal file. */ - buildFromSdist = pkg: lib.overrideDerivation pkg (drv: { - unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' - echo "Source tarball is at ${src}/${tarname}.tar.gz" - tar xf ${src}/${tarname}.tar.gz - cd ${pkg.pname}-* - ''; + buildFromSdist = pkg: overrideCabal pkg (drv: { + src = "${sdistTarball pkg}/${pkg.pname}-${pkg.version}.tar.gz"; + + # Revising and jailbreaking the cabal file has been handled in sdistTarball + revision = null; + editedCabalFile = null; + jailbreak = false; }); /* Build the package in a strict way to uncover potential problems. diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix index 1e234b3f693..91ee174dadf 100644 --- a/pkgs/development/idris-modules/categories.nix +++ b/pkgs/development/idris-modules/categories.nix @@ -6,11 +6,10 @@ build-idris-package { name = "categories"; version = "2018-07-02"; - # https://github.com/danilkolikov/categories/pull/5 src = fetchFromGitHub { - owner = "infinisil"; + owner = "danilkolikov"; repo = "categories"; - rev = "9722d62297e5025431e91b271ab09c5d14867236"; + rev = "a1e0ac0f0da2e336a7d3900051892ff7ed504c35"; sha256 = "1bbmm8zif5d5wckdaddw6q3c39w6ms1cxrlrmkdn7bik88dawff2"; }; diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix index 7b6cb64cfe3..7f3164f3160 100644 --- a/pkgs/development/idris-modules/derive.nix +++ b/pkgs/development/idris-modules/derive.nix @@ -10,12 +10,11 @@ build-idris-package { idrisDeps = [ contrib pruviloj ]; - # https://github.com/david-christiansen/derive-all-the-instances/pull/9 src = fetchFromGitHub { - owner = "infinisil"; + owner = "david-christiansen"; repo = "derive-all-the-instances"; - rev = "61c3e12e26f599379299fcbb9c40a81bfc3e0604"; - sha256 = "0g2lb8nrwqwf3gm5fir43cxz6db84n19xiwkv8cmmqc1fgy6v0qn"; + rev = "0a9a5082d4ab6f879a2c141d1a7b645fa73fd950"; + sha256 = "06za15m1kv9mijzll5712crry4iwx3b0fjv76gy9vv1p10gy2g4m"; }; meta = { diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix index d97d416bc27..adbbbaff890 100644 --- a/pkgs/development/interpreters/elixir/1.7.nix +++ b/pkgs/development/interpreters/elixir/1.7.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.7.3"; - sha256 = "0d7rj4khmvy76z12njzwzknm1j9rhjadgj9k1chjd4gnjffkb1aa"; + version = "1.7.4"; + sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla"; minimumOTPVersion = "19"; } diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 01600f90f28..23d20f418c3 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -3,7 +3,7 @@ , enablePython ? false, pythonPackages , enablePosixThreads ? false , enableOpenMPThreads ? false}: -with stdenv.lib; +with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; version = "2.9.0"; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "1mh9zkfb5dj3j8fk3gdhz2bp6z13nik5pmynpf5l6qy3lhgyn17z"; }; + postPatch = '' + substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir} + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ netcdf diff --git a/pkgs/development/libraries/gsignond/conf.patch b/pkgs/development/libraries/gsignond/conf.patch new file mode 100644 index 00000000000..0aa2034e399 --- /dev/null +++ b/pkgs/development/libraries/gsignond/conf.patch @@ -0,0 +1,12 @@ +diff --git a/meson.build b/meson.build +index cb1e0df..d90c85c 100644 +--- a/meson.build ++++ b/meson.build +@@ -95,6 +95,6 @@ endif + configure_file( + input: 'gsignond.conf.in', + configuration: conf_data, +- install_dir: sysconf_dir, ++ install_dir: 'etc/', + output: 'gsignond.conf' + ) diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix new file mode 100644 index 00000000000..11dcc2a2ee9 --- /dev/null +++ b/pkgs/development/libraries/gsignond/default.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking +, sqlite, gobjectIntrospection, vala, gtk-doc, libsecret, docbook_xsl +, docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper +, symlinkJoin, gsignondPlugins, plugins }: + +let +unwrapped = stdenv.mkDerivation rec { + pname = "gsignond"; + version = "39022c86ddb5062a10fb0503ad9d81a8e532d527"; + + name = "${pname}-2018-10-04"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = pname; + rev = version; + sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff"; + }; + + nativeBuildInputs = [ + docbook_xml_dtd_43 + docbook_xml_dtd_45 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + glib + glib-networking + libsecret + ]; + + propagatedBuildInputs = [ sqlite ]; + + mesonFlags = [ + "-Dbus_type=session" + "-Dextension=desktop" + ]; + + LC_ALL = "en_US.UTF-8"; + + patches = [ + ./conf.patch + ./plugin-load-env.patch + ]; + + meta = with stdenv.lib; { + description = "D-Bus service which performs user authentication on behalf of its clients"; + homepage = https://gitlab.com/accounts-sso/gsignond; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +}; + +in if plugins == [] then unwrapped + else import ./wrapper.nix { + inherit stdenv makeWrapper symlinkJoin gsignondPlugins plugins; + gsignond = unwrapped; + } + diff --git a/pkgs/development/libraries/gsignond/plugin-load-env.patch b/pkgs/development/libraries/gsignond/plugin-load-env.patch new file mode 100644 index 00000000000..5da2b4c157e --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugin-load-env.patch @@ -0,0 +1,35 @@ +diff --git a/src/gplugind/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c +index 5497b32..979e1b4 100644 +--- a/src/gplugind/gsignond-plugin-loader.c ++++ b/src/gplugind/gsignond-plugin-loader.c +@@ -38,11 +38,10 @@ gsignond_load_plugin ( + gchar *plugin_filename; + GSignondPlugin *plugin; + +-# ifdef ENABLE_DEBUG + const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR"); + if (env_val) + plugin_path = env_val; +-# endif ++ + plugin_filename = g_module_build_path (plugin_path, plugin_type); + plugin = gsignond_load_plugin_with_filename (plugin_type, + plugin_filename); +diff --git a/src/gplugind/main.c b/src/gplugind/main.c +index 1c6cdb6..c85c623 100644 +--- a/src/gplugind/main.c ++++ b/src/gplugind/main.c +@@ -93,11 +93,11 @@ _install_sighandlers (GMainLoop *main_loop) + static const gchar* _plugin_path(void) + { + const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR; +-# ifdef ENABLE_DEBUG ++ + const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR"); + if (env_val) + plugin_path = env_val; +-# endif ++ + return plugin_path; + } + diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix new file mode 100644 index 00000000000..a23c1487881 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-lastfm-${version}"; + version = "2018-05-07"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-lastfm"; + rev = "0a7a5f8511282e45cfe35987b81f27f158f0648c"; + sha256 = "0ay6ir9zg9l0264x5xwd7c6j8qmwlhrifkkkjd1yrjh9sqxyfj7f"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + glib + gsignond + json-glib + libsoup + ]; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon handles the Last.FM credentials."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix new file mode 100644 index 00000000000..763e76c9cc9 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-mail-${version}"; + version = "2018-10-04"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-mail"; + rev = "fbc6f34b246fec4ad2b37c696f8de7fdb9bde346"; + sha256 = "1wvwz7qiwvj8iixprip3qd8lplzfnwcjfrbg2vd8xfsvid2zbviw"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + glib + gsignond + ]; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon that handles the E-Mail credentials."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix new file mode 100644 index 00000000000..ee45430122c --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, check +, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 +, docbook_xsl, glibcLocales, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-oauth-${version}"; + version = "2018-10-15"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-oa"; + rev = "d471cebfd7c50567b1244277a9559f18f8d58691"; + sha256 = "00axl8wwp2arc6h4bpr4m3ik2hy8an0lbm48q2a9r94krmq56hnx"; + }; + + nativeBuildInputs = [ + check + docbook_xml_dtd_43 + docbook_xml_dtd_45 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + ]; + + buildInputs = [ + glib + gnutls + gsignond + json-glib + libsoup + ]; + + LC_ALL = "en_US.UTF-8"; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix new file mode 100644 index 00000000000..25f20557906 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, gsasl, check +, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-sasl-${version}"; + version = "2018-10-15"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-sasl"; + rev = "b304c70b7dad9368b23b1205122d10de684c896a"; + sha256 = "0knzw7c2fm2kzs1gxbrm4kk67522w9cpwqj7xvn86473068k90va"; + }; + + nativeBuildInputs = [ + check + docbook_xml_dtd_43 + docbook_xml_dtd_45 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + ]; + + buildInputs = [ + glib + gsasl + gsignond + ]; + + LC_ALL = "en_US.UTF-8"; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix new file mode 100644 index 00000000000..a5df6bbeafb --- /dev/null +++ b/pkgs/development/libraries/gsignond/wrapper.nix @@ -0,0 +1,23 @@ +{ stdenv, makeWrapper, symlinkJoin, gsignond, gsignondPlugins, plugins }: + +symlinkJoin { + name = "gsignond-with-plugins-${gsignond.version}"; + + paths = [ gsignond ] ++ plugins; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/gsignond \ + --set SSO_GPLUGINS_DIR "$out/lib/gsignond/gplugins" + + rm $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service + rm $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service + + substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service \ + --replace ${gsignond} $out + + substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \ + --replace ${gsignond} $out + ''; +} diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 4da9db3ef04..f445f90f308 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,30 +1,38 @@ -{stdenv, fetchurl -, automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt -, glib, systemd, libusb1, vala_0_38 +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobjectIntrospection +, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44 +, glib, systemd, libusb1, vala, hwdata }: stdenv.mkDerivation rec { name = "gusb-${version}"; - version = "0.2.11"; - enableParallelBuilding = true; + version = "0.3.0"; + + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw"; + sha256 = "1p4f6jdjw6zl986f93gzdjg2hdcn5dlz6rcckcz4rbmnk47rbryq"; }; - preConfigure = "./autogen.sh"; - - nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext - gobjectIntrospection libxslt vala_0_38 ]; - buildInputs = [ systemd glib ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext + gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 + gobjectIntrospection vala + ]; + buildInputs = [ systemd glib ]; propagatedBuildInputs = [ libusb1 ]; - meta = { + mesonFlags = [ + "-Dusb_ids=${hwdata}/share/hwdata/usb.ids" + ]; + + doCheck = false; # tests try to access USB + + meta = with stdenv.lib; { description = "GLib libusb wrapper"; - homepage = https://people.freedesktop.org/~hughsient/releases/; - license = stdenv.lib.licenses.lgpl21; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/hughsie/libgusb; + license = licenses.lgpl21; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix new file mode 100644 index 00000000000..175097ef785 --- /dev/null +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "jitterentropy-${version}"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "smuellerDD"; + repo = "jitterentropy-library"; + rev = "v${version}"; + sha256 = "10yl1hi0hysr53wzy2i8brs0qqnxh46mz3dcjh5mk0ad03wvbfsl"; + }; + + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/include + ''; + + installFlags = [ + "PREFIX=$(out)" + ]; + + meta = { + description = "Provides a noise source using the CPU execution timing jitter"; + homepage = https://github.com/smuellerDD/jitterentropy-library; + license = with stdenv.lib.licenses; [ gpl2 bsd3 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; + }; +} diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index e2d7d09b259..87c6bb03d4b 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "14l6bvgq76ls63qc9c448r435q9xiig0rv8ilx6rnjvlgg64h32p"; + sha256 = "1w8wkh03j5zdgbamyj7wv2f6k76kd0w4z04abxxf5b0mnplrb6vb"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index ba267b79787..d4c324d4f23 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-usb-ids-path=${hwdata}/data/hwdata/usb.ids" - "--with-pci-ids-path=${hwdata}/data/hwdata/pci.ids" + "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids" + "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids" "--enable-gtk-doc" ]; diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix new file mode 100644 index 00000000000..2c0ef60bc63 --- /dev/null +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchgit, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobjectIntrospection }: + +stdenv.mkDerivation rec { + pname = "libsignon-glib"; + version = "3639a2e90447e4640a03a44972560afe8f61aa48"; + + name = "${pname}-2018-10-24"; + + outputs = [ "out" "dev" "devdoc" "py" ]; + + src = fetchgit { + url = "https://gitlab.com/accounts-sso/${pname}"; + rev = version; + fetchSubmodules = true; + sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w"; + }; + + nativeBuildInputs = [ + check + docbook_xml_dtd_412 + docbook_xml_dtd_43 + docbook_xsl + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + python3 + vala + ]; + + buildInputs = [ + glib + python3.pkgs.pygobject3 + ]; + + mesonFlags = [ + "-Dintrospection=true" + "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" + ]; + + postPatch = '' + chmod +x build-aux/gen-error-map.py + patchShebangs build-aux/gen-error-map.py + ''; + + meta = with stdenv.lib; { + description = '' + A library for managing single signon credentials which can be used from GLib applications + ''; + homepage = https://gitlab.com/accounts-sso/libsignon-glib; + license = licenses.lgpl21; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index f50b64fca3e..8f72b333aa4 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.1.4"; + version = "1.1.5"; name = "nanomsg-${version}"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nanomsg"; rev = version; - sha256 = "11mxbhkxkzqwdmpl79mfiiqby7zawgkalips7zr0bbdfyhq7jyrl"; + sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index d0f992efb2b..87f9b5effac 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = { + meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 7aad5be36f7..61a40753a56 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = { + meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 7d0e934d911..0c597fc4b33 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -43,5 +43,8 @@ in stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; homepage = https://www.unidata.ucar.edu/software/netcdf/; + license = { + url = https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html; + }; }; } diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index c7e133d94b2..3c5ae8537a4 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus for .NET"; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 9cb7d701b9d..cdbd57d785f 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -35,9 +35,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.mozilla.org/projects/nspr/; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mpl20; }; } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 3089e6da23a..8a3de28b784 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.38"; + version = "3.39"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz"; - sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c"; + url = "mirror://mozilla/security/nss/releases/NSS_3_39_RTM/src/${name}.tar.gz"; + sha256 = "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb"; }; buildInputs = [ perl zlib sqlite ] @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { preConfigure = "cd nss"; makeFlags = [ - "NSPR_INCLUDE_DIR=${nspr.dev}/include/nspr" + "NSPR_INCLUDE_DIR=${nspr.dev}/include" "NSPR_LIB_DIR=${nspr.out}/lib" "NSDISTMODE=copy" "BUILD_OPT=1" diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 44c8f51e856..25e084bfb74 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c ''; - meta = { + meta = with stdenv.lib; { description = "Network Connectivity Tracking library for Desktop Applications"; homepage = https://launchpad.net/ntrack; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + platforms = platforms.linux; + license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index b6728829660..aa188650860 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5"; }; - meta = { + meta = with stdenv.lib; { description = "Open Dynamics Engine"; - platforms = stdenv.lib.platforms.linux; + homepage = https://sourceforge.net/projects/opende; + platforms = platforms.linux; + license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; }; } diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index f86e4d12097..1658e831ddd 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ptlib srtp libtheora speex ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ]; - propagatedBuildInputs = [ speex ]; + propagatedBuildInputs = [ speex ]; configureFlags = [ "--enable-h323" ]; @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1 -std=gnu++98"; patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; - + meta = with stdenv.lib; { description = "VoIP library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = with licenses; [ bsdOriginal mpl10 gpl2Plus lgpl21 ]; }; passthru = { diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 6af15d90cef..4a12217443c 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -25,10 +25,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = http://www.opencascade.org/; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 2724976c5ae..e0a6c6a5705 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -26,13 +26,12 @@ stdenv.mkDerivation rec { cp license.txt "$out/share/doc/opencsg" ''; - meta = { + meta = with stdenv.lib; { description = "Constructive Solid Geometry library"; homepage = http://www.opencsg.org/; - platforms = with stdenv.lib.platforms; - linux; - maintainers = with stdenv.lib.maintainers; - [raskin]; + platforms = platforms.linux; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index a073a29b507..f954aaf7245 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -15,4 +15,10 @@ stdenv.mkDerivation rec { ''; buildInputs = [ readline mysql.connector-c postgresql sqlite ]; + + meta = with stdenv.lib; { + description = "Extremely lightweight but extensible database access library written in C"; + license = licenses.lgpl21; + platforms = platforms.all; + }; } diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.x.nix similarity index 100% rename from pkgs/development/libraries/openjpeg/2.1.nix rename to pkgs/development/libraries/openjpeg/2.x.nix diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index 7d84392d204..339f6064999 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2"; }; - meta = { + meta = with lib; { homepage = https://www.openpam.org; description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ matthewbauer ]; + platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 86015abb981..973f8304273 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.cstrahan ]; + license = licenses.openssl; priority = 10; # resolves collision with ‘man-pages’ }; } diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index aae6ed0f688..b69ded64839 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation { pango ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango."; + homepage = https://sourceforge.net/projects/pangopdf; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index b29388790d0..67f343d6038 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "GStreamer backend for Phonon"; platforms = platforms.linux; maintainers = with maintainers; [ ttuegel ]; + license = licenses.lgpl21; }; src = fetchurl { diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 0487886a896..773478f4dc0 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = https://phonon.kde.org/; description = "GStreamer backend for Phonon"; platforms = platforms.linux; + license = with licenses; [ bsd3 lgpl2Plus ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index acf53139022..1704703f801 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -37,10 +37,10 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { homepage = http://podofo.sourceforge.net; description = "A library to work with the PDF file format"; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + platforms = platforms.all; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix index 54e10b96592..b13335561ac 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -25,9 +25,10 @@ stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { description = "A Qt wrapper around PolKit"; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index edec0b7f069..592a1f1470a 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = { + meta = with stdenv.lib; { description = "Command line option parsing library"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix index 29ff988a226..d40b4442e38 100644 --- a/pkgs/development/libraries/prison/default.nix +++ b/pkgs/development/libraries/prison/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 library for QR-codes"; - maintainers = [ ]; + license = stdenv.lib.licenses.mit; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index ae60a6f69d6..d425de243f5 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { description = "Portable Tools from OPAL VoIP"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = with licenses; [ beerware bsdOriginal mpl10 ]; }; passthru = { diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix new file mode 100644 index 00000000000..5294c779a32 --- /dev/null +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchFromGitHub, cmake, google-gflags, which +, lsb-release, glog, protobuf, cbc, zlib }: + +stdenv.mkDerivation rec { + name = "or-tools-${version}"; + version = "v6.9.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = "or-tools"; + rev = version; + sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c"; + }; + + # The original build system uses cmake which does things like pull + # in dependencies through git and Makefile creation time. We + # obviously don't want to do this so instead we provide the + # dependencies straight from nixpkgs and use the make build method. + configurePhase = '' + cat < Makefile.local + UNIX_GFLAGS_DIR=${google-gflags} + UNIX_GLOG_DIR=${glog} + UNIX_PROTOBUF_DIR=${protobuf} + UNIX_CBC_DIR=${cbc} + EOF + ''; + + buildPhase = '' + make cc + ''; + + installPhase = '' + make install_cc prefix=$out + ''; + + patches = [ + # In "expected" way of compilation, the glog package is compiled + # with gflags support which then makes gflags header transitively + # included through glog. However in nixpkgs we don't compile glog + # with gflags so we have to include it ourselves. Upstream should + # always include gflags to support both ways I think. + # + # Upstream ticket: https://github.com/google/or-tools/issues/902 + ./gflags-include.patch + ]; + + nativeBuildInputs = [ + cmake lsb-release which zlib + ]; + propagatedBuildInputs = [ + google-gflags glog protobuf cbc + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/google/or-tools; + license = licenses.asl20; + description = '' + Google's software suite for combinatorial optimization. + ''; + maintainers = with maintainers; [ fuuzetsu ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/science/math/or-tools/gflags-include.patch b/pkgs/development/libraries/science/math/or-tools/gflags-include.patch new file mode 100644 index 00000000000..08f76180638 --- /dev/null +++ b/pkgs/development/libraries/science/math/or-tools/gflags-include.patch @@ -0,0 +1,12 @@ +diff --git a/ortools/data/jobshop_scheduling_parser.cc b/ortools/data/jobshop_scheduling_parser.cc +index cb0a360b..c2f055eb 100644 +--- a/ortools/data/jobshop_scheduling_parser.cc ++++ b/ortools/data/jobshop_scheduling_parser.cc +@@ -14,6 +14,7 @@ + #include "ortools/data/jobshop_scheduling_parser.h" + + #include ++#include + + #include "google/protobuf/wrappers.pb.h" + #include "ortools/base/filelineiter.h" diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index b74c58a2e38..6577ebeae28 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "szip-${version}"; version = "2.1.1"; src = fetchurl { - url = "ftp://ftp.hdfgroup.org/lib-external/szip/${version}/src/szip-${version}.tar.gz"; - sha256 = "1a8415a7xifagb22aq9dmy7b2s5l0y6diany3b4qigylw6adlzc9"; + url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz"; + sha256 = "04nlhkzzf1gihvrfbzc6rq4kc13p92ly39dzrb4y4jrd9y5rbvi1"; }; meta = { diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 67db6e5097d..a2cb103a182 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch"; sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90"; }) + + (fetchpatch { + # https://github.com/taglib/taglib/pull/869 + name = "CVE-2018-11439.patch"; + url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch"; + sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72"; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 8a8668df74e..582b2dc8a2c 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -11,7 +11,7 @@ let inherit (stdenv.lib) optionals versionAtLeast; pname = "vg"; - version = "0.9.0"; + version = "0.9.1"; webpage = "http://erratique.ch/software/${pname}"; in @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f"; + sha256 = "07h9a464v0x066mjg3ldkaq94ah47b7rvh54z4rndrg7v6bk7kyp"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { module. An API allows to implement new renderers. ''; homepage = "${webpage}"; - platforms = ocaml.meta.platforms or []; - license = licenses.bsd3; + inherit (ocaml.meta) platforms; + license = licenses.isc; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index ab9839a2103..003bd516657 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "adal"; - version = "1.0.2"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "4c020807b3f3cfd90f59203077dd5e1f59671833f8c3c5028ec029ed5072f9ce"; + sha256 = "1hgm62wil1avc3h0dwbks2v6l19xfsjl3azai16llsyp70y92lms"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index acbd7c2ec65..84b43fbcfa9 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.0.4"; + version = "3.0.5"; disabled = !isPy3k; # according to setup.py @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f5d37d20632ba74bd0b12a85179c12f64a9ea037ffc916d8a2de3be4f4656c76"; + sha256 = "0xldn6mh97pnkq915bacj8my9gy2kx58rrdm44496qla5i1gzlc2"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index def46c7fccc..de041c0f4c8 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }: buildPythonPackage rec { pname = "augeas"; - version = "1.0.2"; + version = "1.0.3"; name = pname + "-" + version; src = fetchFromGitHub { owner = "hercules-team"; repo = "python-augeas"; rev = "v${version}"; - sha256 = "1xk51m58ym3qpf0z5y98kzxb5jw7s92rca0v1yflj422977najxh"; + sha256 = "1fb904ym8g8hkd82zlibzk6wrldnfd5v5d0rkynsy1zlhcylq4f6"; }; # TODO: not very nice! diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix new file mode 100644 index 00000000000..6bbcd170382 --- /dev/null +++ b/pkgs/development/python-modules/awkward/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +}: + +buildPythonPackage rec { + version = "0.3.0"; + pname = "awkward"; + + src = fetchPypi { + inherit pname version; + sha256 = "fc3080c66987f2a03aa9ba0809e51227eb7aa34198da4b1ee4deb95356409693"; + }; + + propagatedBuildInputs = [ numpy ]; + + meta = with stdenv.lib; { + homepage = https://github.com/scikit-hep/awkward-array; + description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch b/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch new file mode 100644 index 00000000000..e1019115ac7 --- /dev/null +++ b/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch @@ -0,0 +1,106 @@ +From c636f0cc386c9ded9f31947bbd74affccc93c21a Mon Sep 17 00:00:00 2001 +From: yoch +Date: Mon, 14 May 2018 21:55:00 +0300 +Subject: [PATCH] Adding buffer protocol support for Python 3 + +--- + bitarray/_bitarray.c | 12 ++++++++++-- + bitarray/test_bitarray.py | 14 +++++++------- + 2 files changed, 17 insertions(+), 9 deletions(-) + +diff --git a/bitarray/_bitarray.c b/bitarray/_bitarray.c +index d2c19cb..be6b379 100644 +--- a/bitarray/_bitarray.c ++++ b/bitarray/_bitarray.c +@@ -48,7 +48,7 @@ int PyIndex_Check(PyObject *o) + #define Py_SIZE(ob) (((PyVarObject *) (ob))->ob_size) + #endif + +-#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7 ++#if PY_MAJOR_VERSION == 3 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7) + /* (new) buffer protocol */ + #define WITH_BUFFER + #endif +@@ -2787,6 +2787,8 @@ static PyTypeObject BitarrayIter_Type = { + + /********************* Bitarray Buffer Interface ************************/ + #ifdef WITH_BUFFER ++ ++#if PY_MAJOR_VERSION == 2 + static Py_ssize_t + bitarray_buffer_getreadbuf(bitarrayobject *self, + Py_ssize_t index, const void **ptr) +@@ -2831,6 +2833,8 @@ bitarray_buffer_getcharbuf(bitarrayobject *self, + return Py_SIZE(self); + } + ++#endif ++ + static int + bitarray_getbuffer(bitarrayobject *self, Py_buffer *view, int flags) + { +@@ -2857,14 +2861,18 @@ bitarray_releasebuffer(bitarrayobject *self, Py_buffer *view) + } + + static PyBufferProcs bitarray_as_buffer = { ++#if PY_MAJOR_VERSION == 2 // old buffer protocol + (readbufferproc) bitarray_buffer_getreadbuf, + (writebufferproc) bitarray_buffer_getwritebuf, + (segcountproc) bitarray_buffer_getsegcount, + (charbufferproc) bitarray_buffer_getcharbuf, ++#endif + (getbufferproc) bitarray_getbuffer, + (releasebufferproc) bitarray_releasebuffer, + }; ++ + #endif /* WITH_BUFFER */ ++ + /************************** Bitarray Type *******************************/ + + static PyTypeObject Bitarraytype = { +@@ -2898,7 +2906,7 @@ static PyTypeObject Bitarraytype = { + 0, /* tp_as_buffer */ + #endif + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_WEAKREFS +-#ifdef WITH_BUFFER ++#if defined(WITH_BUFFER) && PY_MAJOR_VERSION == 2 + | Py_TPFLAGS_HAVE_NEWBUFFER + #endif + , /* tp_flags */ +diff --git a/bitarray/test_bitarray.py b/bitarray/test_bitarray.py +index 44de2f0..b72b554 100644 +--- a/bitarray/test_bitarray.py ++++ b/bitarray/test_bitarray.py +@@ -2113,10 +2113,10 @@ def test_read1(self): + a = bitarray('01000001' '01000010' '01000011', endian='big') + v = memoryview(a) + self.assertEqual(len(v), 3) +- self.assertEqual(v[0], 'A') +- self.assertEqual(v[:].tobytes(), 'ABC') ++ #self.assertEqual(v[0], 'A') ++ self.assertEqual(v[:].tobytes(), b'ABC') + a[13] = 1 +- self.assertEqual(v[:].tobytes(), 'AFC') ++ self.assertEqual(v[:].tobytes(), b'AFC') + + def test_read2(self): + a = bitarray([randint(0, 1) for d in range(8000)]) +@@ -2131,14 +2131,14 @@ def test_write(self): + a.setall(0) + v = memoryview(a) + self.assertFalse(v.readonly) +- v[50000] = '\xff' ++ v[50000] = 255 if is_py3k else '\xff' + self.assertEqual(a[399999:400009], bitarray('0111111110')) + a[400003] = 0 + self.assertEqual(a[399999:400009], bitarray('0111011110')) +- v[30001:30004] = 'ABC' +- self.assertEqual(a[240000:240040].tobytes(), '\x00ABC\x00') ++ v[30001:30004] = b'ABC' ++ self.assertEqual(a[240000:240040].tobytes(), b'\x00ABC\x00') + +-if sys.version_info[:2] == (2, 7): ++if sys.version_info[:2] >= (2, 7): + tests.append(BufferInterfaceTests) + + # --------------------------------------------------------------------------- diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix new file mode 100644 index 00000000000..c413303dd21 --- /dev/null +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + version = "0.8.3"; + pname = "bitarray"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pl9p4j3dhlyffsqra6h28q7jph6v3hgppg786lkmnqdh45x6305"; + }; + + # Delete once https://github.com/ilanschnell/bitarray/pull/55 is merged + patches = [ ./0001-Buffer-Protocol-Py3.patch ]; + + meta = with lib; { + description = "Efficient arrays of booleans"; + homepage = https://github.com/ilanschnell/bitarray; + license = licenses.psfl; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index 22243edea9e..4a4a4a86d5e 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bjoern"; - version = "2.2.2"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "1w5z9agacci4shmkg9gh46ifj2a724rrgbykdv14830f7jq3dcmi"; + sha256 = "1lbwqmqrl32jlfzhffxsb1fm7xbbjgbhjr21imk656agvpib2wx2"; }; buildInputs = [ libev ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 4855a07a479..567ea4518f8 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "0.13.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d0cf59774d7c74b7173b82ce36bde35b8fe9da0f960364ba3c4df0d1fbd874d6"; + sha256 = "1h1g3jw53srcvbgl1jb9p2rfi7kjz6c91hbqxfbr3s2wx1f67ahn"; }; disabled = isPyPy; @@ -48,6 +48,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest pillow selenium ]; propagatedBuildInputs = [ + pillow flask jinja2 markupsafe diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index df260b3adb7..13038c5803c 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -15,11 +15,11 @@ let in buildPythonPackage rec { pname = "celery"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "ff727c115533edbc7b81b2b4ba1ec88d1c2fc4836e1e2f4c3c33a76ff53e5d7f"; + sha256 = "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp"; }; # Skip test_RedisBackend.test_timeouts_in_url_coerced diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index 1a2811b50b6..104bdb86bf0 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Chameleon"; - version = "2.25"; + version = "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0va95cml7wfjpvgj3dc9xdn8psyjh3zbk6v51b0hcqv2fzh409vb"; + sha256 = "1a83jf211mqjhgbd3abqyrn4mp4vb077ql8fydmv80xg3whrf3yb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index ed27464d1fe..5cfa1862f48 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -1,16 +1,16 @@ { lib, buildPythonPackage, fetchPypi -, translationstring, iso8601 }: +, translationstring, iso8601, enum34 }: buildPythonPackage rec { pname = "colander"; - version = "1.4"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "e20e9acf190e5711cf96aa65a5405dac04b6e841028fc361d953a9923dbc4e72"; + sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq"; }; - propagatedBuildInputs = [ translationstring iso8601 ]; + propagatedBuildInputs = [ translationstring iso8601 enum34 ]; meta = with lib; { description = "A simple schema-based serialization and deserialization library"; diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix new file mode 100644 index 00000000000..c9e56017447 --- /dev/null +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + version = "0.1.0"; + pname = "dj-email-url"; + + src = fetchPypi { + inherit pname version; + sha256 = "84f32673156f58d740a14cab09f04ca92a65b2c8881b60e31e09e67d7853e544"; + }; + + checkPhase = '' + ${python.interpreter} test_dj_email_url.py + ''; + + # tests not included with pypi release + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/migonzalvar/dj-email-url; + description = "Use an URL to configure email backend settings in your Django Application"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix new file mode 100644 index 00000000000..b66f6b8f73a --- /dev/null +++ b/pkgs/development/python-modules/dj-search-url/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + version = "0.1"; + pname = "dj-search-url"; + + src = fetchPypi { + inherit pname version; + sha256 = "424d1a5852500b3c118abfdd0e30b3e0016fe68e7ed27b8553a67afa20d4fb40"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/dstufft/dj-search-url; + description = "Use Search URLs in your Django Haystack Application"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix new file mode 100644 index 00000000000..4cff6f2a69b --- /dev/null +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + version = "3.0.0"; + pname = "django-cache-url"; + + src = fetchPypi { + inherit pname version; + sha256 = "235950e2d7cb16164082167c2974301e2f0fb2313d40bfacc9d24f5b09c3514b"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest tests + ''; + + # tests not included with pypi release + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/ghickman/django-cache-url; + description = "Use Cache URLs in your Django application"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix new file mode 100644 index 00000000000..0ca6c400df2 --- /dev/null +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, django-discover-runner +, mock +, dj-database-url +, dj-email-url +, dj-search-url +, django-cache-url +, six +, django +}: + +buildPythonPackage rec { + version = "2.1"; + pname = "django-configurations"; + + src = fetchPypi { + inherit pname version; + sha256 = "71d9acdff33aa034f0157b0b3d23629fe0cd499bf4d0b6d699b9ca0701d952e8"; + }; + + checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url six ]; + + checkPhase = '' + export PYTHONPATH=.:$PYTHONPATH + export DJANGO_SETTINGS_MODULE="tests.settings.main" + export DJANGO_CONFIGURATION="Test" + ${django}/bin/django-admin.py test + ''; + + # django.core.exceptions.ImproperlyConfigured: django-configurations settings importer wasn't correctly installed + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://django-configurations.readthedocs.io/; + description = "A helper for organizing Django settings"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix new file mode 100644 index 00000000000..d25d9e79947 --- /dev/null +++ b/pkgs/development/python-modules/django-discover-runner/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, django +}: + +buildPythonPackage rec { + version = "1.0"; + pname = "django-discover-runner"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ba91fe722c256bcbfdeb36fac7eac0f27e5bfda55d98c4c1cf9ab62b5b084fe"; + }; + + propagatedBuildInputs = [ django ]; + + # tests not included with release + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/jezdez/django-discover-runner; + description = "A Django test runner based on unittest2's test discovery"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 3548e930ab3..30ef1a10418 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "2.0.7"; + version = "2.1.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1xf84wq7ab1zfb3nmf4qgw6mjf5xafjwr3175dyrqrrn6cpvcr4a"; + sha256 = "0ns1m9sdkcbbz84wvzgxa4f8hf4a8z656jzwx4bw8np9kh96zfjy"; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 1634e676952..bdf503cd849 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -3,7 +3,7 @@ }: buildPythonPackage rec { pname = "django-hijack"; - version = "2.1.5"; + version = "2.1.9"; name = pname + "-" + version; # the pypi packages don't include everything required for the tests @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "arteria"; repo = "django-hijack"; rev = "v${version}"; - sha256 = "1paiyxhc034336xcd9yzf3azpsapsv26j7w2baxiby71z2hhg0sj"; + sha256 = "109xi93xj37ycdsvainybhg89pcb5sawv6w80px4r6fjvaq4732c"; }; checkInputs = [ django_nose ]; diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 7037f23b071..694b11c6ca8 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-picklefield"; - version = "1.0.0"; + version = "1.1.0"; meta = { description = "A pickled object field for Django"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "61e3ba7f6df82d8df9e6be3a8c55ef589eb3bf926c3d25d2b7949b07eae78354"; + sha256 = "174zlsajpjflrf3jgn0wp5svnxfyrjadk4s9jb45vzjqcmffwzyf"; }; } diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index 15eafa6dd85..1e5936e6089 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.4.0"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "0i32vsgk1xmwpi7i6f6v5hg653y9dl0fsz5qmv94skz6hwgm5kvh"; + sha256 = "1ylw16v5z46ckn8ynbx2zjam6nvipl0xxcr6icrf6driv02q8bzf"; }; # The testsuite fails to modify the base environment diff --git a/pkgs/development/python-modules/elpy/default.nix b/pkgs/development/python-modules/elpy/default.nix index 79ec94a2c82..a947faec453 100644 --- a/pkgs/development/python-modules/elpy/default.nix +++ b/pkgs/development/python-modules/elpy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "elpy"; - version = "1.9.0"; + version = "1.25.0"; src = fetchPypi { inherit pname version; - sha256 = "419f7b05b19182bc1aedde1ae80812c1534e59a0493476aa01ea819e76ba26f0"; + sha256 = "10n20lw7n728ahnfrx03vgx9zim7jb8s1zqhw8yivksm9c1a6i12"; }; propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ] diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 2deb16924d2..c4543032c2b 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.0.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "be0288ef1125bf1c539bb8f3079ef4aa5fb813af28f0c5294a4e744ee554398a"; + sha256 = "0l837gm9cjdp3lybnam38ip0q3n1xy0j6vzgx11hdrr0ps8p5mid"; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 3642d4e55b9..809871b50de 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0ddbhg4nsabi9w66l8vkr0i5r80jqihlic5yrdl3v1aqahvxph1j"; + sha256 = "12245b16czsgq4a251jqlk5qs3sldlcryfcganswzk2lbgplmn7q"; }; # The pypi package does not include tests diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 1f4f914968f..caaf0a61152 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Flask-Babel"; - version = "0.11.2"; + version = "0.12.2"; src = fetchPypi { inherit pname version; - sha256 = "0ff9n165vhf1nhv6807ckhpp224jw7k7sd7jz5kfh3sbpl85gmy0"; + sha256 = "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-oauthlib/default.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix index 2d34ce8583e..58705751415 100644 --- a/pkgs/development/python-modules/flask-oauthlib/default.nix +++ b/pkgs/development/python-modules/flask-oauthlib/default.nix @@ -3,13 +3,13 @@ , mock, nose}: buildPythonPackage rec { pname = "Flask-OAuthlib"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "lepture"; repo = "flask-oauthlib"; rev = "v${version}"; - sha256 = "1vnr2kmbwl6mv2fsv92jjxzfibq2m3pnbcs6ba9k32jr1ci7wfh7"; + sha256 = "1l82niwrpm7411xvwh65bj263si90kcbrbfg5fa52mpixhxcp40f"; }; buildInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index d2e806e43b9..ce847b81de6 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ftfy"; - version = "4.4.3"; + version = "5.3.0"; # ftfy v5 only supports python3. Since at the moment the only # packages that use ftfy are spacy and textacy which both support # python 2 and 3, they have pinned ftfy to the v4 branch. @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w"; + sha256 = "0zybd0ypxhb83bgdbwzi120n02328v4j0ndm6bgkb6wg2gah59qb"; }; propagatedBuildInputs = [ html5lib wcwidth ]; diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 74ab0fc01a6..80ca5099f34 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fusepy"; - version = "2.0.4"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0v5grm4zyf58hsplwsxfbihddw95lz9w8cy3rpzbyha287swgx8h"; + sha256 = "1gg69qfi9pjcic3g98l8ya64rw2vc1bp8gsf76my6gglq8z7izvj"; }; propagatedBuildInputs = [ pkgs.fuse ]; diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index 2feab78f6a8..b690faccf06 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "6.3.3"; + version = "6.3.8"; pname = "gnureadline"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1ghck2zz4xbqa3wz73brgjhrqj55p9hc1fq6c9zb09dnyhwb0nd2"; + sha256 = "0ddhj98x2nv45iz4aadk4b9m0b1kpsn1xhcbypn5cd556knhiqjq"; }; buildInputs = [ pkgs.ncurses ]; diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index ded728bdc0d..899a315da65 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.3.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "ac85fc7f6687bb0271f2f70ca298da90f35789f9de1fe3a11e8caeb571332b77"; + sha256 = "16ximavy7zgg0427790fmyma03xnkywar9krp4lx6bcphvyiahh3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index d6c6a41ae08..6f07725520f 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5.2"; + version = "1.5.4"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "0ce73a9bc7b79968a2b96cc2b0934e2cbe11700adbd02b4b492fea1e3d4d51f4"; + sha256 = "1p1akwirxq809apxia6b9ndalpdfgv340ssnli78h74bkqnw1376"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 492c4da6fcc..cf206472cd3 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "i3ipc"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "i3ipc-python"; rev = "v${version}"; - sha256 = "15drq16ncmjrgsri6gjzp0qm8abycm92nicm78q3k7vy7rqpvfnh"; + sha256 = "06d7g4d7cnh0vp5diavy3x9wz1w5nwdrb7ipc4g1c3a2wc78862d"; }; propagatedBuildInputs = [ enum-compat ]; diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix index 22b809c46c2..dcf39dd24f0 100644 --- a/pkgs/development/python-modules/ibmquantumexperience/default.nix +++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "IBMQuantumExperience"; - version = "2.0.3"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "c5dbcc140344c7bdf545ad59db87f31a90ca35107c40d6cae1489bb997a47ba9"; + sha256 = "0szn743sbm3cs80982cf4994c1xcg6iz5xkhdbpm1kfv5qn1phja"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix new file mode 100644 index 00000000000..db0b8301f00 --- /dev/null +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, ipaddress +, python +, pythonOlder +}: + +buildPythonPackage rec { + version = "0.1.4"; + pname = "ifaddr"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b"; + }; + + # ipaddress is provided in python stdlib > 3.3 + postPatch = if pythonOlder "3.4" then "" else '' + sed -i "s/'ipaddress'//" setup.py + ''; + + propagatedBuildInputs = [ ipaddress ]; + + checkPhase = '' + ${python.interpreter} ifaddr/test_ifaddr.py + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pydron/ifaddr; + description = "Enumerates all IP addresses on all network adapters of the system"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 100ca5b0ff9..0d6828bff72 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "influxdb"; - version = "4.0.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0injsml6zmb3hkgc03117fdlg573kbfgjbijpd5npf0vsy0xnpvz"; + sha256 = "0fqnshmsgifvp79pd4g9a1kyfxvpa9vczv0dv8x2jr2c5m1mi99v"; }; # ImportError: No module named tests diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix index 4325e6ea884..6aecf5959ff 100644 --- a/pkgs/development/python-modules/ipaddr/default.nix +++ b/pkgs/development/python-modules/ipaddr/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "ipaddr"; - version = "2.1.11"; + version = "2.2.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v"; + sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix index 5f40ce0f1aa..7587e5f33c9 100644 --- a/pkgs/development/python-modules/memory_profiler/default.nix +++ b/pkgs/development/python-modules/memory_profiler/default.nix @@ -1,19 +1,27 @@ { stdenv , buildPythonPackage , fetchPypi +, psutil +, python }: buildPythonPackage rec { pname = "memory_profiler"; - version = "0.41"; + version = "0.54.0"; src = fetchPypi { inherit pname version; - sha256 = "dce6e931c281662a500b142595517d095267216472c2926e5ec8edab89898d10"; + sha256 = "d64342a23f32e105f4929b408a8b89d9222c3ce8afbbb3359817555811448d1a"; }; + propagatedBuildInputs = [ psutil ]; + + checkPhase = '' + make test PYTHON=${python.interpreter} + ''; + # Tests don't import profile - doCheck = false; + # doCheck = false; meta = with stdenv.lib; { description = "A module for monitoring memory usage of a python program"; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 2cd2e2484e6..854866f659b 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.630"; + version = "0.641"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1p8rnap4ngczfm2q4035mcmn5nsprbljnhksx2jxzxrb9immh137"; + sha256 = "0ma4l7px96zzb8x89dk9mkrrdzdhdqckvfsbld4fj9n25k1iw1wf"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index a3e67fa7b98..b5150382b36 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -1,17 +1,21 @@ { stdenv , buildPythonPackage , fetchPypi +, glibcLocales }: buildPythonPackage rec { pname = "nameparser"; - version = "0.3.4"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1zi94m99ziwwd6kkip3w2xpnl05r2cfv9iq68inz7np81c3g8vag"; + sha256 = "c7eeeffbf16e263452b17b5f4b544d366c3364e966721f39d490e6c7c8b44b7f"; }; + LC_ALL="en_US.UTF-8"; + buildInputs = [ glibcLocales ]; + meta = with stdenv.lib; { description = "A simple Python module for parsing human names into their individual components"; homepage = https://github.com/derek73/python-nameparser; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 9d5c1675359..e708ff2ee3e 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -2,18 +2,23 @@ , buildPythonPackage , fetchPypi , six +, pythonOlder +, mock +, coverage }: buildPythonPackage rec { pname = "nose2"; - version = "0.5.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0595rh6b6dncbj0jigsyrgrh6h8fsl6w1fr69h76mxv9nllv0rlr"; + sha256 = "9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six coverage ] + ++ stdenv.lib.optionals (pythonOlder "3.4") [ mock ]; + # AttributeError: 'module' object has no attribute 'collector' doCheck = false; diff --git a/pkgs/development/python-modules/ntfy/default.nix b/pkgs/development/python-modules/ntfy/default.nix index 5d54b0928b6..efbd1eec35a 100644 --- a/pkgs/development/python-modules/ntfy/default.nix +++ b/pkgs/development/python-modules/ntfy/default.nix @@ -2,26 +2,32 @@ , buildPythonPackage , fetchFromGitHub , appdirs -, pyyaml +, ruamel_yaml , requests -, dbus-python , emoji , sleekxmpp , mock +, psutil +, python +# , dbus-python }: buildPythonPackage rec { - version = "1.2.0"; + version = "2.6.0"; pname = "ntfy"; src = fetchFromGitHub { owner = "dschep"; repo = "ntfy"; rev = "v${version}"; - sha256 = "0yjxwisxpxy3vpnqk9nw5k3db3xx6wyf6sk1px9m94s30glcq2cc"; + sha256 = "0hnwrybbk0gw0c6kw2zpx0x1rh3jb9qyrprcphzkv0jlhzdfkrp1"; }; - propagatedBuildInputs = [ appdirs pyyaml requests dbus-python emoji sleekxmpp mock ]; + propagatedBuildInputs = [ requests ruamel_yaml appdirs mock sleekxmpp emoji psutil ]; + + checkPhase = '' + HOME=$(mktemp -d) ${python.interpreter} setup.py test + ''; meta = with stdenv.lib; { description = "A utility for sending notifications, on demand and when commands finish"; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 8ebb88fa6a7..d588ebb12e4 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { inherit python; }; @@ -13,12 +13,13 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ pandas pytest pytestrunner JPype1 ]; + checkInputs = [ pandas pytest ]; PYARROW_BUILD_TYPE = "release"; PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"; preCheck = '' + rm pyarrow/tests/test_jvm.py rm pyarrow/tests/test_hdfs.py rm pyarrow/tests/test_cuda.py @@ -43,6 +44,14 @@ buildPythonPackage rec { setupPyBuildFlags = ["--with-parquet" ]; + checkPhase = '' + mv pyarrow/tests tests + rm -rf pyarrow + mkdir pyarrow + mv tests pyarrow/tests + pytest -v + ''; + meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = https://arrow.apache.org/; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 23633ce248d..cd9c054ddca 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -1,17 +1,17 @@ { stdenv, buildPythonPackage, fetchPypi -, nose, pyparsing, decorator, six }: +, nose, pyparsing, decorator, six, future }: buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.3"; + version = "1.8.6"; src = fetchPypi { inherit pname version; - sha256 = "8e52c4ddbc015b56cc672b7c005c11f3df4fe407b832964099836fa3cccb8b9d"; + sha256 = "8b6ad8750bbb712b1c7b8f89772b42baeefd35b3c7085233e8027b92f277e073"; }; buildInputs = [ nose ]; - propagatedBuildInputs = [ pyparsing decorator six ]; + propagatedBuildInputs = [ pyparsing decorator six future ]; meta = with stdenv.lib; { description = "Allows to declare constraints on function parameters and return values"; diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 1a3eb047510..a331f5e1175 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -5,19 +5,15 @@ buildPythonPackage rec { pname = "Pympler"; - version = "0.4.3"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "0mhyxqlkha98y8mi5zqcjg23r30mgdjdzs05lghbmqfdyvzjh1a3"; + sha256 = "c262ceca4dac67b8b523956833c52443420eabc3321a07185990b358b8ba13a7"; }; - # Remove test asizeof.flatsize(), broken and can be missed as - # test is only useful on python 2.5, see https://github.com/pympler/pympler/issues/22 - patchPhase = '' - substituteInPlace ./test/asizeof/test_asizeof.py --replace "n, e = test_flatsize" "#n, e = test_flatsize" - substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(n," "#self.assert_(n," - substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(not e" "#self.assert_(not e" + postPatch = '' + rm test/asizeof/test_asizeof.py ''; doCheck = stdenv.hostPlatform.isLinux; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index db17d60b628..481e4154ddb 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -1,27 +1,26 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pytest, django, setuptools_scm -, fetchpatch +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, django +, setuptools_scm +, django-configurations +, pytest_xdist +, six }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.1.2"; + version = "3.4.3"; src = fetchPypi { inherit pname version; - sha256 = "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303"; + sha256 = "b379282feaf89069cb790775ab6bbbd2bd2038a68c7ef9b84a41898e0b551081"; }; buildInputs = [ pytest setuptools_scm ]; + checkInputs = [ django-configurations pytest_xdist six ]; propagatedBuildInputs = [ django ]; - patches = [ - # Unpin setuptools-scm - (fetchpatch { - url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch"; - sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws"; - }) - ]; - # Complicated. Requires Django setup. doCheck = false; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix new file mode 100644 index 00000000000..d245d472a00 --- /dev/null +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest +, pytz +, glibcLocales +}: + +buildPythonPackage rec { + version = "0.6.3"; + pname = "python-rapidjson"; + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a7729c711d9be2b6c0638ce4851d398e181f2329814668aa7fda6421a5da085"; + }; + + LC_ALL="en_US.utf-8"; + buildInputs = [ glibcLocales ]; + + # buildInputs = [ ]; + checkInputs = [ pytest pytz ]; + # propagatedBuildInputs = [ ]; + + checkPhase = '' + pytest tests + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/python-rapidjson/python-rapidjson; + description = "Python wrapper around rapidjson "; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 5bb20ae8e77..5af4383d44b 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -1,12 +1,20 @@ -{ stdenv, fetchPypi, buildPythonPackage, certifi, future, urllib3 }: +{ stdenv +, fetchPypi +, buildPythonPackage +, certifi +, future +, urllib3 +, tornado +, pytest +}: buildPythonPackage rec { pname = "python-telegram-bot"; - version = "10.1.0"; + version = "11.1.0"; src = fetchPypi { inherit pname version; - sha256 = "ca2f8a44ddef7271477e16f4986647fa90ef4df5b55a7953e53b9c9d2672f639"; + sha256 = "cca4e32ebb8da7fdf35ab2fa2b3edd441211364819c5592fc253acdb7561ea5b"; }; prePatch = '' @@ -16,10 +24,14 @@ buildPythonPackage rec { --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \ --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \ --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" + + touch LICENSE.dual ''; - propagatedBuildInputs = [ certifi future urllib3 ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ certifi future urllib3 tornado ]; + # tests not included with release doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index c6cd2521292..a8997e279b2 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -1,15 +1,21 @@ -{ stdenv, buildPythonPackage, fetchurl }: +{ stdenv +, buildPythonPackage +, fetchurl +, glibcLocales +}: buildPythonPackage rec { pname = "rpmfluff"; - version = "0.5.3"; - name = "${pname}-${version}"; + version = "0.5.5"; src = fetchurl { - url = "https://releases.pagure.org/${pname}/${name}.tar.xz"; - sha256 = "1i45f012ngpxs83m3dpmaj3hs8z7r9sbf05vnvzgs3hpgsbhxa7r"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0m92ihii8fgdyma9vn3s6fhq0px8n930c27zs554la0mm4548ss3"; }; + LC_ALL="en_US.utf-8"; + buildInputs = [ glibcLocales ]; + meta = with stdenv.lib; { description = "lightweight way of building RPMs, and sabotaging them"; homepage = https://pagure.io/rpmfluff; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index cd4a6389a35..b64b53fb2fb 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , buildPythonPackage , geckodriver +, urllib3 , xorg }: @@ -22,17 +23,17 @@ in buildPythonPackage rec { pname = "selenium"; - version = "3.8.1"; + version = "3.14.1"; src = fetchPypi { inherit pname version; - sha256 = "1lqm2md84g11g7lqi94xqb5lydm93vgmlznfhf27g6sy9ayjvgcs"; + sha256 = "ab192cd046164c40fabcf44b47c66c8b12495142f4a69dcc55ea6eeef096e614"; }; buildInputs = [xorg.libX11]; propagatedBuildInputs = [ - geckodriver + geckodriver urllib3 ]; patchPhase = stdenv.lib.optionalString stdenv.isLinux '' diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix new file mode 100644 index 00000000000..badc99f5e37 --- /dev/null +++ b/pkgs/development/python-modules/spark_parser/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, click +}: + +buildPythonPackage rec { + pname = "spark_parser"; + version = "1.8.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "4c5e6064afbb3c114749016d585b0e4f9222d4ffa97a1854c9ab70b25783ef48"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ click ]; + + meta = with stdenv.lib; { + description = ''An Early-Algorithm Context-free grammar Parser''; + homepage = "https://github.com/rocky/python-spark"; + license = licenses.mit; + maintainers = with maintainers; [raskin]; + }; + +} diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index f667f17f77d..a4130502e4b 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -3,34 +3,30 @@ , fetchPypi , fetchpatch , pytest +, python-rapidjson , pretend , freezegun +, twisted , simplejson , six +, pythonAtLeast }: buildPythonPackage rec { pname = "structlog"; - version = "17.2.0"; + version = "18.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6980001045abd235fa12582222627c19b89109e58b85eb77d5a5abc778df6e20"; + sha256 = "e361edb3b9aeaa85cd38a1bc9ddbb60cda8a991fc29de9db26832f6300e81eb4"; }; - patches = [ - # Fix tests for pytest 3.3 - (fetchpatch { - url = "https://github.com/hynek/structlog/commit/22f0ae50607a0cb024361599f84610ce290deb99.patch"; - sha256 = "03622i13ammkpyrdk48kimbz94gbkpcmdpy0kj2z09m1kp6q2ljv"; - }) - ]; - - checkInputs = [ pytest pretend freezegun simplejson ]; + checkInputs = [ pytest pretend freezegun simplejson twisted ] + ++ lib.optionals (pythonAtLeast "3.6") [ python-rapidjson ]; propagatedBuildInputs = [ six ]; checkPhase = '' - rm tests/test_twisted.py* + # rm tests/test_twisted.py* py.test ''; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index ab816cde835..215f39da30b 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -9,22 +9,24 @@ , pyopenssl , trustme , sniffio +, jedi +, pylint }: buildPythonPackage rec { pname = "trio"; - version = "0.7.0"; + version = "0.9.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0df152qnj4xgxrxzd8619f8h77mzry7z8sp4m76fi21gnrcr297n"; + sha256 = "6d905d950dfa1db3fad6b5ef5637c221947123fd2b0e112033fecfc582318c3b"; }; - checkInputs = [ pytest pyopenssl trustme ]; + checkInputs = [ pytest pyopenssl trustme jedi pylint ]; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. checkPhase = '' - py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname' + HOME="$(mktemp -d)" py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname and not test_waitpid' ''; propagatedBuildInputs = [ attrs diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index dfcce835e65..4c031c20aa1 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -6,18 +6,19 @@ , requests_toolbelt , tqdm , pyblake2 +, readme_renderer }: buildPythonPackage rec { pname = "twine"; - version = "1.11.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "09cz9v63f8mrs4znbjapjj2z3wdfryq8q364zm0wzjhbzzcs9n9g"; + sha256 = "7d89bc6acafb31d124e6e5b295ef26ac77030bf098960c2a4c4e058335827c5c"; }; - propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 ]; + propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ]; # Requires network doCheck = false; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 89edc8f184c..f0428f17603 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -3,19 +3,30 @@ , fetchPypi , spark_parser , xdis +, nose +, pytest +, hypothesis +, six }: buildPythonPackage rec { pname = "uncompyle6"; - version = "2.8.3"; + version = "3.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0hx5sji6qjvnq1p0zhvyk5hgracpv2w6iar1j59qwllxv115ffi1"; + sha256 = "bd882f3c979b49d28ba7accc5ce7380ced8cab12e782e9170769ca15f0b81f8a"; }; + checkInputs = [ nose pytest hypothesis six ]; propagatedBuildInputs = [ spark_parser xdis ]; + # six import errors (yet it is supplied...) + checkPhase = '' + pytest ./pytest --ignore=pytest/test_build_const_key_map.py \ + --ignore=pytest/test_grammar.py + ''; + meta = with stdenv.lib; { description = "Python cross-version byte-code deparser"; homepage = https://github.com/rocky/python-uncompyle6/; diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix new file mode 100644 index 00000000000..b3c2ce714ce --- /dev/null +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, awkward +}: + +buildPythonPackage rec { + version = "0.2.5"; + pname = "uproot-methods"; + + src = fetchPypi { + inherit pname version; + sha256 = "7d5563b3335af414a12caf5b350c952fdc7576abb17630382de5564a7c254ae6"; + }; + + propagatedBuildInputs = [ numpy awkward ]; + + meta = with stdenv.lib; { + homepage = https://github.com/scikit-hep/uproot-methods; + description = "Pythonic mix-ins for ROOT classes"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index e2cc1105f09..120f728365d 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -1,17 +1,30 @@ -{lib, fetchPypi, buildPythonPackage, numpy}: +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, python-lz4 +, uproot-methods +, awkward +, cachetools +, pythonOlder +, pytestrunner +, pytest +, backports_lzma +}: buildPythonPackage rec { pname = "uproot"; - version = "2.9.11"; + version = "3.2.6"; src = fetchPypi { inherit pname version; - sha256 = "da71e9e239129ec2ae7a62f9d35aebd46456f05e000ef14f32fe2c9fa8ec92c2"; + sha256 = "af0a093f0788b8983d07b88fac3094b26c3e28358bc10cdb8d757cc07956f8d4"; }; - propagatedBuildInputs = [ - numpy - ]; + buildInputs = [ pytestrunner ]; + checkInputs = [ pytest ] + ++ lib.optionals (pythonOlder "3.3") [ backports_lzma ]; + propagatedBuildInputs = [ numpy python-lz4 cachetools uproot-methods awkward ]; meta = with lib; { homepage = https://github.com/scikit-hep/uproot; diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index 89be87e1849..498c1c401f8 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -1,14 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales }: buildPythonPackage rec { pname = "whichcraft"; - version = "0.4.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "9e0d51c9387cb7e9f28b7edb549e6a03da758f7784f991eb4397d7f7808c57fd"; + sha256 = "fecddd531f237ffc5db8b215409afb18fa30300699064cca4817521b4fc81815"; }; + LC_ALL="en_US.utf-8"; + buildInputs = [ glibcLocales ]; + checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 5973414f8dc..76e424cf011 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -1,20 +1,25 @@ { stdenv , buildPythonPackage , fetchPypi -, nose +, pytest , six +, click }: buildPythonPackage rec { pname = "xdis"; - version = "3.2.4"; + version = "3.8.8"; src = fetchPypi { inherit pname version; - sha256 = "0g2lh70837vigcbc1i58349wp2xzrhlsg2ahc92sn8d3jwxja4dk"; + sha256 = "4d212df8a85ab55a35f6ad71b2c29818d903c3e6a95e31eb26d5f3fc66a4e015"; }; - propagatedBuildInputs = [ nose six ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ six click ]; + + # newest release moves to pytest (tests not packaged with release) + doCheck = false; meta = with stdenv.lib; { description = "Python cross-version byte-code disassembler and marshal routines"; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 06c5fe3a1be..b77215a2d24 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,16 +1,32 @@ -{ stdenv, buildPythonPackage, fetchPypi -, netifaces, six, enum-compat }: +{ stdenv +, buildPythonPackage +, fetchPypi +, ifaddr +, typing +, isPy27 +, pythonOlder +, python +}: buildPythonPackage rec { pname = "zeroconf"; - version = "0.20.0"; + version = "0.21.3"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6e3f1e7b5871e3d1410ac29b9fb85aafc1e2d661ed596b07a6f84559a475efcb"; + sha256 = "5b52dfdf4e665d98a17bf9aa50dea7a8c98e25f972d9c1d7660e2b978a1f5713"; }; - propagatedBuildInputs = [ netifaces six enum-compat ]; + propagatedBuildInputs = [ ifaddr ] + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + + # tests not included with pypi release + doCheck = false; + + checkPhase = '' + ${python.interpreter} test_zeroconf.py + ''; meta = with stdenv.lib; { description = "A pure python implementation of multicast DNS service discovery"; diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix new file mode 100644 index 00000000000..8def71568e7 --- /dev/null +++ b/pkgs/development/tools/database/cdb/default.nix @@ -0,0 +1,57 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub, writeText }: + +let + version = "0.75"; + sha256 = "1iajg55n47hqxcpdzmyq4g4aprx7bzxcp885i850h355k5vmf68r"; + # Please don’t forget to update the docs: + # clone https://github.com/Profpatsch/cdb-docs + # and create a pull request with the result of running + # ./update + # from the repository’s root folder. + docRepo = fetchFromGitHub { + owner = "Profpatsch"; + repo = "cdb-docs"; + rev = "359b6c55c9e170ebfc88f3f38face8ae2315eacb"; + sha256 = "1y0ivviy58i0pmavhvrpznc4yjigjknff298gnw9rkg5wxm0gbbq"; + }; + +in stdenv.mkDerivation { + name = "cdb-${version}"; + + src = fetchurl { + url = "https://cr.yp.to/cdb/cdb-${version}.tar.gz"; + inherit sha256; + }; + + outputs = [ "bin" "doc" "out" ]; + + postPatch = '' + # A little patch, borrowed from Archlinux AUR, borrowed from Gentoo Portage + sed -e 's/^extern int errno;$/#include /' -i error.h + ''; + + postInstall = '' + # don't use make setup, but move the binaries ourselves + mkdir -p $bin/bin + install -m 755 -t $bin/bin/ cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest + + # patch paths in scripts + function cdbmake-subst { + substituteInPlace $bin/bin/$1 \ + --replace /usr/local/bin/cdbmake $bin/bin/cdbmake + } + cdbmake-subst cdbmake-12 + cdbmake-subst cdbmake-sv + + # docs + mkdir -p $doc/share/cdb + cp -r "${docRepo}/docs" $doc/share/cdb/html + ''; + + meta = { + homepage = "https://cr.yp.to/cdb"; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.Profpatsch ]; + platforms = [ lib.platforms.unix ]; + }; +} diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix new file mode 100644 index 00000000000..25bc7934000 --- /dev/null +++ b/pkgs/development/tools/kind/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +with stdenv.lib; + +buildGoPackage rec { + name = "kind-${version}"; + version = "2018-10-03-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "2ae73f8ef93609991b0e47a67825390ceec95b3f"; + + src = fetchFromGitHub { + rev = rev; + owner = "kubernetes-sigs"; + repo = "kind"; + sha256 = "0bg3y35sc1c73z4rfq11x1jz340786q91ywm165ri7vx280ffjgh"; + }; + + goPackagePath = "sigs.k8s.io/kind"; + excludedPackages = "images/base/entrypoint"; + + meta = { + description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; + homepage = https://github.com/kubernetes-sigs/kind; + maintainers = with maintainers; [ offline ]; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index ce297df13c3..15ae07962c5 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -3,9 +3,9 @@ buildGoPackage rec { name = "kustomize-${version}"; - version = "1.0.8"; + version = "1.0.9"; # rev is the 1.0.8 commit, mainly for kustomize version command output - rev = "58492e2d83c59ed63881311f46ad6251f77dabc3"; + rev = "ec86b30d2b01a8fa62e645f024f26bfea5dcd30d"; goPackagePath = "sigs.k8s.io/kustomize"; @@ -17,7 +17,7 @@ buildGoPackage rec { ''; src = fetchFromGitHub { - sha256 = "0y6dqwhm7lczjy0zk2fnc1i43lvnjhcvihvm7qknky05z9f0v8bx"; + sha256 = "06a0iic8sp745q71bh0k2zbcdhppp85bx9c3fwwr4wl77dlybz4f"; rev = "v${version}"; repo = "kustomize"; owner = "kubernetes-sigs"; @@ -32,6 +32,6 @@ buildGoPackage rec { ''; homepage = https://github.com/kubernetes-sigs/kustomize; license = licenses.asl20; - maintainers = [ maintainers.carlosdagos maintainers.vdemeester ]; + maintainers = with maintainers; [ carlosdagos vdemeester periklis ]; }; } diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 8f5948c3c11..3f42e71e778 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib }: let - version = "0.13.0"; + version = "0.12.0"; in stdenv.mkDerivation { name = "ocamlbuild-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "13r9q8c209gkgcmbjhj9z4r5bmi90rxahdsiqm5jx8sr2pia5xbh"; + sha256 = "1shyim50ms0816fphc4mk0kldcx3pnba2i6m10q0cbm18m9d7chq"; }; createFindlibDestdir = true; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 1d23f5426a5..7d4a58d0e39 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "2018.10.9"; + version = "2018.10.13"; src = fetchPypi { inherit pname version; - sha256 = "0b0safavjxq6malmv44acmgds21m2sp1wqa7gs0qz621v6gcgq4j"; + sha256 = "0qwflq00rwk3pnldndb30f3avnbi4hvv6c8mm6l5xxnxy9dj71d7"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/tools/profiling/pyprof2calltree/default.nix index b2497633a68..a2d98bcf238 100644 --- a/pkgs/development/tools/profiling/pyprof2calltree/default.nix +++ b/pkgs/development/tools/profiling/pyprof2calltree/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "pyprof2calltree"; - version = "1.4.3"; + version = "1.4.4"; # Fetch from GitHub because the PyPi packaged version does not # include all test files. @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "pwaller"; repo = "pyprof2calltree"; rev = "v" + version; - sha256 = "0i0a895zal193cpvzbv68fch606g4ik27rvzbby3vxk61zlxfqy5"; + sha256 = "1vrip41ib7nmkwa8rjny1na1wyp7nvvgvm0h9bd21i262kbm4nqx"; }; meta = with lib; { diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index 0fc86e096f3..ca49fb7d8a4 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3 -, gnome-themes-extra, gtk-engine-murrine, optipng, inkscape}: +{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3, gnome3 +, gtk-engine-murrine, optipng, inkscape }: let pname = "arc-theme"; @@ -7,40 +7,45 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "20180715"; + version = "20181022"; src = fetchFromGitHub { owner = "NicoHood"; repo = pname; rev = version; - sha256 = "1kkfnkiih0i3pds5mgd1v9lrdrp4nh4hk42mw7sa4fpbjff4jh6j"; + sha256 = "08951dk1irfadwpr3p323a4fprmxg53rk2r2niwq3v62ryhi3663"; }; - preBuild = '' - # Shut up inkscape's warnings - export HOME="$NIX_BUILD_ROOT" - ''; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + sassc + optipng + inkscape + gtk3 + gnome3.gnome-shell + ]; - nativeBuildInputs = [ autoreconfHook pkgconfig sassc optipng inkscape ]; - buildInputs = [ gtk3 ]; + propagatedUserEnvPkgs = [ + gnome3.gnome-themes-extra + gtk-engine-murrine + ]; - propagatedUserEnvPkgs = [ gnome-themes-extra gtk-engine-murrine ]; + enableParallelBuilding = true; postPatch = '' - find . -name render-assets.sh | - while read filename - do - substituteInPlace "$filename" \ - --replace "/usr/bin/inkscape" "${inkscape.out}/bin/inkscape" \ - --replace "/usr/bin/optipng" "${optipng.out}/bin/optipng" - done patchShebangs . ''; + preBuild = '' + # Shut up inkscape's warnings about creating profile directory + export HOME="$NIX_BUILD_ROOT" + ''; + configureFlags = [ "--disable-unity" ]; postInstall = '' - install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md + install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 5943ced2f8f..dfca87e2716 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.314"; + version = "0.316"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "12k466ndg152fqld1w5v1zfdyv000yypazcwy75ywlxvlknv4y90"; + sha256 = "0k3fypykbq9943cnxlmmpk0xp9nhhf46pfdhkgm99iaa27b8s1gb"; }; preConfigure = "patchShebangs ./configure"; - configureFlags = [ "--datadir=$(prefix)/data" ]; + configureFlags = [ "--datadir=${placeholder "out"}/share" ]; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1w00y5kj8rd8slzydw1gw8cablxlkham4vq786kdd8zga286zabb"; + outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww"; meta = { homepage = https://github.com/vcrhonek/hwdata; diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index a70ab13db62..1e920247a75 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam, yacc, flex }: +{ stdenv, fetchurl, fetchpatch, pam, yacc, flex }: stdenv.mkDerivation rec { name = "libcgroup-${version}"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ pam yacc flex ]; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch?id=33e9f4c81de754bbf76b893ea1133ed023f2a0e5"; + sha256 = "1x0x29ld0cgmfwq4qy13s6d5c8sym1frfh1j2q47d8gfw6qaxka5"; + }) + ]; + postPatch = '' substituteInPlace src/tools/Makefile.in \ --replace 'chmod u+s' 'chmod +x' diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 657d6cc24a8..8d53756d510 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/lsusb.py \ - --replace /usr/share/usb.ids ${hwdata}/data/hwdata/usb.ids + --replace /usr/share/usb.ids ${hwdata}/share/hwdata/usb.ids ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index ab632372b46..4b753bdf0cd 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -4,12 +4,12 @@ assert tls -> gnutls != null; stdenv.mkDerivation rec { - version = "2.1"; + version = "2.2"; name = "nullmailer-${version}"; src = fetchurl { url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; - sha256 = "0gykh0qc86rk0knfvp8ndqkryal3pvqdfdya94wvb6n1cc8p3ild"; + sha256 = "0md8cf90fl2yf3zh9njjy42a673v4j4ygyq95xg7fzkygdigm1lq"; }; buildInputs = stdenv.lib.optional tls gnutls; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index b3a31d2d1ba..70112732d27 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.3.1"; + version = "5.3.2"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0k4jsqgk0wbp1xc159vrs855d42kcdc4d38v498imp6a90idniyp"; + sha256 = "1p2vapyaf11d7zri73vnq1rsgwb018pqbjzdkdgppcm5xfrrjh8y"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "133ckn5f4l6vqy65y1z3mzhzhy8xcyq65nqb34mwn2zsi7pzvssz"; + sha256 = "067rj2lrdwxda1clcg89m1cnl9sfrl2l9ia5fx2bcxq3yzhchazh"; }; postPatch = '' diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index bce69370d2b..231124a42ef 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,36 +1,51 @@ -{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares, libuv }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt +, openssl, libuuid, libwebsockets, c-ares, libuv }: stdenv.mkDerivation rec { - pname = "mosquitto"; - version = "1.4.15"; + name = "mosquitto-${version}"; + version = "1.5.3"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://mosquitto.org/files/source/mosquitto-${version}.tar.gz"; - sha256 = "10wsm1n4y61nz45zwk4zjhvrfd86r2cq33370m5wjkivb8j3wfvx"; + src = fetchFromGitHub { + owner = "eclipse"; + repo = "mosquitto"; + rev = "v${version}"; + sha256 = "0bknmnvssix7c1cps6mzjjnw9zxdlyfsy6ksqx4zfglcw41p8gnz"; }; - buildInputs = [ openssl libuuid libwebsockets c-ares libuv ] - ++ stdenv.lib.optional stdenv.isDarwin cmake; - - makeFlags = stdenv.lib.optionals stdenv.isLinux [ - "DESTDIR=$(out)" - "PREFIX=" + patches = [ + # https://github.com/eclipse/mosquitto/issues/983 + (fetchpatch { + url = "https://github.com/eclipse/mosquitto/commit/7f1419e4de981f5cc38aa3a9684369b1de27ba46.patch"; + sha256 = "05npr0h79mbaxzjyhdw78hi9gs1cwydf2fv67bqxm81jzj2yhx2s"; + name = "fix_threading_on_cmake.patch"; + }) ]; postPatch = '' - substituteInPlace config.mk \ - --replace "/usr/local" "" - substituteInPlace config.mk \ - --replace "WITH_WEBSOCKETS:=no" "WITH_WEBSOCKETS:=yes" + substituteInPlace man/manpage.xsl \ + --replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/ + + # the manpages are not generated when using cmake + pushd man + make + popd ''; - meta = { - homepage = http://mosquitto.org/; + buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]; + + nativeBuildInputs = [ cmake docbook_xsl libxslt ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DWITH_THREADING=ON" + ]; + + meta = with stdenv.lib; { description = "An open source MQTT v3.1/3.1.1 broker"; - platforms = stdenv.lib.platforms.unix; - # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft) - license = stdenv.lib.licenses.epl10; + homepage = http://mosquitto.org/; + license = licenses.epl10; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index bf3d7773640..92a6628dcda 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "antibody-${version}"; - version = "3.7.0"; + version = "4.0.0"; rev = "v${version}"; goPackagePath = "github.com/getantibody/antibody"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "getantibody"; repo = "antibody"; - sha256 = "1c7f0b1lgl4pm3cs39kr6dgr19lfykjhamg74k5ryrizag0j68l5"; + sha256 = "0iq3dfwwh39hmk8qmhrfgkn8pcabxf67c03s7vh18n7w9aay4jfz"; }; goDeps = ./deps.nix; diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index ba65f90d909..29a2a653265 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-completions-${version}"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-completions"; rev = "${version}"; - sha256 = "02n1svaw74y0za856w8zjb98nzg1h6bmy4xsar71irsk1mj3m5h2"; + sha256 = "0a4fdh10rhhjcy06qiyyy0xjvg7fapvy3pgif38wrjqvrddaj6pv"; }; installPhase= '' diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 5059b395610..b9046bf19ca 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "cloud-sql-proxy-${version}"; - version = "1.11"; + version = "1.13"; goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { rev = version; url = "https://${goPackagePath}"; - sha256 = "13g68i51f03xdh7a1qjmj8j5ljn4drd3n44fn348xfdxqclnx90l"; + sha256 = "07n2hfhqa9hinabmx79aqqwxzzkky76x3jvpd89kch14fijbh532"; }; goDeps = ./deps.nix; @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; - homepage = https://github.com/GoogleCloudPlatform/cloudsql-proxy; + homepage = "https://${goPackagePath}"; license = licenses.asl20; maintainers = [ maintainers.nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/cloud-sql-proxy/deps.nix b/pkgs/tools/misc/cloud-sql-proxy/deps.nix index 7021b4b05b2..6898833b6f1 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/deps.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://code.googlesource.com/gocloud"; - rev = "e9284bade4f43071dac5ec56c73a03a3c9fa7772"; - sha256 = "0qm0s97bj21m04a07yni09hdh0aycgmklm5mg6flx17lrp2av9j8"; + rev = "dba8c2c195294739180b3e6865f8893eb808676e"; + sha256 = "1l6aj26sd7byjcgi2b4k452fcg949v28lff2fkw5nq2qr2fjnqxy"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "3a7846fea0afe8cc88deb31d8cfb1fa15a3615ef"; - sha256 = "1dxvliqc79bl0waczzy8ajm7jpbnn2bszwfcd71zjjxph8jz75kg"; + rev = "9b4f9f5ad5197c79fd623a3638e70d8b26cef344"; + sha256 = "06hvxy113h76f31gv1mq6vdr6xja1zv0fdig686l2b4y2b6swych"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269"; - sha256 = "182is558nfvk4x1cm8sqzaym8kfcaaxaga9ggqhvzqrs8mncbj22"; + rev = "9dcd33a902f40452422c2367fefcb95b54f9f8f8"; + sha256 = "15lfa780h2ff50qvcdl7sfs9f9j13fa5kfj6fb292rk3fwxhnx4i"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://code.googlesource.com/google-api-go-client"; - rev = "20530fd5d65ad2caee87891f9896d7547cb400c9"; - sha256 = "06fsnml2kfzifxp2d5anb6vxjlgpkwl82xcddf0cg0v1bnx5mnrd"; + rev = "39567f0042a03aeb2691599961ed4454e43d5063"; + sha256 = "0c5gx156v1pk0gqvl9w43l06z0rh9g2sackpl9ghds0asnyqx04d"; }; } ] diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 563232dbe53..80b66026848 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -5,23 +5,15 @@ stdenv.mkDerivation rec { name = "snapper-${version}"; - version = "0.5.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "14hrv23film4iihyclcvc2r2dgxl8w3as50r81xjjc85iyp6yxkm"; + sha256 = "1dm1kf4wrbcaaagxgbc8q0f5j9dq3bmp6ycl7zx8p70s4nv3xnbc"; }; - patches = [ - # Fix build with new Boost - (fetchpatch { - url = "https://github.com/openSUSE/snapper/commit/2e3812d2c1d1f54861fb79f5c2b0197de96a00a3.patch"; - sha256 = "0yrzss1v7lmcvkajmchz917yqsvlsdfz871szzw790v6pql1322s"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkgconfig docbook_xsl libxslt docbook_xml_dtd_45 diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 23e28c3c286..fa208154eaa 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "units-${version}"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "mirror://gnu/units/${name}.tar.gz"; - sha256 = "1n2xzpnxfn475zkd8rzs5gg58xszjbr4bdbgvk6hryzimvwwj0qz"; + sha256 = "0y26kj349i048y4z3xrk90bvciw2j6ds3rka7r7yn3183hirr5b4"; }; buildInputs = [ readline ]; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index ab8d257d7c7..a0c44b0341c 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -3,18 +3,18 @@ , autoreconfHook }: stdenv.mkDerivation rec { - name = "aircrack-ng-1.2"; + name = "aircrack-ng-1.4"; src = fetchurl { url = "https://download.aircrack-ng.org/${name}.tar.gz"; - sha256 = "0z7sl1ihgrnc98bpqa1mmkh51w26fnsanvj6ydwcnd8g83azwkvr"; + sha256 = "0fz1g6sd7dkfgcxrfrnqbygpx8d4ziyidm9wjb0ws9xgyy52l2cn"; }; nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ]; buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ]; patchPhase = '' - sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c + sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/aircrack-osdep/linux.c ''; postFixup = '' diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index fda5d25aa17..36bc2a9bc28 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "eternal-terminal-${version}"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTCP"; rev = "refs/tags/et-v${version}"; - sha256 = "0df573c5hi3hxa0d3m02zf2iyh841540dklj9lmp6faik8cp39jz"; + sha256 = "17ndpkpyh8hwr6v7ac6029sja95nhn9c1g8r93g20rp0vz3r6lpa"; }; nativeBuildInputs = [ cmake ninja ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Remote shell that automatically reconnects without interrupting the session"; license = licenses.asl20; homepage = https://mistertea.github.io/EternalTCP/; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.dezgeg ]; }; } diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 96bc2c56ece..7aeae3ca9d1 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -13,39 +13,31 @@ let gssapiPatch = fetchpatch { name = "openssh-gssapi.patch"; url = "https://salsa.debian.org/ssh-team/openssh/raw/" - + "e395eed38096fcda74398424ea94de3ec44effd5" + + "d80ebbf028196b2478beebf5a290b97f35e1eed9" + "/debian/patches/gssapi.patch"; - sha256 = "0x7xysgdahb4jaq0f28g2d7yzp0d3mh59i4xnffszvjndhvbk27x"; + sha256 = "14j9cabb3gkhkjc641zbiv29mbvsmgsvis3fbj8ywsd21zc7m2wv"; }; in with stdenv.lib; stdenv.mkDerivation rec { name = "openssh-${version}"; - version = if hpnSupport then "7.7p1" else "7.7p1"; + version = if hpnSupport then "7.8p1" else "7.9p1"; src = if hpnSupport then fetchurl { - url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_7_P1.tar.gz"; - sha256 = "1l4k8mg3gnzxbz53cma8s6ak56waz03ijsr08p8vgpi0c2rc5ri5"; + url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_8_P1.tar.gz"; + sha256 = "05q5hxx7fzcgd8a5i0zk4fwvmnz4xqk04j489irnwm7cka7xdqxw"; } else fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "13vbbrvj3mmfhj83qyrg5c0ipr6bzw5s65dy4k8gr7p9hkkfffyp"; + sha256 = "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb"; }; patches = [ - # Remove on update! - (fetchpatch { - name = "fix-tunnel-forwarding.diff"; - url = "https://github.com/openssh/openssh-portable/commit/cfb1d9bc767.diff"; - sha256 = "1mszj7f1kj6bazr7asbi1bi4238lfpilpp98f6c1dn3py4fbsdg8"; - }) - ./locale_archive.patch - ./fix-host-key-algorithms-plus.patch # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch diff --git a/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch b/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch deleted file mode 100644 index 02846e9bdad..00000000000 --- a/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch +++ /dev/null @@ -1,52 +0,0 @@ -Specifying "HostKeyAlgorithms +ssh-dds" does not work properly because -setting any value for HostKeyAlgorithms causes the known host keys to -be ignored for the purpose of determining the priority of algorithms. -This was fixed upstream for HostKeyAlgorithms in sshd_config, but not -in ssh_config. The fix is to apply order_hostkeyalgs() if the user -specifies a HostKeyAlgorithms starting with "+". - -diff -ru -x '*~' openssh-7.2p2-orig/sshconnect2.c openssh-7.2p2/sshconnect2.c ---- openssh-7.2p2-orig/sshconnect2.c 2016-03-09 19:04:48.000000000 +0100 -+++ openssh-7.2p2/sshconnect2.c 2016-04-01 15:39:45.140945902 +0200 -@@ -100,7 +100,7 @@ - } - - static char * --order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port) -+order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port, char *algs) - { - char *oavail, *avail, *first, *last, *alg, *hostname, *ret; - size_t maxlen; -@@ -116,7 +116,7 @@ - for (i = 0; i < options.num_system_hostfiles; i++) - load_hostkeys(hostkeys, hostname, options.system_hostfiles[i]); - -- oavail = avail = xstrdup(KEX_DEFAULT_PK_ALG); -+ oavail = avail = xstrdup(algs); - maxlen = strlen(avail) + 1; - first = xmalloc(maxlen); - last = xmalloc(maxlen); -@@ -181,18 +181,21 @@ - myproposal[PROPOSAL_MAC_ALGS_CTOS] = - myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; - if (options.hostkeyalgorithms != NULL) { -+ int append = options.hostkeyalgorithms[0] == '+'; - if (kex_assemble_names(KEX_DEFAULT_PK_ALG, - &options.hostkeyalgorithms) != 0) - fatal("%s: kex_assemble_namelist", __func__); - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = -- compat_pkalg_proposal(options.hostkeyalgorithms); -+ compat_pkalg_proposal(append -+ ? order_hostkeyalgs(host, hostaddr, port, options.hostkeyalgorithms) -+ : options.hostkeyalgorithms); - } else { - /* Enforce default */ - options.hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG); - /* Prefer algorithms that we already have keys for */ - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = - compat_pkalg_proposal( -- order_hostkeyalgs(host, hostaddr, port)); -+ order_hostkeyalgs(host, hostaddr, port, KEX_DEFAULT_PK_ALG)); - } - - if (options.rekey_limit || options.rekey_interval) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index b11d149da88..f668998de7f 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.3.2"; + version = "5.4.0"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "1sd6jl349kz3bjwm8rx9kihxyd3d35cac4swla843vwzdpczsk5f"; + sha256 = "1n90qpy079x97a27zpckc0vnaqrdjsxgy0hsz0z8gbrc1sy30sdz"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 33b62d1bb38..12e2deb7422 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20181007"; + version = "0.0.20181018"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1nrhwnccs6sqq1qs7yhxqb989inrc9n2saibpqs6ga6gb0pvpac6"; + sha256 = "0vrr0f89nrpwnyia6kqvrjkxwivrnvjnbavmx2nxlrb3sz23481y"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix new file mode 100644 index 00000000000..988147d7ab0 --- /dev/null +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub +, autoreconfHook, pkgconfig, gettext +, vim, glib, libxml2, openssl, ncurses, popt, screen +}: + +stdenv.mkDerivation rec { + name = "apt-dater-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "DE-IBH"; + repo = "apt-dater"; + rev = "v${version}"; + sha256 = "1flr6cm72cywmwp5h7pbmmpq057xsi9shkczyplxqaqrb2gns5fl"; + }; + + nativeBuildInputs = [ + pkgconfig autoreconfHook gettext + ]; + + buildInputs = [ + libxml2 ncurses vim glib popt screen + ]; + + configureFlags = [ "--disable-history" ]; + + prePatch = '' + substituteInPlace etc/Makefile.am \ + --replace 02770 0770 + ''; + + postPatch = '' + substituteInPlace configure.ac \ + --replace "/usr/bin/screen" "${screen}/bin/screen" + ''; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://github.com/DE-IBH/apt-dater; + description = "Terminal-based remote package update manager"; + longDescription = '' + Provides an ncurses frontend for managing package updates on a large + number of remote hosts using SSH. It supports Debian-based managed hosts + as well as rug (e.g. openSUSE) and yum (e.g. CentOS) based systems. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ c0bw3b ]; + }; +} diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index da32aca28aa..126673ad9cc 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "0csd7dkdv0csc63dz1h08c8xifxwv5fdz5dyk37sr6vh1ccjdapi"; + sha256 = "14ak0qfc5faamnp4fmrqmb1ikpv656nr830rja89yzc96s73337z"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index 44cee21bc49..03af1b8a101 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "paperkey-${version}"; - version = "1.5"; + version = "1.6"; src = fetchurl { url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; - sha256 = "1prd2jaf4zjad3xhv160hmi5n408ssljfg7iz90jxs9w111pjwy4"; + sha256 = "1xq5gni6gksjkd5avg0zpd73vsr97appksfx0gx2m38s4w9zsid2"; }; postPatch = '' diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index d2326c7e8c3..86a5a1b7c39 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -1,24 +1,50 @@ -{ stdenv, fetchurl }: - +{ stdenv, fetchFromGitHub, libtool, autoconf, automake, pkgconfig +, sysfsutils + # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS + # https://www.nist.gov/programs-projects/nist-randomness-beacon +, curl ? null, libxml2 ? null, openssl ? null, withNistBeacon ? false + # Systems that support RDRAND but not AES-NI require libgcrypt to use RDRAND as an entropy source +, libgcrypt ? null, withGcrypt ? true + # Not sure if jitterentropy is safe to use for cryptography + # and thus a default entropy source +, jitterentropy ? null, withJitterEntropy ? false +}: +with stdenv.lib; stdenv.mkDerivation rec { - name = "rng-tools-5"; + name = "rng-tools-${version}"; + version = "6.6"; - src = fetchurl { - url = "mirror://sourceforge/gkernel/${name}.tar.gz"; - - sha256 = "13h7lc8wl9khhvkr0i3bl5j9bapf8anhqis1lcnwxg1vc2v058b0"; + src = fetchFromGitHub { + owner = "nhorman"; + repo = "rng-tools"; + rev = "v${version}"; + sha256 = "0c32sxfvngdjzfmxn5ngc5yxwi8ij3yl216nhzyz9r31qi3m14v7"; }; + nativeBuildInputs = [ libtool autoconf automake pkgconfig ]; + + preConfigure = "./autogen.sh"; + + configureFlags = + optional (!withJitterEntropy) "--disable-jitterentropy" + ++ optional (!withNistBeacon) "--without-nistbeacon" + ++ optional (!withGcrypt) "--without-libgcrypt"; + + buildInputs = [ sysfsutils ] + ++ optional withJitterEntropy [ jitterentropy ] + ++ optional withGcrypt [ libgcrypt.dev ] + ++ optional withNistBeacon [ openssl.dev curl.dev libxml2.dev ]; + + enableParallelBuilding = true; + # For cross-compilation makeFlags = [ "AR:=$(AR)" ]; meta = { description = "A random number generator daemon"; - - homepage = https://sourceforge.net/projects/gkernel; - - license = stdenv.lib.licenses.gpl2; - + homepage = https://github.com/nhorman/rng-tools; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; }; } diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix new file mode 100644 index 00000000000..68db242f40a --- /dev/null +++ b/pkgs/tools/security/signify/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, libbsd, pkgconfig }: + +stdenv.mkDerivation rec { + name = "signify-${version}"; + version = "24"; + + src = fetchFromGitHub { + owner = "aperezdc"; + repo = "signify"; + rev = "v${version}"; + sha256 = "0grdlrpxcflzmzzc30r8rvsmamvbsgqyni59flzzk4w5hpjh464w"; + }; + + doCheck = true; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libbsd ]; + + preInstall = '' + export PREFIX=$out + ''; + + meta = with stdenv.lib; { + description = "OpenBSD signing tool"; + longDescription = '' + OpenBSDs signing tool, which uses the Ed25519 public key signature system + for fast signing and verification of messages using small public keys. + ''; + homepage = https://www.tedunangst.com/flak/post/signify; + license = licenses.isc; + maintainers = [ maintainers.rlupton20 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index e273b2c1909..460474a7bb3 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -5,34 +5,16 @@ }: stdenv.mkDerivation rec { - version = "3.7.1"; + version = "3.8.1"; name = "yara-${version}"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "05smkn4ii8irx6ccnzrhwa39pkmrjyxjmfrwh6mhdd8iz51v5cgz"; + sha256 = "1ys2y5f2cif3g42daq646jcrn2na19zkx7fds2gnavj5c1rk7463"; }; - # FIXME: this is probably not the right way to make it work - # make[2]: *** No rule to make target 'libyara/.libs/libyara.a', needed by 'yara'. Stop. - prePatch = '' - cat >staticlibrary.patch <