From d72f22607acd26c04f4447f3db99946aa15f9fe2 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 3 Apr 2018 11:25:13 +0000 Subject: [PATCH 001/265] cryptsetup: 1.7.5 -> 2.0.2 --- pkgs/os-specific/linux/cryptsetup/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index ef8c55853a3..e2917c81e15 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, devicemapper, openssl, libuuid, pkgconfig, popt +{ stdenv, fetchurl, devicemapper, json_c, openssl, libuuid, pkgconfig, popt , enablePython ? false, python2 ? null }: assert enablePython -> python2 != null; stdenv.mkDerivation rec { - name = "cryptsetup-1.7.5"; + name = "cryptsetup-2.0.2"; src = fetchurl { - url = "mirror://kernel/linux/utils/cryptsetup/v1.7/${name}.tar.xz"; - sha256 = "1gail831j826lmpdx2gsc83lp3br6wfnwh3vqwxaa1nn1lfwsc1b"; + url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz"; + sha256 = "15wyjfgcqjf0wy5gxnmjj8aah33csv5v6n1hv9c8sxdzygbhb0ag"; }; configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ] ++ stdenv.lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ devicemapper openssl libuuid popt ] + buildInputs = [ devicemapper json_c openssl libuuid popt ] ++ stdenv.lib.optional enablePython python2; meta = { From 170223fe642bba1b36181d2120ba0095c70de6eb Mon Sep 17 00:00:00 2001 From: Michishige Kaito Date: Sat, 26 May 2018 12:05:04 +0100 Subject: [PATCH 002/265] Handle attributes being derivations --- nixos/modules/services/security/oauth2_proxy.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 433d97c2a7d..96d78630e6d 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -72,6 +72,7 @@ let mapConfig = key: attr: if (!isNull attr && attr != []) then ( + if isDerivation attr then mapConfig key (toString attr) else if (builtins.typeOf attr) == "set" then concatStringsSep " " (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else if (builtins.typeOf attr) == "list" then concatMapStringsSep " " (mapConfig key) attr else From 9dcf7d0d4e5194677785996d3fbc7f044240b853 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Sun, 3 Jun 2018 19:22:22 +1000 Subject: [PATCH 003/265] taffybar: work around repeated arguments bug Fixes #40013 --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 387983003af..b7419a1ff40 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1049,6 +1049,12 @@ self: super: { # Work around overspecified constraint on github ==0.18. github-backup = doJailbreak super.github-backup; + # Work around large number of repeated arguments + # https://github.com/NixOS/nixpkgs/issues/40013 + taffybar = super.taffybar.overrideDerivation (drv: { + strictDeps = true; + }); + } // From ee4bb9454e1e06e30c1f0396b69a1ae9df1c35dc Mon Sep 17 00:00:00 2001 From: vicgc Date: Wed, 6 Jun 2018 00:24:04 +0200 Subject: [PATCH 004/265] Fixed nilfs2 fsck error at boot because its not needed bu the nilfs2 filesystem --- nixos/modules/system/boot/stage-1-init.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 92e68b72664..de8451bbe31 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -251,6 +251,9 @@ checkFS() { # Skip fsck for bcachefs - not implemented yet. if [ "$fsType" = bcachefs ]; then return 0; fi + # Skip fsck for nilfs2 - not needed by design and no fsck tool for this filesystem. + if [ "$fsType" = nilfs2 ]; then return 0; fi + # Skip fsck for inherently readonly filesystems. if [ "$fsType" = squashfs ]; then return 0; fi From 3dfc9cd8268b10e990a7e9af536dbc7b12099789 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Sat, 9 Jun 2018 01:59:21 -0400 Subject: [PATCH 005/265] nixos/uvcvideo.dynctrl: Init --- .../hardware/video/uvcvideo/default.nix | 64 +++++++++++++++++++ .../video/uvcvideo/uvcdynctrl-udev-rules.nix | 46 +++++++++++++ nixos/modules/module-list.nix | 1 + 3 files changed, 111 insertions(+) create mode 100644 nixos/modules/hardware/video/uvcvideo/default.nix create mode 100644 nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix diff --git a/nixos/modules/hardware/video/uvcvideo/default.nix b/nixos/modules/hardware/video/uvcvideo/default.nix new file mode 100644 index 00000000000..7e3e94fdf2b --- /dev/null +++ b/nixos/modules/hardware/video/uvcvideo/default.nix @@ -0,0 +1,64 @@ + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.uvcvideo; + + uvcdynctrl-udev-rules = packages: pkgs.callPackage ./uvcdynctrl-udev-rules.nix { + drivers = packages; + udevDebug = false; + }; + +in + +{ + + options = { + services.uvcvideo.dynctrl = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable uvcvideo dynamic controls. + + Note that enabling this brings the uvcdynctrl tool + into your environement and register all dynamic controls from + specified packages to the uvcvideo driver. + ''; + }; + + packages = mkOption { + type = types.listOf types.path; + example = literalExample "[ pkgs.tiscamera ]"; + description = '' + List of packages containing uvcvideo dynamic controls + rules. All files found in + pkg/share/uvcdynctrl/data + will be included. + + Note that these will serve as input to the libwebcam + package which through its own udev rule will register + the dynamic controls from specified packages to the uvcvideo + driver. + ''; + apply = map getBin; + }; + }; + }; + + config = mkIf cfg.dynctrl.enable { + + services.udev.packages = [ + (uvcdynctrl-udev-rules cfg.dynctrl.packages) + ]; + + environment.systemPackages = [ + pkgs.libwebcam + ]; + + }; +} diff --git a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix new file mode 100644 index 00000000000..832e6196612 --- /dev/null +++ b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, buildEnv +, libwebcam +, makeWrapper +, runCommand +, drivers ? [] +, udevDebug ? false +}: + +let + version = "0.0.0"; + + dataPath = buildEnv { + name = "uvcdynctrl-with-drivers-data-path"; + paths = drivers ++ [ libwebcam ]; + pathsToLink = [ "/share/uvcdynctrl/data" ]; + ignoreCollisions = false; + }; + + dataDir = "${dataPath}/share/uvcdynctrl/data"; + udevDebugVarValue = if udevDebug then "1" else "0"; +in + +runCommand "uvcdynctrl-udev-rules-${version}" +{ + inherit dataPath; + buildInputs = [ + makeWrapper + libwebcam + ]; + dontPatchELF = true; + dontStrip = true; +} +'' + mkdir -p "$out/lib/udev" + makeWrapper "${libwebcam}/lib/udev/uvcdynctrl" "$out/lib/udev/uvcdynctrl" \ + --set NIX_UVCDYNCTRL_DATA_DIR "${dataDir}" \ + --set NIX_UVCDYNCTRL_UDEV_DEBUG "${udevDebugVarValue}" + + mkdir -p "$out/lib/udev/rules.d" + cat "${libwebcam}/lib/udev/rules.d/80-uvcdynctrl.rules" | \ + sed -r "s#RUN\+\=\"([^\"]+)\"#RUN\+\=\"$out/lib/udev/uvcdynctrl\"#g" > \ + "$out/lib/udev/rules.d/80-uvcdynctrl.rules" +'' + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index da4c21296ff..e692fc0fb7d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -50,6 +50,7 @@ ./hardware/video/bumblebee.nix ./hardware/video/displaylink.nix ./hardware/video/nvidia.nix + ./hardware/video/uvcvideo/default.nix ./hardware/video/webcam/facetimehd.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix From 24f176f01691f3d350f64272bc5297a8400d4b99 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 11 Jun 2018 09:47:01 -0700 Subject: [PATCH 006/265] nixos/mattermost: fix JoinsNamespaceOf config location --- nixos/modules/services/web-apps/mattermost.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index be74a2b1955..277cbe35b78 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -203,11 +203,11 @@ in Group = cfg.group; ExecStart = "${pkgs.mattermost}/bin/mattermost-platform"; WorkingDirectory = "${cfg.statePath}"; - JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service"; Restart = "always"; RestartSec = "10"; LimitNOFILE = "49152"; }; + unitConfig.JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service"; }; }) (mkIf cfg.matterircd.enable { From 8bf1a5c4692fcd0fc2487cad3144ca5482b2729b Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Wed, 13 Jun 2018 15:32:16 +1000 Subject: [PATCH 007/265] bazel: fix darwin build --- .../tools/build-managers/bazel/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e641e69bae6..94100423401 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { extern char **environ; int main(int argc, char *argv[]) { - printf("environ: %s\n", environ[0]); char *path = getenv("PATH"); char *pathToAppend = "${lib.makeBinPath [ coreutils ]}"; char *newPath; @@ -57,12 +56,22 @@ stdenv.mkDerivation rec { } ''; - postPatch = '' + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + '' + '' find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ --replace /bin/bash ${customBash}/bin/bash \ --replace /usr/bin/env ${coreutils}/bin/env done + echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc + echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc + echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc + echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc + sed -i -e "348 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "348 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "348 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "348 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh patchShebangs . ''; From 783eb8438a019f99feca0cab1ae3c9516e8040ae Mon Sep 17 00:00:00 2001 From: Allan Espinosa Date: Tue, 12 Jun 2018 23:54:32 -0400 Subject: [PATCH 008/265] nixos/nexus: allow overriding the package Useful when pulling nixos-unstable in a stable NixOS installation. --- nixos/modules/services/web-apps/nexus.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix index d5bd0f12feb..b0eaee6040e 100644 --- a/nixos/modules/services/web-apps/nexus.nix +++ b/nixos/modules/services/web-apps/nexus.nix @@ -13,6 +13,12 @@ in services.nexus = { enable = mkEnableOption "Sonatype Nexus3 OSS service"; + package = mkOption { + type = types.package; + default = pkgs.nexus; + description = "Package which runs Nexus3"; + }; + user = mkOption { type = types.str; default = "nexus"; @@ -55,10 +61,10 @@ in -XX:LogFile=${cfg.home}/nexus3/log/jvm.log -XX:-OmitStackTraceInFastThrow -Djava.net.preferIPv4Stack=true - -Dkaraf.home=${pkgs.nexus} - -Dkaraf.base=${pkgs.nexus} - -Dkaraf.etc=${pkgs.nexus}/etc/karaf - -Djava.util.logging.config.file=${pkgs.nexus}/etc/karaf/java.util.logging.properties + -Dkaraf.home=${cfg.package} + -Dkaraf.base=${cfg.package} + -Dkaraf.etc=${cfg.package}/etc/karaf + -Djava.util.logging.config.file=${cfg.package}/etc/karaf/java.util.logging.properties -Dkaraf.data=${cfg.home}/nexus3 -Djava.io.tmpdir=${cfg.home}/nexus3/tmp -Dkaraf.startLocalConsole=false @@ -112,7 +118,7 @@ in fi ''; - script = "${pkgs.nexus}/bin/nexus run"; + script = "${cfg.package}/bin/nexus run"; serviceConfig = { User = cfg.user; From f8cd0cbc9c4e449acc8c3a72643643ce3e288f32 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Tue, 12 Jun 2018 18:54:44 +0200 Subject: [PATCH 009/265] asc-key-to-qr-code-gif: init at 20180613 --- .../asc-key-to-qr-code-gif/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/security/asc-key-to-qr-code-gif/default.nix diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix new file mode 100644 index 00000000000..e04b4155748 --- /dev/null +++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, imagemagick, libqrencode +, testQR ? false, zbar ? null +}: + +assert testQR -> zbar != false; + +stdenv.mkDerivation rec { + name = "asc-key-to-qr-code-gif-${version}"; + version = "20180613"; + + src = fetchFromGitHub { + owner = "yishilin14"; + repo = "asc-key-to-qr-code-gif"; + rev = "5b7b239a0089a5269444cbe8a651c99dd43dce3f"; + sha256 = "0yrc302a2fhbzryb10718ky4fymfcps3lk67ivis1qab5kbp6z8r"; + }; + + buildInputs = [ imagemagick libqrencode ] ++ stdenv.lib.optional testQR zbar; + dontBuild = true; + dontStrip = true; + dontPatchELF = true; + + preInstall = '' + substituteInPlace asc-to-gif.sh \ + --replace "convert" "${imagemagick}/bin/convert" \ + --replace "qrencode" "${libqrencode}/bin/qrencode" + ''; + + installPhase = '' + mkdir -p $out/bin + cp * $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/yishilin14/asc-key-to-qr-code-gif; + description = "Convert ASCII-armored PGP keys to animated QR code"; + platforms = platforms.linux; + maintainers = with maintainers; [ asymmetric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b034411921b..283e69e54ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -680,6 +680,8 @@ with pkgs; passExtensions = recurseIntoAttrs pass.extensions; + asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; + gopass = callPackage ../tools/security/gopass { }; browserpass = callPackage ../tools/security/browserpass { }; From 4f1b14b513ba30deed71cafbc39480084d1f4e94 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 27 Mar 2018 17:51:02 -0500 Subject: [PATCH 010/265] editline: init at 1.15.3 --- .../libraries/editline/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/editline/default.nix diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix new file mode 100644 index 00000000000..d9b5a2b64d6 --- /dev/null +++ b/pkgs/development/libraries/editline/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "editline-${version}"; + version = "1.15.3"; + src = fetchFromGitHub { + owner = "troglobit"; + repo = "editline"; + rev = version; + sha256 = "0dm5fgq0acpprr938idwml64nclg9l6c6avirsd8r6f40qicbgma"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + dontDisableStatic = true; + + meta = with stdenv.lib; { + homepage = http://troglobit.com/editline.html; + description = "A readline() replacement for UNIX without termcap (ncurses)"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcfc3646bcc..7bc82ba6094 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8926,6 +8926,8 @@ with pkgs; eclib = callPackage ../development/libraries/eclib {}; + editline = callPackage ../development/libraries/editline { }; + eigen = callPackage ../development/libraries/eigen {}; eigen3_3 = callPackage ../development/libraries/eigen/3.3.nix {}; From 3c5b4c0ceee5ae8dd9218410c2b40feb90a34df1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Jun 2018 20:50:05 -0700 Subject: [PATCH 011/265] speedtest-cli: 2.0.1 -> 2.0.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/speedtest-cli/versions. These checks were done: - built on NixOS - /nix/store/a4chlrm6z1ar1q81dxnyza2caw326mba-speedtest-cli-2.0.2/bin/.speedtest-wrapped passed the binary check. - /nix/store/a4chlrm6z1ar1q81dxnyza2caw326mba-speedtest-cli-2.0.2/bin/speedtest passed the binary check. - /nix/store/a4chlrm6z1ar1q81dxnyza2caw326mba-speedtest-cli-2.0.2/bin/.speedtest-cli-wrapped passed the binary check. - /nix/store/a4chlrm6z1ar1q81dxnyza2caw326mba-speedtest-cli-2.0.2/bin/speedtest-cli passed the binary check. - 4 of 4 passed binary check by having a zero exit code. - 4 of 4 passed binary check by having the new version present in output. - found 2.0.2 with grep in /nix/store/a4chlrm6z1ar1q81dxnyza2caw326mba-speedtest-cli-2.0.2 - directory tree listing: https://gist.github.com/6b0bc77e82e32f36a5b79985ecdfc141 - du listing: https://gist.github.com/d6c4b589c95fcdaad30bc0b4e265e6e6 --- pkgs/tools/networking/speedtest-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index ff0441c4078..623081fbb4e 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "sivel"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "0d3av50qm7bahsdg0k7hp04r9ripsafn95yqcgsy5h5y9yj4rsvf"; + sha256 = "0vv2z37g2kgm2dzkfa4bhri92hs0d1acxi8z66gznsl5148q7sdi"; }; meta = with stdenv.lib; { From 5a7934fe5ff2e708d731b3145c14aa840a736787 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Jun 2018 22:48:41 -0700 Subject: [PATCH 012/265] qjackctl: 0.5.1 -> 0.5.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qjackctl/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/33vv5dahzak40dz8dz3jhl8djhynd3ic-qjackctl-0.5.2/bin/qjackctl had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.5.2 with grep in /nix/store/33vv5dahzak40dz8dz3jhl8djhynd3ic-qjackctl-0.5.2 - directory tree listing: https://gist.github.com/4a9fd6b4ad4fd10c1cd98b69e19013f6 - du listing: https://gist.github.com/a247869091656e3b47ee3174d4077803 --- pkgs/applications/audio/qjackctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index aabd7343010..09249f7fbea 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.5.1"; + version = "0.5.2"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "0jw1s4qh4qjxnysddjv3j2lchwlslj9p4iisv9i89d3m7pf1svs4"; + sha256 = "0nqr5f82lry3i4if8wdmrqsw84m45ijyj4psll30plxx5732zzaz"; }; buildInputs = [ From 94bd4787a93b5fbc1a8f3484b2899e2e923d2c0a Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Fri, 12 May 2017 14:54:13 -0400 Subject: [PATCH 013/265] nixos/postgresql: Use listen_addresses, not -i The -i flag to control if PostgreSQL listens for TCP/IP connections has been deprecated, so replace it with the modern alternative. --- nixos/modules/services/databases/postgresql.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 4ad4728ccda..42d61fa1b36 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -24,14 +24,13 @@ let postgresql = postgresqlAndPlugins cfg.package; - flags = optional cfg.enableTCPIP "-i"; - # The main PostgreSQL configuration file. configFile = pkgs.writeText "postgresql.conf" '' hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}' ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}' log_destination = 'stderr' + listen_addresses = '${if cfg.enableTCPIP then "*" else "localhost"}' port = ${toString cfg.port} ${cfg.extraConfig} ''; @@ -229,7 +228,7 @@ in "${cfg.dataDir}/recovery.conf" ''} - exec postgres ${toString flags} + exec postgres ''; serviceConfig = From 0bc250c48ba6d7a26c24eb6c64aa076fee10b4b8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 Jun 2018 12:30:23 +0200 Subject: [PATCH 014/265] haskellPackages.llvm-hs_6_2_0: fix build --- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 72c13707f48..752c40ad006 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -269,6 +269,10 @@ self: super: builtins.intersectAttrs super { ); llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm; }; + llvm-hs_6_2_0 = super.llvm-hs_6_2_0.override { + llvm-config = pkgs.llvm_6; + llvm-hs-pure = super.llvm-hs-pure_6_2_0; + }; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; From bd35faa8f41a5efe60b24464429a760fc9816bcc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 14 Jun 2018 04:54:58 -0700 Subject: [PATCH 015/265] jgmenu: 0.9 -> 1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jgmenu/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/vpa11fifwvfrf98sl02ypf1cydnwffm9-jgmenu-1.0/bin/jgmenu had a zero exit code or showed the expected version - /nix/store/vpa11fifwvfrf98sl02ypf1cydnwffm9-jgmenu-1.0/bin/jgmenu_run passed the binary check. - 1 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 1.0 with grep in /nix/store/vpa11fifwvfrf98sl02ypf1cydnwffm9-jgmenu-1.0 - directory tree listing: https://gist.github.com/7f8cc3d354c6e8dec4eb42d5ac45a921 - du listing: https://gist.github.com/1a4c5fbad4edaf52118c0d319a135cc7 --- pkgs/applications/misc/jgmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 78f90a4ffa6..0bccc8bcc7e 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jgmenu-${version}"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "johanmalm"; repo = "jgmenu"; rev = "v${version}"; - sha256 = "17xxz5qyz92sjppsvzjl2v012yb3s5p519cv8xf2hd41j7sh9ym1"; + sha256 = "068mm0b2npz6qh9j8m9xd8sbznjp5g195vfav8a6016wgm6fhrx7"; }; nativeBuildInputs = [ From a7937612bf8d21e568c24ca52166f0a5e50ec8b3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 14 Jun 2018 07:21:29 -0700 Subject: [PATCH 016/265] gcompris: 0.90 -> 0.91 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gcompris/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/di4sm1nsx7zshk1n6njvnd07m0abj6cc-gcompris-0.91/bin/gcompris-qt had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/di4sm1nsx7zshk1n6njvnd07m0abj6cc-gcompris-0.91/bin/.gcompris-qt-wrapped had a zero exit code or showed the expected version - 0 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 0.91 with grep in /nix/store/di4sm1nsx7zshk1n6njvnd07m0abj6cc-gcompris-0.91 - directory tree listing: https://gist.github.com/0ac8ed77cca8102d4b32b9b9361464f4 - du listing: https://gist.github.com/5f6daf6f26bdc5d5e1c4f4f4359ae0fa --- pkgs/games/gcompris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 89b9fca06ea..e4f8c4fd8b3 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -2,12 +2,12 @@ gst_all_1, ninja }: stdenv.mkDerivation rec { - version = "0.90"; + version = "0.91"; name = "gcompris-${version}"; src = fetchurl { url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; - sha256 = "1i5adxnhig849qxwi3c4v7r84q6agx1zxkd69fh4y7lcmq2qiaza"; + sha256 = "09h098w9q79hnzla1pcpqlnnr6dbafm4q6zmdp7wlk11ym8n9kvg"; }; cmakeFlags = "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0"; From 520682ccf6ab29d5849b6ece9a3474f6312d531c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 14 Jun 2018 08:08:25 -0700 Subject: [PATCH 017/265] gpodder: 3.10.1 -> 3.10.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gpodder/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/d43pzkl3230xay7l9wh65whsmsf9lwxa-gpodder-3.10.2/bin/gpo had a zero exit code or showed the expected version - /nix/store/d43pzkl3230xay7l9wh65whsmsf9lwxa-gpodder-3.10.2/bin/gpodder passed the binary check. - Warning: no invocation of /nix/store/d43pzkl3230xay7l9wh65whsmsf9lwxa-gpodder-3.10.2/bin/gpodder-migrate2tres had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/d43pzkl3230xay7l9wh65whsmsf9lwxa-gpodder-3.10.2/bin/..gpo-wrapped-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/d43pzkl3230xay7l9wh65whsmsf9lwxa-gpodder-3.10.2/bin/.gpo-wrapped had a zero exit code or showed the expected version - /nix/store/d43pzkl3230xay7l9wh65whsmsf9lwxa-gpodder-3.10.2/bin/..gpodder-wrapped-wrapped passed the binary check. - /nix/store/d43pzkl3230xay7l9wh65whsmsf9lwxa-gpodder-3.10.2/bin/.gpodder-wrapped passed the binary check. - Warning: no invocation of /nix/store/d43pzkl3230xay7l9wh65whsmsf9lwxa-gpodder-3.10.2/bin/..gpodder-migrate2tres-wrapped-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/d43pzkl3230xay7l9wh65whsmsf9lwxa-gpodder-3.10.2/bin/.gpodder-migrate2tres-wrapped had a zero exit code or showed the expected version - 3 of 9 passed binary check by having a zero exit code. - 0 of 9 passed binary check by having the new version present in output. - found 3.10.2 with grep in /nix/store/d43pzkl3230xay7l9wh65whsmsf9lwxa-gpodder-3.10.2 - directory tree listing: https://gist.github.com/cca3f358e73f8f49b3d0dcd3e5549728 - du listing: https://gist.github.com/54e8debaadfab87d705cbf72656b4f35 --- pkgs/applications/audio/gpodder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 0cf5a361003..68315373a02 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { name = "gpodder-${version}"; - version = "3.10.1"; + version = "3.10.2"; format = "other"; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "gpodder"; repo = "gpodder"; rev = version; - sha256 = "1cqhm5h0kkdb2m691dbj8i3bixl7bw0iww2pl6k1jkz8mgafyd9d"; + sha256 = "0nbhyh44cympslcf4miwc2n1gccm5ghjf9slg0r8xnpvg921jv04"; }; postPatch = with stdenv.lib; '' From d9d4199bf39a4f0ad7d27aad8dc369b402a1ff40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 14 Jun 2018 22:02:58 +0200 Subject: [PATCH 018/265] gtkd: 3.6.5 -> 3.8.3 --- pkgs/development/libraries/gtkd/default.nix | 38 ++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index cf4a990d7f7..f206a169b93 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gtkd-${version}"; - version = "3.6.5"; + version = "3.8.3"; src = fetchzip { url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; - sha256 = "1ypxxqklad5wwyvc39wnphnqp5y4q5zbf9j5mxb3bg9vnls48vx1"; + sha256 = "10jhwy1421bypq62ki1dzv8irvlgwr7s40z6l6vxallm4jkgk9gj"; stripRoot = false; }; @@ -19,63 +19,63 @@ stdenv.mkDerivation rec { prePatch = '' substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d - substituteInPlace src/cairo/gtkc/cairo-compiletime.d \ + substituteInPlace src/cairo/c/functions-compiletime.d \ --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ --replace libcairo.dylib ${cairo}/lib/libcairo.dylib - substituteInPlace src/cairo/gtkc/cairo-runtime.d \ + substituteInPlace src/cairo/c/functions-runtime.d \ --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ --replace libcairo.dylib ${cairo}/lib/libcairo.dylib - substituteInPlace generated/gtkd/gtkc/gdkpixbuf.d \ + substituteInPlace generated/gtkd/gdkpixbuf/c/functions.d \ --replace libgdk_pixbuf-2.0.so.0 ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \ --replace libgdk_pixbuf-2.0.0.dylib ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib - substituteInPlace generated/gtkd/gtkc/atk.d \ + substituteInPlace generated/gtkd/atk/c/functions.d \ --replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \ --replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib - substituteInPlace generated/gtkd/gtkc/pango.d \ + substituteInPlace generated/gtkd/pango/c/functions.d \ --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \ --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \ --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib - substituteInPlace generated/gtkd/gtkc/gobject.d \ + substituteInPlace generated/gtkd/gobject/c/functions.d \ --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \ --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib - substituteInPlace generated/gtkd/gtkc/rsvg.d \ + substituteInPlace generated/gtkd/rsvg/c/functions.d \ --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \ --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib - substituteInPlace generated/gtkd/gtkc/cairo.d \ + substituteInPlace generated/gtkd/cairo/c/functions.d \ --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ --replace libcairo.dylib ${cairo}/lib/libcairo.dylib - substituteInPlace generated/gtkd/gtkc/gdk.d \ + substituteInPlace generated/gtkd/gdk/c/functions.d \ --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \ --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib - substituteInPlace generated/peas/peasc/peas.d \ + substituteInPlace generated/peas/peas/c/functions.d \ --replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \ --replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \ --replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \ --replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib - substituteInPlace generated/vte/vtec/vte.d \ + substituteInPlace generated/vte/vte/c/functions.d \ --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \ --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib - substituteInPlace generated/gstreamer/gstreamerc/gstinterfaces.d \ + substituteInPlace generated/gstreamer/gstinterfaces/c/functions.d \ --replace libgstvideo-1.0.so.0 ${gst_plugins_base}/lib/libgstvideo-1.0.so.0 \ --replace libgstvideo-1.0.0.dylib ${gst_plugins_base}/lib/libgstvideo-1.0.0.dylib - substituteInPlace generated/sourceview/gsvc/gsv.d \ + substituteInPlace generated/sourceview/gsv/c/functions.d \ --replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \ --replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib - substituteInPlace generated/gtkd/gtkc/glib.d \ + substituteInPlace generated/gtkd/glib/c/functions.d \ --replace libglib-2.0.so.0 ${glib}/lib/libglib-2.0.so.0 \ --replace libgmodule-2.0.so.0 ${glib}/lib/libgmodule-2.0.so.0 \ --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \ --replace libglib-2.0.0.dylib ${glib}/lib/libglib-2.0.0.dylib \ --replace libgmodule-2.0.0.dylib ${glib}/lib/libgmodule-2.0.0.dylib \ --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib - substituteInPlace generated/gtkd/gtkc/gio.d \ + substituteInPlace generated/gtkd/gio/c/functions.d \ --replace libgio-2.0.so.0 ${glib}/lib/libgio-2.0.so.0 \ --replace libgio-2.0.0.dylib ${glib}/lib/libgio-2.0.0.dylib - substituteInPlace generated/gstreamer/gstreamerc/gstreamer.d \ + substituteInPlace generated/gstreamer/gstreamer/c/functions.d \ --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \ --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib - substituteInPlace generated/gtkd/gtkc/gtk.d \ + substituteInPlace generated/gtkd/gtk/c/functions.d \ --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \ --replace libgtk-3.so.0 ${gtk3}/lib/libgtk-3.so.0 \ --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib \ From 98030eee151c3f3da3dc57ad9566272825a3f850 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 14 Jun 2018 16:27:01 -0700 Subject: [PATCH 019/265] byacc: 20180525 -> 20180609 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/byacc/versions. These checks were done: - built on NixOS - /nix/store/rngxfbcnpk0n5v16msm7dhg609xfg5jp-byacc-20180609/bin/yacc passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 20180609 with grep in /nix/store/rngxfbcnpk0n5v16msm7dhg609xfg5jp-byacc-20180609 - directory tree listing: https://gist.github.com/a6550f00724283aca52496de32c95794 - du listing: https://gist.github.com/85e15144de69a0381160d89701d1b858 --- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 17d1e47cb4e..fc0c6c9ed8a 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "byacc-${version}"; - version = "20180525"; + version = "20180609"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${name}.tgz" "https://invisible-mirror.net/archives/byacc/${name}.tgz" ]; - sha256 = "1ridghk1xprxfg2k8ls87wjc00i4a7f39x2fkswfqb2wwf5qv6qj"; + sha256 = "173l9yai5yndbyn8nzdl6q11wv4x959bd0w392i82nfsqcz0pfsv"; }; doCheck = true; From 3b31290946c01724dd82efdd6958bc1f7da3e9fc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 14 Jun 2018 23:34:31 -0400 Subject: [PATCH 020/265] elisa: 0.1 -> 0.1.80 --- pkgs/applications/audio/elisa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index 4ef1f1dd202..92ffc0daf7e 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -7,13 +7,13 @@ mkDerivation rec { name = "elisa-${version}"; - version = "0.1"; + version = "0.1.80"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; rev = version; - sha256 = "13i0fkpwrskric3gfalh7mcpp4l2knwnq7jpq391lgh6krq04r4w"; + sha256 = "1kyvdxbsfi692zazw8vjy6mwyy0sa4r1cim8gsiv9pphfh5bpxb1"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; From bdac6d8e7e94a3c3f028d5245848374cd315faac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 14 Jun 2018 22:03:50 +0200 Subject: [PATCH 021/265] tilix: 1.7.1 -> 1.8.1 Also build using release flags. --- pkgs/applications/misc/tilix/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index dc723336a9e..1cc03b4cd42 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "tilix-${version}"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; rev = "${version}"; - sha256 = "0x0bnb26hjvxmvvd7c9k8fw97gcm3z5ssr6r8x90xbyyw6h58hhh"; + sha256 = "19dx3hlj40cqwph98pcifkm6axfszfr0v9k6sr3caw4ycml84ci1"; }; nativeBuildInputs = [ @@ -20,7 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus ]; preBuild = '' - makeFlagsArray=(PERL5LIB="${perlPackages.Po4a}/lib/perl5") + makeFlagsArray=( + PERL5LIB="${perlPackages.Po4a}/lib/perl5" + DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace' + ) ''; postInstall = with gnome3; '' From cb907b5d5124cf12b97ef0846b29f6930db37815 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 15 Jun 2018 14:18:34 +0200 Subject: [PATCH 022/265] etherape: 0.9.17 -> 0.9.18 --- .../networking/sniffers/etherape/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index 9c27139c66d..81c48cff4a0 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade, -libgnomecanvas, popt, itstool }: +{ stdenv, fetchurl, pkgconfig, libtool, gtk3, libpcap, goocanvas2, +popt, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "etherape-0.9.17"; + name = "etherape-0.9.18"; src = fetchurl { url = "mirror://sourceforge/etherape/${name}.tar.gz"; - sha256 = "1n66dw9nsl7zz0qfkb74ncgch3lzms2ssw8dq2bzbk3q1ilad3p6"; + sha256 = "0y9cfc5iv5zy82j165i9agf45n1ixka064ykdvpdhb07sr3lzhmv"; }; - nativeBuildInputs = [ itstool pkgconfig ]; + nativeBuildInputs = [ itstool pkgconfig (stdenv.lib.getBin libxml2) ]; buildInputs = [ - libtool gtk2 libpcap libglade libgnomecanvas popt + libtool gtk3 libpcap goocanvas2 popt ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d652824d8b9..f21f7ca1a5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15750,9 +15750,7 @@ with pkgs; eterm = callPackage ../applications/misc/eterm { }; - etherape = callPackage ../applications/networking/sniffers/etherape { - inherit (gnome2) libgnomecanvas libglade; - }; + etherape = callPackage ../applications/networking/sniffers/etherape { }; evilvte = callPackage ../applications/misc/evilvte { configH = config.evilvte.config or ""; From 42e1a217932e25a5c27ebbe2265a41cbbed0f2a9 Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Fri, 15 Jun 2018 17:43:08 +0200 Subject: [PATCH 023/265] ktorrent: fix build with Qt 5.11 --- pkgs/applications/networking/p2p/ktorrent/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index fbd01c388b0..53485e95b9a 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -28,6 +28,16 @@ stdenv.mkDerivation rec { url = "https://cgit.kde.org/ktorrent.git/patch/?id=672c5076de7e3a526d9bdbb484a69e9386bc49f8"; sha256 = "1cn4rnbhadrsxqx50fawpd747azskavbjraygr6s11rh1wbfrxid"; }) + + # Fix build against Qt 5.11 + (fetchpatch { + url = "https://cgit.kde.org/ktorrent.git/patch/?id=7876857d204188016a135a25938d9f8530fba4e8"; + sha256 = "1wnmfzkhf6y7fd0z2djwphs6i9lsg7fcrj8fqmbyi0j57dvl9gxl"; + }) + (fetchpatch { + url = "https://cgit.kde.org/ktorrent.git/patch/?id=36d112e56e56541d439326a267eb906da8b3ee60"; + sha256 = "1d41pqniljhwqs6awa644s6ks0zwm9sr0hpfygc63wyxnpcrsw2y"; + }) ]; enableParallelBuilding = true; From 70214715ba9a09f8310c34057a7515618e6b6205 Mon Sep 17 00:00:00 2001 From: John Children Date: Fri, 15 Jun 2018 16:46:34 +0100 Subject: [PATCH 024/265] LanguageClient-neovim : 2018-03-6 -> 2018-06-12 --- pkgs/misc/vim-plugins/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 163a1a98676..eba479483cd 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -187,25 +187,25 @@ rec { LanguageClient-neovim = let LanguageClient-neovim-src = fetchgit { url = "https://github.com/autozimu/LanguageClient-neovim"; - rev = "fbc46862af7fa254f74f1108149fd0669c46f1ad"; - sha256 = "1wrrmikriyw8an8hn7240igcaca9a0ykh1j0dfy45kslxkmqkk3r"; + rev = "5015aa164dc9ad96a0f5fbadaf92a888d16bc0d9"; + sha256 = "1b3916al2y4hxmmlhqxw4cdliyd42xahc7wmgm8yq1gbvzbhdafg"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - cargoSha256 = "0c2sklpvab63a1f1mhcq9abq5m2srkj52ypq7dq44g8ngn2a05ka"; + cargoSha256 = "1vafyi650qdaq1f7fc8d4nzrv1i6iz28fs5z66hsnz4xkwb3qq9w"; }; in buildVimPluginFrom2Nix { - name = "LanguageClient-neovim-2018-03-06"; + name = "LanguageClient-neovim-2018-06-12"; src = LanguageClient-neovim-src; dependencies = []; propogatedBuildInputs = [ LanguageClient-neovim-bin ]; preFixup = '' - substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/plugin/LanguageClient.vim \ - --replace "let l:command = [s:root . '/bin/languageclient']" "let l:command = ['${LanguageClient-neovim-bin}/bin/languageclient']" + substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \ + --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'" ''; }; From dd7af301b45e8d59127eba75dfbd0979ef3499f1 Mon Sep 17 00:00:00 2001 From: Chen Yu Date: Sat, 16 Jun 2018 02:00:33 +0800 Subject: [PATCH 025/265] Fix the problem of it not compling in macOS --- pkgs/development/python-modules/kiwisolver/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index 6ee732a06cb..c0c3b09e7b4 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchPypi +, stdenv +, libcxx }: buildPythonPackage rec { @@ -11,7 +13,9 @@ buildPythonPackage rec { inherit pname version; sha256 = "ce3be5d520b4d2c3e5eeb4cd2ef62b9b9ab8ac6b6fedbaa0e39cdb6f50644278"; }; - + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + # Does not include tests doCheck = false; @@ -21,4 +25,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; }; -} \ No newline at end of file +} From af507b6569f65172d703ecb83e3f285df22e0972 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 15 Jun 2018 14:32:43 -0400 Subject: [PATCH 026/265] elisa: correct rev --- pkgs/applications/audio/elisa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index 92ffc0daf7e..bda9d3b54bb 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -12,7 +12,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; - rev = version; + rev = "v${version}"; sha256 = "1kyvdxbsfi692zazw8vjy6mwyy0sa4r1cim8gsiv9pphfh5bpxb1"; }; From 673ecfcbaa0e0a2e64ec06f6f51c7e6234e512ef Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Fri, 15 Jun 2018 20:54:49 +0200 Subject: [PATCH 027/265] nixos/zfs: mount AFTER import --- nixos/modules/tasks/filesystems/zfs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index c54cfd4e1aa..b8a420b7d74 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -431,6 +431,7 @@ in { requires = services; after = services; + wantedBy = [ "zfs.target" ]; }; systemd.targets."zfs".wantedBy = [ "multi-user.target" ]; From 835f3059ced6f1c0a581accaf836cc8dc7c089d2 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Fri, 15 Jun 2018 22:12:29 +0200 Subject: [PATCH 028/265] soapui: init at 5.4.0 --- .../networking/soapui/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/networking/soapui/default.nix diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix new file mode 100644 index 00000000000..93ab6c56d99 --- /dev/null +++ b/pkgs/applications/networking/soapui/default.nix @@ -0,0 +1,51 @@ +{ fetchurl, stdenv, writeText, jdk, maven, makeWrapper }: + +stdenv.mkDerivation rec { + name = "soapui-${version}"; + version = "5.4.0"; + + src = fetchurl { + url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz"; + sha256 = "1yqx1fsh8mr5zf36df7pi25dysb28gfscr1667jzd5s0k9jl42xd"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk maven ]; + + installPhase = '' + mkdir -p $out/share/java + cp -R bin lib $out/share/java + + makeWrapper $out/share/java/bin/soapui.sh $out/bin/soapui --set SOAPUI_HOME $out/share/java + ''; + + patches = [ + (writeText "soapui-${version}.patch" '' + --- a/bin/soapui.sh + +++ b/bin/soapui.sh + @@ -34,7 +34,7 @@ SOAPUI_CLASSPATH=$SOAPUI_HOME/bin/soapui-${version}.jar:$SOAPUI_HOME/lib/* + export SOAPUI_CLASSPATH + + JAVA_OPTS="-Xms128m -Xmx1024m -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -Dsoapui.properties=soapui.properties -Dsoapui.home=$SOAPUI_HOME/bin -splash:SoapUI-Spashscreen.png" + -JFXRTPATH=`java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator` + +JFXRTPATH=`${jdk}/bin/java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator` + SOAPUI_CLASSPATH=$JFXRTPATH:$SOAPUI_CLASSPATH + + if $darwin + @@ -69,4 +69,4 @@ echo = SOAPUI_HOME = $SOAPUI_HOME + echo = + echo ================================ + + -java $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@" + +${jdk}/bin/java $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@" + '') + ]; + + meta = with stdenv.lib; { + description = "The Most Advanced REST & SOAP Testing Tool in the World"; + homepage = https://www.soapui.org/; + license = "SoapUI End User License Agreement"; + maintainers = with maintainers; [ gerschtli ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45e62452181..c03a4184f5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5044,6 +5044,8 @@ with pkgs; snort = callPackage ../applications/networking/ids/snort { }; + soapui = callPackage ../applications/networking/soapui { }; + sshguard = callPackage ../tools/security/sshguard {}; softhsm = callPackage ../tools/security/softhsm { From 18f2a534c21a944c1cebd4739e621f5c7ead46dd Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 15 Jun 2018 18:12:15 -0400 Subject: [PATCH 029/265] spidermonkey_17: get darwin working LLVM building is apparently broken. This is a similar fix to what was done in spidermonkey_38. enableReadline flag is also introduced (defaults to true except on darwin). --- pkgs/development/interpreters/spidermonkey/17.nix | 14 +++++++++----- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix index 9c47ebe79b6..e2eef0fab69 100644 --- a/pkgs/development/interpreters/spidermonkey/17.nix +++ b/pkgs/development/interpreters/spidermonkey/17.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline }: +{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi +, enableReadline ? (!stdenv.isDarwin), readline +, libobjc }: stdenv.mkDerivation rec { version = "17.0.0"; @@ -14,7 +16,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ perl python2 zip libffi readline ]; + buildInputs = [ perl python2 zip libffi readline ] + ++ stdenv.lib.optional enableReadline readline + ++ stdenv.lib.optional stdenv.isDarwin libobjc; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; @@ -48,7 +52,7 @@ stdenv.mkDerivation rec { "--enable-threadsafe" "--with-system-nspr" "--with-system-ffi" - "--enable-readline" + (if enableReadline then "--enable-readline" else "--disable-readline") ]; # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 @@ -64,6 +68,7 @@ stdenv.mkDerivation rec { # https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041155.html echo -e '#!${stdenv.shell}\nexit 0' > config/find_vanilla_new_calls + '' + stdenv.lib.optionalString stdenv.isLinux '' paxmark m shell/js17 paxmark mr jsapi-tests/jsapi-tests ''; @@ -78,7 +83,6 @@ stdenv.mkDerivation rec { homepage = https://developer.mozilla.org/en/SpiderMonkey; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45e62452181..e941860fdd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7518,7 +7518,10 @@ with pkgs; spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; - spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; + spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { + inherit (darwin) libobjc; + stdenv = gccStdenv; + }; spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; From 397f5c37df025e561b0cc94e71077fa0a06679f6 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 15 Jun 2018 23:20:53 +0000 Subject: [PATCH 030/265] =?UTF-8?q?cryptsetup:=20apply=20Mat=C3=ADas=20Lan?= =?UTF-8?q?g's=20patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/linux/cryptsetup/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index e2917c81e15..4a64154b585 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, devicemapper, json_c, openssl, libuuid, pkgconfig, popt -, enablePython ? false, python2 ? null -}: +, enablePython ? false, python2 ? null }: assert enablePython -> python2 != null; @@ -12,12 +11,17 @@ stdenv.mkDerivation rec { sha256 = "15wyjfgcqjf0wy5gxnmjj8aah33csv5v6n1hv9c8sxdzygbhb0ag"; }; - configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ] - ++ stdenv.lib.optional enablePython "--enable-python"; + NIX_LDFLAGS = "-lgcc_s"; + + configureFlags = [ + "--disable-kernel_crypto" + "--enable-cryptsetup-reencrypt" + "--with-crypto_backend=openssl" + ] ++ stdenv.lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ devicemapper json_c openssl libuuid popt ] - ++ stdenv.lib.optional enablePython python2; + ++ stdenv.lib.optional enablePython python2; meta = { homepage = https://gitlab.com/cryptsetup/cryptsetup/; From dcb8828a8e9be79d56a38684afd9be8fb73697b5 Mon Sep 17 00:00:00 2001 From: Thorsten Weber Date: Sat, 16 Jun 2018 01:37:45 +0200 Subject: [PATCH 031/265] slic3r-prusa3d: 1.39.2 -> 1.40.0 Don't understand why PERL_VENDORARCH and PERL_VENDORLIB need replacing now. --- pkgs/applications/misc/slic3r/prusa3d.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 371bf26fe6c..f8b5f45d9c5 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU, - glew, eigen }: + glew, eigen, curl }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { name = "Alien-wxWidgets-0.69"; @@ -33,12 +33,13 @@ let in stdenv.mkDerivation rec { name = "slic3r-prusa-edition-${version}"; - version = "1.39.2"; + version = "1.40.0"; enableParallelBuilding = true; buildInputs = [ cmake + curl perl makeWrapper eigen @@ -73,6 +74,8 @@ stdenv.mkDerivation rec { prePatch = '' sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp + sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt + sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt ''; postInstall = '' @@ -82,14 +85,14 @@ stdenv.mkDerivation rec { # it seems we need to copy the icons... mkdir -p $out/bin/var - cp ../resources/icons/* $out/bin/var/ + cp -r ../resources/icons/* $out/bin/var/ cp -r ../resources $out/bin/ ''; src = fetchFromGitHub { owner = "prusa3d"; repo = "Slic3r"; - sha256 = "0vbqkmd2yqi469ijqm4wyzjmq9w1kwiy8av1kchm4429z5hpmxcd"; + sha256 = "1cisplrfv6y9ijgl5bs46bxxmid5hl71hjzl73bay2i2bl8hid2f"; rev = "version_${version}"; }; From eeb621194426d30f4754d007e05e3e41dc2bc59d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 16 Jun 2018 01:53:28 +0200 Subject: [PATCH 032/265] libgcrypt: disable tests on darwin The test binaries hang for some reason (psynch_mutexwait), gnupg seems to work fine so hopefully it's not an actual issue. --- pkgs/development/libraries/libgcrypt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 8f070bf4bda..de657bc9c34 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -49,7 +49,8 @@ stdenv.mkDerivation rec { cp src/.libs/libgcrypt.20.dylib $out/lib ''; - doCheck = true; + # TODO: reenable with next update? + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { homepage = https://www.gnu.org/software/libgcrypt/; From e82a0345ef37763d88e20d042ccd1b56911ff93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 16 Jun 2018 01:32:15 +0100 Subject: [PATCH 033/265] micropolis: remove Old package without maintainer that no longer compiles. --- pkgs/games/micropolis/default.nix | 49 ------------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 51 deletions(-) delete mode 100644 pkgs/games/micropolis/default.nix diff --git a/pkgs/games/micropolis/default.nix b/pkgs/games/micropolis/default.nix deleted file mode 100644 index 5c91911acaf..00000000000 --- a/pkgs/games/micropolis/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, libX11, libXpm, libXext, xextproto, byacc }: - -stdenv.mkDerivation { - name = "micropolis-2010-12-18"; # version from the patch timestamp - - src = fetchurl { - url = http://www.donhopkins.com/home/micropolis/micropolis-activity-source.tgz; - sha256 = "1b3c72dc3680a34b5fc5a740a6fb5cfc0b8775514da8ab7bb3b2965b20d4f8bc"; - }; - - patches = - [ (fetchurl { - url = http://rmdir.de/~michael/micropolis_git.patch; - sha256 = "10j0svcs576ip7v5mn99gvqx9ki8jfd5w5yvsxj57xh56dd0by2p"; - }) - ]; - - buildInputs = [ libX11 libXpm libXext xextproto byacc ]; - - preConfigure = - '' - cd src - sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm.dev}/include/X11@" tk/makefile - sed -i "s@^INCLUDES.*\$@&\n\t-I$PWD/tcl \\\\@" sim/makefile - ''; - - postInstall = - '' - mkdir -p $out/bin - mkdir -p $out/usr/share/games/micropolis - cd .. - for d in activity cities images manual res; do - cp -R $d $out/usr/share/games/micropolis - done - cp Micropolis $out/usr/share/games/micropolis - cat > $out/bin/micropolis << EOF - #!${stdenv.shell} - cd $out/usr/share/games/micropolis - ./Micropolis - EOF - chmod 755 $out/bin/micropolis - ''; - - meta = { - description = "GPL'ed version of S*m C*ty"; - homepage = http://www.donhopkins.com/home/micropolis/; - license = "GPL"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45e62452181..6a15909b01e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19402,8 +19402,6 @@ with pkgs; megaglest = callPackage ../games/megaglest {}; - micropolis = callPackage ../games/micropolis { }; - minecraft = callPackage ../games/minecraft { useAlsa = config.minecraft.alsa or false; }; From 51403b24263222920c7391435f47d3d243184862 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 15 Jun 2018 19:41:48 -0500 Subject: [PATCH 034/265] snes9x-gtk: 1.54.1 -> 1.56.1 --- pkgs/misc/emulators/snes9x-gtk/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 6be60526eb6..e7627130629 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,35 +1,41 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig -, SDL, zlib, gtk2, libxml2, libXv }: +{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, SDL2, zlib +, gtk3, libxml2, libXv, epoxy, minizip, portaudio }: stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; - version = "1.54.1"; + version = "1.56.1"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; rev = version; - sha256 = "10fqm7lk36zj2gnx0ypps0nlws923f60b0zj4pmq9apawgx8k6rw"; + sha256 = "1zj67fkv0l20k8gn8svarsm8zmznh7jmqkk7nxbdf68xmcxzhr38"; }; + enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip portaudio ]; + + preAutoreconf = '' + cd gtk + intltoolize + ''; - preAutoreconf = "cd gtk; intltoolize"; - - buildInputs = [ SDL zlib gtk2 libxml2 libXv ]; installPhase = "install -Dt $out/bin snes9x-gtk"; meta = with stdenv.lib; { + homepage = "http://www.snes9x.com"; description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator"; + longDescription = '' Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES and Super Famicom Nintendo game systems on your PC or Workstation; which includes some real gems that were only ever released in Japan. ''; + license = licenses.lgpl2; maintainers = with maintainers; [ qknight ]; - homepage = http://www.snes9x.com/; platforms = platforms.linux; }; } From 580b8f8ca8fb7c58639603b0cfb266de83aec767 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 15 Jun 2018 20:31:53 -0500 Subject: [PATCH 035/265] citra: 2018-02-23 -> 2018-06-09 --- pkgs/misc/emulators/citra/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index 453114e3b7a..1845757fb30 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchgit, cmake, SDL2, qtbase, boost, curl, gtest }: +{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost, curl, gtest }: stdenv.mkDerivation rec { - name = "citra-2018-02-23"; + name = "citra-${version}"; + version = "2018-06-09"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "e51a642a13b9c2eda43d875fe318f627e11d480f"; - sha256 = "0cw9cqbljc87rjyr2alfryp04mxpvd5mdlyrmnp9yis3xr8g9sa1"; + rev = "cf9bfe0690f1934847500cc5079b1aaf3299a507"; + sha256 = "1ryc5d3fnhzlrzh1yljbq9x5n79dsb5hgqdba8z4x56iccx0kd0p"; }; + enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 qtbase boost curl gtest ]; + buildInputs = [ SDL2 qtbase qtmultimedia boost curl gtest ]; cmakeFlags = [ "-DUSE_SYSTEM_CURL=ON" "-DUSE_SYSTEM_GTEST=ON" ]; preConfigure = '' @@ -21,13 +23,11 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { - homepage = https://citra-emu.org/; - description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games."; - platforms = [ "x86_64-linux" "i686-linux" ]; + homepage = "https://citra-emu.org"; + description = "An open-source emulator for the Nintendo 3DS"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; }; } From 9ee39c594617cfd78724381d3bf5781c6fe9a23c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 15 Jun 2018 20:17:01 -0400 Subject: [PATCH 036/265] lollypop: init at 0.9.514 --- pkgs/applications/audio/lollypop/default.nix | 58 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/audio/lollypop/default.nix diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix new file mode 100644 index 00000000000..50356eaadd5 --- /dev/null +++ b/pkgs/applications/audio/lollypop/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook +, appstream-glib, desktop-file-utils, gobjectIntrospection +, python36Packages, gnome3, glib, gst_all_1 }: + +stdenv.mkDerivation rec { + version = "0.9.514"; + name = "lollypop-${version}"; + + src = fetchgit { + url = "https://gitlab.gnome.org/World/lollypop"; + rev = "refs/tags/${version}"; + fetchSubmodules = true; + sha256 = "0ny8c5apldhhrcjl3wz01pbyjvf60b7xy39mpvbshvdpnqlnqsca"; + }; + + nativeBuildInputs = with python36Packages; [ + desktop-file-utils + meson + ninja + pkgconfig + wrapGAppsHook + wrapPython + ]; + + buildInputs = [ + appstream-glib glib gobjectIntrospection + ] ++ (with gnome3; [ + easytag gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser + ]) ++ (with gst_all_1; [ + gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly + gstreamer + ]); + + pythonPath = with python36Packages; [ + beautifulsoup4 + gst-python + pillow + pycairo + pydbus + pygobject3 + pylast + ]; + + postFixup = "wrapPythonPrograms"; + + postPatch = '' + chmod +x ./meson_post_install.py + patchShebangs ./meson_post_install.py + ''; + + meta = with stdenv.lib; { + description = "A modern music player for GNOME"; + homepage = https://wiki.gnome.org/Apps/Lollypop; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45e62452181..d7bc0b3191e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16195,6 +16195,8 @@ with pkgs; linssid = libsForQt5.callPackage ../applications/networking/linssid { }; + lollypop = callPackage ../applications/audio/lollypop { }; + m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; manuskript = callPackage ../applications/editors/manuskript { }; From cbae3d171ba81af4c383f0f6f7f068c1cb11911c Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 15 Jun 2018 22:20:54 -0400 Subject: [PATCH 037/265] vsenv, vs90wrapper: delete --- pkgs/build-support/vsenv/build-solution.nix | 18 ------------------ pkgs/build-support/vsenv/default.nix | 7 ------- .../compilers/vs90wrapper/default.nix | 9 --------- pkgs/top-level/all-packages.nix | 6 ------ 4 files changed, 40 deletions(-) delete mode 100644 pkgs/build-support/vsenv/build-solution.nix delete mode 100644 pkgs/build-support/vsenv/default.nix delete mode 100644 pkgs/development/compilers/vs90wrapper/default.nix diff --git a/pkgs/build-support/vsenv/build-solution.nix b/pkgs/build-support/vsenv/build-solution.nix deleted file mode 100644 index 32dd06abfaf..00000000000 --- a/pkgs/build-support/vsenv/build-solution.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, vs}: -{ name -, src -, slnFile -, baseDir ? "." -, extraBuildInputs ? [] -}: - -stdenv.mkDerivation { - inherit name src; - installPhase = '' - cd ${baseDir} - vcbuild.exe /rebuild ${slnFile} - mkdir -p $out - cp Debug/* $out - ''; - buildInputs = [ vs ] ++ extraBuildInputs; -} diff --git a/pkgs/build-support/vsenv/default.nix b/pkgs/build-support/vsenv/default.nix deleted file mode 100644 index 68976253519..00000000000 --- a/pkgs/build-support/vsenv/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{stdenv, vs}: - -{ - buildSolution = import ./build-solution.nix { - inherit stdenv vs; - }; -} diff --git a/pkgs/development/compilers/vs90wrapper/default.nix b/pkgs/development/compilers/vs90wrapper/default.nix deleted file mode 100644 index 341833fdf47..00000000000 --- a/pkgs/development/compilers/vs90wrapper/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{stdenv}: - -stdenv.mkDerivation { - name = "visual-studio-9.0"; - buildCommand = '' - mkdir -p $out/bin - ln -s "/cygdrive/c/Program Files/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe" $out/bin/vcbuild.exe - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a15909b01e..0c9de1d9bec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -150,10 +150,6 @@ with pkgs; ebook2cw = callPackage ../applications/misc/ebook2cw { }; - vsenv = callPackage ../build-support/vsenv { - vs = vs90wrapper; - }; - fetchbower = callPackage ../build-support/fetchbower { inherit (nodePackages) bower2nix; }; @@ -7070,8 +7066,6 @@ with pkgs; valadoc = callPackage ../development/tools/valadoc { }; - vs90wrapper = callPackage ../development/compilers/vs90wrapper { }; - wla-dx = callPackage ../development/compilers/wla-dx { }; wrapCCWith = From 38ac2f63c3ee1281f0f30abb5ef8a20091b85940 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 Jun 2018 21:32:53 -0500 Subject: [PATCH 038/265] nodejs: 6.14.2 -> 6.14.3 --- pkgs/development/web/nodejs/v6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index d648cf957d1..8eb05d67f08 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "6.14.2"; - sha256 = "1lb2dpzamrag645l47gb33qqx8ppjimkb8gkczzwd5jymnr399dk"; + version = "6.14.3"; + sha256 = "1jbrfk875aimm65wni059rrydmhp4z0hrxskq3ci6jvykxr8gwg3"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ]; } From 4ad3a21baf2f8d63dac98a4821c29e5a95c1d17d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 Jun 2018 21:33:19 -0500 Subject: [PATCH 039/265] nodejs: 8.11.2 -> 8.11.3 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 5f81842ca23..9410f017a9c 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "8.11.2"; - sha256 = "0ya9iz47d7ld4zb0aqym9cpxah0pzhsllhh7xmmmf28q7304d6ak"; + version = "8.11.3"; + sha256 = "1q3fc791ng1sgk0i5qnxpxri7235nkjm50zx1z34c759vhgpaz2p"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; } From f6422928e9e8e1ffaac93e517cc5dbe6c6a4f153 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 Jun 2018 21:33:45 -0500 Subject: [PATCH 040/265] nodejs: 9.11.1 -> 9.11.2 --- pkgs/development/web/nodejs/v9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index f6f8aa8d1ab..117ca774987 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "9.11.1"; - sha256 = "0k4xkcymf4y3k2bxjryb2lj97bxnng75x7a77i2wgx94749kvp13"; + version = "9.11.2"; + sha256 = "04y2dnbf6jl8j0ykfkdwhir09h274d13k843d7lqfz3bgyn4wj06"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } From 133cf0ce1bafb37d971dcc223738f7c5c329cb6a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 15 Jun 2018 22:57:44 -0400 Subject: [PATCH 041/265] polkit: supports darwin - apply musl patch unconditionally - add doCheck arg - make paxmark linux0nly --- pkgs/development/libraries/polkit/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index ef865529805..0619097af91 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -2,6 +2,7 @@ , intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl , docbook_xml_dtd_412, gtk-doc , useSystemd ? stdenv.isLinux, systemd +, doCheck ? false }: let @@ -37,15 +38,16 @@ stdenv.mkDerivation rec { url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; sha256 = "0bxmjwp8ahy1y5g1l0kxmld0l3mlvb2l0i5n1qabia3d5iyjkyfh"; }) - ] - # Could be applied uncondtionally but don't want to trigger rebuild - # https://bugs.freedesktop.org/show_bug.cgi?id=50145 - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - name = "netgroup-optional.patch"; - url = "https://bugs.freedesktop.org/attachment.cgi?id=118753"; - sha256 = "1zq51dhmqi9zi86bj9dq4i4pxlxm41k3k4a091j07bd78cjba038"; - }); + (fetchpatch { + name = "netgroup-optional.patch"; + url = "https://bugs.freedesktop.org/attachment.cgi?id=118753"; + sha256 = "1zq51dhmqi9zi86bj9dq4i4pxlxm41k3k4a091j07bd78cjba038"; + }) + ]; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e "s/-Wl,--as-needed//" configure.ac + ''; outputs = [ "bin" "dev" "out" ]; # small man pages in $bin @@ -83,22 +85,22 @@ stdenv.mkDerivation rec { "--with-polkitd-user=polkituser" #TODO? config.ids.uids.polkituser "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS "--enable-introspection" - ]; + ] ++ stdenv.lib.optional (!doCheck) "--disable-test"; makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; # The following is required on grsecurity/PaX due to spidermonkey's JIT - postBuild = '' + postBuild = stdenv.lib.optionalString stdenv.isLinux '' paxmark mr src/polkitbackend/.libs/polkitd paxmark mr test/polkitbackend/.libs/polkitbackendjsauthoritytest ''; - #doCheck = true; # some /bin/bash problem that isn't auto-solved by patchShebangs + inherit doCheck; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/polkit; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ ]; }; } From 3b995bba987d97eab2bc3155402126f8dda5dcae Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 15 Jun 2018 23:07:45 -0400 Subject: [PATCH 042/265] packagekit: supports darwin - make systemd optional --- pkgs/tools/package-management/packagekit/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 5eb20169412..142f6176dbc 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchFromGitHub, lib -, intltool, glib, pkgconfig, polkit, python, sqlite, systemd +, intltool, glib, pkgconfig, polkit, python, sqlite , gobjectIntrospection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive # TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false -, enableBashCompletion ? false, bash-completion ? null }: +, enableBashCompletion ? false, bash-completion ? null +, enableSystemd ? stdenv.isLinux, systemd }: stdenv.mkDerivation rec { name = "packagekit-${version}"; @@ -17,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "11drd6ixx75q3w12am3z1npwllq1kxnhbxv0npng92c69kn291zs"; }; - buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ] + buildInputs = [ glib polkit python gobjectIntrospection vala_0_38 ] + ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--enable-systemd" + (if enableSystemd then "--enable-systemd" else "--disable-systemd") "--disable-dummy" "--disable-cron" "--disable-introspection" @@ -63,7 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.packagekit.org/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; }; } From 605827cd4d8d3b24b05c2591aea886b465f5d991 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 15 Jun 2018 22:23:12 -0500 Subject: [PATCH 043/265] mbga: 0.6.1 -> 0.6.3 --- pkgs/misc/emulators/mgba/default.nix | 34 +++++++++++++--------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 64e29f59a18..755e2a2d72b 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, cmake, libzip, epoxy, ffmpeg, imagemagick, SDL2 -, qtbase, qtmultimedia }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cmake, libzip, epoxy, ffmpeg +, imagemagick, SDL2, qtbase, qtmultimedia, qttools, libedit, minizip }: stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1fgxn3j6wc5mcgb81sc6fzy5m4saz02jz4zlms51dgycvy0flbz7"; + sha256 = "0m1pkxa6i94gq95cankv390wsbp88b3x41c7hf415rp9rkfq25vk"; }; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia ]; - - patches = [ - (fetchpatch { - url = "https://github.com/mgba-emu/mgba/commit/e31373560535203d826687044290a4994706c2dd.patch"; - sha256 = "07582vj0fqgsgryx28pnshiwri9dn88l1rr4vkraib7bzx7cs4f9"; - }) - - (fetchpatch { - url = "https://github.com/mgba-emu/mgba/commit/baabe0090bb1fd5997e531fd9568c2de09b5fc21.patch"; - sha256 = "1kv9dxxna35s050q9af9nzskplz2x1aq8avg0ihbznhxjl8vmxz9"; - }) + buildInputs = [ + libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia libedit minizip + qttools ]; + patches = [(fetchpatch { + url = "https://github.com/mgba-emu/mgba/commit/7f41dd354176b720c8e3310553c6b772278b9dca.patch"; + sha256 = "0j334v8wf594kg8s1hngmh58wv1pi003z8avy6fjhj5qpjmbbavh"; + })]; + meta = with stdenv.lib; { homepage = https://mgba.io; description = "A modern GBA emulator with a focus on accuracy"; + longDescription = '' mGBA is a new Game Boy Advance emulator written in C. @@ -47,8 +44,9 @@ stdenv.mkDerivation rec { for tool-assist runners, and a modern feature set for emulators that older emulators may not support. ''; + license = licenses.mpl20; maintainers = with maintainers; [ MP2E AndersonTorres ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } From 9d59cc98802fb246c8649e1d25207172be4c984b Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Fri, 15 Jun 2018 22:40:11 +0200 Subject: [PATCH 044/265] dwm-status: 0.4.0 -> 0.5.1 --- .../window-managers/dwm/dwm-status.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 4a46d4ef7ba..6e0adb15ffd 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,29 +1,25 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg, alsaUtils }: -let - runtimeDeps = [ xorg.xsetroot ] - ++ lib.optional (alsaUtils != null) alsaUtils; -in - rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "0nw0iz78mnrmgpc471yjv7yzsaf7346mwjp6hm5kbsdclvrdq9d7"; + sha256 = "1mppj57h5yr0azypf5d2cgz2wv3k52mg3k4npyfhbmfy1393qbjs"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ dbus gdk_pixbuf libnotify ]; + buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "0169k91pb7ipvi0m71cmkppp1klgp5ghampa7x0fxkyrvrf0dvqg"; + cargoSha256 = "0qr999hwrqn7a4n4kvbrpli7shxp9jchj8csxzsw951qmzq32qwv"; - postInstall = '' + # needed because alsaUtils is an optional runtime dependency + postInstall = lib.optionalString (alsaUtils != null) '' wrapProgram $out/bin/dwm-status \ - --prefix "PATH" : "${stdenv.lib.makeBinPath runtimeDeps}" + --prefix "PATH" : "${alsaUtils}/bin" ''; meta = with stdenv.lib; { From 5f16072ed00e51c13b7ea64f5184902e397dd4b6 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 15 Jun 2018 14:00:57 +0900 Subject: [PATCH 045/265] dropbox: 40.4.46 -> 52.3.56 --- pkgs/applications/networking/dropbox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 2d364450677..721bc6cd6f5 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "40.4.46"; + version = "52.3.56"; arch = { "x86_64-linux" = "x86_64"; From 669199a7258c0a3afeb8af65eee1ba6c417f2bc5 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 16 Jun 2018 13:33:10 +0200 Subject: [PATCH 046/265] LanguageClient-neovim: fix darwin build --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index eba479483cd..aef223da324 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,5 +1,5 @@ # TODO check that no license information gets lost -{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby +{ fetchurl, stdenv, python, git, go, cmake, vim, vimUtils, perl, ruby , which, fetchgit, llvmPackages, rustPlatform , xkb_switch, rustracerd, fzf, skim , python3, boost, icu, ncurses @@ -7,7 +7,7 @@ , pythonPackages, python3Packages , substituteAll , languagetool -, Cocoa ? null, git +, Cocoa, CoreFoundation, CoreServices }: let @@ -195,6 +195,13 @@ rec { src = LanguageClient-neovim-src; cargoSha256 = "1vafyi650qdaq1f7fc8d4nzrv1i6iz28fs5z66hsnz4xkwb3qq9w"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + + # FIXME: Use impure version of CoreFoundation because of missing symbols. + # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" + ''; }; in buildVimPluginFrom2Nix { name = "LanguageClient-neovim-2018-06-12"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45e62452181..e04393f6301 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21377,7 +21377,7 @@ with pkgs; vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { }; vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { - inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; llvmPackages = llvmPackages_39; }); From 2c78c378b7c45b8b59fa420e9bac53655dd9164b Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sat, 16 Jun 2018 08:38:32 -0400 Subject: [PATCH 047/265] helmfile: 0.16.0 -> 0.19.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index b1dcfb809b5..7f07fcc486d 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.16.0"; in +let version = "0.19.0"; in buildGoPackage { name = "helmfile-${version}"; @@ -9,7 +9,7 @@ buildGoPackage { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "12gxlan89h0r83aaacshh58nd1pi26gx5gkna0ksll9wsfvraj4d"; + sha256 = "0wjzzaygdnnvyi5a78bhmz2sxc4gykdl00h78dkgvj7aaw05s9yd"; }; goPackagePath = "github.com/roboll/helmfile"; From 37804741b518f889eecde85f8c5cc17f0a83d640 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sat, 16 Jun 2018 08:38:50 -0400 Subject: [PATCH 048/265] helmfile: add helm to path with wrapProgram Helmfile makes direct calls to `helm` as an implicit dependency. Now helmfile can work without Helm also being explicitly installed. --- .../networking/cluster/helmfile/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 7f07fcc486d..358f4cdb7df 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, ... }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: let version = "0.19.0"; in @@ -14,6 +14,14 @@ buildGoPackage { goPackagePath = "github.com/roboll/helmfile"; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $bin/bin/helmfile \ + --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} + ''; + + meta = { description = "Deploy Kubernetes Helm charts"; homepage = https://github.com/roboll/helmfile; From a9a78f34571a0f5254d4deb843342b1d654ef45c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2018 10:46:36 +0200 Subject: [PATCH 049/265] LTS Haskell 11.13 --- .../configuration-hackage2nix.yaml | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c53fd35c48e..20e67e30167 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 11.12 + # LTS Haskell 11.13 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -216,11 +216,9 @@ default-package-overrides: - attoparsec ==0.13.2.2 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 - - attoparsec-ip ==0.0.1 - attoparsec-iso8601 ==1.0.0.0 - attoparsec-path ==0.0.0.1 - attoparsec-time ==1 - - attoparsec-uri ==0.0.4 - audacity ==0.0.2 - authenticate ==1.3.4 - authenticate-oauth ==1.6 @@ -345,7 +343,7 @@ default-package-overrides: - bytestring-trie ==0.2.4.1 - bzlib ==0.5.0.5 - bzlib-conduit ==0.3.0.1 - - c2hs ==0.28.3 + - c2hs ==0.28.5 - Cabal ==2.0.1.1 - cabal-doctest ==1.0.6 - cabal-file-th ==0.2.4 @@ -626,7 +624,7 @@ default-package-overrides: - dsp ==0.2.4 - dublincore-xml-conduit ==0.1.0.2 - dvorak ==0.1.0.0 - - dynamic-state ==0.3 + - dynamic-state ==0.3.1 - dyre ==0.8.12 - Earley ==0.12.1.0 - easy-file ==0.2.2 @@ -771,7 +769,7 @@ default-package-overrides: - from-sum ==0.2.1.0 - frontmatter ==0.1.0.2 - fsnotify ==0.2.1.1 - - fsnotify-conduit ==0.1.1.0 + - fsnotify-conduit ==0.1.1.1 - funcmp ==1.9 - functor-classes-compat ==1 - fuzzcheck ==0.1.1 @@ -945,7 +943,7 @@ default-package-overrides: - hdaemonize ==0.5.5 - HDBC ==2.4.0.2 - HDBC-mysql ==0.7.1.0 - - HDBC-session ==0.1.1.1 + - HDBC-session ==0.1.2.0 - hdevtools ==0.1.6.1 - heap ==1.0.4 - heaps ==0.3.6 @@ -1008,7 +1006,7 @@ default-package-overrides: - HPDF ==1.4.10 - hpio ==0.9.0.6 - hpp ==0.5.2 - - hpqtypes ==1.5.2.0 + - hpqtypes ==1.5.3.0 - hquantlib ==0.0.4.0 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 @@ -1169,7 +1167,6 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.0.1 - io-streams-haproxy ==1.0.0.2 - - ip ==1.1.2 - ip6addr ==0.5.3 - iproute ==1.7.5 - IPv6Addr ==1.0.3 @@ -1265,7 +1262,7 @@ default-package-overrides: - lens-simple ==0.1.0.9 - lentil ==1.0.11.3 - leveldb-haskell ==0.6.5 - - lexer-applicative ==2.1.0.1 + - lexer-applicative ==2.1.0.2 - libffi ==0.1 - libgit ==0.3.1 - libgraph ==1.14 @@ -1331,10 +1328,9 @@ default-package-overrides: - markdown ==0.1.17.1 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - markup ==4.0.4 - marvin-interpolate ==1.1.2 - massiv ==0.1.6.1 - - massiv-io ==0.1.3.0 + - massiv-io ==0.1.4.0 - mathexpr ==0.3.0.0 - math-functions ==0.2.1.0 - matplotlib ==0.6.0 @@ -1682,9 +1678,8 @@ default-package-overrides: - pretty-show ==1.6.16 - pretty-simple ==2.1.0.0 - pretty-types ==0.2.3.1 - - prim-array ==0.2.2 - primes ==0.2.1.0 - - primitive ==0.6.3.0 + - primitive ==0.6.4.0 - prim-uniq ==0.1.0.1 - probability ==0.2.5.1 - process-extras ==0.7.4 @@ -1728,12 +1723,11 @@ default-package-overrides: - QuickCheck ==2.10.1 - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 - - quickcheck-classes ==0.3.3 - quickcheck-combinators ==0.0.2 - quickcheck-instances ==0.3.18 - quickcheck-io ==0.2.0 - quickcheck-properties ==0.1 - - quickcheck-simple ==0.1.0.3 + - quickcheck-simple ==0.1.0.4 - quickcheck-special ==0.1.0.6 - quickcheck-state-machine ==0.3.1 - quickcheck-text ==0.1.2.1 @@ -1795,7 +1789,7 @@ default-package-overrides: - regex-tdfa-text ==1.0.0.3 - reinterpret-cast ==0.1.0 - relational-query ==0.11.1.0 - - relational-query-HDBC ==0.6.6.1 + - relational-query-HDBC ==0.6.7.0 - relational-record ==0.2.1.2 - relational-schemas ==0.1.6.1 - rematch ==0.2.0.0 @@ -2069,7 +2063,7 @@ default-package-overrides: - tasty-ant-xml ==1.1.4 - tasty-auto ==0.2.0.0 - tasty-dejafu ==1.1.0.2 - - tasty-discover ==4.2.0 + - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.1 - tasty-golden ==2.3.1.3 - tasty-hedgehog ==0.1.0.2 @@ -2250,13 +2244,11 @@ default-package-overrides: - unliftio-core ==0.1.1.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.9.0 - - unordered-intmap ==0.1.0.0 - unsafe ==0.0 - uri-bytestring ==0.3.2.0 - uri-bytestring-aeson ==0.1.0.6 - uri-encode ==1.5.0.5 - uri-templater ==0.3.1.0 - - urlpath ==8.0.1 - userid ==0.1.3.2 - users ==0.5.0.0 - users-postgresql-simple ==0.5.0.2 @@ -2337,6 +2329,7 @@ default-package-overrides: - warp-tls ==3.2.4.3 - wave ==0.1.5 - wavefront ==0.7.1.2 + - web3 ==0.7.3.0 - webdriver ==0.8.5 - webdriver-angular ==0.1.11 - webpage ==0.0.5 From 5cf044ce462f48c1340d9bbcb21a2065d1b72c10 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Jun 2018 20:34:07 +0200 Subject: [PATCH 050/265] hackage2nix: always use latest version of json-autotype --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 20e67e30167..437ff2d9d65 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1197,7 +1197,6 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.9.2 - - json-autotype ==1.0.18 - json-builder ==0.3 - json-rpc-generic ==0.2.1.4 - json-schema ==0.7.4.1 From 46f6f08672f5e428ab0c03a3c4440cc4010bab8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Jun 2018 02:30:36 +0200 Subject: [PATCH 051/265] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-22-g06cc00a from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/de822d09cc89bf07df588bd426ea770672350c7c. --- .../haskell-modules/hackage-packages.nix | 2494 +++++++++++------ 1 file changed, 1698 insertions(+), 796 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6acf6197977..6042f24771f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -917,27 +917,25 @@ self: { "Allure" = callPackage ({ mkDerivation, async, base, containers, enummapset, filepath , LambdaHack, optparse-applicative, random, template-haskell, text - , zlib + , transformers, zlib }: mkDerivation { pname = "Allure"; - version = "0.8.0.0"; - sha256 = "0mg5srs0mfvdwf898fwkf8ji1722rkc55d0z8d4fb3aq8dvxgsxv"; - revision = "1"; - editedCabalFile = "10b34p2wv4nqldj0yaas9injjizxb151ks15k6wdx976fjpkqjqd"; + version = "0.8.1.2"; + sha256 = "0zm2sipfhg3fc5v33z7agj3sx4xzqlsd41apnqn403ld0ffvzy58"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ async base containers enummapset filepath LambdaHack - optparse-applicative random template-haskell text zlib + optparse-applicative random template-haskell text transformers zlib ]; testHaskellDepends = [ base containers enummapset filepath LambdaHack optparse-applicative - random template-haskell text zlib + random template-haskell text transformers zlib ]; description = "Near-future Sci-Fi roguelike and tactical squad game"; - license = stdenv.lib.licenses.agpl3; + license = "unknown"; }) {}; "AndroidViewHierarchyImporter" = callPackage @@ -1834,8 +1832,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.8.6.1"; - sha256 = "1hnw8lzbrhpjwjvy19ppkybxmw9v88rgc8y0sp4z056i2fki09jw"; + version = "0.8.6.2"; + sha256 = "0prk58bxmy0va5i1blc02w8szspavnj4jz6dv9pjg7z64cs863jy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2695,6 +2693,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Chart_1_9" = callPackage + ({ mkDerivation, array, base, colour, data-default-class, lens, mtl + , old-locale, operational, time, vector + }: + mkDerivation { + pname = "Chart"; + version = "1.9"; + sha256 = "1f5azj17y8xsb3gjhf7gg1gnnlq12rxkmfjmgcly314d7vghs05z"; + libraryHaskellDepends = [ + array base colour data-default-class lens mtl old-locale + operational time vector + ]; + description = "A library for generating 2D Charts and Plots"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Chart-cairo" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time @@ -2711,6 +2726,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Chart-cairo_1_9" = callPackage + ({ mkDerivation, array, base, cairo, Chart, colour + , data-default-class, lens, mtl, old-locale, operational, time + }: + mkDerivation { + pname = "Chart-cairo"; + version = "1.9"; + sha256 = "0iany6lfyfb1cw0pxfs5aw5k0a6x41m6ql9ad9w59biwdckbsyqr"; + libraryHaskellDepends = [ + array base cairo Chart colour data-default-class lens mtl + old-locale operational time + ]; + description = "Cairo backend for Charts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Chart-diagrams" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib @@ -2719,8 +2751,8 @@ self: { }: mkDerivation { pname = "Chart-diagrams"; - version = "1.8.3"; - sha256 = "1p1spkx1xkwfiqjkji9wxca1ar0h6n6vqn6h45ly4szr9qyixvdy"; + version = "1.9"; + sha256 = "1n1fa6198yp5iv7xy0fdxfj794kkll0w7kn2zdq7g52rfx6nkall"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers @@ -2739,8 +2771,8 @@ self: { }: mkDerivation { pname = "Chart-gtk"; - version = "1.8.3"; - sha256 = "051w4ik5174502z6d4va84hv7a57y31iy94w09gl5qwihzfs7wz4"; + version = "1.9"; + sha256 = "1p8nf50q031xa1mhv4w3zbyv61i2jyhvd8bq7dqkcqhgknxxpkv0"; libraryHaskellDepends = [ array base cairo Chart Chart-cairo colour data-default-class gtk mtl old-locale time @@ -7273,8 +7305,8 @@ self: { ({ mkDerivation, base, HDBC }: mkDerivation { pname = "HDBC-session"; - version = "0.1.1.1"; - sha256 = "16ffb6fd6y3qxms6pf4qyc2b03pvnz62bbzrlszp7j48z1alwp15"; + version = "0.1.2.0"; + sha256 = "1qwnqb62zgmm4dy5qlcj04aczja6yn16c92jc63zkln9pcc7y1da"; libraryHaskellDepends = [ base HDBC ]; description = "Bracketed connection for HDBC"; license = stdenv.lib.licenses.bsd3; @@ -8036,6 +8068,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HNumeric" = callPackage + ({ mkDerivation, base, normaldistribution, random }: + mkDerivation { + pname = "HNumeric"; + version = "0.4.0.0"; + sha256 = "1vr2i6xm4ix9iym41cp04ipf38hv6n76baf38c8mf25b5cibfblf"; + libraryHaskellDepends = [ base normaldistribution random ]; + testHaskellDepends = [ base normaldistribution random ]; + description = "Haskell Numeric Library with pure functionality, R & MATLAB Syntax"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "HODE" = callPackage ({ mkDerivation, array, base, ode }: mkDerivation { @@ -8551,6 +8595,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HTTP_4000_3_12" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive, conduit + , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl + , network, network-uri, parsec, pureMD5, split, test-framework + , test-framework-hunit, time, wai, warp + }: + mkDerivation { + pname = "HTTP"; + version = "4000.3.12"; + sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3"; + libraryHaskellDepends = [ + array base bytestring mtl network network-uri parsec time + ]; + testHaskellDepends = [ + base bytestring case-insensitive conduit conduit-extra deepseq + http-types httpd-shed HUnit mtl network network-uri pureMD5 split + test-framework test-framework-hunit wai warp + ]; + description = "A library for client-side HTTP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HTTP-Simple" = callPackage ({ mkDerivation, base, HTTP, network }: mkDerivation { @@ -11095,10 +11162,8 @@ self: { }: mkDerivation { pname = "LambdaHack"; - version = "0.8.0.0"; - sha256 = "1g7lmplcgj2swk2mvams42fjmmiamk0hxhhzgzdv29jlq9gzmfv2"; - revision = "1"; - editedCabalFile = "1l0s7vqv2qpq50352x772584zz4q7ip0z7jc17b72vnipqln7jkd"; + version = "0.8.1.2"; + sha256 = "0bad3l413rab2r17j7hqzfypnyf2gmmffzfy1bvpdh3r8xrc5z1d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -16875,6 +16940,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Spock_0_13_0_0" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect + , list-t, monad-control, mtl, reroute, resource-pool, resourcet + , Spock-core, stm, stm-containers, text, time, transformers + , transformers-base, unordered-containers, vault, wai, wai-extra + }: + mkDerivation { + pname = "Spock"; + version = "0.13.0.0"; + sha256 = "1l0sff6xq99hvcmr2fnsr2x6lbzcpynyjl7n21ycv0l9xgfs6wwa"; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers cryptonite focus + hashable http-types hvect list-t monad-control mtl reroute + resource-pool resourcet Spock-core stm stm-containers text time + transformers transformers-base unordered-containers vault wai + ]; + testHaskellDepends = [ + base bytestring hspec hspec-wai Spock-core stm text time + unordered-containers vault wai wai-extra + ]; + description = "Another Haskell web framework for rapid development"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Spock-api" = callPackage ({ mkDerivation, aeson, base, deepseq, hvect, reroute }: mkDerivation { @@ -16889,14 +16980,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Spock-api_0_12_0_1" = callPackage + ({ mkDerivation, aeson, base, deepseq, hvect, reroute }: + mkDerivation { + pname = "Spock-api"; + version = "0.12.0.1"; + sha256 = "0mg5r6rdcgy1yc1lx739bwhlndwyfb9hx0dcwqii7a5sy20qy960"; + libraryHaskellDepends = [ aeson base deepseq hvect reroute ]; + description = "Another Haskell web framework for rapid development"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Spock-api-ghcjs" = callPackage ({ mkDerivation, aeson, base, bytestring, ghcjs-base, hvect , Spock-api, text }: mkDerivation { pname = "Spock-api-ghcjs"; - version = "0.12.0.0"; - sha256 = "00d5irb8gf3rmapyd5xyn8805n5qa6yrf53khx9pyhc4bzd0g9w4"; + version = "0.12.0.1"; + sha256 = "1n03ax4iwz58b4myh8jwkixiclpiyvx55h247248xfh6a0xr96l0"; libraryHaskellDepends = [ aeson base bytestring ghcjs-base hvect Spock-api text ]; @@ -16917,6 +17020,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Spock-api-server_0_12_0_1" = callPackage + ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }: + mkDerivation { + pname = "Spock-api-server"; + version = "0.12.0.1"; + sha256 = "14si03c1xcjfhmjpv717x4ipbd5x7h2sqrld7nnh0pgajzfx8m08"; + libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; + description = "Another Haskell web framework for rapid development"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Spock-auth" = callPackage ({ mkDerivation, base, http-types, Spock, text, time }: mkDerivation { @@ -16957,6 +17072,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Spock-core_0_13_0_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, cookie, directory, hashable, hspec + , hspec-wai, http-api-data, http-types, hvect, monad-control, mtl + , old-locale, reroute, resourcet, stm, superbuffer, text, time + , transformers, transformers-base, unordered-containers, vault, wai + , wai-extra, warp + }: + mkDerivation { + pname = "Spock-core"; + version = "0.13.0.0"; + sha256 = "0qjiv0jqs3bsgx6mpflsykr2rpvw5cch5v7r6z5306ccli1bvjjy"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive containers + cookie directory hashable http-api-data http-types hvect + monad-control mtl old-locale reroute resourcet stm superbuffer text + time transformers transformers-base unordered-containers vault wai + wai-extra warp + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring hspec hspec-wai http-types + monad-control reroute text time transformers transformers-base + unordered-containers wai + ]; + description = "Another Haskell web framework for rapid development"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Spock-digestive" = callPackage ({ mkDerivation, base, digestive-functors, http-types, mtl , Spock-core, text, unordered-containers, wai @@ -21556,19 +21700,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_3_1_1" = callPackage + "aeson_1_4_0_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, HUnit, integer-logarithms, QuickCheck + , hashable-time, integer-logarithms, QuickCheck , quickcheck-instances, scientific, tagged, tasty, tasty-hunit , tasty-quickcheck, template-haskell, text, th-abstraction, time , time-locale-compat, unordered-containers, uuid-types, vector }: mkDerivation { pname = "aeson"; - version = "1.3.1.1"; - sha256 = "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4"; + version = "1.4.0.0"; + sha256 = "042phqkabjrlrl3azr3ba9q7naz4c2cjl5nplbfz8iidpf6j0sli"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text @@ -21578,7 +21722,7 @@ self: { testHaskellDepends = [ attoparsec base base-compat base-orphans base16-bytestring bytestring containers directory dlist filepath generic-deriving - ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck + ghc-prim hashable hashable-time integer-logarithms QuickCheck quickcheck-instances scientific tagged tasty tasty-hunit tasty-quickcheck template-haskell text time time-locale-compat unordered-containers uuid-types vector @@ -21701,6 +21845,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-compat_0_3_8" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base + , base-compat, base-orphans, bytestring, containers, exceptions + , hashable, QuickCheck, quickcheck-instances, scientific, tagged + , tasty, tasty-hunit, tasty-quickcheck, text, time + , time-locale-compat, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-compat"; + version = "0.3.8"; + sha256 = "0j4v13pgk21zy8hqkbx8hw0n05jdl17qphxz9rj4h333pr547r3i"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-iso8601 base base-compat bytestring + containers exceptions hashable scientific tagged text time + time-locale-compat unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat base-orphans bytestring + containers exceptions hashable QuickCheck quickcheck-instances + scientific tagged tasty tasty-hunit tasty-quickcheck text time + time-locale-compat unordered-containers vector + ]; + description = "Compatibility layer for aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-decode" = callPackage ({ mkDerivation, aeson, aeson-qq, base, containers, data-default , hedgehog, text, time, unordered-containers, vector @@ -21809,6 +21980,8 @@ self: { pname = "aeson-extra"; version = "0.4.1.1"; sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl"; + revision = "1"; + editedCabalFile = "14blp4jmcd81ipxany6q7x706xj8fhy019a73c391n767r1nwpq1"; libraryHaskellDepends = [ aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat-batteries bytestring containers deepseq exceptions @@ -22285,8 +22458,8 @@ self: { pname = "aeson-utils"; version = "0.3.0.2"; sha256 = "07sbvmm158yqmw4hri9l66ag4r6l59x230gbjm9r97w4x0dlp0bi"; - revision = "6"; - editedCabalFile = "06jpkp95sicqv9kjasgwwd89kfrnz37402ppvgg5567sbg1wm9zh"; + revision = "7"; + editedCabalFile = "0lnlmsn5imbapdhbza1175wm04ynn1w75llkhlk1akpanx1dnd15"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific text ]; @@ -22534,8 +22707,8 @@ self: { }: mkDerivation { pname = "aig"; - version = "0.2.5"; - sha256 = "115rp0iymwnvd69ymp9kdvc812axrgn2qzwqnqlx4gpn05wh8brr"; + version = "0.2.6"; + sha256 = "1xcwchzsz6kxd6b0bqqmfhyrjsmqyikrf5qdry81y6p5bphk098i"; libraryHaskellDepends = [ base base-compat mtl QuickCheck vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-ant-xml tasty-quickcheck @@ -23026,8 +23199,8 @@ self: { ({ mkDerivation, base, deepseq, template-haskell, text }: mkDerivation { pname = "alex-tools"; - version = "0.3"; - sha256 = "119g5am7nr8wbk0gjyia80pkj81p2z9ag3s97vbmzrkfamsjaik0"; + version = "0.3.1"; + sha256 = "11b7lw8kzzkpaqr6rdh5rcdh21mj5xz2qd9m04rsryvqlxa2y87g"; libraryHaskellDepends = [ base deepseq template-haskell text ]; description = "A set of functions for a common use case of Alex"; license = stdenv.lib.licenses.isc; @@ -27207,8 +27380,8 @@ self: { }: mkDerivation { pname = "apart"; - version = "0.1.0"; - sha256 = "05jpxq68pm1hs05nxz6wd787jmdxf59kd13nmsa89p5qcdh7znqw"; + version = "0.1.1"; + sha256 = "1xrmdzaf56gzmrg596kfkp01pvn9m9w2mvz58z3zhx6jda1zvaan"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29065,6 +29238,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "asn" = callPackage + ({ mkDerivation, aeson, base, hashable, primitive, scientific, text + }: + mkDerivation { + pname = "asn"; + version = "0.1.0.0"; + sha256 = "05gzplhf2p13wjz4gry6mxibds27gsa4pjipr4b2faajwdb3cyjf"; + libraryHaskellDepends = [ + aeson base hashable primitive scientific text + ]; + description = "asn type and encoding/decoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "asn1-codec" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , containers, contravariant, cryptonite, directory, hashable, HUnit @@ -29244,6 +29431,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "asset-map" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, filepath + , hspec, template-haskell, th-lift-instances + }: + mkDerivation { + pname = "asset-map"; + version = "0.1.0.0"; + sha256 = "0c33ghr2wd9dr153zpcmifdysfw39x3bhzz49wy9vm81a7rmw9kg"; + libraryHaskellDepends = [ + aeson base bytestring containers filepath template-haskell + th-lift-instances + ]; + testHaskellDepends = [ base hspec ]; + description = "Asset map support for the JavaScript broccoli-asset-rev library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "assimp" = callPackage ({ mkDerivation, assimp, base, c2hs, haskell98, vect }: mkDerivation { @@ -29336,6 +29540,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "astro_0_4_2_1" = callPackage + ({ mkDerivation, base, HUnit, matrix, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, time + }: + mkDerivation { + pname = "astro"; + version = "0.4.2.1"; + sha256 = "0agy9a91n1sy6rgdgwvdz354x452j2lg7nr3by7z9r22rwdxwpfs"; + libraryHaskellDepends = [ base matrix time ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 time + ]; + description = "Amateur astronomical computations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "astview" = callPackage ({ mkDerivation, astview-utils, base, bytestring, containers , directory, filepath, glade, glib, Glob, gtk, gtksourceview2, hint @@ -30104,8 +30326,8 @@ self: { }: mkDerivation { pname = "ats-storable"; - version = "0.3.0.4"; - sha256 = "0yjbhlxnrprdvf0k93j0w4dpbr55pdcxcs1jhw4b7ngd64a6nvw5"; + version = "0.3.0.5"; + sha256 = "1jafhbvlndr4sv1qb0an588dha549fh3bs7iwsnpc8s2xsxzk7wb"; libraryHaskellDepends = [ base bytestring composition-prelude text ]; @@ -31067,8 +31289,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.3.0.4"; - sha256 = "1f7wq5c7x99gbibwx9mdmq6d8gyz9szrj7k747gavvf5is8z9h6f"; + version = "0.3.0.5"; + sha256 = "04hzx9k3m6k5vlrj9yv02z5x3zq5b5878aa66fj8x2y8306zry39"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -32406,6 +32628,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "barbies" = callPackage + ({ mkDerivation, base, bifunctors, QuickCheck, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "barbies"; + version = "0.1.0.1"; + sha256 = "1mflfgwcz5krncfx5gx60n1j5x624y55kskmrp3nns4ihlrk6m7a"; + libraryHaskellDepends = [ base bifunctors ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + description = "Classes for working with types that can change clothes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "barchart" = callPackage ({ mkDerivation, base, cmdargs, csv, diagrams, filepath }: mkDerivation { @@ -32574,10 +32810,8 @@ self: { ({ mkDerivation, base, base-compat }: mkDerivation { pname = "base-compat-migrate"; - version = "0.1.0.0"; - sha256 = "1xppwdkg347k1qq4pibivv89y4k8q70bmj9fmq6qwsbkizp7hsym"; - revision = "1"; - editedCabalFile = "047zifghyzjg7c0pdbjg1r5w3d6v0pz5miifam1jrzp2pp9a2jai"; + version = "0.1.0.1"; + sha256 = "14kiwazhl7cyxh188ripwdfnc5n287gi8c30xzhf8kyhk6g10jyn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat ]; @@ -32814,8 +33048,8 @@ self: { pname = "base64-bytestring-type"; version = "1"; sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl"; - revision = "2"; - editedCabalFile = "02ywscryrrh6xwfi0gl4qvxy36jzy7i8y2jsv6mma2av2abr9ms7"; + revision = "3"; + editedCabalFile = "18p6iz3b73qyf76azhfpcpgsc1fb2qhv889l0cj1niqlyp7kw69s"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable QuickCheck text @@ -33332,15 +33566,15 @@ self: { , gi-ggit, gi-gio, gi-glib, gitrev, haskell-gi-base, hspec, htoml , http-client, http-media, http-types, libgit2-glib, monad-logger , monad-loops, mtl, network, persistent, persistent-sqlite - , resourcet, safe-exceptions, semver, servant-client - , servant-options, servant-server, split, stm, string-conversions - , string-qq, tar, temporary, text, time, transformers, unix, uuid - , wai, wai-cors, warp + , resourcet, semver, servant-client, servant-options + , servant-server, split, stm, string-conversions, string-qq, tar + , temporary, text, time, transformers, unix, uuid, wai, wai-cors + , warp }: mkDerivation { pname = "bdcs-api"; - version = "0.1.0"; - sha256 = "1hnzbmihpq4nr0yxpwsaq5har2ws20zaialx98g9ws1k8k1kgzh0"; + version = "0.1.2"; + sha256 = "117688c8b3j32if2xc2dw9845jgpv7fxbkq3dhc56hqjlliha0fr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33348,17 +33582,15 @@ self: { containers directory extra filepath gi-ggit gi-gio gi-glib gitrev haskell-gi-base htoml http-media http-types monad-logger monad-loops mtl network persistent persistent-sqlite resourcet - safe-exceptions semver servant-options servant-server split stm - string-conversions tar temporary text time transformers unix uuid - wai wai-cors warp + semver servant-options servant-server split stm string-conversions + tar temporary text time transformers unix uuid wai wai-cors warp ]; libraryPkgconfigDepends = [ libgit2-glib ]; - executableHaskellDepends = [ base safe-exceptions ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ aeson base bdcs bytestring cond directory filepath hspec - http-client monad-loops safe-exceptions servant-client - servant-server string-conversions string-qq temporary text time wai - warp + http-client monad-loops servant-client servant-server + string-conversions string-qq temporary text time wai warp ]; description = "BDCS API Server"; license = stdenv.lib.licenses.gpl3; @@ -33979,8 +34211,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, time }: mkDerivation { pname = "bgmax"; - version = "0.2.0.2"; - sha256 = "05mw9zv1r1zarnqbbz5qhgd173y52nkkv099x5zi2w1j96ca2pmd"; + version = "0.2.0.3"; + sha256 = "15w8ib36spnlsvr41rb4n6dp6nh6ksyb07lzwlcf1a4ajfx23ns6"; libraryHaskellDepends = [ attoparsec base bytestring time ]; description = "Parse BgMax-files"; license = stdenv.lib.licenses.bsd3; @@ -34552,8 +34784,8 @@ self: { pname = "binary-orphans"; version = "0.1.8.0"; sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi"; - revision = "2"; - editedCabalFile = "1kvrp3dfqx49lkvjvglv18r7yzb165wisg953yih9sgksm02pxf5"; + revision = "3"; + editedCabalFile = "083bch2ir9mgiymgyv9qp5z1fv232zr8sxiwn27x3arvxzz9ax85"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -34764,6 +34996,8 @@ self: { pname = "binary-tagged"; version = "0.1.5"; sha256 = "1s05hrak9mg8klid5jsdqh1i7d1zyzkpdbdc969g2s9h06lk7dyl"; + revision = "1"; + editedCabalFile = "0vddb305g3455f0rh0xs6c9i2vllnf83y0pbp53wjwb3l575bqyp"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers generics-sop hashable scientific SHA tagged text time @@ -35833,6 +36067,8 @@ self: { pname = "biohazard"; version = "1.0.1"; sha256 = "0gzsrrapv3ih598qqacnipqgxxzxmci98rzvc54jxv3hajsnxkqb"; + revision = "1"; + editedCabalFile = "0c0wl1m07c8qjyajjrgjr9pahm8i6646pyfschshx2ymcpkn9sdj"; libraryHaskellDepends = [ async attoparsec base base-prelude bytestring containers exceptions hashable primitive stm text transformers unix unordered-containers @@ -36433,17 +36669,19 @@ self: { "bits-extra" = callPackage ({ mkDerivation, base, criterion, ghc-prim, hedgehog, hspec - , hw-hedgehog, hw-hspec-hedgehog, vector + , hspec-discover, hw-hedgehog, hw-hspec-hedgehog, vector }: mkDerivation { pname = "bits-extra"; - version = "0.0.1.2"; - sha256 = "1d950vjf2f8wp9fjpw6nkvafag6pd42zhxg9mmzvcyxvk28i6znq"; + version = "0.0.1.3"; + sha256 = "1vdgj5zz5q7y4n11bsn4v53x5yi0fckj13vbfyrgb454x6rhhav9"; libraryHaskellDepends = [ base ghc-prim vector ]; testHaskellDepends = [ base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion ghc-prim vector ]; + description = "Useful bitwise operations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -36874,6 +37112,8 @@ self: { pname = "blank-canvas"; version = "0.6.3"; sha256 = "1d10ngvsgi2hz6xick59rkq1wzfbsgckply2jmg6gz9mf3zj97bk"; + revision = "1"; + editedCabalFile = "0z3ya0rj3s7h6flqj9k5qib7pvvfimaab62z6yyc68zpfwkdzb36"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -37101,6 +37341,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-html_0_9_1_1" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring + , containers, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-html"; + version = "0.9.1.1"; + sha256 = "06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa"; + libraryHaskellDepends = [ + base blaze-builder blaze-markup bytestring text + ]; + testHaskellDepends = [ + base blaze-builder blaze-markup bytestring containers HUnit + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + description = "A blazingly fast HTML combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-html-contrib" = callPackage ({ mkDerivation, base, blaze-html, cgi, data-default, network, safe , text @@ -39603,8 +39865,8 @@ self: { }: mkDerivation { pname = "bustle"; - version = "0.6.2"; - sha256 = "099awz60hp9bpc8d27zkb3vm8r5bqp2y358drj6bzas5gqlg67bf"; + version = "0.7.1"; + sha256 = "0mwp99ac22h2byz6llgbdacv8abh8zb2cg78ipnpl3icv0mpcvd9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -39615,8 +39877,9 @@ self: { gtk3 hgettext mtl pango pcap process setlocale text time ]; testHaskellDepends = [ - base bytestring cairo containers dbus directory filepath gtk3 HUnit - mtl pango pcap QuickCheck test-framework test-framework-hunit text + base bytestring cairo containers dbus directory filepath gtk3 + hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework + test-framework-hunit text ]; description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; @@ -39663,6 +39926,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "butter" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , forkable-monad, free, HUnit, network-simple, stm + , template-haskell, text, transformers + }: + mkDerivation { + pname = "butter"; + version = "0.1.0.2"; + sha256 = "13by76xgxkjqfdgsfdsc20r8nfcjwg00wp3yr1jwcjq2acqxm3ak"; + libraryHaskellDepends = [ + aeson base bytestring containers forkable-monad free HUnit + network-simple stm template-haskell text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers forkable-monad free HUnit + network-simple stm template-haskell text transformers + ]; + description = "Monad Transformer for Asyncronous Message Passing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "butterflies" = callPackage ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw , OpenGLRaw21, repa, repa-devil @@ -40181,6 +40465,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bytestring-strict-builder_0_4_5_1" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, criterion + , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "bytestring-strict-builder"; + version = "0.4.5.1"; + sha256 = "17n6ll8k26312fgxbhws1yrswvy5dbsgyf57qksnj0akdssysy8q"; + libraryHaskellDepends = [ + base base-prelude bytestring semigroups + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "An efficient strict bytestring builder"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytestring-time" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, hspec , QuickCheck, text, time @@ -40464,30 +40770,6 @@ self: { }) {}; "c2hs" = callPackage - ({ mkDerivation, array, base, bytestring, containers, directory - , dlist, filepath, HUnit, language-c, pretty, process, shelly - , test-framework, test-framework-hunit, text, transformers - }: - mkDerivation { - pname = "c2hs"; - version = "0.28.3"; - sha256 = "1k7i2b1s596yz5i86p5kdy0b071a7chnjkiv0hl06z7f8nwnvk40"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - array base bytestring containers directory dlist filepath - language-c pretty process - ]; - testHaskellDepends = [ - base filepath HUnit shelly test-framework test-framework-hunit text - transformers - ]; - description = "C->Haskell FFI tool that gives some cross-language type safety"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "c2hs_0_28_5" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , dlist, filepath, HUnit, language-c, pretty, process, shelly , test-framework, test-framework-hunit, text, transformers @@ -40509,7 +40791,6 @@ self: { ]; description = "C->Haskell FFI tool that gives some cross-language type safety"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "c2hs-extra" = callPackage @@ -43054,6 +43335,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cassava-conduit_0_5_0" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, cassava + , conduit, containers, criterion, mtl, QuickCheck, text + }: + mkDerivation { + pname = "cassava-conduit"; + version = "0.5.0"; + sha256 = "0xj8hxyijkajgrg6g52lxfbg83d8gp01b2x35z0mqia2k6whlihr"; + libraryHaskellDepends = [ + array base bifunctors bytestring cassava conduit containers mtl + text + ]; + testHaskellDepends = [ + base bytestring cassava conduit QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Conduit interface for cassava package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cassava-embed" = callPackage ({ mkDerivation, base, bytestring, cassava, template-haskell , vector @@ -44334,28 +44636,20 @@ self: { "chart-unit" = callPackage ({ mkDerivation, base, colour, data-default, diagrams-lib - , diagrams-svg, doctest, foldl, formatting, generic-lens - , generic-lens-labels, lens, linear, mwc-probability, mwc-random - , numhask, numhask-histogram, numhask-prelude, numhask-range - , palette, primitive, protolude, scientific, svg-builder, SVGFonts - , tasty, tasty-hspec, text, time + , diagrams-svg, doctest, foldl, formatting, generic-lens, lens + , linear, numhask, numhask-prelude, numhask-range, palette + , protolude, scientific, svg-builder, SVGFonts, tasty, tasty-hspec + , text, time }: mkDerivation { pname = "chart-unit"; - version = "0.6.3.0"; - sha256 = "0r8c2g4jq2ldxn8msyyfa8r04hw5acgvb70q77jhh9v9jk5m93aa"; - isLibrary = true; - isExecutable = true; + version = "0.7.0.0"; + sha256 = "03mjp806mw0qw3wc9fx5x04cj17cdznr22fki8yzk37jm7rr7y4p"; libraryHaskellDepends = [ base colour data-default diagrams-lib diagrams-svg foldl formatting generic-lens lens linear numhask numhask-prelude numhask-range palette protolude scientific svg-builder SVGFonts text time ]; - executableHaskellDepends = [ - base diagrams-lib formatting generic-lens-labels lens - mwc-probability mwc-random numhask numhask-histogram - numhask-prelude numhask-range primitive protolude text time - ]; testHaskellDepends = [ base doctest numhask numhask-prelude numhask-range tasty tasty-hspec @@ -46616,18 +46910,19 @@ self: { }) {}; "clifm" = callPackage - ({ mkDerivation, base, brick, byteunits, directory, filepath - , optparse-applicative, pointedlist, process, time, vector, vty + ({ mkDerivation, base, brick, byteunits, conduit, containers + , directory, filepath, lens, optparse-applicative, pointedlist + , process, time, vector, vty }: mkDerivation { pname = "clifm"; - version = "0.4.1.0"; - sha256 = "0q0m662sg4n2k9lgx82d72gi16widm74a7j08psnjmwhk55ir3cb"; + version = "0.5.0.0"; + sha256 = "1j3a3d17y3cxzq5c01j2vylgdc4380vg2bs2s44k9yxjpry1dv28"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base brick byteunits directory filepath optparse-applicative - pointedlist process time vector vty + base brick byteunits conduit containers directory filepath lens + optparse-applicative pointedlist process time vector vty ]; description = "Command Line Interface File Manager"; license = stdenv.lib.licenses.bsd3; @@ -51518,8 +51813,8 @@ self: { ({ mkDerivation, base, primitive }: mkDerivation { pname = "contiguous"; - version = "0.1.0.0"; - sha256 = "19j58q0iq8ghhvrz6hqh4k7biiw8nnnxd2q3b3gwnlgfv08g8h7b"; + version = "0.2.0.0"; + sha256 = "1cm6syjrql90m54hsinyknfjhspj47ikskq3fv408bl4sx3gk2kl"; libraryHaskellDepends = [ base primitive ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; @@ -51942,15 +52237,16 @@ self: { "convert" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , data-default, lens, template-haskell, text, utf8-string + , data-default, impossible, lens, template-haskell, text + , utf8-string }: mkDerivation { pname = "convert"; - version = "1.4.2"; - sha256 = "0lmbshg6nx0ifnc6qmhvacr5lr5nlay3sjkjg2n5624qm7aiq806"; + version = "1.5"; + sha256 = "0hw2qmb3g9p7zqqk92hwnzamld6kg121dkv4va4hkpcjlhb8af6g"; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring containers data-default lens - template-haskell text utf8-string + ansi-wl-pprint base bytestring containers data-default impossible + lens template-haskell text utf8-string ]; description = "Safe and unsafe data conversion utilities with strong type-level operation. checking."; license = stdenv.lib.licenses.asl20; @@ -52065,6 +52361,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cookies" = callPackage + ({ mkDerivation, base, bytestring, chronos, hashable, text, time }: + mkDerivation { + pname = "cookies"; + version = "0.1.0.0"; + sha256 = "1vf7n6q8kp2a3ndv0cqscxqwk4wda03913lmqkk34gjxn37sgyg5"; + libraryHaskellDepends = [ + base bytestring chronos hashable text time + ]; + description = "web cookies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "coordinate" = callPackage ({ mkDerivation, base, HUnit, lens, papa, transformers }: mkDerivation { @@ -53341,8 +53650,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "10.0"; - sha256 = "10wg1s47r70gxgl9bfg3cxhj8w74k7wn0c3lh418mxypb2p3ffww"; + version = "10.2"; + sha256 = "1yg4nhsjlyj2wh5ck320v8kb3pva5wy0dssn85sia5sz0xlm8kz3"; libraryHaskellDepends = [ base binary bytestring containers Diff hashable mtl network-info safe stm time vector @@ -56764,14 +57073,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_4_1_0_0" = callPackage + "data-diverse_4_5_0_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "4.1.0.0"; - sha256 = "154a7jipfk1wav7pjzghcs54saaphdpxgfgn7jhkvacd51phs0if"; + version = "4.5.0.0"; + sha256 = "1wcyv9nh1zaixyaw4527nslmhian6g6z16y69s345wd6zmx8idmr"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -59146,13 +59455,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "debug-trace-var" = callPackage + ({ mkDerivation, base, template-haskell, unicode-show }: + mkDerivation { + pname = "debug-trace-var"; + version = "0.2.0"; + sha256 = "12dlnvzvnjk6z37pnajmghd5wcrzkf4pkpc0r2nrjp4h3p9pjkqp"; + libraryHaskellDepends = [ base template-haskell unicode-show ]; + description = "You do not have to write variable names twice in Debug.Trace"; + license = stdenv.lib.licenses.mit; + }) {}; + "debug-tracy" = callPackage - ({ mkDerivation, base, random, transformers }: + ({ mkDerivation, base, lens, random, transformers }: mkDerivation { pname = "debug-tracy"; - version = "0.1.0.1"; - sha256 = "1cp3m776yrg8r2lmcbn81y5as27qidzgb3j49ksnq4swry78jhg5"; - libraryHaskellDepends = [ base random transformers ]; + version = "0.1.0.2"; + sha256 = "057rh5gksfbnpxzqh9g3jai1hhmvk42jqgmqgq1qklakhfnbxs2w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base lens random transformers ]; + executableHaskellDepends = [ base ]; description = "More useful trace functions for investigating bugs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -59605,14 +59928,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_8_0_0" = callPackage + "dejafu_1_9_1_0" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "1.8.0.0"; - sha256 = "09l1z86vzccvbmsbar5q2a9zc7i8qh8ykinfhvrzcir1yhyz422i"; + version = "1.9.1.0"; + sha256 = "1bkyy3dsd24gwzng87w85j42wkmycjkqg78nvcragdhvjh1bsv3v"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -60900,8 +61223,8 @@ self: { }: mkDerivation { pname = "diagrams-builder"; - version = "0.8.0.2"; - sha256 = "1jr98sza6bhzq9myfb9f2p8lfbs9qcxck67h2hvxisgpvmy0gjn2"; + version = "0.8.0.3"; + sha256 = "1g8anclzfm88nd6z539g5f2h6yfb538hdl59sbiqv0vk1c4sr01s"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -60996,8 +61319,8 @@ self: { pname = "diagrams-core"; version = "1.4.1"; sha256 = "0zirk4v8qbyv0zbalh28ms9njafnj4z579dvrjvxbg6gqqcx3mcl"; - revision = "1"; - editedCabalFile = "0qv5jq4l0adks83zj2n4cgfazmg39flfb4k2i39l1w0bcmrzqjsc"; + revision = "2"; + editedCabalFile = "1q5h4gsin9p6cx0nypjyp6a1rmpr76n4dvw8hscack4gp9a8pjvl"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -61118,10 +61441,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.4.2.2"; - sha256 = "1rfn1fk251n84bxfn6p82p62gdjiq4yp4dwqmspp7ha2x6abn2s7"; - revision = "3"; - editedCabalFile = "033w27x3w0s567hsifb7nxc1msv9fvzz8idl88n8d5pifpgxg803"; + version = "1.4.2.3"; + sha256 = "175yzi5kw4yd8ykdkpf64q85c7j3p89l90m3h6qcsx9ipv6av9r5"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -61784,8 +62105,8 @@ self: { }: mkDerivation { pname = "digestive-functors-aeson"; - version = "1.1.24"; - sha256 = "01zizzhq9abyka21600234wj8yy9crx4n8qywiry4gjmq7l8gzm5"; + version = "1.1.25"; + sha256 = "1dhyahjwxgy4h4b7kvvakz85jp7fa593z5k0g3gql9xanc79qgqm"; libraryHaskellDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -62277,14 +62598,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_2_2" = callPackage + "directory_1_3_3_0" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.2.2"; - sha256 = "0m4dhcz7d1y0y08hn8ny378ly67gqbx676srgardq6800w2iqhzj"; - revision = "1"; - editedCabalFile = "1qdpglb2xzgcm1yja9d9hvw75cg85wai292f7rb6h0hsjnhrans3"; + version = "1.3.3.0"; + sha256 = "02s1vj56mqfjjgvs0vpz805582rz06p8mrp7784a3mwx78m8p4n9"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -62736,8 +63055,8 @@ self: { }: mkDerivation { pname = "distributed-fork"; - version = "0.0.1.2"; - sha256 = "0sdabc688fm1xajrdr9q6wzxd2fhzs9ary07sxh2sx0dwlyzk773"; + version = "0.0.1.3"; + sha256 = "182dd0lnc53ij1bh2rbw6zr3mnyyjddii1mak0i4s1za1jsh14hp"; libraryHaskellDepends = [ async base binary bytestring constraints distributed-closure exceptions stm terminal-size text transformers typed-process @@ -62751,20 +63070,20 @@ self: { ({ mkDerivation, aeson, aeson-qq, amazonka, amazonka-cloudformation , amazonka-core, amazonka-lambda, amazonka-s3, amazonka-sqs, async , base, base64-bytestring, bytestring, containers, distributed-fork - , interpolate, lens, lens-aeson, safe-exceptions, SHA, stratosphere - , tasty, tasty-hunit, text, time, typed-process + , elf, interpolate, lens, lens-aeson, safe-exceptions, SHA, stm + , stratosphere, tasty, tasty-hunit, text, time , unordered-containers, zip-archive }: mkDerivation { pname = "distributed-fork-aws-lambda"; - version = "0.0.1.2"; - sha256 = "1y511vildwj2f6kcswwqw65xhv06q106pnnv1pnhjc91x7r7sbzm"; + version = "0.0.2.0"; + sha256 = "02lkr9w766v2392k7c0lh8r4g9iyw1hnb3z2pqablqjxpi514s4g"; libraryHaskellDepends = [ aeson aeson-qq amazonka amazonka-cloudformation amazonka-core amazonka-lambda amazonka-s3 amazonka-sqs async base - base64-bytestring bytestring containers distributed-fork - interpolate lens lens-aeson safe-exceptions SHA stratosphere text - time typed-process unordered-containers zip-archive + base64-bytestring bytestring containers distributed-fork elf + interpolate lens lens-aeson safe-exceptions SHA stm stratosphere + text time unordered-containers zip-archive ]; testHaskellDepends = [ base distributed-fork tasty tasty-hunit text @@ -62798,25 +63117,50 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "distributed-process_0_7_4" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , data-accessor, deepseq, distributed-static, exceptions, hashable + , mtl, network-transport, network-transport-tcp, random + , rank1dynamic, stm, syb, template-haskell, time, transformers + }: + mkDerivation { + pname = "distributed-process"; + version = "0.7.4"; + sha256 = "01ck0vhy8rrilyph6ijpxdmh9jijfbx2ri7k2hmacbblwj4bzafq"; + libraryHaskellDepends = [ + base binary bytestring containers data-accessor deepseq + distributed-static exceptions hashable mtl network-transport random + rank1dynamic stm syb template-haskell time transformers + ]; + benchmarkHaskellDepends = [ + base binary bytestring network-transport-tcp + ]; + description = "Cloud Haskell: Erlang-style concurrency in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "distributed-process-async" = callPackage ({ mkDerivation, ansi-terminal, base, binary, containers - , data-accessor, deepseq, distributed-process, exceptions - , fingertree, hashable, HUnit, mtl, network, network-transport - , network-transport-tcp, rematch, stm, test-framework - , test-framework-hunit, time, transformers, unordered-containers + , data-accessor, deepseq, distributed-process + , distributed-process-systest, exceptions, fingertree, hashable + , mtl, network, network-transport, network-transport-tcp, rematch + , stm, test-framework, test-framework-hunit, time, transformers + , unordered-containers }: mkDerivation { pname = "distributed-process-async"; - version = "0.2.4.1"; - sha256 = "1a8a6rpjwm4gp4735z3715y4g99sqdqlbhm0hhzss4d7fprbxqkq"; + version = "0.2.6"; + sha256 = "0d10na24a7w1rd1qkq62xq01fkywm457421lp0frhs5p5c1kb7aw"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process exceptions fingertree hashable mtl stm time transformers unordered-containers ]; testHaskellDepends = [ - ansi-terminal base binary deepseq exceptions HUnit network - network-transport network-transport-tcp rematch stm test-framework + ansi-terminal base binary deepseq distributed-process + distributed-process-systest exceptions network network-transport + network-transport-tcp rematch stm test-framework test-framework-hunit transformers ]; description = "Cloud Haskell Async API"; @@ -62858,8 +63202,8 @@ self: { }: mkDerivation { pname = "distributed-process-client-server"; - version = "0.2.3"; - sha256 = "17y2knzmd277b15hynz0hfz1r4i53mq9a5n14ja5kmm0rhkvpp84"; + version = "0.2.5.1"; + sha256 = "15wd3nb68igg7izjb1zzcdcgsh8a9akhfw41arzdp7xcwp6prxy7"; libraryHaskellDepends = [ base binary containers deepseq distributed-process distributed-process-async distributed-process-extras exceptions @@ -62940,10 +63284,8 @@ self: { }: mkDerivation { pname = "distributed-process-extras"; - version = "0.3.2"; - sha256 = "1cyw171wlhpcc2vp3zidwl1yb5qhp25icqnzg35cdnggh4w12crk"; - revision = "2"; - editedCabalFile = "04d3v54xyq4dq8al8zf3na0ccpvyzhdbsjq7mayq9ih7bf247s8c"; + version = "0.3.5"; + sha256 = "0yva1ydm34fjvzn1z3jfb436d1m3d54fzs3kxqzgsf1nwxpz25rk"; libraryHaskellDepends = [ base binary containers deepseq distributed-process exceptions fingertree hashable mtl stm time transformers unordered-containers @@ -63146,29 +63488,28 @@ self: { ({ mkDerivation, ansi-terminal, base, binary, bytestring , containers, data-accessor, deepseq, distributed-process , distributed-process-client-server, distributed-process-extras - , distributed-static, fingertree, ghc-prim, hashable, HUnit, mtl - , network, network-transport, network-transport-tcp, rematch, stm - , test-framework, test-framework-hunit, time, transformers - , unordered-containers + , distributed-static, exceptions, fingertree, ghc-prim, hashable + , HUnit, mtl, network, network-transport, network-transport-tcp + , random, rematch, stm, test-framework, test-framework-hunit, time + , transformers, unordered-containers }: mkDerivation { pname = "distributed-process-supervisor"; - version = "0.1.3.2"; - sha256 = "1x1x0lgkdk5skixh0974la3d7zvjm6g24l7cncdx8rzv1aa9r6ry"; - revision = "1"; - editedCabalFile = "0paylszj1av8k6yz8qvy8dqp7kcc5kwjanlwx8al5mmpbyp0hcxj"; + version = "0.2.1"; + sha256 = "1cawbyz0nnx0kad1pqi1815nvdcvsap68j5a4ksdg8h8rlkvm05q"; libraryHaskellDepends = [ - base binary containers data-accessor deepseq distributed-process - distributed-process-client-server distributed-process-extras - fingertree hashable mtl stm time transformers unordered-containers + base binary bytestring containers data-accessor deepseq + distributed-process distributed-process-client-server + distributed-process-extras distributed-static exceptions fingertree + hashable mtl stm time transformers unordered-containers ]; testHaskellDepends = [ ansi-terminal base binary bytestring containers data-accessor deepseq distributed-process distributed-process-client-server - distributed-process-extras distributed-static fingertree ghc-prim - hashable HUnit mtl network network-transport network-transport-tcp - rematch stm test-framework test-framework-hunit time transformers - unordered-containers + distributed-process-extras distributed-static exceptions fingertree + ghc-prim hashable HUnit mtl network network-transport + network-transport-tcp random rematch stm test-framework + test-framework-hunit time transformers unordered-containers ]; description = "Supervisors for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; @@ -65304,8 +65645,8 @@ self: { }: mkDerivation { pname = "duckling"; - version = "0.1.6.0"; - sha256 = "0hk7nnqq20wl6sc3jlaykgsn9b4crgw6hl91xml2dh5d83sknvvq"; + version = "0.1.6.1"; + sha256 = "0lvvp13f5zcnf3cnl40avnfh3mgj304d5qfw08mbnwqz1bqp94xy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65791,8 +66132,8 @@ self: { }: mkDerivation { pname = "dynamic-state"; - version = "0.3"; - sha256 = "0aa97yv9p0mw1g7nk5jaayfl70bkp2i4kcybvp4a30gr12dpjqmv"; + version = "0.3.1"; + sha256 = "0drmlb3cvx0blsnqrxzdylpff5jxvpazsy1bxq2szcp70gghpmf4"; libraryHaskellDepends = [ base binary bytestring hashable unordered-containers ]; @@ -65962,8 +66303,8 @@ self: { ({ mkDerivation, base, data-default }: mkDerivation { pname = "ease"; - version = "0.1.0.0"; - sha256 = "17zj7s0qq3y4w6qd06hi4fc54m4j1f07wxm7yfnc47lsg5n9f4g0"; + version = "0.1.0.1"; + sha256 = "14wd2r4c2akxzhqa997gjwf8xvdnk8mhp1hv3na35x2b7xs74njm"; libraryHaskellDepends = [ base data-default ]; description = "Robert Penner's easing equations"; license = stdenv.lib.licenses.bsd3; @@ -66900,8 +67241,8 @@ self: { }: mkDerivation { pname = "ekg-bosun"; - version = "1.0.13"; - sha256 = "0w9zafd8ipq2hpxqmd9iywryjl0ym5gwwrv90kx80jxmv2dpqpzp"; + version = "1.0.14"; + sha256 = "1dfdaff9ig60xacw7fb1r3xq85hrk3x06cr3lwmrxwz493n0vsxl"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq @@ -69184,8 +69525,8 @@ self: { }: mkDerivation { pname = "espial"; - version = "0.0.1"; - sha256 = "19zkd2vki74ny69w2bdc3qr71fzawk20a56vsv3an9q5xx0f36a6"; + version = "0.0.2"; + sha256 = "0pj9hpd2vf68r9jxafg7r70f1h1j5c0qjbld7pnb9kz4sfda7f0f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70683,28 +71024,39 @@ self: { }) {}; "exitcode" = callPackage - ({ mkDerivation, base, checkers, lens, mtl, QuickCheck - , semigroupoids, semigroups, tasty, tasty-hunit, tasty-quickcheck - , transformers + ({ mkDerivation, base, checkers, hedgehog, lens, mmorph, mtl + , QuickCheck, semigroupoids, semigroups, tasty, tasty-hedgehog + , tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "exitcode"; - version = "0.1.0.0"; - sha256 = "0nkb1mbgmb67qc57s2ypcpg8ky905bqy8ns9y7zq6hmizmyn34f3"; - revision = "1"; - editedCabalFile = "077gibwagbkr07lgj8gy2bziam9zb320ry6z889zkqpg74fskbi1"; + version = "0.1.0.1"; + sha256 = "1h4qv29g59dxwsb2i4qrnf2f96xsmzngc9rnrqfkh8nkkcr71br5"; libraryHaskellDepends = [ - base lens mtl semigroupoids semigroups transformers + base lens mmorph mtl semigroupoids semigroups transformers ]; testHaskellDepends = [ - base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck - transformers + base checkers hedgehog lens QuickCheck tasty tasty-hedgehog + tasty-hunit tasty-quickcheck transformers ]; description = "Monad transformer for exit codes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "exomizer" = callPackage + ({ mkDerivation, base, bytestring, c2hs }: + mkDerivation { + pname = "exomizer"; + version = "1.0.0"; + sha256 = "1lngwbwgmh6dvskambn35ncrni7cxlychwbircb6srhjdm1lvhll"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base bytestring ]; + libraryToolDepends = [ c2hs ]; + description = "Compression and decompression in the exomizer format"; + license = "unknown"; + }) {}; + "exp-cache" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq , hashable, HUnit, psqueues, QuickCheck, random, tasty, tasty-hunit @@ -70998,8 +71350,8 @@ self: { }: mkDerivation { pname = "expressions"; - version = "0.1.6"; - sha256 = "081yglpbk0297s7qyq845x9pfkl0dcbz4i2dv1rppslvkhpwa270"; + version = "0.1.7"; + sha256 = "0pg5hxnxj0zm4s4miw9xjqw2yipd29lqj00svhrsf1pqkb5n98x0"; libraryHaskellDepends = [ attoparsec base containers free lattices singletons text transformers @@ -71190,8 +71542,8 @@ self: { }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.1.2.2"; - sha256 = "0iylnsg2q7gx7y2zi7sfklx71p6lghyink0692clipd7z5915ysf"; + version = "0.1.3.0"; + sha256 = "1hzl14g3s94bgnpmm3g3ypbgb66pb4m3japn1gn5z7cknxsl2xh3"; libraryHaskellDepends = [ base containers directory extensible-effects filepath lens logging-effect monad-control mtl parallel process QuickCheck random @@ -72028,10 +72380,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.24.0.0"; - sha256 = "1my71a3cmd637ch5jwsdpyvfx6vsi2vnvshbrwmcx9ya1xm6x7z2"; - revision = "1"; - editedCabalFile = "1bx1dyxir8h0c1qybkfdra36rmdhk7gpgz071v9spl9lplqvpw9s"; + version = "0.24.0.1"; + sha256 = "05z8dyw1yf2bh42mrrk1d9rxqdz1p6gn8sjnpk66s2k76xrg4vm2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72087,6 +72437,8 @@ self: { pname = "fay-dom"; version = "0.5.0.1"; sha256 = "1zm6w6nccswaksr283alhnsss6xw4k7s61yp8ff4lg5127ff9wp0"; + revision = "1"; + editedCabalFile = "1lhmkf2n7prv6w51bl3szz4g9cn2dkhb873m7f568nnwysqibv8b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base ]; description = "DOM FFI wrapper library for Fay"; @@ -73839,8 +74191,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "first-class-patterns"; - version = "0.3.2.3"; - sha256 = "051pmakbg3ipa4vrzk47c0v9ng3sj19wd99qi6gvp40gdkjjmplk"; + version = "0.3.2.4"; + sha256 = "1dc24hgmxyhg7jrij3f3x46ra96y5fw047828f8ahxvj14ljix1v"; libraryHaskellDepends = [ base transformers ]; description = "First class patterns and pattern matching, using type families"; license = stdenv.lib.licenses.bsd3; @@ -75824,8 +76176,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "forkable-monad"; - version = "0.1.1"; - sha256 = "0nxcjx3cf8bkl0cwkpgz5c6byld13kw2601q4157fmfa370bi11h"; + version = "0.2.0.2"; + sha256 = "19a4wagdj2d66w7ka9s480rq3d0i3n5q0zyi2v9sckb6lj3lx175"; libraryHaskellDepends = [ base transformers ]; description = "An implementation of forkIO for monad stacks"; license = stdenv.lib.licenses.bsd3; @@ -75859,6 +76211,8 @@ self: { pname = "forma"; version = "1.1.0"; sha256 = "09f377ak1208lr8sskdga3nq47a151whd7z982pwv552w1q75p5p"; + revision = "1"; + editedCabalFile = "0yn650g1x3v56d45iqks1x7bz6ji8454ppr0qx48bmjnlbb34s1q"; libraryHaskellDepends = [ aeson base containers mtl text unordered-containers ]; @@ -77365,26 +77719,6 @@ self: { }) {}; "fsnotify-conduit" = callPackage - ({ mkDerivation, base, conduit, directory, filepath, fsnotify - , hspec, resourcet, temporary, transformers - }: - mkDerivation { - pname = "fsnotify-conduit"; - version = "0.1.1.0"; - sha256 = "03mlb8yhdajf00dzddvbmb7jm3p05zw1y33f2acaa52pk45zh063"; - libraryHaskellDepends = [ - base conduit directory filepath fsnotify resourcet transformers - ]; - testHaskellDepends = [ - base conduit directory filepath fsnotify hspec resourcet temporary - transformers - ]; - description = "Get filesystem notifications as a stream of events"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "fsnotify-conduit_0_1_1_1" = callPackage ({ mkDerivation, base, conduit, directory, filepath, fsnotify , hspec, resourcet, temporary, transformers }: @@ -77531,16 +77865,15 @@ self: { }) {}; "ftp-client-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit-combinators, connection - , exceptions, ftp-client, ftp-clientconduit, resourcet + ({ mkDerivation, base, bytestring, conduit, connection, exceptions + , ftp-client, ftp-clientconduit, resourcet }: mkDerivation { pname = "ftp-client-conduit"; - version = "0.5.0.0"; - sha256 = "16g1j2a8kikva08bi6n22sw0limlwj8r53acrlq6licg2sdlzp06"; + version = "0.5.0.1"; + sha256 = "08v5zf3idm65b9aihmaplznmcshaydx3f1ns0f6kzfhmvbdpwc2c"; libraryHaskellDepends = [ - base bytestring conduit-combinators connection exceptions - ftp-client resourcet + base bytestring conduit connection exceptions ftp-client resourcet ]; testHaskellDepends = [ base ftp-clientconduit ]; description = "Transfer file with FTP and FTPS with Conduit"; @@ -79148,8 +79481,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.9"; sha256 = "1jw4rmfsky8r8551ddjy0i3va3dj37flzf23gxniyam7zy8kzh9l"; - revision = "3"; - editedCabalFile = "0dlxl7p1nf8d4yh6r5yfdnrsn4wb5wl7bj9ymln744b498frlfln"; + revision = "4"; + editedCabalFile = "0m2m2wfv9nhq8m7xl1nrmj4wy3yip3s31b4448za58ryrwkdgjzd"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -83741,8 +84074,8 @@ self: { pname = "github"; version = "0.19"; sha256 = "1523p2rv4jwsbsqjc9g3qff4cy5dhdy5wzp382x5nr11rmbrpsph"; - revision = "2"; - editedCabalFile = "0ib40npsrwd92mgiqv5rqv21dnhmdh5x6ql84i8ivz8vs2a43hqq"; + revision = "3"; + editedCabalFile = "0s3zmkzgfbh1mc0492i7rjiawxkzg0im8z2p10niv5ff58m87yri"; libraryHaskellDepends = [ aeson aeson-compat base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash deepseq @@ -87862,8 +88195,8 @@ self: { }: mkDerivation { pname = "graph-generators"; - version = "0.1.3.0"; - sha256 = "0l1xc09zpxxdv31ba09l24ayazcfnzzz1b3z8vd1hay5nw99gq0z"; + version = "0.1.4.0"; + sha256 = "1wqxkykg9q8dwk7gbx63501n58pr8drsnyfpg64faggrr72c1c5f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89826,8 +90159,8 @@ self: { }: mkDerivation { pname = "gym-http-api"; - version = "0.1.0.0"; - sha256 = "0id8npw9ziqibm0j5fqkjw7r75la2cd4zlyzsk90rpx2xf5xy20p"; + version = "0.1.0.1"; + sha256 = "0469n34s0p313nwnw8zpg1n9aaf6sqn5h7yl0jhc6yydc6rdjgrc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91112,6 +91445,8 @@ self: { pname = "hackage-security"; version = "0.5.3.0"; sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; + revision = "1"; + editedCabalFile = "0m0xhcivjqq6cwmhr60sva4qz2ciknyacv7dxpdiwbsl3kwyx9sz"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -91702,26 +92037,26 @@ self: { "hadolint" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, gitrev, hspec, HUnit, language-docker - , optparse-applicative, parsec, ShellCheck, split, text, yaml + , filepath, gitrev, hspec, HUnit, language-docker, megaparsec, mtl + , optparse-applicative, ShellCheck, split, text, void, yaml }: mkDerivation { pname = "hadolint"; - version = "1.6.6"; - sha256 = "13rkz6f5dzkh9qy674ia34ld25xwpylja2mivmwfsijh5pc5qvwq"; + version = "1.7.2"; + sha256 = "15z8xyx9dd3wb2fdrbhh5kmd32njr586h76x0rdp4kddij7a5x56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers language-docker parsec ShellCheck - split text + aeson base bytestring containers language-docker megaparsec mtl + ShellCheck split text void ]; executableHaskellDepends = [ - base directory filepath gitrev language-docker optparse-applicative - parsec yaml + base directory filepath gitrev language-docker megaparsec + optparse-applicative text yaml ]; testHaskellDepends = [ - aeson base bytestring hspec HUnit language-docker parsec ShellCheck - split + aeson base bytestring hspec HUnit language-docker megaparsec + ShellCheck split text ]; description = "Dockerfile Linter JavaScript API"; license = stdenv.lib.licenses.gpl3; @@ -93142,6 +93477,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_5_7" = 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.5.7"; + sha256 = "0fis5g2fg0x5pw7r0p7qy090v90gzqza5qjnpzinnq1yipmr872p"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -95777,8 +96139,8 @@ self: { }: mkDerivation { pname = "haskell-overridez"; - version = "0.10.0.1"; - sha256 = "0p50hsnj57hjd2sngcamicjp1yj9h4fk9jyp37ygy1j0yzyhn3a5"; + version = "0.10.1.1"; + sha256 = "0djxy9qfn318qmym711ba9rca2a9l9dpfvdwqmjsnihh33myjk1d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96234,6 +96596,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-ast_1_1_0_0" = callPackage + ({ mkDerivation, base, classyplate, ghc, mtl, pretty, references + , template-haskell, uniplate + }: + mkDerivation { + pname = "haskell-tools-ast"; + version = "1.1.0.0"; + sha256 = "1s5iify3n8bixhrv5gllxbmihddym5vwa46dph36lvv44xxs7gfh"; + libraryHaskellDepends = [ + base classyplate ghc mtl pretty references template-haskell + uniplate + ]; + description = "Haskell AST for efficient tooling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-ast-fromghc" = callPackage ({ mkDerivation, base, bytestring, containers, ghc , haskell-tools-ast, mtl, references, safe, split, template-haskell @@ -96302,25 +96681,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-backend-ghc_1_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th + , haskell-tools-ast, mtl, references, safe, split, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-backend-ghc"; + version = "1.1.0.0"; + sha256 = "08a2h70sbzga9c202q0f7j1nqyvqjpx8npfzrkdid45fp04v3aks"; + libraryHaskellDepends = [ + base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl + references safe split template-haskell transformers uniplate + ]; + description = "Creating the Haskell-Tools AST from GHC's representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-builtin-refactorings" = callPackage ({ mkDerivation, aeson, base, Cabal, classyplate, containers , deepseq, directory, either, filepath, ghc, ghc-paths , haskell-tools-ast, haskell-tools-backend-ghc , haskell-tools-prettyprint, haskell-tools-refactor - , haskell-tools-rewrite, minisat-solver, mtl, references, split - , tasty, tasty-hunit, template-haskell, time, transformers - , uniplate + , haskell-tools-rewrite, minisat-solver, mtl, portable-lines + , references, split, tasty, tasty-hunit, template-haskell, time + , transformers, uniplate }: mkDerivation { pname = "haskell-tools-builtin-refactorings"; - version = "1.0.1.1"; - sha256 = "00yp1gvfvg3c2fa9ndnqphxbnsrshifida3247yafd7q9hhgd7q8"; + version = "1.1.0.0"; + sha256 = "0v448flr5n6ppm4zd4cfd467rxan28vpjavw7yk8gj16ff9xv974"; libraryHaskellDepends = [ aeson base Cabal classyplate containers deepseq directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc haskell-tools-prettyprint haskell-tools-refactor - haskell-tools-rewrite minisat-solver mtl references split - template-haskell transformers uniplate + haskell-tools-rewrite minisat-solver mtl portable-lines references + split template-haskell transformers uniplate ]; testHaskellDepends = [ base Cabal containers directory either filepath ghc ghc-paths @@ -96343,8 +96740,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "1.0.1.2"; - sha256 = "03s7jhq7449z52h6vq9gbay3xdn66s8ma7snak0kk6nra41zrlpp"; + version = "1.1.0.0"; + sha256 = "1yi85v7h9zsnj90kpx681qxyzxdi54s0ah3k95jrwlhiddmf69hx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96380,8 +96777,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "1.0.1.1"; - sha256 = "0r48z9vkkgzgvlryfri6dzivf090pkjv52k517z9wvis3jxhqi7i"; + version = "1.1.0.0"; + sha256 = "07m1zprhqvs7gr9vlhms9gypcp8w0f8a0d1xkx3wp0bbl942zcf6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96413,8 +96810,8 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "1.0.1.1"; - sha256 = "1ml4rbkcajgwssi1a0jgbbqnnci9f74w90zj9cxdxxkkck4fkypl"; + version = "1.1.0.0"; + sha256 = "1cr352nw160gwfnhibc9vfnx1sgryjbq2psiz257ci55zpk4zihb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96439,8 +96836,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "1.0.1.1"; - sha256 = "01fkl2xkq7v3mkm5dzfpfz53i2js68xhc3gvkc1lv8mg92zymfbb"; + version = "1.1.0.0"; + sha256 = "1sjb6imfx9zraxdcwzn4a0a0alswlxazzqzfzsicyqp8778ifc0l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96470,8 +96867,8 @@ self: { }: mkDerivation { pname = "haskell-tools-experimental-refactorings"; - version = "1.0.1.1"; - sha256 = "0dyiixq7rdzjczzfv57b7f2859r4nmxrk68vq0flkazjqh9w08yb"; + version = "1.1.0.0"; + sha256 = "0pw13pr7lwlmbi6lqkxfbhlcvjmphsyy7qxkv6hmvwqfdkv805lr"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -96507,6 +96904,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-prettyprint_1_1_0_0" = callPackage + ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl + , references, split, text, uniplate + }: + mkDerivation { + pname = "haskell-tools-prettyprint"; + version = "1.1.0.0"; + sha256 = "12py365fg7rmprxpy4qj6q3znq8ah0bzi2gy3lx8s1s8kzq0wyv0"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast mtl references split text + uniplate + ]; + description = "Pretty printing of Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-refactor" = callPackage ({ mkDerivation, aeson, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -96537,6 +96951,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-refactor_1_1_0_0" = callPackage + ({ mkDerivation, aeson, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-rewrite, mtl, old-time, polyparse, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate + }: + mkDerivation { + pname = "haskell-tools-refactor"; + version = "1.1.0.0"; + sha256 = "1r3wh3jg8dmmx8fi7qpzl85gnxypmhp90h451dpb3ykcwfav775s"; + libraryHaskellDepends = [ + aeson base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl references + split template-haskell transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl old-time + polyparse references split tasty tasty-hunit template-haskell time + transformers uniplate + ]; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-rewrite" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references @@ -96558,6 +97002,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-rewrite_1_1_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc + , haskell-tools-ast, haskell-tools-prettyprint, mtl, references + , tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-rewrite"; + version = "1.1.0.0"; + sha256 = "1000vm2ihfj8phajnqifhj6q4ghy5jq2xvn7s7l1hh2brd37zah8"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl + references + ]; + testHaskellDepends = [ + base directory filepath haskell-tools-ast haskell-tools-prettyprint + tasty tasty-hunit + ]; + description = "Facilities for generating new parts of the Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tor" = callPackage ({ mkDerivation, array, asn1-encoding, asn1-types, async , attoparsec, base, base64-bytestring, binary, bytestring, cereal @@ -101346,8 +101812,8 @@ self: { }: mkDerivation { pname = "hexpat-lens"; - version = "0.1.6"; - sha256 = "0d395r8rc1s3q1gldynb47g20l4585w18div21jm397gga4cgkmx"; + version = "0.1.7"; + sha256 = "0r9psvrgwkg8y9xvgc3rkay828ri5xbp2z5jjf6b52v99j8aipd8"; libraryHaskellDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; @@ -102163,6 +102629,8 @@ self: { pname = "hid-examples"; version = "0.1.0.0"; sha256 = "0x8i9532w5gxlajx4pw7n31qf6hbqf5335lsqwvwvk12igww7mg8"; + revision = "1"; + editedCabalFile = "0ifcgqm81vh7qidpxzgkx5g3wcyif0zgclz7svsnvw5vvpij350p"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -104424,6 +104892,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; + "hmatrix-morpheus_0_1_1_2" = callPackage + ({ mkDerivation, base, blas, criterion, hmatrix, HUnit, liblapack + , MonadRandom, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "hmatrix-morpheus"; + version = "0.1.1.2"; + sha256 = "19q52n5j1n5db7b2pv0iabh1xygpybgiszswginab5khc01fxwzj"; + libraryHaskellDepends = [ base hmatrix ]; + librarySystemDepends = [ blas liblapack ]; + testHaskellDepends = [ + base hmatrix HUnit MonadRandom test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ base criterion hmatrix ]; + description = "Low-level machine learning auxiliary functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; + "hmatrix-nipals" = callPackage ({ mkDerivation, base, hmatrix }: mkDerivation { @@ -105365,10 +105854,8 @@ self: { ({ mkDerivation, base, either, mtl }: mkDerivation { pname = "hoist-error"; - version = "0.2.0.0"; - sha256 = "1hb479bwn3z1qdsrnz85wfdd9skmmxydxd6xkcrwbcfwy5vap64h"; - revision = "1"; - editedCabalFile = "1nai9ds3r15x78rnj5gvy3mbps2jkq9ndqg56l8g7rxizfzidwfb"; + version = "0.2.1.0"; + sha256 = "028lczd80nhj3yj5dq9qixzdzkyisl34qpi6bb28r8b9nj2i2nss"; libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; @@ -107093,36 +107580,6 @@ self: { }) {}; "hpqtypes" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , data-default-class, directory, exceptions, filepath, HUnit - , lifted-base, monad-control, mtl, postgresql, QuickCheck, random - , resource-pool, scientific, semigroups, test-framework - , test-framework-hunit, text, text-show, time, transformers - , transformers-base, unordered-containers, vector - }: - mkDerivation { - pname = "hpqtypes"; - version = "1.5.2.0"; - sha256 = "0ghqrayylsm68nkqzrb7y81n3zslqv0rjpd0fyya67cy26ks43gw"; - setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ - aeson base bytestring containers data-default-class exceptions - lifted-base monad-control mtl resource-pool semigroups text - text-show time transformers transformers-base vector - ]; - librarySystemDepends = [ postgresql ]; - testHaskellDepends = [ - aeson base bytestring exceptions HUnit lifted-base monad-control - mtl QuickCheck random scientific test-framework - test-framework-hunit text text-show time transformers-base - unordered-containers vector - ]; - description = "Haskell bindings to libpqtypes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) postgresql;}; - - "hpqtypes_1_5_3_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers , data-default-class, directory, exceptions, filepath, HUnit , lifted-base, monad-control, mtl, postgresql, QuickCheck, random @@ -107508,12 +107965,12 @@ self: { license = "GPL"; }) {}; - "hs-bibutils_6_4_0_0" = callPackage + "hs-bibutils_6_5_0_0" = callPackage ({ mkDerivation, base, syb }: mkDerivation { pname = "hs-bibutils"; - version = "6.4.0.0"; - sha256 = "1kravnc0cn0r7bnm3fmcd6d1l4z1ax41wcm32jrp5rafq15lyg9f"; + version = "6.5.0.0"; + sha256 = "10myn4dg9d7ia40cgnsm3biyzd59w3kkaa4w0f6wc1wchmvmr37q"; libraryHaskellDepends = [ base syb ]; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; license = "GPL"; @@ -109670,6 +110127,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-aeson_0_3_0_2" = callPackage + ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit + , ieee754, QuickCheck, quickcheck-instances, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "hslua-aeson"; + version = "0.3.0.2"; + sha256 = "0qfqq2xz5jqws1bh7iwznnv50kgqc1v5xxvnrraqkmz7hh4wyam2"; + libraryHaskellDepends = [ + aeson base hashable hslua scientific text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base hashable hslua hspec HUnit ieee754 QuickCheck + quickcheck-instances scientific text unordered-containers vector + ]; + description = "Allow aeson data types to be used with lua"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hslua-module-text" = callPackage ({ mkDerivation, base, hslua, tasty, tasty-hunit, text }: mkDerivation { @@ -112264,6 +112743,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client_0_5_13" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, deepseq, directory + , exceptions, filepath, ghc-prim, hspec, http-types, memory + , mime-types, monad-control, network, network-uri, random, stm + , streaming-commons, text, time, transformers, zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.5.13"; + sha256 = "12q0w3avdkddrp7cgvwkmmfxdi4cz1ajic8jlrgp2plhn8ggnag2"; + libraryHaskellDepends = [ + array base blaze-builder bytestring case-insensitive containers + cookie deepseq exceptions filepath ghc-prim http-types memory + mime-types network network-uri random stm streaming-commons text + time transformers + ]; + testHaskellDepends = [ + async base blaze-builder bytestring case-insensitive containers + deepseq directory hspec http-types monad-control network + network-uri streaming-commons text time transformers zlib + ]; + doCheck = false; + description = "An HTTP client engine"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-auth" = callPackage ({ mkDerivation, base, base64-string, blaze-builder, bytestring , case-insensitive, conduit, crypto-conduit, http-client @@ -113139,12 +113646,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "http2-client-grpc" = callPackage + ({ mkDerivation, base, binary, bytestring, data-default-class + , http2, http2-client, proto-lens, proto-lens-protoc, text, zlib + }: + mkDerivation { + pname = "http2-client-grpc"; + version = "0.1.0.0"; + sha256 = "11ckgp56k6ypk4smc91909gs8cvlbqji8blsr48k8fbclhi5cqwv"; + libraryHaskellDepends = [ + base binary bytestring data-default-class http2 http2-client + proto-lens proto-lens-protoc text zlib + ]; + testHaskellDepends = [ base ]; + description = "Implement gRPC-over-HTTP2 clients"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "httpd-shed" = callPackage ({ mkDerivation, base, network, network-uri }: mkDerivation { pname = "httpd-shed"; version = "0.4.0.3"; sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh"; + revision = "1"; + editedCabalFile = "159cjn9j8lq00gj2yvrzp81r37av25f83chsimp88h55zm9z8akw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network network-uri ]; @@ -113495,12 +114021,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_1_2_0_3" = callPackage + "hunit-dejafu_1_2_0_4" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.2.0.3"; - sha256 = "1qja9warghakl06fv5v7fimb3bqnb38lhs9y264x9hrc7i0nx2xj"; + version = "1.2.0.4"; + sha256 = "017hdbimpi2wpwdyis3gmwrzxszafws6jxwi4jwm44psnqpl9hry"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; @@ -113908,6 +114434,8 @@ self: { pname = "hw-conduit"; version = "0.2.0.3"; sha256 = "19fwlgnpc17h305nmaygd5w9p5yv9jm25jgc440r9frqzw7if83a"; + revision = "1"; + editedCabalFile = "0zr1r7px2qgpf5fgq18l6ziy2xaz773qbxc87cp84x0vpwas0yg7"; libraryHaskellDepends = [ array base bytestring conduit conduit-combinators time word8 ]; @@ -113932,36 +114460,36 @@ self: { "hw-dsv" = callPackage ({ mkDerivation, base, bits-extra, bytestring, cassava, criterion - , directory, hedgehog, hspec, hspec-discover, hw-bits + , deepseq, directory, hedgehog, hspec, hspec-discover, hw-bits , hw-hspec-hedgehog, hw-prim, hw-rankselect, hw-rankselect-base , lens, mmap, optparse-applicative, resourcet, text, vector, weigh }: mkDerivation { pname = "hw-dsv"; - version = "0.1.0.0"; - sha256 = "1qyqvb4ky4fl0hys1yihn54xxmh1ajnb81szgsv8crh1idvx0fil"; - revision = "1"; - editedCabalFile = "0g99dyjx8vrhm9rdblla1gwd1z1p7fpaddq21y56k5bfg9zjcivw"; + version = "0.2"; + sha256 = "1jkkhkk7rpskxnbiaz7a520nf19f3hl8vxi5gl5k6nvjw6z0zy1q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bits-extra bytestring hw-bits hw-prim hw-rankselect + base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect hw-rankselect-base vector ]; executableHaskellDepends = [ - base bits-extra bytestring hedgehog hw-bits hw-prim hw-rankselect - hw-rankselect-base lens optparse-applicative resourcet vector + base bits-extra bytestring deepseq hedgehog hw-bits hw-prim + hw-rankselect hw-rankselect-base lens optparse-applicative + resourcet vector ]; testHaskellDepends = [ - base bits-extra bytestring cassava directory hedgehog hspec hw-bits - hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text - vector weigh + base bits-extra bytestring cassava deepseq directory hedgehog hspec + hw-bits hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base + text vector weigh ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base bits-extra bytestring cassava criterion directory hw-bits - hw-prim hw-rankselect hw-rankselect-base mmap vector weigh + base bits-extra bytestring cassava criterion deepseq directory + hw-bits hw-prim hw-rankselect hw-rankselect-base mmap vector ]; + description = "Unbelievably fast streaming DSV file parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -114102,6 +114630,8 @@ self: { pname = "hw-json"; version = "0.6.0.0"; sha256 = "1na1xcgnnig27cv1v773jr7mv5izv8n1dnf6k3irw9rml3l213mv"; + revision = "1"; + editedCabalFile = "18w22jnsjv8f4k2q3548vdzl80p4r80pn96rnp69f6l36ibmx771"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114168,25 +114698,25 @@ self: { "hw-kafka-avro" = callPackage ({ mkDerivation, aeson, avro, base, binary, bytestring, cache - , containers, errors, hashable, hspec, http-client, http-types, mtl - , pure-zlib, QuickCheck, semigroups, servant, servant-client - , tagged, text, transformers, unordered-containers + , containers, errors, hashable, hspec, http-client, http-types + , lens, mtl, pure-zlib, QuickCheck, semigroups, tagged, text + , transformers, unordered-containers, wreq }: mkDerivation { pname = "hw-kafka-avro"; - version = "1.4.0"; - sha256 = "19lk0vyrl6hcd8f053yh7m1hym2hqs9srhjq9isq19s8nqgpijc4"; + version = "2.0.0"; + sha256 = "048pj3xq56kvkcgcczvavnhpq8a0hpvnna0w5m5k12wb4hvrj4h5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable - http-client http-types mtl pure-zlib semigroups servant - servant-client tagged text transformers unordered-containers + http-client http-types lens mtl pure-zlib semigroups tagged text + transformers unordered-containers wreq ]; testHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable - hspec http-client mtl pure-zlib QuickCheck semigroups servant - servant-client text transformers unordered-containers + hspec http-client mtl pure-zlib QuickCheck semigroups text + transformers unordered-containers ]; description = "Avro support for Kafka infrastructure"; license = stdenv.lib.licenses.bsd3; @@ -114386,18 +114916,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hw-rankselect_0_12_0_2" = callPackage + "hw-rankselect_0_12_0_3" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq - , directory, hedgehog, hspec, hw-balancedparens, hw-bits - , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens - , mmap, mtl, optparse-applicative, QuickCheck, resourcet, vector + , directory, hedgehog, hspec, hspec-discover, hw-balancedparens + , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-prim + , hw-rankselect-base, lens, mmap, mtl, optparse-applicative + , QuickCheck, resourcet, transformers, vector }: mkDerivation { pname = "hw-rankselect"; - version = "0.12.0.2"; - sha256 = "02fr2p1sl7ynpc1280l1nakf24ifp4fkpjpy2lac8rk4iab48syk"; - revision = "1"; - editedCabalFile = "0wggs7k8b0syivi3lyz6qplkiqb11im94bqhhbn6dqikf5sv6qv7"; + version = "0.12.0.3"; + sha256 = "0qngw9dw15km09z69hrdlyav89s1kbmmml9791m2iwzk4ckd0yhi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114410,8 +114939,9 @@ self: { ]; testHaskellDepends = [ base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog - hw-prim hw-rankselect-base mmap QuickCheck vector + hw-prim hw-rankselect-base mmap QuickCheck transformers vector ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bytestring conduit criterion directory hw-bits hw-prim hw-rankselect-base mmap resourcet vector @@ -115857,6 +116387,8 @@ self: { pname = "ical"; version = "0.0.1"; sha256 = "10nqlypcv7rpc8q83rjhpb2n3sfqfx6p3xhf123hmacs4ks5vr7m"; + revision = "1"; + editedCabalFile = "0sxh3m5iscf1kdkmc8bqgb8snn878ljm962h0f1sgx8z72avawr9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117974,7 +118506,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_6_0_2" = callPackage + "influxdb_1_6_0_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck @@ -117984,8 +118516,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.0.2"; - sha256 = "0f5lcwvs4cw7ipqw3da5baf2sw4m1a7g29iw3big5m93wc2flk38"; + version = "1.6.0.3"; + sha256 = "06ywpr2wpc8kx4kjkmpq6lapbpqwq3c0sxla21v58psj033ihzl9"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -118344,8 +118876,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.1.0"; sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp"; - revision = "6"; - editedCabalFile = "0dna826vhnal6m213llszn68phjs27pd43f7s8wdhdmjdx1nzk72"; + revision = "7"; + editedCabalFile = "1mqdqrr25igra0bhqkjsc5y87q9ciwm5w14gmchx2p7xy7x0xy9b"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -119543,31 +120075,6 @@ self: { }) {}; "ip" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , doctest, hashable, HUnit, primitive, QuickCheck - , quickcheck-classes, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, vector - }: - mkDerivation { - pname = "ip"; - version = "1.1.2"; - sha256 = "16vjbcrjpvs4wh89r4k3d5hpkklvcvrk50qjnx67bsi2jjhcn0aj"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text vector - ]; - testHaskellDepends = [ - attoparsec base bytestring doctest HUnit QuickCheck - quickcheck-classes test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ - attoparsec base bytestring criterion text - ]; - description = "Library for IP and MAC addresses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ip_1_2_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , doctest, hashable, hspec, HUnit, primitive, QuickCheck , quickcheck-classes, semigroups, test-framework @@ -119577,6 +120084,8 @@ self: { pname = "ip"; version = "1.2.1"; sha256 = "024cl4dx0580wch2z9m45siak2n9dpbj3853gc4p9r257zp5xalr"; + revision = "1"; + editedCabalFile = "1zy8l09i95z5s0cfzq2fhn2r805mgxfc82d6nl5aamg5jmfcyzz1"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive semigroups text vector @@ -119591,7 +120100,6 @@ self: { ]; description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ip-quoter" = callPackage @@ -119918,8 +120426,8 @@ self: { pname = "irc-dcc"; version = "2.0.1"; sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234"; - revision = "7"; - editedCabalFile = "01mvdqabbxa68abq49s2kwpl0y8gb6lf258jjg7w098f5v0p4m36"; + revision = "8"; + editedCabalFile = "1ya1bl8pdzbs3gxkq7hsyvkaajf8prrdhr1lx5hm9pi1nqsi879z"; libraryHaskellDepends = [ attoparsec base binary bytestring io-streams iproute irc-ctcp mtl network path safe-exceptions transformers utf8-string @@ -120295,6 +120803,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "iso8601-time_0_1_5" = callPackage + ({ mkDerivation, base, hspec, HUnit, time }: + mkDerivation { + pname = "iso8601-time"; + version = "0.1.5"; + sha256 = "1j7h1xix7vpb88dnksis14rnvw0p528m3d54fg3h51765d5l9kgj"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base hspec HUnit time ]; + description = "Convert to/from the ISO 8601 time format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "isobmff-builder" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, data-default , hspec, mtl, pretty-types, QuickCheck, singletons, tagged @@ -122146,8 +122667,8 @@ self: { }: mkDerivation { pname = "json-assertions"; - version = "1.0.11"; - sha256 = "000a528gmkb25zcl7am6qh8fjrq2v2l71c27fxzm6wpf0ml0vv7z"; + version = "1.0.12"; + sha256 = "0sf1ajldz7c9ksbfr93hhrpbvqxiqbkyxqbw9q54cbf0pi6mhyzb"; libraryHaskellDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; @@ -122204,40 +122725,6 @@ self: { }) {}; "json-autotype" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, GenericPretty, hashable, lens, mtl - , optparse-applicative, pretty, process, QuickCheck, scientific - , smallcheck, text, uniplate, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "json-autotype"; - version = "1.0.18"; - sha256 = "0h2aiq7k6s2qw81mrj77i86vfaci0387cwm6lbfzfag3r4993w7h"; - revision = "2"; - editedCabalFile = "1b7q8af32zpsrq32m34d4h4245ww19kxfqjrbq6s2mfx5qd5s5y6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers filepath GenericPretty hashable - lens mtl optparse-applicative pretty process scientific text - uniplate unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers filepath GenericPretty hashable - lens mtl optparse-applicative pretty process scientific text - uniplate unordered-containers vector yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath GenericPretty - hashable lens mtl optparse-applicative pretty process QuickCheck - scientific smallcheck text uniplate unordered-containers vector - ]; - description = "Automatic type declaration for JSON input data"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "json-autotype_1_1_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, GenericPretty, hashable, lens, mtl , optparse-applicative, pretty, process, QuickCheck, scientific @@ -122247,6 +122734,8 @@ self: { pname = "json-autotype"; version = "1.1.2"; sha256 = "1gf7g5y46wpkkhdnmvi85h518a59yb5j8ffgrnb82cs5zjwjpa9j"; + revision = "1"; + editedCabalFile = "0qc69s8wcsfy8h8mbz2iyxi02gwissb93wn5gapwisinhm44ldpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122265,7 +122754,6 @@ self: { ]; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -122384,8 +122872,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "1.0.1"; - sha256 = "16x0k1iwq9z9sq7z6a2007w8cczy6yd7sniylhacqnf1gsjfb4q6"; + version = "1.0.2"; + sha256 = "1485c4rljprf09nn8hd5fdpipjzpcylgmzz3ckw4nna5fhyx2n40"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -122569,8 +123057,8 @@ self: { pname = "json-rpc-client"; version = "0.2.5.0"; sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak"; - revision = "5"; - editedCabalFile = "0fi7cij476s4lhjpi7m1yp9p30qv7pyv0hlcj30kd0zq74nwwrdz"; + revision = "6"; + editedCabalFile = "1x5vivxcnmf8igc5m3sh301nlag2kj6n7dgpiw58k0f0cdbh86i3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122615,8 +123103,8 @@ self: { pname = "json-rpc-server"; version = "0.2.6.0"; sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn"; - revision = "4"; - editedCabalFile = "19nasv4sxjn3j0xvr1pd9x6bf8f8566wwd15y3wwll89bpnyd4z9"; + revision = "5"; + editedCabalFile = "0hvkfbgg3jbgs0d2jp5djhpd2qp3q9hs5cr4ds93bc9nyncymyq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122640,8 +123128,8 @@ self: { pname = "json-schema"; version = "0.7.4.1"; sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an"; - revision = "14"; - editedCabalFile = "0pf2j8v62mfh6dk0v4a93l75by6i6jsfangbsabksdbzhh64hyrr"; + revision = "15"; + editedCabalFile = "07a5qvmg6bz54k5f608d8lvaay97s6df503rq047sjwa6dipcm0x"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -123627,6 +124115,8 @@ self: { pname = "kanji"; version = "3.4.0"; sha256 = "1wc17b5515vb19ah7wm1zwmpf7b3jgjzrhk21hk8ysr14pcxwifr"; + revision = "1"; + editedCabalFile = "00p8adbln7hrd3gapw51mcqkh7vl9a9fjza59s4mk9w3vh30xg6j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123653,8 +124143,8 @@ self: { pname = "kansas-comet"; version = "0.4"; sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; - revision = "13"; - editedCabalFile = "0qdj3giwfjic87xln1lkrfa9dw8yj31s7x3dsr7n1343jcap2m7n"; + revision = "14"; + editedCabalFile = "0iz92v375bvfp1yib7xmvwwci2ndh68fy20597dvc0b6wpjx76lq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -125483,6 +125973,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lacroix" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "lacroix"; + version = "0.1.0.0"; + sha256 = "0d65dqvbfrrvgdnagjyiq8xf7635rd46wda722g85dxzxr1l7mbn"; + libraryHaskellDepends = [ base ]; + description = "fizzy n dizzy"; + license = stdenv.lib.licenses.mit; + }) {}; + "lagrangian" = callPackage ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -126382,14 +126883,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-c_0_8" = callPackage + "language-c_0_8_1" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers, deepseq , directory, filepath, happy, pretty, process, syb }: mkDerivation { pname = "language-c"; - version = "0.8"; - sha256 = "0ms0hfg65d7phfr2dq6183vcbmq9ddpvmlqbs8nwbqhqvcdpfl4w"; + version = "0.8.1"; + sha256 = "0sdkjj0hq8p69fcdm6ljbjkjvrsrb8a6rl5dq6dj6byj32ajrm3d"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath pretty process syb @@ -126565,15 +127066,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "language-docker_6_0_0" = callPackage + "language-docker_6_0_1" = 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 = "6.0.0"; - sha256 = "0b3m6vzfhypwqnlwdy1b1cx6dfca0rcq2m4zivd608ny2ii22ajv"; + version = "6.0.1"; + sha256 = "01dfs90300h03mlwn05a7k2gsffyxxkjypyykbnc9ky2cx6vwfax"; libraryHaskellDepends = [ base bytestring containers free megaparsec mtl prettyprinter split template-haskell text th-lift time @@ -126761,6 +127262,8 @@ self: { pname = "language-glsl"; version = "0.2.1"; sha256 = "08hrl9s8640a61npdshjrw5q3j3b2gvms846cf832j0n19mi24h0"; + revision = "1"; + editedCabalFile = "1dlax6dfjc8ca0p5an3k1f29b078hgb44aj48njf97shvl9hqf5v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec prettyclass ]; @@ -127725,6 +128228,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lawful" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "lawful"; + version = "0.1.0.0"; + sha256 = "014drjks30wij31fm371q5d8m6x3fpf3z52dim6zmxxv0r0pjmh0"; + libraryHaskellDepends = [ base ]; + description = "Assert the lawfulness of your typeclass instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lawless-concurrent-machines" = callPackage ({ mkDerivation, async, base, containers, lifted-async, machines , monad-control, semigroups, tasty, tasty-hunit, time, transformers @@ -127765,8 +128279,8 @@ self: { }: mkDerivation { pname = "layered-state"; - version = "1.1.3"; - sha256 = "01pi8bslw7pmd3cm7jxxs500i35ny2lbaqi0hnl2a7kzjjxfrs6s"; + version = "1.1.4"; + sha256 = "06mwkz6816nkwlsc51hfx0y67dhf42rkib165xag7kga7843idxa"; libraryHaskellDepends = [ base constraints data-default exceptions lens lens-utils monad-branch monoid mtl primitive profunctors prologue transformers @@ -128606,8 +129120,8 @@ self: { pname = "lens-aeson"; version = "1.0.2"; sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3"; - revision = "4"; - editedCabalFile = "1gas30rarvr8337a06z089m3dp5kvdcvhyac2mrp5pjlfp4zz226"; + revision = "5"; + editedCabalFile = "0z6ib6kndbk5dgzlacmdlsdjrrazj9hwnkk9ldc6flgq15ba74nr"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text @@ -129040,22 +129554,6 @@ self: { }) {}; "lexer-applicative" = callPackage - ({ mkDerivation, base, deepseq, regex-applicative, srcloc, tasty - , tasty-hunit - }: - mkDerivation { - pname = "lexer-applicative"; - version = "2.1.0.1"; - sha256 = "1754rimbj7jdhdhc3ql5ks5mccqip4l6cffkw2bzjw3x1s0155iy"; - libraryHaskellDepends = [ base regex-applicative srcloc ]; - testHaskellDepends = [ - base deepseq regex-applicative srcloc tasty tasty-hunit - ]; - description = "Simple lexer based on applicative regular expressions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "lexer-applicative_2_1_0_2" = callPackage ({ mkDerivation, base, deepseq, regex-applicative, srcloc, tasty , tasty-hunit }: @@ -129069,7 +129567,6 @@ self: { ]; description = "Simple lexer based on applicative regular expressions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lfst" = callPackage @@ -129783,8 +130280,10 @@ self: { }: mkDerivation { pname = "libstackexchange"; - version = "0.3.0.0"; - sha256 = "00v8hmk67dsb0j1bncc06fh46jkz4raf5a796l223mg6x0l3a828"; + version = "0.3.1"; + sha256 = "1fj5pf1hjl749pbx54p1sja8m7k99bd0ijyyzxh3dygxx06inc6i"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers data-default http-conduit profunctors text @@ -130687,6 +131186,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lines-of-action" = callPackage + ({ mkDerivation, base, containers, mtl, safe }: + mkDerivation { + pname = "lines-of-action"; + version = "0.0.0"; + sha256 = "0m047q5x6lqgmw3kfai24jk8x44vib4xmflz7n2xq7b791k1fkrg"; + libraryHaskellDepends = [ base containers mtl safe ]; + description = "Lines of Action, 2-player strategy board game"; + license = stdenv.lib.licenses.mit; + }) {}; + "linguistic-ordinals" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -131928,16 +132438,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {llvm-config = null;}; - "llvm-hs_6_2_0" = callPackage + "llvm-hs_6_3_0" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal , containers, exceptions, llvm-config, llvm-hs-pure, mtl - , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, transformers, utf8-string + , pretty-show, process, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, transformers + , utf8-string }: mkDerivation { pname = "llvm-hs"; - version = "6.2.0"; - sha256 = "1s7n0sansq1mhs6dibp3ikkpn3n0h6cw2ja5m36nphjmzn47dvrk"; + version = "6.3.0"; + sha256 = "10v13f0pcsjaz7lhpg5wr520qp9rgajbv5c3pqx4v79nmfv797jd"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure @@ -131945,8 +132456,9 @@ self: { ]; libraryToolDepends = [ llvm-config ]; testHaskellDepends = [ - base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck - tasty tasty-hunit tasty-quickcheck temporary transformers + base bytestring containers llvm-hs-pure mtl pretty-show process + QuickCheck tasty tasty-hunit tasty-quickcheck temporary + transformers ]; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; @@ -131995,15 +132507,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "llvm-hs-pure_6_2_0" = callPackage + "llvm-hs-pure_6_2_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, fail , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell , transformers, unordered-containers }: mkDerivation { pname = "llvm-hs-pure"; - version = "6.2.0"; - sha256 = "1qqwhq9mjlgpyy5h8wnk1zg8y16c229397fslxyyz3bjqg5a0ghv"; + version = "6.2.1"; + sha256 = "1a9xzg6q4gd6j7dkvpkqpnrmh8y1fabllpjbh0m181v1c52aj23r"; libraryHaskellDepends = [ attoparsec base bytestring containers fail mtl template-haskell transformers unordered-containers @@ -133953,10 +134465,8 @@ self: { ({ mkDerivation, base, colonnade, lucid, text }: mkDerivation { pname = "lucid-colonnade"; - version = "1.0"; - sha256 = "13jb1vh2pxz1w2ycswdmyhr05c00i0x30agcwf93i359rwzcmbmc"; - revision = "1"; - editedCabalFile = "08zcksc8pd7sh4z78i80rinlmr3mghhclhcqn8kdkgv4p7ynldlv"; + version = "1.0.1"; + sha256 = "0gbpfh1ky5pq0f0rz619hxfgll4yj0ky056dvrvq0s741l3gnhv8"; libraryHaskellDepends = [ base colonnade lucid text ]; description = "Helper functions for using lucid with colonnade"; license = stdenv.lib.licenses.bsd3; @@ -136060,24 +136570,6 @@ self: { }) {}; "markup" = callPackage - ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup - , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl - , path-extra, resourcet, text, transformers-base, urlpath - }: - mkDerivation { - pname = "markup"; - version = "4.0.4"; - sha256 = "1brk619d2abryvwyw9pj7g4axs1rc6p51cf4yf5q1p6f0zvi2dyb"; - libraryHaskellDepends = [ - attoparsec-uri base blaze-html blaze-markup clay comonad lucid - mmorph monad-control monad-logger mtl path-extra resourcet text - transformers-base urlpath - ]; - description = "Abstraction for HTML-embedded content"; - license = stdenv.lib.licenses.mit; - }) {}; - - "markup_4_2_0" = callPackage ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl , path, path-extra, resourcet, text, transformers-base, urlpath @@ -136093,7 +136585,6 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -136317,8 +136808,8 @@ self: { }: mkDerivation { pname = "massiv-io"; - version = "0.1.3.0"; - sha256 = "08jngww0ki28d2mhfj9vw4rlxigzzvgb295k5fnj0cr7xmhr48zx"; + version = "0.1.4.0"; + sha256 = "0yah1g7cm959kzzlqkgbzrx5aswd697518v89z7r5380f6hqq4cc"; libraryHaskellDepends = [ base bytestring data-default deepseq directory filepath JuicyPixels massiv netpbm process vector @@ -136620,8 +137111,8 @@ self: { }: mkDerivation { pname = "matrix-as-xyz"; - version = "0.1.1.0"; - sha256 = "0ckirpbflr69a51k21nfak74d5r4jxra2sl4ys2gyicjm77b5a3s"; + version = "0.1.1.1"; + sha256 = "1hca54xrd0ia4vcqpgkjn65qgk35rzrs3hjl6d758dj3gshq30xp"; libraryHaskellDepends = [ base hspec matrix parsec QuickCheck ]; testHaskellDepends = [ base doctest hspec matrix parsec QuickCheck @@ -136999,8 +137490,8 @@ self: { }: mkDerivation { pname = "mbug"; - version = "1.0"; - sha256 = "1bz8bwmapxssgs1j98xvad47185i81sqkydjf6r7329c4sn5gipv"; + version = "1.1"; + sha256 = "1chz9za1zbdw1awm252img4krmya1zq3jb4alrsplf2ijb2c80ls"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138519,6 +139010,8 @@ self: { pname = "microlens-aeson"; version = "2.3.0"; sha256 = "1iahlh505jrlpd9ndkr5asfnzdpp6m6m2lm44ds15461py485wpj"; + revision = "1"; + editedCabalFile = "0nzkdmdfvamhn24lhvg9gjda2rpv8iv7jab0r6drmpk33rxs613s"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable microlens scientific text unordered-containers vector @@ -138724,8 +139217,8 @@ self: { pname = "microstache"; version = "1.0.1.1"; sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax"; - revision = "1"; - editedCabalFile = "1var5mgzvkxl9s78hbxylkvv67z7fnbs5rb1l9q0cqxyw85cbr6j"; + revision = "2"; + editedCabalFile = "0rl6vgmjnf1a14kiynh4gnmy6n6kkik9hqj9k5vqw68h4f110i4b"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -139772,7 +140265,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mltool_0_2_0_0" = callPackage + "mltool_0_2_0_1" = callPackage ({ mkDerivation, ascii-progress, base, deepseq, hmatrix , hmatrix-gsl, hmatrix-morpheus, HUnit, MonadRandom, random , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -139780,8 +140273,8 @@ self: { }: mkDerivation { pname = "mltool"; - version = "0.2.0.0"; - sha256 = "0yjq9wbvni9sgh966jccfcsm6ajicrfkgvwg08383rwnsqbbjm8q"; + version = "0.2.0.1"; + sha256 = "1zz06c0xv718faygnsgzmhg17xc5hrjsj9xkdaf3qmzbr1gwfvki"; libraryHaskellDepends = [ ascii-progress base deepseq hmatrix hmatrix-gsl hmatrix-morpheus MonadRandom random vector @@ -139821,8 +140314,8 @@ self: { pname = "mmark"; version = "0.0.5.6"; sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; - revision = "2"; - editedCabalFile = "0hzz7l9npv364yzw6i6q6699nn1raj1p2cmwmlqp43rz8s3ryawn"; + revision = "3"; + editedCabalFile = "0asb998ch5b33s84ssdps3w7mdlhksmd9c580npg7xkrw60mwjfb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -139848,8 +140341,8 @@ self: { pname = "mmark-cli"; version = "0.0.3.0"; sha256 = "0nb17k23bs21qi7a888qp81w682ax2qvih9fbvdkdh6c2n6yklrp"; - revision = "1"; - editedCabalFile = "0rzz4m7z02m6rmigmmpgqhik1d7kc0i4mri0gpj1i3j7a59p7s1q"; + revision = "2"; + editedCabalFile = "0i3gvfgm4bfbdyflhhaf4gdr7cbkw51i330f25rgha9k3s4v59w3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -140311,8 +140804,8 @@ self: { }: mkDerivation { pname = "mollie-api-haskell"; - version = "0.2.0.0"; - sha256 = "1k2sx65d486dzb9xs2byi3p4ppacj2qjknhqx2kd0020zi7w9s5n"; + version = "0.2.0.1"; + sha256 = "0hyxfa2diqjlcd0x5fxscn8lsmjkwzpvvj04w2n52q5dnm76qacm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-client http-client-openssl @@ -143381,6 +143874,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "multihashmap" = callPackage + ({ mkDerivation, base, hashable, unordered-containers }: + mkDerivation { + pname = "multihashmap"; + version = "0.1.0.0"; + sha256 = "1bripl4vqj275n4wnka7vrdcjyyppbc773pfsbmvfjvl2qqi5jrb"; + libraryHaskellDepends = [ base hashable unordered-containers ]; + description = "hashmap from keys to hashsets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multimap" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -144517,8 +145021,8 @@ self: { pname = "myanimelist-export"; version = "0.2.0.0"; sha256 = "1d9fqna5qavp1lzpsg8yg816m3smybdsx25gafqr9wc2555rj1gg"; - revision = "1"; - editedCabalFile = "1ni5bmhfra2rlxlv55iah865shyibz7bwl2zz6161v4s35bs68dj"; + revision = "2"; + editedCabalFile = "1jws9bhrnhk5j95v7rvnhvc5zmngs7cq2936qjf574azcp2qda5x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147899,8 +148403,8 @@ self: { }: mkDerivation { pname = "nix-diff"; - version = "1.0.2"; - sha256 = "1n1f3p5hamvlc7jhl9m569d8li9kxqwkjmv5nn1mq1n1ldhdlwxj"; + version = "1.0.3"; + sha256 = "1580gqc5jy2zrd62drwzl1i7lcq0r0l653yi9s0c08a7xk5vsz7h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -148389,8 +148893,8 @@ self: { ({ mkDerivation, base, checkers, QuickCheck }: mkDerivation { pname = "non-empty-zipper"; - version = "0.1.0.8"; - sha256 = "0fyq9x0x04pv45v73mkc273ih5kd9ac40psr00zva58n352f9az9"; + version = "0.1.0.9"; + sha256 = "1y1r6058y47g7xy2yknz7fhgx2qbmmxj50zwvyvrrikmrkljr5ba"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base checkers QuickCheck ]; description = "The Zipper for NonEmpty"; @@ -149778,6 +150282,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "observable" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "observable"; + version = "0.1.0"; + sha256 = "1y4rm73dqhdp5nvlqn68v1pkc9lg9wbhd1dx7nn3ckp8m5fv2kh0"; + libraryHaskellDepends = [ base transformers ]; + description = "Make your action to be observable and listen events from them"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "observable-sharing" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -149993,8 +150508,8 @@ self: { }: mkDerivation { pname = "odpic-raw"; - version = "0.2.0"; - sha256 = "0g83ag8ggcwmf82zghzdds990l5hvcfiv85rlj95phb0lpdskj5m"; + version = "0.2.1"; + sha256 = "0py56g2d05b11yw7wi5lmaglixzk63kwlpnnwk3v1vy8daky73w6"; libraryHaskellDepends = [ base conduit monad-control resourcet text time unliftio-core ]; @@ -150006,7 +150521,7 @@ self: { description = "Oracle Database Bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {odpic = null;}; + }) {inherit (pkgs) odpic;}; "oeis" = callPackage ({ mkDerivation, base, HTTP, HUnit, network, network-uri @@ -152090,8 +152605,8 @@ self: { }: mkDerivation { pname = "orgstat"; - version = "0.1.3"; - sha256 = "16vla9aq12hvv1b18j7zl8n1dhr31p4hb361gjfd0b1wf95j81r5"; + version = "0.1.4"; + sha256 = "063iqrxcqj4mxlic934ksrl23alvpwr3q5k2w666sqc02nkmcv88"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153095,6 +153610,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.2.0"; sha256 = "0pydgdpm8fqj4dbv5swbyxkh1bkmqzj3gcas9r04vvzh6mmr22ia"; + revision = "1"; + editedCabalFile = "1x19k4jb8ld8kp4fkcmxj5maw3w3dqv5axh5ay6m6qr5kl77ijgp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -153353,7 +153870,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-types_1_17_4_2" = callPackage + "pandoc-types_1_17_5_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -153361,10 +153878,8 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.17.4.2"; - sha256 = "1jiy4siyfcf4z0m0kn0z58cbrsvggavlxljrcb4srwblih55xqap"; - revision = "1"; - editedCabalFile = "0izgzjfl7l4fb6xd5iqcy5zca4m1vzvr5xqgccw45vkm8q3arqnf"; + version = "1.17.5.1"; + sha256 = "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -153456,13 +153971,13 @@ self: { }: mkDerivation { pname = "pangraph"; - version = "0.1.1.5"; - sha256 = "0p03sm5sna88h1j7gxkwdq0j5zhak38spqyhjlwc2vsrxjc4vjiy"; + version = "0.1.2"; + sha256 = "03iqf77j7a382m7zwkgh872frbii98l04agh6sr4ic96554b0gzl"; libraryHaskellDepends = [ algebraic-graphs base bytestring containers hexml ]; testHaskellDepends = [ base bytestring containers HUnit ]; - description = "A set of parsers for graph languages"; + description = "A set of parsers for graph languages and conversions to graph libaries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -156717,6 +157232,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-migration" = callPackage + ({ mkDerivation, base, bytestring, conduit, containers, exceptions + , fgl, monad-logger, mtl, persistent, persistent-postgresql + , persistent-template, process, QuickCheck, resource-pool, tasty + , tasty-golden, tasty-quickcheck, temporary, text, time + , unordered-containers, yaml + }: + mkDerivation { + pname = "persistent-migration"; + version = "0.0.2"; + sha256 = "0vnc2jiagb2z11dy428fd47zhixw7ib96aras0lvhjbwyldzic5p"; + libraryHaskellDepends = [ + base containers fgl mtl persistent text time unordered-containers + ]; + testHaskellDepends = [ + base bytestring conduit containers exceptions monad-logger mtl + persistent persistent-postgresql persistent-template process + QuickCheck resource-pool tasty tasty-golden tasty-quickcheck + temporary text yaml + ]; + description = "Manual migrations for the persistent library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persistent-mongoDB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal , conduit, containers, http-api-data, mongoDB, network, path-pieces @@ -156989,8 +157528,8 @@ self: { pname = "persistent-template"; version = "2.5.4"; sha256 = "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc"; - revision = "1"; - editedCabalFile = "18mjv4z29cbrqjrsk2gm4bbc988437v8zxc5dynhj99fzjxzs9yr"; + revision = "2"; + editedCabalFile = "03qgwk32krldph3blw5agiqcpccr3649hajyn8wm9k71zz82dpn6"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -157939,8 +158478,8 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "pidfile"; - version = "0.1.0.2"; - sha256 = "1iriansay0vq1b6crd1gc86ghv6iqcrnpflsa5b22x1lrlvxcwmj"; + version = "0.1.0.3"; + sha256 = "12m477kinanyxi5612wz0n72qb0cymjb2x9pp0ggsngfpkqzp1j6"; libraryHaskellDepends = [ base unix ]; description = "Run an IO action protected by a pidfile"; license = stdenv.lib.licenses.bsd3; @@ -158065,6 +158604,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pinch_0_3_3_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, semigroups + , text, unordered-containers, vector + }: + mkDerivation { + pname = "pinch"; + version = "0.3.3.0"; + sha256 = "0bhds7k9bsma1bvihvz6qf832gi2krak3yd8lnddcv87hnjsr4hq"; + libraryHaskellDepends = [ + array base bytestring containers deepseq ghc-prim hashable + semigroups text unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers hspec hspec-discover QuickCheck + semigroups text unordered-containers vector + ]; + description = "An alternative implementation of Thrift for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pinchot" = callPackage ({ mkDerivation, base, containers, Earley, lens, pretty-show , semigroups, template-haskell, transformers @@ -160038,8 +160599,8 @@ self: { ({ mkDerivation, base, bytestring, containers, hspec }: mkDerivation { pname = "plural"; - version = "0.0.2"; - sha256 = "1f35w7rzwq6f1zzdpglij41ra8pwyzjklv2pbnpmbp9q6rpi836p"; + version = "0.1.0.0"; + sha256 = "0amzsa5sf2jdrxmsizl38h1452qqd5fby3c451h0b9zpraxj1fbd"; libraryHaskellDepends = [ base bytestring containers ]; testHaskellDepends = [ base hspec ]; description = "Pluralize"; @@ -161940,8 +162501,8 @@ self: { }: mkDerivation { pname = "postmark-streams"; - version = "0.1.0.1"; - sha256 = "16ag5jghbvz6gialpcpy491x63cq2z7kwrh9ahy8z2ryilcp64vi"; + version = "0.1.0.2"; + sha256 = "00d6rnijlr2095nd1d0vqgbsy5k8w6admi2bn69vdmj39cahgca2"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring binary bytestring http-streams io-streams text time @@ -161984,25 +162545,12 @@ self: { }) {}; "potoki" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bytestring - , directory, foldl, hashable, potoki-core, profunctors, ptr - , QuickCheck, quickcheck-instances, random, rerebase, tasty - , tasty-hunit, tasty-quickcheck, text, transformers, unagi-chan - , unordered-containers, vector - }: + ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "0.11.3"; - sha256 = "134wy711qnkrwa9c78d7lv8vnc3b5a2dqyslzvs59xqx4csh61xj"; - libraryHaskellDepends = [ - attoparsec base base-prelude bytestring directory foldl hashable - potoki-core profunctors ptr text transformers unagi-chan - unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec QuickCheck quickcheck-instances random rerebase tasty - tasty-hunit tasty-quickcheck - ]; + version = "2"; + sha256 = "17w7i1glzn2kvq61f1f9xcfz7z7hmwzjl08xh32hp6nir21ycmq5"; + libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -163131,6 +163679,31 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter_1_2_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck + , random, tasty, tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "prettyprinter"; + version = "1.2.1"; + sha256 = "1kvza7jp5n833m8rj0bc35bd2p8wx3fq0iqflm9nbh3wm05kwrg7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring doctest pgp-wordlist tasty tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base containers criterion deepseq mtl QuickCheck + random text transformers + ]; + description = "A modern, easy to use, well-documented, extensible pretty-printer"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-ansi-terminal" = callPackage ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text }: @@ -163336,18 +163909,6 @@ self: { }) {}; "primitive" = callPackage - ({ mkDerivation, base, ghc-prim, transformers }: - mkDerivation { - pname = "primitive"; - version = "0.6.3.0"; - sha256 = "0mcmbnj08wd6zfwn7xk6zf5hy5zwbla5v78pw0dpymqg9s0gzpnd"; - libraryHaskellDepends = [ base ghc-prim transformers ]; - testHaskellDepends = [ base ghc-prim ]; - description = "Primitive memory-related operations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "primitive_0_6_4_0" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; @@ -163356,7 +163917,6 @@ self: { libraryHaskellDepends = [ base ghc-prim transformers ]; description = "Primitive memory-related operations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primitive-checked" = callPackage @@ -163370,6 +163930,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive-containers" = callPackage + ({ mkDerivation, base, containers, contiguous, gauge, ghc-prim + , primitive, primitive-sort, QuickCheck, quickcheck-classes, random + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "primitive-containers"; + version = "0.2.0"; + sha256 = "11q0dvlsdabmsjsr0gznr8ndx1fyvbvv8jxfszj6na8jhrz7x84b"; + libraryHaskellDepends = [ + base contiguous primitive primitive-sort + ]; + testHaskellDepends = [ + base containers primitive QuickCheck quickcheck-classes tasty + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base containers gauge ghc-prim primitive random + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "primitive-indexed" = callPackage + ({ mkDerivation, base, doctest, primitive, QuickCheck }: + mkDerivation { + pname = "primitive-indexed"; + version = "0.1.0.0"; + sha256 = "0sbn3h426i6i609iyybar10lywpsklgfkzp355cg8dpfp4a3ibsf"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base doctest QuickCheck ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primitive-simd" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, primitive , random, vector @@ -163394,6 +163987,8 @@ self: { pname = "primitive-sort"; version = "0.1.0.0"; sha256 = "147y4y8v00yggfgyf70kzd3pd9r6jvgxkzjsy3xpbp6mjdnzrbm3"; + revision = "1"; + editedCabalFile = "0b148bc30nbfrmdx1k7d4ky6k129w8vy146di90v9q12rvsdaz8w"; libraryHaskellDepends = [ base contiguous ghc-prim primitive ]; testHaskellDepends = [ base containers doctest HUnit primitive QuickCheck smallcheck tasty @@ -165944,8 +166539,8 @@ self: { }: mkDerivation { pname = "purescript-tsd-gen"; - version = "0.1.0.0"; - sha256 = "0wnj2gvibwcdpbwz9hbn773ircp8rm85klb318933s27fl2z0zfb"; + version = "0.2.0.0"; + sha256 = "1l00xyz501gaig3fci9dyz28qdd2zdajzfwnp6hj17c46g8g95f6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166008,8 +166603,8 @@ self: { }: mkDerivation { pname = "push-notify-apn"; - version = "0.1.0.7"; - sha256 = "1rkd7vr2l5136jv1afknqvg6lgvny5wdadh3fcy2k5phihmv9qfd"; + version = "0.1.0.8"; + sha256 = "1077sgc2fhaf99y7p09638bx3w1xlayg2jsf0sf2g85rc6j971nd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167221,30 +167816,14 @@ self: { }) {}; "quickcheck-classes" = callPackage - ({ mkDerivation, aeson, base, containers, prim-array, primitive - , QuickCheck, transformers, vector - }: - mkDerivation { - pname = "quickcheck-classes"; - version = "0.3.3"; - sha256 = "1czppkc56ny7nvfc11wdv96gng4vln7bkx87sgwlpdkw0q73rc14"; - libraryHaskellDepends = [ - aeson base containers prim-array primitive QuickCheck transformers - ]; - testHaskellDepends = [ aeson base primitive QuickCheck vector ]; - description = "QuickCheck common typeclasses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-classes_0_4_11_1" = callPackage ({ mkDerivation, aeson, base, bifunctors, containers, primitive , QuickCheck, semigroupoids, semigroups, semirings, tagged , transformers, vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.4.11.1"; - sha256 = "1x75fm8axvxdvqds93df1cgb3gp047d4n3yr6ydwsl6xhvmb023g"; + version = "0.4.12"; + sha256 = "1gnzaw5vvn5xk6h9zjvdjicxq35ppwvrs87fys1lk51c402npvz7"; libraryHaskellDepends = [ aeson base bifunctors containers primitive QuickCheck semigroupoids semigroups semirings tagged transformers @@ -167254,7 +167833,6 @@ self: { ]; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-combinators" = callPackage @@ -167268,6 +167846,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-combinators_0_0_4" = callPackage + ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: + mkDerivation { + pname = "quickcheck-combinators"; + version = "0.0.4"; + sha256 = "0i5hv58b8vgqbmwb7j8c9xr6qv0v5n2zjh3a9rab8x6hsdlb0mvv"; + libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; + description = "Simple type-level combinators for augmenting QuickCheck instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-instances" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , case-insensitive, containers, hashable, old-time, QuickCheck @@ -167431,17 +168021,6 @@ self: { }) {}; "quickcheck-simple" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "quickcheck-simple"; - version = "0.1.0.3"; - sha256 = "08f87mqnm04sgi21q5snvr4li3zm4m86jydc3s4b71i9czy4q8wg"; - libraryHaskellDepends = [ base QuickCheck ]; - description = "Test properties and default-mains for QuickCheck"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-simple_0_1_0_4" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-simple"; @@ -167450,7 +168029,6 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; description = "Test properties and default-mains for QuickCheck"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-special" = callPackage @@ -169276,8 +169854,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "4.1.0"; - sha256 = "1skamrpkz8p9i19anyp0lqcncsa1zwzcikcxlm3gmrgqf2hq0m0i"; + version = "4.1.1"; + sha256 = "1wwglqr84ijzrbsrid5cfhm96ljnfdj59z766wjbr8fx5gmrcdfw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169850,8 +170428,8 @@ self: { }: mkDerivation { pname = "reactive-banana-gi-gtk"; - version = "0.2.0.0"; - sha256 = "05gnxhxnf9s7zxmmda52f36sk3d8rh6cbh1ibxv28gz814v1ps4a"; + version = "0.3.0.0"; + sha256 = "1kcn95p2k4lb5xr0q4ag53gkym6dyz6hxsshm05pxf8778hm9c6f"; libraryHaskellDepends = [ base gi-gtk haskell-gi-base reactive-banana text transformers ]; @@ -172283,8 +172861,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.6.6.1"; - sha256 = "1aa4bjkv9i2an2igfdc0rvq2hmd6wv5zfgcbgw32y3qmy0zb3v2g"; + version = "0.6.7.0"; + sha256 = "1g10z6076lrlal3ismvz4q4pxpawy749zwxpyvvfdhld2qqhg74c"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record product-isomorphic relational-query @@ -172295,22 +172873,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query-HDBC_0_6_7_0" = callPackage + "relational-query-HDBC_0_6_7_1" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic - , relational-query, relational-schemas, sql-words, template-haskell - , th-data-compat, transformers + , QuickCheck, quickcheck-simple, relational-query + , relational-schemas, sql-words, template-haskell, th-data-compat + , transformers }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.6.7.0"; - sha256 = "1g10z6076lrlal3ismvz4q4pxpawy749zwxpyvvfdhld2qqhg74c"; + version = "0.6.7.1"; + sha256 = "011zvhwkdl7py1mdb5n65zc98xdfm013lpqc2kd37v9pvn11g28s"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record product-isomorphic relational-query relational-schemas sql-words template-haskell th-data-compat transformers ]; + testHaskellDepends = [ + base convertible HDBC QuickCheck quickcheck-simple + ]; description = "HDBC instance of relational-query and typed query interface for HDBC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -173226,6 +173808,8 @@ self: { pname = "req"; version = "1.1.0"; sha256 = "08jfq1fsqd57l7csw4fg22wppq06wddh8qxxms5z6bay55nqikc7"; + revision = "1"; + editedCabalFile = "1qb458sldda1msrx8hyp31a5ybny2kdymsxhmsyk9i9c5gk0qqib"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -173404,6 +173988,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reroute_0_5_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, graph-core, hashable + , hspec, http-api-data, hvect, mtl, random, regex-compat, text + , unordered-containers, vector + }: + mkDerivation { + pname = "reroute"; + version = "0.5.0.0"; + sha256 = "1wl7g4z37rwghckwpi34qgg5b3rdy9h1zyf8dcgrm6hdfaabp65r"; + libraryHaskellDepends = [ + base deepseq hashable http-api-data hvect mtl text + unordered-containers + ]; + testHaskellDepends = [ + base hspec hvect mtl text unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq graph-core hashable http-api-data hvect mtl + random regex-compat text unordered-containers vector + ]; + description = "abstract implementation of typed and untyped web routing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reserve" = callPackage ({ mkDerivation, base, base-compat, bytestring, directory, hspec , http-conduit, http-kit, http-types, network, process, QuickCheck @@ -176344,8 +176953,8 @@ self: { ({ mkDerivation, base, HUnit, parsec, s-cargot, text }: mkDerivation { pname = "s-cargot-letbind"; - version = "0.2.2.0"; - sha256 = "0yv15kqfx21qwrm4i7rkwb1iybx27314f86xqbf2yyh4ala35wr1"; + version = "0.2.3.0"; + sha256 = "1fl7a9cny1l6swxyaw4x1izl2l6rxha6zz2k1bjw1ldwzhsrip83"; libraryHaskellDepends = [ base s-cargot text ]; testHaskellDepends = [ base HUnit parsec s-cargot text ]; description = "Enables let-binding and let-expansion for s-cargot defined S-expressions"; @@ -178246,8 +178855,8 @@ self: { pname = "scotty"; version = "0.11.1"; sha256 = "1xcdfx43v1p2a20jjmnb70v2sm34iprn17ssa81fcfnabcn4blhw"; - revision = "1"; - editedCabalFile = "0msb0ydgga07gicchs8k0f7d35gp18vrin649q6yqah75l5i2f9x"; + revision = "2"; + editedCabalFile = "10h2h1pxndxlfp6hal5p22159cpybdvnhxq13xn2k8q859imylx1"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types monad-control mtl @@ -179592,6 +180201,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "semilattices" = callPackage + ({ mkDerivation, base, containers, doctest, hashable, QuickCheck + , quickcheck-instances, unordered-containers + }: + mkDerivation { + pname = "semilattices"; + version = "0.0.0.1"; + sha256 = "0yqqww2mqspbhgkmzrkvljjkwfyi8iqndy8bm1c4sfmrza1h1byx"; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + testHaskellDepends = [ + base doctest QuickCheck quickcheck-instances + ]; + description = "Semilattices"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "semiring" = callPackage ({ mkDerivation, base, Boolean, containers, monoids }: mkDerivation { @@ -179801,7 +180428,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sensu-run_0_5_0_1" = callPackage + "sensu-run_0_5_0_2" = callPackage ({ mkDerivation, aeson, async, base, bytestring, filepath , http-client, http-client-tls, http-types, lens, network , optparse-applicative, process, temporary, text, time, unix @@ -179809,8 +180436,8 @@ self: { }: mkDerivation { pname = "sensu-run"; - version = "0.5.0.1"; - sha256 = "1kxdndaimwgj9mjjhb5z8kb36k4awby8a3h1dpghvas1l64i5dfl"; + version = "0.5.0.2"; + sha256 = "0m8fdi2mca536qycz3kyicdxrwqyds9fb3dlv7xqzkj3694a7wj1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -180320,6 +180947,8 @@ self: { pname = "servant"; version = "0.13.0.1"; sha256 = "0vfypxdhz1yqkj6ini41ylas91jklvn05rrnarp4d57rli498jx7"; + revision = "1"; + editedCabalFile = "0c5j8y6x9andar2zlqr2z4b8j1m3ss5qd4shias4z86mssmfgxp6"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive @@ -180784,8 +181413,8 @@ self: { pname = "servant-client"; version = "0.13.0.1"; sha256 = "120qs135arlby811p9z6zqjyrhsm517dq1xq41x3s2f167zkd7q8"; - revision = "1"; - editedCabalFile = "12iac58pgx5w20x0v6l5ikxxapgl0ql0c91hyv8vcw8mbrjq2qpv"; + revision = "2"; + editedCabalFile = "1pi7nvgylx4qvzswc31slyr2zj09hgajkac7f6lw66ba3h9rhmd5"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions http-client http-client-tls http-media http-types monad-control mtl @@ -180883,6 +181512,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-dhall" = callPackage + ({ mkDerivation, base, base-compat, bytestring, dhall, formatting + , http-media, megaparsec, prettyprinter, servant, servant-server + , text, wai, warp + }: + mkDerivation { + pname = "servant-dhall"; + version = "0.1"; + sha256 = "12rr4xknj44ynswzpx11dgymki86gfhhs2gcg0pjfg9w0k416mi9"; + libraryHaskellDepends = [ + base base-compat bytestring dhall formatting http-media megaparsec + prettyprinter servant text + ]; + testHaskellDepends = [ + base base-compat bytestring dhall http-media servant servant-server + wai warp + ]; + description = "Servant Dhall content-type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-docs" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , case-insensitive, control-monad-omega, hashable, hspec @@ -180893,8 +181543,8 @@ self: { pname = "servant-docs"; version = "0.11.2"; sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b"; - revision = "2"; - editedCabalFile = "17nv36pm0vv0lgfyk5ay65h7i5bdfq48n0npawcvmqfjsls61xs4"; + revision = "3"; + editedCabalFile = "16hbrgp5r6mjhcncz8y2gq8q6z3h2b9sl0fzl0yi0w0vp7whgpm5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181390,6 +182040,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-nix" = callPackage + ({ mkDerivation, base, bytestring, hnix, http-client, http-media + , servant, servant-client, servant-server, text, wai, warp + }: + mkDerivation { + pname = "servant-nix"; + version = "0.1"; + sha256 = "1bg2pxfq5g4imppsn9snlw2mzl8qrdr1hpxk7pppwp9cpcy3bsvg"; + libraryHaskellDepends = [ + base bytestring hnix http-media servant text + ]; + testHaskellDepends = [ + base hnix http-client servant servant-client servant-server wai + warp + ]; + description = "Servant Nix content-type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-options" = callPackage ({ mkDerivation, base, bytestring, http-types, servant-foreign , servant-server, text, wai @@ -181697,8 +182366,8 @@ self: { pname = "servant-server"; version = "0.13.0.1"; sha256 = "0fggdqz2d6q96x8vnm64yvarg4fgxqh0jd3vis6yxpybfi174arm"; - revision = "1"; - editedCabalFile = "102w8rbl7hrm3gqsdzk1g794vssvn1c89h5d2j0hqkc587qws0nd"; + revision = "2"; + editedCabalFile = "16bllcaqpcj6i53vl1sas1f6m85i6ah7qcn5mh8x515qmfzngisp"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -181921,8 +182590,8 @@ self: { pname = "servant-swagger"; version = "1.1.5"; sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg"; - revision = "1"; - editedCabalFile = "005b3z7wxcrad8210yw3qsndh3zh0v2h8j50qxl8sj1l6wqb7zs6"; + revision = "2"; + editedCabalFile = "1q45dgawmi46q9ps2z7y7kbwvl8pjbzq58s7jzrh096aaiv5141a"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers @@ -182229,8 +182898,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.5.2"; - sha256 = "1nsxc9kif57fvr6j1pp116llbmyb1ngvzgndcfjwvdbscl23jfwg"; + version = "0.6.0"; + sha256 = "0vwvgncayp0wknycg1d3w2dx5nhr4dik9vkcc4mcxw9p479llx5r"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -182783,16 +183452,16 @@ self: { "sexp-grammar" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , criterion, deepseq, happy, invertible-grammar, prettyprinter - , QuickCheck, recursion-schemes, scientific, semigroups, split - , tasty, tasty-hunit, tasty-quickcheck, text, utf8-string + , QuickCheck, recursion-schemes, scientific, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, utf8-string }: mkDerivation { pname = "sexp-grammar"; - version = "2.0.0"; - sha256 = "1wf9mrmz89kcvrkyif5mp0wwqxgg363f3jc7y9sf370qc4frm68p"; + version = "2.0.1"; + sha256 = "0znzxih07yhm0gjbwzm3gdvmrjm2676g7sqjicawc86fwww1rgms"; libraryHaskellDepends = [ array base bytestring containers deepseq invertible-grammar - prettyprinter recursion-schemes scientific semigroups split text + prettyprinter recursion-schemes scientific semigroups text utf8-string ]; libraryToolDepends = [ alex happy ]; @@ -183135,10 +183804,10 @@ self: { }: mkDerivation { pname = "shake-cabal"; - version = "0.1.0.0"; - sha256 = "1zxxfjfklwnarzvdyq9n221n5aygq253xcr3hly54mrvalq337bb"; - revision = "2"; - editedCabalFile = "02hzlwp75i2vmvk8inaasnpgpy89a00xbawp6p4p5fg07czx3fap"; + version = "0.1.0.1"; + sha256 = "1x7bz1qzm1sfnz7f9zhwinzpyghj0yj8x2hag0p3ay8g6s2wxbs4"; + revision = "1"; + editedCabalFile = "1lvs3z5r37pswaanyg0an2zrys8lmjq4s22dbw6283rbxw4vjcvc"; libraryHaskellDepends = [ base Cabal composition-prelude directory shake ]; @@ -184211,6 +184880,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "show-prettyprint_0_2_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter + , trifecta + }: + mkDerivation { + pname = "show-prettyprint"; + version = "0.2.2"; + sha256 = "0mdgx484vgf2lif4a58vm8yl8zghxh0533038r76l5xlkc5qczgh"; + libraryHaskellDepends = [ + ansi-wl-pprint base prettyprinter trifecta + ]; + testHaskellDepends = [ base doctest ]; + description = "Robust prettyprinter for output of auto-generated Show instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "show-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -185692,8 +186378,8 @@ self: { }: mkDerivation { pname = "siphon"; - version = "0.8.0"; - sha256 = "1ssjbpl4vdx7z2gbl3xywlljk8iq25kaqgcsryigsmx9mgv7194q"; + version = "0.8.1"; + sha256 = "0f0i6clnlzkmks7l7pjxyvv2xq7lcd45fmdpzr7xqfwdn17mq6sx"; libraryHaskellDepends = [ attoparsec base bytestring colonnade streaming text transformers vector @@ -186134,7 +186820,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_7_1" = callPackage + "skylighting_0_7_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, directory, filepath, hxt @@ -186143,8 +186829,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.7.1"; - sha256 = "0x7mn1dn6hsqwvcq6l3yx74g5lpq1zwh96mba9h24xsw0zqd9g60"; + version = "0.7.2"; + sha256 = "1rh3z1a7a4clvksdw1qlpmhxqkfahwypi70k91whgfamzsqpxdch"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186168,8 +186854,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.7.1"; - sha256 = "0gkjv36cbqyzvxvqfjdz816901x949zjmyasrvgwwlyvahsj5zjg"; + version = "0.7.2"; + sha256 = "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186312,6 +186998,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "slack-web_0_2_0_5" = 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.5"; + sha256 = "1bplhq3qd4hssp6s6710fgxdbmwm0gknsgs0p4n3hz3w30rp6b56"; + 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; + }) {}; + "slate" = callPackage ({ mkDerivation, base, directory, filepath, htoml , optparse-applicative, process, string-conversions @@ -186503,8 +187213,8 @@ self: { pname = "slug"; version = "0.1.7"; sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp"; - revision = "3"; - editedCabalFile = "1kqaqhg8bkrkax41pbi18612s0m9w2324n5akn5nhmxq0zla73vh"; + revision = "4"; + editedCabalFile = "18h2wl2a3bb9094yq9dp6sjschb75ki4zlp1vrfzkpsrwb4v3ndr"; libraryHaskellDepends = [ aeson base exceptions http-api-data path-pieces persistent QuickCheck text @@ -186798,6 +187508,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smoothie_0_4_2_9" = callPackage + ({ mkDerivation, aeson, base, linear, text, vector }: + mkDerivation { + pname = "smoothie"; + version = "0.4.2.9"; + sha256 = "0kra42nh86dfp66ngr4bmb8d530nh7b9pra1vlykc0sx9b1zpjnk"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ aeson base linear text vector ]; + description = "Smooth curves via several interpolation modes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "smsaero" = callPackage ({ mkDerivation, aeson, base, containers, http-api-data , http-client, servant, servant-client, servant-docs, text, time @@ -187293,8 +188016,8 @@ self: { }: mkDerivation { pname = "snap-language"; - version = "0.1.0.3"; - sha256 = "18nw841pl2ba1ms3gksd9m928ihkhrh9553jq616sf22gwg7ykjh"; + version = "0.1.0.4"; + sha256 = "144l44s587hizsxkh38bqrabyjndwacipklsg30hiwk8cdhqa8f4"; libraryHaskellDepends = [ attoparsec base bytestring containers snap-core ]; @@ -189162,8 +189885,8 @@ self: { ({ mkDerivation, base, split, WAVE }: mkDerivation { pname = "soundgen"; - version = "0.1.0.0"; - sha256 = "0zlap41i7npx8n8c3wsdhq6mqm5yhidhid1mqn4lq726sa3njanq"; + version = "0.1.0.1"; + sha256 = "0vjl992xsb06ry6bbyi9zbgiyf5117zr5hpdmpjcy9d2g0bzi2q2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base split WAVE ]; @@ -189792,26 +190515,29 @@ self: { }) {}; "speechmatics" = callPackage - ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, hspec - , http-client, http-client-openssl, http-types, json-autotype, lens - , mime-types, monad-logger, mtl, neat-interpolation, options, SHA - , text, wreq + ({ mkDerivation, aeson, base, bytestring, heavy-logger, HsOpenSSL + , hspec, http-client, http-client-openssl, http-types + , json-autotype, lens, mime-types, mtl, neat-interpolation, options + , SHA, text, text-format-heavy, wreq }: mkDerivation { pname = "speechmatics"; - version = "0.5.0.0"; - sha256 = "12hk79wfs935118y1dzzrya9k82jf525scn67ps0s314g8fzpnc0"; + version = "0.7.0.0"; + sha256 = "13rz6h9wxclmbd7zx26f0x3xb6i884k2mrpqczhix3gby6banzpl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring HsOpenSSL http-client http-client-openssl - http-types json-autotype lens mime-types monad-logger mtl text wreq + aeson base bytestring heavy-logger HsOpenSSL http-client + http-client-openssl http-types json-autotype lens mime-types mtl + text text-format-heavy wreq ]; executableHaskellDepends = [ - base bytestring mime-types monad-logger mtl options SHA text + aeson base bytestring heavy-logger mime-types mtl options SHA text + text-format-heavy ]; testHaskellDepends = [ - base bytestring hspec monad-logger mtl neat-interpolation text + base bytestring heavy-logger hspec mtl neat-interpolation text + text-format-heavy ]; description = "Speechmatics api client"; license = stdenv.lib.licenses.bsd3; @@ -190650,6 +191376,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sqlite-simple_0_4_16_0" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only + , semigroups, template-haskell, text, time, transformers + }: + mkDerivation { + pname = "sqlite-simple"; + version = "0.4.16.0"; + sha256 = "1pih3nbfczyb91smci2dg9p1wvjsqiv5f5y97q6vqzlns64a3lk0"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-textual bytestring containers + direct-sqlite Only semigroups template-haskell text time + transformers + ]; + testHaskellDepends = [ + base base16-bytestring bytestring direct-sqlite HUnit text time + ]; + description = "Mid-Level SQLite client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlite-simple-errors" = callPackage ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }: mkDerivation { @@ -191160,8 +191908,8 @@ self: { pname = "stache"; version = "1.2.1"; sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; - revision = "4"; - editedCabalFile = "03qy0mlyiwpv98aq74m3pyarg6v6w9vn8qlq6ljdlb40xi1p9s7z"; + revision = "5"; + editedCabalFile = "0d0zq3k6dnxk0jwmy3vg6j3cd8aarpc1rya0jv25qjzm8kgvcsvq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -195416,8 +196164,8 @@ self: { }: mkDerivation { pname = "summoner"; - version = "1.0.2"; - sha256 = "164mcpcjmbqrpdxaw693394s15f13i8mvxaq7ib7rflavkjdm8qh"; + version = "1.0.3"; + sha256 = "0hyki46wp34rzwdgbn6icr0pmsqg89kwqs7hs76ydi4jzxv5183j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196139,8 +196887,8 @@ self: { pname = "swagger2"; version = "2.2.2"; sha256 = "1jkfmfrldqrfqqnjf0g4spd03w9xjmi35k33xnhsmfj122455lw2"; - revision = "1"; - editedCabalFile = "08rjphysbbiy1zcakgrscv0f3ypxx604dcg6h84jg38azqsf8kff"; + revision = "2"; + editedCabalFile = "1y2d8h2g0iyyi56s7adqgl2n88f1frr16xcfs8y8ayy1jl8c8c9i"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring containers generics-sop @@ -196258,10 +197006,8 @@ self: { }: mkDerivation { pname = "sws"; - version = "0.4.1.0"; - sha256 = "1xcbmwpwp2nvi7adihkddpgi9pkdc7q7ly08vm57r56lcpzvs70p"; - revision = "1"; - editedCabalFile = "1mlyk1959yy4lmx7zsc5iafw1y7vj1d39dndn9as34pqd1rvdk5j"; + version = "0.4.2.0"; + sha256 = "0bwfpw348g167a195f8g4cp3h553hkanm6s67bairhn8qprh8az4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -197725,8 +198471,8 @@ self: { }: mkDerivation { pname = "taffybar"; - version = "2.1.1"; - sha256 = "13bp0ydwb26k8y4f3cn47qy24lwxfx9v7ysm1q0r8iksjg9a6lhk"; + version = "2.1.2"; + sha256 = "10qza0s83kvn8x7nl496xks4f55ndicd59b36qahhavxcyk6v0n4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -198691,12 +199437,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_1_2_0_4" = callPackage + "tasty-dejafu_1_2_0_5" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.2.0.4"; - sha256 = "151cr15l4v1p1zlfps4q3wv26v2mhcnplnnx03lmcq9di21y95yn"; + version = "1.2.0.5"; + sha256 = "1xx72sw7rc4lg1wy5fpfjpxiwqynchlvvcyz4mb7dac6a3rbynf3"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; @@ -198704,32 +199450,6 @@ self: { }) {}; "tasty-discover" = callPackage - ({ mkDerivation, base, containers, directory, filepath, Glob - , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit - , tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "tasty-discover"; - version = "4.2.0"; - sha256 = "19qs3sg28anjjajwvkd79xsh5iip59w6bwphc88sy7gyybq6q586"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filepath Glob - ]; - executableHaskellDepends = [ - base containers directory filepath Glob - ]; - testHaskellDepends = [ - base containers directory filepath Glob hedgehog tasty - tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck - tasty-smallcheck - ]; - description = "Test discovery for the tasty framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-discover_4_2_1" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit , tasty-quickcheck, tasty-smallcheck @@ -198753,7 +199473,6 @@ self: { ]; description = "Test discovery for the tasty framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-expected-failure" = callPackage @@ -198831,8 +199550,8 @@ self: { pname = "tasty-hedgehog"; version = "0.1.0.2"; sha256 = "0cjdi0kpwpb4m5ad1y47x52336xfza4m82h5zg76r75f7fvzzh8x"; - revision = "1"; - editedCabalFile = "1kmmry6zawyhxgi20v3j62m58lqjcjzvap0qp6b35yj31vbzl727"; + revision = "2"; + editedCabalFile = "0kcsky6xnqpg2hpvpw50sdmjg50z1s57wbvxqmcjrd7wx8hpapdq"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -200742,6 +201461,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-karya" = callPackage + ({ mkDerivation, async, base, bytestring, containers, data-ordlist + , deepseq, Diff, directory, filepath, ghc-prim, haskell-src + , pcre-heavy, pcre-light, pretty, process, QuickCheck, text, unix + }: + mkDerivation { + pname = "test-karya"; + version = "0.0.1"; + sha256 = "0sq0v3bv0civ46ls5xqmbwp8h8g6ppzj4bzxv64rifzgwblqayb4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers data-ordlist deepseq Diff + directory filepath ghc-prim haskell-src pcre-heavy pcre-light + pretty process QuickCheck text unix + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath pcre-heavy pcre-light + text + ]; + description = "Testing framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "test-pkg" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -201222,8 +201965,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.5.1"; - sha256 = "1x5dacn3zkc3v72kspdicmp0c1cr8yq83xp115lfj7aq5riw6z1r"; + version = "0.5.1.1"; + sha256 = "02h27jb5m5yz5ai1q7x5w41vh8imnkhd2fp7l65mwxp96khsa7ql"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -202874,8 +203617,8 @@ self: { pname = "these"; version = "0.7.4"; sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw"; - revision = "6"; - editedCabalFile = "16dglq7aj28ag4h11m4ym8lm3jjq5kx3y0bycbhqm4q9xpnwfvfb"; + revision = "7"; + editedCabalFile = "112m4b952zdm1fsjlz8q4ln3arhhiyfi9sb00d797y8fr16bs6yf"; libraryHaskellDepends = [ aeson base bifunctors binary containers data-default-class deepseq hashable keys mtl profunctors QuickCheck semigroupoids transformers @@ -203084,8 +203827,8 @@ self: { }: mkDerivation { pname = "threadscope"; - version = "0.2.10"; - sha256 = "1wmj5a7kfyj8msi9gfvd48rr4vpl4ggd251yrj09ly5la98zs8pv"; + version = "0.2.11"; + sha256 = "07v9szpjx4hd01rk1wq5a3bcpkxnm317f6xj3mi2klxrdwrhdyav"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -203157,6 +203900,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "threepenny-gui_0_8_2_4" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , data-default, deepseq, exceptions, file-embed, filepath, hashable + , safe, snap-core, snap-server, stm, template-haskell, text + , transformers, unordered-containers, vault, vector, websockets + , websockets-snap + }: + mkDerivation { + pname = "threepenny-gui"; + version = "0.8.2.4"; + sha256 = "0fy8mwg4h78c7h1k6igc9i8k5r7avj59jkljbg47wlr0x8fs06yb"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson async base bytestring containers data-default deepseq + exceptions file-embed filepath hashable safe snap-core snap-server + stm template-haskell text transformers unordered-containers vault + vector websockets websockets-snap + ]; + description = "GUI framework that uses the web browser as a display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threepenny-gui-contextmenu" = callPackage ({ mkDerivation, base, threepenny-gui }: mkDerivation { @@ -204460,19 +205228,19 @@ self: { }) {}; "tintin" = callPackage - ({ mkDerivation, base, clay, data-has, directory, frontmatter - , inliterate, lucid, optparse-generic, process, require, temporary - , text, universum, yaml + ({ mkDerivation, base, clay, containers, data-has, directory + , frontmatter, inliterate, lucid, optparse-generic, process + , require, temporary, text, universum, yaml }: mkDerivation { pname = "tintin"; - version = "1.8.0"; - sha256 = "1i5hdyxrrflxbw59i55p7bxfn75m2j6dmn7h43f9qwcgn6fv3l3y"; + version = "1.9.0"; + sha256 = "0nl2qpj59zavvdjbq565ls2gz4apwh2qq2jrknxsvwfl79jnf8pz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base clay data-has directory frontmatter inliterate lucid process - require temporary text universum yaml + base clay containers data-has directory frontmatter inliterate + lucid process require temporary text universum yaml ]; executableHaskellDepends = [ base optparse-generic require universum @@ -205592,21 +206360,21 @@ self: { "tpdb" = callPackage ({ mkDerivation, base, bytestring, containers, data-default - , filepath, hashable, HaXml, hxt, mtl, parsec, pretty + , exceptions, filepath, hashable, mtl, parsec, pretty , prettyprinter, text, time, xml-conduit, xml-hamlet }: mkDerivation { pname = "tpdb"; - version = "1.5.2"; - sha256 = "08cckg0n6pbj067advjppgybbwbl256igk4lirwmiav6hf1m723k"; + version = "2.1.0"; + sha256 = "155vpz1l2qdxnyp87qmkyphdrab7jryqjdlvddb55ii7cdjdm6d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers data-default filepath hashable HaXml hxt - mtl parsec prettyprinter text time xml-conduit xml-hamlet + base bytestring containers data-default exceptions filepath + hashable mtl parsec prettyprinter text time xml-conduit xml-hamlet ]; executableHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring HaXml pretty ]; + testHaskellDepends = [ base pretty text ]; description = "Data Type for Rewriting Systems"; license = "GPL"; }) {}; @@ -206509,8 +207277,8 @@ self: { pname = "tree-diff"; version = "0.0.1"; sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz"; - revision = "3"; - editedCabalFile = "04ajimrbywfnnnlx9axz3hmbi33c4g62hrmv52plgifjiw6c4y2y"; + revision = "4"; + editedCabalFile = "1rqxxyj6hqllahs11693g855cxz8mgnb490s7j1ksd300i5xgjsp"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring containers generics-sop hashable MemoTrie parsec parsers pretty @@ -209095,6 +209863,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typenums" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "typenums"; + version = "0.1.1"; + sha256 = "1n8fwcpwk5qpjljvwi2mfh0rg7sv58cvlzk165bj3bqcac2ffrq4"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Type level numbers using existing Nat functionality"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "typeof" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -211337,18 +212117,18 @@ self: { "uom-plugin" = callPackage ({ mkDerivation, base, containers, deepseq, ghc - , ghc-tcplugins-extra, tasty, tasty-hunit, template-haskell + , ghc-tcplugins-extra, hlint, tasty, tasty-hunit, template-haskell , units-parser }: mkDerivation { pname = "uom-plugin"; - version = "0.2.0.1"; - sha256 = "109fxbc9gwwc0p4a1p46jhc71j5cv5kc3hm9jh9h3i8p0bhd5yiy"; + version = "0.3.0.0"; + sha256 = "16a6l88z49nl0nqn3l7mki8rr39hh3i4wsn1q31gwahn3kfkzgll"; libraryHaskellDepends = [ base containers deepseq ghc ghc-tcplugins-extra template-haskell units-parser ]; - testHaskellDepends = [ base tasty tasty-hunit ]; + testHaskellDepends = [ base hlint tasty tasty-hunit ]; description = "Units of measure as a GHC typechecker plugin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -211789,25 +212569,6 @@ self: { }) {}; "urlpath" = callPackage - ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph - , monad-control, monad-control-aligned, monad-logger, mtl - , path-extra, resourcet, split, strict, text, transformers - , transformers-base, vector - }: - mkDerivation { - pname = "urlpath"; - version = "8.0.1"; - sha256 = "04w5ivbvfbh60jsfdsmznvm5cxracslmr1hyqhf0qdva29vcxj4z"; - libraryHaskellDepends = [ - attoparsec-uri base exceptions mmorph monad-control - monad-control-aligned monad-logger mtl path-extra resourcet split - strict text transformers transformers-base vector - ]; - description = "Painfully simple URL deployment"; - license = stdenv.lib.licenses.mit; - }) {}; - - "urlpath_9_0_0" = callPackage ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph , monad-control, monad-control-aligned, monad-logger, mtl, path , path-extra, resourcet, split, strict, text, transformers @@ -211824,7 +212585,6 @@ self: { ]; description = "Painfully simple URL deployment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "urn" = callPackage @@ -212696,6 +213456,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "vado_0_0_10" = callPackage + ({ mkDerivation, attoparsec, base, directory, filepath, process + , QuickCheck, text + }: + mkDerivation { + pname = "vado"; + version = "0.0.10"; + sha256 = "04rdjhc1ny2xwmwvbf70bwjgyv5kzl8s83m79qr3i04vicax14gd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base directory filepath process text + ]; + executableHaskellDepends = [ + attoparsec base directory filepath process text + ]; + testHaskellDepends = [ + attoparsec base directory filepath process QuickCheck text + ]; + description = "Runs commands on remote machines using ssh"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "valid-names" = callPackage ({ mkDerivation, base, containers, MonadRandom }: mkDerivation { @@ -214166,6 +214950,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "versioning" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }: + mkDerivation { + pname = "versioning"; + version = "0.2.0.0"; + sha256 = "1c35s0hv6wgyr40ky7yh7ajv0jhphfb8m53zn9a59v7nibp476mq"; + libraryHaskellDepends = [ aeson base bytestring semigroupoids ]; + testHaskellDepends = [ aeson base bytestring hspec ]; + description = "Type-safe data versioning"; + license = stdenv.lib.licenses.asl20; + }) {}; + "versions" = callPackage ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text @@ -214174,6 +214970,8 @@ self: { pname = "versions"; version = "3.3.2"; sha256 = "1w4b6a9dvl69bw132nic40a65y2142z1qzzg1qxgylwarfwqmsfg"; + revision = "1"; + editedCabalFile = "0vh8nikp0xqyp24fx5lm7221jg7pp8c83dankja2zzkmr09pd96v"; libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; testHaskellDepends = [ base checkers microlens QuickCheck tasty tasty-hunit @@ -214183,6 +214981,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "versions_3_4_0_1" = callPackage + ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable + , megaparsec, microlens, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "3.4.0.1"; + sha256 = "0r7crjnzllip9ya3lgf7cckfgz57daq379sh19z7adlzj8rxhimg"; + libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; + testHaskellDepends = [ + base base-prelude checkers megaparsec microlens QuickCheck tasty + tasty-hunit tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vgrep" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th , containers, directory, doctest, fingertree, generic-deriving @@ -215066,8 +215883,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "vulkan-api"; - version = "1.1.2.1"; - sha256 = "0iwzjr2w6ifsj6lah8viahsxcqxiqy0dk1v6lnzi77nb05sjpr6d"; + version = "1.1.3.0"; + sha256 = "1sd7rasg7305dlfq1mwyxw45gwy4ria0cbcd18pnilwjgsla7kvc"; libraryHaskellDepends = [ base ]; description = "Low-level low-overhead vulkan api bindings"; license = stdenv.lib.licenses.bsd3; @@ -216396,6 +217213,26 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "wai-route_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck + , tasty, tasty-quickcheck, unordered-containers, wai + }: + mkDerivation { + pname = "wai-route"; + version = "0.4.0"; + sha256 = "1rdrb7v17svz6y502bg49pj1wik7zy7r2l8bldfkssqh9kbrjiyp"; + libraryHaskellDepends = [ + base bytestring http-types unordered-containers wai + ]; + testHaskellDepends = [ + base bytestring http-types mtl QuickCheck tasty tasty-quickcheck + wai + ]; + description = "Minimalistic, efficient routing for WAI"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-router" = callPackage ({ mkDerivation, base, text, wai }: mkDerivation { @@ -216975,8 +217812,8 @@ self: { }: mkDerivation { pname = "warp-tls-uid"; - version = "0.2.0.1"; - sha256 = "1f9la7hz5x6xhyz3b4zgxqgp8hn0085k5fhp03fw9gzhkdgq1c08"; + version = "0.2.0.5"; + sha256 = "1b3kxpbai9nxqqv9kww4cr1vgaa0cz4fpkd3pfmj0hin10hr6mmq"; libraryHaskellDepends = [ base bytestring network streaming-commons unix wai warp warp-tls ]; @@ -218064,6 +218901,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets_0_12_5_1" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , bytestring, bytestring-builder, case-insensitive, containers + , criterion, entropy, HUnit, network, QuickCheck, random, SHA + , streaming-commons, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "websockets"; + version = "0.12.5.1"; + sha256 = "1v9zmd34bmh0y02njff4n1vkp1d5jdpq9dlva0z7sr0glv8c3drz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive containers entropy network + random SHA streaming-commons text + ]; + testHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive containers entropy HUnit + network QuickCheck random SHA streaming-commons test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive containers criterion entropy + network random SHA text + ]; + doCheck = false; + description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "websockets-rpc" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, hashable, monad-control, mtl, QuickCheck @@ -218732,31 +219604,37 @@ self: { }) {}; "winery" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable, mtl - , prettyprinter, prettyprinter-ansi-terminal, text, transformers + ({ mkDerivation, base, binary, bytestring, cassava, containers + , deepseq, fast-builder, gauge, hashable, mtl, prettyprinter + , prettyprinter-ansi-terminal, serialise, text, transformers , unordered-containers, vector }: mkDerivation { pname = "winery"; - version = "0"; - sha256 = "0bhgiw2zljr50cyhfc8rzkd217g8mvl56f82ys5z0kvr5gp8mjdw"; + version = "0.1"; + sha256 = "1i8myd2adkwsini5lvs8418yipr8lx3plsp02f0ja4w726f0d6br"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers hashable mtl prettyprinter + base bytestring containers fast-builder hashable mtl prettyprinter prettyprinter-ansi-terminal text transformers unordered-containers vector ]; executableHaskellDepends = [ - base bytestring containers hashable mtl prettyprinter + base bytestring containers fast-builder hashable mtl prettyprinter prettyprinter-ansi-terminal text transformers unordered-containers vector ]; testHaskellDepends = [ - base bytestring containers hashable mtl prettyprinter + base bytestring containers fast-builder hashable mtl prettyprinter prettyprinter-ansi-terminal text transformers unordered-containers vector ]; + benchmarkHaskellDepends = [ + base binary bytestring cassava containers deepseq fast-builder + gauge hashable mtl prettyprinter prettyprinter-ansi-terminal + serialise text transformers unordered-containers vector + ]; description = "Sustainable serialisation library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -219452,6 +220330,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "work-time" = callPackage + ({ mkDerivation, base, containers, megaparsec, text }: + mkDerivation { + pname = "work-time"; + version = "0.1.1.0"; + sha256 = "02rrag1zi266spp6szlxsh23x55r669xz6h4rv7qymp5ww1dj0bf"; + libraryHaskellDepends = [ base containers megaparsec text ]; + description = "A library for parsing a chat-based work hour reporting scheme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "workdays" = callPackage ({ mkDerivation, base, containers, doctest, hspec, time }: mkDerivation { @@ -220042,6 +220931,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wss-client" = callPackage + ({ mkDerivation, base, bytestring, hspec, http-client + , http-client-tls, network-uri, QuickCheck, websockets + }: + mkDerivation { + pname = "wss-client"; + version = "0.2.0.0"; + sha256 = "06rxgxbpmpdk7sxpjmv65spn697pyqjfi2h5lyi4gx678whpgr7m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring http-client http-client-tls network-uri websockets + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A-little-higher-level WebSocket client"; + license = stdenv.lib.licenses.asl20; + }) {}; + "wtk" = callPackage ({ mkDerivation, base, old-locale, time, transformers }: mkDerivation { @@ -221341,8 +222248,8 @@ self: { }: mkDerivation { pname = "xml-html-conduit-lens"; - version = "0.3.2.3"; - sha256 = "1r2slz8wqgn0wdbs5cn7fnr7shz9di8bkn3m11jf70ij1gxi1cib"; + version = "0.3.2.4"; + sha256 = "1axg0b5y43fnmj64jffqkivrlckx9arw31ijjqdlj0yb7qwfahhk"; libraryHaskellDepends = [ base bytestring containers html-conduit lens text xml-conduit ]; @@ -222835,8 +223742,8 @@ self: { }: mkDerivation { pname = "yaml-combinators"; - version = "1.1.1"; - sha256 = "0zrvg0ccqn20gj8bbnc3xnlmbvf226qq7synx3q962cw95l53cyl"; + version = "1.1.1.1"; + sha256 = "1343q4wddqmszi21qx5a0jjawvqa1aqfzbkn8npi3sy2gmk42zi8"; libraryHaskellDepends = [ aeson base bytestring generics-sop scientific text transformers unordered-containers vector yaml @@ -222895,19 +223802,13 @@ self: { }) {}; "yaml-pretty-extras" = callPackage - ({ mkDerivation, base, bytestring, errors, hspec, mtl, rio, text - , yaml - }: + ({ mkDerivation, base, hspec, microlens-platform, rio, yaml }: mkDerivation { pname = "yaml-pretty-extras"; - version = "0.0.1.3"; - sha256 = "15jk0hxpvq6hjysxrf4nilhn7s32cwvpfc4wbb3fgfvgzaxnnqfb"; - libraryHaskellDepends = [ - base bytestring errors mtl rio text yaml - ]; - testHaskellDepends = [ - base bytestring errors hspec mtl rio text yaml - ]; + version = "0.0.2.1"; + sha256 = "1xjkfrqip9dfsc964759h11jz8kpza20lcqbvwcw2li93fn5p8y7"; + libraryHaskellDepends = [ base microlens-platform rio yaml ]; + testHaskellDepends = [ base hspec microlens-platform rio yaml ]; description = "Extra functionality for pretty printing Yaml documents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -223164,8 +224065,8 @@ self: { }: mkDerivation { pname = "yarn-lock"; - version = "0.4.1"; - sha256 = "1jhw8ss2psap2shl8spwqbdvxchmvfxb354asvdjjgld608xz8wk"; + version = "0.5.0"; + sha256 = "1nwb0zc4qddvq2rkzb56c56iba7v0yms0hlam8y1nlcbvsqxrnc6"; libraryHaskellDepends = [ base containers either megaparsec protolude text ]; @@ -223181,34 +224082,35 @@ self: { "yarn2nix" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, async-pool, base - , bytestring, containers, data-fix, directory, either, filepath - , hnix, mtl, neat-interpolation, optparse-applicative, process - , protolude, regex-tdfa, regex-tdfa-text, stm, tasty, tasty-hunit - , tasty-quickcheck, tasty-th, text, unix, unordered-containers - , yarn-lock + , bytestring, containers, data-fix, directory, filepath, hnix, mtl + , neat-interpolation, optparse-applicative, process, protolude + , regex-tdfa, regex-tdfa-text, stm, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, text, transformers, unix + , unordered-containers, yarn-lock }: mkDerivation { pname = "yarn2nix"; - version = "0.5.0"; - sha256 = "1vnhf7na4ljlybxpwi0n7ivmigc1mwjzn1vbcl4rrwlr4qcvaylp"; + version = "0.7.0"; + sha256 = "0rna9z1vm05f99a0dkvvv893als9x2zjifzc4gphwylgkih7d826"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint async-pool base bytestring containers data-fix - directory either filepath hnix mtl process protolude regex-tdfa - regex-tdfa-text stm text unordered-containers yarn-lock + directory filepath hnix mtl process protolude regex-tdfa + regex-tdfa-text stm text transformers unordered-containers + yarn-lock ]; executableHaskellDepends = [ aeson ansi-wl-pprint async-pool base bytestring containers data-fix - directory either filepath hnix mtl optparse-applicative process - protolude regex-tdfa regex-tdfa-text stm text unix + directory filepath hnix mtl optparse-applicative process protolude + regex-tdfa regex-tdfa-text stm text transformers unix unordered-containers yarn-lock ]; testHaskellDepends = [ aeson ansi-wl-pprint async-pool base bytestring containers data-fix - directory either filepath hnix mtl neat-interpolation process - protolude regex-tdfa regex-tdfa-text stm tasty tasty-hunit - tasty-quickcheck tasty-th text unordered-containers yarn-lock + directory filepath hnix mtl neat-interpolation process protolude + regex-tdfa regex-tdfa-text stm tasty tasty-hunit tasty-quickcheck + tasty-th text transformers unordered-containers yarn-lock ]; description = "Convert yarn.lock files to nix expressions"; license = stdenv.lib.licenses.mit; From 379e9253c4bb375409feb75013c91dc665b04453 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 Jun 2018 09:57:07 +0200 Subject: [PATCH 052/265] all-cabal-hashes: update snapshot to Hackage at 2018-06-14T18:11:23Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 4612556f73d..a60368e5c6d 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/6a869307fd58b59579f78e5631b9bc8ae6b9bb92.tar.gz"; - sha256 = "1i6gg49gibbqgc0iq87qlf6cqmi67pk8y2zbiz3gynqzrcmqbhfd"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/db00b74891fcaae598fdcaf3835e274be8f2c082.tar.gz"; + sha256 = "0csvwqnvyg2jg76rr4blm4hm6max10a6as4mnwdz76sliw4092sg"; } From e6e64d5e45ccfc3c435bdc88bb6f216a3f0c4c20 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2018 10:50:18 +0200 Subject: [PATCH 053/265] haskell-pandoc-types: update override for ghc 8.4.x --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b0dc20128fc..68fa2385179 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -418,7 +418,7 @@ self: super: { hspec-smallcheck = self.hspec-smallcheck_0_5_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_2_1; - pandoc-types = self.pandoc-types_1_17_4_2; + pandoc-types = self.pandoc-types_1_17_5_1; wl-pprint-text = self.wl-pprint-text_1_2_0_0; # https://github.com/xmonad/xmonad/issues/155 From 78f91c8aa17c91029dd001a4e953268b45946315 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Jun 2018 08:49:38 +0200 Subject: [PATCH 054/265] hledger: jailbreak to fix builds with ghc-8.4.x --- .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ++++++ 1 file changed, 6 insertions(+) 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 68fa2385179..db453e66c67 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -444,4 +444,10 @@ self: super: { lambdabot-core = appendPatch super.lambdabot-core ./patches/lambdabot-core-ghc-8.4.x-fix.patch; + # Version 1.9.1 excludes base-compat 0.10.x for the benefit of older + # compilers, but ghc 8.4.x works fine with the new version. + hledger-lib = doJailbreak super.hledger-lib; + hledger = doJailbreak super.hledger; + hledger-ui = doJailbreak super.hledger-ui; + } From 2189f230e2647fac4a98bc9b3558e6bf02c1870b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 16 Jun 2018 16:12:44 +0200 Subject: [PATCH 055/265] calibre: 3.25.0 -> 3.26.1 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 93a5d942853..cfd869e5592 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.25.0"; + version = "3.26.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "018gxjbj5rak4ys5nyx6749rj9vszlf9k1wdcpl60ap3l83kxdnd"; + sha256 = "0i53095g6wl3ghhpzfrvizj24b8zxbxs1c7bvcj3fpkf43wd45j0"; }; patches = [ From 7a3c052e97d143540baf8fb3ae1bda52d9144f9c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 16 Jun 2018 17:16:03 +0200 Subject: [PATCH 056/265] gource: 0.48 -> 0.49 --- pkgs/applications/version-management/gource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index d617d363fa0..c52a2049a11 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.48"; + version = "0.49"; name = "gource-${version}"; src = fetchurl { url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz"; - sha256 = "04qxcm05qiyr9rg2kv6abfy7kkzqr8ziw4iyp1d14lniv93m61dp"; + sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9"; }; nativeBuildInputs = [ pkgconfig ]; From 4e52780f9dad5f6c7934c299a8b1a1b88b167561 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 16 Jun 2018 17:19:49 +0200 Subject: [PATCH 057/265] logstalgia: 1.1.1 -> 1.1.2 --- pkgs/tools/graphics/logstalgia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index be4cf0f493b..93a6652eafb 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "logstalgia-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz"; - sha256 = "0nvnk8q9m2ignzwxak0vch88blywbx4znk70xf9fg38xa4rf94yn"; + sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd"; }; nativeBuildInputs = [ pkgconfig ]; From 180ad2c1b01e9e09bfb2499cf17660e989a7fd2d Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 16 Jun 2018 09:15:07 -0700 Subject: [PATCH 058/265] Udiskie appindicator (#42063) * udiskie: Add libappindicator-gtk3 runtime dependency This is needed to support the --appindicator --tray command line flag. --- pkgs/applications/misc/udiskie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 1db0e4be196..5b75fbbc08e 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, asciidoc-full, gettext -, gobjectIntrospection, gtk3, hicolor-icon-theme, libnotify, librsvg +, gobjectIntrospection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg , udisks2, wrapGAppsHook , buildPythonApplication , docopt @@ -27,7 +27,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ gettext gobjectIntrospection gtk3 libnotify docopt - pygobject3 pyyaml udisks2 + pygobject3 pyyaml udisks2 libappindicator-gtk3 ]; postBuild = "make -C doc"; From 3476cdb2e5d864b50eccdd7ad6655fbe98d804c7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 16 Jun 2018 16:03:23 -0300 Subject: [PATCH 059/265] lightning: 2.1.0 -> 2.1.2 --- pkgs/development/libraries/lightning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index b4a33bbe7df..8e38b7b6192 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "lightning-${version}"; - version = "2.1.0"; + version = "2.1.2"; src = fetchurl { url = "mirror://gnu/lightning/${name}.tar.gz"; - sha256 = "19j9nwl88k660045s40cbz5zrl1wpd2mcxnnc8qqnnaj311a58qz"; + sha256 = "0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v"; }; buildInputs = stdenv.lib.optional doCheck libopcodes; From e1983175e870f40e6c6f3cc2260434fbaef6e0a7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 15 Jun 2018 18:12:15 -0400 Subject: [PATCH 060/265] spidermonkey_17: get darwin working LLVM building is apparently broken. This is a similar fix to what was done in spidermonkey_38. enableReadline flag is also introduced (defaults to true except on darwin). --- pkgs/development/interpreters/spidermonkey/17.nix | 14 +++++++++----- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix index 9c47ebe79b6..e2eef0fab69 100644 --- a/pkgs/development/interpreters/spidermonkey/17.nix +++ b/pkgs/development/interpreters/spidermonkey/17.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline }: +{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi +, enableReadline ? (!stdenv.isDarwin), readline +, libobjc }: stdenv.mkDerivation rec { version = "17.0.0"; @@ -14,7 +16,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ perl python2 zip libffi readline ]; + buildInputs = [ perl python2 zip libffi readline ] + ++ stdenv.lib.optional enableReadline readline + ++ stdenv.lib.optional stdenv.isDarwin libobjc; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; @@ -48,7 +52,7 @@ stdenv.mkDerivation rec { "--enable-threadsafe" "--with-system-nspr" "--with-system-ffi" - "--enable-readline" + (if enableReadline then "--enable-readline" else "--disable-readline") ]; # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 @@ -64,6 +68,7 @@ stdenv.mkDerivation rec { # https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041155.html echo -e '#!${stdenv.shell}\nexit 0' > config/find_vanilla_new_calls + '' + stdenv.lib.optionalString stdenv.isLinux '' paxmark m shell/js17 paxmark mr jsapi-tests/jsapi-tests ''; @@ -78,7 +83,6 @@ stdenv.mkDerivation rec { homepage = https://developer.mozilla.org/en/SpiderMonkey; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc3c4db2690..7a91080212f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7514,7 +7514,10 @@ with pkgs; spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; - spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; + spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { + inherit (darwin) libobjc; + stdenv = gccStdenv; + }; spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; From 3f9ea23556e45f0c313c1b192d1cdd9170fbc6b1 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sat, 16 Jun 2018 16:51:44 -0400 Subject: [PATCH 061/265] packagekit: fix platform typo should be unix --- pkgs/tools/package-management/packagekit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 142f6176dbc..456469f150f 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.packagekit.org/; license = licenses.gpl2Plus; - platforms = platforms.darwin; + platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; }; } From 5468f796a85b2ade53af4e745825aae3c7450387 Mon Sep 17 00:00:00 2001 From: plchldr Date: Sat, 16 Jun 2018 20:46:37 +0200 Subject: [PATCH 062/265] hugo: 0.40.3 -> 0.42.1 --- pkgs/applications/misc/hugo/default.nix | 4 +- pkgs/applications/misc/hugo/deps.nix | 64 ++++++++++++------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index e4e45dd570b..f2be640a34d 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.40.3"; + version = "0.42.1"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "08d4y6x19cd4qy9pf80zrqarcyarbzxph0yp8mfb1sp2bvq42308"; + sha256 = "17m8bkldvnd7yyzxi4rc8vv3qfypjzik38bjy4qavb7sjdjmfij9"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index a99eb563dc2..837919b1c32 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "222a1f0fc811afd47471d4a4e32f3aa09b6f9cdf"; - sha256 = "090yb9f9gld4l0r6x8y2a6a3ghiqbyh19fgmjcjfq8qlv0vj5n4s"; + rev = "d7b2ed20a4989ab604703f61f86523560f8a6a87"; + sha256 = "0ni2ncck787sxk9gl14xnyjnw4y27ipypjf4kc00g635fvc64ik6"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "bbcee2f5c9d5e94ca42c8b50ec847fec64a6c134"; - sha256 = "0dzwqy1xcm0d481z1fa2r60frdlf5fzjligpiqh5g8lhqskk2lx8"; + rev = "5e63c9a565d0a3260d23d060a795783dab90fefe"; + sha256 = "1mmiz439lygi30dj1rbps57iqh762jkinnpb4wfl382v4h136qvp"; }; } { @@ -122,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/gobuffalo/envy"; - rev = "ef60bfc50c8f92d1ee64674d8ce7a48f1f67625e"; - sha256 = "15qrmw3l2achpd3hz8fkkz7yzpbvldm1pf1vsr250q24nsh6x7iz"; + rev = "2d0f467653f3d961ce9ada4d32a230bdcb3bfe11"; + sha256 = "0p9raqrsqg2z1hq2kbvbq5qcwqihjqf28xnfh62214p7ak9b9x8n"; }; } { @@ -140,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785"; - sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy"; + rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71"; + sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7"; }; } { @@ -203,8 +203,8 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "2c9e9502788518c97fe44e8955cd069417ee89df"; - sha256 = "1w0rl9rla61m0qbha75jg48yiq1vs91sfy96rgqa6nags9v9b1rl"; + rev = "c2353362d570a7bfa228149c62842019201cfb71"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; }; } { @@ -212,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/markbates/inflect"; - rev = "fbc6b23ce49e2578f572d2e72bb72fa03c7145de"; - sha256 = "10rf7kfqnic8x4z8c29whb76w9v847y63wh5b2kfx6rqhrjfilis"; + rev = "84854b5b4c0dbb0c107480d480a71f7db1fc7dae"; + sha256 = "0b7shs0mxhkl7v7mwp799n7jgjsdbgi81f5hbaz2b936gbxksw7d"; }; } { @@ -239,8 +239,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; - sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"; + sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7"; }; } { @@ -257,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "8c6996ea1058153460146b16c341a4ae611f7cf7"; - sha256 = "1k8ai8mdi5cqbcxihzx727z3gg46lpkw0s1byb3lrdnmp31l7p9r"; + rev = "f6ac3d9cf0c4b6a32527779e992ebde26bd3d948"; + sha256 = "1vg25khaf7lr90xwf97bsyn873cdi1j7nxh68s80jrg2a86zw0ff"; }; } { @@ -275,8 +275,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12"; - sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15"; + rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; }; } { @@ -302,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "63644898a8da0bc22138abf860edaf5277b6102e"; - sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw"; + rev = "787d034dfe70e44075ccc060d346146ef53270ad"; + sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; }; } { @@ -320,8 +320,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + rev = "1e58aa3361fd650121dceeedc399e7189c05674a"; + sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin"; }; } { @@ -356,8 +356,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + rev = "3ebe029320b2676d667ae88da602a5f854788a8a"; + sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp"; }; } { @@ -383,8 +383,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "f315e440302883054d0c2bd85486878cb4f8572c"; - sha256 = "010pc6qjppqd9c7rramiwz7myvip9vhridfxy7wc2qj1kr92b4dc"; + rev = "af66defab954cb421ca110193eed9477c8541e2a"; + sha256 = "0dgi7svwzs37c7m5dz2jig3xr45fyjihhr8cg0x8nc8sc8fsyq4h"; }; } { @@ -392,8 +392,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f73e4c9ed3b7ebdd5f699a16a880c2b1994e50dd"; - sha256 = "1mvnpln6vm0y1i5bb0ycswds49hyapg3jz643lmlw6d183jdcg0q"; + rev = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"; + sha256 = "1f6q8kbijnrfy6wjqxrzgjf38ippckc5w34lhqsjs7kq045aar9a"; }; } { @@ -410,8 +410,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "64746a42f36bf0832f86b76004f1699dbeb33e4f"; - sha256 = "1hbk7cnbywiwxdzbx7lqw6iym9dpwvdyacg06gchxpfw7nfa9r27"; + rev = "6c888cc515d3ed83fc103cf1d84468aad274b0a7"; + sha256 = "18anqrdajp4p015v3f5y641k3lmgp2jr0lfyx0pb3ia0qvn93mrp"; }; } { @@ -419,8 +419,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f"; - sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr"; + rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877"; + sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs"; }; } { From 69a4204231183a956d7db4ac57289c4a3ddc0d19 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Sun, 17 Jun 2018 00:06:20 +0300 Subject: [PATCH 063/265] lf: 4 -> 5 --- pkgs/tools/misc/lf/default.nix | 4 ++-- pkgs/tools/misc/lf/deps.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 79f70da9e26..11759cc6d40 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "4"; + version = "5"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0wvx5hhkj3l68xjcr0i5lk623zi3si79hhvwi6mw9s52i43irr31"; + sha256 = "0qgvaa69xs97x42j1ikb03bzpm497z9h3qk7adbdippaqcj40s70"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index e22a31a8fe2..c372b0d669c 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "21a4d435a86280a2927985fd6296de56cbce453e"; # master - sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7"; + rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"; # master + sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw"; }; } { From 1b7ce4c6d5f5f3882326b71f89803af5bf1f5053 Mon Sep 17 00:00:00 2001 From: dje4321 Date: Sat, 16 Jun 2018 17:15:42 -0500 Subject: [PATCH 064/265] brightnessctl: init at 0.3.2 (#42102) * brightnessctl: init at 0.3.2 * Revised PR --- maintainers/maintainer-list.nix | 5 ++++ nixos/modules/hardware/brightnessctl.nix | 30 ++++++++++++++++++++++++ nixos/modules/module-list.nix | 1 + pkgs/misc/brightnessctl/default.nix | 29 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 67 insertions(+) create mode 100644 nixos/modules/hardware/brightnessctl.nix create mode 100644 pkgs/misc/brightnessctl/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 246a6d06cec..059969b92d3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -78,6 +78,11 @@ github = "DmitryTsygankov"; name = "Dmitry Tsygankov"; }; + Dje4321 = { + email = "dje4321@gmail.com"; + github = "dje4321"; + name = "Dje4321"; + }; Esteth = { email = "adam.copp@gmail.com"; name = "Adam Copp"; diff --git a/nixos/modules/hardware/brightnessctl.nix b/nixos/modules/hardware/brightnessctl.nix new file mode 100644 index 00000000000..341e4b791c2 --- /dev/null +++ b/nixos/modules/hardware/brightnessctl.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.hardware.brightnessctl; +in +{ + + options = { + + hardware.brightnessctl = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable brightnessctl in userspace. + This will allow brightness control from users in the video group. + ''; + + }; + }; + }; + + + config = mkIf cfg.enable { + services.udev.packages = with pkgs; [ brightnessctl ]; + }; + +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e45909eb2d6..cd594b934b8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -29,6 +29,7 @@ ./config/vpnc.nix ./config/zram.nix ./hardware/all-firmware.nix + ./hardware/brightnessctl.nix ./hardware/ckb.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix new file mode 100644 index 00000000000..ef53dc1446b --- /dev/null +++ b/pkgs/misc/brightnessctl/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, coreutils }: + +stdenv.mkDerivation rec { + name = "brightnessctl-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "Hummer12007"; + repo = "brightnessctl"; + rev = "${version}"; + sha256 = "0amxhcikcgj04z81272kz35m5h5q4jx9x7v71h8yl1rv4b2lzh7z"; + }; + + makeFlags = "MODE=0 PREFIX=/ DESTDIR=$(out)"; + + patchPhase = '' + substituteInPlace 90-brightnessctl.rules --replace /bin/ ${coreutils}/bin/ + substituteInPlace 90-brightnessctl.rules --replace %k '*' + ''; + + meta = { + homepage = "https://github.com/Hummer12007/brightnessctl"; + maintainers = [ stdenv.lib.maintainers.Dje4321 ]; + license = stdenv.lib.licenses.mit; + description = "This program allows you read and control device brightness"; + platforms = stdenv.lib.platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a91080212f..4ffc88444ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20729,6 +20729,8 @@ with pkgs; brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {}; + brightnessctl = callPackage ../misc/brightnessctl { }; + calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; click = callPackage ../applications/networking/cluster/click { }; From fb924af13fa0ccc3d2859a6208f56a2bd65fcd49 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 16 Jun 2018 19:25:59 -0400 Subject: [PATCH 065/265] nixpkgs-lint.pl: use nix-shell for shebang This is more portable. --- maintainers/scripts/nixpkgs-lint.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl index 7e9ff91ebe0..638d1b2aaa1 100755 --- a/maintainers/scripts/nixpkgs-lint.pl +++ b/maintainers/scripts/nixpkgs-lint.pl @@ -1,4 +1,5 @@ -#! /run/current-system/sw/bin/perl -w +#! /usr/bin/env nix-shell +#! nix-shell -i perl -p perl perlPackages.XMLSimple use strict; use List::Util qw(min); From 0ac07da0ecdc693c5d8570e9e2b8c0538f5978c8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 16 Jun 2018 20:13:39 -0400 Subject: [PATCH 066/265] dict: fix datadir path /run/current-system/sw is the correct profile. --- pkgs/servers/dict/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index 6868c0f8166..bf9fd77df7c 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patchPhase = "patch -p0 < ${./buildfix.diff}"; configureFlags = [ "--enable-dictorg" - "--datadir=/run/current-system/share/dictd" + "--datadir=/run/current-systems/sw/share/dictd" ]; meta = with stdenv.lib; { From d203ce230bf646432fefbec2d1a7d7627012dc29 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 16 Jun 2018 20:14:07 -0400 Subject: [PATCH 067/265] haskell.section.md: fix typo --- doc/languages-frameworks/haskell.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 74cb0da1570..68dd59958c3 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -312,7 +312,7 @@ For example, installing the following environment allows one to browse module documentation index [not too dissimilar to this](https://downloads.haskell.org/~ghc/latest/docs/html/libraries/index.html) for all the specified packages and their dependencies by directing a browser of -choice to `~/.nix-profiles/share/doc/hoogle/index.html` (or +choice to `~/.nix-profile/share/doc/hoogle/index.html` (or `/run/current-system/sw/share/doc/hoogle/index.html` in case you put it in `environment.systemPackages` in NixOS). From 00b4ab22a474571e2b9f6f389825421815fb4936 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 16 Jun 2018 20:23:30 -0400 Subject: [PATCH 068/265] linux: 4.4.137 -> 4.4.138 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 999952dba69..307276d04e7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.137"; + version = "4.4.138"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "01hjnwfrx0fr9zbd6qcqfxsp0xm34ai7k49i7ndxwcrhzdipkl9i"; + sha256 = "1vn45hvwk49cfm283yg4j76k7dnn351rg5zy28z3bfp02x7cdyg6"; }; } // (args.argsOverride or {})) From a06962d08cfe7f7242f521a26b3ebcf1c0882387 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 16 Jun 2018 20:30:15 -0400 Subject: [PATCH 069/265] linux: 4.9.108 -> 4.9.109 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d9b821b8f15..242083219b2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.108"; + version = "4.9.109"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ha0bvjfxz6nx3nrcrpciqlrphy318xi04lv4k7jr5hpialjpzkk"; + sha256 = "1c2rwddr8v1l0b5yswfmpy0pf4gdqi4ycs9b94cj2hsklma5dk9x"; }; } // (args.argsOverride or {})) From c4d0d910704d17db4f677a59605e88bba6d7ad5a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 16 Jun 2018 20:30:33 -0400 Subject: [PATCH 070/265] linux: 4.14.49 -> 4.14.50 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 79bc8e51093..d469867ecb4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.49"; + version = "4.14.50"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1xrvklrh0zf3ma61qkbng2495j4bcvif45l8bm5074pk3rrlk7y6"; + sha256 = "1b529qp5cixvp47h8jhincnc40n7l27qawkgjf6l5p157c0qsfkh"; }; } // (args.argsOverride or {})) From 0c077e1e90d731053bfa7b37a5eaa84fe22dbfe5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 16 Jun 2018 20:31:31 -0400 Subject: [PATCH 071/265] linux: 4.16.15 -> 4.16.16 --- pkgs/os-specific/linux/kernel/linux-4.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 2643faac48a..120639814da 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.15"; + version = "4.16.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0v13g5ancr85hr24y7xagjn9w168h2d87m4m4hr4a2i45mrsdwjq"; + sha256 = "0wcinqf5m1zzj747k86yxvm3acpa50vbzbjhd4hikl1jfidss31h"; }; } // (args.argsOverride or {})) From 3afc706c74dc973a0779a0669e96226325aa2d7c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 16 Jun 2018 20:31:57 -0400 Subject: [PATCH 072/265] linux: 4.17.1 -> 4.17.2 --- pkgs/os-specific/linux/kernel/linux-4.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index ca8abcc0ef1..7dbe8c1a15a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17.1"; + version = "4.17.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0w3hma7k4nwjp1zsfgn2i18dsmmdn1lxccqx3vapwsz6pjy3ygy9"; + sha256 = "173vv0fwykpxhldrr7z83d1wl3ly5mc21nd68f2ycjfw9mpwvssc"; }; } // (args.argsOverride or {})) From f85a82a647e781001f8b7faf5a8148dd3306ae82 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 16 Jun 2018 20:33:00 -0400 Subject: [PATCH 073/265] linux-testing: 4.17-rc7 -> 4.18-rc1 --- pkgs/os-specific/linux/kernel/common-config.nix | 10 ++++++---- pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d1314431abe..93732f1c6f8 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -368,7 +368,7 @@ with stdenv.lib; ${optionalString (! stdenv.hostPlatform.isAarch32) (if versionOlder version "3.14" then '' CC_STACKPROTECTOR? y # Detect buffer overflows on the stack - '' else '' + '' else optionalString (versionOlder version "4.18") '' CC_STACKPROTECTOR_REGULAR? y '')} ${optionalString (versionAtLeast version "3.12") '' @@ -647,7 +647,7 @@ with stdenv.lib; X86_X2APIC y IRQ_REMAP y ''} - + # needed for iwd WPS support (wpa_supplicant replacement) ${optionalString (versionAtLeast version "4.7") '' KEY_DH_OPERATIONS y @@ -690,10 +690,12 @@ with stdenv.lib; CRC32_SELFTEST? n CRYPTO_TEST? n - DRM_DEBUG_MM_SELFTEST? n + ${optionalString (versionOlder version "4.18") '' + DRM_DEBUG_MM_SELFTEST? n + LNET_SELFTEST? n + ''} EFI_TEST? n GLOB_SELFTEST? n - LNET_SELFTEST? n LOCK_TORTURE_TEST? n MTD_TESTS? n NOTIFIER_ERROR_INJECTION? n diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 4794685a755..d1732af9f5e 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.17-rc7"; - modDirVersion = "4.17.0-rc7"; - extraMeta.branch = "4.17"; + version = "4.18-rc1"; + modDirVersion = "4.18.0-rc1"; + extraMeta.branch = "4.18"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0kibvll2h4wvfbfxral7jsjajaijw0jb0scpjascwh66d7cxbbbr"; + sha256 = "1wzxnzhxmzn5gygxs1vm4iawknpivr5kn1mav8l1ll3q7s5xqjnr"; }; # Should the testing kernels ever be built on Hydra? From bad3800307b435e6b8017a517d2546052c4008bf Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sat, 16 Jun 2018 21:24:27 -0400 Subject: [PATCH 074/265] polkit: fix paxmark script --- pkgs/development/libraries/polkit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 0619097af91..98937308191 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -92,6 +92,7 @@ stdenv.mkDerivation rec { # The following is required on grsecurity/PaX due to spidermonkey's JIT postBuild = stdenv.lib.optionalString stdenv.isLinux '' paxmark mr src/polkitbackend/.libs/polkitd + '' + stdenv.lib.optionalString (stdenv.isLinux && doCheck) '' paxmark mr test/polkitbackend/.libs/polkitbackendjsauthoritytest ''; From 9aa1624e8326ebba29d3d5305a6b468571c11538 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 17 Jun 2018 03:25:10 +0000 Subject: [PATCH 075/265] netbsd.compat: fix build with musl (#41537) --- pkgs/os-specific/bsd/netbsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index aae11b6affc..e31d6fea378 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, coreutils +{ stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, buildPackages , yacc, flex, libressl, bash, less, writeText }: let @@ -178,7 +178,7 @@ let # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later - makeFlags = [ "INSTALL=${coreutils}/bin/install" ]; + makeFlags = [ "INSTALL=${buildPackages.coreutils}/bin/install" ]; installFlags = []; RENAME = "-D"; From 764491f654b1808f39186fe0522d1034af24952d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 Jun 2018 22:53:19 -0500 Subject: [PATCH 076/265] kakasi: supports darwin --- pkgs/tools/text/kakasi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/tools/text/kakasi/default.nix index b6b647b4398..b0baeaab5f6 100644 --- a/pkgs/tools/text/kakasi/default.nix +++ b/pkgs/tools/text/kakasi/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { name = "kakasi-2.3.6"; + buildInputs = stdenv.lib.optional stdenv.isDarwin [ libiconv ]; + meta = with stdenv.lib; { description = "Kanji Kana Simple Inverter"; longDescription = '' @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://kakasi.namazu.org/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; src = fetchurl { From 5fb615d990031cbde5048c62622bb8c65c4d6980 Mon Sep 17 00:00:00 2001 From: Anders Riutta Date: Tue, 12 Jun 2018 14:00:23 -0700 Subject: [PATCH 077/265] sqlint: init at 0.1.7. ht @ryantm. --- maintainers/maintainer-list.nix | 5 ++++ pkgs/development/tools/sqlint/Gemfile | 2 ++ pkgs/development/tools/sqlint/Gemfile.lock | 17 +++++++++++ pkgs/development/tools/sqlint/default.nix | 34 ++++++++++++++++++++++ pkgs/development/tools/sqlint/gemset.nix | 28 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 6 files changed, 88 insertions(+) create mode 100644 pkgs/development/tools/sqlint/Gemfile create mode 100644 pkgs/development/tools/sqlint/Gemfile.lock create mode 100644 pkgs/development/tools/sqlint/default.nix create mode 100644 pkgs/development/tools/sqlint/gemset.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0aa91a31313..f48b3fb3f40 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -33,6 +33,11 @@ github = "Anton-Latukha"; name = "Anton Latukha"; }; + ariutta = { + email = "anders.riutta@gmail.com"; + github = "ariutta"; + name = "Anders Riutta"; + }; Baughn = { email = "sveina@gmail.com"; github = "Baughn"; diff --git a/pkgs/development/tools/sqlint/Gemfile b/pkgs/development/tools/sqlint/Gemfile new file mode 100644 index 00000000000..7f045baeaa0 --- /dev/null +++ b/pkgs/development/tools/sqlint/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'sqlint' diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock new file mode 100644 index 00000000000..1fd44e97b99 --- /dev/null +++ b/pkgs/development/tools/sqlint/Gemfile.lock @@ -0,0 +1,17 @@ +GEM + remote: https://rubygems.org/ + specs: + json (2.1.0) + pg_query (1.0.0) + json (>= 1.8, < 3) + sqlint (0.1.7) + pg_query (~> 0.13.5) + +PLATFORMS + ruby + +DEPENDENCIES + sqlint + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/development/tools/sqlint/default.nix b/pkgs/development/tools/sqlint/default.nix new file mode 100644 index 00000000000..67fbd09f102 --- /dev/null +++ b/pkgs/development/tools/sqlint/default.nix @@ -0,0 +1,34 @@ +{ lib, bundlerApp, fetchurl, ruby }: + +let + LIB_PG_QUERY_TAG = "10-1.0.1"; + libpgQuerySrc = fetchurl { + name = "libpg_query.tar.gz"; + url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/${LIB_PG_QUERY_TAG}"; + sha256 = "0m5jv134hgw2vcfkqlnw80fr3wmrdvgrvk1ndcx9s44bzi5nsp47"; + }; +in bundlerApp { + pname = "sqlint"; + gemdir = ./.; + inherit ruby; + + exes = [ "sqlint" ]; + + gemConfig = { + pg_query = attrs: { + dontBuild = false; + postPatch = '' + substituteInPlace ext/pg_query/extconf.rb \ + --replace "#{workdir}/libpg_query.tar.gz" "${libpgQuerySrc}" + ''; + }; + }; + + meta = with lib; { + description = "Simple SQL linter"; + homepage = https://github.com/purcell/sqlint; + license = licenses.mit; + maintainers = with maintainers; [ ariutta ]; + platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix new file mode 100644 index 00000000000..d2802a91703 --- /dev/null +++ b/pkgs/development/tools/sqlint/gemset.nix @@ -0,0 +1,28 @@ +{ + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + pg_query = { + dependencies = ["json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zgwnrf5mkpkxfh49r2pvh2djivrbqd19350g8hxapmkya9w3qpi"; + type = "gem"; + }; + version = "1.0.0"; + }; + sqlint = { + dependencies = ["pg_query"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wm81dgdmgc16b97bz73vm0wjd2m1ra1b40h0kwfd9wgrh9ig2al"; + type = "gem"; + }; + version = "0.1.7"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94ebd20a0f5..520d65f8040 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1489,6 +1489,8 @@ with pkgs; utillinux = utillinuxMinimal; }; + sqlint = callPackage ../development/tools/sqlint { }; + antibody = callPackage ../shells/zsh/antibody { }; antigen = callPackage ../shells/zsh/antigen { }; From b0909cc394fce2695629ce1c4412e5446e6fe2c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 17 Jun 2018 10:37:06 +0200 Subject: [PATCH 078/265] ghc: drop compiler version 8.4.2; we prefer 8.4.3 --- pkgs/development/compilers/ghc/8.4.2.nix | 208 ----------------------- pkgs/top-level/haskell-packages.nix | 13 +- 2 files changed, 1 insertion(+), 220 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/8.4.2.nix diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix deleted file mode 100644 index ac8d76c63ed..00000000000 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ /dev/null @@ -1,208 +0,0 @@ -{ stdenv, targetPackages -, buildPlatform, hostPlatform, targetPlatform - -# build-tools -, bootPkgs, alex, happy, hscolour -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 - -, libffi, libiconv ? null, ncurses - -, useLLVM ? !targetPlatform.isx86 -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(gmp.meta.available or false), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? targetPlatform != hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt - -, # Whetherto build terminfo. - enableTerminfo ? !targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross" -}: - -let - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - '' + stdenv.lib.optionalString enableIntegerSimple '' - INTEGER_LIBRARY = integer-simple - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = YES - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - toolsForTarget = - if hostPlatform == buildPlatform then - [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm - else assert targetPlatform == hostPlatform; # build != host == target - [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - -in -stdenv.mkDerivation rec { - version = "8.4.2"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "0yq4y0smn92sksnjjva28b8847krxizns6rm50j3pgq69br35k01"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [(fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf"; - sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - })] - ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ - # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatability. - strictDeps = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 - ghc alex happy hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = libDeps hostPlatform; - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = [ "format" ]; - - postInstall = '' - for bin in "$out"/lib/${name}/bin/*; do - isELF "$bin" || continue - paxmark m "$bin" - done - - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - - # Our Cabal compiler name - haskellCompilerName = "ghc-8.4.2"; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c5f0378049e..ec471538095 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -66,12 +66,6 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_39; llvmPackages = pkgs.llvmPackages_39; }; - ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec { - bootPkgs = packages.ghc821Binary; - inherit (bootPkgs) alex happy hscolour; - buildLlvmPackages = buildPackages.llvmPackages_5; - llvmPackages = pkgs.llvmPackages_5; - }; ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix rec { bootPkgs = packages.ghc821Binary; inherit (bootPkgs) alex happy hscolour; @@ -100,7 +94,7 @@ in rec { stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; }; ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec { - bootPkgs = packages.ghc842; + bootPkgs = packages.ghc843; inherit (bootPkgs) alex happy; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json; stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix; @@ -151,11 +145,6 @@ in rec { ghc = bh.compiler.ghc822; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghc842 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc842; - ghc = bh.compiler.ghc842; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; - }; ghc843 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc843; ghc = bh.compiler.ghc843; From 1d8bb7e5c85189905b9d08c8d2b918b5c30c6641 Mon Sep 17 00:00:00 2001 From: "Samuel W. Flint" Date: Sun, 17 Jun 2018 04:59:07 -0500 Subject: [PATCH 079/265] lice: init at 0.4 (#42108) * lice: init at 0.4 * lice: make changes per pSub --- pkgs/tools/misc/lice/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/lice/default.nix diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/tools/misc/lice/default.nix new file mode 100644 index 00000000000..bb0f93ba328 --- /dev/null +++ b/pkgs/tools/misc/lice/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonPackage rec { + + version = "0.4"; + name = "lice-${version}"; + + src = fetchFromGitHub { + owner = "licenses"; + repo = "lice"; + rev = version; + sha256 = "0yxf70fi8ds3hmwjply2815k466r99k8n22r0ppfhwjvp3rn60qx"; + fetchSubmodules = true; + }; + + meta = with stdenv.lib; { + description = "Print license based on selection and user options."; + homepage = https://github.com/licenses/lice; + license = licenses.bsd3; + maintainers = with maintainers; [ swflint ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ffc88444ad..6a3bbc772ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21098,6 +21098,8 @@ with pkgs; lkproof = callPackage ../tools/typesetting/tex/lkproof { }; + lice = callPackage ../tools/misc/lice {}; + m33-linux = callPackage ../misc/drivers/m33-linux { }; mnemonicode = callPackage ../misc/mnemonicode { }; From e3ad1039c596e7e21856c6277e0fe6e35f3aca4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Sun, 17 Jun 2018 12:10:50 +0200 Subject: [PATCH 080/265] lyx: Fixes building with Qt5.11 --- pkgs/applications/misc/lyx/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 092ad6bf478..ad3bd499cde 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, python, file, bc +{ fetchurl, stdenv, pkgconfig, python, file, bc, fetchpatch , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: @@ -35,6 +35,13 @@ stdenv.mkDerivation rec { --prefix PATH : '${python}/bin' ''; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch?id=07e82fd1fc07bf055c78b81eaa128f8f837da80d"; + sha256 = "1bnx0il2iv36lnrnyb370wyvww0rd8bphcy6z8d7zmvd3pwhyfql"; + }) + ]; + meta = with stdenv.lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = http://www.lyx.org; From 06b602b192a97235894661a3a7f52ba84553ef2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Jun 2018 12:11:42 +0200 Subject: [PATCH 081/265] ffmpeg_2: 2.8.13 -> 2.8.14 Lots of bugfixes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/3f8a0d5ad1:/Changelog --- pkgs/development/libraries/ffmpeg/2.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix index ea28769668c..5ffbc215d8b 100644 --- a/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/pkgs/development/libraries/ffmpeg/2.8.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.13"; + version = "${branch}.14"; branch = "2.8"; - sha256 = "0y3712ivmpr5dw1nsk1bqpd4b7ldzd69ak4vwbl4q02ab35ri6yz"; + sha256 = "1g6x3lyjl1zlfksizj1ys61kj97yg0xf4dlr6sr5acpbja3a26yn"; }) From 577d54bb1692de1dc0b608f48d0e984acc7824a7 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Sun, 17 Jun 2018 13:03:32 +0200 Subject: [PATCH 082/265] Crystal: 0.24.2 -> 0.25.0 --- .../development/compilers/crystal/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 7b83e0e68b7..237ca7e5aed 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,26 +1,27 @@ -{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, makeWrapper }: +{ stdenv, fetchurl, makeWrapper +, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang }: stdenv.mkDerivation rec { name = "crystal-${version}"; - version = "0.24.2"; + version = "0.25.0"; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "1l7nrrfgz1yxxjphypwzlxj6dbari20p71zb4l0gix09lmas8l6y"; + sha256 = "1pnx21ky6cqfyv6df4mmjnyd1yh1bvcqkdzq6f0mk0yrkcl57k3q"; }; - prebuiltName = "crystal-0.24.2-1"; + prebuiltName = "crystal-0.25.0-1"; prebuiltSrc = let arch = { "x86_64-linux" = "linux-x86_64"; "i686-linux" = "linux-i686"; "x86_64-darwin" = "darwin-x86_64"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); in fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/0.24.2/${prebuiltName}-${arch}.tar.gz"; + url = "https://github.com/crystal-lang/crystal/releases/download/0.25.0/${prebuiltName}-${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "1xf6riwd5k5f95988m1hsppsfii5v96svgmy12ncy7mgmm7k4dh3"; - "i686-linux" = "0ar05kj89pm3zxfnxwhf0mz9vrd9q5p47y4969sh0r6knccri0kp"; - "x86_64-darwin" = "1vz8bi5rfgggiic4ayxbcf6pfmdjvqcg4lsivnk2fyshr1m8l0h5"; + "x86_64-linux" = "1q006086pbbvhmscbjzzgbdq1jkppd4p4kl9z9fn9j6np8fhi8ms"; + "i686-linux" = "074ndm9n0mzsa7dkl3chhf234l85msm99yjksa5980lyqynyrw1d"; + "x86_64-darwin" = "006f2j5984dkp5lsq8kns5mkxbhj50syjvzqk9z931pxl92wc7iy"; }."${stdenv.system}"; }; @@ -60,6 +61,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 .build/crystal $out/bin/crystal wrapProgram $out/bin/crystal \ + --suffix PATH : ${clang}/bin \ --suffix CRYSTAL_PATH : lib:$out/lib/crystal \ --suffix LIBRARY_PATH : $libPath install -dm755 $out/lib/crystal @@ -79,7 +81,7 @@ stdenv.mkDerivation rec { dontStrip = true; - enableParallelBuilding = true; + enableParallelBuilding = false; meta = { description = "A compiled language with Ruby like syntax and type inference"; From d9428ceaf5d2b983e79aaa7c721faa8ecafc3e82 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Sun, 17 Jun 2018 13:03:47 +0200 Subject: [PATCH 083/265] Mint: 0.0.3 -> 0.0.4 --- .../development/compilers/mint/crystal2nix.cr | 2 +- pkgs/development/compilers/mint/default.nix | 6 +++--- pkgs/development/compilers/mint/shards.nix | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/mint/crystal2nix.cr b/pkgs/development/compilers/mint/crystal2nix.cr index 017ebe62b49..f2ef5dafdbc 100644 --- a/pkgs/development/compilers/mint/crystal2nix.cr +++ b/pkgs/development/compilers/mint/crystal2nix.cr @@ -8,7 +8,7 @@ end File.open "shards.nix", "w+" do |file| file.puts %({) yaml = YAML.parse(File.read("shard.lock")) - yaml["shards"].each do |key, value| + yaml["shards"].as_h.each do |key, value| owner, repo = value["github"].as_s.split("/") url = "https://github.com/#{value["github"]}" rev = if value["version"]? diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 08a55dc609f..40527e87921 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -28,13 +28,13 @@ let }; in stdenv.mkDerivation rec { - version = "0.0.3"; + version = "0.0.4"; name = "mint-${version}"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; - rev = "0.0.3"; - sha256 = "15aawhpagpaqrs64jnz3g6iw3dhq0rlqm92cvfd5a3hbwvxg7lm0"; + rev = "0.0.4"; + sha256 = "04zq6qqh2dbqgnywsy6qfpimsr2zg19gs3xls1bphbaygnb2yi3l"; }; buildInputs = [ crystal zlib openssl duktape ]; diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index dcf7454b4ca..7810eb5ff09 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -8,26 +8,26 @@ ameba = { owner = "veelenga"; repo = "ameba"; - rev = "v0.6.0"; - sha256 = "16jfyrkfc909h16si513lw944qp3dyapymczcqc2ic0jaal0af5b"; + rev = "v0.7.0"; + sha256 = "01h0a1ba5l254r04mgkqhjdfn21cs0q7fmvk4gj35cj5lpr2bp17"; }; baked_file_system = { owner = "schovi"; repo = "baked_file_system"; - rev = "v0.9.6"; - sha256 = "06cpriaizp5pcqwdq3jl2lm4sz9b2gcxg3a9q3lh0fqk2acajzmx"; + rev = "e1447549d5ac0560720fae62179b2f2c62c9bfd1"; + sha256 = "1fi6zag1a6h4xwrfizy01dls3hhraqw0cmpwj7rjv1qcddjgig5z"; }; duktape = { owner = "jessedoyle"; repo = "duktape.cr"; - rev = "v0.13.0"; - sha256 = "0v0nckprgr7idmsx97g98as1a7z4hmlmwl924dbbaqvyslv5ls6w"; + rev = "v0.14.1"; + sha256 = "0fkay3qspzych050xl8xjkrphmxpzaj0dcf9jl22xwz8cx1l89f1"; }; kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "v0.22.0"; - sha256 = "0gq3c27grgh90fykbj9fdsz507lwd41gk686qfnig6npndqv1v10"; + rev = "a5870e7d24e5ec75c956bcf3e4423f55a2c4ff78"; + sha256 = "1f2bm4xmfg6zqs3a8744pbk1vx964flf17g1mj01yslfcnzxywal"; }; kilt = { owner = "jeromegn"; @@ -50,8 +50,8 @@ time_format = { owner = "vladfaust"; repo = "time_format.cr"; - rev = "v0.1.0"; - sha256 = "1f3rssdlcw2a5f74qa8bzlf1rh5dzvyg1d32w9qlisf2cc4lkh9g"; + rev = "v0.1.1"; + sha256 = "0mmssnabf476i07sajm7s3rlvfcav4lkh0n8g12rybxr6c9f683v"; }; tree_template = { owner = "anykeyh"; From 783f5150625714f4b7d8464be54757a450b68756 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Sun, 17 Jun 2018 13:04:04 +0200 Subject: [PATCH 084/265] Shards: 0.7.2 -> 0.8.0 --- pkgs/development/tools/build-managers/shards/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 36d9ddfb8ea..286190436bf 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "shards-${version}"; - version = "0.7.2"; + version = "0.8.0"; src = fetchurl { url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz"; - sha256 = "1qiv9zzpccf6i5r2qrzbl84wgvqapbs0csazayhcpzfjfhg6i8wp"; + sha256 = "02v69xl7x6sn0ddn29mjx3srwk4fyz0hz2pwaqa25fwwyhxvyn3p"; }; buildInputs = [ crystal libyaml which ]; - buildFlags = [ "CRFLAGS=" "release" ]; + buildFlags = [ "CRFLAGS=--release" ]; installPhase = '' mkdir -p $out/bin From c5454933a1be9fc42baf0646e216826522d38275 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 17 Jun 2018 21:19:27 +1000 Subject: [PATCH 085/265] nix-prefetch-git: fix output `fetchSubmodules` property --- pkgs/build-support/fetchgit/nix-prefetch-git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 1d993dcc109..3cf4ecc280f 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -356,7 +356,7 @@ print_results() { "rev": "$(json_escape "$fullRev")", "date": "$(json_escape "$commitDateStrict8601")", "$(json_escape "$hashType")": "$(json_escape "$hash")", - "fetchSubmodules": $([[ -n "fetchSubmodules" ]] && echo true || echo false) + "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false) } EOF fi From baa1098a4a87dab08bbfcfe0ae96677ef69981ef Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 17 Jun 2018 11:23:30 +0000 Subject: [PATCH 086/265] nixos/xrdp: add fonts.enableDefaultFonts --- nixos/modules/services/networking/xrdp.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index bf23c6ae619..0e882873b4b 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -97,6 +97,7 @@ in # xrdp can run X11 program even if "services.xserver.enable = false" environment.pathsToLink = [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ]; + fonts.enableDefaultFonts = mkDefault true; systemd = { services.xrdp = { From 20ee8fbb1e7d2c6b1966f63cfb786f30449e03c7 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 17 Jun 2018 14:38:58 +0200 Subject: [PATCH 087/265] qpdf: apply patch for CVE-2018-9918 in context of #41748 --- pkgs/development/libraries/qpdf/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 00ce5133048..7622254afd9 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, zlib, perl }: +{ stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: let version = "8.0.2"; in @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libjpeg ]; + patches = [ + (fetchpatch { + name = "CVE-2018-9918.patch"; + url = "https://github.com/qpdf/qpdf/commit/b4d6cf6836ce025ba1811b7bbec52680c7204223"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + }) + ]; + postPatch = '' patchShebangs qpdf/fix-qdf ''; From 3b0560dddc71323538b8cdedfe64925d3c51478c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 17 Jun 2018 14:42:45 +0200 Subject: [PATCH 088/265] mupdf: use CVE in name to enable vulnix detection --- pkgs/applications/misc/mupdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a8458e3432c..d78caa24e46 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { patches = [ (fetchpatch { - # CVE-2018-10289 + name = "CVE-2018-10289.patch"; url = "https://bugs.ghostscript.com/attachment.cgi?id=15230"; sha256 = "0jmpacxd9930g6k57kda9jrcrbk75whdlv8xwmqg5jwn848qvy4q"; }) From df74d3720a5a153595b19e51cf5bfa87bdef00ef Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sat, 16 Jun 2018 10:09:12 -0700 Subject: [PATCH 089/265] remmina: 1.2.0-rcgit.24 -> 1.2.30.1 The project moved to GitLab. Add @ryantm and @melsigl as maintainers. Melsigl from https://github.com/NixOS/nixpkgs/pull/41549 Closes #41549 --- maintainers/maintainer-list.nix | 5 +++++ .../networking/remote/remmina/default.nix | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 246a6d06cec..3480c634af8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2453,6 +2453,11 @@ github = "meisternu"; name = "Matt Miemiec"; }; + melsigl = { + email = "melanie.bianca.sigl@gmail.com"; + github = "melsigl"; + name = "Melanie B. Sigl"; + }; metabar = { email = "softs@metabarcoding.org"; name = "Celine Mercier"; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6d32036def5..6b0ddb37120 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook +{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core -, openssl, gsettings-desktop-schemas +, openssl, gsettings-desktop-schemas, json-glib # The themes here are soft dependencies; only icons are missing without them. , hicolor-icon-theme, adwaita-icon-theme }: let - version = "1.2.0-rcgit.24"; + version = "1.2.30.1"; desktopItem = makeDesktopItem { name = "remmina"; @@ -25,11 +25,11 @@ let in stdenv.mkDerivation { name = "remmina-${version}"; - src = fetchFromGitHub { - owner = "FreeRDP"; + src = fetchFromGitLab { + owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "1x7kygl9a5nh7rf2gfrk0wwv23mbw7rrjms402l3zp1w53hrhwmg"; + sha256 = "1jz20yv84a8m9gm9fsz0jii8ag90v1scmbkkx9gk38ax5il7ilvn"; }; nativeBuildInputs = [ pkgconfig ]; @@ -39,7 +39,7 @@ in stdenv.mkDerivation { pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret spice-protocol spice-gtk epoxy at-spi2-core - openssl hicolor-icon-theme adwaita-icon-theme ]; + openssl hicolor-icon-theme adwaita-icon-theme json-glib ]; cmakeFlags = [ "-DWITH_VTE=OFF" @@ -64,9 +64,9 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { license = stdenv.lib.licenses.gpl2; - homepage = http://remmina.sourceforge.net/; + homepage = https://gitlab.com/Remmina/Remmina; description = "Remote desktop client written in GTK+"; - maintainers = []; + maintainers = with maintainers; [ melsigl ryantm ]; platforms = platforms.linux; }; } From 5b25d4fa3e5b5969138b2ae36cac263d36424676 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Jun 2018 08:47:16 -0700 Subject: [PATCH 090/265] s3backer: 1.4.3 -> 1.5.0 (#41959) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/s3backer/versions. These checks were done: - built on NixOS - /nix/store/6lsma6d012qscsg8r5gcigk58f1bs93j-s3backer-1.5.0/bin/s3backer passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 1.5.0 with grep in /nix/store/6lsma6d012qscsg8r5gcigk58f1bs93j-s3backer-1.5.0 - directory tree listing: https://gist.github.com/70ca4de57ddd45b85eceae64476f7125 - du listing: https://gist.github.com/d5deb0dd7314e7a74448e9af05d695e0 --- pkgs/tools/filesystems/s3backer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 1007d04036e..16ecb1c9d15 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "s3backer-${version}"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { - sha256 = "0fhkha5kap8dji3iy48cbszhq83b2anssscgjj9d5dsl5dj57zak"; + sha256 = "0pmszcnnlqyysljfyysd6jsvdz7fqgbk8z4vnkmda5dwwcm8b8fs"; rev = version; repo = "s3backer"; owner = "archiecobbs"; From b6b4b3fa065852d5ab483e449aac4ecc6c7af0ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Jun 2018 08:54:33 -0700 Subject: [PATCH 091/265] xawtv: 3.103 -> 3.104 (#41931) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xawtv/versions. These checks were done: - built on NixOS - /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/dump-mixers passed the binary check. - /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/record passed the binary check. - Warning: no invocation of /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/showriff had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/showqt had a zero exit code or showed the expected version - /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/streamer passed the binary check. - Warning: no invocation of /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/webcam had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/ttv had a zero exit code or showed the expected version - /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/radio passed the binary check. - Warning: no invocation of /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/fbtv had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/v4l-info had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/v4l-conf had a zero exit code or showed the expected version - /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/ntsc-cc passed the binary check. - Warning: no invocation of /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/v4lctl had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/propwatch had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/xawtv-remote had a zero exit code or showed the expected version - /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/rootv passed the binary check. - Warning: no invocation of /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/xawtv had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/pia had a zero exit code or showed the expected version - /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104/bin/subtitles passed the binary check. - 7 of 19 passed binary check by having a zero exit code. - 0 of 19 passed binary check by having the new version present in output. - found 3.104 with grep in /nix/store/flz0nziga8rf7yy8qi207l3dgzy9x4z5-xawtv-3.104 - directory tree listing: https://gist.github.com/e59bbee51fd744b22ad39bcc4ee19850 - du listing: https://gist.github.com/6768a962875588d853d9979d9e5ed06f --- pkgs/applications/video/xawtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index d249d29686e..9fcb88c2aaa 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -2,10 +2,10 @@ , libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}: stdenv.mkDerivation rec { - name = "xawtv-3.103"; + name = "xawtv-3.104"; src = fetchurl { url = "http://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; - sha256 = "0lnxr3xip80g0rz7h6n14n9d1qy0cm56h0g1hsyr982rbldskwrc"; + sha256 = "0jnvbahxmx9jw8g2519wmc1dq9afnlqcrzc876fcbf2x1iz39qxr"; }; preConfigure = '' From 4af3190e41666c24a628e001670ce255b282cf16 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Jun 2018 08:55:26 -0700 Subject: [PATCH 092/265] zita-convolver: 3.1.0 -> 4.0.0 (#41924) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/zita-convolver/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/d4fff99f47b470ae2fb591d4d0eca6a9 - du listing: https://gist.github.com/fa1de3cf8f7b6e64c8bcf06617b79635 --- pkgs/development/libraries/audio/zita-convolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 578bc7f4a2d..48a409b5367 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "zita-convolver-${version}"; - version = "3.1.0"; + version = "4.0.0"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; - sha256 = "14qrnczhp5mbwhky64il7kxc4hl1mmh495v60va7i2qnhasr6zmz"; + sha256 = "0fx7f48ls0rlndqrmd4k7ifpnml39yxzc2f0n6xyysypgn06y673"; }; buildInputs = [ fftwFloat ]; From 0dbfa47ed12f42c78a3ea86aaebd2db243fa8384 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 17 Jun 2018 18:04:14 +0200 Subject: [PATCH 093/265] geogebra: 5-0-444-0 -> 5-0-472-0 (#41990) Bumped to the latest version available. Also tested the `web.archive.org` backup to avoid broken downloads when the tarball is removed from the official download mirror. --- pkgs/applications/science/math/geogebra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 9e2c55d567c..755a6094038 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "geogebra-${version}"; - version = "5-0-444-0"; + version = "5-0-472-0"; preferLocalBuild = true; src = fetchurl { urls = [ "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - "http://web.archive.org/web/20180325075100/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + "http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "1x2h40m62zbhmy42hln5gjj3fwk4b6803v3k9agpv5c6j468sq0p"; + sha256 = "1f56k5r5wf2l27sgp2vjpvx7wl72gizwxs0a6hngk15nzzka87v9"; }; srcIcon = fetchurl { From 7da8f449f379c2148c75df6d0c42bdd8c52ada5e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Jun 2018 09:06:27 -0700 Subject: [PATCH 094/265] spice-protocol: 0.12.13 -> 0.12.14 (#41962) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/spice-protocol/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.12.14 with grep in /nix/store/c8d98iaj9smm6k0fkcjnz8x9byb6vb1x-spice-protocol-0.12.14 - directory tree listing: https://gist.github.com/4927fbed4bca5bd3e211633f48595e5f - du listing: https://gist.github.com/67d9c9cad3d1803064b71e56d68c8a26 --- pkgs/development/libraries/spice-protocol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 56adea9ca82..19b68a0c43d 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "spice-protocol-0.12.13"; + name = "spice-protocol-0.12.14"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0cwrgkp558mblcf4vrhacb3iizz12khsrrl82w38w9nj0ar13vl9"; + sha256 = "170ckpgazvqv7hxy209myg67pqnd6c0gvr4ysbqgsfch6320nd90"; }; postInstall = '' From a96db8f5670b226cb3361549a24e2737db8b392f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Jun 2018 09:10:03 -0700 Subject: [PATCH 095/265] nanomsg: 1.1.3 -> 1.1.4 (#41984) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nanomsg/versions. These checks were done: - built on NixOS - /nix/store/cgrs63zfbqf7p2kq1xsm2sl5wligj9gh-nanomsg-1.1.4/bin/nanocat passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 1.1.4 with grep in /nix/store/cgrs63zfbqf7p2kq1xsm2sl5wligj9gh-nanomsg-1.1.4 - directory tree listing: https://gist.github.com/ffcd786ca28d29d8689184633a4175e9 - du listing: https://gist.github.com/3dc4771cae8f61cdb26717382321406a --- pkgs/development/libraries/nanomsg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 4950624a0b6..07bd4e7e9fb 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.3"; + version = "1.1.4"; name = "nanomsg-${version}"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nanomsg"; rev = version; - sha256 = "0mckz63rm0hpnln7mkg79bwiybydzbxyzyb39y2m1bjj8xwxkp2m"; + sha256 = "11mxbhkxkzqwdmpl79mfiiqby7zawgkalips7zr0bbdfyhq7jyrl"; }; buildInputs = [ cmake ]; From c9fe43c6689a0788ef76579004b0773e57434124 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Jun 2018 09:15:14 -0700 Subject: [PATCH 096/265] qutebrowser: 1.3.1 -> 1.3.2 (#41965) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qutebrowser/versions. These checks were done: - built on NixOS - /nix/store/d5f7w3hcgxzhk1sgk1gjnl36nrq30wlm-qutebrowser-1.3.2/bin/qutebrowser passed the binary check. - /nix/store/d5f7w3hcgxzhk1sgk1gjnl36nrq30wlm-qutebrowser-1.3.2/bin/..qutebrowser-wrapped-wrapped passed the binary check. - /nix/store/d5f7w3hcgxzhk1sgk1gjnl36nrq30wlm-qutebrowser-1.3.2/bin/.qutebrowser-wrapped passed the binary check. - 3 of 3 passed binary check by having a zero exit code. - 0 of 3 passed binary check by having the new version present in output. - found 1.3.2 with grep in /nix/store/d5f7w3hcgxzhk1sgk1gjnl36nrq30wlm-qutebrowser-1.3.2 - directory tree listing: https://gist.github.com/86db26ab52e4c4aaabb2949ceba69142 - du listing: https://gist.github.com/47c80976cbfff66061ccbffa47d02669 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 38aaf811516..90beb85bbf4 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -29,13 +29,13 @@ let in python3Packages.buildPythonApplication rec { name = "qutebrowser-${version}${versionPostfix}"; namePrefix = ""; - version = "1.3.1"; + version = "1.3.2"; versionPostfix = ""; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "121fz549vlxdasw0lcx6v394x8g34nadvrfs4svw3b65n0shv1ky"; + sha256 = "0zy2cm85qq095hk94d8jk6yqpyy0f31vb2pfbdpgg93b9vvzajzz"; }; # Needs tox From c40c98d40c79ce212fbec605f3eaa2a650ebab30 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Jun 2018 09:18:31 -0700 Subject: [PATCH 097/265] sssd: 1.16.1 -> 1.16.2 (#41963) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sssd/versions. These checks were done: - built on NixOS - /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_ssh_authorizedkeys passed the binary check. - /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_ssh_knownhostsproxy passed the binary check. - /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_cache passed the binary check. - Warning: no invocation of /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_debuglevel had a zero exit code or showed the expected version - /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_groupadd passed the binary check. - /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_groupdel passed the binary check. - /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_groupmod passed the binary check. - /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_groupshow passed the binary check. - Warning: no invocation of /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_obfuscate had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_override had a zero exit code or showed the expected version - /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_seed passed the binary check. - /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_useradd passed the binary check. - /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_userdel passed the binary check. - /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sss_usermod passed the binary check. - Warning: no invocation of /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sssctl had a zero exit code or showed the expected version - /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2/bin/sssd passed the binary check. - 12 of 16 passed binary check by having a zero exit code. - 1 of 16 passed binary check by having the new version present in output. - found 1.16.2 with grep in /nix/store/i0srimsn8chzyqblbf6jvzxndw0w35lg-sssd-1.16.2 - directory tree listing: https://gist.github.com/842245741e6082400e50d4fd7e764d2c - du listing: https://gist.github.com/e4b7c96457a7134ffcc6ecf385b7c5c6 --- pkgs/os-specific/linux/sssd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 3d89fdfdc28..bbc4bc7da46 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "sssd-${version}"; - version = "1.16.1"; + version = "1.16.2"; src = fetchurl { url = "https://fedorahosted.org/released/sssd/${name}.tar.gz"; - sha256 = "0vjh1c5960wh86zjsamdjhljls7bb5fz5jpcazgzrpmga5w6ggrd"; + sha256 = "032ppk57qs1lnvz7pb7lw9ldwm9i1yagh9fzgqgn6na3bg61ynzy"; }; # Something is looking for instead of From dce87078a3f994b9e52117a0d77138f2ffec82a9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 17 Jun 2018 18:23:15 +0200 Subject: [PATCH 098/265] opera: 50.0.2762.45 -> 53.0.2907.99 (#42097) * Updates opera to the latest version available (fixes #40780) * Use gnome3 package set for gconf (see #39976) * Needs `at-spi2-atk` now --- .../networking/browsers/opera/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index b98d1d415c6..37ea44bb28d 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -11,7 +11,7 @@ , freetype , gdk_pixbuf , glib -, gnome2 +, gnome3 , gtk3 , libX11 , libxcb @@ -32,12 +32,13 @@ , pango , stdenv , systemd +, at-spi2-atk }: let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "50.0.2762.45"; + version = "53.0.2907.99"; rpath = stdenv.lib.makeLibraryPath [ @@ -54,7 +55,7 @@ let freetype.out gdk_pixbuf.out glib.out - gnome2.GConf.out + gnome3.gconf gtk3.out libX11.out libXScrnSaver.out @@ -81,6 +82,8 @@ let # Works fine without this except there is no sound. libpulseaudio.out + + at-spi2-atk ]; in stdenv.mkDerivation { @@ -89,7 +92,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "1ajdr6yzqc9xkvdcgkps6j5996n60ibjhj518gmminx90da6x5dy"; + sha256 = "0fih5047xv275rmbcr2drji81wxi6p0kyp172mmn328g3pzddmwx"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; From 3e1acfd8248b085f66018189c4c0d7c9a562e286 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sun, 17 Jun 2018 12:33:32 -0400 Subject: [PATCH 099/265] looking-glass-client: a10 -> a11 (#42098) Requires new dependencies libconfig and nettle. --- .../virtualization/looking-glass-client/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index bd014dd60d3..36d8e1ca70a 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub , pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig -, libX11, freefont_ttf +, libX11, freefont_ttf, nettle, libconfig }: stdenv.mkDerivation rec { name = "looking-glass-client-${version}"; - version = "a10"; + version = "a11"; src = fetchFromGitHub { owner = "gnif"; repo = "LookingGlass"; rev = version; - sha256 = "10jxnkrvskjzkg86iz3hnb5v91ykzx6pvcnpy1v4436g5f2d62wn"; + sha256 = "0q4isn86pl5wddf6h8qd62fw3577ns2sd2myzw969sbl796bwcil"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig - libX11 freefont_ttf + libX11 freefont_ttf nettle libconfig ]; enableParallelBuilding = true; From c0e8b3410cb5b410eafe0c2405cf788cc41aa102 Mon Sep 17 00:00:00 2001 From: Walter Franzini Date: Sun, 17 Jun 2018 18:35:28 +0200 Subject: [PATCH 100/265] riemann-tools: 0.2.6 -> 0.2.13 (package name only) (#42040) fix the package name that a previous PR missed --- pkgs/tools/misc/riemann-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/riemann-tools/default.nix b/pkgs/tools/misc/riemann-tools/default.nix index c518bc66984..a20046deafc 100644 --- a/pkgs/tools/misc/riemann-tools/default.nix +++ b/pkgs/tools/misc/riemann-tools/default.nix @@ -1,7 +1,7 @@ { bundlerEnv }: bundlerEnv { - name = "riemann-tools-0.2.6"; + name = "riemann-tools-0.2.13"; gemfile = ./Gemfile; lockfile = ./Gemfile.lock; gemset = ./gemset.nix; From 9fb100dc28a4182d060834d958c9789dcdb3d076 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Jun 2018 09:39:58 -0700 Subject: [PATCH 101/265] mkdocs: 0.17.3 -> 0.17.4 (#41988) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mkdocs/versions. These checks were done: - built on NixOS - /nix/store/jvkm61ryls5w90v32pisdy2w9hv4sjjb-mkdocs-0.17.4/bin/.mkdocs-wrapped passed the binary check. - /nix/store/jvkm61ryls5w90v32pisdy2w9hv4sjjb-mkdocs-0.17.4/bin/mkdocs passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 2 of 2 passed binary check by having the new version present in output. - found 0.17.4 with grep in /nix/store/jvkm61ryls5w90v32pisdy2w9hv4sjjb-mkdocs-0.17.4 - directory tree listing: https://gist.github.com/51f000d43eea93f02bf57debed7ac8bc - du listing: https://gist.github.com/6f535d35f7a3c2d0e393e4e0fd0682c8 --- pkgs/development/tools/documentation/mkdocs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 128eed603b0..c03de09de11 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -4,13 +4,13 @@ with python.pkgs; buildPythonApplication rec { pname = "mkdocs"; - version = "0.17.3"; + version = "0.17.4"; src = fetchFromGitHub { owner = "mkdocs"; repo = "mkdocs"; rev = version; - sha256 = "15lv60gdc837zja5kn2rfp78kwyb1ckc43jg01zfzqra4qz7b6rw"; + sha256 = "1hwvy6lnqqmzjia5vqd45jx6gwd9cvf7p5vw245c0cg27zkgpazp"; }; postPatch = '' From 153c7665722956f9b9ad9516743a69871a7b0da3 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Sun, 17 Jun 2018 09:43:42 -0700 Subject: [PATCH 102/265] slack: 3.2.0-beta25a7a50e -> 3.2.1 (#42043) --- .../networking/instant-messengers/slack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index c39e3ce1a45..32648ee34c9 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -5,7 +5,7 @@ let - version = "3.2.0-beta25a7a50e"; + version = "3.2.1"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -47,7 +47,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "0497794a7f0e5ac00a9421e6b1875dcc576ed93efc4a7d8c6465db641c234064"; + sha256 = "095dpkwvvnwlxsglyg6wi9126wpalzi736b6g6j3bd6d93z9afah"; } else throw "Slack is not supported on ${stdenv.system}"; From 56a7ea6fbed4192a8fb8f53784cefd4b07b912f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Jun 2018 10:08:31 -0700 Subject: [PATCH 103/265] obs-linuxbrowser: 0.3.1 -> 0.4.0 (#41978) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/obs-linuxbrowser/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/d0ce1376180ae841789e118c1fd370a7 - du listing: https://gist.github.com/ee99a853a8b3bef5c469482ca3a3ec4c --- pkgs/applications/video/obs-studio/linuxbrowser.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix index 289c0ffd707..62c4eba4db5 100644 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "obs-linuxbrowser-${version}"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "bazukas"; repo = "obs-linuxbrowser"; rev = version; - sha256 = "0dql7wxyhksqa08j1dn5d09v2jwhgywc1p7psifhhvh97rkp4z7j"; + sha256 = "1nqi04ici9n1xjliy1gaqy2bq8zj1z32dffk890x2hi7ml688y9h"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; From ccdd229d2137c78797796c3421d49cd2bc0d9a3b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 17 Jun 2018 19:33:14 +0200 Subject: [PATCH 104/265] dlib: 19.9 -> 19.13 (#41953) This fixes the latest `dlib` build for `nixpkgs` compliancy: * Patched `setup.py` to use number of jobs defined in `$NIX_BUILD_CORES` rather than using all available cores. * Bumped `dlib` to latest version (v19.13 ATM). * Dropped `openblas` build input, `cblas` which actually works lives in `dlib/external`. Otherwise the test suite runs into segfaults (see https://github.com/NixOS/nixpkgs/pull/39255#issuecomment-384535129 for further reference). * Added myself as maintainer in case of any further breakage in the future. Closes #39255 /cc @dotlambda @ryantm --- pkgs/development/libraries/dlib/default.nix | 11 ++++---- .../python-modules/dlib/build-cores.patch | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +-- 3 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/python-modules/dlib/build-cores.patch diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index eaae1f7ecda..e5e3c2d662c 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, openblas, libpng, libjpeg +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libpng, libjpeg , guiSupport ? false, libX11 }: stdenv.mkDerivation rec { - version = "19.9"; + version = "19.13"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "0lc54r928j9dg7f2wn25m887z24d31wrc14v2hn6aknp1z084lrc"; + sha256 = "11ia4pd2lm2s9hzwrdvimj3r2qcnvjdp3g4fry2j1a6z9f99zvz3"; }; postPatch = '' @@ -19,14 +19,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ openblas libpng libjpeg ] ++ lib.optional guiSupport libX11; + buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11; meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; homepage = http://www.dlib.net; license = licenses.boost; - maintainers = with maintainers; [ christopherpoole ]; + maintainers = with maintainers; [ christopherpoole ma27 ]; platforms = platforms.linux; }; } - diff --git a/pkgs/development/python-modules/dlib/build-cores.patch b/pkgs/development/python-modules/dlib/build-cores.patch new file mode 100644 index 00000000000..eebc69a330f --- /dev/null +++ b/pkgs/development/python-modules/dlib/build-cores.patch @@ -0,0 +1,27 @@ +diff --git a/setup.py b/setup.py +index 0c8d8f16..565ef8ef 100644 +--- a/setup.py ++++ b/setup.py +@@ -172,21 +172,7 @@ class CMakeBuild(build_ext): + subprocess.check_call(cmake_build, cwd=build_folder) + + def num_available_cpu_cores(ram_per_build_process_in_gb): +- if 'TRAVIS' in os.environ and os.environ['TRAVIS']=='true': +- # When building on travis-ci, just use 2 cores since travis-ci limits +- # you to that regardless of what the hardware might suggest. +- return 2 +- try: +- mem_bytes = os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') +- mem_gib = mem_bytes/(1024.**3) +- num_cores = multiprocessing.cpu_count() +- # make sure we have enough ram for each build process. +- mem_cores = int(floor(mem_gib/float(ram_per_build_process_in_gb)+0.5)); +- # We are limited either by RAM or CPU cores. So pick the limiting amount +- # and return that. +- return max(min(num_cores, mem_cores), 1) +- except ValueError: +- return 2 # just assume 2 if we can't get the os to tell us the right answer. ++ return os.getenv("NIX_BUILD_CORES", 1) + + + from setuptools.command.test import test as TestCommand diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d17e16f1c6..ad9f2452607 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1239,9 +1239,9 @@ in { cypari2 = callPackage ../development/python-modules/cypari2 { }; dlib = buildPythonPackage rec { - inherit (pkgs.dlib) name src nativeBuildInputs meta; + inherit (pkgs.dlib) name src nativeBuildInputs meta buildInputs; - buildInputs = pkgs.dlib.buildInputs ++ [ self.boost ]; + patches = [ ../development/python-modules/dlib/build-cores.patch ]; checkInputs = with self; [ pytest ]; }; From 7d6a42e17f78f44448cf66dca372825600bc05e2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 17 Jun 2018 12:43:16 -0500 Subject: [PATCH 105/265] strace: 4.22 -> 4.23 (#42119) --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index a059f5658b0..a19fecc9c33 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.22"; + version = "4.23"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "17dkpnsjxmys1ydidm9wcvc3wscsz44fmlxw3dclspn9cj9d1306"; + sha256 = "1bcsq2gbpcb81ayryvn56a6kjx42fc21la6qgds35n0xbybacq3q"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From a3f556a32319a6252033725290cae7f993b3bd44 Mon Sep 17 00:00:00 2001 From: lewo Date: Sun, 17 Jun 2018 21:31:18 +0200 Subject: [PATCH 106/265] kubernetes-helm: 2.9.0 -> 2.9.1 (#42113) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/helm/versions. These checks were done: - built on NixOS - /nix/store/clpdnyjaysh2i2h1xjilxryzzb5ywp7y-helm-2.9.1/bin/helm passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 2.9.1 with grep in /nix/store/clpdnyjaysh2i2h1xjilxryzzb5ywp7y-helm-2.9.1 - directory tree listing: https://gist.github.com/ed779ecaf62619059b08a121472e6a96 - du listing: https://gist.github.com/2621c9acfcbf3fa34c093d8bbd9d0292 --- pkgs/applications/networking/cluster/helm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index ae9dc3bbc34..d09e65a4caa 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -5,10 +5,10 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if isLinux - then "0bnjpiivhsxhl45ab32vzf6crv4z8nbq5kcjkvlbcbswdbgp0pq6" - else "0smwhj4pmd4k7csz82akbkrkb0j2jxnmb33ifhkqw7n33jhl3aqp"; + then "1fk6w6sajdi6iphxrzi9r7xfyaf923nxcqnl01s6x3f611fjvbjn" + else "1jzgy641hm3khj0bakfbr5wd5zl3s7w5jb622fjv2jxwmnv7dxiv"; pname = "helm"; - version = "2.9.0"; + version = "2.9.1"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -45,6 +45,6 @@ stdenv.mkDerivation { description = "A package manager for kubernetes"; license = licenses.asl20; maintainers = [ maintainers.rlupton20 ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = [ "x86_64-linux" ] ++ platforms.darwin; }; } From afbcc2670fca5e9ad0b73bd00d8433f0e237cddd Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 17 Jun 2018 15:39:29 -0400 Subject: [PATCH 107/265] python: grpcio: 1.9.1 -> 1.12.0 (#41300) --- pkgs/development/python-modules/grpcio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index d1f0903238c..b434848006a 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "grpcio"; - version = "1.9.1"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "e7c43b5619deff48cc177c1b0618c4beeb2797f910f160e3c2035d5baf790a5d"; + sha256 = "0dsw58aimr8yyb6cgdvs7b7jc0rz2k9vhrsfglg2h7bmh83izzg1"; }; propagatedBuildInputs = [ six protobuf ] From a81fea3224a32d8a23a1cbf4623f77bf047276ba Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Wed, 13 Jun 2018 19:47:39 +0200 Subject: [PATCH 108/265] pdf-tools: 0.80 -> HEAD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To fix #41916, this commit upgrades the emacs package “pdf-tools” to the HEAD revision, since there’s no official release containing the fix. --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/emacs-packages.nix | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94ebd20a0f5..f2efcb3e94f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15702,7 +15702,7 @@ with pkgs; emacsPackagesNgGen = emacs: import ./emacs-packages.nix { inherit lib newScope stdenv; - inherit fetchFromGitHub fetchgit fetchhg fetchurl; + inherit fetchFromGitHub fetchgit fetchhg fetchurl fetchpatch; inherit emacs texinfo makeWrapper runCommand; inherit (xorg) lndir; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index f81a921938c..c4c264c811a 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -32,7 +32,7 @@ # `meta` with `platforms` and `homepage` set to something you are # unlikely to want to override for most packages -{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand +{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, fetchpatch, runCommand , emacs, texinfo, lndir, makeWrapper , trivialBuild @@ -82,6 +82,20 @@ let rev = "v${version}"; sha256 = "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s"; }; + patches = [ + (fetchpatch { + url = https://github.com/politza/pdf-tools/commit/6505a0e817495b85897c9380161034ae611ddd90.patch; + sha256 = "122ycbja8ckaysp58xqfcv11sgpbcp78pll5mywf9hgr0qap9jsy"; + }) + (fetchpatch { + url = https://github.com/politza/pdf-tools/commit/ded6341b0e3ad97e8b14f68c1796ba66dc155fd1.patch; + sha256 = "0hd2v4c6xq2jzg2m6s5kzs0fldgygf1pnfqd11v6x4w05zvxn6a2"; + }) + (fetchpatch { + url = https://github.com/politza/pdf-tools/commit/50a5297b82e26cfd52f6c00645ddc1057099d6a7.patch; + sha256 = "107rqzldg06h8k3pmdinkl78dr4xycm570sp2an4ihjmpmph0z39"; + }) + ]; nativeBuildInputs = [ external.pkgconfig ]; buildInputs = with external; [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; From 756f64bb359a9ba029f8570b911f2738b2cbfbf7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 17 Jun 2018 21:47:00 +0200 Subject: [PATCH 109/265] vim-plugins: updates --- pkgs/misc/vim-plugins/default.nix | 547 +++++++++--------- pkgs/misc/vim-plugins/vim-plugin-names | 1 - .../vim2nix/additional-nix-code/vimshell.vim | 1 - 3 files changed, 274 insertions(+), 275 deletions(-) delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimshell.vim diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index aef223da324..a94707e1afa 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -161,17 +161,6 @@ rec { xterm-color-table = xterm-color-table-vim; zeavim = zeavim-vim; - # do not auto-update this one, as the name clashes with vim-snippets - vim-docbk-snippets = buildVimPluginFrom2Nix { - name = "vim-docbk-snippets-2017-11-02"; - src = fetchgit { - url = "https://github.com/jhradilek/vim-snippets"; - rev = "69cce66defdf131958f152ea7a7b26c21ca9d009"; - sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc"; - }; - dependencies = []; - }; - fzfWrapper = buildVimPluginFrom2Nix { name = fzf.name; src = fzf.src; @@ -216,6 +205,28 @@ rec { ''; }; + # do not auto-update this one, as the name clashes with vim-snippets + vim-docbk-snippets = buildVimPluginFrom2Nix { + name = "vim-docbk-snippets-2017-11-02"; + src = fetchgit { + url = "https://github.com/jhradilek/vim-snippets"; + rev = "69cce66defdf131958f152ea7a7b26c21ca9d009"; + sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc"; + }; + dependencies = []; + }; + + # missing dependency, using additional-nix-code results in an invalid expression + vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vimshell-vim-2018-06-02"; + src = fetchgit { + url = "https://github.com/shougo/vimshell.vim"; + rev = "03bf7673a5098918a533000d67dca97546695237"; + sha256 = "1ckxjap9kz8skbjchg561sqyd5y5qwacg8mabmniy78qa7i3qdzi"; + }; + dependencies = [ "vimproc-vim" ]; + }; + # --- generated packages bellow this line --- vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation @@ -230,11 +241,11 @@ rec { }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2018-03-02"; + name = "vim-autoformat-2018-05-28"; src = fetchgit { url = "https://github.com/Chiel92/vim-autoformat"; - rev = "e63b4e957ad034494b1495d4b4ac1a18503cba79"; - sha256 = "1p64q9a7wqppy1zj70xki86zs5wwxbf9x0wdd4fsg0w741ga9wdf"; + rev = "3c50ddb50635f7899b4339a64bc02333cdd24a4b"; + sha256 = "1zw7b3zxgsmj149z238qx2palqysdywqgsxgj2z37kc8is8dpdpy"; }; dependencies = []; @@ -267,11 +278,11 @@ rec { }; julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "julia-vim-2018-03-27"; + name = "julia-vim-2018-05-07"; src = fetchgit { url = "https://github.com/JuliaEditorSupport/julia-vim"; - rev = "4593c8b1ffe20022677e524487c8554d96cf8f84"; - sha256 = "0yrdzkxyg6cg2i4bd6bqbq0w63hssh3nd0f0qnfl7v5pkq9yba4w"; + rev = "3b8e8f9b03c4ffa415fb715406231efbbd1dfdd6"; + sha256 = "1dnhawb73c89x58nl0iqhn1rvyw0wrhmvfkxdsh40rnpdbjkyrcn"; }; dependencies = []; @@ -552,22 +563,22 @@ rec { }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-04-16"; + name = "deoplete-nvim-2018-06-17"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "0d48792663437d81bdfa195c676d5c37ef10c89a"; - sha256 = "1zqrxxi7ci1mp5ml7nayj3crzpqgdl09q20wilp68kf2mvll28xi"; + rev = "62078d04aea43aceb7cbdcfc4b22cf8f7767f614"; + sha256 = "1gc6hl3yi7h2mzw2sf1phnaphwmalyfqd6lfzmzq0lzf111mq9r3"; }; dependencies = []; }; ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ultisnips-2018-04-16"; + name = "ultisnips-2018-04-30"; src = fetchgit { url = "https://github.com/SirVer/ultisnips"; - rev = "905e5249246169b6db2bb060e0a2b06eac1890e6"; - sha256 = "025b2f4gs04qb6wnxa0yclwm5jysdj6q10i2zkbiclvblfbxxv19"; + rev = "6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba"; + sha256 = "1zp3xcmxk6cn38zmxxy5s2wnw9djskwkmspq2s9vqliyhprf9sy3"; }; dependencies = []; @@ -585,11 +596,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2018-04-11"; + name = "vim-gitgutter-2018-06-01"; src = fetchgit { url = "https://github.com/airblade/vim-gitgutter"; - rev = "5481318fc1b97e7c04eab5496ec45c63335d6bc1"; - sha256 = "1jwqxkaqvkmdqi9k9nx25xz28av374a70izs0534hx12crgg8g3w"; + rev = "a986ab054788776dca269d6c289b470255d54e8c"; + sha256 = "0c0rjclqz8l1w1q6dfa2sxc67ns9vvg6q7yy2l0s5p7159d423iy"; }; dependencies = []; @@ -629,11 +640,11 @@ rec { }; vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-closetag-2018-03-09"; + name = "vim-closetag-2018-05-15"; src = fetchgit { url = "https://github.com/alvan/vim-closetag"; - rev = "aa14c2c1e7da4112e46ef6b287cacdd7af96da6f"; - sha256 = "058z8dzqki3idv7r5654xd91wplhhnsa2l533rszmkzji3hj2why"; + rev = "17367f433e095a66a8a885ab628033ce2a635aa1"; + sha256 = "11qkk1vsihw2sv1vdn94xjwm2p5hvisjv5h1arpdyxpnz45rs6vh"; }; dependencies = []; @@ -720,11 +731,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2018-04-17"; + name = "neomake-2018-06-02"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "df72c7a2f1bdcc08b5dbcd86f165fe7cd5eb6e1f"; - sha256 = "1vlc0irqkl27dyh52wci36fcj80a67fcb9q9cpcbr94lwh4l7l26"; + rev = "ed2d2069ef7d2e919fc73c993a2c99a05d12d79e"; + sha256 = "1sf1ad8qzya8vkj8kdkkd204hs0fn7wh3ar9wv4nq1ks7v2y2855"; }; dependencies = []; @@ -753,33 +764,33 @@ rec { }; vim-toml = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-toml-2018-03-06"; + name = "vim-toml-2018-06-15"; src = fetchgit { url = "https://github.com/cespare/vim-toml"; - rev = "624f02475080ea26d9430b8d31d7c3199b0ec939"; - sha256 = "0frjdv50rhd3awrddq25x4l22ca15i5587pgcmvwxz92y52484lx"; + rev = "85ba8277a6e331a56fce920d62bfdacce5bc5a80"; + sha256 = "0nnm4ja5j9gcsl9cv7ra30slrlpjpy4dsl0ykg0yhdq1vbby3m6n"; }; dependencies = []; }; denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-extra-2018-03-18"; + name = "denite-extra-2018-06-02"; src = fetchgit { url = "https://github.com/chemzqm/denite-extra"; - rev = "c48443ba1a27375b8a3c04b7b0a5b2c96c7ff62b"; - sha256 = "142s6c4af7h0jrnyl0smflg2wmkwsvhvly04rci3p54x59w7xdc5"; + rev = "54c2df37a2fa53e3caed4ad7391f85ff6dc7f0b1"; + sha256 = "0rsgd302h3rml98a9ddkaglp157av6yhbfbmc5i781k5pz003vvg"; }; dependencies = []; }; denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-git-2018-03-20"; + name = "denite-git-2018-06-05"; src = fetchgit { url = "https://github.com/chemzqm/denite-git"; - rev = "d1feb1470f667a5086ae45136642cefa5fc74810"; - sha256 = "001mwa6691a46lv9m9w8gb2syxgsny6ifv4l80f1chb7hjkblkhh"; + rev = "dfc8c8977133b2e00efa2d5add7ff05c36b2c1a3"; + sha256 = "1p4y22wwxvhxbgavandlld2rp2204g7vr162y0vsc0dm9lygvvm6"; }; dependencies = []; @@ -819,11 +830,11 @@ rec { }; csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "csv-vim-2018-04-15"; + name = "csv-vim-2018-06-12"; src = fetchgit { url = "https://github.com/chrisbra/csv.vim"; - rev = "5ca39450e6d40265086d929ff82ca2c9566fdc68"; - sha256 = "0i6j6c6027vpdcjq6znmkbdbbsdgwqb89jswkyhyx7ff3lwmzryq"; + rev = "eddfe4d553d2d25ffcf294e225717ddf9ae4c357"; + sha256 = "1074x0gycwaivadsa6g7mfhdf9rvyirhsfipby2pcvjrkbzvmz7j"; }; dependencies = []; @@ -852,11 +863,11 @@ rec { }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2017-07-07"; + name = "vim-tmux-navigator-2018-05-17"; src = fetchgit { url = "https://github.com/christoomey/vim-tmux-navigator"; - rev = "d724094e7128acd7375cc758008f1e1688130877"; - sha256 = "1n0n26lx056a0f8nmzbjpf8a48971g4d0fzv8xmq8yy505gbq9iw"; + rev = "d030f75e2932605cfc1417ca2ebb3fd5192c2a8e"; + sha256 = "1qfkzlg7g4ri54fhxnwwvh2xsm0hcnfxav7chdw10z3g984nzb1a"; }; dependencies = []; @@ -874,11 +885,11 @@ rec { }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2018-04-10"; + name = "ctrlp-vim-2018-06-11"; src = fetchgit { url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "4b9e7cac612902a25498cca49f13475fe1a821a4"; - sha256 = "1wa2kxiwipnxwd19gyv6grgqn0ms6zdxsj2xg80whkk3namlgg7m"; + rev = "306bc60a1bed48cee895623d03c87d84d00764b6"; + sha256 = "1ylzg9wjc1m4jgi6p3wk9nbip16cfhhgcbavly394j9w4zn3zdwy"; }; dependencies = []; @@ -907,11 +918,11 @@ rec { }; agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "agda-vim-2018-03-16"; + name = "agda-vim-2018-05-23"; src = fetchgit { url = "https://github.com/derekelkins/agda-vim"; - rev = "911a9695f550b47e4dedbe8a3dd1b6a9a745fe52"; - sha256 = "1bmi3d39hllrsnsy37dxhziffvs9qzns631gd9psk6xgcchkan7n"; + rev = "24169e70c1dbd784349b1551b6a3753680d9bb87"; + sha256 = "1bn2g89dvwccfl4ki07jb8iydb3d0s4rm7z5gv5q1bv3lccndax6"; }; dependencies = []; @@ -929,11 +940,11 @@ rec { }; vim-table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-table-mode-2018-03-22"; + name = "vim-table-mode-2018-05-16"; src = fetchgit { url = "https://github.com/dhruvasagar/vim-table-mode"; - rev = "e646bee5c45201b52f8f879eddf84b5c2e360e98"; - sha256 = "1kaszrik5mqrvavl0lzfy9i0r3b2vf1jmjxp23azy0jfanflrxwa"; + rev = "5483e163bd0a67e729e0e8436315f33f9e126baf"; + sha256 = "0mmpa7zhrj8mqf4931ldf6n9jlpfxc4kg8xdhqlp7srlnq4h8siw"; }; dependencies = []; @@ -962,11 +973,11 @@ rec { }; vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2018-04-13"; + name = "vim-2018-05-31"; src = fetchgit { url = "https://github.com/dracula/vim"; - rev = "7668d800a20c1f180bb49655d98378f2605ad616"; - sha256 = "07xcqickvw22yx5b91blvb463jn5dpn3drzf8y0nmpz08kfs4qfc"; + rev = "23e76f31abae2d3e090fcc25fbfcd8d8c9edd3bd"; + sha256 = "0zj749kc65dgqhsan65wagqlq45hg68m7qs07h1r12csfrr3r8x7"; }; dependencies = []; @@ -995,11 +1006,11 @@ rec { }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2017-08-17"; + name = "neco-ghc-2018-05-13"; src = fetchgit { url = "https://github.com/eagletmt/neco-ghc"; - rev = "faa033c05e6a6470d3d780e3931b4c9c72042009"; - sha256 = "01l5n4x94sb6bhjhjx2sibs8gm3zla7hb6szdfgbdmdf7jlzazak"; + rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; + sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; }; dependencies = []; @@ -1039,22 +1050,22 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2018-04-16"; + name = "vim-elixir-2018-05-25"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "36e54e1cf965d92f251ead359207d4a7b04cfdf2"; - sha256 = "0y296falc5l6k52vpw1f0bwzxgdbdjiljjg394s472228mnb2r3p"; + rev = "b916c00a7cdb6099dbebb6096eab55794751e2b3"; + sha256 = "1scg80j7kjjqfcswddwsig166zmipa9q6rm0kh8779i7qflgg4g0"; }; dependencies = []; }; elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "elm-vim-2017-07-09"; + name = "elm-vim-2018-06-16"; src = fetchgit { url = "https://github.com/elmcast/elm-vim"; - rev = "ae5315396cd0f3958750f10a5f3ad9d34d33f40d"; - sha256 = "0a85l0mcxgha4s5c9lzdv9y2c1ff942y9a5sfjihz6sph21c77xp"; + rev = "e7c2f9ce36e69608c2f289f75e22d068255eac1f"; + sha256 = "022xan3ss4rrfhdsz9dd5n6avk4nf6lxqqbgpx9v4lrnqy01dhd8"; }; dependencies = []; @@ -1094,11 +1105,11 @@ rec { }; ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ensime-vim-2017-08-27"; + name = "ensime-vim-2018-04-21"; src = fetchgit { url = "https://github.com/ensime/ensime-vim"; - rev = "d992b971a84afdfb2d99896d8aed537030e09a80"; - sha256 = "1rhrq3zplvpyli1ymqjmhq91p61ixpjz1v5xf68nvq4ax50nl45z"; + rev = "634cce6eae10a31cd6eec259890bdcda326ee3c2"; + sha256 = "03sr53680kcwxaa5xbqzdfbsgday3bkzja33wym49w9gjmlaa320"; }; dependencies = ["vimproc" "vimshell" "self" "forms"]; pythonDependencies = with pythonPackages; [ sexpdata websocket_client ]; @@ -1127,11 +1138,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2018-04-11"; + name = "vim-go-2018-06-16"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "7491209072ed4aa746e6fe7894f976ecd251801e"; - sha256 = "1a7fy8n9h383776jixlwxl8y3h8h5mixi0bcv4lv61x0g3xxh8gx"; + rev = "155836d47052ea9c9bac81ba3e937f6f22c8e384"; + sha256 = "1d16xninxwmqd6vgcjxzlqqynygb2h40lfmvwgp2cm60g2994fa3"; }; dependencies = []; @@ -1215,11 +1226,11 @@ rec { }; vim-codefmt = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-codefmt-2017-03-04"; + name = "vim-codefmt-2018-06-06"; src = fetchgit { url = "https://github.com/google/vim-codefmt"; - rev = "8bae55b45c3f030845ab636d6860cef4071915d1"; - sha256 = "0wg0fplpwsgkbycjx1ryl29afbfzfsdv0j7xisjik26m9q8shn1k"; + rev = "78f646545c4e1254fc413242e5c204a2dc79665d"; + sha256 = "0ysnjsc7nybm374k039655y1wijkh8p2m0hsfxf9cxf79yjinyql"; }; dependencies = ["maktaba"]; @@ -1237,22 +1248,22 @@ rec { }; vim-maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-maktaba-2018-04-09"; + name = "vim-maktaba-2018-05-06"; src = fetchgit { url = "https://github.com/google/vim-maktaba"; - rev = "77a4dcecd7d65ae2bf362bd7d9055d2806a8edf3"; - sha256 = "0fvspd6q0dj9bqnv8xavfx7xwmg5g68r1kksfv54bbzckkhkw28w"; + rev = "ffdb1a5a9921f7fd722c84d0f60e166f9916b67d"; + sha256 = "1cmhgd9xvx09l6ypks09gxqs1vad1bddinf4cx2jmd516bv8qss3"; }; dependencies = []; }; gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gitv-2017-11-26"; + name = "gitv-2018-06-10"; src = fetchgit { url = "https://github.com/gregsexton/gitv"; - rev = "4b7ecf354726a3d31d0ad9090efd27a79c850a35"; - sha256 = "0n2ddq0kicl2xjrhxi5pqvpikxa7vbf0hp3lzwmpapmvx146wi3w"; + rev = "41e4ffdbdb02374412d03c5680906ebee84dd5a2"; + sha256 = "1wfp3kkcvrccq0dqplg3ymyz9vdwn1c5wabh6mwfzbs2zx01vwcn"; }; dependencies = ["fugitive"]; @@ -1270,11 +1281,11 @@ rec { }; vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsdoc-2017-12-18"; + name = "vim-jsdoc-2018-05-05"; src = fetchgit { url = "https://github.com/heavenshell/vim-jsdoc"; - rev = "a164cb4c14b9063e82b6ccba96b4bc8b3a6d8f73"; - sha256 = "0f4hj2vd4l4rprizkg64q6dmm86f5yc9gk554a6f4kpagw2w9y76"; + rev = "5ef086789f5ac431d1d5aab53e771f00f1c25503"; + sha256 = "0f0dbcvbmha2nfadvf27crxkkxc1ps1inss5n66vy1p5bffv0bpm"; }; dependencies = []; @@ -1292,11 +1303,11 @@ rec { }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2018-04-16"; + name = "vim-snippets-2018-06-11"; src = fetchgit { url = "https://github.com/honza/vim-snippets"; - rev = "d081fa5117acdd972bd0a3ec1c0424e79ef6121e"; - sha256 = "0wrm5f15lf6hlyv9ca2a8jil14647acicsmaq34nr11gd375bvvc"; + rev = "62f46770378ab899f40c334de264ccd64dc2db57"; + sha256 = "1g55qhy81dh9x5rkzij3k7ain561gz1amyvg69cq44n6d7pz798h"; }; dependencies = []; @@ -1347,11 +1358,11 @@ rec { }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2018-04-14"; + name = "lightline-vim-2018-05-19"; src = fetchgit { url = "https://github.com/itchyny/lightline.vim"; - rev = "e54d2ae512c9c081bfff9303cb22ffa94ed48ba3"; - sha256 = "042sfdwj46yv0bmf0cm5vm24j197isc3asdj4ymxzh5d6jy2i5qb"; + rev = "555f202e33987863aaa31bf4df75ef989c3c49a7"; + sha256 = "0997k1wzlclwf4y70mv5zncv6vp9xdwgp5q7nickw6j9qf86gb84"; }; dependencies = []; @@ -1402,11 +1413,11 @@ rec { }; vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-test-git-2018-04-16"; + name = "vim-test-git-2018-05-30"; src = fetchgit { url = "https://github.com/janko-m/vim-test.git"; - rev = "61dbd5621bcf0fe74c1008083d7f103f041fc7c7"; - sha256 = "0r5nxspznniviy0j89pmvksgvyzrzvx1qivabbcds7i62vqrxyw0"; + rev = "062c489781c995f7e81103fec8a3c07bd2ff1f4b"; + sha256 = "0q4rnaqf5c979h10pacxxn7h3zv4zs9lf7f3z90avnlarh1sjvvx"; }; dependencies = []; @@ -1435,11 +1446,11 @@ rec { }; vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-buffergator-2017-02-05"; + name = "vim-buffergator-2018-05-02"; src = fetchgit { url = "https://github.com/jeetsukumaran/vim-buffergator"; - rev = "04dfbc0c78b0a29b340a99d0ff36ecf8f16e017d"; - sha256 = "1z13qqmvzismz7f6ss2pk956adnqh14df8qrlzk9rgplknm4w6k7"; + rev = "947b60dca4d4fc6a041a6ec84b17ca6736d1b916"; + sha256 = "1b6sw5858h3v7p46v1fiy06jnfwiwqsfqwhr46ia12d0rfdm538c"; }; dependencies = []; @@ -1479,22 +1490,22 @@ rec { }; vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nerdtree-tabs-2017-07-04"; + name = "vim-nerdtree-tabs-2018-05-05"; src = fetchgit { url = "https://github.com/jistr/vim-nerdtree-tabs"; - rev = "47bbe5afc26f701f08d31b2bbdb660f117367ded"; - sha256 = "0a1gqdvmpa4gylnb7sxs6zr89i60fl16p477200x18hgh2zd2v02"; + rev = "5fc6c6857028a07e8fe50f0adef28fb20218776b"; + sha256 = "051m4jb8jcc9rbafp995hmf4q6zn07bwh7anra6k1cr14i9lasaa"; }; dependencies = []; }; zenburn = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zenburn-2015-09-18"; + name = "zenburn-2018-04-29"; src = fetchgit { url = "https://github.com/jnurmine/zenburn"; - rev = "f7847fb1531b91e2b4bb4aed5db3146f07765179"; - sha256 = "1las12jznf25dkxrjk3s9l70c6wnpjisngmvi83bhw5gvx4c7mq5"; + rev = "2cacfcb222d9db34a8d1a13bb8bb814f039b98cd"; + sha256 = "0m5d5sjckirfpdhg9sf1nl5xywvzdx6y04r13m47jlavf79hhimi"; }; dependencies = []; @@ -1523,11 +1534,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2018-04-17"; + name = "fzf-vim-2018-05-28"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "bbda33b402d92d43c75827bd54ee1932cf03a7b6"; - sha256 = "02f16kdgs1ahsja84ls1zpjidcg1yx1bhpp39fd7zqqvzw16mf1q"; + rev = "ce82e10630830bc37a50f706cc3b7216d24e5009"; + sha256 = "081r1a4zqcr46rb4d39m8yj2dq1kiadh7n2iv7gxaqqldhx0p8pb"; }; dependencies = []; @@ -1721,11 +1732,11 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2018-04-15"; + name = "vimtex-2018-06-17"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "a7fc6f62e8234fc0696cfe4325153e922e2fddd5"; - sha256 = "0bvv9k3zqdmvh80mwhrzxwjacrfq1x56ba7yqndggygfxb3l17mf"; + rev = "13474370fa0cc5e547abd6f40a9b6fddf2712ae4"; + sha256 = "1rwj8i5k8xaa466ld1p5nxsvfk3g20g42l2xqa60s6jmjicn7km5"; }; dependencies = []; @@ -1743,11 +1754,11 @@ rec { }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2017-10-20"; + name = "vim-easymotion-2018-06-05"; src = fetchgit { url = "https://github.com/lokaltog/vim-easymotion"; - rev = "342549e7a1e5b07a030803e0e4b6f0415aa51275"; - sha256 = "1glv4s95v8xxj47n0jzjxd0pxphnnpgzyd384d2bh0ql1xgf320v"; + rev = "1a0244c90c3ff46219cf9597bb13662be4232407"; + sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy"; }; dependencies = []; @@ -1765,11 +1776,11 @@ rec { }; rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow-2017-04-21"; + name = "rainbow-2018-06-14"; src = fetchgit { url = "https://github.com/luochen1990/rainbow"; - rev = "1c45e0f81324641b23d4c21edda4eabeacba031b"; - sha256 = "143bkawg4sy1vbizfwb6p9alizyr80sr6incxrz179l9dp9r8frf"; + rev = "e7d115792f2a6bf6248d3f84a9025ae5e759868e"; + sha256 = "0zd7dcbrn7djx3nqnf8kkz8wzxcjla2b3bzqg2j7v9bjb3x3vdfl"; }; dependencies = []; @@ -1791,11 +1802,11 @@ rec { }; vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-highlightedyank-2018-04-17"; + name = "vim-highlightedyank-2018-06-01"; src = fetchgit { url = "https://github.com/machakann/vim-highlightedyank"; - rev = "6387f7cc3b768300d1fcf82d367dbcb8d16b6230"; - sha256 = "1ldyiy3qlxnxqkqa9yv39y5xkm7gma5gjy6nccqxxxjpjlyj39hb"; + rev = "eafae05916e670da8bc99e44b1534cd8c7f87c7a"; + sha256 = "1z6xjb9244fgnhmw21m7y3bd9vs9gvxbb9ig73iwy0ny886hjlnk"; }; dependencies = []; @@ -1901,33 +1912,33 @@ rec { }; vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grepper-git-2018-04-13"; + name = "vim-grepper-git-2018-04-24"; src = fetchgit { url = "https://github.com/mhinz/vim-grepper.git"; - rev = "27e73cfa7970bf38fe9037c0053a2edbb622b000"; - sha256 = "1hy9rjvfgry9426gflw4k5qmwzmijwg3gzmmzavf7m7sagl101kd"; + rev = "04d659c9e0a57e0c3e989069601d2a98df0386c4"; + sha256 = "16k5ahcn9i4wvlhw16j0gfgxw0clry72l78lk28qmx9p2gh1ka3g"; }; dependencies = []; }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2018-04-17"; + name = "vim-signify-2018-05-03"; src = fetchgit { url = "https://github.com/mhinz/vim-signify"; - rev = "8351e5212f9415ccc1d9696518e1ec4337ad539f"; - sha256 = "12gix280mmsgn1z1ihbvzh67xqribrc39h670fzyn6302dzb05p0"; + rev = "a1551dbae3b76035360b2ea2b38555194505d925"; + sha256 = "0wcfdcvbpl6hknsmzmpj86kbw1mfbfc55fza6kwad0lsw9ff5cix"; }; dependencies = []; }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2018-04-10"; + name = "vim-startify-2018-06-14"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "532f3db6be8c6e123abb3f6523c419b6b19436da"; - sha256 = "19inxsafsivdwgdvw59x3dbx65xkb09q0k2p66q4n57fj60bajmb"; + rev = "0b300f411f466f14f6832b3c97b7fb109f7b1ee3"; + sha256 = "0qjd2bnag4rr29yjkrxrzpkvfkb0912g2virj5rr26bbf8ya6s5q"; }; dependencies = []; @@ -1956,11 +1967,11 @@ rec { }; vim-yapf = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-yapf-2017-03-21"; + name = "vim-yapf-2018-06-05"; src = fetchgit { url = "https://github.com/mindriot101/vim-yapf"; - rev = "324380d77c9cf8e46e22b2e4391702273a53f563"; - sha256 = "0vsd53k5k8absc60qka8nlj2ij6k4zgff2a65ixc7vqcmawxr3nw"; + rev = "cae79733a1a39732c5305d4a89cd093d17cb917d"; + sha256 = "16bmzvzks6kbqm6dk908k23b9wj7qf3x8bz3kikrzj27s0p7s9cc"; }; dependencies = []; buildPhase = '' @@ -2003,11 +2014,11 @@ rec { }; vim-indent-guides = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-indent-guides-2017-07-03"; + name = "vim-indent-guides-2018-05-14"; src = fetchgit { url = "https://github.com/nathanaelkane/vim-indent-guides"; - rev = "b40687195c01caf40f62d20093296590b48e3a75"; - sha256 = "17hc3bdb707lkg0kyac2czjjijdrzarnh6sr78s9rqpwrj3fj4i4"; + rev = "54d889a63716ee2f1818aa2ec5082db47147147b"; + sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2"; }; dependencies = []; @@ -2025,22 +2036,22 @@ rec { }; vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easygit-2018-04-02"; + name = "vim-easygit-2018-05-15"; src = fetchgit { url = "https://github.com/neoclide/vim-easygit"; - rev = "db10f7bbe0106c7b74875d4530f0c20e6aceee51"; - sha256 = "194mgkyqxn4s8mj8gwkjznixm7kbpzhawr6f0bphk6bc5llphnkr"; + rev = "ada670f87f269e431b72cd7d63727683c46f3b4b"; + sha256 = "0shj52jzkhq89kw9wg4p89f1aidn9c0h6ishq56pdzzmqnjgzkdr"; }; dependencies = []; }; haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2018-04-13"; + name = "haskell-vim-2018-05-22"; src = fetchgit { url = "https://github.com/neovimhaskell/haskell-vim"; - rev = "e027b314df128979dbd00dd94c9db080db156b5c"; - sha256 = "13dx1ifwa444q8zkwda4qha74xjm4jfhhk9lbgbj9p1mj7gvbl7f"; + rev = "b1ac46807835423c4a4dd063df6d5b613d89c731"; + sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br"; }; dependencies = []; @@ -2114,44 +2125,44 @@ rec { }; vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-javascript-2018-04-06"; + name = "vim-javascript-2018-06-12"; src = fetchgit { url = "https://github.com/pangloss/vim-javascript"; - rev = "c99c96bdf12b5a5749c9bbdb977b070e14c15eb3"; - sha256 = "1lyiy7vfkliw91j6mvq77n4221fws6hkv0az362r32114d97309l"; + rev = "935125e2c481a65d344b11ddfdb2e5f903e24e72"; + sha256 = "1n4cij2in9i4f6mcj7wn9zn9i4xmxcrf6yn00bacx4f51l6qhhkr"; }; dependencies = []; }; vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-markdown-2018-03-23"; + name = "vim-markdown-2018-06-05"; src = fetchgit { url = "https://github.com/plasticboy/vim-markdown"; - rev = "8ace66328c7a2f416671b863cd842712d36c53cc"; - sha256 = "09pcxwwblq2bwdrq6qa42hw7sllgym42n7gb8igg6p9krkwvjx7s"; + rev = "6d2cb3c06cd546fd4bee4136679db3a3d5de97fa"; + sha256 = "17izjzgpwpl6i1vvz2hcd7ympgxyjmsb0k62rhvl15jmx06c3ysz"; }; dependencies = []; }; python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2018-04-09"; + name = "python-mode-2018-06-13"; src = fetchgit { url = "https://github.com/python-mode/python-mode"; - rev = "5308d0cc241080057a58c1772ebd254f2922998d"; - sha256 = "1pkwhl9ab1fybc4sp5721xzlrzhzigf34w8zlmxby8v4nvmb8ggq"; + rev = "bb746d0d0cba9adedbac856429e37a0dbfc599c6"; + sha256 = "1zlzlfz4arb2gi9ba5mdkpfkirhyk21g18cwx1f150b14baq734f"; }; dependencies = []; }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2017-10-15"; + name = "vim-racer-2018-05-13"; src = fetchgit { url = "https://github.com/racer-rust/vim-racer"; - rev = "da725d38a6f0dd223771018c05e62a33c4a92f09"; - sha256 = "16m9iw6x6wr26ilm72vwjsm9p346hbjd6md62mqk6ranln8rdirp"; + rev = "cd663ddacc89fb3cbbb9649f7cd36528960b1fe9"; + sha256 = "1k75ypgiy13l28mndi6p95lc818k04imlm7xk0y9sck8bsny1vhi"; }; dependencies = []; @@ -2202,11 +2213,11 @@ rec { }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2018-04-16"; + name = "vim-grammarous-2018-05-19"; src = fetchgit { url = "https://github.com/rhysd/vim-grammarous"; - rev = "fc7e73f2af96fb1745887dabde9bf8b945d0273d"; - sha256 = "0zfnbdsva140hc50s4fr1as5c1mn3hfm43x53sk50fylb51r9hr7"; + rev = "058db30bbd88e23fceb2f6364d9b22803d7c4c0d"; + sha256 = "1l2vhfsb0lhr5j77r8lgqnqgs9h9kdhw9bla1lj27xi0njbl4kql"; }; dependencies = []; # use `:GrammarousCheck` to initialize checking @@ -2255,11 +2266,11 @@ rec { }; nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nvim-completion-manager-2017-12-28"; + name = "nvim-completion-manager-2018-04-18"; src = fetchgit { url = "https://github.com/roxma/nvim-completion-manager"; - rev = "e724a442072261993ca503e969d2cb25722ab1d2"; - sha256 = "00q52vl06hgcinclszm21a3rx7ivc147p52w1p29icksc26yxhjb"; + rev = "3ef5ade36e7321aace4e9e22da216202bdcd65f1"; + sha256 = "0vfcnvdcxhs3in4pwcqjb5h3ns7ik53n4xb1h9r94w1gfw00lh1l"; }; dependencies = []; @@ -2277,22 +2288,22 @@ rec { }; vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-devicons-2018-03-14"; + name = "vim-devicons-2018-05-19"; src = fetchgit { url = "https://github.com/ryanoasis/vim-devicons"; - rev = "390b0142f1b6f02bdecc4867009e83c9ecc01db2"; - sha256 = "1pzvhdcgyp85xx858a7i357d3xymrd0y2afwfpnsrhz35fsaw96z"; + rev = "8ee4c8cdef4f6ea0f27b341ac077c303d0e57a90"; + sha256 = "1mfkg9miqg42qmzamlkhjc3mlqcri69d1pj6cs4kz3bdl7326ww6"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2018-04-07"; + name = "neoformat-2018-06-01"; src = fetchgit { url = "https://github.com/sbdchd/neoformat"; - rev = "77c2c007508823f353f75a6b525d63ae21e55e82"; - sha256 = "1xrvbkc8y40dgyiq5jnp0nhg19mh7m7v902hb9z3lkl6fsbcwbmb"; + rev = "ebe9ed941aea254e5fc6c3e2a0219054ff873e4b"; + sha256 = "0la3nvyi8kmp8pq6pkbhjc35wg6g28f903y7bz4igsajl37nijm1"; }; dependencies = []; @@ -2310,22 +2321,22 @@ rec { }; nerdtree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nerdtree-2018-04-10"; + name = "nerdtree-2018-06-15"; src = fetchgit { url = "https://github.com/scrooloose/nerdtree"; - rev = "727770147a7589ab3a06722f4852c0237c8b3549"; - sha256 = "105vgwy7qs6l92dm6kfby7lmxv35v2hbpjk9z5sr0qak5rad4m6c"; + rev = "d6032c876c6d6932ab7f07e262a16c9a85a31d5b"; + sha256 = "0s7z60rcdkziqqjc45adfqykpznv7aagfyfi5ybsxi5w4b8f2b9s"; }; dependencies = []; }; syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "syntastic-2018-04-17"; + name = "syntastic-2018-06-15"; src = fetchgit { url = "https://github.com/scrooloose/syntastic"; - rev = "d31e270cc8affc6338a9ed44e2efcaec0ca4cd34"; - sha256 = "121a1mxgfng2y5zmivyyk02mca8pyw72crivf4f1q9nhn0barf57"; + rev = "9e1b2a8620a0ff48a9f4e42a6e09b65a34ad2a6a"; + sha256 = "1765ish9vdm7abm7c45z4h4v1xdhfis7igm5yc3m5h7im33gl7j2"; }; dependencies = []; @@ -2343,11 +2354,11 @@ rec { }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2018-04-03"; + name = "vim-polyglot-2018-06-05"; src = fetchgit { url = "https://github.com/sheerun/vim-polyglot"; - rev = "cab6866e21341cab7419cdb4ae1fd18437d31bb0"; - sha256 = "17mizznm80yj5vz6vajwix8m8xmsn552lph5vmic5dpg7bcny6m6"; + rev = "33f610feb73ce782cf41a7d9a377541991c692b5"; + sha256 = "0sqsarrvy8flxlp0nj5782gzqvk3v6c7r6234pbpjwqga967h0fd"; }; dependencies = []; @@ -2365,11 +2376,11 @@ rec { }; denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-nvim-2018-04-14"; + name = "denite-nvim-2018-06-11"; src = fetchgit { url = "https://github.com/shougo/denite.nvim"; - rev = "c0c75a752577399be53aa7a7e235e6ff5387494c"; - sha256 = "1zbf2f0w02q8jwr824l6v0pxbc620rwfsah6mxyqbr5mxddcf1v6"; + rev = "ef3ffe7ffff25b0260be1e336dcd55014a6787a7"; + sha256 = "1zvin44fb9b11dciv1i14pwr3wc6yigsr4xmcg3gzaibr4mpng6b"; }; dependencies = []; @@ -2420,11 +2431,11 @@ rec { }; neoinclude-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoinclude-vim-2018-02-12"; + name = "neoinclude-vim-2018-05-22"; src = fetchgit { url = "https://github.com/shougo/neoinclude.vim"; - rev = "b63757822e0c31db04b32f0ca6bab01a560c2498"; - sha256 = "1q2pbvl0xspjzwnisnrmv6w9wq289avzz2248hnm0v20rxvy5lwj"; + rev = "2fa77b9211d3f10c29559b715b6863da67ae7d3a"; + sha256 = "0pdahb2z9q4dk67xkwvaqrlpai86slhncfb4gn88x40dlnd7rkbg"; }; dependencies = []; @@ -2442,22 +2453,22 @@ rec { }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2018-04-15"; + name = "neosnippet-snippets-2018-06-17"; src = fetchgit { url = "https://github.com/shougo/neosnippet-snippets"; - rev = "f453635c60998071299c3239c3d881f2be0c248e"; - sha256 = "1df6mzk5yjhjlmzgz7lr9aa69a973mzfxmwldqnpi6yjfnmjn04c"; + rev = "e5946e9ec4c68965dbabfaaf2584b1c057738afd"; + sha256 = "114w2vm28075bz85867lz0rzam1m0wk7dkbkm1lm0jbknbpk606n"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2018-03-12"; + name = "neosnippet-vim-2018-06-17"; src = fetchgit { url = "https://github.com/shougo/neosnippet.vim"; - rev = "8cf286e3bf7a5fc859f4c5f1bef52c351f24fefa"; - sha256 = "15mxckg5s9pjfm7xkhs4awx0vpmwdwwifqrvrh1r4mbia39pk6ry"; + rev = "978ef36165e83ba1f8ee0a2047b6c923f7842d33"; + sha256 = "083jfdwadjdv2pwbxmwz8m384m023zvzdszjnn6qkbgwimx5ga7m"; }; dependencies = []; @@ -2486,11 +2497,11 @@ rec { }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2018-04-14"; + name = "unite-vim-2018-06-17"; src = fetchgit { url = "https://github.com/shougo/unite.vim"; - rev = "7252fc334ed24722ad70867ba9e4aba125b611d7"; - sha256 = "0r2na9i15qfmshzk0wr845nyn8h8mpbkz5xanjibsch2xz6fps76"; + rev = "c175ba7df239a5971e4c189ecbc9486b160fbde2"; + sha256 = "16j5vhmqs04y5rps5g86bgpf91w067gyw9rz47hf0y0a52niy436"; }; dependencies = []; @@ -2515,16 +2526,6 @@ rec { ''; }; - vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2016-12-14"; - src = fetchgit { - url = "https://github.com/shougo/vimshell.vim"; - rev = "d0c5bef010237855b4de25863bc54895effe5d7a"; - sha256 = "13szswi1n04w66c4h701y47xblrba8ysxjwvmnfxb0pyd1x3gzgz"; - }; - dependencies = [ "vimproc-vim" ]; - }; - gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "gundo-vim-2017-05-09"; src = fetchgit { @@ -2537,11 +2538,11 @@ rec { }; alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist-vim-2018-03-22"; + name = "alchemist-vim-2018-04-23"; src = fetchgit { url = "https://github.com/slashmili/alchemist.vim"; - rev = "fdc880663e0d76d29d6310553ae12d51565f692d"; - sha256 = "03p5cw5j1j6v3x9gg61d95qzcijj1q0yqz5qdkjgll0fp507j8ak"; + rev = "d15033ce1b94aa1e6ba11c1bf1249d9680b24a45"; + sha256 = "0b0r236ah56zax7s095wq18j6bvfp267a3nfrndnszihwh7h2v1j"; }; dependencies = []; @@ -2581,22 +2582,22 @@ rec { }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2018-04-09"; + name = "vim-multiple-cursors-2018-04-17"; src = fetchgit { url = "https://github.com/terryma/vim-multiple-cursors"; - rev = "8ae5dd3f4f344cc2abe79783a8b808e4093bf084"; - sha256 = "0zj5dm86daqzl6f76prlfalpsb3vxxl7x1k6kza8hcbyicaxsi49"; + rev = "b781b1461bd4b346958309e1733a9d6ad1a66b6c"; + sha256 = "0hadbp2yj0kzcwj5rp18diq3b24xgxn46n7c29dgrjg91w4vagfd"; }; dependencies = []; }; vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimpreviewpandoc-2018-04-02"; + name = "vimpreviewpandoc-2018-05-12"; src = fetchgit { url = "https://github.com/tex/vimpreviewpandoc"; - rev = "83b0958b570dace55166f565e2d88c468d99d854"; - sha256 = "1fa8624wxry53x62xjmglgm6kwppfcg50ifbzms555bfjsd4fxn8"; + rev = "266d14d362f6c069863b2d63edb683e802e7e3ee"; + sha256 = "1qhc5vyk7vxrgq11dh1iwkz2a3zd7wfjvyirhhlpx1zx12d6l0ly"; }; dependencies = []; @@ -2625,11 +2626,11 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2018-04-16"; + name = "vim-quickrun-2018-05-07"; src = fetchgit { url = "https://github.com/thinca/vim-quickrun"; - rev = "630ddff167e30c55d21985713ad6729adeb8e40b"; - sha256 = "0r2gg3a8q5627n28xgyhmb6275xwvg76ghc1wdy38xdszvykh024"; + rev = "4b493faaeb5322f11cadab52e39a53164baf9db7"; + sha256 = "0081m3v8dg4ihxsd0rzhmrra3i6vrnpz0svgjmm689rk55dkrv5i"; }; dependencies = []; @@ -2691,44 +2692,44 @@ rec { }; vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-commentary-2018-04-06"; + name = "vim-commentary-2018-05-30"; src = fetchgit { url = "https://github.com/tpope/vim-commentary"; - rev = "296d99b353261191adb7a356ee3fefbce8e6096b"; - sha256 = "1n29rbgm2464byncmgxbvyizmag1gzswg00nfg2387nwprmpg7zj"; + rev = "7f2127b1dfc57811112785985b46ff2289d72334"; + sha256 = "0ck221cj0zwn19p0vlzv0vl26rjlsnfpllslrqjh5g57m5cxb8aq"; }; dependencies = []; }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2018-04-15"; + name = "vim-dispatch-2018-06-02"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "f6b3e7799e6dce08869d7744aa7faa6528f065f5"; - sha256 = "1zn6c54hlygkx348vd7kgkfpdj93vsijhc2ma42k6s7vhwqfyylg"; + rev = "47729b7831421f20fa40a7d5b3e9b928faf18e75"; + sha256 = "0wmvfqzw785c9bda0p4vlsavm0d59dmmnhs87jvqfijzyi2prj1l"; }; dependencies = []; }; vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2018-03-16"; + name = "vim-eunuch-2018-05-28"; src = fetchgit { url = "https://github.com/tpope/vim-eunuch"; - rev = "0971b4cb5c0865d3dd0316f725cd4236ff75b828"; - sha256 = "1lw2ycgxypp0j8kyvlgn8hivqf1dj9rfrx8n7zgayy5w756g45cy"; + rev = "e57666aa8d3a87b42c5ec429490bbf4a54f4c31d"; + sha256 = "01sz7mhckhnwlp48rkl34cz4nkjwrkdc1rq4mbknd3yscg1w259d"; }; dependencies = []; }; vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-fugitive-2018-04-15"; + name = "vim-fugitive-2018-06-15"; src = fetchgit { url = "https://github.com/tpope/vim-fugitive"; - rev = "40d78f07dee2ffab68abb9d6d1a9e27843df0fe0"; - sha256 = "16fh3n8sr57cfhfpilqhz9f3svhj4swa9yqjf4wicbw9zn40hrir"; + rev = "d39d5ca4299569a5d1a37a511d1a5eccef71b037"; + sha256 = "1657x01ihw96hnbnflyzxc88qpyj2lm6dnl84xs1ckzw3iqsw6ki"; }; dependencies = []; @@ -2779,11 +2780,11 @@ rec { }; vim-sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sleuth-2018-03-30"; + name = "vim-sleuth-2018-05-24"; src = fetchgit { url = "https://github.com/tpope/vim-sleuth"; - rev = "3b9df28c39f93c5ec8179d958900be1d0100b536"; - sha256 = "10rba71hmmbgv5kfsl0lmj59z1nz7b2rr6p0dmww82zp6cyzy5j0"; + rev = "478e495d40434fb42c655ea2881c8c6b114ecd49"; + sha256 = "1dicdxxfd5sywk02hbpknbr100n96qggy3zy5v520dxdknq0sccz"; }; dependencies = []; @@ -2801,22 +2802,22 @@ rec { }; vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-surround-2016-06-01"; + name = "vim-surround-2018-06-15"; src = fetchgit { url = "https://github.com/tpope/vim-surround"; - rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313"; - sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46"; + rev = "aa1f120ad3a29c27cc41d581cda3751c59343cce"; + sha256 = "1vblmvmbl9k2fzm0fjlbvvbb5izyljaxg187s29cp6p4xm0frcql"; }; dependencies = []; }; vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-vinegar-2018-04-03"; + name = "vim-vinegar-2018-06-06"; src = fetchgit { url = "https://github.com/tpope/vim-vinegar"; - rev = "97f3fbc9596f3997ebf8e30bfdd00ebb34597722"; - sha256 = "0y2nzvn4xxbgyjmm4mirwak4hnzka2g3w8xm64f1smh4cb3jn0yf"; + rev = "bc2d57e2f57551171370b4458c6198041b11750c"; + sha256 = "0f0pasz9r9qqdnlcc6zj94kh4dnslydb7zfdjhdj2salqm3hnpd7"; }; dependencies = []; @@ -2845,22 +2846,22 @@ rec { }; caw-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "caw-vim-2018-01-01"; + name = "caw-vim-2018-06-16"; src = fetchgit { url = "https://github.com/tyru/caw.vim"; - rev = "50efcd94e00dc3e814bcc0d3d8ccfa3ff324ea42"; - sha256 = "06hpby2amh2pb4dlfd7s6wybzc8rh8wa3jz0gyv6xx3l91agfari"; + rev = "e82ae00f3fc03289d4054b44f100025a1bc81939"; + sha256 = "16sbrc34nxbrgpj8gyi1drwh52qg3z2nq4frd5f2nfgxsgjrjjjc"; }; dependencies = []; }; open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "open-browser-vim-2018-03-11"; + name = "open-browser-vim-2018-04-26"; src = fetchgit { url = "https://github.com/tyru/open-browser.vim"; - rev = "43b08d6642f26af5a875b0d0bdb3aa9a6d12e7eb"; - sha256 = "162dv172n16jpjr812d561yyj9rz9xn4qrfx18wlpyixj3qf2bda"; + rev = "de4eeb085051e9b56dd5574eba7c7e72feb21246"; + sha256 = "1fgp4wwizpknfwscxraqqaxrhvwp9l1mnjwj3llk2x0n9qcqf1db"; }; dependencies = []; @@ -2878,11 +2879,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2018-04-16"; + name = "youcompleteme-2018-06-10"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "6975efddc1a90514db7c8ee882ccac91f70ff4cc"; - sha256 = "1zmbb91fc0axavxln4milmn95d9szx8zwdiiwqjdyybkm29nxhc9"; + rev = "e49f817bfe7a7400efcc0b6527188ff6395f996f"; + sha256 = "19cnixx08aqirb9yw2k3glklmyna075x1d9szzpg8ml557v9qgnn"; }; dependencies = []; buildPhase = '' @@ -2904,22 +2905,22 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2018-04-17"; + name = "vim-airline-2018-06-13"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline"; - rev = "3ad4a18d858bb80d45a1c054b845021abe5c8f0d"; - sha256 = "1sgf9czgajba8nf7xbfa2dm26vw356ca55m1myaxlkqrlcckcvav"; + rev = "45c9621157b5bc851804bfed57b8a504d55757b0"; + sha256 = "0g4g5fa0qy6hagic590sksa8z6xlmigdan64bya06jr9m7fd8a1a"; }; dependencies = []; }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2018-03-24"; + name = "vim-airline-themes-2018-06-14"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline-themes"; - rev = "b0fca80555b8249f3c62271b7635542a7de22363"; - sha256 = "1ap7b7v1v3n4hpnj2w24w0dli2sliphvpyfhkdbhbq4c30znm1pk"; + rev = "b35f952a6ae6768ae2c6a9f4febc7945cc311f74"; + sha256 = "1j9y9irrzsq1bwp3b22ls016byi0yc9ymigzhw0n180rk6nb36c7"; }; dependencies = []; @@ -2959,11 +2960,11 @@ rec { }; vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ruby-2018-04-01"; + name = "vim-ruby-2018-06-02"; src = fetchgit { url = "https://github.com/vim-ruby/vim-ruby"; - rev = "71f5df78a45c5458da793b2c897ff5dcdcd9a819"; - sha256 = "1nblkhb1yp3q0rfq43l9968inn1z26vngf28n23y161ncfmq674y"; + rev = "1e4c6fdf4450a01208911c079538e1a2ed128ec6"; + sha256 = "0xnnk0sd3z8v5hvdxy7rljvzfvdl63dqvd3kiksw4kzj7j8gcbkg"; }; dependencies = []; @@ -3157,44 +3158,44 @@ rec { }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2018-04-17"; + name = "vimwiki-2018-06-12"; src = fetchgit { url = "https://github.com/vimwiki/vimwiki"; - rev = "90dc1e58717bd25798bb16d3badab8908b619912"; - sha256 = "01a2gy1r4k5gw7vrdn6p0vmybb2s0gf9q0w07qps5cnxapsggxk9"; + rev = "9f8b0082dbd99e706cc18de2076f7a66c2ca0a90"; + sha256 = "0q9ik2shvg9lcavds2y7ffsj34zl5ichprm2sylz2bfhjcqgsslw"; }; dependencies = []; }; ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2018-04-17"; + name = "ale-2018-06-17"; src = fetchgit { url = "https://github.com/w0rp/ale"; - rev = "f9ba3d924fc445ceea6ab7a6700b95dd12d268ca"; - sha256 = "12905gq95xif3963720yqywvzpvxz7j8qyk0i6pnmzjf92xnk8xm"; + rev = "24fe1953110455f7f3305db2a8e5abc2aa6821af"; + sha256 = "0m47h33w73k6p0p4i8rhqpnp8jn5siyjzwyhgv5nk3ydci5y1mmy"; }; dependencies = []; }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2018-04-05"; + name = "vim-wakatime-2018-05-25"; src = fetchgit { url = "https://github.com/wakatime/vim-wakatime"; - rev = "e0e7621f18a8763b851b0feb4a735633bf147cf7"; - sha256 = "1xnrcxd7r08hqrv2fnv8x8p60nx2flh2pfcr4pkkscr0ilinakwz"; + rev = "3d88d49551c15f6abd9fecd2480ef75f0d8cbe40"; + sha256 = "1lm4j5c67q4al1ymqnr0zlbdgql0381rl65v78vyai8vzaj98m14"; }; dependencies = []; buildInputs = [ python ]; }; targets-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "targets-vim-2018-02-28"; + name = "targets-vim-2018-05-27"; src = fetchgit { url = "https://github.com/wellle/targets.vim"; - rev = "c1732189c9ec29cc3320094304019ffcafadafc4"; - sha256 = "12ryicmb29qhmn216xdv9g8rl170mz5zrbfnmqja3wdlwkj3g83j"; + rev = "c3042dc18acc0dfcee479310d3efc6aefe92db75"; + sha256 = "0shnlgwrxzrd0m3k6hnmr66i2l4zknp0pn7f71d2frx937gih34q"; }; dependencies = []; @@ -3260,22 +3261,22 @@ rec { }; nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nim-vim-2018-02-27"; + name = "nim-vim-2018-05-20"; src = fetchgit { url = "https://github.com/zah/nim.vim"; - rev = "bdc19809d22190d9b8e85377252a24d930cd25f8"; - sha256 = "08abwnzim767jvin6jsp2a580hpxzb2w5hbf8w5dhkvxv2pgk0vz"; + rev = "704dd5d63cac54c22fe25c6efbcf18796df412e7"; + sha256 = "0azk3m33c47ja24iirlrjqphmd8rzlivinqkx69izmd7l150ds2m"; }; dependencies = []; }; deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-go-2018-02-04"; + name = "deoplete-go-2018-05-20"; src = fetchgit { url = "https://github.com/zchee/deoplete-go"; - rev = "513ae17f1bd33954da80059a21c128a315726a81"; - sha256 = "0rfxzryccrq3dnjgb9aljzrmfjk7p8l2qdjkl8ar4bh2hmz8vn5y"; + rev = "977fb75b38b82528d179f1029d1852900332dedc"; + sha256 = "114ypdawgj5k2gx1ff48z7yzk14b7gc68s4ijnb1yww2qxa2g9wm"; }; dependencies = []; buildInputs = [ python3 ]; @@ -3288,22 +3289,22 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2018-04-07"; + name = "deoplete-jedi-2018-05-13"; src = fetchgit { url = "https://github.com/zchee/deoplete-jedi"; - rev = "eb777b50b7d218a23464c7d58c8573b5223d52f4"; - sha256 = "1j2jfvgzj2y7pp8z441rs8ffbn1hmiwa7h556kf6mjlmyzs5cfma"; + rev = "45f1ac2cf44e6a0c10298e07b4d308b84e94a80d"; + sha256 = "03590rabdycbwjp0h36crb0jsavw5mln77hl107mb737rq2dgmah"; }; dependencies = []; }; zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zig-vim-2018-04-15"; + name = "zig-vim-2018-06-10"; src = fetchgit { url = "https://github.com/zig-lang/zig.vim"; - rev = "eba14b79890b674432a78291ff0f16de4da2ed08"; - sha256 = "1yj7gijwbsc1vrxlb158pf083ahrpgg5g7j3gjrkrazdcmmx5d2j"; + rev = "e35f63823edcf1dd35fa3deb262e6eed0cac4f8c"; + sha256 = "0vr6hh4vnpi6gbr3d54xip2n6s4j5xaiiqvzpa4pl6vfnqixazq5"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index fcc4fcaa76f..02988df045f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -201,7 +201,6 @@ "github:shougo/tabpagebuffer.vim" "github:shougo/unite.vim" "github:shougo/vimproc.vim" -"github:shougo/vimshell.vim" "github:SirVer/ultisnips" "github:sjl/gundo.vim" "github:slashmili/alchemist.vim" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimshell.vim b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimshell.vim deleted file mode 100644 index 5be23305079..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimshell.vim +++ /dev/null @@ -1 +0,0 @@ - dependencies = [ "vimproc-vim" ]; From 6d5cb130affc6754d4006ed6130bee863bac8e86 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 17 Jun 2018 23:25:41 +0300 Subject: [PATCH 110/265] not-detected: use lib.mkDefault --- nixos/modules/installer/scan/not-detected.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/scan/not-detected.nix b/nixos/modules/installer/scan/not-detected.nix index 903933e2df0..baa068c08db 100644 --- a/nixos/modules/installer/scan/not-detected.nix +++ b/nixos/modules/installer/scan/not-detected.nix @@ -1,9 +1,6 @@ -# List all devices which are _not_ detected by nixos-generate-config. -# Common devices are enabled by default. -{ config, lib, pkgs, ... }: - -with lib; +# Enables non-free firmware on devices not recognized by `nixos-generate-config`. +{ lib, ... }: { - hardware.enableRedistributableFirmware = true; + hardware.enableRedistributableFirmware = lib.mkDefault true; } From 1824d10a12e93bb60351359dbd8acd0764eaa07f Mon Sep 17 00:00:00 2001 From: "Samuel W. Flint" Date: Sun, 17 Jun 2018 15:51:22 -0500 Subject: [PATCH 111/265] ical2org: init at v.1.1.5 --- pkgs/tools/misc/ical2org/default.nix | 27 +++++++++++++++++++++++++++ pkgs/tools/misc/ical2org/deps.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/tools/misc/ical2org/default.nix create mode 100644 pkgs/tools/misc/ical2org/deps.nix diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix new file mode 100644 index 00000000000..51509e7448b --- /dev/null +++ b/pkgs/tools/misc/ical2org/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, buildGoPackage}: + +buildGoPackage rec { + name = "ical2org-${version}"; + version="v.1.1.5"; + + goPackagePath = "github.com/rjhorniii/ical2org"; + + src = fetchFromGitHub { + owner = "rjhorniii"; + repo = "ical2org"; + rev = "${version}"; + sha256 = "0hdx2j2innjh0z4kxcfzwdl2d54nv0g9ai9fyacfiagjhnzgf7cm"; + fetchSubmodules = true; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Convert an iCal file to org agenda format, optionally deduplicating entries."; + homepage = https://github.com/rjhorniii/ical2org; + license = licenses.gpl3; + maintainers = with maintainers; [ swflint ]; + platforms = platforms.unix; + } + +} diff --git a/pkgs/tools/misc/ical2org/deps.nix b/pkgs/tools/misc/ical2org/deps.nix new file mode 100644 index 00000000000..b948fac3d11 --- /dev/null +++ b/pkgs/tools/misc/ical2org/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/rjhorniii/ics-golang"; + fetch = { + type = "git"; + url = "https://github.com/rjhorniii/ics-golang"; + rev = "da66d6f502fac65073773ea3779cae2959545cb2"; + sha256 = "1mm5rssvyjk29n1gq4l5xw26gm8bhvbzrs5c059i41zh9af121px"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a3bbc772ed..dfd570d832e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -396,6 +396,8 @@ with pkgs; useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh; + ical2org = callPackage ../tools/misc/ical2org {}; + iconConvTools = callPackage ../build-support/icon-conv-tools {}; From 976828f36aaa33833c8c1b9094c8b72a7d2a4f4c Mon Sep 17 00:00:00 2001 From: "Samuel W. Flint" Date: Sun, 17 Jun 2018 16:46:29 -0500 Subject: [PATCH 112/265] ical2org: fix missing semicolon --- pkgs/tools/misc/ical2org/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index 51509e7448b..decc4afde0b 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -22,6 +22,6 @@ buildGoPackage rec { license = licenses.gpl3; maintainers = with maintainers; [ swflint ]; platforms = platforms.unix; - } + }; } From a2a83755a2a5cfa17f911c971a5bddd208a31fff Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 18 Jun 2018 00:09:29 +0200 Subject: [PATCH 113/265] ycmd: 2017-11-05 -> 2018-06-14 (#42080) Fixes build with boost 1.67 --- pkgs/development/tools/misc/ycmd/default.nix | 13 +++----- .../tools/misc/ycmd/dont-symlink-clang.patch | 33 ------------------- 2 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 5f90525feca..2eb9b453661 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "ycmd-${version}"; - version = "2017-11-05"; + version = "2018-06-14"; src = fetchgit { - url = "git://github.com/Valloric/ycmd.git"; - rev = "0ca16e7ba3a9078b697befdce64104e61829aa3b"; - sha256 = "0bs94iv521ac2n53n3k8mw3s6v0hi3hhxhjsr0ips3n99al8wndi"; + url = "https://github.com/Valloric/ycmd.git"; + rev = "29e36f74f749d10b8d6ce285c1453fac26f15a41"; + sha256 = "0s62nf18jmgjihyba7lk7si8xrxsg60whdr430nlb5gjikag8zr5"; }; nativeBuildInputs = [ cmake ]; @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { ${python.interpreter} build.py --system-libclang --clang-completer --system-boost ''; - patches = [ ./dont-symlink-clang.patch ]; - configurePhase = ":"; # remove the tests @@ -53,8 +51,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release} - cp -r third_party/JediHTTP $out/lib/ycmd/third_party - for p in waitress frozendict bottle python-future argparse requests; do + for p in jedi waitress frozendict bottle python-future requests; do cp -r third_party/$p $out/lib/ycmd/third_party done diff --git a/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch deleted file mode 100644 index 6199758de52..00000000000 --- a/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt -index 133c987a..33625271 100644 ---- a/cpp/ycm/CMakeLists.txt -+++ b/cpp/ycm/CMakeLists.txt -@@ -359,28 +359,6 @@ if( LIBCLANG_TARGET ) - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${PATH_TO_LLVM_ROOT}/bin/libclang.dll" "$" - ) -- else() -- add_custom_command( -- TARGET ${PROJECT_NAME} -- POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$" -- ) -- -- if( NOT APPLE ) -- # When loading our library, the dynamic linker may look for -- # libclang.so.x instead of libclang.so.x.y. Create the corresponding -- # symlink. -- get_filename_component( LIBCLANG_NAME ${LIBCLANG_TARGET} NAME ) -- string( REGEX REPLACE "([^.]+).([0-9]+).([0-9]+)$" "\\1.\\2" -- LIBCLANG_SONAME ${LIBCLANG_NAME} ) -- add_custom_command( -- TARGET ${PROJECT_NAME} -- POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E create_symlink -- "${LIBCLANG_NAME}" -- "$/${LIBCLANG_SONAME}" -- ) -- endif() - endif() - endif() - From 65f16a5818939a4fc971ab11b7736ac52b545fe8 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 17 Jun 2018 18:26:16 -0400 Subject: [PATCH 114/265] dbeaver: 5.1.0 -> 5.1.1 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 84150a4c32c..36aca5e1729 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.0"; + version = "5.1.1"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "041wqlipkwk4xp3qa4rrwyw6rgsn1ppv25qb4h2mkhrsjcjagqhj"; + sha256 = "1ll1q585b7yca9jrgg7iw7i6xhyy1wc9q8hjqj1g3gzdagbrf396"; }; installPhase = '' From d60127fd8c43b0c8c4dc572dc53464ee28a24f56 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 18 Jun 2018 00:07:06 +0200 Subject: [PATCH 115/265] nifskope: 1.1.3 -> 2.0.dev7 `nifskope` v2 contains a lot of new features and a new, QT5-based UI (see https://github.com/niftools/nifskope/releases). Additionally the 2.0 sourcetree exists for quite a while and after some short user tests it seems fairly stable. The following aspects have been changed: * Use QT 5.9 rather than QT4 (see #33248). * GCC7 support from upstream (gcc6 patch not needed anymore, build on GCC7 works fine), disabled `-Werror=format-security` can be used again as compiler flag. * Patched broken paths in `NifSkope_targets.pri` to point to the proper dependencies (otherwise `` and `qhull` couldn't be found). * Patched paths in `NifSkope.pro` to `lupdate` and `lrelease` (default `QT_*` paths point to `libsForQt5x.qtbase` which doesn't contain the needed binaries, instead they need to point to `libsForQt5x.qttools`). * Added myself as maintainer. --- pkgs/tools/graphics/nifskope/default.nix | 91 +++++++------ .../nifskope/external-lib-paths.patch | 33 +++++ pkgs/tools/graphics/nifskope/gcc-6.patch | 123 ------------------ .../graphics/nifskope/qttools-bins.patch | 22 ++++ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 107 insertions(+), 164 deletions(-) create mode 100644 pkgs/tools/graphics/nifskope/external-lib-paths.patch delete mode 100644 pkgs/tools/graphics/nifskope/gcc-6.patch create mode 100644 pkgs/tools/graphics/nifskope/qttools-bins.patch diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 19aa7f00f14..c5651d0418e 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -1,57 +1,68 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, makeWrapper }: stdenv.mkDerivation rec { - name = "nifskope-1.1.3"; + name = "nifskope-${version}"; + version = "2.0.dev7"; - src = fetchurl { - url = "https://github.com/niftools/nifskope/releases/download/${name}/${name}.tar.bz2"; - sha256 = "0fcvrcjyvivww10sjhxamcip797b9ykbf5p3rm2k24xhkwdaqp72"; + src = fetchFromGitHub { + owner = "niftools"; + repo = "nifskope"; + rev = "47b788d26ae0fa12e60e8e7a4f0fa945a510c7b2"; # `v${version}` doesn't work with submodules + sha256 = "1wqpn53rkq28ws3apqghkzyrib4wis91x171ns64g8kp4q6mfczi"; + fetchSubmodules = true; }; - patches = [ ./gcc-6.patch ]; + patches = [ + ./external-lib-paths.patch + (substituteAll { + src = ./qttools-bins.patch; + qttools = "${qttools.dev}/bin"; + }) + ]; - buildInputs = [ qt4 ]; + buildInputs = [ qtbase qttools libGLU.dev makeWrapper ]; + nativeBuildInputs = [ qmake ]; - nativeBuildInputs = [ qmake4Hook ]; - - preConfigure = - '' - for i in *.cpp gl/*.cpp widgets/*.cpp; do - substituteInPlace $i --replace /usr/share/nifskope $out/share/nifskope - done - ''; - - qmakeFlags = [ "-after TARGET=nifskope" ]; + preConfigure = '' + shopt -s globstar + for i in **/*.cpp; do + substituteInPlace $i --replace /usr/share/nifskope $out/share/nifskope + done + ''; enableParallelBuilding = true; - hardeningDisable = [ "format" ]; + # Inspired by install/linux-install/nifskope.spec.in. + installPhase = let + qtVersion = "5.${stdenv.lib.versions.minor qtbase.version}"; + in '' + runHook preInstall - # Inspired by linux-install/nifskope.spec.in. - installPhase = - '' - d=$out/share/nifskope - mkdir -p $out/bin $out/share/applications $out/share/pixmaps $d/{shaders,doc,lang} - cp release/nifskope $out/bin/ - cp nifskope.png $out/share/pixmaps/ - cp nif.xml kfm.xml style.qss $d/ - cp shaders/*.frag shaders/*.prog shaders/*.vert $d/shaders/ - cp doc/*.html doc/docsys.css doc/favicon.ico $d/doc/ - cp lang/*.ts lang/*.tm $d/lang/ + d=$out/share/nifskope + mkdir -p $out/bin $out/share/applications $out/share/pixmaps $d/{shaders,lang} + cp release/NifSkope $out/bin/ + cp ./res/nifskope.png $out/share/pixmaps/ + cp release/{nif.xml,kfm.xml,style.qss} $d/ + cp res/shaders/*.frag res/shaders/*.prog res/shaders/*.vert $d/shaders/ + cp ./res/lang/*.ts ./res/lang/*.tm $d/lang/ + cp ./install/linux-install/nifskope.desktop $out/share/applications - substituteInPlace nifskope.desktop \ - --replace 'Exec=nifskope' "Exec=$out/bin/nifskope" \ - --replace 'Icon=nifskope' "Icon=$out/share/pixmaps/nifskope.png" - cp nifskope.desktop $out/share/applications/ + substituteInPlace $out/share/applications/nifskope.desktop \ + --replace 'Exec=nifskope' "Exec=$out/bin/NifSkope" \ + --replace 'Icon=nifskope' "Icon=$out/share/pixmaps/nifskope.png" - find $out/share -type f -exec chmod -x {} \; - ''; # */ + find $out/share -type f -exec chmod -x {} \; - meta = { - homepage = https://github.com/niftools/nifskope/; + wrapProgram $out/bin/NifSkope --prefix QT_PLUGIN_PATH : "${qtbase}/lib/qt-${qtVersion}/plugins" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = http://niftools.sourceforge.net/wiki/NifSkope; description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd3; + maintainers = with maintainers; [ eelco ma27 ]; + platforms = platforms.linux; + license = licenses.bsd3; }; } diff --git a/pkgs/tools/graphics/nifskope/external-lib-paths.patch b/pkgs/tools/graphics/nifskope/external-lib-paths.patch new file mode 100644 index 00000000000..a7f329caf74 --- /dev/null +++ b/pkgs/tools/graphics/nifskope/external-lib-paths.patch @@ -0,0 +1,33 @@ +diff --git a/NifSkope.pro b/NifSkope.pro +index 1c0bc5a..cc29fc5 100644 +--- a/NifSkope.pro ++++ b/NifSkope.pro +@@ -330,14 +330,14 @@ nvtristrip { + } + + qhull { +- !*msvc*:QMAKE_CFLAGS += -isystem ../nifskope/lib/qhull/src +- !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/qhull/src ++ !*msvc*:QMAKE_CFLAGS += -isystem ./lib/qhull/src ++ !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/qhull/src + else:INCLUDEPATH += lib/qhull/src + HEADERS += $$files($$PWD/lib/qhull/src/libqhull/*.h, false) + } + + gli { +- !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/gli/gli -isystem ../nifskope/lib/gli/external ++ !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/gli/gli -isystem ./lib/gli/external + else:INCLUDEPATH += lib/gli/gli lib/gli/external + HEADERS += $$files($$PWD/lib/gli/gli/*.hpp, true) + HEADERS += $$files($$PWD/lib/gli/gli/*.inl, true) +@@ -346,8 +346,8 @@ gli { + } + + zlib { +- !*msvc*:QMAKE_CFLAGS += -isystem ../nifskope/lib/zlib +- !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/zlib ++ !*msvc*:QMAKE_CFLAGS += -isystem ./lib/zlib ++ !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/zlib + else:INCLUDEPATH += lib/zlib + HEADERS += $$files($$PWD/lib/zlib/*.h, false) + SOURCES += $$files($$PWD/lib/zlib/*.c, false) diff --git a/pkgs/tools/graphics/nifskope/gcc-6.patch b/pkgs/tools/graphics/nifskope/gcc-6.patch deleted file mode 100644 index 2bb8af9cfe4..00000000000 --- a/pkgs/tools/graphics/nifskope/gcc-6.patch +++ /dev/null @@ -1,123 +0,0 @@ -Based on https://github.com/niftools/nifskope/commit/7261b0a119a549b11006d8e41ba990d706171f1c - -diff -ru -x '*~' nifskope-1.1.3-orig/gl/dds/ColorBlock.cpp nifskope-1.1.3/gl/dds/ColorBlock.cpp ---- nifskope-1.1.3-orig/gl/dds/ColorBlock.cpp 2012-11-17 23:40:31.000000000 +0100 -+++ nifskope-1.1.3/gl/dds/ColorBlock.cpp 2017-09-10 10:50:36.766909836 +0200 -@@ -78,8 +78,8 @@ - - void ColorBlock::init(const Image * img, uint x, uint y) - { -- const uint bw = min(img->width() - x, 4U); -- const uint bh = min(img->height() - y, 4U); -+ const uint bw = std::min(img->width() - x, 4U); -+ const uint bh = std::min(img->height() - y, 4U); - - static int remainder[] = { - 0, 0, 0, 0, -diff -ru -x '*~' nifskope-1.1.3-orig/gl/dds/Common.h nifskope-1.1.3/gl/dds/Common.h ---- nifskope-1.1.3-orig/gl/dds/Common.h 2012-11-17 23:40:31.000000000 +0100 -+++ nifskope-1.1.3/gl/dds/Common.h 2017-09-10 10:48:08.462099032 +0200 -@@ -33,14 +33,10 @@ - #ifndef _DDS_COMMON_H - #define _DDS_COMMON_H - --#ifndef min --#define min(a,b) ((a) <= (b) ? (a) : (b)) --#endif --#ifndef max --#define max(a,b) ((a) >= (b) ? (a) : (b)) --#endif -+#include -+ - #ifndef clamp --#define clamp(x,a,b) min(max((x), (a)), (b)) -+#define clamp(x,a,b) std::min( std::max( (x), (a) ), (b) ) - #endif - - template -diff -ru -x '*~' nifskope-1.1.3-orig/gl/dds/DirectDrawSurface.cpp nifskope-1.1.3/gl/dds/DirectDrawSurface.cpp ---- nifskope-1.1.3-orig/gl/dds/DirectDrawSurface.cpp 2012-11-17 23:40:31.000000000 +0100 -+++ nifskope-1.1.3/gl/dds/DirectDrawSurface.cpp 2017-09-10 10:48:45.912056969 +0200 -@@ -63,6 +63,7 @@ - #include "DirectDrawSurface.h" - #include "BlockDXT.h" - #include "PixelFormat.h" -+#include "Common.h" - - #include // printf - #include // sqrt -@@ -685,8 +686,8 @@ - // Compute width and height. - for (uint m = 0; m < mipmap; m++) - { -- w = max(1U, w / 2); -- h = max(1U, h / 2); -+ w = std::max(1U, w / 2); -+ h = std::max(1U, h / 2); - } - - img->allocate(w, h); -@@ -787,9 +788,9 @@ - readBlock(&block); - - // Write color block. -- for (uint y = 0; y < min(4U, h-4*by); y++) -+ for (uint y = 0; y < std::min(4U, h-4*by); y++) - { -- for (uint x = 0; x < min(4U, w-4*bx); x++) -+ for (uint x = 0; x < std::min(4U, w-4*bx); x++) - { - img->pixel(4*bx+x, 4*by+y) = block.color(x, y); - } -@@ -909,9 +910,9 @@ - - for (uint m = 0; m < mipmap; m++) - { -- w = max(1U, w / 2); -- h = max(1U, h / 2); -- d = max(1U, d / 2); -+ w = std::max(1U, w / 2); -+ h = std::max(1U, h / 2); -+ d = std::max(1U, d / 2); - } - - if (header.pf.flags & DDPF_FOURCC) -diff -ru -x '*~' nifskope-1.1.3-orig/gl/gltexloaders.cpp nifskope-1.1.3/gl/gltexloaders.cpp ---- nifskope-1.1.3-orig/gl/gltexloaders.cpp 2012-11-17 23:40:31.000000000 +0100 -+++ nifskope-1.1.3/gl/gltexloaders.cpp 2017-09-10 10:51:23.586839810 +0200 -@@ -1736,8 +1736,8 @@ - - // generate next offset, resize - mipmapOffset += mipmapWidth * mipmapHeight * 4; -- mipmapWidth = max( 1, mipmapWidth / 2 ); -- mipmapHeight = max( 1, mipmapHeight / 2 ); -+ mipmapWidth = std::max( 1, mipmapWidth / 2 ); -+ mipmapHeight = std::max( 1, mipmapHeight / 2 ); - } - - // set total pixel size -@@ -1932,11 +1932,11 @@ - { - if ( ddsHeader.ddsPixelFormat.dwFourCC == FOURCC_DXT1 ) - { -- mipmapOffset += max( 8, ( mipmapWidth * mipmapHeight / 2 ) ); -+ mipmapOffset += std::max( 8, ( mipmapWidth * mipmapHeight / 2 ) ); - } - else if ( ddsHeader.ddsPixelFormat.dwFourCC == FOURCC_DXT5 ) - { -- mipmapOffset += max( 16, ( mipmapWidth * mipmapHeight ) ); -+ mipmapOffset += std::max( 16, ( mipmapWidth * mipmapHeight ) ); - } - } - else if ( ddsHeader.ddsPixelFormat.dwBPP == 24 ) -@@ -1947,8 +1947,8 @@ - { - mipmapOffset += ( mipmapWidth * mipmapHeight * 4 ); - } -- mipmapWidth = max( 1, mipmapWidth / 2 ); -- mipmapHeight = max( 1, mipmapHeight / 2 ); -+ mipmapWidth = std::max( 1, mipmapWidth / 2 ); -+ mipmapHeight = std::max( 1, mipmapHeight / 2 ); - } - - nif->set( iData, "Num Pixels", mipmapOffset ); diff --git a/pkgs/tools/graphics/nifskope/qttools-bins.patch b/pkgs/tools/graphics/nifskope/qttools-bins.patch new file mode 100644 index 00000000000..5d85f9ef4fd --- /dev/null +++ b/pkgs/tools/graphics/nifskope/qttools-bins.patch @@ -0,0 +1,22 @@ +diff --git a/NifSkope_targets.pri b/NifSkope_targets.pri +index 05324c2..d8389b1 100644 +--- a/NifSkope_targets.pri ++++ b/NifSkope_targets.pri +@@ -11,7 +11,7 @@ else:EXE = "" + ## lupdate / lrelease + ############################### + +-QMAKE_LUPDATE = $$[QT_INSTALL_BINS]/lupdate$${EXE} ++QMAKE_LUPDATE = @qttools@/lupdate$${EXE} + exists($$QMAKE_LUPDATE) { + # Make target for Updating .ts + updatets.target = updatets +@@ -23,7 +23,7 @@ exists($$QMAKE_LUPDATE) { + message("lupdate could not be found, ignoring make target") + } + +-QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease$${EXE} ++QMAKE_LRELEASE = @qttools@/lrelease$${EXE} + exists($$QMAKE_LRELEASE) { + # Build Step for Releasing .ts->.qm + updateqm.input = TRANSLATIONS diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45e62452181..e1aaa6364cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4066,7 +4066,7 @@ with pkgs; niff = callPackage ../tools/package-management/niff { }; - nifskope = callPackage ../tools/graphics/nifskope { }; + nifskope = libsForQt59.callPackage ../tools/graphics/nifskope { }; nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; From 7de340761d73139541a2234babc4cc0cd18abd9c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Jun 2018 03:59:02 +0200 Subject: [PATCH 116/265] gnome3.grilo: clean up --- pkgs/desktops/gnome-3/core/grilo/default.nix | 26 +++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix index 08a6b784e9b..ab35a3bd35a 100644 --- a/pkgs/desktops/gnome-3/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib -, libxml2, gnome3, gobjectIntrospection, libsoup, python3Packages }: +{ stdenv, fetchurl, pkgconfig, file, intltool, vala, glib, liboauth, gtk3 +, gtk-doc, docbook_xsl, docbook_xml_dtd_43 +, libxml2, gnome3, gobjectIntrospection, libsoup }: let pname = "grilo"; @@ -7,6 +8,9 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; + outputs = [ "out" "dev" "man" "devdoc" ]; + outputBin = "dev"; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0vh67gja6yn7czh77ssmx6ncp99fl2926pbi2hplqms27c2n8sbw"; @@ -14,20 +18,24 @@ in stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ]; + configureFlags = [ + "--enable-grl-pls" + "--enable-grl-net" + "--enable-gtk-doc" + ]; preConfigure = '' for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do - substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/" + substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$dev/share/gir-1.0/" substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0" done ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ file intltool glib libxml2 libsoup - gnome3.totem-pl-parser ]; - - propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ]; + nativeBuildInputs = [ + file intltool pkgconfig gobjectIntrospection vala + gtk-doc docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ glib liboauth gtk3 libxml2 libsoup gnome3.totem-pl-parser ]; passthru = { updateScript = gnome3.updateScript { From 69384eb47f20d4d9357ad67f4583d3aa331da491 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Jun 2018 04:50:30 +0200 Subject: [PATCH 117/265] =?UTF-8?q?gnome3.totem:=203.26.0=20=E2=86=92=203.?= =?UTF-8?q?26.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/totem/default.nix | 21 ++++---------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index f852e053cde..df37377e52e 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -6,34 +6,25 @@ stdenv.mkDerivation rec { name = "totem-${version}"; - version = "3.26.0"; + version = "3.26.1"; src = fetchurl { url = "mirror://gnome/sources/totem/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; + sha256 = "10n302fdp3lhkzbij5sbzmsnln738029xil6cnng2d4dxv4n1099"; }; doCheck = true; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobjectIntrospection wrapGAppsHook ]; buildInputs = [ gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop gnome3.gsettings-desktop-schemas tracker nautilus - ]; - - propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; - - patches = [ - (fetchurl { - name = "remove-pycompile.patch"; - url = "https://bug787965.bugzilla-attachments.gnome.org/attachment.cgi?id=360204"; - sha256 = "1iphlazllv42k553jqh3nqrrh5jb63gy3nhj4ipwc9xh4sg2irhi"; - }) + python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins ]; postPatch = '' @@ -43,10 +34,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" - # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 - # https://bugzilla.gnome.org/show_bug.cgi?id=784236 - # https://github.com/mesonbuild/meson/issues/1994 - "-Denable-vala=no" ]; wrapPrefixVariables = [ "PYTHONPATH" ]; From bb08686f1e3c274979f842e8d405e381b1e41658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Mon, 18 Jun 2018 09:46:47 +0200 Subject: [PATCH 118/265] opensmtpd module: allow changing the package --- nixos/modules/services/mail/opensmtpd.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index 53acdba4245..f9b890532ce 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -10,7 +10,7 @@ let sendmail = pkgs.runCommand "opensmtpd-sendmail" {} '' mkdir -p $out/bin - ln -s ${pkgs.opensmtpd}/sbin/smtpctl $out/bin/sendmail + ln -s ${cfg.package}/sbin/smtpctl $out/bin/sendmail ''; in { @@ -27,6 +27,13 @@ in { description = "Whether to enable the OpenSMTPD server."; }; + package = mkOption { + type = types.package; + default = pkgs.opensmtpd; + defaultText = "pkgs.opensmtpd"; + description = "The OpenSMTPD package to use."; + }; + addSendmailToSystemPath = mkOption { type = types.bool; default = true; @@ -97,7 +104,7 @@ in { systemd.services.opensmtpd = let procEnv = pkgs.buildEnv { name = "opensmtpd-procs"; - paths = [ pkgs.opensmtpd ] ++ cfg.procPackages; + paths = [ cfg.package ] ++ cfg.procPackages; pathsToLink = [ "/libexec/opensmtpd" ]; }; in { @@ -115,7 +122,7 @@ in { chown smtpq.root /var/spool/smtpd/purge chmod 700 /var/spool/smtpd/purge ''; - serviceConfig.ExecStart = "${pkgs.opensmtpd}/sbin/smtpd -d -f ${conf} ${args}"; + serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}"; environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd"; }; From 9cb3f3504f818a70dab575c485e866585ca02f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 18 Jun 2018 09:57:45 +0200 Subject: [PATCH 119/265] copyq: 3.3.1 -> 3.5.0 (#42100) --- pkgs/applications/misc/copyq/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 75a402ba231..7b34674c218 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst, git +{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst +, qtx11extras, git , webkitSupport ? true }: stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.3.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "1jjb979dwdnkjca95yxzapbjpd6hr97hxz7sn614whvdv4vvpnyc"; + sha256 = "0hzdv6rhjpq9yrfafnkc6d8m5pzw9qr520vsjf2gn1819gdybmr0"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ - git qtbase qtscript libXfixes libXtst + git qtbase qtscript libXfixes libXtst qtx11extras ] ++ stdenv.lib.optional webkitSupport qtwebkit; meta = with stdenv.lib; { From 1aac733ccd79d0003a4be2dcd378e1b8125f61be Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 18 Jun 2018 16:04:27 +0800 Subject: [PATCH 120/265] firefox-devedition-bin: 61.0b12 -> 61.0b14 --- .../firefox-bin/devedition_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index d8d58c0fe16..8dd7d4752b7 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "61.0b12"; + version = "61.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ach/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ach/firefox-61.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "076d627bb6fba278807793b5b41b944595626f80f5c1b92cf61d3c4be8c3c35c08139b57349ca08b2f0f23aceb7af755d94332a1e11483f03a813bda400371bd"; + sha512 = "1b8e2e92cc7489a9876aa4b8082f3285a1db6ced460597f05f4843f3858eb4fe858b5d87e641480836526bd7b718d033a24fc1a2b9bdf0504dfebbc5e7a292c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/af/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/af/firefox-61.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "b3e0f4fef73c0714f5a8d54b21278137a83fbaed1056b4201bbfe9a227f6406d6f962f676707641ed7d9c3a3d225ed90879803d7101b84950d4fbc7d7bebf8e4"; + sha512 = "d1b77553f03b06de6fa6d8e3a308105b885690d2eaa21a066f89ad35c5475633a3f4d63536dca33c737dfe2e84dba9c05a09c011cab7bc4356b4158dc122662e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/an/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/an/firefox-61.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "10087d953477a93cc4ef842b3e54cda8e41236d1a50737538dade9eea0849698106ba25ac506d83fa3baa1773b98b1a7545b0e2c28224a6d9f55d4805e4f448d"; + sha512 = "b8ff7e36c2b826da7d69352abd2f2ce6661298ea09b1f457ccfeaf9d271ad49358b2a6947bba47bee506c102c59fc1426a92f09e3e9591693e4fd6c8fe84ea18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ar/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ar/firefox-61.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "aeabe46628f508010dbd51a8961ffb1fe6d8941376758e165ce3f286bcaff8764b4c38afa494875407e99d44175bcea744aad4b331f49ef2fe1828133478cf76"; + sha512 = "108a6b8f7af9915c20a11bce0bf1c2096d8ee09fcec394325faf0142eff1452d493e5a5c894ae3061ffdb63b2f19b127446f2b86339ddff309120df37e113bdf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/as/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/as/firefox-61.0b14.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "a2699f209952f310939ed4e605380940391f212a6649b73b0b850ba9cb575fe6b7fd56e09631658245edfc3b45f53979fbc1e522334e49607124d4b1d1091f7e"; + sha512 = "b4368567ebe0ca46aeaf48b23e75bb972f88af82ed692d72b4fa1aab8f89e16f09974810c4fb333bcb30b5d2f9cdb50a39a42ff73fa53c2511a1adbd0713c060"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ast/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ast/firefox-61.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "e06bd557142c7f25fc450f52c405e93e9aea03b9774054fa361a16849f46cf52919f9d09f1c7897f7c96a32825891f5677faac5994b1a8ce4ecfa03f97c8062c"; + sha512 = "3ca40ec6844c55e7beb3e6ee7a3a7604a92560830ad060feb7cca5118bffe4d2b5f6ca8af6f98d07eb6a970814a33d38b0516ea339f07b0e2c8e55a79a031bae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/az/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/az/firefox-61.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "496899ac014db2ec2044df67b62e4a78c4f8a65708c141bb33e0234691ef4d68c0e6338e6664d40e18f29d6892600bda71fb27083c5d23b1c492018a35b02026"; + sha512 = "3bcd5e17dcd0debd02bb79aae488ad6f158e6e45aad6ef49ba6e6d69e894e5513c7b1e27c4d90df9423717d1d8f1b5f02c1dcc42e2255d5ad0727095e9ade169"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/be/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/be/firefox-61.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "fe3c134af6a3023d91f2ee022eea6febfeba3901af6d60492121503ea464b506942885de2a93a58c1b1302c8dadb26915695ecb6866864901f6b263ebaca8c3f"; + sha512 = "bb1168d80f4947e5de3872c02ec5f472381b1b59aec5cb4a05788556db462702c99e36f67ecbd52029856badaf255a9a8ff692f37b6d5c7166d73255b097057c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/bg/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bg/firefox-61.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "37c2a30520cffa6374e28020cdbcb1e4fba124e42dc78d1806e6ccd973265e1d6c6f7a74a3b9510e1059b49b44198e75c7d056baf6553ecce4e522641ef8d0f6"; + sha512 = "52b93a4eb34c083ee824cbeed17a65396c8916b4313a080d43dddbe0fbc1e80b84030a201e98ce259e24eca7bbcf89f83442779c60660104d28c683471ff4f78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/bn-BD/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bn-BD/firefox-61.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "e123698c813009b7ad982e42c7e91a43f86576d71bf4fbc0fddb092de28cd6b3f213cd1abec52bdc7c779c5385847aac3637b1a00ce2754341a736f1815f6c3b"; + sha512 = "f387009c1e447e276dc042e1ad0c39661d32dde20e3ae1a4c5f57c6c3acd154ffeacce170843f8a5d04f26d9c1c44fb933899f8253f38690944bed38dc339d72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/bn-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bn-IN/firefox-61.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "16e8d4f623e78333df9cfd72a03b30ebd54c3cb26d6583cc009b278288495f971e33183334a59931f2d00d59efc37eab51327743075cbf2c2c1c985c86d06379"; + sha512 = "fbfd8c0d7ba2038505bde3172d736d851e64600738c28ac9a414e0f859ac7c7b264b23a9a2921e20b2cb9a99d5c371dad7e186e1a5910415debb203dd08bcc3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/br/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/br/firefox-61.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "7c4678353845207626bb2b886a0b2dec87f0fc86c370085afefcdaf470d4d67f74f4e20631257700c309efba9d301e4092b5daa1f3b85ea691f9885c307fb3f7"; + sha512 = "c0a7900802be77222c156690df96e3ee03d88d4888b0dc31d45dd46d29d19a13b97141c68b002f39b657cd96463152c358b45e78368f72884529af51991b8512"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/bs/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bs/firefox-61.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "a201de963c3dfebe369f1fc8f04784e69ad06aa6402aad9853c822d43223d211732b1fada85ae3fc72b68ba14c4bacf516787880d421e81efcb1f27fad782e0e"; + sha512 = "391a2b1aa85ec4bf010c7051565b9168b0bb71dca5a4f40368781efb690d838412859c8bab34c14ae168d3bb9bdbe538c6a38dff11e138aec9f179ae52cda7d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ca/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ca/firefox-61.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "d79adefe980e53658d591c1dd2b4ad6e3ebffe22a6723b23cb052a24c30e0face2bb0a7678661018ef1f47cb65ba37838bb705f1cf601f9a6c3647b34b685ebd"; + sha512 = "7655c923e92f356e3d893dddb01a966bcc7ee89f035ae1e8caee681605fcd54c3e6497225700d9eacd099374f0a3fff3050a529354018963e3df40ee3fccc86e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/cak/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/cak/firefox-61.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "eea0c8306c265d85ae6c8f2c8a0cb9233e6798b81228c65e6afd62cbb529b57d4f43c5f00033f62b2d3eea2220dc2c6cf614d04682f82102dabceb399c0b11fa"; + sha512 = "daea430b504dbc276e6b7b8091acced1b7842a97045184bad7867f98033feed98b7ebbab922f25f828c031e189b3d437aade6cc7060eb982068c2cd8d977409b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/cs/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/cs/firefox-61.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "f55e4f7e0c75ff9f6e73eacbffed28a85cc3a561f60390d42ac8ed8550cd2bbf3c4592bb8119646c246779eb102b79a6bb046498c06c0c9529e2ce559ef08248"; + sha512 = "a6cc36eda14619d4fce6fd2304f0027130ad92cdbaf0e88e3077deb721b9740bfd99d62d22c67cd35286c082374c53df782452227e69364e414f92f16dd96741"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/cy/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/cy/firefox-61.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e431d678fccbe04769821132f5abe84778940fc0a61210ab6e3bbbdd2506530baa19ca53c75d7212726eed8ea10d226f90f314bd68ebaa0bc21f509fc932ec3a"; + sha512 = "df0589ec3b22f6a320b3890a6f2beefa99fc2688de6c4afa0f8a879b830d249f4aac4cae1599895edb7e6196ffc02213188d461b07c7242ad29ffbc9901c1c66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/da/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/da/firefox-61.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b4e2ea82061651644db144c56296df53d7a401f72ba999220dbfe6339e3233be65b8195709881cf3a4210c463f851fe2806b9a87a7567911c031fbb0b11e947f"; + sha512 = "d6c97c376384c742bf0cba9eb4cfa011ecf1500a7e6c518041c30acd6227df9b8300b156935216ea112956bb0291bd925935b940d372ef8b57a19357e5074d15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/de/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/de/firefox-61.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "0603e12a1f7f9f5c478abff3012f94d0124e657c327fc851010f01e5f2bf213b829d680ca1d0119a55bd4ff2475e37323cd0bd9ee656a266a6c87fbd2c159989"; + sha512 = "a5781c0515280f5b4fb80f4eaf373a62f591e924466668667885554dc1086e48006cfe0645140bf53b877d078a08c4a1ce209c9dd0985ea28b9fa5579137045b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/dsb/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/dsb/firefox-61.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c7ed913ae77520203acdbe32069d239a3c3ab5dd03e6fcf2556909eeb9b8dd94f49405d036275481fb49f376009fcc72b6676d0380b520d8e57b70be2034b94e"; + sha512 = "ec5eaa244ad1f6bafec67ed2017d16560be5ba2f66e5788c54fc643a748e1e834a7eb11869c5aef233f1d1d7322b15bdbabfc0a6bd6a46011397203911607cc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/el/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/el/firefox-61.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "7c54f4b2c905854e7deb59b18c44d8868518aceeecb340d9b287f502aa3a62e317ac7e86439915ab03eee8151fe2573946fdf10944ec271f64d3dd73b272cdf6"; + sha512 = "8e4a7d9e778b85caf16e2144189338bf3beb577d057c3416dc45be315eaa4d8a9f26180aabdf1de28cfbc3a6545ed8304e04bb112392a5c49046261a7976fc33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/en-GB/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/en-GB/firefox-61.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "531a49323ab069376afe6aa7d925e517a90ad9304127d8f5a7c740f0a5f09e45b9b161a1283419c02438d5099b5b6f7d61149ad988564504b00ee7b007c664e0"; + sha512 = "bf5cfef892fb906accc0db406b5e3b3389f338719ee29605b2296151ef8a0f2d4916f8b3dd31cd52e79262a4747252d4b553b170c185e181ed2895aa7130cffb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/en-US/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/en-US/firefox-61.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "7b9af92e0718abebdc64a5f4c5ca1e3b26838c58f2d92a3fe189d1fc1e593815d6a7ffb5970a9d02c7172a3e8ba1dee8294337e29c43e2f2fbb2998042f26143"; + sha512 = "52c5502b6423b7ce3140f3eb62e274874595761dc996a200442f21b5611c97534734fd93b90340f719d01d0557e2aa18d88137217f8c40a23b2bf50577a820f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/en-ZA/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/en-ZA/firefox-61.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "7c6f80d57f2d9ca8c98601f05290018a323c1d2103caa71f712f0006fcb0885864989f07e77a2bde4edab1ed2fcbdce22962eee7fb5917bb43eb5b73fdd41692"; + sha512 = "55f251447753564f7db3973c72e1007f1ebc356cdf6c3765dcc6a5352c931f39f7d7e46ffae72b1b4dda59bf2917a09eaecf33cc30b976f78bc7922466a2a9e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/eo/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/eo/firefox-61.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "89813e89b4cd363458113ea9fa4428b43ce978aed19d4e9236268f6ee9de8a739adf0cf3ee397548592eea74750c37195a8e189567c0fc853d9b010fe394bdd0"; + sha512 = "d008d4e0614e3490ffc7951ad7413ee57d84ce1d17563bd69ebb7bed7f5d362231b497d6ac142003aaaba8129683b24fc3fe6c2612b674ead893ed0e500d9ca6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/es-AR/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-AR/firefox-61.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "4f86c38d1c056259b7d27241d805575dfcb2a71afd593c638f0c3ed3488d9a8e6c9125735378e22fe7ed47bbe61d56b743755b6331e3621733dbdadf1afbec7f"; + sha512 = "ebee62d32b2e7d48561ebab7a387b06f06f4c1553cacf814b846bc8cd58a708c397b2e642b67f31617047e34b3baecce7ea9e0177606cf92e386d22f7276a941"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/es-CL/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-CL/firefox-61.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "fdc42f6d6c96c24a08e0ce6a34bb2be21e314ddad090107e6640f4d761e2ed8304211f071ee6ca71aec7f3e36fe0b618b72da72a29ba12456a8a6b1b13392edc"; + sha512 = "35f964ebc3133704d95cc1ecdf0cfab7c7902b7d22608d0711dfc5badabd262df52f10516a5a3c4635bbc3fa5dfce2e7c73a9362c58768f54a38abbb4a8ff55c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/es-ES/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-ES/firefox-61.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ad2e4d68fc63d93bba2267fda419e3e227ee07d4084673bc1942c3bf8f48a87af9b01f5639561ad302ed9f6ba325c8a4bbcbb3618bc58b8d0a6272bcdfe167fe"; + sha512 = "c728a0cf0d75739be5db224a49e1c91e779456b75769898d1097b443e3348e12ec11e6626bd72512e5d81ae22201be55043bc0f82ca74123178cb637f8e44bbb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/es-MX/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-MX/firefox-61.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "700e5d01b2f130dcda65df25121d09f55fbacc52ab58e2f32fbcbe2cfbc591e6552e4157b64c4bf31b3fc02f85bec7ea9276c948a023a89987ff1a1ff4dcae33"; + sha512 = "58c2ab98acc72d0e5421f6d14194a0c6a14a443290fb1461ee45abed3086b5bd6977c0ad4f083ad2c7b7cc84e39f02621b248c6ec0c50823d15c2778636ff6d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/et/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/et/firefox-61.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e576b557e08ae12aea5db28c1be4fe0d48469196c854b78c750560325f29b347b8c2600a5df97258dd0b104a888ca2fcc6d03068a8ea78b0bbecf08022b7ca5a"; + sha512 = "b73a8057c6a8ce7091d0d9717ee67790ec13faf7eb27b2dcc696a465c291e24fa7e9630c7c0382dc3de2f477c7b476e84687a0fa49f84ee1aeb7b4ef47c76e13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/eu/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/eu/firefox-61.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "6d2175348912f8b07b76c9c3750040efce9cacf3ea79a27353a2cf4ae70d6240b0b4c4d40c1c07291518da49ead715a7e8f65ef33be623365dcfd462ee237cc5"; + sha512 = "956df7dc028b820af5679b731578331b98d146e843da68796f878e939e8f9ce60355dce3d28093b4cbcb2052083f29c5e412afd502307895553f8254f3e18b3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/fa/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fa/firefox-61.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9c3f1e65f56421334108ac9206cbaaa4eebb761447f993037c1b6790996db9bbe19b2a75843e746e482cea4281ba571ae3874b2323efea10eba559a74f6d4e10"; + sha512 = "5a2f480f6c7e120eabc19f629de687cf4bca8c824b0c693aacbbf7d0b7c577097b03e5eab2570bd127cc36963c85599ea1355f2ced07d283ff8ee964779167f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ff/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ff/firefox-61.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "bb2600a4ccba282bfcc3b26a44cfd13adc72083d333613fb17cb927358a61f505c74a727ffce5943ec1cc37239e1149874beaf404699bc49ecc17397aa578487"; + sha512 = "afc19bb38a30a1227babd3b011ee1639cafe154f72b67bed65f897b7584ed8509ecb59f176380cb1ae0f6068926686e3473ec63ae8b68a75cbe5c8c32aa97224"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/fi/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fi/firefox-61.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "b1fdd37d5a661145173594d2e5ad3add713f1843c55c20d282c6967c0a98de7d91f42ee4dfdf54b482195b3ba7ed4e94dd65667632bc75df250312aae4d1932e"; + sha512 = "dab0cc26ab4cc2f700867140715e4f5a63d272b053550d69783e20794e167a4b323e054d91ac9f0aa05c4b82c60618fc37a9cb6003ff8d92cc6b39781e25ed78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/fr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fr/firefox-61.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "dd04b9c12290b0e54d7aa19330e3902cb131e9e390f091674d16a857797cd106461e63ef65be71fd912e6b8979dc534c3e66c89c64a2cadc427422e9dac22ded"; + sha512 = "6946a4375ec4abaccf6326acbdb775dc2c9c866e8b41eb1978b7e9525f0865b5c6e5b6541a04405abe294600eb97b53f2fc3dc25dfb2c0760861be25075466e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/fy-NL/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fy-NL/firefox-61.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "6a2f60be75f6e0812f4e7defbd9f483669a4c4a4d6d59a5bc8490a35e0520ec231186c6769384c768395e27ae660820fee8fa4e9d0049715e5503d4e55431623"; + sha512 = "e718d94a1d5c1bfb5f19317f6eff382c2ba5549561bdefaf1c67c1a51e68cf291b7f77dcc8a4141b53abdfda9e7f3806166a9675c55f1f3397e9c1bd41f74598"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ga-IE/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ga-IE/firefox-61.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "b61bd25b1b9010f70c2deb0cda49838d89abef4c4c1ce0d2b7334195d9871957fc0aa4a38d278ccd05171671a92ab7bb1578331481492aa0a4cc5b5ec0ea75c3"; + sha512 = "31f571ae0eaece944002b1c4541b8894d860bc8987d0c914cc78fc2f5e202f4c8733b48e350f443f513e998f654bf6fca1fff80811f380c2c8babedb5d7a1f02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/gd/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gd/firefox-61.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "9afffdb255895026cb963ad9e24690710948decb53bc254e363cb3d96fa2aba3714748858e0d0158682678e8c4cd9cfbf6fde24f180e07ebb017b814cde43714"; + sha512 = "f288337f68922425589edb57cd49e9d1d468a60d9172c5d514719e5c2e2d1fcd3ccde7f2581cd58a9b94c9241cde3e2a3ff24304e452459808ab74100ab30242"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/gl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gl/firefox-61.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "65c39926daf8664a306d85936421bdae622f16a26c86cd7c8d6ba928d5cb76b3fc0e75bb7b484317d7e6f8f2b6b00d016711f70a24f271051c3ffbc7702e80c1"; + sha512 = "bb33fd8d03f49cc1c993d9d95aea3c8b739fc25b266ad394b725d16cbdf06e55a0330ef1a9f749b0b55b6724eb310470dae8cbd0927f90a9f321290beaec971b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/gn/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gn/firefox-61.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "1c605598cf858fb46b1931503019f644fe1ae0e93fdc36193fde6e9d4667926a477e1b3b51722a496e8f55fbba2ff65e6c7209a2a3bf47ec0f5106924a1184f8"; + sha512 = "2b3edfc6fd42a8bffd0035512ac3ef8393acb051852af6368f772a683cdafe28c278f305f77936e03a2b8273233ea583ba12d5709d1a61735c328283a57936f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/gu-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gu-IN/firefox-61.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "b4bea06a476fac58407a54358fb56cdaf26853f19c5f87ba90d8d8fce27d959e333abb5ded0c960ab3faefb45abda2aa54c40ab1dbb7ae2e342e1601fa89bf9b"; + sha512 = "8dcc7f8461e7a296a07f74864e853d063409bf73fe7edd8e35be9ee18bddda7f2f8307ffd36e9e2fe5c13e777ceef8718b58894a81a963bf35b3dc40f04e3976"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/he/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/he/firefox-61.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "997b1e8e7fb8036bde2785ec0b1a2fd1f3cc00bfdf4d1ae1697f740bb91bb174e021e632c167d9a702d924e457e689fc90e006c05caafcf6be403859b6267ac2"; + sha512 = "44957ce39dc9230388cfde78652d88d0a6b283a1e8bf731ca6916d706ebde291045d4f27e3a0480dcfb97f8fb4bb68e03d5009ef658cc98224002ec1ced82fc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hi-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hi-IN/firefox-61.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f9320e510318e83a879adf34d6e94637c2d457c4f0c8ce54794b66c8ac09de2224510745a3e96b152ba652ba070cf5184bbaa3afe2af816083115863ddf3a6eb"; + sha512 = "2ef4df45864245c3e8a5b276031d0f3dcaab8271d253b07d79cabb9e0098d59ccfbab949d10a843e946a01596b51eb8d4c2c31a476e877c050324806b4c07326"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hr/firefox-61.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "1097e0020b011d160bd2a1c0c20676b5188d07cd6a818ee047e83ac07b83bf89e036fd7223c6fb978f5c23eb940ceb0bf840cdee1fd46bb303fe7d40439289d4"; + sha512 = "da0e053a5cb88481699bdca777e9c930ebc2842da4c114237c49d40de6811e2c7e9c3d3a3b773a9ed2a7fe275447e3e585c0440dfef6450b6b57b58436233c53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hsb/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hsb/firefox-61.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8c2a4f2d42fef3a3085660c2ef5186e0e2d9af585eb4dbb919b186eca8ecd391582e40e1844c3a7b8494465c1d052440f1d31c725d0a44ed9ba35ce071a2cc0d"; + sha512 = "40e362ea134e1a03a9394f3c3b15d428b309da30b209553fbedf72e7b923439d4133b5e6bf8a79a2dba7d37fc65bc03f90df5608f360588ea80ac6208f13595a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hu/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hu/firefox-61.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b080e388ec0d6a46575668cdb0867ae34b79f6338f401d1888020bc0469d878a5e717b70744326be1bc62eca321e41df6ffd8ee2e4f740d0a1859b6b394123aa"; + sha512 = "d9b152504340f00b1ce00d7be1bc4ba1c80ebe87507f7cb3985fab52c0a04238e026b7488f46817102b578139671c81709ba6fc5edb4eb37b0182c5c52a54282"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hy-AM/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hy-AM/firefox-61.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "367010c05454117230802a61b6ee00838905514aac7f06af5e612bfa12dc44e1bad8b642ba24d59242ef5cfcf67cb04165bc3cf08dc5e13beb8b754b136e91bc"; + sha512 = "c36dc4a3a87230dac351440cd66ce6f6479f34b65f018f36d1f3cf3b6f5eaccf40e9fb15dcf796032a2cb08028ec8b7c3407c03ab0bd1330fd669323d59ed78e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ia/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ia/firefox-61.0b14.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "cb6fcf58b49ebad81329cee4a9e4f5e54cdca6506f17df16af85f3f35c328e7a5ebbe4b8419f531531c79c2efc855ea2c31ad56dd0563b299df913a4be2a413d"; + sha512 = "cb0c4ab408fe879c9629bcaaebd4ce34be033aee6cbaa2a7360f68a40be03e0ff79e5ca61991e3378fdce28278194ed54a9c5273be401ce30c359b22aa2062d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/id/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/id/firefox-61.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "e8de3160e004a82b38daebb44b3af2eca63c44971296e6c4eb1e3dd7b65e516a00f40b430d740bdcaa2a500917d653de02c363285f243d5db0f09ede34322160"; + sha512 = "98c413687af4db1e68229348290fe426d607f264179b1b634eac4ec87bcb36dce497ac25a458a97873a3f8fd962a47b865f8f5a5c5afe4b5beef56e46d1aad2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/is/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/is/firefox-61.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "dd4aaae6eb4bba3d4383fe736061d033ee2c56914711f4d3aab00fb965404b0626b3133cb57588b51148c13b4de6f090597ac25beb28c93660723752ea313c15"; + sha512 = "3647141ef52695f91ef303aee2e74accb78336fddeff84411d2f20eaf4ee89407fd9b80ec9667587d5cbe81bde846b01893330e8576421a9cd2eba937b31fc26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/it/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/it/firefox-61.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "5eef084981e138f49a12a9c188d5caf59777a8fedf905670a0151749dc964bc7be20c6ac848b29ce89ab7d51c9bad28ad51e65c2b2a80a3a82a8225c490ddeb2"; + sha512 = "f20d33aa7081862088d25c5bb9c8ba90a1dd4a5951045ef80768f34216241f7dcde2957970caef715d3d935147f1254e3feb1269a302c4adedfcd76218445bed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ja/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ja/firefox-61.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "561590036c3c0d16e742c0877cef4f107a05ae13c9f4b030b08afc4633b64212ec359a438b0dd54d968cfe33d85c5478f8c9fd997ea0252a2869cce93cb6b6fe"; + sha512 = "32a3c325fc8a258dbed4ec5af6cb06a1d9829cf87b2863644050775165d0df2df6fbdc4a4d553f45567141d1c09a0a5a8bce3c7d4cab773502f0846f6f0ebb0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ka/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ka/firefox-61.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "5ed3e24a7762da603b0ae00ae5bade06881b69369fbe98f6ef8ba800da2d66a306fef43a830f324238558f7affad168c08499d1757ded12612cad2d808cbf908"; + sha512 = "ec51621ed8adb6141d7055b82d1bfb11dd97f492d1927c709216d5bd57cc5b14f4f07b40bbc379f62a364769adf5c907efda8936c39ac077a56a2a6bd546ad18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/kab/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/kab/firefox-61.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "0bea4f9e2547361f39bf52552ee95dadea60cdf13e462ca536e5e08c85125823e92893b1f71653a3be01d250477fde733b362e31d218c1eb7c0c28d7dbe97691"; + sha512 = "5e0e3b8a238f34445380fdec1bb4ee0d5fcd60b5e6947843af19f0d770c497508664af78a49c339eeb08049a870ab0098ecd6ef50bc1a3527fbb6c891e54edf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/kk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/kk/firefox-61.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "a7b9777cd258b64900771c9a9b0a17ca064fe5ad7704f775d5ab007146242971f16dc8fa43eafb9b6b1e595046bbe25efe3ef428d80e77889127b7d18f670140"; + sha512 = "a3d80dd3ca4e969a9779e00ff24087013c5497b113b086d68c3dc33c6d05d98921014dcd81ce7cb871274f9d9b825cd1d09ab867d7329503411ff68431c947c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/km/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/km/firefox-61.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "08c45d608b04ef7e58fec76f1ff3988c701374e5f81b6c51d9cd16c829a014526c6fd358852ad68d46fac52975b0849c9ea9b60f67ca27c6608f25dd39c5e58c"; + sha512 = "260d5585d544c1cbf7a7762bd2126041026dd281500475079cf8889a03cd016d5fb7d6b3da7483a51374cdfa1b0871317689cf248d32466885e0d92055e80d31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/kn/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/kn/firefox-61.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "6e37f618c5993a40bdd80d228a1d35b8b95fff02e74c62d64a01dd065b8f5e43c9dac296ec9f7d282897c1ed8463799aa4f58a93bc183541871988ac241821b6"; + sha512 = "92338e4f1d92ca91fbdb7cef4c999c6f78a1aebe69d6fbe46f7a67a13f4d63d838fa33d602990d3b10c160ee5e1c595fc9d37674bfea8a9e40088e057683847c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ko/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ko/firefox-61.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d633acc7e741cdad5384fb7f48865817d952ceab58af67b9664f122f89eb864333ef174d046c45053f7289a44751c468891d3a39f71c3b2de3f56673a5d4f0d7"; + sha512 = "6066cdbc6603db7b9cbcbcc85485937a9303466091cc737fa5fc5e219f7758fc1c0198378ff2fbc9a63059d6d93b018daae15c51d264c3e47ce3f8c4450d4418"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/lij/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/lij/firefox-61.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "43b9976d4a98134f2c83edbebb1b4d8de7c8e24ababd41719256aafd7c11f6cd1e89ccd6549246529e860303ba5ba41becb07b3e5cf722290b5bde32f602576c"; + sha512 = "eb546ae48d9d5d88ec861d51bec7476b64a383be32fc225d41f86cf1f4f3cc4d4df2238d067ef50d7540f666d55e7c8d7dcc0856d24f377117ae310cbf47f474"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/lt/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/lt/firefox-61.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "47cc1e66ca49cae1249872465c2f4b27fac6badab4a28c53118c06abd4ba3e43d2a4b93a556d8ab86add2446a28e36e532b170ba95eb505128de4720c6468047"; + sha512 = "4cd5648ab324ff2d9af506f3888a53273cb4f6848aef9069f153081de16f7159a376710c91c4dc4ff489ba5462ba3d91e5abbf824d9abd633455a6c9900114df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/lv/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/lv/firefox-61.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "8c3aa7fcf524a63670113a08ce3b31dc34c113c04360216ef5076ed33240f7a062a649fa4d0d95cb0e2749c5bc0ba33e0fafdf073b3c09d6d11d196aece24861"; + sha512 = "e54cd1faeb530c680fb38c567398f208d5e9f9fe1ce0b5db78c8ed46432703f59f7ac1accbde86ca78617cdcf177bf2c9850dac127490bfc71264c2c64f7d026"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/mai/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/mai/firefox-61.0b14.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "8c7e485363f6e16b3858f1c25ac0f6dae2f3f70aea8ca18c14fbc21c3084700585202fe0832d165f519f8c8bb312d84943d34f0f46c0e2127dbee4e8eb706889"; + sha512 = "8d7b7d264325de3040c981d8c446d1cd634cd7742eff7dcbb5edc490e43ac4d5821536d5ada900ca7ed35ebd2f7f3e935c76fede38dd16803ecd1cdf0a067f0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/mk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/mk/firefox-61.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "4c063b9c4b8b6e1433576384d8707906337648dd141eef6672f72877e2367a33da87a420a621339b68abe786f0f35f007ea999639aa37f480b6cc9de278669ec"; + sha512 = "dd740707e019800784cef932c037d779380e1f3db20c888469036b228a4b261050c072d38ce639ddd9caf63b143b5dd970dedc379a03621203479c148c2e2dc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ml/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ml/firefox-61.0b14.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "32b7a4d6c27cd8a19bec4875bf56846cac63789f943c63b555fa8c4503c083a261cb112ca4a3077de9e5bdccef301c631e8beaa4e40eab322805730a9519e73d"; + sha512 = "695815665c4c3381f8fecb62d402aa7a868b8997a412e4230c92c0fe7ad454f249bff8f7f1a92b2bb002fda4f22506ffd988e6332f6c4a8a026b7216dad1b4f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/mr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/mr/firefox-61.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "1c4607c713df330d01efd8f33d2defaf154d65e911dc5bdc9f30b67a7eb35d704dc474a5366fcafdb546438b157f5bd1c9fff879f9d15f00c028ae480e3890f9"; + sha512 = "b7c3fcb0f41dfbd09591740e1121fd2c37806814ff9c7ddd8dd683b86c6445ff3b02f73338658968cd0dfb9487e779414217f29e81d4b415296a72349a575d57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ms/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ms/firefox-61.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "c611780fb48d09967fea62a8b9173c1eba99e56dcc2ae8196f1b29cf07552931a9ebc06010e513c652fdae01b32b1446b5409361d3f5f0c262fdd1cd715bbc0d"; + sha512 = "036e8d6536005d77c5aee1532f302e0aacc074e005f0cf3d5f5f397e573481a3c6d3589d62dc84ec0aab9d9b2ec4a2aedcb4722222e13f8f78819177b790c3d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/my/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/my/firefox-61.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "7fc59b78f1d6251122c5b91dc51753e1477b6ce4d5a0bc22ba813048cb5b6f6b05ed79482296ec12158c9f11be08a484f8ca9b3e4e77eacd1aa902fcdef30a98"; + sha512 = "185286fe6fb8037240b07a4356008a3ceb70653ea2fdbcb25c7882c395e08e7d64fba7acb394447b68e970dc2cfc4936008ac0167fde2b8b4f2113bd5c5040f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/nb-NO/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/nb-NO/firefox-61.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "281f313ada351f060aedcb4b08424beb6a8518b45d9571eae15527bcede5c87a188c4042d7ec826484b9f7e643b20575bf526d3699e29cc48cfc4a6367744a37"; + sha512 = "7a199a5fba5d3c954c4489533f48e4424908c3d141d8a3f6055c7d4a6d071dab9b0d52a85ca899d0d662aa5668d9c5fadd8238ea9ed770097dd15eaa6b17c87e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ne-NP/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ne-NP/firefox-61.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "05b146af2dffebe79f19e2f32b469633f1ca38ad190b8763667d80f434c94ab23723fd29a4a4680cc394ac48eb7b049df61238d2ed0fc995c730e7a27dc8a0d4"; + sha512 = "eadb4fe826c22d067f91bb010e7176ec6b0a890c10ff0716d68e21f70b28fbcc8e65739af7c6c9ed919abe5e067271e55285a0e3d809c7c1ba65376e8e8b8347"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/nl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/nl/firefox-61.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "279253a928dad6f326a16e6e5720802e83e7f15ea1eca1714ca6d2ce7035a79d16e3dc195dd64701b2b3c6a1d79c150706733d5bbfe02e1fcb7e911592f6edb1"; + sha512 = "6bdfa9d6242d17b4396a25b5a4ed30a251c0aa85cbdd9a53bb89e0496673f138e8d3b938a2f7181523085dc3af0ffe31edeab78531f3e8fc35484fd250688cb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/nn-NO/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/nn-NO/firefox-61.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "7ffd3a708b8cf8ef7b8293322008fc6f8765d1de4df72e7e8b8d320bf16f638fd068dc8eec4cae4a6a23387245dec1c7ce7341acd3b8c6cdd52af0178fa14570"; + sha512 = "af7eb3ea2c18871c0bb33dc4997f38dbb7c6896bbd0d1defd027e4b64df65799e50c01969c34204f5f212389108d6d62cd2d52de33a55aa385b2d5eef34e4849"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/oc/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/oc/firefox-61.0b14.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "ee3b9e8b5d092c966b8fbdb35b04bb25f3816a2f5ba72520372c65ae53163461d184c313cfbccab9a7a68fe4cddfc708671e3ea61d3400096dc168098be0656b"; + sha512 = "59b939410f19f7afe089c8540498304cddea08a0061dbc1ec2d65be74081971e65ec3503dad820fae0126984313ca7fe36881e347e1c20f69feaaeb1afffff33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/or/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/or/firefox-61.0b14.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "2f6a878393fdb6c7df042fa95e04db8f7250eedf991470e8affc42f27b0ac5526e50bfe926b5e44fca6d877aff8f1c7459f30d58cd961a77f5e7754c1d07a9dd"; + sha512 = "5b3c288c6f5b09d21f600959bdc6fdb1b7d0529be4fdb3ce9c05b0ad3003e90ef538e6c1c058d0d04acf59e72616027c5a2eff25aac3fccaab7ff388c52d7a1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/pa-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pa-IN/firefox-61.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "230d08f87b6aa0115383d926792033ab88860083a887d1acf9409466cc0f6e528e039277e37f75b1839956ef4bd237de8682474b6fb1f1519233088e89aab6c0"; + sha512 = "5b3a227dbdd13ccda515efec7d10c529fd04c9f0a91363eb45c2e8b7386654ec906c83326c22d355f2a662f22688144317d89a302e59a7cf8d368df3910b1add"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/pl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pl/firefox-61.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "50531ee7a4bdbe3533d3fa94797da28c9bdb41c262537f7b14d8ab5c3ab7353c083e62d14a00678bff4b9fa3a1d7a6c5f2bd6cb1d0364a5d364de661476737c8"; + sha512 = "9ca212e82615b9d7f95358f70e0f294001fc94eebdf4e96754c1880e136dcd428f6a8ca04b6c319587e2bc5a89b762e94f27c0439c3fc7de6b1e9f1d83ed5bbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/pt-BR/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pt-BR/firefox-61.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "4f70f26ce2779a6185cddb3bfa4f973b59a60fea1541ab0bc1dd8a58607ecd853073883823a254ccd353b247f141a8af126f491dc732b5c4a14963c0719788c3"; + sha512 = "b0bb415701de65165ea2c90ff837fd6025791b7061930999afdfda2db9d77ee4ab38bd11288db3a668332a25915fb97e44d26fef5bd5aca8052cd4ce2a0f8b4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/pt-PT/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pt-PT/firefox-61.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "19d0a557eeafc734e13c852f9222839a31c7e56fe6e100a75f3d64d7167ed78ccb10bc491724403948d13f0a1b874aa7568c648e3d20e5b41208a645fe9996c8"; + sha512 = "a6adbcae92503d65cb4076f7d917b7dff21396f70049fcc9836b4ca91c1d5d6016c1f74e0572b10361e9bf3327d87c2abea4d179bf2daa25f2b506c6cb7ce808"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/rm/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/rm/firefox-61.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "10ea7f8eb8ecb5ace562b9eca4182ac05554b9cdffdab1716cab55685428ebc50f25738e71994c2da6b27a657411e409d063cda6d7aff2dc477a30d2d3c14eff"; + sha512 = "d86dc38bc86b27ab0b8cfe10b09f8d78219ec282690a5f876b174877371cf7179f26459e927044720390162a697ed37c2684225722c23acb26b5718a40b4e399"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ro/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ro/firefox-61.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "654cc1cb5bcccde12d486e92123401940ab00a47cd20e864a5424bbc0f37854cb4047fadd672fce71b976659dc0aa4082a0d12c25431dc0a30e6faf97531d3d5"; + sha512 = "3441346f8842a956921658295808dfbe0c4be04083779409cf19846e75d6287c524441869252d693a23bf5e7794466e4ec9f6cd3aa363475e1f855ca3c86c872"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ru/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ru/firefox-61.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "582c24ca9b4808f004a622b4bfa59b00df17a81425e5785452a4d9871925e118cd59d9fdc1a8854ab0a702be026012cecea48fc842b4660e389e37d5f11842c2"; + sha512 = "47c370cc4e1e759fb498f3e7889605ed4b9db6ecc7f1b324d800db89ab69369dba584e76fe2ff6777d47ba60ba3f7a628ca75171b7019c65d4d0275476befd96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/si/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/si/firefox-61.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "f26f9abdd9e1da50c7e4d555396bd96ac309a6aaaba9c1bda10925c16c3f8a57bbf26180fef93afe7ecff9ec49a41a51004450d738ac440f54071cc9c4d4eda0"; + sha512 = "6dc7f968e4e96c99cb12e682ce1db5139465816addff1cc9235187b8341c7f94dc322899b85eae96b85ff0abbafe937916ddd88750bc9b295a06207e1f8dc0fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sk/firefox-61.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "de942ae63f311ce0e3a7786f10f9ee728060e520551a8c0ec91a31a74344dd373a18aec68cb1547f96d245536a669369569cec605699f85bfd8aefaf1d0576b1"; + sha512 = "3537af8e430f9ae41f5ef4b7ec5ed883f4e70124c691db76420d69d16a19b06c0c9a29e4b17bf44a81a85a50bb9ed6bf1f897061d5e6a79b72762b61e66c6aa9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sl/firefox-61.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "be1a0662549921cea469a2c40452a973daf47a40883e044455697c2caa0dfd6184f23a0458f448916e2b0f483d3ad228a9e3724d5dd46e2c82b38ff63b571498"; + sha512 = "6e521922bf2e5839b269601116bdcef0cb6a4c3bd8ae75c68afbf12fa9834b24da2e9e773121b50d7f38cf2dab28826ce246cd87212a9b742d0a09a2fb118103"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/son/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/son/firefox-61.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "225527e7f8a9ced9fb53f7f0d3e11cf5a6745ec861b1e293aca467339a487bc50fdf11e2c2a0512dbd5532b4439651f57095b9b4b779d670945c912e5cc20901"; + sha512 = "98a1ef288662186ecdad6d15ce34a78a7385d0576c923a330a1fccaa36a79ee7e2ff8b8d874e253cb44df24a596fa11ff79fd756a814589ca5f43d277665f153"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sq/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sq/firefox-61.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "b8f1aa044caad453cb0ee492ee8204ed5fae05d5f7fd1344d9dc2ffc0989e9b089adfaf486f3b09f38534af17bb35e5ce183e353200c3b5279c566a86f952bfb"; + sha512 = "1a51452b80bf795c72b9e4696768474bd21bc1311be6d943be0c4bfc8aba9cdc3e8829859ffb5c73fafbc7e5be0d5bcb27181842b0d55699e1a943c8b4dd315d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sr/firefox-61.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b31d69a2dbe85f7269c994751ea8e5c43c3b134be9843ccdaf0c2dfb3d5db19635a9d998bd2465ecb47c02b9cafaa50329d08a501289846eb80097561cfe6330"; + sha512 = "2090f30b3c24125ef4c3ebfbc8d11867d2730bb4217855384d7a61a1b76aefa6223dae5fe227acaed2316697fb877214b2f1c9a62e497ca026f2b1f8d91d48fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sv-SE/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sv-SE/firefox-61.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "08c58b4457122713139d7d5db7bdc1fb10cc3c8789b7052c95f868722c84679919b8dd5ec11c26343210ab962566827bfd350007f2e0207016c36754a4a24266"; + sha512 = "55ebddd90a2504be1cff612965df4b7521c32c9adc168e2323a898219d2780c503639b9e073b26928838da533cfb06dc90c98192a522d9cc2192bb1a82c406a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ta/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ta/firefox-61.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "dbfea11dcb74aa27fe3f0a3984303ba813df0ef0a958c2fd43ebc215d00e7def02dd31e2450f98179250deecc98db79880c973048f53d72a6792591043fdd792"; + sha512 = "cca9e0c313f019e2cb00ffd1f8343d78e033cbb88261d2b58f543ae7a743aec6f5375e88f3a56aa87bab162f511a1f7af147aecc8bf3d8c1533ee4fc342d5993"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/te/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/te/firefox-61.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "87c4bb3f356698e2b7fe2968c100384e7f74b2731191d1cc4aa6e8dc500e5cdc94c561d8b06a2b208575c85b68abaafdbcd2dfbebe31ed8cc15d7acf4bca3fa3"; + sha512 = "7cc45e847c58b11716dbc0b26e7a5de7950be959e4bcf7ec2a245974494b2e2d0ee06c62696e1b1b1b2959fcc1f728e4b354445ba02b5e762fae16460c3fc2af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/th/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/th/firefox-61.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "2dd48ccefeafd4848f480b24bde131667e87ed25fff8fe119c4d60bbfc114ad68ba350980f0eba9590c26eb631fa77db5873ffe72aee3a754b346046e89fc0d0"; + sha512 = "aa1420d420388eb49d73b09e3dd6313b376b233e3e4e681f9b284c59a87726cb85569490e6978524040825f0c005aff936e25881dffd0d42f76f07060ab2dc68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/tr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/tr/firefox-61.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "cb2923deb94acbd7159df685fbe44477bd49d9982853d30567ac56fb17849f215d7e462a9cce9f4a5c467cc1d9632f89d956881fbf6ad1e90b9a58a549ebfda7"; + sha512 = "4783e93f6405cb1a4bb66010a24cd41a957efe638bffa8ea11bbcbb59f0a994681775ebc1db242fcd3abf46cca1050da0e25f60fb1bb866159a259bddbaef9bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/uk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/uk/firefox-61.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "24931a8ffeba090ac00f32cce09488456e153ad267b7f43f15ae4be3921fb4547820fb93baf5f15695ad003c5d7716c1916f7742f22ba09ccc71fbb6de602885"; + sha512 = "0b8ab5e88943be553a2a6482c266f81c790732099f3dba6614a1fe2c520ec4e82c18fe5aa525e40c425975c71ea992da6b04f336bdb52d1ce069c3cb715ee235"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ur/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ur/firefox-61.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "900a307a41faf1c1e3663e4b10ae7ef7972c3ce010c2e3098396dedd8d882c2769ecb5bbbf57d2b0cdcb21d3bbd898f508b4851792eed0d2e06a03142d204c69"; + sha512 = "03afad45c029f408369b44a5c6e06c7ea6d348734b5d8af90b94b0216646cf025c11239015698f7d2d94921d583a13caf57cbc176d55d283b990496dba6fa34b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/uz/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/uz/firefox-61.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "0bb865a14e5c9c33679c09f6fab5a1fea12a41a7c561e37cf20e02b2c424c85cd766c9e4769ac199a8cd6341cf3950cb64c15776bef1f8b992786c979ae5901c"; + sha512 = "dcb586205dd3965c511ac6d675d4974a7d3d3d9574e9db1e6abda9da93cbc197f76f0c7d656778211f3b4ade70733953b0753d58fdad45eb94faa214e325b8fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/vi/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/vi/firefox-61.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "b45a9c119d16b7d06199df2ffa49d44ca54101d249354e766a06dec3b7fb9b126d1badf9b787268846b8f0650ad033382c1a9a927bb62e0d260ad4c5880b5a22"; + sha512 = "3bbd74b322121d2c82d17ea137985830542c26a51fb154d02be9f09aafc5456160fc78567a21ba0a8cebe0b9f86aa7e7d83b69865517bd6a95ab8b34573a26ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/xh/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/xh/firefox-61.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "a183e4a310e4a6cb4f0d98daf230b38c5c1d1852b8144f4fa8d56b05beea0e1b42fe4a243a5e551c366a9d724eeb7677175331d1b812a54151e3e0e64ff31fc3"; + sha512 = "ae0718ff478b973fa2c76470f5e2c01014f270402251d8474451764a431b7cf43eaaa59373904446c8e2045c844a35d4e2027ba2e694d6cfd89c7a38178d9187"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/zh-CN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/zh-CN/firefox-61.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "efef2f01d1dbf8a53dde1511e71ad33c220c76fdc8b6c9a68067f69d58149d613f7bedbf9952dbda386834f14aed4aaa798ee3871a6d4d018bd432ac52b1eeca"; + sha512 = "fcf70e05a796cffb027d0c0396861fba4a58c98ee773c5cbed38ffe09786f98faca147117915c64fc9b4d01081de55d4689547c8767d84609b66927d50982176"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/zh-TW/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/zh-TW/firefox-61.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "9b247086e288674c0b38a6da4658d8363d616cc0a518d54bf8a7f46a5b0b1aa40798725a45a09162bf85e4e07a9bba1a0a5b80e458182fba92f27af6691b4fdc"; + sha512 = "9f3978cbb2a51182ba62fa68c09d49e33cd0fb68be7d8de8de2e335997184648981cffc8e90764452bee0fc81a26ba9b8896ff630e81918b4634e8cf6923c5d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ach/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ach/firefox-61.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "b10f1bfe8fa0daa5cdebf7dd67cc79b2bba5c1bd01df11ac6157f557759737794dc591b8253bb2f911a9157145d56e95c8cae557319a2739c19913f3e85e0f5c"; + sha512 = "ab140f06e11e226bedf7bf01b2f5c366b654583bcdba17546c6b8cd144ca6a71424f774316985d0885733a7702d201995a25964e2015c278028888a946c26099"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/af/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/af/firefox-61.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "479ff91b7b4270aacb02230de29e111204951c194bc70b534d34b1965e76b408340aa2d6e3c3496d43ff007728880bc9c36eeed33a2ca90e48e2375ebf6d158e"; + sha512 = "8d934c0823d899c8a523a131eb31a7643b137f795b94c4d73cd675e0c10758cfa051958297dfbff57238383284eb7e8986ded98ea3b952d4b60135e426948bc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/an/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/an/firefox-61.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ea0b543308a21b7d364cba55c1a55be6c87acd86133ebee60006ac9bd73144b22f7c4d140401175c1c7bdca95eddd7a63c3cd622df2326b7a622664424f5f801"; + sha512 = "1a0523a8900909bfdb396c6bb16072918a78a65011f2f88d714ca74f8bc5e9f667b22e7a30529f985f34b55c05b547209c5d307d4c576cada9bd5af144718f6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ar/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ar/firefox-61.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "78e9971aa0e31e37be5a8373109dce66eba95b444f2cf830d08566024f1260565903552708050f6428a755ed2fff727cf0ba177428d505de568c976118527e55"; + sha512 = "283ee30ecd49786cf23207cd495aa58fca84be51bd65c329418ccd6a09e058222ab1d2cadacc94074b7dc35707139659639cf42ebb6edf1819b9ab5520cde691"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/as/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/as/firefox-61.0b14.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "3d915d481b88156da4700e7b7669698b23f4ed761d808c3d3ba57c0ae54b4ed7cef38ce5cd1def3dfbf9fcdc8333ad74e376c8f1520ca6f05a69c7b3758bb1f8"; + sha512 = "637fdae253df177d12feff2cd70bbf308dbe8f2bd51c09491de35dda9e666428f1f42c80a110fbbf38489c2ed6196e34fa8e6f9c1eacf15b15d721de0b8f37ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ast/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ast/firefox-61.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1d160b65cbec0d222aefbf1ded97bc131398e7c10ef9e4ab03e0057d59f2999f1e0d79b7466f522923e286f48afea8309d98d2c1e6b1c9c3a81879b0471918f7"; + sha512 = "087bc7c5e22defd3141cbccc271e0be8af29fdfd4d1842cf6c1ca1f757921cdd5966c3c6351d489a3026ccdd75becdc5c1b318ceb64014593df348309d915e8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/az/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/az/firefox-61.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "db9556748397f222b01776df3fc920f1d75d3b89ff854c17aacde8c44777b7b60c2a115d80fbc5af9adc14e81d1801efa96c83bc3fb64aefb886f79f0fd09a80"; + sha512 = "68fa700cf5e085361bd49f53ec79fb096820e9f4528892d37c8c846aa2d3bcc7b39de0bfbcbbcdd8a23a52ba7a1449196e8c81909e0f8ad2924fb2a68abc8fac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/be/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/be/firefox-61.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "7a4591db7d7f500c969def96949ed441807364d5afe0bbd50960d3344a91afa11a553047210f1ac5f820e1f266d2974aa516c50f8f403868544b8adecb12719d"; + sha512 = "b27df80f1d7052b5ac80f8a05c20b71f20d13b9f76b92ab10fc3bb591ce8a6d2d5660aff11d2d5c996843f60b5c0f661bca5f750a097f542e8ce3c719bac14ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/bg/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bg/firefox-61.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "418c8fe10153784695829714b50c75db6c380f22abecc596555646ed00d6a2f0c94d1eec70f000808f6343ada728b69a1d504e910676526d50b5fb1a7148f41b"; + sha512 = "c1dda1a57ee7b565e779b33b41ba7a92eb49b8ec4461bb388761fadb69b33011bc26f0e253d7b9902cc526a105fe783209e8028dde3ef8c1ded2543d17e0735a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/bn-BD/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bn-BD/firefox-61.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "6860c155ae24b95ac5e394b6e73d893b904ec63c057bf361c9afc3ce6cb8ef085e086e595da8f106092641f37bd5482cb4e07655882ea35e18174f2ca7bea839"; + sha512 = "fbefb442d38a01c3d2b45b2f9f251a1dde050993d6c54a58695197a57e493a1b0c699ca6995b4111af230893912648b1e0009ae4b852803d71423427759491b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/bn-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bn-IN/firefox-61.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "a381c1c9d0a0b366859d7ce48405a84bb6fb5a116841cfb7e0780c390e42795a095f74727dacc20ea058f7f9c8c85e22e1da06133a10d1106e4d41dd5ffb0ac6"; + sha512 = "dac0f5d616daaa19b2507ab9d43a0127d39bb41ddab92519f33f0e9950b34803e1fabae035d1fb803982d6f0b5bba7192695722a728ca85ea9602fb08b775cd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/br/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/br/firefox-61.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "3556210ae4bf3d2062dea53c267bce8dfece29bbf8f485eff398f76b9a4722b42408dabe34b4ce4f3eeea18a3390c17ac0fbfd33133ea5c009d13e7290e5f624"; + sha512 = "bc4573646eaab95724a6b3429c3b0263fddbc65ad0250fe7fdf8ecbcb4a0422b39513d03d018311141e3cc67f95b994565949bf2fb31b41be10991fdd610d7e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/bs/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bs/firefox-61.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "52aecb7676940adbca112bbe17feb4f7946684f54f5a2111c08375919f78690e1340599beae4c886913dc97c47438c4962a2ab78ed01c29f235b9f8c130433b9"; + sha512 = "a8dd8a5ee5637f8a0bdcd00ff142fdbd825308097bec954bcdb8845076dc8367c09ef4fb0783ab47f5b8581a6ce4befa9c883d445ff6d96e444751fe8d4ae23e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ca/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ca/firefox-61.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "b92d1711a552b96b9617dbefd917124764cfdf6f79c657272a0a12bee6d79eb2f02228f6d7bc23002ce104f7475c28efc0e4d474f444349a1751f393915690e6"; + sha512 = "faef1b8531dacdded64cc0bf572e075b81690de76835c9a5a108b5d3fa0486a930bd8bec943d91f177166c51b506fed683bb00071873d57bf87c23267993f79e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/cak/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/cak/firefox-61.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "86d6e0f2d427d1fd6c8bb1c33ec8594e63f2349c2bd00faecee0ef5d0d24b2baf9b7a8f40094170a4c9d737c978eaecc7c74f0377fc1d13fba24a9db6904de1f"; + sha512 = "21b226e39e0d02dfa3b7bde90a47d407088d327a82abf21b5002e56eb28ed7605ea35b28e15b088d6486dc9735b7cb8827a51f1e17ef07da22c019214f3b0fda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/cs/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/cs/firefox-61.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "53c5c1b07f24c9c0510d40860b6944d613b3ffe4b752029ed9a32e89bb9b699fb8cb54ab2f25b9222aabd08255197e44e6cc3797bebbff1392c5a65ddd1a460d"; + sha512 = "fe52d89c9176a4160636c04fcd2cbec1add30db3ebc64d9f2e01d2439b4f1f7412a5195cd29f1f7b7b9b6d062f880062f6fa33674a413a4257250ab764822b35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/cy/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/cy/firefox-61.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "4f634916df6f13916858d4bba56092ce8224fbc693c7a466ac1636088545c268a607f0ae986f0ca58404668913565da9ddf778a8aad0fec2de040c87c20edc12"; + sha512 = "75f1f87cb31db73dadf4897e8336a7af2433ec89cd9cf886c5bd951aba3920df3e5f723a730607c868ce086fd8f4e5fbe3f6e31e5c364cc9b498586bb3804ea1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/da/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/da/firefox-61.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "1c35bb182112c13667121588db9d686f5797a29acb7b3515550d8c8631d3420409678972233bd9fd08d477985d796fa51e7cd7f5f72e05b8476d4451737d5479"; + sha512 = "c0d646633133e05c792ce2d4459b0ed754598192508b0340a24886aa2b8f65a3b7487b20f6a5ba19f83cb64ce4f480859ed5f3d14e8c978c4bbdadf323988cc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/de/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/de/firefox-61.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "02b3897e181b6427e6b713e97d9b4ddb6c175091796577aa7c726ab0d865520a44435f26425ffa4e9f78a9a73581eca30e82a4172d617b15c6ab9e42caeaddb5"; + sha512 = "583ba8d028fa48327747776c7027c1598e600860ee0b9409ebbe4755fd552c189288903e61904a16d3dd065dca030ee5d674618a8b14645c2e2705fa41c80d3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/dsb/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/dsb/firefox-61.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "82fc4a58d0a0a49f8b96d4457854ba295f11c5880716c517838d4329e5cd41044dd26b4aa20f036fe664cbf8813e4622ecc3b2069a7629fe6e03e84a87927191"; + sha512 = "7b7a508fc15dd777b00a786abb9ad013f985c6c3389d78a1882323e50b3c09e49bf63391df5b3a4e91c60902ea4522b9b6eb5b93915bdedafdd303c6624aa9e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/el/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/el/firefox-61.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "e4c46c68f9a2551969a06dcf55a7fff30a53b52896c3802ec7966d53e4527d986c2d15d7eea3a70ab90cb8bd8414de20e207ca40afc7866bc13cfd47524a752e"; + sha512 = "4bb687487ebcc9283ccfd737750f6724fcd787f441ed7d48eeb91133768191f04cb38770eadb854615907a04ccf1279746e6e12f8e7ec78086e97de6bae0a9e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/en-GB/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/en-GB/firefox-61.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "1c478b893c558516988c273f9b82e27e3abfc3db28f83aaab952a9df5595cff6a0044ff8054f172d7ec71304d65ce0f67a682b9b0008213cc9a301e24901146b"; + sha512 = "cf50aa3949578ee5a178b665e58ec148a8534226f31838b4df01a06d4e860b61ccb457d6c3f59dae735e8d9ca8e80434b27f2d912d437dfb0695d5c5d6c9ada6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/en-US/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/en-US/firefox-61.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "1750541362c668f517431b6abc5d8096f0436895f85134ad008cd11d589a0b89b6aba7b54ad2d4ec08164d1bed88a25ed9c279cdad07b996657caecbe7f946bb"; + sha512 = "9e1f551c0f63e2aa1db652b884315a366debb515197636d1e2b81e6d94d5c764705716f610931d44b020ae97175ad88780421071bf000751e66ccb6935360303"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/en-ZA/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/en-ZA/firefox-61.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "71e632bec1a0d3b4c95d4e9ffaca97e18a0d936e4c7be8c2ce3595672d28fc7b5dfeeb73962d189d83b64cc4bad0e4855d80fceace8384c76bec8bea5d8c253b"; + sha512 = "9720c4dfe5a2a9916325f5f08577ba0517c51e517a3b10b7e131fde709fc1ad26bdfc8e21b4ec09c0a7c0afe1ed6a213ebedb603f6ff49d8be3dfa8f6bded202"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/eo/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/eo/firefox-61.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "ae28a8f714639b150103a271254f9deaa405d86d9cfad0f4dc5dd2d198e64a59c9b34d7ac2e3eb723ed629452ba94de0218f7125d5e40cc1aa9f5e3bc7eaf17c"; + sha512 = "58c514b410d3b91ba370ca3fa01cd6cbf2a4925875d77b7bdbefabac37b6c84327064a3086c862eb4c7a954bf86249502defa89acb245e725f521460e2fbbd82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/es-AR/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-AR/firefox-61.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "91772cc444e2f6e56103d4635c6eb3861b22a4d5dadb440f049c1cde84901b463fec3305086ae224c98e321b867ed556d7831de33cf91facd7d99a2896b7202e"; + sha512 = "da2ce694e2e161c20edd137472e1217a7ec5b90611f58992116fbf200b53006599723f7510ba2e242e2a77c6279ce6ff0b7fa61cd5d45f984ad3bde2c473b237"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/es-CL/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-CL/firefox-61.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9d4a2209c1a8c8e620de33c43f80e09003f08f97f4bb551839f8ecb877967261f9e8b3e87449c3e2fb659a17a0ce408c5b4c3386f4551bb9b49b57347cbf0ce9"; + sha512 = "eeb0d1e813e1e90da99ed7539936d3e8189598631c89cf41abad0069f5e992c972aad661d59a4fde25539c3a1d33492fabe9b809c95e9777d8ac5366d3b5d3e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/es-ES/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-ES/firefox-61.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4282f1ff6a953a2f7f30e7adf05470022259911c113a0777dd614f7cc55190b764be66cc025c4db1a65118e111612422ab02794ad659940bce9d3cec448368f9"; + sha512 = "ec875171c103e574a91f7930a346b9fa95df13288a58461ba8f7affe74cf97f741394c98ba4891582cbd19c26b870e46cbe021678625c5435e3ad42355700f05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/es-MX/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-MX/firefox-61.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d01276bd4f3e740bf61f5d6553dc0252bb367117db56cc9b8df8df143df0db0c2624e81a926f363d9a71963f8ff1c4412c7cd41b8d7a7be7503a9f3177ce9b85"; + sha512 = "974532385a78eaef5e29f7a345c0b74af166251ab7188efdca7c1bc0a579c4677739adbb3c07ca1b27dff7012ab1f31be1c6aa383bdc4a46e84ac34bee25ef71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/et/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/et/firefox-61.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "d48429950bd675d120dcee2c078d005d87ef84eb29012fad143c498e87962561c0f75f43f841374ef2af898e3ad83b67287a1bd200926bb6c35026f40fe5d050"; + sha512 = "0dbe8007bdaa26c8d4947f0f9c58233255f5e8d16beca1ab499e1d67f386f97733071adbb5102abc24504193410aa0d0f43cc0ebd235d06d35e61b6f41b70375"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/eu/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/eu/firefox-61.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ca86788fe7133a03b4bd9d1061da03d01510b5f997a5bcd5a186e21310889084053d2109820b8efa62cf0f1526e89271e2460a28508653e32ca34caad560ab17"; + sha512 = "7ea445637a36d5868a8c8c5b8645e9266082ac812e5bcf36ed4a5f9369324112d700fe0809cff3bd4b543b15e2e09569fe4ecd48ba72319321287b76c6d0a896"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/fa/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fa/firefox-61.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fe3f9fe8c832333b979ba34e1328eb11a38fd76cdbcdb9b19a4669df8d71dd7a34b0518ae5b9e71a1a41777fa1dbcb0ed0e4d0727c5d1eca56a74271dfebb3f3"; + sha512 = "612eef22e6dc033cc601fc094f22fada961c4309923245164459bdac44e584d3dba0411c5a1c708585b3241a8893cf7c760355a3d1f396320354ef1d104599d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ff/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ff/firefox-61.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "7d8b940a57c3c3b019dc83abb63e7f4e6222f3705197df3114a560d676ce580bcfc119531f9f96f168353fbd4b12e58c107411ee62f152454f9aef33decc50ce"; + sha512 = "a927567ab31a8e37dbc6503e9cdc1048deda751aa88294918938bfda055e7bc5175383a0eb0168c65e69c35ad758b9d6e22da1765fd41901e2818091d7031a50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/fi/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fi/firefox-61.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "2ccdfc0613d91e7066c640f1b310dedf0e1f6d89bb3d1ae71510b22bf63786aaf693211586fa25181e5cc183a5d54966c43f8cf60639f66679248fd3c7b3645e"; + sha512 = "0e2db17c273b356c9fa62eebdce05ba2f2aac8dc8d593f96c2e3c9aa65a0e6aa183d1216342970bc78173bbc08ecddf0016c87989f36ede989d65410350c5588"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/fr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fr/firefox-61.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "6a88924af75101f52b354e37756b9638320865d726560a794cf02f65b3c0eae46eaae0c980ce90757250c94d2eecb76275915c6a1160d39514201f261a24d239"; + sha512 = "09979e982d82581dfdba0c1737cc7b4e9849d176396ba084088377bf86a9ca3dfd5f9174056154f85bc95632bde09766e5e206b2e6be7f65f0ce63f6b6cf4f2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/fy-NL/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fy-NL/firefox-61.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "06a99118ab6a20e884bb7771a61093206fcf7230d097f606d8a162144f00493811f2f462db2d75d70bc7e8284b4fe82f7462e7382419b08841da5d441f8524ec"; + sha512 = "515b5b9acef3bb11e412e7ec26b05176aacf8e9c4227be62890b613de0d94d3f9dc82fea287990d97ae7ee2774814c7aafe6c02bdd74d2fcb88074c17d2fb1b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ga-IE/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ga-IE/firefox-61.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c0b3695a8e3f3f8ff991fdf861823964129e142872cd79eb76a588eaca71b57c8742477a5ad455fd13d10e344b5c117a4a101e65d18148958db62315a572252a"; + sha512 = "90a3932a735da2c82607d2cc7403d6ae274c6d6a292dbe7b409752d70ab8db47d3411bd39c48f9643f54fe21896bf48c1f7e6428c7b903b349b9dd871404e9f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/gd/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gd/firefox-61.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "047fe3900b1e904d9f6d6ffea8866e56701ff269e6589fc2836021d1a841e7c524f25db5ccb00b91163901d8bd3a89b27fc98a1affdf4119351f96a7aaa56429"; + sha512 = "04e0c9c45548666b4aa8b22fad375759b4fe8bf236e24f0039a88792242a42dcb928401b2f84b1f978ade360182538d246846e3d066fcf18de3944cc02544e9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/gl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gl/firefox-61.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5c7091e0f42d711f4f65814cf2b1745c14889d8206530911216b55443d75d9fe43bdcdf7b7221dd7a316553de5ee4327f1fd50fc9143d3c333926c2b22755f7d"; + sha512 = "8e33ae93083535d3e16c92121f6af480193640f17018c51c648ed1cc8d56fbcb43a5a1a82ea964a494e19bfd23f2abb22b245ff0ffb22511ea5273ababb603b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/gn/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gn/firefox-61.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "5bff9ecc955a5c40afe27775c255727d8eaca2c48e92065edff3ff841280b917b89ea2c2a5e53115959ea14b0c86a60559acf802fb74707dccd92241e469272d"; + sha512 = "d8d3a3870db1a62a513aa85775c6eee8a2de6c5aebddd3ff76e9a98d1197e38509fd79caf80135c8b1a3a01350633f697a88a3c5b4e99bcd1596e0e8ac52fcb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/gu-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gu-IN/firefox-61.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e210b2a52074d446b835a47becb241ff01724cb55829665a3fd8661ff25f5a19c2f77998e678d485bf14409c8c88f1a8850a1717d08d1240dd844888ddb2dfec"; + sha512 = "648d1ac593d0dfd81cdf8ecb5881e15d3378993b3dba58d0702ce6c4ce8189d589d8a5d3ff600841787576a60c6e6af9aa5aee7ae6f6ea182d8ce9c5bf1e368d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/he/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/he/firefox-61.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "790a38a052543e13974134e9366f579a1f41b5c6c9e0c7b56c6bce0d44d1a9bdc04aa9a57bf035293b0fbc0c5ae02c7181673d5373b01c63579b4aaaa3f66ad7"; + sha512 = "37bd53fa8de977d6fff8b86134a2a280cccf7b1027b4af3a28fe7a1de6d5571c63797be1b029231e0133c60737a68d5d6c3ec5f8ce1901e31d94ae9533148166"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hi-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hi-IN/firefox-61.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "a987e5e132b4c5efbefe700364e094502b33471bab25d479934ff25cf4e6b614e9161d1d8f113852fb710ac7282d0c5845e5a1e0e3c3281db86bd79a12d27551"; + sha512 = "375725d897b046a40793ebcd8689b6553095f931a348a38bc61b8123ef94f34e9f0b25e699c048968126ff26d09c2ca5b976a671251a8ea10a8edcaa837dfa25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hr/firefox-61.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "156bce37c7224b01c5f0929ee80a12088f57ee215f875125f646f7258654a91210792d52ffbc8e1749f85c9bf174d633f2a787160be01c8821ad6d1cd8118133"; + sha512 = "58c400af34e1e771b04e9567144911866dc752ee4d95773eb77886d63fe6e136b15594cff3910088938186e84a5d875b6d434a07a3a5ae4fa3912f06f75421b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hsb/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hsb/firefox-61.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0eb4815892e9ea61a9a7cc258c891c674df6abea2f04551f30a4cafdc3e4a190c18a6413a8889060193a3481ef19833e6703c2a7f527e718fe13222605d78ed9"; + sha512 = "29f47f4b9d0878e1f8977254f7f0a7d919f023e3d5a64a0c53f64271fcefe6416a278bf83025f8e235a9be4fd7b0afca34f5c796aac4c0c1b204118c3ac5f9e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hu/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hu/firefox-61.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "3f1e5afca6e56f251631931799be1fd18417b4907a7f075c9a4d78a46afabc482b3e6df0ade62dc5013e4e34f0080411c3a5171f8ece6bec1d0723d2d5930c0e"; + sha512 = "b2776f2003f140648fff22dbde719a325b7eb407858086fae671149cfb975c89f433cdc5057daf2cd07e84e4221026c33cd45f6af7a9f54e9e7174bf2fd26636"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hy-AM/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hy-AM/firefox-61.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "f6897f07b122fd68e96dc502c3df8489d967a6bb5ff48f8b4fdf07de646d89735bed686dbfb8433277bea57fdd18d75ebb28f755e40cbb0b7d2fcb8cb8e87cb9"; + sha512 = "889b4f043aaa78d0a5418fab3c406296396081c5a21338ec07340f89288ff0f99e7a566aeed04e65765e211c2bd8ea5a8df54ff2a9cb880639114847008b7524"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ia/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ia/firefox-61.0b14.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "4c1e875e73f0c4afb5a0f8ab5ec40f520ff2734f060419e8d3bff5e9f533774d1a52b554b3ca8c6a76c3286bc70091a1ba85a8e00cc2e64d6fdb3167be3f13da"; + sha512 = "3567a4595f322a38cfb3cac147c635f658742d516e102e07dd8438b7939b0613ff913ce86b0ced95f5c0d7dd5e0e71d673534aa5f96938210fd5bdb16397b9d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/id/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/id/firefox-61.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "daaf0fbef850fa277f6089bbde27b58fae2aad022df5cfa5428e81eb5e65fd8fd56b17466c6aa2ea9751c3ffadd3227100903413a62f696f134310f33b894a47"; + sha512 = "0cbfae9884e3d296730244f15342952141771b0e6f1d48d30b29ded30141c51cccd9cc0cfa60f50987d435da6e306deaf93c7b9dba86be591d958e441db00b2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/is/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/is/firefox-61.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "ee7af4acf4191578cadeed746b4a333ec072349dc7a334d4dcef7cfef4b5f6cdc736c0d0d465d809e564da7521d1591a86e0bdb8f059216f29155b99a8eb4006"; + sha512 = "ca491e6ae92d933b4fc75c07aad7580f8d5aed90984363268bba1a2db4c237b09a6a8fa09a3b475d9f6e06b9def57a948207c44c9572d1bfa48f3914d9446eba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/it/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/it/firefox-61.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "548d9492e0da5241936c3c9bc5b8ba655a4334118e3b16758f3f96b53ee6367c9403f02be501375c96b60e20f9a733408a953c86cad48116fcc07b7ed907167a"; + sha512 = "1b35e8cd0c2eeac92ef7d43ca73ebab85b731cef5e505236f5c9df4e9fb05ba8f03455ec2ac6262a0bd86e3a05c6d8ca236f9437277c36154011e6721e795e75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ja/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ja/firefox-61.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "84e44c54977bd37417b7cc92ee7ffe51a5815a3a63559c53026cdf703931c418aef7a16e81b8a038a61209e0b246cc2d16d73a1ff42afaa81792e2250894b168"; + sha512 = "d9252c1e002802ef09e85e04586dd983adb5fcdfc6248e5b7cf71030697477785c74409b27f6640c02a026a621e6edb6b20842cd0d6e2271ef81730a3b2b5cb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ka/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ka/firefox-61.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f315c726215432bc8375044714ba66f1a02504d0ac4ac75ebd2eccddb69c7a05eff6ebaae84f7fb2a33dcf8571ef231e4c130ae168f00874a4fdcd04b6a16491"; + sha512 = "a9b5fecf88d96bbfe34901bf8a386c8b31ad97f87c322294a0362d992b88ab42fc78836c70cfe27301729aba46c21648da0377a0f113b99ddf14b524017a0b66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/kab/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/kab/firefox-61.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "c5d5ce3a7aa32fe2be100b4c1095cbc7ca533ec6abce2c770584fd108e5671ce7e7e4e3bb7d7bd68d66a78f4e04aadcc2e6fabae94526dc6beffea99629d6faa"; + sha512 = "5eab8f88267155c8d8d8164047e624900ef8d915ec5c1c4fa275df7ee2745427e2ef50254c92127d5a6768c70c2fad9d7c7c7c8af1383793b238ac00a487fc42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/kk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/kk/firefox-61.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8338d1d56bf64f419ead646f8c79afa81b310a24f250625f637a3bedb2db3e60850d2f2d10e393098838d8e65f4e7dd870cc7fadd34f16c81fda20578893888b"; + sha512 = "c22908d53da55aa3aaf5929b29af37d6b273df6164784bd03ce89e7a9aaded8cdc939ea0c1e7b87a9c4ef3ff0a76273ae1149259f9ba8c3d98db75d6b8755e20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/km/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/km/firefox-61.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "c408f89bbbc6e90d831b47236cdd6c4b2086556235e7c5df65a3796fdb36053c70eca365016aab3cced3249f0f50794c741454a7298e42c1fb9d261faf6b9627"; + sha512 = "ab73eed0d4649afa678e762e361eeddee7d188beb41d4415e272e8bbc855c25666642b5b4299a3a4b5aeb80d1fadbd59c3dbcabb1d30c2bd68d2def706259d3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/kn/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/kn/firefox-61.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "02aa0007ca0e3495c343ebed7bec89c30d3b0b34a2c09d8adb9e7e61846fa3586bd954a53cfde76b7f7058e2f938ffb1f59648e3968a3f37f11e56f34de1a628"; + sha512 = "d5219ce9149b510283c2178d51c209f88c97e5c73696316f9c0eb94492950c6d9d22509655739cd32905d6e0c534245e7dddde9a5630f61d2dccd14dbc968663"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ko/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ko/firefox-61.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "12281135bb407740b4bd2098c6382ae440e3fe3cda92cbef7a9ef38268d2d72b357330c8f054f8365c4b2301709bcd3119759818a1b86a25697d3843191b6b10"; + sha512 = "633f2b5bd4d935b48c9da2e00b1dad339f9ba3fc6a0c2102e0b2e66fc4c3177013e47d99afd6de9d54d7897b54270b85849c60ffcdf3f75d78d85f1f85785df7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/lij/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/lij/firefox-61.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "4d28673f495ec4c8dc1a7bb6915ed8474fd7f378fbcacbdc5633835e3a33c89b8cc9e82c5258fb1975ef5675d7b72df6c0ad2d909003b33e60d89737674c51f5"; + sha512 = "b29fc63919da339eacdad4e9851f1f0b63f3f3b46590b86256b9e1bc7d0ecf7cc91d708b54e1145add40efbb146d8e4470f77a4c33118ff65445e2802e6fefe7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/lt/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/lt/firefox-61.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "9a7939df189181535319e74eb28c87d570e053e329efd42c32a4572e953bbd975ee8c310deee24a5fe31d9cbe5bb209d36c6525c6eaa8ea440555d87c3ab91b9"; + sha512 = "6a38be681c24da3c3aec3fa78a0561f96d53d1b1754dab1796f137cf1c1dbfd559b3a4e77bbcf47d5571b56f0ee176af0353827a5899db8424e471af67a29022"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/lv/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/lv/firefox-61.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "fdf9d973305278e3c7fa677e3f884ab533fc1895b68e8318846a8771038a2b876aaa8465cf0e952e67aff0c3b6529f2c988226610ca7f1359aedca464a62a9d4"; + sha512 = "9e5d8b2ed27810964862ed7b1308db33de6d518b1cd293266ca950797066e8108d8e5869d3062870f74d38dfbac9776cd926165142340ac5ab920ca0cb0c6fd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/mai/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/mai/firefox-61.0b14.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "c89e58c8888bf34a370309c9d29ebd4870e18565b5a41cf0e654c773f0daac8f1e0f3d33a2df1d7acf8cdfb5a99a17c2407bdd1027b30f2d831cdf11bd4fdc9d"; + sha512 = "ffc81f670b3bcf5c43ed29e8016cb240a8c9936eec601e53092357854f2587dcf28943ac72a098791398bbb98d37b68cccb9a813db9dc22d0a44328b788680e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/mk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/mk/firefox-61.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "4ef7ac1803bf7634e754d3719c3ea53f2f19e7d3faf47f0c91ed1bd2446871d43ab33b1786a00f79f8e68ca57361778a99663160bdea8a196d109a6c347d4dff"; + sha512 = "711d7b92936415d46574d144e0a718278807d00dcc252e46e5bcbe528e578ff9e7d2baaa76be20e18d8b41f492a6d7b4bb95a6d47e899adde988ab5fe47900f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ml/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ml/firefox-61.0b14.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "40abc6fdc4ba15d88af54dca0aefa33809140ad3d7059eb17e86accbd1a788d045b80bf94117819813647b5b5011c3e35783bbc7035808a42668c44278170845"; + sha512 = "5d0d5ab64f8663fdf700c317c346c79e47ee4c035589b4eed1d8f928f5e78ac8dc8f60c4183fc6d46308b14306298be4d8e87c69ada4a7d3a23f9db8473c62d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/mr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/mr/firefox-61.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "800461d8726ed7cee434d283bd87942ec1729d5fa052c4c51e7de44a69b4b9b2fadf9c314e504e75ec713e72f53aef323ec45708b3ee73ba758c8940ca44decf"; + sha512 = "d97774eba736fc032b06972e1684464022db0aa9e0c67c815f71f07bb5e9a1df01bbe5c93d1a9011d4519430264d64aaaa6cc13bc2fd778acfec69138118ee92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ms/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ms/firefox-61.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "c00f27a992e42b8c5c707a07946582e577431f6e0603bd1d6fd23308961230923f243fa07b484feea97e9f05a66d4a0ac9d2bbc4f6a14153d49bd5ed55eda5d0"; + sha512 = "c3204e7880cbb6604f5dc63973db3b4c51c01e1e54e9a03e8b18441ef86ae70644a038fbd4e638257195c5cd6ce2706dc385ac155936a8221727e916ded6f6b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/my/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/my/firefox-61.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "c74fea7e9ea9f6967893293b11011c980ad1f621aacfab2fd6913d6fbb39ec4e33480d527a677237495bf7a5fddb6a2b012713251ab58b033a90fea856187501"; + sha512 = "6a99b4de109040f7d28fcce85efcfecf07c6d603d77d21d28e9953f3d240818d8d2e1c0ac51e732cfb2ec1a5d431d5610f8d92fc125ddf3d5b7ba38d617ae633"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/nb-NO/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/nb-NO/firefox-61.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "f3cb7b04a139a7c4d9974fa50ca64e31109b05719c65c02114735d05e0cbb1a8274b212470d3c49150afd28c53b8b52083bc97fa95d31460b172bce81852414d"; + sha512 = "796ab97579eac69fbfbdd12e62e3457c9329587a4a69d999ea85177ad9871c42b89a84641a450c17cda7536fe97552d4d5b2150d21261514c649f446d76c5935"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ne-NP/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ne-NP/firefox-61.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "21f328f1deb08a06957195ccdd6de3ee08c316655643e60f4c1c8fd2748d69ccf778a9e108037a859ec1ff9f079802b6f70a4c0f5436692eca42f0ee2b6a18a3"; + sha512 = "3efdc62d62f3f3da82d3e669f3becca6e26163a05d72cb94a42bc5a8c0cb85767d1da14ea18348d13c9b43856e4fdd6ff2a21765fed622b1f087eea968440574"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/nl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/nl/firefox-61.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c640dba6a09dfaf25c9d76f26808a5d5a6d96c7c8164f567c1be396af32a36b64b07eaa2fc4db7b011aa6dd4e63b31fa2d14499eadd59c34894a8ac16b6e2bc5"; + sha512 = "b70dd7e08bd397b175030c28b93fc8154f4a5ffa7abe1fd6f95dc46f8b37ceee19359ef1d451cc198d93222e50a5a6a0e84616f2b1d361f18e53958332aa0d71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/nn-NO/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/nn-NO/firefox-61.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "bd69bba361521ca53cc4603bf874122cf21977eb86be84f58664da4ccb7d330641eed6084fd62a14920ccbf9ad723cf3edcb44b2c672e6fa46ebdc3129d5e8a1"; + sha512 = "a7971d6900fc9f35c014e0e98c1c7efe672a81c29d00de39c76218b347c1e3fe0b1c241cee92593fb38bb236cdc756016d597830b4db10d346041560e8f95ce1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/oc/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/oc/firefox-61.0b14.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "6b325721e50c9f5d3cda7961c169f1bf61379f199f203eb04708e5daf5adf4e5cfbdcafe393846be8811a95caea08eae379413f070fc87fcc6fdc8d792429bfd"; + sha512 = "281ec70ff1d62c5343352efe648d7db8f4f6b49e0a608427b85615e21ff0c435531fdfb57afceaabd446823659665ad6f411521c605cf846ff1a0d9c62c76b8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/or/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/or/firefox-61.0b14.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "fb810758c07df0e88346e9da1b3f69b8ad0c1f325253b4066f979028133b35b6f38ec6ced190b469302edeacc2be1480a89101ebd49595692ba4ae0810336f72"; + sha512 = "e31b8f043d2f468b33a7561c42eb09c904571d2949d53486c2fa44a07375b6321efb07045935c8a6cde7a3bf1caac606218c8d658cd067b2a08d3321d4684cc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/pa-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pa-IN/firefox-61.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "a64fc38eb4aca8f51323c0fd579f92710f9f2130885f1d3af375ba22be6f052354664abb35cf92be820117f37c2e86dceb1a0dae6b06ffb2a38ddc71d35e6afa"; + sha512 = "ce200baf1b4f99ce75fe1a8bc9e07d2ca05c2b231d05afdd93de385b56609c25586a92d67554ec292c916f9ba775c0b65750e3d3dde07229f70ef6da34eddebe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/pl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pl/firefox-61.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "90284224c8c4b990280e60d00c7d787a4702d466a4a98be69948d56e9d2142388c39eeb0de77d7277b5df97444de7c6b341c42020ba42dbaf1c80336cd8f2397"; + sha512 = "ceff46c9b211e1df3f52fd522531f329b4f12ab7229fb569d3eba96e2b5d8aca49f8482d773189e129db1a893de85aec5bd1bb3dcf5ac87715b9f042b7b8eb36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/pt-BR/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pt-BR/firefox-61.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "09f22cfa4d6a5d7943ba21c46b3d272f002cbeb75c70de51ced0787ff45068eca9a6f7f1b336863ef315b41e8d6145cf77f974c7ae12c0d2825720fcc32f6f48"; + sha512 = "cba9d2c59717d10308e9ba36fb20e6b88f13b3d2ed9620a64ee5125bd19b173a03fc3e0d0344c9f022b89609172ae1eb71603a705b6374b057864d391d951652"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/pt-PT/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pt-PT/firefox-61.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3d6f83528e8161f5dfdd6f35174f88d677ac97fac3ffb561450ac54367f552cf9c09ff08a69a82224123ca271ebfb2d011723de4a8a86708ab0afd34e9806c30"; + sha512 = "6ca78cdca5cdf329d5ae153f016290c7e2c25c4db19c306460b902b217ac8c38fe01061c43f3e9e12e93c2805aeb7a44c5e1828e4235dc0f457a178caaf4e08c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/rm/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/rm/firefox-61.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "65043eb93f0b43f1e7a4282732d06b5d4043f898eec4324ece23fdea36812c85871fd943cabe8265badae913d7338e925f519732edac792429f7643adc062332"; + sha512 = "fe9fe0f3a3e1b7409ab2452496b63376e124e1fb5bf3c3521eda8afc008756bbc3011189dc9efa520d6332a5eb734dd2d1c5d1d0a1396db1aa116530ad8653e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ro/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ro/firefox-61.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d78f56f3171789ab1254f6be63725f5a5462da78fb1d6f5df1acd4d2e3baa777fdbddf565d4f458e678508cc0aad8bdcfca55d810e86a1c7bbd490b303134252"; + sha512 = "9fd3fae5bdfe6b41b33b91672bb46fe29b56d750e4df5a7dc069457623a1effce440c875847a36a0c18c02f3182ffc60b103a74352a3316d57b099ecf9a71eaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ru/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ru/firefox-61.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "51ebb33bd00d2444a1049222fb8d97d846034fd4eca5e441b066c4da262080846e22d893e1fd7ed6eca390112f8694996cd001a28ccb7f24769a3fa479cbb453"; + sha512 = "2df4bf48b71daa282a360f6877530e67e8e5e050c70066b2bee890409611053d72a0cf698e80f5bfabf3a9c5482997b66cd1acdd98dbf5027d5abb9224641bd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/si/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/si/firefox-61.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "097e100f8b1d476fda5d070d87ac3a0521889f5c2aa7a26fa794e01b518b311ce380c8731bcfba41db6e6dbe24c6cb83fe8e595dc41cf2450a72f7e6698d74ec"; + sha512 = "d05ef105312b143ebf85131f8e5645281f8ff0969ea891ff455bb5d300eace172abfcfa1a588afbf85b8046e6c51141774c7482947d80110c0df20ccfb54be93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sk/firefox-61.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "603b641c4f23a68767cf97945d8e72e81abf2cf40da031aa6d343729ff028a30c3e4bed074d4377aba9dd58d3f0d18a80bd9cc15ad81dad873866ddb9f6b00dc"; + sha512 = "64785b3e374e143037e8d278c1702d82b6b872fd7c839713ff2272beac3c63e3d39b7eda51fccacab1c2bc313d373d5850f9e6425ed611759d1073a59d785d76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sl/firefox-61.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "6eaba505da78615bb9345ae6bb3321a089dabf470d6b4d10c08290ab81f0b44df346015e96c95b413d32eee27bddc53ca5e3d1a632f8ebfbb8fdd0580c937fc5"; + sha512 = "82fe1143c73daa2d1b2c4322c783503301470c8df32fafd910234a156dd8ec40e327b94134c52915fe39e5feeb9e12ab347172277ebfac6d6584a352b7d05f56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/son/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/son/firefox-61.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "dddeb77817ecfae0e6671c8db2aa4a0c313c3d7bc11474be4d2933033f11dece142c1b6d1e12fa1f2650e7691dcb8ddd58a2ee9af6005620647c06d69f6691fe"; + sha512 = "69e0839613b34afb114628998f073cf48ebbd58fe7ca64b55dd14efdc3770bb31ddfbd8d4e4d57fc73d6664bade0acfa57d0ac0eae849431d6064bedbec66a66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sq/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sq/firefox-61.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "b5f3e7e78abbc20d612ea38ed74697f4543e6b580605cd37c630ddddbb15cb6829af2f69fbf470981bf47184b4ee501426fb515c6f09fc4d7b1156bdd04002a2"; + sha512 = "d198b61bc16b71f4ba0bc5cd6e62497e31103e3df5b2aab759166721c44410370e606598ed9b2f2bf1eadeacfef5f723434bbdf8ad781057e10f59bc82b2bb4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sr/firefox-61.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b1687aba62e211f614d0ed4d307fa48b8228109665f42f1557037ab645f87af54b1c0069f54c14e09d46d652b68e6e5802f83c3052b45c29f5ac9284934b2961"; + sha512 = "b621a05fe50181b1c94f408f680d48fe8e596da8b7df353633d4d8ccdc08f25443ab79ab4e6f858ba6fb8a656c140813e352ff3e1689176de0147701a2396b0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sv-SE/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sv-SE/firefox-61.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "fdb632c4004f721fba16669ffd8ae0031023f55fff3ab0de3f045fc408232788b4aa7dff4fd5bbab847f1b7a1b524fd786dd9c9f63ac289d699dbfad687a759c"; + sha512 = "85e20d2e721a22abab9a1c369cce31514edaac7c9ccce28416cf3eb6e46974613ec175b33783f07ff55636745d6ef28c35cabefcf7b8aa70f925fe6fdafc66c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ta/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ta/firefox-61.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "a53f07ad5212a975d201dfec81a89c18ab83e8e6429a67d835aa47897d8a5ac4cbc676d178db41fdeef4f5d066813bb68fd5b52c8dc9d55b8830be2b69b353db"; + sha512 = "5162bec39eba7dd8c320ed75de56c2fdbfd66fcf47036f3c07fa8dc849f5fc532f0871f7a8de287ab69d6fe7e1c85317f9dabc64f7e276a40bce531083f19d85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/te/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/te/firefox-61.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "9cc6d73c01531a72dd59fc19e56987da093518f4a54b76e6d40fb6f26b708caadc7c301d069ba8138ea91cd667c46e1c298aa63889b067a1b981cd3bafeb55fd"; + sha512 = "063b9ca6d71bd22d79ff21637fd3f32e711582ce08331b7fd13b7271f759072d648b4de0f6503fce35990751d4da9c01429f38de5ff12345ddf5bc16dcdd000b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/th/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/th/firefox-61.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "8afb2048fd071ec612791c26892652c01aab0d12798cf26dfb5af69e97962d805f962c555e4e6c842d403286da7572724022885f13599fbde665dbcdb27438fb"; + sha512 = "e42dd04acffc8d4468833444d23bdda05d7696f37376c6afbc0a2af5d7ee78f8ff0fefdc475b5f69bbf4e42b93f944e6bf2550cc4975a114699992224a3a522d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/tr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/tr/firefox-61.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2ef229013fbe4221920a2573b7925be045ef8062b600f8e560e844ec87420506df3c712378cef34e7890e387f0a8d4706f7ceafa1487d5f024a69cc46c218408"; + sha512 = "27b34656efd50449a3cc86a9d46dc64fb6fcd8248b4e8e43fe871a7f95138187a0102b87d1393cc78c600255e745dd21c2b01870690e4e0820c6859d8dde9dce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/uk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/uk/firefox-61.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "ce10d72b1eb8ebe01cbce38722ed16333b6eda3616aaf398a40c685ce062874339599a1c1344b6d9c9529e072564f3bf739b56a62ad0c6deea2ae2f5ffa29505"; + sha512 = "537871ebf2c3457cfe9b61ddc2ba4916e502bfcfa8e2d1d4d10b84278a025ab3b859e4fdf68b1ba7ace37c0af14fda702f2be6a7b0e1ba5512c63294ebbed7da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ur/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ur/firefox-61.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "52c7fa6169f399eb224bdbbafef9951285543a478985088e60f601fb5c798855d24b1b8257d29ff44ed6c5435fea4e65ec1e1164daa0b7e22eb32152d172e6f4"; + sha512 = "89f5c1db253fc25ebf57523471c1f9a72797b3e2ee67eb4b74ca06ed297976bf1c15b7a25d1f1eb309d759e2f146e7210a8a33667b8bb22e254f071c76f7d49b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/uz/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/uz/firefox-61.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "835f1cae73b327bbb520935b801b78bf47b9e58a03962aa22a9d2b933f187670d828871a679508702a0ac2d461e17bdad71a3e0bf2e8d34824b08dffb7f65d52"; + sha512 = "3050b5ac3530cbad7b31920921a9aa29533614264a55eae9d333e95a5d57568f8a7002a3c9739a8f55594983d70fdf0ad29d38d8f9e7b212df23f488ebc26515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/vi/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/vi/firefox-61.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "f4812bba2812a71e004107a0d761795fe1feaa9705be0afe7db5462782fc888cc677bf5eaaedad7f5f914b827435bceba8322dd246274539d095b082f1221fb8"; + sha512 = "03c6ab48cd6fa0a797eee0acbd39a14673da14da3f2505b445f08a3b6021c3d6e01baf48a725c8fa08bc68d5189eb8e0a8a2c150e9563a149c8a221b6c50091e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/xh/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/xh/firefox-61.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "d8ba71f75d3131dc130a638692e42565cf9a5cd976caee18220cba6bba8a858f728f470cf345294d286bbbd3e2059554018f86f33533fd9dace88f0e0d97c0f1"; + sha512 = "bb9b5bc312024abda5e44e8f299217cac7bdf3cfcf26f55ee1605ac3c4b59fdc5a59fe0fb8897243b9e542f83faccc3025c77710d236e8f937844f7be101d272"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/zh-CN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/zh-CN/firefox-61.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "49ea68976c1ea0a972b7b228283cac2a1f0c9bc660da4456e700786d235e7f40a04f89a69c337a65e82a4c200307120cd2c8cbb1fe3536c9d417be07a80c42cf"; + sha512 = "bd80296763f7c82be3bc02e75a47ffbdabf37873e41b82b213d71aa6eb165e742b89c1fabe00ccddd2c9b81824e96eb51186bcb399560e285063e050bd435ae6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/zh-TW/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/zh-TW/firefox-61.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "0332cba8cbc962ab2868bc61de0748c446c098a45d4ce8125c78b2f7d167e6da94348cd255e2910471c9ff7635d4ed8500eec27c1bbde21e79cd65b7f88fdba4"; + sha512 = "995e0a228a83f464b3d47f4b9e0fb9b692bf6ff2af4c526e6046cab17fb4c15f1e36d7822efd55731bfe812fdfa8885fd60e4431cbab0562ac6dfac21fd3aa6e"; } ]; } From 0ae60f98c4e9f09c0c314fa8157eb60d64f43f9e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 18 Jun 2018 16:04:34 +0800 Subject: [PATCH 121/265] firefox-beta-bin: 61.0b12 -> 61.0b14 --- .../browsers/firefox-bin/beta_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index ec6b0734a1d..feab0194983 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "61.0b12"; + version = "61.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ach/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ach/firefox-61.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "52a328bfa793f42b7244eb29368c4e5ee044d4bd3b291aa5c43f0b6cc8c9a0486b15c7d44bf1a1f1e51697b6f775ec1c55f27a1970284483a3f8b28c64ceda6e"; + sha512 = "db3ed2a6baafe609e3e57f21058b65d6aaad657289c647f50cf701de11653324ea02a1edd11ff005a1037b61053cdf332c2399eb5483f31783e44665fa0a5892"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/af/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/af/firefox-61.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "8278f56fd31808414ab5df2f6aec2b4df31c8a7f1e5658213933254c58cc78087b2741befc4260444b2b6d32b38f4d5fbf281e3c6a30248e31f93053ddd46057"; + sha512 = "b6a1607c92e59e05a17df816e99065b1ecd0d83e8de6f14493985d758c7900d6ca648fb63664479f94d7a162f61a2c3e8dfe54d9ac07a61a1d2021be0d2601ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/an/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/an/firefox-61.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "7487a16e06b0e71d1a1b3495952d6216f3aa4941fe20243a276e61bb2ed4cd0f08b7c02886437ae82a0fdf1b90773ceb54a31ec3290ce050ae4170ac16a4e226"; + sha512 = "8a4df389f422a994926875d90b880ff110f4c526f50c6fafef164b4a7657677f05932729c553387e06bef7af7e479e0e357b005fef72ed05c940811ba94f7f9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ar/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ar/firefox-61.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "df491982db74b684c6aa1a1163564b2210a502d994ce3813fe73cce40e9c4eb064a966286ae35db436495c9802528995cf4ad80752ded199dc8528412f150042"; + sha512 = "349f96b77c0b67e9339079c3d5a3b71a655855b5a2d138e3444f0018043a9ba801830a62c07be2ccc452202ff171802ac46bfee4223f5aaaf623d51430a0fa40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/as/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/as/firefox-61.0b14.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "eabe64dcd8d7daaedf6ed6a6538e32837752e7c18e1fd19d31a5751f556a8a05a95342fd2c8a6438c1bbb6546101adbeb95138b83baf6065be7b93b4e4d45f2a"; + sha512 = "c60cf70bcae7ccc00fe4a0350a60ecde6284d7e4cca96386b2e8fd26d0f45fded354b547c0da2855e20b0150772fa6e4523074f8bc455c11a1a05abdf0680940"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ast/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ast/firefox-61.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a10cf8205b4ed7a83ebbf58475d2b24b831e548c5fe99b19e05dc9106be53516a660a877f8d952dec86c97eddfbc01100b9056630e5fcb1157d45cbd0a473323"; + sha512 = "c68f45e752a7e0733540ade38e369ab85e0815f81d0df8887509e3ce0265a7f8d213ccec9390a6637600ef2027d413c14933702d259c745cf1e9789f13d2760c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/az/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/az/firefox-61.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "45b55eec4e38782d44708e4db79e81383cb87425c4ea1db124dc986326e889f41f41f361fb408c1b1575604ba92173d42d959f1fa333bc06dfef2bca2cc6f766"; + sha512 = "b953d077fad90aec862fd50c9cb9ec73b682cbcc1ccefc75e813ce00aeeb7f2865b6abeaa23e1a6217e2fffe4530110447905d5c7d68d6a4a297669ecf98a7b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/be/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/be/firefox-61.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "b442e60610d2b705210117da72b37f28f9fc5c72f3c0d90a11ec7136be2230f6f4953b69cfefad37948aa4afccaeb73c363cf2de8f72c58cfeb3a2aba6da747d"; + sha512 = "d68b380e95e3c353698b5e6842aee7737c22d1140d62d92653936efb92b49ec1e9f227ad9e0cd8cb5dbdbc5efd7b537112532a87c4d20759adc89d9ae58a42c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/bg/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/bg/firefox-61.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "c93ca5b4a33041ef2c0dd0eab472ff7d8d94bab7d5b2f17600bf45995a1c67287ca8a1bd2c82ed5fce3d15c8efae228c6cbf9f5884a97280f52ee431836e02bf"; + sha512 = "79270f024baaacbc01b46d63c60ed58e75f49c1ec14a0c9de480bfd750b5f914bbaf25be216792bf0be6eaa3ae0f8886862bdb8f92568eef54c6f31b9f71c15a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/bn-BD/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/bn-BD/firefox-61.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "25b6962a0b196bf19fe2de5f553d49c78b1c1fe4037561cbbefaaae453769b7dbc99e92876706b021eaac28e3cb7dd2bddd05206fc983abd7ce7aac49853cbd6"; + sha512 = "3c5620c1017dae764823fc98cb724e69fa74bb0925fe1ee1f687de7122d3a9094492d7fc80fcf3e922c7bdd3d6bd4e744bd9cf02f3f10763382303f88fb79b48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/bn-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/bn-IN/firefox-61.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "b035474bbc3260270a79e30c3d7b0c9d211d6c4498a2627ddd9c4266027654ff317682e0654a9a83b9b8b5f4e86fbdc692dad08b8b45dc2e671fdf87df673bcd"; + sha512 = "47a9f5c4b6f9e96b8c6dd64fd3989115a66a5ced77c913409201f4dae25c6d72b6d91e0746abcaaafc4c84d3018d7955e085dd2af45665b96f590a95746e8da1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/br/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/br/firefox-61.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "bc3bb4159aed0ea2d24940c245d2f7305b8c9aa2db08b89050cfa1148abc51c66118176e1a4796cae04b37ccdc7d46908b7321484be689c65dec64ad6ddd3730"; + sha512 = "75fbd163865f92bc40eff88d475b8e30e77e4e9a3d1d9b0ba588e7b78d5ca1c57d15d85cd8868dda73e8a67a25e0ecfbc9710d758828463b0d7030076c3d421d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/bs/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/bs/firefox-61.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "0ad50c789c497ee9fe48dd981c61ac5efc8c298d2f113294c0f273beeae5e26461890def35568c670d6bdf00346f01a87cbeb30936236a4977dc0e9690da9eb9"; + sha512 = "23065f2645d8ee5c502568bac03f7e184b7d49d9c05388d2110e9875ac7423c43f3edef6c64d307c14697991adc039d6779fcc8c6b4f488b953484e611e0931f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ca/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ca/firefox-61.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "a8412bd99749c5b8c4b32b4a92d24a4ca464e9bb04e4aaf36da0536cfe768bea38bc9aa077600473d644a9c68b202d64ddded17c3f2a49d7486bb7ab966a7b29"; + sha512 = "10c180075ebdb9eeb09f00e8c3c88848955969b429167a3dc2f8a61826ea20aa687cc2ed819ad0a8d59909278e55c2c8c626bf0a366ec52841e27b0eb434d3d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/cak/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/cak/firefox-61.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "249f20e9a18ac6c21d3ffd27d4d1da5385b44b959ef884add67651f9560381967fdbb5ae51157736a29ce20882ad78ddad2a1bd3e586ff204301575ab6d277cf"; + sha512 = "9dc714c03556dcaf0d775257183a93b09b1bda567fce442af55e7dca4fbd119ca55d754c1d504304683e92bd29734b298ba685a089b11ceab52cee5ebbc74fc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/cs/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/cs/firefox-61.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "28a7a595f9348a6e19467ce25c6b02ff91b10db4f8ba05099eef4e4e0404c29a8a8ed4ff589b0d5b95cdf3d5c2c84c69170e420034399f906e9632ec10e1cfc4"; + sha512 = "a4122dfca825a16a40176a6aba334e4fc74e66146f04d01812c6049be2ff93b0199f321bd2d46b02b87a179fb51ae95246fde58a263e507ff2f3fe1b1e11d3dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/cy/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/cy/firefox-61.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "cc3c2dfa6ec782bf4ec16c914063c88292bebf81d3814a2b2873490409f84c0934c517e753a4813aea72e44d76a986aec283623f3b17e40cdbf15ab22b4a7213"; + sha512 = "5fd2a5f5bf3d26c79eb896370932c5bc72842f086617fe16a8b4b729c841a8e872946b56e20c623b54c12a6751918c3cd97d7dc29835b0b2a04a01f70da65e38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/da/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/da/firefox-61.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "7b1d54a8a18472369bc9c51d42289d399bd0c59178fe44026229f71390203adcbcda944aa6e7288bb87962a6d7d2123659969d91d3149ec1ffd1143516c23333"; + sha512 = "a9f48d240cc0bb8eacf2ab418b5903db0d789c3712a61b28b8aee3aec2c9112eb79a4805142798aa15561ab09d7d63fb69ddced7d8ae3b1fd5aab1f00da164e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/de/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/de/firefox-61.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "001d83700ad1630ebc139cf7228c82abeb62f4e9b06179bba185e10731df9e040b543ad4b2ef53eb1a8f6eb24b5bba341a7c8563943e09c23fcab67cce930a3d"; + sha512 = "ca81b151a407d588418505b84cfa14cea622d50c3ce3cf7e8b9e0666fc5c93d7f2fd25e792d768ea8d7fbbbc22d7228a2bd85fcafd9aafc6c8f8c78259e6e9ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/dsb/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/dsb/firefox-61.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "d5750da2cff1c2467a3ef1db671b3d457c185f95bcd3865e553fb30bc1c574573a6e42a064cbe666fd35a1021fede35975bf562a0b161783ad16332080527784"; + sha512 = "f4a733fc705ddb33f8f2108c85aa39050157fdcfc9ae07905ce6fd50e910595741837356eaefe83610a50e4ac93b919ce8d665817b5b53f9c71cb00c278b73f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/el/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/el/firefox-61.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "25a5d3afc9543abf9a403992af0f1a2690559e93357bdc7742ab216c87888d9d7c25a711b2540fb298e699bcd13da5134bb35584d252345669ed0d5e877b5277"; + sha512 = "da642365a096f146047b92d915467b34cb348fe1986189afdd32e0fb5a89d826b9d19c5f0adbc786810d65987528a7d7c4fef60ba144e695ffff26e2149b099e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/en-GB/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/en-GB/firefox-61.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "033999bb8c3c973342755983fdf208a828ad2344a5aeac6e82fc9d066afd21784ba48866981cffd4fa793fc2ae063f420931402e9cd290a97eeedd9047678f4e"; + sha512 = "aaec5a485464ab420d936395c16dbea142642162b22a494a5ebe5ac6e9f184df303807fda2573d7f36cd0cfa370f7b6101b4bbd259ff59f16f99bc88039c253b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/en-US/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/en-US/firefox-61.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "662859918fef837f5b66413164f1fd89c68506a12733d0014dcf75366dd62a03489439a035ad6481a4764feaa80a0a5eec5201813136f755d95c1bb65d87c954"; + sha512 = "61e810f7c8d3d959f29653e754ec4d1b3f5745684c06d2621a9c84da70917adf4a6926f16288ac3375240247c9d09388be0c07cf386f4683f4ae4dc967eb53a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/en-ZA/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/en-ZA/firefox-61.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "5f5a6ef28731594dba101d6e244f909dbcbb8b08d2808440bbb485038997719f30f2ba38c1e021d8b91268c7d402b3b9c9fa341afec412cb5878a31a1150c40e"; + sha512 = "b8feaa4158cc886799eacfd87a28f48d1176e5e23d89d7f23457197ae9c8a414a45f96a656815d3322ba307d20cac889f68984967114a7e5655276a32a10ad71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/eo/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/eo/firefox-61.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "5c96c2d900106ddbb0e527aabb90f082dccbee05e8e05a40a3d704d59254027b9ef42eddd0c19ceaf73bb5d020cd7a075b510ec9fbe4f9cae71e3cd92a6d0d8a"; + sha512 = "ad3293e8b836ad2b0fe81f4864d8b9ea3a62fb2e293c564fd92a67d75671047c8b2f77ca9626dbc6bd5f4f4989b43d676eb8f56e2ea7bb7770a682b583a3d889"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/es-AR/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/es-AR/firefox-61.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "83c0596af66758bc50649badda5e628ef6344ff1e6f579540c804a8fe1d503c36d2c8116d9fc4cb1ad4ca8cfa13dff0462b299f5a038f7f607282ab702b4ac82"; + sha512 = "437a6d1f79e45f0ffade6db41806d2397fa85966e744bab1251ad38c77141782ac2c7e97303ce75013f17d2be7672121c366a35de00b12a42e3eb382b56323ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/es-CL/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/es-CL/firefox-61.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "d03939763ce2bec161acec52fb67c9068f50e28abb838f9a073bc4bb479a1696e5aa721cd2e4f6993937e6539c7c56e16385b1ffed6c9942b41996fe44afa722"; + sha512 = "685f731b6d24c9c7d069e3bd1e387ca68e6c165c0f68aa956b644ef68bb5094be93ed4c97e1e102da7b1773083ea578a7aa12fa8f3b56d7e28c79e0503952043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/es-ES/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/es-ES/firefox-61.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b200f2c47bb70213aa13531b540d2d11d457282c7ded5316093b61e6f09cf333225aaceeeb9c4d44174e3faad4635ddbabd87c399fac17466d53a2318b691b0f"; + sha512 = "c01478c08a969ad80a2fb3be6f0a64e483100e4bdaf2d287e1cc410c0ed4b7ce7845fb1a3ed7cd393cecddd094b2eaacfb8a59101da0f6ae69f50817f1163b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/es-MX/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/es-MX/firefox-61.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "eb26c0f4e1cbc4c19a05de06781a9012c46e0c30c4f7eeb33817fac24bc1d052904d77a51ca4d8f2a7ad323e2dca1c026f339adf4d29725417beff74fb2197c1"; + sha512 = "0cca13347ce96fd516658a25ebb4c6c9c3bab292d7bfaf9fd5f0b046af5171c9b628808d118fcf32c0ec7b5c5a1a3d38f0c39c652436c42f700b7ec02d888752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/et/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/et/firefox-61.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7b36afcc29ed9e54aeeb563361c23fd97faa572fc470f3a80af583076d6fed1003aa6f9152c958466185672ca14232be4027efba6f3b9383e490d997766b9c4d"; + sha512 = "51542b5b23f34d6fed183a5fb764d3904fba9c2e64f5818ecd6cf06b903b8b77f65365d0c38648ff454a46fa557744f6a62c520428909a3dd6a69440fbb2fc86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/eu/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/eu/firefox-61.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "3560f55503091209c10e5eec35e11d5eba4051b37e8eadeb52f6179697570a3900a5c6807a97cab39fc028966e2d1c4b1acb57878fa651f5c435a8a9a78325fa"; + sha512 = "24e6bc43548588f7e4ab2b9ffbf2631924abb2e4878bc1f34fd0f03ab82d5eb2cc923de2473a7887579fb4089ff7370470fb4f4d6141e5695fa90447e43320f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/fa/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/fa/firefox-61.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "45b0e2c3669d556e62ac9a9f9c6e3dba61c304db275b037e9e2c24c63513f55c7d41f82256dc7cfc23528d1ae92964c25268a55200deaad2113c689287a021a4"; + sha512 = "128ae166b160bcb909d46ce491edc3a916b09040ca13e032d87fb324031410696f610dfde2e179337278388a04a2b9dfaf66dc665c8006838e4dae8adaeb9729"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ff/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ff/firefox-61.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c9da6bc3443dbdf28fdc9f9c5b11be77e6569621286ce3eb75ef4160aad22f76a78c98f700f80be63f19c6964771c7b4f9e35d251d8cbad5aad98889cbdfe74b"; + sha512 = "df4d1662be15fa20eda2211250b0f67b4397b4ba6f405920356aabcb4faf41d78bbadeab174d4d4bf34059aece1138b430420fc03fe6105b2864c1a020545736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/fi/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/fi/firefox-61.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "845ec5b705525585855cb846454f84a683a3c53fd27732250e4de823113a9f178a8dba0cae5da456cfb8a7e33121ab046a8eba68f0fd8917fa7484efe86cd7c3"; + sha512 = "4a8b8cabc19ab53bc510b9cbbda9af78abd688f8ca59ee4ede1c2452f3813c9b662bda41325e5bd181ee82777cae605fe00d2da6d41237dd967b7b0a0ab7abd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/fr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/fr/firefox-61.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "eb0c835552d8bedc442140969ab66973d2852e016bfd3bf471bce0063afe7fd3a6e52a0e4759f797886a89c24fe84caa150e01867078d23026ba28dbec476761"; + sha512 = "33cc81bd2ad138ecec1b8f34eb2ea9c54d7e1180ff4ecc7c569f8d1984c8651c0b13d5648dc11ce4cf8b54898a801c5b8f7b4129e342916e757907e820e6eb68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/fy-NL/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/fy-NL/firefox-61.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "438eae3dda2d35251fb9ebd18e42a58fd8cd20ef475c9575f0a087d9c336daf07482c8919791c5e0f7d6deec58c02b481c9810a364637f4a918d0ca896fae9a1"; + sha512 = "b2d0d5ead80040c9ffa393568896792a092fffd9b65713a49d06411bd087e5226ccab8cfbf739d209a6abf1db33b7b051d661e88d20809e63fb8217bf2561e8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ga-IE/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ga-IE/firefox-61.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "e1436c622ffc70b381809e62c9889d7b35924914c689b55b0a05d12cc13a7a612677efe47e0fc4b58b90bb188b3289630d86874ba6849ff619cf9518c77c4c80"; + sha512 = "af2cdabb5bad6fae6fee620dfcb4f0cb2092ed1ec2630ba625575e4001e4f9632e7273e1f0397d3451053cd7861daa09e07946a360a9b22b94172ef2fdd9a805"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/gd/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/gd/firefox-61.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "2cb057a728e2772181619fd8b908f9b363232d12afeed63052d3e4c0b201e3f960aba6e879a41dd3f381a8561a813aa5ca490ae5f58b9e6f095b5ce4ece21aa4"; + sha512 = "70273bd17930f0d6062bcbb83a9a62137df4fdd6cdcdc6d924765667ef324dd6b240980db6909fd07622dad50a6aa722d0b209c7b1549df254f9b18dccaa5c69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/gl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/gl/firefox-61.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "4d00e5cb9ef0cf15a8c8db979836a50d28ac4741875f56f632135cc777f8096d05e398d773596a314e24627ffb549e354a07f1efa14c74318c266d8c373fee26"; + sha512 = "f55b0ff1ee18d9cad4008ad8f3934274e27bc47b96d052504fb0a81777bccff7ab70b9577efe0b1e020c45d52600d2c83f63eca4d847af9a76906453f007250b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/gn/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/gn/firefox-61.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a5e92fd556d1d084793b3d3d5b61bf7fa083f1447a88be227cf58cdbc7f66e156ca67a2a3f6508135935f0315efb02b0ee2ad1a597a7937d6ded1efb7d7c1a07"; + sha512 = "a019bc5261681a56fc4cd0c69269c2a0b64ab59b7e3b2fc8bc1f93258abcd883eb27fd54af3128cfeede247d3af83454ff7fe28b07c61294850c0ac09c730898"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/gu-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/gu-IN/firefox-61.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "02c9c67bb7003c114c6d64f864b878c5ce6048c54f6bbf13753606bef5b4d1ee6b62c543de230d537b5afc7c99b619049d45989c851027b23f7d1e8a8c029e86"; + sha512 = "08acda8d3412f713c9ab352a650e3bb03e880ceca90a9160bae712d67bffccfdd448ff6efbe5da0ae798c542fe3e8cdb960d45dcdbfc5ce8e76204ad243f8aae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/he/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/he/firefox-61.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "2150ea2261ceebcbdc97013630bed5b9fddb581b52fe416ae237115a93997e4db3ceee3056724df321ab3922effec37dcb421e5c72f417301c8e500d877bd606"; + sha512 = "a440032a4a9844bc419fdfe53dda3ed9df9e4323ccef56c3d346c84abcd0262b2d8b777892560d14e831b348c1e958fc309c4740280fec94f9ef0be56751b939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hi-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hi-IN/firefox-61.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "1944f410ee05c3e2fea73460a1ed576490a54a8f16fab3cb4893913c7db9bbc7f133cf6a0aabf00736292986f11ce595670e03f1a30833d57549dd2d0943a0f8"; + sha512 = "fda2da9cd5ee20becf3f43af75eb9a101b986911921ef0b31b8350945d06fb5c8f6e86b4fe863021564a0e03e8e3b66bce2c4dbb5adb4a060140f47008e20a5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hr/firefox-61.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "3b330bf4db4e818723f17b6ae8b78337e2d1c8c03eb58a1ccd0d078ad70dcd2864a5c94e7e1259f1a1c4cf3df482659b6e8d6d37c1c0f131e030101883141bdb"; + sha512 = "beaa980e41ccda8da17afabb1e9628400087930581c6aa53f84cde1849b9395cf55b2a8d0f99514df93e439de8b0b65b75e767bb72ade0dbc26265392410befb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hsb/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hsb/firefox-61.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "06690a9d7933a561e0ee7d6ce72a08c34626860f6d0a5475e0bbfcd598eb5c499a3098e7ed354341553600fada49cd8a1411a1b6bb016b10d67acf5e5050609f"; + sha512 = "abfb497cb396855188222b4fda3f529ece63df9314540db2d8f998588150c036ca44f9e5a1b0b28ec1e49c0bc2ff16617cd41b8e427a8cf80df07199a5cad794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hu/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hu/firefox-61.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d61587a46d45839fd2b3545ec0ef51a58b8af22ac795f77031f0739320f6568f69ec637a4ae8048c519720a6756b87f6453dda77a2d8eab2de7d7ba4031c53a4"; + sha512 = "7a7f0ac492b52f4dd85f9cdbcead46957dd866a10abb92abd5e0ead7a6b3a28cc3fdb4d7f35b3074bea867342977713cb5fb3e75fc35225b4fd915831c3b7b11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hy-AM/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hy-AM/firefox-61.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "67375036a64e5b4b7e2174d64a28a34ef28273fac58939686ad90a6348d82d8d5cde629763535276fbf4dc7a89ffd3c0c753d6649300b82bd0d8050f96bddb2d"; + sha512 = "5ca423c446b7923d609e5ea831ff8d732f58326e5a04d42da546418963a18568c48af608ba15c2c64d4a91a7e8baae8c911349dd8b6153d55d03252e95e5fdb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ia/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ia/firefox-61.0b14.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "0e1042db7af12830cdfef6f34b00a2a57ea7ff24628c4e9dc3381681252eb93979f90c19d020c542fc8c5e517e7639b3a8f2804ebe9afafd1d2308ff1efc7c60"; + sha512 = "7210c9c50d0486ebbb02b9fa0f82b1f49ca6b30c1159c7bbda16ba25e6ba200892c8fa63ca329a450441d86a1480f79d514172d17a9e4baaf0d336a5a7cca136"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/id/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/id/firefox-61.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "938603e41fa33128f615e983beeed9aa99820110ff69466e7d0b16650655efa8773a7bb6eb863bb51267988bb3b9097e03c9632e0dae945827033aaad67a2e22"; + sha512 = "4d49c7501c4a1169cd8820e3ba469b9118a1ebba2a72761137c890e4aa1f30ca735cae23c857af3cb9755c69828bb8f4cd51dcd3b862cce39e56d1a4c937d2f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/is/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/is/firefox-61.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "2cb7dbce745c9e310f77977914cc7b1e861b62c11abfdcacf9899174f3dfad850fb0b0dfbc10842fa8e0e1cc4dc08a0863f1842e99b967d75e76fb13cb26b4fd"; + sha512 = "2983b2e1ef94b551ad40558bc0380347aa4b5aaa7964e5d3b2a8de8aa14cbbd472c1abf2ffa1bdec5c2471f6d906395383be9653b5aed1f9d2732e62d04a37d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/it/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/it/firefox-61.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0aca845e35d1f392cce164062690c5b346fa7c2e422666ed4ce8abc9e61f341e401e6a3fd09c1cbd05a5c08a8a8e671622c690e776b584cf356c61b4c46433e2"; + sha512 = "edbb9dbda1ad0e7a1b7f0f9c79001052083a36b180706a26ff70653ee4af859f0d93a5792a59f2542cad140005c8cdf2948cf8b4a784626ee78b009f2a92d3a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ja/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ja/firefox-61.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "1679481dd3bab13693a54d2e0b31e85c5d1ba374e3f13434986bfac6e2606d761245ce6d7945a75f4547775e7b72743038699102edb938f296e5a35d6ededef8"; + sha512 = "63d8787831be6a56e7a1ef73c1d54c5e2659415862e87c7f0e237c9b83a9dc7a41259fa598f9ad49af1608ef7d49fa46c8b3c0395f9ff473567a16620523b4f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ka/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ka/firefox-61.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "607f3cc38807df3293c8ab288d143724206ef7d2a84e6ab34b2099637ab6e53f295996c552edda9d8f8f12aa5101b3d1cdd4269b3afb792c27a136ea2ba87c4a"; + sha512 = "2d47a3853a46609208c07dc79f44cd36e01668f0bdeb37d4dd233fdb2e1388ab545373a52b321b29a86390015af92cf95b0ecf8afeb779fd5a4991b368399d11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/kab/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/kab/firefox-61.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "1edd189564cd7e760753c3f335b406a341233135711884c45244055c861480d3b4d654e697a5f0158bb16c3ad05934dff5c18ab0543c7d1e4e2234ee81351bf0"; + sha512 = "ee009619b6c01e2d85afeda2be4773442ee3e8a037519f6203d6717cf851ad80c3f9622ce9166c4391803870a900b8a9f1f9cefd72fc26549c3712ac91fbdebc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/kk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/kk/firefox-61.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "37cb725edf3cb07927ddd4f9ffc9c510bf30d8a02acd1f7c2bab838b9b344d57e003fc87cf61da340a98a13a8386a6e36f92896bcee5774c9629f1b851e06a68"; + sha512 = "ca42d739e7f0611ac4386d71b838e1e02f1f3faf490d4776c6d4efe18bef1abfbe8840c750f2924948b5c4fedbc4b8ddc814ba47d76109c337c237c34484877c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/km/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/km/firefox-61.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "3e5e5ea32e9bbbc912e9047492a4df1e928e56060218d6338b4f3f8a173aba13767b9653e66bffbeaf0932b0640e4853e12ca870724b24d31554e6814fdddbbc"; + sha512 = "048270e2ce3f5677fd419f7a17896f1d5d5b9169edbc3121aeb4883b1fb6aa945c98f66099cc800d2364cd4510323bd6ee7cd428299a8545a6e43e90c9889a42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/kn/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/kn/firefox-61.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "d49132da3584d83bbb8b8620871e8b8016b7379b45c9b3a88992c6ab7c888ddd648eeeece8168bcd808af9a1adeb227689b109c27bc221bbe51c10a8bd7ae483"; + sha512 = "589ae46f4172da22d479edf47e8593d142a8a194258215d72b657b681122cc500bdf6a10915b5dc3436a897ed033b29ef77e53ed82c42018dd2a23bc40c6e16f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ko/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ko/firefox-61.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "4ba372f0ff299eb86f0fae4eab623ece74525516c256fdfbf2579bfea8365d5b85beb0d544af6dfb492eeee5f5c3fa3bb779d2221aa197e0108f4a46096111fe"; + sha512 = "1b1b9cc7a0beaa0eff417e2736da000a0a82f400f1e16181d07943f3740978c491dcb4be2c3f9113c7bd7bfb1ebd5f2dd812ce4e793225e5753c88447d366111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/lij/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/lij/firefox-61.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3f2508dacd506a4e2368bec9253c0efc88e4e97c37bcf4e923e1acd0014431bd79a0a223d157f9eeebfbdf1262351b1fcfd20ad0a5be6a22ebeccad68cdaa6c8"; + sha512 = "d0aa1d8dda8a60de3f16ca5d600df4e1d3a6f0424ccbfd2f0d89f0f4dec7547e1ac6234e0b75f43785d4ec99a79c96023cdeb8d38fd5632a470382d25d052fd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/lt/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/lt/firefox-61.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "6e147ded183d2de13419d077ac7e74941881e5c17bf9f5e3e9f2805352d6b0c33628ce493a3e6bc8705a57631da13f33c45486280a62caba471ac6c558c03ae5"; + sha512 = "7e940801759c6f93892d6fb9839138a6f548563d91ed56b6e4c757523e446e16fc7e6672a1d1fff8b3ebb8c014283a62205ae0528e69228cfc50be88df450b81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/lv/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/lv/firefox-61.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9357d029b1a7b189917d5d2587a7da8ac05801b530c5e9b9bd46353a9b980da782a406b47d6ef4528f3865a8ad05fa5442ecec92696b5f96494d09bf6f35d02a"; + sha512 = "3e8eb6bef0b1acc94d5570a89ff7a9528777f8b6b3eb2ce20984ba299f32c122090d4117b702004ea97e667b38a59d553777a5239b2cf03909501a6c2ca0cb90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/mai/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/mai/firefox-61.0b14.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "0264751831b7caf8f5d56255af54b446574819f2bac3d0252d5cea29b8fd7b060da60e513c16f9dbf486114b02ca244901270ed40c2741b9ec9e403fd547e031"; + sha512 = "29df14e1c1529fb5e69925e58dba1ee093c3f1279499e28ca0477511c62f838b8e2b76218b2a32f3a7012dc246b9bd41a8ebab691c986fae1e0aeebf80deae98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/mk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/mk/firefox-61.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "16445afe986de8dd4b894bf07ff0dd8a99fef38c768479d8a83a4f091c616e7439db5b1dba41c878fb8492100630026c0a453ca0e7cf26c066e2a076715a87ae"; + sha512 = "7e5054e4daf8b03851c68a9453d43f5991e1f06b27483ec2c788460134aa196630d1f7e3ca2e6be3aefe1b04ea02ab9d765d6c92f3baeef48f463b14308367f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ml/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ml/firefox-61.0b14.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "db77a52531b4e706b84fccc042ee45337aecb77015578b4504a3e9898157d775c3a8d5b0538a12281627a040cbe049e7e8f48b138acb9c34291a532d2e320726"; + sha512 = "7627427e8f2650caf48ce0c319d5adeddba8f12b8a7869481954f7b66fdfeb0cbf7dc4248a2164ebdecc136d078db376cabbdec26999220f0bc604cd779c5393"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/mr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/mr/firefox-61.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "46192be8b4b3f0885c8c587f919def8418fd2711a9f35fac16d1240fd8e3c7a89c4349ca4a625986999a5d3525c7cb35965d703cceb8d027d4f3188276aac123"; + sha512 = "b84b177ef37cb0760ecb717597175923110732ef87043efc7c751705fb0317fe585112e66c1350b552dd1b338d298d59f32c18f426d943e9e1d5d95996aac056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ms/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ms/firefox-61.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7306b0517f8dfafb55221adc4fb02840c33db98a54856ea768bd0a0795a9fd7a761dde7fdeef9da3b9b32f04a4a948e897084847ab91c2ea282acfb6ee24d85d"; + sha512 = "724e176e62efebb8ca7fefba8a152e4a54269793e077fc8236da49f86bc943a5decb79b1db8fe48b9e4b62470248f6d8bfb33275e8fad5d1ae12be965b35d95b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/my/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/my/firefox-61.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "774950b82abd0360a0acf997ca2a86afa0a08216f2bafd759ba26a603bf02e524ad2f54fb99d9ee869fe5ca474e8aaf59afa31d1b9d048a1cf277a4e0696903d"; + sha512 = "2811005715196c3320a9939db86eb282359ff8fecd7e16097d64cf7a02a8647922db16be214cfef0f7b5b1f7340306b83622ae79e3bc361c19071cd1ecf44762"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/nb-NO/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/nb-NO/firefox-61.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "bba3378115ec3aec5539094820959226ddad5f2ace20d6de8f73920317eba594771762cd552b0bffe5371c7050f9bf3af88c1ff57d67887e55cec017521a823d"; + sha512 = "20569fea1ad722a88f32e4f711fd14020613bd0b17e068962dacf8c789da643ff95b03e67db99496bb3c78c9960e05bfe4c5d4d7e56315f3c5d68b7b52b073a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ne-NP/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ne-NP/firefox-61.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "7d2218a5dd3a75d652d73fa50d349c40e1cc89d02ea7e1918b8f3b732ac078b2f9187527b2345576de7733009ed1a74bc68df4cc9727bf92a65b6f88e25418c8"; + sha512 = "77fc1f141dc0f594bc6c81d48e82cb294ac12bf75e0aa44a0c6302952701b7ad9db637f818042efadc962a0ea86eb54d76a75a2d862eec753960309aeaf58449"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/nl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/nl/firefox-61.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c574b2086b28c060e9cafcb560d4914106bad3571b1c58848b0e99436fc188af5a4a3cf82649636e305e8a2bd32e67827e48a7960eb561cac266973e6c249c33"; + sha512 = "fc59c15e8061aa38fc9192c9d527c70cf645b27bd12fcb4dab9b6b6eca52399670d2ddb734079211b7fc0ae460742c9fa0f05e84cd1cf0c7c4cba2b90161a835"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/nn-NO/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/nn-NO/firefox-61.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "abaa85ff573cffd459db073d3fc1a66e41cb0901698c00b8c33d7db2a25e4fd7764989ad7e6a97afc976d606713e0807730c4ec9b13076b7546a5661aabd1cb1"; + sha512 = "fdc761fe1ff141c822ae33c973e43f6746af10c87438929878c95617dcafe15b53b2e5dbfc86f4705b1d2b19de22d9ff001dbe4cfc18690e15a16fa232035890"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/oc/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/oc/firefox-61.0b14.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "c8b309a79531a6a53f06ccf96aedb1667004d242d56be5f252e802f5a9689ad7a72aa6dc2c9e2a2641c10ee102bff930a939d41d2586b55d04db2805a39ebfff"; + sha512 = "3b027dad30e088e7f829cf71d7b9202293c4541719f5f424444542fdbc2b726b8c89f2ec0b4bb44110433cd58c4c1a449816aef97c7a94e985df4867959b978d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/or/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/or/firefox-61.0b14.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "d00ad155453c562f5d04b99db7810160535ad36e0066c76c17a2c37889369a5e699f1addf045bc7472d7f2a98f22443ac7fbfea785da52619c41162025587fd3"; + sha512 = "073ed117f3fee3a27191083f5b0ad5da554c7e88e9af962ca9fac2a7e51ea852f782812cc5f8dbd4f3ed0a0baa858b0df94a0bc52b5066441d031599d814756e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/pa-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/pa-IN/firefox-61.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "582714b7c9db90f364ab390d4bd383b5f111628e2aae7d08083f4b01eda1edd3b566dd985500e3e72e49d56333c2c98648f6835ef06e2c12a4189dbaa86b2a6d"; + sha512 = "88c674c508f99b3efd900b8c02cc43a8d10555ff3862ce82ed031ab4f9b05588b62f0591c41f7e617fee8ba8d58a57159417f59e81127d36471d33e2acff1a07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/pl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/pl/firefox-61.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "f07a2e782fbaf2d43404d890a84820bac13d4f06daca634fbc203674560c94917a2e189a193c9c4ada26b5380bc2ba7eab05ddda34e98e9cfe8b4912a2c11d7f"; + sha512 = "3a6da575e3dc776a4f5ff94ef8ec3650b5089dbb3f9f413c5656cfd5ef583053db24ff9d51564f46ed69977549fa1c46d838c360d8a56c308c70573d0d2e6b08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/pt-BR/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/pt-BR/firefox-61.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "1e54be6780c0a1cacd364b91d4a1857eacd2646b668fed30487707b8a7eea5d7b14bfc1a137fcce60f27847da411b5187155e16b9ea15ed4dec8c38f5ad707d9"; + sha512 = "8037bf07ae7d69fa90f1c0bfc0d5ebceab92739e4789c002520da6349fb454d0a365fdb8614e02cc125cddf9f1a2c154d75d9cd4c6ebd0e93b67e9f4f6a54949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/pt-PT/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/pt-PT/firefox-61.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "3bf222a72788c1ffd67ffc102203f2b55796391adf61bee3e586ee1cdca773206017f2927c7e3898ff548eb7c6372027e8c14ba5819e1dc084103a317eb4697e"; + sha512 = "3f7795c2aad51c8650fe48e1722e064acc9d7f021ae03d512f6c339810f635ac2daa0d015f5b1e05e0caa6ff7ae8d5b54bfa0d952f2ace93cc318c77fb4eeb0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/rm/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/rm/firefox-61.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "7eb639523200984fc229d0578e3bd322c5a517aaa6ccb314a85dd490c00c0793d2f9b3e8ff8e02a328425160f5c1a67325906fb27ee4ba159cf08f87a5976d11"; + sha512 = "8e269a4688a81db4b31e01a9cc740d16b8e5b1b8f2d63a869ef9a365e5043a7b6ca6b47457ee263d5f95e148f7c91279435109728bdfe92992525beb450b20d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ro/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ro/firefox-61.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "7488f5dff4381076f07e50fac78eb7355ea46ddbb9a7da33212d140d57fdf33079c91e2c218e22db78c7e230db5bd51014a930b052be603840bf2d2fad026077"; + sha512 = "b6a93a86cf055da00edb0f8cd77ad2abaa5db584ae6a8ae0165a4bcdec9e36a94ce89094c9aed956c751555518a1d8c92b396fe3f813e9c39605d23aab064b6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ru/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ru/firefox-61.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "0538f5ae025020d57bf9a8102892ecd27f493839badeefc3f27de5dac01bd96255aaa7aa9b677a60ed7d9cee86f6913c41a8338ee61473b718a9b2724419ad74"; + sha512 = "4b1204d979afd4269c9e6b2bf91d0e911cbdb4151331bcad1f87cda9f4b72d57f9fdf3bef1aad3f7ef225c2f57093c23120f1f03f8a43ce05da9d777098d1c02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/si/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/si/firefox-61.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "601daed45b7a07d3a71a7dc94acc40911041145e920fda15061c98c155e6282b2070dd023887e7d2fecc813dfb83368459ae5d0593b36ea9c31d42f31abae777"; + sha512 = "7526e31f043c440317b31c4bfac03ed04c52395722b08fb2640e0345f08b36e4004f59cf99af192dcf2604ead3dc39ffd3e54552e7664bfd853c3741c0d9d250"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sk/firefox-61.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "78a1167cee2e6e2104ebb1b40aa34f71964984c332f06d061c21213627d8205a33069a7bb4574b3e763c4086ef072c0dee5e02e41ea1284131ccd9688e688dcc"; + sha512 = "9110f9d05de1700bb1f8b25f551694621180dceb01f2d31c420b80a1f9934abad01c455b3a742df9cd1e2a23bfb6918a428fdabdbf175011e5192df3a4678002"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sl/firefox-61.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "01d9c2c21bb9bb343dbcf914266845400345683cd81f71fe0bbf523a626b08a493b6851bffab94ceaca0fdd432d5c386c3de1396f0fc48b460103878f1dd4781"; + sha512 = "2ffee69bf2162d825103be8d5c1886336903e51bc2276b7a8e1724c87b216d6eeb86c36c58dffd3ce543bd6efbc85011c6b5270742f68dcec13bd9e1c68e2792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/son/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/son/firefox-61.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "41ceaf62ea512e6c18a4ec01c51d5c5377ca947821c82cb414913f52bdf742ad26e9de86dd67bebc9cb4fc921c4c5e1d2f57664028eb7d143f5ed770718a5c7f"; + sha512 = "04b16e9ba37f2d318c00f62a02b6aa163cf0f53d6c094f77e9723267595dc1ff7e49270537cfc052016592e036d4c3d6b163865ebb836b61497926fc5c4de0c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sq/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sq/firefox-61.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "a5fe9343e1aaf6818cfae7e5953ee2dcfacc15c33aaacab445eb345f1f340dc0d090d0e2f42f74daf6c6bf4f7efd50c8e4ac9fc2a52e33b84369d3a7b46341ba"; + sha512 = "087fc35a1ecdf796a3b028c2cb2a01e0bfa635a1ef185778901f0cf32f350de9194f3bef9c7f071efff2a99b18abec715a7d46982e1ace1738ed96ec8b59bcf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sr/firefox-61.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "16180694b75382f00c1853984e78d6a423b5b9859e827606f3d603ce13fcfe578ed3b5ce7656937625b9459996ee996d704eafdb9e880d8d2274e2154253375c"; + sha512 = "356b1b95f0fb94d549de1d70f9cb7367d939d9bf5c5c261e82abc552897291beb2aed4951fab3790de8aff7a607612a254c2893696283fa9c4c876785519ebbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sv-SE/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sv-SE/firefox-61.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "9d71193c78ff1f06c2d12b0e8fc299d5e0316b1425861e6faf7f9e46303d72280358e9f2a4cebe931ea7bfde54e36147872c1e319fc95dfa964bfd6abd235d55"; + sha512 = "d08b88fd20cc744e65f860e4e5554464ffc68ad560e9df21e7f9cc50a247ecdde98b14423a77de27d82c5423036fc453f868120acf2f5be1ab256995921a2271"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ta/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ta/firefox-61.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "21f00f0631fa5e3ad7e4a9e33596beb1bba7df4cf3d7cf1fcbd3c9f457039fb038f3c77595f8b925268192f3215a83dd7d233d782e2ed883ee053d932f5304cf"; + sha512 = "16dfdef8941dbbda1cb56731dd25970b7460168abcc5ee3ef037efbcc0b0b6f3bd37a3f5ea81c6f9c75121dbc6ea95fa100d980ccc9152c05dde2a69f04fa94f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/te/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/te/firefox-61.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "34489cc573800d78fbf1e98645275a2245d4a764abf3431ab79f182dbd30bccb383ce860dbcda2f215df47358307be2899a00d30a6dde2055311be3830e9a6eb"; + sha512 = "3362d040253ab49a114b534d246a0bf158f0bb37643e2420bd04430c7b0b40a9d416af6b40d907011757b099967a1af841ea97a04b8f2f7d26e3b429c9dbabbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/th/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/th/firefox-61.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "f9593af4f06279ddbeaf465669a9a5235f5521f7c020c8cbe36f6d069cb7f64461e2e0c1b6100c23f8cd4d02f81f56053df6cc004aa5f4b0b54fbfff4dfadc11"; + sha512 = "ea53e69b2010801200f7c93f5691a95c1e21ae1ac7f8f5519c64d1e823ec0be097d9298492c68ba970527fb2a8022b9786c0e001c938bfdad803c4b12c65371c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/tr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/tr/firefox-61.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "18248ee9591aefd1049f7c12274940c913a5780daff7c9a5c3f39966cad584a31a877dc4ccbb491ad15c555561e3d35482afffbab921c093d165d33715a507ad"; + sha512 = "6d7cf398e05e5e7de2d5262e8fc15482c97ed529807bdf72cbba2f09e95c961c33e4cc4eff5e27f05ed62d3fa4aa2f29803dfdd70ee21271c22880dc5ad380f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/uk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/uk/firefox-61.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "7a3d3a3b3514b1cb4870131e875547574bd93803ea8dc5caad970ec8bbbedd408d65efdb4049c728ddaa6445b59e7925dd29fab1783f47e7160af128c7f7f045"; + sha512 = "e5638cefc2d867edbd1a8c09f756d206b0bd390bb1dc23fe779171c37c73de9fa5c9429bc0156deefe85a95fe9d84bde8c4845c0d6c0bdd8813dc8642aeb6895"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ur/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ur/firefox-61.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "a0ca2dda0e0ee5696760156a18863acf9742ba914e76feb08a52b3d56b03d3cef93273e4c05b21a7888effb03d4a2acedd278caf0e7bf19117dd2fcca848ee42"; + sha512 = "370c06a1102ffcd2c43b15618c677303a49b321b69833167089107ede0a0210251af3e25b83f27651e77fc2e3c6b921094e8d2fb1246ff147815d241b359a268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/uz/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/uz/firefox-61.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "25ccd88703d814115cb5e19a511b3b93d18d1b122fb3323c262de2f807b93b7ffca31fea484859c400966b5b028414aa0675d6fe12bee27b3dbf29ca62db4ac0"; + sha512 = "370bd94f9dd0c07dd24eb8be0b0ee217c5fe85825849db387d6efcebc67bb75926981be6de24ef4702d45e6e6d885a34f5c58520e5c95bc82cc249de794c7b3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/vi/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/vi/firefox-61.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "04d6c29f647a788b6b5345fe6caf1bb045a7d4855ebfbae67975049a84f42660bd18f2471d7a8b46afd3aa71e23226ac9bc99b0b151439961250e968cd83af4c"; + sha512 = "c1afd15a69938f75d0da51ab5911d059589011a6d9c4e062a2cb07e20e8743965e2101fce31a52714f6f24c94d4a723c6a133563f7e6bf2b2f2f11f1b34c59fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/xh/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/xh/firefox-61.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "678d5e90d2016cf3ff4826c763cc9110a8a7685f9a0f1c4a423c0b48e0779a422be834493d8eb420453b90d3cee9b11e3d891a57f25de50ae4a13419f8a00259"; + sha512 = "077c6ee3c1a7ada84989542265ea653afb3d10623ff765b7e0f41f1fe2af92e52918279612dc02e6c3b5dc1671128410134b6ddbe693fc892db52cfb0f96db66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/zh-CN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/zh-CN/firefox-61.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "df6abf9a93a6745fa96eee39dec2b7460347fdab6348a8b20fb84334d8373de95b5bc595a9159a6e9acd17f16f6aeb3eb8af30709c0c65a8949404c3360269ac"; + sha512 = "f076b4d080e07af43f53c7a88a1bc78099ea6245c14fa33dd9626da6230c6fec8409dc736250c3493e86209c4ea0647dd4869e5dfefe65e3a7ba3f10646ebd07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/zh-TW/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/zh-TW/firefox-61.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "6f5982081aada2eb35459db7de8a46eecf5d2abb45a9ccf0119f91fd05daf82ab6a2d95d601a847febcfb4de6f8c75da71f40c43140da4845fe0bc7f5cfce80c"; + sha512 = "6760e7f7a2a54f89990ef47bf8c22c69ba3233182e400df40f020aa994dab46feeb98faa219e9d123c9432660b7247c39c3f2a1138cc52e2bf5bfdeeede60ca9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ach/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ach/firefox-61.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "146e5f0560341cc585337223fe04f7a2a7e7f0c4b47ffbca58707c4d3bb52b71f82b02f0ad5ac4cce69f45d6702a4c06230ed12612a529d71714a5efbc1de553"; + sha512 = "2a2b61f47e6d0210523040a19cb2d40439c71391153f8e5336967360ba9303028bce1e3861fec0d8435c08199d7812b5f7bb8dfc1c62a7bd42ce72f06af0eea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/af/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/af/firefox-61.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "132ea8da613fa047aef0d63ae5ac33256306a18fb16a3012551dc8bda4383889bc6a51be0c85ab09a3470b7a2e5c22996d04487b5b5ae2ddb474efcb18570059"; + sha512 = "203c5368da99891c3dbd87e919aee53ae2a1783ab982280d5eddbc00c60ed580a4329e7288275d5c5d29ba084e92e187f219d1fbe2e00b35176ec8141a1bd60e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/an/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/an/firefox-61.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "f9b8e3bfa820f5f24cef33745e51079636d6e8fc69fefbe511d20392309426281670dcf9924bd0f1bde8fac05750d80ec360257aed4078ba7f5efaad4d8acaf6"; + sha512 = "3bad264a314ee943e656bbb547f0a88bb08570d42ebab47659d4d2d5436b1726af072c1e520c8a2e1bd29f6bf819535b7fc5999658309450f3609b01ab8b8d28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ar/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ar/firefox-61.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "62795fdb3d07fc6f9877039068dbe18214b3c6ab3f248bafa17e4e251e093b600bb912fae5cc19e2f9b9b498941bd5ff20f44790c2f89dcc12ed8fc403f94f6f"; + sha512 = "1dd65025483e00c557f926692e3c0ac274a27f0412cf556c3e0ef864b1046c7888c8d354e931a419b04382544cff5e8f83ffe3ad3a4fbb040d7155e6e45a3e03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/as/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/as/firefox-61.0b14.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "c07cf4012c35379cab339b88cf8d70c5bee7403b7de782ced36999829701477b18c4398986e4c88ec138322b0f6fcba17853cd6cb9627fa597329ec3362df4f1"; + sha512 = "5863c820b36e54c6de3428e3fd0c54e9ee4efc1fcfc6fd3953163b042e93301b04b7243bb56284b83c283cdb8e3d48e0068d4cc18818ec350b9ccf17703011c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ast/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ast/firefox-61.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "510ffd64355160f52ac60251b5a3f580fd688910fe0eaa7d54f6f1850b1597dbe3f4a9a8db2a2a236b7244b084c37a7ac612427bd28375eecd2d899f81ec9465"; + sha512 = "eeb69145ad50f7868859392dc768891b48a717b4609d5320e8aadd73d03e6b3124740f97b1557e4fc52d8b128a22253194c624b5df86491a4d17ca9947526d9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/az/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/az/firefox-61.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "f0b3dc7ebd3cb6cb44816c8af620d8cd4d7fdd317557e960c72c08722a2a97f6c9cc17d322e85239f7262aa8dd57e9281ac42a679ecd97d1ed6a6685135e93bc"; + sha512 = "a10c3cd3d0117f51666f92e37ea1f8df818f5df6ed96c1d99a88a277317b14b7e1a87a67a0b100a2cc22040da03a91ac3916b11f1b560e60fc8b03f42a21e3c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/be/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/be/firefox-61.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "3aeb733096ec39823015271b731be2b51da548d633c82d7040e9be887acd774310cf44ce392cd5ecf0526bb483cad5010ea00ac355c17755fea5ad8a99ebbaa8"; + sha512 = "7e9fa9f157bef60f53d752ce1309146061f67bf1b22c5b1fa2f700bf825ca84981c5eb6988a35719d9871aba96702043a8eb108a1a99f5ba6a69206f841459e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/bg/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/bg/firefox-61.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "9990329df9385651e42a32276573e9b5666481fe9619946f469455f0beb972e8308ab789ba3063f42475f21774e8e7f2353df5e0c49a6b11789397fb937e5cf6"; + sha512 = "2aecd034f770c2b005a11b9debc589a50f84495741116644f06925d718062f3bf2d23238e9c62ff53e73a47b4efcdca5bfe86242f58ca9aa3b7b704b04737ab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/bn-BD/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/bn-BD/firefox-61.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "31860be3d06c3f78126d037324dfa0cf9ac648f34847a4016e255c4ecd3743ee3fd2b8c48c6bc532adc16a5cbe337350923769aa1ee3facc5c64c87add39d24b"; + sha512 = "01f8ffd5c3f0f5084f41a9e8cb71da6cb985c689b4acc534a67b34844b7d7c3851d7236b7f0f5bec5488ec0c332373e19cb8e2e44595e4482ec8a3ddfd82f5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/bn-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/bn-IN/firefox-61.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "eb182fa279ffe2365676835029c47f7f89b38964f74942aa597b99b02b02fd42fb25b55ac9325c997e7faab1a912dc99405cb8acdb6c6ceb7aad13dd518976a5"; + sha512 = "0706b9f070ba39b787b3743806731905144dcd27cd52681dcf431c3d0feff859ec4071c3d289dfab818390e964cd63adcc526d23ccca81833ec78000853eee46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/br/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/br/firefox-61.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "9cee54cbc563039273ee81c09b322e83e014b3d2d66d0f05854d09dc6b9651410fc7e5259d8bcabd6d24fd4afd95cb2b5f7aa549f8a96914afe7552102317f8c"; + sha512 = "6e9f1f8070031d79035b9b607f3c8db80d32134e0df44cd54eaccb066b9ead09f239a59f29f28bd9e1237c0dad23e300052ef82b0a1c7991d6feedc7b0823844"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/bs/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/bs/firefox-61.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "edabcbc201ac663c8c596b7bf1fbb128da042b3b3eabeb0cddc80ac1364c570eeb596d13e6e2fda6fbc2f06f068768a3391826be9bdbc74d66335287d9705e37"; + sha512 = "47d02d0780410b9fc9f062a981b3bdfc46d3d784112882a72190dc4e361ecbb34fd67bb730ed5a5257fef13015d705746939a0ee9a0357d028df0498b83f7781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ca/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ca/firefox-61.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "dd38e337c6d0efd503c7f117c22a2542f4f77b8e27b4bd58f40ddc7f90950db5d5c90c40afc6ea78e1c55c1d5e21f585b49016640f5cbf60ff73f74bedef00f2"; + sha512 = "20b540c40eef7bd437af29378468dd60d923f38fc09544ef79c37245aeb31147a40f5a60784896c16b9565dd0689243f7d5d3dd8ea1741e454f192640e394b85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/cak/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/cak/firefox-61.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c4535437b19571f1143ae2e242a9068993553a282ee9e87658b467491dfa1b1919a705dfbfbcd3bb1392c8795e43fcfc9598bd4bc91211f81b0a75a650153ebc"; + sha512 = "97fb206d18c8a31dade78ef73cf1e8eda6da87ef137f6e708afb7eed7016d0880b3ecd29297b27969797d76399bafd36e0e644b06c585a8ccd44c9a734daeb8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/cs/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/cs/firefox-61.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "657c545ac09551db5363ec085f08af96637df8dd9e2cda81276ee02b9d3cd03ca52a4e2d3f1fc30b60717caeb39b6ace71f8f799d9de9f3a1c793bd37be13b9a"; + sha512 = "e4e24731741405fffdbd71a1ec71c7153b37843a148e0afc6c63114a65467de00143729b46d715a5fdf2f85ea51b45a550cf6a18bcf655875880766d4cfbd0f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/cy/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/cy/firefox-61.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e5c70b0b61721f0d166556fa3693cbdcd8a174a1e795412637a6d03107d51240fd1095425145958c9c3ef3ccd3bea0a228e1fe12525dc05763d632075248e1d2"; + sha512 = "05f90be2bf33ef4cb89ed99b7509bc89d68e0800a472c47852246200b4344506b352ce9c47a72641ce5cf7324900aa6460f1ff4b201e5ebad0c17302e1985d32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/da/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/da/firefox-61.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "73445ab7d6e44074f9995523047717dd6a6f58f4673649f1de0e370c14a49958befdf70ff52a295976966e5e7900392c1b96d6a19170907018b9defc592638eb"; + sha512 = "62a3833f81a050c8d686fe48d23c05572c097178b2f38df27119d443788b02980682984fa9c43aa0bf93d7063d317eacdead1593cf382b9b13f45869c4f1041d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/de/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/de/firefox-61.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "38a13b53dc897e154cdf7c0bb06afde38e5201f832650a1c6f2d55f4ae6319b934cf1e9be33770e2e75cbe231184906d1e4a1a22fde98b9647d67e48b5f475aa"; + sha512 = "60ee63b9e762d6fd467901aa79190f142a2cb3e1ff2360e573bcc8c23ff3de37f30b8145794ad9e0720cd0db9b37054ee8217449b9c9c1a29f799d2a6c6dc62e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/dsb/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/dsb/firefox-61.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "db069d18fa6ea82011f337dbe71fa653d81f7001f708a6f907327e8721caf64398ac3977aa3941920bee84d9787a037d48bb00952f785513e2346df9cb1a1991"; + sha512 = "bb6d9b5279b279c72c708e301e2f40c2238f06dd75aa431d442d2dac33638efdf61e9228572f28c559cb9fa5132ac031d743288099caaf9cdbdcc9ffb7899228"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/el/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/el/firefox-61.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "d59cb7082b6aafae03177b3193bbaa44f76aa59ec0b230e35e800fd2705fe5a859c7f381a9a3701a6938286ae98ccf4acb4e0835722ce9d6ba020fe93a653d4e"; + sha512 = "8e854281742ba2eda03404d24c72a5b765ae267f87e00b71edbf9615966ca6cb8f1d742ce254001a898fa247633c6d66249e32172649e53ba5ea89308d97cb3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/en-GB/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/en-GB/firefox-61.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "390b1a511a6e4563af75a9e9b419d3052cf1d4b27ab53c61860572b2d72991771cfbe4e645464a7e1ad252a3808e3a64abf87fb05ec2525e279b5d70b240ac0c"; + sha512 = "0a5976df3aab1eea107ca06812a088b7c2bdf50234dc405461e1e2b9f9f51e2974d904066810757b7504e8e766a2f08bb897b35bfac37736691da7aace35d6bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/en-US/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/en-US/firefox-61.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "35e9712e45d749f3a3855dfcc0e20812b775911ab7ef3fb4a908c3fc824faaedea08160ec9bd3f0367b2d0a95f18f885feb66775d9769905fc2b272ef0577c3f"; + sha512 = "40527b6b86f91fda49ac0a379dd86519065e0c27a3e71a5b4a3f20ffaa3b8f15a9c9dc3d4b3477140c8bfb67bdb013aee1ec739c5ec9681cc381be31d2b8a9e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/en-ZA/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/en-ZA/firefox-61.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "6a53911b6de1f07047e5ff60fde03d12895292c4e50712f8da4a2d044ce7b265e1a8ae5be096a987fc0d7e055c9a55876d446308c461355a6024783a82672203"; + sha512 = "bfec1005f0f749dd18e2d442b12f91e6b3a3a958cb2ba384995349b336ea104525fff29edb397ada2f09beefac4144f35ceda1ac71f7b49d8a1c6dcdb3c8a982"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/eo/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/eo/firefox-61.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "893df2a1b1e0a3494222e940dbbec52754944a6e0239a69515204d15190b3f9c53f187976b21672165dac42f5d2253db506608f949f04101651e33bff0f37d02"; + sha512 = "e98dbbaf1f54c79c515b50f4407e1cb9fd09facd87fbc537c834d82236fa8a512e04ede57562d539752cb1d792a27f61973a6ddbd0ae54e96f4f090f0c31f953"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/es-AR/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/es-AR/firefox-61.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "7f727d9572804a21796d583564c3d4cdbecbc480a92ee5ae2c57174a9fbce9e3f867bce52cef9bb346c2dbd312fc710f691fc5b005ca1f272bccd7c6f0680418"; + sha512 = "67c9f943b156cdddf7338c8b28ff6a038c728469b4b56737ca90ec37215aacca419d67bee782715e38a0a19d6cb71e2d03175806727025956d29ce06599da658"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/es-CL/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/es-CL/firefox-61.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "6f9442c705d469233294a18e567d4c60a291345b9d2fb1086ba898a869c1d1de501f773ec66e32cc07787df7111e7f5ee3e38c11d212faa6a0d6098894718a4f"; + sha512 = "8aa5f0d088b2dcbffbc3aab792a981a260ca47ca664cd9bce1524895c065b694daa54c1634ba750fb2156ece43ede1ca4b677565de0d7ecfa262417537263ee6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/es-ES/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/es-ES/firefox-61.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e60abf563a66d68007eabafa6113a8ab38f558e61630b0eff3f5896cdaafaa6411db49525e6a4a7930030bc3b94253b13a65fbf87d6812982b380ba88f74edea"; + sha512 = "0171bab869a15aff9717a8a12073aef6c1de7041e819ad9646845fbd439466ff01ffc4de828bb39f0ea197e509573322d7720dc7f29a3c0b78027abcb0b5d728"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/es-MX/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/es-MX/firefox-61.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "18e09cd4ce53933e405d653f6b6dc731f0367fc9fa772c9a2338b71c02984499c9c529e5450976170e0249d5e10d861f561718b4762a6e730dfb159ebe664c88"; + sha512 = "04bfff437a5eaca5ea4d6ab36fb95417b0022a4c6258f06198be20f97f435094a915c1417f6adea650490a789301367d665e92a3db965b8f891bb4d013bef80a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/et/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/et/firefox-61.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "17999b5c83170958b49b818cedf360581a0198897acf7a439d7cb8c4cef8a69d67f5185a976690afd319b3a18f86aa437e1031c6529268d236174630fce50d58"; + sha512 = "c6cc47cc3810549957eb17f36537165c86b6a96fde6fe6b2c2bf6cfdb5e89dee594d4cdd71b763299fd2d70cc4a111b14c13429e9f0b937f86c80b1daca9d2ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/eu/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/eu/firefox-61.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "5d1508e82062c4680fb3deea990417aec7250ed2d005132fb0c8159c938e7098cc72d06d2425bed797969138d53a9bd39f2446a914e3320a8770951e0397b5bf"; + sha512 = "68cc677bfb3b0bd62199648e9fed7345940935e4124a8276097a66430e5579fcfb5f12c0fd2509be642a55daecc193f87c08f817a3130eba5d61e060ae543bab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/fa/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/fa/firefox-61.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "4471fa4e48ca9763f92247dc225bba545ea8f6b6ae85657481906624350dcbe61e78e04fd24814d967c12680cc70f4cfaa0c50c6e9335ea914ebd30f41e298c7"; + sha512 = "84f20aa1d9587e46ba8df0cc831c615f27b70517b454056e318aa2e25a2c5affd690c384cbcad13a787a824884d8b2f6a82d5562594aba1df502546a68af4cb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ff/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ff/firefox-61.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "ef0d11d3c7f212871a387b800567e53f717c59cc7186ced1ed92c12d9fb0f9c15e0e1922e21d2a57fbebaff901c0f4018ea5907a0344c52e504bdb9ac8454b32"; + sha512 = "c003035c001fb703ed3760a74a357163d0e2a2c78fc9f9441aa477f5b90007ccebf209db7064ce93eb580f548bf558e0706baf42143ae5ce68e04b1fd970a831"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/fi/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/fi/firefox-61.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "c606a916853f95e9a8a90b341533725a9c3a8fef5cf52deb4d99163309a90650552df6db79186396233f19133c0955f818b11f65a75cab395be7ea1476dd326d"; + sha512 = "d365e9de7a51dd3fc0d6e5b20b72c53cae3c04ec7514ceee3b90b9648a852d42c88371dd82b6fbd0152e02d43676816a6cb2c7cddf94974f91c8307bfe632209"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/fr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/fr/firefox-61.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "e3ad9f587d99ed1e5b258b02b990c43e2c760376eac9f94ae42c8fddcb079d0f4a946b5873ed0b82ff6a35009f11fccea8d157af496ba1ec565f5d64b2cfbb3f"; + sha512 = "57da42f68f1397b59f41486a945e1f29cabe9db7bdda3ec93c4c313b48eb8cade04b2735a6f4134aee1a1c62c8780d7ac599224dfcee994c893c215f6ab99243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/fy-NL/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/fy-NL/firefox-61.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "d7b93ec05788b7c324dfbfc0d55411368d46ce1bae8bdc245c920ab26356643259672ba473ea8f9cb63db141a0cb76acd8bfbb0f9c0fcc4ff197795705f4e47e"; + sha512 = "988680846f81922d419561531af99172d20ed3b7fb96c52be17ed50abef947d86dc4c79c0b8bf99e6b1275eb91e2bd4f0f0b0d5caf51135ad989e9f5dad58170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ga-IE/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ga-IE/firefox-61.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "9928b0e7c03060bb93d4edadc9228ede47f5e43caed8f0d23be729740b4aba168be59e3365f9619696d4a8e421a663b0946701746ffd3c4fd5bcec1473d2b092"; + sha512 = "a1e3d50f339ab4de550f8bc28795cea6ab5c1086defb80effc9847c005d8f9dda6e0cf28c09c19fa771682f5c3ffc2344178ad2072f51a258037ee4cc9ddc027"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/gd/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/gd/firefox-61.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "a883d411bfd612b5de69d7e1b535d992c0641eb1cabdc28a80f8a38469f55de36aafbb3547da757b4f6fdac96dd2934aa10c8c61362fb9a837e49049062c2afc"; + sha512 = "43989eea2de832ef6d32353e1c5391709b575db80d6602404f002b3869e55605f5b9bbcdae50a8755d09c2a7f0577eb3fa57f581d132c9d1e0b11313976be9b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/gl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/gl/firefox-61.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "6e01cc01459c1d78df561eefe0bcda490960a8724f4fd4670e19b84c3ff16c41b5367205f883e51a0af8c03b957b65f55696bd7eb851f015f57aa5e950b36799"; + sha512 = "a77de1b17a36e410b3b7e5088c8714c6223c1eb3cd558b6e7880675f8a7e307818e207376bfa3d9695bcc1cd271feee8225e1935cf80a41e7c6b0ec14a4f0f43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/gn/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/gn/firefox-61.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "62dd993eb1a643fcad48aaa5e2b9ac291137c6e26ee40065333ca31bee94e51f0f6fb31b55dc1901fe3983f87b69b617b0577b7555e20663147ac17a94fd423e"; + sha512 = "29473ea93d487757a3e9899f0bc09571a0c973f7d1426096fb290241438c1c32c3cc01130d563ba04e5a62c973a167d756d7fd314f970f0e6a2e0215ee0b93c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/gu-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/gu-IN/firefox-61.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "6dbd6d474aef6d10b6b47d1c3f606ddfee10488dbf9ef6d353002157bc31158564d5603699c1c8e8abe6af83717c098776fa90430cb849461aeaed8b832252bb"; + sha512 = "933c87a3c3d34648b7ef74ca5ac1bb4b98bdf0fd571b40265e7d1137d1b519809929e7330fd8e2e0fe635557947013a257f3e1009fb04657658ee8725a99bef8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/he/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/he/firefox-61.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "06d27186e2b0970ab8599d283c7a5332de87af021584137b4ceef3ceff35e0177f0068d4de2190e0e633be44674291a021087f5c1bd344162555cc50999eac2d"; + sha512 = "5e7d5c69c7da4c3065aa8f4e1ac6435ae294b6fa4ad813704863eb699f90f0add5c22ab32db5e32aa7ed797ad276f1c872b6b0ef0d16cda09d87e3fe9291e3fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hi-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hi-IN/firefox-61.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "24b56f6eddda98e6bf33bad4a2ce615191076d3094c84611b5a244c488397a8afce689fe2a5089eb8fa93f4ba3cc894164bf1500f5b0b864fbbcd843a338ec03"; + sha512 = "bb2de84243fb2c80f5457890361b4b365baffa64e90afd354ec0606ab3432360a9f70fa406a75dff68e9b3bbd6e842a1566181a62c246af67559cb164f223d46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hr/firefox-61.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "bf5b2dddf62818357e4729c8b51cf87b03d8c2ed74456a9666b85d4837d88db73ca83684e6348a53f03ec9086572526888c84204e661b4aeb022a31e4962c8d6"; + sha512 = "8b3c437ca5629c8751b55424c1a71ad9247edd72f3d06b3dcbc9f256a5e729a7df3cddc8984f65cdb84a8b6608af339e84c36e728e64978db0ac6be21e9eb95c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hsb/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hsb/firefox-61.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "c55d7ac11802db6cb85cab3a62c850ba2e868d6f46760bdcb1dc530313b0355113cac404619f3ea7347d26efe3754dd8ae74f83fbfac5b27655164beca0bb56e"; + sha512 = "e76dbdafa7d73291d9674de2e6faf84622482efc55aa1ff94bc76bcdc6aaa693bddf4899fe10615f78b2832eb541cac2b5621092b53ea8d2d682951b15f52907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hu/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hu/firefox-61.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "75b66ec8b5827e39d0fd1e72e01321b640e356855fd1b70d3ff8a0d8fe7abbc44a381db9fad8a44c97840fa39f200cd53d55a02e84f6137c65e4217ca0b951ea"; + sha512 = "72cac3169709b2293e0d00d9ad190635252047b3267f8ba77c076436682c7c2ba22006558456516e18d8331c21cef3644e9d59c76deeebb1a6328796746198a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hy-AM/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hy-AM/firefox-61.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "2e94363c1f25d59fbb97b2faf554b3000bd3a8aee7783cf415e7008c8754578299f7529e04a907ad94cdea80c51ee2562e114c369ef98c66beb9776c83e4e4f7"; + sha512 = "1c806e54898725cd1fa6e62c012d8dce5225ac1c423a80597fb9b3716e7aebd92add9dde916bef22632b5d4122d6bd42159571d0357fc77ee3a0f553dca71645"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ia/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ia/firefox-61.0b14.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "bdd9f4ea0a4017abd387ccf8514b5ad9f73f232e252f66b4ba0387ee328f159c49e7b79c1a28c3ba4e040ff767f018f8ddbe4de20193a361c406934fcff42e5c"; + sha512 = "5ccd9d2fb06679312590534542b34950875c76b2cb26aa1648c09e8727b60610a9cf9fabe433670ccce8e55e01c300827707163d0e071d176446f1590f4d0cb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/id/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/id/firefox-61.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "e29865d8115bcf89f34af721e0c12365e1fcb622a9abe56f1e6f04edd4456b400ddccced69bf45912c5be24da63058c73c981e1f34bceac9b4d436ef3306fa36"; + sha512 = "66f47c27bcf34d4a194f64fe40f069a7c1c799f5f859c9893f6dc751194a514022ffdbb3b6c9aca4842bfebfd6682a0b78b3972cc7710abd2f84fb1fd7a62c5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/is/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/is/firefox-61.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "3ff1eeade8b45f8657f87e0c7e84ee551f330461e39f377c14469e9b7ba8d744077407185e9968d021ffb4fbf1394b6c100e6d76c4ba94e1711310fad14c8d43"; + sha512 = "1ddccadee1a492e2a2062b370193f7b5d67a9fec45f48b4b283e1ef22a14d6c7520ffa209f365937458b6029b36aca9c6ede675f532a7dc12459874b3b746899"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/it/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/it/firefox-61.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "b912beeb96910ee0fe101a1f1ba4ca0f6f5fa13c93d1fe14fb6bbc5bed14eaa2d9b2caeeca3a9665de8ba27de9a55b903060441f152b4a4563ccf74ced2b5aba"; + sha512 = "e00ab5b91594b53b7e95d975040159c49eca2eadc9bf70d4e6f576d216b454fb752e3860d7595db2aae5ea1aa980227334dfc6d9abe8076149182f77a859289a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ja/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ja/firefox-61.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "1712c01828f98110fb68925ee80a343e79bf8bc7521d44840dc5c6f57ff0a2b8625c5116d1d076882a517f00c8f09066e9385744aa6a3ec57b2f21315a3279ca"; + sha512 = "36e800528ce1aa0dffff9bf1967158f4065c35efdc40cd7d01dbb9f622ac1aaee31f57f11800d2e2617dde9064ce767d9728da2723276d20b7d6e0c822dc8fb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ka/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ka/firefox-61.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "b7e3d57935289bfab5a7925210cd484d24c87374412041ee0d279691e758e6bc872666fcdf2a0ecec84e6073fd03f9e32765e0fcf4ede852a4f389d6fcd5be03"; + sha512 = "6acff5ec778eca029433e34b63b2ad0a5405dc4c6d64d12e899f895df1e43e21ced61cc7f3c0979a9c4e0237dffc0733caf45c66eea66f8d0576b56a80711d64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/kab/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/kab/firefox-61.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "6cc7b0bc89590ffc749b39a070e20ffe3a8c7b611d69aa7d1b0d803bea0fa98c208387e24b640ce18f586e718a4bd3e2387070053d0cf7fe2198e920119d9b41"; + sha512 = "429e656266348d7b4b114d29c19c645bef26657bea0a5436eb537deb1e27f4dc30f3be0c48c2af4700af74e3f8b0256e60661e3172d0cdfac6f7be7754b40575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/kk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/kk/firefox-61.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "be754f0a6bd1f7b8b81eaf59b8985fa993bd6ab507d16385b4da2541000e9a25304de87b017979d7d79a803a9bacb147026aa0c96fa3c94cc2e5f5322e1c7f69"; + sha512 = "7c4e9a3a36c2393badd55f78461622154264365b709a4ea1dc801b1bc267290cb31414e036823fdb7544dc08930bc0a1ba30e9793df50e26ec3660bc870e0c58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/km/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/km/firefox-61.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "87f25a6ba372602ac5c80143c740370df1ec020f4166786310937af019225f7ab156e6f6a1580187cff144ecc53b28d0c4596fbe5efe49befbd5c2ce0b579b93"; + sha512 = "26188cc7887d0093395699e9d504d2749a74cadef9280af4fdcedf34960b92308993b1a17b1b2335183db6a4fe734b0da7078c2301aab626b5cd375dbbe9d95e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/kn/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/kn/firefox-61.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "c5e50196d9ffa05ed6dc1d3b70407fcc3d65bd5889ce891e988a4fe131d58480460de560f89f5d19afda6f17cebcbb25ce15233381be571b2d5ed20d5d964940"; + sha512 = "266922c89bc287d1f934a35c9909d3549ff298219d40bc1286d94e9a84d4122ce5dfc1a6e6a50393af01877a370822058134b3cb0ffe337df38f196ed1acc05c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ko/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ko/firefox-61.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "129c1b5d034514b486979b1ce8b960ab2a533c7d92127135029f207c56c9c9fe79ab44bba68a1a6decb8444e040fa2f304bd4120a9da2ca4dec6f2f084cb0224"; + sha512 = "42eed78f69e8d7cf27d839bb20a622271c09cc9a54f8242d2b97235b9865804eca9632aee86f88cfc19399e9f8d957efb3d71681d7bd3b85aa924fa2fe7a1bd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/lij/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/lij/firefox-61.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "7633c91bd22b6034bae60513d506baf824f9240cc01a3845b6e8b52de6662074dcdeaa672846677aecbbd8027e29b4e703f7ae63be249591c4d48006b24a8960"; + sha512 = "f751829a499b0b0df7c23239f90195a4a9578df5cbd14d3547bd537c70408cc8625a9af7a22e9ac874b1c9fdb61b89f83f3667fb2a08bacb5fdb87d2216cfea1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/lt/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/lt/firefox-61.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "dcd4765d1df0ef95e71052b9b981c874af71a97e3f37185d33d74c49208ec2839602830043749b5e551683602c263c095012d2385209d75a6e4f04fc30d2afc4"; + sha512 = "c96b866a94b39cf744cad0d4c404913db86ecefe0a5aa44051494fc4fa085a90864c57db953e415c09709c76ce146c6dcd12dafb4d887739d9b096fa9b28cac5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/lv/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/lv/firefox-61.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "354997be972af80700b7085f5023c46b8d8cecdec079c7415f5ec5a12bdc2ceb6aadca9a7c9041c2ef65a518cb18efdadb9f3b78692f9a17e62d35ea701e1e11"; + sha512 = "15a31d3341c3218c7da3413fd18db5eb865fb8f57783817394046b2d34790c2f9379421013959368f227209e5a7497c14a7b0d8e0e27debca389ace98d165438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/mai/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/mai/firefox-61.0b14.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "8b9bbb13c4bef28a7134c05f0d05476caf5d72d0112f4b8507b66e448b183fd357b7caf643c81cefd652ebcdf021432c2cc5af9e40803b20f11e3095d3ee3a4f"; + sha512 = "5b1d2430e46fb427be89f97eaad48716607831ce113578355711eef1ee41c023cce5d5f854e65963b4387ad090f3c28b8507465057948059bae810c587963ea0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/mk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/mk/firefox-61.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "9e098c8a2bf36c14b3802c54fe2c8e6b7db83242d2356e299f9eee67edcc006e74fc83646428c0f475b1ac93440fc4105f767a5bbf57974b8e4d19cb1d30a0dd"; + sha512 = "a9f3188c05350be481a176c8bc2a1017fa3ac6723644bc82d6595343e8b7d7cd9a5bf8d014a3f9e7ee34ecbf8371b78005729bb48a630f99ad59dac9651360ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ml/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ml/firefox-61.0b14.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "b6a84bdc0168d82e6ecc3cdacd9e899c0ba0b15e448b04ba70621c82e82d05cf022b762f8df2e9b54082facebee3040ce50b1074f74b5637694ee7cdd840880d"; + sha512 = "285e33d2a9439130322ece4b98137760feb929c69e41edda8a73efb258ee7b7d2f5b15a1587da48ebe1b85c4dc83a1b2d41ab8a52bd15ea3c332a8a514fc0a01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/mr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/mr/firefox-61.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e1901d752960078ef992dd11bcb04df1c29019bb8a947442478cceae75083c2f063341329e10dcd471720cd1fef6f5ba6410fa98f95ced45591178592b760e97"; + sha512 = "613cc263328545e42b1f78c1cdef685aa717c230b411b6ef1fa19550f309332dce7c08825a78990c766d900afd793c6abda60028a5a79ae481296ec34f75124a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ms/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ms/firefox-61.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "3cc2cb6c9fbd5d3c5a399cdc0dd10d2198412a5cda82ac4e93e691f88e8eb6bc55fd27abc453c011502e681abbd0017f6743915906869c3ac60d5b713b45fcc3"; + sha512 = "47c073e05ddde6fa6deca25a206d649bbcc89557e5eac2d55b6fd764b7341a0aac9b69bd7cf1c2cf8a80fd0a60536cf83a849b0ecdf402d70e113b13a409333d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/my/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/my/firefox-61.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "e267949bd286b873105e1872f077fa3b6a0d1fe4ec2a789a0a415781e847d540e021e830ee37fc70738ab54829f6c35e2f0b4d0fea1003f771fd12f19c97c04d"; + sha512 = "b20fe68717a9894a630dfa78e8313f62b4054a6821c1daccdc0001653836247ce5d659f580e4127e8d96ac3b37f25a252768e9991bb429642e51a742e0dfbe6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/nb-NO/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/nb-NO/firefox-61.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "8e369eb4e8085abb02dd29ec504e198e7c2167e32c60d81448b24c6204818708f1756690e2ee8e498c7aa0eebf0db5755df7884f706853e2d3306e4002425c82"; + sha512 = "94447d3231f864c7d6fb027e7bc44bad4408c32851b7e57cb5cc0bc35a89a7db1fa2868ac94d2b2284cc51e4f69457e00ee8965c5e1ce83c4811e654bd7e10b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ne-NP/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ne-NP/firefox-61.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6425928fe907b60946f029d8ea67a5c4b6e0860771eb15a0f26bfe9a56ea020a5a278b513e077cb9d2c751675596c42a7ccda96aed810987a701ea9f0b505330"; + sha512 = "42c6876f5f5f6d860e79f852c55ac4661c77d7603a158aba0c26e4245a4f0ba9a7cf9822c6f1fe0c67c161b9e8fe904cb665f6b91fbc5faed233515e091c36e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/nl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/nl/firefox-61.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "822baa292edbcc6a72dbe175f9d8cda33d03aa6389027a982f3c40bb0ccc9709be663d072d72ad046a2bef1b9f251ba85dfe422cfd6e68bf4e2990a9f8b8d205"; + sha512 = "c6cd8f95b88d856c33cc62b1052a3d2956e48fc405455d227be16e58c251ec00d793ba2215433ccbd2a126cf77e98d629251ec1cb72c38faf4d544bd53963749"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/nn-NO/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/nn-NO/firefox-61.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "1f91b46a16102e291a74d653572e34329e0d6e4905c7a9770badc446c129db9a9037106d401aa925a26e4662eb42f89f925aabc0a438bcfce262a9b5cdc501da"; + sha512 = "7423ca1349d7aff3469cb922bc33894eee1b4b46678767666369f6833df30a95b575dc5d175bee2f09b30b49ef6cdf93b144feed7e74992cd9b930114a46411c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/oc/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/oc/firefox-61.0b14.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "436800ba52f5b68c3b53e6c13cd3d4749556575314215228608426ef1315e8ad2628a84eec05a66a53d9de10ef159e4b493649ed0ab73b61cc2007933f43dec1"; + sha512 = "3ebde82eae1ebd0ed41ea5ce842ca6717914961c518d4238cdd2c094c9e4b871f856547563da4dae1c5aac0462471ab56b1098705b47b817521e5946109b5edc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/or/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/or/firefox-61.0b14.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "02584b67c2dd65ac2ffdfd7fb1ecb518afd0344ab6ea623b43ba1b3da9142c6788e4060e4449fe5aa362f2b748ccef1a3c535bb1f6c8bc99eb2753dc119cad66"; + sha512 = "01b5737ac9db850a0b8e08e3ae36d85d9152775abe354f4014604e3e974dab273950d3bbf74ccb921325df87d565cdaaa9bd59109f8d1f887ac32cf261389fdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/pa-IN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/pa-IN/firefox-61.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "931a1f6319dfb6db4148eba5bb01a996c2ea2512f065123113e539a9c6cdef40ad92b5ed3f42237a36e256fd95f3a6eccb6a77f2a9829541c57f651f3ddf65dc"; + sha512 = "b40698c13098332e0ac4e0070589b05553a5fed58ec823fbd9cd12caad7662b2394dd4cff1d05f025879e20821b3742f9b07f28fe69a9f34051d9118204b63cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/pl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/pl/firefox-61.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "c94c23a33651f0036e3163d25c6ca94fb832e1906869c1d384417098f89e7fea75e815c62a7e2f6661e629cbc56d17cce03d440a716c77185a1c38b6f646dfc3"; + sha512 = "1d5ffc9c578b625d8dbb085c0c681aefb8aef1a962ed4e7b8e05d7a8062f11a7ae792344acc5bdd41be66a987aaee0edaf2c5e15e65ff509c36e4164bb45dad1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/pt-BR/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/pt-BR/firefox-61.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e4714d288c1729aa625d9a497aec6154d5fe055e9b306ee2fbe812b4123e2bcab03177488806c470f530d9c45b2781cfb650a756eb17565d3f9e58097d8a8c2c"; + sha512 = "fd2954673b8a1a1d6e547db8ae830ed89c4b7e8bb70debf344e76f7dd10aa73aa03cdbb0b788fc4c4e9fffcb5f6a1536323481cebcbe35ccbc5c4317ac813db5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/pt-PT/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/pt-PT/firefox-61.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d460b6962554bf114b28feb80ad560b7e2eac625b05bb4722422f04a41787d32d04c7393b95c1bae9ab6dfbbeeceb1b43493bc3126dcca1f265c23e5870a89db"; + sha512 = "ad9b660ae4c8a21696570682390de7a46f3d6d2c8096e7ee0c6288b69b0ed95451b06d6b84ee1719a4f8d90c7d9def61a86cc4a8fb0c2c6c8ad7801d8ce6cdfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/rm/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/rm/firefox-61.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "a38ad0170a0811754a282ad894f41ab6edf30addfc83da973fe1a5b7ce61824b817b42543613203757f98768609213b68242d61f17c3388d4b67909e9a45a921"; + sha512 = "dced55cc01aef583db533d5ffe8960f87f7485d232b6194003f1625e370a6767fa27126dd3d35f5e32c295c6f20ebfd4fcec983e57e56b160430b04964c84cc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ro/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ro/firefox-61.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "3a8c57014c7e4a9e912219b61192d0617f6b995e0609104574948dad1405601ca02d750d71dd8c29b7b914f11044d9623d0d89d2531c2506519c41a905ab3cea"; + sha512 = "e3a7deb350abdfb188a11dfb2f2e1569603019e3391ccf97fc84faaac35e9fac7489ddb97220845cdcaec6321317f6a10897de0feca68650f5fbfdf13644667f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ru/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ru/firefox-61.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "23a7611dddccd415ba5fbca31a3bc7e58f0de84295f60a051fac891581e3a52cfc52000e2be2f4a81a37a208e9d4c0d8c0db72a109a6361c03fb0294753dea2a"; + sha512 = "439b8ab31a627df07df9d9cf0a713a330cb2fdf8af27caf12367077226327c60eeab5b1931a0f2e978c965e402a7c8ef31d0e06a60515c5fbc6c03bb8877d922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/si/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/si/firefox-61.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "8266694c5c13e3ff93cf1e6380dadbaa4056a80b48c2b42eb1d1b0d4d3b57cb5db18ce78b261b459ff25356f3bbdaa0d6032cc71e97414f8e124d68a0198685c"; + sha512 = "e90be9907ffd6a6e8edf3c5af56faeb1b57f27094af50f5bb583c2645267e4a47c9330c8dcd8727c51eb83920c7743ec88b5427e72c92fbf66fae7568c213d81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sk/firefox-61.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9bcb5e29e221be2eac6552578f0b4cf351400101f44f91648fbfc82db85dc5175d66854017751f1f890cb78cf8ab6102bac7d86e0fa2615abe6a18c62baadf1a"; + sha512 = "a135e841a1eef634684c904df2b3170ef4da7a6b74e4e7e8758610ec4875910328a77bf686f280b4c705eb9cda6939afe1d7cc23b4e1f45718ceb630a99569bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sl/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sl/firefox-61.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e08a7ac0517da3d82627fe126096205c60c3ee4114ef9ed8a67859a0b2ce9540d79f6d84b046f28ba0d3c3c1902484fefae8090ce3780bcd45ce24c2ea211cb1"; + sha512 = "241b8b72761f475cd3ed482cdcd3014bd574b1654ea37bd82562c273473f56a6fbc20a44b0f38dae9611629871e5122ffcfbbf006261352b137f5c04895f0a26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/son/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/son/firefox-61.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "d50fd3a722014d16c95e8c8ea1798d2305ed77c878513d3f67f3d3f5baf5ae7eb595fef17f84a41a353342ab93bd7d2049c62cbc9b9e9be8bd7593cba563eb9b"; + sha512 = "e5b5cc8fcfa68a6490bc0780ca7d6aa39be5b7f764b74ba832be25242fa19cf1b079b4a67d4f8320d01b64ccf636010981072f81aba5e01bcb86607ee09454c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sq/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sq/firefox-61.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "a21ed6954e84ec409700f12a285acb46f8f969e20c671e2ade4d1015a8b01823d7c5b64b49c6b73b7000f367ba6e1ccfe3af1f7eef4ee0b28335385bb206d61c"; + sha512 = "c3e1246d2351df36ab477d5ce9cde3badf041df1c93d80493786d9d14f2241fb04367725264ad1c7043de193a7188d16b1c646c1ad98b073a4aa74fcd36df15b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sr/firefox-61.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "cc73f22b2f3846dbf19b320ea9433696bd00471ecaecc6b3450dee8f6696bd5698c329254629aacdf3b10ca2a3d67cba9cc44f636901a74672ecae506d6936be"; + sha512 = "c2d87fc3adaa26cf50534ad0db581b3130ebd6906976183ec3d338e5c71a48fa1c81107c2f690221a43e8267cc7166b1ad0b75a6fb20a813d8953f145b37128e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sv-SE/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sv-SE/firefox-61.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "02fc03caab923214814a5e6c025bac0113c8454696c2dd502e97a729d96693aaf3f0419cb8ddb3a55803b2c05ae35ec82f0cc59547c42e50f4125f061c2ee7f8"; + sha512 = "4af7da8131ef8d9ddd1baed4fd0def10c648addddfbf3f14605478a2e8ad67f0e713d304b36aa32a2abc2e506b8a56485c6bff13ad7ddc3091e39eaf406a6c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ta/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ta/firefox-61.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "2f240d2d1c49d6cdb162edcfd3fd7dd6771854f516fea45e1d9634421815ca2315735fbd1a9556dcda180c1fbc27934dc0e27f64d0bd2f8640a4c532521b0f73"; + sha512 = "d90f085f2c67def801484808f49bdd4b7862a9f7e2701025510fce2d7ae1d5cafdee4d5c42ae288ed45ab86a71a3893161e9fc7b84403f746d9fc72a754e4f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/te/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/te/firefox-61.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ef538472c38863cf11728eb38e03bd8b3d7e6c568d81ab030b010a9c123a191c1b0d6a6361b9daed2d025d708a433633b74819a67d3751e0b37de17bbc495c12"; + sha512 = "3ef8eee4f684f021eca667ec29dc4ddc1339e83a6ee93015fe5f24dc91a804f8405a958b0647d9430aca6202659a811720401a960b36ab6b2f54b53e6e88686f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/th/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/th/firefox-61.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "bd5db689c9115f88efd8ea6e38d557f7ae765d8c58c269954005b069626421f022d7a2cbda59b143bad54a0d0f17acb15691641f1699d89435e68ee2eebb7801"; + sha512 = "ff4e3d40ad392c0e00dff2d0720327e45199597d31128e3e67c8cee77b63e39680848351c947df46825eec862afc1adf24880a2a825769b222742adfbeec55a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/tr/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/tr/firefox-61.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "8a4f2e312cc7e6e7a80eccc0619702d64e89e5a120341fab88705dc9236d4604343fa0e80115b496004f1af5465949188a34accc09958612c8d8277e027c3470"; + sha512 = "5dbb673c93c84a7bb30704503869f6cb43ef42de038507d81daaaec4482ce93db74b1f43c8c50881768fe94cfbea95dd2f7ec376409ff2779afcc08727ddab9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/uk/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/uk/firefox-61.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "ecd943cd65d7ee7b57328d2adbfe3b81ed457fa6f75d2d911845ebe31ffec7c0d622ecccbe04eeeba90d35e8f6c789d33caf251d6aa4e38d85633108013f2374"; + sha512 = "863cc55f0f44f5f01d5134a5572b39367ba899457bc5fca3f60b62309a6212546a3b8e71945c70572ce311fa9a60c09cd0f4ac8c2f380692f806dbdb4880c648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ur/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ur/firefox-61.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "23120059c8f35c7cda3493fd2c233c810d81d81ac6ad521e01c9a455fbc63375024510e2394c9a3eb8ae3bc311f68c2a760bc7451e3d35a7246b33f618fef167"; + sha512 = "d6550a25f2c81f55799032ac2f78f1db50cded6e06a8ea06144d65edaf619a9ea0ad9e2571fef4614e744c5e949a73a414934f70fd18710bfb0a54022685daeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/uz/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/uz/firefox-61.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "6dee30f68865feed42e46806a81620edada2095d28b79751ca813497df5b17a831eedf7d22b14f37ab8a85bef3111f7ba1f04ea8ec4133fad0ca281af28a32e4"; + sha512 = "089b8a19ab110d3358dfc8837d0550b954a443e5ece3cb779d06a160988f0be2c3ff3b1fdd56d2daeb3ee625cb880d9ee65246c80dfc5dd58b49ab0e2d7c2302"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/vi/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/vi/firefox-61.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "868a354fa2a09e79cb914c0d51d58a810ed00498eb051d39345fbe23a1f6c19c4293df71af951e7701767a1579c178090f0a3b49216e25fc48458c33dd252f8f"; + sha512 = "b7010185038600d9045df6e5504f34745b7ccf0b031271474d69bdca2940f95e7bede030fa6bc241696fcccf971ded644970c829c612bd13aa0e4452e0ddf27b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/xh/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/xh/firefox-61.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "a7deea372bb9597668ae47040aaa3ef6432eb5a8df65fdee92c001dca10474283171bdbf9a498b48c023495f0f0f39352221df54cc3f874fd623dbf510377409"; + sha512 = "fca5c5f5a2f667932aabcf7d112dd4293e7a0f2df1a400b9ffe60c9e08c4c0631df5834778dec3f3312898a4b1cb6d30637ef6b78b3868a49dcfa3c82858bf83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/zh-CN/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/zh-CN/firefox-61.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "e1d7d831001c8914cb577d31ae5e4bd1af779a79da422bca8f0bdabadf1a7d44b9e950c1f66ef5917bdfc8c274972cad5e3c9678831a4d3bc58e292b6db3faff"; + sha512 = "da337172f306b816d1004c176d5ea4f968e65c126571cbea323d85bb35c7d51a6214510b709d20a8574ff7686ac9168abecb8c8c6ddd33137982e4e7d1519e99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/zh-TW/firefox-61.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/zh-TW/firefox-61.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "056940876ef7139604ee19ea9a44ef4f4c3ebd4b31a4705bd44a312a53e9750fc7f7af8f39d2e4641f831bcba6aa8e185a71351acb6a871b26aae015bfbc2e0c"; + sha512 = "5ab07868511a6a2fe31e5039bd52aad753782fb6bc6c437caea66cb8264307203f2fdfb711a49b5ca4dbc8db6408b21e309f1ca4f7b4f7ee3a47bbc83b3871ef"; } ]; } From 26db7273f4a761443c505e56d2ba3e36b3c7fcde Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 18 Jun 2018 10:07:03 +0200 Subject: [PATCH 122/265] mozjpeg: 3.2 -> 3.3.1 --- pkgs/applications/graphics/mozjpeg/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index 33785a279c7..b48fd891a6a 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl, file, pkgconfig, libpng, nasm }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libpng, nasm }: stdenv.mkDerivation rec { - version = "3.2"; + version = "3.3.1"; name = "mozjpeg-${version}"; - src = fetchurl { - url = "https://github.com/mozilla/mozjpeg/releases/download/v${version}/mozjpeg-${version}-release-source.tar.gz"; - sha256 = "0wvv5qh1jasz8apq93c3j9d5wd22j7lld9dr06p76yj4mpnc3v4a"; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "mozjpeg"; + rev = "v${version}"; + sha256 = "1na68860asn8b82ny5ilwbhh4nyl9gvx2yxmm4wr2v1v95v51fky"; }; - postPatch = '' - sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure - ''; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libpng nasm ]; meta = { From 8c5ccc935f2b08456c4dea13f8c09da3c442640e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 18 Jun 2018 09:30:25 +0200 Subject: [PATCH 123/265] libvirt: make xen support optional --- pkgs/development/libraries/libvirt/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 8456e395f46..cb81aa262e9 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,8 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, xen, zfs, parted, bridge-utils, dmidecode +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode +, enableXen ? false, xen ? null }: with stdenv.lib; @@ -39,7 +40,7 @@ in stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted - ] ++ optionals (stdenv.isLinux && stdenv.isx86_64) [ + ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen ] ++ optionals stdenv.isDarwin [ libiconv gmp From 9e64556dbcc51832f8a6f50476765ee60beeb392 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 13 Jun 2018 19:08:00 +0300 Subject: [PATCH 124/265] jetbrains: update.pl use channel name --- .../editors/jetbrains/default.nix | 22 +++++++++---------- pkgs/applications/editors/jetbrains/update.pl | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f6c446da35d..e2064e1ad33 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -245,7 +245,7 @@ in sha256 = "0daj1ha7d9kxgb60mx2yzyj01m6ahw5d6wzs0vvwp5fh5qf4mpw5"; }; wmClass = "jetbrains-clion"; - update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml + update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml }; datagrip = buildDataGrip rec { @@ -258,7 +258,7 @@ in sha256 = "0y959p9jsfqlf6cnj2k5m4bxc85yn5lv549rbacwicx4f0g6zp6r"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; - update-channel = "datagrip_2018_1"; + update-channel = "DataGrip 2018.1"; }; goland = buildGoland rec { @@ -271,7 +271,7 @@ in sha256 = "02nl6dssf2r4lk0fy40cvgm1m0nnfvaz2k6yygwzr35qmbsw2xjq"; /* updated by script */ }; wmClass = "jetbrains-goland"; - update-channel = "goland_release"; + update-channel = "GoLand Release"; }; idea-community = buildIdea rec { @@ -284,7 +284,7 @@ in sha256 = "1qb425wg4690474g348yizhkcqcgigz2synp4blcfv4p0pg79ri6"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; - update-channel = "IDEA_Release"; + update-channel = "IntelliJ IDEA Release"; }; idea-ultimate = buildIdea rec { @@ -297,7 +297,7 @@ in sha256 = "0jn771z09bscnk283kwrki0zyzhh4v4n6mr2swbd0ccs9v12dx71"; /* updated by script */ }; wmClass = "jetbrains-idea"; - update-channel = "IDEA_Release"; + update-channel = "IntelliJ IDEA Release"; }; phpstorm = buildPhpStorm rec { @@ -310,7 +310,7 @@ in sha256 = "0rrcsn44va942nrznldjkxymir45q8gq1lf3f8vg1w3k87cfk1zp"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; - update-channel = "PS2018.1"; + update-channel = "PhpStorm 2018.1"; }; pycharm-community = buildPycharm rec { @@ -323,7 +323,7 @@ in sha256 = "1cwrqdcp6hwr8wd234g120bblc4bjmhwxwsgj9mmxblj31c7c6an"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; - update-channel = "PyCharm_Release"; + update-channel = "PyCharm Release"; }; pycharm-professional = buildPycharm rec { @@ -336,7 +336,7 @@ in sha256 = "1chri4cknfvvqhxy973dyf7dl5linqdxc97zshrzdqhmwq6y7580"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; - update-channel = "PyCharm_Release"; + update-channel = "PyCharm Release"; }; rider = buildRider rec { @@ -349,7 +349,7 @@ in sha256 = "0jhzfi9r18hy6mig8rrrr2n55lrfn5ysa7h347w5yv2dm7kx09ib"; /* updated by script */ }; wmClass = "jetbrains-rider"; - update-channel = "rider_2018_1"; + update-channel = "Rider 2018.1.2"; }; ruby-mine = buildRubyMine rec { @@ -362,7 +362,7 @@ in sha256 = "033rjsx6zjrfbl89i513ms14iw53ip56h4bkilrij32hshb7c2c5"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; - update-channel = "rm2018.1"; + update-channel = "RubyMine 2018.1"; }; webstorm = buildWebStorm rec { @@ -375,7 +375,7 @@ in sha256 = "03nhs4vmqbm5s4ykjz475nvcbwvp2hb0bq5ijfjxwayj3jgv0zbm"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; - update-channel = "WS_Release"; + update-channel = "WebStorm Release"; }; } diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl index a0479fc9112..b4a96228db4 100755 --- a/pkgs/applications/editors/jetbrains/update.pl +++ b/pkgs/applications/editors/jetbrains/update.pl @@ -17,7 +17,7 @@ sub get_latest_versions { my @channels = get("http://www.jetbrains.com/updates/updates.xml") =~ /()/gs; my %h = {}; for my $ch (@channels) { - my ($id) = $ch =~ /^)/gs; my $latest_build = reduce { my ($aversion) = $a =~ /^]*version="([^"]+)"/; die "no version in $a" unless $aversion; From 955b349c53fe33cd989c8a637d836b1eca023729 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 13 Jun 2018 19:09:32 +0300 Subject: [PATCH 125/265] jetbrains.datagrip: 2018.1.3 -> 2018.1.4 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index e2064e1ad33..02e0fc24b54 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2018.1.3"; /* updated by script */ + version = "2018.1.4"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0y959p9jsfqlf6cnj2k5m4bxc85yn5lv549rbacwicx4f0g6zp6r"; /* updated by script */ + sha256 = "1m0qckq645jw7cj40m5vfgr212b8hji539skavch2j5s5fbqy3ln"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip 2018.1"; From ff3d215e705c6e7673195802a72eff8ffb07bece Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 13 Jun 2018 19:09:52 +0300 Subject: [PATCH 126/265] jetbrains.goland: 2018.1.3 -> 2018.1.4 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 02e0fc24b54..8126e522b74 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -263,12 +263,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.1.3"; /* updated by script */ + version = "2018.1.4"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "02nl6dssf2r4lk0fy40cvgm1m0nnfvaz2k6yygwzr35qmbsw2xjq"; /* updated by script */ + sha256 = "1ipib91443sb27snnqik8rm3bm9w6gb5niildbd538lhc9agc9xb"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand Release"; From 16b7ba2f0466ce7a0596e9b7e300a6dd516b2d90 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 13 Jun 2018 19:10:37 +0300 Subject: [PATCH 127/265] jetbrains.pycharm-community: 2018.1.3 -> 2018.1.4 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 8126e522b74..67b6a591670 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -315,12 +315,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.1.3"; /* updated by script */ + version = "2018.1.4"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1cwrqdcp6hwr8wd234g120bblc4bjmhwxwsgj9mmxblj31c7c6an"; /* updated by script */ + sha256 = "0frzasqh3jx7wcip4dnwdl9ap2g1nkx7anapwd416cxv4jj3r5ch"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm Release"; From 7b35d856ce18befe7dcced160471b1a8d6b5d46c Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 13 Jun 2018 19:10:55 +0300 Subject: [PATCH 128/265] jetbrains.pycharm-professional: 2018.1.3 -> 2018.1.4 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 67b6a591670..461aeca4e47 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -328,12 +328,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.1.3"; /* updated by script */ + version = "2018.1.4"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1chri4cknfvvqhxy973dyf7dl5linqdxc97zshrzdqhmwq6y7580"; /* updated by script */ + sha256 = "1kv1d5y2ph36aq91sq08lbz8hvfp765xi7m0hdwkhqdi2wkrpnkc"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm Release"; From 79a94d5dea189a500c0ba0a8de9167ab0b7c1f2c Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 13 Jun 2018 19:11:14 +0300 Subject: [PATCH 129/265] jetbrains.webstorm: 2018.1.3 -> 2018.1.5 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 461aeca4e47..29655c3e744 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -367,12 +367,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.1.3"; /* updated by script */ + version = "2018.1.5"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "03nhs4vmqbm5s4ykjz475nvcbwvp2hb0bq5ijfjxwayj3jgv0zbm"; /* updated by script */ + sha256 = "1mqms8gzmsaqvwzfk821vj1z1cxdgjw5nnwq63mag6rly04h60n6"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm Release"; From c3801658850ce0d565085d15234213590acee150 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 13 Jun 2018 19:11:44 +0300 Subject: [PATCH 130/265] jetbrains.idea-community: 2018.1.4 -> 2018.1.5 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 29655c3e744..01d5185b249 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -276,12 +276,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.1.4"; /* updated by script */ + version = "2018.1.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1qb425wg4690474g348yizhkcqcgigz2synp4blcfv4p0pg79ri6"; /* updated by script */ + sha256 = "0bhajghwh5r5mdv3lbnq0xlr6669hid5kyzlsxnsfzc2z737zwc5"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA Release"; From d4257c1a98aa6b824d637db61bc402536ce716f4 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 13 Jun 2018 19:11:57 +0300 Subject: [PATCH 131/265] jetbrains.idea-ultimate: 2018.1.4 -> 2018.1.5 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 01d5185b249..e1a824cc8b9 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -289,12 +289,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.1.4"; /* updated by script */ + version = "2018.1.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "0jn771z09bscnk283kwrki0zyzhh4v4n6mr2swbd0ccs9v12dx71"; /* updated by script */ + sha256 = "046wyvk2f7vbh4zam1bbri4yxzb34q43rjpk6i6npxrb25jv6clx"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA Release"; From e8d8592937160c85a9a1fdd667ea1e1e0981054c Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 13 Jun 2018 19:12:09 +0300 Subject: [PATCH 132/265] jetbrains.phpstorm: 2018.1.4 -> 2018.1.6 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index e1a824cc8b9..13aada82f3e 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -302,12 +302,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2018.1.4"; /* updated by script */ + version = "2018.1.6"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0rrcsn44va942nrznldjkxymir45q8gq1lf3f8vg1w3k87cfk1zp"; /* updated by script */ + sha256 = "0v07sfg7ywawk6wb52zhr3753hscpxw3m53ppgw4n50dcdwx0kdn"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm 2018.1"; From e9ad12ae9234a8048d5e078f91bed6f149c130b5 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 13 Jun 2018 19:12:36 +0300 Subject: [PATCH 133/265] jetbrains.rider: 2018.1 -> 2018.1.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 13aada82f3e..126b1f0b500 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -341,12 +341,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0jhzfi9r18hy6mig8rrrr2n55lrfn5ysa7h347w5yv2dm7kx09ib"; /* updated by script */ + sha256 = "1jsj0g4mv7fci3jgwx9skaz2m40g3ray2n17djaln08731rls5cc"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider 2018.1.2"; From efe77a8e78a534d10c515fb9c7d0417765fe1f09 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Mon, 18 Jun 2018 11:37:55 +0300 Subject: [PATCH 134/265] jetbrains.clion: 2018.1.3 -> 2018.1.5 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 126b1f0b500..060d1de5e04 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -237,12 +237,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.1.3"; + version = "2018.1.5"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0daj1ha7d9kxgb60mx2yzyj01m6ahw5d6wzs0vvwp5fh5qf4mpw5"; + sha256 = "0hd58i531schyjlm99vff9bi5gjskdbsljd367k9zafjfh53z91l"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml From fa9674d54440b88f32349716d2bf6f3aa93336c8 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Sun, 3 Jun 2018 17:19:59 +0300 Subject: [PATCH 135/265] libreoffice-fresh: 6.0.3.2 -> 6.0.4.2 --- pkgs/applications/office/libreoffice/default-primary-src.nix | 4 ++-- pkgs/applications/office/libreoffice/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index 436558283e0..ded09963246 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "6"; minor = "0"; - patch = "3"; + patch = "4"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "16w5f8jbicby9jgsrpaj7g9c0wzymcmk1qk1fqdxaykrgpss5f0j"; + sha256 = "1xqh4l1nrvgara4ni9zk8pqywz3gbq4a8sw9v0ggxsch409zp0ch"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c8897c87bd3..0d682bb0281 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1cx537akvil4ci4lc9gnz83xmhxyjjrpv9xcibkif6vhdck539la"; + sha256 = "0bjl3hdckd5bcgskh46xqna1hpxjjx0ycgpnilyk7j8l6407hpw6"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "00a7iqknww28z0ifcjrx529p2nxqsa4gjavk75rwykvcfyn9x686"; + sha256 = "1z21bk5lwd5gxsyjdwh0fmgkys4lhnx7flbjd6dbn9d99paz1w6f"; }; }; From 6e9808e4f172f6620f5c3f4604c073b6c21cfff3 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Thu, 14 Jun 2018 12:11:20 +0300 Subject: [PATCH 136/265] libreoffice: disable system xmlsec --- pkgs/applications/office/libreoffice/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 0d682bb0281..1d309fae9af 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme +, defaultIconTheme, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ] , withHelp ? true , kdeIntegration ? false @@ -241,6 +241,7 @@ in stdenv.mkDerivation rec { "--without-system-mdds" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" + "--without-system-xmlsec" ]; checkPhase = '' @@ -261,7 +262,7 @@ in stdenv.mkDerivation rec { python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux - librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy + librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal defaultIconTheme gettext gdb ] From c9c7c987fdfceaa71338ae7532b7f508585bea76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 18 Jun 2018 09:51:13 +0100 Subject: [PATCH 137/265] hugo: remove $bin/bin/generate This is used internally for the build process is not meant to be used. --- pkgs/applications/misc/hugo/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index f2be640a34d..110d17492f8 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -15,6 +15,10 @@ buildGoPackage rec { goDeps = ./deps.nix; + postInstall = '' + rm $bin/bin/generate + ''; + meta = with stdenv.lib; { description = "A fast and modern static website engine."; homepage = https://gohugo.io; From 83b389394b8ede5eb29b72c9ccda9380ee4aaf4e Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 19 Apr 2018 12:45:06 +0900 Subject: [PATCH 138/265] lightdm-mini-greeter: init at 0.3.2 --- .../lightdm-greeters/mini.nix | 100 ++++++++++++++++++ .../services/x11/display-managers/lightdm.nix | 1 + .../lightdm-mini-greeter/default.nix | 32 ++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 135 insertions(+) create mode 100644 nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix create mode 100644 pkgs/applications/display-managers/lightdm-mini-greeter/default.nix diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix new file mode 100644 index 00000000000..ba8151a60f2 --- /dev/null +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix @@ -0,0 +1,100 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + dmcfg = config.services.xserver.displayManager; + ldmcfg = dmcfg.lightdm; + cfg = ldmcfg.greeters.mini; + + xgreeters = pkgs.linkFarm "lightdm-mini-greeter-xgreeters" [{ + path = "${pkgs.lightdm-mini-greeter}/share/xgreeters/lightdm-mini-greeter.desktop"; + name = "lightdm-mini-greeter.desktop"; + }]; + + miniGreeterConf = pkgs.writeText "lightdm-mini-greeter.conf" + '' + [greeter] + user = ${cfg.user} + show-password-label = true + password-label-text = Password: + show-input-cursor = true + + [greeter-hotkeys] + mod-key = meta + shutdown-key = s + restart-key = r + hibernate-key = h + suspend-key = u + + [greeter-theme] + font = Sans + font-size = 1em + text-color = "#080800" + error-color = "#F8F8F0" + background-image = "${ldmcfg.background}" + background-color = "#1B1D1E" + window-color = "#F92672" + border-color = "#080800" + border-width = 2px + layout-space = 15 + password-color = "#F8F8F0" + password-background-color = "#1B1D1E" + + ${cfg.extraConfig} + ''; + +in +{ + options = { + + services.xserver.displayManager.lightdm.greeters.mini = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable lightdm-mini-greeter as the lightdm greeter. + + Note that this greeter starts only the default X session. + You can configure the default X session by + and + . + ''; + }; + + user = mkOption { + type = types.str; + default = "root"; + description = '' + The user to login as. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the lightdm-mini-greeter.conf + configuration file. + ''; + }; + + }; + + }; + + config = mkIf (ldmcfg.enable && cfg.enable) { + + services.xserver.displayManager.lightdm.greeters.gtk.enable = false; + + services.xserver.displayManager.lightdm.greeter = mkDefault { + package = xgreeters; + name = "lightdm-mini-greeter"; + }; + + environment.etc."lightdm/lightdm-mini-greeter.conf".source = miniGreeterConf; + + }; +} diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 9d30155a723..5beadacdfa9 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -72,6 +72,7 @@ in # preferred. imports = [ ./lightdm-greeters/gtk.nix + ./lightdm-greeters/mini.nix ]; options = { diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix new file mode 100644 index 00000000000..ef80aa00563 --- /dev/null +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }: + +stdenv.mkDerivation rec { + name = "lightdm-mini-greeter-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "prikhi"; + repo = "lightdm-mini-greeter"; + rev = version; + sha256 = "1g3lrh034w38hiq96b0xmghmlf87hcycwdh06dwkdksr0hl08wxy"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ lightdm gtk3 ]; + + configureFlags = [ "--sysconfdir=/etc" ]; + makeFlags = [ "configdir=$(out)/etc" ]; + + postInstall = '' + substituteInPlace "$out/share/xgreeters/lightdm-mini-greeter.desktop" \ + --replace "Exec=lightdm-mini-greeter" "Exec=$out/bin/lightdm-mini-greeter" + ''; + + meta = with stdenv.lib; { + description = "A minimal, configurable, single-user GTK3 LightDM greeter"; + homepage = https://github.com/prikhi/lightdm-mini-greeter; + license = licenses.gpl3; + maintainers = with maintainers; [ mnacamura ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d652824d8b9..fecd7b36998 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18006,6 +18006,8 @@ with pkgs; inherit (xfce) exo; }; + lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { }; + slic3r = callPackage ../applications/misc/slic3r { }; slic3r-prusa3d = callPackage ../applications/misc/slic3r/prusa3d.nix { }; From 450db02db1d22bb4b825fa155d2b62acd36eb51f Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Mon, 18 Jun 2018 20:06:38 +1000 Subject: [PATCH 139/265] brightnessctl: fix permissions --- pkgs/misc/brightnessctl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix index ef53dc1446b..69fa10d74fe 100644 --- a/pkgs/misc/brightnessctl/default.nix +++ b/pkgs/misc/brightnessctl/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0amxhcikcgj04z81272kz35m5h5q4jx9x7v71h8yl1rv4b2lzh7z"; }; - makeFlags = "MODE=0 PREFIX=/ DESTDIR=$(out)"; + makeFlags = "MODE=0755 PREFIX=/ DESTDIR=$(out)"; patchPhase = '' substituteInPlace 90-brightnessctl.rules --replace /bin/ ${coreutils}/bin/ From c449f0b55c56206baa93de0079a393897c51b3b1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 13 Jun 2018 00:15:45 +0200 Subject: [PATCH 140/265] nixos/tor: grammer fix, advise -> advice Seems to me that the noun form is more appropriate here. --- nixos/modules/services/security/tor.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index c2de1c45a39..15200c49d70 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -360,7 +360,7 @@ in - WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVISE. + WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVICE. Consult with your lawer when in doubt. From 9fb27679deea0697c818fe908a382ecd74c712e1 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Mon, 18 Jun 2018 22:09:14 +1000 Subject: [PATCH 141/265] nix-pin: 0.3.1 -> 0.3.4 --- pkgs/tools/package-management/nix-pin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index 89342953705..10afb1d9097 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,12 +1,12 @@ { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }: let self = stdenv.mkDerivation rec { name = "nix-pin-${version}"; - version = "0.3.1"; + version = "0.3.4"; src = fetchFromGitHub { owner = "timbertson"; repo = "nix-pin"; - rev = "version-0.3.1"; - sha256 = "1sldbrz33wz30d3vv3d2clyqyd6x1y6h6xjz1xv55fa97ig1h481"; + rev = "version-0.3.4"; + sha256 = "03wdxai3hpv2v9jp7r91x8y36ryz6v1cczmx3d26g1bf0ij5svb8"; }; buildInputs = [ python3 mypy makeWrapper ]; checkPhase = '' From e905a3a417baff1aa7b25c61886cce38b99221f1 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Mon, 18 Jun 2018 22:09:52 +1000 Subject: [PATCH 142/265] nix-update-source: 0.5.0 -> 0.6.3 --- pkgs/tools/package-management/nix-update-source/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index fe3cf33b46c..e7eb497b4b9 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -1,12 +1,12 @@ { lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }: python3Packages.buildPythonApplication rec { - version = "0.5.0"; + version = "0.6.3"; name = "nix-update-source-${version}"; src = fetchFromGitHub { owner = "timbertson"; repo = "nix-update-source"; - rev = "version-0.5.0"; - sha256 = "13icwk249frddsmn9albasikwp8asmgvp3jf9xj9adzh63wzh1i7"; + rev = "version-0.6.3"; + sha256 = "157wvv9vnaszzwbj68jpdc0imcm1hdab3z760bx2axbsgfpqqilz"; }; propagatedBuildInputs = [ nix-prefetch-scripts ]; passthru = { From 3756efbdcc077dbce566e0dd3f23900756684671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Jun 2018 14:15:11 +0200 Subject: [PATCH 143/265] pythonPackages.xml2rfc: init at 2.9.8 It seems to work fine, in python2Packages and python3Packages. If you find a problem, let me know and I'll try to fix it. --- .../python-modules/xml2rfc/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/xml2rfc/default.nix diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix new file mode 100644 index 00000000000..7a091eb09f7 --- /dev/null +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchurl, buildPythonPackage, intervaltree, pyflakes, requests, lxml }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "xml2rfc"; + version = "2.9.8"; + + src = fetchurl { + url = "mirror://pypi/x/${pname}/${name}.tar.gz"; + sha256 = "1img6941wvwpk71q3vi9526bfjbh949k4lphrvdwlcf4igwy435m"; + }; + + propagatedBuildInputs = [ intervaltree pyflakes requests lxml ]; + + meta = with lib; { + description = "Tool generating IETF RFCs and drafts from XML sources"; + homepage = https://tools.ietf.org/tools/xml2rfc/trac/; + # Well, parts might be considered unfree, if being strict; see: + # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright + license = licenses.bsd3; + maintainers = [ maintainers.vcunat ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad9f2452607..d057cebf9f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15051,6 +15051,8 @@ EOF }; }); + xml2rfc = callPackage ../development/python-modules/xml2rfc { }; + xmltodict = callPackage ../development/python-modules/xmltodict { }; xarray = callPackage ../development/python-modules/xarray { }; From b5d6a4908537a10388257c3449b826f16dc0eef2 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 17 Jun 2018 20:03:29 +0300 Subject: [PATCH 144/265] nixos/networkmanager: add extraConfig --- nixos/modules/services/networking/networkmanager.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f4c4adcaaeb..81623450659 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -38,6 +38,8 @@ let [device] wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"} + + ${cfg.extraConfig} ''; /* @@ -120,6 +122,14 @@ in { ''; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Configuration appended to the generated NetworkManager.conf. + ''; + }; + unmanaged = mkOption { type = types.listOf types.string; default = []; From a6d2cd545862218b92950bb11f19e852c30da3be Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 18 Jun 2018 16:50:31 +0200 Subject: [PATCH 145/265] osquery: 3.2.2 -> 3.2.8 The 3.2.2 build fails ATM on Hydra: https://hydra.nixos.org/build/75998362 Bumping to 3.2.8 and rebasing `osquery/CMakeLists.txt` with `misc.patch` fixes the issue. Additionally the NixOS test remains functional. --- pkgs/tools/system/osquery/default.nix | 8 ++++---- pkgs/tools/system/osquery/misc.patch | 25 +++++++++++++++---------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index a0aaa846bc7..c2d31ccb0fb 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -12,15 +12,15 @@ let thirdparty = fetchFromGitHub { owner = "osquery"; repo = "third-party"; - rev = "4ef099c31a1165c5e7e3a699f9e4b3eb68c3c3d9"; - sha256 = "1vm0prw4dix0m51vkw9z0vwfd8698gqjw499q8h604hs1rvn6132"; + rev = "32e01462fbea75d3b1904693f937dfd62eaced15"; + sha256 = "0va24gmgk43a1lyjs63q9qrhvpv8gmqjzpjr5595vhr16idv8wyf"; }; in stdenv.mkDerivation rec { name = "osquery-${version}"; - version = "3.2.2"; + version = "3.2.8"; # this is what `osquery --help` will show as the version. OSQUERY_BUILD_VERSION = version; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "facebook"; repo = "osquery"; rev = version; - sha256 = "0qwj4cy6m25sqwb0irqfqinipx50l4imnz1gqxx147vzfwb52jlq"; + sha256 = "1py5jizl7z1f9xzpg7pylbdnawvvifiyv9gpjwiim8ilgkmpaiv4"; }; patches = [ ./misc.patch ]; diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch index acdbf6346c8..859e398616a 100644 --- a/pkgs/tools/system/osquery/misc.patch +++ b/pkgs/tools/system/osquery/misc.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8eb5a16..319d81dc 100644 +index 71921740..156ea6dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -447,12 +447,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD) +@@ -456,12 +456,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto=thin") endif() @@ -15,7 +15,7 @@ index b8eb5a16..319d81dc 100644 # Make sure deps were built before compiling (else show warning). execute_process( COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}" -@@ -518,6 +512,8 @@ endif() +@@ -528,6 +522,8 @@ endif() if(APPLE) LOG_PLATFORM("OS X") @@ -24,7 +24,7 @@ index b8eb5a16..319d81dc 100644 elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian") LOG_PLATFORM("Debian") elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu") -@@ -567,7 +563,6 @@ if(POSIX AND DEPS) +@@ -577,7 +573,6 @@ if(POSIX AND DEPS) endif() endif() @@ -32,7 +32,7 @@ index b8eb5a16..319d81dc 100644 include_directories("${CMAKE_SOURCE_DIR}/include") include_directories("${CMAKE_SOURCE_DIR}") -@@ -655,18 +650,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "") +@@ -668,18 +663,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "") add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0) endif() @@ -52,7 +52,7 @@ index b8eb5a16..319d81dc 100644 add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/linenoise-ng") endif() diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt -index 1c8201ee..a89e6821 100644 +index c8cbac4e..a4382420 100644 --- a/osquery/CMakeLists.txt +++ b/osquery/CMakeLists.txt @@ -35,8 +35,6 @@ if(CLANG AND POSIX) @@ -64,7 +64,7 @@ index 1c8201ee..a89e6821 100644 -Wno-unused-parameter -Wno-gnu-case-range -Weffc++ -@@ -61,14 +59,7 @@ endif() +@@ -65,14 +63,7 @@ endif() # Construct a set of all object files, starting with third-party and all # of the osquery core objects (sources from ADD_CORE_LIBRARY macros). @@ -80,7 +80,7 @@ index 1c8201ee..a89e6821 100644 # Add subdirectories add_subdirectory(config) -@@ -147,10 +138,11 @@ if(APPLE OR LINUX) +@@ -153,10 +144,11 @@ if(APPLE OR LINUX) ADD_OSQUERY_LINK_ADDITIONAL("rocksdb_lite") elseif(FREEBSD) ADD_OSQUERY_LINK_CORE("icuuc") @@ -93,15 +93,20 @@ index 1c8201ee..a89e6821 100644 if(POSIX) ADD_OSQUERY_LINK_CORE("boost_system") ADD_OSQUERY_LINK_CORE("boost_filesystem") -@@ -168,6 +160,8 @@ endif() +@@ -174,10 +166,10 @@ endif() ADD_OSQUERY_LINK_CORE("glog${WO_KEY}") if(POSIX) +- # Hashing methods in core use libcrypto. +- ADD_OSQUERY_LINK_CORE("crypto") +- + ADD_OSQUERY_LINK_ADDITIONAL("benchmark") + ADD_OSQUERY_LINK_ADDITIONAL("snappy") ADD_OSQUERY_LINK_ADDITIONAL("ssl") - ADD_OSQUERY_LINK_ADDITIONAL("crypto") ++ ADD_OSQUERY_LINK_ADDITIONAL("crypto") ADD_OSQUERY_LINK_ADDITIONAL("libpthread") + ADD_OSQUERY_LINK_ADDITIONAL("magic") + endif() diff --git a/osquery/extensions/CMakeLists.txt b/osquery/extensions/CMakeLists.txt index 52f3bf80..066ed1c0 100644 --- a/osquery/extensions/CMakeLists.txt From 516c5f54ed7f0972a1d2c172303e6ec63e95d862 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Jun 2018 10:41:24 -0500 Subject: [PATCH 146/265] ngx_brotli: 0.1.1 -> 0.1.2 Fixes socket closing issues (only happened in some circumstances AFAICT). --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f482c92ed9f..1919cfddf62 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -5,8 +5,8 @@ src = let gitsrc = pkgs.fetchFromGitHub { owner = "eustas"; repo = "ngx_brotli"; - rev = "37ab9b2933a0b756ba3447000b7f31d432ed8228"; # v0.1.1 - sha256 = "114ai8v9ns23qm12wp9dgdjvldqjnrmb3cmarkn0d3k6n3bm01bf"; + rev = "v0.1.2"; + sha256 = "19r9igxm4hrzrhxajlxw2ccq0057h8ipkfiif725x0xqbxjskl6c"; }; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' cp -a ${gitsrc} $out substituteInPlace $out/config \ From 54f50e6e2524dc29732c6d1a47e61c72e0f4dd55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20H=C3=B6ppner?= Date: Mon, 18 Jun 2018 16:49:57 +0100 Subject: [PATCH 147/265] WoeUSB: 3.1.5 -> 3.2.1 (#42158) --- pkgs/tools/misc/woeusb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 197eea17d88..9c6211b13df 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -3,14 +3,14 @@ , wxGTK30 }: stdenv.mkDerivation rec { - version = "3.1.5"; + version = "3.2.1"; name = "woeusb-${version}"; src = fetchFromGitHub { owner = "slacka"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "0jbyrd49ikwkfpnka884y3p600bm3nfil2zinrgbac7vyhxxqjmw"; + sha256 = "0qymdc216ws6adkzmzxz6hx43dim0hpwab9c4qmgg8jnkhnpvnj1"; }; buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; From c068e1ca9af3e86f56615aafd705fbd851f466bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 17 Jun 2018 22:28:23 +0200 Subject: [PATCH 148/265] opensmtpd: fix interaction with dovecot-2.3.1 This has been merged upstream with https://github.com/OpenSMTPD/OpenSMTPD/pull/847 --- pkgs/servers/mail/opensmtpd/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index e562fdc88a6..60c517230b4 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoconf, automake, libtool, bison +{ stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison , libasr, libevent, zlib, openssl, db, pam # opensmtpd requires root for no reason to encrypt passwords, this patch fixes it @@ -23,7 +23,13 @@ else stdenv.mkDerivation rec { sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81"; }; - patches = [ ./proc_path.diff ]; + patches = [ + ./proc_path.diff + (fetchpatch { + url = "https://github.com/OpenSMTPD/OpenSMTPD/commit/725ba4fa2ddf23bbcd1ff9ec92e86bbfaa6825c8.diff"; + sha256 = "19rla0b2r53jpdiz25fcza29c2msz6j6paivxhp9jcy1xl457dqa"; + }) + ]; postPatch = with builtins; with lib; optionalString unpriviledged_smtpctl_encrypt '' From a669574a908561737eeac2ba7eb05c505bc02a79 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Mon, 18 Jun 2018 02:16:52 +0200 Subject: [PATCH 149/265] patchwork-classic : init at 2.12.0 --- .../ssb/patchwork-classic/default.nix | 106 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 108 insertions(+) create mode 100644 pkgs/applications/networking/ssb/patchwork-classic/default.nix diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix new file mode 100644 index 00000000000..361aac4f122 --- /dev/null +++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix @@ -0,0 +1,106 @@ +{ stdenv, fetchurl, lib, makeWrapper, + # build dependencies + alsaLib, atk, cairo, cups, dbus, expat, fontconfig, + freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg, + glibc, systemd +}: + +stdenv.mkDerivation rec { + + version = "2.12.0"; + + name = "patchwork-clasic-${version}"; + + src = fetchurl { + url = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb"; + sha256 = "1rvp07cgqwv7ac319p0qwpfxd7l8f53m1rlvvig7qf7q23fnmbsj"; + }; + + sourceRoot = "."; + + unpackCmd = '' + ar p "$src" data.tar.xz | tar xJ + ''; + + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -R usr/share opt $out/ + + # fix the path in the desktop file + substituteInPlace \ + $out/share/applications/ssb-patchwork-electron.desktop \ + --replace /opt/ $out/opt/ + + # symlink the binary to bin/ + ln -s $out/opt/ssb-patchwork-electron/ssb-patchwork-electron $out/bin/patchwork-classic + ''; + + + preFixup = let + packages = [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + nspr + nss + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + stdenv.cc.cc.lib + stdenv.cc.cc + glibc + ]; + libPathNative = lib.makeLibraryPath packages; + libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; + libPath = "${libPathNative}:${libPath64}"; + in '' + # patch executable + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/opt/ssb-patchwork-electron" \ + $out/opt/ssb-patchwork-electron/ssb-patchwork-electron + + # patch libnode + patchelf \ + --set-rpath "${libPath}" \ + $out/opt/ssb-patchwork-electron/libnode.so + + # libffmpeg is for some reason not executable + chmod a+x $out/opt/ssb-patchwork-electron/libffmpeg.so + + # fix missing libudev + ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/ssb-patchwork-electron/libudev.so.1 + wrapProgram $out/opt/ssb-patchwork-electron/ssb-patchwork-electron \ + --prefix LD_LIBRARY_PATH : $out/opt/ssb-patchwork-electron + ''; + + meta = with stdenv.lib; { + description = "Electron wrapper for Patchwork Classic: run as a desktop app outside the browser"; + homepage = "https://github.com/ssbc/patchwork-classic-electron"; + license = licenses.gpl3; + maintainers = with maintainers; [ mrVanDalo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37acfa65025..11d996d38ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4365,6 +4365,8 @@ with pkgs; patchage = callPackage ../applications/audio/patchage { }; + patchwork-classic = callPackage ../applications/networking/ssb/patchwork-classic { }; + pcapfix = callPackage ../tools/networking/pcapfix { }; pbzip2 = callPackage ../tools/compression/pbzip2 { }; From 106bde413e424137ef7fa9797fc02fa5a549e948 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 7 Jun 2018 13:34:09 +0200 Subject: [PATCH 150/265] gitea: 1.4.1 -> 1.4.2 Not much of a changelog: https://github.com/go-gitea/gitea/releases/tag/v1.4.2 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 71b59ed4aef..917deac6daa 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1mid67c4021m7mi4ablx1w5v43831gzn8xpg8n30a4zmr70781wm"; + sha256 = "15iqvfvijg46444pybi7vg7xhl2x0pr5p1416qlc2nakkn3drpi1"; }; patches = [ ./static-root-path.patch ]; From e99a869c197b511949151d02562b29f27dea332b Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Mon, 18 Jun 2018 19:21:20 +0200 Subject: [PATCH 151/265] prometheus-node-exporter: 0.15.2 -> 0.16.0 --- pkgs/servers/monitoring/prometheus/node-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 497f20ac55e..02a6197d384 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "node_exporter-${version}"; - version = "0.15.2"; + version = "0.16.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -11,10 +11,10 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "1vxbkps80ba8c0ndawijg07am5gyc8y49h8fd0ky5h05zmkp25qv"; + sha256 = "0rm6ahccgr1djpwvsa3p1kfal3mpy4a6g5w974pra84gk3krli5a"; }; - # FIXME: megacli test fails + # FIXME: tests fail due to read-only nix store doCheck = false; meta = with stdenv.lib; { From f8ec07e836dfd224c41216cbd82a8cfc3de50b8a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 13 Jun 2018 13:44:16 -0400 Subject: [PATCH 152/265] haskell generic-builder: Always use separate pkg db for custom setup This decreases complexity and ensures setup dependencies are properly specified with `setup-depends` as they should be. Testing will say if this is a reasonable change. --- .../haskell-modules/generic-builder.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 1cc38586458..7f3ddc48103 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -166,14 +166,8 @@ let "--configure-option=--host=${hostPlatform.config}" ] ++ crossCabalFlags); - useSeparateSetupDb = setupHaskellDepends != [] || isCross || isGhcjs; - setupCompileFlags = [ - (optionalString (!coreSetup) "-${nativePackageDbFlag}=${ - if useSeparateSetupDb - then "$setupPackageConfDir" - else "$packageConfDir" - }") + (optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir") (optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") # https://github.com/haskell/cabal/issues/2398 (optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded") @@ -270,10 +264,8 @@ stdenv.mkDerivation ({ echo "Build with ${ghc}." ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} - '' + (optionalString useSeparateSetupDb '' setupPackageConfDir="$TMPDIR/setup-package.conf.d" mkdir -p $setupPackageConfDir - '') + '' packageConfDir="$TMPDIR/package.conf.d" mkdir -p $packageConfDir @@ -284,14 +276,13 @@ stdenv.mkDerivation ({ # dependencies for the build machine. # # pkgs* arrays defined in stdenv/setup.hs - + (optionalString useSeparateSetupDb '' + + '' for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do ${buildPkgDb nativeGhc.name "$setupPackageConfDir"} done ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache - '') - - # For normal components + '' + # For normal components + '' for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do ${buildPkgDb ghc.name "$packageConfDir"} From 1b08966db94df553d282d8f5eee2e27e0e212dd3 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 17 Jun 2018 18:49:29 +0200 Subject: [PATCH 153/265] journaldriver: init at 1.0.0 --- pkgs/tools/misc/journaldriver/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/journaldriver/default.nix diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix new file mode 100644 index 00000000000..58c9ee770b7 --- /dev/null +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }: + +rustPlatform.buildRustPackage rec { + name = "journaldriver-${version}"; + version = "1.0.0"; + cargoSha256 = "04llhriwsrjqnkbjgd22nhci6zmhadclnd8r2bw5092gwdamf49k"; + + src = fetchFromGitHub { + owner = "aprilabank"; + repo = "journaldriver"; + rev = "v${version}"; + sha256 = "1163ghf7dxxchyawdaa7zdi8ly2pxmc005c2k549larbirjjbmgc"; + }; + + buildInputs = [ openssl systemd ]; + nativeBuildInputs = [ pkgconfig ]; + + meta = with lib; { + description = "Log forwarder from journald to Stackdriver Logging"; + homepage = "https://github.com/aprilabank/journaldriver"; + license = licenses.gpl3; + maintainers = [ maintainers.tazjin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a3bbc772ed..2e175c1a2a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3225,6 +3225,8 @@ with pkgs; journalbeat = callPackage ../tools/system/journalbeat { }; + journaldriver = callPackage ../tools/misc/journaldriver { }; + jp = callPackage ../development/tools/jp { }; jp2a = callPackage ../applications/misc/jp2a { }; From 59e5aabee6b36b998c7ac47778dbe6c4bf245ed9 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 17 Jun 2018 19:24:57 +0200 Subject: [PATCH 154/265] nixos/journaldriver: add module for journaldriver log forwarder Adds a module for running the journaldriver log forwarding agent via systemd. The agent can be deployed on both GCP instances and machines hosted elsewhere to forward all logs from journald to Stackdriver Logging. Consult the module options and upstream documentation for more information. Implementation notes: * The service unit is configured to use systemd's dynamic user feature which will let systemd set up the state directory and appropriate user configuration at unit launch time instead of hardcoding it. * The module depends on `network-online.target` to prevent a situation where journaldriver is failing and restarting multiple times before the network is online. --- .../services/logging/journaldriver.nix | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 nixos/modules/services/logging/journaldriver.nix diff --git a/nixos/modules/services/logging/journaldriver.nix b/nixos/modules/services/logging/journaldriver.nix new file mode 100644 index 00000000000..74ac3d4c236 --- /dev/null +++ b/nixos/modules/services/logging/journaldriver.nix @@ -0,0 +1,112 @@ +# This module implements a systemd service for running journaldriver, +# a log forwarding agent that sends logs from journald to Stackdriver +# Logging. +# +# It can be enabled without extra configuration when running on GCP. +# On machines hosted elsewhere, the other configuration options need +# to be set. +# +# For further information please consult the documentation in the +# upstream repository at: https://github.com/aprilabank/journaldriver/ + +{ config, lib, pkgs, ...}: + +with lib; let cfg = config.services.journaldriver; +in { + options.services.journaldriver = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable journaldriver to forward journald logs to + Stackdriver Logging. + ''; + }; + + logLevel = mkOption { + type = types.str; + default = "info"; + description = '' + Log level at which journaldriver logs its own output. + ''; + }; + + logName = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Configures the name of the target log in Stackdriver Logging. + This option can be set to, for example, the hostname of a + machine to improve the user experience in the logging + overview. + ''; + }; + + googleCloudProject = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Configures the name of the Google Cloud project to which to + forward journald logs. + + This option is required on non-GCP machines, but should not be + set on GCP instances. + ''; + }; + + logStream = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Configures the name of the Stackdriver Logging log stream into + which to write journald entries. + + This option is required on non-GCP machines, but should not be + set on GCP instances. + ''; + }; + + applicationCredentials = mkOption { + type = with types; nullOr path; + default = null; + description = '' + Path to the service account private key (in JSON-format) used + to forward log entries to Stackdriver Logging on non-GCP + instances. + + This option is required on non-GCP machines, but should not be + set on GCP instances. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.journaldriver = { + description = "Stackdriver Logging journal forwarder"; + script = "${pkgs.journaldriver}/bin/journaldriver"; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Restart = "always"; + DynamicUser = true; + + # This directive lets systemd automatically configure + # permissions on /var/lib/journaldriver, the directory in + # which journaldriver persists its cursor state. + StateDirectory = "journaldriver"; + + # This group is required for accessing journald. + SupplementaryGroups = "systemd-journal"; + }; + + environment = { + RUST_LOG = cfg.logLevel; + LOG_NAME = cfg.logName; + LOG_STREAM = cfg.logStream; + GOOGLE_CLOUD_PROJECT = cfg.googleCloudProject; + GOOGLE_APPLICATION_CREDENTIALS = cfg.applicationCredentials; + }; + }; + }; +} From 627aae5884fd9bc2b380eab818f58212aa8753f1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 Jun 2018 14:47:29 -0400 Subject: [PATCH 155/265] darwin stdenv: Put back "man" attribute on clang and llvm We take care to make it use the final stdenv to avoid mass rebuilds and bootstrap python. --- pkgs/stdenv/darwin/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 7ef74c5ea7d..71de45bb1d7 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -323,8 +323,16 @@ in rec { coreutils findutils diffutils patchutils; llvmPackages_5 = super.llvmPackages_5 // (let - tools = super.llvmPackages_5.tools.extend (_: _: { - inherit (llvmPackages_5) llvm clang-unwrapped; + tools = super.llvmPackages_5.tools.extend (_: super: { + # Build man pages with final stdenv not before + llvm = lib.extendDerivation + true + { inherit (super.llvm) man; } + llvmPackages_5.llvm; + clang-unwrapped = lib.extendDerivation + true + { inherit (super.clang-unwrapped) man; } + llvmPackages_5.clang-unwrapped; }); libraries = super.llvmPackages_5.libraries.extend (_: _: { inherit (llvmPackages_5) libcxx libcxxabi; @@ -370,7 +378,8 @@ in rec { inherit (prevStage) stdenv; }; inherit (pkgs) coreutils gnugrep; - cc = pkgs.llvmPackages.clang-unwrapped; + # Hack to avoid man pages in stdenv to avoid mass rebuild + cc = builtins.removeAttrs pkgs.llvmPackages.clang-unwrapped [ "man" ]; bintools = pkgs.darwin.binutils; libc = pkgs.darwin.Libsystem; extraPackages = [ pkgs.libcxx ]; From e3b1937baf008bea6bb60ff3f384a012e7c58531 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 Jun 2018 15:05:23 -0400 Subject: [PATCH 156/265] tests.cc-wrapper: Fix sanitizer condition fc9644d4c9c9d29958e9bcf1676d48d4b3026bb4 accidentally enabled the sanitizer tests for GCC on Darwin, when fixing that case was never attempted. Also inverted the condition from broken to working for clarity. --- pkgs/test/cc-wrapper/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index dd41cd157ca..f9c6e9e7779 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -3,7 +3,9 @@ with stdenv.lib; let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug - sanitizersBroken = stdenv.cc.isClang && versionOlder (getVersion stdenv.cc.name) "6.0.0"; + sanitizersWorking = + (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "6.0.0") + || (stdenv.cc.isGNU && stdenv.isLinux); in stdenv.mkDerivation { name = "cc-wrapper-test"; @@ -43,7 +45,7 @@ in stdenv.mkDerivation { NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c} ./ldflags-check - ${optionalString (!sanitizersBroken) '' + ${optionalString sanitizersWorking '' printf "checking whether sanitizers are fully functional... ">&2 $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} ./sanitizers From 30913cc998d568684670deb3a45f6a855f0742f8 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 18 Jun 2018 15:44:23 -0400 Subject: [PATCH 157/265] ghcjs: remove phases We can just disable each one we don't want manually. --- pkgs/development/compilers/ghcjs-ng/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 93257ff7d53..affed7e2d07 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -69,7 +69,8 @@ in stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ gcc # https://github.com/ghcjs/ghcjs/issues/663 ]; - phases = ["unpackPhase" "buildPhase"]; + dontConfigure = true; + dontInstall = true; buildPhase = '' export HOME=$TMP mkdir $HOME/.cabal From 3ab1993b1fb977764547e42529b4d21dc3b50112 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Jun 2018 11:15:50 +0200 Subject: [PATCH 158/265] deja-dup: fix nautilus extension breaking nautilus When deja-dup is installed, Nautilus segfaults on start due to the missing gsettings schemas. This commit hardcodes path to the compiled schemas file to the extension. --- pkgs/applications/backup/deja-dup/default.nix | 5 +++ .../backup/deja-dup/hardcode-gsettings.patch | 38 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/backup/deja-dup/hardcode-gsettings.patch diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index ef7aa96beb0..7e3c3b2e8b3 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -19,8 +19,13 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit coreutils; }) + ./hardcode-gsettings.patch ]; + postPatch = '' + substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas + ''; + nativeBuildInputs = [ meson ninja pkgconfig vala_0_40 gettext itstool appstream-glib desktop-file-utils libxml2 wrapGAppsHook diff --git a/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch new file mode 100644 index 00000000000..50bf2ba4fbd --- /dev/null +++ b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch @@ -0,0 +1,38 @@ +--- a/deja-dup/nautilus/NautilusExtension.c ++++ b/deja-dup/nautilus/NautilusExtension.c +@@ -24,6 +24,8 @@ + #include + + GList *dirs = NULL; ++GSettingsSchemaSource *schema_source = NULL; ++GSettingsSchema *schema = NULL; + GSettings *settings = NULL; + + // This will treat a < b iff a is 'lower' in the file tree than b +@@ -313,7 +315,13 @@ + bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR); + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + +- settings = g_settings_new("org.gnome.DejaDup"); ++ schema_source = g_settings_schema_source_new_from_directory ("@DEJA_DUP_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default (), TRUE, NULL); ++ ++ schema = g_settings_schema_source_lookup (schema_source, ++ "org.gnome.DejaDup", FALSE); ++ ++ settings = g_settings_new_full (schema, NULL, NULL); + g_signal_connect(settings, "changed::include-list", + update_include_excludes, NULL); + g_signal_connect(settings, "changed::exclude-list", +@@ -329,7 +337,11 @@ + + void nautilus_module_shutdown(void) + { ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); + g_object_unref(settings); ++ schema_source = NULL; ++ schema = NULL; + settings = NULL; + + update_include_excludes(); /* will clear it now that settings is NULL */ From a6e737c65eee89ee809dce73923bce8ec210acd7 Mon Sep 17 00:00:00 2001 From: mulderr Date: Mon, 18 Jun 2018 21:50:57 +0200 Subject: [PATCH 159/265] odpic-raw: disable tests (#42135) Test suite expects a running Oracle database server. --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a9db4a8ce72..204c183ca35 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -364,6 +364,7 @@ self: super: { notcpp = dontCheck super.notcpp; ntp-control = dontCheck super.ntp-control; numerals = dontCheck super.numerals; + odpic-raw = dontCheck super.odpic-raw; # needs a running oracle database server opaleye = dontCheck super.opaleye; openpgp = dontCheck super.openpgp; optional = dontCheck super.optional; From 6d5751bfa564a365add8a3d7d7d070541a9e33fc Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Fri, 27 Apr 2018 20:14:15 +0300 Subject: [PATCH 160/265] haskell: Add setup depends for Cabal --- .../haskell-modules/configuration-common.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a9db4a8ce72..c420c19d075 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1068,3 +1068,14 @@ self: super: { in { inherit amazonka amazonka-core amazonka-test; }) + +// + +# The actual Cabal library gets built while building its `Setup.hs`. +(let + inherit (pkgs.lib) filterAttrs flip mapAttrs hasPrefix; + cabals = filterAttrs (n: v: hasPrefix "Cabal_" n) super; + fixCabal = n: v: addSetupDepends v [ self.mtl self.parsec ]; +in + mapAttrs fixCabal cabals +) From ad5cc515bb8d320061e08e82b8b91328f2a4d3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claes=20Wallin=20=28=E9=9F=8B=E5=98=89=E8=AA=A0=29?= Date: Mon, 18 Jun 2018 22:22:31 +0200 Subject: [PATCH 161/265] connect: works on darwin (#42172) --- pkgs/tools/networking/connect/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index f7a0c00fb48..3d63340adb0 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = https://bitbucket.org/gotoh/connect/wiki/Home; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } From 29d8149fe9890668ff08649334aca8c26ca595ec Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Mon, 18 Jun 2018 22:27:07 +0200 Subject: [PATCH 162/265] pencil : fix udev dependency (#42147) --- pkgs/applications/graphics/pencil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 0e52190af42..de758271004 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -2,7 +2,7 @@ # build dependencies alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg, - glibc, udev + glibc, systemd }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ar p "$src" data.tar.xz | tar xJ ''; - buildPhase = ":"; + dontBuild = true; nativeBuildInputs = [ makeWrapper ]; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { chmod a+x $out/opt/Pencil/libffmpeg.so # fix missing libudev - ln -s ${udev}/lib/systemd/libsystemd-shared.so $out/opt/Pencil/libudev.so.1 + ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/Pencil/libudev.so.1 wrapProgram $out/opt/Pencil/pencil \ --prefix LD_LIBRARY_PATH : $out/opt/Pencil ''; From 1782b9ec09fadfef5e9c8b560fa90aa926a86f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 18 Jun 2018 22:32:56 +0200 Subject: [PATCH 163/265] vlc: Fixes build with fribidi version 1.0 (#42130) --- pkgs/applications/video/vlc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index c3665daad9d..d9bc2ed18b1 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -58,6 +58,10 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vlc-qt5.11.patch?h=packages/vlc"; sha256 = "0yh65bhhaz876cazhagnafs1dr61184lpj3y0m3y7k37bswykj8p"; }) + (fetchpatch { + url = "https://github.com/videolan/vlc/commit/26e2d3906658c30f2f88f4b1bc9630ec43bf5525.patch"; + sha256 = "0sm73cbzxva8sww526bh5yin1k2pdkvj826wdlmqnj7xf0f3mki4"; + }) ]; postPatch = '' From f8cef0d06e39728497f4109855f46b8cc6d4f7db Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 18 Jun 2018 16:38:07 -0400 Subject: [PATCH 164/265] multi-ghc-travis: db63eb7f2ea -> 05926968f17 (#42171) Just a routine bump; adds support for GHC 8.4.3. --- pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 98df266703a..697af75a434 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -18,8 +18,8 @@ mkDerivation { src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "db63eb7f2eaa64b7b0e4759e98258fea2a27a424"; - sha256 = "0ff55zafx7561s1yps7aw83ws4vcpc5cq9r6bbckaagvwwla0dcq"; + rev = "05926968f17256cae2308756835a3a24d9de437b"; + sha256 = "0s1g1yq6j6vl2bspc90bwbwp7532pcrmh8fhnz8j6yv9py927mmm"; }; patches = [ newShellCheck ]; isLibrary = true; From d97f7d3b890086cae07bcbd778c6bd813f16f941 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:40:49 -0700 Subject: [PATCH 165/265] raxml: 8.2.11 -> 8.2.12 (#41964) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/RAxML/versions. These checks were done: - built on NixOS - /nix/store/w8iy7fvdwhjw7zx1dkga3v56fz59s7r8-RAxML-8.2.12/bin/raxmlHPC-PTHREADS-SSE3 passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 8.2.12 with grep in /nix/store/w8iy7fvdwhjw7zx1dkga3v56fz59s7r8-RAxML-8.2.12 - directory tree listing: https://gist.github.com/8a2b70b299e53bfee9f18d2ab8cd5f9f - du listing: https://gist.github.com/02803409663f19671adc6be233a327fd --- pkgs/applications/science/biology/raxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index 0bac6c77804..efe19a4e2b6 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "RAxML"; - version = "8.2.11"; + version = "8.2.12"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "stamatak"; repo = "standard-${pname}"; rev = "v${version}"; - sha256 = "08fmqrr7y5a2fmmrgfz2p0hmn4mn71l5yspxfcwwsqbw6vmdfkhg"; + sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh"; }; buildInputs = if mpi then [ pkgs.openmpi ] else []; From b3052440f640ee2654bf4cbde2b0dd08d78c06d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:41:49 -0700 Subject: [PATCH 166/265] picard-tools: 2.18.5 -> 2.18.7 (#41975) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/picard-tools/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/siklhy9pl9xl9cq3nlqhln038554h72g-picard-tools-2.18.7/bin/picard had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 2.18.7 with grep in /nix/store/siklhy9pl9xl9cq3nlqhln038554h72g-picard-tools-2.18.7 - directory tree listing: https://gist.github.com/a49ed5f2ff312ce6180174183901e38f - du listing: https://gist.github.com/243f4d89d2100ef27d332e3562d5f173 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 555542b7631..830f4af514a 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.18.5"; + version = "2.18.7"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "1lk1qnwc2gwjh8js3rx4qayan5157an6yzxnhija6kqgrxv58f11"; + sha256 = "00p5wmd3kb7pr3yvsqz660fsk845dwgj76bllwjfrbiscjdyhy9f"; }; buildInputs = [ jre makeWrapper ]; From a35b6dac434ad128eea4a7015b801f92ae053806 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:43:27 -0700 Subject: [PATCH 167/265] arangodb: 3.3.9 -> 3.3.10 (#42057) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/arangodb/versions. These checks were done: - built on NixOS - /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/foxx-manager passed the binary check. - /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangobench passed the binary check. - /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangodump passed the binary check. - /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangoexport passed the binary check. - /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangoimp passed the binary check. - /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangorestore passed the binary check. - /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangosh passed the binary check. - /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangovpack passed the binary check. - /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arango-dfdb passed the binary check. - /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arango-init-database passed the binary check. - /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arango-secure-installation passed the binary check. - /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangod passed the binary check. - 12 of 12 passed binary check by having a zero exit code. - 0 of 12 passed binary check by having the new version present in output. - found 3.3.10 with grep in /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10 - directory tree listing: https://gist.github.com/8818b9d47b33b5c0025db3d2cf065186 - du listing: https://gist.github.com/3b134770993a508d79b2bf086d761531 --- pkgs/servers/nosql/arangodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 5d1723274cb..c330837cdbb 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.9"; + version = "3.3.10"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "1zr9byxlqd7s3rnmvdgv85mmk5xxjz0va1pj2gn6y28k569prcbs"; + sha256 = "0c0n681k2z73klb5inhfdy2qzkba681kzg01gwpc6qdnvya8mk9f"; }; buildInputs = [ From d9a1e79c7b0a472e8adaec4a545295fe132793ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:44:37 -0700 Subject: [PATCH 168/265] chirp: 20180606 -> 20180611 (#42039) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chirp-daily/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/b4iyklh8y10knkzrrw45dsz95hvs38mr-chirp-daily-20180611/bin/.chirpw-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/b4iyklh8y10knkzrrw45dsz95hvs38mr-chirp-daily-20180611/bin/chirpw had a zero exit code or showed the expected version - 0 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 20180611 with grep in /nix/store/b4iyklh8y10knkzrrw45dsz95hvs38mr-chirp-daily-20180611 - directory tree listing: https://gist.github.com/c4bf3ab0db022bdfe692715110e6c3d6 - du listing: https://gist.github.com/1c1987a895d93ba39651f4037e030aad --- pkgs/applications/misc/chirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 7004b247667..6dc7a5f7dd2 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20180606"; + version = "20180611"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "1v1s02675gyghhxasp4pxjrifkgshc82p99haxph1yzkq7gsf03w"; + sha256 = "1569gnbs4jb53n58wdkdjrxx9nrayljn5v0wqacn5zfr87s16zxf"; }; nativeBuildInputs = [ makeWrapper ]; From a81fba7595cfe4f96c2448a5eb3f6c5162ede9df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:45:22 -0700 Subject: [PATCH 169/265] forkstat: 0.02.02 -> 0.02.03 (#42016) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/forkstat/versions. These checks were done: - built on NixOS - /nix/store/i74h7m1lbmyxjgrkdyii68a4dhi2m2fz-forkstat-0.02.03/bin/forkstat passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.02.03 with grep in /nix/store/i74h7m1lbmyxjgrkdyii68a4dhi2m2fz-forkstat-0.02.03 - directory tree listing: https://gist.github.com/89b0404a0b74c11f7d41c06cf94d184a - du listing: https://gist.github.com/e13ac9907c46410b6a17fefb8f6977f3 --- pkgs/os-specific/linux/forkstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index bf7bc8a4546..bde2cbbafa6 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "forkstat-${version}"; - version = "0.02.02"; + version = "0.02.03"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz"; - sha256 = "02iqi4xjg2hl4paw88fz9jb88a9p4zprvq3g56cd7jwfx3vmw5a4"; + sha256 = "1dl95ijs9bs9s9i629bi88qmvxjl25ym742gc063bysbp8drban1"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' From b3110c46b962439c9d6c84aa8e4d7dc530e763a7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:45:57 -0700 Subject: [PATCH 170/265] libraw: 0.18.11 -> 0.18.12 (#42000) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libraw/versions. These checks were done: - built on NixOS - /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/raw-identify passed the binary check. - /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/unprocessed_raw passed the binary check. - /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/4channels passed the binary check. - /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/simple_dcraw passed the binary check. - /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/mem_image passed the binary check. - /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/dcraw_half passed the binary check. - /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/half_mt passed the binary check. - /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/multirender_test passed the binary check. - /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/postprocessing_benchmark passed the binary check. - /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/dcraw_emu passed the binary check. - 10 of 10 passed binary check by having a zero exit code. - 0 of 10 passed binary check by having the new version present in output. - found 0.18.12 with grep in /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12 - directory tree listing: https://gist.github.com/20e1b0e52e1c94011da90df577fa84e2 - du listing: https://gist.github.com/adb7f31a821d3bd4157e8003f58d47ce --- pkgs/development/libraries/libraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index d70a9fc29f5..3ce4b3f2d3f 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.18.11"; + version = "0.18.12"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "07a7k83hx7icahh6jaxfbd7pw5jjm5i11xcqjj31b28d1aj29xvw"; + sha256 = "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap"; }; outputs = [ "out" "lib" "dev" "doc" ]; From 8563f5067f0e5494ee242cbbb3e2374cc17441f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:46:33 -0700 Subject: [PATCH 171/265] chromedriver: 2.39 -> 2.40 (#42042) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chromedriver/versions. These checks were done: - built on NixOS - /nix/store/b62dsg9dibywkpx8yzfm08dbcdfh9i60-chromedriver-2.40/bin/chromedriver passed the binary check. - Warning: no invocation of /nix/store/b62dsg9dibywkpx8yzfm08dbcdfh9i60-chromedriver-2.40/bin/.chromedriver-wrapped had a zero exit code or showed the expected version - 1 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 2.40 with grep in /nix/store/b62dsg9dibywkpx8yzfm08dbcdfh9i60-chromedriver-2.40 - directory tree listing: https://gist.github.com/2beed7dbaa434f54d37a742a2c0e2662 - du listing: https://gist.github.com/8b1a61054a03382c346ba383ac79c163 --- pkgs/development/tools/selenium/chromedriver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index f140c1a7450..82724924a4a 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,7 +6,7 @@ let allSpecs = { "x86_64-linux" = { system = "linux64"; - sha256 = "1rkdlf9v5lciaq3yp7cp2vwmca612vngbcnz55ck76jgx6rknh3g"; + sha256 = "07b39j1glr53yxbbkkkkx12h8r44fybqkn4fd7s2lr1ysyq5vn1a"; }; "x86_64-darwin" = { @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.39"; + version = "2.40"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; From 09aa2457bd3b6633cc2c4e6c21e182322fa78d3c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:47:04 -0700 Subject: [PATCH 172/265] mlterm: 3.8.4 -> 3.8.6 (#41993) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mlterm/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6/bin/mlterm had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6/bin/mlfc had a zero exit code or showed the expected version - /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6/bin/mlcc passed the binary check. - /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6/bin/mlclient passed the binary check. - /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6/bin/mlclientx passed the binary check. - Warning: no invocation of /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6/bin/mlterm-fb had a zero exit code or showed the expected version - 3 of 6 passed binary check by having a zero exit code. - 0 of 6 passed binary check by having the new version present in output. - found 3.8.6 with grep in /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6 - directory tree listing: https://gist.github.com/917b0ce2af6e7d2a9baa6c66857143a5 - du listing: https://gist.github.com/7b0c64048e0913af1cabbed5885116b2 --- pkgs/applications/misc/mlterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 701e4b2e052..31793031dc1 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.8.4"; + version = "3.8.6"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "07ih7953pr1jr99rayjn57ba5a0cr3niqkmvy9n59lcc1qwcrwf9"; + sha256 = "06zylbinh84s9v79hrlvv44rd57z7kvgz9afbps3rjcbncxcmivd"; }; nativeBuildInputs = [ pkgconfig autoconf ]; From d412c2972ce745d50a7ef67b1f00aed107dc6fc1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:47:39 -0700 Subject: [PATCH 173/265] mcelog: 158 -> 159 (#41992) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mcelog/versions. These checks were done: - built on NixOS - /nix/store/cb40l2kslmy5lr78j30h74d1mbpa6bxv-mcelog-159/bin/mcelog passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 159 with grep in /nix/store/cb40l2kslmy5lr78j30h74d1mbpa6bxv-mcelog-159 - directory tree listing: https://gist.github.com/453a2e6f8b596debb0596272afaf34c1 - du listing: https://gist.github.com/57e4337775456719a1e299eee738068f --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 18e90f85b44..e5ee5e20294 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "158"; + version = "159"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "0hiyj626fv4awzqgf4wnxjkr68cfcllqpibw0ncnpkvk9rn96rqp"; + sha256 = "1w8y4igxi48r2d9s6g9fm1bgmsga94gfz6x0xaln6rhvbgi318xg"; }; postPatch = '' From 034b1bd1f9a38348ef7554fe4315bea8816a5f9a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:48:33 -0700 Subject: [PATCH 174/265] grantlee: 0.4.0 -> 0.5.1 (#42012) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/grantlee/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.5.1 with grep in /nix/store/6g40ly4agw1h9kvb3cl6yf0g3swi95fc-grantlee-0.5.1 - directory tree listing: https://gist.github.com/e74be5a3f1cab3f4f9f9a56612731410 - du listing: https://gist.github.com/6e697a1e258b3e9e42c164a437f319f2 --- pkgs/development/libraries/grantlee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 3944d2ecab6..9dde67b5c79 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qt4, cmake }: stdenv.mkDerivation rec { - name = "grantlee-0.4.0"; + name = "grantlee-0.5.1"; # Upstream download server has country code firewall, so I made a mirror. src = fetchurl { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { "http://downloads.grantlee.org/${name}.tar.gz" "http://www.loegria.net/grantlee/${name}.tar.gz" ]; - sha256 = "0gqdckxx45qmyixyz5d7ipcqq2dw26r71m2fpsrlnh4j2c9di8hk"; + sha256 = "1b501xbimizmbmysl1j5zgnp48qw0r2r7lhgmxvzhzlv9jzhj60r"; }; buildInputs = [ cmake qt4 ]; From fd8d570cc45edea190df88c80cbeabfa363f785b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:52:41 -0700 Subject: [PATCH 175/265] cppcms: 1.0.5 -> 1.2.1 (#42024) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cppcms/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/9rzm8kp5fc4w1n4iygff2fl9i9l47n83-cppcms-1.2.1/bin/cppcms_config_find_param had a zero exit code or showed the expected version - /nix/store/9rzm8kp5fc4w1n4iygff2fl9i9l47n83-cppcms-1.2.1/bin/cppcms_make_key passed the binary check. - Warning: no invocation of /nix/store/9rzm8kp5fc4w1n4iygff2fl9i9l47n83-cppcms-1.2.1/bin/cppcms_scale had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/9rzm8kp5fc4w1n4iygff2fl9i9l47n83-cppcms-1.2.1/bin/cppcms_tmpl_cc had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/9rzm8kp5fc4w1n4iygff2fl9i9l47n83-cppcms-1.2.1/bin/cppcms_run had a zero exit code or showed the expected version - 1 of 5 passed binary check by having a zero exit code. - 0 of 5 passed binary check by having the new version present in output. - found 1.2.1 with grep in /nix/store/9rzm8kp5fc4w1n4iygff2fl9i9l47n83-cppcms-1.2.1 - directory tree listing: https://gist.github.com/d1f2849fe9d35b02a9db07f7d396c6a7 - du listing: https://gist.github.com/f5c96329d8e59da59472edbaf149d83d --- pkgs/development/libraries/cppcms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index 6dc496d0e5a..a2493e55fb0 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cppcms-${version}"; - version = "1.0.5"; + version = "1.2.1"; src = fetchurl { url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; - sha256 = "0r8qyp102sq4lw8xhrjhan0dnslhsmxj4zs9jzlw75yagfbqbdl4"; + sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh"; }; enableParallelBuilding = true; From f6c0588c9752bdc2bbd694f68807af332a54e21b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:53:32 -0700 Subject: [PATCH 176/265] gzdoom: 3.3.2 -> 3.4.0 (#42011) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gzdoom/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/f4bpkw3bk3p8ca0vcxdi17hc5lm2r3jz-gzdoom-3.4.0/bin/gzdoom had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 3.4.0 with grep in /nix/store/f4bpkw3bk3p8ca0vcxdi17hc5lm2r3jz-gzdoom-3.4.0 - directory tree listing: https://gist.github.com/1d92d331e8c24929e998260ca9018ddb - du listing: https://gist.github.com/ba47c37ae7b73d3fb85a14b537b6c270 --- pkgs/games/gzdoom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 3964eefb9b3..4115dccf577 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "3.3.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "0zlkja0jcqi3s4iw5h076iwqxa3haradqksjnx9jxcbkvaw75p3k"; + sha256 = "09400w0xpw6sk593c0fr6m9qmgn6n5r1qdardizim6m0r5ki565i"; }; nativeBuildInputs = [ cmake makeWrapper ]; From 87baad7e4980683fda4603d636c65f4a3a6183cc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:56:22 -0700 Subject: [PATCH 177/265] jackett: 0.8.1014 -> 0.8.1070 (#42007) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions. These checks were done: - built on NixOS - /nix/store/a9gjyqrjq6gf7l9s16pipj77p7vb3qcm-jackett-0.8.1070/bin/Jackett passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.8.1070 with grep in /nix/store/a9gjyqrjq6gf7l9s16pipj77p7vb3qcm-jackett-0.8.1070 - directory tree listing: https://gist.github.com/ee9b1ad710c8226187cbc65aa3ab9042 - du listing: https://gist.github.com/c374f814801d76ac2507c5cb6fa5d405 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 5a87c423f4f..2190ae1afa2 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.1014"; + version = "0.8.1070"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0pvm9q8dpavkgsv180mw4y6555iixjv5s7mnmai9xzjspjpf264k"; + sha256 = "1xdmf1nvs1y8jhivmc0sw8cip925xrj8hg66z0awcymri6qnp6s9"; }; buildInputs = [ makeWrapper ]; From 072ad3a67f6bb8c4cfcea59c55a27160a141ed8a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 13:57:10 -0700 Subject: [PATCH 178/265] mate.mate-settings-daemon: 1.20.1 -> 1.20.3 (#41985) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-settings-daemon/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.20.3 with grep in /nix/store/gdndnz6arz8xpvppphm7jxsyfsm7nq2y-mate-settings-daemon-1.20.3 - directory tree listing: https://gist.github.com/2cdc92987c9492e4c99b02efde4fd349 - du listing: https://gist.github.com/071f4f1371037662c45c8ef83b163383 --- pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 490500fca69..cf63e3e69d9 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-settings-daemon-${version}"; - version = "1.20.1"; + version = "1.20.3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1hmc5qfr9yrvrlc1d2mmsqbhv0lhikbadaac18bxjynw9ff857iq"; + sha256 = "018f2yg4jd6hy0z7ks0s3jyjgpyi3vhd9j61951v5lb1x8ckzxhk"; }; nativeBuildInputs = [ From c99ba895aabe6826875265e6e98c263df1977acb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 14:00:20 -0700 Subject: [PATCH 179/265] folly: 2018.05.28.00 -> 2018.06.11.00 (#42014) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/folly/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 2018.06.11.00 with grep in /nix/store/3x7mc1n99r135i68xrax71bqcxpk6cbs-folly-2018.06.11.00 - directory tree listing: https://gist.github.com/cd02bb388dc7ae5c5b39289c8d8b3dc9 - du listing: https://gist.github.com/87c16407b769dd56c0d14d59d577da32 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 8abd42fe174..5dd96c22584 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.05.28.00"; + version = "2018.06.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "1n5zic8bgm4dfc7prjj3af2ipxalia6w7dk6w9pmrz1nkrpyd68c"; + sha256 = "005p2i36vxy2nppxqhdd4a5x58yx7zljb2diyqb820jygz2hfz8a"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; From 34b7abada4700122160b2a4edb3370e3edd925fc Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 18 Jun 2018 14:06:05 -0700 Subject: [PATCH 180/265] erlangR20: 20.3.2 -> 20.3.8 (#42170) --- pkgs/development/interpreters/erlang/R20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index 42aaed0b659..5cea1fd533f 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchurl }: mkDerivation rec { - version = "20.3.2"; - sha256 = "0cd7rz32cxghxb2q7g3p52sxbhwqn4pkjlf28hy1dms6q7f85zv1"; + version = "20.3.8"; + sha256 = "1griiszz1x34idmwi6234br7bqd1d7mimim63amjgi9ds79jh6jj"; prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' From 9f26d17f4a256d1e6d5152d7c49f5056f0dbb184 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 14:33:50 -0700 Subject: [PATCH 181/265] ace: 6.4.8 -> 6.5.0 (#42038) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ace/versions. These checks were done: - built on NixOS - /nix/store/4fh87988qw0bjzks9cy73ly1np8bkkn3-ace-6.5.0/bin/ace_gperf passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 6.5.0 with grep in /nix/store/4fh87988qw0bjzks9cy73ly1np8bkkn3-ace-6.5.0 - directory tree listing: https://gist.github.com/fa80e4b2dda282f3a3dc47a359985002 - du listing: https://gist.github.com/35c8e366656494975834ec145335d2f5 --- pkgs/development/libraries/ace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index e428b9a8c78..d1ddb17ba2f 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.4.8"; + version = "6.5.0"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "190cyfs2najph2yycyj8abzddwa8s4wx8lx38iv237plwfl2308g"; + sha256 = "0mzkyn7bjw3h8q22ajg765dflwxnsz6b20ql23gcbqkxfjvvdyyv"; }; enableParallelBuilding = true; From 1e0a2eafbff199b08641bdceadf30e7f0ef73f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20Bed=C5=91?= Date: Tue, 19 Jun 2018 07:50:06 +1000 Subject: [PATCH 182/265] singularity-tools: create mount points for image building (#41470) --- pkgs/build-support/singularity-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 60271e592a2..db2bef367e9 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -96,7 +96,7 @@ rec { echo creating singularity image.create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out echo importing - mkdir -p /var/singularity/mnt/container + mkdir -p /var/singularity/mnt/{container,final,overlay,session,source} tar -c . | singularity image.import $out ''); From b30d52905e618c6ae3e5ef0cea41777ee72be835 Mon Sep 17 00:00:00 2001 From: symphorien Date: Mon, 18 Jun 2018 22:03:48 +0000 Subject: [PATCH 183/265] tesseract: make tessdata a fix output derivation (#41227) the full tessdata is nearly a GB, so sparing a copy each time we need to rebuild tesseract without updating tessdata is worth it. --- .../graphics/tesseract/default.nix | 64 ++++++++++--------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index eb9a6383861..7940079d099 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,10 +1,38 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , leptonica, libpng, libtiff, icu, pango, opencl-headers - # Supported list of languages or `null' for all available languages , enableLanguages ? null +# if you want just a specific list of languages, optionally specify a hash +# to make tessdata a fixed output derivation. +, enableLanguagesHash ? (if enableLanguages == null # all languages + then "1h48xfzabhn0ldbx5ib67cp9607pr0zpblsy8z6fs4knn0zznfnw" + else null) }: +let tessdata = stdenv.mkDerivation ({ + name = "tessdata"; + src = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tessdata"; + rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d"; + # when updating don't forget to update the default value fo enableLanguagesHash + sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7"; + }; + buildCommand = '' + cd $src; + for lang in ${if enableLanguages==null then "*.traineddata" else stdenv.lib.concatMapStringsSep " " (x: x+".traineddata") enableLanguages} ; do + install -Dt $out/share/tessdata $src/$lang ; + done; + ''; + preferLocalBuild = true; + } // (stdenv.lib.optionalAttrs (enableLanguagesHash != null) { + # when a hash is given, we make this a fixed output derivation. + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = enableLanguagesHash; + })); +in + stdenv.mkDerivation rec { name = "tesseract-${version}"; version = "3.05.00"; @@ -16,41 +44,17 @@ stdenv.mkDerivation rec { sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30"; }; - tessdata = fetchFromGitHub { - owner = "tesseract-ocr"; - repo = "tessdata"; - rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d"; - sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7"; - }; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; LIBLEPT_HEADERSDIR = "${leptonica}/include"; - # Copy the .traineddata files of the languages specified in enableLanguages - # into `$out/share/tessdata' and check afterwards if copying was successful. - postInstall = let - mkArg = lang: "-iname ${stdenv.lib.escapeShellArg "${lang}.traineddata"}"; - mkFindArgs = stdenv.lib.concatMapStringsSep " -o " mkArg; - findLangArgs = if enableLanguages != null - then "\\( ${mkFindArgs enableLanguages} \\)" - else "-iname '*.traineddata'"; - in '' - numLangs="$(find "$tessdata" -mindepth 1 -maxdepth 1 -type f \ - ${findLangArgs} -exec cp -t "$out/share/tessdata" {} + -print | wc -l)" - - ${if enableLanguages != null then '' - expected=${toString (builtins.length enableLanguages)} - '' else '' - expected="$(ls -1 "$tessdata/"*.traineddata | wc -l)" - ''} - - if [ "$numLangs" -ne "$expected" ]; then - echo "Expected $expected languages, but $numLangs" \ - "were copied to \`$out/share/tessdata'" >&2 - exit 1 - fi + postInstall = '' + for i in ${tessdata}/share/tessdata/*; do + ln -s $i $out/share/tessdata; + done ''; meta = { From 7162eb196f3dee10dab0ee576956d168ff8810d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 15:16:58 -0700 Subject: [PATCH 184/265] c-blosc: 1.11.3 -> 1.14.3 (#42036) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/c-blosc/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.14.3 with grep in /nix/store/b83mqicbd21q8wm22qgp4jzm7cg90avw-c-blosc-1.14.3 - directory tree listing: https://gist.github.com/05bbb5f5c067b769556ba71848514220 - du listing: https://gist.github.com/cc182424092e94e9dd611e5300b7ac68 --- pkgs/development/libraries/c-blosc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 2f60fb7391f..3793b70de4b 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "c-blosc-${version}"; - version = "1.11.3"; + version = "1.14.3"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "18665lwszwbb48pxgisyxxjh92sr764hv6h7jw8zzsmzdkgzrmcw"; + sha256 = "051x2hh0yq1zhiyjmiarvc2radi59v03vzs2sa4hmgfhfaxcklld"; }; buildInputs = [ cmake ]; From 06ab7d8e5981eb33f7c4b4197420a9ea8f72c3d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 15:17:27 -0700 Subject: [PATCH 185/265] balsa: 2.5.5 -> 2.5.6 (#42054) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/balsa/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6/bin/balsa had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6/bin/balsa-ab had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6/bin/.balsa-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6/bin/.balsa-ab-wrapped had a zero exit code or showed the expected version - 0 of 4 passed binary check by having a zero exit code. - 0 of 4 passed binary check by having the new version present in output. - found 2.5.6 with grep in /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6 - directory tree listing: https://gist.github.com/8c38ffd6950508c78fde54f6f3530673 - du listing: https://gist.github.com/2156c87e8b84b7a84f6d6f4c4a7b8ebb --- pkgs/applications/networking/mailreaders/balsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index 762c6222b58..571a4895147 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "balsa-${version}"; - version = "2.5.5"; + version = "2.5.6"; src = fetchurl { url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2"; - sha256 = "0p4w81wvdxqhynkninzglsgqk6920x1zif2zmw8bml410lav2azz"; + sha256 = "17k6wcsl8gki7cskr3hhmfj6n54rha8ca3b6fzd8blsl5shsankx"; }; nativeBuildInputs = [ From 1f8f89d309eeebfe00b25c30cc9dca103f3d8b47 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Jun 2018 18:41:17 -0400 Subject: [PATCH 186/265] inkscape: work around ARGMAX limit This uses strictDeps to get our args passed to the linker low enough to enable building inkscape. With strictDeps we need to correctly use nativeBuildInputs to avoid an issue. --- pkgs/applications/graphics/inkscape/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 7eb9e7aa001..0d01a631358 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6"; }; + # Inkscape hits the ARGMAX when linking on macOS. It appears to be + # CMake’s ARGMAX check doesn’t offer enough padding for NIX_LDFLAGS. + # Setting strictDeps it avoids duplicating some dependencies so it + # will leave us under ARGMAX. + strictDeps = true; + unpackPhase = '' cp $src ${name}.tar.bz2 tar xvjf ${name}.tar.bz2 > /dev/null @@ -33,19 +39,19 @@ stdenv.mkDerivation rec { --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ]; buildInputs = [ perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext - makeWrapper gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace cmake python2Env + gsl poppler imagemagick libwpg librevenge + libvisio libcdr libexif potrace ]; enableParallelBuilding = true; postInstall = '' # Make sure PyXML modules can be found at run-time. - rm "$out/share/icons/hicolor/icon-theme.cache" + rm -f "$out/share/icons/hicolor/icon-theme.cache" '' + stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview From 085bf3e7b97bceed15dd0f02769da2b0e2b1817f Mon Sep 17 00:00:00 2001 From: Anders Riutta Date: Mon, 18 Jun 2018 16:02:17 -0700 Subject: [PATCH 187/265] docs: minor rewording for easier reading. --- doc/reviewing-contributions.xml | 48 ++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index b648691183b..673ff92d2c8 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -6,18 +6,22 @@ Reviewing contributions - The following section is a draft and reviewing policy is still being - discussed. + The following section is a draft, and the policy for reviewing is still being + discussed in issues such as #11166 + and #20836 + . - The nixpkgs projects receives a fairly high number of contributions via + The nixpkgs project receives a fairly high number of contributions via GitHub pull-requests. Reviewing and approving these is an important task and a way to contribute to the project. - The high change rate of nixpkgs make any pull request that is open for long - enough subject to conflicts that will require extra work from the submitter + The high change rate of nixpkgs makes any pull request that remains open for + too long subject to conflicts that will require extra work from the submitter or the merger. Reviewing pull requests in a timely manner and being responsive to the comments is the key to avoid these. GitHub provides sort filters that can be used to see the @@ -33,34 +37,34 @@ When reviewing a pull request, please always be nice and polite. Controversial changes can lead to controversial opinions, but it is important - to respect every community members and their work. + to respect every community member and their work. - GitHub provides reactions, they are a simple and quick way to provide + GitHub provides reactions as a simple and quick way to provide feedback to pull-requests or any comments. The thumb-down reaction should be - used with care and if possible accompanied with some explanations so the - submitter has directions to improve his contribution. + used with care and if possible accompanied with some explanation so the + submitter has directions to improve their contribution. - Pull-requests reviews should include a list of what has been reviewed in a + Pull-request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review. All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt - them to his liking. + them to their liking.
Package updates A package update is the most trivial and common type of pull-request. These - pull-requests mainly consist in updating the version part of the package + pull-requests mainly consist of updating the version part of the package name and the source hash. - It can happen that non trivial updates include patches or more complex + It can happen that non-trivial updates include patches or more complex changes. @@ -84,12 +88,12 @@ - Ensure that the package versioning is fitting the guidelines. + Ensure that the package versioning fits the guidelines. - Ensure that the commit text is fitting the guidelines. + Ensure that the commit text fits the guidelines. @@ -99,7 +103,7 @@ - mention-bot usually notify GitHub users based on the submitted changes, + mention-bot usually notifies GitHub users based on the submitted changes, but it can happen that it misses some of the package maintainers. @@ -107,13 +111,13 @@ - Ensure that the meta field contains correct information. + Ensure that the meta field information is correct. - License can change with version updates, so it should be checked to be - fitting upstream license. + License can change with version updates, so it should be checked to match + the upstream license. @@ -137,9 +141,9 @@ - Pull-requests are often targeted to the master or staging branch so - building the pull-request locally as it is submitted can trigger a large - amount of source builds. + Pull-requests are often targeted to the master or staging branch, and + building the pull-request locally when it is submitted can trigger + many source builds. It is possible to rebase the changes on nixos-unstable or From e8acdccfb16734319b07e3b8abb2daf38d240b2c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Jun 2018 18:42:50 -0500 Subject: [PATCH 188/265] range-v3: 0.3.5 -> 0.3.6 --- pkgs/development/libraries/range-v3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index bddda1dff55..cd981f8947a 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "range-v3-${version}"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; rev = version; - sha256 = "00bwm7n3wyf49xpr7zjhm08dzwx3lwibgafi6isvfls3dhk1m4kp"; + sha256 = "050h9pa57kd57l73njxpjb331snybddl29x2vpy5ycygvqiw8kcp"; }; nativeBuildInputs = [ cmake ]; From 34f57ac837349e9c1080f456098af53a1244c933 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Jun 2018 19:02:15 -0400 Subject: [PATCH 189/265] haskell: fix with-packages-wrapper in ghcjs Fixes #42032 Fixes #42070 --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 03f0a1dd0a3..7fda1d84e55 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -38,7 +38,7 @@ let ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; - libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghcCommand}-${ghc.version}"; + libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else if isGhcjs then "$out/libexec" else "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); From 7b6755d0031c5b779e89a5083d382c2570c29ca8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 17:26:52 -0700 Subject: [PATCH 190/265] xonsh: 0.6.6 -> 0.6.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xonsh/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/mb1vva59dwhq6yzqf98gkygljbzpdf37-xonsh-0.6.7/bin/xon.sh had a zero exit code or showed the expected version - /nix/store/mb1vva59dwhq6yzqf98gkygljbzpdf37-xonsh-0.6.7/bin/.xonsh-wrapped passed the binary check. - /nix/store/mb1vva59dwhq6yzqf98gkygljbzpdf37-xonsh-0.6.7/bin/xonsh passed the binary check. - 2 of 3 passed binary check by having a zero exit code. - 2 of 3 passed binary check by having the new version present in output. - found 0.6.7 with grep in /nix/store/mb1vva59dwhq6yzqf98gkygljbzpdf37-xonsh-0.6.7 - directory tree listing: https://gist.github.com/1d8694bad62c300714d6658deedc7ec0 - du listing: https://gist.github.com/2d8baff97fce82b5ba4ded4746d954a0 --- pkgs/shells/xonsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 0e4d23ffd5c..20f39f40a24 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "xonsh-${version}"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = version; - sha256= "09w7656qhqv3al52cl5lgzawvkbkpwjfnxyg0vyx0gbjs1hwiqjj"; + sha256= "0vxdfq1wpajfypdl5lhvib50mk742dk8y375zf3h057hjb0khhgw"; }; LC_ALL = "en_US.UTF-8"; From 95358db95645863ae758da5c74db4671d97fcf1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Tue, 19 Jun 2018 02:48:42 +0200 Subject: [PATCH 191/265] chromium: Abort build on gn warnings. Fixes #42189. Also fix such obsolete flags: * `use_gconf` was already known to become obsolete with Chromium 65 * `enable_hotwording` has been removed in upstream commit d693f0c7ab --- .../applications/networking/browsers/chromium/common.nix | 9 ++++----- .../networking/browsers/chromium/default.nix | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7803a530a92..dbfd4753416 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -22,7 +22,6 @@ # package customization , enableNaCl ? false -, enableHotwording ? false , enableWideVine ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null @@ -215,11 +214,8 @@ let proprietary_codecs = false; use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; - ## FIXME remove use_gconf after chromium 65 has become stable - use_gconf = gnomeSupport; use_gio = gnomeSupport; enable_nacl = enableNaCl; - enable_hotwording = enableHotwording; enable_widevine = enableWideVine; use_cups = cupsSupport; @@ -259,7 +255,10 @@ let libExecPath="${libExecPath}" python build/linux/unbundle/replace_gn_files.py \ --system-libraries ${toString gnSystemLibraries} - gn gen --args=${escapeShellArg gnFlags} out/Release + gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt + + # Fail if `gn gen` contains a WARNING. + grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 runHook postConfigure ''; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1458a181656..d2bb0425170 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -4,7 +4,6 @@ # package customization , channel ? "stable" , enableNaCl ? false -, enableHotwording ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true @@ -22,7 +21,7 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { - inherit enableNaCl enableHotwording gnomeSupport gnome + inherit enableNaCl gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport enableWideVine; }; From e7d3dee45b0068844c3dec351bfa5e30d9bae69b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 18:17:57 -0700 Subject: [PATCH 192/265] zerotierone: 1.2.8 -> 1.2.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/zerotierone/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/vd1y0dqqxk8dm0g7daw4anxfip7l97cm-zerotierone-1.2.10/bin/zerotier-idtool had a zero exit code or showed the expected version - /nix/store/vd1y0dqqxk8dm0g7daw4anxfip7l97cm-zerotierone-1.2.10/bin/zerotier-cli passed the binary check. - /nix/store/vd1y0dqqxk8dm0g7daw4anxfip7l97cm-zerotierone-1.2.10/bin/zerotier-one passed the binary check. - 2 of 3 passed binary check by having a zero exit code. - 2 of 3 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/87164b4a118f54881debe8986fa9d125 - du listing: https://gist.github.com/d1842159ba2f6272856b4451d5860bf7 --- pkgs/tools/networking/zerotierone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 43aa44809ed..bc8b1a5e0cd 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }: stdenv.mkDerivation rec { - version = "1.2.8"; + version = "1.2.10"; name = "zerotierone-${version}"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "0iwaaicf3wa1xi20k2w18q01d0dlmf5w9akf227bcsqdalsdzqh8"; + sha256 = "0mqckh51xj79z468n2683liczqracip36jvhfyd0fr3pwrbyqy8w"; }; preConfigure = '' From 59eca689ccc58861fb0937bcafcf6299d7cd4acb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Jun 2018 20:34:59 -0500 Subject: [PATCH 193/265] dmraid: fix w/musl (missing includes, -D_GNU_SOURCE) --- pkgs/os-specific/linux/dmraid/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index d39cadf4199..73ae6801bc2 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper }: +{ stdenv, fetchurl, fetchpatch, devicemapper }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc16"; @@ -8,10 +8,20 @@ stdenv.mkDerivation rec { sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq"; }; - patches = [ ./hardening-format.patch ]; + patches = [ ./hardening-format.patch ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/006-musl-libc.patch"; + sha256 = "1j8xda0fpz8lxjxnqdidy7qb866qrzwpbca56yjdg6vf4x21hx6w"; + stripLen = 2; + extraPrefix = "1.0.0.rc16/"; + }) + ]; postPatch = '' sed -i 's/\[\[[^]]*\]\]/[ "''$''${n##*.}" = "so" ]/' */lib/Makefile.in + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE" ''; preConfigure = "cd */"; From d316ca55a8f8af0e3c55d76d1ab9f62ac9885c10 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 21:08:50 -0700 Subject: [PATCH 194/265] vips: 8.6.3 -> 8.6.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vips/versions. These checks were done: - built on NixOS - /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vips passed the binary check. - /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsedit passed the binary check. - /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsthumbnail passed the binary check. - /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsheader passed the binary check. - Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/light_correct had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/shrink_width had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/batch_image_convert had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/batch_rubber_sheet had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/batch_crop had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsprofile had a zero exit code or showed the expected version - /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vips-8.6 passed the binary check. - 5 of 11 passed binary check by having a zero exit code. - 0 of 11 passed binary check by having the new version present in output. - found 8.6.4 with grep in /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4 - directory tree listing: https://gist.github.com/3d47ce9f75e2a1d701b3089ffa679618 - du listing: https://gist.github.com/b6aa67c89ec9bb55f45e21ae98e82fdc --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index d1dfe7afbf8..da63cb58a55 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.6.3"; + version = "8.6.4"; src = fetchurl { url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz"; - sha256 = "14h9w61gaimldmqaym0zhf9fkxjj1pkd5lhglhs6pxphynwxnnpq"; + sha256 = "1x4ai997yfl4155r4k3m5fa5hj3030c4abi5g49kfarbr60a0ca6"; }; buildInputs = From 08691d0515a44097fcaf27f59d002805afd0e105 Mon Sep 17 00:00:00 2001 From: Emily Ann Ediger Date: Mon, 18 Jun 2018 23:54:45 -0500 Subject: [PATCH 195/265] Grub: default is signed int. Fixes #42152 --- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 2e497ff9f2c..ee07d8657ef 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -386,7 +386,7 @@ in default = mkOption { default = 0; - type = types.int; + type = types.str; description = '' Index of the default menu item to be booted. ''; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 872261d0edf..d1ff6e6bf52 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -54,7 +54,7 @@ my $splashImage = get("splashImage"); my $configurationLimit = int(get("configurationLimit")); my $copyKernels = get("copyKernels") eq "true"; my $timeout = int(get("timeout")); -my $defaultEntry = int(get("default")); +my $defaultEntry = get("default"); my $fsIdentifier = get("fsIdentifier"); my $grubEfi = get("grubEfi"); my $grubTargetEfi = get("grubTargetEfi"); From 21a7a98fa603ffa3ff203f99b182d8b80403b8a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 22:26:15 -0700 Subject: [PATCH 196/265] spectrojack: 0.4 -> 0.4.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/spectrojack/versions. These checks were done: - built on NixOS - /nix/store/vc60bssjlz3xpkd8mv3pvq6ymnida0d3-spectrojack-0.4.1/bin/spectrojack passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.4.1 with grep in /nix/store/vc60bssjlz3xpkd8mv3pvq6ymnida0d3-spectrojack-0.4.1 - directory tree listing: https://gist.github.com/edadad9b5269d1184d20fd2bc9796eb7 - du listing: https://gist.github.com/481859872810a39dd7668a81c4162d6e --- pkgs/applications/audio/spectrojack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index 86eefc39556..6614e370224 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "spectrojack-${version}"; - version = "0.4"; + version = "0.4.1"; src = fetchurl { url = "http://sed.free.fr/spectrojack/${name}.tar.gz"; - sha256 = "0p5aa55hnazv5djw0431mza068h7mjkb9pnglxfpqkx5z0czisdx"; + sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjack2 fftwFloat gtk2 ]; From a597c0de06985ae25216535d085391ed85855a08 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 22:44:18 -0700 Subject: [PATCH 197/265] uptimed: 0.4.0 -> 0.4.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/uptimed/versions. These checks were done: - built on NixOS - /nix/store/3g4ks4j5qpbmaz77h94cq00rb09bw4nx-uptimed-0.4.1/bin/uprecords passed the binary check. - /nix/store/3g4ks4j5qpbmaz77h94cq00rb09bw4nx-uptimed-0.4.1/bin/uptimed passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 0.4.1 with grep in /nix/store/3g4ks4j5qpbmaz77h94cq00rb09bw4nx-uptimed-0.4.1 - directory tree listing: https://gist.github.com/e0050389ab1f978da6cea6fdba7a6c1b - du listing: https://gist.github.com/8ad3f0b88db5b50f78bfff19c91cee6b --- pkgs/tools/system/uptimed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index 58e194d38b9..849baa7159a 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "uptimed-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { - sha256 = "0h3192angfiv01bjk3f3nd2fmjic37cl72pvmr556n0wy3cfybas"; + sha256 = "0hqs7n3agayckwdgwadzw5shpdh4h1inqgvp4zr5fi324pj5x80j"; rev = "v${version}"; repo = "uptimed"; owner = "rpodgorny"; From 2db31b6b660191c85eb9eda1841815879cbe9151 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 23:13:12 -0700 Subject: [PATCH 198/265] redis: 4.0.9 -> 4.0.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/redis/versions. These checks were done: - built on NixOS - /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-sentinel passed the binary check. - /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-server passed the binary check. - /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-benchmark passed the binary check. - /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-cli passed the binary check. - Warning: no invocation of /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-check-rdb had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-check-aof had a zero exit code or showed the expected version - 4 of 6 passed binary check by having a zero exit code. - 1 of 6 passed binary check by having the new version present in output. - found 4.0.10 with grep in /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10 - directory tree listing: https://gist.github.com/a3e7b3964e29e1b8f0cfe9feca21635a - du listing: https://gist.github.com/be5306dea5e04998bf4b962ab9c0de8d --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 07489b62728..4980a6fb2bf 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.9"; + version = "4.0.10"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "0465bv6yxnwmas3wzg07vmrprv2pxhnr56hn5pxrybwf66y76kyz"; + sha256 = "194cydhv3hf4v95ifvjvsqrs4jn3ffrkg5lvxj5d3y04lwsp9dhx"; }; buildInputs = [ lua ]; From eb196922ced75b20db933e52ef8deb36003e92e1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 23:30:22 -0700 Subject: [PATCH 199/265] riot-web: 0.15.4 -> 0.15.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/riot-web/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.15.5 with grep in /nix/store/p5phic74phlnz8zyrfdvkq6qyacbjfdh-riot-web-0.15.5 - directory tree listing: https://gist.github.com/2dfaa31736d9687934c557f92066d007 - du listing: https://gist.github.com/f769d44c305628e76a52b8d63351b060 --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 822080df10b..9111fa59c29 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.15.4"; + version = "0.15.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1c0b9717xmzvzzxj006hqxafvcpvnnrsifxjnbxxla58jmnwr9v5"; + sha256 = "04sij99njkiiwc1q23gwa8z6h4z0riw6yb9z3ds7v2qiyi4sshdz"; }; installPhase = '' From 49eae144e6735cdeb23aa227bcfb2e7af59cfeb0 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Tue, 19 Jun 2018 01:51:56 -0500 Subject: [PATCH 200/265] snes9x-gtk: Install normally --- pkgs/misc/emulators/snes9x-gtk/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index e7627130629..09e3fb91324 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, SDL2, zlib -, gtk3, libxml2, libXv, epoxy, minizip, portaudio }: +{ stdenv, fetchFromGitHub, autoreconfHook, wrapGAppsHook, intltool, pkgconfig +, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }: stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook wrapGAppsHook intltool pkgconfig ]; buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip portaudio ]; preAutoreconf = '' @@ -21,11 +21,9 @@ stdenv.mkDerivation rec { intltoolize ''; - installPhase = "install -Dt $out/bin snes9x-gtk"; - meta = with stdenv.lib; { homepage = "http://www.snes9x.com"; - description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator"; + description = "Super Nintendo Entertainment System (SNES) emulator"; longDescription = '' Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) From ae04fb01f8867c112fdbb7334de546875c31e117 Mon Sep 17 00:00:00 2001 From: Emily Ann Ediger Date: Tue, 19 Jun 2018 01:59:21 -0500 Subject: [PATCH 201/265] set default to type.str --- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index ee07d8657ef..f1da2f41b5c 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -385,7 +385,7 @@ in }; default = mkOption { - default = 0; + default = "0"; type = types.str; description = '' Index of the default menu item to be booted. From 933f53eabb0f8b6f78b5b4ac6ae42e23c56335dd Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Tue, 19 Jun 2018 02:12:41 -0500 Subject: [PATCH 202/265] mgba: Add desktop file --- pkgs/misc/emulators/mgba/default.nix | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 755e2a2d72b..7fb804d31e4 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,7 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cmake, libzip, epoxy, ffmpeg -, imagemagick, SDL2, qtbase, qtmultimedia, qttools, libedit, minizip }: +{ stdenv, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper, pkgconfig +, cmake, epoxy, libzip, ffmpeg, imagemagick, SDL2, qtbase, qtmultimedia, libedit +, qttools, minizip }: -stdenv.mkDerivation rec { +let + desktopItem = makeDesktopItem { + name = "mgba"; + exec = "mgba-qt"; + icon = "mgba"; + comment = "A Game Boy Advance Emulator"; + desktopName = "mgba"; + genericName = "Game Boy Advance Emulator"; + categories = "Game;Emulator;"; + startupNotify = "false"; + }; +in stdenv.mkDerivation rec { name = "mgba-${version}"; version = "0.6.3"; @@ -13,7 +25,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ makeWrapper pkgconfig cmake ]; buildInputs = [ libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia libedit minizip @@ -25,6 +37,12 @@ stdenv.mkDerivation rec { sha256 = "0j334v8wf594kg8s1hngmh58wv1pi003z8avy6fjhj5qpjmbbavh"; })]; + postInstall = '' + cp -r ${desktopItem}/share/applications $out/share + wrapProgram $out/bin/mgba-qt --suffix QT_PLUGIN_PATH : \ + ${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; + meta = with stdenv.lib; { homepage = https://mgba.io; description = "A modern GBA emulator with a focus on accuracy"; From c89b6f47a739f02f08a9441bd3628463fde3f4e2 Mon Sep 17 00:00:00 2001 From: rys ostrovid Date: Tue, 19 Jun 2018 10:09:20 +0200 Subject: [PATCH 203/265] vym: 2.2.4 -> 2.6.11 (#42186) --- pkgs/applications/misc/vym/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index e06242f7a02..48818ca3b8b 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, qt4, qmake4Hook }: +{ stdenv, fetchurl, pkgconfig, qmake, qtsvg }: stdenv.mkDerivation rec { name = "vym-${version}"; - version = "2.2.4"; + version = "2.6.11"; src = fetchurl { - url = "mirror://sourceforge/project/vym/${version}/${name}.tar.bz2"; - sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs"; + url = "mirror://sourceforge/project/vym/2.6.0/${name}.tar.bz2"; + sha256 = "1yznlb47jahd662a2blgh1ccwpl5dp5rjz9chsxjzhj3vbkzx3nl"; }; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ qt4 qmake4Hook ]; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ qtsvg ]; meta = with stdenv.lib; { description = "A mind-mapping software"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efe4b9f7464..fd778deea95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18590,7 +18590,7 @@ with pkgs; vwm = callPackage ../applications/window-managers/vwm { }; - vym = callPackage ../applications/misc/vym { }; + vym = qt5.callPackage ../applications/misc/vym { }; w3m = callPackage ../applications/networking/browsers/w3m { graphicsSupport = !stdenv.isDarwin; From ac0136509ce775b5d14bd2de0cf010f6c1bdc47e Mon Sep 17 00:00:00 2001 From: Emily Ann Ediger Date: Tue, 19 Jun 2018 04:05:50 -0500 Subject: [PATCH 204/265] added suggestion to support both str and int --- nixos/modules/system/boot/loader/grub/grub.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index f1da2f41b5c..42da6585722 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -386,7 +386,8 @@ in default = mkOption { default = "0"; - type = types.str; + type = types.either types.int types.str; + apply = toString; description = '' Index of the default menu item to be booted. ''; From fd2043588d0fa4fcf4c7b74315b004add16d0e1e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 19 Jun 2018 04:08:09 -0500 Subject: [PATCH 205/265] tectonic: 0.1.7 -> 0.1.8 --- pkgs/tools/typesetting/tectonic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index f3f0a60b480..8ce2a6b0aa3 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { name = "tectonic-${version}"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "v${version}"; - sha256 = "007l0l9xnyayiqiap22zlsp8l9afdw803064cj8inr3q7ckzfcpb"; + sha256 = "1bm3s2zkyy44xrc804c65hrbc6ixzcr95na671b0dannjrikrx1x"; }; - cargoSha256 = "0kjy9zrjlrlkr2il62nz35hm1nndyym9dbnas43hzz7y8hdf859k"; + cargoSha256 = "1pyaw72h85ydq794mpgfjfq7dcq3a1dg4infh770swfaycyll6h6"; nativeBuildInputs = [ pkgconfig ]; From d2f623d35e19a976d67907bbf6acf817ff68a521 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 19 Jun 2018 11:28:13 +0200 Subject: [PATCH 206/265] avidemux: 2.7.0 -> 2.7.1 The current version of `avidemux` (v2.7.0) breaks on master (see https://hydra.nixos.org/build/75993794), the 18.03 build remains fine (https://hydra.nixos.org/build/75935027). The following changes have been applied: * `glibc` compat patch is obsolete as it landed in upstream. * Fixed QT_PLUGIN_PATH for QT binaries to avoid errors because of missing plugins like this: ``` qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in "" This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem. [1] 20081 abort /nix/store/rjwxc6ih15zwvvy71ss8bvnh56ibfbmj-avidemux-2.7.1/bin/avidemux3_qt5 ``` --- pkgs/applications/video/avidemux/default.nix | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 991842ba0dc..b36147009a6 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, cmake, pkgconfig, lndir +{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi , makeWrapper, libXext, libGLU, qttools, qtbase @@ -25,21 +25,16 @@ assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { name = "avidemux-${version}"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy"; + sha256 = "15g9h791qbnmycabbbl7s2b3n3xpvygm88qrfk35g2cw6957ik9w"; }; patches = [ ./dynamic_install_dir.patch ./bootstrap_logging.patch - # glibc 2.27 compat - (fetchpatch { - url = https://github.com/mean00/avidemux2/commit/afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d.patch; - sha256 = "0mf8vpfdqybziqsfyvxwcdm3zsmnp64293icinhvfpq9xp5b6vn6"; - }) ]; nativeBuildInputs = [ yasm cmake pkgconfig ]; @@ -58,7 +53,10 @@ stdenv.mkDerivation rec { ++ lib.optionals withQT [ qttools qtbase ] ++ lib.optional withVPX libvpx; - buildCommand = '' + buildCommand = let + qtVersion = "5.${stdenv.lib.versions.minor qtbase.version}"; + wrapProgram = f: "wrapProgram ${f} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib"; + in '' unpackPhase cd "$sourceRoot" patchPhase @@ -73,11 +71,13 @@ stdenv.mkDerivation rec { mkdir $out cp -R install/usr/* $out - for i in $out/bin/*; do - wrapProgram $i \ - --set ADM_ROOT_DIR $out \ - --prefix LD_LIBRARY_PATH ":" "${libXext}/lib" - done + ${wrapProgram "$out/bin/avidemux3_cli"} + + ${stdenv.lib.optionalString withQT '' + ${wrapProgram "$out/bin/avidemux3_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins + ${wrapProgram "$out/bin/avidemux3_jobs_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins + ''} + ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux" fixupPhase From 3d29c1ae6844c3dcf9a00c1673a530adc49a8dd7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 03:27:58 -0700 Subject: [PATCH 207/265] pkcs11helper: 1.23 -> 1.24 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pkcs11-helper/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.24 with grep in /nix/store/vi1vlsjsmz56rdrk2zyga4jbvh5cqfcd-pkcs11-helper-1.24 - directory tree listing: https://gist.github.com/fa82ab8b06f566b9c980c0d49e7a4800 - du listing: https://gist.github.com/d8cd7f6fba6e45564b5a6cb4c6048428 --- pkgs/development/libraries/pkcs11helper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 0c5d5e22e69..3e69bbde75a 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pkcs11-helper-${version}"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${name}"; - sha256 = "1m3fp3v6c903cs36bvvg0h65p1sdamsmzy13ww0zyvplcycarz0n"; + sha256 = "07ij6i76abf6bdhczsq1wkln3q0y0wkfbsi882vj3gl2wvxh0d1i"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From efd91a0a5851e8361b01dd28f2a4b9e23790f35f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 03:53:25 -0700 Subject: [PATCH 208/265] offlineimap: 7.2.0 -> 7.2.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/offlineimap/versions. These checks were done: - built on NixOS - /nix/store/i64ljqy7csw76jqan3d4r1ayqmdbpgiq-offlineimap-7.2.1/bin/.offlineimap-wrapped passed the binary check. - /nix/store/i64ljqy7csw76jqan3d4r1ayqmdbpgiq-offlineimap-7.2.1/bin/offlineimap passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 2 of 2 passed binary check by having the new version present in output. - found 7.2.1 with grep in /nix/store/i64ljqy7csw76jqan3d4r1ayqmdbpgiq-offlineimap-7.2.1 - directory tree listing: https://gist.github.com/db353c3cafac9aac9a95c6c5e39c8d32 - du listing: https://gist.github.com/87553df2ee20c8d6f60e17381d46f676 --- pkgs/tools/networking/offlineimap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index c1d00dba2b4..c7d15318698 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, libxslt, docbook_xml_xslt }: pythonPackages.buildPythonApplication rec { - version = "7.2.0"; + version = "7.2.1"; name = "offlineimap-${version}"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "0xyvqgy36n0bb41c4ffldyrcnaja5gpwx2ngbnk3qs22ldb2n1sb"; + sha256 = "1m5i74baazwazqp98ssma968rnwzfl1nywb7icf0swc8447ps97q"; }; postPatch = '' From 8dcb7c713dfd57e4f5f05c3ac031002b3394c7e1 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Tue, 19 Jun 2018 21:41:26 +0900 Subject: [PATCH 209/265] lf: available on the other UNIX-like platforms --- pkgs/tools/misc/lf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 11759cc6d40..3089d6cace9 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -38,7 +38,7 @@ buildGoPackage rec { ''; homepage = https://godoc.org/github.com/gokcehan/lf; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; }; } From a5cd4b26851734a6d49b097d8d4da69b9b51d4a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 19 Jun 2018 15:02:23 +0200 Subject: [PATCH 210/265] =?UTF-8?q?deepin.deepin-terminal:=202.9.2=20?= =?UTF-8?q?=E2=86=92=203.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/deepin/deepin-terminal/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 8e64fa69805..a72bae4384a 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,32 +1,31 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; - version = "2.9.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "1pmg1acs44c30hz9rpr6x1l6lyvlylc2pz5lv4ai0rhv37n51yn2"; + sha256 = "11f2yc0fj05lwhgvdrbrs8xsdm7qgp6wb5wd1f9iyc5nxn7ccl1r"; }; patches = [ # Do not build vendored zssh and vte (fetchurl { name = "remove-vendor.patch"; - url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=5baa756e8e6ac8ce43fb122fce270756cc55086c; - sha256 = "0zrq004malphpy7xv5z502bpq30ybyj1rr4hlq4k5m4fpk29dlw6"; + url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=de701614c19c273b98b60fd6790795ff7d8a157e; + sha256 = "0g7hhvr7ay9g0cgc6qqvzhbcwvbzvrrilbn8w46ypfzj7w5hlkqv"; }) ]; postPatch = '' - substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh" ''; nativeBuildInputs = [ - pkgconfig vala cmake gettext + pkgconfig vala cmake ninja gettext # For setup hook gobjectIntrospection ]; From c3e0592f20e4cb76d93decc0b254e42dfd4450b4 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Tue, 19 Jun 2018 19:34:18 +0900 Subject: [PATCH 211/265] esh: init at 0.1.1 --- pkgs/tools/text/esh/default.nix | 40 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/text/esh/default.nix diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix new file mode 100644 index 00000000000..2ca515358a6 --- /dev/null +++ b/pkgs/tools/text/esh/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, asciidoctor, gawk, gnused }: + +stdenv.mkDerivation rec { + name = "esh-${version}"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "jirutka"; + repo = "esh"; + rev = "v${version}"; + sha256 = "1ddaji5nplf1dyvgkrhqjy8m5djaycqcfhjv30yprj1avjymlj6w"; + }; + + nativeBuildInputs = [ asciidoctor ]; + + buildInputs = [ gawk gnused ]; + + makeFlags = [ "prefix=$(out)" "DESTDIR=" ]; + + postPatch = '' + patchShebangs . + substituteInPlace esh \ + --replace '"/bin/sh"' '"${stdenv.shell}"' \ + --replace '"awk"' '"${gawk}/bin/awk"' \ + --replace 'sed' '${gnused}/bin/sed' + substituteInPlace tests/test-dump.exp \ + --replace '#!/bin/sh' '#!${stdenv.shell}' + ''; + + doCheck = true; + checkTarget = "test"; + + meta = with stdenv.lib; { + description = "Simple templating engine based on shell"; + homepage = https://github.com/jirutka/esh; + license = licenses.mit; + maintainers = with maintainers; [ mnacamura ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd778deea95..bef16a50667 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -645,6 +645,8 @@ with pkgs; enpass = callPackage ../tools/security/enpass { }; + esh = callPackage ../tools/text/esh { }; + ezstream = callPackage ../tools/audio/ezstream { }; genymotion = callPackage ../development/mobile/genymotion { }; From f6af93f44e06ea45d78c560012beb57653427580 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 19 Jun 2018 15:24:51 +0200 Subject: [PATCH 212/265] grafana: 5.1.3 -> 5.1.4 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 646401ce02f..5e3d118b2f3 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.1.3"; + version = "5.1.4"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "09q4xrh4j02b8nrkskndahs039rhmcs8hrcgvnnpg36qqyvs1x0g"; + sha256 = "09bpijjm7cm4p5ci04ihq55fy5zwpdcld791vdpk6m91ixpab2zc"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "131dxpjnzhsjh6c0fp48jhxf5piy6wh287pfm2s7pm4ywq9m0q46"; + sha256 = "0ygfq4my3bdqs942l31w0695a6rwyrwq7jr23g0vgaqadamgbgkg"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; From f077cde5a208bf7c85ac8043187197a0e4d62a52 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 19 Jun 2018 09:57:39 -0400 Subject: [PATCH 213/265] wakatime: 10.1.0 -> 10.2.1 --- pkgs/tools/misc/wakatime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 9899e38c854..6d71a407239 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { name = "wakatime-${version}"; - version = "10.1.0"; + version = "10.2.1"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "0mq1b5hwm03jz1mhlfiwi8k5r6556r1nfv9h7qs3y32zrj9mvifv"; + sha256 = "14b87x6pd80qdf2dxj9dd53k3a61i793cnrm4nqycn3d7vq2akqx"; }; # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt From d21653f465f5a9d9123ac4126fd0560cf74ab0cd Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 19 Jun 2018 15:40:37 +0200 Subject: [PATCH 214/265] haskell generic-buider: nativeGhc should be a depsBuildBuild It targets the build platform. --- pkgs/development/haskell-modules/generic-builder.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7f3ddc48103..52df573d222 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -179,7 +179,8 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; - nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ + depsBuildBuild = [ nativeGhc ]; + nativeBuildInputs = [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; @@ -242,7 +243,7 @@ stdenv.mkDerivation ({ inherit src; - inherit nativeBuildInputs; + inherit depsBuildBuild nativeBuildInputs; buildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs; propagatedBuildInputs = optionals hasActiveLibrary propagatedBuildInputs; From 37eca93aab86a132d5c29f2d4cbe37f6493f03b7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 19 Jun 2018 10:52:10 -0400 Subject: [PATCH 215/265] haskell generic-builder: Only pass --extra-* for host deps --- .../haskell-modules/generic-builder.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 52df573d222..52128d3fc5d 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -211,18 +211,6 @@ let cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf ${packageConfDir}/ continue fi - if [ -d "$p/include" ]; then - configureFlags+=" --extra-include-dirs=$p/include" - fi - if [ -d "$p/lib" ]; then - configureFlags+=" --extra-lib-dirs=$p/lib" - fi - '' - # It is not clear why --extra-framework-dirs does work fine on Linux - + optionalString (!buildPlatform.isDarwin || versionAtLeast nativeGhc.version "8.0") '' - if [[ -d "$p/Library/Frameworks" ]]; then - configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks" - fi ''; in @@ -287,6 +275,19 @@ stdenv.mkDerivation ({ + '' for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do ${buildPkgDb ghc.name "$packageConfDir"} + if [ -d "$p/include" ]; then + configureFlags+=" --extra-include-dirs=$p/include" + fi + if [ -d "$p/lib" ]; then + configureFlags+=" --extra-lib-dirs=$p/lib" + fi + '' + # It is not clear why --extra-framework-dirs does work fine on Linux + + optionalString (!buildPlatform.isDarwin || versionAtLeast nativeGhc.version "8.0") '' + if [[ -d "$p/Library/Frameworks" ]]; then + configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks" + fi + '' + '' done '' # only use the links hack if we're actually building dylibs. otherwise, the From 07e8402ed40206a45d058a227d346a757949c5ee Mon Sep 17 00:00:00 2001 From: qolii <36613499+qolii@users.noreply.github.com> Date: Tue, 19 Jun 2018 15:07:53 +0000 Subject: [PATCH 216/265] linux-hardkernel: Init at 4.14.47-139 (#41782) --- .../linux/kernel/linux-hardkernel-4.14.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 12 ++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix new file mode 100644 index 00000000000..6855c5c5f90 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: + +buildLinux (args // rec { + version = "4.14.47-139"; + + # modDirVersion needs to be x.y.z. + modDirVersion = "4.14.47"; + + # branchVersion needs to be x.y. + extraMeta.branch = "4.14"; + + src = fetchFromGitHub { + owner = "hardkernel"; + repo = "linux"; + rev = version; + sha256 = "0jjgrmvi1h8zs8snnvghnjd422yfmn7jv9y1n7xikmfv4nvwqrkv"; + }; + +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd778deea95..6dcb6c54e85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13653,6 +13653,13 @@ with pkgs; ]; }; + linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.modinst_arg_list_too_long + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -13876,6 +13883,11 @@ with pkgs; linuxPackages_samus_latest = linuxPackages_samus_4_12; linux_samus_latest = linuxPackages_samus_latest.kernel; + # Hardkernel (Odroid) kernels. + linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); + linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14; + linux_hardkernel_latest = linuxPackages_hardkernel_latest.kernel; + # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); From b75e083c69b9f403706bb4388811abf798d77332 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 21:16:28 -0700 Subject: [PATCH 217/265] verilator: 3.922 -> 3.924 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/verilator/versions. These checks were done: - built on NixOS - /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924/bin/verilator_bin passed the binary check. - /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924/bin/verilator_bin_dbg passed the binary check. - /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924/bin/verilator_coverage_bin_dbg passed the binary check. - /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924/bin/verilator passed the binary check. - /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924/bin/verilator_coverage passed the binary check. - Warning: no invocation of /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924/bin/verilator_profcfunc had a zero exit code or showed the expected version - 5 of 6 passed binary check by having a zero exit code. - 0 of 6 passed binary check by having the new version present in output. - found 3.924 with grep in /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924 - directory tree listing: https://gist.github.com/eebd214973454154b716fc6a9556b922 - du listing: https://gist.github.com/cb78abec038b5abdae8004ea1edcefc0 --- pkgs/applications/science/electronics/verilator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 75e99dcf659..205d56f3fc8 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "3.922"; + version = "3.924"; src = fetchurl { url = "http://www.veripool.org/ftp/${name}.tgz"; - sha256 = "1srv8d1w3mwblfydznl3frswg98i3dkylx8x18c4807wsjk8vflg"; + sha256 = "0xarifraycmdzjxs0lscpwvrwr59z84p8g8dkyjssc463dqikjvx"; }; enableParallelBuilding = true; From c2867828bbc5a49b43f24e5732e622dfe3cf5de2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 08:39:26 -0700 Subject: [PATCH 218/265] libressl: 2.7.3 -> 2.7.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libressl/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/2sj5bh1lwzls0vc31v2fhxaw648n0i9v-libressl-2.7.4-bin/bin/ocspcheck had a zero exit code or showed the expected version - /nix/store/2sj5bh1lwzls0vc31v2fhxaw648n0i9v-libressl-2.7.4-bin/bin/openssl passed the binary check. - 1 of 2 passed binary check by having a zero exit code. - 1 of 2 passed binary check by having the new version present in output. - found 2.7.4 with grep in /nix/store/2sj5bh1lwzls0vc31v2fhxaw648n0i9v-libressl-2.7.4-bin - directory tree listing: https://gist.github.com/e28b9d47b987d9408427c7ec06e3b9fb - du listing: https://gist.github.com/0d61c26c272780f10c5ce5359fb79bc7 --- pkgs/development/libraries/libressl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 5dfb61f172f..6fccc918c3c 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -45,7 +45,7 @@ in { }; libressl_2_7 = generic { - version = "2.7.3"; - sha256 = "1597kj9jy3jyw52ys19sd4blg2gkam5q0rqdxbnrnvnyw67hviqn"; + version = "2.7.4"; + sha256 = "19kxa5i97q7p6rrps9qm0nd8zqhdjvzx02j72400c73cl2nryfhy"; }; } From 96a2217e922e61ed83b45a5a2eaeb58e70f644fc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 19 Jun 2018 18:05:17 +0200 Subject: [PATCH 219/265] libressl_2_5: remove, unmaintained --- pkgs/development/libraries/libressl/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 6fccc918c3c..d7a9b7af64b 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -34,11 +34,6 @@ let in { - libressl_2_5 = generic { - version = "2.5.5"; - sha256 = "1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5"; - }; - libressl_2_6 = generic { version = "2.6.4"; sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3"; From 26501a9bf9555c405b2d54c50b625bc78ed2cda0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 19 Jun 2018 18:06:59 +0200 Subject: [PATCH 220/265] libressl_2_6: 2.6.4 -> 2.6.5 --- pkgs/development/libraries/libressl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index d7a9b7af64b..a29257af4c3 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -35,8 +35,8 @@ let in { libressl_2_6 = generic { - version = "2.6.4"; - sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3"; + version = "2.6.5"; + sha256 = "0anx9nlgixdjn811zclim85jm5yxmxwycj71ix27rlhr233xz7l5"; }; libressl_2_7 = generic { From 8eaff5b06ad149642c4f50aea3b924d03579d401 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 19 Jun 2018 12:12:44 +0200 Subject: [PATCH 221/265] xmr-stak service: support multiple config files --- nixos/modules/services/misc/xmr-stak.nix | 60 ++++++++++++++++-------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/misc/xmr-stak.nix b/nixos/modules/services/misc/xmr-stak.nix index 57f43936547..a87878c31e0 100644 --- a/nixos/modules/services/misc/xmr-stak.nix +++ b/nixos/modules/services/misc/xmr-stak.nix @@ -10,9 +10,6 @@ let inherit (cfg) openclSupport cudaSupport; }; - xmrConfArg = optionalString (cfg.configText != "") ("-c " + - pkgs.writeText "xmr-stak-config.txt" cfg.configText); - in { @@ -29,22 +26,34 @@ in description = "List of parameters to pass to xmr-stak."; }; - configText = mkOption { - type = types.lines; - default = ""; - example = '' - "currency" : "monero", - "pool_list" : - [ { "pool_address" : "pool.supportxmr.com:5555", - "wallet_address" : "", - "pool_password" : "minername", - "pool_weight" : 1, - }, - ], + configFiles = mkOption { + type = types.attrsOf types.str; + default = {}; + example = literalExample '' + { + "config.txt" = ''' + "verbose_level" : 4, + "h_print_time" : 60, + "tls_secure_algo" : true, + '''; + "pools.txt" = ''' + "currency" : "monero7", + "pool_list" : + [ { "pool_address" : "pool.supportxmr.com:443", + "wallet_address" : "my-wallet-address", + "rig_id" : "", + "pool_password" : "nixos", + "use_nicehash" : false, + "use_tls" : true, + "tls_fingerprint" : "", + "pool_weight" : 23 + }, + ], + '''; + } ''; description = '' - Verbatim xmr-stak config.txt. If empty, the -c - parameter will not be added to the xmr-stak command. + Content of config files like config.txt, pools.txt or cpu.txt. ''; }; }; @@ -58,10 +67,13 @@ in environment = mkIf cfg.cudaSupport { LD_LIBRARY_PATH = "${pkgs.linuxPackages_latest.nvidia_x11}/lib"; }; - script = '' - exec ${pkg}/bin/xmr-stak ${xmrConfArg} ${concatStringsSep " " cfg.extraArgs} - ''; + + preStart = concatStrings (flip mapAttrsToList cfg.configFiles (fn: content: '' + ln -sf '${pkgs.writeText "xmr-stak-${fn}" content}' '${fn}' + '')); + serviceConfig = let rootRequired = cfg.openclSupport || cfg.cudaSupport; in { + ExecStart = "${pkg}/bin/xmr-stak ${concatStringsSep " " cfg.extraArgs}"; # xmr-stak generates cpu and/or gpu configuration files WorkingDirectory = "/tmp"; PrivateTmp = true; @@ -70,4 +82,12 @@ in }; }; }; + + imports = [ + (mkRemovedOptionModule ["services" "xmr-stak" "configText"] '' + This option was removed in favour of `services.xmr-stak.configFiles` + because the new config file `pools.txt` was introduced. You are + now able to define all other config files like cpu.txt or amd.txt. + '') + ]; } From 5673d74dd1423b7de72ee954d4927b647bb64b1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 04:23:13 -0700 Subject: [PATCH 222/265] pagemon: 0.01.12 -> 0.01.13 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pagemon/versions. These checks were done: - built on NixOS - /nix/store/i6bq7x5lbw83spjs8irjihvrr09ygkif-pagemon-0.01.13/bin/pagemon passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.01.13 with grep in /nix/store/i6bq7x5lbw83spjs8irjihvrr09ygkif-pagemon-0.01.13 - directory tree listing: https://gist.github.com/b7b92de7a71b30515369214111f387e0 - du listing: https://gist.github.com/257db82673b5cf4032834d2d9a93b431 --- pkgs/os-specific/linux/pagemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index 99caa813b2e..6429c19f2b5 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pagemon-${version}"; - version = "0.01.12"; + version = "0.01.13"; src = fetchFromGitHub { - sha256 = "0bddn22daf33dbghwfjxxgsn4gmr5knr6h9sbqhs7g7p85dla6wa"; + sha256 = "055qniys5xv0ivdvdws5vwdgfyj6iyq02v5nn945l1x59rwnb541"; rev = "V${version}"; repo = "pagemon"; owner = "ColinIanKing"; From 867c4a438b346e2ffd139a07d62165160f8d0f4c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 04:49:11 -0700 Subject: [PATCH 223/265] neo4j: 3.4.0 -> 3.4.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neo4j/versions. These checks were done: - built on NixOS - /nix/store/cmnl1i2dr77i6rs6kvk2y5pml713zpp6-neo4j-3.4.1/bin/neo4j passed the binary check. - /nix/store/cmnl1i2dr77i6rs6kvk2y5pml713zpp6-neo4j-3.4.1/bin/neo4j-admin passed the binary check. - /nix/store/cmnl1i2dr77i6rs6kvk2y5pml713zpp6-neo4j-3.4.1/bin/neo4j-import passed the binary check. - /nix/store/cmnl1i2dr77i6rs6kvk2y5pml713zpp6-neo4j-3.4.1/bin/neo4j-shell passed the binary check. - /nix/store/cmnl1i2dr77i6rs6kvk2y5pml713zpp6-neo4j-3.4.1/bin/cypher-shell passed the binary check. - 5 of 5 passed binary check by having a zero exit code. - 2 of 5 passed binary check by having the new version present in output. - found 3.4.1 with grep in /nix/store/cmnl1i2dr77i6rs6kvk2y5pml713zpp6-neo4j-3.4.1 - directory tree listing: https://gist.github.com/89bcc22704e3395637aebe7490b1c372 - du listing: https://gist.github.com/28e23479c8d4173c73887b835e0d2ada --- pkgs/servers/nosql/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 022a1a9ba10..fe4d285713f 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "1pccw3av72qqpyfsdyz72ab1lvc7fqraw14vi3hq67n96rsj017a"; + sha256 = "1hgpgkmz0rgdppk1rl41017369qp9lfbrdk7j3qc5dq54x8rxbjp"; }; buildInputs = [ makeWrapper jre8 which gawk ]; From a0d07eb94e147b133f485b041e852c5f690a7ea2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 03:47:59 -0700 Subject: [PATCH 224/265] openfortivpn: 1.7.0 -> 1.7.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openfortivpn/versions. These checks were done: - built on NixOS - /nix/store/qn1hzzhcv20cyk6q58wlgjar03dbqbqv-openfortivpn-1.7.1/bin/openfortivpn passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 1.7.1 with grep in /nix/store/qn1hzzhcv20cyk6q58wlgjar03dbqbqv-openfortivpn-1.7.1 - directory tree listing: https://gist.github.com/8d202ae1f27f632d9f02045900200b02 - du listing: https://gist.github.com/809d7d83e583187909b98ed31fae9fab --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index b265cdb4c32..5512db9fe76 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.7.0"; + version = "1.7.1"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1qfz5igry7fhrkz5iyzqpffldhpdvcw98k06yb6acwc1jyv87nh0"; + sha256 = "01nsgmmh72qk0aq2zdjh8qqn256mmvz1w2gl0wi7g29d82y2hdfm"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From ac3b07b581b86c674995a732a09608d4db1d732e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 23:11:05 -0700 Subject: [PATCH 225/265] smcroute: 2.4.0 -> 2.4.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/smcroute/versions. These checks were done: - built on NixOS - /nix/store/919h9vn683b5whq3229sl3f907m1jsik-smcroute-2.4.1/bin/smcroutectl passed the binary check. - /nix/store/919h9vn683b5whq3229sl3f907m1jsik-smcroute-2.4.1/bin/smcrouted passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 2 of 2 passed binary check by having the new version present in output. - found 2.4.1 with grep in /nix/store/919h9vn683b5whq3229sl3f907m1jsik-smcroute-2.4.1 - directory tree listing: https://gist.github.com/f35692e1d0eaf5b66e1203fcdc9cdf6d - du listing: https://gist.github.com/6170a85a1ce970d7ef1388b28005dfee --- pkgs/servers/smcroute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 40472c59a87..241ed17d2a1 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "smcroute-${version}"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "12xwdwvl9h269armwak7grm4g944j2c89srha4lqx2zndx1ycg1r"; + sha256 = "0wh7c15lglcgiap9pplqpd5abnxhfx3vh0nqjzvfnl82hwhnld1z"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 18096d201b6dee117fff095aa8df10d120dc8140 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jun 2018 21:32:07 -0700 Subject: [PATCH 226/265] toot: 0.17.1 -> 0.18.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/toot/versions. These checks were done: - built on NixOS - /nix/store/bhs5n438kn33h9v1r27m27zb27z0pvmw-toot-0.18.0/bin/.toot-wrapped passed the binary check. - /nix/store/bhs5n438kn33h9v1r27m27zb27z0pvmw-toot-0.18.0/bin/toot passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 0.18.0 with grep in /nix/store/bhs5n438kn33h9v1r27m27zb27z0pvmw-toot-0.18.0 - directory tree listing: https://gist.github.com/a202deb57487abab3f68139efcdf7e07 - du listing: https://gist.github.com/fffb680bbb26f7e0ff4956e000c89985 --- pkgs/applications/misc/toot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index e282e752b31..0fa0495ceda 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.17.1"; + version = "0.18.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "05fzsakm089bn03z8gip6yp4xfmwa054v40x2f3gqpl04r504gis"; + sha256 = "0snvxn7ifbkrdnml66pdna7vny3qa0s6gcjjz69s7scc0razwrh8"; }; checkInputs = with python3Packages; [ pytest ]; From f5f8f57e112d40d028108a624a456e28ec085d67 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 09:32:29 -0700 Subject: [PATCH 227/265] xmrig: 2.6.2 -> 2.6.3 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 91fdb37432e..340d84fd2aa 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "09dcjvnm74j1d26mvdiz0sl1qwns5xfkdwx46nqd4xlgvg9x4rpx"; + sha256 = "1ssiq2yv8b3xg4kfp2cfzl41m5apjw2r2k74lh3fz0g0ix3cq55b"; }; nativeBuildInputs = [ cmake ]; From d7c2561790034fe6323872dc597dce10d5269607 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 09:46:06 -0700 Subject: [PATCH 228/265] smemstat: 0.01.18 -> 0.02.00 (#42208) --- pkgs/os-specific/linux/smemstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index b4b8606197e..c4d699c395e 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "smemstat-${version}"; - version = "0.01.18"; + version = "0.02.00"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz"; - sha256 = "0g262gilj2jk365wj4yl93ifppgvc9rx7dmlw6ychbv72v2pbv6w"; + sha256 = "16in8bzsrrcz7mc5qvyvjkxgpzz4bnq8zvkb7vsv6qfgyd3xr1dp"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; From a943befd8a2727bae96fe1d2d40e5e7ec64459ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 09:47:00 -0700 Subject: [PATCH 229/265] swiften: 4.0 -> 4.0.2 (#42206) --- pkgs/development/libraries/swiften/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 272967fcb99..810420fe6b7 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -1,14 +1,14 @@ { stdenv, python, fetchurl, openssl, boost }: stdenv.mkDerivation rec { name = "swiften-${version}"; - version = "4.0"; + version = "4.0.2"; buildInputs = [ python ]; propagatedBuildInputs = [ openssl boost ]; src = fetchurl { url = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; - sha256 = "06bk45hxqmny8z7x78ycrfrazq6xdzv5c28i8x0lgc85j03b5dsh"; + sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; }; buildPhase = '' From 42b28bfd7bf8c3110f0697a71c433e4a049f5449 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 19 Jun 2018 18:50:51 +0200 Subject: [PATCH 230/265] libressl: fix eval --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dcb6c54e85..9d644182a0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11071,7 +11071,6 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_2_5 libressl_2_6 libressl_2_7; From 9374c3f2036398bb8a14286541606e2d3a44c16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Tue, 19 Jun 2018 19:00:03 +0200 Subject: [PATCH 231/265] platformio: Fix building of overridden click package The normal click package now applies a patch that doesn't work with the older version used for platformio. --- pkgs/development/arduino/platformio/chrootenv.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index ae68e84ab1c..8f93a0b3772 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -13,6 +13,7 @@ let inherit version; sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a"; }; + patches = []; }); platformio = self.callPackage ./core.nix { }; From c7647189663f676a79f5291d15b91b571d035ea6 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 19 Jun 2018 13:00:39 -0400 Subject: [PATCH 232/265] python click: make patch conditional Make sure we are not using the old version of click when applying the patch. --- pkgs/development/python-modules/click/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 4a96ef7f673..2a3004de379 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -9,12 +9,10 @@ buildPythonPackage rec { sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; }; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - locale = "${locale}/bin/locale"; - }) - ]; + patches = stdenv.lib.optional (lib.versionAtLeast version "6.7") (substituteAll { + src = ./fix-paths.patch; + locale = "${locale}/bin/locale"; + }); buildInputs = [ pytest ]; From d2c633f55dc0ebb1186ff8e391ab1b82c3df3433 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 19 Jun 2018 13:01:04 -0400 Subject: [PATCH 233/265] click: fix error forgot stdenv. --- pkgs/development/python-modules/click/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 2a3004de379..68a4662d282 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; }; - patches = stdenv.lib.optional (lib.versionAtLeast version "6.7") (substituteAll { + patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (substituteAll { src = ./fix-paths.patch; locale = "${locale}/bin/locale"; }); From 2388a9b5a9b274127fd51fa2b411cbed55558346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Tue, 19 Jun 2018 19:01:34 +0200 Subject: [PATCH 234/265] platformio: 3.5.2 -> 3.5.3 --- pkgs/development/arduino/platformio/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 9d30c226855..de058530999 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "platformio"; - version = "3.5.2"; + version = "3.5.3"; src = fetchPypi { inherit pname version; - sha256 = "bb311ce5b8f12c95bc45c2071626a4887a3632fb2472b4d69a873b2acfc2e4ec"; + sha256 = "1l4s2xh1p9h767amk9zapzivz4irl2y3kff3dna6icvsgq6rz011"; }; propagatedBuildInputs = [ From 56b6771e09a013759ac45fbaaf20b6462dc68bc7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 11:47:55 -0700 Subject: [PATCH 235/265] entr: 4.0 -> 4.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/entr/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/10c98102g693y06k81q97z6akq0a87i8-entr-4.1/bin/entr had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 4.1 with grep in /nix/store/10c98102g693y06k81q97z6akq0a87i8-entr-4.1 - directory tree listing: https://gist.github.com/fd156bc7a5f670e3b90073b60678bee9 - du listing: https://gist.github.com/3a2e6fc964562e2a7d597aeb4c95b46d --- pkgs/tools/misc/entr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index b8791f5f32a..9301ce12a05 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "4.0"; + version = "4.1"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "12vc3xp0z0abmsy5kbix0wmn0sca39c8miyga6cijydi128zxm2a"; + sha256 = "0y7gvyf0iykpf3gfw09m21hy51m6qn4cpkbrm4nnn7pwrwycj0y5"; }; postPatch = '' From 802ea37863d7b62f83b502212c6bb2a0671e6df1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 11:59:41 -0700 Subject: [PATCH 236/265] git-secret: 0.2.3 -> 0.2.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/git-secret/versions. These checks were done: - built on NixOS - /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4/bin/git-secret passed the binary check. - /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4/bin/.git-secret-wrapped passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 1 of 2 passed binary check by having the new version present in output. - found 0.2.4 with grep in /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4 - directory tree listing: https://gist.github.com/d460daac78bbcef226d1fff7918d150d - du listing: https://gist.github.com/ea683543c922a9c179a97faf441a1797 --- .../version-management/git-and-tools/git-secret/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 02dc7f86fb3..4993910634a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }: let - version = "0.2.3"; + version = "0.2.4"; repo = "git-secret"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit repo; owner = "sobolevn"; rev = "v${version}"; - sha256 = "1swgw91zzs9n582500a34cppyngrqrqrnl80d1vd7i93xx1lkmv6"; + sha256 = "0lx2rjyhy3xh6ik755lbbl40v7a7ayyqk68jj8mnv42f2vhd66xl"; }; buildInputs = [ makeWrapper ]; From 5fce881f60a475f113270ba5f7d721ae8fb35f34 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 19 Jun 2018 21:14:28 +0200 Subject: [PATCH 237/265] wireshark: 2.4.7 -> 2.6.1 --- .../networking/sniffers/wireshark/default.nix | 10 ++++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index f3afeced8f6..42038426515 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.7"; + version = "2.6.1"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0i2ggkkx7fphsk7kv9kygsf5pcaf4vgnqgi8mj1rrf2gfdl3rjsy"; + sha256 = "126dvd6myjbxjr69dy9vzzdda2lmjy1wwwc6gcs5djb46jy5nvmb"; }; cmakeFlags = [ @@ -52,6 +52,10 @@ in stdenv.mkDerivation { }) ++ stdenv.lib.optional stdenv.isDarwin ./cmake.patch; + preBuild = '' + export LD_LIBRARY_PATH="$PWD/run" + ''; + postInstall = if stdenv.isDarwin then '' ${optionalString withQt '' mkdir -p $out/Applications @@ -72,6 +76,8 @@ in stdenv.mkDerivation { ''} ${optionalString withQt '' install -Dm644 -t $out/share/applications ../wireshark.desktop + wrapProgram $out/bin/wireshark \ + --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix} ''} substituteInPlace $out/share/applications/*.desktop \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d644182a0f..063e3a57672 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15973,6 +15973,7 @@ with pkgs; wireshark = callPackage ../applications/networking/sniffers/wireshark { withQt = true; + qt5 = qt59; withGtk = false; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; From 912e60f9294f263d3bfa3847cc33be86cbd58b1f Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 19 Jun 2018 15:43:36 -0400 Subject: [PATCH 238/265] inkscape: add perl to nativeBuildInputs This should fix the issue in Linux sandbox. --- pkgs/applications/graphics/inkscape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 0d01a631358..639f1928f8a 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ]; + nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env perl perlXMLParser ]; buildInputs = [ - perl perlXMLParser libXft libpng zlib popt boehmgc + libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext gsl poppler imagemagick libwpg librevenge libvisio libcdr libexif potrace From cb1fcff6a0c05842e2a99babbf392e6a6f76e5b3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 13:17:30 -0700 Subject: [PATCH 239/265] fnotifystat: 0.02.00 -> 0.02.01 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fnotifystat/versions. These checks were done: - built on NixOS - /nix/store/bhgmqgb2378111cih2i66xxw8hs437cg-fnotifystat-0.02.01/bin/fnotifystat passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.02.01 with grep in /nix/store/bhgmqgb2378111cih2i66xxw8hs437cg-fnotifystat-0.02.01 - directory tree listing: https://gist.github.com/403bc6fa2fa6447782c088789925dbfa - du listing: https://gist.github.com/a24a28895d12487f43e6b23117868c75 --- pkgs/os-specific/linux/fnotifystat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index d49d0115822..eb87d8aa725 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "fnotifystat-${version}"; - version = "0.02.00"; + version = "0.02.01"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "0sfzmggfhhhp3vxn1s61b5bacr2hz6r7y699n3nysdciaa2scgdq"; + sha256 = "18p6rqb3bhs2ih6mnp57j0cyawjm0iwky6y3ays54alkxqaz8gmx"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' From f9ad1cae78b5fc27a5bf2f17b3f9ebf7b239b3ca Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Mon, 18 Jun 2018 13:05:01 +0200 Subject: [PATCH 240/265] nixos/kubernetes: dashboard lockdown Kubernetes dashboard currently has cluster admin permissions, which is not recommended. - Renamed option "services.kubernetes.addons.dashboard.enableRBAC" to "services.kubernetes.addons.dashboard.rbac.enable" - Added option "services.kubernetes.addons.dashboard.rbac.clusterAdmin", default = false. - Setting recommended minimal permissions for the dashboard in accordance with https://github.com/kubernetes/dashboard/wiki/Installation - Updated release note for 18.09. --- nixos/doc/manual/release-notes/rl-1809.xml | 16 ++ nixos/modules/rename.nix | 1 + .../services/cluster/kubernetes/dashboard.nix | 138 +++++++++++++++--- 3 files changed, 132 insertions(+), 23 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index f57fd75c782..d3062b3ea32 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -306,6 +306,22 @@ inherit (pkgs.nixos { was not used and thus has been removed. + + + The option services.kubernetes.addons.dashboard.enableRBAC + was renamed to services.kubernetes.addons.dashboard.rbac.enable. + + + + + The Kubernetes Dashboard now has only minimal RBAC permissions by default. + If dashboard cluster-admin rights are desired, + set services.kubernetes.addons.dashboard.rbac.clusterAdmin to true. + On existing clusters, in order for the revocation of privileges to take effect, + the current ClusterRoleBinding for kubernetes-dashboard must be manually removed: + kubectl delete clusterrolebinding kubernetes-dashboard + +
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 2df737452fb..e3691843e17 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -34,6 +34,7 @@ with lib; (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ]) (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"]) (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "") + (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ]) (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ]) diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix index 9c1f814b683..6d9faada440 100644 --- a/nixos/modules/services/cluster/kubernetes/dashboard.nix +++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix @@ -8,10 +8,25 @@ in { options.services.kubernetes.addons.dashboard = { enable = mkEnableOption "kubernetes dashboard addon"; - enableRBAC = mkOption { - description = "Whether to enable role based access control is enabled for kubernetes dashboard"; - type = types.bool; - default = elem "RBAC" config.services.kubernetes.apiserver.authorizationMode; + rbac = mkOption { + description = "Role-based access control (RBAC) options"; + type = types.submodule { + + options = { + enable = mkOption { + description = "Whether to enable role based access control is enabled for kubernetes dashboard"; + type = types.bool; + default = elem "RBAC" config.services.kubernetes.apiserver.authorizationMode; + }; + + clusterAdmin = mkOption { + description = "Whether to assign cluster admin rights to the kubernetes dashboard"; + type = types.bool; + default = false; + }; + + }; + }; }; version = mkOption { @@ -202,29 +217,106 @@ in { namespace = "kube-system"; }; }; - } // (optionalAttrs cfg.enableRBAC { - kubernetes-dashboard-crb = { - apiVersion = "rbac.authorization.k8s.io/v1"; - kind = "ClusterRoleBinding"; - metadata = { - name = "kubernetes-dashboard"; - labels = { - k8s-app = "kubernetes-dashboard"; - k8s-addon = "kubernetes-dashboard.addons.k8s.io"; - "addonmanager.kubernetes.io/mode" = "Reconcile"; - }; - }; - roleRef = { - apiGroup = "rbac.authorization.k8s.io"; - kind = "ClusterRole"; - name = "cluster-admin"; - }; + } // (optionalAttrs cfg.rbac.enable + (let subjects = [{ kind = "ServiceAccount"; name = "kubernetes-dashboard"; namespace = "kube-system"; }]; - }; - }); + labels = { + k8s-app = "kubernetes-dashboard"; + k8s-addon = "kubernetes-dashboard.addons.k8s.io"; + "addonmanager.kubernetes.io/mode" = "Reconcile"; + }; + in + (if cfg.rbac.clusterAdmin then { + kubernetes-dashboard-crb = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "ClusterRoleBinding"; + metadata = { + name = "kubernetes-dashboard"; + inherit labels; + }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "ClusterRole"; + name = "cluster-admin"; + }; + inherit subjects; + }; + } + else + { + # Upstream role- and rolebinding as per: + # https://raw.githubusercontent.com/kubernetes/dashboard/master/src/deploy/alternative/kubernetes-dashboard.yaml + kubernetes-dashboard-role = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "Role"; + metadata = { + name = "kubernetes-dashboard-minimal"; + namespace = "kube-system"; + inherit labels; + }; + rules = [ + # Allow Dashboard to create 'kubernetes-dashboard-key-holder' secret. + { + apiGroups = [""]; + resources = ["secrets"]; + verbs = ["create"]; + } + # Allow Dashboard to create 'kubernetes-dashboard-settings' config map. + { + apiGroups = [""]; + resources = ["configmaps"]; + verbs = ["create"]; + } + # Allow Dashboard to get, update and delete Dashboard exclusive secrets. + { + apiGroups = [""]; + resources = ["secrets"]; + resourceNames = ["kubernetes-dashboard-key-holder"]; + verbs = ["get" "update" "delete"]; + } + # Allow Dashboard to get and update 'kubernetes-dashboard-settings' config map. + { + apiGroups = [""]; + resources = ["configmaps"]; + resourceNames = ["kubernetes-dashboard-settings"]; + verbs = ["get" "update"]; + } + # Allow Dashboard to get metrics from heapster. + { + apiGroups = [""]; + resources = ["services"]; + resourceNames = ["heapster"]; + verbs = ["proxy"]; + } + { + apiGroups = [""]; + resources = ["services/proxy"]; + resourceNames = ["heapster" "http:heapster:" "https:heapster:"]; + verbs = ["get"]; + } + ]; + }; + + kubernetes-dashboard-rb = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "RoleBinding"; + metadata = { + name = "kubernetes-dashboard-minimal"; + namespace = "kube-system"; + inherit labels; + }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "Role"; + name = "kubernetes-dashboard-minimal"; + }; + inherit subjects; + }; + }) + )); }; } From 1d07b0edac30d0eaa7c0f92a1e0b5ed5a22820ea Mon Sep 17 00:00:00 2001 From: Thomas Kim Pham Date: Mon, 18 Jun 2018 14:14:55 +0200 Subject: [PATCH 241/265] add missing k8s Webhook authorization mode --- .../services/cluster/kubernetes/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 20f2308508c..5e87ae88f5a 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -332,11 +332,11 @@ in { authorizationMode = mkOption { description = '' - Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See + Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/Webhook/RBAC/Node). See ''; default = ["RBAC" "Node"]; - type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC" "Node"]); + type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "Webhook" "RBAC" "Node"]); }; authorizationPolicy = mkOption { @@ -348,6 +348,15 @@ in { type = types.listOf types.attrs; }; + webhookConfig = mkOption { + description = '' + Kubernetes apiserver Webhook config file. It uses the kubeconfig file format. + See + ''; + default = null; + type = types.nullOr types.path; + }; + allowPrivileged = mkOption { description = "Whether to allow privileged containers on Kubernetes."; default = true; @@ -943,6 +952,9 @@ in { (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.apiserver.authorizationPolicy) }" } \ + ${optionalString (elem "Webhook" cfg.apiserver.authorizationMode) + "--authorization-webhook-config-file=${cfg.apiserver.webhookConfig}" + } \ --secure-port=${toString cfg.apiserver.securePort} \ --service-cluster-ip-range=${cfg.apiserver.serviceClusterIpRange} \ ${optionalString (cfg.apiserver.runtimeConfig != "") From 2b534c6e7ed07385d90c8c5188173785963bf675 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 14:31:23 -0700 Subject: [PATCH 242/265] clex: 4.6.patch6 -> 4.6.patch9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/clex/versions. These checks were done: - built on NixOS - /nix/store/qkxwkwy5z5spp4i1s47sxa4yp5fn74ih-clex-4.6.patch9/bin/clex passed the binary check. - Warning: no invocation of /nix/store/qkxwkwy5z5spp4i1s47sxa4yp5fn74ih-clex-4.6.patch9/bin/kbd-test had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/qkxwkwy5z5spp4i1s47sxa4yp5fn74ih-clex-4.6.patch9/bin/cfg-clex had a zero exit code or showed the expected version - 1 of 3 passed binary check by having a zero exit code. - 0 of 3 passed binary check by having the new version present in output. - found 4.6.patch9 with grep in /nix/store/qkxwkwy5z5spp4i1s47sxa4yp5fn74ih-clex-4.6.patch9 - directory tree listing: https://gist.github.com/2c328494e947f31dde0f4b4e11ae16cc - du listing: https://gist.github.com/34e5287c0403e2308608877e577ca373 --- pkgs/tools/misc/clex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index 2f442a7a9c1..54a6fac17a3 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "clex-${version}"; - version = "4.6.patch6"; + version = "4.6.patch9"; src = fetchurl { - sha256 = "0bqa2hc9721d62cfsy5c7a5pzgh9b4px7g4q60xlybkwll19qbbp"; + sha256 = "1qj5yp8k90wag5sb3zrm2pn90qqx3zbrgf2gqpqpdqmlgffnv1jc"; url = "${meta.homepage}/download/${name}.tar.gz"; }; From a13cc1151712c5aa81e165da81a6914ce897c5ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 14:44:44 -0700 Subject: [PATCH 243/265] debootstrap: 1.0.101 -> 1.0.102 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/debootstrap/versions. These checks were done: - built on NixOS - /nix/store/1d259k14mlj2g4ahwzrqysz8qzq3h0yf-debootstrap-1.0.102/bin/debootstrap passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 1.0.102 with grep in /nix/store/1d259k14mlj2g4ahwzrqysz8qzq3h0yf-debootstrap-1.0.102 - directory tree listing: https://gist.github.com/a5ffc7b266836c399de6806088eb48a7 - du listing: https://gist.github.com/7ec59bc18aa8dc8cf0540391333485c2 --- pkgs/tools/misc/debootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index bf4319759fb..21f91691a71 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.101"; + version = "1.0.102"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1p1a81s8hq73byd7256iljdls389x2q7w6srgrgfmx5bl1csnzp3"; + sha256 = "1i8fnxyf073dqywcvj6n32k1crzl7bwlmn373n5342pz71rmqrq9"; }; buildInputs = [ dpkg gettext gawk perl ]; From 5d0780193830ffff29ff7b4b522f919cafbd496d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 10 Jun 2018 20:21:33 +0200 Subject: [PATCH 244/265] python.pkgs.cython: fix tests (cherry picked from commit b9b18ded57842d24ef05bfe33aa7dba95b77babf) --- pkgs/development/python-modules/Cython/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 189468a2daa..1c391d3495d 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -9,6 +9,7 @@ , gdb , numpy , ncurses +, fetchpatch }: let @@ -48,6 +49,15 @@ in buildPythonPackage rec { ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''} ''; + patches = [ + # The following is in GitHub in 0.28.3 but not in the `sdist`. + # https://github.com/cython/cython/issues/2319 + (fetchpatch { + url = https://github.com/cython/cython/commit/c485b1b77264c3c75d090a3c526de24966830d42.patch; + sha256 = "1p6jj9rb097kqvhs5j5127sj5zy18l7x9v0p478cjyzh41khh9r0"; + }) + ]; + meta = { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; homepage = http://cython.org; From 98eefba1906e8333d17f537d2b059362027f6660 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 16:24:05 -0700 Subject: [PATCH 245/265] wesnoth: 1.14.2 -> 1.14.3 (#42195) --- pkgs/games/wesnoth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 12fb0bd60b0..45b4e5a5891 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.2"; + version = "1.14.3"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1xhnhxjc8zjv89xmrbffa54fa4ybw6x0p34k14n9lrz1y18vaar8"; + sha256 = "06648041nr77sgzr7jpmcn37cma3hp41qynp50xzddx28l17zwg9"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 39f01c1a8bc1ea4c78f3bf1f97159d245b393f61 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 16:36:02 -0700 Subject: [PATCH 246/265] adapta-gtk-theme: 3.93.1.18 -> 3.93.1.22 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/e6801ef270b37b8b69012340d257786e - du listing: https://gist.github.com/50a1c6c1c9f0e79a349f8b5a83d10300 --- pkgs/misc/themes/adapta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 372efec785d..c7033bba4b6 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.93.1.18"; + version = "3.93.1.22"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "1jaayfj2h0miaalmgk0i26py4b6750iq3kis2jnm54g2gxyw3ipw"; + sha256 = "1i74vpf7fv1r6074lv8f9515hzrhcbi2wg069vmc10ihwpml391r"; }; preferLocalBuild = true; From 12a554dc318a98ef4d3856ce49003fd35d21904d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 16:52:22 -0700 Subject: [PATCH 247/265] brial: 1.2.3 -> 1.2.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/brial/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.2.4 with grep in /nix/store/d80z046q8l3rhi7zwbcxzaydfrqxvzq9-brial-1.2.4 - directory tree listing: https://gist.github.com/73a4fe4d778faacdf1c17f40a83e3884 - du listing: https://gist.github.com/23202c35b020ea0976f7c4ff9e23ca2c --- pkgs/development/libraries/science/math/brial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index 0c0332f1366..38b77781867 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.3"; + version = "1.2.4"; name = "brial-${version}"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg"; + sha256 = "08skgmwz190mvpkh0ddx92ilva6bxidxwh1qg16ipi768x92193s"; }; # FIXME package boost-test and enable checks From 48fd0e6f20cd835765d7803eff4ed116409d81e1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 19 Jun 2018 20:45:33 +0200 Subject: [PATCH 248/265] =?UTF-8?q?evolution-data-server:=203.28.2=20?= =?UTF-8?q?=E2=86=92=203.28.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/evolution-data-server/default.nix | 15 +++++++++++---- .../core/evolution-data-server/fix-paths.patch | 11 +++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index a9516206859..5146123cfd4 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,19 +1,26 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python3, gobjectIntrospection -, intltool, libsoup, libxml2, libsecret, icu, sqlite +{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobjectIntrospection +, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.28.2"; + version = "3.28.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1azk8zh167a6hyxzz73yh36gbpf7i52b7zi10hnnnsywh80pj6jk"; + sha256 = "11sq795115vrcgxl9svscm6wg8isjj784c3d84qzb6z47zq92zj3"; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit tzdata; + }) + ]; + nativeBuildInputs = [ cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection vala ]; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch new file mode 100644 index 00000000000..33423551659 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/calendar/libecal/e-cal-system-timezone.c ++++ b/src/calendar/libecal/e-cal-system-timezone.c +@@ -26,7 +26,7 @@ + #ifdef HAVE_SOLARIS + #define SYSTEM_ZONEINFODIR "/usr/share/lib/zoneinfo/tab" + #else +-#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo" ++#define SYSTEM_ZONEINFODIR "@tzdata@/share/zoneinfo" + #endif + + #define ETC_TIMEZONE "/etc/timezone" From 843a1cdcae20228f05423ab747a6c0ed37336ff0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 19 Jun 2018 20:45:42 +0200 Subject: [PATCH 249/265] =?UTF-8?q?gnome3.evolution:=203.28.2=20=E2=86=92?= =?UTF-8?q?=203.28.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 4470f11597e..6c7f57b0162 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -5,13 +5,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.28.2"; + version = "3.28.3"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0lx9amjxmfnwc0089griyxms9prmb78wfnfvdsvli8yw1cns4i74"; + sha256 = "1s1vlznc22q1f8fm8fhggi8xak52b6n952s562f3kpv6g0dm2x6k"; }; propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; From 77f3ac7b7638b33ab198330eaabbd6e0a2e751a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 17:15:26 -0700 Subject: [PATCH 250/265] altcoins.bitcoin: 0.16.0 -> 0.16.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bitcoin/versions. These checks were done: - built on NixOS - /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoind passed the binary check. - /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoin-cli passed the binary check. - /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoin-tx passed the binary check. - /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/test_bitcoin passed the binary check. - /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bench_bitcoin passed the binary check. - Warning: no invocation of /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoin-qt had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/test_bitcoin-qt had a zero exit code or showed the expected version - 5 of 7 passed binary check by having a zero exit code. - 0 of 7 passed binary check by having the new version present in output. - found 0.16.1 with grep in /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1 - directory tree listing: https://gist.github.com/a5e5d745910497ae913d4577342deba5 - du listing: https://gist.github.com/5f62bec50f6ab977a25c8ee0f118cb10 --- pkgs/applications/altcoins/bitcoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 30bbcb2c839..25f223d5744 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.16.0"; + version = "0.16.1"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc"; + sha256 = "1zkqp93yircd3pbxczxfnibkpq0sgcv5r7wg6d196b9pwgr9zd39"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From dada18527a9699f80c005a4e20190dd1521eb0af Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Wed, 20 Jun 2018 10:37:00 +0900 Subject: [PATCH 251/265] rPackages.RcppEigen: fix Darwin build --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 35822fa78bd..25019f0d8a5 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -397,6 +397,7 @@ let RPushbullet = [ pkgs.which ]; qtpaint = [ pkgs.cmake ]; qtbase = [ pkgs.cmake pkgs.perl ]; + RcppEigen = [ pkgs.libiconv ]; RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkgconfig ]; rggobi = [ pkgs.pkgconfig ]; From f972a30f16b860cccaf4330d228ebcd5e0277e5b Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Wed, 20 Jun 2018 11:08:29 +0900 Subject: [PATCH 252/265] rPackages.igraph: fix Darwin build --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 35822fa78bd..b09f76cee03 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -438,6 +438,7 @@ let nlme = [ pkgs.libiconv ]; Matrix = [ pkgs.libiconv ]; mgcv = [ pkgs.libiconv ]; + igraph = [ pkgs.libiconv ]; }; packagesRequireingX = [ From 696861f9a65e43645b3c08ed55cd863d935c5991 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Wed, 20 Jun 2018 09:11:04 +0300 Subject: [PATCH 253/265] direnv: 2.15.1 -> 2.17.0 --- pkgs/tools/misc/direnv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 15d8647ff82..e22bce7c698 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.15.1"; + version = "2.17.0"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "07kzfkv5ssys788j0f1bp73gd7b53vwv2jsxkd85zwb3kby1145v"; + sha256 = "1dmanqpifx27cz41yc3ijpij0wrbgw9qny2d4n6jppfwf2qzyq4s"; }; postConfigure = '' From 1c1e32ba002aba575e970306497380bf10e67da3 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 20 Jun 2018 05:56:09 +0000 Subject: [PATCH 254/265] ddrescueview: init at 0.4alpha3 --- pkgs/tools/system/ddrescueview/default.nix | 39 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/system/ddrescueview/default.nix diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix new file mode 100644 index 00000000000..517cefb6a2b --- /dev/null +++ b/pkgs/tools/system/ddrescueview/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk_pixbuf, glib, gtk2, libX11, pango }: + +stdenv.mkDerivation rec { + name = "ddrescueview-0.4alpha3"; + + src = fetchurl { + name = "${name}.tar.xz"; + url = "mirror://sourceforge/ddrescueview/ddrescueview-source-0.4%7Ealpha3.tar.xz"; + sha256 = "0603jisxkswfyh93s3i20f8ns4yf83dmgmy0lg5001rvaw9mkw9j"; + }; + + nativeBuildInputs = [ fpc lazarus ]; + + buildInputs = [ atk cairo gdk_pixbuf glib gtk2 libX11 pango ]; + + sourceRoot = "source"; + + NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + + buildPhase = '' + lazbuild --lazarusdir=${lazarus}/share/lazarus ddrescueview.lpi + ''; + + installPhase = '' + install -Dt $out/bin ddrescueview + cd ../resources/linux + install -Dt $out/share/applications ddrescueview.desktop + install -Dt $out/share/icons/hicolor/32x32/apps ddrescueview.xpm + install -Dt $out/share/man/man1 ddrescueview.1 + ''; + + meta = with lib; { + description = "A tool to graphically examine ddrescue mapfiles"; + homepage = https://sourceforge.net/projects/ddrescueview/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 063e3a57672..4ff64a13070 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1993,6 +1993,8 @@ with pkgs; ddrescue = callPackage ../tools/system/ddrescue { }; + ddrescueview = callPackage ../tools/system/ddrescueview { }; + deluge = callPackage ../applications/networking/p2p/deluge { pythonPackages = python2Packages; }; From 6916565510f013fe86eb44013fe196d3f5e8ff9a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 20 Jun 2018 05:57:08 +0000 Subject: [PATCH 255/265] ddrutility: init at 2.8 --- pkgs/tools/system/ddrutility/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/system/ddrutility/default.nix diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix new file mode 100644 index 00000000000..f8a6dac8197 --- /dev/null +++ b/pkgs/tools/system/ddrutility/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "ddrutility-${version}"; + version = "2.8"; + + src = fetchurl { + url = "mirror://sourceforge/ddrutility/${name}.tar.gz"; + sha256 = "023g7f2sfv5cqk3iyss4awrw3b913sy5423mn5zvlyrri5hi2cac"; + }; + + postPatch = '' + substituteInPlace makefile --replace /usr/local "" + ''; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with stdenv.lib; { + description = "A set of utilities for hard drive data rescue"; + homepage = https://sourceforge.net/projects/ddrutility/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ff64a13070..7bbb5ca26ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1995,6 +1995,8 @@ with pkgs; ddrescueview = callPackage ../tools/system/ddrescueview { }; + ddrutility = callPackage ../tools/system/ddrutility { }; + deluge = callPackage ../applications/networking/p2p/deluge { pythonPackages = python2Packages; }; From 8f558a68cae77825186001fb634891900da6b3ea Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 20 Jun 2018 14:58:39 +0800 Subject: [PATCH 256/265] firefox-devedition-bin: 61.0b14 -> 62.0b1 --- .../firefox-bin/devedition_sources.nix | 796 +++++++++--------- 1 file changed, 403 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 8dd7d4752b7..fad5f0bf434 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,995 @@ { - version = "61.0b14"; + version = "62.0b1"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ach/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ach/firefox-62.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "1b8e2e92cc7489a9876aa4b8082f3285a1db6ced460597f05f4843f3858eb4fe858b5d87e641480836526bd7b718d033a24fc1a2b9bdf0504dfebbc5e7a292c8"; + sha512 = "a87905427f380f4234a76e36f1157c7b4286e71b46aadc84275ec21897a179d2e6aabee553efb3528c9b8a6255ecf6145bd05e96dd1ace096832cd5c724996cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/af/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/af/firefox-62.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "d1b77553f03b06de6fa6d8e3a308105b885690d2eaa21a066f89ad35c5475633a3f4d63536dca33c737dfe2e84dba9c05a09c011cab7bc4356b4158dc122662e"; + sha512 = "1178bdcfbcdb948284847df330666f82ff4347c38d1737177469c7a3e32a792cb9434103adcaefc3773421b5f544ccba0464d4329464ce1dfcefc99eee837e2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/an/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/an/firefox-62.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b8ff7e36c2b826da7d69352abd2f2ce6661298ea09b1f457ccfeaf9d271ad49358b2a6947bba47bee506c102c59fc1426a92f09e3e9591693e4fd6c8fe84ea18"; + sha512 = "0097dbcf6f23251e0328d3966c76e250f9be83a232f9cfb3afcdfa6b445193beea64fe907396bb54a41ab89008dc35304b8de7dc8b7abf7bab8afc703ed71ddd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ar/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ar/firefox-62.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "108a6b8f7af9915c20a11bce0bf1c2096d8ee09fcec394325faf0142eff1452d493e5a5c894ae3061ffdb63b2f19b127446f2b86339ddff309120df37e113bdf"; + sha512 = "6c26898763eb09341d6b39d9519f4ffc869202fa14b7a16187eec8e736e0575b119e0d4f6dc47eff3caaa1a0e62bdf7b61c729f26463a4dc96a1e6e700fc29f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/as/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/as/firefox-62.0b1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "b4368567ebe0ca46aeaf48b23e75bb972f88af82ed692d72b4fa1aab8f89e16f09974810c4fb333bcb30b5d2f9cdb50a39a42ff73fa53c2511a1adbd0713c060"; + sha512 = "55a3a9f38a810981538d714d29c2c53cbea4953d187480838fefe5e83e101b0ebf40f4584fcf6e8967b978c54e03ccd59d9c07653aa4663de679438bdf5047e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ast/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ast/firefox-62.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "3ca40ec6844c55e7beb3e6ee7a3a7604a92560830ad060feb7cca5118bffe4d2b5f6ca8af6f98d07eb6a970814a33d38b0516ea339f07b0e2c8e55a79a031bae"; + sha512 = "e531fcd3d3140dd2733ee2e62d7b092ab55b96c91a4be6004240a7d505cb64e3b38d8e0b2dab15634d814174e93936b19150d88bfde3bd5af0e322a63cda14bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/az/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/az/firefox-62.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3bcd5e17dcd0debd02bb79aae488ad6f158e6e45aad6ef49ba6e6d69e894e5513c7b1e27c4d90df9423717d1d8f1b5f02c1dcc42e2255d5ad0727095e9ade169"; + sha512 = "00734d67c95010caf326a2e3751564f801225e8d524d94d2cfdb11daf56ccc80b2904e6811b355720434efaa29a58a06c46157527f8d7c148e89ac420ac6d83c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/be/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/be/firefox-62.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "bb1168d80f4947e5de3872c02ec5f472381b1b59aec5cb4a05788556db462702c99e36f67ecbd52029856badaf255a9a8ff692f37b6d5c7166d73255b097057c"; + sha512 = "326cab9a252bed4bf51d36b53f59f12cea73e7fa9c2b930c86353bea8bbd2ef4ac962bbcfc68f4145fda0de2651db294d42d826c6bb1d7555de514a83010ab8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bg/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/bg/firefox-62.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "52b93a4eb34c083ee824cbeed17a65396c8916b4313a080d43dddbe0fbc1e80b84030a201e98ce259e24eca7bbcf89f83442779c60660104d28c683471ff4f78"; + sha512 = "98f3ad0cb0bd02d4107f9799138cb5fd41fb435b0755bdbdedd926c5409427605febbc6fbb060c5f68876fd5b40e0e3b8bec67a9ee3f957611cea922127277ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bn-BD/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/bn-BD/firefox-62.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f387009c1e447e276dc042e1ad0c39661d32dde20e3ae1a4c5f57c6c3acd154ffeacce170843f8a5d04f26d9c1c44fb933899f8253f38690944bed38dc339d72"; + sha512 = "62e2d3bdf24346326831721e9b3e71fb041dba6774c1ad9c3806bec52e2d38dab14c4fb67a78d803233fb40f8ed6e4d2910bfe97ad4711090c87dd81fad2cc65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bn-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/bn-IN/firefox-62.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "fbfd8c0d7ba2038505bde3172d736d851e64600738c28ac9a414e0f859ac7c7b264b23a9a2921e20b2cb9a99d5c371dad7e186e1a5910415debb203dd08bcc3f"; + sha512 = "21cd75ade9c30a21964d3147b8120d94993bbb406ca9e58643ca78cfe81c9f13bbe8538961eb6b3ced551dc1e80f7060c9a5899c4046db0063513f254789ec29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/br/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/br/firefox-62.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "c0a7900802be77222c156690df96e3ee03d88d4888b0dc31d45dd46d29d19a13b97141c68b002f39b657cd96463152c358b45e78368f72884529af51991b8512"; + sha512 = "a63061938c280c299d54627f979c9ffdf2dec1271b767bad0a972f1300fb150746775e6dcdc86c3dfe184a45afd4e864e08fe78a8c7a63f318c2e227c84d1773"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/bs/firefox-62.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "391a2b1aa85ec4bf010c7051565b9168b0bb71dca5a4f40368781efb690d838412859c8bab34c14ae168d3bb9bdbe538c6a38dff11e138aec9f179ae52cda7d4"; + sha512 = "3703be2a357ce4eb122b70450e1e45054b93d9f9de78a797fab75d1b4125c75e4c8a10c58c40f764631806b070d48536e36b372c168cbc945bf05198cc8dd5f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ca/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ca/firefox-62.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7655c923e92f356e3d893dddb01a966bcc7ee89f035ae1e8caee681605fcd54c3e6497225700d9eacd099374f0a3fff3050a529354018963e3df40ee3fccc86e"; + sha512 = "7d5d296e589c5eeedb6e293a55ae9594e71ae034fd58cf5b474f0dbe1d567f0783b4d97336861d4f14a4201302f353ab41a30040bbda30a66f795b640114dba0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/cak/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/cak/firefox-62.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "daea430b504dbc276e6b7b8091acced1b7842a97045184bad7867f98033feed98b7ebbab922f25f828c031e189b3d437aade6cc7060eb982068c2cd8d977409b"; + sha512 = "884554722c3c019bc7e1afdb14ac26eedadbec8fa7b1f7efee99e5c4bfca0ea52969d122632bfc17e54ce91731e9577270c74d5bbc86adcf252de2732aff3685"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/cs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/cs/firefox-62.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a6cc36eda14619d4fce6fd2304f0027130ad92cdbaf0e88e3077deb721b9740bfd99d62d22c67cd35286c082374c53df782452227e69364e414f92f16dd96741"; + sha512 = "5f8c14bbf0090b6beb8b10bdf2400511347157aa329659fef174c0e8d651bc3ab43282c5b4492aacefba0a19230d55b8a90412c6bae7d7c70de9ce104169ac5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/cy/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/cy/firefox-62.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "df0589ec3b22f6a320b3890a6f2beefa99fc2688de6c4afa0f8a879b830d249f4aac4cae1599895edb7e6196ffc02213188d461b07c7242ad29ffbc9901c1c66"; + sha512 = "90bb43395d0257bd1f48d9c673465850ad05c5e5b80a337d6438394defcde211ea35a164bd5ae9a9b80980bb955f686ef73a6c50699d209c8bec7df7c1b72be8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/da/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/da/firefox-62.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d6c97c376384c742bf0cba9eb4cfa011ecf1500a7e6c518041c30acd6227df9b8300b156935216ea112956bb0291bd925935b940d372ef8b57a19357e5074d15"; + sha512 = "6f4aa6e27afeef8424a577cd7d5d67fc51636a71d2f4243f703ef327d9e5b69d835d6dba4eb7a7a2e3aed444903f457e944da787549401cd1ba3bad2cdd38bdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/de/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/de/firefox-62.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "a5781c0515280f5b4fb80f4eaf373a62f591e924466668667885554dc1086e48006cfe0645140bf53b877d078a08c4a1ce209c9dd0985ea28b9fa5579137045b"; + sha512 = "a533e81e2935e33606ca579a4c70d56be07ab70352a6ed37509a23d3e36d0041a053d7117bd495f2d944c0d5ce91848f99ac397c399af41813e469289ab028ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/dsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/dsb/firefox-62.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ec5eaa244ad1f6bafec67ed2017d16560be5ba2f66e5788c54fc643a748e1e834a7eb11869c5aef233f1d1d7322b15bdbabfc0a6bd6a46011397203911607cc5"; + sha512 = "4977ef29ad99e13f98156f2ab4f29c2e36cfe1c07bf4bd2db19d6e2af005c319d00370480c15cd56db4266d3922da3456fea18a85fea534f3fe7848d50cfc683"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/el/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/el/firefox-62.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8e4a7d9e778b85caf16e2144189338bf3beb577d057c3416dc45be315eaa4d8a9f26180aabdf1de28cfbc3a6545ed8304e04bb112392a5c49046261a7976fc33"; + sha512 = "5fe84e58b746519b9ad95294443dc112186916c7cba6728c955f8d986f587dcf3542bf3c3c5b5b2eb862b5ba22849ff870a178be70ccd5f9807db0a5b83a98af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/en-GB/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/en-CA/firefox-62.0b1.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha512 = "f16ff6e47ef02e83e2dd73db8a559bd1ccf871d545a3fd744addd7c4c034af5329d17ed253b77c0186f29cce3f84b7ebaf4539df533c783defabb1527d7fbd94"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/en-GB/firefox-62.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "bf5cfef892fb906accc0db406b5e3b3389f338719ee29605b2296151ef8a0f2d4916f8b3dd31cd52e79262a4747252d4b553b170c185e181ed2895aa7130cffb"; + sha512 = "69383c1076d7ec8a88c1b8b4ff9a42c9fd6d6a615fe729e11f5b2d45d52df9b51e1ccfb953ac5e62dcb54ba6c806f1dca5cc24c76f586dc4c74c70fa768d7edd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/en-US/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/en-US/firefox-62.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "52c5502b6423b7ce3140f3eb62e274874595761dc996a200442f21b5611c97534734fd93b90340f719d01d0557e2aa18d88137217f8c40a23b2bf50577a820f3"; + sha512 = "d36f78be9b830596356017348d3e0f30d55f6da6f37d54719e06b5d49a96e171c14af457febc8e8dabe88752833f8ac700ddc2c5bcdbe92bf9593b4938f847a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/en-ZA/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/en-ZA/firefox-62.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "55f251447753564f7db3973c72e1007f1ebc356cdf6c3765dcc6a5352c931f39f7d7e46ffae72b1b4dda59bf2917a09eaecf33cc30b976f78bc7922466a2a9e5"; + sha512 = "dd106e71d05e801ac6c1b127dff07bcb2d10b235f075ad85e7d1acd3ab583eb76ec88ee8e1698382b35b407604ce5d5b74a7afb6ac491b57e925c957cb419f61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/eo/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/eo/firefox-62.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d008d4e0614e3490ffc7951ad7413ee57d84ce1d17563bd69ebb7bed7f5d362231b497d6ac142003aaaba8129683b24fc3fe6c2612b674ead893ed0e500d9ca6"; + sha512 = "7bdf3e44663c9665942a88ea3ada22cb178b656e036b8a20ad7b14b78f38334cc3aa34489622eee180ec52e2474c6a89803e676ae83cc509290cb6394b228930"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-AR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/es-AR/firefox-62.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ebee62d32b2e7d48561ebab7a387b06f06f4c1553cacf814b846bc8cd58a708c397b2e642b67f31617047e34b3baecce7ea9e0177606cf92e386d22f7276a941"; + sha512 = "241e516324dc6003d6944a3341532192ac8dccb33e128fec57e0026c5e24b5e9e533f2f5cd995cb0543f84ca2f10c92e2464ba0946eac115ea3e615866dc8122"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-CL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/es-CL/firefox-62.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "35f964ebc3133704d95cc1ecdf0cfab7c7902b7d22608d0711dfc5badabd262df52f10516a5a3c4635bbc3fa5dfce2e7c73a9362c58768f54a38abbb4a8ff55c"; + sha512 = "3c51d5fec1074ad4d9ef0dd1617b183ef3550b5b6b653bbc529c23adb59ae7e11081adf554be2924d9dae1a483403d7bc570379cdbaeaa3bb262c678def252eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-ES/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/es-ES/firefox-62.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c728a0cf0d75739be5db224a49e1c91e779456b75769898d1097b443e3348e12ec11e6626bd72512e5d81ae22201be55043bc0f82ca74123178cb637f8e44bbb"; + sha512 = "45f0c26958718df7ae9d7c25e9e7dbd0a2358a02b46e8927f38b264325b2baaf936ff371713abf334afc3eb99a069372ba53efaa6514384f225c1e5353b4afdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-MX/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/es-MX/firefox-62.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "58c2ab98acc72d0e5421f6d14194a0c6a14a443290fb1461ee45abed3086b5bd6977c0ad4f083ad2c7b7cc84e39f02621b248c6ec0c50823d15c2778636ff6d2"; + sha512 = "9d17ccec770e1004149bda6622a27c5ec9fe72ea6c8e0c43adf20d2afd6f417a8a89ae737b3e1bd51dc520747996eddb1d489db0557b825fa15ada232af58e92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/et/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/et/firefox-62.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "b73a8057c6a8ce7091d0d9717ee67790ec13faf7eb27b2dcc696a465c291e24fa7e9630c7c0382dc3de2f477c7b476e84687a0fa49f84ee1aeb7b4ef47c76e13"; + sha512 = "c1cb2baa3f4698818f2b914f66e95f0d09755d28b416499f046d5bc043cd8dcb07fdd01a302cf898fcf80fbb88848bde740a18bad0feb08c046f08f44ac58f30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/eu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/eu/firefox-62.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "956df7dc028b820af5679b731578331b98d146e843da68796f878e939e8f9ce60355dce3d28093b4cbcb2052083f29c5e412afd502307895553f8254f3e18b3d"; + sha512 = "05e7a366441e6672d424391818fa662473a30ca6b894e928ebd77c918989346f12bd37b03ae442b765168dee4499c92fad460941b11d21373411530771fa093d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fa/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/fa/firefox-62.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "5a2f480f6c7e120eabc19f629de687cf4bca8c824b0c693aacbbf7d0b7c577097b03e5eab2570bd127cc36963c85599ea1355f2ced07d283ff8ee964779167f6"; + sha512 = "c36a4962eafe222db6b320a2d5477ea37b7f9e79db1ad9ce0e13c879b876d3adf790caa148e5fddcaea8890bb6a2c1d0489d202842868aa1851312ff50e6cead"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ff/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ff/firefox-62.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "afc19bb38a30a1227babd3b011ee1639cafe154f72b67bed65f897b7584ed8509ecb59f176380cb1ae0f6068926686e3473ec63ae8b68a75cbe5c8c32aa97224"; + sha512 = "2321bc75c84f5700157a5b774437ae2ce63b791fb8e4d9dbc5c66df39b6a513f1b2669c605ed5ae0ac1890aa1429b4f342099574e89352dc24e270ce1ee99a36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/fi/firefox-62.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "dab0cc26ab4cc2f700867140715e4f5a63d272b053550d69783e20794e167a4b323e054d91ac9f0aa05c4b82c60618fc37a9cb6003ff8d92cc6b39781e25ed78"; + sha512 = "4982001bafabd64ccf7c761efd142b02e88c03fe5c8d245a8918f4490436fd8778c149211bde5bdabe6f19d30ff3cad48a1c6462557008a3cde6df369f96007b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/fr/firefox-62.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "6946a4375ec4abaccf6326acbdb775dc2c9c866e8b41eb1978b7e9525f0865b5c6e5b6541a04405abe294600eb97b53f2fc3dc25dfb2c0760861be25075466e1"; + sha512 = "2f68665bc1e0f933dd5cebaa76133d32d1a729520022ca76708ecdaf9e7bcbb27f365f95cc725e0da44b20239cf60039526850858f9d2102a1736fdba7dbdea9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fy-NL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/fy-NL/firefox-62.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "e718d94a1d5c1bfb5f19317f6eff382c2ba5549561bdefaf1c67c1a51e68cf291b7f77dcc8a4141b53abdfda9e7f3806166a9675c55f1f3397e9c1bd41f74598"; + sha512 = "90866a8c0e7c1f4cc27d69e03b24d47505d34ca07d54f1bd5718ab8b440ff869fc1e2b359f200f05ab77b5360b96b2a1ae4a5cc1981edac41c9db0f187264041"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ga-IE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ga-IE/firefox-62.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "31f571ae0eaece944002b1c4541b8894d860bc8987d0c914cc78fc2f5e202f4c8733b48e350f443f513e998f654bf6fca1fff80811f380c2c8babedb5d7a1f02"; + sha512 = "ee503cd31998e51cd9353129ceb204879c3acf24bc6cf5f09a4cb81a223cc62a360190d6ff6a8742bff8a37c7740a475f20cca723d7afad48ea6acbd1e67d376"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gd/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/gd/firefox-62.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "f288337f68922425589edb57cd49e9d1d468a60d9172c5d514719e5c2e2d1fcd3ccde7f2581cd58a9b94c9241cde3e2a3ff24304e452459808ab74100ab30242"; + sha512 = "4fa5938eced70ca43010b6c390e3dd97e5cd27e0355d217f100823ba5c2d324795be340e71d77dcd2cb0f213409f04c51866a31fd1f913524869f4899414d0ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/gl/firefox-62.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "bb33fd8d03f49cc1c993d9d95aea3c8b739fc25b266ad394b725d16cbdf06e55a0330ef1a9f749b0b55b6724eb310470dae8cbd0927f90a9f321290beaec971b"; + sha512 = "9c958f29ecc41a631985edb6a3744ca2ae132832b743fe9f43b5b308b115e509dff110f61da057780708d2a998110062f09a135b2e53e896f3d938ef9c821c33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/gn/firefox-62.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "2b3edfc6fd42a8bffd0035512ac3ef8393acb051852af6368f772a683cdafe28c278f305f77936e03a2b8273233ea583ba12d5709d1a61735c328283a57936f8"; + sha512 = "94efb1247d9ceaa1b1c2e79d1163dff31b8b87794ebdb22236f111e0bccede73cddc1ccddda387d8e7606c9dc0295167d0941af6a56b456fd2776481ecd7893b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gu-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/gu-IN/firefox-62.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "8dcc7f8461e7a296a07f74864e853d063409bf73fe7edd8e35be9ee18bddda7f2f8307ffd36e9e2fe5c13e777ceef8718b58894a81a963bf35b3dc40f04e3976"; + sha512 = "876a944f415aa830b5b7231d6feb765640ff4b7cc0bf6c40f12a4d03acca6feaef7d7cfbdb0de8ebbdab112663323b3adb08b92b32bc241515b433640431e7ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/he/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/he/firefox-62.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "44957ce39dc9230388cfde78652d88d0a6b283a1e8bf731ca6916d706ebde291045d4f27e3a0480dcfb97f8fb4bb68e03d5009ef658cc98224002ec1ced82fc1"; + sha512 = "e04deddf11b82bdbdb0f98be9144423735bbbd467b6f2f15c2f6609b1ab3a3024e7205c2397faaea1d817feb9f71843458c9c4e054c57e72cd6e0215c0151783"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hi-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hi-IN/firefox-62.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "2ef4df45864245c3e8a5b276031d0f3dcaab8271d253b07d79cabb9e0098d59ccfbab949d10a843e946a01596b51eb8d4c2c31a476e877c050324806b4c07326"; + sha512 = "80d4d38b725696dde0f0e71aa325a4be9c34993fa0a98f1a05eecccf1e34e6d7c850d94ff2f14578a0dbce9e697688f8af959e4d9fd54e6530f1dea0d037a0c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hr/firefox-62.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "da0e053a5cb88481699bdca777e9c930ebc2842da4c114237c49d40de6811e2c7e9c3d3a3b773a9ed2a7fe275447e3e585c0440dfef6450b6b57b58436233c53"; + sha512 = "5f4da7f2b75bd963783ca0570377477407fe5778be2f1727488b26933960ff473318be2e92ade00d7bd0996db1f87636a800e6bd94052e2c4ab8972bfebc8fad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hsb/firefox-62.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "40e362ea134e1a03a9394f3c3b15d428b309da30b209553fbedf72e7b923439d4133b5e6bf8a79a2dba7d37fc65bc03f90df5608f360588ea80ac6208f13595a"; + sha512 = "d89f2dbb3e4934f750f5ecb7a90a76aad2804f44744f6925ba2a805df2a55bd3ed6390ae889a9569bf266f06d2dc92a38bb4bb4c125a3164f574e1edb00eb1cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hu/firefox-62.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d9b152504340f00b1ce00d7be1bc4ba1c80ebe87507f7cb3985fab52c0a04238e026b7488f46817102b578139671c81709ba6fc5edb4eb37b0182c5c52a54282"; + sha512 = "76dea45f4f224bcd92ff82c3f0b9967ea6cb9b0d9b60079ba8a3d105965dec539c50723d5203f254e6d1fa43cc80da0605880625bd79cfec541d3dbc85fa8cf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hy-AM/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hy-AM/firefox-62.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "c36dc4a3a87230dac351440cd66ce6f6479f34b65f018f36d1f3cf3b6f5eaccf40e9fb15dcf796032a2cb08028ec8b7c3407c03ab0bd1330fd669323d59ed78e"; + sha512 = "2d21caf978ae853c376d94d9dd0b14f50f3ac5415bef319ebf5131d8b14bc496d8f8da09f3529e4b910971042965f07650b8b82e6b9b1d41eb456845dc52714d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ia/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ia/firefox-62.0b1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "cb0c4ab408fe879c9629bcaaebd4ce34be033aee6cbaa2a7360f68a40be03e0ff79e5ca61991e3378fdce28278194ed54a9c5273be401ce30c359b22aa2062d3"; + sha512 = "8a463b132e199dbc7a6c14a054e23ce93e466e1b9ae43d16c41ab6eca8d31dfabc5caf0aa9068244f23d158da6e0e69920a21c77caa6074d18f8572cb8c847b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/id/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/id/firefox-62.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "98c413687af4db1e68229348290fe426d607f264179b1b634eac4ec87bcb36dce497ac25a458a97873a3f8fd962a47b865f8f5a5c5afe4b5beef56e46d1aad2a"; + sha512 = "57ac16932a18617f068242fb2266f48ac0fed528be46a327641eebb8740022f032c76981c526e659b0a81d0c68d5ab2b69c40b154800e98b72cc9140afdb182b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/is/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/is/firefox-62.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "3647141ef52695f91ef303aee2e74accb78336fddeff84411d2f20eaf4ee89407fd9b80ec9667587d5cbe81bde846b01893330e8576421a9cd2eba937b31fc26"; + sha512 = "d7fcd1795c577ba6db8535a2ecd11f3f5184752b96b2227dd62cc0520e2be72d7e4c75e7506cba1ec4b6e131b64d8fe42a1e8ab05471e2b87400a88547b4224e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/it/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/it/firefox-62.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "f20d33aa7081862088d25c5bb9c8ba90a1dd4a5951045ef80768f34216241f7dcde2957970caef715d3d935147f1254e3feb1269a302c4adedfcd76218445bed"; + sha512 = "11022485019bc02b316705d5d178fc5d32e2e3161dee676acbac326e2a80d70905d2b8b743b1bce733e97208ebe9393d5a0f852fdad15fa464b5773a6ded2116"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ja/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ja/firefox-62.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "32a3c325fc8a258dbed4ec5af6cb06a1d9829cf87b2863644050775165d0df2df6fbdc4a4d553f45567141d1c09a0a5a8bce3c7d4cab773502f0846f6f0ebb0b"; + sha512 = "57efa4365d3da6e69bf2fed5f69b148585ba72f21c515dd4ba3bc4dba4ebdc56975b74b60ceb5451027d1244ebef83f397822e93900c86b1cdd8e18056d36a32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ka/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ka/firefox-62.0b1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "ec51621ed8adb6141d7055b82d1bfb11dd97f492d1927c709216d5bd57cc5b14f4f07b40bbc379f62a364769adf5c907efda8936c39ac077a56a2a6bd546ad18"; + sha512 = "f3976a6e621fd63fa405b3b0e513842ae2de1e1943f5a1c5d26a447b0d9cd934a8a13f4b9a7bbe69365de4669246417671463bba2399ba1b8f98023083bc5003"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/kab/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/kab/firefox-62.0b1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "5e0e3b8a238f34445380fdec1bb4ee0d5fcd60b5e6947843af19f0d770c497508664af78a49c339eeb08049a870ab0098ecd6ef50bc1a3527fbb6c891e54edf7"; + sha512 = "a16a5eda06f2cc7257b780bc3403b01cb4f183e520f43599b33030e5157a3dbb664e738d90de037bb7e14790f7b87683ef6290a75a984fcc8f7b87802ece8b55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/kk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/kk/firefox-62.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "a3d80dd3ca4e969a9779e00ff24087013c5497b113b086d68c3dc33c6d05d98921014dcd81ce7cb871274f9d9b825cd1d09ab867d7329503411ff68431c947c6"; + sha512 = "efc2c1b2dec9554cb099d9d415d9edce10525a5c82ed011c82032b89ef23b330c360b22c70deee4fcf2704d8121b2f7209cb1069fe415df17135cc23988f8d8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/km/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/km/firefox-62.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "260d5585d544c1cbf7a7762bd2126041026dd281500475079cf8889a03cd016d5fb7d6b3da7483a51374cdfa1b0871317689cf248d32466885e0d92055e80d31"; + sha512 = "11bb2c1e223eac93956979f12ce8046fc4046820623894cc0284ec758ca677cc25faf5dc913000840527d6c39ca3e05ea4ad1d67e2c896a00df3b3e42f8e08a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/kn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/kn/firefox-62.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "92338e4f1d92ca91fbdb7cef4c999c6f78a1aebe69d6fbe46f7a67a13f4d63d838fa33d602990d3b10c160ee5e1c595fc9d37674bfea8a9e40088e057683847c"; + sha512 = "456289e3c99016e5ebee2c393bd727205488228a4b52673d2e658d8071a9cc2a6382f9e5b08d25d70d319d1900cd6c0e31519b52be561a35ebbdec5c6a3c6d21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ko/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ko/firefox-62.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "6066cdbc6603db7b9cbcbcc85485937a9303466091cc737fa5fc5e219f7758fc1c0198378ff2fbc9a63059d6d93b018daae15c51d264c3e47ce3f8c4450d4418"; + sha512 = "4fb02aa4d05477e8f22c8821ed921b2961ad6ba4bb1b049f24b1a6f255903c8c6260eda4f0f30cd6fc17a7836edf7fa48d3d7cfc56056019636284a92dd0520e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/lij/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/lij/firefox-62.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "eb546ae48d9d5d88ec861d51bec7476b64a383be32fc225d41f86cf1f4f3cc4d4df2238d067ef50d7540f666d55e7c8d7dcc0856d24f377117ae310cbf47f474"; + sha512 = "7c52a19bd02d7daa83ceec382891f345a376fbd9a8627f5e6f9312663d7a544a382f2e2c23d1eaa8bdffeedacef11ed5e1dd052d7c52ad527b840dcd419d35ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/lt/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/lt/firefox-62.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4cd5648ab324ff2d9af506f3888a53273cb4f6848aef9069f153081de16f7159a376710c91c4dc4ff489ba5462ba3d91e5abbf824d9abd633455a6c9900114df"; + sha512 = "77dd939383cb68dabce5a29ebc66ee701ed4ff521be891f6140f88e384234ed0f134aec2e6fb40e3e09d451d0501820a5b0b700388f7ce9708d6f39ec210a17f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/lv/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/lv/firefox-62.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "e54cd1faeb530c680fb38c567398f208d5e9f9fe1ce0b5db78c8ed46432703f59f7ac1accbde86ca78617cdcf177bf2c9850dac127490bfc71264c2c64f7d026"; + sha512 = "d7761cf119cd718b1862dad2bf2d24584836a1017c161d342e8d68ec036695097fadbf166338be07a7a48093bb29d45cec0650e973d33ef4886781383760732d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/mai/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/mai/firefox-62.0b1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "8d7b7d264325de3040c981d8c446d1cd634cd7742eff7dcbb5edc490e43ac4d5821536d5ada900ca7ed35ebd2f7f3e935c76fede38dd16803ecd1cdf0a067f0c"; + sha512 = "45c87b9ea504e47f7467198f35ee906bbd22375aac1e75b0e3102f4312cd8aeaf4affa40eb2620733d30ebede743b0dc7875fd5f7dbf2de9e702e86d917b483c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/mk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/mk/firefox-62.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "dd740707e019800784cef932c037d779380e1f3db20c888469036b228a4b261050c072d38ce639ddd9caf63b143b5dd970dedc379a03621203479c148c2e2dc9"; + sha512 = "284302019c6d499431b4ec1d7cfaeb1bd344720cb41b1ee3da937d07ac38df278099116ddd5b160b4ee9e8084c58712aea1e1eae2f93c5e9d330a18af733b770"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ml/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ml/firefox-62.0b1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "695815665c4c3381f8fecb62d402aa7a868b8997a412e4230c92c0fe7ad454f249bff8f7f1a92b2bb002fda4f22506ffd988e6332f6c4a8a026b7216dad1b4f5"; + sha512 = "c3631e69c78fb2f759ca20f59f4378703c9a21d62c138a628c7b5e7becd7d680c444b5a997ff518279cafee82da0dfd8f2f2d728ed53620123bcf7eff6ab1d1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/mr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/mr/firefox-62.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b7c3fcb0f41dfbd09591740e1121fd2c37806814ff9c7ddd8dd683b86c6445ff3b02f73338658968cd0dfb9487e779414217f29e81d4b415296a72349a575d57"; + sha512 = "38ad3b359b6cf39d4ff74afaa88fba269499c5eb5c5d3fe6622f3d63a09d797637fa4a8f9ef6df79dc6145bb782ba1b0af9f26745cee34e1269601e93dcdc035"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ms/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ms/firefox-62.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "036e8d6536005d77c5aee1532f302e0aacc074e005f0cf3d5f5f397e573481a3c6d3589d62dc84ec0aab9d9b2ec4a2aedcb4722222e13f8f78819177b790c3d6"; + sha512 = "40c09a877ca3606749997bfbd8cd71c38aa050e4b394983dac75d6d4c060c613aa3332f1e96e1ac809363c9166d1a263afde54550578f657df64f69ed1bff88c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/my/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/my/firefox-62.0b1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "185286fe6fb8037240b07a4356008a3ceb70653ea2fdbcb25c7882c395e08e7d64fba7acb394447b68e970dc2cfc4936008ac0167fde2b8b4f2113bd5c5040f3"; + sha512 = "9ce0e16e123cbb0cbd370124225391eba5a3e657c008492ec4675b431ad47745299e73075907bdbba532d029052d9522359764122678f92b137b59133cbecf98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/nb-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/nb-NO/firefox-62.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "7a199a5fba5d3c954c4489533f48e4424908c3d141d8a3f6055c7d4a6d071dab9b0d52a85ca899d0d662aa5668d9c5fadd8238ea9ed770097dd15eaa6b17c87e"; + sha512 = "86e0880350b015e77c0acd480da9a20d83349ce3dda110880565025fb6875e887025856cd17ad87c1193eaba53d8ab04c2b69f39235f555ed7ecf76d4299d08d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ne-NP/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ne-NP/firefox-62.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "eadb4fe826c22d067f91bb010e7176ec6b0a890c10ff0716d68e21f70b28fbcc8e65739af7c6c9ed919abe5e067271e55285a0e3d809c7c1ba65376e8e8b8347"; + sha512 = "13a4291276baade6d8ddc1de73b9222fc121549e0b52d2bb86838a5b4c7d1df3ed494c4c8d739ea3fa39264419888676a8aacb8e7501290a182efdea8f41fe16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/nl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/nl/firefox-62.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "6bdfa9d6242d17b4396a25b5a4ed30a251c0aa85cbdd9a53bb89e0496673f138e8d3b938a2f7181523085dc3af0ffe31edeab78531f3e8fc35484fd250688cb9"; + sha512 = "fca0002264ba3e6f4a661bfa2f257bb71ecdce5d17875fc85a914f9c33f02809b79def6626fde8f659b81aa61da60600edc5e094a71e3d0673a3faebdd1caf6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/nn-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/nn-NO/firefox-62.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "af7eb3ea2c18871c0bb33dc4997f38dbb7c6896bbd0d1defd027e4b64df65799e50c01969c34204f5f212389108d6d62cd2d52de33a55aa385b2d5eef34e4849"; + sha512 = "ba286362b9a13b069c4eed0cbc473d31e8ca3a85b791e60eaa09ee354b9f2fed3c62b3a77c01a85b68e33f30e23f8c6d9adc6c6f7ecbe3146a0401d248ffe77e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/oc/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/oc/firefox-62.0b1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "59b939410f19f7afe089c8540498304cddea08a0061dbc1ec2d65be74081971e65ec3503dad820fae0126984313ca7fe36881e347e1c20f69feaaeb1afffff33"; + sha512 = "5949a4fa66a8f783170b4deefe07c0fbf73790c53ced93c30553effa03d2942ef00c2af7bb2bf1b83dddd2a08db72a2c305c4535d4bb60666fecaeb4ac418ec4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/or/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/or/firefox-62.0b1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "5b3c288c6f5b09d21f600959bdc6fdb1b7d0529be4fdb3ce9c05b0ad3003e90ef538e6c1c058d0d04acf59e72616027c5a2eff25aac3fccaab7ff388c52d7a1e"; + sha512 = "31bba0616cb9ef68f9d2bb451bc5d02d67adb8fdf4e8214cd5a1ad49644060fb23beeaf1b17d19217d894ed0127208cee2bca2b031b08b837ed3ea7b1fb0cf81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pa-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/pa-IN/firefox-62.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "5b3a227dbdd13ccda515efec7d10c529fd04c9f0a91363eb45c2e8b7386654ec906c83326c22d355f2a662f22688144317d89a302e59a7cf8d368df3910b1add"; + sha512 = "8961151c03a1d3bd3a72cc19cba4491a0173189125305b30f984457668af55f76a609f78ef2dabf14f1b5d66a3ce2d0f332f2cb4a8e78b8f1cd7245fb2c232c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/pl/firefox-62.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "9ca212e82615b9d7f95358f70e0f294001fc94eebdf4e96754c1880e136dcd428f6a8ca04b6c319587e2bc5a89b762e94f27c0439c3fc7de6b1e9f1d83ed5bbe"; + sha512 = "58ff6108e529ac5d7d2a19a8b9d8d2ecfe5aeb0ec7fbf52b80033e40b2d5d79c33950149cd275238072604a460abee9bd7d499464f1c4dfb615334b516dc5407"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pt-BR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/pt-BR/firefox-62.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "b0bb415701de65165ea2c90ff837fd6025791b7061930999afdfda2db9d77ee4ab38bd11288db3a668332a25915fb97e44d26fef5bd5aca8052cd4ce2a0f8b4f"; + sha512 = "39782bc11d81c9ec558da43237915ba1bef642187b6747d550cc58677103745f125703b909e757cf3b41a0706bd4a1ddc408eadbc01a8fe2fcc1daf827ccd730"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pt-PT/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/pt-PT/firefox-62.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a6adbcae92503d65cb4076f7d917b7dff21396f70049fcc9836b4ca91c1d5d6016c1f74e0572b10361e9bf3327d87c2abea4d179bf2daa25f2b506c6cb7ce808"; + sha512 = "2b2ae5086952de1761459083605260dcf1ec4ca94f15a40bd2272e43145516b6e7115f2d8d17926399a563b1d25e8477174564af9f697606df85c816fbc1e1e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/rm/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/rm/firefox-62.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d86dc38bc86b27ab0b8cfe10b09f8d78219ec282690a5f876b174877371cf7179f26459e927044720390162a697ed37c2684225722c23acb26b5718a40b4e399"; + sha512 = "42fc889ca0fcafb143725bb616ce6b8f70dbf802b024f183b8a9470c72119b7793e275648bfbc94433875a97197b913d7942df361ad0b6f8395ec17c3be6e2d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ro/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ro/firefox-62.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "3441346f8842a956921658295808dfbe0c4be04083779409cf19846e75d6287c524441869252d693a23bf5e7794466e4ec9f6cd3aa363475e1f855ca3c86c872"; + sha512 = "86fea7512cde6a583303f6ad700bb26aaf5181ad90596b952df5a5627d2a78b5aa88337d68ff31b914146c474c92020d9359fa2243b336987e03fc003c135439"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ru/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ru/firefox-62.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "47c370cc4e1e759fb498f3e7889605ed4b9db6ecc7f1b324d800db89ab69369dba584e76fe2ff6777d47ba60ba3f7a628ca75171b7019c65d4d0275476befd96"; + sha512 = "8baf71ca8b18ddf6c08d469d41c0b8c7d9ed815adef8fa8c8d312094bc55f863c574b3e8990630aed79b4ec2b4965182eaf8ac6c105e68f82dffe143118ffad8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/si/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/si/firefox-62.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "6dc7f968e4e96c99cb12e682ce1db5139465816addff1cc9235187b8341c7f94dc322899b85eae96b85ff0abbafe937916ddd88750bc9b295a06207e1f8dc0fc"; + sha512 = "e5cfade7c16e0c04f0ef12f5a867a9cfeb8570439dd16d6ab8109bdfd3b6cb45db60f7e2cafa9e3a3e18a7e634d4491a72050e54d3988c64744063c20cb50532"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sk/firefox-62.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3537af8e430f9ae41f5ef4b7ec5ed883f4e70124c691db76420d69d16a19b06c0c9a29e4b17bf44a81a85a50bb9ed6bf1f897061d5e6a79b72762b61e66c6aa9"; + sha512 = "66ae74fabbc2079a14e10297bc2ecac3578274adf4e67532a14a8ccd49cdd043a5f6c3d6a91bb3ed78b2d087dadf11bcd75f1ea504e32f183949e512b9eb72ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sl/firefox-62.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6e521922bf2e5839b269601116bdcef0cb6a4c3bd8ae75c68afbf12fa9834b24da2e9e773121b50d7f38cf2dab28826ce246cd87212a9b742d0a09a2fb118103"; + sha512 = "1852ac0d4de217a4531bf70302267899fa94144801d10bd8f41694016a66e0662cefe45765240990c3747baa39b10cb8b23e7efb647c6cb72dc59c7d44216802"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/son/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/son/firefox-62.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "98a1ef288662186ecdad6d15ce34a78a7385d0576c923a330a1fccaa36a79ee7e2ff8b8d874e253cb44df24a596fa11ff79fd756a814589ca5f43d277665f153"; + sha512 = "22707848521ae418a620255174790907c96ed6301a2d2a032f095ae17af1eada2b0a87c7a39a27ac3a63b710e7c96638979ce47aae613e4d0b1ae9c1728c4f07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sq/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sq/firefox-62.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "1a51452b80bf795c72b9e4696768474bd21bc1311be6d943be0c4bfc8aba9cdc3e8829859ffb5c73fafbc7e5be0d5bcb27181842b0d55699e1a943c8b4dd315d"; + sha512 = "0c27782b9aedf9fed190ad95e9c8e194ed0971cfcbf62741e5032dfd95f80dc7420a7364e0fd614587094de98ac24e4c06cbb4eac43ddb0efeab0d0dfb42c996"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sr/firefox-62.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "2090f30b3c24125ef4c3ebfbc8d11867d2730bb4217855384d7a61a1b76aefa6223dae5fe227acaed2316697fb877214b2f1c9a62e497ca026f2b1f8d91d48fe"; + sha512 = "d8d9b0e082b002b99a8aeee8b23885bdad9d405a58eda2180b5f46c26544c3cc4810882e1f347953900588825450b3e6b9d4b0d913a2e454ca45857f9f2bf5df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sv-SE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sv-SE/firefox-62.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "55ebddd90a2504be1cff612965df4b7521c32c9adc168e2323a898219d2780c503639b9e073b26928838da533cfb06dc90c98192a522d9cc2192bb1a82c406a5"; + sha512 = "7eddc9c3cda027c8a824f67f99ea5166397362a4305f6fd6907d15542c5fa8a1ba34b7f5c90b83eab18ca5c610643622702332df103373d7a99a954567cc5def"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ta/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ta/firefox-62.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "cca9e0c313f019e2cb00ffd1f8343d78e033cbb88261d2b58f543ae7a743aec6f5375e88f3a56aa87bab162f511a1f7af147aecc8bf3d8c1533ee4fc342d5993"; + sha512 = "58e601d01ce339b4492baa48be9e708c243f65949eca881b6f2d65902965ba0c8548bdd5ca92b5139983e0a451db516ed1d04ed81c159bad2b4d37cb3c482f7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/te/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/te/firefox-62.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "7cc45e847c58b11716dbc0b26e7a5de7950be959e4bcf7ec2a245974494b2e2d0ee06c62696e1b1b1b2959fcc1f728e4b354445ba02b5e762fae16460c3fc2af"; + sha512 = "bff5f9a38f36e825ea6cde6a7dc332ec9f82dffade16be0fa1bba14758284664ebe7d8a3564f163368b0b0b3cdb28b97b7f3bbf335ae6b7872cb958b9a7b78ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/th/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/th/firefox-62.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "aa1420d420388eb49d73b09e3dd6313b376b233e3e4e681f9b284c59a87726cb85569490e6978524040825f0c005aff936e25881dffd0d42f76f07060ab2dc68"; + sha512 = "6290c4899ffd2ee6d42888b7a1c4b1e9a53b9bd038d64b64aa21b07a79fb256d80fe0621ba9a2bc4c98bef600c66cdd5e7c9c4d5c0e196617ccaa114bae56ce1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/tr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/tr/firefox-62.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "4783e93f6405cb1a4bb66010a24cd41a957efe638bffa8ea11bbcbb59f0a994681775ebc1db242fcd3abf46cca1050da0e25f60fb1bb866159a259bddbaef9bb"; + sha512 = "ba235dc6154a27f2351764900bd22f48b3cbd1eef854bf930be59e0d7d251bcf47d41a9c94a859427acd4d3db669b8d07e4e867422e3d002ca0405fe74cb4ff9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/uk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/uk/firefox-62.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "0b8ab5e88943be553a2a6482c266f81c790732099f3dba6614a1fe2c520ec4e82c18fe5aa525e40c425975c71ea992da6b04f336bdb52d1ce069c3cb715ee235"; + sha512 = "74637192055d2c3c3a75ad49147485d97f865026f43af3933830d513f501b255b1280349a7e554c4060b5b030947a8ae987e57e9465eeb83ae59d316d434fa01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ur/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ur/firefox-62.0b1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "03afad45c029f408369b44a5c6e06c7ea6d348734b5d8af90b94b0216646cf025c11239015698f7d2d94921d583a13caf57cbc176d55d283b990496dba6fa34b"; + sha512 = "f5ee9bd844fb230c445dcee9e615a75b9ceced1e6e15fac214a0d7f0c511ed1b177ad11885cc916b52b6556930827848dbbb22457717eeffd8e4683074fbae14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/uz/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/uz/firefox-62.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "dcb586205dd3965c511ac6d675d4974a7d3d3d9574e9db1e6abda9da93cbc197f76f0c7d656778211f3b4ade70733953b0753d58fdad45eb94faa214e325b8fd"; + sha512 = "1e4a2af576bfaf3bba1c9e54216015ee0fca177112ad5cc444c064d020cb1d5da1d63b761c6f63b0528bd073582ad3f106caa6cac4c3c56cc81687e235ad8b94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/vi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/vi/firefox-62.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3bbd74b322121d2c82d17ea137985830542c26a51fb154d02be9f09aafc5456160fc78567a21ba0a8cebe0b9f86aa7e7d83b69865517bd6a95ab8b34573a26ce"; + sha512 = "bbbb982f4924074efeb0b3a0aa998246275e9dbebaa2208bddd400a3ef367f5a6cf4377453a3e2ade02401699ea6149d39b65ad4cb88cc32da05488f5466051a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/xh/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/xh/firefox-62.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "ae0718ff478b973fa2c76470f5e2c01014f270402251d8474451764a431b7cf43eaaa59373904446c8e2045c844a35d4e2027ba2e694d6cfd89c7a38178d9187"; + sha512 = "d60563ae6e359eba3a1be3d84c89705c13d30abf30b45b1ba7a1ecaa10e9e3520d4801317d48ce3b6b7c4d2cc2ec79e5c14041561cd3c5664a27120afc2a45b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/zh-CN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/zh-CN/firefox-62.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "fcf70e05a796cffb027d0c0396861fba4a58c98ee773c5cbed38ffe09786f98faca147117915c64fc9b4d01081de55d4689547c8767d84609b66927d50982176"; + sha512 = "9152ffa08f60b1474650c41188d64eb7239e9a78ae8594982d1e37ad84e6a3ccad04e78f2f8e13d263d8d3336f4b385a9ffd60015ad0d5326b453a4dac838779"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/zh-TW/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/zh-TW/firefox-62.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "9f3978cbb2a51182ba62fa68c09d49e33cd0fb68be7d8de8de2e335997184648981cffc8e90764452bee0fc81a26ba9b8896ff630e81918b4634e8cf6923c5d4"; + sha512 = "24148a13ef717ed36a9787e433b9f9b6262912009df2649920ae39a04dec3b68959b2e9abc15d376a64f8720669a9ce9e155c856698897a7efa97b0b45042ca4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ach/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ach/firefox-62.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "ab140f06e11e226bedf7bf01b2f5c366b654583bcdba17546c6b8cd144ca6a71424f774316985d0885733a7702d201995a25964e2015c278028888a946c26099"; + sha512 = "2a69bce7fcc5691f5150b8077d01b5fce140113eb74e2934d2851c76642ed7c2e173ab35271d3cab11f94fc8f3971cc23d5159bc90d525614e6a759e1d7c72b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/af/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/af/firefox-62.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "8d934c0823d899c8a523a131eb31a7643b137f795b94c4d73cd675e0c10758cfa051958297dfbff57238383284eb7e8986ded98ea3b952d4b60135e426948bc9"; + sha512 = "443eb00d24ff3410b1268ba9e469239246dea7d4b989ea4d8b0f15b8e29911675244b9df76f6f38a3341b3385fc32a5394c5b9f2272257d07cd662c1d0397159"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/an/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/an/firefox-62.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "1a0523a8900909bfdb396c6bb16072918a78a65011f2f88d714ca74f8bc5e9f667b22e7a30529f985f34b55c05b547209c5d307d4c576cada9bd5af144718f6e"; + sha512 = "b89d592d03667289b9582114726e175cbb38f2c17f16da4e3d28d89d12868bdfaa1edd2109cdbeacdb50c54ab27467926d5dbc3f9cd364670cfa6df5f45ef552"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ar/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ar/firefox-62.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "283ee30ecd49786cf23207cd495aa58fca84be51bd65c329418ccd6a09e058222ab1d2cadacc94074b7dc35707139659639cf42ebb6edf1819b9ab5520cde691"; + sha512 = "5e18d15894477db914cf42af85b4e4d4676f93574c4cc04418ab32803d5709ceda37b283a4e0bedf5e374a54968b106f8d9211f302c7085a8abab8b02512da71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/as/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/as/firefox-62.0b1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "637fdae253df177d12feff2cd70bbf308dbe8f2bd51c09491de35dda9e666428f1f42c80a110fbbf38489c2ed6196e34fa8e6f9c1eacf15b15d721de0b8f37ec"; + sha512 = "92c26d4084ec2fabcd7c1ca3b5b69c1ed9396bfd7d6b1432f41a1c07aa10e292c0ff4b5ea509d2503cbe815a165dbf3400a39067dad2c266a92629cc5bc285ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ast/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ast/firefox-62.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "087bc7c5e22defd3141cbccc271e0be8af29fdfd4d1842cf6c1ca1f757921cdd5966c3c6351d489a3026ccdd75becdc5c1b318ceb64014593df348309d915e8c"; + sha512 = "882c6c30f681b495b971ec4499c79da7da6e51f2ec1c954071bbe674f07280066cbf66baab4d9de950b0073b7aa123d2bb2aeb69203e54dbfe40be66a6552769"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/az/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/az/firefox-62.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "68fa700cf5e085361bd49f53ec79fb096820e9f4528892d37c8c846aa2d3bcc7b39de0bfbcbbcdd8a23a52ba7a1449196e8c81909e0f8ad2924fb2a68abc8fac"; + sha512 = "1e5271ef465c28ba10117b8d9cbb02c29c26c287045121c111a8576d1edbee1fc66b16764ba18c197c6648fef40146bf01dced7a40b9e643ba925f4f6b771925"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/be/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/be/firefox-62.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b27df80f1d7052b5ac80f8a05c20b71f20d13b9f76b92ab10fc3bb591ce8a6d2d5660aff11d2d5c996843f60b5c0f661bca5f750a097f542e8ce3c719bac14ed"; + sha512 = "04211608dddae59c53a678a51f8f55061479be40426745fd5b6ce2c10cf6a6f5f6aaf97fde1754101e9824b1de99a767649b7eea06e94fc4b8777575f77c63e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bg/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/bg/firefox-62.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c1dda1a57ee7b565e779b33b41ba7a92eb49b8ec4461bb388761fadb69b33011bc26f0e253d7b9902cc526a105fe783209e8028dde3ef8c1ded2543d17e0735a"; + sha512 = "c7ea5434cdfbe05be4c99a46564d199207d3dcdaf817da34b3e4d9e66ae4569c91b79b03cf5ca49855c3cd6754f42c63130c220afe4ffeae67ed0ec38844103f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bn-BD/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/bn-BD/firefox-62.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "fbefb442d38a01c3d2b45b2f9f251a1dde050993d6c54a58695197a57e493a1b0c699ca6995b4111af230893912648b1e0009ae4b852803d71423427759491b4"; + sha512 = "6853afdc3e36ee170e4c58302e6d02f3f21881395d0630b35087dcba417e62af36e193a82f6b95bb27526ed39f817a7da61d04e34c29eaed57b946dfd0d2a83f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bn-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/bn-IN/firefox-62.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "dac0f5d616daaa19b2507ab9d43a0127d39bb41ddab92519f33f0e9950b34803e1fabae035d1fb803982d6f0b5bba7192695722a728ca85ea9602fb08b775cd5"; + sha512 = "e26c6c4a7d9eda29cf030be82432fb2acb8c7a63de441f10d8ad4b14ef63010ace42376bf6768fda952645d203487cf8251870944b2816f68d1d59a098edf5c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/br/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/br/firefox-62.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "bc4573646eaab95724a6b3429c3b0263fddbc65ad0250fe7fdf8ecbcb4a0422b39513d03d018311141e3cc67f95b994565949bf2fb31b41be10991fdd610d7e7"; + sha512 = "b84d2da5aca088b147327dd22d9ad63a381e4024d046663cf85d9cfee1234cf39c0fecff6e7fb5b647c13ab40b270489eb0fa92e56c5cae9bdb8e9b91b7f61ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/bs/firefox-62.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "a8dd8a5ee5637f8a0bdcd00ff142fdbd825308097bec954bcdb8845076dc8367c09ef4fb0783ab47f5b8581a6ce4befa9c883d445ff6d96e444751fe8d4ae23e"; + sha512 = "0097b0144eca625affa1228ceb27d53d41a8ac8d75edf74dbfbe33a2f00834c8430dd0a936a0ab47d85ce6b173b60a10e21d59e20c7f8b17350d3f6b08e7cadb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ca/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ca/firefox-62.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "faef1b8531dacdded64cc0bf572e075b81690de76835c9a5a108b5d3fa0486a930bd8bec943d91f177166c51b506fed683bb00071873d57bf87c23267993f79e"; + sha512 = "93f28382bb11907946bf66e7272219fc43cb1dea3d63035308f533072c768bc4c5d7b8be1352272f1f7ada77f1224932cfd028d6bc507d04dfff515c6cd61f96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/cak/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/cak/firefox-62.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "21b226e39e0d02dfa3b7bde90a47d407088d327a82abf21b5002e56eb28ed7605ea35b28e15b088d6486dc9735b7cb8827a51f1e17ef07da22c019214f3b0fda"; + sha512 = "0952433b064ebc8c347e187e616cd7a884e1947bd602a2fc396de898d8351c11f2f79a709ddd1fec962299d279bb15f2435fcb88319104fa2dd92729e34c94c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/cs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/cs/firefox-62.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "fe52d89c9176a4160636c04fcd2cbec1add30db3ebc64d9f2e01d2439b4f1f7412a5195cd29f1f7b7b9b6d062f880062f6fa33674a413a4257250ab764822b35"; + sha512 = "e4142088780249441c19989ef3bbca2b2d32bc09eec9ea32142fbaf87e416b7b6317b168706f161f8e9c77e2c924d41cb60b6682d24d1f899daf00e5c8a4c646"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/cy/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/cy/firefox-62.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "75f1f87cb31db73dadf4897e8336a7af2433ec89cd9cf886c5bd951aba3920df3e5f723a730607c868ce086fd8f4e5fbe3f6e31e5c364cc9b498586bb3804ea1"; + sha512 = "59ace20cd22e6d251f0f3de856201feab581d068dbcd0bfa4ec33ab6015613e52dd903e41fec8bf4e74aebcaba3fe7fe3b6778a2ea04e567a9446e8b125fb92c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/da/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/da/firefox-62.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "c0d646633133e05c792ce2d4459b0ed754598192508b0340a24886aa2b8f65a3b7487b20f6a5ba19f83cb64ce4f480859ed5f3d14e8c978c4bbdadf323988cc0"; + sha512 = "a9b0c3479917a7ecbb6501398d19f6d2345267772a3999f484e59addfe10bcfba458fb28aef319461fbd78c388412b6615f1d581eac40894e250eb49c8f9ff61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/de/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/de/firefox-62.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "583ba8d028fa48327747776c7027c1598e600860ee0b9409ebbe4755fd552c189288903e61904a16d3dd065dca030ee5d674618a8b14645c2e2705fa41c80d3a"; + sha512 = "a9d9bce5e8ea0ee67e158424be3b8cb9fd0057b784c6bdfcb9ae40b20d155f4a717a9e83f9425e3dd831c4c54fc2120e4c3f92473c06a30f7f619fb3062d5147"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/dsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/dsb/firefox-62.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "7b7a508fc15dd777b00a786abb9ad013f985c6c3389d78a1882323e50b3c09e49bf63391df5b3a4e91c60902ea4522b9b6eb5b93915bdedafdd303c6624aa9e0"; + sha512 = "8f39109a68ef0f8a2860e36ef271963dcf9d71a0030bd53e7548f49f0378f678766bfe7d1217ec55f06cd02e14279edabb7b04631d2642a323e94ce0637f0990"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/el/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/el/firefox-62.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "4bb687487ebcc9283ccfd737750f6724fcd787f441ed7d48eeb91133768191f04cb38770eadb854615907a04ccf1279746e6e12f8e7ec78086e97de6bae0a9e1"; + sha512 = "5c17db7de7e441b80f55650bdfa5c6dff90fa26eab0bd139301a81e41b40bf382bc1fd981e014bce195e0e9cc45a366bc4f35da8d5187c042ec6335382ab82fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/en-GB/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/en-CA/firefox-62.0b1.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha512 = "f922ca74cf91aa74b0e7fbdc550a2236333d501db5f9993a1d6de4bdfb825e33e3534788295dab0353516db698a753bfc3414f25f691d3547aa375967beb7f2a"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/en-GB/firefox-62.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "cf50aa3949578ee5a178b665e58ec148a8534226f31838b4df01a06d4e860b61ccb457d6c3f59dae735e8d9ca8e80434b27f2d912d437dfb0695d5c5d6c9ada6"; + sha512 = "2013c63b9fa8c3a3f53d8aac2c47c8c23d7d27bffe5ce7ac24becfdb96e90d200883a0ed8a2aa130b2d2f6c86d9f47db26a5fe1b4e9b4e8357f502c5ec3d84e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/en-US/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/en-US/firefox-62.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "9e1f551c0f63e2aa1db652b884315a366debb515197636d1e2b81e6d94d5c764705716f610931d44b020ae97175ad88780421071bf000751e66ccb6935360303"; + sha512 = "22a95c85c16430d0c4ba06f96727483e1d5adfe41dcef95e4107e80cc669f8c802eeec6dc16934473c33b822d2ef1cf080aa4ebff1706ccd4dee9b21d4107a3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/en-ZA/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/en-ZA/firefox-62.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "9720c4dfe5a2a9916325f5f08577ba0517c51e517a3b10b7e131fde709fc1ad26bdfc8e21b4ec09c0a7c0afe1ed6a213ebedb603f6ff49d8be3dfa8f6bded202"; + sha512 = "4cb771c4b43b07707b760526f068d2d41a622f7dc2c9abcdd5e5501149355d9d5ab39d8d860bf6a1b1c0f24a8d850198faf3127463158b4e62871774b023b28f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/eo/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/eo/firefox-62.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "58c514b410d3b91ba370ca3fa01cd6cbf2a4925875d77b7bdbefabac37b6c84327064a3086c862eb4c7a954bf86249502defa89acb245e725f521460e2fbbd82"; + sha512 = "51ea9e1339e19a889b9f3edf067a5560f7398d68cfaf7f10cae113b498db87770b280644ad18bb7e1774195b9ba0ca2b8e27407b7f25a641c6b0660b76da6699"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-AR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/es-AR/firefox-62.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "da2ce694e2e161c20edd137472e1217a7ec5b90611f58992116fbf200b53006599723f7510ba2e242e2a77c6279ce6ff0b7fa61cd5d45f984ad3bde2c473b237"; + sha512 = "9bad5b12fe67391fc8e9c1acd519344700a5d5f798590d7c861eb5a51b7dba8a4a1ce6b30d617872aeef5d8def0fa8e2378e47dec9e8da0df3a113ee5aaf9e8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-CL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/es-CL/firefox-62.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "eeb0d1e813e1e90da99ed7539936d3e8189598631c89cf41abad0069f5e992c972aad661d59a4fde25539c3a1d33492fabe9b809c95e9777d8ac5366d3b5d3e8"; + sha512 = "2c80c7d3c817bdc6e3003cf6bc14b5d05537d1f90e1646116bfb3f21f75e21b7dac7ff6485b469b8993f7719687f90d46375d4ad8f607849ac64ad9135baca33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-ES/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/es-ES/firefox-62.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "ec875171c103e574a91f7930a346b9fa95df13288a58461ba8f7affe74cf97f741394c98ba4891582cbd19c26b870e46cbe021678625c5435e3ad42355700f05"; + sha512 = "c7a90515291dbcd86f357392d73bcd90e31bc919f192012b3b91588ef6ef2ace9ba7250c62ab54f6e94c8ceea190e940e82a7bac89c14118095917781c23bc45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-MX/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/es-MX/firefox-62.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "974532385a78eaef5e29f7a345c0b74af166251ab7188efdca7c1bc0a579c4677739adbb3c07ca1b27dff7012ab1f31be1c6aa383bdc4a46e84ac34bee25ef71"; + sha512 = "6efe529d1aebbdbe28266574ef9ffe93a0866a8f4d43f73d8712d97e50632318b01deab082a421229cd11424f4c8a6bee00ee11f9a32c68362c798abbbdd3ee7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/et/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/et/firefox-62.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "0dbe8007bdaa26c8d4947f0f9c58233255f5e8d16beca1ab499e1d67f386f97733071adbb5102abc24504193410aa0d0f43cc0ebd235d06d35e61b6f41b70375"; + sha512 = "82f0dea819f21ba2f8def3c7ca5157c839463b6e2d544b64acc1a798fe7aaecd9c173150dcc38cc5236e0f3626f1012af33287fec1f5f825b1f9b3074b261ffb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/eu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/eu/firefox-62.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "7ea445637a36d5868a8c8c5b8645e9266082ac812e5bcf36ed4a5f9369324112d700fe0809cff3bd4b543b15e2e09569fe4ecd48ba72319321287b76c6d0a896"; + sha512 = "0750f68158c993a30d1551c0218d0480cabcc53c21987458784751277e84525acd673fa930d34847eec5400e4fc0038982a336ca5d06e2e9c40ae342e3ed5f99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fa/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/fa/firefox-62.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "612eef22e6dc033cc601fc094f22fada961c4309923245164459bdac44e584d3dba0411c5a1c708585b3241a8893cf7c760355a3d1f396320354ef1d104599d6"; + sha512 = "6812e82c39bc9635bc58ec0db38259062c118a8dcc2c2f55e8d8ade72db4146e4fb70509f1a7631efbdef90d34b016f93f775e4941dd0b395b0bee90d395447c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ff/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ff/firefox-62.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "a927567ab31a8e37dbc6503e9cdc1048deda751aa88294918938bfda055e7bc5175383a0eb0168c65e69c35ad758b9d6e22da1765fd41901e2818091d7031a50"; + sha512 = "0dc650e5617432b162beb981dfe86cb76291c30b58bf9ba635eea7a8395ab3c8c83db81c61e0585574e37fcf1481d953cfd8d2b36c48f6d64cbdceea8c90971e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/fi/firefox-62.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "0e2db17c273b356c9fa62eebdce05ba2f2aac8dc8d593f96c2e3c9aa65a0e6aa183d1216342970bc78173bbc08ecddf0016c87989f36ede989d65410350c5588"; + sha512 = "c6d04dd3abb11f717f23599d4f62fc2dea8d36c7fc05da4050ecb226409ff34c7f2180941fdb178d4ed6871b290c743d8b6b47cb1c10f88f93575fb1ca53e1e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/fr/firefox-62.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "09979e982d82581dfdba0c1737cc7b4e9849d176396ba084088377bf86a9ca3dfd5f9174056154f85bc95632bde09766e5e206b2e6be7f65f0ce63f6b6cf4f2f"; + sha512 = "4eafdae8fb6cc36b2d85ebc478aeaf80fbfe85359d955ffd7c9e34046b27aaf8d81f5a91e67d0ce1f9a0a593d7df258c9fe479fa4eb3a16dc01788f0aac4e69c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fy-NL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/fy-NL/firefox-62.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "515b5b9acef3bb11e412e7ec26b05176aacf8e9c4227be62890b613de0d94d3f9dc82fea287990d97ae7ee2774814c7aafe6c02bdd74d2fcb88074c17d2fb1b3"; + sha512 = "c16b78bbdb512a194d785f67c6a910fafe24b18ef3e9bfa3b3d3eafc411e264ae61c34fd8d02efa075531b694cc79bb14586be3b0a69af974f042b03d40344ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ga-IE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ga-IE/firefox-62.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "90a3932a735da2c82607d2cc7403d6ae274c6d6a292dbe7b409752d70ab8db47d3411bd39c48f9643f54fe21896bf48c1f7e6428c7b903b349b9dd871404e9f8"; + sha512 = "a9ee9bbdae4a32b1d350da589b5c47f9eb258636ebeb6f1c00c90434c2d26fb9ca70041de64f7d45435d098c8c6d145cd1d7d7c4788acfc88e1ec9dbb0ff17d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gd/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/gd/firefox-62.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "04e0c9c45548666b4aa8b22fad375759b4fe8bf236e24f0039a88792242a42dcb928401b2f84b1f978ade360182538d246846e3d066fcf18de3944cc02544e9d"; + sha512 = "6f115c9246ce800e64cc5c65164fb60c1752e847df326a41199ba674131bf4d2b49d9c2c62bba6ffd19b15bbb717dfddce3a0ff8f64ee0179f8c176d5c530f9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/gl/firefox-62.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "8e33ae93083535d3e16c92121f6af480193640f17018c51c648ed1cc8d56fbcb43a5a1a82ea964a494e19bfd23f2abb22b245ff0ffb22511ea5273ababb603b1"; + sha512 = "dae7fef780ea737978253f92bc0c10f2f708e4206ee7ca02eb886e73a6a06509e3426498a35349197d758dca5bc4b899297d3713817c47e7b440d175e11b42b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/gn/firefox-62.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d8d3a3870db1a62a513aa85775c6eee8a2de6c5aebddd3ff76e9a98d1197e38509fd79caf80135c8b1a3a01350633f697a88a3c5b4e99bcd1596e0e8ac52fcb4"; + sha512 = "a98f3c244b828fec424f2c41a0e26590654ecf58e6216cf279be1c455afff1fba605182dc9b1c75a09be93df60b4feaf46b5f0c9471316c692549125c603154d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gu-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/gu-IN/firefox-62.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "648d1ac593d0dfd81cdf8ecb5881e15d3378993b3dba58d0702ce6c4ce8189d589d8a5d3ff600841787576a60c6e6af9aa5aee7ae6f6ea182d8ce9c5bf1e368d"; + sha512 = "00b30be562063f65383750fab39fb66f67c1deadd9826cc8aa6e20856aa129ea999c1f0660cc4d6680c343cccf50f9d60a0b16c062ff932a06dcca3d79b195e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/he/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/he/firefox-62.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "37bd53fa8de977d6fff8b86134a2a280cccf7b1027b4af3a28fe7a1de6d5571c63797be1b029231e0133c60737a68d5d6c3ec5f8ce1901e31d94ae9533148166"; + sha512 = "e3179e17d961f8d8ed29189e5e89e249ba18f2cd4b084cd1b47ec965af7f5403609673d477df0ba418fd1c2cabc7e92afe43123fb247f41a535eb4a34a899e8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hi-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hi-IN/firefox-62.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "375725d897b046a40793ebcd8689b6553095f931a348a38bc61b8123ef94f34e9f0b25e699c048968126ff26d09c2ca5b976a671251a8ea10a8edcaa837dfa25"; + sha512 = "bde96bd5f8225bc5ee7c3e304c39c5f36ca06ef3a7d9d0a0d56db0782b9ddc64b4024b26c1b79c23caf54a219521145030e2e4f019448e434e234e058fb81328"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hr/firefox-62.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "58c400af34e1e771b04e9567144911866dc752ee4d95773eb77886d63fe6e136b15594cff3910088938186e84a5d875b6d434a07a3a5ae4fa3912f06f75421b5"; + sha512 = "983e6fca9dc9d505bfd1fd41f3a69f54510087180182f4fa07d4ad4b9ce180b3674eae6efd5f6be36be5c02f555bddbb81a52e21c6f94968395ff86ad7d98c43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hsb/firefox-62.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "29f47f4b9d0878e1f8977254f7f0a7d919f023e3d5a64a0c53f64271fcefe6416a278bf83025f8e235a9be4fd7b0afca34f5c796aac4c0c1b204118c3ac5f9e4"; + sha512 = "f2d76467468d62cbe0b14f056654bff256ff6ace2de45d9b957424022feacf6afa385841b7763443b2a7e4033a14693616d1a1d117ecdb7cc6da6ea34c285d0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hu/firefox-62.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b2776f2003f140648fff22dbde719a325b7eb407858086fae671149cfb975c89f433cdc5057daf2cd07e84e4221026c33cd45f6af7a9f54e9e7174bf2fd26636"; + sha512 = "d2a2d116083cb1519502a5c8d42f6c8b6a82e3fdcc6a43cce388d3c39fe766a2eda0f9355565ec503f83d18f2993d5d2ef22fe8e72a469594344ec878fc34f3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hy-AM/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hy-AM/firefox-62.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "889b4f043aaa78d0a5418fab3c406296396081c5a21338ec07340f89288ff0f99e7a566aeed04e65765e211c2bd8ea5a8df54ff2a9cb880639114847008b7524"; + sha512 = "e16153be498984c1d86aa5d409ab20f24864a7cad5dd682e7274853366a8f91db1d9b3adf3c0025d657004282f6eae736c3a6fb1f98700b3d8d86696d9b27766"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ia/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ia/firefox-62.0b1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3567a4595f322a38cfb3cac147c635f658742d516e102e07dd8438b7939b0613ff913ce86b0ced95f5c0d7dd5e0e71d673534aa5f96938210fd5bdb16397b9d3"; + sha512 = "413e252c2e7e1fd31c4c39ce6e05cf31d47de79d25b43113d9b64e3ddabe35e2a292052c1f3e32628e617e5bbd4121905fbc8e7899aaad6297dbb8b08c286b0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/id/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/id/firefox-62.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "0cbfae9884e3d296730244f15342952141771b0e6f1d48d30b29ded30141c51cccd9cc0cfa60f50987d435da6e306deaf93c7b9dba86be591d958e441db00b2d"; + sha512 = "0e602ce9a799ecb08196dd22fd00226ac0efb1a95d2fed43d69846cf1c1d810ffe2d08c39fd9564c4e133bcf94fb8642a836fe6760e9d0a4e86b0df0bf3f250b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/is/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/is/firefox-62.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "ca491e6ae92d933b4fc75c07aad7580f8d5aed90984363268bba1a2db4c237b09a6a8fa09a3b475d9f6e06b9def57a948207c44c9572d1bfa48f3914d9446eba"; + sha512 = "6896efe5a1982e2b5126891f7da40c43cf2eeff59c76d4837d0327ac873dbdb190609ef2e84130bfb38d111e4232b029a713bac6c9bfdee5f397831b68fc9c50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/it/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/it/firefox-62.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "1b35e8cd0c2eeac92ef7d43ca73ebab85b731cef5e505236f5c9df4e9fb05ba8f03455ec2ac6262a0bd86e3a05c6d8ca236f9437277c36154011e6721e795e75"; + sha512 = "62bb8fa38d8ea96af516d9c69c981ed959e66824785040bffa809ee7a1c6ba2e4b6e324beba263e5627183e660d97943960a2fba31f72b7d751a85a963538787"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ja/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ja/firefox-62.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d9252c1e002802ef09e85e04586dd983adb5fcdfc6248e5b7cf71030697477785c74409b27f6640c02a026a621e6edb6b20842cd0d6e2271ef81730a3b2b5cb2"; + sha512 = "a968827ec6d07ea4a88722faba0deb26c633e755278a32072737f139b02309aff3b8da18f48949e0ed737a04755138c8594b6c10bcb4e65d09aa9dc73a045174"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ka/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ka/firefox-62.0b1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "a9b5fecf88d96bbfe34901bf8a386c8b31ad97f87c322294a0362d992b88ab42fc78836c70cfe27301729aba46c21648da0377a0f113b99ddf14b524017a0b66"; + sha512 = "767b550e392e5547c269cf04e06de184e08fabaa3a1a06bcfa1932411589c7bf661817038e0969b8f1ea51c99b676f304d1308142d0eba8bc5b6338092e06c8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/kab/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/kab/firefox-62.0b1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "5eab8f88267155c8d8d8164047e624900ef8d915ec5c1c4fa275df7ee2745427e2ef50254c92127d5a6768c70c2fad9d7c7c7c8af1383793b238ac00a487fc42"; + sha512 = "d3204991c980728d23f01690041439d25deb6f338bd88c9c9636bd773a726af7327609da029a766c0d65c9a2f8f0801ff656ba195996bfaaf3a3ce2f050f23a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/kk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/kk/firefox-62.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "c22908d53da55aa3aaf5929b29af37d6b273df6164784bd03ce89e7a9aaded8cdc939ea0c1e7b87a9c4ef3ff0a76273ae1149259f9ba8c3d98db75d6b8755e20"; + sha512 = "650ef47cbc485304ed84ad674a0f6c0e724f612a90694eb20df7bbd9a88f9be4aee5acc9dc3c3079a95b11061cd34f0147c39dc16a0d49710a270c7e519d369d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/km/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/km/firefox-62.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "ab73eed0d4649afa678e762e361eeddee7d188beb41d4415e272e8bbc855c25666642b5b4299a3a4b5aeb80d1fadbd59c3dbcabb1d30c2bd68d2def706259d3c"; + sha512 = "35eaced569719c0877a3190b49163a3b5cca8c9aeed2ba868401f1dc2b5ddc28fe60e5235258ef4d9a2b5e7cd25aecdbae008636e389dc2663f0a10d225179bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/kn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/kn/firefox-62.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "d5219ce9149b510283c2178d51c209f88c97e5c73696316f9c0eb94492950c6d9d22509655739cd32905d6e0c534245e7dddde9a5630f61d2dccd14dbc968663"; + sha512 = "8626cc39f2b65543a9dc7cfa090db7883294a47692740b123413dfd223543c83c961a47968f02597411e236d2bcb7125f0899db52c78041d830ce89101c7bf8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ko/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ko/firefox-62.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "633f2b5bd4d935b48c9da2e00b1dad339f9ba3fc6a0c2102e0b2e66fc4c3177013e47d99afd6de9d54d7897b54270b85849c60ffcdf3f75d78d85f1f85785df7"; + sha512 = "d8904507cbabd5e89bba2ed3d39da6f2e7327710af5390f75c9a2c8f99489512ab54f884231616469ed989248c384aa3ac1d086dcf42d02b92d2b44e75cba556"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/lij/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/lij/firefox-62.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "b29fc63919da339eacdad4e9851f1f0b63f3f3b46590b86256b9e1bc7d0ecf7cc91d708b54e1145add40efbb146d8e4470f77a4c33118ff65445e2802e6fefe7"; + sha512 = "f3dfd0195283582ed07e697c3f9996ca20c887909bd4f1972bb49a980afcf41e77df18fc81e0bd9f52519acf3507080a1e58512a0e50b7978acb8a17269fdf35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/lt/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/lt/firefox-62.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "6a38be681c24da3c3aec3fa78a0561f96d53d1b1754dab1796f137cf1c1dbfd559b3a4e77bbcf47d5571b56f0ee176af0353827a5899db8424e471af67a29022"; + sha512 = "53d0481730b86a6b964e769f6d3fa849d833328140fa47ac5d31a7988060bafee5a5309678740df15ce8ad864f9731fc3277a6a58f8577a857193709f09dd033"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/lv/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/lv/firefox-62.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "9e5d8b2ed27810964862ed7b1308db33de6d518b1cd293266ca950797066e8108d8e5869d3062870f74d38dfbac9776cd926165142340ac5ab920ca0cb0c6fd0"; + sha512 = "283f3f9345d8d7bd186ced0f417c5dfc02b788d357bb45f366fb8e92fc5985e83cd80bd7ef8b085fcc23e276fc3411395f976731810edccad61c63d2edcefb7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/mai/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/mai/firefox-62.0b1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "ffc81f670b3bcf5c43ed29e8016cb240a8c9936eec601e53092357854f2587dcf28943ac72a098791398bbb98d37b68cccb9a813db9dc22d0a44328b788680e8"; + sha512 = "fbbaca82dbb5cc794a852bdbb2a766b5f90f5c061222c4154200641540ff6f1d9bad5cfd5f3acceb5fabd69fb500ab7c21c43186820601d089a7cc1bf5168042"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/mk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/mk/firefox-62.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "711d7b92936415d46574d144e0a718278807d00dcc252e46e5bcbe528e578ff9e7d2baaa76be20e18d8b41f492a6d7b4bb95a6d47e899adde988ab5fe47900f5"; + sha512 = "39f0c19e563ffe0ef44596429ebef45aa4176ddcbef35ef1de4e7c006ce93dc21afa5512cfaf343ae46e774a7e92a471c2d0052540d3704c5dbd30def3b86abe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ml/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ml/firefox-62.0b1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "5d0d5ab64f8663fdf700c317c346c79e47ee4c035589b4eed1d8f928f5e78ac8dc8f60c4183fc6d46308b14306298be4d8e87c69ada4a7d3a23f9db8473c62d4"; + sha512 = "eabc942d8c49bad4a9a1ca55aca4762d56c58992a37247aacc6ca2426713e9116925827216386140160649dd86005452b3411cc6158ebf3191bee6cddf621240"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/mr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/mr/firefox-62.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "d97774eba736fc032b06972e1684464022db0aa9e0c67c815f71f07bb5e9a1df01bbe5c93d1a9011d4519430264d64aaaa6cc13bc2fd778acfec69138118ee92"; + sha512 = "56bf7ab49c79aceb18c6c11949a72813bad2589480a865d0da0ee3986869004bf544cd2d66510a022d60fac8b4456162bbdd479f846bbc0f0434ce8e00146cb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ms/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ms/firefox-62.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "c3204e7880cbb6604f5dc63973db3b4c51c01e1e54e9a03e8b18441ef86ae70644a038fbd4e638257195c5cd6ce2706dc385ac155936a8221727e916ded6f6b3"; + sha512 = "19be62f3476f136f34660336ea7e96058ddd8699a71c5b2d1be8c444b372205fcd8f16d5d852ec33bc848292b346883fb065837711ce28bb5b16cad65a62a5ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/my/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/my/firefox-62.0b1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "6a99b4de109040f7d28fcce85efcfecf07c6d603d77d21d28e9953f3d240818d8d2e1c0ac51e732cfb2ec1a5d431d5610f8d92fc125ddf3d5b7ba38d617ae633"; + sha512 = "293c80b252f9a6102d7d259e493cfa4a263917fe1204bfbb0f82215bb17905055d99923fbce4dd029d83faf92d29327e2b8326b082cbceb15dc18dbe0b041976"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/nb-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/nb-NO/firefox-62.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "796ab97579eac69fbfbdd12e62e3457c9329587a4a69d999ea85177ad9871c42b89a84641a450c17cda7536fe97552d4d5b2150d21261514c649f446d76c5935"; + sha512 = "acf870d40309cf7fb39c30ddf41a88555bd037ba2ecb769b30d41094efd1e29181df91337286c0d8db76bc0bc3e2da915e74e409f5328a51f2f73e0f8ed05cef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ne-NP/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ne-NP/firefox-62.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "3efdc62d62f3f3da82d3e669f3becca6e26163a05d72cb94a42bc5a8c0cb85767d1da14ea18348d13c9b43856e4fdd6ff2a21765fed622b1f087eea968440574"; + sha512 = "bf47317457835eb796567bf21c41b5cd4e88e8f5e3623022b8fb3a6975604e5e0f637a4297b68cb03d88b08ad58cfd6bdc81523a349738a12f10b6ec005e17ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/nl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/nl/firefox-62.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b70dd7e08bd397b175030c28b93fc8154f4a5ffa7abe1fd6f95dc46f8b37ceee19359ef1d451cc198d93222e50a5a6a0e84616f2b1d361f18e53958332aa0d71"; + sha512 = "d489b412aa16d31f1e81a9715ef8efd852803b1e8c26bdc1aa496c5c0a73263826affdf721694213c638a1dbf37333e9f45d5ee0286b39c236cdc3a4e1e6b4ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/nn-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/nn-NO/firefox-62.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "a7971d6900fc9f35c014e0e98c1c7efe672a81c29d00de39c76218b347c1e3fe0b1c241cee92593fb38bb236cdc756016d597830b4db10d346041560e8f95ce1"; + sha512 = "ef1660457ffb2cbe6b266b8d6295bda784759027abf8afa5179d12ef302374809b8c03ca8cfd028444cb727089008e75ff15042e12f2f883aa18cf27f9baf76b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/oc/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/oc/firefox-62.0b1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "281ec70ff1d62c5343352efe648d7db8f4f6b49e0a608427b85615e21ff0c435531fdfb57afceaabd446823659665ad6f411521c605cf846ff1a0d9c62c76b8f"; + sha512 = "b366368985b0491a3fdae463c114c60147d080e8347ad085d5db82d65b2a8d720f7dcc7486e0b9e576a83e335ee1eb3c8949949a49463ec7eb2dbc43b6c72f98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/or/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/or/firefox-62.0b1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "e31b8f043d2f468b33a7561c42eb09c904571d2949d53486c2fa44a07375b6321efb07045935c8a6cde7a3bf1caac606218c8d658cd067b2a08d3321d4684cc4"; + sha512 = "ced81741353263836d9bbbe13d3e981fb7c83f55f9a2095d1bbb9bc06a2221e5e125578096bfed54b66e3707a6c659b9a4736ba1552be1809ab7708587a79115"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pa-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/pa-IN/firefox-62.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "ce200baf1b4f99ce75fe1a8bc9e07d2ca05c2b231d05afdd93de385b56609c25586a92d67554ec292c916f9ba775c0b65750e3d3dde07229f70ef6da34eddebe"; + sha512 = "c3e11f3580dda5b4a11c50277d9da81fc94c23ca1ec40e2c48ccb828579a9443b3a4dcc1bf3ae24ffd78b8aee9288e0edd00eaeb0f44cc89ed06f45c03e7ea41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/pl/firefox-62.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ceff46c9b211e1df3f52fd522531f329b4f12ab7229fb569d3eba96e2b5d8aca49f8482d773189e129db1a893de85aec5bd1bb3dcf5ac87715b9f042b7b8eb36"; + sha512 = "882f35dd369488c3d2c7dfce8205d3a165e8fc2ffd057166d6ff4e61e1726a4452d6a5acaef5e65571f6247718c489e0bec0a7e5960708f44cbf5ddf08dfc39e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pt-BR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/pt-BR/firefox-62.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "cba9d2c59717d10308e9ba36fb20e6b88f13b3d2ed9620a64ee5125bd19b173a03fc3e0d0344c9f022b89609172ae1eb71603a705b6374b057864d391d951652"; + sha512 = "9b03a2fefd05f986878e55bcf88991273112a44bdb216598a9a5a56433580a8e5c344be75cc13fe6799e701127bbed67e5d768520611e981c6b54a569f281b0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pt-PT/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/pt-PT/firefox-62.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6ca78cdca5cdf329d5ae153f016290c7e2c25c4db19c306460b902b217ac8c38fe01061c43f3e9e12e93c2805aeb7a44c5e1828e4235dc0f457a178caaf4e08c"; + sha512 = "565c9fd3eeb044e56da27897c20959e65d17c653521d2ba848ef73b0533519e0e01ff482e4bdf352974a584d654bde23d0e58c929722554125473f420b286e25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/rm/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/rm/firefox-62.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "fe9fe0f3a3e1b7409ab2452496b63376e124e1fb5bf3c3521eda8afc008756bbc3011189dc9efa520d6332a5eb734dd2d1c5d1d0a1396db1aa116530ad8653e2"; + sha512 = "66cb8e518d7f794341afe9310efd5588bd88a81eff38dca36311a60b3140fac1f83b30eeb78ec7f9c8f999e276eab50964b31b5923fec58ee0b32c333285ebff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ro/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ro/firefox-62.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "9fd3fae5bdfe6b41b33b91672bb46fe29b56d750e4df5a7dc069457623a1effce440c875847a36a0c18c02f3182ffc60b103a74352a3316d57b099ecf9a71eaa"; + sha512 = "3a4cd4037f51347cab0b198cefd3fcee5c201fde671ed2b781553ea336a20e1a57809844ac3806f771603693ba9f118416cb4af5ea0cae029f99f4286a89d22e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ru/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ru/firefox-62.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "2df4bf48b71daa282a360f6877530e67e8e5e050c70066b2bee890409611053d72a0cf698e80f5bfabf3a9c5482997b66cd1acdd98dbf5027d5abb9224641bd1"; + sha512 = "f44fd98115173deb2d05804842413ee4f05629e07d4362346a51f97a1ed0ddbdd6f6c79cc01bd89366bce2f455cc27af56de2807954c913be8a26fdae9495c82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/si/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/si/firefox-62.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "d05ef105312b143ebf85131f8e5645281f8ff0969ea891ff455bb5d300eace172abfcfa1a588afbf85b8046e6c51141774c7482947d80110c0df20ccfb54be93"; + sha512 = "c2b3473fe2994e57c5321d4cdce60c250e0dfd11915449afe2d3033be2f082817e9dd6c2ea64a000ee4f20ea4fe51b642dfa6abe1faee976ca2dfee754d5ffd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sk/firefox-62.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "64785b3e374e143037e8d278c1702d82b6b872fd7c839713ff2272beac3c63e3d39b7eda51fccacab1c2bc313d373d5850f9e6425ed611759d1073a59d785d76"; + sha512 = "eb0cbb65eff38e20371930ea56450478172360a85c6692b14bebeffaca47dd2c1bbf07446294e210a52e14749c31dfc6dc34c36fca8312bfa4267ac17f2e5d98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sl/firefox-62.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "82fe1143c73daa2d1b2c4322c783503301470c8df32fafd910234a156dd8ec40e327b94134c52915fe39e5feeb9e12ab347172277ebfac6d6584a352b7d05f56"; + sha512 = "3328939bf37de6646df07b2f63fd6bbe14638587c9f5349b2899ae1bdd11d4d57d7fa8d43c9bd6a915f95815717b1b9cb7b028be250428651ac5c73d9bcd3686"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/son/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/son/firefox-62.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "69e0839613b34afb114628998f073cf48ebbd58fe7ca64b55dd14efdc3770bb31ddfbd8d4e4d57fc73d6664bade0acfa57d0ac0eae849431d6064bedbec66a66"; + sha512 = "2b833d57529f58a2a34ca6f3770cadcb14cb4b7758dd3a3c2f5ede33b22fe3759483b3af7db17b87272a255a044403b4b8c8946c6e6358c3edb699347c6caf03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sq/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sq/firefox-62.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "d198b61bc16b71f4ba0bc5cd6e62497e31103e3df5b2aab759166721c44410370e606598ed9b2f2bf1eadeacfef5f723434bbdf8ad781057e10f59bc82b2bb4d"; + sha512 = "96413625445c9afb849ef34dfed5f7445f61038b27c136add1ab43632a3e01e645804aa48cc0c4df8a89942e8a4b3ee41e6999433ca8f35d38b411358d12656c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sr/firefox-62.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b621a05fe50181b1c94f408f680d48fe8e596da8b7df353633d4d8ccdc08f25443ab79ab4e6f858ba6fb8a656c140813e352ff3e1689176de0147701a2396b0b"; + sha512 = "a1f9dfefbf53f8b3583e318d9e7bb7c6443e302b54db220dbbd7f24369abc3c556d49aa07174f979c565f81a22154e8d340a76746854e09af2c5beddb345dec6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sv-SE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sv-SE/firefox-62.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "85e20d2e721a22abab9a1c369cce31514edaac7c9ccce28416cf3eb6e46974613ec175b33783f07ff55636745d6ef28c35cabefcf7b8aa70f925fe6fdafc66c8"; + sha512 = "42f99df87e0b45ea29c51ab9a4d3147f9956980bc62429a6cfe29a51d394b2b9515a0c042722305b31f5d3834502b6d032a4eca9f060a3fc3c6ae9bcf5efc128"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ta/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ta/firefox-62.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "5162bec39eba7dd8c320ed75de56c2fdbfd66fcf47036f3c07fa8dc849f5fc532f0871f7a8de287ab69d6fe7e1c85317f9dabc64f7e276a40bce531083f19d85"; + sha512 = "4342517a40d246676c57aa1da4baaba44af63ee8fb5919d0c040b2e190efe2ace068da4955525dafb42f55bee84c5c7d0fd27347c6743c84b677c6a76b50bf86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/te/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/te/firefox-62.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "063b9ca6d71bd22d79ff21637fd3f32e711582ce08331b7fd13b7271f759072d648b4de0f6503fce35990751d4da9c01429f38de5ff12345ddf5bc16dcdd000b"; + sha512 = "a37b00cd8fb297a67f57c0e493d112a31c7d51da45f63312b1afb689bbdcb7c73ccb93b24c721137534dc6d2f4d4a08dad6b9cdd6f075d35aff3cf3b88b2bc89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/th/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/th/firefox-62.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "e42dd04acffc8d4468833444d23bdda05d7696f37376c6afbc0a2af5d7ee78f8ff0fefdc475b5f69bbf4e42b93f944e6bf2550cc4975a114699992224a3a522d"; + sha512 = "23bb835d03d8ecf73f474ab20b9af4d0064e794c93be320eb1902635f8ddf63b83425e4aaed9457b949bb97f15999a1aafa3a831af45eb7937a5f3f497bb409f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/tr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/tr/firefox-62.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "27b34656efd50449a3cc86a9d46dc64fb6fcd8248b4e8e43fe871a7f95138187a0102b87d1393cc78c600255e745dd21c2b01870690e4e0820c6859d8dde9dce"; + sha512 = "25b11eb970a5bb5889cfd36e14865bf53de05de53fcec21ffc44e4e57889422ae668061110d6c23fa94282619a7fea69aac1baf2e3db075b61f8aef68ba0a00b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/uk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/uk/firefox-62.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "537871ebf2c3457cfe9b61ddc2ba4916e502bfcfa8e2d1d4d10b84278a025ab3b859e4fdf68b1ba7ace37c0af14fda702f2be6a7b0e1ba5512c63294ebbed7da"; + sha512 = "d1ccb9277f72d2b575bd1bdeb26b05f8be1fb7dc7aea801f51ae1e63684c541cde9e203ef2bc0f01c48b01ad9b85701b40117573c5b44b2f8fafcb3940993576"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ur/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ur/firefox-62.0b1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "89f5c1db253fc25ebf57523471c1f9a72797b3e2ee67eb4b74ca06ed297976bf1c15b7a25d1f1eb309d759e2f146e7210a8a33667b8bb22e254f071c76f7d49b"; + sha512 = "9fd5a14da1c5ef7f508c0852428d7657ec646785cf21d8f381b16f8bece68699081b85507fa7e69b186533f4653ca27038f0f976899ea8220a97cf8e199d22ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/uz/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/uz/firefox-62.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "3050b5ac3530cbad7b31920921a9aa29533614264a55eae9d333e95a5d57568f8a7002a3c9739a8f55594983d70fdf0ad29d38d8f9e7b212df23f488ebc26515"; + sha512 = "24ea3aed72b06fcc84d4e4148ef7a766594f94de11d49a67239f3e454eeffcaaa74e41b93d76a256ac0f9bbd302de2e82f02356f4c650c80e9bcb2ab01bafb65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/vi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/vi/firefox-62.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "03c6ab48cd6fa0a797eee0acbd39a14673da14da3f2505b445f08a3b6021c3d6e01baf48a725c8fa08bc68d5189eb8e0a8a2c150e9563a149c8a221b6c50091e"; + sha512 = "580fa2bd0d5a5105bdf37f855ad67e12df04cb556f03911e252f1854b7749e407b0dee93c643d44371f4e03a9cf4c1522389c7fe4b36ab3c27bd5f1729f0d942"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/xh/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/xh/firefox-62.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "bb9b5bc312024abda5e44e8f299217cac7bdf3cfcf26f55ee1605ac3c4b59fdc5a59fe0fb8897243b9e542f83faccc3025c77710d236e8f937844f7be101d272"; + sha512 = "8497ee2217b0f0588579f56d64e56c7e17352b0b88d7d3fb98d46ee67889f017bf69ad0c79480c24108445d8c9a171d047c3d4c0363c9f447f50f4863c8104a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/zh-CN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/zh-CN/firefox-62.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "bd80296763f7c82be3bc02e75a47ffbdabf37873e41b82b213d71aa6eb165e742b89c1fabe00ccddd2c9b81824e96eb51186bcb399560e285063e050bd435ae6"; + sha512 = "168268f4cf22dd22c64fecee16ed619c6adfc5370e022554b000e92c052356b31492a10733f55fee3c37d45b08a3ab63f66545f4e502101f0440f9c683837e33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/zh-TW/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/zh-TW/firefox-62.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "995e0a228a83f464b3d47f4b9e0fb9b692bf6ff2af4c526e6046cab17fb4c15f1e36d7822efd55731bfe812fdfa8885fd60e4431cbab0562ac6dfac21fd3aa6e"; + sha512 = "0c9b3475773dc7669c2408c8533a23330f3c3f49d6b07a807a16eeab946ef933fcf505f43835237f690f49045489e3ad294a2db74622cd09ab2b4473e8eac42b"; } ]; } From bbf359ecc8baa1c627360d3e4892a4172f28a78c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Jun 2018 09:49:21 +0200 Subject: [PATCH 257/265] esniper: update to latest version 0.35.0 --- pkgs/applications/networking/esniper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 80984208460..a7d10adc0a7 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation rec { - name = "esniper-2.33.0.2017-11-06"; + name = "esniper-2.35.0"; src = fetchFromGitHub { owner = "yhfudev"; From ec93a511876eb9d9dff4b9540ed559ef6ed31880 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 09:54:20 -0700 Subject: [PATCH 258/265] grails: 3.3.5 -> 3.3.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/grails/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/sp0w4frknlgjhmw18j8rsj5sgaf95zhm-grails-3.3.6/bin/grails had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 3.3.6 with grep in /nix/store/sp0w4frknlgjhmw18j8rsj5sgaf95zhm-grails-3.3.6 - directory tree listing: https://gist.github.com/8278e7c1c9d28a8983fdaf23975bb930 - du listing: https://gist.github.com/10a146e1e865583f68e892f13c310026 --- pkgs/development/web/grails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index a0d8a0b84ba..e5e6f639b95 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "grails-${version}"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "0796jbcblr3vxdf6sngzcfs1m24d1ra1n8jc7cnfrfxpf8r0z15m"; + sha256 = "0q3rbz47lp2zh2794aycf85vnic77dg3sclrqbizfpdijma87iy7"; }; buildInputs = [ unzip ]; From a3963742e5c2c5ea972378852776026e26dadb04 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jun 2018 11:39:58 -0700 Subject: [PATCH 259/265] ethtool: 4.16 -> 4.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ethtool/versions. These checks were done: - built on NixOS - /nix/store/l6vkhh88xfbdfjaqm9wmnlvm1q6qqg7i-ethtool-4.17/bin/ethtool passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 4.17 with grep in /nix/store/l6vkhh88xfbdfjaqm9wmnlvm1q6qqg7i-ethtool-4.17 - directory tree listing: https://gist.github.com/1861fff97928fe0b6cb81079b3266156 - du listing: https://gist.github.com/65766ebe5f7022f5c96f6f8266a93c78 --- pkgs/tools/misc/ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 62c782b26fe..0e0bc37ad53 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ethtool-${version}"; - version = "4.16"; + version = "4.17"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "00ss07jc7p276d83f6jpafgwyc9yiribciyqcgx9j86v49kpm5py"; + sha256 = "11f5503mgcwjn1q4dvhjiqwnw3zmp2gbhirjvgfr71y72ys1wsy4"; }; meta = with stdenv.lib; { From 2f371536f2674239d639c6d2ea83f4676c1a197c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jun 2018 05:11:46 -0700 Subject: [PATCH 260/265] facter: 3.11.1 -> 3.11.2 (#42273) --- pkgs/tools/system/facter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 22c25bfd567..a88cca41fa6 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.11.1"; + version = "3.11.2"; src = fetchFromGitHub { - sha256 = "10ai59vyx1ssb3jyfwnmi4y5kchlnbi7vn7wbax36pa90l1j7jqk"; + sha256 = "0sxxd05r7ika2m4p76kld1xclyi8yf4b79gb86084m1rcv692ap1"; rev = version; repo = "facter"; owner = "puppetlabs"; From 6ce9c5e97cc19ff6fb8609b91c55ea0433de4cbb Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Wed, 20 Jun 2018 16:43:43 +0900 Subject: [PATCH 261/265] fcitx-qt5: fix build with Qt 5.11 --- pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 1a3352676b1..50ab7d85c5a 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }: +{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules +, fetchpatch +}: stdenv.mkDerivation rec { name = "fcitx-qt5-${version}"; @@ -9,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c"; }; + patches = [ + # Fix build with Qt 5.11 + # https://github.com/fcitx/fcitx-qt5/issues/34 + (fetchpatch { + url = https://github.com/fcitx/fcitx-qt5/commit/af033e3d5305108eecc568adff7f8b2da5831ed6.diff; + sha256 = "14vfz1fw2k362wnqpglw766fg3d3mc8cmfgic2p96yyipjh9xx3b"; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; buildInputs = [ fcitx qtbase ]; From f9218b1346a025d213dec6b838ef33864b3e3456 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 20 Jun 2018 05:17:26 +0300 Subject: [PATCH 262/265] nixos/stage-1: Make find-libs not choke on dynamic linker being in DT_NEEDED find-libs is currently choking when it finds the dynamic linker as a DT_NEEDED dependency (from glibc) and bails out like this (as glibc doesn't have a RPATH): Couldn't satisfy dependency ld-linux-x86-64.so.2 Actually the caller of find-libs ignores the exit status, so the issue almost always goes unnoticed and happens to work by chance. But additionally what happens is that indirect .so dependencies are left out from the dependency closure calculation, which breaks latest cryptsetup as libssl.so isn't found anymore. --- nixos/modules/system/boot/stage-1.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 55bb6d3449c..6756f68cdf7 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -56,6 +56,12 @@ let left=("''${left[@]:3}") if [ -z ''${seen[$next]+x} ]; then seen[$next]=1 + + # Ignore the dynamic linker which for some reason appears as a DT_NEEDED of glibc but isn't in glibc's RPATH. + case "$next" in + ld*.so.?) continue;; + esac + IFS=: read -ra paths <<< $rpath res= for path in "''${paths[@]}"; do From 7a7463d0a3fe6d39a7fc499a0fd9756a3c671e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 20 Jun 2018 17:31:25 +0100 Subject: [PATCH 263/265] pipenv: 11.9.0 -> 2018.5.18 --- pkgs/development/tools/pipenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 153c0f76a40..e58cc44884c 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 = "11.9.0"; + version = "2018.5.18"; src = fetchPypi { inherit pname version; - sha256 = "7b3c52fb57e17ca61b6141b75c8f5ba61a95c713ca470754240f7f1dbd0a4968"; + sha256 = "1knyknmykjj7gixdpfyns77sv4mizl68addk09ajmw9z5aqaif84"; }; LC_ALL = "en_US.UTF-8"; From 94a926816e995eb174c08828a0246cbdbdba6574 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 20 Jun 2018 18:54:42 +0200 Subject: [PATCH 264/265] fribidi: fix dylib install_name on darwin --- pkgs/development/libraries/fribidi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 2bc36d1b2b9..7a903f00ae6 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -4,6 +4,7 @@ , meson , ninja , pkgconfig +, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -18,6 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; outputs = [ "out" "devdoc" ]; From b717ca8e45a6ba6925e00d7782baf5fb1ce5674b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 20 Jun 2018 19:50:08 +0200 Subject: [PATCH 265/265] eclipse-plugin-spotbugs: 3.1.3 -> 3.1.5 --- pkgs/applications/editors/eclipse/plugins.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index f381064c92c..801583299ab 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -532,11 +532,12 @@ rec { spotbugs = buildEclipseUpdateSite rec { name = "spotbugs-${version}"; - version = "3.1.3"; + version = "3.1.5"; src = fetchzip { + stripRoot = false; url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip"; - sha256 = "01zrmk497bxzqgwgbpsvi5iz5qk9b4q949h4918abm54zvkgndlg"; + sha256 = "0fxdirz6ik9rqykm2lcr720apsaqgngr4c7q793rjb9b3bn30c85"; }; meta = with stdenv.lib; {