From 4b8bb6a65aee0caf563833096925e6f6daedc9c1 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 14 Jul 2018 19:06:48 -0700 Subject: [PATCH 001/258] rofi-systemd: init at 0.1.0 --- pkgs/tools/system/rofi-systemd/default.nix | 45 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/system/rofi-systemd/default.nix diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix new file mode 100644 index 00000000000..ee7626d2712 --- /dev/null +++ b/pkgs/tools/system/rofi-systemd/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, utillinux, gawk, makeWrapper +}: + +stdenv.mkDerivation rec { + name = "rofi-systemd-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "rofi-systemd"; + rev = "v${version}"; + sha256 = "1dbygq3qaj1f73hh3njdnmibq7vi6zbyzdc6c0j989c0r1ksv0zi"; + }; + + buildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -a rofi-systemd $out/bin/rofi-systemd + ''; + + wrapperPath = with stdenv.lib; makeBinPath [ + rofi + coreutils + utillinux + gawk + systemd + ]; + + fixupPhase = '' + patchShebangs $out/bin + + wrapProgram $out/bin/rofi-systemd --prefix PATH : "${wrapperPath}" + ''; + + meta = { + description = "Control your systemd units using rofi"; + homepage = https://github.com/IvanMalison/rofi-systemd; + maintainers = with stdenv.lib.maintainers; [ imalison ]; + license = stdenv.lib.licenses.gpl3; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01de9af5347..2efb566e013 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18051,6 +18051,8 @@ with pkgs; rofi-menugen = callPackage ../applications/misc/rofi-menugen { }; + rofi-systemd = callPackage ../tools/system/rofi-systemd { }; + rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; rstudio = libsForQt5.callPackage ../applications/editors/rstudio { From e013a50568f2038d0dee2990ead80d7cbc1d01df Mon Sep 17 00:00:00 2001 From: Stefan Lau Date: Sun, 15 Jul 2018 12:11:02 +0200 Subject: [PATCH 002/258] ja2-stracciatella: 0.15.1 -> 0.16.1 --- pkgs/games/ja2-stracciatella/Cargo.lock | 291 ++++++++++++++++++ pkgs/games/ja2-stracciatella/default.nix | 45 ++- .../remove-rust-buildstep.patch | 21 ++ 3 files changed, 350 insertions(+), 7 deletions(-) create mode 100644 pkgs/games/ja2-stracciatella/Cargo.lock create mode 100644 pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch diff --git a/pkgs/games/ja2-stracciatella/Cargo.lock b/pkgs/games/ja2-stracciatella/Cargo.lock new file mode 100644 index 00000000000..d017e93e4db --- /dev/null +++ b/pkgs/games/ja2-stracciatella/Cargo.lock @@ -0,0 +1,291 @@ +[[package]] +name = "aho-corasick" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bitflags" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "dtoa" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "getopts" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "itoa" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "libc" +version = "0.2.42" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "memchr" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "proc-macro2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "quote" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex-syntax" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "remove_dir_all" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "serde_derive" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_json" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "shell32-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "stracciatella" +version = "0.1.0" +dependencies = [ + "getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)", + "shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syn" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "tempdir" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thread-id" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thread_local" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "unicode-width" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "user32-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "utf8-ranges" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[metadata] +"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" +"checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789" +"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd" +"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +"checksum getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797" +"checksum itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5adb58558dcd1d786b5f0bd15f3226ee23486e24b7b58304b60f64dc68e62606" +"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +"checksum libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b685088df2b950fccadf07a7187c8ef846a959c142338a48f9dc0b94517eb5f1" +"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" +"checksum proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "effdb53b25cdad54f8f48843d67398f7ef2e14f12c1b4cb4effc549a6462a4d6" +"checksum quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e44651a0dc4cdd99f71c83b561e221f714912d11af1a4dff0631f923d53af035" +"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5" +"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" +"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" +"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" +"checksum serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "0c3adf19c07af6d186d91dae8927b83b0553d07ca56cbf7f2f32560455c91920" +"checksum serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "3525a779832b08693031b8ecfb0de81cd71cfd3812088fafe9a7496789572124" +"checksum serde_json 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "84b8035cabe9b35878adec8ac5fe03d5f6bc97ff6edd7ccb96b44c1276ba390e" +"checksum shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" +"checksum syn 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)" = "2beff8ebc3658f07512a413866875adddd20f4fd47b2a4e6c9da65cd281baaea" +"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" +"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" +"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" +"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +"checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47" +"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" +"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +"checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd" +"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 134cb650fd2..0e5702d4614 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -1,16 +1,47 @@ -{ stdenv, fetchFromGitHub, SDL }: - -stdenv.mkDerivation rec { - version = "0.15.1"; - name = "ja2-stracciatella-${version}"; +{ stdenv, fetchFromGitHub, cmake, SDL2, boost, fltk, rustPlatform }: +with rustPlatform; +let + version = "0.16.1"; src = fetchFromGitHub { owner = "ja2-stracciatella"; repo = "ja2-stracciatella"; rev = "v${version}"; - sha256 = "0r7j6k7412b3qfb1rnh80s55zhnriw0v03zn5bp3spcqjxh4xhv1"; + sha256 = "1pyn23syg70kiyfbs3pdlq0ixd2bxhncbamnic43rym3dmd52m29"; }; + lockfile = ./Cargo.lock; + libstracciatellaSrc = stdenv.mkDerivation { + name = "libstracciatella-${version}-src"; + src = "${src}/rust"; + installPhase = '' + mkdir -p $out + cp -R ./* $out/ + cp ${lockfile} $out/Cargo.lock + ''; + }; + libstracciatella = buildRustPackage { + name = "libstracciatella-${version}"; + inherit version; + src = libstracciatellaSrc; + cargoSha256 = "0gxp5ps1lzmrg19h6k31fgxjdnjl6amry2vmb612scxcwklxryhm"; + doCheck = false; + }; +in +stdenv.mkDerivation rec { + name = "ja2-stracciatella-${version}"; + inherit src; + inherit version; + + buildInputs = [ cmake SDL2 fltk boost ]; + + patches = [ + ./remove-rust-buildstep.patch + ]; + preConfigure = '' + sed -i -e 's|rust-stracciatella|${libstracciatella}/bin/libstracciatella.so|g' CMakeLists.txt + cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2") + ''; + enableParallelBuilding = true; - buildInputs = [ SDL ]; meta = { description = "Jagged Alliance 2, with community fixes"; license = "SFI Source Code license agreement"; diff --git a/pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch b/pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch new file mode 100644 index 00000000000..b86589fc671 --- /dev/null +++ b/pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f354370e0..c9fa23c6d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -159,7 +159,6 @@ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/externalized") + add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/game") + add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/sgp") + add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/slog") +-add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/rust") + add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-smacker") + + if(BUILD_LAUNCHER) +@@ -235,8 +234,6 @@ copy_assets_dir_to_ja2_binary_after_build("externalized") + copy_assets_dir_to_ja2_binary_after_build("unittests") + copy_assets_dir_to_ja2_binary_after_build("mods") + +-get_property(STRACCIATELLA_SHARED_LIB TARGET rust-stracciatella PROPERTY IMPORTED_LOCATION) +- + if (MSVC OR APPLE) + add_custom_command(TARGET ${JA2_BINARY} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy From 3d7916824ea78eda67604d36fb7599ecb7c6b9f5 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Mon, 16 Jul 2018 20:50:04 +0200 Subject: [PATCH 003/258] pulseeffects: depend on hicolor-icon-theme This avoids conflicts on `share/icons/hicolor/icon-theme.cache`. --- pkgs/applications/audio/pulseeffects/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 6a1237dd9b3..c9d4e5ccc5f 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -27,6 +27,7 @@ , zam-plugins , rubberband , mda_lv2 +, hicolor-icon-theme }: let @@ -75,6 +76,7 @@ in stdenv.mkDerivation rec { boost fftwFloat zita-convolver + hicolor-icon-theme ]; postPatch = '' From 10707eaf438daac876e8c481e658739c7f4517dc Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Mon, 16 Jul 2018 20:50:30 +0200 Subject: [PATCH 004/258] lightdm-gtk-greeter: depend on hicolor-icon-theme This avoids conflicts on `share/icons/hicolor/icon-theme.cache`. --- pkgs/applications/display-managers/lightdm/gtk-greeter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 3227151ce21..7ae854cee3c 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lightdm exo intltool makeWrapper ] + buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ From e0936ff6e36a3508fe197161596580770dfcedd5 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Mon, 16 Jul 2018 20:50:53 +0200 Subject: [PATCH 005/258] gxmessage: depend on hicolor-icon-theme This avoids conflicts on `share/icons/hicolor/icon-theme.cache`. --- pkgs/applications/misc/gxmessage/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index a61d532f1f8..8401386ead4 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo}: +{ stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "gxmessage-${version}"; @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gnome3.gtk texinfo ]; + buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ]; + meta = { description = "A GTK enabled dropin replacement for xmessage"; homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; From 06e0a518d160d4fa21a64a7f5ac1737378aed6d7 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Mon, 16 Jul 2018 20:51:05 +0200 Subject: [PATCH 006/258] viking: depend on hicolor-icon-theme This avoids conflicts on `share/icons/hicolor/icon-theme.cache`. --- pkgs/applications/misc/viking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index d090878f976..b7d0b330e85 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper -, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }: +, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "viking-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils - libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite + libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme ]; configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ]; From 14e5e8a15a79f784f8f10a160e3a5699e2b690d1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 25 Jul 2018 17:28:24 +0100 Subject: [PATCH 007/258] gem-config: fix capybara-webkit on Darwin --- pkgs/development/ruby-modules/gem-config/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 3c355d08576..227dab63e4a 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -22,7 +22,7 @@ , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem -, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick +, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx }@args: let @@ -69,7 +69,8 @@ in }; capybara-webkit = attrs: { - buildInputs = [ qt48 ]; + buildInputs = [ qt48 ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; }; charlock_holmes = attrs: { From 48f7778d996fae8ab5e7177ac39ce9e86ed37b9b Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 5 Aug 2018 23:07:54 +0200 Subject: [PATCH 008/258] dhcpcd service: order before network target This reverts a change applied in PR #18491. When interfaces are configured by DHCP (typical in a cloud environment), ordering after network.target cause trouble to applications expecting some network to be present on boot (for example, cloud-init is quite brittle when network hasn't been configured for `cloud-init.service`) and on shutdown (for example, collectd needs to flush metrics on shutdown). When ordering after network.target, we ensure applications relying on network.target won't have any network reachability on boot and potentially on shutdown. Therefore, I think ordering before network.target is better. --- nixos/modules/services/networking/dhcpcd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index de0aa1a2c2c..019c8fd9ec4 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -161,8 +161,8 @@ in { description = "DHCP Client"; wantedBy = [ "multi-user.target" ] ++ optional (!hasDefaultGatewaySet) "network-online.target"; - after = [ "network.target" ]; wants = [ "network.target" ]; + before = [ "network.target" ]; # Stopping dhcpcd during a reconfiguration is undesirable # because it brings down the network interfaces configured by From 01a8fa1a723cca9d31ae3ad6c49c8654a824ea1d Mon Sep 17 00:00:00 2001 From: Urban Skudnik Date: Mon, 6 Aug 2018 21:01:38 +0200 Subject: [PATCH 009/258] Add support for user-extensible shellHook to buildStackProject buildStackProject is overridding shell hook and doesn't append user-specified shellHook to it, resulting in user's shellHook never executing. --- pkgs/development/haskell-modules/generic-stack-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 591de1236d4..2afe270e0fc 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation (args // { STACK_PLATFORM_VARIANT="nix"; STACK_IN_NIX_SHELL=1; STACK_IN_NIX_EXTRA_ARGS = extraArgs; - shellHook = addStackArgsHook; + shellHook = addStackArgsHook + args.shellHook or ""; # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042. From cbfdce4d7b94f4fe3c840f45327032433a46ba7b Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Wed, 8 Aug 2018 16:39:30 +0700 Subject: [PATCH 010/258] nodePackages.tiddlywiki: init at 5.1.17 --- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index dd8d0818703..e9cd4f9bc1a 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -104,6 +104,7 @@ , "stylus" , "svgo" , "tern" +, "tiddlywiki" , "titanium" , "typescript" , "typings" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 6dae8dd7013..7dd48d37dad 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -46763,6 +46763,23 @@ in production = true; bypassCache = false; }; + tiddlywiki = nodeEnv.buildNodePackage { + name = "tiddlywiki"; + packageName = "tiddlywiki"; + version = "5.1.17"; + src = fetchurl { + url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.17.tgz"; + sha1 = "bd3311146ba67fb4beee9933dd2e6d55e92665ed"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "a non-linear personal web notebook"; + homepage = "https://github.com/Jermolene/TiddlyWiki5#readme"; + license = "BSD"; + }; + production = true; + bypassCache = false; + }; titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; From 4a1d0b12bffe81cbbafa8a88139a423e04c1c3df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 8 Aug 2018 04:32:56 -0700 Subject: [PATCH 011/258] polygraph: 4.11.0 -> 4.12.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/polygraph/versions. --- pkgs/tools/networking/polygraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix index 46680ab47af..c05e44fb1c0 100644 --- a/pkgs/tools/networking/polygraph/default.nix +++ b/pkgs/tools/networking/polygraph/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib, ncurses }: stdenv.mkDerivation rec { - name = "polygraph-4.11.0"; + name = "polygraph-4.12.0"; src = fetchurl { url = "http://www.web-polygraph.org/downloads/srcs/${name}-src.tgz"; - sha256 = "1ii60yl3p89qawvl19sd1bkpkw39fz8kpvmc3cawa32nxzbm9pbs"; + sha256 = "1anrdc30yi9pb67642flmn7w82q37cnc45r9bh15mpbc66yk3kzz"; }; buildInputs = [ openssl zlib ncurses ]; From 18869d85f9f6f98df14dda0b7a21375634a3468d Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 8 Aug 2018 23:21:18 +0900 Subject: [PATCH 012/258] Add the virtualbox-puel license to the licenses file. --- lib/licenses.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 79124855f7f..1ec0e5149c9 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -613,6 +613,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Vim License"; }; + virtualbox-puel = { + fullName = "Oracle VM VirtualBox Extension Pack Personal Use and Evaluation License (PUEL)"; + url = "https://www.virtualbox.org/wiki/VirtualBox_PUEL"; + free = false; + }; + vsl10 = spdx { spdxId = "VSL-1.0"; fullName = "Vovida Software License v1.0"; From 8ccfb99ac07476a7d73518944c983d0fdc30643f Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 8 Aug 2018 23:22:02 +0900 Subject: [PATCH 013/258] Add a derivation that downloads the virtualbox extension pack. --- .../virtualization/virtualbox/extpack.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/applications/virtualization/virtualbox/extpack.nix diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix new file mode 100644 index 00000000000..f7a44d37e31 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, lib}: + +with lib; + +let extpackRev = "123301"; + version = "5.2.14"; +in +stdenv.mkDerivation rec { + name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack"; + src = fetchurl { + url = "http://download.virtualbox.org/virtualbox/${version}/${name}"; + sha256 = "d90c1b0c89de19010f7c7fe7a675ac744067baf29a9966b034e97b5b2053b37e"; + }; + + installPhase = "cp -r . $out"; + phases = ["installPhase"]; + + meta = { + description = "Oracle Extension pack for VirtualBox"; + license = licenses.virtualbox-puel; + homepage = https://www.virtualbox.org/; + maintainers = with maintainers; [ flokli sander cdepillabout ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} From 60f2b476e4f72e8782a14a6ad2382d6eea46b46a Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 8 Aug 2018 23:23:01 +0900 Subject: [PATCH 014/258] Add the virtualbox-extpack as a top-level package. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cd0eb706ae..e18ae895e92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18864,6 +18864,8 @@ with pkgs; headless = true; }); + virtualbox-extpack = callPackage ../applications/virtualization/virtualbox/extpack.nix { }; + virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix { fltk = fltk13; }; From 09e58bc4e71a11e674a6aa2a506d8c4024eba5d6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 8 Aug 2018 17:55:43 +0200 Subject: [PATCH 015/258] weechat-xmpp: create proper runtime environment The `weechat-xmpp` plugin requires `pydns` to properly resolve the XMPP host. Furthermore it's much easier to use substituteAll rather than messing around with substituteInPlace in a patched file. --- .../instant-messengers/weechat-xmpp/default.nix | 17 ++++++++--------- .../weechat-xmpp/libpath.patch | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix index 8c7e80b3ff8..4b92d1212c5 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xmpppy }: +{ stdenv, fetchFromGitHub, xmpppy, pydns, substituteAll, buildEnv }: stdenv.mkDerivation { name = "weechat-jabber-2017-08-30"; @@ -15,15 +15,14 @@ stdenv.mkDerivation { cp jabber.py $out/share/jabber.py ''; - buildInputs = [ xmpppy ]; - - postPatch = '' - substituteInPlace jabber.py \ - --replace "__NIX_OUTPUT__" "${xmpppy}/lib/python2.7/site-packages" - ''; - patches = [ - ./libpath.patch + (substituteAll { + src = ./libpath.patch; + env = "${buildEnv { + name = "weechat-xmpp-env"; + paths = [ pydns xmpppy ]; + }}/lib/python2.7/site-packages"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch index d3faab33a8e..372c83944a2 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch @@ -8,7 +8,7 @@ index 27006a3..e53c2c0 100644 +import sys + -+sys.path.append('__NIX_OUTPUT__') ++sys.path.append('@env@') + + import_ok = True diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09fb1ff28c9..7d95390cc43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18982,7 +18982,9 @@ with pkgs; inherit (luaPackages) cjson; }; - weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp {}; + weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp { + inherit (pythonPackages) pydns; + }; westonLite = weston.override { pango = null; From 927b22589f81399ed0e860d0ab5a6ccb5a5c87c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 8 Aug 2018 20:02:56 -0700 Subject: [PATCH 016/258] blockhash: 0.3 -> 0.3.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/blockhash/versions. --- pkgs/tools/graphics/blockhash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index c48b85cedb2..5ddf8185b3c 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "blockhash-${version}"; - version = "0.3"; + version = "0.3.1"; src = fetchFromGitHub { owner = "commonsmachinery"; repo = "blockhash"; rev = "v${version}"; - sha256 = "15iwljpkykn2711jhls7cwkb23gk6iawlvvk4prl972wic2wlxcj"; + sha256 = "0m7ikppl42iicgmwsb7baajmag7v0p1ab06xckifvrr0zm21bq9p"; }; nativeBuildInputs = [ python pkgconfig ]; From 637cc2a35ec5924212e17c417ebdb83fca0538d3 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 5 May 2018 12:44:36 +0100 Subject: [PATCH 017/258] datadog-agent: init at 6.1.4 DataDog have adopted a subtle naming convention: - dd-agent refers to the v5 Python implementation - datadog-agent refers to the v6 golang implementation --- .../dd-agent/{default.nix => 5.nix} | 5 +- pkgs/tools/networking/dd-agent/6.nix | 76 ++++ pkgs/tools/networking/dd-agent/deps.nix | 353 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 4 files changed, 435 insertions(+), 2 deletions(-) rename pkgs/tools/networking/dd-agent/{default.nix => 5.nix} (95%) create mode 100644 pkgs/tools/networking/dd-agent/6.nix create mode 100644 pkgs/tools/networking/dd-agent/deps.nix diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/5.nix similarity index 95% rename from pkgs/tools/networking/dd-agent/default.nix rename to pkgs/tools/networking/dd-agent/5.nix index ff4a24fb781..d3c4a2af765 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -89,7 +89,10 @@ in stdenv.mkDerivation rec { ''; meta = { - description = "Event collector for the DataDog analysis service"; + description = '' + Event collector for the DataDog analysis service + -- v5 Python implementation + ''; homepage = https://www.datadoghq.com; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/networking/dd-agent/6.nix b/pkgs/tools/networking/dd-agent/6.nix new file mode 100644 index 00000000000..be5f016c187 --- /dev/null +++ b/pkgs/tools/networking/dd-agent/6.nix @@ -0,0 +1,76 @@ +{ stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig }: + +let + inherit (pythonPackages) python; + + # keep this in sync with github.com/DataDog/agent-payload dependency + payloadVersion = "4.7"; + +in buildGoPackage rec { + name = "datadog-agent-${version}"; + version = "6.1.4"; + owner = "DataDog"; + repo = "datadog-agent"; + + src = fetchFromGitHub { + inherit owner repo; + rev = "a8ee76deb11fa334470d9b8f2356214999980894"; + sha256 = "06grcwwbfvcw1k1d4nqrasrf76qkpik1gsw60zwafllfd9ffhl1v"; + }; + + subPackages = [ + "cmd/agent" + "cmd/dogstatsd" + "cmd/py-launcher" + "cmd/cluster-agent" + ]; + goDeps = ./deps.nix; + goPackagePath = "github.com/${owner}/${repo}"; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; + + buildFlagsArray = let + ldFlags = stdenv.lib.concatStringsSep " " [ + "-X ${goPackagePath}/pkg/version.Commit=${src.rev}" + "-X ${goPackagePath}/pkg/version.AgentVersion=${version}" + "-X ${goPackagePath}/pkg/serializer.AgentPayloadVersion=${payloadVersion}" + "-X ${goPackagePath}/pkg/collector/py.pythonHome=${python}" + "-r ${python}/lib" + ]; + in [ + "-ldflags=${ldFlags}" + ]; + buildFlags = "-tags cpython"; + + # DataDog use paths relative to the agent binary, so fix these. + postPatch = '' + sed -e "s|PyChecksPath =.*|PyChecksPath = \"$bin/${python.sitePackages}\"|" \ + -e "s|distPath =.*|distPath = \"$bin/share/datadog-agent\"|" \ + -i cmd/agent/common/common_nix.go + ''; + + # Install the config files and python modules from the "dist" dir + # into standard paths. + postInstall = '' + mkdir -p $bin/${python.sitePackages} $bin/share/datadog-agent + cp -R $src/cmd/agent/dist/{conf.d,trace-agent.conf} $bin/share/datadog-agent + cp -R $src/cmd/agent/dist/{checks,utils,config.py} $bin/${python.sitePackages} + + cp -R $src/pkg/status/dist/templates $bin/share/datadog-agent + + wrapProgram "$bin/bin/agent" \ + --set PYTHONPATH "$bin/${python.sitePackages}" + ''; + + meta = with stdenv.lib; { + description = '' + Event collector for the DataDog analysis service + -- v6 new golang implementation. + ''; + homepage = https://www.datadoghq.com; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice domenkozar rvl ]; + }; +} diff --git a/pkgs/tools/networking/dd-agent/deps.nix b/pkgs/tools/networking/dd-agent/deps.nix new file mode 100644 index 00000000000..7a8fc69b2a4 --- /dev/null +++ b/pkgs/tools/networking/dd-agent/deps.nix @@ -0,0 +1,353 @@ +[ + { + goPackagePath = "github.com/DataDog/agent-payload"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/agent-payload"; + rev = "3b793015ecfa5b829e8a466bd7cce836891502cc"; + sha256 = "0lg7c1whmvk4a13mrivdjfzfxqan07kvs2calgylncy7yf4szdp6"; + }; + } + { + goPackagePath = "github.com/DataDog/gohai"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/gohai"; + rev = "d80d0f562a71fa2380fbeccc93ba5a2e325606e4"; + sha256 = "1frslms7f5i8dc8n0v9pb64mf4zdj3q2c005qxajl8j8i9nhj7yb"; + }; + } + { + goPackagePath = "github.com/DataDog/mmh3"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/mmh3"; + rev = "2cfb68475274527a10701355c739f31dd404718c"; + sha256 = "09jgzxi08pkxllxk3f5qwipz96jxrw5v035fj2bkid1d4akn8y0b"; + }; + } + { + goPackagePath = "github.com/beevik/ntp"; + fetch = { + type = "git"; + url = "https://github.com/beevik/ntp"; + rev = "cb3dae3a7588ae35829eb5724df611cd75152fba"; + sha256 = "0nc6f7d0xw23y18z9qxrmm8kvnywihassyk706mn9v4makmhalnz"; + }; + } + { + goPackagePath = "github.com/cihub/seelog"; + fetch = { + type = "git"; + url = "https://github.com/cihub/seelog"; + rev = "f561c5e57575bb1e0a2167028b7339b3a8d16fb4"; + sha256 = "0r3228hvgljgpaggj6b9mvxfsizfw25q2c1761wsvcif8gz49cvl"; + }; + } + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363"; + sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar"; + }; + } + { + goPackagePath = "github.com/dsnet/compress"; + fetch = { + type = "git"; + url = "https://github.com/dsnet/compress"; + rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f"; + sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "507f6050b8568533fb3f5504de8e5205fa62a114"; + sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "bda519ae5f4cbc60d391ff8610711627a08b86ae"; + sha256 = "05vcc3ssxyrk8g3sr4gs888vllgjqfq11na63qz2pvaiy7m0rqrs"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "1ef32a8b9fc3f8ec940126907cedb5998f6318e4"; + sha256 = "0zk2n0n35ksskr5cd83k5k8wg21ckrcggjy88bym2s21ngj5w4fh"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "553a641470496b2327abcac10b36396bd98e45c9"; + sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "ded0c29b24f96f46cf349e6701b099db601cf8ec"; + sha256 = "125dxfxs7his95fd2r28bn1rpb78pldfgm3lmw84ha1c0v5gfh33"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; + sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "2c9e9502788518c97fe44e8955cd069417ee89df"; + sha256 = "1w0rl9rla61m0qbha75jg48yiq1vs91sfy96rgqa6nags9v9b1rl"; + }; + } + { + goPackagePath = "github.com/mholt/archiver"; + fetch = { + type = "git"; + url = "https://github.com/mholt/archiver"; + rev = "e4ef56d48eb029648b0e895bb0b6a393ef0829c3"; + sha256 = "1krxyh6iq0s0rwhz7gg6dn795j9qq64rsgq9nivav7fhrqpgr6hb"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; + sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + }; + } + { + goPackagePath = "github.com/nwaples/rardecode"; + fetch = { + type = "git"; + url = "https://github.com/nwaples/rardecode"; + rev = "e06696f847aeda6f39a8f0b7cdff193b7690aef6"; + sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw"; + }; + } + { + goPackagePath = "github.com/patrickmn/go-cache"; + fetch = { + type = "git"; + url = "https://github.com/patrickmn/go-cache"; + rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; + sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12"; + sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15"; + }; + } + { + goPackagePath = "github.com/pierrec/lz4"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/lz4"; + rev = "ed8d4cc3b461464e69798080a0092bd028910298"; + sha256 = "0flsn2ka108lb63gkxfzl90bkhndh1znnscv4v1k6j5h2s3zksls"; + }; + } + { + goPackagePath = "github.com/pierrec/xxHash"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/xxHash"; + rev = "a0006b13c722f7f12368c00a3d3c2ae8a999a0c6"; + sha256 = "1hf7hqrqx0cbgx0alfwnqs0mrxg9rnwsijn5d0lv06w6vzqbvnzj"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "57f370e13068146efe1cb7129f79e5d51da8a242"; + sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "63644898a8da0bc22138abf860edaf5277b6102e"; + sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; + sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; + sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "8dc2790b029dc41e2b8ff772c63c26adbb1db70d"; + sha256 = "147zq6v34pgb79r4m0m2mwm8739jxwawxs8mpqvvhq7gxwvhng40"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69"; + sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691"; + }; + } + { + goPackagePath = "github.com/ulikunitz/xz"; + fetch = { + type = "git"; + url = "https://github.com/ulikunitz/xz"; + rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; + sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; + }; + } + { + goPackagePath = "github.com/urfave/negroni"; + fetch = { + type = "git"; + url = "https://github.com/urfave/negroni"; + rev = "22c5532ea862c34fdad414e90f8cc00b4f6f4cab"; + sha256 = "0jxd10cr3imm96xa01mdgyad4nq6mc7yr49z830fv3vywfr7bac8"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "640f4622ab692b87c2f3a94265e6f579fe38263d"; + sha256 = "097m4qhcljhp180171j5fjhq4740iirfkkajfd7yrxqhp4s9hljx"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "6f686a352de66814cdd080d970febae7767857a3"; + sha256 = "1z3pwvxlzq8kghjdsd9xmf184iiz13h8h66ipp626k4rc7kydr03"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f"; + sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "github.com/sbinet/go-python"; + fetch = { + type = "git"; + url = "https://github.com/sbinet/go-python"; + rev = "6d13f941744b9332d6ed00dc2cd2722acd79a47e"; + sha256 = "0x5q4nyv6gck9q33g54gy2ajmyjksxjmzh0jfqqn97jpgf4qfaym"; + }; + } + { + goPackagePath = "github.com/mitchellh/reflectwalk"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/reflectwalk"; + rev = "63d60e9d0dbc60cf9164e6510889b0db6683d98c"; + sha256 = "1hpq6sjr6l1h25x68mz13q7sd52dv1mjfxbl5p7m3j7cv85khnvc"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35f10c345f3..475ddb722e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15672,7 +15672,8 @@ with pkgs; dbvisualizer = callPackage ../applications/misc/dbvisualizer {}; - dd-agent = callPackage ../tools/networking/dd-agent { }; + dd-agent = callPackage ../tools/networking/dd-agent/5.nix { }; + datadog-agent = callPackage ../tools/networking/dd-agent/6.nix { }; ddgr = callPackage ../applications/misc/ddgr { }; From 3a195dc2efaec5dc100f0122084460fdf24607d6 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 27 May 2018 14:51:28 +0100 Subject: [PATCH 018/258] pythonPackages.uuid: init at 1.30 --- pkgs/development/python-modules/uuid/default.nix | 16 ++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/python-modules/uuid/default.nix diff --git a/pkgs/development/python-modules/uuid/default.nix b/pkgs/development/python-modules/uuid/default.nix new file mode 100644 index 00000000000..0481e5c24c0 --- /dev/null +++ b/pkgs/development/python-modules/uuid/default.nix @@ -0,0 +1,16 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "uuid"; + version = "1.30"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gqrjsm85nnkxkmd1vk8350wqj2cigjflnvcydk084n5980cr1qz"; + }; + + meta = with lib; { + description = "UUID object and generation functions (Python 2.3 or higher)"; + homepage = http://zesty.ca/python/; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6fc3a140eb8..572cad7886c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17309,6 +17309,8 @@ EOF uranium = callPackage ../development/python-modules/uranium { }; + uuid = callPackage ../development/python-modules/uuid { }; + versioneer = callPackage ../development/python-modules/versioneer { }; vine = callPackage ../development/python-modules/vine { }; From fb6679151a7bd0d9ecc485cc7e0524b82a2adf01 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 27 May 2018 14:52:24 +0100 Subject: [PATCH 019/258] datadog-integrations-core: init at git-2018-05-27 --- .../networking/dd-agent/integrations-core.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +- 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/dd-agent/integrations-core.nix diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix new file mode 100644 index 00000000000..2efc8247369 --- /dev/null +++ b/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -0,0 +1,66 @@ +{ pkgs +, python +, overrides ? (self: super: {}) +}: + +with pkgs.lib; + +let + src = pkgs.fetchFromGitHub { + owner = "DataDog"; + repo = "integrations-core"; + rev = "7be76e73969a8b9c993903681b300e1dd32f4b4d"; + sha256 = "1qsqzm5iswgv9jrflh5mvbz9a7js7jf42cb28lzdzsp45iwfs2aa"; + }; + version = "git-2018-05-27"; + + buildIntegration = { pname, ... }@args: python.pkgs.buildPythonPackage (args // { + inherit src version; + name = "datadog-integration-${pname}-${version}"; + + postPatch = '' + # jailbreak install_requires + sed -i 's/==.*//' requirements.in + cp requirements.in requirements.txt + ''; + sourceRoot = "source/${args.sourceRoot or pname}"; + doCheck = false; + }); + + packages = (self: { + python = python.withPackages (ps: with self; [ disk network postgres nginx mongo ]); + + datadog_checks_base = buildIntegration { + pname = "checks-base"; + sourceRoot = "datadog_checks_base"; + propagatedBuildInputs = with self; with python.pkgs; [ requests protobuf prometheus_client uuid simplejson uptime ]; + }; + + disk = buildIntegration { + pname = "disk"; + propagatedBuildInputs = with self; with python.pkgs; [ datadog_checks_base psutil ]; + }; + + network = buildIntegration { + pname = "network"; + propagatedBuildInputs = with self; with python.pkgs; [ datadog_checks_base psutil ]; + }; + + postgres = buildIntegration { + pname = "postgres"; + propagatedBuildInputs = with self; with python.pkgs; [ datadog_checks_base pg8000 psycopg2 ]; + }; + + nginx = buildIntegration { + pname = "nginx"; + propagatedBuildInputs = with self; with python.pkgs; [ datadog_checks_base ]; + }; + + mongo = buildIntegration { + pname = "mongo"; + propagatedBuildInputs = with self; with python.pkgs; [ datadog_checks_base pymongo ]; + }; + + }); + +in fix' (extends overrides packages) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 475ddb722e3..323a5daab3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15673,7 +15673,12 @@ with pkgs; dbvisualizer = callPackage ../applications/misc/dbvisualizer {}; dd-agent = callPackage ../tools/networking/dd-agent/5.nix { }; - datadog-agent = callPackage ../tools/networking/dd-agent/6.nix { }; + datadog-agent = callPackage ../tools/networking/dd-agent/6.nix { + pythonPackages = datadog-integrations-core; + }; + datadog-integrations-core = callPackage ../tools/networking/dd-agent/integrations-core.nix { + python = python27; + }; ddgr = callPackage ../applications/misc/ddgr { }; From 51618113f4813b6d500f9ac153c8f57234ef5fd0 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 5 May 2018 13:46:10 +0100 Subject: [PATCH 020/258] nixos/dd-agent: Fix dodgy temp files DataDog was dropping PID files and and python pickle files in /tmp. Move these to private directories as a precaution. --- .../services/monitoring/dd-agent/dd-agent.nix | 80 ++++++++++--------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index cf65b6c28cf..abc8d65d58f 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -114,13 +114,22 @@ let in { options.services.dd-agent = { enable = mkOption { - description = "Whether to enable the dd-agent montioring service"; + description = '' + Whether to enable the dd-agent v5 monitoring service. + For datadog-agent v6, see . + ''; default = false; type = types.bool; }; api_key = mkOption { - description = "The Datadog API key to associate the agent with your account"; + description = '' + The Datadog API key to associate the agent with your account. + + Warning: this key is stored in cleartext within the world-readable + Nix store! Consider using the new v6 + module instead. + ''; example = "ae0aa6a8f08efa988ba0a17578f009ab"; type = types.str; }; @@ -188,48 +197,41 @@ in { users.groups.datadog.gid = config.ids.gids.datadog; - systemd.services.dd-agent = { - description = "Datadog agent monitor"; - path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps pkgs.gohai ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; - User = "datadog"; - Group = "datadog"; - Restart = "always"; - RestartSec = 2; + systemd.services = let + makeService = attrs: recursiveUpdate { + path = [ pkgs.dd-agent pkgs.python pkgs.sysstat pkgs.procps pkgs.gohai ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "datadog"; + Group = "datadog"; + Restart = "always"; + RestartSec = 2; + PrivateTmp = true; + }; + restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ]; + } attrs; + in { + dd-agent = makeService { + description = "Datadog agent monitor"; + serviceConfig.ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; }; - restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ]; - }; - systemd.services.dogstatsd = { - description = "Datadog statsd"; - path = [ pkgs."dd-agent" pkgs.python pkgs.procps ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start"; - User = "datadog"; - Group = "datadog"; - Type = "forking"; - PIDFile = "/tmp/dogstatsd.pid"; - Restart = "always"; - RestartSec = 2; + dogstatsd = makeService { + description = "Datadog statsd"; + environment.TMPDIR = "/run/dogstatsd"; + serviceConfig = { + ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start"; + Type = "forking"; + PIDFile = "/run/dogstatsd/dogstatsd.pid"; + RuntimeDirectory = "dogstatsd"; + }; }; - restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ]; - }; - systemd.services.dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) { - description = "Datadog JMX Fetcher"; - path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch"; - User = "datadog"; - Group = "datadog"; - Restart = "always"; - RestartSec = 2; + dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) { + description = "Datadog JMX Fetcher"; + path = [ pkgs.dd-agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; + serviceConfig.ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch"; }; - restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ]; }; environment.etc = etcfiles; From b9486e2b50b28524758ccc5a7825a54abe35c09e Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 27 May 2018 14:59:38 +0100 Subject: [PATCH 021/258] nixos/datadog-agent: add module This is the new v6 version of datadog-agent. The old v5 module is kept as dd-agent. --- nixos/modules/module-list.nix | 1 + .../services/monitoring/datadog-agent.nix | 201 ++++++++++++++++++ 2 files changed, 202 insertions(+) create mode 100644 nixos/modules/services/monitoring/datadog-agent.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 73173dd4e24..ef429357031 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -407,6 +407,7 @@ ./services/monitoring/cadvisor.nix ./services/monitoring/collectd.nix ./services/monitoring/das_watchdog.nix + ./services/monitoring/datadog-agent.nix ./services/monitoring/dd-agent/dd-agent.nix ./services/monitoring/fusion-inventory.nix ./services/monitoring/grafana.nix diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix new file mode 100644 index 00000000000..65bc7da4e5d --- /dev/null +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -0,0 +1,201 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.datadog-agent; + + ddConf = { + dd_url = "https://app.datadoghq.com"; + skip_ssl_validation = "no"; + api_key = ""; + confd_path = "/etc/datadog-agent/conf.d"; + additional_checksd = "/etc/datadog-agent/checks.d"; + use_dogstatsd = "yes"; + } + // optionalAttrs (cfg.logLevel != null) { log_level = cfg.logLevel; } + // optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; } + // optionalAttrs (cfg.tags != null ) { tags = concatStringsSep ", " cfg.tags; } + // cfg.extraConfig; + + makeConfigDir = entries: mapAttrsToList (name: conf: { + source = pkgs.writeText (baseNameOf name) (builtins.toJSON conf); + target = "datadog-agent/" + name; + }) (filterAttrs (name: conf: conf != null) entries); + + etcfiles = makeConfigDir + { "datadog.yaml" = ddConf; + "conf.d/disk.yaml" = cfg.diskConfig; + "conf.d/network.yaml" = cfg.networkConfig; + "conf.d/postgres.d/conf.yaml" = cfg.postgresqlConfig; + "conf.d/nginx.d/conf.yaml" = cfg.nginxConfig; + "conf.d/mongo.d/conf.yaml" = cfg.mongoConfig; + "conf.d/process.yaml" = cfg.processConfig; + "conf.d/jmx.yaml" = cfg.jmxConfig; + }; + +in { + options.services.datadog-agent = { + enable = mkOption { + description = '' + Whether to enable the datadog-agent v6 monitoring service + ''; + default = false; + type = types.bool; + }; + + package = mkOption { + default = pkgs.datadog-agent; + defaultText = "pkgs.datadog-agent"; + description = '' + Which DataDog v6 agent package to use. + Override the pythonPackages argument + of this derivation to include more checks. + ''; + type = types.package; + }; + + apiKeyFile = mkOption { + description = '' + Path to a file containing the Datadog API key to associate the + agent with your account. + ''; + example = "/run/keys/datadog_api_key"; + type = types.path; + }; + + tags = mkOption { + description = "The tags to mark this Datadog agent"; + example = [ "test" "service" ]; + default = null; + type = types.nullOr (types.listOf types.str); + }; + + hostname = mkOption { + description = "The hostname to show in the Datadog dashboard (optional)"; + default = null; + example = "mymachine.mydomain"; + type = types.uniq (types.nullOr types.string); + }; + + logLevel = mkOption { + description = "Logging verbosity."; + default = null; + type = types.nullOr (types.enum ["DEBUG" "INFO" "WARN" "ERROR"]); + }; + + extraConfig = mkOption { + default = {}; + type = types.attrs; + description = '' + Extra configuration options that will be merged into the + main config file datadog.yaml. + ''; + }; + + diskConfig = mkOption { + description = "Disk check config"; + type = types.attrs; + default = { + init_config = {}; + instances = [ { use-mount = "no"; } ]; + }; + }; + + networkConfig = mkOption { + description = "Network check config"; + type = types.attrs; + default = { + init_config = {}; + # Network check only supports one configured instance + instances = [ { collect_connection_state = false; + excluded_interfaces = [ "lo" "lo0" ]; } ]; + }; + }; + + postgresqlConfig = mkOption { + description = "Datadog PostgreSQL integration configuration"; + default = null; + type = types.nullOr types.attrs; + }; + + nginxConfig = mkOption { + description = "Datadog nginx integration configuration"; + default = null; + type = types.nullOr types.attrs; + }; + + mongoConfig = mkOption { + description = "MongoDB integration configuration"; + default = null; + type = types.nullOr types.attrs; + }; + + jmxConfig = mkOption { + description = "JMX integration configuration"; + default = null; + type = types.nullOr types.attrs; + }; + + processConfig = mkOption { + description = '' + Process integration configuration + + See http://docs.datadoghq.com/integrations/process/ + ''; + default = null; + type = types.nullOr types.attrs; + }; + + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package pkgs.sysstat pkgs.procps ]; + + users.extraUsers.datadog = { + description = "Datadog Agent User"; + uid = config.ids.uids.datadog; + group = "datadog"; + home = "/var/log/datadog/"; + createHome = true; + }; + + users.extraGroups.datadog.gid = config.ids.gids.datadog; + + systemd.services = let + makeService = attrs: recursiveUpdate { + path = [ cfg.package pkgs.python pkgs.sysstat pkgs.procps ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "datadog"; + Group = "datadog"; + Restart = "always"; + RestartSec = 2; + PrivateTmp = true; + }; + restartTriggers = [ cfg.package ] ++ map (etc: etc.source) etcfiles; + } attrs; + in { + datadog-agent = makeService { + description = "Datadog agent monitor"; + preStart = '' + chown -R datadog: /etc/datadog-agent + rm -f /etc/datadog-agent/auth_token + ''; + script = '' + export DD_API_KEY=$(head -n1 ${cfg.apiKeyFile}) + exec ${cfg.package}/bin/agent start -c /etc/datadog-agent/datadog.yaml + ''; + serviceConfig.PermissionsStartOnly = true; + }; + + dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) (makeService { + description = "Datadog JMX Fetcher"; + path = [ cfg.package pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; + serviceConfig.ExecStart = "${cfg.package}/bin/dd-jmxfetch"; + }); + }; + + environment.etc = etcfiles; + }; +} From 5a07bb2fc7b743d3fea1c9e42a49f622a5ac5532 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 9 Aug 2018 14:00:24 +0200 Subject: [PATCH 022/258] nixos/datadog-agent: Refactor to allow arbitrary check configs Refactors the datadog-agent (i.e. V6) module to let users configure arbitrary checks, not just a limited set, without having to resort to linking the files manually and updating the systemd unit. Checks are now configured via a `services.datadog-agent.checks` option which takes an attribute set in which the keys refer directly to Datadog check names, and the values are attribute sets representing Datadog's configuration structure. With this mechanism users can configure arbitrary integrations, for example for the `ntp`-check, simply by saying: services.datadog-agent.checks.ntp = { init_config = null; # ... other check configuration options as per Datadog # documentation }; The previous check-specific configuration options for non-default checks have been removed. Disk & network check configuration options have been kept rather than making them a `default`-value of the `checks`-option because they will be overridden by user-configurations in that case. Relates to NixOS/nixpkgs#40399. --- .../services/monitoring/datadog-agent.nix | 117 ++++++++++-------- 1 file changed, 62 insertions(+), 55 deletions(-) diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index 65bc7da4e5d..6b7359934f5 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -18,21 +18,25 @@ let // optionalAttrs (cfg.tags != null ) { tags = concatStringsSep ", " cfg.tags; } // cfg.extraConfig; - makeConfigDir = entries: mapAttrsToList (name: conf: { - source = pkgs.writeText (baseNameOf name) (builtins.toJSON conf); - target = "datadog-agent/" + name; - }) (filterAttrs (name: conf: conf != null) entries); + # Generate Datadog configuration files for each configured checks. + # This works because check configurations have predictable paths, + # and because JSON is a valid subset of YAML. + makeCheckConfigs = entries: mapAttrsToList (name: conf: { + source = pkgs.writeText "${name}-check-conf.yaml" (builtins.toJSON conf); + target = "datadog-agent/conf.d/${name}.d/conf.yaml"; + }) entries; - etcfiles = makeConfigDir - { "datadog.yaml" = ddConf; - "conf.d/disk.yaml" = cfg.diskConfig; - "conf.d/network.yaml" = cfg.networkConfig; - "conf.d/postgres.d/conf.yaml" = cfg.postgresqlConfig; - "conf.d/nginx.d/conf.yaml" = cfg.nginxConfig; - "conf.d/mongo.d/conf.yaml" = cfg.mongoConfig; - "conf.d/process.yaml" = cfg.processConfig; - "conf.d/jmx.yaml" = cfg.jmxConfig; - }; + defaultChecks = { + disk = cfg.diskCheck; + network = cfg.networkCheck; + }; + + # Assemble all check configurations and the top-level agent + # configuration. + etcfiles = with pkgs; with builtins; [{ + source = writeText "datadog.yaml" (toJSON ddConf); + target = "datadog-agent/datadog.yaml"; + }] ++ makeCheckConfigs (cfg.checks // defaultChecks); in { options.services.datadog-agent = { @@ -93,62 +97,65 @@ in { ''; }; - diskConfig = mkOption { + checks = mkOption { + description = '' + Configuration for all Datadog checks. Keys of this attribute + set will be used as the name of the check to create the + appropriate configuration in `conf.d/$check.d/conf.yaml`. + + The configuration is converted into JSON from the plain Nix + language configuration, meaning that you should write + configuration adhering to Datadog's documentation - but in Nix + language. + + Refer to the implementation of this module (specifically the + definition of `defaultChecks`) for an example. + + Note: The 'disk' and 'network' check are configured in + separate options because they exist by default. Attempting to + override their configuration here will have no effect. + ''; + + example = { + http_check = { + init_config = null; # sic! + instances = [ + { + name = "some-service"; + url = "http://localhost:1337/healthz"; + tags = [ "some-service" ]; + } + ]; + }; + }; + + default = {}; + + # sic! The structure of the values is up to the check, so we can + # not usefully constrain the type further. + type = with types; attrsOf attrs; + }; + + diskCheck = mkOption { description = "Disk check config"; type = types.attrs; default = { init_config = {}; instances = [ { use-mount = "no"; } ]; }; - }; + }; - networkConfig = mkOption { + networkCheck = mkOption { description = "Network check config"; type = types.attrs; default = { init_config = {}; # Network check only supports one configured instance instances = [ { collect_connection_state = false; - excluded_interfaces = [ "lo" "lo0" ]; } ]; + excluded_interfaces = [ "lo" "lo0" ]; } ]; }; }; - - postgresqlConfig = mkOption { - description = "Datadog PostgreSQL integration configuration"; - default = null; - type = types.nullOr types.attrs; - }; - - nginxConfig = mkOption { - description = "Datadog nginx integration configuration"; - default = null; - type = types.nullOr types.attrs; - }; - - mongoConfig = mkOption { - description = "MongoDB integration configuration"; - default = null; - type = types.nullOr types.attrs; - }; - - jmxConfig = mkOption { - description = "JMX integration configuration"; - default = null; - type = types.nullOr types.attrs; - }; - - processConfig = mkOption { - description = '' - Process integration configuration - - See http://docs.datadoghq.com/integrations/process/ - ''; - default = null; - type = types.nullOr types.attrs; - }; - }; - config = mkIf cfg.enable { environment.systemPackages = [ cfg.package pkgs.sysstat pkgs.procps ]; @@ -189,7 +196,7 @@ in { serviceConfig.PermissionsStartOnly = true; }; - dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) (makeService { + dd-jmxfetch = lib.mkIf (lib.hasAttr "jmx" cfg.checks) (makeService { description = "Datadog JMX Fetcher"; path = [ cfg.package pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; serviceConfig.ExecStart = "${cfg.package}/bin/dd-jmxfetch"; From 924016f45f0fbe61b6a0db97ce9f2b41b8645dda Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 9 Aug 2018 15:33:22 +0200 Subject: [PATCH 023/258] dd-agent: Simplify inclusion of additional Datadog core integrations Refactors the process used to build the Datadog core integrations to be more easily extensible with integrations other than the ones built and installed by default. Documentation has been added in relevant parts of the module to describe how the process works. As a high-level overview: The `datadog-integrations-core` attribute in the top-level package set now accepts an extra parameter. This parameter is an attribute set where each key is the name of a Datadog integration as it appears in Datadog's integrations-core repository[1], and the value is a function that receives the Python package set and returns the required dependencies of this integration. For example: datadog-integrations-core { ntp = (ps: [ ps.ntplib ]); }; This would build the default integrations and, additionally, the `ntp` integration. To support passing the modified Python environment to the datadog-agent itself, the `python` key has been moved inside of the derivation which means that it will be made overridable. This relates to NixOS/nixpkgs#40399. [1]: https://github.com/DataDog/integrations-core --- pkgs/tools/networking/dd-agent/6.nix | 5 +- .../networking/dd-agent/integrations-core.nix | 101 +++++++++++------- pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 69 insertions(+), 42 deletions(-) diff --git a/pkgs/tools/networking/dd-agent/6.nix b/pkgs/tools/networking/dd-agent/6.nix index be5f016c187..56a71595cea 100644 --- a/pkgs/tools/networking/dd-agent/6.nix +++ b/pkgs/tools/networking/dd-agent/6.nix @@ -1,8 +1,6 @@ { stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig }: let - inherit (pythonPackages) python; - # keep this in sync with github.com/DataDog/agent-payload dependency payloadVersion = "4.7"; @@ -27,6 +25,9 @@ in buildGoPackage rec { goDeps = ./deps.nix; goPackagePath = "github.com/${owner}/${repo}"; + # Explicitly set this here to allow it to be overridden. + python = pythonPackages.python; + nativeBuildInputs = [ pkgconfig makeWrapper ]; PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix index 2efc8247369..9212209e775 100644 --- a/pkgs/tools/networking/dd-agent/integrations-core.nix +++ b/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -1,7 +1,39 @@ -{ pkgs -, python -, overrides ? (self: super: {}) -}: +# The declarations in this file build the Datadog agent's core +# integrations. These integrations are tracked in a separate +# repository[1] outside of the agent's primary repository and provide +# checks for various kinds of services. +# +# Not all services are relevant for all users, however. As some of +# them depend on various tools and Python packages it is nonsensical +# to build *all* integrations by default. +# +# A set of default integrations is defined and built either way. +# Additional integrations can be specified by overriding +# `extraIntegrations` in datadog-integrations-core. +# +# In practice the syntax for using this with additional integrations +# is not the most beautiful, but it works. For example to use +# datadog-agent from the top-level with the `ntp`-integration +# included, one could say: +# +# let +# integrationsWithNtp = datadog-integrations-core { +# # Extra integrations map from the integration name (as in the +# # integrations-core repository) to a function that receives the +# # Python package set and returns the required dependencies.g +# ntp = (ps: [ ps.ntplib ]); +# }; +# +# in ddAgentWithNtp = datadog-agent.overrideAttrs(_ : { +# python = integrationsWithNtp.python; +# }); +# +# The NixOS module 'datadog-agent' provides a simplified interface to +# this. Please see the module itself for more information. +# +# [1]: https://github.com/DataDog/integrations-core + +{ pkgs, python, extraIntegrations ? {} }: with pkgs.lib; @@ -14,6 +46,7 @@ let }; version = "git-2018-05-27"; + # Build helper to build a single datadog integration package. buildIntegration = { pname, ... }@args: python.pkgs.buildPythonPackage (args // { inherit src version; name = "datadog-integration-${pname}-${version}"; @@ -27,40 +60,32 @@ let doCheck = false; }); - packages = (self: { - python = python.withPackages (ps: with self; [ disk network postgres nginx mongo ]); + # Base package depended on by all other integrations. + datadog_checks_base = buildIntegration { + pname = "checks-base"; + sourceRoot = "datadog_checks_base"; + propagatedBuildInputs = with python.pkgs; [ + requests protobuf prometheus_client uuid simplejson uptime + ]; + }; - datadog_checks_base = buildIntegration { - pname = "checks-base"; - sourceRoot = "datadog_checks_base"; - propagatedBuildInputs = with self; with python.pkgs; [ requests protobuf prometheus_client uuid simplejson uptime ]; - }; + # Default integrations that should be built: + defaultIntegrations = { + disk = (ps: [ ps.psutil ]); + mongo = (ps: [ ps.pymongo ]); + network = (ps: [ ps.psutil ]); + nginx = (ps: []); + postgres = (ps: with ps; [ pg8000 psycopg2 ]); + }; - disk = buildIntegration { - pname = "disk"; - propagatedBuildInputs = with self; with python.pkgs; [ datadog_checks_base psutil ]; - }; + # All integrations (default + extra): + integrations = defaultIntegrations // extraIntegrations; + builtIntegrations = mapAttrs (pname: fdeps: buildIntegration { + inherit pname; + propagatedBuildInputs = (fdeps python.pkgs) ++ [ datadog_checks_base ]; + }) integrations; - network = buildIntegration { - pname = "network"; - propagatedBuildInputs = with self; with python.pkgs; [ datadog_checks_base psutil ]; - }; - - postgres = buildIntegration { - pname = "postgres"; - propagatedBuildInputs = with self; with python.pkgs; [ datadog_checks_base pg8000 psycopg2 ]; - }; - - nginx = buildIntegration { - pname = "nginx"; - propagatedBuildInputs = with self; with python.pkgs; [ datadog_checks_base ]; - }; - - mongo = buildIntegration { - pname = "mongo"; - propagatedBuildInputs = with self; with python.pkgs; [ datadog_checks_base pymongo ]; - }; - - }); - -in fix' (extends overrides packages) +in builtIntegrations // { + inherit datadog_checks_base; + python = python.withPackages (_: (attrValues builtIntegrations)); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 323a5daab3c..3d50a280ac5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15674,10 +15674,11 @@ with pkgs; dd-agent = callPackage ../tools/networking/dd-agent/5.nix { }; datadog-agent = callPackage ../tools/networking/dd-agent/6.nix { - pythonPackages = datadog-integrations-core; + pythonPackages = datadog-integrations-core {}; }; - datadog-integrations-core = callPackage ../tools/networking/dd-agent/integrations-core.nix { + datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix { python = python27; + extraIntegrations = extras; }; ddgr = callPackage ../applications/misc/ddgr { }; From 5b748bd8fa517fa16d0fdb60fd5a83d4d1717efe Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 9 Aug 2018 16:01:12 +0200 Subject: [PATCH 024/258] nixos/datadog-agent: Add option to configure datadog integrations Introduces an option `services.datadog-agent.extraIntegrations` that can be set to include additional Datadog agent integrations from the integrations-core repository. Documentation and an example is provided with the change. Relates to NixOS/nixpkgs#40399 --- .../services/monitoring/datadog-agent.nix | 48 +++++++++++++++---- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index 6b7359934f5..f8ee34ebdf8 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -38,6 +38,12 @@ let target = "datadog-agent/datadog.yaml"; }] ++ makeCheckConfigs (cfg.checks // defaultChecks); + # Apply the configured extraIntegrations to the provided agent + # package. See the documentation of `dd-agent/integrations-core.nix` + # for detailed information on this. + datadogPkg = cfg.package.overrideAttrs(_: { + python = (pkgs.datadog-integrations-core cfg.extraIntegrations).python; + }); in { options.services.datadog-agent = { enable = mkOption { @@ -52,9 +58,10 @@ in { default = pkgs.datadog-agent; defaultText = "pkgs.datadog-agent"; description = '' - Which DataDog v6 agent package to use. - Override the pythonPackages argument - of this derivation to include more checks. + Which DataDog v6 agent package to use. Note that the provided + package is expected to have an overridable `python`-attribute + which configures the Python environment with the Datadog + checks. ''; type = types.package; }; @@ -88,6 +95,27 @@ in { type = types.nullOr (types.enum ["DEBUG" "INFO" "WARN" "ERROR"]); }; + extraIntegrations = mkOption { + default = {}; + type = types.attrs; + + description = '' + Extra integrations from the Datadog core-integrations + repository that should be built and included. + + By default the included integrations are disk, mongo, network, + nginx and postgres. + + To include additional integrations the name of the derivation + and a function to filter its dependencies from the Python + package set must be provided. + ''; + + example = { + ntp = (pythonPackages: [ pythonPackages.ntplib ]); + }; + }; + extraConfig = mkOption { default = {}; type = types.attrs; @@ -157,7 +185,7 @@ in { }; }; config = mkIf cfg.enable { - environment.systemPackages = [ cfg.package pkgs.sysstat pkgs.procps ]; + environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps ]; users.extraUsers.datadog = { description = "Datadog Agent User"; @@ -171,7 +199,7 @@ in { systemd.services = let makeService = attrs: recursiveUpdate { - path = [ cfg.package pkgs.python pkgs.sysstat pkgs.procps ]; + path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { User = "datadog"; @@ -180,7 +208,7 @@ in { RestartSec = 2; PrivateTmp = true; }; - restartTriggers = [ cfg.package ] ++ map (etc: etc.source) etcfiles; + restartTriggers = [ datadogPkg ] ++ map (etc: etc.source) etcfiles; } attrs; in { datadog-agent = makeService { @@ -190,16 +218,16 @@ in { rm -f /etc/datadog-agent/auth_token ''; script = '' - export DD_API_KEY=$(head -n1 ${cfg.apiKeyFile}) - exec ${cfg.package}/bin/agent start -c /etc/datadog-agent/datadog.yaml + export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile}) + exec ${datadogPkg}/bin/agent start -c /etc/datadog-agent/datadog.yaml ''; serviceConfig.PermissionsStartOnly = true; }; dd-jmxfetch = lib.mkIf (lib.hasAttr "jmx" cfg.checks) (makeService { description = "Datadog JMX Fetcher"; - path = [ cfg.package pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; - serviceConfig.ExecStart = "${cfg.package}/bin/dd-jmxfetch"; + path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; + serviceConfig.ExecStart = "${datadogPkg}/bin/dd-jmxfetch"; }); }; From a7685f76971f18b7b151691223a365a76e968226 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 9 Aug 2018 22:28:51 +0200 Subject: [PATCH 025/258] nix1: don't deliver perl-bindings of nixStable (a.k.a nix2) This causes collisions between the build outputs of `nix` when building in an environment with `nix1.perl-bindings` and `nix`: ``` collision between `/nix/store/aa4rrcj7dg2xj4rfkiclcmp745ibqng0-nix-2.0.4/lib/libnixstore.so' and `/nix/store/sp0sdi4bll80h58big1iy8kkh3qqxpw2-nix-1.11.16/lib/libnixstore.so' builder for '/nix/store/wgbccin107lhm8cv9imnnvkx1j2pgibc-hydra-perl-deps.drv' failed with exit code 25 ``` --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2302476eb91..56bfdb046a8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -132,7 +132,7 @@ in rec { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; }; - }) // { perl-bindings = nixStable; }; + }) // { perl-bindings = nix1; }; nixStable = (common rec { name = "nix-2.0.4"; From d2b5e6eafe4ee59d89a8233a599fafb83bc35169 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Fri, 10 Aug 2018 14:28:57 +0900 Subject: [PATCH 026/258] Start trying to actually use the extpack in the virtualbox derivation. --- .../virtualization/virtualbox/default.nix | 27 +++---------------- .../virtualization/virtualbox/extpack.nix | 11 +++----- pkgs/top-level/all-packages.nix | 7 +++-- 3 files changed, 11 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f9770435aaf..94fc9697e54 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -6,7 +6,7 @@ , xorriso, makeself, perl , javaBindings ? false, jdk ? null , pythonBindings ? false, python2 ? null -, enableExtensionPack ? false, requireFile ? null, fakeroot ? null +, extensionPack ? null, fakeroot ? null , pulseSupport ? false, libpulseaudio ? null , enableHardening ? false , headless ? false @@ -19,30 +19,9 @@ with stdenv.lib; let python = python2; buildType = "release"; - # Manually sha256sum the extensionPack file, must be hex! - # Do not forget to update the hash in ./guest-additions/default.nix! - extpack = "d90c1b0c89de19010f7c7fe7a675ac744067baf29a9966b034e97b5b2053b37e"; - extpackRev = "123301"; + # Remember to change the extpackRev and version in extpack.nix as well. main = "ee3af129a581ec4c1a3e777e98247f8943e976ce6edd24962bcaa5c53ed1f644"; version = "5.2.14"; - - # See https://github.com/NixOS/nixpkgs/issues/672 for details - extensionPack = requireFile rec { - name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack"; - sha256 = extpack; - message = '' - In order to use the extension pack, you need to comply with the VirtualBox Personal Use - and Evaluation License (PUEL) available at: - - https://www.virtualbox.org/wiki/VirtualBox_PUEL - - Once you have read and if you agree with the license, please use the - following command and re-run the installation: - - nix-prefetch-url http://download.virtualbox.org/virtualbox/${version}/${name} - ''; - }; - in stdenv.mkDerivation { name = "virtualbox-${version}"; @@ -174,7 +153,7 @@ in stdenv.mkDerivation { ln -s "$libexec/$file" $out/bin/$file done - ${optionalString enableExtensionPack '' + ${optionalString (extensionPack != null) '' mkdir -p "$share" "${fakeroot}/bin/fakeroot" "${stdenv.shell}" < Date: Sat, 11 Aug 2018 02:48:29 +0900 Subject: [PATCH 027/258] virtualization: update the virtualbox-host module to use the extension pack if enabled. --- nixos/modules/virtualisation/virtualbox-host.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 8adf3aa919d..af0a27b0ad8 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -6,7 +6,8 @@ let cfg = config.virtualisation.virtualbox.host; virtualbox = pkgs.virtualbox.override { - inherit (cfg) enableExtensionPack enableHardening headless; + inherit (cfg) enableHardening headless; + extensionPack = if cfg.enableExtensionPack then pkgs.virtualboxExtpack else null; }; kernelModules = config.boot.kernelPackages.virtualbox.override { @@ -28,7 +29,16 @@ in ''; }; - enableExtensionPack = mkEnableOption "VirtualBox extension pack"; + enableExtensionPack = mkEnableOption "VirtualBox extension pack" // { + description = '' + Whether to install the Oracle Extension Pack for VirtualBox. + + + You must set nixpkgs.config.allowUnfree = true in + order to use this. This requires you accept the VirtualBox PUEL. + + ''; + }; addNetworkInterface = mkOption { type = types.bool; From 2560b0724ad3f427d4f82367b1823209cb366fa2 Mon Sep 17 00:00:00 2001 From: Jason Carr Date: Fri, 10 Aug 2018 02:40:51 -0400 Subject: [PATCH 028/258] nodePackages.jake init --- pkgs/development/node-packages/node-packages-v6.json | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index dd8d0818703..4e10a50938e 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -41,6 +41,7 @@ , "ios-deploy" , "istanbul" , "imapnotify" +, "jake" , "javascript-typescript-langserver" , "jayschema" , "jsdoc" From c2fc585110e294df60047ea16c7537e296ab1ff0 Mon Sep 17 00:00:00 2001 From: Jason Carr Date: Fri, 10 Aug 2018 02:41:07 -0400 Subject: [PATCH 029/258] nodePackages.madoko init --- pkgs/development/node-packages/node-packages-v6.json | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 4e10a50938e..fdf028196c3 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -63,6 +63,7 @@ , "less-plugin-clean-css" , "live-server" , "livedown" +, "madoko" , "meat" , "meguca" , "mocha" From 533a83c30d9e89731de16b5cf0a25af9cd1f002d Mon Sep 17 00:00:00 2001 From: Jason Carr Date: Fri, 10 Aug 2018 03:05:58 -0400 Subject: [PATCH 030/258] nodePackages: update versions --- .../node-packages/node-packages-v10.nix | 6 +- .../node-packages/node-packages-v6.nix | 2509 +++++++---------- .../node-packages/node-packages-v8.nix | 383 +-- 3 files changed, 1079 insertions(+), 1819 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 85008c96b14..488f1782dda 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -213,10 +213,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.12.2"; + version = "2.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.12.2.tgz"; - sha1 = "1b575512ae27d767f4aaec14e94b18e0c70bcc7b"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.1.tgz"; + sha512 = "xwIluOOA+GV6Rz5jvVS2hcGlrqjEWaaU7/PUECdG8H/Eo9I4xban/XhedQ8jIrqt1P7KLDV0/+ENlmYusdL/Zw=="; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 6dae8dd7013..7e118a7ab20 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -58,31 +58,31 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; - "@ionic/cli-framework-1.0.2" = { + "@ionic/cli-framework-1.0.5" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "1.0.2"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.0.2.tgz"; - sha512 = "YQ05O1H537yilPxReua/ge7u0nHmlp8kMBbDlUrnxU50HDdqKeUThMPnavqzbVHaEbWI4xJZcxR1cjjKVXqg+Q=="; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.0.5.tgz"; + sha512 = "xyxPkNS2JQUIBrK7OMG9NkLgEZsKPXMIEWR/7+6n7VxerVYCWmFvEqrmMzxenVBTueZYlRJBQ39XLyyggMEPEg=="; }; }; - "@ionic/cli-utils-2.0.3" = { + "@ionic/cli-utils-2.0.6" = { name = "_at_ionic_slash_cli-utils"; packageName = "@ionic/cli-utils"; - version = "2.0.3"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-2.0.3.tgz"; - sha512 = "E0YIkKusnQ0XuuGQ8aPBV3NN3e4suG+7U/gMlpoiGGVMAd1zb9rwbxsQU4/S0kfLOrdTbMzB7wTd/ko0l6hHyA=="; + url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-2.0.6.tgz"; + sha512 = "1tIqQwHqessMDTr7DlZGuWkAcZPPRK5hbhxcBEFyz2FHrMxDHnh8/omU6MBToDNQZn1KaZDpppfCP2q95WYAaw=="; }; }; - "@ionic/discover-1.0.2" = { + "@ionic/discover-1.0.3" = { name = "_at_ionic_slash_discover"; packageName = "@ionic/discover"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.2.tgz"; - sha512 = "U2oQPgsZlVuYXvlWO0uSuxs2g0YZ3gmYqkHwbThJaX6AO6UgASQrnLDQ0KXw+If7la2MYWVolFWq+fZFyMvT5Q=="; + url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.3.tgz"; + sha512 = "TssgJD1A1Ll4bigVM84ugmIxADFHMvlXP41FZDPqZsgjYDt09B4h0jc3tsuDovgswany+vOeQCrDNzkfanIXZA=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -94,382 +94,409 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.0.0-rc.0" = { + "@lerna/add-3.0.0" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.0.0-rc.0.tgz"; - sha512 = "PZ/dn4UlA/7sd848LHE2TLXIkOzLDk8Uw/Gz6OwXfxXpng/w6mXcyjaScniT3HzLbzw5fP150+im5mL6BQv9JQ=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.0.0.tgz"; + sha512 = "wgdHheCPQ4qLqiBrYeT2JtZcVASoodhmiwHNqvs6HBkzUb/c+2qJc9Kul2GkJt8OHiqXFNPRzYJ9CIws/wzaXg=="; }; }; - "@lerna/batch-packages-3.0.0-rc.0" = { + "@lerna/batch-packages-3.0.0" = { name = "_at_lerna_slash_batch-packages"; packageName = "@lerna/batch-packages"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.0.0-rc.0.tgz"; - sha512 = "2FZs545THLHSWZ96xKT5wWFOdIt1UIKnc+Z2IIXCgmhT//fcqEcHFSgq42VxgoELgE4rM7jE2s6wgMatiJwRGg=="; + url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.0.0.tgz"; + sha512 = "0tN9oNykfIhdFaxEEHxF1S8K7wJdRjzGmbMhrirNogk7I2sLP82aoKH4rLCAdwidX5OvDhzlyQM0MC86T7Lazg=="; }; }; - "@lerna/bootstrap-3.0.0-rc.0" = { + "@lerna/bootstrap-3.0.0" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.0.0-rc.0.tgz"; - sha512 = "69mXMWjXA8R6ldDmSntFIIZTNAgEu1lOUP7DilL4OY55z01ln5fOtG/c65PQBm4mjm5ejh1kJVWiDT8MbCRslQ=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.0.0.tgz"; + sha512 = "urMkEp+oF+huqML3u7Q6lZ3w0vkv7x8QKMAKFuB14gNLaviMWy+YxfEz0DrIVjcleAryxmgRtdlUbN0+VhjS3g=="; }; }; - "@lerna/changed-3.0.0-rc.0" = { + "@lerna/changed-3.0.0" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.0.0-rc.0.tgz"; - sha512 = "DY2Id3Y1jifIdZ8uNymUijUgkVRFg64IUHMTb1sm0g/Nd+n++kLo9oqxRTUfuBkW3e1HTUuMkd3ZygU5UBtz6g=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.0.0.tgz"; + sha512 = "l1wrzHPgLXAh9OxU/RLr87ns5H1Gw14u4WXPDthqPb41ZNT4Pf15Pj08pbM+KK7y8Ffapr/rdh28QVFsMRC/fw=="; }; }; - "@lerna/child-process-3.0.0-rc.0" = { + "@lerna/child-process-3.0.0" = { name = "_at_lerna_slash_child-process"; packageName = "@lerna/child-process"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.0.0-rc.0.tgz"; - sha512 = "5LhCU8isfJFj+5V5cJ+wcRR+VkNIbb3rSjm4VVclnD05ZfaY1HmfhBu3VjYt0SulhZKWJEnNBvjG88wgTay1vQ=="; + url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.0.0.tgz"; + sha512 = "8vHRDkpGhzSaMsXgyXVgY80mUSC5WSkDmhWWA3bnB/n5FBK1gK8EKQUpHTk14SckwvUgEJzBd35gR5/XKGOgmQ=="; }; }; - "@lerna/clean-3.0.0-rc.0" = { + "@lerna/clean-3.0.0" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.0.0-rc.0.tgz"; - sha512 = "rVlvO+bhfU/Q9D6bfg5GaLprKMD5rTRjJEqLONpESx/5Ed+NKgbYRiWafpQrB85m2r3c5dSGEPEc2q2rNG3EPg=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.0.0.tgz"; + sha512 = "53klFwyNKdwu0a6R/n/tHCcuNAfOgunTqPQfudZr28yALTjqkfgomyaE8DCQ3h5vjp/4axBLKj0S4Jv6GKTT+A=="; }; }; - "@lerna/cli-3.0.0-rc.0" = { + "@lerna/cli-3.0.1" = { name = "_at_lerna_slash_cli"; packageName = "@lerna/cli"; - version = "3.0.0-rc.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.0.0-rc.0.tgz"; - sha512 = "MUOrP8BiwjayPZAS3Nww1nlB6j02N4FmJK/f2PhJPMDsXMqm3mn5jBTBvlKbLQZJ/VDro8JbRGUUxCuCQEE+cQ=="; + url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.0.1.tgz"; + sha512 = "/SIaTqLkUM/x1ryQdlJuAr57AqNyudRCA9UX5n3kSg+vAJdRx81f9p7RVsSmr/kqhHFsVLbBkg7YK+9PgXDDiA=="; }; }; - "@lerna/collect-updates-3.0.0-rc.0" = { + "@lerna/collect-updates-3.0.0" = { name = "_at_lerna_slash_collect-updates"; packageName = "@lerna/collect-updates"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.0.0-rc.0.tgz"; - sha512 = "G1BgTIWc6rSsuMLsgpT+xvrQrSN/a0kC+KqMZ9CbCoImtj0AKvrAm3TeFOsYU9JHBUYfe1HWMIIhUSD4VhXmeg=="; + url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.0.0.tgz"; + sha512 = "JYrcH8V36Uqhd5f032WAhxxQwyaUZ2KSEhTnBNPUUxQpw1fTH07BWh2e9pcS+ylI6C0yVQrTC2Z8WyB52tSvtw=="; }; }; - "@lerna/command-3.0.0-rc.0" = { + "@lerna/command-3.0.0" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-3.0.0-rc.0.tgz"; - sha512 = "YzQKhQGSaqhnj/UbygmIneQDuhsTGu9rBqbX84Qs8RhKMMAPWurg+k6sCIihHgBz17tknxEvch/SefMNQxqzAA=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-3.0.0.tgz"; + sha512 = "qPTM9jFSoxncqlxumlgS1/+hqJ5YYxw4+5UN/4Mbq6yqHObt1VfCtU1EDmDND9gSzdPxV1nLhIeEESoPs0p9LQ=="; }; }; - "@lerna/conventional-commits-3.0.0-rc.0" = { + "@lerna/conventional-commits-3.0.0" = { name = "_at_lerna_slash_conventional-commits"; packageName = "@lerna/conventional-commits"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.0.0-rc.0.tgz"; - sha512 = "J5RC+pd7kHP8EfqzvZqaXW253IoShdlzl1Jrw17KqPDAfL5CoZoUwxgZv4ur3kSSv+jHZGQeuAcg93OsBgkzPw=="; + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.0.0.tgz"; + sha512 = "4RkrZqkJjsUVG9pR5xK5buUM9vROG+XdJ0jAVnuuT8L3u1xE+nwe41cydtm6etqkfOZ26BOaI0bWl5uCvozpHg=="; }; }; - "@lerna/create-3.0.0-rc.0" = { + "@lerna/create-3.0.0" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-3.0.0-rc.0.tgz"; - sha512 = "6GLI+MEKANCAVnuA9pYQX1k+XyyPEBdoPAiSK4lnW2w4E2KSQZxdkI1+9QLv6S2oTrnlrFSxGmqgmmijaZfCGg=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-3.0.0.tgz"; + sha512 = "SyfEhdkR9LJYQaMlXfqGnJwK0kMYjqMDy+SgWGZ2QQ5dxDNEw3+fS7ofIduULS35tC447PmNgViWTgN4PmkY0w=="; }; }; - "@lerna/create-symlink-3.0.0-rc.0" = { + "@lerna/create-symlink-3.0.0" = { name = "_at_lerna_slash_create-symlink"; packageName = "@lerna/create-symlink"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.0.0-rc.0.tgz"; - sha512 = "wz/C7DB5chTidAOc9+edeg65nJLG1PNO9J/jlAUZOY4G3EPGihLroabIlvbjB5SJ8QKS88ftX+f1pzFZ+nYOdQ=="; + url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.0.0.tgz"; + sha512 = "Q9qAzGGqQtVzHWrCz+Md4SH0tW99DrgFJ68cnFqilOO6H3Y/y/H0gwHICqM9YxRwLs6GJdkzoqJATFShM7PKJA=="; }; }; - "@lerna/diff-3.0.0-rc.0" = { + "@lerna/diff-3.0.0" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.0.0-rc.0.tgz"; - sha512 = "fXeB10qaFeBMucorkV6Q/bJiWayZgGizVsPkuGN1izENd4DBsTxUyh2a6Y3lY5GzCZ33wmuVDe2HdRVHtfrzaQ=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.0.0.tgz"; + sha512 = "UaPVahvqu93Sw92jcG4vt6RCaRNH38uQrZMAbSe2UQg+p3MFAnJpHRSPVYy2UDG5QgWHAQkg2FEJcBGjgJAWLg=="; }; }; - "@lerna/exec-3.0.0-rc.0" = { + "@lerna/exec-3.0.0" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.0.0-rc.0.tgz"; - sha512 = "DYU00HAAoreqNQmLV0+gfH4mXIJKbd1rbrMvQbnfCTZ3nWYiORXQwvwCYbGgmsMarSaJ/T3eTPP6LvsVt7y1aw=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.0.0.tgz"; + sha512 = "AtlvpnKdcoUq+XPQZHkEBUiGznCpq8SYtvo7Y0o4O8CZxYw/FKCTS8rXNUB/DPFen3OqX8ySmEAg0g5MMbr2Jg=="; }; }; - "@lerna/filter-options-3.0.0-rc.0" = { + "@lerna/filter-options-3.0.0" = { name = "_at_lerna_slash_filter-options"; packageName = "@lerna/filter-options"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.0.0-rc.0.tgz"; - sha512 = "aqyb0GWEnQgu7eXHpVSpZLedVd3PrI5WK/CfzDlHGqUT8PCJTo9q2562gmEdeCWWfeSvXbezGm0djTC6RwHV1A=="; + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.0.0.tgz"; + sha512 = "l2oMEbpeOZQZ+TCbPKasnq7zMXdgwgazyVTHU1k319pQN6kSW57gEhUGjjQaeKhOM3XFF4pPWyqwFxw80SJDMw=="; }; }; - "@lerna/filter-packages-3.0.0-rc.0" = { + "@lerna/filter-packages-3.0.0" = { name = "_at_lerna_slash_filter-packages"; packageName = "@lerna/filter-packages"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.0.0-rc.0.tgz"; - sha512 = "ZVObVh8Nk5d6XS/RAJEdu56KbpqvwJrKruoYnDPFeno/Q6/G1Oi8S/W2NmfEXMBSPaVpYecbGfM4Xu5dLzipNA=="; + url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.0.0.tgz"; + sha512 = "zwbY1J4uRjWRZ/FgYbtVkq7I3Nduwsg2V2HwLKSzwV2vPglfGqgovYOVkND6/xqe2BHwDX4IyA2+e7OJmLaLSA=="; }; }; - "@lerna/get-npm-exec-opts-3.0.0-rc.0" = { + "@lerna/get-npm-exec-opts-3.0.0" = { name = "_at_lerna_slash_get-npm-exec-opts"; packageName = "@lerna/get-npm-exec-opts"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.0.0-rc.0.tgz"; - sha512 = "n5Oe1LPzyMKGAdYVVDimpuVsWexTCaLlJq9RqXphoijRh5DAB/Mhaw9//5vGrv770m/QNMSceF99SZLI9gyh4g=="; + url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.0.0.tgz"; + sha512 = "arcYUm+4xS8J3Palhl+5rRJXnZnFHsLFKHBxznkPIxjwGQeAEw7df38uHdVjEQ+HNeFmHnBgSqfbxl1VIw5DHg=="; }; }; - "@lerna/global-options-3.0.0-rc.0" = { + "@lerna/global-options-3.0.0" = { name = "_at_lerna_slash_global-options"; packageName = "@lerna/global-options"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.0.0-rc.0.tgz"; - sha512 = "Sy8KE1cAcGwjxOxiJOHjTxJecLcJhAeQym4Ge3WP1Jnz5mq03o9mb37X0Hmjpv1W9OblbXVxHdmbyC3hxMEHIA=="; + url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.0.0.tgz"; + sha512 = "F0xxrPuTT0qpoRg1uG16GVFZmP8Avm31u2r2/p9twn4wTZ8pqRS3IAoV0a6kU4fzq1fiHJjWbuL+3ZiC5YB9SA=="; }; }; - "@lerna/import-3.0.0-rc.0" = { + "@lerna/import-3.0.0" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-3.0.0-rc.0.tgz"; - sha512 = "ZRrusuAScKg29jRrurEi/qJbpol5RWY98nBhOmq08pibVz8cwS1QzyTwQhxaZECHYrKpL/qdLNigKsNi4+jyYw=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-3.0.0.tgz"; + sha512 = "46nwGkL44K2uEagW8v9bMqA+zoKz3xXYVkN++SZxHBPD8ZsLSrQ9RMUyfQb6Z3me/wNv1FN6nJs3MbTNx+z6JA=="; }; }; - "@lerna/init-3.0.0-rc.0" = { + "@lerna/init-3.0.0" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-3.0.0-rc.0.tgz"; - sha512 = "/G4gy5QDNsxVXTEo59YRilcW7hnob31GVPc3omy9AZq8HZYCpj/tAw39mEds7S1wPCx0aotRj+NDf178zj11Mw=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-3.0.0.tgz"; + sha512 = "9iq8aentjd157VjQrK4ihYLXWTT4/yC3iX0tw3S7kh/qbud3qTYCeJkIXcKUl0OK4UcGPD9f4R6oUo9Zoud/yw=="; }; }; - "@lerna/link-3.0.0-rc.0" = { + "@lerna/link-3.0.0" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-3.0.0-rc.0.tgz"; - sha512 = "Al57Ib56/ojGQ3hcln+DhS5IGWqLv8EElrAmSp0c3t/Ie48VOv9AusQR9nDRIGEn73APu/EG0ILdbylfQBzaKg=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-3.0.0.tgz"; + sha512 = "uwOnMFbtipvZecLNylrYwoXu1M5NcBN51AaLO6JuzP1xXFIbLOevP1iELM4e9pW4GnX3WBsuf37C7eweAy0erQ=="; }; }; - "@lerna/list-3.0.0-rc.0" = { + "@lerna/list-3.0.0" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-3.0.0-rc.0.tgz"; - sha512 = "uQuFeRHhF6ALohRkVY6VxpCyeCHHTEqzt0SNvacTAA+gJX/hadtEYS883KOzmmcFibL4UtljQbdfj+DjrLKfUQ=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-3.0.0.tgz"; + sha512 = "48AfpzOqbUbunvFVkmmWSQp7dSJgSLl1RqliV06nNay39bpW6AFVApo2/2/O5p2on+MG+yasB7xYBillc+rW4g=="; }; }; - "@lerna/npm-conf-3.0.0-rc.0" = { + "@lerna/listable-3.0.0" = { + name = "_at_lerna_slash_listable"; + packageName = "@lerna/listable"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.0.0.tgz"; + sha512 = "HX/9hyx1HLg2kpiKXIUc1EimlkK1T58aKQ7ovO7rQdTx9ForpefoMzyLnHE1n4XrUtEszcSWJIICJ/F898M6Ag=="; + }; + }; + "@lerna/log-packed-3.0.0" = { + name = "_at_lerna_slash_log-packed"; + packageName = "@lerna/log-packed"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.0.0.tgz"; + sha512 = "DdITJW54KfNFDqH+AE6hBGGqSDEimxnjyOjSaUrvfB5Gxkp1ddfYNaMQSRLxjo4PTDnVckCuqlrMo/tWwlodWA=="; + }; + }; + "@lerna/npm-conf-3.0.0" = { name = "_at_lerna_slash_npm-conf"; packageName = "@lerna/npm-conf"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.0.0-rc.0.tgz"; - sha512 = "zdd/c83UTDGHci1MrW61olXh04cqRvwkA1SZgXYiLo7A87yHlBYwVOu1d7Rl0J6lHG7++8X2odWqzYZkFfeVFA=="; + url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.0.0.tgz"; + sha512 = "xXG7qt349t+xzaHTQELmIDjbq8Q49HOMR8Nx/gTDBkMl02Fno91LXFnA4A7ErPiyUSGqNSfLw+zgij0hgpeN7w=="; }; }; - "@lerna/npm-dist-tag-3.0.0-rc.0" = { + "@lerna/npm-dist-tag-3.0.0" = { name = "_at_lerna_slash_npm-dist-tag"; packageName = "@lerna/npm-dist-tag"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.0.0-rc.0.tgz"; - sha512 = "Xa5mPmSIsi0N4pNNSBpKeghQ7XskKCVK+pawEvgKAYHph/J9PIfrddVJUU8o3nk2qkqeqikypoS++bwMdVr8Ew=="; + url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.0.0.tgz"; + sha512 = "ZOcfcsNJlCoVHvLOROdCTvqD3keG3TJ78Cu8sALsz8n0kEz2ga7tNy5wbQ67SGyY7+jq4YiBv5BwXjV+56Sv+A=="; }; }; - "@lerna/npm-install-3.0.0-rc.0" = { + "@lerna/npm-install-3.0.0" = { name = "_at_lerna_slash_npm-install"; packageName = "@lerna/npm-install"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.0.0-rc.0.tgz"; - sha512 = "QWvgQ0osTf7e87hc1kKXDcbWPXVCqGUiVnTpjX22+CEiJjUMStWEp4MjLieObgFVLyTtanOZp8VpRqBsPE0HRQ=="; + url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.0.0.tgz"; + sha512 = "e0sspVUfzEKhqsRIxzWqZ/uMBHzZSzOa4HCeORErEZu+dmDoI145XYhqvCVn7EvbAb407FV2H9GVeoP0JeG8GQ=="; }; }; - "@lerna/npm-publish-3.0.0-rc.0" = { + "@lerna/npm-publish-3.0.0" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.0.0-rc.0.tgz"; - sha512 = "rP8epG0SsHzqYw9xvwVX6YyAAwPYJAYZvMNxJvyi8fp5KdnD2sTeV/JOrWbQD/RxBxR2WGJxelVRL617KWZMOA=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.0.0.tgz"; + sha512 = "Ir+pkq9gTHoJ3hA2b7oYhjfEyfOkeF+nmqmqEB5/DmO4BwVAITcIBBIDNXWGLfpkrCmQ+SLiwpYqJfTPCq286A=="; }; }; - "@lerna/npm-run-script-3.0.0-rc.0" = { + "@lerna/npm-run-script-3.0.0" = { name = "_at_lerna_slash_npm-run-script"; packageName = "@lerna/npm-run-script"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.0.0-rc.0.tgz"; - sha512 = "Hm6KLPpeIyRIdc9MntmaAhuboUyw75DJLJ1MTaLwq/RwZ2kKHYk1Hi/R7yjj8LOyD7A25BTYX0Pd1gHd1lsFVw=="; + url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.0.0.tgz"; + sha512 = "Y1H4Myer1S7an33FDK0eqyR+95PujUePC/xJZKq/H50SaQNwBw7KMlxXxy6kXVEcQhmvQsER4Bw3msgqwwGYIw=="; }; }; - "@lerna/output-3.0.0-rc.0" = { + "@lerna/output-3.0.0" = { name = "_at_lerna_slash_output"; packageName = "@lerna/output"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/output/-/output-3.0.0-rc.0.tgz"; - sha512 = "zZmQ94nVUfe1CvexarDnrb/Mqt81OcZNuOCvcKFHJiNkr5VSIn2GJuUwtTaVUtoh5uXdJCJvm696Ptsep10BWw=="; + url = "https://registry.npmjs.org/@lerna/output/-/output-3.0.0.tgz"; + sha512 = "EFxnSbO0zDEVKkTKpoCUAFcZjc3gn3DwPlyTDxbeqPU7neCfxP4rA4+0a6pcOfTlRS5kLBRMx79F2TRCaMM3DA=="; }; }; - "@lerna/package-3.0.0-rc.0" = { + "@lerna/package-3.0.0" = { name = "_at_lerna_slash_package"; packageName = "@lerna/package"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package/-/package-3.0.0-rc.0.tgz"; - sha512 = "4EUnBc04IxganMamjnEfagajLya3nPKfqlorGc5VLoGh5akOZmrCF9qiqB90nYzrJoMt+5QB1lxYD8bxikX0qg=="; + url = "https://registry.npmjs.org/@lerna/package/-/package-3.0.0.tgz"; + sha512 = "djzEJxzn212wS8d9znBnlXkeRlPL7GqeAYBykAmsuq51YGvaQK67Umh5ejdO0uxexF/4r7yRwgrlRHpQs8Rfqg=="; }; }; - "@lerna/package-graph-3.0.0-rc.0" = { + "@lerna/package-graph-3.0.0" = { name = "_at_lerna_slash_package-graph"; packageName = "@lerna/package-graph"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.0.0-rc.0.tgz"; - sha512 = "E2MlL0CwDzcDTLPpMhg9+TESRAD/wYLtEu+Mj1R4OZbF2jlSXSZok1g3LW/gzulVd5oq9q+qBdY3SX5b9PCsGQ=="; + url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.0.0.tgz"; + sha512 = "kD9ezB7UT2I0BbVv3+ZYfR/t/Z+z6RJmaI/OkvEaZ3bAcAqQRV4zTDdh2Xeiead+UwsA38xf7Z6pDEMWzswLVg=="; }; }; - "@lerna/project-3.0.0-rc.0" = { + "@lerna/project-3.0.0" = { name = "_at_lerna_slash_project"; packageName = "@lerna/project"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/project/-/project-3.0.0-rc.0.tgz"; - sha512 = "lNego7jYd24jIDGLTcy1mrESEopCblVaZztKhJJntSZdqWZ/tnExjIITfS55CnZyKAXwPVIus6YRfOc24tvuaA=="; + url = "https://registry.npmjs.org/@lerna/project/-/project-3.0.0.tgz"; + sha512 = "XhDFVfqj79jG2Speggd15RpYaE8uiR25UKcQBDmumbmqvTS7xf2cvl2pq2UTvDafaJ0YwFF3xkxQZeZnFMwdkw=="; }; }; - "@lerna/prompt-3.0.0-rc.0" = { + "@lerna/prompt-3.0.0" = { name = "_at_lerna_slash_prompt"; packageName = "@lerna/prompt"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.0.0-rc.0.tgz"; - sha512 = "4ABsGTq7/IMh3nX7LfRirJnXt50Yp/Lg837hb/Hp1OXFz1FoXLcbzoIx0QQYyk3q+Gnv2TwSK2M86xoUFIUXnw=="; + url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.0.0.tgz"; + sha512 = "EzvNexDTh//GlpOz68zRo16NdOIqWqiiXMs9tIxpELQubH+kUGKvBSiBrZ2Zyrfd8pQhIf+8qARtkCG+G7wzQQ=="; }; }; - "@lerna/publish-3.0.0-rc.0" = { + "@lerna/publish-3.0.1" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.0.0-rc.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.0.0-rc.0.tgz"; - sha512 = "bfjRtCzHAGSS5z8QOUw3UeLn4u5CpJTGUkk9y1PPbzdbMWmJhJnEjSw+TN2LaZFVGzQbE8dsLqR5TL149Y7P/Q=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.0.1.tgz"; + sha512 = "ml1odkwPJl+DxcIVI8GilXD1O7oGBQEI+IuX2bBfgJFJ+DHm/l5l7cmflaetpjkE4GjNhaVAZD6JiReLHMp9eA=="; }; }; - "@lerna/resolve-symlink-3.0.0-rc.0" = { + "@lerna/resolve-symlink-3.0.0" = { name = "_at_lerna_slash_resolve-symlink"; packageName = "@lerna/resolve-symlink"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.0.0-rc.0.tgz"; - sha512 = "EBRD/65aTCyZMqWzAM7Ac1zqtZBkTE5AHzzIViQaB5el3j7ThBzzWwYuiBNWibNGTMObLQMrp+65yCbew5H+aA=="; + url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.0.0.tgz"; + sha512 = "MqjW9e+QVXts5IK5dk1XnYx7JKb+g+tQkOnnpAxYWHjahf3rGJ7Ru8maWh8KoPE+nIHAekk4WcjpiA9nLKvkFQ=="; }; }; - "@lerna/rimraf-dir-3.0.0-rc.0" = { + "@lerna/rimraf-dir-3.0.0" = { name = "_at_lerna_slash_rimraf-dir"; packageName = "@lerna/rimraf-dir"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.0.0-rc.0.tgz"; - sha512 = "aFPX1hMOBL+5AU5xI9SZ2xKTAlnk93+tIw1ZJGWMMc4dzxNs/sT3WeUUH4v1TOYzMqWM3AnLQza3O4OY/xb2hg=="; + url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.0.0.tgz"; + sha512 = "epvh/RGWSOYdrNgrizMcRq9VyCHkeY0LpIE4074r4ouKdYNhBT0LlpT0yMLvQgQKJkKRlqcfhJHvZeGHhXQyGg=="; }; }; - "@lerna/run-3.0.0-rc.0" = { + "@lerna/run-3.0.0" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-3.0.0-rc.0.tgz"; - sha512 = "biLKshDBwQ7n3XLihV5QvrlOBJ1isnRJC8xC8FeUbH3x1FRX15Ogg+8/GiGG7vaM6kdE4j0ebrW8HPUEh5L4cw=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-3.0.0.tgz"; + sha512 = "Sa45Iwj5ifxmgQEiqc86ke72N9DD+3AwyOIbPeIgRxMyEtKQ/+UYy+maizIGjgVnVdT90OkPN6TKvbbt+dOgYQ=="; }; }; - "@lerna/run-lifecycle-3.0.0-rc.0" = { + "@lerna/run-lifecycle-3.0.0" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.0.0-rc.0.tgz"; - sha512 = "/cofDJ5qzAgC99+VYxO602k1wBetv79NYOXUoju3R8xPrCXGJYoBN+/NhrPdj/CciZd9lSsx016M6FcScsaO1Q=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.0.0.tgz"; + sha512 = "kfq6eC5mCreTk7GusZyvF0/BfU9FDEt8JaUgzNKLrK1Sj6z2RO8uSpFsUlj+7OuV4wo0I+rdTdJOAFoW8C0GZw=="; }; }; - "@lerna/run-parallel-batches-3.0.0-rc.0" = { + "@lerna/run-parallel-batches-3.0.0" = { name = "_at_lerna_slash_run-parallel-batches"; packageName = "@lerna/run-parallel-batches"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-parallel-batches/-/run-parallel-batches-3.0.0-rc.0.tgz"; - sha512 = "MpXiDRo02ZHazis3sDqzhmFuMxEEPKv+mmPpzLElkCDO4LHVZYvwa3ib3ezhWwt+FUFPP4u/8w2A4cFO2PbmVQ=="; + url = "https://registry.npmjs.org/@lerna/run-parallel-batches/-/run-parallel-batches-3.0.0.tgz"; + sha512 = "Mj1ravlXF7AkkewKd9YFq9BtVrsStNrvVLedD/b2wIVbNqcxp8lS68vehXVOzoL/VWNEDotvqCQtyDBilCodGw=="; }; }; - "@lerna/symlink-binary-3.0.0-rc.0" = { + "@lerna/symlink-binary-3.0.0" = { name = "_at_lerna_slash_symlink-binary"; packageName = "@lerna/symlink-binary"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.0.0-rc.0.tgz"; - sha512 = "aFmZmvjNApa7i4SCrq//j7kg7E6mO3U7dzE4J28biFen2Ey1fmxObf1jiv6b24T92D/WztiBGSSTXbFR41yAsw=="; + url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.0.0.tgz"; + sha512 = "ElV1ij0ZiOw5j1bZqg9K+q+dV/DJVvMZxP+oj3vsP4SgnG3EdWxBIbE7TCZHbLZtF0LNJsrquGCkdqk17svx/w=="; }; }; - "@lerna/symlink-dependencies-3.0.0-rc.0" = { + "@lerna/symlink-dependencies-3.0.0" = { name = "_at_lerna_slash_symlink-dependencies"; packageName = "@lerna/symlink-dependencies"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.0.0-rc.0.tgz"; - sha512 = "dk7V95ToYw1nfn7ydkGQAn0RWyye9n05vPSCQzME+OP0nL7PcsSY+0umatsRP104VMX0yTmML129Zg5xpYDSAw=="; + url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.0.0.tgz"; + sha512 = "INPlVkuGbneQ2gKf/pe3FlvcSXOk+KbZShQsrcvvYhIjK/td1g6ToMGLhml7lNmQxL90YiAqo23Q8nwIh0HAIA=="; }; }; - "@lerna/validation-error-3.0.0-rc.0" = { + "@lerna/validation-error-3.0.0" = { name = "_at_lerna_slash_validation-error"; packageName = "@lerna/validation-error"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.0.0-rc.0.tgz"; - sha512 = "VuYvUC2DUjVq/DG7r52wWKmq1G0doGPB5eq7Uozi4QIIRWj2op1l6yCSogb3H2UKPn/5NrMOV4jztwQBnSJu0w=="; + url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.0.0.tgz"; + sha512 = "5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA=="; }; }; - "@lerna/write-log-file-3.0.0-rc.0" = { + "@lerna/version-3.0.0" = { + name = "_at_lerna_slash_version"; + packageName = "@lerna/version"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/version/-/version-3.0.0.tgz"; + sha512 = "U/YNTn53wA5y540QgdfoD5vYulLJ7X2WoBKBVGe3G8IYEHB+QpVM02yT+E6DYAfRV5C9Sd2r4bGZl2NNjMRdNw=="; + }; + }; + "@lerna/write-log-file-3.0.0" = { name = "_at_lerna_slash_write-log-file"; packageName = "@lerna/write-log-file"; - version = "3.0.0-rc.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.0.0-rc.0.tgz"; - sha512 = "LHQPRY/1eWyq7ly+4A412FT9uzGKHDSGHkLYVro8r6mToPB/6eHdntJFRGOYNzKM5eax6RgrzBImEhs3F9FWSQ=="; + url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.0.0.tgz"; + sha512 = "SfbPp29lMeEVOb/M16lJwn4nnx5y+TwCdd7Uom9umd7KcZP0NOvpnX0PHehdonl7TyHZ1Xx2maklYuCLbQrd/A=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -616,31 +643,31 @@ let sha512 = "TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg=="; }; }; - "@types/node-10.5.5" = { + "@types/node-10.5.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.5.5"; + version = "10.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.5.tgz"; - sha512 = "6Qnb1gXbp3g1JX9QVJj3A6ORzc9XCyhokxUKaoonHgNXcQhmk8adhotxfkeK8El9TnFeUuH72yI6jQ5nDJKS6w=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.7.tgz"; + sha512 = "VkKcfuitP+Nc/TaTFH0B8qNmn+6NbI6crLkQonbedViVz7O2w8QV/GERPlkJ4bg42VGHiEWa31CoTOPs1q6z1w=="; }; }; - "@types/node-6.0.115" = { + "@types/node-6.0.116" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.0.115"; + version = "6.0.116"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.0.115.tgz"; - sha512 = "PWA07jqflLli+PAk7VaJn0MVdTw96egk5B1FxwocV/tcc3RamNGbza1ZgS0OGUsTuAYCFCboL+IlG2bPazV2Nw=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.0.116.tgz"; + sha512 = "vToa8YEeulfyYg1gSOeHjvvIRqrokng62VMSj2hoZrwZNcYrp2h3AWo6KeBVuymIklQUaY5zgVJvVsC4KiiLkQ=="; }; }; - "@types/node-8.10.23" = { + "@types/node-8.10.24" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.23"; + version = "8.10.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.23.tgz"; - sha512 = "aEp5ZTLr4mYhR9S85cJ+sEYkcsgFY10N1Si5m49iTAVzanZXOwp/pgw6ibFLKXxpflqm71aSWZCRtnTXXO56gA=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.24.tgz"; + sha512 = "5YaBKa6oFuWy7ptIFMATyftIcpZTZtvgrzPThEbs+kl4Uu41oUxiRunG0k32QZjD6MXMELls//ry/epNxc11aQ=="; }; }; "@types/rimraf-2.0.2" = { @@ -1516,15 +1543,6 @@ let sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; - "amqplib-0.5.2" = { - name = "amqplib"; - packageName = "amqplib"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/amqplib/-/amqplib-0.5.2.tgz"; - sha512 = "l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA=="; - }; - }; "ansi-0.3.1" = { name = "ansi"; packageName = "ansi"; @@ -2425,15 +2443,6 @@ let sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; }; }; - "async-2.1.2" = { - name = "async"; - packageName = "async"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz"; - sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; - }; - }; "async-2.1.5" = { name = "async"; packageName = "async"; @@ -2443,15 +2452,6 @@ let sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; }; }; - "async-2.3.0" = { - name = "async"; - packageName = "async"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.3.0.tgz"; - sha1 = "1013d1051047dd320fe24e494d5c66ecaf6147d9"; - }; - }; "async-2.5.0" = { name = "async"; packageName = "async"; @@ -2542,13 +2542,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.286.2" = { + "aws-sdk-2.290.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.286.2"; + version = "2.290.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.286.2.tgz"; - sha512 = "46a/2+rGEgIlmUz08vZOkYFmZIgj+An/cc+Ngz9XBLkAZbx+3sBzOrxexrlVV69MPkMbckbeZjIq8NEJWV5gPw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.290.0.tgz"; + sha512 = "4AiExL06NsjrYqec/GdZP6qsquppFhaJE9hKZNw1c4ApjiGCRucfSlMvaZ6aZw76MG9b2Mi8mboGXOYW8nTGJQ=="; }; }; "aws-sign-0.2.1" = { @@ -2578,22 +2578,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.7.0" = { + "aws4-1.8.0" = { name = "aws4"; packageName = "aws4"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; - sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; - }; - }; - "axios-0.15.3" = { - name = "axios"; - packageName = "axios"; - version = "0.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz"; - sha1 = "2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; }; }; "axios-0.17.1" = { @@ -3577,15 +3568,6 @@ let sha1 = "ae29e9382a7ba4898de9f48bb23fd338c4fbdcf8"; }; }; - "bitsyntax-0.0.4" = { - name = "bitsyntax"; - packageName = "bitsyntax"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.0.4.tgz"; - sha1 = "eb10cc6f82b8c490e3e85698f07e83d46e0cba82"; - }; - }; "bittorrent-dht-6.4.2" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; @@ -3640,13 +3622,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.10.0" = { + "bittorrent-tracker-9.10.1" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.10.0"; + version = "9.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.10.0.tgz"; - sha512 = "mL/hLX5aT9D0ywIcleksJ3vaggxguwzyBTWEYU/8s7f3x8rvtB2SDNaQ548/CezqfVVxGNAHlBxctw4EeXSp8Q=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.10.1.tgz"; + sha512 = "n5zTL/g6Wt0rb2EnkiyiaGYhth7I/N0/xMqGUpvGX/7g1scDGBVPhJnXR8lfp3/OMj681fv40o4q/otECMtZSA=="; }; }; "bl-0.8.2" = { @@ -4360,15 +4342,6 @@ let sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; }; }; - "buffer-more-ints-0.0.2" = { - name = "buffer-more-ints"; - packageName = "buffer-more-ints"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz"; - sha1 = "26b3885d10fa13db7fc01aae3aab870199e0124c"; - }; - }; "buffer-xor-1.0.3" = { name = "buffer-xor"; packageName = "buffer-xor"; @@ -4531,6 +4504,15 @@ let sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; }; }; + "byte-size-4.0.3" = { + name = "byte-size"; + packageName = "byte-size"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/byte-size/-/byte-size-4.0.3.tgz"; + sha512 = "JGC3EV2bCzJH/ENSh3afyJrH4vwxbHTuO5ljLoI5+2iJOcEpMgP8T782jH9b5qGxf2mSUIp1lfGnfKNrRHpvVg=="; + }; + }; "bytebuffer-3.5.5" = { name = "bytebuffer"; packageName = "bytebuffer"; @@ -5170,13 +5152,13 @@ let sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; }; }; - "chunk-store-stream-2.1.0" = { + "chunk-store-stream-3.0.0" = { name = "chunk-store-stream"; packageName = "chunk-store-stream"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-2.1.0.tgz"; - sha512 = "mVVfkjLW3E4wgBIMBw+5es+q0ShA/67r8dvGwy31o3CUo4kJ74bxWEK2WDHCJ5rTFWFbtQe5O2ZKFJgCnsOcWA=="; + url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-3.0.0.tgz"; + sha512 = "eKmlEJ3qpHvHedRdoJA1sixqKF2iNL9mNPu3eev5wO0zg/YXKqda9rBnCfxsIUzxqFkPwyf7fPWcQuFKUCqARw=="; }; }; "ci-info-1.1.3" = { @@ -5269,13 +5251,13 @@ let sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a"; }; }; - "clean-css-4.2.0" = { + "clean-css-4.2.1" = { name = "clean-css"; packageName = "clean-css"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.0.tgz"; - sha1 = "0a9d62040cddc7904c5edaee9bdeca642d9b9c1c"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz"; + sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g=="; }; }; "clean-stack-1.3.0" = { @@ -5818,6 +5800,15 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; + "colors-1.3.0" = { + name = "colors"; + packageName = "colors"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz"; + sha512 = "EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw=="; + }; + }; "colors-1.3.1" = { name = "colors"; packageName = "colors"; @@ -5998,6 +5989,15 @@ let sha512 = "sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew=="; }; }; + "commander-2.17.1" = { + name = "commander"; + packageName = "commander"; + version = "2.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"; + sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; + }; + }; "commander-2.6.0" = { name = "commander"; packageName = "commander"; @@ -6863,13 +6863,13 @@ let sha512 = "zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q=="; }; }; - "cosmiconfig-5.0.5" = { + "cosmiconfig-5.0.6" = { name = "cosmiconfig"; packageName = "cosmiconfig"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.5.tgz"; - sha512 = "94j37OtvxS5w7qr7Ta6dt67tWdnOxigBVN4VnSxNXFez9o18PGQ0D33SchKP17r9LAcWVTYV72G6vDayAUBFIg=="; + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.6.tgz"; + sha512 = "6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ=="; }; }; "couch-login-0.1.20" = { @@ -7457,13 +7457,13 @@ let sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf"; }; }; - "dat-dns-3.0.1" = { + "dat-dns-3.0.2" = { name = "dat-dns"; packageName = "dat-dns"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.0.1.tgz"; - sha512 = "OBolbMJNk7Uknw8po7Yv4XGNewH6VbuPQNrcf57EwtvgR8ScNUBDporU+DiCXYh2F7GwOcsCyVkSb++guR+OoA=="; + url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.0.2.tgz"; + sha512 = "TqkWQ03NvdLK9Rm9n11UCy59KnIsu82A0lPQYcMG02pYTU4xTxShzDryGO2orvmcT5063olmI1R9vKil0jw0Lw=="; }; }; "dat-doctor-2.0.0" = { @@ -7529,13 +7529,13 @@ let sha512 = "oK6R74WV8TdhGR9VCLym7D/vlN8lXND5AyhJhrjtm1WNDrg/6Clx1Tk7k3Dt8quy2AmmGO7vbIk7iwFtzTAJfA=="; }; }; - "dat-node-3.5.11" = { + "dat-node-3.5.12" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.11"; + version = "3.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.11.tgz"; - sha512 = "8vDc4XwOtOdZgtw/YSb5k/8KIu0+jByaZCsWv5gY5RbrnCouh0Qa7CvIWezZyl0FFke5LIvHuzme2iRiEYIdOw=="; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.12.tgz"; + sha512 = "XYxdkeNYk8gM6nb125XrOQKAXLZlICLYZUk7bZAktpQUrSjAQnc9qPY2a/KCvHSbdoJf//PwyB00K0UiBTqawQ=="; }; }; "dat-registry-4.0.0" = { @@ -8303,15 +8303,6 @@ let sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; - "diff-3.2.0" = { - name = "diff"; - packageName = "diff"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; - sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; - }; - }; "diff-3.5.0" = { name = "diff"; packageName = "diff"; @@ -8744,15 +8735,6 @@ let sha512 = "4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow=="; }; }; - "double-ended-queue-2.1.0-0" = { - name = "double-ended-queue"; - packageName = "double-ended-queue"; - version = "2.1.0-0"; - src = fetchurl { - url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz"; - sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; - }; - }; "downgrade-root-1.2.2" = { name = "downgrade-root"; packageName = "downgrade-root"; @@ -9005,13 +8987,13 @@ let sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; - "elliptic-6.4.0" = { + "elliptic-6.4.1" = { name = "elliptic"; packageName = "elliptic"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; - sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz"; + sha512 = "BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ=="; }; }; "email-validator-2.0.4" = { @@ -9141,15 +9123,6 @@ let sha512 = "j1DWIcktw4hRwrv6nWx++5nFH2X64x16MAG2P0Lmi5Dvdfi3I+Jhc7JKJIdAmDJa+5aZ/imHV7dWRPy2Cqjh3A=="; }; }; - "engine.io-3.1.5" = { - name = "engine.io"; - packageName = "engine.io"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz"; - sha512 = "D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA=="; - }; - }; "engine.io-3.2.0" = { name = "engine.io"; packageName = "engine.io"; @@ -9177,15 +9150,6 @@ let sha512 = "AYTgHyeVUPitsseqjoedjhYJapNVoSPShbZ+tEUX9/73jgZ/Z3sUlJf9oYgdEBBdVhupUpUqSxH0kBCXlQnmZg=="; }; }; - "engine.io-client-3.1.6" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "3.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.6.tgz"; - sha512 = "hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg=="; - }; - }; "engine.io-client-3.2.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -9591,13 +9555,13 @@ let sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; }; }; - "eslint-5.2.0" = { + "eslint-5.3.0" = { name = "eslint"; packageName = "eslint"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.2.0.tgz"; - sha512 = "zlggW1qp7/TBjwLfouRoY7eWXrXwJZFqCdIxxh0/LVB/QuuKuIMkzyUZEcDo6LBadsry5JcEMxIqd3H/66CXVg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.3.0.tgz"; + sha512 = "N/tCqlMKkyNvAvLu+zI9AqDasnSLt00K+Hu8kdsERliC9jYEc8ck12XtjvOXrBKu8fK6RrBcN9bat6Xk++9jAg=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -10293,13 +10257,13 @@ let sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A=="; }; }; - "external-editor-3.0.0" = { + "external-editor-3.0.1" = { name = "external-editor"; packageName = "external-editor"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.0.tgz"; - sha512 = "mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ=="; + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.1.tgz"; + sha512 = "e1neqvSt5pSwQcFnYc6yfGuJD2Q4336cdbHs5VeUO0zTkqPbrHMyw2q1r47fpfLWbvIG8H8A6YO3sck7upTV6Q=="; }; }; "extglob-0.3.2" = { @@ -10662,6 +10626,15 @@ let sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; }; }; + "filelist-0.0.6" = { + name = "filelist"; + packageName = "filelist"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/filelist/-/filelist-0.0.6.tgz"; + sha1 = "58a641ad1f57574a27fe87a440ef318834b55719"; + }; + }; "filename-regex-2.0.1" = { name = "filename-regex"; packageName = "filename-regex"; @@ -11049,15 +11022,6 @@ let sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; - "follow-redirects-1.0.0" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz"; - sha1 = "8e34298cbd2e176f254effec75a1c78cc849fd37"; - }; - }; "follow-redirects-1.4.1" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -11193,15 +11157,6 @@ let sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; }; }; - "form-data-2.0.0" = { - name = "form-data"; - packageName = "form-data"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; - sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; - }; - }; "form-data-2.1.4" = { name = "form-data"; packageName = "form-data"; @@ -11427,24 +11382,6 @@ let sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; }; }; - "fs-extra-2.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.0.0.tgz"; - sha1 = "337352bded4a0b714f3eb84de8cea765e9d37600"; - }; - }; - "fs-extra-2.1.2" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; - sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; - }; - }; "fs-extra-3.0.1" = { name = "fs-extra"; packageName = "fs-extra"; @@ -11481,6 +11418,15 @@ let sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; }; }; + "fs-extra-7.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz"; + sha512 = "EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ=="; + }; + }; "fs-minipass-1.2.5" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -12463,13 +12409,13 @@ let sha512 = "BHaEZe2J2lQ1TX2W73a6PI2zVjB9Nb0J9pFdbG1L7ugYdbait/elDrsNMxLCsDHVOGJF009VlYszrk7Cq7FiTg=="; }; }; - "graphql-request-1.8.0" = { + "graphql-request-1.8.1" = { name = "graphql-request"; packageName = "graphql-request"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-request/-/graphql-request-1.8.0.tgz"; - sha512 = "kX4u/rPNd8EkYdYXDzAiGyVrLBZmdZREOlQVemcUkXtNVaNTh6eXC0yhmRypIB070/YtRl1w01xR1efOrHO+JA=="; + url = "https://registry.npmjs.org/graphql-request/-/graphql-request-1.8.1.tgz"; + sha512 = "ZqVtROJ/lgTQq9dRVCQU3/wRQX2JjUfUB7RWH/QuktmxsAAc3pkZikpiIkKyjSR0OD/+h6iSh/MkP0FonQBMNQ=="; }; }; "graphql-schema-linter-0.1.1" = { @@ -12544,13 +12490,13 @@ let sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; }; }; - "gulp-clean-css-3.9.4" = { + "gulp-clean-css-3.10.0" = { name = "gulp-clean-css"; packageName = "gulp-clean-css"; - version = "3.9.4"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-3.9.4.tgz"; - sha512 = "jsbAj65WM08H1jCFOKpIvA1OlACk7OHS2FFTeeBZrSJ5OR1PJzAqi0I2R2LTWYN3oMd/N1JYN9cN2IS/8eYqdg=="; + url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-3.10.0.tgz"; + sha512 = "7Isf9Y690o/Q5MVjEylH1H7L8WeZ89woW7DnhD5unTintOdZb67KdOayRgp9trUFo+f9UyJtuatV42e/+kghPg=="; }; }; "gulp-less-3.5.0" = { @@ -13039,15 +12985,6 @@ let sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88"; }; }; - "hipchat-notifier-1.1.0" = { - name = "hipchat-notifier"; - packageName = "hipchat-notifier"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz"; - sha1 = "b6d249755437c191082367799d3ba9a0f23b231e"; - }; - }; "hiredis-0.4.1" = { name = "hiredis"; packageName = "hiredis"; @@ -13372,15 +13309,6 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "httpntlm-1.6.1" = { - name = "httpntlm"; - packageName = "httpntlm"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz"; - sha1 = "ad01527143a2e8773cfae6a96f58656bb52a34b2"; - }; - }; "httpolyglot-0.1.2" = { name = "httpolyglot"; packageName = "httpolyglot"; @@ -13390,15 +13318,6 @@ let sha1 = "e4d347fe8984a62f467d4060df527f1851f6997b"; }; }; - "httpreq-0.4.24" = { - name = "httpreq"; - packageName = "httpreq"; - version = "0.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz"; - sha1 = "4335ffd82cd969668a39465c929ac61d6393627f"; - }; - }; "https-browserify-0.0.1" = { name = "https-browserify"; packageName = "https-browserify"; @@ -13498,13 +13417,13 @@ let sha512 = "LTgbsJ+9ZrdQfLaXXc01kQMttaicHhSOtUM3v/k7ORwXJziqQ2eMQ80+8Tfg67ja+w6zrdl5HYOK+mnlwQpCww=="; }; }; - "hyperdrive-http-4.3.2" = { + "hyperdrive-http-4.3.3" = { name = "hyperdrive-http"; packageName = "hyperdrive-http"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.3.2.tgz"; - sha512 = "dVEtiPiaoR0BNtO8SBvBqRJQMVMV1zzXLIWBBGjVefhISfybfyOBuGi7xzhGnHj+4oK7E8Wwt2Bo5W/J5ecpIg=="; + url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.3.3.tgz"; + sha512 = "YRAjbCCRefLK9EMcgDXRgDx/sZksWf85iLtGl9JMVrzFSIfUx0//DpUJ6k0m0eG4KHJJM+dBwORxFPNi29EQHg=="; }; }; "hyperdrive-network-speed-2.1.0" = { @@ -13642,13 +13561,13 @@ let sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; }; - "ignore-4.0.3" = { + "ignore-4.0.5" = { name = "ignore"; packageName = "ignore"; - version = "4.0.3"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-4.0.3.tgz"; - sha512 = "Z/vAH2GGIEATQnBVXMclE2IGV6i0GyVngKThcGZ5kHgHMxLo9Ow2+XHRq1aEKEej5vOF1TPJNbvX6J/anT0M7A=="; + url = "https://registry.npmjs.org/ignore/-/ignore-4.0.5.tgz"; + sha512 = "Q2daVnMtQJPacGrcCRyOEiI+syPCt+mR4YotoC0KEYeinV/6HztT5mUuVEj7UYyoNZ1jGYiu2XEem7I8oM44bg=="; }; }; "ignore-by-default-1.0.1" = { @@ -13696,6 +13615,15 @@ let sha1 = "0ecdad0c546332672d7b5b511b26bb18ce56e73f"; }; }; + "immediate-chunk-store-2.0.0" = { + name = "immediate-chunk-store"; + packageName = "immediate-chunk-store"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.0.0.tgz"; + sha512 = "5s6NiCGbtWc+OQA60jrre54w12U7tynIyUNjO5LJjNA5lWwvCv6640roq8Wk/wIuaqnd4Pgtp453OyJ7hbONkQ=="; + }; + }; "import-jsx-1.3.0" = { name = "import-jsx"; packageName = "import-jsx"; @@ -13786,24 +13714,6 @@ let sha512 = "HQPzFLTTUvwfeUH6RAGjD8cHS069mBqXG5n4qaxX7sJXBhVQrsGgF+0ZJGkSuN6a8pcUWB/GXStta11kKi/WvA=="; }; }; - "inflection-1.12.0" = { - name = "inflection"; - packageName = "inflection"; - version = "1.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz"; - sha1 = "a200935656d6f5f6bc4dc7502e1aecb703228416"; - }; - }; - "inflection-1.3.8" = { - name = "inflection"; - packageName = "inflection"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz"; - sha1 = "cbd160da9f75b14c3cc63578d4f396784bf3014e"; - }; - }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -13966,13 +13876,13 @@ let sha512 = "E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ=="; }; }; - "inquirer-6.0.0" = { + "inquirer-6.1.0" = { name = "inquirer"; packageName = "inquirer"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-6.0.0.tgz"; - sha512 = "tISQWRwtcAgrz+SHPhTH7d3e73k31gsOy6i1csonLc0u1dVK/wYvuOnFeiWqC5OXFIYbmrIFInef31wbT8MEJg=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.1.0.tgz"; + sha512 = "f9K2MMx/G/AVmJSaZg2a+GVLRRmTdlGLbwxsibNd6yNTxXujqxPypjCnxnC0y4+Wb/rNY5KyKuq06AO5jrE+7w=="; }; }; "insert-module-globals-7.2.0" = { @@ -14515,13 +14425,13 @@ let sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; - "is-my-json-valid-2.17.2" = { + "is-my-json-valid-2.18.0" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.17.2"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz"; - sha512 = "IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg=="; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.18.0.tgz"; + sha512 = "DWT87JHCSdCPCxbqBpS6Z2ajAt+MvrJq8I4xrpQljCvzODO5/fiquBp20a3sN6yCJvFbCRyYvJOHjpzkPTKJyA=="; }; }; "is-natural-number-4.0.1" = { @@ -15523,6 +15433,15 @@ let sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; + "json5-1.0.1" = { + name = "json5"; + packageName = "json5"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + }; + }; "jsonata-1.5.4" = { name = "jsonata"; packageName = "jsonata"; @@ -16028,13 +15947,13 @@ let sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; }; }; - "klaw-2.1.1" = { + "klaw-3.0.0" = { name = "klaw"; packageName = "klaw"; - version = "2.1.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/klaw/-/klaw-2.1.1.tgz"; - sha1 = "42b76894701169cc910fd0d19ce677b5fb378af1"; + url = "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz"; + sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g=="; }; }; "knockout-3.5.0-rc" = { @@ -17189,22 +17108,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-2.11.0" = { + "log4js-3.0.4" = { name = "log4js"; packageName = "log4js"; - version = "2.11.0"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-2.11.0.tgz"; - sha512 = "z1XdwyGFg8/WGkOyF6DPJjivCWNLKrklGdViywdYnSKOvgtEBo2UyEMZS5sD2mZrQlU3TvO8wDWLc8mzE1ncBQ=="; - }; - }; - "loggly-1.1.1" = { - name = "loggly"; - packageName = "loggly"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/loggly/-/loggly-1.1.1.tgz"; - sha1 = "0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"; + url = "https://registry.npmjs.org/log4js/-/log4js-3.0.4.tgz"; + sha512 = "4rQ1TrOf85lxB0+hBiPF27Zw8pGTHxKZq8FYfum1TNhx/KMUlQ+LL4bMKcdzc7zoAFF992w8+MFQm3BQbUgePA=="; }; }; "lokijs-1.5.3" = { @@ -17252,13 +17162,13 @@ let sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; }; }; - "longjohn-0.2.11" = { + "longjohn-0.2.12" = { name = "longjohn"; packageName = "longjohn"; - version = "0.2.11"; + version = "0.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz"; - sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; + url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.12.tgz"; + sha1 = "7ca7446b083655c377e7512213dc754d52a64a7e"; }; }; "looper-2.0.0" = { @@ -17513,15 +17423,6 @@ let sha1 = "a6531822899614fee899c92226d81e2b9cbb183d"; }; }; - "mailcomposer-4.0.1" = { - name = "mailcomposer"; - packageName = "mailcomposer"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz"; - sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"; - }; - }; "mailcomposer-4.0.2" = { name = "mailcomposer"; packageName = "mailcomposer"; @@ -17531,15 +17432,6 @@ let sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101"; }; }; - "mailgun-js-0.18.1" = { - name = "mailgun-js"; - packageName = "mailgun-js"; - version = "0.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.18.1.tgz"; - sha512 = "lvuMP14u24HS2uBsJEnzSyPMxzU2b99tQsIx1o6QNjqxjk8b3WvR+vq5oG1mjqz/IBYo+5gF+uSoDS0RkMVHmg=="; - }; - }; "mailparser-0.6.2" = { name = "mailparser"; packageName = "mailparser"; @@ -17774,13 +17666,13 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "mediasource-2.2.1" = { + "mediasource-2.2.2" = { name = "mediasource"; packageName = "mediasource"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mediasource/-/mediasource-2.2.1.tgz"; - sha512 = "WRtioPZW7FbuD4OvgrGZU3t5c0sp1F4rGJhrYp4pMIK1u8Hi5HS5aiVvQf24T2/NBg650xdWOXgx8yqTUM71lw=="; + url = "https://registry.npmjs.org/mediasource/-/mediasource-2.2.2.tgz"; + sha512 = "yIyAJMcu1mudTkxZ0jDAKnZJJba4eWPCxxtZRMpoaA4/AI7m7nqbRjmdxmi+x3hKTohb5vC9Yd3IBF/SUzp1vQ=="; }; }; "mediawiki-title-0.6.5" = { @@ -17819,13 +17711,13 @@ let sha1 = "a15ed0b6a8f216848d80a75c0fe8dd0bad89b608"; }; }; - "memoizee-0.4.12" = { + "memoizee-0.4.13" = { name = "memoizee"; packageName = "memoizee"; - version = "0.4.12"; + version = "0.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.12.tgz"; - sha512 = "sprBu6nwxBWBvBOh5v2jcsGqiGLlL2xr2dLub3vR8dnE8YB17omwtm/0NSHl8jjNbcsJd5GMWJAnTSVe/O0Wfg=="; + url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.13.tgz"; + sha512 = "OVDg4OBcDOaNnTKbVYZPf+N6ON4oon2V0fBVJ1QkIGnfjdusLoUISUptQTY5kP5+zmnAr6k5V/zLc8nKNmVrcg=="; }; }; "memory-chunk-store-1.3.0" = { @@ -18503,15 +18395,6 @@ let sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; }; }; - "moment-2.16.0" = { - name = "moment"; - packageName = "moment"; - version = "2.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; - sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; - }; - }; "moment-2.20.1" = { name = "moment"; packageName = "moment"; @@ -19088,13 +18971,13 @@ let sha512 = "4/uzl+LkMGoVv/9eMzH2QFvefmlJErT0KR7EmuYbmht2QvxSEqTjhFFOZ/KHE6chH58fKL3njrOcEwbYV0h9Yw=="; }; }; - "nanoid-1.1.0" = { + "nanoid-1.2.0" = { name = "nanoid"; packageName = "nanoid"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.1.0.tgz"; - sha512 = "iOCqgXieGrk8/wDt1n9rZS2KB1dYVssemY0NTWjfzVr+1t1gAmdTp1u2+YHppKro3Bk5S+Gs+xmYCfpuXauYXQ=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.0.tgz"; + sha512 = "rJvd0q5Bq375+jrMAJh8vZk+0Q4lnHyuqZL2fbrc9moYy4DCld5VSycYLXvwFHbbut1+UcjA+fm0bq4ADVBYQg=="; }; }; "nanolru-1.0.0" = { @@ -19281,13 +19164,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "neat-input-1.7.0" = { + "neat-input-1.8.0" = { name = "neat-input"; packageName = "neat-input"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/neat-input/-/neat-input-1.7.0.tgz"; - sha512 = "oPAF9Js5IVPL6eYxn4vE4mwSuqEKTODnlcWHyv7/BW5RXaRs7QOmjp2eOp2KQ/vLuo3UoEsFcezrfHwSrec+2g=="; + url = "https://registry.npmjs.org/neat-input/-/neat-input-1.8.0.tgz"; + sha512 = "9LsyX7NcQBOT0/VEthxOCpYlKXgo0UZeGlMSx/a2SKFkE4ZiU/wTUBoF9brQKtKspmBZyLnXqDiktsbopEb0Tg=="; }; }; "neat-log-2.4.0" = { @@ -19335,13 +19218,13 @@ let sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29"; }; }; - "needle-2.2.1" = { + "needle-2.2.2" = { name = "needle"; packageName = "needle"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz"; - sha512 = "t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q=="; + url = "https://registry.npmjs.org/needle/-/needle-2.2.2.tgz"; + sha512 = "mW7W8dKuVYefCpNzE3Z7xUmPI9wSrSL/1qH31YGMxmSOAnjatS3S9Zv3cmiHrhx3Jkp1SrWWBdOFXjfF48Uq3A=="; }; }; "negotiator-0.3.0" = { @@ -19525,13 +19408,13 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "node-appc-0.2.44" = { + "node-appc-0.2.48" = { name = "node-appc"; packageName = "node-appc"; - version = "0.2.44"; + version = "0.2.48"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.44.tgz"; - sha512 = "8D+uqpr4OMXLmWblJBuFaph/wvLKDqgQFOCAmk4JlkE9PoJ6DW9VI2nVb+UZCRIge+Kfe3/upRD9haOjHBOiAg=="; + url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.48.tgz"; + sha512 = "fKPynW61a+PmqssitvJXxN2FZAN/w4eBvmE5zqJXl+eDfOip/b26y7SIGGJOn23KjAYX2uyl2Oy/+qTaRz/gHQ=="; }; }; "node-cache-4.2.0" = { @@ -19597,13 +19480,13 @@ let sha512 = "MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ=="; }; }; - "node-gyp-3.7.0" = { + "node-gyp-3.8.0" = { name = "node-gyp"; packageName = "node-gyp"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz"; - sha512 = "qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz"; + sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; }; }; "node-gyp-build-3.4.0" = { @@ -19813,15 +19696,6 @@ let sha1 = "4e69cb39b03015b1d1ef0c78a815412b9e976f79"; }; }; - "nodemailer-2.7.2" = { - name = "nodemailer"; - packageName = "nodemailer"; - version = "2.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-2.7.2.tgz"; - sha1 = "f242e649aeeae39b6c7ed740ef7b061c404d30f9"; - }; - }; "nodemailer-direct-transport-1.1.0" = { name = "nodemailer-direct-transport"; packageName = "nodemailer-direct-transport"; @@ -19831,15 +19705,6 @@ let sha1 = "a2f78708ee6f16ea0573fc82949d138ff172f624"; }; }; - "nodemailer-direct-transport-3.3.2" = { - name = "nodemailer-direct-transport"; - packageName = "nodemailer-direct-transport"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz"; - sha1 = "e96fafb90358560947e569017d97e60738a50a86"; - }; - }; "nodemailer-fetch-1.6.0" = { name = "nodemailer-fetch"; packageName = "nodemailer-fetch"; @@ -19858,15 +19723,6 @@ let sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; }; }; - "nodemailer-smtp-pool-2.8.2" = { - name = "nodemailer-smtp-pool"; - packageName = "nodemailer-smtp-pool"; - version = "2.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz"; - sha1 = "2eb94d6cf85780b1b4725ce853b9cbd5e8da8c72"; - }; - }; "nodemailer-smtp-transport-1.1.0" = { name = "nodemailer-smtp-transport"; packageName = "nodemailer-smtp-transport"; @@ -19876,15 +19732,6 @@ let sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398"; }; }; - "nodemailer-smtp-transport-2.7.2" = { - name = "nodemailer-smtp-transport"; - packageName = "nodemailer-smtp-transport"; - version = "2.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz"; - sha1 = "03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"; - }; - }; "nodemailer-wellknown-0.1.10" = { name = "nodemailer-wellknown"; packageName = "nodemailer-wellknown"; @@ -20029,13 +19876,13 @@ let sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w=="; }; }; - "npm-bundled-1.0.3" = { + "npm-bundled-1.0.4" = { name = "npm-bundled"; packageName = "npm-bundled"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz"; - sha512 = "ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow=="; + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.4.tgz"; + sha512 = "FLIrRxfuX2EOA9krlthXp8lyFR5vW21zNu6ORrfWGD5ZYWTqx3tOCUwsPUSuzPdUBLxLD7bwPkG3YfgWSfqOtg=="; }; }; "npm-conf-1.1.3" = { @@ -21623,22 +21470,22 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "path-loader-1.0.4" = { + "path-loader-1.0.6" = { name = "path-loader"; packageName = "path-loader"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz"; - sha512 = "k/IPo9OWyofATP5gwIehHHQoFShS37zsSIsejKe6fjI+tqK+FnRpiSg4ZfWUpxb0g2PfCreWPqBD4ayjqjqkdQ=="; + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.6.tgz"; + sha512 = "vAtndQsgWS0s2JOjT+NWtJyP5Gc940SlQQ55j0+qSj/SJQ4dmt/L8gLeW9wJF0rM32qEts+3NDvKjs6TUxwFtg=="; }; }; - "path-parse-1.0.5" = { + "path-parse-1.0.6" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; "path-platform-0.11.15" = { @@ -21650,15 +21497,6 @@ let sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2"; }; }; - "path-proxy-1.0.0" = { - name = "path-proxy"; - packageName = "path-proxy"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz"; - sha1 = "18e8a36859fc9d2f1a53b48dee138543c020de5e"; - }; - }; "path-root-0.1.1" = { name = "path-root"; packageName = "path-root"; @@ -21948,13 +21786,13 @@ let sha512 = "n5aJmABDjzZbwrB0AEbUeugz1Rh55c9T62yVGv6YL1vP1GuqpjIcLgwZIM1SI8E4Nfmcoo46SSmPgSSA9mPdog=="; }; }; - "pino-std-serializers-2.1.0" = { + "pino-std-serializers-2.2.0" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.1.0.tgz"; - sha512 = "NqWvrQD/GpY78ybiNBzi/dg8ylERhDo6nB33j5sfCKpUmWLc3lYzeoBjyRoCMvEpDpL9lmH6ufRd0jw6rcd1pQ=="; + url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.2.0.tgz"; + sha512 = "Ef95yX2/cUb5knEmHCpvkfrvjWBx0CTcBwB3WAneX8o0WpEf8y+lmR/XMkgAbJ/Ak2mHbo0eL5ANy8qDqpH1xw=="; }; }; "pkg-dir-2.0.0" = { @@ -22479,15 +22317,6 @@ let sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; }; }; - "promisify-call-2.0.4" = { - name = "promisify-call"; - packageName = "promisify-call"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/promisify-call/-/promisify-call-2.0.4.tgz"; - sha1 = "d48c2d45652ccccd52801ddecbd533a6d4bd5fba"; - }; - }; "prompt-0.2.14" = { name = "prompt"; packageName = "prompt"; @@ -22623,15 +22452,6 @@ let sha512 = "CNKuhC1jVtm8KJYFTS2ZRO71VCBx3QSA92So/e6NrY6GoJonkx3Irnk4047EsCcswczwqAekRj3s8qLRGahSKg=="; }; }; - "proxy-agent-3.0.1" = { - name = "proxy-agent"; - packageName = "proxy-agent"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.1.tgz"; - sha512 = "mAZexaz9ZxQhYPWfAjzlrloEjW+JHiBFryE4AJXFDTnaXfmH/FKqC1swTRKuEPbHWz02flQNXFOyDUF7zfEG6A=="; - }; - }; "proxy-from-env-1.0.0" = { name = "proxy-from-env"; packageName = "proxy-from-env"; @@ -23280,13 +23100,13 @@ let sha1 = "f7d97d92dee6665ec5f6da08c7f963cad4b2ac99"; }; }; - "randomatic-3.0.0" = { + "randomatic-3.1.0" = { name = "randomatic"; packageName = "randomatic"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz"; - sha512 = "VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA=="; + url = "https://registry.npmjs.org/randomatic/-/randomatic-3.1.0.tgz"; + sha512 = "KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ=="; }; }; "randombytes-2.0.6" = { @@ -23424,13 +23244,13 @@ let sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; - "rc-config-loader-2.0.1" = { + "rc-config-loader-2.0.2" = { name = "rc-config-loader"; packageName = "rc-config-loader"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.1.tgz"; - sha512 = "OHr24Jb7nN6oaQOTRXxcQ2yJSK3SHA1dp2CZEfvRxsl/MbhFr4CYnkwn8DY37pKu7Eu18X4mYuWFxO6vpbFxtQ=="; + url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.2.tgz"; + sha512 = "Nx9SNM47eNRqe0TdntOY600qWb8NDh+xU9sv5WnTscEtzfTB0ukihlqwuCLPteyJksvZ0sEVPoySNE01TKrmTQ=="; }; }; "re-emitter-1.1.3" = { @@ -23748,33 +23568,6 @@ let sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a"; }; }; - "redis-2.8.0" = { - name = "redis"; - packageName = "redis"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; - sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; - }; - }; - "redis-commands-1.3.5" = { - name = "redis-commands"; - packageName = "redis-commands"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz"; - sha512 = "foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA=="; - }; - }; - "redis-parser-2.6.0" = { - name = "redis-parser"; - packageName = "redis-parser"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"; - sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; - }; - }; "reduce-component-1.0.1" = { name = "reduce-component"; packageName = "reduce-component"; @@ -23847,6 +23640,15 @@ let sha512 = "LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="; }; }; + "regexpp-2.0.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.0.tgz"; + sha512 = "g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA=="; + }; + }; "registry-auth-token-3.3.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; @@ -23937,13 +23739,13 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "render-media-3.1.2" = { + "render-media-3.1.3" = { name = "render-media"; packageName = "render-media"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/render-media/-/render-media-3.1.2.tgz"; - sha512 = "SZZ1i5qsPTLKIkYZ5SHHFUArtj5hGzvNGcwnQnJcjcNI9X3yptAhB4dBdglTO9ViYG/CXQDz/liaqYLNFBWA/A=="; + url = "https://registry.npmjs.org/render-media/-/render-media-3.1.3.tgz"; + sha512 = "K7ziKKlIcgYpAovRsABDiSaNn7TzDDyyuFGpRwM52cloNcajInB6sCxFPUEzOuTJUeyvKCqT/k5INOjpKLCjhQ=="; }; }; "render-readme-1.3.1" = { @@ -24054,15 +23856,6 @@ let sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; - "request-2.75.0" = { - name = "request"; - packageName = "request"; - version = "2.75.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; - sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; - }; - }; "request-2.79.0" = { name = "request"; packageName = "request"; @@ -24135,15 +23928,6 @@ let sha1 = "3eee00b2c5aa83239cfb04c5700da36f81cd08b6"; }; }; - "requestretry-1.13.0" = { - name = "requestretry"; - packageName = "requestretry"; - version = "1.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/requestretry/-/requestretry-1.13.0.tgz"; - sha512 = "Lmh9qMvnQXADGAQxsXHP4rbgO6pffCfuR8XUBdP9aitJcLQJxhp7YZK4xAVYXnPJ5E52mwrfiKQtKonPL8xsmg=="; - }; - }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -24189,6 +23973,15 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; + "requirejs-2.3.5" = { + name = "requirejs"; + packageName = "requirejs"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz"; + sha512 = "svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw=="; + }; + }; "requires-port-1.0.0" = { name = "requires-port"; packageName = "requires-port"; @@ -24765,13 +24558,13 @@ let sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; - "schema-utils-0.4.5" = { + "schema-utils-0.4.7" = { name = "schema-utils"; packageName = "schema-utils"; - version = "0.4.5"; + version = "0.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz"; - sha512 = "yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA=="; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz"; + sha512 = "v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ=="; }; }; "scoped-regex-1.0.0" = { @@ -25422,13 +25215,13 @@ let sha512 = "lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw=="; }; }; - "simple-get-3.0.2" = { + "simple-get-3.0.3" = { name = "simple-get"; packageName = "simple-get"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.2.tgz"; - sha512 = "dU3TBVIGkP5Hzw6o74hJx+VzTBTX2rqIiLfugs0HdmdVQCQp76XGg2jlBCqfRJfW/n6/mUKTi+s3rnzX7SgbBA=="; + url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.3.tgz"; + sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw=="; }; }; "simple-git-1.96.0" = { @@ -25575,15 +25368,6 @@ let sha1 = "d4ba3e8e5e92760e4d1d3b603d772805c6cb256f"; }; }; - "slack-node-0.2.0" = { - name = "slack-node"; - packageName = "slack-node"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slack-node/-/slack-node-0.2.0.tgz"; - sha1 = "de4b8dddaa8b793f61dbd2938104fdabf37dfa30"; - }; - }; "slash-1.0.0" = { name = "slash"; packageName = "slash"; @@ -25674,15 +25458,6 @@ let sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; }; }; - "smart-buffer-4.0.1" = { - name = "smart-buffer"; - packageName = "smart-buffer"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.1.tgz"; - sha512 = "RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg=="; - }; - }; "smartdc-auth-2.3.1" = { name = "smartdc-auth"; packageName = "smartdc-auth"; @@ -25701,15 +25476,6 @@ let sha1 = "55832c2160cfb3086e1dcd87fd1c19fa61b7f536"; }; }; - "smtp-connection-2.12.0" = { - name = "smtp-connection"; - packageName = "smtp-connection"; - version = "2.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz"; - sha1 = "d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"; - }; - }; "snake-case-2.1.0" = { name = "snake-case"; packageName = "snake-case"; @@ -25782,22 +25548,22 @@ let sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; }; }; - "snyk-1.90.0" = { + "snyk-1.90.2" = { name = "snyk"; packageName = "snyk"; - version = "1.90.0"; + version = "1.90.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.90.0.tgz"; - sha1 = "ba37f66484e18a56fc98f64d565a517a53fc8562"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.90.2.tgz"; + sha512 = "SbV6dlDRbXx6q0I2m176NH3LER1wTibuwctcthphsywl1zjoPAdJlMmAOK3BQ61XtjV4xQmzk4OYYf6TUr9ZEw=="; }; }; - "snyk-config-2.1.0" = { + "snyk-config-2.2.0" = { name = "snyk-config"; packageName = "snyk-config"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.1.0.tgz"; - sha512 = "D1Xz1pZa9lwA9AHogmAigyJGo/iuEGH+rcPB77mFsneVfnuiK9c6IjnsHbEBUf1cePtZvWdGBjs6e75Cvc2AMg=="; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.0.tgz"; + sha512 = "mq0wbP/AgjcmRq5i5jg2akVVV3iSYUPTowZwKn7DChRLDL8ySOzWAwan+ImXiyNbrWo87FNI/15O6MpOnTxOIg=="; }; }; "snyk-docker-plugin-1.10.3" = { @@ -25809,13 +25575,13 @@ let sha512 = "nIw6zS705SiQLEhBwoO2qsJ3lVN1DZ48tyMgqhlr5f5GuOrwUJ0ivUK5HQUI79xA6pF7tU18495OlbsKuEHUOw=="; }; }; - "snyk-go-plugin-1.5.1" = { + "snyk-go-plugin-1.5.2" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.1.tgz"; - sha512 = "8OPJOT05Z/UL5fFSXV6b/A6KjlS1Ahr2gpup1bhXtAGXlUUPyWidqkCIER9fexDXqYWgAoDAdn9YHIvmL/5bfw=="; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.2.tgz"; + sha512 = "XWajcSh6Ld+I+WdcyU3DGDuE2ydThQd8ORkESy0nQ2LwekygLYVYN66OBy0uxpqYfd4qoqeg+J8lb4oGzCmyGA=="; }; }; "snyk-gradle-plugin-1.3.0" = { @@ -25845,13 +25611,13 @@ let sha512 = "ieTWhn1MB88gEQ6nUtGCeUKQ6Xoxm+u+QmD9u3zfP1QS5ep9fWt3YYDUQjgUiDTJJy7QyVQdZ/fsz3RECnOA7w=="; }; }; - "snyk-nuget-plugin-1.6.3" = { + "snyk-nuget-plugin-1.6.4" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.3.tgz"; - sha512 = "sC590aveQb0ns7HuDheIZ7FhN/HZzWgzXKUnBGfia/SXIFBpQz/6tognraMJ4+877uLLSdsB2jkyDeHYeWICrg=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.4.tgz"; + sha512 = "D7cwfPC1U/HABAs4Tc9jviajoblMggWOYvWpjf1F4InG6gTfp5lDeeonFp/Xoj6wcju/j88w2gAveWrJWXNj6w=="; }; }; "snyk-php-plugin-1.5.1" = { @@ -25872,13 +25638,13 @@ let sha512 = "CEioNnDzccHyid7UIVl3bJ1dnG4co4ofI+KxuC1mo0IUXy64gxnBTeVoZF5gVLWbAyxGxSeW8f0+8GmWMHVb7w=="; }; }; - "snyk-python-plugin-1.8.0" = { + "snyk-python-plugin-1.8.1" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.8.0.tgz"; - sha512 = "44oDdNjCaNEy+uSmLB3iqtGJa6TAmB7bcG7j9+KkHH6WNxjrwCDHAZQXncIeliYXohb0FFTNMAnbAK4PosqN2Q=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.8.1.tgz"; + sha512 = "DsUBkQZiPlXGkwzhxxEo2Tvfq6XhygWQThWM0yRBythi9M5n8UimZEwdkBHPj7xKC1clsB8boM3+sT/E1x6XGA=="; }; }; "snyk-resolve-1.0.1" = { @@ -25899,13 +25665,13 @@ let sha512 = "YVAelR+dTpqLgfk6lf6WgOlw+MGmGI0r3/Dny8tUbJJ9uVTHTRAOdZCbUyTFqJG7oEmEZxUwmfjqgAuniYwx8Q=="; }; }; - "snyk-sbt-plugin-1.3.0" = { + "snyk-sbt-plugin-1.3.1" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.3.0.tgz"; - sha512 = "SRxPB16392dvN3Qv2RfUcHe0XETLWx2kNIOuoNXvc2Gl6DuPW+X+meDJY7xC/yQhU7bSPPKoM2B7awYaj9i2Bg=="; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.3.1.tgz"; + sha512 = "un9ddM4M+7Ye/zhkh5Cm6EYMXU0Z/aM8wuYZvu4O+wd8sonoUClwckzJlsaI2BA7xvfDL9qQUaImtpgy94v5JQ=="; }; }; "snyk-tree-1.0.0" = { @@ -25953,15 +25719,6 @@ let sha1 = "2f7ecedc3391bf2d5c73e291fe233e6e34d4dd00"; }; }; - "socket.io-2.0.4" = { - name = "socket.io"; - packageName = "socket.io"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; - sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; - }; - }; "socket.io-2.1.1" = { name = "socket.io"; packageName = "socket.io"; @@ -26025,15 +25782,6 @@ let sha1 = "ec9f820356ed99ef6d357f0756d648717bdd4281"; }; }; - "socket.io-client-2.0.4" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz"; - sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; - }; - }; "socket.io-client-2.1.1" = { name = "socket.io-client"; packageName = "socket.io-client"; @@ -26070,15 +25818,6 @@ let sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; }; }; - "socket.io-parser-3.1.3" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz"; - sha512 = "g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g=="; - }; - }; "socket.io-parser-3.2.0" = { name = "socket.io-parser"; packageName = "socket.io-parser"; @@ -26097,24 +25836,6 @@ let sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; }; }; - "socks-1.1.9" = { - name = "socks"; - packageName = "socks"; - version = "1.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-1.1.9.tgz"; - sha1 = "628d7e4d04912435445ac0b6e459376cb3e6d691"; - }; - }; - "socks-2.2.1" = { - name = "socks"; - packageName = "socks"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.2.1.tgz"; - sha512 = "0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w=="; - }; - }; "socks-proxy-agent-3.0.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; @@ -26124,15 +25845,6 @@ let sha512 = "ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA=="; }; }; - "socks-proxy-agent-4.0.1" = { - name = "socks-proxy-agent"; - packageName = "socks-proxy-agent"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz"; - sha512 = "Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw=="; - }; - }; "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -26142,13 +25854,13 @@ let sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA=="; }; }; - "sodium-native-2.1.6" = { + "sodium-native-2.2.1" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.1.6"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz"; - sha512 = "vfovcNlU8C93SbeNoGSAdW5zVOTlrh1sTy+TzdC2FhDTE/IUK6j4ML5gdr/qziLz4XRT4EQWJvbFzql6CAAH/A=="; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.2.1.tgz"; + sha512 = "3CfftYV2ATXQFMIkLOvcNUk/Ma+lran0855j5Z/HEjUkSTzjLZi16CK362udOoNVrwn/TwGV8bKEt5OylsFrQA=="; }; }; "sodium-universal-2.0.0" = { @@ -26259,15 +25971,6 @@ let sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; }; }; - "source-map-0.1.32" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.32"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; - sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; - }; - }; "source-map-0.1.43" = { name = "source-map"; packageName = "source-map"; @@ -26322,15 +26025,6 @@ let sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; }; }; - "source-map-support-0.3.2" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz"; - sha1 = "737d5c901e0b78fdb53aca713d24f23ccbb10be1"; - }; - }; "source-map-support-0.4.18" = { name = "source-map-support"; packageName = "source-map-support"; @@ -26367,6 +26061,15 @@ let sha512 = "N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g=="; }; }; + "source-map-support-0.5.8" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.8.tgz"; + sha512 = "WqAEWPdb78u25RfKzOF0swBpY0dKrNdjc4GvLwm7ScX/o9bj8Eh/YL8mcMhBHYDGl87UkkSXDOFnW4G7GhWhGg=="; + }; + }; "source-map-url-0.4.0" = { name = "source-map-url"; packageName = "source-map-url"; @@ -28456,15 +28159,6 @@ let sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "tsscmp-1.0.6" = { - name = "tsscmp"; - packageName = "tsscmp"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz"; - sha512 = "LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA=="; - }; - }; "ttl-1.3.1" = { name = "ttl"; packageName = "ttl"; @@ -28735,15 +28429,6 @@ let sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; }; }; - "uglify-js-2.8.21" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.8.21"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.21.tgz"; - sha1 = "1733f669ae6f82fc90c7b25ec0f5c783ee375314"; - }; - }; "uglify-js-2.8.29" = { name = "uglify-js"; packageName = "uglify-js"; @@ -28762,13 +28447,13 @@ let sha512 = "hobogryjDV36VrLK3Y69ou4REyrTApzUblVFmdQOYRe8cYaSmFJXMb4dR9McdvYDSbeNdzUgYr2YVukJaErJcA=="; }; }; - "uglify-js-3.4.6" = { + "uglify-js-3.4.7" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.6"; + version = "3.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz"; - sha512 = "O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.7.tgz"; + sha512 = "J0M2i1mQA+ze3EdN9SBi751DNdAXmeFLfJrd/MDIkRc3G3Gbb9OPVSx7GIQvVwfWxQARcYV2DTxIkMyDAk3o9Q=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -29572,6 +29257,24 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; + "utilities-0.0.37" = { + name = "utilities"; + packageName = "utilities"; + version = "0.0.37"; + src = fetchurl { + url = "https://registry.npmjs.org/utilities/-/utilities-0.0.37.tgz"; + sha1 = "a3470d0a7f688142d9e8a57cee1128f12e19e196"; + }; + }; + "utilities-1.0.5" = { + name = "utilities"; + packageName = "utilities"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/utilities/-/utilities-1.0.5.tgz"; + sha1 = "f2b77a88f3510733fc7215b5c486a504a75ab245"; + }; + }; "utils-merge-1.0.0" = { name = "utils-merge"; packageName = "utils-merge"; @@ -29653,15 +29356,6 @@ let sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; - "uws-9.14.0" = { - name = "uws"; - packageName = "uws"; - version = "9.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz"; - sha512 = "HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg=="; - }; - }; "v8-debug-1.0.1" = { name = "v8-debug"; packageName = "v8-debug"; @@ -29698,13 +29392,13 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "validate-npm-package-license-3.0.3" = { + "validate-npm-package-license-3.0.4" = { name = "validate-npm-package-license"; packageName = "validate-npm-package-license"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz"; - sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g=="; + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; "validate-npm-package-name-3.0.0" = { @@ -30220,13 +29914,13 @@ let sha512 = "lchLOk435iDWs0jNuL+hiU14i3ERSrMA0IKSiJh7z6X/i4XNsutBZrtqu2CPOZuA4G/zabiqVAos0vW+S7GEVw=="; }; }; - "webtorrent-0.101.2" = { + "webtorrent-0.102.1" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.101.2"; + version = "0.102.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.101.2.tgz"; - sha512 = "GEr6m98uiTNdPVvk4XQHd2cBYoqlpk07JHZAm/LoJOXJB5CGAu+/vIdwIb3DqciPoTKlNf0TOOFEjAkeRVLCQg=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.102.1.tgz"; + sha512 = "RcJIAJPdgtApjzsL4U2ndmeGIqXCxkbqcS7RkjTZNglVC7EAaVJM7C29a4D/r2QeWGaHmygie2L5w2IB3y/q7w=="; }; }; "whatwg-fetch-2.0.3" = { @@ -30508,15 +30202,6 @@ let sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe"; }; }; - "with-callback-1.0.2" = { - name = "with-callback"; - packageName = "with-callback"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/with-callback/-/with-callback-1.0.2.tgz"; - sha1 = "a09629b9a920028d721404fb435bdcff5c91bc21"; - }; - }; "wordwrap-0.0.2" = { name = "wordwrap"; packageName = "wordwrap"; @@ -30886,15 +30571,6 @@ let sha1 = "fa6bf762a60a413fb3dd8f4b03c5b269238d308f"; }; }; - "xmldom-0.1.22" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.22"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz"; - sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; - }; - }; "xmldom-0.1.27" = { name = "xmldom"; packageName = "xmldom"; @@ -31414,7 +31090,7 @@ in sources."chalk-1.1.3" sources."chmodr-1.0.2" sources."colors-1.3.1" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-js-2.5.7" @@ -31474,7 +31150,7 @@ in sources."os-tmpdir-1.0.2" sources."parse-passwd-1.0.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."pkginfo-0.4.1" sources."private-0.1.8" sources."regenerator-runtime-0.11.1" @@ -31524,7 +31200,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -31535,7 +31211,7 @@ in sources."chromium-pickle-js-0.2.0" sources."co-4.6.0" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cuint-0.2.2" @@ -31628,7 +31304,7 @@ in sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; }; dependencies = [ - sources."@types/node-8.10.23" + sources."@types/node-8.10.24" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -31642,7 +31318,7 @@ in sources."async-1.4.2" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."azure-arm-authorization-2.0.0" sources."azure-arm-batch-3.1.1" sources."azure-arm-cdn-4.0.1" @@ -31840,7 +31516,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-2.0.6" // { dependencies = [ - sources."commander-2.16.0" + sources."commander-2.17.1" ]; }) sources."has-ansi-2.0.0" @@ -31856,7 +31532,7 @@ in sources."inherits-2.0.3" sources."is-buffer-1.1.6" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.17.2" + sources."is-my-json-valid-2.18.0" sources."is-property-1.0.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -32178,7 +31854,7 @@ in ]; }) sources."trim-newlines-1.0.0" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -32259,7 +31935,7 @@ in sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - sources."elliptic-6.4.0" + sources."elliptic-6.4.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" sources."fs.realpath-1.0.0" @@ -32299,7 +31975,7 @@ in sources."parse-asn1-5.1.1" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."path-platform-0.11.15" sources."pbkdf2-3.0.16" sources."process-0.11.10" @@ -32425,7 +32101,7 @@ in sources."codepage-1.4.0" sources."colour-0.7.1" sources."combined-stream-0.0.7" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."compact2string-1.4.0" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { @@ -32708,7 +32384,7 @@ in sources."utfx-1.0.1" sources."util-deprecate-1.0.2" sources."utp-0.0.7" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."voc-1.1.0" sources."ware-1.3.0" sources."windows-no-runnable-0.0.6" @@ -32738,10 +32414,10 @@ in clean-css = nodeEnv.buildNodePackage { name = "clean-css"; packageName = "clean-css"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.0.tgz"; - sha1 = "0a9d62040cddc7904c5edaee9bdeca642d9b9c1c"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz"; + sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g=="; }; dependencies = [ sources."source-map-0.6.1" @@ -32792,7 +32468,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."colors-1.3.1" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" sources."follow-redirects-1.5.2" @@ -32892,7 +32568,7 @@ in sources."async-1.5.2" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" @@ -32939,7 +32615,7 @@ in sources."code-point-at-1.1.0" sources."combine-source-map-0.8.0" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."compressible-2.0.14" sources."compression-1.7.3" sources."concat-map-0.0.1" @@ -33027,7 +32703,7 @@ in sources."editor-1.0.0" sources."ee-first-1.1.1" sources."elementtree-0.1.6" - sources."elliptic-6.4.0" + sources."elliptic-6.4.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."escape-html-1.0.3" @@ -33119,7 +32795,7 @@ in sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.17.2" + sources."is-my-json-valid-2.18.0" sources."is-npm-1.0.0" sources."is-obj-1.0.1" sources."is-property-1.0.2" @@ -33202,7 +32878,7 @@ in sources."parseurl-1.3.2" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."path-platform-0.11.15" sources."path-to-regexp-0.1.7" sources."pbkdf2-3.0.16" @@ -33360,7 +33036,7 @@ in sources."utils-merge-1.0.1" sources."uuid-2.0.3" sources."valid-identifier-0.0.1" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" (sources."verror-1.10.0" // { @@ -33408,7 +33084,7 @@ in sources."buffer-from-0.1.2" sources."builtins-1.0.3" sources."chalk-1.1.3" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.2" @@ -33586,7 +33262,7 @@ in sources."asynckit-0.4.0" sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bencode-1.0.0" @@ -33638,7 +33314,7 @@ in sources."crypto-random-string-1.0.0" sources."cycle-1.0.3" sources."dashdash-1.14.1" - (sources."dat-dns-3.0.1" // { + (sources."dat-dns-3.0.2" // { dependencies = [ sources."debug-2.6.9" ]; @@ -33653,7 +33329,7 @@ in }) sources."dat-link-resolve-2.2.0" sources."dat-log-1.2.0" - sources."dat-node-3.5.11" + sources."dat-node-3.5.12" sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.1" sources."dat-storage-1.0.4" @@ -33734,7 +33410,7 @@ in ]; }) sources."hyperdrive-9.14.0" - sources."hyperdrive-http-4.3.2" + sources."hyperdrive-http-4.3.3" sources."hyperdrive-network-speed-2.1.0" sources."i-0.3.6" sources."import-lazy-2.1.0" @@ -33828,7 +33504,7 @@ in sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" sources."ncp-1.0.1" - sources."neat-input-1.7.0" + sources."neat-input-1.8.0" sources."neat-log-2.4.0" sources."neat-spinner-1.0.0" sources."neat-tasks-1.1.1" @@ -33871,7 +33547,7 @@ in sources."random-access-file-2.0.1" sources."random-access-memory-3.0.0" sources."random-access-storage-1.3.0" - (sources."randomatic-3.0.0" // { + (sources."randomatic-3.1.0" // { dependencies = [ sources."is-number-4.0.0" sources."kind-of-6.0.2" @@ -33910,7 +33586,7 @@ in sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" sources."sodium-javascript-0.5.5" - sources."sodium-native-2.1.6" + sources."sodium-native-2.2.1" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.2.0" sources."sorted-indexof-1.0.0" @@ -34339,9 +34015,9 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.286.2" + sources."aws-sdk-2.290.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-4.9.1" @@ -34453,7 +34129,7 @@ in sources."async-each-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.11.0" @@ -34472,7 +34148,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.0" @@ -34540,7 +34216,7 @@ in sources."is-extglob-1.0.0" sources."is-glob-2.0.1" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.17.2" + sources."is-my-json-valid-2.18.0" sources."is-number-2.1.0" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" @@ -34596,7 +34272,7 @@ in sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.3.2" - (sources."randomatic-3.0.0" // { + (sources."randomatic-3.1.0" // { dependencies = [ sources."is-number-4.0.0" sources."kind-of-6.0.2" @@ -34873,7 +34549,7 @@ in sources."unicode-emoji-modifier-base-1.0.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" (sources."wrap-ansi-3.0.1" // { dependencies = [ @@ -34895,10 +34571,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.2.0.tgz"; - sha512 = "zlggW1qp7/TBjwLfouRoY7eWXrXwJZFqCdIxxh0/LVB/QuuKuIMkzyUZEcDo6LBadsry5JcEMxIqd3H/66CXVg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.3.0.tgz"; + sha512 = "N/tCqlMKkyNvAvLu+zI9AqDasnSLt00K+Hu8kdsERliC9jYEc8ck12XtjvOXrBKu8fK6RrBcN9bat6Xk++9jAg=="; }; dependencies = [ sources."acorn-5.7.1" @@ -34973,7 +34649,7 @@ in sources."has-flag-3.0.0" sources."has-symbols-1.0.0" sources."iconv-lite-0.4.23" - sources."ignore-4.0.3" + sources."ignore-4.0.5" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -35020,7 +34696,7 @@ in sources."progress-2.0.0" sources."punycode-2.1.1" sources."regexp.prototype.flags-1.2.0" - sources."regexpp-1.1.0" + sources."regexpp-2.0.0" sources."require-uncached-1.0.3" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" @@ -35116,7 +34792,7 @@ in sources."es-abstract-1.12.0" sources."es-to-primitive-1.1.1" sources."escape-string-regexp-1.0.5" - sources."eslint-5.2.0" + sources."eslint-5.3.0" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -35146,7 +34822,7 @@ in sources."has-flag-3.0.0" sources."has-symbols-1.0.0" sources."iconv-lite-0.4.23" - sources."ignore-4.0.3" + sources."ignore-4.0.5" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -35186,7 +34862,7 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -35195,7 +34871,7 @@ in sources."progress-2.0.0" sources."punycode-2.1.1" sources."regexp.prototype.flags-1.2.0" - sources."regexpp-1.1.0" + sources."regexpp-2.0.0" sources."require-uncached-1.0.3" sources."resolve-1.8.1" sources."resolve-from-1.0.1" @@ -35274,7 +34950,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" sources."builtin-modules-1.1.1" @@ -35424,7 +35100,7 @@ in sources."typedarray-0.0.6" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" sources."which-1.3.1" sources."yauzl-2.4.1" @@ -35588,7 +35264,7 @@ in sources."process-nextick-args-2.0.0" sources."prompt-0.2.14" sources."ps-tree-0.0.3" - (sources."randomatic-3.0.0" // { + (sources."randomatic-3.1.0" // { dependencies = [ sources."is-number-4.0.0" sources."kind-of-6.0.2" @@ -35720,7 +35396,7 @@ in sources."async-2.6.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" @@ -35763,7 +35439,7 @@ in }) sources."combined-stream-1.0.6" sources."command-exists-1.2.7" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."common-tags-1.8.0" sources."concat-map-0.0.1" sources."configstore-3.1.2" @@ -35900,7 +35576,7 @@ in ]; }) sources."graphql-playground-middleware-express-1.6.2" - sources."graphql-request-1.8.0" + sources."graphql-request-1.8.1" sources."graphql-schema-linter-0.1.1" sources."graphql-static-binding-0.9.3" sources."har-schema-2.0.0" @@ -36140,7 +35816,7 @@ in sources."simple-errors-1.0.1" sources."snake-case-2.1.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.6" // { + (sources."source-map-support-0.5.8" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -36193,7 +35869,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.3.2" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."validator-10.5.0" sources."vary-1.1.2" sources."verror-1.10.0" @@ -36604,7 +36280,7 @@ in sources."parse-filepath-1.0.2" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."posix-character-classes-0.1.1" @@ -36864,7 +36540,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.5.7" - (sources."uglify-js-3.4.6" // { + (sources."uglify-js-3.4.7" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -36883,15 +36559,15 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "4.0.3"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-4.0.3.tgz"; - sha512 = "hnsbLBFfJAteX3FUIddr9jeIbyTizha3l2R3T4rTDhcEaegl3jyszeLc66lZZ1pwA3gZB501FGC1sy9hrKdKOw=="; + url = "https://registry.npmjs.org/ionic/-/ionic-4.0.6.tgz"; + sha512 = "OaRISaUCxW2TXYinZX8LZPyYEhTxznMV3V/TFGpm9nPma9EmZ9zOqDxceIgfnQCVaqfqFYEhoJ1MTpgLkQBb0Q=="; }; dependencies = [ - sources."@ionic/cli-framework-1.0.2" - sources."@ionic/cli-utils-2.0.3" - sources."@ionic/discover-1.0.2" + sources."@ionic/cli-framework-1.0.5" + sources."@ionic/cli-utils-2.0.6" + sources."@ionic/discover-1.0.3" sources."@types/cross-spawn-6.0.0" sources."@types/debug-0.0.30" sources."@types/events-1.2.0" @@ -36903,7 +36579,7 @@ in sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" sources."@types/ncp-2.0.1" - sources."@types/node-6.0.115" + sources."@types/node-6.0.116" sources."@types/rimraf-2.0.2" sources."@types/rx-4.1.1" sources."@types/rx-core-4.0.3" @@ -36978,7 +36654,7 @@ in sources."esutils-2.0.2" sources."execa-0.7.0" sources."extend-3.0.2" - sources."external-editor-3.0.0" + sources."external-editor-3.0.1" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" @@ -37013,7 +36689,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-6.0.0" + sources."inquirer-6.1.0" sources."ip-1.1.5" sources."is-ci-1.1.0" sources."is-fullwidth-code-point-2.0.0" @@ -37028,7 +36704,7 @@ in sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."klaw-2.1.1" + sources."klaw-3.0.0" sources."latest-version-3.1.0" (sources."leek-0.0.24" // { dependencies = [ @@ -37143,6 +36819,7 @@ in sources."thunkify-2.1.2" sources."timed-out-4.0.1" sources."tmp-0.0.33" + sources."tree-kill-1.2.0" sources."tslib-1.9.3" sources."type-check-0.3.2" sources."unique-string-1.0.0" @@ -37350,6 +37027,40 @@ in production = true; bypassCache = false; }; + jake = nodeEnv.buildNodePackage { + name = "jake"; + packageName = "jake"; + version = "8.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/jake/-/jake-8.0.18.tgz"; + sha512 = "KSF3QH/uNR7pKcWgBuS7U1nYoYdcqitLEB86nvIcYztiiDsePkn2/JoSutiKP77O1MTNlbhTiNHorIrlpyy4sA=="; + }; + dependencies = [ + sources."ansi-styles-1.0.0" + sources."async-0.9.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."chalk-0.4.0" + sources."concat-map-0.0.1" + (sources."filelist-0.0.6" // { + dependencies = [ + sources."utilities-0.0.37" + ]; + }) + sources."has-color-0.1.7" + sources."minimatch-3.0.4" + sources."strip-ansi-0.1.1" + sources."utilities-1.0.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "JavaScript build tool, similar to Make or Rake"; + homepage = "https://github.com/jakejs/jake#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = false; + }; javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; @@ -37372,7 +37083,7 @@ in sources."check-error-1.0.2" sources."color-convert-1.9.2" sources."color-name-1.1.1" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."concat-map-0.0.1" sources."deep-eql-3.0.1" sources."deep-equal-1.0.1" @@ -37510,7 +37221,7 @@ in sources."async-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -37664,7 +37375,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."bluebird-3.5.1" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."config-chain-1.1.11" sources."editorconfig-0.13.3" sources."ini-1.3.5" @@ -37754,10 +37465,10 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.6"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.6.tgz"; - sha512 = "umW/uhtvq2YO+MRtHXUiSIlaoslME3xjnpQJ5rkCQoF5RpDfuBqkbO22W3H4Q16VDOTECKHceqYQzef7sT/Hig=="; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.8.tgz"; + sha512 = "Yd6c51emldJK8f0rRzjg+5mZOthqTuIHdKxagRtbIfBAiycElEyOOdI0/idMYQoJFE2T/Rd3l5TfeDSHL81VdA=="; }; dependencies = [ sources."argparse-1.0.10" @@ -37784,7 +37495,7 @@ in sources."mime-types-2.1.19" sources."ms-2.0.0" sources."native-promise-only-0.8.1" - sources."path-loader-1.0.4" + sources."path-loader-1.0.6" sources."process-nextick-args-2.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -37825,7 +37536,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" (sources."basic-auth-2.0.0" // { dependencies = [ sources."safe-buffer-5.1.1" @@ -37972,7 +37683,7 @@ in sources."minimist-1.2.0" sources."morgan-1.9.0" sources."ms-2.0.0" - sources."nanoid-1.1.0" + sources."nanoid-1.2.0" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -38100,26 +37811,14 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "2.0.5"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-2.0.5.tgz"; - sha512 = "rECezBeY7mjzGUWhFlB7CvPHgkHJLXyUmWg+6vHCEsdWNUTnmiS6jRrIMcJEWgU2DUGZzGWG0bTRVky8fsDTOA=="; + url = "https://registry.npmjs.org/karma/-/karma-3.0.0.tgz"; + sha512 = "ZTjyuDXVXhXsvJ1E4CnZzbCjSxD6sEdzEsFYogLuZM0yqvg/mgz+O+R1jb0J7uAQeuzdY8kJgx6hSNXLwFuHIQ=="; }; dependencies = [ sources."accepts-1.3.5" - sources."addressparser-1.0.1" sources."after-0.8.2" - sources."agent-base-4.2.1" - sources."ajv-5.5.2" - (sources."amqplib-0.5.2" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" sources."anymatch-2.0.0" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -38127,22 +37826,10 @@ in sources."array-slice-0.2.3" sources."array-unique-0.3.2" sources."arraybuffer.slice-0.0.7" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.11.5" - sources."async-2.6.1" sources."async-each-1.0.1" sources."async-limiter-1.0.0" - sources."asynckit-0.4.0" sources."atob-2.1.1" - sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" - (sources."axios-0.15.3" // { - dependencies = [ - sources."follow-redirects-1.0.0" - ]; - }) sources."backo2-1.0.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -38152,21 +37839,11 @@ in }) sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" - sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."binary-extensions-1.11.0" - sources."bitsyntax-0.0.4" - (sources."bl-1.1.2" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) sources."blob-0.0.4" sources."bluebird-3.5.1" sources."body-parser-1.18.3" - sources."boom-2.10.1" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -38177,13 +37854,9 @@ in sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."buffer-more-ints-0.0.2" - sources."buildmail-4.0.1" sources."bytes-3.0.0" sources."cache-base-1.0.1" sources."callsite-1.0.0" - sources."caseless-0.12.0" - sources."chalk-1.1.3" sources."chokidar-2.0.4" sources."circular-json-0.5.5" (sources."class-utils-0.3.6" // { @@ -38203,12 +37876,9 @@ in sources."kind-of-5.1.0" ]; }) - sources."co-4.6.0" sources."collection-visit-1.0.0" sources."colors-1.3.1" sources."combine-lists-1.0.1" - sources."combined-stream-1.0.6" - sources."commander-2.16.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -38219,44 +37889,29 @@ in sources."copy-descriptor-0.1.1" sources."core-js-2.5.7" sources."core-util-is-1.0.2" - sources."cryptiles-2.0.5" sources."custom-event-1.0.1" - sources."dashdash-1.14.1" - sources."data-uri-to-buffer-1.2.0" sources."date-format-1.2.0" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" - sources."deep-is-0.1.3" sources."define-property-2.0.2" - sources."degenerator-1.0.4" - sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."di-0.0.1" sources."dom-serialize-2.2.1" - sources."double-ended-queue-2.1.0-0" - sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.1.5" // { + (sources."engine.io-3.2.0" // { dependencies = [ sources."debug-3.1.0" ]; }) - (sources."engine.io-client-3.1.6" // { + (sources."engine.io-client-3.2.1" // { dependencies = [ sources."debug-3.1.0" ]; }) sources."engine.io-parser-2.1.2" sources."ent-2.2.0" - sources."es6-promise-4.2.4" - sources."es6-promisify-5.0.0" sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" - sources."esprima-3.1.3" - sources."estraverse-4.2.0" - sources."esutils-2.0.2" sources."eventemitter3-3.1.0" (sources."expand-braces-0.1.2" // { dependencies = [ @@ -38298,11 +37953,6 @@ in sources."is-extendable-0.1.1" ]; }) - sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" - sources."fast-json-stable-stringify-2.0.0" - sources."fast-levenshtein-2.0.6" - sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -38320,23 +37970,10 @@ in ]; }) sources."for-in-1.0.2" - sources."forever-agent-0.6.1" - sources."form-data-2.3.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" sources."fsevents-1.2.4" - (sources."ftp-0.3.10" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."get-uri-2.0.2" sources."get-value-2.0.6" - sources."getpass-0.1.7" sources."glob-7.1.2" (sources."glob-parent-3.1.0" // { dependencies = [ @@ -38344,9 +37981,6 @@ in ]; }) sources."graceful-fs-4.1.11" - sources."har-schema-2.0.0" - sources."har-validator-5.0.3" - sources."has-ansi-2.0.0" (sources."has-binary2-1.0.3" // { dependencies = [ sources."isarray-2.0.1" @@ -38359,30 +37993,12 @@ in sources."kind-of-4.0.0" ]; }) - sources."hawk-3.1.3" - sources."hipchat-notifier-1.1.0" - sources."hoek-2.16.3" sources."http-errors-1.6.3" sources."http-proxy-1.17.0" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - sources."http-signature-1.2.0" - sources."httpntlm-1.6.1" - sources."httpreq-0.4.24" - (sources."https-proxy-agent-2.2.1" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) sources."iconv-lite-0.4.23" sources."indexof-0.0.1" - sources."inflection-1.12.0" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ip-1.1.5" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -38391,69 +38007,30 @@ in sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.0" - sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.17.2" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) sources."is-plain-object-2.0.4" - sources."is-property-1.0.2" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isbinaryfile-3.0.3" sources."isobject-3.0.1" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" - sources."json-stringify-safe-5.0.1" - sources."jsonpointer-4.0.1" - sources."jsprim-1.4.1" sources."kind-of-6.0.2" - sources."levn-0.3.0" - sources."libbase64-0.1.0" - (sources."libmime-3.0.0" // { - dependencies = [ - sources."iconv-lite-0.4.15" - ]; - }) - sources."libqp-1.1.0" sources."lodash-4.17.10" sources."lodash.debounce-4.0.8" - (sources."log4js-2.11.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."loggly-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - sources."aws-sign2-0.6.0" - sources."caseless-0.11.0" - sources."form-data-2.0.0" - sources."har-validator-2.0.6" - sources."http-signature-1.1.1" - sources."qs-6.2.3" - sources."request-2.75.0" - sources."tunnel-agent-0.4.3" - ]; - }) - sources."lru-cache-4.1.3" - sources."mailcomposer-4.0.1" - (sources."mailgun-js-0.18.1" // { + (sources."log4js-3.0.4" // { dependencies = [ sources."debug-3.1.0" ]; }) + sources."lru-cache-2.2.4" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."media-typer-0.3.0" sources."micromatch-3.1.10" - sources."mime-1.6.0" + sources."mime-2.3.1" sources."mime-db-1.35.0" sources."mime-types-2.1.19" sources."minimatch-3.0.4" @@ -38464,21 +38041,7 @@ in sources."nan-2.10.0" sources."nanomatch-1.2.13" sources."negotiator-0.6.1" - sources."netmask-1.0.6" - sources."node-uuid-1.4.8" - (sources."nodemailer-2.7.2" // { - dependencies = [ - sources."socks-1.1.9" - ]; - }) - sources."nodemailer-direct-transport-3.3.2" - sources."nodemailer-fetch-1.6.0" - sources."nodemailer-shared-1.1.0" - sources."nodemailer-smtp-pool-2.8.2" - sources."nodemailer-smtp-transport-2.7.2" - sources."nodemailer-wellknown-0.1.10" sources."normalize-path-2.1.1" - sources."oauth-sign-0.8.2" sources."object-component-0.0.3" (sources."object-copy-0.1.0" // { dependencies = [ @@ -38497,61 +38060,26 @@ in sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."wordwrap-0.0.3" - ]; - }) - sources."optionator-0.8.2" + sources."optimist-0.6.1" sources."os-tmpdir-1.0.2" - (sources."pac-proxy-agent-2.0.2" // { - dependencies = [ - sources."debug-3.1.0" - sources."socks-proxy-agent-3.0.1" - ]; - }) - sources."pac-resolver-3.0.0" sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.2" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" - (sources."path-proxy-1.0.0" // { - dependencies = [ - sources."inflection-1.3.8" - ]; - }) - sources."performance-now-2.1.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" sources."posix-character-classes-0.1.1" - sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.0" - sources."promisify-call-2.0.4" - (sources."proxy-agent-3.0.1" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - sources."proxy-from-env-1.0.0" - sources."pseudomap-1.0.2" - sources."punycode-1.4.1" sources."qjobs-1.2.0" sources."qs-6.5.2" sources."range-parser-1.2.0" sources."raw-body-2.3.3" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" - sources."redis-2.8.0" - sources."redis-commands-1.3.5" - sources."redis-parser-2.6.0" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."request-2.87.0" - sources."requestretry-1.13.0" sources."requires-port-1.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -38559,7 +38087,6 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."semver-5.5.0" sources."set-immediate-shim-1.0.1" (sources."set-value-2.0.0" // { dependencies = [ @@ -38568,9 +38095,6 @@ in ]; }) sources."setprototypeof-1.1.0" - sources."slack-node-0.2.0" - sources."smart-buffer-1.1.15" - sources."smtp-connection-2.12.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -38601,28 +38125,27 @@ in sources."kind-of-3.2.2" ]; }) - sources."sntp-1.0.9" - sources."socket.io-2.0.4" + (sources."socket.io-2.1.1" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.0.4" - (sources."socket.io-parser-3.1.3" // { + (sources."socket.io-client-2.1.1" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."socket.io-parser-3.2.0" // { dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" ]; }) - sources."socks-1.1.10" - (sources."socks-proxy-agent-4.0.1" // { - dependencies = [ - sources."smart-buffer-4.0.1" - sources."socks-2.2.1" - ]; - }) sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."split-string-3.1.0" - sources."sshpk-1.14.2" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -38647,11 +38170,6 @@ in ]; }) sources."string_decoder-1.1.1" - sources."stringstream-0.0.6" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."thunkify-2.1.2" - sources."timespan-2.3.0" sources."tmp-0.0.33" sources."to-array-0.1.4" (sources."to-object-path-0.3.0" // { @@ -38661,14 +38179,8 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."tough-cookie-2.3.4" - sources."tsscmp-1.0.6" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" sources."type-is-1.6.16" sources."ultron-1.1.1" - sources."underscore-1.7.0" (sources."union-value-1.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -38690,26 +38202,14 @@ in sources."upath-1.1.0" sources."urix-0.1.0" sources."use-3.1.1" - (sources."useragent-2.2.1" // { - dependencies = [ - sources."lru-cache-2.2.4" - ]; - }) + sources."useragent-2.2.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" - sources."uws-9.14.0" - sources."verror-1.10.0" sources."void-elements-2.0.1" - sources."when-3.7.8" - sources."with-callback-1.0.2" - sources."wordwrap-1.0.0" + sources."wordwrap-0.0.3" sources."wrappy-1.0.2" sources."ws-3.3.3" sources."xmlhttprequest-ssl-1.5.5" - sources."xregexp-2.0.0" - sources."xtend-4.0.1" - sources."yallist-2.1.2" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -38994,7 +38494,7 @@ in sources."async-1.5.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" @@ -39236,59 +38736,62 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.0.0-rc.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.0.0-rc.0.tgz"; - sha512 = "fj5Ku6vGgJAzdnpXWE3Stlgnex9ZfaHBQvMQzts13qZ57cJNCzEq5AQPVOOFWE6qqqiABLQfE5T2+Yg/IEqWNQ=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.0.1.tgz"; + sha512 = "oLo6mf6C/qk2+PhROGH5durWu58eT35XgzMLNk+HPN15SSKLsVc4JtpfTrdwLNDRLmNcTYF1xmkmUgeMX1G+zA=="; }; dependencies = [ - sources."@lerna/add-3.0.0-rc.0" - sources."@lerna/batch-packages-3.0.0-rc.0" - sources."@lerna/bootstrap-3.0.0-rc.0" - sources."@lerna/changed-3.0.0-rc.0" - sources."@lerna/child-process-3.0.0-rc.0" - sources."@lerna/clean-3.0.0-rc.0" - sources."@lerna/cli-3.0.0-rc.0" - sources."@lerna/collect-updates-3.0.0-rc.0" - sources."@lerna/command-3.0.0-rc.0" - sources."@lerna/conventional-commits-3.0.0-rc.0" - sources."@lerna/create-3.0.0-rc.0" - sources."@lerna/create-symlink-3.0.0-rc.0" - sources."@lerna/diff-3.0.0-rc.0" - sources."@lerna/exec-3.0.0-rc.0" - sources."@lerna/filter-options-3.0.0-rc.0" - sources."@lerna/filter-packages-3.0.0-rc.0" - sources."@lerna/get-npm-exec-opts-3.0.0-rc.0" - sources."@lerna/global-options-3.0.0-rc.0" - sources."@lerna/import-3.0.0-rc.0" - sources."@lerna/init-3.0.0-rc.0" - sources."@lerna/link-3.0.0-rc.0" - sources."@lerna/list-3.0.0-rc.0" - sources."@lerna/npm-conf-3.0.0-rc.0" - sources."@lerna/npm-dist-tag-3.0.0-rc.0" - sources."@lerna/npm-install-3.0.0-rc.0" - sources."@lerna/npm-publish-3.0.0-rc.0" - sources."@lerna/npm-run-script-3.0.0-rc.0" - sources."@lerna/output-3.0.0-rc.0" - sources."@lerna/package-3.0.0-rc.0" - sources."@lerna/package-graph-3.0.0-rc.0" - sources."@lerna/project-3.0.0-rc.0" - sources."@lerna/prompt-3.0.0-rc.0" - sources."@lerna/publish-3.0.0-rc.0" - sources."@lerna/resolve-symlink-3.0.0-rc.0" - sources."@lerna/rimraf-dir-3.0.0-rc.0" - sources."@lerna/run-3.0.0-rc.0" - sources."@lerna/run-lifecycle-3.0.0-rc.0" - sources."@lerna/run-parallel-batches-3.0.0-rc.0" - sources."@lerna/symlink-binary-3.0.0-rc.0" - sources."@lerna/symlink-dependencies-3.0.0-rc.0" - sources."@lerna/validation-error-3.0.0-rc.0" - sources."@lerna/write-log-file-3.0.0-rc.0" + sources."@lerna/add-3.0.0" + sources."@lerna/batch-packages-3.0.0" + sources."@lerna/bootstrap-3.0.0" + sources."@lerna/changed-3.0.0" + sources."@lerna/child-process-3.0.0" + sources."@lerna/clean-3.0.0" + sources."@lerna/cli-3.0.1" + sources."@lerna/collect-updates-3.0.0" + sources."@lerna/command-3.0.0" + sources."@lerna/conventional-commits-3.0.0" + sources."@lerna/create-3.0.0" + sources."@lerna/create-symlink-3.0.0" + sources."@lerna/diff-3.0.0" + sources."@lerna/exec-3.0.0" + sources."@lerna/filter-options-3.0.0" + sources."@lerna/filter-packages-3.0.0" + sources."@lerna/get-npm-exec-opts-3.0.0" + sources."@lerna/global-options-3.0.0" + sources."@lerna/import-3.0.0" + sources."@lerna/init-3.0.0" + sources."@lerna/link-3.0.0" + sources."@lerna/list-3.0.0" + sources."@lerna/listable-3.0.0" + sources."@lerna/log-packed-3.0.0" + sources."@lerna/npm-conf-3.0.0" + sources."@lerna/npm-dist-tag-3.0.0" + sources."@lerna/npm-install-3.0.0" + sources."@lerna/npm-publish-3.0.0" + sources."@lerna/npm-run-script-3.0.0" + sources."@lerna/output-3.0.0" + sources."@lerna/package-3.0.0" + sources."@lerna/package-graph-3.0.0" + sources."@lerna/project-3.0.0" + sources."@lerna/prompt-3.0.0" + sources."@lerna/publish-3.0.1" + sources."@lerna/resolve-symlink-3.0.0" + sources."@lerna/rimraf-dir-3.0.0" + sources."@lerna/run-3.0.0" + sources."@lerna/run-lifecycle-3.0.0" + sources."@lerna/run-parallel-batches-3.0.0" + sources."@lerna/symlink-binary-3.0.0" + sources."@lerna/symlink-dependencies-3.0.0" + sources."@lerna/validation-error-3.0.0" + sources."@lerna/version-3.0.0" + sources."@lerna/write-log-file-3.0.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.0" sources."JSONStream-1.3.3" sources."abbrev-1.1.1" - sources."ajv-4.11.8" + sources."ajv-5.5.2" (sources."align-text-0.1.4" // { dependencies = [ sources."kind-of-3.2.2" @@ -39296,7 +38799,7 @@ in }) sources."amdefine-1.0.1" sources."ansi-escapes-3.1.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -39313,13 +38816,13 @@ in sources."arrify-1.0.1" sources."asap-2.0.6" sources."asn1-0.2.4" - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."async-1.5.2" sources."asynckit-0.4.0" sources."atob-2.1.1" - sources."aws-sign2-0.6.0" - sources."aws4-1.7.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -39328,7 +38831,6 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" - sources."boom-2.10.1" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -39339,6 +38841,7 @@ in sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."byline-5.0.0" + sources."byte-size-4.0.3" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" @@ -39380,12 +38883,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" - (sources."columnify-1.5.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) + sources."columnify-1.5.4" sources."combined-stream-1.0.6" (sources."compare-func-1.3.2" // { dependencies = [ @@ -39415,17 +38913,12 @@ in sources."conventional-recommended-bump-2.0.9" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."cosmiconfig-5.0.5" + sources."cosmiconfig-5.0.6" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" - sources."cryptiles-2.0.5" sources."currently-unhandled-0.4.1" sources."dargs-4.1.0" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."dateformat-3.0.3" sources."debug-2.6.9" sources."debuglog-1.0.1" @@ -39485,11 +38978,13 @@ in ]; }) sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" (sources."fast-glob-2.2.2" // { dependencies = [ sources."is-glob-4.0.0" ]; }) + sources."fast-json-stable-stringify-2.0.0" sources."figures-2.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -39499,17 +38994,15 @@ in sources."find-up-2.1.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" + sources."form-data-2.3.2" sources."fragment-cache-0.2.1" sources."fs-extra-6.0.1" sources."fs.realpath-1.0.0" sources."fstream-1.0.11" (sources."gauge-2.7.4" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" ]; }) sources."get-caller-file-1.0.3" @@ -39530,11 +39023,7 @@ in sources."get-stdin-4.0.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."git-raw-commits-1.3.6" (sources."git-remote-origin-url-2.0.0" // { dependencies = [ @@ -39554,8 +39043,8 @@ in sources."source-map-0.4.4" ]; }) - sources."har-schema-1.0.5" - sources."har-validator-4.2.1" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."has-value-1.0.0" @@ -39564,10 +39053,8 @@ in sources."kind-of-4.0.0" ]; }) - sources."hawk-3.1.3" - sources."hoek-2.16.3" sources."hosted-git-info-2.7.1" - sources."http-signature-1.1.1" + sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" sources."ignore-3.3.10" sources."import-local-1.0.0" @@ -39577,7 +39064,12 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."init-package-json-1.10.3" - sources."inquirer-5.2.0" + (sources."inquirer-5.2.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) sources."invert-kv-1.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" @@ -39617,16 +39109,11 @@ in sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" - sources."json-stable-stringify-1.0.1" + sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" - sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."jsprim-1.4.1" sources."kind-of-6.0.2" sources."lazy-cache-1.0.4" sources."lcid-1.0.0" @@ -39676,7 +39163,7 @@ in sources."mute-stream-0.0.7" sources."nanomatch-1.2.13" sources."nice-try-1.0.4" - (sources."node-gyp-3.7.0" // { + (sources."node-gyp-3.8.0" // { dependencies = [ sources."semver-5.3.0" ]; @@ -39738,7 +39225,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-type-3.0.0" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -39751,7 +39238,7 @@ in sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."q-1.5.1" - sources."qs-6.4.0" + sources."qs-6.5.2" sources."quick-lru-1.1.0" (sources."rc-1.2.8" // { dependencies = [ @@ -39784,7 +39271,7 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."repeating-2.0.1" - sources."request-2.81.0" + sources."request-2.87.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" (sources."resolve-cwd-2.0.0" // { @@ -39843,7 +39330,6 @@ in sources."kind-of-3.2.2" ]; }) - sources."sntp-1.0.9" sources."sort-keys-2.0.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" @@ -39856,11 +39342,7 @@ in sources."split-string-3.1.0" sources."split2-2.2.0" sources."sprintf-js-1.0.3" - (sources."sshpk-1.14.2" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."sshpk-1.14.2" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -39878,10 +39360,14 @@ in sources."kind-of-5.1.0" ]; }) - sources."string-width-2.1.1" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) sources."string_decoder-1.1.1" - sources."stringstream-0.0.6" - sources."strip-ansi-4.0.0" + sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" sources."strip-indent-2.0.0" @@ -39942,13 +39428,9 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."which-1.3.1" sources."which-module-2.0.0" @@ -39957,10 +39439,8 @@ in sources."wordwrap-0.0.3" (sources."wrap-ansi-2.1.0" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" ]; }) sources."wrappy-1.0.2" @@ -39973,6 +39453,7 @@ in sources."yallist-2.1.2" (sources."yargs-12.0.1" // { dependencies = [ + sources."ansi-regex-3.0.0" sources."cliui-4.1.0" sources."decamelize-2.0.0" sources."find-up-3.0.0" @@ -39980,6 +39461,7 @@ in sources."p-limit-2.0.0" sources."p-locate-3.0.0" sources."p-try-2.0.0" + sources."strip-ansi-4.0.0" ]; }) sources."yargs-parser-10.1.0" @@ -39996,10 +39478,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.8.0.tgz"; - sha512 = "746DPDyL+Wsjo7h/Z3t+A3Mg/mpDTaxW4puZyLhCQJjWJJvHggN735orjuCLIYgo7jKqv1zWLiQrxkuUOg5oGA=="; + url = "https://registry.npmjs.org/less/-/less-3.8.1.tgz"; + sha512 = "8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q=="; }; dependencies = [ sources."ajv-5.5.2" @@ -40008,9 +39490,10 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" + sources."clone-2.1.2" sources."co-4.6.0" sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" @@ -40200,7 +39683,7 @@ in sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" sources."proxy-middleware-0.15.0" - (sources."randomatic-3.0.0" // { + (sources."randomatic-3.1.0" // { dependencies = [ sources."is-number-4.0.0" sources."kind-of-6.0.2" @@ -40277,7 +39760,7 @@ in sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" @@ -40443,7 +39926,7 @@ in sources."proxy-addr-2.0.4" sources."punycode-1.4.1" sources."qs-6.5.2" - (sources."randomatic-3.0.0" // { + (sources."randomatic-3.1.0" // { dependencies = [ sources."is-number-4.0.0" sources."kind-of-6.0.2" @@ -40515,6 +39998,28 @@ in production = true; bypassCache = false; }; + madoko = nodeEnv.buildNodePackage { + name = "madoko"; + packageName = "madoko"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/madoko/-/madoko-1.1.4.tgz"; + sha1 = "3a2bec6219a2658fcb955494a21d0db11a9e6fe4"; + }; + dependencies = [ + sources."amdefine-1.0.1" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."requirejs-2.3.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Madoko is a fast scholarly Markdown processor written in Koka"; + homepage = http://madoko.codeplex.com/; + }; + production = true; + bypassCache = false; + }; meat = nodeEnv.buildNodePackage { name = "meat"; packageName = "meat"; @@ -40616,7 +40121,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.1" sources."aws-sign2-0.6.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -40655,7 +40160,11 @@ in sources."kind-of-5.1.0" ]; }) - sources."clean-css-4.1.11" + (sources."clean-css-4.2.1" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."cliui-2.1.0" sources."clone-1.0.4" sources."clone-buffer-1.0.0" @@ -40819,7 +40328,7 @@ in sources."glogg-1.0.1" sources."graceful-fs-3.0.11" sources."gulp-3.9.1" - (sources."gulp-clean-css-3.9.4" // { + (sources."gulp-clean-css-3.10.0" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" @@ -40995,7 +40504,7 @@ in sources."make-iterator-1.0.1" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."memoizee-0.4.12" + sources."memoizee-0.4.13" sources."micromatch-3.1.10" sources."mime-1.6.0" sources."mime-db-1.35.0" @@ -41049,7 +40558,7 @@ in sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."performance-now-0.2.0" @@ -41202,7 +40711,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typescript-2.7.2" - (sources."uglify-js-3.4.6" // { + (sources."uglify-js-3.4.7" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -41325,7 +40834,7 @@ in sources."argparse-1.0.10" sources."asynckit-0.4.0" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."component-emitter-1.2.1" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" @@ -41347,7 +40856,7 @@ in sources."mime-types-2.1.19" sources."ms-2.0.0" sources."native-promise-only-0.8.1" - sources."path-loader-1.0.4" + sources."path-loader-1.0.6" sources."process-nextick-args-2.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -41407,7 +40916,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."base64-js-1.2.3" sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" @@ -41525,7 +41034,7 @@ in sources."uid-number-0.0.5" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."walk-2.3.14" @@ -41545,26 +41054,25 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz"; - sha512 = "qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz"; + sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-4.11.8" + sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."asn1-0.2.4" - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" sources."asynckit-0.4.0" - sources."aws-sign2-0.6.0" - sources."aws4-1.7.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" - sources."boom-2.10.1" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" @@ -41573,35 +41081,26 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."cryptiles-2.0.5" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" + sources."form-data-2.3.2" sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."gauge-2.7.4" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."glob-7.1.2" sources."graceful-fs-4.1.11" - sources."har-schema-1.0.5" - sources."har-validator-4.2.1" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" sources."has-unicode-2.0.1" - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" + sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-fullwidth-code-point-1.0.0" @@ -41611,14 +41110,9 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-stable-stringify-1.0.1" + sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" - sources."jsonify-0.0.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."jsprim-1.4.1" sources."mime-db-1.35.0" sources."mime-types-2.1.19" sources."minimatch-3.0.4" @@ -41634,27 +41128,21 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" - sources."qs-6.4.0" + sources."qs-6.5.2" sources."readable-stream-2.3.6" - sources."request-2.81.0" + sources."request-2.87.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sntp-1.0.9" - (sources."sshpk-1.14.2" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."sshpk-1.14.2" sources."string-width-1.0.2" sources."string_decoder-1.1.1" - sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" sources."tar-2.2.1" sources."tough-cookie-2.3.4" @@ -41662,11 +41150,7 @@ in sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."which-1.3.1" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -41674,7 +41158,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Node.js native addon build tool"; - homepage = https://github.com/nodejs/node-gyp; + homepage = "https://github.com/nodejs/node-gyp#readme"; license = "MIT"; }; production = true; @@ -41720,7 +41204,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" @@ -41958,7 +41442,7 @@ in sources."uuid-3.3.2" sources."v8-debug-1.0.1" sources."v8-profiler-5.7.0" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."vary-1.1.2" (sources."verror-1.10.0" // { dependencies = [ @@ -42037,9 +41521,9 @@ in sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."needle-2.2.1" + sources."needle-2.2.2" sources."nopt-4.0.1" - sources."npm-bundled-1.0.3" + sources."npm-bundled-1.0.4" sources."npm-packlist-1.1.11" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -42465,7 +41949,7 @@ in sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."basic-auth-2.0.0" sources."bcrypt-1.0.3" @@ -43021,7 +42505,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" @@ -43195,12 +42679,12 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."colors-1.0.3" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."configstore-3.1.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" - sources."debug-2.6.9" + sources."debug-3.1.0" sources."deep-extend-0.6.0" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" @@ -43232,7 +42716,7 @@ in sources."jju-1.4.0" sources."js-yaml-3.12.0" sources."json-parse-helpfulerror-1.0.3" - sources."json5-0.5.1" + sources."json5-1.0.1" sources."latest-version-3.1.0" sources."lodash-4.17.10" sources."lowercase-keys-1.0.1" @@ -43261,7 +42745,11 @@ in sources."prepend-http-1.0.4" sources."pseudomap-1.0.2" sources."rc-1.2.8" - sources."rc-config-loader-2.0.1" + (sources."rc-config-loader-2.0.2" // { + dependencies = [ + sources."path-exists-3.0.0" + ]; + }) sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."require-from-string-2.0.2" @@ -43424,7 +42912,7 @@ in sources."supports-color-5.4.0" sources."through-2.3.8" sources."tmp-0.0.33" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" sources."which-module-2.0.0" sources."wrap-ansi-2.1.0" @@ -43514,7 +43002,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."babybird-0.0.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" @@ -43803,7 +43291,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.3.2" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-module-1.0.0" @@ -44110,7 +43598,7 @@ in sources."uniq-1.0.1" sources."util-deprecate-1.0.2" sources."utp-0.0.7" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."winreg-1.2.4" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" @@ -44135,21 +43623,24 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.2.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.2.0.tgz"; - sha1 = "1848fdc14036f013af7489a39e8a5f0f9da48b87"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.3.1.tgz"; + sha512 = "T0PUe1EkLIammEBDCUM+/BRlOX6D504+ldvT1VWP4YzyZRAxYh/O1qv7BMyfF6FoF68wqOr1VYaNilOycLJ/IA=="; }; dependencies = [ sources."accepts-1.2.13" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" + sources."archiver-2.1.1" + sources."archiver-utils-1.3.0" sources."arraybuffer.slice-0.0.6" - sources."async-0.2.10" + sources."async-2.6.1" sources."aws-sign-0.2.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" + sources."base64-js-1.3.0" sources."base64-url-1.2.1" sources."base64id-1.0.0" sources."basic-auth-1.0.4" @@ -44165,6 +43656,7 @@ in sources."minimist-1.2.0" ]; }) + sources."bl-1.2.2" sources."blob-0.0.4" sources."bn.js-4.11.8" sources."bncode-0.5.3" @@ -44175,8 +43667,10 @@ in }) sources."boom-0.3.8" sources."brace-expansion-1.1.11" + sources."buffer-5.2.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-crc32-0.2.13" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" @@ -44189,13 +43683,17 @@ in sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" + sources."compress-commons-1.2.2" sources."compressible-2.0.14" sources."compression-1.5.2" sources."concat-map-0.0.1" (sources."connect-2.30.2" // { dependencies = [ + sources."isarray-0.0.1" sources."multiparty-3.3.2" sources."qs-4.0.0" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" ]; }) sources."connect-multiparty-2.1.1" @@ -44207,7 +43705,8 @@ in sources."cookie-parser-1.3.5" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" - sources."crc-3.3.0" + sources."crc-3.8.0" + sources."crc32-stream-2.0.0" sources."cryptiles-0.1.3" sources."csrf-3.0.6" sources."csurf-1.8.3" @@ -44251,6 +43750,7 @@ in }) (sources."express-session-1.11.3" // { dependencies = [ + sources."crc-3.3.0" sources."uid-safe-2.0.0" ]; }) @@ -44262,22 +43762,30 @@ in sources."forever-agent-0.2.0" (sources."form-data-0.0.10" // { dependencies = [ + sources."async-0.2.10" sources."mime-1.2.11" ]; }) sources."forwarded-0.1.2" sources."fresh-0.3.0" sources."fs-chunk-store-1.7.0" + sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.0.2" sources."glob-7.1.2" - sources."has-binary-0.1.7" + sources."graceful-fs-4.1.11" + (sources."has-binary-0.1.7" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) sources."has-cors-1.1.0" sources."hat-0.0.3" sources."hawk-0.10.2" sources."hoek-0.7.6" sources."http-errors-1.3.1" sources."iconv-lite-0.4.11" + sources."ieee754-1.1.12" sources."immediate-chunk-store-1.0.8" sources."indexof-0.0.1" sources."inflight-1.0.6" @@ -44285,7 +43793,7 @@ in sources."ip-1.1.5" sources."ip-set-1.0.1" sources."ipaddr.js-1.0.5" - sources."isarray-0.0.1" + sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stringify-safe-3.0.0" sources."json3-3.3.2" @@ -44300,7 +43808,8 @@ in sources."bencode-2.0.0" ]; }) - sources."lodash-2.4.2" + sources."lazystream-1.0.0" + sources."lodash-4.17.10" sources."lru-2.0.1" sources."magnet-uri-2.0.1" sources."media-typer-0.3.0" @@ -44325,6 +43834,7 @@ in sources."multiparty-4.1.4" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" + sources."normalize-path-2.1.1" sources."oauth-sign-0.2.0" sources."object-assign-4.1.0" sources."object-component-0.0.3" @@ -44347,6 +43857,9 @@ in (sources."peer-wire-protocol-0.7.1" // { dependencies = [ sources."bncode-0.2.3" + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" ]; }) sources."peer-wire-swarm-0.12.2" @@ -44369,7 +43882,8 @@ in }) sources."re-emitter-1.1.3" sources."read-torrent-1.3.0" - sources."readable-stream-1.1.14" + sources."readable-stream-2.3.6" + sources."remove-trailing-separator-1.1.0" (sources."request-2.16.6" // { dependencies = [ sources."mime-1.2.11" @@ -44415,20 +43929,11 @@ in }) sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - (sources."simple-peer-6.4.4" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."simple-peer-6.4.4" sources."simple-sha1-2.1.1" (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" sources."safe-buffer-5.0.1" - sources."string_decoder-1.1.1" sources."ultron-1.1.1" sources."ws-2.3.1" ]; @@ -44455,16 +43960,25 @@ in (sources."socket.io-parser-2.3.1" // { dependencies = [ sources."component-emitter-1.1.2" + sources."isarray-0.0.1" ]; }) sources."speedometer-0.1.4" sources."statuses-1.5.0" - sources."stream-counter-0.2.0" + (sources."stream-counter-0.2.0" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) sources."string2compact-1.3.0" - sources."string_decoder-0.10.31" + sources."string_decoder-1.1.1" + sources."tar-stream-1.6.1" sources."thirty-two-0.0.2" sources."thunky-1.0.2" sources."to-array-0.1.4" + sources."to-buffer-1.1.1" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.2" (sources."torrent-stream-1.0.4" // { @@ -44493,6 +44007,7 @@ in sources."xmlhttprequest-ssl-1.5.3" sources."xtend-4.0.1" sources."yeast-0.1.2" + sources."zip-stream-1.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -44526,7 +44041,7 @@ in sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" sources."core-util-is-1.0.2" @@ -44566,7 +44081,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.17.2" + sources."is-my-json-valid-2.18.0" sources."is-property-1.0.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -44644,10 +44159,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.14.0"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.14.0.tgz"; - sha512 = "KtQ2EGaUwf2EyDfp1fxyEb0PqGKakVm0WyXwDt6u+cAoxbO2Z2CwKvOe3+b4+F2IlO9lYHi1kqFuRM70ddBnow=="; + url = "https://registry.npmjs.org/prettier/-/prettier-1.14.2.tgz"; + sha512 = "McHPg0n1pIke+A/4VcaS2en+pTNjy4xF+Uuq86u/5dyDO59/TtFZtQ708QIRkEZ3qwKz3GVkVa6mpxK/CpB8Rg=="; }; buildInputs = globalBuildInputs; meta = { @@ -44787,7 +44302,7 @@ in sources."diffie-hellman-5.0.3" sources."domain-browser-1.1.7" sources."duplexer2-0.1.4" - sources."elliptic-6.4.0" + sources."elliptic-6.4.1" sources."es6-promise-3.3.1" sources."events-1.1.1" sources."evp_bytestokey-1.0.3" @@ -44953,7 +44468,7 @@ in sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."path-platform-0.11.15" sources."pbkdf2-3.0.16" sources."posix-character-classes-0.1.1" @@ -45150,7 +44665,7 @@ in sources."assert-plus-0.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."babel-runtime-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" @@ -45170,7 +44685,7 @@ in sources."center-align-0.1.3" sources."character-parser-2.2.0" sources."chownr-1.0.1" - (sources."clean-css-4.2.0" // { + (sources."clean-css-4.2.1" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -45179,7 +44694,7 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."console-control-strings-1.1.0" sources."constantinople-3.1.2" sources."content-disposition-0.5.2" @@ -45321,7 +44836,7 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."parseurl-1.3.2" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" sources."performance-now-0.2.0" (sources."prebuild-install-2.1.2" // { @@ -45461,7 +44976,7 @@ in sources."balanced-match-1.0.0" sources."base62-0.1.1" sources."brace-expansion-1.1.11" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -45579,7 +45094,7 @@ in sources."asynckit-0.4.0" sources."aws-sdk-1.18.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-crc32-0.2.1" sources."bytes-0.2.1" @@ -45714,10 +45229,10 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "9.4.0"; + version = "9.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-9.4.0.tgz"; - sha512 = "a5TpnFytY2r59g0M3L9g2HvlLBcTHeevR8gTnDkzMWECfV2c8tUCEGC9tl3YYWM7xucdkUmov+xyKjWamQQJ7Q=="; + url = "https://registry.npmjs.org/serve/-/serve-9.4.2.tgz"; + sha512 = "2kSfuxVKvsMhXLyg3AoIYzxHwoY+kiSB6l/+zD7G+9c13W4519DtKl4qK+kbWvOXEVPdphg5MUePfp8ONGr7Yg=="; }; dependencies = [ sources."@zeit/schemas-1.7.0" @@ -45828,7 +45343,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."base64-arraybuffer-0.1.2" sources."base64id-0.1.0" sources."bcrypt-nodejs-0.0.3" @@ -45842,7 +45357,7 @@ in sources."cheerio-0.17.0" sources."co-4.6.0" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -46053,7 +45568,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" (sources."body-parser-1.18.3" // { @@ -46076,7 +45591,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."compressible-2.0.14" (sources."compression-1.7.3" // { dependencies = [ @@ -46766,166 +46281,97 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.1.1.tgz"; - sha1 = "69b0032628178bafc3f0d09a1c9c16437413db5b"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.2.0.tgz"; + sha512 = "kB3n4rOfcUznvAA+8yXjuExczfq2ILEp6tUlY2H3YVYRcV5W5tsVsvRJLHeB3sZzijxZY+5DTBuV3txiWevSHA=="; }; dependencies = [ - sources."adm-zip-0.4.7" - sources."ajv-4.11.8" - sources."align-text-0.1.4" - sources."amdefine-1.0.1" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."adm-zip-0.4.11" + sources."ajv-5.5.2" sources."asn1-0.2.4" - sources."assert-plus-0.2.0" - sources."async-2.1.2" + sources."assert-plus-1.0.0" + sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sign2-0.6.0" - sources."aws4-1.7.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" - sources."boom-2.10.1" - sources."camelcase-1.2.1" + sources."buffer-from-1.1.1" sources."caseless-0.12.0" - sources."center-align-0.1.3" - sources."chalk-1.1.3" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) sources."co-4.6.0" - sources."colors-1.1.2" + sources."colors-1.3.0" sources."combined-stream-1.0.6" sources."commander-2.16.0" sources."core-util-is-1.0.2" - sources."cryptiles-2.0.5" sources."cycle-1.0.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."decamelize-1.2.0" + sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - sources."diff-3.2.0" + sources."diff-3.5.0" sources."ecc-jsbn-0.1.2" - sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" (sources."fields-0.1.24" // { dependencies = [ sources."colors-0.6.2" ]; }) sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."fs-extra-2.1.2" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."form-data-2.3.2" + sources."fs-extra-7.0.0" + sources."getpass-0.1.7" sources."graceful-fs-4.1.11" - sources."har-schema-1.0.5" - sources."har-validator-4.2.1" - sources."has-ansi-2.0.0" - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."http-signature-1.2.0" sources."humanize-0.0.9" - sources."is-buffer-1.1.6" - sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.17.2" - sources."is-property-1.0.2" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-stable-stringify-1.0.1" + sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" - sources."jsonify-0.0.0" - sources."jsonpointer-4.0.1" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."jsonfile-4.0.0" + sources."jsprim-1.4.1" sources."keypress-0.2.1" - sources."kind-of-3.2.2" - sources."lazy-cache-1.0.4" sources."lodash-4.17.10" - sources."longest-1.0.1" - sources."longjohn-0.2.11" + sources."longjohn-0.2.12" sources."mime-db-1.35.0" sources."mime-types-2.1.19" sources."minimist-0.0.10" - sources."moment-2.16.0" - (sources."node-appc-0.2.44" // { + sources."moment-2.22.2" + (sources."node-appc-0.2.48" // { dependencies = [ - sources."async-2.3.0" - sources."fs-extra-2.0.0" - sources."request-2.81.0" + sources."fs-extra-6.0.1" ]; }) sources."oauth-sign-0.8.2" sources."optimist-0.6.1" sources."os-tmpdir-1.0.2" - sources."performance-now-0.2.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" + sources."performance-now-2.1.0" sources."pkginfo-0.3.1" sources."punycode-1.4.1" - sources."qs-6.4.0" - sources."repeat-string-1.6.1" - (sources."request-2.79.0" // { - dependencies = [ - sources."caseless-0.11.0" - sources."har-validator-2.0.6" - sources."qs-6.3.2" - sources."tunnel-agent-0.4.3" - ]; - }) - sources."right-align-0.1.3" + sources."qs-6.5.2" + sources."request-2.87.0" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.3.0" - sources."sntp-1.0.9" - sources."source-map-0.1.32" - sources."source-map-support-0.3.2" + sources."semver-5.5.0" + sources."source-map-0.6.1" + sources."source-map-support-0.5.8" sources."sprintf-0.1.5" - (sources."sshpk-1.14.2" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."sshpk-1.14.2" sources."stack-trace-0.0.10" - sources."stringstream-0.0.6" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" sources."temp-0.8.3" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."uglify-js-2.8.21" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."uglify-to-browserify-1.0.2" - sources."uuid-3.0.1" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."window-size-0.1.0" + sources."uglify-js-3.4.7" + sources."universalify-0.1.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" (sources."winston-1.1.2" // { dependencies = [ sources."async-1.0.0" @@ -46933,9 +46379,7 @@ in ]; }) sources."wordwrap-0.0.3" - sources."xmldom-0.1.22" - sources."xtend-4.0.1" - sources."yargs-3.10.0" + sources."xmldom-0.1.27" ]; buildInputs = globalBuildInputs; meta = { @@ -47183,10 +46627,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.6"; + version = "3.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz"; - sha512 = "O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.7.tgz"; + sha512 = "J0M2i1mQA+ze3EdN9SBi751DNdAXmeFLfJrd/MDIkRc3G3Gbb9OPVSx7GIQvVwfWxQARcYV2DTxIkMyDAk3o9Q=="; }; dependencies = [ sources."commander-2.16.0" @@ -47231,7 +46675,7 @@ in sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" @@ -47593,7 +47037,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.3.2" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" @@ -47665,7 +47109,7 @@ in sources."async-2.6.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" @@ -47702,7 +47146,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."concat-map-0.0.1" sources."config-chain-1.1.11" sources."consolidate-0.14.5" @@ -47735,7 +47179,7 @@ in sources."esprima-4.0.1" sources."extend-3.0.2" sources."extend-shallow-2.0.1" - sources."external-editor-3.0.0" + sources."external-editor-3.0.1" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -47780,7 +47224,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-6.0.0" + sources."inquirer-6.1.0" sources."is-3.2.1" sources."is-buffer-1.1.6" sources."is-extendable-0.1.1" @@ -47961,7 +47405,7 @@ in sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" (sources."config-chain-1.1.11" // { @@ -48012,7 +47456,7 @@ in sources."inherits-2.0.3" sources."ini-1.1.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.17.2" + sources."is-my-json-valid-2.18.0" sources."is-property-1.0.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -48103,10 +47547,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.16.4"; + version = "4.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.16.4.tgz"; - sha512 = "RqUfwp4qMqv3oFwBQQOoK69C2tdu2FHJEqPABPqgjGDvOIOLqkTOhmmdJjpiRabzNAAH1ahmkA3z4xowlHN+VA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.16.5.tgz"; + sha512 = "i5cHYHonzSc1zBuwB5MSzW4v9cScZFbprkHK8ZgzPDCRkQXGGpYzPmJhbus5bOrZ0tXTcQp+xyImRSvKb0b+Kw=="; }; dependencies = [ sources."@webassemblyjs/ast-1.5.13" @@ -48226,7 +47670,7 @@ in sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexify-3.6.0" - sources."elliptic-6.4.0" + sources."elliptic-6.4.1" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" sources."enhanced-resolve-4.1.0" @@ -48421,7 +47865,7 @@ in sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."schema-utils-0.4.5" + sources."schema-utils-0.4.7" sources."serialize-javascript-1.5.0" sources."set-immediate-shim-1.0.1" (sources."set-value-2.0.0" // { @@ -48591,10 +48035,10 @@ in sources."debug-3.1.0" ]; }) - (sources."bittorrent-tracker-9.10.0" // { + (sources."bittorrent-tracker-9.10.1" // { dependencies = [ sources."debug-3.1.0" - sources."simple-get-3.0.2" + sources."simple-get-3.0.3" ]; }) sources."blob-to-buffer-1.2.8" @@ -48618,7 +48062,7 @@ in sources."mime-1.6.0" ]; }) - sources."chunk-store-stream-2.1.0" + sources."chunk-store-stream-3.0.0" sources."clivas-0.2.0" sources."closest-to-2.0.0" sources."colour-0.7.1" @@ -48657,7 +48101,7 @@ in sources."get-stdin-6.0.0" sources."glob-7.1.2" sources."he-1.1.1" - sources."immediate-chunk-store-1.0.8" + sources."immediate-chunk-store-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ip-1.1.5" @@ -48674,7 +48118,7 @@ in sources."last-one-wins-1.0.4" (sources."load-ip-set-2.1.0" // { dependencies = [ - sources."simple-get-3.0.2" + sources."simple-get-3.0.3" ]; }) sources."long-2.4.0" @@ -48682,7 +48126,7 @@ in sources."magnet-uri-5.2.3" sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" - sources."mediasource-2.2.1" + sources."mediasource-2.2.2" sources."memory-chunk-store-1.3.0" sources."mime-2.3.1" sources."mimic-response-1.0.1" @@ -48716,7 +48160,7 @@ in sources."parse-numeric-range-0.0.2" (sources."parse-torrent-6.1.1" // { dependencies = [ - sources."simple-get-3.0.2" + sources."simple-get-3.0.3" ]; }) sources."path-is-absolute-1.0.1" @@ -48740,7 +48184,7 @@ in sources."range-slice-stream-1.2.0" sources."readable-stream-2.3.6" sources."record-cache-1.1.0" - (sources."render-media-3.1.2" // { + (sources."render-media-3.1.3" // { dependencies = [ sources."debug-3.1.0" ]; @@ -48801,10 +48245,10 @@ in sources."util-deprecate-1.0.2" sources."videostream-2.5.1" sources."vlc-command-1.1.1" - (sources."webtorrent-0.101.2" // { + (sources."webtorrent-0.102.1" // { dependencies = [ sources."debug-3.1.0" - sources."simple-get-3.0.2" + sources."simple-get-3.0.3" ]; }) sources."winreg-1.2.4" @@ -48836,7 +48280,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.5.5" + sources."@types/node-10.5.7" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.7.1" @@ -48893,7 +48337,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.1" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" (sources."babel-code-frame-6.26.0" // { dependencies = [ sources."chalk-1.1.3" @@ -49004,7 +48448,7 @@ in sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."common-tags-1.8.0" sources."component-emitter-1.2.1" sources."compress-commons-1.2.2" @@ -49054,7 +48498,7 @@ in sources."chalk-2.4.1" sources."pino-4.17.6" sources."source-map-0.6.1" - sources."source-map-support-0.5.6" + sources."source-map-support-0.5.8" sources."supports-color-5.4.0" sources."yargs-12.0.1" ]; @@ -49354,7 +48798,7 @@ in sources."is-installed-globally-0.1.0" sources."is-mergeable-object-1.1.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.17.2" + sources."is-my-json-valid-2.18.0" sources."is-npm-1.0.0" sources."is-number-3.0.0" sources."is-obj-1.0.1" @@ -49508,7 +48952,7 @@ in ]; }) sources."ncp-2.0.0" - sources."needle-2.2.1" + sources."needle-2.2.2" sources."neo-async-2.5.1" sources."netmask-1.0.6" sources."next-tick-1.0.0" @@ -49574,7 +49018,7 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."path-type-1.1.0" sources."pend-1.2.0" sources."performance-now-2.1.0" @@ -49587,7 +49031,7 @@ in sources."quick-format-unescaped-3.0.0" ]; }) - sources."pino-std-serializers-2.1.0" + sources."pino-std-serializers-2.2.0" sources."pkginfo-0.4.1" sources."pluralize-7.0.0" sources."po2json-0.4.5" @@ -49734,7 +49178,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.90.0" // { + (sources."snyk-1.90.2" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -49746,7 +49190,7 @@ in sources."supports-color-5.4.0" ]; }) - (sources."snyk-config-2.1.0" // { + (sources."snyk-config-2.2.0" // { dependencies = [ sources."debug-3.1.0" ]; @@ -49756,7 +49200,7 @@ in sources."debug-3.1.0" ]; }) - sources."snyk-go-plugin-1.5.1" + sources."snyk-go-plugin-1.5.2" sources."snyk-gradle-plugin-1.3.0" (sources."snyk-module-1.8.2" // { dependencies = [ @@ -49764,10 +49208,9 @@ in ]; }) sources."snyk-mvn-plugin-1.2.0" - (sources."snyk-nuget-plugin-1.6.3" // { + (sources."snyk-nuget-plugin-1.6.4" // { dependencies = [ sources."debug-3.1.0" - sources."es6-promise-4.2.4" ]; }) (sources."snyk-php-plugin-1.5.1" // { @@ -49780,7 +49223,7 @@ in sources."debug-3.1.0" ]; }) - sources."snyk-python-plugin-1.8.0" + sources."snyk-python-plugin-1.8.1" (sources."snyk-resolve-1.0.1" // { dependencies = [ sources."debug-3.1.0" @@ -49791,7 +49234,11 @@ in sources."debug-3.1.0" ]; }) - sources."snyk-sbt-plugin-1.3.0" + (sources."snyk-sbt-plugin-1.3.1" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."snyk-tree-1.0.0" (sources."snyk-try-require-1.3.1" // { dependencies = [ @@ -49928,7 +49375,7 @@ in sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" sources."watchpack-1.5.0" sources."wcwidth-1.0.1" @@ -50009,10 +49456,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.9.2"; + version = "1.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.9.2.tgz"; - sha1 = "7666c6db0fed8dc090ae0dce11a8a28b1d82e391"; + url = "https://registry.npmjs.org/yarn/-/yarn-1.9.4.tgz"; + sha1 = "3b82d8446b652775723900b470d966861976924b"; }; buildInputs = globalBuildInputs; meta = { @@ -50059,7 +49506,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.1" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -50204,7 +49651,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-3.0.0" + sources."external-editor-3.0.1" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -50280,7 +49727,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-6.0.0" + sources."inquirer-6.1.0" (sources."insight-0.10.1" // { dependencies = [ sources."chardet-0.4.2" @@ -50700,7 +50147,7 @@ in sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" sources."vinyl-1.2.0" (sources."vinyl-file-2.0.0" // { diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index aeb940fc4fb..9da19d2b718 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -58,13 +58,13 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; - "@types/node-10.5.5" = { + "@types/node-10.5.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.5.5"; + version = "10.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.5.tgz"; - sha512 = "6Qnb1gXbp3g1JX9QVJj3A6ORzc9XCyhokxUKaoonHgNXcQhmk8adhotxfkeK8El9TnFeUuH72yI6jQ5nDJKS6w=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.7.tgz"; + sha512 = "VkKcfuitP+Nc/TaTFH0B8qNmn+6NbI6crLkQonbedViVz7O2w8QV/GERPlkJ4bg42VGHiEWa31CoTOPs1q6z1w=="; }; }; "@types/superagent-3.5.6" = { @@ -112,15 +112,6 @@ let sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; }; }; - "ajv-4.11.8" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; - sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; - }; - }; "ajv-5.5.2" = { name = "ajv"; packageName = "ajv"; @@ -427,15 +418,6 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; - }; - }; "assert-plus-1.0.0" = { name = "assert-plus"; packageName = "assert-plus"; @@ -535,15 +517,6 @@ let sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4"; }; }; - "aws-sign2-0.6.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; - }; - }; "aws-sign2-0.7.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -553,13 +526,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.7.0" = { + "aws4-1.8.0" = { name = "aws4"; packageName = "aws4"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; - sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; }; }; "balanced-match-1.0.0" = { @@ -706,15 +679,6 @@ let sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; }; }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; - }; - }; "boxen-1.3.0" = { name = "boxen"; packageName = "boxen"; @@ -1300,13 +1264,13 @@ let sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; }; }; - "commander-2.16.0" = { + "commander-2.17.1" = { name = "commander"; packageName = "commander"; - version = "2.16.0"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz"; - sha512 = "sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew=="; + url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"; + sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; }; }; "commander-2.3.0" = { @@ -1507,15 +1471,6 @@ let sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; }; }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; - }; - }; "crypto-random-string-1.0.0" = { name = "crypto-random-string"; packageName = "crypto-random-string"; @@ -1588,13 +1543,13 @@ let sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; - "dat-dns-3.0.1" = { + "dat-dns-3.0.2" = { name = "dat-dns"; packageName = "dat-dns"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.0.1.tgz"; - sha512 = "OBolbMJNk7Uknw8po7Yv4XGNewH6VbuPQNrcf57EwtvgR8ScNUBDporU+DiCXYh2F7GwOcsCyVkSb++guR+OoA=="; + url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.0.2.tgz"; + sha512 = "TqkWQ03NvdLK9Rm9n11UCy59KnIsu82A0lPQYcMG02pYTU4xTxShzDryGO2orvmcT5063olmI1R9vKil0jw0Lw=="; }; }; "dat-doctor-2.0.0" = { @@ -1660,13 +1615,13 @@ let sha512 = "oK6R74WV8TdhGR9VCLym7D/vlN8lXND5AyhJhrjtm1WNDrg/6Clx1Tk7k3Dt8quy2AmmGO7vbIk7iwFtzTAJfA=="; }; }; - "dat-node-3.5.11" = { + "dat-node-3.5.12" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.11"; + version = "3.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.11.tgz"; - sha512 = "8vDc4XwOtOdZgtw/YSb5k/8KIu0+jByaZCsWv5gY5RbrnCouh0Qa7CvIWezZyl0FFke5LIvHuzme2iRiEYIdOw=="; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.12.tgz"; + sha512 = "XYxdkeNYk8gM6nb125XrOQKAXLZlICLYZUk7bZAktpQUrSjAQnc9qPY2a/KCvHSbdoJf//PwyB00K0UiBTqawQ=="; }; }; "dat-registry-4.0.0" = { @@ -2299,13 +2254,13 @@ let sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A=="; }; }; - "external-editor-3.0.0" = { + "external-editor-3.0.1" = { name = "external-editor"; packageName = "external-editor"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.0.tgz"; - sha512 = "mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ=="; + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.1.tgz"; + sha512 = "e1neqvSt5pSwQcFnYc6yfGuJD2Q4336cdbHs5VeUO0zTkqPbrHMyw2q1r47fpfLWbvIG8H8A6YO3sck7upTV6Q=="; }; }; "extglob-0.3.2" = { @@ -2542,15 +2497,6 @@ let sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577"; }; }; - "form-data-2.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; - sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; - }; - }; "form-data-2.3.2" = { name = "form-data"; packageName = "form-data"; @@ -2893,15 +2839,6 @@ let sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; }; }; - "har-schema-1.0.5" = { - name = "har-schema"; - packageName = "har-schema"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; - }; - }; "har-schema-2.0.0" = { name = "har-schema"; packageName = "har-schema"; @@ -2911,15 +2848,6 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; - }; - }; "har-validator-5.0.3" = { name = "har-validator"; packageName = "har-validator"; @@ -3019,15 +2947,6 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; - }; - }; "he-1.1.1" = { name = "he"; packageName = "he"; @@ -3037,15 +2956,6 @@ let sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; }; }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; - }; - }; "http-errors-1.6.3" = { name = "http-errors"; packageName = "http-errors"; @@ -3064,15 +2974,6 @@ let sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; - "http-signature-1.1.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; - }; - }; "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; @@ -3118,13 +3019,13 @@ let sha512 = "LTgbsJ+9ZrdQfLaXXc01kQMttaicHhSOtUM3v/k7ORwXJziqQ2eMQ80+8Tfg67ja+w6zrdl5HYOK+mnlwQpCww=="; }; }; - "hyperdrive-http-4.3.2" = { + "hyperdrive-http-4.3.3" = { name = "hyperdrive-http"; packageName = "hyperdrive-http"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.3.2.tgz"; - sha512 = "dVEtiPiaoR0BNtO8SBvBqRJQMVMV1zzXLIWBBGjVefhISfybfyOBuGi7xzhGnHj+4oK7E8Wwt2Bo5W/J5ecpIg=="; + url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.3.3.tgz"; + sha512 = "YRAjbCCRefLK9EMcgDXRgDx/sZksWf85iLtGl9JMVrzFSIfUx0//DpUJ6k0m0eG4KHJJM+dBwORxFPNi29EQHg=="; }; }; "hyperdrive-network-speed-2.1.0" = { @@ -3253,13 +3154,13 @@ let sha512 = "h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ=="; }; }; - "inquirer-6.0.0" = { + "inquirer-6.1.0" = { name = "inquirer"; packageName = "inquirer"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-6.0.0.tgz"; - sha512 = "tISQWRwtcAgrz+SHPhTH7d3e73k31gsOy6i1csonLc0u1dVK/wYvuOnFeiWqC5OXFIYbmrIFInef31wbT8MEJg=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.1.0.tgz"; + sha512 = "f9K2MMx/G/AVmJSaZg2a+GVLRRmTdlGLbwxsibNd6yNTxXujqxPypjCnxnC0y4+Wb/rNY5KyKuq06AO5jrE+7w=="; }; }; "inspect-custom-symbol-1.1.0" = { @@ -3829,15 +3730,6 @@ let sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; }; }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; - }; - }; "json-stringify-safe-5.0.1" = { name = "json-stringify-safe"; packageName = "json-stringify-safe"; @@ -3856,15 +3748,6 @@ let sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; - }; - }; "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; @@ -4918,13 +4801,13 @@ let sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; }; }; - "neat-input-1.7.0" = { + "neat-input-1.8.0" = { name = "neat-input"; packageName = "neat-input"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/neat-input/-/neat-input-1.7.0.tgz"; - sha512 = "oPAF9Js5IVPL6eYxn4vE4mwSuqEKTODnlcWHyv7/BW5RXaRs7QOmjp2eOp2KQ/vLuo3UoEsFcezrfHwSrec+2g=="; + url = "https://registry.npmjs.org/neat-input/-/neat-input-1.8.0.tgz"; + sha512 = "9LsyX7NcQBOT0/VEthxOCpYlKXgo0UZeGlMSx/a2SKFkE4ZiU/wTUBoF9brQKtKspmBZyLnXqDiktsbopEb0Tg=="; }; }; "neat-log-2.4.0" = { @@ -4954,13 +4837,13 @@ let sha512 = "U8HkIv90/lrdNlHVp63PoF3FeuQUvJ6toMX6InqRqpBmQq9iukZRAnq/yCE4Ii6WHZRYa6DEiTH/EGFTZ0rIGg=="; }; }; - "needle-2.2.1" = { + "needle-2.2.2" = { name = "needle"; packageName = "needle"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz"; - sha512 = "t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q=="; + url = "https://registry.npmjs.org/needle/-/needle-2.2.2.tgz"; + sha512 = "mW7W8dKuVYefCpNzE3Z7xUmPI9wSrSL/1qH31YGMxmSOAnjatS3S9Zv3cmiHrhx3Jkp1SrWWBdOFXjfF48Uq3A=="; }; }; "nets-3.2.0" = { @@ -5044,13 +4927,13 @@ let sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; }; }; - "npm-bundled-1.0.3" = { + "npm-bundled-1.0.4" = { name = "npm-bundled"; packageName = "npm-bundled"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz"; - sha512 = "ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow=="; + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.4.tgz"; + sha512 = "FLIrRxfuX2EOA9krlthXp8lyFR5vW21zNu6ORrfWGD5ZYWTqx3tOCUwsPUSuzPdUBLxLD7bwPkG3YfgWSfqOtg=="; }; }; "npm-conf-1.1.3" = { @@ -5350,13 +5233,13 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "path-loader-1.0.4" = { + "path-loader-1.0.6" = { name = "path-loader"; packageName = "path-loader"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz"; - sha512 = "k/IPo9OWyofATP5gwIehHHQoFShS37zsSIsejKe6fjI+tqK+FnRpiSg4ZfWUpxb0g2PfCreWPqBD4ayjqjqkdQ=="; + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.6.tgz"; + sha512 = "vAtndQsgWS0s2JOjT+NWtJyP5Gc940SlQQ55j0+qSj/SJQ4dmt/L8gLeW9wJF0rM32qEts+3NDvKjs6TUxwFtg=="; }; }; "path-to-regexp-1.7.0" = { @@ -5386,15 +5269,6 @@ let sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; - "performance-now-0.2.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; - }; - }; "performance-now-2.1.0" = { name = "performance-now"; packageName = "performance-now"; @@ -5647,15 +5521,6 @@ let sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; - "qs-6.4.0" = { - name = "qs"; - packageName = "qs"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; - }; - }; "qs-6.5.2" = { name = "qs"; packageName = "qs"; @@ -5710,13 +5575,13 @@ let sha512 = "pdS9Mcb9TB7oICypPRALlheaSuszuAKmLVEPKJMuYor7R/zDuHh5ALuQoS+ox31XRwQUL+tDwWH2GPdyspwelA=="; }; }; - "randomatic-3.0.0" = { + "randomatic-3.1.0" = { name = "randomatic"; packageName = "randomatic"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz"; - sha512 = "VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA=="; + url = "https://registry.npmjs.org/randomatic/-/randomatic-3.1.0.tgz"; + sha512 = "KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ=="; }; }; "randombytes-2.0.6" = { @@ -5917,15 +5782,6 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "request-2.81.0" = { - name = "request"; - packageName = "request"; - version = "2.81.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; - }; - }; "request-2.87.0" = { name = "request"; packageName = "request"; @@ -6358,15 +6214,6 @@ let sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - }; "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -6376,13 +6223,13 @@ let sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA=="; }; }; - "sodium-native-2.1.6" = { + "sodium-native-2.2.1" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.1.6"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz"; - sha512 = "vfovcNlU8C93SbeNoGSAdW5zVOTlrh1sTy+TzdC2FhDTE/IUK6j4ML5gdr/qziLz4XRT4EQWJvbFzql6CAAH/A=="; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.2.1.tgz"; + sha512 = "3CfftYV2ATXQFMIkLOvcNUk/Ma+lran0855j5Z/HEjUkSTzjLZi16CK362udOoNVrwn/TwGV8bKEt5OylsFrQA=="; }; }; "sodium-universal-2.0.0" = { @@ -6673,15 +6520,6 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; - "stringstream-0.0.6" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz"; - sha512 = "87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA=="; - }; - }; "strip-ansi-3.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -7763,7 +7601,7 @@ in }) sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" - sources."@types/node-10.5.5" + sources."@types/node-10.5.7" sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -7925,7 +7763,7 @@ in sources."asynckit-0.4.0" sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bencode-1.0.0" @@ -7977,7 +7815,7 @@ in sources."crypto-random-string-1.0.0" sources."cycle-1.0.3" sources."dashdash-1.14.1" - (sources."dat-dns-3.0.1" // { + (sources."dat-dns-3.0.2" // { dependencies = [ sources."debug-2.6.9" ]; @@ -7992,7 +7830,7 @@ in }) sources."dat-link-resolve-2.2.0" sources."dat-log-1.2.0" - sources."dat-node-3.5.11" + sources."dat-node-3.5.12" sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.1" sources."dat-storage-1.0.4" @@ -8073,7 +7911,7 @@ in ]; }) sources."hyperdrive-9.14.0" - sources."hyperdrive-http-4.3.2" + sources."hyperdrive-http-4.3.3" sources."hyperdrive-network-speed-2.1.0" sources."i-0.3.6" sources."import-lazy-2.1.0" @@ -8167,7 +8005,7 @@ in sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" sources."ncp-1.0.1" - sources."neat-input-1.7.0" + sources."neat-input-1.8.0" sources."neat-log-2.4.0" sources."neat-spinner-1.0.0" sources."neat-tasks-1.1.1" @@ -8210,7 +8048,7 @@ in sources."random-access-file-2.0.1" sources."random-access-memory-3.0.0" sources."random-access-storage-1.3.0" - (sources."randomatic-3.0.0" // { + (sources."randomatic-3.1.0" // { dependencies = [ sources."is-number-4.0.0" sources."kind-of-6.0.2" @@ -8249,7 +8087,7 @@ in sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" sources."sodium-javascript-0.5.5" - sources."sodium-native-2.1.6" + sources."sodium-native-2.2.1" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.2.0" sources."sorted-indexof-1.0.0" @@ -8434,26 +8272,25 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz"; - sha512 = "qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz"; + sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-4.11.8" + sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."asn1-0.2.4" - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" sources."asynckit-0.4.0" - sources."aws-sign2-0.6.0" - sources."aws4-1.7.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" - sources."boom-2.10.1" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" @@ -8462,35 +8299,26 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."cryptiles-2.0.5" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" + sources."form-data-2.3.2" sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."gauge-2.7.4" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."glob-7.1.2" sources."graceful-fs-4.1.11" - sources."har-schema-1.0.5" - sources."har-validator-4.2.1" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" sources."has-unicode-2.0.1" - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" + sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-fullwidth-code-point-1.0.0" @@ -8500,14 +8328,9 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-stable-stringify-1.0.1" + sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" - sources."jsonify-0.0.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."jsprim-1.4.1" sources."mime-db-1.35.0" sources."mime-types-2.1.19" sources."minimatch-3.0.4" @@ -8523,27 +8346,21 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" - sources."qs-6.4.0" + sources."qs-6.5.2" sources."readable-stream-2.3.6" - sources."request-2.81.0" + sources."request-2.87.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sntp-1.0.9" - (sources."sshpk-1.14.2" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."sshpk-1.14.2" sources."string-width-1.0.2" sources."string_decoder-1.1.1" - sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" sources."tar-2.2.1" sources."tough-cookie-2.3.4" @@ -8551,11 +8368,7 @@ in sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."which-1.3.1" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -8563,7 +8376,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Node.js native addon build tool"; - homepage = https://github.com/nodejs/node-gyp; + homepage = "https://github.com/nodejs/node-gyp#readme"; license = "MIT"; }; production = true; @@ -8628,9 +8441,9 @@ in sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."needle-2.2.1" + sources."needle-2.2.2" sources."nopt-4.0.1" - sources."npm-bundled-1.0.3" + sources."npm-bundled-1.0.4" sources."npm-packlist-1.1.11" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -8676,10 +8489,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.12.2"; + version = "2.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.12.2.tgz"; - sha1 = "1b575512ae27d767f4aaec14e94b18e0c70bcc7b"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.1.tgz"; + sha512 = "xwIluOOA+GV6Rz5jvVS2hcGlrqjEWaaU7/PUECdG8H/Eo9I4xban/XhedQ8jIrqt1P7KLDV0/+ENlmYusdL/Zw=="; }; buildInputs = globalBuildInputs; meta = { @@ -8779,7 +8592,7 @@ in sources."async-2.6.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" @@ -8816,7 +8629,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."concat-map-0.0.1" sources."config-chain-1.1.11" sources."consolidate-0.14.5" @@ -8849,7 +8662,7 @@ in sources."esprima-4.0.1" sources."extend-3.0.2" sources."extend-shallow-2.0.1" - sources."external-editor-3.0.0" + sources."external-editor-3.0.1" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -8894,7 +8707,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-6.0.0" + sources."inquirer-6.1.0" sources."is-3.2.1" sources."is-buffer-1.1.6" sources."is-extendable-0.1.1" @@ -9162,7 +8975,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."commander-2.17.1" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -9459,7 +9272,7 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - (sources."path-loader-1.0.4" // { + (sources."path-loader-1.0.6" // { dependencies = [ sources."debug-3.1.0" sources."qs-6.5.2" From 750dc39116dc8b76696836112e8935c7f75ac243 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Fri, 10 Aug 2018 21:28:53 +0200 Subject: [PATCH 031/258] mpvScripts.mpris: 0.1 -> 0.2 --- pkgs/applications/video/mpv/scripts/mpris.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index e98ba9bdc3f..c72714598d6 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mpv-mpris-${version}.so"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "hoyon"; repo = "mpv-mpris"; - rev = "v${version}"; - sha256 = "0rsbrbv5q7vki59wdlx4cdkd0vvd79qgbjvdb3fn3li7aznvjwiy"; + rev = version; + sha256 = "06hq3j1jjlaaz9ss5l7illxz8vm5bng86jl24kawglwkqayhdnjx"; }; nativeBuildInputs = [ pkgconfig ]; From fb15f208454e6721d598553a6d0fb9761c693ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Lang?= Date: Fri, 10 Aug 2018 16:47:16 -0300 Subject: [PATCH 032/258] checksec: switch to binutils-unwrapped checksec needs the readelf command to work properly, which is contained in the binutils-unwrapped derivation but not in the normal binutils. Before this commit, this tool wasn't working due to that. --- pkgs/os-specific/linux/checksec/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index a8ffb133a90..6c927ae93af 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, findutils, binutils, glibc, coreutils, sysctl }: +{ stdenv, fetchurl, file, findutils, binutils-unwrapped, glibc, coreutils, sysctl }: stdenv.mkDerivation rec { name = "checksec-${version}"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $" substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file" - substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils.out}/bin/readelf -" - substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils.out}/bin/readelf -" - substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils.out}/bin/readelf" + substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils-unwrapped}/bin/readelf -" + substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils-unwrapped}/bin/readelf -" + substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils-unwrapped}/bin/readelf" substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${sysctl}/bin/sysctl -" substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -" ''; From f4f488de21c971c1280fff11b8fe217fa8ad015e Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 11 Aug 2018 13:50:43 +0200 Subject: [PATCH 033/258] ldc: 1.8.0 -> 1.10.0 Disabled tests on Darwin for now --- pkgs/development/compilers/ldc/default.nix | 106 +++++++++++---------- 1 file changed, 58 insertions(+), 48 deletions(-) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index dc6a933a934..bb364930218 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -2,8 +2,8 @@ , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, targetPackages , bootstrapVersion ? false -, version ? "1.8.0" -, ldcSha256 ? "0zswjlibj8zcdj06nn09jjhbd99chsa5f4kps8xifzgrpgsa28g4" +, version ? "1.10.0" +, ldcSha256 ? "0wc3vlblsz4qdwa9ay9plv9nvfd07zj2byqqffaa4a5gvjwf5dlr" }: let @@ -155,7 +155,10 @@ let makeFlags = [ "DMD=$DMD" ]; - doCheck = true; + # Disable tests on Darwin for now because of + # https://github.com/NixOS/nixpkgs/issues/41099 + # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 + doCheck = !bootstrapVersion && !stdenv.hostPlatform.isDarwin; checkPhase = '' # Build and run LDC D unittests. @@ -184,65 +187,72 @@ let # Need to test Phobos in a fixed-output derivation, otherwise the # network stuff in Phobos would fail if sandbox mode is enabled. - ldcUnittests = stdenv.mkDerivation rec { - name = "ldcUnittests-${version}"; + # + # Disable tests on Darwin for now because of + # https://github.com/NixOS/nixpkgs/issues/41099 + # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 + ldcUnittests = if (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) then + stdenv.mkDerivation rec { + name = "ldcUnittests-${version}"; - enableParallelBuilding = ldcBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = ldcBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; + enableParallelBuilding = ldcBuild.enableParallelBuilding; + preferLocalBuild = true; + inputString = ldcBuild.outPath; + outputHashAlgo = "sha256"; + outputHash = builtins.hashString "sha256" inputString; - src = ldcBuild.src; + src = ldcBuild.src; - postUnpack = ldcBuild.postUnpack; + postUnpack = ldcBuild.postUnpack; - postPatch = ldcBuild.postPatch; + postPatch = ldcBuild.postPatch; - nativeBuildInputs = ldcBuild.nativeBuildInputs + nativeBuildInputs = ldcBuild.nativeBuildInputs - ++ [ - ldcBuild - ]; + ++ [ + ldcBuild + ]; - buildInputs = ldcBuild.buildInputs; + buildInputs = ldcBuild.buildInputs; - preConfigure = '' - cmakeFlagsArray=( "-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc" - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_SKIP_RPATH=ON" - "-DBUILD_SHARED_LIBS=OFF" - "-DLDC_WITH_LLD=OFF" - # Xcode 9.0.1 fixes that bug according to ldc release notes - "-DRT_ARCHIVE_WITH_LDC=OFF" - "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2" - ) - ''; + preConfigure = '' + cmakeFlagsArray=( "-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_SKIP_RPATH=ON" + "-DBUILD_SHARED_LIBS=OFF" + "-DLDC_WITH_LLD=OFF" + # Xcode 9.0.1 fixes that bug according to ldc release notes + "-DRT_ARCHIVE_WITH_LDC=OFF" + "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2" + ) + ''; - postConfigure = ldcBuild.postConfigure; + postConfigure = ldcBuild.postConfigure; - makeFlags = ldcBuild.makeFlags; + makeFlags = ldcBuild.makeFlags; - buildCmd = if bootstrapVersion then - "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\"" - else - "make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug"; + buildCmd = if bootstrapVersion then + "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\"" + else + "make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug"; - testCmd = if bootstrapVersion then - "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\"" - else - "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\""; + testCmd = if bootstrapVersion then + "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\"" + else + "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\""; - buildPhase = '' - ${buildCmd} - ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2 - ${testCmd} - ''; + buildPhase = '' + ${buildCmd} + ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2 + ${testCmd} + ''; - installPhase = '' - echo -n $inputString > $out - ''; - }; + installPhase = '' + echo -n $inputString > $out + ''; + } + else + ""; in From 4beb94d6d6b7cf1829c27b1fd52d43707fbc1844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 Aug 2018 16:42:43 +0200 Subject: [PATCH 034/258] python/grpcio: fix darwin build grpcio currently does not build on Darwin (10.13.6). Due to the following issues: * ar is invoked with incorrect flags (#33765). * libtool cannot be found, with a libtool dependency, with libtool the option '-no_warning_for_no_symbols' is not recognized. * the module build cannot find boringssl that is packaged with python-grpcio when pkgconfig is not installed (grpc/#10058). --- pkgs/development/python-modules/grpcio/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 1846c7bcd89..204080fe115 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,6 +1,7 @@ -{ stdenv, buildPythonPackage, fetchPypi, lib -, six, protobuf, enum34, futures, isPy27, isPy34 }: +{ stdenv, buildPythonPackage, fetchPypi, lib, darwin +, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig }: +with stdenv.lib; buildPythonPackage rec { pname = "grpcio"; version = "1.13.0"; @@ -10,10 +11,14 @@ buildPythonPackage rec { sha256 = "6324581e215157f0fbe335dff2e21a65b4406db98ac7cca05f1e23b4f510b426"; }; + nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools; + propagatedBuildInputs = [ six protobuf ] ++ lib.optionals (isPy27 || isPy34) [ enum34 ] ++ lib.optionals (isPy27) [ futures ]; + preBuild = optionalString stdenv.isDarwin "unset AR"; + meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; license = lib.licenses.asl20; From 643d9a08ef4abedde135dcd9a21096ebf45d2044 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 11 Aug 2018 13:48:04 +0200 Subject: [PATCH 035/258] dmd: 2.079.1 -> 2.081.1 Needed to switch to ldc as bootstrap compiler to fix the compilation --- pkgs/development/compilers/dmd/default.nix | 164 ++++++--------------- 1 file changed, 46 insertions(+), 118 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index b391b6eb845..1e9e62efb63 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,34 +1,15 @@ -{ stdenv, fetchFromGitHub, overrideCC, gcc5 +{ stdenv, fetchFromGitHub , makeWrapper, unzip, which , curl, tzdata, gdb, darwin -, callPackage, targetPackages -, bootstrapVersion ? false -, version ? "2.079.1" -, dmdSha256 ? "0mlk095aw94d940qkymfp85daggiz3f0xv598nlc7acgp6408kyj" -, druntimeSha256 ? "18r8gwvb54ar80j5155wx0qbqq4w56hqmbf6wap20xwijg2rw90g" -, phobosSha256 ? "1x5v1ln51nr8x2vyki864160bakdyq0acmvbfv7jcipaj2w3m9bb" +, callPackage, targetPackages, ldc +, version ? "2.081.1" +, dmdSha256 ? "1xdz7p0pdzwkn57ai93mavgdkd8xb1sr2brlc6y3c12x84h43s8z" +, druntimeSha256 ? "1vl8ag6rjvqqmc5bn5jk3yfynjb9ggy3hw1awwl7c76bq4f7nbif" +, phobosSha256 ? "0h1jdc3yai1l42bxjdlyi9hf9qadh76v925rjk2q4ibv2fzl56b7" }: let - bootstrapDmd = if !bootstrapVersion then - # Versions 2.070.2 and up require a working dmd compiler to build so we just - # use the last dmd without any D code to bootstrap the actual build. - callPackage ./default.nix { - stdenv = if stdenv.hostPlatform.isDarwin then - stdenv - else - # Doesn't build with gcc6 on linux - overrideCC stdenv gcc5; - bootstrapVersion = true; - version = "2.067.1"; - dmdSha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz"; - druntimeSha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02"; - phobosSha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1"; - } - else - ""; - dmdBuild = stdenv.mkDerivation rec { name = "dmdBuild-${version}"; inherit version; @@ -74,11 +55,6 @@ let usePIC = "-fPIC"; ROOT_HOME_DIR = "$(echo ~root)"; - datetimePath = if bootstrapVersion then - "phobos/std/datetime.d" - else - "phobos/std/datetime/timezone.d"; - phobosPatches = '' # Ugly hack so the dlopen call has a chance to succeed. # https://issues.dlang.org/show_bug.cgi?id=15391 @@ -89,77 +65,24 @@ let substituteInPlace phobos/posix.mak \ --replace "-soname=libcurl.so.4" "-soname=${curl.out}/lib/libcurl.so.4" - '' - - + stdenv.lib.optionalString (!bootstrapVersion) '' - # Can be removed when https://github.com/dlang/phobos/pull/6224 is included. - substituteInPlace ${datetimePath} \ - --replace "foreach (DirEntry de; dirEntries(tzDatabaseDir, SpanMode.depth))" "import std.path : baseName; foreach (DirEntry de; dirEntries(tzDatabaseDir, SpanMode.depth))" - - substituteInPlace ${datetimePath} \ - --replace "tzName == \"leapseconds\"" "baseName(tzName) == \"leapseconds\"" - '' - - + stdenv.lib.optionalString (bootstrapVersion) '' - substituteInPlace ${datetimePath} \ - --replace "import std.traits;" "import std.traits;import std.path;" - - substituteInPlace ${datetimePath} \ - --replace "tzName == \"+VERSION\"" "baseName(tzName) == \"leapseconds\" || tzName == \"+VERSION\"" - - # Ugly hack to fix the hardcoded path to zoneinfo in the source file. - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace ${datetimePath} \ - --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ - '' - - + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isLinux) '' - # See https://github.com/dlang/phobos/pull/5960 - substituteInPlace phobos/std/path.d \ - --replace "\"/root" "\"${ROOT_HOME_DIR}" ''; - dmdPath = if bootstrapVersion then - "dmd/src" - else - "dmd"; - postPatch = '' - '' - - + stdenv.lib.optionalString (!bootstrapVersion) '' substituteInPlace druntime/test/common.mak \ --replace "DFLAGS:=" "DFLAGS:=${usePIC} " - '' - + stdenv.lib.optionalString (bootstrapVersion) '' - # Use proper C++ compiler - substituteInPlace ${dmdPath}/posix.mak \ - --replace g++ $CXX + substituteInPlace dmd/src/posix.mak \ + --replace "DFLAGS :=" "DFLAGS += -link-defaultlib-shared=false" '' + phobosPatches - + stdenv.lib.optionalString (stdenv.hostPlatform.isLinux && bootstrapVersion) '' - substituteInPlace ${dmdPath}/root/port.c \ - --replace "#include " "#include " - - substituteInPlace ${dmdPath}/root/port.c \ - --replace "#include " "#include " - '' - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace ${dmdPath}/posix.mak \ + substituteInPlace dmd/posix.mak \ --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ - '' - - + stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin && bootstrapVersion) '' - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - substituteInPlace ${dmdPath}/root/port.c --replace __inline_isnanl __inline_isnan ''; - nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which gdb ] + nativeBuildInputs = [ ldc makeWrapper unzip which gdb ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Foundation @@ -173,23 +96,22 @@ let else stdenv.hostPlatform.parsed.kernel.name; top = "$(echo $NIX_BUILD_TOP)"; - pathToDmd = if bootstrapVersion then - "${top}/dmd/src/dmd" - else - "${top}/dmd/generated/${osname}/release/${bits}/dmd"; + pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd"; # Buid and install are based on http://wiki.dlang.org/Building_DMD buildPhase = '' cd dmd - make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out + make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2 cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} + make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} cd ../phobos - make -j$NIX_BUILD_CORES -f posix.mak PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/ + make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/ cd .. ''; - doCheck = !bootstrapVersion; + # Disable tests on Darwin for now because of + # https://github.com/NixOS/nixpkgs/issues/41099 + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' cd dmd @@ -198,9 +120,9 @@ let make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release cd .. ''; - - extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; + extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; + dontStrip = true; installPhase = '' @@ -250,34 +172,40 @@ let # Need to test Phobos in a fixed-output derivation, otherwise the # network stuff in Phobos would fail if sandbox mode is enabled. - phobosUnittests = stdenv.mkDerivation rec { - name = "phobosUnittests-${version}"; - version = dmdBuild.version; + # + # Disable tests on Darwin for now because of + # https://github.com/NixOS/nixpkgs/issues/41099 + phobosUnittests = if !stdenv.hostPlatform.isDarwin then + stdenv.mkDerivation rec { + name = "phobosUnittests-${version}"; + version = dmdBuild.version; - enableParallelBuilding = dmdBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = dmdBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; + enableParallelBuilding = dmdBuild.enableParallelBuilding; + preferLocalBuild = true; + inputString = dmdBuild.outPath; + outputHashAlgo = "sha256"; + outputHash = builtins.hashString "sha256" inputString; - srcs = dmdBuild.srcs; + srcs = dmdBuild.srcs; - sourceRoot = "."; + sourceRoot = "."; - postPatch = dmdBuild.phobosPatches; + postPatch = dmdBuild.phobosPatches; - nativeBuildInputs = dmdBuild.nativeBuildInputs; - buildInputs = dmdBuild.buildInputs; + nativeBuildInputs = dmdBuild.nativeBuildInputs; + buildInputs = dmdBuild.buildInputs; - buildPhase = '' - cd phobos - make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${dmdBuild}/bin/dmd BUILD=release TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/ - ''; + buildPhase = '' + cd phobos + make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${dmdBuild}/bin/dmd TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/ + ''; - installPhase = '' - echo -n $inputString > $out - ''; - }; + installPhase = '' + echo -n $inputString > $out + ''; + } + else + ""; in From 6301b09eaa29a2a3eec635620f29593b6a4a1304 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 11 Aug 2018 15:11:02 +0200 Subject: [PATCH 036/258] dtools: 2.079.1 -> 2.081.1 --- pkgs/development/tools/dtools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index bc29fe2cbcf..0cbb753fbf5 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.079.1"; + version = "2.081.1"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "0mlk095aw94d940qkymfp85daggiz3f0xv598nlc7acgp6408kyj"; + sha256 = "1xdz7p0pdzwkn57ai93mavgdkd8xb1sr2brlc6y3c12x84h43s8z"; name = "dmd"; }) (fetchFromGitHub { owner = "dlang"; repo = "tools"; rev = "v${version}"; - sha256 = "0fvpfwh3bh3fymrmis3n39x9hkfklmv81lrlqcyl8fmmk694yvad"; + sha256 = "1sbcfj8r1nvy7ynh9dy55q9bvfvxwf1z3llpxckvi8p6yvf35qn2"; name = "dtools"; }) ]; From c685f15dc2a7e0c0999f9da91ae9b327546bfa19 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 11 Aug 2018 15:25:01 +0200 Subject: [PATCH 037/258] dub: 1.8.1 -> 1.10.0 --- .../tools/build-managers/dub/default.nix | 67 ++++++++++--------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index b9a8c97bd5e..11461fc6952 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -4,7 +4,7 @@ let dubBuild = stdenv.mkDerivation rec { name = "dubBuild-${version}"; - version = "1.8.1"; + version = "1.10.0"; enableParallelBuilding = true; @@ -12,7 +12,7 @@ let owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "16r7x4jsfv5fjssvs6mwj8ymr6fjpvbkjhpr4f4368sjr5iyfad6"; + sha256 = "02xxpfcjs427jqbwz0vh5vl3bh62ys65zmi9gpa3svzqffyx13n4"; }; postUnpack = '' @@ -51,40 +51,45 @@ let # Need to test in a fixed-output derivation, otherwise the # network tests would fail if sandbox mode is enabled. - dubUnittests = stdenv.mkDerivation rec { - name = "dubUnittests-${version}"; - version = dubBuild.version; + # Disable tests on Darwin for now because they don't work + # reliably there. + dubUnittests = if !stdenv.hostPlatform.isDarwin then + stdenv.mkDerivation rec { + name = "dubUnittests-${version}"; + version = dubBuild.version; - enableParallelBuilding = dubBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = dubBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; + enableParallelBuilding = dubBuild.enableParallelBuilding; + preferLocalBuild = true; + inputString = dubBuild.outPath; + outputHashAlgo = "sha256"; + outputHash = builtins.hashString "sha256" inputString; - src = dubBuild.src; - - postUnpack = dubBuild.postUnpack; - postPatch = dubBuild.postPatch; + src = dubBuild.src; + + postUnpack = dubBuild.postUnpack; + postPatch = dubBuild.postPatch; - nativeBuildInputs = dubBuild.nativeBuildInputs; - buildInputs = dubBuild.buildInputs; + nativeBuildInputs = dubBuild.nativeBuildInputs; + buildInputs = dubBuild.buildInputs; - buildPhase = '' - # Can't use dub from dubBuild directly because one unittest - # (issue895-local-configuration) needs to generate a config - # file under ../etc relative to the dub location. - cp ${dubBuild}/bin/dub bin/ - export DUB=$NIX_BUILD_TOP/source/bin/dub - export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ - export DC=${dmd.out}/bin/dmd - export HOME=$TMP - ./test/run-unittest.sh - ''; + buildPhase = '' + # Can't use dub from dubBuild directly because one unittest + # (issue895-local-configuration) needs to generate a config + # file under ../etc relative to the dub location. + cp ${dubBuild}/bin/dub bin/ + export DUB=$NIX_BUILD_TOP/source/bin/dub + export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ + export DC=${dmd.out}/bin/dmd + export HOME=$TMP + ./test/run-unittest.sh + ''; - installPhase = '' - echo -n $inputString > $out - ''; - }; + installPhase = '' + echo -n $inputString > $out + ''; + } + else + ""; in From 85c43675d0908ec289fa808047e29356449bd674 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 12 Aug 2018 03:09:50 +0900 Subject: [PATCH 038/258] dcraw: fix build on Darwin --- pkgs/tools/graphics/dcraw/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index dd81c3e4ecc..e4ceff36f92 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libjpeg, lcms2, gettext, jasper }: +{stdenv, fetchurl, libjpeg, lcms2, gettext, jasper, libiconv }: stdenv.mkDerivation rec { name = "dcraw-9.28.0"; @@ -8,15 +8,18 @@ stdenv.mkDerivation rec { sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; buildInputs = [ libjpeg lcms2 gettext jasper ]; patchPhase = '' - sed -i -e s@/usr/local@$out@ install + substituteInPlace install \ + --replace 'prefix=/usr/local' 'prefix=$out' \ + --replace gcc '$CC' ''; buildPhase = '' mkdir -p $out/bin - sh install + sh -e install ''; meta = { From feee2235b52930511cbba6495b49e8cf8dc557f3 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sun, 12 Aug 2018 13:32:38 +0200 Subject: [PATCH 039/258] firefoxWrapper: Fail if deprecated enableVLC option exists --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index d2e7c59faff..38d59648032 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -43,6 +43,9 @@ let plugins = assert !(jre && icedtea); + if builtins.hasAttr "enableVLC" cfg + then throw "The option \"${browserName}.enableVLC\" has been removed since Firefox no longer supports npapi plugins" + else ([ ] ++ lib.optional enableAdobeFlash flashplayer ++ lib.optional (cfg.enableDjvu or false) (djview4) From 17f098721269ec238c94d83c0f70a4b89a79db08 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 12 Aug 2018 23:30:53 +0200 Subject: [PATCH 040/258] codec2: init at 0.8 --- pkgs/development/libraries/codec2/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/codec2/default.nix diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix new file mode 100644 index 00000000000..9f4c4c3b6b3 --- /dev/null +++ b/pkgs/development/libraries/codec2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchsvn, cmake } : + +let + version = "0.8"; + +in stdenv.mkDerivation { + name = "codec2-${version}"; + + src = fetchsvn { + url = "https://svn.code.sf.net/p/freetel/code/codec2/branches/${version}"; + sha256 = "0qbyaqdn37253s30n6m2ric8nfdsxhkslb9h572kdx18j2yjccki"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Speech codec designed for communications quality speech at low data rates"; + homepage = http://www.rowetel.com/blog/?page_id=452; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ markuskowa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c29238170a4..ed5d4faaf4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1119,6 +1119,8 @@ with pkgs; codesearch = callPackage ../tools/text/codesearch { }; + codec2 = callPackage ../development/libraries/codec2 { }; + contacts = callPackage ../tools/misc/contacts { inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; }; From ed10d7c303db5ac21d36e1e616e0303a639f9f78 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 13 Aug 2018 00:42:15 +0200 Subject: [PATCH 041/258] qradiolink: init at 0.5.0 --- pkgs/applications/misc/qradiolink/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/applications/misc/qradiolink/default.nix diff --git a/pkgs/applications/misc/qradiolink/default.nix b/pkgs/applications/misc/qradiolink/default.nix new file mode 100644 index 00000000000..4029bd80b88 --- /dev/null +++ b/pkgs/applications/misc/qradiolink/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, alsaLib, boost +, qt4, libpulseaudio, codec2, libconfig +, gnuradio, gnuradio-osmosdr, gsm +, libopus, libjpeg, protobuf, qwt, speex +} : + +let + version = "0.5.0"; + +in stdenv.mkDerivation { + name = "qradiolink-${version}"; + + src = fetchFromGitHub { + owner = "kantooon"; + repo = "qradiolink"; + rev = "${version}"; + sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi"; + }; + + preBuild = '' + cd ext + protoc --cpp_out=. Mumble.proto + protoc --cpp_out=. QRadioLink.proto + cd .. + qmake + ''; + + installPhase = '' + mkdir -p $out/bin + cp qradiolink $out/bin + ''; + + buildInputs = [ + qt4 + alsaLib + boost + libpulseaudio + codec2 + libconfig + gsm + gnuradio + gnuradio-osmosdr + libopus + libjpeg + protobuf + speex + qwt + ]; + + meta = with stdenv.lib; { + description = "SDR transceiver application for analog and digital modes"; + homepage = http://qradiolink.org/; + license = licenses.agpl3; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed5d4faaf4e..094b8c5452b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11751,6 +11751,8 @@ with pkgs; lvtk = callPackage ../development/libraries/audio/lvtk { }; + qradiolink = callPackage ../applications/misc/qradiolink { }; + qrupdate = callPackage ../development/libraries/qrupdate { }; resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; From 02353e4a10598202226d4eac6a5174d5cdb282e4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 13 Aug 2018 00:45:46 -0400 Subject: [PATCH 042/258] libplist: 2.0.0 -> 2018-07-25 --- .../libraries/libplist/default.nix | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 8dc64f2c2b5..0d6e3b8db6e 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -1,31 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, swig2, python2Packages, glib }: +{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig, python2Packages, glib }: let inherit (python2Packages) python cython; -in stdenv.mkDerivation rec { - name = "libplist-${version}"; - version = "2.0.0"; +in +stdenv.mkDerivation rec { + pname = "libplist"; + version = "2018-07-25"; - nativeBuildInputs = [ pkgconfig swig2 python cython ]; + name = "${pname}-${version}"; - propagatedBuildInputs = [ glib ]; - - passthru.swig = swig2; + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = "db68a9d1070b363eee93147f072f46526064acbc"; + sha256 = "0lxyb35jjg31m8dxhsv1jr2ccy5s19fsqzisy7lfjk46w7brs4h5"; + }; outputs = ["bin" "dev" "out" "py"]; + nativeBuildInputs = [ + pkgconfig + python + cython + autoreconfHook + ]; + + propagatedBuildInputs = [ glib ]; + postFixup = '' moveToOutput "lib/${python.libPrefix}" "$py" ''; - src = fetchurl { - url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; - sha256 = "00pnh9zf3iwdji2faccns7vagbmbrwbj9a8zp9s53a6rqaa9czis"; - }; - - meta = { - homepage = https://github.com/JonathanBeck/libplist; - platforms = stdenv.lib.platforms.all; + meta = with stdenv.lib; { + description = "A library to handle Apple Property List format in binary or XML"; + homepage = https://github.com/libimobiledevice/libplist; + license = licenses.lgpl21Plus; maintainers = [ ]; + platforms = platforms.linux; }; } From d4d5068557ada12e3e726857e6d915f0dc1b3a31 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 13 Aug 2018 00:46:35 -0400 Subject: [PATCH 043/258] libusbmuxd: 1.0.10 -> 2018-07-23 --- .../libraries/libusbmuxd/default.nix | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index ae53178e88d..08aeba1254e 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -1,25 +1,26 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libplist }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libplist }: stdenv.mkDerivation rec { - name = "libusbmuxd-1.0.10"; - src = fetchurl { - url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; - sha256 = "1wn9zq2224786mdr12c5hxad643d29wg4z6b7jn888jx4s8i78hs"; + pname = "libusbmuxd"; + version = "2018-07-23"; + + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = "78df9be5fc8222ed53846cb553de9b5d24c85c6c"; + sha256 = "05hbn0mbmv5ln9hfsvnf7i1mnp6ncbyfnl5w331kg4fi12wjshc5"; }; - patches = [ - (fetchpatch { - name = "CVE-2016-5104.patch"; - url = "https://github.com/libimobiledevice/libusbmuxd/commit/4397b3376dc4e4cb1c991d0aed61ce6482614196.patch"; - sha256 = "0cl3vys7bkwbdzf64d0rz3zlqpfc30w4l7j49ljv01agh42ywhgk"; - }) - ]; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libplist ]; - meta = { - homepage = http://www.libimobiledevice.org; - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "A client library to multiplex connections from and to iOS devices"; + homepage = https://github.com/libimobiledevice/libusbmuxd; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } From 8842e434777d329e19b5e7a84c4bd72580532d2c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 13 Aug 2018 00:48:23 -0400 Subject: [PATCH 044/258] libimobiledevice: 1.2.0 -> 2018-07-24 --- .../libraries/libimobiledevice/default.nix | 67 ++++++++++++------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index d1b779627c6..f4eafcdaace 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -1,32 +1,46 @@ -{ stdenv, fetchurl, fetchpatch, python2, pkgconfig, usbmuxd, glib, libgcrypt, - libtasn1, libplist, readline, libusbmuxd, openssl }: +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig, gnutls +, libgcrypt, libtasn1, glib, libplist, libusbmuxd }: stdenv.mkDerivation rec { - name = "libimobiledevice-1.2.0"; + pname = "libimobiledevice"; + version = "2018-07-24"; - nativeBuildInputs = [ python2 libplist.swig pkgconfig ]; - buildInputs = [ readline ]; - propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ]; + name = "${pname}-${version}"; - patches = [ - ./disable_sslv3.patch - (fetchpatch { - name = "CVE-2016-5104.patch"; - url = "https://github.com/libimobiledevice/libimobiledevice/commit/df1f5c4d70d0c19ad40072f5246ca457e7f9849e.patch"; - sha256 = "06ygb9aqcvm4v08wrldsddjgyqv5bkpq6lxzq2a1nwqp9mq4a4k1"; - }) - ]; - - postPatch = ''sed -e 's@1\.3\.21@@' -i configure''; - passthru.swig = libplist.swig; - - src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.bz2"; - sha256 = "0dqhy4qwj30mw8pwckvjmgnj1qqrh6p8c6jknmhvylshhzh0ssvq"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "d7a2e04d2e7880c56116fd35489a7f98755501b7"; + sha256 = "0cj0j10lmfr28c7nh79n2mcmy31xx50g93h0bqs0l7y76ph4dqkc"; }; - meta = { - homepage = http://www.libimobiledevice.org; + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkgconfig + ]; + propagatedBuildInputs = [ + glib + gnutls + libgcrypt + libplist + libtasn1 + libusbmuxd + ]; + + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + + configureFlags = [ + "--disable-static" + "--disable-openssl" + "--without-cython" + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/libimobiledevice/libimobiledevice; description = "A software library that talks the protocols to support iPhone®, iPod Touch® and iPad® devices on Linux"; longDescription = '' libimobiledevice is a software library that talks the protocols to support @@ -38,7 +52,10 @@ stdenv.mkDerivation rec { installed applications, retrieve addressbook/calendars/notes and bookmarks and synchronize music and video to the device. The library is in development since August 2007 with the goal to bring support for these - devices to the Linux Desktop.''; - inherit (usbmuxd.meta) platforms maintainers; + devices to the Linux Desktop. + ''; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } From ddc73a67b5423711c1ab3bd9af776364533b22b1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 13 Aug 2018 00:48:58 -0400 Subject: [PATCH 045/258] usbmuxd: 1.1.0 -> 2018-07-22 --- pkgs/tools/misc/usbmuxd/default.nix | 42 ++++++++++++++++++----------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index 2a792669ba8..6c26564c9db 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -1,30 +1,40 @@ -{ stdenv, fetchurl, libplist, libusb1, pkgconfig, libimobiledevice }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, libimobiledevice }: stdenv.mkDerivation rec { - name = "usbmuxd-${version}"; - version = "1.1.0"; + pname = "usbmuxd"; + version = "2018-07-22"; - src = fetchurl { - url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; - sha256 = "0bdlc7a8plvglqqx39qqampqm6y0hcdws76l9dffwl22zss4i29y"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = "ee85938c21043ef5f7cd4dfbc7677f385814d4d8"; + sha256 = "1qsnxvcagxa92rz0w78m0n2drgaghi0pqpbjdk2080sczzi1g76y"; }; - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ libusb1 libplist libimobiledevice ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + propagatedBuildInputs = [ libimobiledevice libusb1 ]; preConfigure = '' configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d" configureFlags="$configureFlags --with-systemdsystemunitdir=$out/lib/systemd/system" ''; - meta = { - homepage = http://marcansoft.com/blog/iphonelinux/usbmuxd/; - description = "USB Multiplex Daemon (for talking to iPhone or iPod)"; + meta = with stdenv.lib; { + homepage = https://github.com/libimobiledevice/usbmuxd; + description = "A socket daemon to multiplex connections from and to iOS devices"; longDescription = '' - usbmuxd: USB Multiplex Daemon. This bit of software is in charge of - talking to your iPhone or iPod Touch over USB and coordinating access to - its services by other applications.''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + usbmuxd stands for "USB multiplexing daemon". This daemon is in charge of + multiplexing connections over USB to an iOS device. To users, it means + you can sync your music, contacts, photos, etc. over USB. To developers, it + means you can connect to any listening localhost socket on the device. usbmuxd + is not used for tethering data transfer which uses a dedicated USB interface as + a virtual network device. Multiple connections to different TCP ports can happen + in parallel. The higher-level layers are handled by libimobiledevice. + ''; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } From 098da6633ecd108ec513b2130774a2be276298e5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 13 Aug 2018 00:49:17 -0400 Subject: [PATCH 046/258] ifuse: rework expression --- pkgs/tools/filesystems/ifuse/default.nix | 36 ++++++++++++++---------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix index 942b6272071..f9021c5a3aa 100644 --- a/pkgs/tools/filesystems/ifuse/default.nix +++ b/pkgs/tools/filesystems/ifuse/default.nix @@ -1,25 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, usbmuxd, fuse, gnutls, libgcrypt, - libplist, libimobiledevice }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, usbmuxd, fuse, libimobiledevice }: stdenv.mkDerivation rec { - name = "ifuse-1.1.3"; + pname = "ifuse"; + version = "1.1.3"; - nativeBuildInputs = [ pkgconfig fuse libplist usbmuxd gnutls libgcrypt libimobiledevice ]; + name = "${pname}-${version}"; - src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.bz2"; - sha256 = "1p9a4n36jb194cnp6v57cz2bggwbywaz8pbpb95ch83pzdkdx257"; + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = version; + sha256 = "0p01rds3vc5864v48swgqw5dv0h937nqnxggryixg9pkvzhc6cx5"; }; - meta = { - homepage = http://www.libimobiledevice.org; - license = stdenv.lib.licenses.lgpl21Plus; + nativeBuildInputs = [ autoreconfHook pkgconfig fuse usbmuxd libimobiledevice ]; + + meta = with stdenv.lib; { + homepage = https://github.com/libimobiledevice/ifuse; description = "A fuse filesystem implementation to access the contents of iOS devices"; longDescription = '' - Mount directories of an iOS device locally using fuse. By default the media - directory is mounted, options allow to also mount the sandbox container of an - app, an app's documents folder or even the root filesystem on jailbroken - devices.''; - inherit (usbmuxd.meta) platforms maintainers; + Mount directories of an iOS device locally using fuse. By default the media + directory is mounted, options allow to also mount the sandbox container of an + app, an app's documents folder or even the root filesystem on jailbroken + devices. + ''; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } From 319b5cec4ebf5ff7ab2938c089387bb08ec48ca6 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 13 Aug 2018 00:56:32 -0400 Subject: [PATCH 047/258] libgpod: drop libimobiledevice.swig was removed a while ago --- pkgs/development/libraries/libgpod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index c6056ee49fb..74aee0f39c7 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -25,8 +25,8 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils gdk_pixbuf taglib libimobiledevice python pygobject2 mutagen ]; - nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl - libimobiledevice.swig ] ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ]; + nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl] ++ + lib.optionals monoSupport [ mono gtk-sharp-2_0 ]; meta = { homepage = http://gtkpod.sourceforge.net/; From 48e5fbe8eeddf9fbe1fca3c9ee0e5fd5ac1bafb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Mon, 13 Aug 2018 14:44:30 +0900 Subject: [PATCH 048/258] buildRustPackage: allow patches to fix Cargo.lock --- pkgs/build-support/rust/default.nix | 5 +++++ pkgs/build-support/rust/fetchcargo.nix | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index fb1d6e390ae..820989a7620 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -7,6 +7,8 @@ in { name, cargoSha256 ? "unset" , src ? null , srcs ? null +, cargoPatches ? [] +, patches ? [] , sourceRoot ? null , logLevel ? "" , buildInputs ? [] @@ -23,6 +25,7 @@ let cargoDeps = if cargoVendorDir == null then fetchcargo { inherit name src srcs sourceRoot cargoUpdateHook; + patches = cargoPatches; sha256 = cargoSha256; } else null; @@ -44,6 +47,8 @@ in stdenv.mkDerivation (args // { buildInputs = [ cacert git rust.cargo rust.rustc ] ++ buildInputs; + patches = cargoPatches ++ patches; + configurePhase = args.configurePhase or '' runHook preConfigure # noop diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 42a3ac27cb5..2670ed52864 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -1,11 +1,11 @@ { stdenv, cacert, git, rust, cargo-vendor }: -{ name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }: +{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }: stdenv.mkDerivation { name = "${name}-vendor"; nativeBuildInputs = [ cacert cargo-vendor git rust.cargo ]; - inherit src srcs sourceRoot; + inherit src srcs patches sourceRoot; - phases = "unpackPhase installPhase"; + phases = "unpackPhase patchPhase installPhase"; installPhase = '' if [[ ! -f Cargo.lock ]]; then From b4599987e3ce5a3a83e1f6720f741ed359752603 Mon Sep 17 00:00:00 2001 From: Sebastien Maret Date: Mon, 13 Aug 2018 15:17:15 +0200 Subject: [PATCH 049/258] gildas: 20180701_a -> 20180801_a --- .../science/astronomy/gildas/default.nix | 10 +++++----- .../science/astronomy/gildas/mod.patch | 17 ----------------- 2 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 pkgs/applications/science/astronomy/gildas/mod.patch diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 7ede379fb49..ee19077065e 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { - srcVersion = "jul18a"; - version = "20180701_a"; + srcVersion = "aug18a"; + version = "20180801_a"; name = "gildas-${version}"; src = fetchurl { - url = "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz"; - sha256 = "0kl3zf6b1kv8hgsfrarsnm2gnrdax3vi8f856249y4nxsa7lbv2i"; + url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"; + sha256 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1"; }; enableParallelBuilding = true; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; - patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./mod.patch ./aarch64.patch ]; + patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ]; configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out diff --git a/pkgs/applications/science/astronomy/gildas/mod.patch b/pkgs/applications/science/astronomy/gildas/mod.patch deleted file mode 100644 index c917b4674f1..00000000000 --- a/pkgs/applications/science/astronomy/gildas/mod.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ruN gildas-src-jul18a/admin/Makefile.build gildas-src-jul18a.mod/admin/Makefile.build ---- gildas-src-jul18a/admin/Makefile.build 2018-06-14 14:36:54.000000000 +0200 -+++ gildas-src-jul18a.mod/admin/Makefile.build 2018-07-06 13:31:46.000000000 +0200 -@@ -291,6 +291,13 @@ - win-$(LIB_IDENTITY)-und.def -o $@ $(FLDLIBS) $(LIB_DEPENDS) $(ADD_LIBS) $(SYS_LIBS)) - endif - -+# Dummy rules for modules just so that make consider the module a -+# valid dependency when first parsing the makefiles. This rule should -+# never be applied as the modules are a by-product of the compilation -+# of the object -+$(builddir)/%.mod: -+ echo "dummy" > /dev/null -+ - # Fortran executables - $(bindir)/% : $(builddir)/%.o | $(bindir) - $(FC) $(ALL_FLDFLAGS) $< $(OBJECTS) -o $@ \ From 774944533755fabd4de405596a381a358042e197 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 13 Aug 2018 16:47:58 +0000 Subject: [PATCH 050/258] hadoop: fix build in sandbox --- .../networking/cluster/hadoop/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 6f4bc17f8b5..2af80032069 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -11,10 +11,15 @@ let inherit sha256; }; + postUnpack = stdenv.lib.optionalString (tomcat != null) '' + install -D ${tomcat.src} $sourceRoot/hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz + install -D ${tomcat.src} $sourceRoot/hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz + ''; + # perform fake build to make a fixed-output derivation of dependencies downloaded from maven central (~100Mb in ~3000 files) fetched-maven-deps = stdenv.mkDerivation { name = "hadoop-${version}-maven-deps"; - inherit src nativeBuildInputs buildInputs configurePhase; + inherit src postUnpack nativeBuildInputs buildInputs configurePhase; buildPhase = '' while mvn package -Dmaven.repo.local=$out/.m2 ${mavenFlags} -Dmaven.wagon.rto=5000; [ $? = 1 ]; do echo "timeout, restart maven to continue downloading" @@ -48,11 +53,6 @@ let ''; configurePhase = "true"; # do not trigger cmake hook mavenFlags = "-Drequire.snappy -Drequire.bzip2 -DskipTests -Pdist,native -e"; - # prevent downloading tomcat during the build - preBuild = stdenv.lib.optionalString (tomcat != null) '' - install -D ${tomcat.src} hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz - install -D ${tomcat.src} hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz - ''; buildPhase = '' # 'maven.repo.local' must be writable mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetched-maven-deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ${mavenFlags} From 6abda8be18ecec7bff02181ddf36317d68816e4f Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 13 Aug 2018 16:48:27 +0000 Subject: [PATCH 051/258] hadoop_2_7: 2.7.6 -> 2.7.7 --- pkgs/applications/networking/cluster/hadoop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 2af80032069..91de907d55f 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -123,8 +123,8 @@ let in { hadoop_2_7 = common { - version = "2.7.6"; - sha256 = "0wmg0iy0qxrf43fzajzmx03gxp4yx197vxacqwkxaj45clqwl010"; + version = "2.7.7"; + sha256 = "1ahv67f3lwak3kbjvnk1gncq56z6dksbajj872iqd0awdsj3p5rf"; dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r"; tomcat = tomcat_6_0_48; }; From 4cc594d483bb6ac531ef8502c43cc31b4b775d48 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 13 Aug 2018 16:48:50 +0000 Subject: [PATCH 052/258] hadoop_3_1: 3.1.0 -> 3.1.1 --- pkgs/applications/networking/cluster/hadoop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 91de907d55f..dfe6513bf0c 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -147,9 +147,9 @@ in { tomcat = null; }; hadoop_3_1 = common { - version = "3.1.0"; - sha256 = "0lig25jkffkzc2bfgyrnm3wymapgyw9fkai8sk9fnmp7cljia314"; - dependencies-sha256 = "1ri6a7lrijh538vy7v0fzgvkw603pf8jkh3ldl1kl7l0dvszd70d"; + version = "3.1.1"; + sha256 = "04hhdbyd4x1hy0fpy537f8mi0864hww97zap29x7dk1smrffwabd"; + dependencies-sha256 = "1q63jsxg3d31x0p8hvhpvbly2b07almyzsbhwphbczl3fhlqgiwn"; tomcat = null; }; } From 43595c7884533769a68f92359ca13f06dd62af97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 13 Aug 2018 19:47:30 +0200 Subject: [PATCH 053/258] zfsLegacyCrypto: remove This package was only mandatory for migration for people on zfsUnstable in nixos unstable. --- nixos/modules/rename.nix | 1 + nixos/modules/tasks/filesystems/zfs.nix | 27 +------------------------ pkgs/os-specific/linux/spl/default.nix | 7 ------- pkgs/os-specific/linux/zfs/default.nix | 26 +----------------------- pkgs/top-level/all-packages.nix | 6 +++--- 5 files changed, 6 insertions(+), 61 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 75f02ea78e6..f032f10e455 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -256,6 +256,7 @@ with lib; (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") + (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 7120856387e..a7ed18a9bcd 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -23,11 +23,7 @@ let kernel = config.boot.kernelPackages; - packages = if config.boot.zfs.enableLegacyCrypto then { - spl = kernel.splLegacyCrypto; - zfs = kernel.zfsLegacyCrypto; - zfsUser = pkgs.zfsLegacyCrypto; - } else if config.boot.zfs.enableUnstable then { + packages = if config.boot.zfs.enableUnstable then { spl = kernel.splUnstable; zfs = kernel.zfsUnstable; zfsUser = pkgs.zfsUnstable; @@ -117,27 +113,6 @@ in ''; }; - enableLegacyCrypto = mkOption { - type = types.bool; - default = false; - description = '' - Enabling this option will allow you to continue to use the old format for - encrypted datasets. With the inclusion of stability patches the format of - encrypted datasets has changed. They can still be accessed and mounted but - in read-only mode mounted. It is highly recommended to convert them to - the new format. - - This option is only for convenience to people that cannot convert their - datasets to the new format yet and it will be removed in due time. - - For migration strategies from old format to this new one, check the Wiki: - https://nixos.wiki/wiki/NixOS_on_ZFS#Encrypted_Dataset_Format_Change - - See https://github.com/zfsonlinux/zfs/pull/6864 for more details about - the stability patches. - ''; - }; - extraPools = mkOption { type = types.listOf types.str; default = []; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 880da81c42e..43711f92209 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -73,11 +73,4 @@ in sha256 = "07qlx7l23y696gzyy7ynly7n1141w66y21gkmxiia2xwldj8klkx"; patches = [ ./install_prefix.patch ]; }; - - splLegacyCrypto = common { - version = "2018-01-24"; - rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; - sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; - patches = [ ./install_prefix.patch ]; - }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 45edf8945c0..9a1baf8f7b9 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -9,7 +9,7 @@ , gawk, gnugrep, gnused, systemd # Kernel dependencies -, kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null +, kernel ? null, spl ? null, splUnstable ? null }: with stdenv.lib; @@ -194,28 +194,4 @@ in { spl = splUnstable; }; - - # TODO: Remove this module before 18.09 - # also remove boot.zfs.enableLegacyCrypto - zfsLegacyCrypto = common { - # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; - - # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-02-01"; - - rev = "4c46b99d24a6e71b3c72462c11cb051d0930ad60"; - sha256 = "011lcp2x44jgfzqqk2gjmyii1v7rxcprggv20prxa3c552drsx3c"; - isUnstable = true; - - extraPatches = [ - (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/4c46b99d24a6e71b3c72462c11cb051d0930ad60...nixos-zfs-2018-02-01.patch"; - sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch"; - }) - ]; - - spl = splLegacyCrypto; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74af33761c3..fab09745a42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14024,7 +14024,7 @@ with pkgs; sch_cake = callPackage ../os-specific/linux/sch_cake { }; inherit (callPackage ../os-specific/linux/spl {}) - splStable splUnstable splLegacyCrypto; + splStable splUnstable; spl = splStable; @@ -14057,7 +14057,7 @@ with pkgs; inherit (callPackage ../os-specific/linux/zfs { configFile = "kernel"; inherit kernel spl; - }) zfsStable zfsUnstable zfsLegacyCrypto; + }) zfsStable zfsUnstable; zfs = zfsStable; }); @@ -14605,7 +14605,7 @@ with pkgs; inherit (callPackage ../os-specific/linux/zfs { configFile = "user"; - }) zfsStable zfsUnstable zfsLegacyCrypto; + }) zfsStable zfsUnstable; zfs = zfsStable; From dd70c1273215843b14c6707886c692226a867bd5 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 13 Aug 2018 20:02:33 +0200 Subject: [PATCH 054/258] libtensorflow: 1.8.0 -> 1.9.0 --- pkgs/development/libraries/libtensorflow/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix index c8b299034fc..e6cd140c4e4 100644 --- a/pkgs/development/libraries/libtensorflow/default.nix +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -31,19 +31,19 @@ let in stdenv.mkDerivation rec { pname = "libtensorflow"; - version = "1.8.0"; + version = "1.9.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz"; sha256 = if system == "linux-x86_64" then if cudaSupport - then "0m1g4sqr9as0jgfx7wlyay2nkad6wgvsyk2gvhfkqkq5sm1vbx85" - else "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha" + then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3" + else "0l9ps115ng5ffzdwphlqmj3jhidps2v5afppdzrbpzmy41xz0z21" else if system == "darwin-x86_64" then if cudaSupport then unavailable - else "0q8lmyj8l50hl6l48c640ixanvhqf2836bicyl9p2x8sj97b7y8l" + else "1qj0v1706w6mczycdsh38h2glyv5d25v62kdn98wxd5rw8f9v657" else unavailable; }; From a70fbb8d9ebd944800ebacc401f67b62f5b0172d Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 13 Aug 2018 20:06:09 +0200 Subject: [PATCH 055/258] haskell: upgrade the tensorflow packages Also enable building on GHC-8.4. --- .../haskell-modules/configuration-common.nix | 3 +- .../configuration-ghc-8.2.x.nix | 2 +- .../configuration-tensorflow-ghc-8.2.x.nix | 292 ------------------ .../configuration-tensorflow.nix | 86 ++++++ .../patches/proto-lens-0.2.2.0.patch | 23 ++ .../patches/proto-lens-protoc-0.2.2.3.patch | 51 +++ 6 files changed, 163 insertions(+), 294 deletions(-) delete mode 100644 pkgs/development/haskell-modules/configuration-tensorflow-ghc-8.2.x.nix create mode 100644 pkgs/development/haskell-modules/configuration-tensorflow.nix create mode 100644 pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch create mode 100644 pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e32ccfa1793..f345e0b910a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1129,4 +1129,5 @@ self: super: { # Can be removed once yi-language >= 0.18 is in the LTS yi-core = super.yi-core.override { yi-language = self.yi-language_0_18_0; }; -} + +} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 2f8cf9076e6..f73172e02d3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -96,4 +96,4 @@ self: super: { haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); })); -} // import ./configuration-tensorflow-ghc-8.2.x.nix {inherit pkgs haskellLib;} self super +} diff --git a/pkgs/development/haskell-modules/configuration-tensorflow-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-tensorflow-ghc-8.2.x.nix deleted file mode 100644 index 7fcb0e43eb6..00000000000 --- a/pkgs/development/haskell-modules/configuration-tensorflow-ghc-8.2.x.nix +++ /dev/null @@ -1,292 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: -let - tensorflow-haskell = pkgs.fetchFromGitHub { - owner = "tensorflow"; - repo = "haskell"; - rev = "e40d2c44f0a861701cc90ec73c2bcee669ab5ba7"; - sha256 = "05pda34jfrlqmb8y9l8g87n4iq87v1z820vnd3cy41v5c5nrdpa8"; - fetchSubmodules = true; - }; - - setSourceRoot = dir: drv: drv.overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";}); - - proto-lens = self.proto-lens_0_2_2_0; - proto-lens-protoc = self.proto-lens-protoc_0_2_2_3; - proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0; - mainland-pretty = self.mainland-pretty_0_6_2; - lens-labels = self.lens-labels_0_1_0_2; - haskell-src-exts = self.haskell-src-exts_1_19_1; -in -{ - proto-lens-descriptors = super.proto-lens-descriptors.override { - inherit proto-lens lens-labels; - }; - proto-lens-protoc_0_2_2_3 = super.proto-lens-protoc_0_2_2_3.override { - inherit proto-lens haskell-src-exts; - }; - proto-lens-protobuf-types_0_2_2_0 = super.proto-lens-protobuf-types_0_2_2_0.override { - inherit proto-lens proto-lens-protoc; - }; - tensorflow-proto = setSourceRoot "tensorflow-proto" (super.callPackage ( - { mkDerivation, base, Cabal, proto-lens, proto-lens-protobuf-types - , proto-lens-protoc, stdenv - }: - mkDerivation { - pname = "tensorflow-proto"; - version = "0.1.0.0"; - src = tensorflow-haskell; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; - libraryHaskellDepends = [ - base proto-lens proto-lens-protobuf-types proto-lens-protoc - ]; - libraryToolDepends = [ pkgs.protobuf ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "TensorFlow protocol buffers"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit proto-lens proto-lens-protoc proto-lens-protobuf-types; - }); - tensorflow = setSourceRoot "tensorflow" (super.callPackage ( - { mkDerivation, async, attoparsec, base, bytestring, c2hs - , containers, data-default, exceptions, fgl, HUnit, lens-family - , mainland-pretty, mtl, proto-lens, semigroups, split, stdenv - , temporary, libtensorflow, tensorflow-proto, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , transformers, vector - }: - mkDerivation { - pname = "tensorflow"; - version = "0.1.0.2"; - src = tensorflow-haskell; - libraryHaskellDepends = [ - async attoparsec base bytestring containers data-default exceptions - fgl lens-family mainland-pretty mtl proto-lens semigroups split - temporary tensorflow-proto text transformers vector - ]; - librarySystemDepends = [ libtensorflow ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ - attoparsec base bytestring HUnit lens-family proto-lens - tensorflow-proto test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "TensorFlow bindings"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit mainland-pretty proto-lens; - }); - tensorflow-core-ops = setSourceRoot "tensorflow-core-ops" (super.callPackage ( - { mkDerivation, base, bytestring, Cabal, directory, filepath - , lens-family, mainland-pretty, proto-lens, stdenv, tensorflow - , tensorflow-opgen, text - }: - mkDerivation { - pname = "tensorflow-core-ops"; - version = "0.1.0.0"; - src = tensorflow-haskell; - setupHaskellDepends = [ - base bytestring Cabal directory filepath mainland-pretty proto-lens - tensorflow tensorflow-opgen text - ]; - libraryHaskellDepends = [ - base bytestring lens-family proto-lens tensorflow text - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Haskell wrappers for Core Tensorflow Ops"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit mainland-pretty proto-lens; - }); - tensorflow-logging = setSourceRoot "tensorflow-logging" (super.callPackage ( - { mkDerivation, base, bytestring, conduit, data-default, directory - , exceptions, filepath, hostname, HUnit, lens-family, proto-lens - , resourcet, stdenv, stm, stm-chans, stm-conduit, temporary - , tensorflow, tensorflow-core-ops, tensorflow-ops, tensorflow-proto - , tensorflow-records-conduit, test-framework, test-framework-hunit - , text, time, transformers - }: - mkDerivation { - pname = "tensorflow-logging"; - version = "0.1.0.0"; - src = tensorflow-haskell; - libraryHaskellDepends = [ - base bytestring conduit data-default directory exceptions filepath - hostname lens-family proto-lens resourcet stm stm-chans stm-conduit - tensorflow tensorflow-core-ops tensorflow-ops tensorflow-proto - tensorflow-records-conduit text time transformers - ]; - testHaskellDepends = [ - base bytestring conduit data-default directory filepath HUnit - lens-family proto-lens resourcet temporary tensorflow - tensorflow-proto tensorflow-records-conduit test-framework - test-framework-hunit text - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "TensorBoard related functionality"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit proto-lens; - }); - tensorflow-mnist = setSourceRoot "tensorflow-mnist" (super.callPackage ( - { mkDerivation, base, binary, bytestring, containers, filepath - , HUnit, lens-family, proto-lens, split, stdenv, tensorflow - , tensorflow-core-ops, tensorflow-mnist-input-data, tensorflow-ops - , tensorflow-proto, test-framework, test-framework-hunit, text - , transformers, vector, zlib - }: - mkDerivation { - pname = "tensorflow-mnist"; - version = "0.1.0.0"; - src = tensorflow-haskell; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary bytestring containers filepath lens-family proto-lens - split tensorflow tensorflow-core-ops tensorflow-proto text vector - zlib - ]; - executableHaskellDepends = [ - base bytestring filepath lens-family proto-lens tensorflow - tensorflow-mnist-input-data tensorflow-ops tensorflow-proto text - transformers vector - ]; - testHaskellDepends = [ - base bytestring HUnit lens-family proto-lens tensorflow - tensorflow-mnist-input-data tensorflow-ops tensorflow-proto - test-framework test-framework-hunit text transformers vector - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "TensorFlow demo application for learning MNIST model"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit proto-lens; - }); - tensorflow-mnist-input-data = setSourceRoot "tensorflow-mnist-input-data" (super.callPackage ( - { mkDerivation, base, bytestring, Cabal, cryptonite, directory - , filepath, HTTP, network-uri, stdenv - }: - mkDerivation { - pname = "tensorflow-mnist-input-data"; - version = "0.1.0.0"; - src = tensorflow-haskell; - enableSeparateDataOutput = true; - setupHaskellDepends = [ - base bytestring Cabal cryptonite directory filepath HTTP - network-uri - ]; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Downloader of input data for training MNIST"; - license = stdenv.lib.licenses.asl20; - } - ) {}); - tensorflow-opgen = setSourceRoot "tensorflow-opgen" (super.callPackage ( - { mkDerivation, base, bytestring, containers, filepath, lens-family - , mainland-pretty, optparse-applicative, proto-lens, semigroups - , stdenv, tensorflow-proto, text - }: - mkDerivation { - pname = "tensorflow-opgen"; - version = "0.1.0.0"; - src = tensorflow-haskell; - libraryHaskellDepends = [ - base bytestring containers filepath lens-family mainland-pretty - optparse-applicative proto-lens semigroups tensorflow-proto text - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Code generation for TensorFlow operations"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit mainland-pretty proto-lens; - }); - tensorflow-ops = setSourceRoot "tensorflow-ops" (super.callPackage ( - { mkDerivation, base, bytestring, containers, criterion - , data-default, deepseq, fgl, HUnit, lens-family, mtl, proto-lens - , QuickCheck, random, stdenv, temporary, tensorflow - , tensorflow-core-ops, tensorflow-proto, tensorflow-test - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, transformers, vector - }: - mkDerivation { - pname = "tensorflow-ops"; - version = "0.1.0.0"; - src = tensorflow-haskell; - libraryHaskellDepends = [ - base bytestring containers data-default fgl lens-family mtl - proto-lens tensorflow tensorflow-core-ops tensorflow-proto text - ]; - testHaskellDepends = [ - base bytestring data-default HUnit lens-family proto-lens - QuickCheck random temporary tensorflow tensorflow-core-ops - tensorflow-proto tensorflow-test test-framework - test-framework-hunit test-framework-quickcheck2 transformers vector - ]; - benchmarkHaskellDepends = [ - base criterion deepseq tensorflow transformers vector - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Friendly layer around TensorFlow bindings"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit proto-lens; - }); - tensorflow-records = setSourceRoot "tensorflow-records" (super.callPackage ( - { mkDerivation, base, bytestring, cereal, snappy-framing, stdenv - , test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "tensorflow-records"; - version = "0.1.0.0"; - src = tensorflow-haskell; - libraryHaskellDepends = [ base bytestring cereal snappy-framing ]; - testHaskellDepends = [ - base bytestring cereal test-framework test-framework-quickcheck2 - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Encoder and decoder for the TensorFlow \"TFRecords\" format"; - license = stdenv.lib.licenses.asl20; - } - ) {}); - tensorflow-records-conduit = setSourceRoot "tensorflow-records-conduit" (super.callPackage ( - { mkDerivation, base, bytestring, cereal-conduit, conduit - , conduit-extra, exceptions, resourcet, stdenv, tensorflow-records - }: - mkDerivation { - pname = "tensorflow-records-conduit"; - version = "0.1.0.0"; - src = tensorflow-haskell; - libraryHaskellDepends = [ - base bytestring cereal-conduit conduit conduit-extra exceptions - resourcet tensorflow-records - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Conduit wrappers for TensorFlow.Records."; - license = stdenv.lib.licenses.asl20; - } - ) {}); - tensorflow-test = setSourceRoot "tensorflow-test" (super.callPackage ( - { mkDerivation, base, HUnit, stdenv, vector }: - mkDerivation { - pname = "tensorflow-test"; - version = "0.1.0.0"; - src = tensorflow-haskell; - libraryHaskellDepends = [ base HUnit vector ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Some common functions for test suites"; - license = stdenv.lib.licenses.asl20; - } - ) {}); -} diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix new file mode 100644 index 00000000000..dfc93686405 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -0,0 +1,86 @@ +{ pkgs, haskellLib }: + +with haskellLib; + +self: super: +let + tensorflow-haskell = pkgs.fetchFromGitHub { + owner = "tensorflow"; + repo = "haskell"; + rev = "85bf0bb12cecfcdfcf31dea43b67cbe44576f685"; + sha256 = "1xbwc8y4a7n2163g746dpyh1q86rbxaw3d41kcy1mbhvmfqq56x7"; + fetchSubmodules = true; + }; + + setSourceRoot = dir: drv: drv.overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";}); + + proto-lens = self.proto-lens_0_2_2_0; + proto-lens-protoc = self.proto-lens-protoc_0_2_2_3; + proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0; + mainland-pretty = self.mainland-pretty_0_6_2; +in +{ + proto-lens_0_2_2_0 = appendPatch super.proto-lens_0_2_2_0 ./patches/proto-lens-0.2.2.0.patch; + proto-lens-descriptors = doJailbreak (super.proto-lens-descriptors.override { + inherit proto-lens; + lens-labels = self.lens-labels_0_1_0_2; + }); + proto-lens-protoc_0_2_2_3 = appendPatch (addBuildDepend (super.proto-lens-protoc_0_2_2_3.override { + inherit proto-lens; + haskell-src-exts = self.haskell-src-exts_1_19_1; + }) self.semigroups) ./patches/proto-lens-protoc-0.2.2.3.patch; + proto-lens-protobuf-types_0_2_2_0 = doJailbreak (super.proto-lens-protobuf-types_0_2_2_0.override { + inherit proto-lens proto-lens-protoc; + }); + + lens-labels_0_1_0_2 = doJailbreak super.lens-labels_0_1_0_2; + + haskell-src-exts_1_19_1 = appendPatch (doJailbreak super.haskell-src-exts_1_19_1) ( + # Adapt to the Semigroup–Monoid Proposal (enables building on GHC >= 8.4) + pkgs.fetchpatch { + url = https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch; + sha256 = "0ja6ai41v9plinlhjwja282m6ahn6mw4xi79np0jxqk83cg0z1ff"; + } + ); + + tensorflow-proto = super.tensorflow-proto.override { + inherit proto-lens proto-lens-protoc proto-lens-protobuf-types; + }; + tensorflow = super.tensorflow.override { + inherit mainland-pretty proto-lens; + }; + tensorflow-core-ops = super.tensorflow-core-ops.override { + inherit mainland-pretty proto-lens; + }; + tensorflow-logging = super.tensorflow-logging.override { + inherit proto-lens; + }; + tensorflow-mnist = super.tensorflow-mnist.override { + inherit proto-lens; + }; + tensorflow-mnist-input-data = setSourceRoot "tensorflow-mnist-input-data" (super.callPackage ( + { mkDerivation, base, bytestring, Cabal, cryptonite, directory + , filepath, HTTP, network-uri, stdenv + }: + mkDerivation { + pname = "tensorflow-mnist-input-data"; + version = "0.1.0.0"; + src = tensorflow-haskell; + enableSeparateDataOutput = true; + setupHaskellDepends = [ + base bytestring Cabal cryptonite directory filepath HTTP + network-uri + ]; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "Downloader of input data for training MNIST"; + license = stdenv.lib.licenses.asl20; + } + ) {}); + tensorflow-opgen = super.tensorflow-opgen.override { + inherit mainland-pretty proto-lens; + }; + tensorflow-ops = super.tensorflow-ops.override { + inherit proto-lens; + }; +} diff --git a/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch b/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch new file mode 100644 index 00000000000..100a828a501 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch @@ -0,0 +1,23 @@ +diff -Naur proto-lens-0.2.2.0/proto-lens.cabal proto-lens-0.2.2.0-patched/proto-lens.cabal +--- proto-lens-0.2.2.0/proto-lens.cabal 2018-08-13 18:05:41.704823370 +0200 ++++ proto-lens-0.2.2.0-patched/proto-lens.cabal 2018-08-13 18:07:42.352372300 +0200 +@@ -33,7 +33,7 @@ + Data.ProtoLens.Encoding.Wire + Data.ProtoLens.TextFormat.Parser + build-depends: attoparsec == 0.13.* +- , base >= 4.8 && < 4.11 ++ , base >= 4.8 + , bytestring == 0.10.* + , containers == 0.5.* + , data-default-class >= 0.0 && < 0.2 +diff -Naur proto-lens-0.2.2.0/src/Data/ProtoLens/TextFormat.hs proto-lens-0.2.2.0-patched/src/Data/ProtoLens/TextFormat.hs +--- proto-lens-0.2.2.0/src/Data/ProtoLens/TextFormat.hs 2017-04-28 02:16:46.000000000 +0200 ++++ proto-lens-0.2.2.0-patched/src/Data/ProtoLens/TextFormat.hs 2018-08-13 18:08:06.371486594 +0200 +@@ -17,6 +17,7 @@ + readMessageOrDie, + ) where + ++import Prelude hiding ((<>)) + import Lens.Family2 ((&),(^.),(.~), set, over) + import Control.Arrow (left) + import qualified Data.ByteString diff --git a/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch b/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch new file mode 100644 index 00000000000..87fd2aeab21 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch @@ -0,0 +1,51 @@ +diff -Naur proto-lens-protoc-0.2.2.3/proto-lens-protoc.cabal proto-lens-protoc-0.2.2.3-patched/proto-lens-protoc.cabal +--- proto-lens-protoc-0.2.2.3/proto-lens-protoc.cabal 2018-07-21 22:55:12.041698876 +0200 ++++ proto-lens-protoc-0.2.2.3-patched/proto-lens-protoc.cabal 2018-08-13 19:44:44.993147985 +0200 +@@ -37,8 +37,8 @@ + default-language: Haskell2010 + hs-source-dirs: src + build-depends: +- Cabal >= 1.22 && < 2.1 +- , base >= 4.8 && < 4.11 ++ Cabal >= 1.22 ++ , base >= 4.8 + , bytestring == 0.10.* + , containers == 0.5.* + , data-default-class >= 0.0 && < 0.2 +@@ -53,6 +53,7 @@ + , proto-lens == 0.2.2.* + , proto-lens-descriptors == 0.2.2.* + , text == 1.2.* ++ , semigroups + reexported-modules: + -- Modules that are needed by the generated Haskell files. + -- For forwards compatibility, reexport them as new module names so that +@@ -76,7 +77,7 @@ + main-is: protoc-gen-haskell.hs + + build-depends: +- base >= 4.8 && < 4.11 ++ base >= 4.8 + , bytestring == 0.10.* + , containers == 0.5.* + , data-default-class >= 0.0 && < 0.2 +diff -Naur proto-lens-protoc-0.2.2.3/src/Data/ProtoLens/Compiler/Definitions.hs proto-lens-protoc-0.2.2.3-patched/src/Data/ProtoLens/Compiler/Definitions.hs +--- proto-lens-protoc-0.2.2.3/src/Data/ProtoLens/Compiler/Definitions.hs 2017-08-07 06:52:21.000000000 +0200 ++++ proto-lens-protoc-0.2.2.3-patched/src/Data/ProtoLens/Compiler/Definitions.hs 2018-08-13 19:14:07.240505220 +0200 +@@ -35,6 +35,7 @@ + import qualified Data.Map as Map + import Data.Maybe (fromMaybe) + import Data.Monoid ++import qualified Data.Semigroup as Semigroup + import qualified Data.Set as Set + import Data.String (IsString(..)) + import Data.Text (Text, cons, splitOn, toLower, uncons, unpack) +@@ -139,7 +140,7 @@ + -- a 'Symbol' is used to construct both the type-level argument to + -- @HasLens@ and the name of the function @foo@. + newtype Symbol = Symbol String +- deriving (Eq, Ord, IsString, Monoid) ++ deriving (Eq, Ord, IsString, Semigroup.Semigroup, Monoid) + + nameFromSymbol :: Symbol -> Name + nameFromSymbol (Symbol s) = fromString s From a6781fabc160271a46852d85e748df82949062fc Mon Sep 17 00:00:00 2001 From: Free Potion <42352817+freepotion@users.noreply.github.com> Date: Mon, 13 Aug 2018 21:24:39 +0300 Subject: [PATCH 056/258] ivan: add myself as maintainer --- maintainers/maintainer-list.nix | 5 +++++ pkgs/games/ivan/default.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2ca02c20c5c..48264a423a5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1382,6 +1382,11 @@ github = "fps"; name = "Florian Paul Schmidt"; }; + freepotion = { + email = "freepotion@protonmail.com"; + github = "freepotion"; + name = "Free Potion"; + }; Fresheyeball = { email = "fresheyeball@gmail.com"; github = "fresheyeball"; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 54aa2722092..07b67fa6397 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = https://attnam.com/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; []; + maintainers = with maintainers; [freepotion]; }; } From 0adc6f4d8fc759e6af5af35fc169dd950eeeb35c Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 13 Aug 2018 15:55:04 -0400 Subject: [PATCH 057/258] mirtk: init at 2.0.0 --- .../science/biology/mirtk/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/libraries/science/biology/mirtk/default.nix diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix new file mode 100644 index 00000000000..6ecc5159a3b --- /dev/null +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, gtest, fetchgit, cmake, boost, eigen, python, vtk, zlib }: + +stdenv.mkDerivation rec { + version = "2.0.0"; + name = "mirtk-${version}"; + + # uses submodules so can't use fetchFromGitHub + src = fetchgit { + url = "https://github.com/BioMedIA/MIRTK.git"; + rev = "v${version}"; + sha256 = "0i2v97m66ir5myvi5b123r7zcagwy551b73s984gk7lksl5yiqxk"; + }; + + cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON -DBUILD_TESTING=ON"; + + doCheck = true; + + checkPhase = '' + ctest -E '(Polynomial|ConvolutionFunction|Downsampling|EdgeTable|InterpolateExtrapolateImage)' + ''; + # testPolynomial - segfaults for some reason + # testConvolutionFunction, testDownsampling - main not called correctly + # testEdgeTable, testInterpolateExtrapolateImageFunction - setup fails + + postInstall = '' + install -Dm644 -t "$out/share/bash-completion/completions/mirtk" share/completion/bash/mirtk + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake gtest ]; + buildInputs = [ boost eigen python vtk zlib ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/BioMedIA/MIRTK"; + description = "Medical image registration library and tools"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8358d28bcf2..b73d76d264a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20387,6 +20387,8 @@ with pkgs; kallisto = callPackage ../applications/science/biology/kallisto { }; + mirtk = callPackage ../development/libraries/science/biology/mirtk { }; + muscle = callPackage ../applications/science/biology/muscle { }; n3 = callPackage ../applications/science/biology/N3 { From 59f88b478f676f4f67a1269926256c38d508a2f7 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Mon, 13 Aug 2018 16:15:47 -0400 Subject: [PATCH 058/258] maintainers: add @illegalprime --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2ca02c20c5c..49df1b8f488 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1679,6 +1679,11 @@ github = "ikervagyok"; name = "Balázs Lengyel"; }; + illegalprime = { + email = "themichaeleden@gmail.com"; + github = "illegalprime"; + name = "Michael Eden"; + }; ilya-kolpakov = { email = "ilya.kolpakov@gmail.com"; github = "ilya-kolpakov"; From eca17c4a7f363469562fdc1f5c903bd87cab6c7c Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Mon, 13 Aug 2018 16:23:19 -0400 Subject: [PATCH 059/258] libphonenumber: init at 8.9.9 --- .../libraries/libphonenumber/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/libphonenumber/default.nix diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix new file mode 100644 index 00000000000..4cb327ff527 --- /dev/null +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkgconfig, protobuf, icu }: + +let + version = "8.9.9"; +in +stdenv.mkDerivation { + name = "phonenumber-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "googlei18n"; + repo = "libphonenumber"; + rev = "v${version}"; + sha256 = "005visnfnr84blgdi0yp4hrzskwbsnawrzv6lqfi9f073l6w5j6w"; + }; + + nativeBuildInputs = [ + cmake + gmock + pkgconfig + ]; + + buildInputs = [ + boost + protobuf + icu + ]; + + cmakeDir = "../cpp"; + + checkPhase = "./libphonenumber_test"; + + meta = with stdenv.lib; { + description = "Google's i18n library for parsing and using phone numbers"; + license = licenses.asl20; + maintainers = with maintainers; [ illegalprime ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8358d28bcf2..41720196913 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10672,6 +10672,8 @@ with pkgs; libpgf = callPackage ../development/libraries/libpgf { }; + libphonenumber = callPackage ../development/libraries/libphonenumber { }; + libpng = callPackage ../development/libraries/libpng { }; libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; From 4f0db5d0ad12ff44e24094b483c80731bf2f1cc9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 7 Aug 2018 12:58:23 +0000 Subject: [PATCH 060/258] coq: default to version 8.8 --- pkgs/top-level/coq-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index de9b6d38b74..5f784e64534 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -81,7 +81,7 @@ in rec { coqPackages_8_6 = mkCoqPackages coq_8_6; coqPackages_8_7 = mkCoqPackages coq_8_7; coqPackages_8_8 = mkCoqPackages coq_8_8; - coqPackages = coqPackages_8_7; + coqPackages = coqPackages_8_8; coq = coqPackages.coq; } From 1bfbe76772b731770ec9fb70db780a53371f7b2b Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Mon, 13 Aug 2018 16:47:35 -0400 Subject: [PATCH 061/258] ntl: Add darwin support --- pkgs/development/libraries/ntl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index ab50cf1e17c..96d3be41235 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { sha256 = "04avzmqflx2a33n7v9jj32g83p7m6z712fg1mw308jk5ca2qp489"; }; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace DoConfig --replace g++ c++ + ''; + buildInputs = [ gmp ]; From 7682c2fd61caa805fff1752e6671a7d8e653b7f3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 9 Aug 2018 22:32:27 +0200 Subject: [PATCH 062/258] hydra: 2017-11-21 -> 2018-08-07 This bumps Hydra to the latest revision available. As Hydra doesn't have a release model (and therefore no tags) ATM, the derivation will pin against the actual git revision and the date of the commit in the derivation name. Additionally the following changes have been made: * Dropped `postUnpack` phase. It is useful when working with the Hydra source (and no dirty changes shall be used in `release.nix`, but is has no use in `nixpkgs`). * Added myself as maintainer to have more folks available in case of future breakage. * Implemented support for Nix 2.0 and `unstable` (currently 2.1): Since 1672bcd230447f1ce0c3291950bdd9a662cee974 in NixOS/nix the evaluator differentiates between `settings` and `evalSettings`. Previously `restrictEval` in `hydra-eval-jobs.cc` has been set in `settings`, this doesn't work anymore in Nix 2.1 and is therefore incompatible to Nix 2.0 on an API level. To resolve this, the flag `isGreaterNix20` parses the version string of `pkgs.nix` and applies a patch if nix.version<=2.0. Furthermore the Hydra build with Nix 2.1 requires `boost` as build input which is not needed for Nix 2.0. To avoid unnecessary increase in the closure size this library will only used as build input for nix.version>2.0. * Fixed the NixOS test for `hydra`: disabled binary cache to allow sandbox builds (otherwise it would query `cache.nixos.org` during the Hydra build inside the test). Additionally the trivial.nix jobset required simplification (as done in NixOS/hydra, e.g. tests/api-test.nix) as bash is not available in the build sandbox as builder (even when adding pkgs.bash to systemPackages). The easiest workaround to confirm a the functionality of a jobset without importing nixpkgs is to use the default shell /bin/sh which is mounted from `pkgs.busybox` into the build env (https://github.com/NixOS/nixpkgs/pull/44841#discussion_r209751972) in the VM and a named pipe to create $out. Closes #44044 --- nixos/tests/hydra/default.nix | 13 +++---- pkgs/development/tools/misc/hydra/default.nix | 38 ++++++++++++------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index 98d99811f3c..db4e97e0039 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -2,14 +2,11 @@ import ../make-test.nix ({ pkgs, ...} : let trivialJob = pkgs.writeTextDir "trivial.nix" '' - with import ; - { trivial = builtins.derivation { name = "trivial"; system = "x86_64-linux"; - PATH = coreutils; - builder = shell; - args = ["-c" "touch $out; exit 0"]; + builder = "/bin/sh"; + args = ["-c" "echo success > $out; exit 0"]; }; } ''; @@ -27,7 +24,7 @@ let in { name = "hydra-init-localdb"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ pstn lewo ]; + maintainers = [ pstn lewo ma27 ]; }; machine = @@ -50,6 +47,8 @@ in { hostName = "localhost"; systems = [ "x86_64-linux" ]; }]; + + binaryCaches = []; }; }; @@ -74,5 +73,5 @@ in { $machine->succeed("create-trivial-project.sh"); $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'); - ''; + ''; }) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index f4f72491970..829c124a159 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -3,11 +3,18 @@ , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , guile, perl, postgresql, nukeReferences, git, boehmgc , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar -, rpm, dpkg, cdrkit, pixz }: +, rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook +}: with stdenv; let + isGreaterNix20 = with lib.versions; + let + inherit (nix) version; + inherit (lib) toInt; + in major version == "2" && toInt (minor version) >= 1 || toInt (major version) > 2; + perlDeps = buildEnv { name = "hydra-perl-deps"; paths = with perlPackages; @@ -63,15 +70,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2017-11-21"; + version = "2018-08-07"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "b7bc4384b7b471d1ddf892cb03f16189a66d5a0d"; - sha256 = "05g37z3ilazzqa5rqj5zljndwxjbvpc18xibh6jlwjwpvg3kpbbh"; + rev = "4dca8fe14d3f782bdf927f37efce722acefffff3"; + sha256 = "1yas4psmvfp7lhcp81ia2sy93b78j9hiw9a6n3q2m1a616hwpm25"; }; buildInputs = @@ -80,17 +87,24 @@ in releaseTools.nixBuild rec { guile # optional, for Guile + Guix support perlDeps perl nix postgresql # for running the tests - ]; + ] ++ lib.optionals isGreaterNix20 [ boost ]; hydraPath = lib.makeBinPath ( [ sqlite subversion openssh nix coreutils findutils pixz gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); - postUnpack = '' - # Clean up when building from a working tree. - (cd $sourceRoot && (git ls-files -o --directory | xargs -r rm -rfv)) || true - ''; + nativeBuildInputs = [ autoreconfHook ]; + + # adds a patch which ensures compatibility with the API of Nix 2.0. + # it has been reverted in https://github.com/NixOS/hydra/commit/162d671c48a418bd10a8a171ca36787ef3695a44, + # for Nix 2.1/unstable compatibility. Reapplying helps if Nix 2.0 is used to keep the build functional. + patches = lib.optionals (!isGreaterNix20) [ + (fetchpatch { + url = "https://github.com/NixOS/hydra/commit/08de434bdd0b0a22abc2081be6064a6c846d3920.patch"; + sha256 = "0kz77njp5ynn9l81g3q8zrryvnsr06nk3iw0a60187wxqzf5fmf8"; + }) + ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; @@ -99,8 +113,6 @@ in releaseTools.nixBuild rec { PERL5LIB=$(pwd)/src/lib:$PERL5LIB; ''; - preConfigure = "autoreconf -vfi"; - enableParallelBuilding = true; preCheck = '' @@ -130,6 +142,6 @@ in releaseTools.nixBuild rec { description = "Nix-based continuous build system"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ domenkozar ma27 ]; }; - } +} From 42a0d36fdbf32688060e500748d28e3117fa3909 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Mon, 13 Aug 2018 17:36:18 -0400 Subject: [PATCH 063/258] Mark gf2x as supported on darwin --- pkgs/development/libraries/gf2x/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 0d0fa0b2ca5..8c2e29231dc 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { homepage = http://gf2x.gforge.inria.fr; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From e3773de8848a5b60c67c0ff952e8f81a16a1fcfb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Aug 2018 15:54:04 -0700 Subject: [PATCH 064/258] obs-linuxbrowser: 0.4.0 -> 0.5.0 (#44734) 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. --- 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 62c4eba4db5..7a06e25f8a7 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.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "bazukas"; repo = "obs-linuxbrowser"; rev = version; - sha256 = "1nqi04ici9n1xjliy1gaqy2bq8zj1z32dffk890x2hi7ml688y9h"; + sha256 = "0jgh377yv69wbcqg7m7axi22x2p9jmcirws1pgrz22vaw7zbbdzl"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; From 44e8163ad33541da9569b058c494df50e1cce57c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Aug 2018 15:54:33 -0700 Subject: [PATCH 065/258] lsscsi: 0.29 -> 0.30 (#44742) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lsscsi/versions. --- pkgs/os-specific/linux/lsscsi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index d250d658282..96b84c00a5f 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "lsscsi-0.29"; + name = "lsscsi-0.30"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-0.29.tgz"; - sha256 = "0538fjgxky03yn7mzyslkyi2af3yy5llsnjjcgjx73x08wd6hv5n"; + url = "http://sg.danny.cz/scsi/lsscsi-0.30.tgz"; + sha256 = "05cba72m0hj3kpikk26h7j02cly7zy5lgww2fvswa0jz823j36k1"; }; preConfigure = '' From 989292e3e114105168fc75bbabfe9370b6db29f2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 13 Aug 2018 22:59:32 +0000 Subject: [PATCH 066/258] ocamlPackages.ocaml_extlib: 1.7.4 -> 1.7.5 (#44736) --- pkgs/development/ocaml-modules/extlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index e1c56bf7ebe..de759e92278 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -3,11 +3,11 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { - name = "ocaml-extlib-1.7.4"; + name = "ocaml${ocaml.version}-extlib-1.7.5"; src = fetchurl { - url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.4.tar.gz; - sha256 = "18jb4rvkk6p3mqnkamwb41x8q49shgn43h020bs4cp4vac7nrhnr"; + url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz; + sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; }; buildInputs = [ ocaml findlib cppo ]; From 9f234788e42d308b0f5d0953a44c501f22b23514 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Tue, 14 Aug 2018 01:03:56 +0200 Subject: [PATCH 067/258] aws-iam-authenticator: init at 2018-07-29 (#44863) --- .../aws-iam-authenticator/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/security/aws-iam-authenticator/default.nix diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix new file mode 100644 index 00000000000..39c0c02890b --- /dev/null +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -0,0 +1,27 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "aws-iam-authenticator-${version}"; + # This is meant to be a stable release, but since the rename from + # heptio, there has been no release. Please pin this to an actual + # release once that happens. + version = "2018-07-29"; + rev = "01dd27d77ec1e2ec640a010970f00b2f8074b0b5"; + + goPackagePath = "github.com/kubernetes-sigs/aws-iam-authenticator"; + + src = fetchgit { + inherit rev; + url = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; + sha256 = "1n7khd2qvl527x3ac6f89smf12za92g08d9v2j393i7n9l1rgw38"; + }; + + meta = { + homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; + description = "AWS IAM credentials for Kubernetes authentication"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.srhb ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8358d28bcf2..fc1686dbba1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -569,6 +569,8 @@ with pkgs; avfs = callPackage ../tools/filesystems/avfs { }; + aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; + awscli = callPackage ../tools/admin/awscli { }; awsebcli = callPackage ../tools/virtualization/awsebcli {}; From 9862072e99cdd9845ec07c47130998312374da65 Mon Sep 17 00:00:00 2001 From: Ben Challenor Date: Mon, 13 Aug 2018 22:31:12 +0100 Subject: [PATCH 068/258] xsecurelock: git-2018-07-10 -> 1.0 --- pkgs/tools/X11/xsecurelock/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 176b9fa0068..c252894dbfe 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -3,13 +3,14 @@ , pamtester, xscreensaver }: stdenv.mkDerivation rec { - name = "xsecurelock-git-2018-07-10"; + name = "xsecurelock-${version}"; + version = "1.0"; src = fetchFromGitHub { owner = "google"; repo = "xsecurelock"; - rev = "0fa0d7dd87a4cc4bdb402323f95c3fcacc6f5049"; - sha256 = "071b3gslszql1mgabs53r82jgbk9mn263m5v6adskfxbkamks8g0"; + rev = "v${version}"; + sha256 = "0k135hnfnn1j82wvc03b8jkq06wws1xk325x5m25ps6xwsn725sw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From a0649086b50d26ff82212af5ba45bd85ff12e73c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 13 Aug 2018 20:18:56 -0400 Subject: [PATCH 069/258] zfs: unsupported for 4.18 --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 9a1baf8f7b9..f7d94ddd2e9 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -157,7 +157,7 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.18"; # this package should point to the latest release. version = "0.7.9"; @@ -176,7 +176,7 @@ in { zfsUnstable = common rec { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.18"; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-05-22"; From 942a5efa286bd71525a6f86d99edcac2e627cf8d Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Mon, 13 Aug 2018 22:47:57 -0400 Subject: [PATCH 070/258] flint: Add darwin support --- pkgs/development/libraries/flint/default.nix | 4 ++-- pkgs/development/libraries/mpir/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 2b3f75b80db..d92a0c61aab 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; # issues with ntl -- https://github.com/wbhart/flint2/issues/487 - NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + NIX_CXXSTDLIB_COMPILE = [ "-std=c++11" ]; patches = [ (fetchpatch { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = ''Fast Library for Number Theory''; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://www.flintlib.org/; downloadPage = "http://www.flintlib.org/downloads.html"; updateWalker = true; diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 2ecae98387e..fe9cd6f492e 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = ''A highly optimised library for bignum arithmetic forked from GMP''; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; downloadPage = "http://mpir.org/downloads.html"; homepage = http://mpir.org/; updateWalker = true; From 681d02ba5f86f0593950c28cacfb138bd7afb553 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Mon, 13 Aug 2018 23:14:57 -0400 Subject: [PATCH 071/258] tachyon: Add darwin support --- .../libraries/tachyon/darwin.patch | 31 +++++++++++++++++++ .../development/libraries/tachyon/default.nix | 7 +++-- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/tachyon/darwin.patch diff --git a/pkgs/development/libraries/tachyon/darwin.patch b/pkgs/development/libraries/tachyon/darwin.patch new file mode 100644 index 00000000000..dbede586f07 --- /dev/null +++ b/pkgs/development/libraries/tachyon/darwin.patch @@ -0,0 +1,31 @@ +diff --git a/unix/Make-arch b/unix/Make-arch +index 08afb85..822c4fc 100644 +--- a/unix/Make-arch ++++ b/unix/Make-arch +@@ -924,7 +924,7 @@ macosx-thr: + $(MAKE) all \ + "ARCH = macosx-thr" \ + "CC = cc" \ +- "CFLAGS = -Os -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \ ++ "CFLAGS = -Os -ffast-math -DBsd -DTHR $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = strip" \ +@@ -946,7 +946,7 @@ macosx-x86-thr: + $(MAKE) all \ + "ARCH = macosx-x86-thr" \ + "CC = cc" \ +- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \ ++ "CFLAGS = -O2 -ffast-math -DBsd -DTHR $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = strip" \ +@@ -957,7 +957,7 @@ macosx-x86-thr-ogl: + $(MAKE) all \ + "ARCH = macosx-x86-thr-ogl" \ + "CC = cc" \ +- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include -F/System/Library/Frameworks $(MISCFLAGS) -DUSEOPENGL" \ ++ "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include $(MISCFLAGS) -DUSEOPENGL" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = strip" \ diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 4f711a639f7..d5d12e44df0 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -50,7 +50,9 @@ stdenv.mkDerivation rec { ./no-absolute-paths.patch # Include new targets (like arm) ./make-archs.patch - ]; + ] ++ + # Ensure looks for nix-provided Carbon, not system frameworks + stdenv.lib.optional stdenv.isDarwin ./darwin.patch; installPhase = '' cd ../compile/${arch} @@ -66,8 +68,7 @@ stdenv.mkDerivation rec { description = ''A Parallel / Multiprocessor Ray Tracing System''; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; - # darwin fails due to missing Carbon.h, even though Carbon is a build input - platforms = with stdenv.lib.platforms; linux ++ cygwin; + platforms = with stdenv.lib.platforms; linux ++ cygwin ++ darwin; homepage = http://jedi.ks.uiuc.edu/~johns/tachyon/; }; } From ad565e992562d43cb9e6f843459a2ac1c35790f5 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 1 Aug 2018 19:04:22 +1000 Subject: [PATCH 072/258] lensfun: Add macOS as a supported platform --- pkgs/development/libraries/lensfun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index e9ba4ae5ac2..1c9c66f8936 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { configureFlags = "-v"; meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ enzime ]; license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; homepage = http://lensfun.sourceforge.net/; From 0ee70940b148d02300e6d8572620c2dd199fa413 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 1 Aug 2018 19:04:45 +1000 Subject: [PATCH 073/258] osm-gps-map: Add macOS as a supported platform --- pkgs/development/libraries/osm-gps-map/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index febba5d5703..b7033ea4ddf 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = https://nzjrs.github.io/osm-gps-map; license = licenses.gpl2Plus; maintainers = with maintainers; [ hrdinka ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From 61cbf57300c91d9895c79e3d758ba75dbfb4e020 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 1 Aug 2018 19:05:22 +1000 Subject: [PATCH 074/258] darktable: Fix compilation on macOS Only compile X11 and other components on Linux. Use DYLD_LIBRARY_PATH on macOS instead of LD_LIBRARY_PATH. --- .../graphics/darktable/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index ac44a1e875c..51a401d4b8c 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -3,7 +3,7 @@ , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 -, ocl-icd +, ocl-icd, pcre, gtk-mac-integration }: stdenv.mkDerivation rec { @@ -18,24 +18,32 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; buildInputs = [ - cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif + cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libsoup graphicsmagick json-glib openjpeg lua pugixml - colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme - osm-gps-map ocl-icd - ]; - + libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre + ] ++ stdenv.lib.optionals stdenv.isLinux [ + colord colord-gtk libX11 ocl-icd + ] ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration; + cmakeFlags = [ "-DBUILD_USERMANUAL=False" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DUSE_COLORD=OFF" + "-DUSE_KWALLET=OFF" ]; + # darktable changed its rpath handling in commit # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in # the wrappers: - preFixup = '' + preFixup = let + libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libPathPrefix = "$out/lib/darktable" + stdenv.lib.optionalString stdenv.isLinux ":${ocl-icd}/lib"; + in '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable:${ocl-icd}/lib" + --prefix ${libPathEnvVar} ":" "${libPathPrefix}" ) ''; @@ -43,7 +51,7 @@ stdenv.mkDerivation rec { description = "Virtual lighttable and darkroom for photographers"; homepage = https://www.darktable.org; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ goibhniu rickynils flosse mrVanDalo ]; }; } From be81e1e29c895e50a6e6d355da4a8ae00fbf0fad Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Tue, 14 Aug 2018 00:15:36 -0400 Subject: [PATCH 075/258] gfan: Add darwin support --- pkgs/applications/science/math/gfan/default.nix | 11 ++++++++--- pkgs/development/libraries/cddlib/default.nix | 2 +- pkgs/development/libraries/mpir/default.nix | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index 65d551f39a7..d2d1ddb6584 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -9,15 +9,20 @@ stdenv.mkDerivation rec { sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56"; }; - makeFlags = ''PREFIX=$(out) CC=cc CXX=c++ cddnoprefix=1''; - buildInputs = [gmp mpir cddlib]; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace "-fno-guess-branch-probability" "" + ''; + + buildFlags = [ "CC=cc" "CXX=c++" "cddnoprefix=1" ]; + installFlags = [ ''PREFIX=$(out)'' ]; + buildInputs = [ gmp mpir cddlib ]; meta = { inherit version; description = ''A software package for computing Gröbner fans and tropical varieties''; license = stdenv.lib.licenses.gpl2 ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://home.math.au.dk/jensen/software/gfan/gfan.html; }; } diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 058ee893c37..68d34c75c01 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron''; license = licenses.gpl2Plus; maintainers = with maintainers; [raskin timokau]; - platforms = platforms.linux; + platforms = platforms.unix; homepage = https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html; }; } diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 2ecae98387e..fe9cd6f492e 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = ''A highly optimised library for bignum arithmetic forked from GMP''; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; downloadPage = "http://mpir.org/downloads.html"; homepage = http://mpir.org/; updateWalker = true; From c0c854da9545a48c328250cfc9338bdc3ac911af Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Tue, 14 Aug 2018 00:49:22 -0400 Subject: [PATCH 076/258] zn_poly: Add darwin support --- pkgs/development/libraries/science/math/zn_poly/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index bc322d4c534..19d63d89834 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { libname = "libzn_poly${stdenv.targetPlatform.extensions.sharedLibrary}"; + makeFlags = [ "CC=cc" ]; + # Tuning (either autotuning or with hand-written paramters) is possible # but not implemented here. # It seems buggy anyways (see homepage). @@ -45,6 +47,6 @@ stdenv.mkDerivation rec { description = "Polynomial arithmetic over Z/nZ"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 83279da92910c8cbae0e0a89cd6e69d79fd71833 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 14 Aug 2018 15:26:25 +0800 Subject: [PATCH 077/258] firefox-devedition-bin: 62.0b15 -> 62.0b17 --- .../firefox-bin/devedition_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 0961617b9f3..fc24898b964 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b15"; + version = "62.0b17"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ach/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ach/firefox-62.0b17.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "7d11be235a8c4b207f2f9e3099d01bad01ab78c224d383eff4a0882be2fd4858d1211b49cf2f996c66acb35852d779749ae407723e22016e7a8310be716df397"; + sha512 = "e039e831474ad897e02025413a582b55b27c67fa7e4745042f4f8be5f6c9fa7f40e4d82d05597629ffc11e8f02568ac5ba80dab6028f58ab56663d54c2e15a73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/af/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/af/firefox-62.0b17.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "01aeca82cf9de26aa8a6a3b92690d906216cc7094a821abf1b585d2d433d93cc9931be27d5807eb957fa0cc2792f310dc22286a5404b2d8dd9a4c8a401e077f5"; + sha512 = "51d6b84e6ace621c670e443a75565e18a6aaab48e3f19598d3710bb4545cd317a753cf07090fe9dcbb8f11ad905900b3fc6d6b020218717ccd4666f4b791743b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/an/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/an/firefox-62.0b17.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "88e42c5f8af586ee5d2f2d7f942f666b00472c26349065315b63af1c927d58bda9fa2b2b02039aa2a4691eede934e42c1759abf4c58a52bce2a50783c9314be2"; + sha512 = "9bd7222734ab1ebbbe196baf7c21ff0a6d4e2a60f31f870d02310a9d79f63ad5cc423da0b96f2f5026f59d8dc2a1ca10612faf680e2b39c75da8305b3de733ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ar/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ar/firefox-62.0b17.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "e942e3e8d565d8a72177d06e7a0300986a766d05a3539c177d8f941c760348b55c9dd01fc1d43a3bae89317d204666ae4ba06e067a56c437bffbe00c5f24ae77"; + sha512 = "b8ce2b0cbb18c9bbd9efe40859b65b9f0bc3c98b3085f90619ed84aa13a949adf46862d6cfc5d2e519e198a5b4659ee7c6658cc07904ab71990e20d1147c3b4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/as/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/as/firefox-62.0b17.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "5a771c8ef19a8f5e8f6e368d665fa331b611c446643e11a238646ee20fd8ea6963450a0cafedfef611dcc2e524b51b927d6c6e86ec89367663291554959fc5d5"; + sha512 = "3f1db020f7dc88dadf13b12b3c5c74ef5ee4cf61f1a0e1faa49e403ef7c5307420118c049288cdc0151b47f075781a5164a9b4539f2b0e3072cedfbcadfcf076"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ast/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ast/firefox-62.0b17.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a2ac24d391cdf7a72c08e46be0693ddf0f74b23bf4da12ca91ffe12040c753ba86901d0b8dab81ba344edf87df008aa551756eb7f47c3c3c8a669a7d2dfa2f8b"; + sha512 = "6a91664c66d275c5adc08c22f611905b2e15d5739ef0af9514e923c8ad4baae479cf5bb2240861ff9075ce99180f6a9cb136968e65367dbf53a0ad9621720ea9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/az/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/az/firefox-62.0b17.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "b8344798225bd0d2a1d1cc6664d3ba0adad345ab459346d5731835c9a554814279855224ee12de1a768e4c3413c0d4114917bb7cb8bee858e30570a3165cb39b"; + sha512 = "83db2d53eb86da5e409645812b1bd48c0f315e0afd6047567c62685b62efa7362cb46374defdfd935ecaef8e83b469ad5f27b99d12eee286f7cb12efbee4ae9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/be/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/be/firefox-62.0b17.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "f956abcd5828ee15877d6aa857782f6c6294c4592c92c0467360ac55f30b7a6e76006767a0282dbe719793b52e8741f99a107ed2933cd2c138594366302d9fa5"; + sha512 = "13bd2cc3266c63ec87bd7cf1d843b4d93c6178a2501d5b19e797493da20b7b4963d224553aa9b246d49cd444c394127c91e2fb772f9fb60135b798d9ff856e52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/bg/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bg/firefox-62.0b17.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "6791e277c6a80b3382f870c8d1f317826f99ac447716a72f4186a42ccea91a8bd60cbcf5394f02b943257234cdaf8e1cf7297bb009bf709c09238b5ff82ac0ae"; + sha512 = "2ba3401663f896b58aee0f19ffb088429765627852f0406d6c60c2285d441f17639d4cf102101f2be7a29ea0d15f615db4fa3b3584466b06d8ed52096ee98178"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/bn-BD/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bn-BD/firefox-62.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "90532dec2d4d689fc2df62388188bb70e4860d67d7c5ba513e6921720624c139c6b387c4c5c6b29288e32ab778d882d74bd0c7644f9469be7ed2991ff26700db"; + sha512 = "e39d0760ad12719b0919659bd0976a362a6df65bb2c035a7e0f6e3e58f771e821b8ce02fcbf32b7cdd5d2ffc0de6b4b40ed7301f1be0293596b509a09a2c4c4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/bn-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bn-IN/firefox-62.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "c378c9e28a82ca03a3c51ccc79bbc3dbf01ae485f0b258fa146c3790dfe484ec1de99a4185a7e1751a2a94d0545a45060535bc03533474dd3136ba28fef8f530"; + sha512 = "7929ca419228b0c3aeca4131b1952fa1b754278d77134abc4c1b4ee2e91f8b6349f5e6a4f1a721506262ab321196cd977cd446787c9ee2a3b2d84dc2610bed0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/br/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/br/firefox-62.0b17.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "1ff6afb621415159237a5bb8000e395a916be6cca60adecabcb6929bdd15bc51421230cc2e08986592d19bbb455ebf8473ab9d83e07944c26cd431c25d3f87bb"; + sha512 = "750ca92294db2f3180e0bbe2c449b42b5ebb28ed71a5b5f0fde1a0f033867cc642d244bacc3578eae5dffb787b9732510f7790c4ffaf2c742916550e5193c30c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/bs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bs/firefox-62.0b17.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b94236fd6ab61b36b2c2719c4bf0f0a285e1f930dc91f39787e16d776f447ef48a9bb6106c82cb11fd0cbebc198abd3502ea0ddeb5c9ce6a659f16383b50ce8e"; + sha512 = "585b4cd4d7ef1d9cc2930f9b3fe12509468b52ba0f99efce40e56e28e3fb53c60248bf6362edcdca518a49e9667b07a1ddcd6bbb33487673137246b404a0fd02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ca/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ca/firefox-62.0b17.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "b8e385f345e4dbd4836deb0394ab95b9b3be51acb3d32fd2d892b2ef9213126f1a2cc8c191d5985ef15dffee42b011cae94a6d13cedb1e16b09d71bdc5f1522b"; + sha512 = "65c5de7ede82ee5c92903e37935a08be96b164c20031d389205171de6d4afbd37b87acde1717c0c26fc4bfa942fffca97a03023de5c4a6b8b4e9ead07c8b3528"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/cak/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cak/firefox-62.0b17.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "b08bf5cde25803b2e9f4dbb3b7abb5b76e0c851b3d933131c03ba84da500d0ba97d6e2cd21d99b4cb8cd6c2eb4364f3bc5668522939eef78ffa16eb7a646e6d9"; + sha512 = "f4aeb3ed7fde6c2efc50c4170fd52af33d223352df99fe80ae7f9ffc79281bd6cca55540060724ed237f81f083a1052e389003cc66fc910f1d70beacd59b2b65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/cs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cs/firefox-62.0b17.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "d8c219b086a05a5f4455fa38b0c965d9e4436cd2414b19c967a906c941e1f64a649ad1fe669b54443680adfb681887111d8181a40411ed12db2f4adc380b2607"; + sha512 = "2bc2db8f32b38c4fd6176f674bc2b6fd01a0b743c7a9b1a882f37357a22eceff62f55207aff17f8fe61808ecc2ca5b813471c3bb3e0accd840bb45e34f05edc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/cy/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cy/firefox-62.0b17.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "1adbcee99851108258551b35d2bee5e98217efda837211ff9b975780ae8e626928aa080512fb1b255538c403f4a3ade0ca7c57d6a9b2b9068d01ef7dbfa1d2b0"; + sha512 = "42a7ca67d0f882adf403384634e84c8606b6b155af5afe463829a791f5605969ebb2569c74d84bdf4b45f7bf1b0297b1b3b68c2a404bf8c4487dae06b43564a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/da/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/da/firefox-62.0b17.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4727659ce6f6b0e33b9616b344c4699ea8dd4d39fffc42b068e798ab5228092ae965d67d7ecdaaa6a4a231b8c59a93b54ab0685a2296e314a5d418816dbaed4d"; + sha512 = "942836a33ed6044ea8de524ff235614f7b05cb4efc09b04782154497b19d8dd548dc46f630fa49a4da619c09e88a337359c9102f605139369d1682c9b408cbf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/de/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/de/firefox-62.0b17.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2e19697cee8fd11f59705f92331fc48ae9faf1d928cb3c56359f4456ddd55e06b17a59a41fc0ad4f98409166910da0e78a0d7c900abf5d79b478f58cc2b21a06"; + sha512 = "c11ff6ce36a730b00a42eb134209ecf18759894074c8956062d82135540bc3e6667df228ef680b8b7a04be8d3c55b808fa65c8b4f55f41874319d93da1db0012"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/dsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/dsb/firefox-62.0b17.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "2d251ca208bb1a86ea65b17531f027fdd27a2415113ce873a9f24ead27391161a08299d2ddb5d737c3ba85e8f7c691094b2886cd02c3e1054ce7a5fc77b2203b"; + sha512 = "568f5b808c9038668e1c1c42b6fb5097d016dfd62192219fa8cb42613206e6814cd58308cf9967c634a332b135a9303e5e27e85768ac0f2cae482ac0566e440b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/el/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/el/firefox-62.0b17.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "355319f9f166e4b37e9a8ee3735bd7321ed303484d4a9257832298b712feaa47303ff0c20436614a648ed0cb2603dbf896a2673238a9fe0d36e87646c0b98e51"; + sha512 = "9ecf0d27ce9f4f5f7ddf5d9ccaff82cccb47f4083ac0113175a909657362bab7ce80812752ae425de9adb7e87daadd6d3f512543b636bdf9d7bbfa8a908e248d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/en-CA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-CA/firefox-62.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "94aed17b4830e301837c207a2d9bc5859c3257de19f7d6ec7b946fc0248e74881587c79387c1a58bb049817fe01e5fb1fed86f1e36576ceb2cf551bc0bcf74c8"; + sha512 = "1a9e0bc564d36ecdc8e906eb079bf6d3368007cc5e8fbeee7520eeb75d9299e111a556745d594274bb7882e8a513ca0894d3018ddd6ac9177dc2c1d336804dce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/en-GB/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-GB/firefox-62.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "d3a930d3792a0972bd4cf797c4fc15021926cdc08e41e4c524c16c2fb5f51a48a23b8f771d9f17093bc97bd15faea83fb38f825bf874372067ddd54b461f5f8e"; + sha512 = "b3cb6de9a31029cf019db888eb5c4680fa20f4d21f0dd9afca02b35ad039c4c0d844bd0ec8d9790aee0b583951874846d30b6f506f21db2617af4ccf5ab98304"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/en-US/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-US/firefox-62.0b17.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "4dd33a755056d2904521a9db642fb42c45750310adf8a0d83b8c696eef459fa93cffe0cd0299f31fb7cc94d6c1e77c14af44f24bdf702934287166f9747fe564"; + sha512 = "6a4cccd98f9bbd25ffe07087c847e22d62e467baeadc467b33c057b96a94b93e2821b13f8d6d9773ac7c182e06ec2b42b9c6abfe9b20fa869b72d2d7873ab213"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/en-ZA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-ZA/firefox-62.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "17d9700b90c3372d441b9b3f6842e75c89f80e195e1ca4ce63e9829be3ae70033fee3ab3ff8a0c7dd6ec3da8f012c0557f33f4964ea3b5f241ffbf2c1d257341"; + sha512 = "b7246ad58dda67f3b8958a54817bc80610427f2978d0a8398fcf38164f8f9c96137fdaa2305be3830a42143b5549b1a3a017adaec9c5c9a2d07060daa85c5e92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/eo/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/eo/firefox-62.0b17.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d9e14b5791bf5d522bf5e72ca8129a60b78c455e6a35b7b2091d27b52bdbe0515083ccc32eb31dafcc99fbe7fe7f4ab03ff2b45d7c8edea7caef378c2b77b0df"; + sha512 = "fcf8915c6cbbc578c81888459db625236a3f3ceee7eb0076c43427731aa9ccd4476b4d1a5dc5656ccbc5d5a75cec550d4e4c39c894529651a499db4fd8137c81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/es-AR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-AR/firefox-62.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "aaec8f063aa555a040e293b29ef359a5c1ceb2bdbfdba4d2c3c72a7e2aa98f204d37755be4233818bd03e3a2744c1834758126eff9b0a61d63bf662d5810c33b"; + sha512 = "9cb80b1d9182e7f9e24d1ab71c6dad4d283b11f0c8fc1074c5e20a7b847d008575edae6ac1d48eaf64c9acb239198348a08b930231dad156b3209149571f6a0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/es-CL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-CL/firefox-62.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "7e3af8b5f396382694f4c9e82951b59f59b9059faad0703118b2ce2dfb2060d6755a8bfac1f165dcf12bcb0ab2c7826e6ad1e73e8acaf5198819f9cd55dd5362"; + sha512 = "633e9ca0911086309b6fdb15389fbacc88f32a3db0fa8d7420d7eec3cf11fbbf1f548f050e3e88ad0cd397f055a94aa9516a2e2c4fc2eb793f0e8e38a096ef3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/es-ES/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-ES/firefox-62.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f790215a1b1d2714cb030103455f2fc8ce20f46301b301173ebda0db001c26772933a774714c78e72f5fdfd869650cec7aadafce061447916f172f7226383069"; + sha512 = "ffbb61dc9fb1902c334d7d4cd023fbe09d3cf1e2b44bd1a1d5f286ecae5b8612b40b498ccfd01c86ce6d3e5b986adb9a6a889909095d182e003f06bc0df3bbe6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/es-MX/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-MX/firefox-62.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "0b87b7ee487214d5d5008b5d1954de01f92c17d44b94a926beebb34423bc2b178cad90c3173594a3e7b2cc3e6d4c29d7d9aa972975b397ed9762a0d54598ad20"; + sha512 = "489e1b834bc02fb54500e9521ef18971e5a17f03be582447bb68330e6cd679a3f8fa59655e46f7f9f8c8d6093d8b9a17a5500b53a75e8e2f48670b9f0560ba56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/et/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/et/firefox-62.0b17.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7cf0b67eb011ebff7426a13b4c0165585cd5134bc47d0327f3fce4155a30b4894b803c34b654536e0a7f78a8df34dde24e2415c3d9e08ae14886525a53d9cf11"; + sha512 = "7e6c9888adb48210b40b7652e5d02d4bceab9f11e4b83df43d334cf0dee6eb4da408d1a9e63c6fab0ceef5995476c0534555096e91c59456104634eca3851bb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/eu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/eu/firefox-62.0b17.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "1d41f7351e72916dca3033616ebbc2da3e2be1834560f25dc824eaf420070a472b9659a3c278b7f77d13d8143fbd3eb5e70184491bbaec75f6d3318a5090a0fd"; + sha512 = "d17b5e9810428a4268497fbe94b529b8151dd38e44a15e99b9e2bdfb756da2f9a9d02d3905a4b6314076281a87a2a687827cc81cb98dd9eebf7a6bd73f9406ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/fa/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fa/firefox-62.0b17.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9a1ec01acf7a26f5e27784502b902e1aefbc27e92ad90a7f6167dc2af2e690ad9f1be3ecc553783ec11193f87aecc17e4a6e1132ce527c120cac191661926373"; + sha512 = "2a4eda4aff30d19d855015451cf1ac20540d6b462d6435d9d36a7aef6c5cc986991f84e8e24ab0c2dd19cb2556a15d96e8e28cc05c72ea028f91f98749945e79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ff/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ff/firefox-62.0b17.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "560a4c9d6b6abcf2c77a1bfcec21658ea009f0cbf9c49057673d85ef8be9e550f862ec05edef35bb1b772d7d7c8eb367bb1779b93143277ca4b770267552b523"; + sha512 = "dfca1b04004b51a8ddd77c68be9e85e0ece4147d074c53f912029934163e56e3e09cac1281f8bb4514393c3f5aaa9acea27d45a59707a80b75fab933e25f51c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/fi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fi/firefox-62.0b17.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "1a45bc84080d0bfe1f8cf6e54b9af6fcd752d25dc6e97873186d7e0fc6e9ba3b01140c7244589ad15c78e3f933030e93dde91fd73d2feba0240d0aa8615e1a59"; + sha512 = "bf28291a72fde1f62799b5b4794774ae3df1596d1a07678696781949e6f1c05f9751f5c43b1cb21191e7c16d4c8c67f295c53358d9995da41d086b4ce907607c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/fr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fr/firefox-62.0b17.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "8446ee45d85c0d52d4b39849567825f82878c40ef8936e526752efdc84ae71ec73478065bd5ddd6fafce0252749f3f8f99906271076aa737883c512c81f7af1b"; + sha512 = "7ab5d5b2ac6dffc0cbffa22971eaa72999475bdaa5baf3dbffd5ce4c2b01027a4c6ef517d4369f86f692395721d9032dff667c0b07ca402ca8d1ffc3e96febd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/fy-NL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fy-NL/firefox-62.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "32e48085d55a90bb632e3e9eb690ef5197a17e9fb2984eb4bbe195aada475027cbee14c8bafb698753b2c0c172dccccba02c1cf5ffd5dee9bd15aec11feeede9"; + sha512 = "7fd419e89cefa2b387b0fb23cfc252ce3a1a628c0313eea8153a8e82da2f74abe069c8c88a3ff80e0bd3c38ec91ca7b6ea7a41251aed3077cbb69d10ca398ae4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ga-IE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ga-IE/firefox-62.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "6b034e99ab67ef87d3a691d455054142fef9b7af46a02b870aed12b6297a4e075c880e4c53ffab9a2dd787380150d292c3a7348b3b0e53ba07fdc9626ecf4c64"; + sha512 = "73676ef0c8568d1d97a7725bb4e4334581bd0e09c3d4d93b276ef9345626841c83659791046872dc04631ada4facec7386e07969b9d6a5b8fd37aeaedbf82a6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/gd/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gd/firefox-62.0b17.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "b8535c0386d3dd3a0070ab768e1b641a3b019a5fd2f0477219756c002883b418ef4a801a1e4a659a697e9dfd731d6032bb50575bad36f103c9c2d97eb081588d"; + sha512 = "fa8bec8df767f62bd361e346deba0de6d994f7d84334a2adc18cac6c8b4454ef2be6e772e34fad41b5c608b9b2e82802acf171c50acc3dd75a5b16bc66768105"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/gl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gl/firefox-62.0b17.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "676ea65034060f71bc23dc1702d15c2ea98700b082b943f022576361ef5564481cf3072dd05073b7a3294f39105fe7ca28a49d0c17654722de9e85aa587c10ee"; + sha512 = "f58e80c8cda4777bf49ec736dd1cb17e25b7efeaa791d385ad8af63ddf0f6ff01fb4935f8e006b73555c2c351d32566a13164ecc00ca611bd2a6e5403a2a5fdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/gn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gn/firefox-62.0b17.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "28130e7da8d83dd8add45b68d5a6137ee8192cfad43ab70f507084c6d2ece47acffd7a683261b12bf494608caf1788f6978f51102711c05c4f7a6029da131080"; + sha512 = "9665884890f6512e5f460ae7ffad24340a545df9f14fe20a39ff6e8363dbabf095bada881239b57203a0b4da1bba9b16551c60d09510a9fd2cd7fc6d5c1d74cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/gu-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gu-IN/firefox-62.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "c31dd3ed5ad8d4508580854b99f4f9a62efc5a565141003d25b7ef6ddbc41dbf2f78bf8c51302c91ed4426cf215c38122d5e1df9dbbd59e358f8e6601ef8b1fa"; + sha512 = "92bf250acc6e0fac999ed4adde4d5412ec87bfd4b70478dc0313a322be55ced401aeffbe3fa1fc77b8fcf8c8da5e47490147e49565eca9c0a0ac37e50b31cdbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/he/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/he/firefox-62.0b17.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "5a203e14b03ae9939c71b05bf962ce7dbbf354e99989aa82ad23ce971f047799d13ebd9d813a589295efcfa488e32eaa63e23f400f0c951441c161c427f7c8f7"; + sha512 = "be1157e943bfca4e516dd442ac697cb7182590ce15bb7cad3ea11ae438c5fbdd8b86b3102bcbde78f7a2dcdee54ef0886b130276c5897e3eb55f364ad0c0bf34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/hi-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hi-IN/firefox-62.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "c0e3b7faf7d3d1b727d8f17b8db0e6cb06a6000a6529df65300fad02addbad7d597905f1211217f291346048714752082c6dcd5228a9a814a558badcb7db07cc"; + sha512 = "30616cd4e6ba7fd9d98bb7b4b95a86bbb956e58d6403aa9646009d26dff2a2f9e743d4807cc178babd083b5725454384fc646a266b0b036a1ee03d9f6380ba53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/hr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hr/firefox-62.0b17.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "70edbcc945567810a6bd2c075df0c44270684a313c1c989548ebc53e754f6f1d4a1f4cea80bc7bc3289c6777f63bdf51957f596b387549b892cf6e1c0c1a0329"; + sha512 = "5736c7ad3467dd7cb01128184ee4de44fde57add1df07d0538387f527b1ba7e0c02a1d50a3e90610d368ec6bcc86b12a63a2aaa6fa37b842ca258b604e0648d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/hsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hsb/firefox-62.0b17.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "1d1ab5f7b3eb32569eca8a283d24c82b85931706df54f2286e0221c5a8cd74a01ec4b36451ed8e98255c9e8a02a34fb3bf92a81b738bdd2634ee62cb053042b5"; + sha512 = "74cde3231acba2627134639efece862877eb66b6852b64d3477069258bc9f6cd333d602f5e6f4216515268acc8e264a54e24b6139aee0564275b74c424847e4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/hu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hu/firefox-62.0b17.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "295527a482c786d5e993af7677cef3e136768b087b53ef771a495ca3e2a0c84b1e7065e1956c63acc90a8e7b7ea1e127820688331f2ee0c5b5c06b1ba149a2f4"; + sha512 = "2ac18b1795fb09d39a6dfd4a60d1e99f0107309868a90c8aeb29e721408b886dfc8a53f8fce0572ae91b004586e4752cbf2fcb5a5f907557599cb588fbe8ea19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/hy-AM/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hy-AM/firefox-62.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b7711c9385063f723bb5105ac9002e74369796eef15a6da575240431401aef6d28625c1909a8a8145dcf25f761d710db53a1a3772aa0479ad98bc2054912860a"; + sha512 = "a58c8aba9a0ba03adc349bb75a236c06a31d9e627b85ad46b112e1a34b77b9d14d4ee6636fab0b3b1eeedfb494db7129371928e638540393bb9dc468f13bb7e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ia/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ia/firefox-62.0b17.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "4fee5ae5167a1db8e7c2f1e5880255bd74354fdf8f1aff4336e384babe80d8240d1b2731831d73bc7cd780e3bdc4dbd6a8692f055fe3a35a1b3a240a28dc38ed"; + sha512 = "02b3134b0e46c3029732876017b87464d9c5e69fb298381cedd70dae789c4a79c6948f0b0650cb567eec989fbdc1c0cac077a084627e858a5449dd5196ce39de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/id/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/id/firefox-62.0b17.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "df8e25b9fa8a563193051d4cdc4896812b4cb5535b335d560b56e5b2eaacbf2e60e5af1645cb27e4318d0783a08a299c822a98aab528876b6eaa8baf5e1bd634"; + sha512 = "4ab61d1f55f29c7657183e514c90b58f7be50e6e421a579bf95efe03257d58d9c751e8bcfcf35dd5116a7c898b61fa56c3ddd39150d38fa99b7f0608f2d42c3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/is/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/is/firefox-62.0b17.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "76be24db28ac52d4b76b6f34d5f9868560d6413cc5967af3eb03f45fe89a290816078c3ddfaeaf0ee4520e4c2b16ea7855cbfd617a7915450e0306f96eca60af"; + sha512 = "c226d9cc2481c199973efb047f98a92b47d325cef30513756bf62d2df10cef578b21a182d36c8bc8f3510c48f143229139f3e2758e916944bc1f0c8fdf56230a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/it/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/it/firefox-62.0b17.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "93bb22e37d3c733fc311e369f1b5016ac7d441d946488a5f3c0b4d1c4beed1c7996afc753df14047e6bf66aef3151ba373d44b81ee66c3ab679de96b6c057a17"; + sha512 = "99bb797482557cdbcca6a1ac50c4214d807ca6db2248e39e6c98b6d2d627763652f21654b937a380f521530186de602e0dc8ecd0eb1a2f11dd99904aa2f9719a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ja/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ja/firefox-62.0b17.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "07af00e208dfdf342e7d558e7a56b766b479d77a27c79f121159698523d401963432b6387f20e323fcc070274d68372a2838b4cb7bbe27dd14d51327871b38a5"; + sha512 = "8d15ca85b7754529bfb275acc46f61129031a7a9cba7c7caad31e9608c677e2049f4a09bbdcf1f6d3c1b550dd4a8196349bff8937eafbbfdb190e8606ac0aeb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ka/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ka/firefox-62.0b17.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "8d485b8bee26c7390a0d98eb1129c5bb832484c1429ac9384805775d9fba79f21368bc82b9f7f342c7bd27ef65712d437f76b751a57986d4fba218a67595d6aa"; + sha512 = "df10d32090a66973e4dda4d94d9c736e0a18f00c701235a20e58164914e3de59653903aba094558f7d7b3ba05b8d5abaa06ca0469437fef8d9d97f868b0ae776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/kab/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kab/firefox-62.0b17.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "fb1ecb5df183a3c65978c0afe193add9e792577d0fe6bc62b47b313d0f47c0c8dd989b03c9e911a112cd858d08a44b0db857ccc4b3901c005f8ce9310ad4f98d"; + sha512 = "29199f1589d24d982561fc41087b94999d4c0baa352188501b7cdfe50b110892b33cd2ab9f6fa3bf8420b58b2d7a9416a74e9cb553888dc16c1365ac0ae8eb5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/kk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kk/firefox-62.0b17.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "cbe184cd7fbf5e88dfc93d058752499ce1e0629358ff2e93e1957f4b5dea356a2daa80a0663c5cdcb93e62a4a1b01bd468a813bae22c6b72a46cb4f245906b61"; + sha512 = "92d552f5757576f2c9c3be7c7fd283a179c47f1b8c51675a4f8269235a29a3d887bd2ea6a8a30633c132223223d50e0e2ce65a50003df2638f537d18d09c9705"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/km/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/km/firefox-62.0b17.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "01666393b46c34fa40568cf52baa67dcb27efcea8724562a66c4e6c74c92acf2e9fadb813887a5c7f1607ad2f36239bc93af9c9261b871bec5b4e778e03b286f"; + sha512 = "5dcf9ad9af1685968c011fd22436ce226884967a51c9ff2b05f54d90f853d95b3e586137f5c2e24922f685d7c709cb8077a23365b5c226639ee4c89a21f61767"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/kn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kn/firefox-62.0b17.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "a82dcce6ebd702ec337f3d23a9db7b1281b9d4c271b70cb6d7ed752d8fdde18b35b29bb694910236bb96be9eca71e2e57e9e7b672ebe92da124d0fdb773638b3"; + sha512 = "8f7730140f816d6ed4abf7a61a89c8e6ce8fb1242b3bdfa9d8209c87c3e2c7f592f946789aee57eef33176671748b04615d3d8f433c39a3c5e92501bb663e00f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ko/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ko/firefox-62.0b17.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "60d9c327273711b0d2c3b3eccf858d0b8c7634992693a1970368306a0c35d74d651138c5edb4a5f3495c1692a3e8037247c66529b8b84fe4977c5d912d83581e"; + sha512 = "267f33b76df130d1dd06750d547db570a68539a05c9e6a1795ec02898d78fd54cf72a1dbfa8b74c71882472b11929b7eb35cc5c792e374d803236db7be64d5d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/lij/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lij/firefox-62.0b17.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "81e9b8846503ff00b05530d026fcf3a0f21808e4396aea1814db46f1254042062a15be3044dd80bf294bc82a26f59151d64f612e380a305166b9292a53adce3d"; + sha512 = "3f55b56575eefc2b515d540f6be6f907b215c244381cdc858231b85e8687f8bffb6dfb25cbdaee38ab536055a134a206816afb71307c61e343e5ee473189df48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/lt/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lt/firefox-62.0b17.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "670286825b5dcf853beac6953386d5431de65355c5ada86f97b711e618f0a401c5253c3c19917c837fc9eaefef660572d4f216f8b5b724e16c900a8eb702be7f"; + sha512 = "4af80a0b429fd1800fc6979384ebbaa3e9b13c136f48d12b2cb25a13f10886d85f864aa8a635b59e827ad8d203a91b7c2200278bb04ced4db20e5c68984a150d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/lv/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lv/firefox-62.0b17.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "edd0606ad14dac7d7c21f673b43e10ff7bc7a93961e68c980b972ad2de75f08fea573edc4a5fb119d3cc7ace585609212a3c866737734d2d7f78922b4e82d56b"; + sha512 = "2ecf95f3334eb40af526e40018021cae7a4ceec929e02f97dad31d468231691b7e4bb29f4bc0a6699a90b45c8ac7df59699ab3c75c7e4dd1c76746b4dc62c542"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/mai/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mai/firefox-62.0b17.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "e0061b255b0da95f1273978f1be17040202bbc5c56693ae056463562b5b46dd34575007d6c19a974a2b2988ed1839dac192dafec38e0351a75a8d0ce3138d440"; + sha512 = "833466d1d6eaf4352a1488e104cdeaac1fe7d05e96836a2187f71c9fe81653a7e26d0a488605d79918c8004a9776c86d1f29ef22df14f505dc58415f89f7dd6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/mk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mk/firefox-62.0b17.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "4e68db3fe47b2d8bb508b5563ff6e96538dcea0de33ba1fe843b7e0b1d883d6149890c32e42b9bcd90e9dda8cc66775e1017cc60cd7588c01cf2fdb69ffd63ea"; + sha512 = "76813a7bb7e01d8d0c9d4ac1c3069af5cead2447480490605797459944e8280c9350fe9df7f12a8dae491710d0d374021b99c0d4b902cb734619b9863b4d3ab2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ml/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ml/firefox-62.0b17.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "f502f31478ff8c69604bdfce7bebcf1a1b4269ac5e4494472f9122639f6b5221c11777150c152991ae069c8e33cbe701dab20443f5c4288b6ded3bb11c7041d3"; + sha512 = "9e30775adf279cbde154f0fd392acb4592b9c75dce0532435753bda755120c2d2eb61f6b968dc5de7e70856339a6238f36cdf413029d92e8fe2b537f00866154"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/mr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mr/firefox-62.0b17.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "55c6480f79e1010323543ea40c3019a4eed002b0c86b230fb7bb392d488769fb0de7f242371c8a64fda231656ec554c5a30e38f8d5b476f55def5031f409fdf1"; + sha512 = "65ef02670895f237303184e90d06bdb6373af3f0282209588937be77c859db483843638080c35c112c2206f927b2f4221d3cd1adcc3f16d0c2d5b0a1aff7f225"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ms/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ms/firefox-62.0b17.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "cd226241e9541a8f5448be6b72f274478c5f6c69d111414fb00b9b15e44eeb899a26a4894d02d3100f41d6b0f4bb131e9f8a779459631347e3d8cbaa35e0266e"; + sha512 = "8419e15179296fc16a5d5f5d09cfe65aa0b678756c7e27faaae14b7f2bcbc724e43d5f7b710d3e79ca67beee60e5c5f452e9596779e208f58c77883e1693ed66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/my/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/my/firefox-62.0b17.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "4ae9aa1290baa307dfdb22478797c8b26eb7f4e36195b4f73b87d875ed2307d068f6937b3fc6aad605776d1fc2819d7640bdabea13fa02dcae6f0b57997e3b6a"; + sha512 = "50f99e38d85d59addabe4f2437e09c82f5e6e8a8fcaf3d42fbc234cca0c541c735d930d3cfaf7b5b6e3d7c51f1ce82cc06450fae52cfd6ac5e0ccce9e518f166"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/nb-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nb-NO/firefox-62.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "df8061d4a29a15177e77195111bf390bd28e1ebab6597029c51d47c3cc4192885e2792af9ace300f7908a34cca2d0a705af788ccdc0e213076204c6575f2356f"; + sha512 = "c9b27b683ad5b3a015843aab9b1cc73bf1bb216d5a762c273631c04306b8710cd9570109eb9d81366adec16b1138c3a4d860f2dc2497d537185fd60409676322"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ne-NP/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ne-NP/firefox-62.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "430b91f403b8b78919def773ed2af7aa8c1e711e2ac7f9bebc8c0fec8f2285d4f0005374d19ef67b0b96c022b3016546b02c1f193003fc76b8d522fa5e54a2af"; + sha512 = "e4c6ea3b5e8e895ba9311ff16413323ff982b93583be3751a2a004a855d3174f85fd3898c9f95aa88e00d307e59c474b995f3be99ba52d73759fd4b13ca6cc99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/nl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nl/firefox-62.0b17.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "01fd6b1e8aa677f5d6a138dbb012890a33540cdcd6e3cad1997c0e08bddb678a384391b206b68f0de66742a912346f3b3e0f4ccb6648f6a6007cf3e2b70d4466"; + sha512 = "cb79da779d9a27177923b211b99f06eba1b769b9419beefd9140ccd538628dc8ded5f40d87c1393093f6a7873f24d6e8b8e18b23e691e583859ba79b8fb5caa4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/nn-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nn-NO/firefox-62.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "ca5ed09d95ba1a6f0aa0df7ef55e388031ce2d176459b8d88b008b430aad319867c1229af76c4fbe58522717012005f6cd03c21755aefd4db20e99a80aeb1df6"; + sha512 = "6a7bf35979b1fc27816551429cd90cbd24c391d26aa322ab0e7267bf5202181c0a07092878be6a558f767e9c51e91ee9ee2d53a89d4a005b0f0a3ceac1859f41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/oc/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/oc/firefox-62.0b17.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "0c166dd3c1e63b12884fcf55448fb5c1ac6d87776025c7fa57828c3bb9be237357267dd1e418617c6c487d26805c5fca3db28f70c93c9de7540927431a480ba5"; + sha512 = "299a816776656628638a5c59dc165e8edbd3e84213059ad829615fb246a6de78a6a0db53585d0f27b23e1f4aea83eed4b216f7851fb918c46484550f203accd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/or/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/or/firefox-62.0b17.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "28dba98199bc1199554105a00cbdaa88f4c637ced5fa7c21b15829e135510e43bf42c87848cf32078780698c7fce59ab123f50ef38dbbabd9d67f15fffa30a0a"; + sha512 = "9a915f6f438937142ed1664b142e2d45663f56384c2be35cc1597762d6b0d681bad5456c9fad947c7b552855086a7055691e8a33e74faa486879e4fda0d594a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/pa-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pa-IN/firefox-62.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "c3cd5ae6e84fdadaf6f6766529d91b30e2c5ff77ee35f8a7f16ae74cb8925ac0c7daacb77c3f090ec1b08580252e04f08233fbb10453c1aedbcc915b124513e2"; + sha512 = "251657a065f5de9ac28e4425310048cf7960835704586530b201bb69f790c7513ec5b9590fd00b2e1b92992b3574892e311b5955bb3e725908dbd2d76ee5851b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/pl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pl/firefox-62.0b17.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "09d532fc6083d04fc8214665c95f544bd1f042042022dd8226a356186eece3ac11c4aaf3bb7bf9d4129e9e53015a7c62077bfd2311ba4da27120d0f253bd43e1"; + sha512 = "129b1b986d3bbd8f3c0895ac1705cc488f5de652cde35be767996825523a65533fd7f75564897722976e6b8be67a0711e3819056f36917048ef97306440e6c66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/pt-BR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pt-BR/firefox-62.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "70adc2ab406d9415d69d7e87e8692ee768bded857c4bce862215fc89b273cf9696a384df5b6a7891317590271c79e60bc8795bf16301e5da69bd917ed7920ce4"; + sha512 = "f15f4bb22322a95aa2cd10b33cf3e7c74a6cca22a229260118993c08fa7e3f1643a54efe9fa4d6c2241d5c1fcb60b430bf88ef963cca8a2f98c3ec9172866eed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/pt-PT/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pt-PT/firefox-62.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "ae34ca39e5db4d08a157cecc3c46bf0c0935353591df5d7120fb5d4a2a7b7963be8cfedb3178a5335adf39a9f9766083c5ea34d026e24eea0c394e9203008786"; + sha512 = "b46124a50862d268c25cba907f1788bc0b22ce926e3ea76c17bcc32b00b07cce53c3502b927d208a664c04c93405a2d199c26f56075c0c0e0e0c639ac86b249b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/rm/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/rm/firefox-62.0b17.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "cbec6ecb4a7d59665c81fdaebddb14d4405aafb750e89106d4da5f82ea8061e22bfe19a13eb2173ef528b2353d86c8be0c7cf0e9740356635426521c08ed3563"; + sha512 = "b28faa2983476e110cec7fa1bbee4ee65b064d84a18908f7698c40f2d551b3e1796358b14fac9a1de32336566e15d7684572435015c4e5ee874a8e96210e483b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ro/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ro/firefox-62.0b17.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e5f83616fc0e1def99812d8a01905ed0f7d8f22fa4fff6b53d15aa0ca78b03ab2c3d68c9bf6c13eb8d0c6c0e487e2d3fb4d14e16e6731170a37bf1465db8dfe7"; + sha512 = "676a127961cfc1a68d65c05266da3debab12441a642f6f98f3b52db5cb830efb25d7ca2bcd4ff88efd606437f5aa729c152a5a616ccca65aa51060197691a4ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ru/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ru/firefox-62.0b17.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "a5055d49fa647b160142e3c619f735b72cdd1c6d335337a2d8ae173a1f63036f9e565a5cf7d11635c130cb7ed38f40d0db4606e8fd7ee41155114e73cc1c78e9"; + sha512 = "68351211b3ef98f1930f90b807c114065b675d81f84d07cec5ffdcca5e3a9b41eb0390b7e88c0a2942056bd08e4cd5ab340abe11563886c85118c799e0acf1cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/si/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/si/firefox-62.0b17.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "09304fa0193dce43291ae95657b322d0221cbaa4f3e5c54b296e52a804d0b2df2af7aa167886e7678f7f83d24f6cf96b7110e1dc9c966bf1a90f75dcadcb1830"; + sha512 = "34a4af9561360c154e2e9ffd0556f3e87cff6cf2cab90459916c88967678c6b410690607b9a131c0b0aecafe418a6e368666defb5d3b16df7c0d2641e95c42a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/sk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sk/firefox-62.0b17.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "5b9ed87260633e96087d86ec100030999283e02b7288c7bbc7a7a229a4ea12ca33af4c09aed248e0bf6195eb982d2462320fa6eae2ebe4ec98d1873c0cc2f22c"; + sha512 = "450bb4c94f380ea801679c8d4e44cbd520a3137486572ab7bb3e521ae9dfed55568c460f83f1383fcf30c581a526c9d03801cb3175e2fe70796ba88428aa729b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/sl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sl/firefox-62.0b17.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a06a5eb4c7aa46dd79df392b6abb2a7e8d94c515a318d6fc154f03715dec197d4311ae2a54929a24134548acec02a662d2111866f6f69668d20c5a8dc802ad0e"; + sha512 = "dc7aab2a519419a4d0b14a4ac5e137440569e35af383fc88638d6aa1c91a5c722b62bdaded5cb18f2cc66f88115a7ec74590f9c98edf18736c6d2833e435ff8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/son/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/son/firefox-62.0b17.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "3a4851ed7e4b7be4a9c9d3125a3867d18e1b27a492848ec3d4946c2a755e191da44f10988e12e3644e160c633a3a78cf65c7aca3acd05c383a2d00f5deeaf764"; + sha512 = "d1d676333f6ebd8ba564e1aa49a003b0ae901646c86d4d58649fa92db92bf67d0d93d6a2f4878361a704553a2fe922bcb0c657872f5e759f0358d0e44a6d2539"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/sq/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sq/firefox-62.0b17.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4b36d0b4be8596eaca519a44c9d9e0a487c3239de5e2f9b8e8fedaf116d776dc5904a0cb64482465e329b303c3e83be2b890ef775fefaffdf2aa085d08d9adf8"; + sha512 = "736f0f8b577bdd2934d306a1674b1342590b62fb472d79d1eae65741dd0c670a400edf7e7d5caacdb2bace402b37fd3f86076a03088ef1343ee1fac02343f4e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/sr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sr/firefox-62.0b17.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "f6ff9b978a9c8d9e92eab603ad18191e119b844c6bc097a47d7cda9ed644cefe326cd7c3219f627ba77aed2073e454b12ccc578eed9dd8d98cc4f43f06d12ffd"; + sha512 = "74fd745b38a39d562f5c8a2a410dc67b3fa2bd82f30e9155b00eff81b1f85d18fb2604a1730cab6a440390fcea9cb66c018d0a2b008870b443c3bc08f776ea5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/sv-SE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sv-SE/firefox-62.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "3de21a816de56d89495d95699a27ab7b725d4465c37a7977078b761313f1d4d893ac4460006b7c41ee8c209439a4274f6bba333a13392642a731676c906c6060"; + sha512 = "a411a89b0289ab47674efbf7bd43a9f80ab79c25b826ceb21ea7968067a78c9e10dcd8fbb101dca57492d5167fd8b604d15aa1fdee7a458b34843815b2880dae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ta/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ta/firefox-62.0b17.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "fb1eb184fad76d5f12f06aa6ea1406b99a3b7f26d12d985991c5fbf3eec32c70294d64117ceed2c54f5a1b18bf49fda0edd792bcf3cb74a04c9da93626583953"; + sha512 = "88efc962145833472bcfedb760f85dd9099b596d574509df7eb982a41ee4eead4b336eee60ea79ea0a376f7fa625db1236b730b690ddb13259c8a06fd03c17d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/te/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/te/firefox-62.0b17.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "6f0cd675c579710c2d252f5740def245be9711292946e554e81dd7d0013e6f7aedcc1dedf3915442541d40efe7b791e51082db5f3680496f4f8dc85dc5c3d535"; + sha512 = "6be44084b417b0dc52917524317081c7bf1f75398518b7a9be939b2f539c28bad563b7adfa9b42e875daeef80075c5d5aa728dc8dabded1ef7457cba7a601e5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/th/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/th/firefox-62.0b17.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "93f6a512047fd81cccf50ed45a3077fecb6c44e1181bdaba00c4109081a5e57f3ecc7909068c4f3b9e9898a1239ffaf709adc9b0ccb541c3ecfbf614b6a120a6"; + sha512 = "7216aa7d6cc26fe7c98539d0dac48c68530971d8bc99385379d250b5cef3838215f9eefb10b5b05a4d18ce949beed47b75c755880a1a1601faf3feee17967894"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/tr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/tr/firefox-62.0b17.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "2b0569e50053beb3b07da6986d04fca84aaff724b7f9d082982bb26f2486a0f36492d16e45aaebd9d0d3e0e216ade77b6ea3dfea92b7ef012f06bf9584a123fd"; + sha512 = "9b8078a149e85a8c13af01280f248e2713c4e83e9d0999a5fb0f0eed539355ce6bac3a9a2d4122db06d96206b02a34f6b51a8e5198d3046c3547ff1be85069c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/uk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/uk/firefox-62.0b17.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "611f5c4c5a550087d5fd343dc6db191cd79924b355b59814dcb529b2c7e0144f41669f88596d548b636f1c472e28ae7f2f3576293e5cff30415798165d0585a2"; + sha512 = "f018e84596c981b135638dcbdcb8d4424bc1626ba48eeb26b83713c45afca5f0a90b38841ab0c08196acd91981090d20e63ec0810a8f6f9b51cd2e5302ae9062"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ur/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ur/firefox-62.0b17.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2dfd0669d41cec72b48acfc1831f11c336f7cd0d6b2f60ce911af2d2470693e0833f368fdaa49e4ec8006d37c62bee5f53ac7571d5dcbdb8eea837d27fa93c1b"; + sha512 = "96fc4019d827bfce46684b2e447197e6a22b09843967c25e2dbc7c38341117c4f55bc2d16d4b5a63445b29ae08efde697c93bc4f677d3498bbc2bfc8f346a8f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/uz/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/uz/firefox-62.0b17.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e42a3ee6b794813c3ee050b083828adc8c190b824b3361ea2252da70e7814d60230c14767158b6c20263cec8e39fb2e92dcf2da4a5f36ee7d0c643d882692789"; + sha512 = "ed6c25d7f4205999816c2cc7f2cfb7ce682087656f1721af8a8f4530217dd79f23032830252be629bbea0d6a19422ca7b307dcda341dbf287a7dd9b901ccb197"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/vi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/vi/firefox-62.0b17.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "8003a0651f5683fbe58e7436143b6367ddebec6b0f456aae9cb26dc056f2ec90460bd26b53705bf6b8ba46b9ab63a00e20c6b675fa294617a9d799d68cdf477a"; + sha512 = "6e5a6a59694fe9a2b386e79b874cfe92282d177959c447c7f500f9ea805d9e07cb7c1d57eb10f1c8e3426f142f28c1db03cd7935321fe81f6548d4331197b259"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/xh/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/xh/firefox-62.0b17.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c74fab9a7dfb49a736725600b9e957b3a882ebf8b33931f8f648d354a5f8018341bf5f97f4f7e21ed4daa2d175fd14b2636abf5c3834f22d401983bfd89e55ec"; + sha512 = "628ee5f3b03527e222a55f434b6c266d98b10d7fd41249641e478233fc877f28c84825366d5151e43f3c604a0c3df6e7a0753b3a04213e88b169daee7da71c26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/zh-CN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/zh-CN/firefox-62.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e0af6c2362fb5dd8ebea341b0e7da412b267867afb1af0b36ddee0b79c878737482402617830c25d2794cc3636f94c690f95c21a6464da0ba70c25f48cbbd98d"; + sha512 = "e47cd677d2278c5a6bea963c2d38c8f3505ea295481cd934a5534e4b6f1cd2b5ad81fb7f8dfab1f2a1dcb4face3ad514f56e1c7824f559946a5fbe5cb4022ce1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/zh-TW/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/zh-TW/firefox-62.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "b894efda72e8efdbe2f84f04a9dbcb8268cf8c539f977484500a944b49dfbcb0be835924e106c37886e82120c9d938adbeca49ee35e7e319bdd45d25ccc6f270"; + sha512 = "cdcac4355ded1ae2fe0900a44e077e2f9a768cb0207dcff57f9559721338e1e9f62d4688dd2397f84cba6c7e010c1431302f91e42c9d2c7bb24a732674d73957"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ach/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ach/firefox-62.0b17.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "21c3b84bdb5ac2b66fc90ec38e07b7f7bd8162b63fc424c71daba757bccf3dac159814d6e42a13c21c113675f5c8035c5c8b3a0fc1be0a3f075ac929cd5814cd"; + sha512 = "a0f0c7bbc8ce8861cd3ace0acaf3c92a9da788d0583ab7c83557d6431623f80e729faeae14ac3807853d95883466a5cdb2ff25a72b255b84a3cae00dd5536904"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/af/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/af/firefox-62.0b17.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "c700512bcf25db8cfe6674ac599645745f6580d35089ca4877a2af68aa9d768db6cc3275d431d3debf44f4d4e0ec8ceb180e8abe565a6931f905dbf153ba193a"; + sha512 = "04d5e91ca8d227fd3790d36e7eb846cea50b0328bda59f0751b57fd8befc6dc9c74937b4a77ab0acf9c57b62283e4df22cc457c21283f37eb857deb77c428b63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/an/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/an/firefox-62.0b17.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "3025f4a3a041f94075f9d42ae85dea7e24f6718fa67e78b38cd8aabfabe4f2850504c21d05f7c6803abb0b8b64104e76e07588430c040f7a51a6013c02783c63"; + sha512 = "d4531e9ece8dc30b47aab6053ece67241ff052ed3b4f31d8cf4ffb9a3ace48abbfd2dee6d6632e3f963955d6b352f09bde2a2012d8c48ff0bc12c961763fd70a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ar/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ar/firefox-62.0b17.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "aac572b6df62e683322680fbf7ee8918970bc89e66e0b40a3a951d137b97588e49d747e560545ea5a674cb78b2c6b11f881b6929023fdd98fe77d0ce219198b1"; + sha512 = "4b5d1c3b2f9b8c8bfe8a8ffad3a62cbeda296ccd521c8e937967031434cc74ca3f7e431d4a1b852907d07ab35e5fe11f9fb74eb592bb317cf67bb93ece5b8787"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/as/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/as/firefox-62.0b17.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "b3faf85caa0b5ed0b1881df23a6fc9f3eb0320cf8fca19d10eb32e7f743982499eba6e02e553a264f7d6de8175804291bd5bb8f41adca81d9e0e167b27b7597d"; + sha512 = "7b6b5795882034bc8e790ec42930cbe8f52f2f0daf63ab8a7b9eac27ca7cc4e0ea604ca08faa8dc8e560d550bf6400b27b2e70f9b8597c011e0c59b56101ae25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ast/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ast/firefox-62.0b17.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1ae6641e85ad3efd6b88e2d47dfa66691fecb1f246b03e28b23bb02dbf4eb01a5bb80ae2e4cb53f9d21fa0fea161664d4fbc161481e043adfc3216a3e810ecdd"; + sha512 = "e4995dadc334deb20c0892f2f980cba5ecc9c06191580308a462c23cb972486891a981e81db7ae54f230aaafafb0608bb231d8a4c272bfb570674d8babebd57f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/az/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/az/firefox-62.0b17.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "f4f5eb299aa196182f1fe6141387b742bb4087727e3ca53beafea375839c81912055074daaf5ff8e8e2fff4f88458a4de00950fe8188d6e69f742fbba9c7f7ca"; + sha512 = "59b0cb8fc86339608550188866198ede84cacec5f82593fde8368c379feb68152611e6129fd2dad8e00f07bb183455f9201849b22c38599078873cc3ea352e53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/be/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/be/firefox-62.0b17.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "c3055ed544c6e5159e789f5475f48d352db0bbb44b0b0369bd5802d563ab282c0d1fe8793e43248fd526c58456f58cc70acd254212c71c0183387dddafff8e18"; + sha512 = "bfb82a8b580eb42939b00ff2d92cc83d0d2471d195a8f7aac5e808496a9e8a078f974093301dfcbcd16759b1f8b69134e911de35043062fec9f7ce2612315bb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/bg/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bg/firefox-62.0b17.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "7f532da77b839b9240b1308c87f0e9bc0c974bd3078c85242c80c5e88ef905f0c7e84f4b000144dfe3937bcde1a61041cc9b3437eab0d5ed17600e7dfb09f1eb"; + sha512 = "d878c71266f98a4778840f1f1766180edc7c40ff7ba976d984ec0307fd3c69ac945c343f7a440c592b04c11be68acaaff2d99fef39adacb66fa82cd2213ec858"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/bn-BD/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bn-BD/firefox-62.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "78c3a039a7e0411e7ccb0bb699bce3529ae23a3987455722c7462dfcc90c248a290f0384d08551e4cabba3e738218d035ba4c95f3c4eeda4a4aedf4608ec1bf9"; + sha512 = "856e9755cab299753252a67c8d0eeba489a2ce7a87af032c5b55105f90ea1de28db3e99cd4aa09ac251ca3e5babcb53934a26ae57f1231656611773b3c988da5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/bn-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bn-IN/firefox-62.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "892ccc092798b816cb66ab43c6e81c62b7a3c48d3687ee61cfa55c46c289be74be981e4eeb2221ef39d1ec865a57cb5395a96dc6d93e2fb2db9cff83b5797c6f"; + sha512 = "c121a4b4f468ab4a015c2fe4d2470a2c61f4c7d001df6501dac8ae9dfa3f939c36e7764e822aef94f172725b03df7c48e9d5ed46b658c7bbe69d5b1de534c10f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/br/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/br/firefox-62.0b17.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "4e8f36d6078b26eab4131e3204ad730c92dee0d96ff5733827ae7a3a6c5a4289e0fd2f02b0da756f5eccc0ccfe6a88c9f5b97ff2c7a7e67949c73d7b4cf8d815"; + sha512 = "b2904226d994c9c699f24c39fb8b0f50f8cf192efda15a3ddc3915a60728fcb50b4942df514214a46ce29695f3c3c044bd33d55bf74ba965af729c85124caddf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/bs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bs/firefox-62.0b17.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "e6b6b0637482b2bf1900605557085768f330815504d5de26f0c3dadb0ae6b8fd6dd589d3e76bed3f876ac4ef681c316da92f321e4134b7a0f6b6bb13c0826104"; + sha512 = "6f0f553c749072dbcfcd5da45da7bd1fb2276a10770938a0c14070b2093be2eceb0684b6c53b67e07ccf1d8b7e61b60021abeeba57d4a13e2b9d62deef012051"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ca/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ca/firefox-62.0b17.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3606038c168de7fafd57bb49be1c0cb4d86dd045532d367749eca9ecdabfa21afb014bdeeac7801a94aaee71f95a9da647feb579d2f482f4fa32ccef35f0c7fa"; + sha512 = "707bb26b6cc24ce9267a813f266cdfb5ea788dfbea502fadac5cf49a54440c8d9831e87d5e5bd49e8002a4622d2545becc2452e2536387c70e25c1d7147a0848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/cak/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cak/firefox-62.0b17.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "04900da3cfab412d00611ca9ab629f9e15491e48c7bf6ca7b8cae6792704cf1326b0a093a314b772f5a55d20b7dc2f61616ead2c4f9c86d75e5e1cba0852d4a7"; + sha512 = "717c98a64fbec95ef1763a86a35466cedcba7b657309b3bce7a833ccdfb3f278922909fe74e8a875ee0387db76a8f9f4182de8dc1e7eb17ee59b2e424ef6a871"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/cs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cs/firefox-62.0b17.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "27c7104d54761db41ecfac91ffad785813cee4ed41b2826874ce514c3d46bad87443ef0cb39ad949044688405aeb7cb2bc0bb24fea42da2d8bb9903460ab74f6"; + sha512 = "54a1163d642b77210d3127b56dbbf0cac60b3afee6f8b5884f85be8c81570445e74e3e7709aa8bfa1d5e132e05d2c6899ad854a38d42389d553206b7284e3c64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/cy/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cy/firefox-62.0b17.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "55edb6794ef4b943acf3478cbc8fcf01729591448ff226e5ad20cc319a548e009167fd8d9afbf14bb0304526fe8b295826afdd23eac78e954dd2d78bc83c2f30"; + sha512 = "f160ce85f5430bafe9f43275a7bd0c1f420c767983b5f25580e63de7d962a61259067628dd73381f18ffd7b9bb70f297a744d2af5fad96ada80e03619fd23984"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/da/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/da/firefox-62.0b17.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "b7219e0a39262fd5a3f6c75f9fdab721e99be5a2336a1bc2c78a4efc2fb2cc44972537a5dd4589b8acc1f0ebd47769061349177658b86dc25fe9bbf9794ca679"; + sha512 = "18f2f42819bb23f5690ba64153c4c4acab1519138fb2ca9150ac923d69a4495f171abf3a5cddb429ad09a090221df6461628ad8184c5bd05182108a7a2120cd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/de/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/de/firefox-62.0b17.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "00e4ffe075d4f627798fd478807db829e4532f3e6531bf9c6e2a60da4cd26e0004a13e996b2fc0669e98eaf482a257d23a440192a4cb852e9407d8f4a468a733"; + sha512 = "ef480f7d900f45800060984543b4eb3bd7308cd8b8f032eff06bba5506654fc96921752da72b73986ca55125ab16a2aefac97d5996f705be9ce9b47d6faab726"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/dsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/dsb/firefox-62.0b17.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "5215dbd302e512000571bdf2f0a89c9a7060c9b0634dd611c5407c2d20a1fa78d4c66fcb4e690254b6d2527601216107ca91a3e50e00cfa254ea1d355b314835"; + sha512 = "8c05ebe73ed32e25b11d36800b9e1103605f4963e02b1b72a1ac35a8ae10aef2f516431cdf4aa32ab376c15b4bf07bb927daad020a7693949687ec46904e2aee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/el/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/el/firefox-62.0b17.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "00a380e37f80efec963baa9895d86baa2f7332c1cd34fd632240465a899c807959520d753aa103a291586ef094ca362f0c1934cf84d72b99d83867975da3813d"; + sha512 = "80da58193df534fdd8bc2886dca3f21986a32b8b940bdc1077f259edcdaed353a8f1437f968cb9dad5b46e06f94356354fea17c66781834be4b22d4775bb72ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/en-CA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-CA/firefox-62.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "a66483e783e46f5062f947a3fbf4901cb2f3640424713928a8256b3815a7d3cad435b193f3b6a2b45307ccdb934a961f184bd0b6a1b44ba7fe057b41c76783fe"; + sha512 = "6cf787b5b646ffbb43442a2066985dbbd2a99aa0959dea691bccf4d0a727213f4eef3bdc232ddb1e4c58411c3412ea06d11f3f3f985ffcf646b44f2015bab4b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/en-GB/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-GB/firefox-62.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4e56ad4a593c953f28559d3774a926a4ee6a160f3697bcfa686c8f0e3f17bc6099683c9c4c5fc48fdd940b038f4d534d6bdc82cd81f08fd86e06ba24cca50da5"; + sha512 = "bccbc642ac8f4dea2365c9d2d4efea2987d06c1708dbc51ce6293c5c2ae02568dbcad6b101ca1c8c4cf1e0e43d8fa8e6ef60a2a9e811e13544ae1579658530a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/en-US/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-US/firefox-62.0b17.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "408865f32880b935d3371fe464061f43f8b373fb30f815b7317bf3808840d62b1aa4db35964c935dc0194a79c28f19c4cf31b12c60150be281e95c09efa6f2a3"; + sha512 = "5e7c6a524ffab57954ca30ce717aeb0aec555d933d5584f530c8dc3194b6ed8fc8a57e2d4d1c48539aab2b6bf7bbea51617a0faa0c4a9441ea42bc19902cc874"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/en-ZA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-ZA/firefox-62.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "c11483360ad70e103fb76c1e7e6b9162a11976ddb2b3704a114b14d34ada17494ed93c35c70b9b09d8302015938aec42c1a645c0e6a762a554b253dd5946def7"; + sha512 = "e214e1f6d179ea4ff2b6bcb79c58625d269e1e41c17f506fb3e80f5cf33f7e24851baf9c28c7f1792555b576913009ef3b7c648e91725e75cd47711ef280b471"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/eo/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/eo/firefox-62.0b17.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1b5a4077dfe02aa0f690f9c85fbcb65d3b3cb9f85595cad88945c3a2a35a968cedcad7ae60acb3f4923743169cde44b779fb913af3f27df5075023b77b6ec24a"; + sha512 = "ca05ac344bb68941ef82926cd9548036a3ecdb0fafbd71aff1d75b6c90b82e55ed8f3a9f00800656c146356a4a59624835e23ef572e5a04872c7966d9019e661"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/es-AR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-AR/firefox-62.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "ae19e0b5732cc7566215729fb7c6cfa01cad1b18a9ff47f3cae869652f8be8a884a67f29ac9541ba938c155016415e007fe4bcd90100f0b964a6d496c6b16f00"; + sha512 = "7ad38902eea68a200b4da512580840d54f6457515d7c3d763619cbc021315dd0b153e224c448ae99e7122e9dfcf53cb6f059aeaaa6319d8911e092e6bcc5d6d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/es-CL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-CL/firefox-62.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "b09334d527d4000cb84e1efc40aa0df0a59ee699cb4def8508f885cf06f17dff175ddb202d2dfd898dece5d87b785188f70ef09715adc07f4d27da33dd194aca"; + sha512 = "19dfac04335e93ca66cb3767e7547224df13c278043bcece2a437ca1b63ca30e9930232f6aa8314d063557d4ed6889780ce5d0807b056e97d49a767aff495ce7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/es-ES/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-ES/firefox-62.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4e4cf8dfb345d38974f5b293bea8473a6c1e530fb6ce936e3f6005a2cafaae4a9d063efba518945ae395d0e051de45f9100c07e065b4394d4624847cb63883e1"; + sha512 = "f7d72327058245c76b8e577bbe62cee4b1c6333836386ae5a473e56ed825cdad023c3af9038ba23b1527c1f0beb4815765b8309321984bc9f13d67987ab0d03f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/es-MX/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-MX/firefox-62.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "1c51512b73cc30c85d07d575641885008262d4e1a09f81f1295e79e3b075f83de7c49eb4809c038994486086160d146648d8f9dc9e470fb19860781638c77915"; + sha512 = "c9c637305140f02d26a1d0bcb99d3419e7f30f12d46c39e611ad8893d918b770633d08b4a82c6f5d11b06621e32a530ff7a065deaa958eca6787fc4f0024192b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/et/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/et/firefox-62.0b17.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "64cfa6cbe0e5029838077cfa1941e8bdfdcaed72b390ec265bff0d2e650dbcaea3b497333d25258d92fff5f9ae6b83b8a1bdb62c7347540625eea7c4d92ed948"; + sha512 = "585df3ec775bccb61a602a3e62cf7faadf0091d2fc328c74b0aa8810cbf3d614edb418f95873c56eedb5cd2ad3efb211cc972f6425404f10b0f43b5bb1480152"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/eu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/eu/firefox-62.0b17.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "55d0bcc3b8b2d38c6157c895fc636d2eb777a9b49df033a318d590a97d1f7ed1641b40c41164799bd24f56c1ec4d98f9351d342929a1ba18fc6476f3aea3bdbd"; + sha512 = "071688f8e892d8deb70f65f0176a4909b337e1350fe0d0fb9cf1a66ff69bd6979083ed99543f14212f0936ccac084afc98979655645fdd9cb37250f2639e86ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/fa/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fa/firefox-62.0b17.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "0e401cd8aa9a68c365d3665d547a09d704b5e5369878ce4a9d34a5d58de82ec29f541f79857b6f0d900e3a477b047f3e0572e61819ecc73cfb2ee5eb720ada53"; + sha512 = "efaa758e950f1ca0f4c011ff1da8ffa5d6d3c9c23784ab3a2cf253bae95d6d25ad8fbdb05167118099ef6ea0037ae341c4c4356cb5af849db2f63b923e616e6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ff/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ff/firefox-62.0b17.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "24a1a187ad9242219376bf07026a31ced3496abbfe74f1fa3d252b677018394196ae0fad8e982d9ffb64505753f20e352e35149cbcbf837ed15e4f00c52a7b4d"; + sha512 = "1b30f20f6959803c6f105588d612d2d0d88209f2103d829d56f4788b43c4faedc827fcd150a0af0c4987532bd4bc7ccd7591afc34e6e22d18ec304841d9c450c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/fi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fi/firefox-62.0b17.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "01fe0ab929d3bb30c620b9967d58de215f3dbde403996491d927b9b80f45a238940202ef87f2a832a0b87cd2047b2192c52d25f61bcae5f8c9d1ad009aed4896"; + sha512 = "97157deb509825073d484222b5402d8c8aa239285b9af7f12e92649672c1fe1d9454ad5a88d38424272956fbcddf069ffff2b8d80da809ad65f65ac185d50e8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/fr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fr/firefox-62.0b17.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7bea3ae6d615ec57fb40756a6ab549002b0586d202ae8d02ea50a36720c63bc7d55ad690a716eaa90e31d0e530d0b4ab76f6cce555aaa9a9b953528e93f54799"; + sha512 = "49e01d81c93f464e1b028af91113123513af7d0f4cff5f76f7ea1b32201a962c49f0744545ec82e0314aa2c74004199d2734a8aa236d057c6673cb2f8df37b32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/fy-NL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fy-NL/firefox-62.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "17c45bdde063bccbf6c22233380f1f882686a1d029b09687bc5a4298f8bd58332ae0112a115388e83f51f9059a034d1e02a0ad3395a8f7525e1ab9867bf7cfde"; + sha512 = "e121aa2fcb0c023ce339d2764f58ae489b1fddaecdd4751d76c6ddfaa2297e071a5cc0901e36fd089dbf3db2eba74ecee57e379d7b2bf0e71a887b87a4fb9425"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ga-IE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ga-IE/firefox-62.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7d67b7944eb0cc393afac66ffadef494e405ae0e9a36ee8a5225b2093f257ecffa09ee06ecda57e01464fb47fef7f778ae0980b2c31e32220873c3bedea85866"; + sha512 = "719d35a8d603dee4be8806dedb253979d89cb8eb912fb389b6b7889c5bada5cfd5c797eddb3612b9ff57147df1ee2e55df9272619e7f88ee63944bdf9697c050"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/gd/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gd/firefox-62.0b17.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "db757c79cb0d29ecca54eec5b3cdafd3ca9c2a8a3b4c174f616f2004bfc50c5e5f4ef076977544079d886280e78596f155f18ec185f5d99931bf20c5e3266f8e"; + sha512 = "63a247caa38e0a9fb34c99f6949272fb1139db5944a4fb2f13b3ad1ea19fffedacbe70c3a409c1189de5d89790cfb03ac69c22bb224f6318010b752f520ac4fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/gl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gl/firefox-62.0b17.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "25ace945c620a60e1e38a0a8a994f833bd708532b437859950a1d298739fe4bc3a007435e7dadc3e3fab132be7a706bc02917f2e0014e9455d68f6b499f6d226"; + sha512 = "93a3feda1be1d74eab798e60532b99196ed343999d7b7b49ddb5de98663657cdc894e310e705cdd8e0f1a1e0333292014fa47e787f15908d691ccd3e51fe27e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/gn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gn/firefox-62.0b17.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "45fbbe23710f97a6a0e52586fe66a0c9375cf5736b524d9e48d540b5a170e00239b6ff4ec1e23f73507a5d302db7a122978058c88171b4216c54f6f572d326ef"; + sha512 = "d8b94e55d6770646ea47ace57364c0eafe47d62a2dc57a40a2c7db7e74109b04478e7e8cad08d29a553eeb2c23bac896476b049f9ba99f62f1b0e585f7f6f403"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/gu-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gu-IN/firefox-62.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "3a55a597d3023e8e4847856f56ba0861df053bfaff032ff56b78bcdcef67422eab31135df2f40f9ee4b940e4aeabb180595e578346162cafe0360b812264aa0d"; + sha512 = "1361f71c0a98fdfe727e8cdcde445c01244d63520a37036c95abaa2175b450fa029a634e6b0b044771ddaca310a92db2d5526eb8111bbf3dda7e605d95e6cfc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/he/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/he/firefox-62.0b17.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9a66991f31e29cafa5e120a33232949ea0b11eec14fae136f0f1ff743bd5a9387fdf567320cbd3d10904fca975d5df0cf3ff99d571e7c55deb4e1b804a38b39c"; + sha512 = "0468b5ccca77ce311059cb204caa3f9fabba2218a33c6d1accb3adeafbc9523bd21611a2c0d2ba926c3bd9c1026323a054de2bb6017344013535665da9ae2d4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/hi-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hi-IN/firefox-62.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "9fd3976b56e358e6948a060c63770d4de0e7fc6a9932381f42377ad8ee7bb5fd6c45a59a2b6c49bcbccf0f92a4ff3291969b45276a1a04f891239058a7dd35f4"; + sha512 = "76900afd9f8bbf8d8aded010695fefb9b45a7fe06908e55b39f7447c850716f5c4139cff722aec342ec88fd3b84f81bdde607d30e7d6dcfcc4e6a37b5a7ea973"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/hr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hr/firefox-62.0b17.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f79d888b5c02277be81d6b0dc0adfdb1ccb755371a9dfd02d817209255daef6b87c4860fb36837e6bd64827c04235de4579305d052e7f69939c5bd2b96d907a0"; + sha512 = "59f5dcad6e28a127dc702458d15f094ec106013f996a136e07b6a7214751cfdb9e50dbb46bd3eb202156612a8e67e4ee6bc82843dc0868a7595e9cc9afd48b9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/hsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hsb/firefox-62.0b17.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "4d634e23092524f7b1881591dce8930d661bd0cc154ebf6ba5cd8aa5d00de5e77670bddae05145f7c6f485ef86e4dff4ece2962ed084384c576821c0e0e578f9"; + sha512 = "62496712ebfd4813c428639f05d936c9444e59725a4f1b43ea2eb164468d90f8a3f8c4b20280f61a4049bda348f4fb973647f921c3da384e05313bf748230917"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/hu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hu/firefox-62.0b17.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "0b734fe02178b3c17463e23166a0cb00df2ce93a56655fa7085a416f2ad53bcf3ddffc0ebb62328fd991ffe75034c1fdb0e08f272ea6bf117a2bfeafc23f1808"; + sha512 = "51d0c976525fb2beeb53b83254d8b1a3211618e65f44a2e9dfc02eba6bdea229aec340242615481e4170a182316242986f09efcb7db14f83c86710ab13688981"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/hy-AM/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hy-AM/firefox-62.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "2b39a85ea13baf9e1e7766273210a0758f5469b7825de8a760984ce58354f4a669fad1816062d7c9e6e5888029f7e7043dbc39fac40f6b6a7206ed4dd9019151"; + sha512 = "d131287920a31ab5daca21708204e405681c7e1e6c860cb10b16b475e42ce1160cb7084e31833bffe317e47710729027fe2f77bcffd35e715b661ac81bb1748e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ia/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ia/firefox-62.0b17.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "f0f5c0ebe23fb4f06d1bb5271e85b46ca50c0de902624102b1803fcfda860aae2ee17c8b3a5dae98e7c7904bfecfd9f4a81d08f34d7a718bb605a45aded08073"; + sha512 = "50434e6bfcea74603cd9a5d8f660295e8c433423abaa5e27b192522936fb88d93a27ad6ee64fa136d120af6ab1183a7d21bd85bb3577291863f0b4509d8ec8b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/id/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/id/firefox-62.0b17.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "0de5c717764c8f410d4f28cb0760aa0d6d7a1b17674e0c38fb82d7cb325c07cafdf12db8ef87d56881f231b4bf2ba643d645e59e2ad0defd1867ea889fadc066"; + sha512 = "e3d73385e4120d91dd08fb3abc4f6268f6d10cce23ebd34553e3037c176f27f39c90f8fce59a0416cee210e73b1cf57b2c92596b3b4634700d8287a89dc3e014"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/is/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/is/firefox-62.0b17.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1bd2ecde86c878e8a2456af6dc2d87e3f14a58eeaddd046e926e1acd7350577b287c5923aa236acd345a081dab49f1a2dcabf33126ca4efa2271c64f0cfea7ad"; + sha512 = "775d84a419e24914f31cc4d34dbfde547e42c35e41397f4ff462a80ed7f91cb87ebdda4a248735d402ad57bb00cd8d7084618a381c89f53d6ed17bdeccd93762"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/it/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/it/firefox-62.0b17.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "15167f4d6d6693c5e1119e6eb4b2077db1ee7e3fb7fae86bc17e4c80d81db431afc01c55760f87827948c192ace690408a8443d3b0e3025ff07986689b5b8af2"; + sha512 = "27e315aeea864d91b422c4e6c698e9de06fe14867c12fe8b455ef284ebfa80c3a00774df7003150ec24abb05f8717577092feb4a41931071836a09fceeb3893c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ja/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ja/firefox-62.0b17.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "29e4098dd194dfa1fbf9eb345dc1c365e0e972242395246a6815d4f5c3fcb82368983bc3b24f2adfb57b7745b0ab70765469ad61955f00a95e70ef46e1c441df"; + sha512 = "966d8519de5579a30a1cf8cbd275602cf39d3390ae9f70bc56709ffe71b0937c7ac4ec6788c3b972739376f76114037da6b54d94c091e035a8fdb5c3832cd4a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ka/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ka/firefox-62.0b17.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "7611ee251ee992ffa50eaf18630f22f28ae0ce930fd91edcae9f23492aa0a3c4ef1308c8a81bd05b6a3c60ee0a5f6714937ba1c4afd60a3c983cadef1922ae4b"; + sha512 = "029b687417bd612ef8d26e209795c8691ba310d95c2d6ef4603a71a0c334a96c12e54b79ef1b02f35385f28f2d7d399b7c8bda494d3c8e8aa7041f6a9e9771a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/kab/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kab/firefox-62.0b17.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "deb15e34021ecebb9e51ef2e0836decb4e8b62f4e9ce4270f8421c037b0ddb52b60586be7b8e660daee234108560e9898d2b76db867cabcb120f53b4e1a51776"; + sha512 = "bf07ffe28d321b12435f441674d28d26cc076f0f3bf5a4c74b481581bb2bd1204c66a7ff76698759c22436cbe9c101b337a007c7d44530f6d2d87e89dbd5d95e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/kk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kk/firefox-62.0b17.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "7f4a366480567d60d65a992b14afaa8ed38840a8669f1997d7d2121ff8f703b324ca7ccb70c88bc11a64efea8a4a8cdf18b55dca32518c01d3cd22feaa1c7042"; + sha512 = "2fe956a4f39c6e42beabe512ce45406ba586b462a604bafe3ed325e7625ff1558bcd0e200c147438741a6dc010d9fdbdd1728391ec660600e60883f91fe0f203"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/km/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/km/firefox-62.0b17.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "49446f50f0121f5952da9bc2ef16f95d46ecdb2221b534ca8c6d537e3290a64856cab3b5f75843e101cea5616f7dca6fd5611029806110b2c067a519a89af3eb"; + sha512 = "abc5c7b2bea6d67f7ad229a00859740c37675a584f3835608bbc6e9b0e1a267f81cb4e29436dbaa67035fc1824f2a8c8d25de59b328fed512a4c6741fe737448"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/kn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kn/firefox-62.0b17.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "f938ae815a744729d74ea03be4ec17962a8825316b48e3b24c13b02cb2221de360f03615823a1793136c1429fa26c91a7c456e5104111b2af69eccde3f5631fb"; + sha512 = "a26e3c8ebb41f40bf8211da74f8057bf058dcff95606a9614ad75340b9a1f1bb2c21f368beadcdf953a43a837d7ffa899a3869fbaac0464136216c9351a8173f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ko/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ko/firefox-62.0b17.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "601906a9f59a7268c23f8b706700a12e538c43100ecb1f2ceab1dad9cf8de4ce0b59b5b9adc0d58fa80cce64cb9833e50626934053fc869b1e0fe503874daba6"; + sha512 = "1b6d2dec4f3cfdd1e6f80c7bd35007d17394e7cfc16f8e5c469f3c8dfffddd9917dc775f0adf3e86d2956caedacae98d78b25961061dc7e214394fdff3737d33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/lij/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lij/firefox-62.0b17.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "690d2cacc16615d1b713e52034c80b901c63f5b69d8147d5c72a5642347c2eea9fd8b58ee7afb969fe4cdf4360e59a8a18958f04082ba3e474571a60c647d56c"; + sha512 = "6749c691ce78968dff64f124b992c9e45882cfb245f6e406c8ec2a74278828d419beed30ecb8762f2330590474db5a209f0720c574f1eb4f1fb0739c80f040ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/lt/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lt/firefox-62.0b17.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b148f4c28a61f83edd98b2be25722f22f2c50ff07a5796bbf1bb9e3820ba67d26a668c0b15807368e3962c68575c82edafafea092090a7cf71cb69b0fc1b7410"; + sha512 = "cceb2c1dcd6146194fc6f542b901723d9101ae03157567b4b6f0a9ce680a7c3d18e7ea959a4b772a75e138ef19e0c6ae7aa70e2c51304ef8568264c1e1e5a5d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/lv/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lv/firefox-62.0b17.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "349c63a3960ddc53ad511d344d5410db81ce2230532217aca14e260a72625c9f0dce8ef38115bf1d0e6e102f6c22bb70425b77f63eca583cee15bfe404ac80f3"; + sha512 = "1f9a6f75d4f4cf44f6bf3244e9b0fde13358914602579a25b8e8146010321b0fd31de81aa55aecf759163ab54d4c48b580272d3261b1d534da26c1ab8664beaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/mai/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mai/firefox-62.0b17.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "becf83fb95de317f3c380dccf8e4bdec2c1281d4a0c6b9f22ec7789375cffd86a443b0a7a454b94173294ebefdd58f3364b2e5b0bb31365d4fccefdec558ac46"; + sha512 = "de067af17fc6460fbe046fa661eb85e609061e68975ef8f3ba22492a6ada228a09ad92933a385ce184688a4d40477995d54cd548ae03ef37c73d53039599e97c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/mk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mk/firefox-62.0b17.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "ff6507e5e118348b30487fb6d6d836826e92a9bf9310a5fa555e758a25f7dd464b44acb260d4f6f30b941e47fbe6bc97e78ba6e03024fc6fa96df0efb778ef05"; + sha512 = "9c2033a0403b76301559a306c76cb29ed0a5267db915bb0771c0c808b16bf95e822e2c5e7dbade943eef1b3789ad5ac1bdbdfd01fdc0c18b49f08b35e6bca983"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ml/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ml/firefox-62.0b17.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "504fb0012d4f8323f4b49ae64f18344e6f381d7a22f3143bafff2149841644f5640eb332c7c0286278845211cbc0a2aed8eb567e2cea00cf051a969ee76b5fc7"; + sha512 = "a0f606071b04b1822b7a8d51f46b989dd7520b7cf1330fcefed1c8e6d09b095e11c176f9f94f123acbf9eb61293e8b765f3ab4f303442b4a10993418e25cdcc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/mr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mr/firefox-62.0b17.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "7a88e339373e0bfa60dcf37b680a7b8895b20f34a65821c78d082b121b2297232b2e3719b282002be77597e3d3e31bd3337ec8b0974895cc500d346db1d149d4"; + sha512 = "67b307e0a45dd6f2bea45377a22ba6dfd5437dac5ad3ac0995ee14091608bae6b86a3489b8dab9cfd87879d763271d70d7e7683b4cbbef5c1bc488ef94ef553a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ms/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ms/firefox-62.0b17.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "40aaf17ba6edf08855164af2e318b21b32d77dd6d380f9fea9fd9b86129e5639ccb3a49079bf5304086df63f9872c6e74277931a6934b7db353dbb744fe52548"; + sha512 = "099133a0a252f2b123328c66c6530fbe98280ac1fc5cbe8b2da4537fad4b5bd265e972843d9dc4bc937ec03329ac258e9dd7c931843d8d8859a75ccccc2802a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/my/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/my/firefox-62.0b17.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "c2533bc67fa97ac03a1c71aee5b81c330c44b18cc4ff9f9ba439302a42a63211e0c4ad7aa05ce32925819a0034f46e26c72c55fa86086c396d6a70b7a758f619"; + sha512 = "857b59f4c1613e4243345ef9819f88932918b4cb708f94bcfdb2537145e19c2825cc6fe2166073606ac282c10250c552f1d4c482d991a33f1224cecb5186811e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/nb-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nb-NO/firefox-62.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "a22a2a711efb976a629ab86e4ddf4447b44d1065689f0eb7c48cfb1a875f69dd548a438223091b145800d14eee581d171f49c5ad990846e91db68c6ed705b57d"; + sha512 = "edd41419b95e5ca51eed3562207240db6cdf85965bd77e85e8a6cb7395e292cdd6c5af444934d922cd5495000f8c46d22774fc7fa7d371236b22147fecbc4560"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ne-NP/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ne-NP/firefox-62.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "8ca95df861eafde367c7ad6f6a3bff36dd28f13189ff9f78b63d2251ee83898d0fadf0c79ea3e43e274ca37c4bb3bb7a9aceb552e218ab491197e72f61b920a2"; + sha512 = "6eae78f9e49cc61a6cd217b4059b0aa91942b3122207c716fd35a726ef9402a11bf35e2ec84fe51e0548e286bd0f447019b3f1190411662252fd7d96e0de6ada"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/nl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nl/firefox-62.0b17.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d4769508cc176e06d87b2340dd8172d91c47d28c3b6cda6469a79a33fc97b93183c1fe39a327d15b5081c191beb1b8245b876b65a0628a7397db28b418e41999"; + sha512 = "c5005b61225e26940a30b6f49f6d92dccb976c324a4422812e9414170961e60933754da76f50ae4b0f6cfddc3ca300ed4439376545d1770331da619af89c3673"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/nn-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nn-NO/firefox-62.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "83181171c4ef24452b1e64aaaaabd99b05b92b819f360ea9cf7cf6c442dcc3b5b5b24d3db7400904ced347acf7be775e37f67c621a059d9e55013b9cef48f9db"; + sha512 = "03ebe1aca85db5d5c0886f08adf3c5d0b8e6a9576eb1941f28123a87440297cbb0fc0957cf847d59d85dbd1aee4ffae8a9ee11b3d9005258a1ecc89c6c2692dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/oc/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/oc/firefox-62.0b17.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1a8ddf0f25948d4f515b3946ba354421d16de428b01e03ed742160b2151edd3c95dffc15d896e055a3b7f0b4fc53172d19d94119eb33429c3cd43daf6f737fc8"; + sha512 = "8629f8ce3d89472be12f321658e7de12c652c540b116ce6e8e192f4f697d08159298e977eb09fc5e24243d73e679f54d586a444d99542f6b35e1018d9a9c74f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/or/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/or/firefox-62.0b17.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "7da17878ff2189d17db9b461f8fb0c29f26f61c76a7a1b4d9a713979a9c1590b84190d6e2b35fee2042276e24accd894a0ba4e3dabbc9112bead71d367ca73a2"; + sha512 = "f9af314dd17d16f981124117bd3705c9d20b0ee75552356d1b6423a07b6620dffc05e516490f435407647d7ff800411f2118a5d190090fba5da33d59cc3dae92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/pa-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pa-IN/firefox-62.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e2e656481d5023a20d1ce93b046790d9cb658fe68c6da6c15191b722f60e6167f348f43a9e89a1eb431176eb41ed8151d02cb538d3813d6c665327eb419d6cdc"; + sha512 = "14e472a2db37fdd16d092741df7300aac32670bfcced278a1f2d4c19750ecc9b7342b5f8f100d7a4c92a8bd2788da90ce9f7c3c9de65963daba0398f292a2d4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/pl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pl/firefox-62.0b17.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "faeaf287802d92bb63d76f6585c445ec0360cf357acaf6805161801175bae5e77c78384f1b949a533205f5caac06db149ebf2169a466dbc583801e90083a6558"; + sha512 = "6d303012540dff3d0d62037893559099cb015d4a4ae491f9a30ae5586b5ce747233fb9ce85aff018b3f675782ba20cc50de5ed8137dc0fee43fd50a4d0db208d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/pt-BR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pt-BR/firefox-62.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b8a9978406c58255871f1a5a9338ba4646258797d93733aa39ca0f71f13ec92fa84d2b91ad43689fb0791556472d5be828865e23891577157cbd1ad751325f2b"; + sha512 = "172b1ed2481a2c42f22fae52333e254c9240062d2b197682f056a9782ae8405b8d33aaecc580b4a2418449d7af99d2f95da0b6929195e2f81e0d5af84bceedf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/pt-PT/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pt-PT/firefox-62.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "9c0730b4f5b65479d17e2be56324a6f7b1b133ea356212f8cadf40e9a30987bf646b39e31c8e5e887aa170534ac26c5c23299bd72780a7fedc270af3f6696eb6"; + sha512 = "646f0c2d24028bf02af352b0cee3118c37890a013cd17a37d8c260c8b8d2ecdbe1a258177b2e82057ee1b0ee18748b3c22e5d10b454626f560e63b0d95b28fc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/rm/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/rm/firefox-62.0b17.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "1f970daccdbbb8de55fc0674121937419b6aee38238d35b0aeebfb04ea2a5516f182361cb54abc52546a7a064aecbebca5db56f7d830281a7841295af568e750"; + sha512 = "25a2049dbc5d0bb7223989bd8cd3cbda0bb31a1a41a72fdb2d094f8f31977929e22dabcb792e72152c40fd45ad4b82efa1f4023a4e1ee2ab26c3dd6b0c06047a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ro/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ro/firefox-62.0b17.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "dba4011a8857e3e8b6eeb7d72d52b500b9b51cbce0721e54cc6452af6f717a7f0ee4ac2973851fdd6d06aa16135f4b4bcccf25860bfa46f4ec45c4027b0578c7"; + sha512 = "1e718ddd6e94769e7de9a458b9b4c914061a6902100f9a941b49d8f6a2f128d5460a9b932b4efaa7a8036ff64792e05713d11bc9c90022ea06639ca704a392cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ru/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ru/firefox-62.0b17.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "66abd07ba3fe48a9c0f0b445011007030638ea3bf797b1d2c49f59d6bfff4e06661eba3569b965eded229374e598ff85730437587a653ed209c35b41973ce40d"; + sha512 = "575675c09aa212a8952808238b783b7728ba973981c1d91af7178a8f80be26a64edfa0ac2ea8ef8ed99d3d7b0fbdc88113f6b8e56dc4ba77e75e40cd7fe30013"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/si/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/si/firefox-62.0b17.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "18a86d7c6e989b93959ddbb21b60dd6923726d7a4aa8497658e218760a3877be2a91dcbc11a0a0c395bfc7e333d7420518fd78f5a51e7c6b2b64f430a8b09cc8"; + sha512 = "a8457d36199a6bc80b40747e553d97921fe670b5bd5b23b74163788ccce8c2b5c978da0d20e8ccb4546f76ed6697b7833b30132008d85a6d26e1056ab17e4f23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/sk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sk/firefox-62.0b17.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "880e6eab2636fb6bacc789f2cf6b1521e644f8b7ec10fc0751fe84a4dce80dd233e665c0eb1260fe75a849237852cf5fee7b3384c202ef062abc5ee87cdb2c85"; + sha512 = "4db245112df4feff3a9683e5cd451935dc43044e07c5e44d60dd8e425dc3fee3fabfee0b2478045cdef3bb69a7a948f0bf5bdb894c3104c41a1ad2a2c3d5b2fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/sl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sl/firefox-62.0b17.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f53b14255f5a39e73a623f08bf179afce62f65e63a0765978d31c2cee826d17fe013dcc3267042f31b8209db64554fc454c8f1560d624eba51f0fc9851aec8a9"; + sha512 = "08c3774a94dfeb9d9f984aafc298336e8785f06d4fde3ef9b260e53a8c6f21c9531d5d52a9e09a81b68a17275d6b1d725f3fb894df0366a7b4e2de1669fe94a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/son/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/son/firefox-62.0b17.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "9a7efcb38233768dc5f537fbac2b3006d0c128f27b6a8682e19e37e37f2196c6ee02858bdd1b4a8e0a2b95140c9eddd27abd7857bb71fcc6ac45b560f154258f"; + sha512 = "f30bab848220c3969c572783f7fad6395a2c6933b57383146bc1799dd5e5dcbeaf679af9ccac90a72cb607360f2adf8b20c75503c314cdc9cf99a0d18eca2c93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/sq/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sq/firefox-62.0b17.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6bca6876118bf00713eab7e57e92c3fc956797ae2389cc57d5d8ba874758b1b27c2d61b14f15aad522e58cd73ad01d3701d99e1a9963b172df4ec72f2ce0d31a"; + sha512 = "cd07a455109ac035f3adcb81bce85dc7ca9fd871498e808dc91c4eed3775fb1b4b752b769769ac79a2e8bdb781c1425c3990bf3a6df40cdfc2b6dce6e99b7c70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/sr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sr/firefox-62.0b17.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b9cfe8cca63c83e1757ef5df25e881705a3c8b6ba636a15528288a7bc3dc4d42a93ec40c7078f0188cb238ee345ec46075366542bbfb52d8f8337ba96cb41a3f"; + sha512 = "e5e2c694f464d781ce67e6e5738784538e22f8fbbf02853a6dad9d6d31ee4914b2ab9e2fc2a609eb353c4a040d58ade875f9b64f061cef97e2c5de1e386ec469"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/sv-SE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sv-SE/firefox-62.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "213e949f4052bd8adcd82795153869e6ab0ae559fdef3f815a2d3e2da2ea4f581b724cf42875760a262c5262a084538b0dd9d43c2de93c2247a2ffd38d37fb3c"; + sha512 = "b714ca1dfe8aa648fa9fce2a5b1c35d01d7f5bd8088afb91b18ee02a60bc9063183c5e93044bbfb88bbe5a7274cdb0a9c20aa9a044195febaeb2156ccf10a650"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ta/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ta/firefox-62.0b17.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "1b17ad9fd366be9d0c99ce964db339e7bb018b8a203a7e6191290de9dabfb38eed8dedd6740bdbb1232c097637a2429384338e9dd04a96a8082d2a944f138d4b"; + sha512 = "18d93447e531436500f6ac56a60f7e550e2677c8a0fef730c44ffb62a6c36c3a9de81b37dd6636c687a2ebaae3a1594e8ad522b9fad4c7233c6f51c2fe1c3a04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/te/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/te/firefox-62.0b17.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "d28c35da3c3cd04be91280a9a209510e7d5267b6ee2bd6ab24f10d028f3a1ca1c9dd37a29414cd2213f8b5308df4f44c1622ab35e38498382a629ab355484ddc"; + sha512 = "a4f06d18f8bd33707f0ab7fe68ed169ca14be68800c69a7264b9b30e4f563a349f9e5af357f20af5ad1382323699b74219f95c00187558d0b923a28583204b18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/th/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/th/firefox-62.0b17.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "5198003c07e39a93737d80f9dfd7913de1f1ccd8946f302807a0393bcf7defa1782514fcab24aad7083a176bfa4342257c6573deb38cde4358792e4c089a49ea"; + sha512 = "8d7a09e43f4f184f07b5d67a49fd2d48691166cdd4bbfb4338d5f9f721cafa0a0d9a4cad3b886bf883764edbef592a11acef1028b06e1d023d7a86827c861cc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/tr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/tr/firefox-62.0b17.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a1e61231898c823798864303a0a098be8c72ecdf65ff512e9eb1e0feb28e65ec15a8574ea53584a95e0a5ee6f9bdc2d3d03bfd92663d80b50132c1d1f1dc7a3b"; + sha512 = "aa390ed3142e80a089b6363a41e674f62f7b423cf01d8a49f89f9646d5e3e3b79a7d14b044386b9a2bc11ae7648668b502d31f27561937e94c4cba057f5e8499"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/uk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/uk/firefox-62.0b17.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "0f10c306ef9bf3362ba220e80e799c565ad79417a5135793cb15589cda66c0eda88e812ad22a2c0bb39cd05c0e3b142073d9ff6e111bc8ac9a080171da375dff"; + sha512 = "b878a398a0cb21b53176da0ab40f9bcc29fc31dfe82639ab266c6d6aafae4ead7d7914d17d916eb0e3a733d9eb45fae1c1534ed473cb64b145325253afe7d999"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ur/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ur/firefox-62.0b17.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "4d553abdd49b8dfa1d22a44d928ef44d2eb10f5024a459941ac0a021309ba22ee245deea1236068cfeebeae3ed6bf4a7f117a68f2646de9009c7564ef3534f09"; + sha512 = "c828613d82a1df96fc5045539e173633761b24339a1386dc2528d275519b2b511dfaf83baa560ce0e34a05e5db192f2cbfd8595eecaf3ce922de1d8bf1555216"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/uz/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/uz/firefox-62.0b17.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "17f77480118e580e8d85686709f44a5be14fc3aafe42326db704d7f46af8c866fe8df902b236a88d5b5a5bace399bcc1fa6b431a91f411f5750ea88359993d4e"; + sha512 = "9bd604b913c7ade0a61e5244ccd8d0fddc209d8bd7dcf232ccaef3019a31d416f2ff0da0a267349a5f1458e2d80f1af1eb98969904708a486b9ac06b917e60ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/vi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/vi/firefox-62.0b17.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "280708fbacbc2110d35be4b079e770e1e1128a5f915f69f4215c488c033e73847ff3218c4e9a2f4c12d56c9d30a7bc786fe0e77c42e7a3da2be6406f0d1c45fa"; + sha512 = "93ed4c1d8e394d549bca34177ae5180390ce8a9d469ef0fc5fd858a0e61bc8f9f7184917826b72269f28f79793040286bb94760c5a06609325f41e2baf22d7cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/xh/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/xh/firefox-62.0b17.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fcd3fc5f7f155eb69b02134759be4174c2be8731614fcd26d7ec122ce28a051003875626019497b256983f0d63b4ccdcba2e9c72ca6f0844481b71686bf5a1e0"; + sha512 = "fa28b9e1f6f3598e0936c916a7d9b93866caecaecb9c07f497d63b57dbd2ca37f6110ca2e2b63361e30c2ff2961d97dc2eb9b88b9deeee6ea3a6969a46cdada8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/zh-CN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/zh-CN/firefox-62.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "8e62d79dc339e1a2b7917e73d5e3c1e71f9cf26ccabac1267b71eddbf195c4905e76d4c0ce8df6b456f56e967d5bfcefc7c41df488add9ffb36aaf809d45aea6"; + sha512 = "7f5d84e863a76c2ecc53b0b7ce1cae5f48818586ce8f7ce14c42a423f0d3336ece9a84c35d89613df286f7f0165b63de0a38079a007fb40f7b3bd12f16ec5afd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/zh-TW/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/zh-TW/firefox-62.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "736aec3eb0fecc56e4a46eec211e31b202d1f9f58c3bf46f7ca120b3ac0687e9307108b7a5886cc998aaeb804d47b62c6b233f0eab732d0a5d86fb8c50a37fdd"; + sha512 = "0f904bb2d25dd1f481dc7a5579a64c6bc3e14d4f6038a9ffda0ac8b24549cd1cf2f3bf337f4221c15532e25372c1eaf76a243485434551ae12ad569e26cb4fb1"; } ]; } From 751f10e84dfc27023d0ac687d09c46b76df8c44a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 14 Aug 2018 15:26:33 +0800 Subject: [PATCH 078/258] firefox-beta-bin: 62.0b15 -> 62.0b17 --- .../browsers/firefox-bin/beta_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index ebaac123b41..47389e21328 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b15"; + version = "62.0b17"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ach/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ach/firefox-62.0b17.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "a8dfb2fc7a93a82125e407bf40484e8b3f783c8909ac922f84454fa6053cfbdaae643b543e8c9cfa299c99891711a07c330ed18fe2fe87a4ebbda5dee1754d3a"; + sha512 = "7e32f8fae2e8a863fabed1ca2da1d13d89873aa6450687021cf77fbdf8b8f7a589590ffe7dfb20fc6f4fda8bfd21cbb50e7d2ceb1fcebb32765926e85532a56c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/af/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/af/firefox-62.0b17.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "3cdd00e25d93bfce4ef7b4e2457f02200ff079809c6fa59ef559df6e06bd07a77b941db24a8b8a1bae6336e33864ff042c40b8270afd99b035c1bb17ecd54c90"; + sha512 = "b20b67c44eca5b615febb4983479f3ae4d8ebcc2b014b30445974d3a0f47672439f2121f4665cabc8ecefc955ee6f70651af24d46c7f324f898715565ba49864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/an/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/an/firefox-62.0b17.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "f589d38c20ac60c2e3933acf47e84440a02cdc5cd26c7a02f9574473ae579f63fa4f106dd0d1c8afaabaacab4f863c9bc45333538b272551b161e41dd030664d"; + sha512 = "120ee79642bb4695b9b7ca7c1bf21e6774031be52a271da7042f6c45710d2bcf4405a4bb322245814c82c8f891067cc39309c69c5a61b40b908eedd804d9fdfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ar/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ar/firefox-62.0b17.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "0422fcb0322123f5a8f0c3fb97e125262394e802620a2a5f75aeb66b4d9468b1b4ac14a522059acfb0277446f528a41dc6763be22585512cc9f6a6a4eeee379b"; + sha512 = "85f16989d0f80aa21df59270d98306eaf260fd74c3e28c00a15f546c5fef9eabb39a079645cfb7c51b1edeec63433cd62d8871d75728489220a3def049b47b78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/as/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/as/firefox-62.0b17.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "dfa3124aec43570d5eba8ca4af24ae8cb58fe1241bbf094cd90b204e2c75de71ac85b930ce8625a259e1efb275a7fd8f94eca740d69c7388fa385ef9df47e4f8"; + sha512 = "2a7d134b7f50d8ada8772daed52825f008a5efa7759de29393c6fe578c03e5952221fd9108e751671d3849492e2a567c1f1cd614d356fded4b3b11a7dd21a4e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ast/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ast/firefox-62.0b17.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d10e2399be593b39b0392863b11480cfcb7d70e2af9e1a3ed0ab6c45f538ae4d41211524fbc68df04bf7eebc3dc7a43d6bb2b507c32f18821bf21fa6bad1b311"; + sha512 = "522785be0747916af7d77cf93a5d9c8917f7b0b244497ee2dde9c2abdc49ab1bf916393865211db42b2118086b0e114d228ef8ecb95384bdc2818f08487c6a57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/az/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/az/firefox-62.0b17.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9a3d8cd66689f62ba45bed0039563a698c191489a91b7bda16eeb99b91a0222408d1db917e49f43fd8be5e081dfb5d7650ae6bef65984b83a9ecfb47a0954973"; + sha512 = "1bb6022ffeb6d0c6f263dc2bb2e111733baa00a7a06e0830a0e8103505a016a68c3b88244fe6f1764dab12c9b7682eebd547b62c38d3cd974fd4a0ede49a63b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/be/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/be/firefox-62.0b17.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "dfdf98755e89b378c0127d5cc723e5d86944e2adc5faf7be23fc6b33066d36dab75ddf9d2f2e4715e5e9d24083e29f6fa38938f20d8e45f33e2fb17f6b31becd"; + sha512 = "8197ecf380fcadda666d71cdb45eef73dae713b73268fca1f1f3cab152c08cf4f8f923c5878d5f4e07c55ecc564080db31f64d8ad26ec2ad9bf1c0bde47b3b18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/bg/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bg/firefox-62.0b17.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "5c14389c4a2460b43fa22d005da4fd56d8798ac5b07c7d8f68935a6f0b1eb45d178af76b8d0433f70ff5c367791f30e5b05bd172fe09609a3437d515263b4ded"; + sha512 = "e6039c1291ebd11c37ac233f105778e8bb19b3b7e3fe9622a01c6a9f3bdbeff74b24569284b7083da29febda260fa71429ac105f656e4c9f599deb132f497cd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/bn-BD/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bn-BD/firefox-62.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "2b70fbc0513c3b049d2be9fbccdfbda7739a6b85642760138d7add8a1e774101c9ec9ae0472faee73d2d7eb64316c87b64c2651894a4f65b0d2ed5af196b4194"; + sha512 = "5d9a8af84b4944fb962da196ec065349b2109461506630625211d234ce7339e47bdcefdbf1c590a14c21cf740c10f31c1b5e6bf374dd696ecf2bbf5bbbeb232e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/bn-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bn-IN/firefox-62.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "22d8ba6e67b99a74cba94ec43a4768840a79a79744a33fa0780a97dd6ef3a31b16c9bd157ee835bfafc0c425cb92d7293949039a387c353db46c1cff874349a1"; + sha512 = "df7d1ccc455bbb55358da614f72ad878bb28f882ef82e2a007b743ce94f218cf3f469ac0b7ee968814e9fe87dac1c5c41b8b380f76f78f358e621077b2266a98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/br/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/br/firefox-62.0b17.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "a33efb4a95b1af31e03ae8fa160b34c504d33081efe9430a133813fe429fb561956ced7791685f5b1406914fde2c9019db56cd1e0d1119fd7e8046a3133c522a"; + sha512 = "ee172b89d05b727d895998c42af19d7d5a1f9040bdaf323a780dbe9b39937ccd91a721409ef34276cbf81fe3bb0a43bc6534335fb68bb38de8f50194fccc887f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/bs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bs/firefox-62.0b17.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fb1bfb44581bd49b06a8ec3d5792119d08e6241ccfdc96033c3219ab5bfeb9a2ea405005d132f27667c8c5184afde1027461e60e7f2bf2643f27a7f0fd07eb79"; + sha512 = "2ea8db7e182744d607d683aa55a482ce0da78d3c035b841597c8d7382cdf843e3afe274cc82b97b3244e5306f03b7b34f1964e772bfbdaa42cf98bd960d45872"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ca/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ca/firefox-62.0b17.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "fe11d17201e3d0fa09ab47ee4a112bba10ae3654f215be93956c5fef57b9351c27da73847161ed1f8269047b7b4b494d1d676104d5380dff1c92a181588daebe"; + sha512 = "aa0b2eabba996fd8073a09898a9e42f2d5c8fabd81ed02bd74a14bc5d9f9e00ea4f20dc647f461e5bd44b8783f12449de6407c440a6435796610ddd709fe4578"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/cak/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cak/firefox-62.0b17.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "a0fd135214b41cf63c9a599415f6d1cd945a376825c39545512b31ad62f89183153fe08c9df216c0a63ed1ecf23b905c9d8731662d1cd9a90fc8e535c7f9127f"; + sha512 = "e93b043f81d8f3e559f732b2b667774fabbee643a5ebc8fd6fdbaf1ffbdf33b8bb0d85035f2233a40da2c611cfeb7740230bf53de57bc4db65bb96046d29eb1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/cs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cs/firefox-62.0b17.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "449fb77a6d0be732dbb0dee55fc36e06429250387949e77aabc87766063826b86678adc7b85e14e81180f7adff78570ca59f2b335fd68c3be220bdc71779bbaa"; + sha512 = "6fa2edd2ed70b4ed8a37e3b5e61f1130bb2c69c5a34b03d2a28d7840834c0db51ba7239be548dc792df03f4832344376bfea9dc542fbd8771a10bb5ef05968eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/cy/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cy/firefox-62.0b17.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "50df0f93363aec333ab4cd08c669b6ee5037744e7fdf2092e362d3366d900c3091b1de6e10153c951e1a620ce964cebacf2ae39db36a1d351ebc0e3ebdd1cd04"; + sha512 = "dc4f02881550ce4f77cbb66c7f3033c41d0697c5d86b8ee52396955b3d3f81fb870c60f82728cc4a8d7e647af7f08c1deda4d1f30b8c140c58786576c3460d56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/da/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/da/firefox-62.0b17.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "81647af265f4654bc8692abb54e80f09fafeb3d18a1df44595dbd4c5b3839d64e771b1d8b0d91ea0b783f61cedcabe7466cd3e40e4cd622d453768305adbceb1"; + sha512 = "df887b8627e3587fd1fa94055a9e39bd3b42ff5d0d9b2d3ad761a674700c0081f769fded2e9b5262316c81020d4ad58b421185851fbb1c770a023ff94b2b26c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/de/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/de/firefox-62.0b17.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "f6a03ee9142accb71b1b2785b68fac0348aafa953b620003fd7d2e876cd9da6bad8a62d5e72f82446cc2327f749f0507a2b00e9493bf1833f35e1050facf8424"; + sha512 = "6195000ee4013587a2f4cceb368b8283a99094f2617b0a350c62ec3e562a049b49c01691a876dbfce77c7d26c3354c00b9340bb0f8fe822000f012fecf19b842"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/dsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/dsb/firefox-62.0b17.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "bbb215805d1a21c2dd72bbd14b0775c6d8242ef6c6b98d5d973dbe43f1f2e2108ebe5c2961a19f8fb82cae2d94649891942a8de217449b0391c7a5684912dddd"; + sha512 = "c44a694a85b2f443faa78fbd2ca9cbbd94a91fe1f33c2438a0d027767896f842edbbe668bfeaa9f79a00e98d7ad89b45173273a13b9b0825952f39ffac256397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/el/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/el/firefox-62.0b17.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "7db87bb11536cfba4cc8e451fae66fab1efa3d1b1ba4784564c3abc644827083b754b0cb1611ba7d715079b08f70676f03cd1a4be932851669d2c483586f33ed"; + sha512 = "f20f82982b59b223e8bd2f62c6c0fd38517799cb425619104e38e28526aec8b21eefb9b76fe9f6c7be6282a902144ccbf1033cfdc2202d927336cbac9d9c8c58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/en-CA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-CA/firefox-62.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "c672f88956f8dc43507ea6f928a927dc74f42cc4d805785bfcf3657c5928aa81a75d61508c11c1555fbf15e7f88bb476912ec77c26fe0c9817df6cd5c5ab9b49"; + sha512 = "163c3cb96fd01bfe1cf06f3f725f612f966903ed64f8f924008288e040402e252a490b7153b9a916040c25c074856b179eae4a89d511f4d7bc73dcd985367406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/en-GB/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-GB/firefox-62.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "73512f0a9cfee55a46203c35964be95e5e8b3a38b4eaeed89ecdf4cc50195ba4be32ad05405aa3117179fbc2d2a157ef7940853726d65fb9d9b0241b62b37fd1"; + sha512 = "147b7d01424a53245d0f73440961280bdcbca765b2580594db60fb0a398daa483f913d799543e97903393dec2e09d66ae437f1ce2d64a70c6ec74fe0017511d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/en-US/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-US/firefox-62.0b17.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "97d28dbd2ead9fc0e99913c0c6fd9163449e8ef208e61873781df4bcd61cb09fcd20d7a5e5883b4c32d2708c108cd435746a7ec860448836074c334549f98dd9"; + sha512 = "e822437b28e12d38bd701afab12c77d3667bb30e40420db8bee9e7ab85a77b8e3fbf00300ec2711753b25503aa7d2fb870c646ce652335cdde9fca436e04324d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/en-ZA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-ZA/firefox-62.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "161503247ef337af07e6d7b503d9909512ac413312e413d780c8c1472d507acf5de888d2f823252a093213eb1d93eb257616b6837701e5448756fddf74bf30ea"; + sha512 = "f0a5a20d9f99ab7815834ef58ded2900f32bfc84f998894b0098e22e33eb192f906c6d8eb95aa6f16e23df6413a841c681284796a85af85d9d8787c9dcd20b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/eo/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/eo/firefox-62.0b17.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "f9bf8b1bddd6b21dc4c77694b2d9cf05aebe03e39f45402d02f887237e20664c22a9baa19f4957379dcbef0ad5580abb9f90d97c0dd82be8eeeff476fd816c20"; + sha512 = "722e579e85603f959488b98c45904e65f87d424d914b90df79e1e763cc84602d03dc25891c46c7ff2abb37f296c97193f08e6f90de01b64cc15b6da48678da6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/es-AR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-AR/firefox-62.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "62741da4a75eba59d0658b37b2c5939cf7ee5d3ddd8a6e6844ca0d80c65be80535e72f0a9c611a88ce89e1a47d82c1e1cf6770eafdbc0541d9fbbd76cf299946"; + sha512 = "f0533cc71133daaf7de1fb200b7f6394e8cf7aa0113f4816096674b588c1d393381cea1607e94311a85621bc58197a923af2772a32b424966b1e5187c9a3aec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/es-CL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-CL/firefox-62.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "0fa8795a6c0974a106ac10d4afd4be3d003d259f25d9f6cf2ce956d6a72393bfb325bc227485710a9578d2ebae95f64fe61fbc76aaee41b7852b0c4509218066"; + sha512 = "a12837c9698e04b697fee3b7fbbfba1d69ec795b80bd05e64e0db90e53faded0201fdf9808c8302b7b5cd15c1dc8f092a9a3ad2084da7de58dc1248e03c2f5bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/es-ES/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-ES/firefox-62.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b23058831969f5ad3c63f349dfe2608cf98bc6c41817f668a391f06007f6bc04e36c033a5cba345a306fd4ddbdd24ba9036af57f8bf7473d2e9fc7d53b54e8b4"; + sha512 = "8ed88af39e201686a3c2f6bb42690726b1fb727d1978568f9968d588272f0c90565f69c2ba39ff0d24ea7855206d1ed6b8cb924e5079007ac205ca9962222af0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/es-MX/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-MX/firefox-62.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "c5e5a6b55a6c4ee219b648051db9b92f496ef5a924b2423a32e017a64c436e646aac974cdb6147d3fb4cc702fac31d8836bd104a5393dc81f3539b9aafd2a9ae"; + sha512 = "aa40c774af32560d751b938bd002a42dc144de9ab1f2f250e8c19fd564a5087d635662a50c052b14cdcb845a682b25c805b0ea54b7957dc0f36ca9b26803a081"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/et/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/et/firefox-62.0b17.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "1869375cd2cb0eafcb94149bf310c8d97b96ed348ee543dbda15d65af2d2f09dae4424804e439485caa409eeaf9c63f1229b38884ee5bbe1416e8bc7125b586e"; + sha512 = "43599868abe6827f8f17cc01157c5ab0a942654be65ad9285282da314dad3e22210a98b3039e8f35e9e3db49af0a18551c4f98f0b2bb1829a3987f0e00d525f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/eu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/eu/firefox-62.0b17.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "37782049e77047b2f8cac126fd2ebb2f798e74d3e5238803d7c3bdab1988def498db28454ab1236963c433978bd0d19b422922a08b959d06e52b44c4fdd744a4"; + sha512 = "a9f7cbc0253b10430c0c24648fb2ed5a0a20504ba306e1247a432f7d77d8b2ec9ad9ec2cd3c28079733e4b9ebddfe7488b1db8e3a835f1404e6b579066384d2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/fa/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fa/firefox-62.0b17.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "d460d58e329a8c3d2ef0e5189318aba185ffa60d8d3abe80a63a6e5c99b810c2de1bfff4e59abc46cd6dbe012312b1323ac1e68700c68eddae556ee709e85aad"; + sha512 = "51135e2c5303d0d237a7b1016cec133bc2c490ace618eee703a49c0c9dd9f08a8af563a6a864ebc985b8962645f05750690e3a554da2194de42dae397ab97d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ff/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ff/firefox-62.0b17.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "8386ad16f715b22a28837a656f406483d3431cf0076e42f339f76eb42b25c1c512aae95e05dac9a5ce00fc201956fc2f644f60e56fec42c0cd9f6b52ee240b55"; + sha512 = "64b32c975093e936e938daca63944ab118df082d04f84567beb081b413844181d574dac1d858084f33abc4bb79d3c154f661775ec0918a052ca59ab2679ecd0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/fi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fi/firefox-62.0b17.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "bd72f34060448694c30e13a38802ea93c72450e29b4ecd11db24c5289abee46bd3b5b4602a7cce0adb1aa3ad9152d7090c6ddfbea741dd0607bcbcb226758a0f"; + sha512 = "a4510c29801a4ca7609ab61dc1429a1f3034a61544a9a59ef4d8b64db7269f8d6f9c25f500a13da4af7741d035a7b29e064da457aa8c3beaea57e8b134ce66ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/fr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fr/firefox-62.0b17.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "3adb2ce155e9cb322b1b3d47b1d999f193ad0b7443faf4d9c09b91493cfc35a9623a9f95454f4e811504ce7beebc0bb7662cd129739161b1de51b78f1c3a6bdd"; + sha512 = "09547877fdb386abd306081d764df6aa4ccc0218aff9f84453f97e79609004bfee2f3d702fcbaef5eaad1194acac7788514da21903dbfa59d5bb54d70bf705aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/fy-NL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fy-NL/firefox-62.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "092def6ed1b677b788e5c513535f69df282698bc7e38fdd46e14e590769763bd5d854dbcdd5b7bcc1709798c50b3c1ee225a5d5b16284aeb7e3ae34fb5e3c57f"; + sha512 = "a9d150098a3adeb0a88587e66594c297ea3b16d17a4c7331707ed94ab6c0565c9a9045d5cd863a97ff2d98464bc728701501fe57a50fd7ce6e3d36697be1fc58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ga-IE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ga-IE/firefox-62.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "fcdc044dfa570a6a9d7c29bd530f20bf83f82659870f460bfd6d360bf3e0c647060a9bb97e44f9251ef0863cc1e0340b6fd893432eecc3083b9febc0f0fb4085"; + sha512 = "babe69b1a9b9a469db354546822c9fddb52e17fb6aa196eaf05de24e51cb8a1337994f4d92e412fe4c92de5a79f4561c799cc44cae039e0de6c8ea25a91516c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/gd/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gd/firefox-62.0b17.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "5e792e5976294757fe574db749e5d2b92e54e1c40ab6ffa0e6146ddbe60d9c85090e6a476f4a30d4f3e9fe767cd5fa635fc6ff63f707472b71200dba8eb99632"; + sha512 = "68a5ddfb2c450e034a8491ccfb5de00a807f89ee9d65f4fe42bc9bb7dfb7c2b26c3a0eb79039992c7989105549f177f087599ca84a50257417a1aee0920d2f2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/gl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gl/firefox-62.0b17.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "00fcc6e68596bfc023dfdbffa5232ee41d0734a776ed3852bd0577d32f28184cf48c0e5390cf7619141d76b4b943bcd15b5cc3edd64e48af9b497ca75e994388"; + sha512 = "22aa041a0f076ba986f13e835909bbdc0958a61d6ea92933a392b17335e9698b398fb4534f9c830dac3fdf94e8633cbdf1fb9348199b6e60de1a0a97047a8144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/gn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gn/firefox-62.0b17.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "7828cc3b13897bc12609456acc155285150da25d3ee21c4f55c27333d71eaa511999146cefa1694a213e6cf7d4e1bfd84e138601f4421a9f5613d99fec935172"; + sha512 = "a8bed372475435fa95e387ca23189f3d3130055a1ca211e7a51fa74b47835bcf04503bfd65f31747fa30e370ffac644cdadd0df3a25e097d56b909bf8c2651ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/gu-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gu-IN/firefox-62.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "af968771f4d062d7ead11b5a9be44345f63883cc1c8ebba00dc2f75ceb7356048082d9b19c0a50fde087e6bcb948f9ec2ca2a7f45e86ab27867c0478a17de429"; + sha512 = "067d16fa5afd8fd83f5e27d26b282c80b4793e85f53c12436730b6577b5ff5de009e2da8305a65883b04149f9120dc365de9b2681e3fa4479f1e201cc7ce2385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/he/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/he/firefox-62.0b17.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "4a3897127d8312451a87aac13b4864e22fef60ce3e72d13fc960c784f0dc5b330f89d7e9b1a16cf3cf139f9c99393bfdb761e4af0988ab1e01f8487e9c147270"; + sha512 = "d7ae260f75f7d7931849fc55811e26ed51169870d4e3f574a692b92d5454de69428b803c5c9f9d3e090c79857577b02a82820ac75c52306a12eabd2ef72ab38d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/hi-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hi-IN/firefox-62.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "9b538e508904de3657a2b790ef1366323b4b0104a683ef287a1a7df7faca26519af1409dbd0e98f841cf6f8d757d7e3f1cfbd840ab191608a1cba4fede4e3f64"; + sha512 = "f508a9889691484120c457b3838b1a6de00af0f7ddd23a736cfb8efa9db1886b8cdb9cdd2e9e134aa44af86e8ff8efa4b4f967ce31abf8d283488e379d01665e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/hr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hr/firefox-62.0b17.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "af9fc0d2af147e4c9837d487357b8af91ed4da929a6ba1d9e45d6099b17f65cd8ca947dcf6142b71de5a684a259ac6a4552c07d507dd2beec7ab42492519f6fd"; + sha512 = "ed40057ccbd2da2a675b83f28ee69759921dbefe2490573269fce6b2b671ee1e1b480dd75a773e22ab594381996f1e1f5aab6b0145a8a4612cfcae601439dc9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/hsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hsb/firefox-62.0b17.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "5e99c90bf7ef70de29868a5d5ca185827752492cf68e4d027a7cf4a6ff6cb2f8429f0ed25371707ba3a46462fb2d0d52505d2ef0dc1e969bf07c272c37eaf9f0"; + sha512 = "ef4c1b377ccd898585b7aefa02bceac1d9d8ecbcd02f0679ad029743222c479f3dc57c211ec9872d5bf2f58e50336d5f248c46ce4d46536da7b0aff03cbaf135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/hu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hu/firefox-62.0b17.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "a8c3ca9ae49e84839646b765a52b1f6acee8b465af58fb6c9f2cab51876227208912ed3c75c23cf4f1f24b271e639d01189dc6e022708fac2ef5c7a3175777ac"; + sha512 = "fadf57fe984884b4caa678cff5ccaefcdfc9f560ccb33c8f449ad87df19d3177ab0205bf5ceaa60e5e874d05c1262f3cf465a0723c24453655e60280b7f06b19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/hy-AM/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hy-AM/firefox-62.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "e2dc417bc52644468834a32f06b39055bd4e5c3e5d898c03389f816317bfc086a9e4b08af3282d764fe5db9c14383ca6776cd952d5f948fa965385f33f4175ee"; + sha512 = "53f7db4751de67b40d31de66228ad0deeafe8216a217661069a1931de3dc7d050f4e8d9a4721df5680a5d784203709fea5851f887b9c22f2b232150b2b969cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ia/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ia/firefox-62.0b17.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5a387c1934a055b7edecf29e6cd7597f9b3cafa549beba39f3c47afdcff956041ac6c08fce2f25e37f74a553f0db215d1b8931d554770d3d4a4b861d4066ea4e"; + sha512 = "58ad97f682f24ebfafdef3641c59410b6e252bb4e30fcee3c7b51bad7081fd76eaa15e116759e2a6844cf50ce0b597ac8fb7be8eb48618d1615d3654af2a8bdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/id/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/id/firefox-62.0b17.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a4edd555cf2c8fb7e834a835fee4e1caa5f170e9fc83020fcffe4cd6623b703da9b979e659fed7093fbb084a013f6cbb95ffb3c24f3569769edbab583fd8e753"; + sha512 = "e5e8a41fddfff24b958310dc89945d2a89455f00dc04906c0604e153350c99a49b1c051da60ca139928a380db6d51408d8de9299248caa7319e9e2bfab6d4e8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/is/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/is/firefox-62.0b17.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "a9543ed0385f06c68e9c55de95d0d8cb6c3955d54dfefe716db9abce223b43c35ad09bcc2e6ec37d3e24d59a9278269a502d405654f9db98989cfd533a8f81f8"; + sha512 = "cb2a6793fc7c08d8e6727a12b5449e4afef224b4f764b14cbaece7d9c78abaedb0eadde140becf9a8e5eecf0359e4d365f502545838683a5bdb49a844a1e60f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/it/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/it/firefox-62.0b17.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0c0bac12cc296bf0e08ad967310c71f06e999a4c273ddc4887a38fc24393a38f190c57983f7a4165aa00db3fe37d4c7af361ed30e2b7849c8bad49b7468907dc"; + sha512 = "607fb8a8267d125a639e0ae6c906df579874df537fcaa54aaf7d5dd42d17fe1e7b3aac680fd25a18fa4c2dd8cd68bd7dc168bf59df28d7aac80082982cabe8ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ja/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ja/firefox-62.0b17.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "f7b9f579703fbed90b6478bfb8b776845a2e2a7377cadff91dabc2153c871ce179dc3d0f1235776db20f7462fd95c59ac8b72d5af5f79728b3f8c10c7f92f460"; + sha512 = "2e803d9c3a633f2daba2768299dc3c8f52b67f4a511c20bbcb608962e28189768d242af3797fa06cdabf8a89c3179ce229e690b19eb2f3baab754f30595761bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ka/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ka/firefox-62.0b17.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "af61f3f5caa530255721d9e0590384657a5a2456b3a0d91b82de6acd6375ec9dc5617adfc1fee0dfafcadbd8509c5711a2fdd7b63d268d345fe6c77529ab60e9"; + sha512 = "c6d559bbc1eeec0e26e7b374e867bb9bce9663310578ebe518150e977a46fb9fdf5f23446d37e64141c6fd4da89c6f79edd08bba7c450c78cb07c3e66e5c0771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/kab/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kab/firefox-62.0b17.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "226e84294573c0c2970c177fac972e6c2fea9c5f8bfc955a42b796f9b2ed35b7031fe8bd4b8098cf11d633d7a823357e3573d748cf36096fc3ac1df0d511753b"; + sha512 = "8e7e979c3abfc711f3cb48c5baa61839f1e3973fd35a74964400d402cfdea31a69310a94e49dffff63411a94b169e19a9d508c83553541fd42f307652a72d5bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/kk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kk/firefox-62.0b17.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "41c1ae15049cd7984bc3b76b683fb8b90df22d3cc3a59d8ab4ef570ab5e79539c382038f6c438e20755105f5bfe4044e2ce233d897a906c22b148ae4420f71a1"; + sha512 = "e13112297a1d154866d9933d1bf6daaeeb4de05f149ad0737268ad7f4fd42c8be1af9c111a2604368c1c633a2e50f009153845b688fd8c7f42e6d94a429c6607"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/km/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/km/firefox-62.0b17.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "75a4423d4df5510fc29ef020290a6a13dde1c02a27664abd06915c84e01a23f6f733fcc2957ca0d39642c13c37b75712caeb5f7953dac1548ab0604e1abbf507"; + sha512 = "fa9bc4df90efe92d0b803ae0d88cbab6008d8312bc3d3bdb79913eca7fd6864c9141520772f0ca17f85d7763186630410238dd1a3fe8f62915d0beebd8d3027b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/kn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kn/firefox-62.0b17.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "e8acd1d8350ead568690798b8b3f06a7c893c0ed5b581cf5a23e4d34a81fc04fee2bc7d8206a126f8cf6edf9221e23c7a155fcaa5434e3ff047a8f81eb912331"; + sha512 = "10fedd6b5e5f2fc7a3160c7ae8e7d48e336534a2a9c5133621166ffe9bb8ea81cb08dd44df8e92a2db9638df0b6aa7861dafafa436b63c9b509cfcf4e4c26ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ko/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ko/firefox-62.0b17.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "9ccb6fdd9f587f21f2b536173cf778eae28654c1e99d4cb5364f30a565684b25ece931578bec6fa2c22177de84152018b654fbf0b00e8ac4271635cde4565089"; + sha512 = "88a76d6c3dff55eef87b380594ee64367e60b3a42ca8b8a7d76f7d4dce8d7b1e51bf7a06dfd6d2f43e804ac5840f1748a275210abef98dab5f6ba3819a674b10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/lij/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lij/firefox-62.0b17.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "f6793fd7189b2d2c2ad3e42126c84085ac8cda971230dba667182073614c5933e1416d89527acc1e07e1fa6827f1200b15a26944b331ad4a44f395192cc23d81"; + sha512 = "9e4bf43b24577d60113455d52eb6363a3372d5fdcc22e63dc173dd1455a6385391f5a676a499f22809b883d18b78c1abe186d328fb2357a464e891d7d27434db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/lt/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lt/firefox-62.0b17.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "cb74d521321cef44e699eac8d75198b02941f0063c8556baed37ab5f2e88277bf0f3f944ed6a94cbb102d514521c5814e8a47f9832bf4b2bf5f2982083591505"; + sha512 = "9a56ccd577e112b072a42a65e99a35a5404d7127b438b6522e9787f5b75dcdd20e4d42f8f370d218e48554514059bc3d625f1b13395cc1b3e79fd7069c276057"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/lv/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lv/firefox-62.0b17.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "a8dc8c0f42cc491e03cce681e34c794ff5114ece729d67cb3af605715fe645078365c9b394e3b6941697063558fc68916ab9efaa723a1fb37b8a7e421a29ba29"; + sha512 = "67d2ad4f29ca504ad1b515af5de47eefa48678d70b67b7853273bd98944a4a6398822c2cc0e2135e0fc1a8c45152c939a4bbb06dea36d6917a854431bae62f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/mai/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mai/firefox-62.0b17.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "48009775d4ccdce0efd16d8cef43cd3ea2f083acae4f05660259a6da97f1f4f5ec2ae2f143045056186982646cd86d9ef508c74499d0444a7624e3d876527ffa"; + sha512 = "d969b4adfc93dc808c41ebeeb0b44668d09fc4ae47b6f324a3bac7c4c304ba914785fa1bfe38bcd0467935665e7853e1fc38621b70c2e6dbb3004c9e67c78ec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/mk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mk/firefox-62.0b17.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "3f4e156b749c63e79edd4db670372dc5365eba6ade603f05edb36577c71df098ed75b97438c965bccab1a70050645b828f0f1a22885c9ea4dc755e741c61ec2b"; + sha512 = "289a00ebb4070dfd94230b6bbc1fa3db40b96f9f10d2062d81fcd8b34b6f950ef87a68a50270220052246adefa046b00e38f63b79200143fbb0c8be7f65872b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ml/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ml/firefox-62.0b17.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "d0d830baedcde31df8a993f193ccc46a2947dd89c580e948bb0dbb285550109a308b2b7d37bdbedc88413aa21106b7b23b6b505de8ec9b67eecdd4a05a672263"; + sha512 = "6c85958a7f09075f3c271b62c20a6d02bf18ec36da494f884b3a18b7ec5fc0df91c5ec5a3b14d1ca7501f6a804acd8b56888c331b55c565511a41caba8a8bd8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/mr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mr/firefox-62.0b17.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "f64d9c5d33b95f8a3f2ceeaa9b1f68d99cbcaad3094c6993a4c2a3dac523e4b0b60a6b7e41317d67c31d5481184a088603da2f207cfd5d5ace3ae0ded8d52852"; + sha512 = "8b63d0b332ea5c7328df9dee470010ebc9dd17ae342ef43961e5f87f685646a7cec18a114a028bf0bba0df15e5eb2a04794ee28aacaacf50f75294a9268e9b77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ms/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ms/firefox-62.0b17.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "b174739711b12edd9dfd0eb1748412c603f4c5c7ef6d4220848b42ce45f7434c1b81d6027552bb0d3d8a031d4b7def83ccc15cd3094b901ba68d5dec36d9870d"; + sha512 = "8639a93a8fa49c7ab3d0ee9c9e966bd7a5b6e99d93ee4c675e307c9720f09a485add3f81e936ee4aa1928fadc427e157e86d9497d67d3a06e15a9b7012087073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/my/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/my/firefox-62.0b17.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "b1e9fa7a2ba122272a9ef2f1e84e6170d79771c253c121f36b24a920e6b5d2412f21eddff9a03139ed7a33f1fee6239a7efcd50a1ef025ecc8e9b00df2f5e6af"; + sha512 = "3220272d6a6c8d853d5caa4e18351cb9565f0fe806cd67f7206251f0d3d0118b0a8e5469d8b170aad07d0f6ccb805068a5dae79f6c9f18958b68839470adcff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/nb-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nb-NO/firefox-62.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "9d47f3291ab725d3fd23dfa05af8356090a68ed2bd07a27296f7e6eb2cf41e3c16cf92714c906f57c67e4965aab0608f14bfed37afb51b76967630cbd522e36d"; + sha512 = "c6c166d486eef5540e4b6f0ceed6a1ff638f4aa5e87efa680e03b0108b23679e91dac02eb06ee933981411770967a1dcdbb35afadb1269f8b46faabad92faf9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ne-NP/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ne-NP/firefox-62.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "9209056f9b87ac9d7d76ccd12b18e2090af872a80be69a31a639294d47000b160c286c4bf27795f5ef173dd9eea2bb1276175b3b1fc70b5c01dd58698a6401b4"; + sha512 = "b59dd15e2f89ebe15a361c3a175ee763773d9ef7d85f58aabf775bd16f016f857ab01c094e271e5b8e56ce77114de57e31cc617b1c58a38a521b9c8a21ca000a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/nl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nl/firefox-62.0b17.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "81c198037a678d996e8c222f7d63cf223416e644f8911be1f851091234984aa06231f1b101d328ab9581be284eb1349666d7741f1e101c8a1c0d7e052e4ec585"; + sha512 = "d363573109c810116b4f9efd2b3f87b456ff3d825808be21754ea34659b5ed8ea5fe87018149178e7f91433b2a7b8c61f7c4a59264fdccaae5acec2344597f1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/nn-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nn-NO/firefox-62.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "650e5c70aa691209d577ed1289348966856164dc96626b4c766adf23ab75368cb01b4c150a432fbd7c747be79ce5bb690db877c1a79b5e1a7f3d8c872aefabe1"; + sha512 = "457a86dbd230cb5f87955ac01af4fa58c2b4b625d67bb8657dc3fe01ac625935469b3d72f6065fdbb18a18af1db9b402b4d2540457e8c54bf2816a0a7b667db9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/oc/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/oc/firefox-62.0b17.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "260ec1aa1bf420c39f4fea462fc66cb1867a6d114b147536cc53c2e47a9d95b411cfbf104f8c93dcd1ef415820bca4f32e69dcc69c2f19345150a5f4be236f3e"; + sha512 = "662e3e3fcf70c90d95fed5864a5807ca1ff64058d3d0ea31542a66985f19c9783ecbe0b4becd018ce2760318477a01ce1c6c5a1ef0077293f3fbdb5244b2db45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/or/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/or/firefox-62.0b17.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "daa4d6e09fe2c49edfba98f23507d6b0180e2676b48a1054779c265057b90b571877fbb9fce17a08811ecf1fde57557d1bcea098522faabefdff3e9b61e09532"; + sha512 = "81d954f0b5e1b8fa820cb9b860a7a09ea5ef4702febbee123c0cedea11360b84fd06d3f9ca79c008e734fa5a7021c6c276b31a864e30a3b91f8a239854feefb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/pa-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pa-IN/firefox-62.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "8968e7f225d819b3d5e0f1df3064008e26763fb1d09dbd35f0d2f428c2f385d1d6f309e0c23967ab113d23160f13f9b3bc0b2333cb8fddd15d99da05b9a64548"; + sha512 = "8bc73c2fa797acb388950921eecae58d4f499f78d6f51afd62218f974e6763b2ee3ee366fcd5acfbce759bafcc03798726d38ad0dbc9c33c2026d6bb6c0fcd4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/pl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pl/firefox-62.0b17.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "64fee3bffe1ac18e089a0a7756c29bce6c13fb5020b96f12637d2fc52a18fab478aae3c1da11b489a1a5389e71af1ac134c2653f0855120f28702a23c605e2a7"; + sha512 = "30391e5e9c34347997ba8824a77c60a3ca6fcef1039275c8147eabe8ca7f79849ce4320deb7b2e8610e83942b968e90b484483c9ceb2b9d0dba012aab26668a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/pt-BR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pt-BR/firefox-62.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "ceca437054d9220e678431c91761baa9da8399bf27b23941540e9e19663d88f06f10eaa66182e5240831c83e7fca0bfdb08b89417b8171bd6cf3a0bfdc78f07f"; + sha512 = "69d450c2370320e6ed9541185fdb53ac8ebfbfd3a2806525950c5e97d1cdc4c1c587b5bda9f290673e83529aa0cacc5f282650b7d38a43cdc9d179239e39ed93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/pt-PT/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pt-PT/firefox-62.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "76eeccd4310fc448538471223524c49e596cdac8497d5302ace2a4989285709cdcd581edd1fa74e09b93a500042fdaafe03e1fe3d502489f72a4b7cd32173f3b"; + sha512 = "e731b618af837016e58034014ca6c183215b3ad3aed2cdf21b41b14d4a807f690ef7f642c73906ac72a76cef0f89484261b46b25f6761d6367bc39a4f0ff4d9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/rm/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/rm/firefox-62.0b17.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "98ae4f16560a278a0f6b4f1a5e5367457f7d792f19252ea7bd55c28082d47d232cf513b33ea8bddb5306aab8f22241763c9b5229072b11553845e12dfeb7ec6b"; + sha512 = "95e5d85c77e752ca569ea48b79c0e1dd99e77532a8176ba61e3737a770a717863485230bc50ee3e2c09a6c441c6d98b7e8ecd432ce281247202631e16c7397dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ro/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ro/firefox-62.0b17.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "17bc38944e8e1852061f608ae7a20706860e10ce7d3a5a3dbe5a74727310842d50547f38a0ed0628b8a9404f886ba753a4f2e3c89d2e3a327d0e4932e303f35a"; + sha512 = "a61cadb8a75051f93c4f644f6c5a0a03fdf7f8ec376a712a9999755bceb343140ea670df6df643e77900b2b8e164e9a4214a12bf15f5e805d0f30bb03f68c30c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ru/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ru/firefox-62.0b17.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "8499d8449311cd4740d8f8e57d9455459578cf1177d9fabd308490a433cbbaaf5d95c98680656e734cd8d2c37b382cc5b748457e10d234b571648f4745f36221"; + sha512 = "47a4a306eac7388e71a1ce7ebc4714e0934d676315d97f0ba94675fe746eedbf0e3daee7b5605a9fd7109eb6aa8ac3fa4331f5064043ac1b9e859a26989270ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/si/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/si/firefox-62.0b17.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "8bdf041067c139359e98e7c895e6ee344f24eafac06884b51ab5fd7757f11f7fd332595a68f8adb61aa7afe5debf4a60d81680d70262661976466746be914f77"; + sha512 = "36c021da18c2d95d24144b18ba878e6b068abc465c056a913d1693bf2973be628a68f7f4bbd3e8cd822c97e674d61b3ce8251e1e98c1f7e97b98ea93cd89450e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/sk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sk/firefox-62.0b17.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "4aa4fe0c4ff0b10fa491f730b095d04fc9567c7306a6b4311c895d2618c94135149578a978c421c1202d6c01d8c109d63fedae84a82b00ba26eadda2e61321c4"; + sha512 = "c2dfecdd93932eac75af5dcee4e75b7ff0dc5d09cb391f113205b05b4e0bb345606f1e1be1a1dacb46eca9f39d5fd0987d2d4d53ad5f71e771f9ba3703dc2f45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/sl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sl/firefox-62.0b17.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "4556f8f810805f117def7ae5ee3e03bffe1c0209594eb4585b135fe23d542e1b0cb67bf5a4721bd52ee6651b2e591daad4da0afcc93101e8791cffd315f75451"; + sha512 = "3247716a11ee8b140219a8825298eba191a7c07bbb18decf8284d7a14a7583e80766d2580133d506a3235fec4494e3322635654ed4d1e624990e0a45649d780b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/son/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/son/firefox-62.0b17.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "58130bfa59f909e3537f6aca0b07dd823d3df435467699f5fe27376941b3b97a3110bf2a85ebae63d21627b962be29cb213b513825016a0e76f52081de9974ac"; + sha512 = "d2354d10182ab21d951dde2c2d714f30f855a199a198be64ec81d00f6089cd32000efe0ae074f24d46daf7c99eac7ba88538838eb3df30ca4a59968cacac43d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/sq/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sq/firefox-62.0b17.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "8d730e15571b95efb0010329dfb402d4cb1ae902efda742336e70036e9d8036c584c3fbef99bf7a2b4c02773e45938dee944faacc55490b3c51e817fc66b5abb"; + sha512 = "667a8eefa2188422848a8f6af0ed424adb6b8e815c11e3660cea18ea1568d4097342f0d094d8e39e3ab264b87ae451b7873f1a53ae129582b6ed00a45eaad417"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/sr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sr/firefox-62.0b17.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "e0b32685b23af4daba291c99914ed761ddd2190a46427c1568449c36cde7c51bb7ceb37ee34417a43bddad6072f492e9bb68ced2453f0aab993985118aca2b23"; + sha512 = "aaa74d3a4bb948e63e5c0f7ce049822a9add2c30bc69d6c9d96b54fd35212b999affb0c76b6ce52c5142cda992bf7a2a8b33e47e81540a481ef91896c1b86ded"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/sv-SE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sv-SE/firefox-62.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "3aa107b354c86f00ebf2599a74e3381e32792add2ec209daa41534c44fe5e6e3ad17822ca0db8b2d5e67d0cccac8fbeb6847ced5ae5dda766994f0eab2fadd39"; + sha512 = "f20617ddad0974675faf5872ed5959d9d903d80926a39a8065739a997164e3eecc51c3c5eebb4564916993e1915b88544dc4a2c3fda9c73cba956d65fa8431d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ta/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ta/firefox-62.0b17.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "c93a2ab32254d53bca064684b6a6eedfcb4d26423a61f7c94f998b40d1f9729213125ed819f09f9fc1f6bd8df2e1c6c1c9df114784ca37e48cf12e22a70b8065"; + sha512 = "07758ae74963a24c2315e72333a98abc212e1e6d0cb58a8fb7385c224dfdeb76f6af06159a74a0dd3669ac75de5396952dc87220cf0840c2570937331fc031c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/te/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/te/firefox-62.0b17.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0bca59d188fabc130cb01743a5b92e08cf405fecb5d38a0b6e42d2f55e29d86bbf298c941b89299f8e8504efa2ae0dd6039786b02fc832ae465e958b1878ae66"; + sha512 = "152dfd4cd0ea7b39bf1eb79ee61ffb77289274049e9b760a5e05001265d3a2029b13db764fbabef6c8b6736f592f55b047cf01330e7e1cd3f058689942095ec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/th/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/th/firefox-62.0b17.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "8c3758634ad86c61392f03bb6b116ad7a366b6919c3cda05a1c32d12b9e195e7177764f7079d6817c3b75cbf0f5f1caa1e03a442599756883a482ea8f76252f8"; + sha512 = "88ee9a99415036a4a1623575d574bc3fbe23c69acceed6fb174a73ffb9e728aeb85cc80f9ddd3b1a8da302e1fdcef5c1d5501a21e816eed5b19e76bc3b868fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/tr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/tr/firefox-62.0b17.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "7329df1e35ee13995cca435bc48c283ad2350a9218f7110b8241932944958db53bd153139ba7a9e7a4687ab461521003b88e9bcc47506320262b3ddff5b7fdec"; + sha512 = "361201558aab5800fdc3686522fa02222e41271357cddc21c8d89e1ac78b21222cf06ac41189c2eb870fd89e6066f6324b6450a274a25fab273a6d6964d96aac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/uk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/uk/firefox-62.0b17.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "6248ec63fb6c7fc246b6200e2e4a4f32bc5c96b471e818aef0b421de22eff54c7268c51d1c715c601b9be67d9257707be37134bf2451e20d716f9ba82440072c"; + sha512 = "1314249f6c869c75888dfdc24a7decb66923760ed10b1db63a245a0843864a928b66b3a831e2e5d137a09f63dc099f8f19c16da5a6e622a50a3907155ed2550c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ur/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ur/firefox-62.0b17.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "f828af641b8a9dace659389e8e9c4cbe701a7260ff852feefdfd0cd433baf792806d915d7c04ea7c186b5f4994d13dffbdbdd04575377ce430c7eca10def9809"; + sha512 = "9f7d9c144bec3644d469672840f8854210832a5a47fd8d6454f35257f52de21b760a9e1f70c5ff4042c145c14fa10bce23a080b577060b868f779d85b01b8c0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/uz/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/uz/firefox-62.0b17.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "607e1a4592da7184e6d12dcc3f10114f56e0427c59947ecc18714abe3ad7c9d1cd1c4b407ed433a72ba33c2878071f5c0009b7d40806b5983a002bebcac041e8"; + sha512 = "be28cb4dba902e706f10ca3db8eddcd18a95ae6ad742686591997cfa7909de2c2d37f4b3a9154708a8ef1cca062b6f5275fe566fe1a33f2e6d56e4ad1b62a56f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/vi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/vi/firefox-62.0b17.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6213fc7aa23b96db10fad99fc6f096782b8cd94776a25f56e140038488f6f064e21301f7eaefc73e6be544c7d2ab7aabd76f6e938d7ae3da1ca68cf31e4d8704"; + sha512 = "b576d962621a5c8ff5ce61d67b7a3d08f22cf7cc1a48edaee1fafbadaac4d2633d89385d3d9f57d00a12ad38eda41c6c1428ebf2b9884dc9cb9437c1a84456d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/xh/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/xh/firefox-62.0b17.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b14637fc01f6a7c5ce87500e541159770424a17e562db8dd8fc6441a5efc357588fc4abb6fd799eda4acf13fc05016e602ab78867e3da18f8baed08d4af70221"; + sha512 = "eb8dd68eb51c7f19f52f23819e934891b06565376b13accd0da0074619cd35ae74ec2f1476a7319f4746a136fb734bd94e8c8faa8db40eaa03ec001db79f7373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/zh-CN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/zh-CN/firefox-62.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "d7d2478cb4d8e58ec3bafcf3807bb6acd8cc5d94b5a63245d17dbf3a3e72d712e95e32e1e28427a8ff82257c32a5c393dc3916f3f56f36bed40c4be30b653436"; + sha512 = "3982dfaa8067642470e47ac27ab47cd8a2e21b76e972786c333ff7035879ad186e4b8bb95acf70dd7a77d5a65059c0e9f00c47da0a81b0c720f16dfa900d1062"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/zh-TW/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/zh-TW/firefox-62.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "914f78b4ef2436c394fefd3c12f1ea82fdc7c2b4b293bcf00b07058e0c016b016c8ad58a9590c7db2bcdc1da255f2b482ab265608d5946557651635a640d333f"; + sha512 = "ee934bff4c51fe60838457054449d4ca438d4ef163535e583c8692e8e3f3dbfe1d7affe0ecb89e544c22bd7afc775966bd0438094d538451a919ce3da48b7e96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ach/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ach/firefox-62.0b17.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "21c494929764bb10a2df82a430aa3c730f603e32178ee10941bc2d2768da9d25fa16f824febcf752511977a4738be07e0772a77d11192395a59bd650c0010bc2"; + sha512 = "7036e33fde1fb0b9bf5b39874604fbac9c17d4cd635b2ce473088def9007256d0096cdadc3182a9707ae547777af5638186962170e5e11cfa484df194923c9a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/af/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/af/firefox-62.0b17.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "14e2e9a0dce357e117bab5a45db5c70e5ed32ae74ba03bd595bd1b073bf42fd536b8dfecb7107f53ad6a871136958fb1fbe065a8708c0c569ab4bf126d938ac8"; + sha512 = "1ff3092cafcd0a6d0774d6f8cba93c47db3a0ee7001af8c3f06286059cd5ab34ff8715440a7b8a57eda6bbdbab8ed2230c02117e250ae6cc28297d97680ce61b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/an/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/an/firefox-62.0b17.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "29f8b77934a121d56240333f3b64e62e9a3034d8216fe7ad504b65f919028fb80b0c5b97dd12e4ad78b0c49e61d74ae93113d52f100e28a7f6f18e67741a67b8"; + sha512 = "1b1a33f4c826d6e9238db6a7e24e028a2ce06092bc7efad9ce708a06ef8f4e33fb2520e35c899dc703ae81ab12fe9e89813d3603bffb1ee3acd52bf44fbfc526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ar/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ar/firefox-62.0b17.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "73547253f9efaf676e1488670371fdb8b4df59222506b0455e74bd76e1b1a518ee8a14ba113a0de973ea055ee156a98df14de5ad09ffaa90f40eb116c8fb627f"; + sha512 = "ff57419c24d73a6c4dedcfd02be88bbca1c78f3f43fb0d1a8ab8eb464eb38a15889d126fa553301ee3a66d50d77f2b8ef88e1809ff7cfce8dd4132c00ef1128c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/as/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/as/firefox-62.0b17.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "62ae3514b578fe6b20f4696024320ea983a0716778de74007aeded8b605745f2d00909076f05624843e609b1783eb09afa9dd4dadae5250c4775954bed22aa0b"; + sha512 = "1c5b21bd57a3d064eafade32ff89070a46f6c13797f504e0aca3990f298062a5ebe074e1bb821253e81a06d9492d902cbd5b9e0ed981aa66bc18d85bbf82d30e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ast/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ast/firefox-62.0b17.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "b4ea3ea4126ef26211b353b3f1a3270a8073839c63df0c799fdd0ed8a847bb922dec25777a8cd1b45799524ff93e21eaf8699e4981c966ce74890a67219860a4"; + sha512 = "5869edce6bbb1984e15c84cde58c77c88732c7b04aa2ce52195857b2a549c04d4ef9af1a90c80845d2beff8f6a6ec1331ec789d7ffd6f7848d2e9a67e76fc43c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/az/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/az/firefox-62.0b17.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a65dcfd45f567a87a7dc5b2780c19adb044f2eb86c897147c2dcb286a0031b8537968b173004aabeba40ffdf171b0bd6f6e7c3a6addf9c39691518732475e55f"; + sha512 = "6b035d2d0ec5b9d2bdba120cc76823970edbe2193a95a5b55d869418213e03d6dca58dbf555400592ab3626c06700f5910869b1a459ecc0bfc69c8f49bdfdd81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/be/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/be/firefox-62.0b17.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b0c103fff31e5f9d87ec9eacd61dd1fb1c4ac6a9ae4f7b43057abae82c536875ea22921435c5365b73096609d589e15dc8834c3442a87dab46946421a45e7864"; + sha512 = "02e0903e940890924f6f5622fceff812c73576c3c7efb965c9ae32dbca50f7b9ec44dce69d127ab9a6ac5b0a4d3bad8fb7b5b5f7a4f7840859b221f5132243f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/bg/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bg/firefox-62.0b17.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "ad0f7be3cd3ba70f4fe8619be55bf3bf2bac515dff8b860d8926bdb7c1ce5eb9c3ec51d041e21de8b1b78c1f4879fef7f7251e7d836d3ca243ee4d659d0c045b"; + sha512 = "2acbe46e29bd576c287add7bbec292a2c306f40402d525611c9572b7751f2122753acaecc441b1f121d24dea922e493a8e0c86180c6eea98beced8c0df986ccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/bn-BD/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bn-BD/firefox-62.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "8d5ba2d3328705fb64f2fee08bd61963f6e2293744d0076081fa4cd87abade0261d03efd98ecd8c557e2d7469021dac407c16a6cec0291e5fbdd3b052c2d877d"; + sha512 = "baf4938003380adf8136aa00c0f8d0bb08d84714b12bcef2f3403f73d1540e9a289c65991b39be53ca6a329d72f5ea93960e3801ddadcf0f3aabecd64f4a1495"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/bn-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bn-IN/firefox-62.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "1d181d1b3a65a90fcd3ce3c840acf8ab616fd522099f104c3270b8b5d1ca80a6a9e9a6fb3ffc4a43b5540be1dbcc61d3c7c4a5f30a2ebf53542b3e0bd2386a38"; + sha512 = "e9ef2861c948286acca6fe8600eddc9adf95af26f9b12349f60896b4aea62c838be784ae44da5a175b2458ce4b1b29894ce45c4b927bc777844aa76d745473bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/br/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/br/firefox-62.0b17.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7e01dba111f80e6f1e1e7e703e0774805bb90bbed2d27df4afc76e36827cbacea9e271f1526ac4f6c893b30c50220b935470aa5f214cf8b6720f05c4291589bf"; + sha512 = "0f90520613ac75a78720786a6b1bed17a3765081ef5c7f398286270c92b92940b98b566b40233192f968375c61e285257776ccbee22280a9c807eb7f7e198d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/bs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bs/firefox-62.0b17.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "ae1aefb472d293e90a16fd0e19b16e2e40d4393e30da203cadc97b32c0f94452109156f620fe4f89f2becc8e2b5b641c4675bbb5ff21c7c287b1195d4611aad3"; + sha512 = "de03884b41c072bea3950d8d920fb6eeec6bdefba4f28295639567050d4ca89efa29f9ab169ee6c7dc2cee2b8127a83853124c25e282bfe7ede5bab9cacdea1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ca/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ca/firefox-62.0b17.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e0f22b3562c620f5c1fe9a60831e122225abc5385a89bf724d82d138c8f8d36f9f16613d2a925c109ddc07eb0fb6306855ba3766c336ad9e5daa70fc2e58a834"; + sha512 = "157d6179152e33d85eced2dbda53294d94ef1b217f469bc63483de254d66cddae0d4a378c3d13bffc6f7ca07e669fa2755b82cfc66e5ac09bdcc2f075c3713fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/cak/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cak/firefox-62.0b17.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "b40ed57b43a278a3ea29edc03716a23d543d785c24826f077633893a623ca7f73ad6c2e5e5f12e113b425fe07dbdc7e17b88645eb663b2b4924a34e4045c3369"; + sha512 = "37bb3290f6a5f54ecf505faac44651f8c0566ef2a5e47f0aee4084931afd1226651eb35b66bb9cb2a8e41afd06b2163433fc3435a415fbfda7e81e0f7f3a779f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/cs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cs/firefox-62.0b17.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "35b6dae732eb01674fabe4b04000e3b7faaf69f4530210672b6a4515ee394b51cded39c37f05cdbfabe9eb37a1c87f18f7fef088d9c8aa7e81b749a59a6162fc"; + sha512 = "e5098770cc159925e4d89bf27d5d72dcedbac6fbee42ffcdf26694f9d3a0710e5be4dc198241a3236fe06109e4b6e4d86b1dfa3d669effe42adb574141e16fdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/cy/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cy/firefox-62.0b17.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "06ab9af2e3bb062dd5a69b0474523925439d3789990ff654faaf93ffc32a4d91d376fd6a57283da076d8fb3578362cbf31076c8c0abe5c4de937b5a8b5e88054"; + sha512 = "ddfbe195d60b949637f33c627aa9a4c9e2ad1f04788ee5f35040e251aac303f8876bba7d350aeebef11ae5bada037e31f96b8f46771ade8fa425b70d2a4a759b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/da/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/da/firefox-62.0b17.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "692af5e24a5ccbe236ca1844ef56a0ac82800771d040c8038da4b3a46181d291256307f104940b38fa047150d7c66ef26fc68ae85df8440343c014222681e899"; + sha512 = "40df7ffa3472e2bcdd35a2549e6ba52a7846417c92eb058a84e32dd355e7c6724b6b75fe617956b970ee0c3565450f9a84458d86eb282b1f1de8b789c6eca2fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/de/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/de/firefox-62.0b17.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "9f5595b94a9b464be56d3faabb1d75c1f10ee8a4a5393f909acddb2977f3be140d53a1d32fb1113fdf5af858332b47d48c7513b42b2fab88a0d79339122408a8"; + sha512 = "3702da040d3478a4562a30f8758eaf5e574ff664c1b2a4a7b676a436e4172b294fdcc120b1cc043c3d060315c10c40a2f0f9506eed6cbb9dbfc80279d65f76cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/dsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/dsb/firefox-62.0b17.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "ea23e8aa1310671379bef10c8074b0a9dc094dc3f452033671b450a90574af0e009fe07c8da83d024ac1f8b4f839a082ff861323d415d1d7313ffdefa8c01a15"; + sha512 = "54a5c5d242579314997c41b0e26fb7751f19c97ea9b43c8ba1f3a7dcb5b6681123aef82159c4be9600564062b20667dfd1197be0d44e6b9ac3064d682c7eb2c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/el/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/el/firefox-62.0b17.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "199547b5a94f37adfe55256cef75a1a167dcf217c6f7204355db43dd45634afa02cb82423cb474763488a6dcc02658a19551485718f656503a39c63af62d1f8f"; + sha512 = "cd76f6f7d54818e8ade65147921a0160948500d7bc9cebfaefd1c8a2dada91a2c5bf277222fbef1421ea9748ff799cc2213e300dd1c767c56b4b0ef977dac556"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/en-CA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-CA/firefox-62.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "7cc9a69ac8eae55aba16ab088ce0f1852f706c4e32492bbf432bd09fd993a58fe2bd72fa864731a3d9918215b3cf98550bb37965d8ee0454419052f14223fc1b"; + sha512 = "046c5fabaac28242019b208ed66a71d1824f6e055042576cfb8ef026906dcd7b25ad75aa962ec609884967288bb58b78e915865d858b8620123c0168637c3364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/en-GB/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-GB/firefox-62.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "2cb7c58bccc4986284c9e9dc1bce84d7582f54113cc3234b2f722e827a6d99f442b84713532818ef8921a377cacd505ad3bdfd540d117034feffc9508711c459"; + sha512 = "852c4763231c2fa64330b417a1eb710e8fb04fc11821e2881697e8c3a42d375478a37156efb0e23839f147074b8116e29ecd6dff04e77a4a9b9fad57d73fe5c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/en-US/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-US/firefox-62.0b17.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "569edf3ae316977f318fcf3eb00b82c33fc58b20221d972003e1124deb12a4ffc1b78199f92d7f9ce8ef0e993e97d8d43905c934f7435cf76477cd958dd0b6d9"; + sha512 = "68dd635f30b450c6501617fabdfd0104ac9ecd89a9c400acb1ea7481782c4fd4da601531cb13d0ca3a79be34adbb62d35b70ea9d275339319da39915e51be6e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/en-ZA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-ZA/firefox-62.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "4b4750adb200a5923e7d7fde57c0c2c6a750b208ff15fc0402e5dcd1eeafe85876833eb9846a485ddf4a02b304ded984e38e878d244c1301212c4b00d683ef83"; + sha512 = "1e287c91c6451284a62c27d91916aaa2adae0d66bd7b2fa77003b8a5ff5030fd7219a42b9cfe6b1d100303a7758f591e88489f09ce9c4c6240b8f3dab7ce3044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/eo/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/eo/firefox-62.0b17.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1c8e96fd068acb535e36c605ecfcb1908b3ef3bdb9c6f9affacdcfc09d82f963f94dc3bb8e1b4e8f6248db7049be2857126da226f553183fcacb96e00ccaff64"; + sha512 = "71466b5a790cb8eded34971266c2d8d21204b4caeee5b6497d0bbaba176417f1b89a2644902942b47e10a4656bc522339db2a0852470cfeba5e9d6daca731dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/es-AR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-AR/firefox-62.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "68e63b5ac7b5f9935232acc97467cc1b876f4bf3152e7af7103fad41294e47991cca8f41e0364fbdfde9f4d57c5d962327db6e2565816d4e9371e3967757bdcd"; + sha512 = "90c6a17bedee44faca5e01f6982a67afd65bc05ca604c056c427ec4c52b7d96e19de8d98751e73dca840e33902080b36bbadcbba7cd1e89c8147f89d324d3893"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/es-CL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-CL/firefox-62.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "025afab8bd647cb4071605dadc017928da5a883c0988edb0fed305a4f469c1e491e8850048e803148b691d017f348849f233c8f40061c0cdfabf7ec64079ea36"; + sha512 = "da66ec9771e13333a5def77cfe3a744d05ba9153ee21f604005340aa2b880273bc1c38066107733d4e0abc0ed828afd1bc77f6ee2be5e790f15a6e369fdc8b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/es-ES/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-ES/firefox-62.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e288cc6a475273719d1316ecc7c45aadaae1378a2c83e872d78b8bd25e63f212afe1627a16b30ce8463cbe7547d8d2ac6768fd7837048dbc7475474dfaea60ba"; + sha512 = "4daa9db65e3c4ef3479ba4e0ac8819e8df0b711d87e9457ed3a2025fc9a0ca7de06f2b5f7224364798eaf3b0d56ab81b44ba5e2245cc8f52dd465312818f4c6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/es-MX/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-MX/firefox-62.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d44db510b9fedfcec7eac0bbd890eff0bf2eba34d3feaa2fc050b4ed7ec5a6fa86076e0390186b0900cfa53969e4b4a013a85c9f37b7531077a795fc26fe095c"; + sha512 = "1da64fe7c723606ff7b2d3502b7d4cfc2f0866a78649bef876ed8e357612a2bb2eb37f85f0e909f5809937584259c5aa92db2976a5e358d70ed3a05f294f41ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/et/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/et/firefox-62.0b17.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "a3fe1a940445bf4a5ce3f828619fb6489939ce73ce667f078e91ba17dc80b336871539d9a053bef58e897b36aeb12ab40bae8c545322c23066a3d5e62857351d"; + sha512 = "fda5d73cb75dcde2f131eb0036f3275761709dbbf5839cbe282566d5370c4daf81966250b59bd3b5db6bd768d939062f35e88c3cd454cbc10f2b575878324f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/eu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/eu/firefox-62.0b17.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "dd2d91308975e19818cd3a0b7203b6d5d05e988c070bd3d69b24780bafc8ca9526ea10d45355c499da7223f81a26781f082f0549f99684d2e436e71ce9f7b412"; + sha512 = "21f80e21f4f2fb496298883df334768c096f834c5dd82a71720e63a11d94d64515ae692f192bf540c13bf245497cf8c37776bd1c53fa57158e751865a0947dad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/fa/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fa/firefox-62.0b17.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "281db55b9f5c240d5a41be1e5aa3eb9897e74aa2e690dac6acc3c1a607c36d76caa106437aba7650e616af137232c51f10e46246555243c309b049ddfb792ab8"; + sha512 = "f254bf9b8715217a62fc9b604db47aaa2985864a7cbe925591cdf4233b81bd73acf5e7eb34daa7506400d5efc86c9eecb8ee9ba6dfaef4e43c03142ca595ab3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ff/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ff/firefox-62.0b17.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "a46a0d54cd58504f40f037ba82823818cf2b8c75c7c5b38effc783511f1d0158158c7cabce8ba01aae3432b22da43016f603ad89e0cd7c0061d579ca584908a2"; + sha512 = "0c0b97a0297e886feb7b18e3081e460fc3f237365ed04280a1587814631261dd1c8c35a0610659d43e70a36927413ef20e46067c13d0daa6e47b9c3f058bfef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/fi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fi/firefox-62.0b17.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "7ec7adfd7f8b1a85e4ed085d6810ec26e8407b0d24b8e1ab795c04dbb4f4b8ea759d468b667430ddeb8bc1d4177477e5efd1a99af7f94f4ba0acefe2b56c6d95"; + sha512 = "318e324647c847d6a12ef0bb74dcf2d75367b423a9c2d89222ae4a193f9f775ce85617e9cc72d3b960ed216a9f48fb67fd0f51dd36e2ab8330208866a852b04d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/fr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fr/firefox-62.0b17.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "caf028c1e67691b2b5d1e3fc8ee6e571cf81fb2e9d321082be4126864a5137bed4c29ff9f070152cd1566f5885384d5e3a8bf38a2cf511b22f238faf18aee4d2"; + sha512 = "c9f7033354260a72a24f94f481f5cc67bf91fbcc9170a63eddc48307972de57b937d4fa31e1eab4db1ecb9dc1f05dc56b2e38c35a946445a1d77535a1d41b433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/fy-NL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fy-NL/firefox-62.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "7bcec77acf4b662ce7b449eecc6e8bd9546755fa6a56512f94f88c1ac54e819d0f2779771cd31225fff14011dcb63cd980638301ce7131326f085b79545860f3"; + sha512 = "08a6c18f6b4beaef405e9e9292a197c42510ef50a3071fd3c20687a94ecb2bcd52076a234fbafc4b9be82c8111498d1fd35468bc604def726e3187e9119f496b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ga-IE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ga-IE/firefox-62.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "585b6dd1e765a4642032fbe00621aa1d8d853359f33c6f4f3e6f2927bbe52897531c39aada850154e0d3082a58a0f18bbd47470afc7e05d94a9fd813cc758583"; + sha512 = "f23c2be81ad724862b4408560c8b28b28a9133290a1f2af37db4afbdeedb713cba0bfb23cb436c671ef1d4b42fb10c2398416e347d75afe3e77d215a9f0349d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/gd/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gd/firefox-62.0b17.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "bbd69a6e75b24e801a96826cb04e8b7614b83d88bd54620b84190431a06c845d2203afb3c3a025caa38f65f76284b6002c63b2ccced565da500366980d66d6d3"; + sha512 = "46f1069551fb83ba5502438f27082d591f1ec4d24e689c825115553baa6d39eb026203de30bd6a50ff082a65b73514e7007f0419375a05bc2acebd38d323fd6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/gl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gl/firefox-62.0b17.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "eb1ed3b3bdb1706bf7b75b055dad9ecc0b072bd2795cc7973b9f3326b058e8acfc1f45ae895396c7493ef06784c1b470a4611336e3cdb07eb322992706206aea"; + sha512 = "6864803363c3f61cbb8bf903da7275c90f8fcd0d8997a9828392e4fa2199d75e46d5690c55fa8980437a999af3322cc5927cd576d675602c049fa15b605ede1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/gn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gn/firefox-62.0b17.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "5806709a2429bf4c69af99170fbc11964ea7a7529313eafb3795294020bd04a21afc85cc79a36ac66d470a058b603e9b62d8a7d1d3386af5d5f9f78ebcce2f78"; + sha512 = "9932f1f2ca3b0646bd63aaae3bf118e91f39957581ec03fcd6ee4138abe00b9142acde3afef6ef31f802f9a5ce5e64755af912fb6e70d49f9baf4abf497fb82f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/gu-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gu-IN/firefox-62.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "5fe290aed4522c9d7aee2235a2fbc5940d754d7c51d09c593633ffeec42607ebb7e0b3f1cf2c9a4507e9f5fe552f64b4b9ae3710d5eef5e6fcfe576f7ce87ad6"; + sha512 = "b0a216cc4194990b993ad31156325ea5296d16901a0b6cbb3e792142ddd7e38b728331b68d73d2878b24042d0015ba7a0550d3ddb1c5898119a9cc4a5e91bb7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/he/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/he/firefox-62.0b17.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ba2bb33bf8c568344396c9fdde9d28c898b20f469a56d091f78f76a8c2a16d77cfe75c937c632563fe5c00da72f1b9152dcd1d7658761595eefe7912ba412355"; + sha512 = "123a4d8b8be454276ed6003051adbe2c87f0222d96c20902fce3820efb5149c4a1d8af13763974339936d5d1b25695ccab68f7d13d773899f19c2346735ebf2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/hi-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hi-IN/firefox-62.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "c64165668845a540c4938882eef49807166b8ea5ad9d7f20a2e68ffdcc55e87d17a113e86e375347d7fffd61eab4fc4ca0d35187edf810abc0fbc481378567bf"; + sha512 = "030dd5862dd46ea72079f0dcccd4439bd766b98072d7e0d92d1260a1c2e2f2f2e48cd7a8ffe0be25449c5598a308a18093e273338eda2bb49502a3e8afe6f670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/hr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hr/firefox-62.0b17.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "4e592ac1e17ba8e61c66401396b1b9a0a25dece8cd1eac04b15bb2a4cff5b4331418b1ae8e764e644f12efe66489e8727be6278c7b11c892eccfa6ec2abbeb2d"; + sha512 = "c7ce79360d517ce4012ffc0c472e04139e2e65a068a97e38677e327cbeca054f54973dbc1344e1cfd36155e17d5a3e9a13b118fae0a3251d1f6de36bf45359af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/hsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hsb/firefox-62.0b17.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "a21275e8b61c22a7e7df3d01fc78510e9f0d1dbb8f730de6bc5def7faf823c28511e7c7fd964d6f021d60fa324d6bb244b1e07928a46b01904045dbb0cc1390a"; + sha512 = "397902ace1c3e21d564e55dbf86a218408df70fcf185a4b30406abfaed6bf8e1184fb8077d9b606a350100ae471484bb4a48c433bd889cc38f9655e7475a2949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/hu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hu/firefox-62.0b17.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "bff36f6a045dfa914a6ee204d48cdf1d52a202696e7c65661f90799fb86e077ccaf12b577be4486d13045180cbf153c67d3f84866eb762a6fbd5ea87d13c657d"; + sha512 = "982a9b5aeb1ef8762828d0cc974d8a7b77d457591f662a35f3d0f56c158aafe6b026bbb75b8f58746f4389afe08a90240238fac7994ddcf7ad1edc8567f3e547"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/hy-AM/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hy-AM/firefox-62.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "53ee68a7ca0bc8550ee2d039ab6767905102d98edc6d83ac64704382bd2b8f62f0620eed969f87b1625c8b748f826adfd772ba0ee9f4e252ba369b801eefe92b"; + sha512 = "32d842954afccfd9433621e9d9a7fc7c4ac3915b07b0e85e7caa10dad55e338768bef50077d129368059621d3af3354b5033077517089c1aa70c8d21043735bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ia/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ia/firefox-62.0b17.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "010cb2422000498b8fa4508ffecb1a69da636534a02ea0db91d94787f466e854a8ccf8e87245d73e05cdf68c2d9bdae033bb1be6616506aa7f1e29d2d9161c5d"; + sha512 = "d165c88b6288f10eb7b5f11402528a077b22cde681738d9371c4ecc5fa01c691593b7599cd605224631aaa3d93eb05d89923a939aa025a929fbc35bb9f09ae1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/id/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/id/firefox-62.0b17.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "05cdc0bcd2e92e5e574d6cbb360de385022cf036c9c2551ef320dccc9a6050cff4e0cf445693c96d11f49af9ea8cee557223a3fe1d8208285ba4469f33178924"; + sha512 = "1324b6c140db320d6ac43521091b9b77d52800e76f3f9741c83a7382bdad8522b8467c75d82c48b61d0018c40671e0bb23870b112a8957cf8256a72c009886c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/is/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/is/firefox-62.0b17.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "07c49104b961d315f8307d4208b375c7630c7d649b1c1bf6fec0cb4b4a0e3883db24b6ea1a7fcbd1193575a92da433ae46a53788b9372f2e9c9c903f5e6c8653"; + sha512 = "6b10cda6efae14942aadf96b3d1a2b7ae58790be601ea46e04225d356c5ad1109eb9ac7a6983dfa21d8c2e6710219f8d3a05605b2a80a498fc6bddbf2abbee09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/it/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/it/firefox-62.0b17.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "7d2b7c15327f141521ecdb16682674da56f6f5a4d6e731702c7727132ea1d469f39718cd265ddce308e44929569f3d913d2011d4fc547c34ff5fa9335b49fa82"; + sha512 = "f43b85b59581eec108f882f8bdf2886b658a00b46c9f651a28d9cfd09af02f4c49b70ca72dae5cedb26c5ba246e8b01dd483dba6de42da170f12a73a6f02e87d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ja/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ja/firefox-62.0b17.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "af005ae2e3416fde74bfeda4ee5003eef6176ebf01a2bf435bea16548c82cc996d4ab4317da7b28cf455b9c6df0be2c84b36b3d4290c0707411d6af1f87613f0"; + sha512 = "3f2e08852c9400ec7e7402b5d9dc97e0002ca4d3099e0b101697f8581e8ef318ecc77f286aff1d33d945cabac20e7af4296327a25bfdac44293362ec416d59e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ka/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ka/firefox-62.0b17.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "65a04aedb0de061dbea557894eb09fb8accba046c1def56824835129c11b2a0956030285a0f889dfee99d7e6643225852a7e31be727fb6eee778ab68143b4637"; + sha512 = "a9d68aee2257e50220d739053c6ff18d8fc18b8ed56e49e5b3bc49694805575ca427c7f00f4267f52700d0880f1bbd39c9e9b18a6b0706454024e46f4de34de4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/kab/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kab/firefox-62.0b17.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ade04ede7985deeac1514108cc65e58d54d679edd4612d7e0ac483e4ce5b6b69eea6fafe93dae4afaa5a2cf465a0de1c833d8c2ca6613b0ce7e09b8288687a1b"; + sha512 = "01b17ffa5140f86e5d51bf8093e99fbd50cae29e7ffe6813b61c6788a0363b7edb2680cb922e9172c7f9e2f1a8fd934938a3883184f9a9cff99c597b65663919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/kk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kk/firefox-62.0b17.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "d3ede57e990110283e06ff782645012ae72ca5dc30bdc7483c5dcb6c75b40d3e078d9b01227467427fe5db5b056eb7338d287be353679c2358e895e3ee6d771f"; + sha512 = "8403cb0799b57a5dcb703f5aeb2c75acdf1e141785bcc91097eee8daacd51cda79c31755fc71c608794440146a8762ea53f20ab39a62870cdefbe5f59448b930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/km/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/km/firefox-62.0b17.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "f77e4e44352aae1d162e4c78d3438d555341d858d41e0a02a4d425c53585e553aa3a5b18e8c84153dcc57fe462eda86a95abb586cd23e009d4b2ec2e7495b214"; + sha512 = "75fa171c93bcbffaefa44b5c8e66ea049e6234f4a97d51260cdd14a2beb9c9a62a1bf05453253afe6de5f7cee5677ad3ea96cf151d7632809f2e50fbf21d7fa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/kn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kn/firefox-62.0b17.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9fc4cc01288626e4d9ea7bcaed28891c8943c99d31791a147b1769ab49d7ca2be936de0d55e2954f13c8e17b2ac9544af46935838c9bafc81745928d7cd684d5"; + sha512 = "0a6ad18cbe339f925d6254a314ef0cdf3c3b007765eabb96c3decf3b17b359c7122bd4346c5e3b0539236defbb7f31cf23dc0b7971af2d008618bfc60d932047"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ko/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ko/firefox-62.0b17.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "fa02c1a8687ba2da4fb72602fd80c6304ad017e47d54add6734962651b2b8bbfbfd5abe52090eb7b32c8a890f117f3fdde6fc12cec6b36aed872d7a4b6e8491e"; + sha512 = "2daee318ce7984a519abdbdd7cb86fe87689c21af736b25c6e942518a50ed8e83178d2a16a81c61d829cfd5c87a657f357b6d23d6301368ed4bf886f07f75b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/lij/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lij/firefox-62.0b17.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "8cb8b872151aeab08c2a907105a1099fa9c7dcca7334544defb4ba4354e66f528dda650a5c3ba9375100a991b2f8630f890d5d1af40627cf6f541b302ebdab29"; + sha512 = "aa64a352d7179b95f95a3a5dc39bedbcfa96a7c77686065b0ee5bde8eacbe684cad1231cbaa9755c4476a3a9a4187ef97fbeb6741f18afd2430ef43a6f9a8cc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/lt/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lt/firefox-62.0b17.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "722c8a4e9408460416e26c4c2a5769955aba06a38d81e819848195fe691ee72c138bf288ddf5d7b98e46212925c4432fcad8be97433bfb86a2eaf3e70732430a"; + sha512 = "4505b712e03bae127f5168c221360543f29681aeeffa088ad66631dfb6c268c3ca24bad11c84439f690ed4a4d67138812ee74117644a803b1345d548638eaf89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/lv/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lv/firefox-62.0b17.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e10c1349e51e5dae6f54d0927e2c4c0df83c1d5a7ee2317e1e07b2184aa96e81485143b3498bb8c4ef97820d14d9431442d19f6ef4784ece0856a78ef7b64a11"; + sha512 = "bfc47b18ad8ee9c65c8520c8b57214d3493c897d0d1bfbec32ad961aa740217247755610b029039c0282932b8c1de19e9b34d801ceb96b3d4969829944de1858"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/mai/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mai/firefox-62.0b17.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "879fd2f4480bf104dfb5d313caf2793bd6ede7256c728ad366566330f6f1c00c8535bdf0202eff7e10dca7567b226bd566a8dbae78b6745e98210b8608b69a27"; + sha512 = "1d96dcbf58668827b055be628160c90f4e2d1a3e8178cf953e89e30e9bb041ecd5c1d409be905f6bd6d1780dd278ae105d1a82ec7226196614faee83f333f7a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/mk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mk/firefox-62.0b17.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "f982aa4cf67b75564f2608ddd287fc857e83efc65a1f7e438f15cc0287f64d454d64801fca8302715363658f4f9bd56c21ae8f924f415957fd042cd132263721"; + sha512 = "71a561df96f60272e7dded20f30ec8632d8df0a675ffa0730b1e2c61e131d30f70f710958fa38d5bf647cb372b763975cabbf11b81f187b154af3416aab8d2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ml/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ml/firefox-62.0b17.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "4561ca4755d2f8fd9f9d0591536d141e4295eef758ea5c96b85e1a7995f2484b369d64548b24517e88a1d00e3b767241ac5b2e018fd4f2c60e78c246a3586091"; + sha512 = "563beafe7aacaeeac411aae9b2fe2706d9ecc497984322caa6ba4e44957c24f16e06e1db90605b4085c708f563a416eaee15d2b7daf9ac481c947957ec25b5fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/mr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mr/firefox-62.0b17.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "bdbf458e10094fe522063b2bd827f03014abf276f64270a6cadcc5ff973e1dd7c9ff162fd78de9782c5e24d63384e301a8e63c560d50c04caad56bb8976498f5"; + sha512 = "bc728d67aee3f0e831316dda5415efdcd5835d3c4f29a575cc0c2772703551b4752ace541d9535f9da56132f94fe8ce116ca19c5ae07b70958fdd934f74c151a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ms/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ms/firefox-62.0b17.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "8ef1071d47d7a794cb51f574251ead51e1f8ec1f11f033c473e0452242a442e8ed681868b7f0657f8202229e4e7558af89574de9832c3eaf486e7ff8d167c51f"; + sha512 = "b368091fb415d2397e95029728a5e97e07b78c2d2119b5e3d2b0d00fb0fbd3484b397e7efa1976adf61cb8de3cacd63f7984b0b9341979a9e3b2e1b61a4563c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/my/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/my/firefox-62.0b17.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "2ac073444224c3749b1a8a7df461594e2c764e5c0d4455451b018fc0d44117e3e185378d85c48ba741a6d34d29634b326fe902cb841b003633acc0760c41a642"; + sha512 = "ad489157ff5ee3932162741e4c1746112c161cea1780e8c7764798b765aa1a821cf794f259d9ce5c3c852f575af6bf0112ce2ef90259b9432cb9c57a76508cfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/nb-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nb-NO/firefox-62.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "0f808455cdd0540ad660e71e41118f0d088a6d1ad2acf9bd1d4bba914a21c5c08a6e4b68f0552f073ee21284d9378e64dc0fae8bef103af528c5c15948649eff"; + sha512 = "ade119bcef7a54c05fb81ecaa30b4543225d78490f93611988d9df10992aedecae962d9d50cf6ecb09e9e83466423da8714c5dd9ec2d5588f0ca2d3fabe38fa5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ne-NP/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ne-NP/firefox-62.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "daae2210059a4a925b7b6b4de6b447bf89a9444ebdd2f06a5b40c4d31da2aceee0e03c58624263fae32eb481f13dde0850af40f55f16834a6a6931f958c8f942"; + sha512 = "a375b759aedbb9aeaee233b2bcc0d9c7958d2aa989ccc6cb7e6100de6c10b1957fd0a73ad24620db1c0380f455e06559bf6b991f6616591bb547ad247d15703c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/nl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nl/firefox-62.0b17.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "5a8fb7801bd027e3fbea6b546417c5cbfc51fbc43567b63eeb34cdb2a7e7609a59d8662e8eb4ed008d9c5f4207416aaf3379b3c2f79d495e612f04271ebbcd4a"; + sha512 = "06dc4e376936fa64ea081d047c224baf43dfe14eef8a6f27ef9ae0d475f5dda5bdf171432061e31bdf368da0eb2ab6b694d31df868a86c9ac0636ee701da9fcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/nn-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nn-NO/firefox-62.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4bac9202e6500bceae389864a83a4edff8ac86812899667ae19497d6e2b0140de326299a726ae27544a77786a5deb83bd5a88a1bcc250b4a2e023541f4d7cba6"; + sha512 = "6bb9bf90a1e0e747568f97b82f3b35eb6f552025a6d2e052b359e667451e336583c6bdfc6a3746d24a3bc5ccacf72301cf079811046a4adbb221003a70e89da5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/oc/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/oc/firefox-62.0b17.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "dc4a0bc0b164096323b7ea7761444098f1f8b5b3fc4b7487add6450e2bad3c564aaf083659773a3c3ffb16bc086702c3de1d6035947862d55219859a01976df5"; + sha512 = "9991b32bdea0e392a955178f9b64dd243e74da3ec95c52a9dd5b42e399534893503840cecec8329cbf2478b58b08b94b15c53288a02a12b2a41e0af12bc0ff08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/or/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/or/firefox-62.0b17.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "a6a618304971e13ead103cfd926d5e191c0cf8990a41a49c6998fd730af440007a27a73daba0ad14c72d9b448e96de35fb87bc45ed09436e6bfa68e6bf73668a"; + sha512 = "e61e0d63ae95aefaa17ec5ba1b128bf0bdd3de1a81037ccd61d746021a32d7274530acfc332c1b25b08708f03e0d15fbacea1c9d9c196f19c77fee2305e255f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/pa-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pa-IN/firefox-62.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "dbdf198696535afac39b05ed39fa886d95c3e2ddf3379f16382a7d0c98a96bab0aebfc2ce1148dc8726e938dda3ff149ce82c6d1c18a24aa1cfa5bcdd8839577"; + sha512 = "49149c7636028e69c61dd8129fa149037c5cd13aedf1e83f137ff5cbb4a368b0a222c225dacc213f31ccaee323f31831b5271cd8adc04ffcdadbe6d71943963c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/pl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pl/firefox-62.0b17.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "24722e1410e97822ce6120d466b9189047827e08bde7188dd2ab2248249ff48c69dd3a072264d3ea60fea59fa089407266863e49161f2c1d6dd329cae87415de"; + sha512 = "a1827c77ba0d48903f9e4ac2ffbaff2bd404db41335313f27dc1e024cb2b5d724f67456f01d01c0eb0406141259e351e1d19184ee6bf61660b8204d518c7fb4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/pt-BR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pt-BR/firefox-62.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "dd40ae2dd5582ae59159192d84c89b93a1d6938e1c100829cabf446d42168daaa6a61a4a7bba7b36665bcc7e9b0eeab787b42b2bf2826a4da4a72a390492da4c"; + sha512 = "c8dc8882a7f465a51813c09e46a07cf0ba42b4be3e40c7adfeda22238e8f492c74c224fc54965cc9a1145fe82a0eaab61ecd64503c1870f341825c3054cbf01c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/pt-PT/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pt-PT/firefox-62.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "5f776c53de78a360ecf70a2c0929e542a1fa792e1b3689a5eb8d695e3f25c5d1a69c7584d877fa170abdfeb00660a8a5dd0205abc328ac9c4f806eb6c6d99a5e"; + sha512 = "b0376a03c13d892b4484ea207eb31cc2e7db1333d7fec82654a96cca1ca2a724f74f552f1baea2aa9c2580055a9aa934d1a2ad3d4ca41b50ac554a9f65b7146a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/rm/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/rm/firefox-62.0b17.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "4c7d06adf68107dd9b94f67995e5326affe5f14f7cd7e9a1b2e30926479088ea75b01e4ce6cfd0eafa4ebb7b4ad3021fe7fea67b9933fc1a9e7886deda222f92"; + sha512 = "f356ecf9f19a8fb314340851f101375e7667d8c99792398ad5e5c17745db181c1a1e3513ac56597f2d75bd915a4c6a6c12f3ac71682aeaa13aaa952eaad9477c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ro/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ro/firefox-62.0b17.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "3a2438fa32b1d459cae6da58e6f68de63048fc8897f1a7ad8620dfabbe0c8d5ca07599ebddbe75536dc22ac43633e9b6cfbce74ff9a00dc12bfc4a6a3dbb03dc"; + sha512 = "549a9b2e1e6e7935434186ca3d3c4b97520b0261fd9c3f95253ace286021e43785237ff7d3afda5d497dce366eaea09e11e172cb1271031f3c1cab0c55a07772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ru/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ru/firefox-62.0b17.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "114c297751515a274ef093ee506bd2e172a46db45630b707b7a90f40368f7888b596cf46c76fc2e21192cc934fbf1f5b16efce0660652a5a3c8a43349c360321"; + sha512 = "79256f61f98035dcb063e45ee27c06eeb1e088e2dbe4429b1a5feb2664b8b37b2851f23c836d57e0272b9fed73be22ee029373107b2fd19813f7d9466ebc5900"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/si/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/si/firefox-62.0b17.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "36631bb4c8b299cf10bb261be2e3a0b4363789f83ff941029ceb8d1cb217054eeeab95b8549caa5f45d8b44ad3b20f10b2d61b65678f3c6de95510e436232e0d"; + sha512 = "907241d6ba61f53ead341cba2de045a8e6c31805954469a84792035472b9dfa6f8175716f765d332590259651fb5e17a96d1fa3d4fb0f12279b6cda9d1f0c5a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/sk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sk/firefox-62.0b17.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "68e41ca26a368903a6893bfa01094b80c9aa1f9763931c2a7b22fd0312402c7b150fceb5986b804869a573bfa752ca1edea8ec6c764b2cd05640a3b0c7338679"; + sha512 = "a8932f837cbe336fe74a223196f2f3d4383be4b1c8f53d793fdf9a9fb66a65527fb65321160df2eaf1328c8b1cafc7558c3e14a06d7d49bd93f24657e24deb76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/sl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sl/firefox-62.0b17.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "17979244d7cf5981f1d24ea3a0c1433e0d2e7872c5440e7fd1103f4349fc62694528e5e50ca00908b9d9791e1c77b65a81476b17b56152a70880fe09b9430abe"; + sha512 = "f1a76d7a77f1ff67a0defdd51fc2ed246e06ee00e11a80e58e35f4d35e081e1a0520f3f11fbdf3314a722c0f4c033cf6915ee792b8d98bc75b5552f92527dd4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/son/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/son/firefox-62.0b17.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "11823e59f2e23af9d38aec7a1e6b8552731f2e6b77eaa7d46ed73cf47a954690c4e65906adad880921fc9dcb3009e7baa2bef61cf626359e3eb9348fd87122e1"; + sha512 = "f31660a7c3e85f759611d695fd44db021fe004f990e5c2680906f60b8650eedbc6d624cd54f5a6f17ab0c46d27bfc260789b2f294908a9c77d1cbcbfbf90baea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/sq/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sq/firefox-62.0b17.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "451dc724bb610b36b66c707423765e5d53bb993d9c38d3d2a0afd6398467a8ab73f7e4a30a9834ce116a6b566c9f0471cac2d95a009b000c1626c05e82daf076"; + sha512 = "823d671493e005bf7311dc563916d28e9fb6c04378366a5be8a9ea39a0b5e6606a299682b0e58599a02853c6be592f1778dcbecf42650d200b5e8d4a9883ea50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/sr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sr/firefox-62.0b17.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "0e48a07a2a504bf955982e57f1bc8db7b45f05256b6477b617bf60d2857e6bca4fe3be9fe07ba716a0a37c6c7fb04772bcf81af53d342d9ec01cdad5c7e917fc"; + sha512 = "c397bf56d12ff28b36ffbfd132c3d304017069cb12415a085bcb7f27898136bd8363c8366ee75324aa136442d93733223e1493204163aefc792eaa531a50c3b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/sv-SE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sv-SE/firefox-62.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ab17516bbf2672741d9f4f59c399ffacf8beb02d3b8a1e808a1f68f75e478a5992812b0367885043b67b2cf444ce4e4b894b904236d7532ff55e1c30f20d9b82"; + sha512 = "7fff653a86fa12dff883366b0d76898ee3fc0b6c93ec91617e0b27254df873f7c5b8b3b5217f0082e474808a465fbc254ab682c521b36f031eda75c5558128b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ta/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ta/firefox-62.0b17.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "cf780dd39d9ef1478978ca8a030a1818d874263f5e9ec2948ee60b723c3ae5c5a947745bb105625d781146c6041a2c6666e7ef67f4c6fbd287d18bc5f8478534"; + sha512 = "9b7d327e5e72135bcc4591d7ed2aa606dabb2e292b6ccc480c8665b247a24fa0721ed23ecfe242cb50604f7f211435be63915c1bbdc828e4590a91802d277155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/te/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/te/firefox-62.0b17.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "5cf9c02fb9c7a77723dde561e7528e3c517134e95bf45c04f6e72a5f828822736b1e5bc3d389e9e14e3331b9ec40645e9f73c1752cb9a6638b839e294db77265"; + sha512 = "0067469eadde18e120645a55701454381010530fe7cea3370efdee5e728b2b0258771ab3c39ada75727c796d44be5bc1487479103649964aa4926f8e23ba9c69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/th/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/th/firefox-62.0b17.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9875766f565091479070a782b42a3ddd30b9d992a6a3bf3354b57d006cc9355a4ba470d852f413d29b3045db60d41683a63b8b74b68423747fb5855011d42d3c"; + sha512 = "3157d512fac92eb23db2774128d509277ac8047e525b14c98f9b7b291c2697fb4917144605451b1acbc76cf9f104e0c39d8a4b9c0e90d8bb206613802c2edd91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/tr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/tr/firefox-62.0b17.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b85cf631abca48ae7d41e43222c8a88c1f38e4ec6ccead6f2064fb88a9b6a108a89c5cbde805174a1be541ec40d65e213463d127c8356c2fb27e51a1e54fcca1"; + sha512 = "38e928345d279831f5c7ed1c6c4e618377d5a92e69b65f7b3d9bcfd16f24c32018bcdd8fe384350a6e846996de783897619ce8d6b734dd92cdf3f1308b9cb582"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/uk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/uk/firefox-62.0b17.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "4e800d00989bd9896aa94a98f1eaafb1712809c333a3fb0a43661bf318c71e63dd5c8b220cfd5c8424540a959e11919cd69cb7dc37ee8aa42fc42a1192ae6045"; + sha512 = "14745f76dcaf57d2a365a0eafa253e7849ab1eb168877de7a9d20a142228581190766eb7c0064edd966301d63c728aea63190d2a2fa6d2e803a96f28f15bf9ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ur/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ur/firefox-62.0b17.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ba210c76e47acde498138b9e189c333ed30ecd0aa48deaf8863a088b3315b9c7b8434077c97683ad224f79aff76a055e8dd4e5254937f83ce1f548f3003f95ee"; + sha512 = "7fc7d0ab990b64dbd611ea3e76939ed438a1a63360e746beab30a057fa053717e92c35706ab8f2ac81c52a9bd92d62cffbbf99d3ac85cfb092bbb2868f47a092"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/uz/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/uz/firefox-62.0b17.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "286d483c826f27d599e0343335420224f2a1aa9ef5ea7a675f95316ca85edfcd617a658a65acb48b90cce06cd2c8469715aa183866304b532c8961e844afd04a"; + sha512 = "256b8c553e61796b439ae3d4f90248ae07bd7c13b9a32ce3baeb24901941ff8d6ec6ab810122b6a6da713c0a1b3737ad66e6d798d6cf62fea87885541920f6ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/vi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/vi/firefox-62.0b17.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "331cf13276b56467c20142beee9004cc3f33e09612cc8c9d00849b194b9d5b0500445dcaf692aae9a9064dcfaf92031a5bf24571676ce8872fead3e808b77b76"; + sha512 = "152a826f7ca28351a6395728ca6ae1fea3623bf154e00e2bd0e56ef14ef819225a65d12dd7cb6a483b2a2e1e08a3da39082d9997a7116b2a05c66b45f8cd77bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/xh/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/xh/firefox-62.0b17.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "2537cf229336d34633dfd1581d427162199e5f721f60cfa43868974179854cdf807b5d070fd7c432f832470438495b0174be5030a110ffaab423a1d66df831ab"; + sha512 = "b5aa2d4450c34eedaadd120da155622590e053e2b5bce0328e1e314be339a7e9def21417d18c094602cadf5fcb674fef0ec6691fecc00e2f92336c393cbc0f66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/zh-CN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/zh-CN/firefox-62.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "213d872b9e7cf6d0b60f8b988f75430d919ef70ea0445cb63c2935352f96c3032db42ad518c6c283cc93079b56b2bff06b29997abd670e6d00e58860a17da16c"; + sha512 = "9c4d18c8cd48e63a0142ac2af142e75581cb57d242e779b4fb6d18fb3e90fa748952275409fa174261ca8fbebdf4d69251b0681a4b4a0aa03cf03240bd97e855"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/zh-TW/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/zh-TW/firefox-62.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "7b7e4ab64bf6ebc540deef70f28d89b243da108dd8760a47d9e0c479b4c41458583fb77f0cf3ebf8b4f3b01656c1662896df8d208c92a32e8057b130dcb8d0c4"; + sha512 = "13238f853646c2249e3eb13e140507ed2e3551151ebf0c5db3c8146239bf1a943c794d77beda40e97d93ce0eca955ba3a1b618431fd34180d2adebd8c405a137"; } ]; } From 7e0561370ba0302e65352225eb5cfc1a2d24aa1b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 14 Aug 2018 10:40:47 +0300 Subject: [PATCH 079/258] rust: Set dontUpdateAutotoolsGnuConfigScripts everywhere It's needed on ARM nowadays as well, so just put it everywhere. --- pkgs/development/compilers/rust/cargo.nix | 4 ++-- pkgs/development/compilers/rust/rustc.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 2ff3257c7fb..34932c911eb 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { passthru.rustc = rustc; - # changes hash of vendor directory otherwise on aarch64 - dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then "1" else null; + # changes hash of vendor directory otherwise + dontUpdateAutotoolsGnuConfigScripts = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index f3f9e2f57b7..23aa750060a 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation { __darwinAllowLocalNetworking = true; - # The build will fail at the very end on AArch64 without this. - dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; + # rustc complains about modified source files otherwise + dontUpdateAutotoolsGnuConfigScripts = true; # Running the default `strip -S` command on Darwin corrupts the # .rlib files in "lib/". From 4b542fdf8efb47981ec0c79c5e59d2784d1de20c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 6 Aug 2018 10:04:45 +0000 Subject: [PATCH 080/258] ocamlPackages.core: 0.11.1 -> 0.11.2 --- pkgs/development/ocaml-modules/janestreet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index f8ce400e864..76bbe04e67e 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -299,9 +299,9 @@ rec { }; core = janePackage { - version = "0.11.1"; + version = "0.11.2"; name = "core"; - hash = "0wa2dsfk5m5wlhz915664y9h08idijj5s41hyg8n54dhihvxw2ci"; + hash = "0vpsvd75lxb09il2rnzyib9mlr51v1hzqdc9fdxgx353pb5agh8a"; propagatedBuildInputs = [ core_kernel spawn ]; meta.description = "Jane Street's standard library overlay"; }; From 72d1be9b96b098f6a6f83b509374618ff6c6b0d3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 6 Aug 2018 10:06:17 +0000 Subject: [PATCH 081/258] ocamlPackages.async_kernel: 0.11.0 -> 0.11.1 --- pkgs/development/ocaml-modules/janestreet/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 76bbe04e67e..65e917fc647 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -341,8 +341,9 @@ rec { }; async_kernel = janePackage { + version = "0.11.1"; name = "async_kernel"; - hash = "1drxawih7vhhb1mhd291698ly7yb38qzif82jk1adqcvwdb547af"; + hash = "1ssv0gqbdns6by1wdjrrs35cj1c1n1qcfkxs8hj04b7x89wzvf1q"; propagatedBuildInputs = [ core_kernel ]; meta.description = "Jane Street Capital's asynchronous execution library (core)"; }; From 2aae0c04422418d170f24ae90f2f523682de264e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 6 Aug 2018 12:09:44 +0000 Subject: [PATCH 082/258] ocamlPackages.async_extra: 0.11.0 -> 0.11.1 --- pkgs/development/ocaml-modules/janestreet/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 65e917fc647..86acc242bd1 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -370,8 +370,9 @@ rec { }; async_extra = janePackage { + version = "0.11.1"; name = "async_extra"; - hash = "1qac95zlvq34fh2wbwbw0vdzxnba6si8lkal7n09y2lzpwvsifx3"; + hash = "0dmplvqf41820rm5i0l9bx1xmmdlq8zsszi36y2rkjna8991f7s2"; propagatedBuildInputs = [ async_rpc_kernel async_unix ]; meta.description = "Jane Street's asynchronous execution library (extra)"; }; From 44f18a5a4f01cde94c743bbfcacff663c7b88c21 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 7 Aug 2018 13:01:01 +0000 Subject: [PATCH 083/258] ocamlPackages.incremental_kernel: 0.11.0 -> 0.11.1 --- pkgs/development/ocaml-modules/janestreet/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 86acc242bd1..040a4ca618b 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -550,8 +550,9 @@ rec { }; incremental_kernel = janePackage { + version = "0.11.1"; name = "incremental_kernel"; - hash = "02arw8blpmnzlw5jlvavyvpgh3s9q0j9mhi2byz0x8cxknqvvasg"; + hash = "1qp9dqncx2h0np0rndqaic4dna8f1dlkqnbjfcdhcim5dp2vg4x6"; propagatedBuildInputs = [ core_kernel ]; meta.description = "Library for incremental computations depending only on core_kernel"; }; From 5762a5771b5789fd3fa345ab375646e799adf3d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=81=E3=83=AB=E3=83=8E?= Date: Tue, 14 Aug 2018 03:24:47 -0500 Subject: [PATCH 084/258] qbittorrent: 4.1.1 -> 4.1.2 (#45005) --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index a1f27572396..599e569d3eb 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "09bf1jr2sfdps8cb154gjw7zhdcpsamhnfbgacdmkfyd7qgcbykf"; + sha256 = "1756hr92rvh4xlf6bk2wl24ypczhwf1rv1pdq05flk118jciqb05"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported From 6bdb20dec0bf853f2c8a18951b527144a37ba98c Mon Sep 17 00:00:00 2001 From: Patrick Chilton Date: Tue, 14 Aug 2018 16:50:28 +0800 Subject: [PATCH 085/258] meshlab: 2016.02 -> 20180627-beta --- .../applications/graphics/meshlab/default.nix | 23 ++--- .../graphics/meshlab/fix-2016.02.patch | 88 ------------------- .../graphics/meshlab/fix-20180627-beta.patch | 25 ++++++ 3 files changed, 38 insertions(+), 98 deletions(-) delete mode 100644 pkgs/applications/graphics/meshlab/fix-2016.02.patch create mode 100644 pkgs/applications/graphics/meshlab/fix-20180627-beta.patch diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index eaaabe8fd39..bd5dea8014d 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchFromGitHub, libGLU, qtbase, qtscript, qtxmlpatterns }: +{ fetchFromGitHub, libGLU, llvmPackages, qtbase, qtscript, qtxmlpatterns }: let - meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662"; - vcglibRev = "a8e87662b63ee9f4ded5d4699b28d74183040803"; + meshlabRev = "d596d7c086c51fbdfb56050f9c30b55dd0286d4c"; + vcglibRev = "6c3c940e34327322507c703889f9f1cfa73ab183"; + # ^ this should be the latest commit in the vcglib devel branch at the time of the meshlab revision + + stdenv = llvmPackages.stdenv; # only building with clang seems to be tested upstream in stdenv.mkDerivation { - name = "meshlab-2016.12"; + name = "meshlab-20180627-beta"; srcs = [ @@ -12,31 +15,32 @@ in stdenv.mkDerivation { owner = "cnr-isti-vclab"; repo = "meshlab"; rev = meshlabRev; - sha256 = "0srrp7zhi86dsg4zsx1615gr26barz38zdl8s03zq6vm1dgzl3cc"; + sha256 = "0xi7wiyy0yi545l5qvccbqahlcsf70mhx829gf7bq29640si4rax"; name = "meshlab-${meshlabRev}"; }) (fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "vcglib"; rev = vcglibRev; - sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; + sha256 = "0jfgjvf21y9ncmyr7caipy3ardhig7hh9z8miy885c99b925hhwd"; name = "vcglib-${vcglibRev}"; }) ]; sourceRoot = "meshlab-${meshlabRev}"; - patches = [ ./fix-2016.02.patch ]; - hardeningDisable = [ "format" ]; enableParallelBuilding = true; + patches = [ ./fix-20180627-beta.patch ]; + buildPhase = '' # MeshLab has ../vcglib hardcoded everywhere, so move the source dir mv ../vcglib-${vcglibRev} ../vcglib cd src export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" + export QMAKESPEC="linux-clang" pushd external qmake -recursive external.pro @@ -53,7 +57,7 @@ in stdenv.mkDerivation { ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver ''; - buildInputs = [ libGLU qtbase qtscript qtxmlpatterns ]; + buildInputs = [ libGLU llvmPackages.openmp qtbase qtscript qtxmlpatterns ]; meta = { description = "A system for processing and editing 3D triangular meshes."; @@ -61,6 +65,5 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/graphics/meshlab/fix-2016.02.patch b/pkgs/applications/graphics/meshlab/fix-2016.02.patch deleted file mode 100644 index ebccccc00a2..00000000000 --- a/pkgs/applications/graphics/meshlab/fix-2016.02.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 0fd17cd2b6d57e8a2a981a70115c2565ee076d0f Mon Sep 17 00:00:00 2001 -From: Marco Callieri -Date: Mon, 9 Jan 2017 16:06:14 +0100 -Subject: [PATCH 1/3] resolved ambiguity for abs overloads - - -diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp -index 364d53bf..ef3d4a2d 100644 ---- a/src/meshlabplugins/edit_quality/eqhandle.cpp -+++ b/src/meshlabplugins/edit_quality/eqhandle.cpp -@@ -83,7 +83,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) - setCursor(Qt::OpenHandCursor); - - QPointF newPos = event->scenePos(); -- qreal handleOffset = abs(newPos.x()-pos().x()); -+ qreal handleOffset = std::fabs(newPos.x()-pos().x()); - - if (handleOffset >= std::numeric_limits::epsilon()) - { --- -2.15.0 - - -From 33cfd5801e59b6c9e34360c75112e6dcb88d807b Mon Sep 17 00:00:00 2001 -From: Marco Callieri -Date: Tue, 10 Jan 2017 10:05:05 +0100 -Subject: [PATCH 2/3] again, fabs ambiguity - - -diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp -index ef3d4a2d..d29f8c45 100644 ---- a/src/meshlabplugins/edit_quality/eqhandle.cpp -+++ b/src/meshlabplugins/edit_quality/eqhandle.cpp -@@ -30,6 +30,7 @@ FIRST RELEASE - #include "eqhandle.h" - #include - #include -+#include - - EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position, - EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox, -@@ -83,7 +84,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) - setCursor(Qt::OpenHandCursor); - - QPointF newPos = event->scenePos(); -- qreal handleOffset = std::fabs(newPos.x()-pos().x()); -+ qreal handleOffset = fabs(newPos.x()-pos().x()); - - if (handleOffset >= std::numeric_limits::epsilon()) - { --- -2.15.0 - - -From d717e44f4134ebee03322a6a2a56fce626084a3c Mon Sep 17 00:00:00 2001 -From: Patrick Chilton -Date: Mon, 4 Dec 2017 21:27:23 +0100 -Subject: [PATCH 3/3] io_TXT -> io_txt - - -diff --git a/src/meshlab_full.pro b/src/meshlab_full.pro -index 6ea7f1db..2a95c127 100644 ---- a/src/meshlab_full.pro -+++ b/src/meshlab_full.pro -@@ -16,7 +16,7 @@ SUBDIRS = common \ - meshlabplugins/io_x3d \ - meshlabplugins/io_expe \ - meshlabplugins/io_pdb \ -- plugins_experimental/io_TXT \ -+ plugins_experimental/io_txt \ - # Filter plugins - meshlabplugins/filter_aging \ - meshlabplugins/filter_ao \ -diff --git a/src/plugins_experimental/io_TXT/io_txt.cpp b/src/plugins_experimental/io_txt/io_txt.cpp -similarity index 100% -rename from src/plugins_experimental/io_TXT/io_txt.cpp -rename to src/plugins_experimental/io_txt/io_txt.cpp -diff --git a/src/plugins_experimental/io_TXT/io_txt.h b/src/plugins_experimental/io_txt/io_txt.h -similarity index 100% -rename from src/plugins_experimental/io_TXT/io_txt.h -rename to src/plugins_experimental/io_txt/io_txt.h -diff --git a/src/plugins_experimental/io_TXT/io_txt.pro b/src/plugins_experimental/io_txt/io_txt.pro -similarity index 100% -rename from src/plugins_experimental/io_TXT/io_txt.pro -rename to src/plugins_experimental/io_txt/io_txt.pro --- -2.15.0 - diff --git a/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch b/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch new file mode 100644 index 00000000000..177b8e90c57 --- /dev/null +++ b/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch @@ -0,0 +1,25 @@ +diff --git a/src/meshlabplugins/edit_paint/paintbox.cpp b/src/meshlabplugins/edit_paint/paintbox.cpp +index 2097a5b..6bcd1a4 100644 +--- a/src/meshlabplugins/edit_paint/paintbox.cpp ++++ b/src/meshlabplugins/edit_paint/paintbox.cpp +@@ -23,6 +23,7 @@ + + #include "paintbox.h" + #include ++#include + + Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags) + { +diff --git a/src/meshlabplugins/render_gdp/shaderDialog.h b/src/meshlabplugins/render_gdp/shaderDialog.h +index a62d3b5..7eb1594 100644 +--- a/src/meshlabplugins/render_gdp/shaderDialog.h ++++ b/src/meshlabplugins/render_gdp/shaderDialog.h +@@ -32,6 +32,8 @@ + #include "shaderStructs.h" + #include "ui_shaderDialog.h" + #include ++#include ++#include + + class QGLWidget; + From 85f892b988c4412373238609c8f8a5493fa4f5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 14 Aug 2018 11:41:42 +0100 Subject: [PATCH 086/258] stack2nix: cleanup --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f345e0b910a..80ec7194465 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -858,9 +858,6 @@ self: super: { fluid-idl-http-client = markBroken super.fluid-idl-http-client; fluid-idl-scotty = markBroken super.fluid-idl-scotty; - # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4 - stack2nix = doJailbreak super.stack2nix; - # Work around https://github.com/haskell/c2hs/issues/192. c2hs = dontCheck super.c2hs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74d62f70fa3..70bd3170e4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1013,7 +1013,7 @@ with pkgs; executableToolDepends = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/stack2nix \ - --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin" + --prefix PATH ":" "${git}/bin:${cabal-install}/bin" ''; }); From d2c55eb34a7fc9a1a9448b43e6fd33592442e793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 14 Aug 2018 11:42:10 +0100 Subject: [PATCH 087/258] haskellPackages.hpack: set to newest hpack to avoid conflicting hpack versions in closure --- .../haskell-modules/configuration-common.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 80ec7194465..d15d121776b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1077,19 +1077,18 @@ self: super: { haddock-library = doJailbreak (dontCheck super.haddock-library); haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0); + # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2. + # Lets remove this once the LTS has upraded to 0.29.6. + hpack = super.hpack_0_29_6; + cabal2nix = - let - # The test suite does not know how to find the 'cabal2nix' binary. - drv1 = overrideCabal super.cabal2nix (drv: { - preCheck = '' - export PATH="$PWD/dist/build/cabal2nix:$PATH" - export HOME="$TMPDIR/home" - ''; - }); - # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2. - # Lets remove this once the LTS has upraded to 0.29.6. - drv2 = drv1.override { hpack = self.hpack_0_29_6; }; - in drv2; + # The test suite does not know how to find the 'cabal2nix' binary. + overrideCabal super.cabal2nix (drv: { + preCheck = '' + export PATH="$PWD/dist/build/cabal2nix:$PATH" + export HOME="$TMPDIR/home" + ''; + }); # Break out of "aeson <1.3, temporary <1.3". stack = doJailbreak super.stack; From 849b27c62b64384d69c1bec0ef368225192ca096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 14 Aug 2018 11:44:07 +0100 Subject: [PATCH 088/258] hydra: remove me as maintainer --- pkgs/development/tools/misc/hydra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index d6644445e3a..42da07baca6 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -143,6 +143,6 @@ in releaseTools.nixBuild rec { description = "Nix-based continuous build system"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar ma27 ]; + maintainers = with maintainers; [ ma27 ]; }; } From af960e5df9450664968d3392130e499fbaf1713f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Tue, 14 Aug 2018 11:20:30 +0900 Subject: [PATCH 089/258] buildRustPackage: add documentation about cargoPatches --- doc/languages-frameworks/rust.section.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index b77c41e9b22..eec982d4c90 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -59,6 +59,11 @@ all crate sources of this package. Currently it is obtained by inserting a fake checksum into the expression and building the package once. The correct checksum can be then take from the failed build. +When the `Cargo.lock`, provided by upstream, is not in sync with the +`Cargo.toml`, it is possible to use `cargoPatches` to update it. All patches +added in `cargoPatches` will also be prepended to the patches in `patches` at +build-time. + To install crates with nix there is also an experimental project called [nixcrates](https://github.com/fractalide/nixcrates). From 318020e4e79332bc659e707c082742ee06a1e36b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 14 Aug 2018 13:28:51 +0200 Subject: [PATCH 090/258] alsaOss: Add license --- pkgs/os-specific/linux/alsa-oss/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index a13e178e418..0883cc9bc41 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -15,11 +15,7 @@ stdenv.mkDerivation rec { installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; - preConfigure = - '' - ''; - - meta = { + meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation"; @@ -28,6 +24,7 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 2845b63ff40bd4a2bf7ececb71e2c51a6516377d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 14 Aug 2018 13:29:25 +0200 Subject: [PATCH 091/258] AlsaTools: Add license --- pkgs/os-specific/linux/alsa-tools/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 1ce94d14803..8faba250fb3 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture tools"; @@ -47,7 +47,8 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.fps ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.fps ]; }; } From c6ffdedc532b2fd8e4a646f38a8c31dcbef7310d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 14 Aug 2018 13:32:42 +0200 Subject: [PATCH 092/258] alsaUtils: Add license --- pkgs/os-specific/linux/alsa-utils/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 376c42a8f9b..1b797166141 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; - meta = { + meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture utils"; longDescription = '' @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.AndersonTorres ]; }; } From 038cd7533e9d516bb1459612bb2f50483d992f5e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 14 Aug 2018 13:33:05 +0200 Subject: [PATCH 093/258] altermime: add license --- pkgs/tools/networking/altermime/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index f1e85487d8f..fee133b1d73 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -21,12 +21,11 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" ''; - meta = { + meta = with stdenv.lib; { description = "MIME alteration tool"; - maintainers = with stdenv.lib.maintainers; [ - raskin - ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license.fullName = "alterMIME LICENSE"; downloadPage = "http://www.pldaniels.com/altermime/"; }; } From 4360a87c45f69f7444c7b87546705de7fbc8681f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 13 Aug 2018 20:40:45 +0200 Subject: [PATCH 094/258] linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13 spl was merged into zfs master --- nixos/modules/tasks/filesystems/zfs.nix | 8 +- pkgs/os-specific/linux/spl/default.nix | 105 +++++------- .../linux/spl/install_prefix-0.7.9.patch | 162 ------------------ pkgs/os-specific/linux/zfs/default.nix | 23 +-- pkgs/top-level/all-packages.nix | 5 +- 5 files changed, 59 insertions(+), 244 deletions(-) delete mode 100644 pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index a7ed18a9bcd..2b3b09d725c 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -24,7 +24,7 @@ let kernel = config.boot.kernelPackages; packages = if config.boot.zfs.enableUnstable then { - spl = kernel.splUnstable; + spl = null; zfs = kernel.zfsUnstable; zfsUser = pkgs.zfsUnstable; } else { @@ -325,12 +325,12 @@ in virtualisation.lxd.zfsSupport = true; boot = { - kernelModules = [ "spl" "zfs" ] ; - extraModulePackages = with packages; [ spl zfs ]; + kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; + extraModulePackages = with packages; [ zfs ] ++ optional (!cfgZfs.enableUnstable) spl; }; boot.initrd = mkIf inInitrd { - kernelModules = [ "spl" "zfs" ]; + kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; extraUtilsCommands = '' copy_bin_and_libs ${packages.zfsUser}/sbin/zfs diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 43711f92209..58c4fc53a41 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -6,71 +6,50 @@ with stdenv.lib; -let - common = { version - , sha256 - , rev ? "spl-${version}" - , broken ? false - , patches ? [] - }: stdenv.mkDerivation rec { - name = "spl-${version}-${kernel.version}"; +assert kernel != null; - src = fetchFromGitHub { - owner = "zfsonlinux"; - repo = "spl"; - inherit rev sha256; - }; +stdenv.mkDerivation rec { + name = "spl-${version}-${kernel.version}"; - inherit patches; - - nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; - - hardeningDisable = [ "fortify" "stackprotector" "pic" ]; - - preConfigure = '' - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" - substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - ''; - - configureFlags = [ - "--with-config=kernel" - "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" - "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; - - enableParallelBuilding = true; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - - longDescription = '' - This kernel module is a porting layer for ZFS to work inside the linux - kernel. - ''; - - inherit broken; - - homepage = http://zfsonlinux.org/; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; - }; + src = fetchFromGitHub { + owner = "zfsonlinux"; + repo = "spl"; + rev = "spl-0.7.9"; + sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; }; -in - assert kernel != null; -{ - splStable = common { - version = "0.7.9"; - sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; - patches = [ ./install_prefix-0.7.9.patch ]; - }; - splUnstable = common { - version = "2018-05-07"; - rev = "1149b62d20b7ed9d8ae25d5da7a06213d79b7602"; - sha256 = "07qlx7l23y696gzyy7ynly7n1141w66y21gkmxiia2xwldj8klkx"; - patches = [ ./install_prefix.patch ]; - }; + patches = [ ./install_prefix.patch ]; + + nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; + + hardeningDisable = [ "fortify" "stackprotector" "pic" ]; + + preConfigure = '' + substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid + substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" + substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + ''; + + configureFlags = [ + "--with-config=kernel" + "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" + "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + enableParallelBuilding = true; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + + longDescription = '' + This kernel module is a porting layer for ZFS to work inside the linux + kernel. + ''; + + homepage = http://zfsonlinux.org/; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; + }; } diff --git a/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch b/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch deleted file mode 100644 index 114ca123147..00000000000 --- a/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch +++ /dev/null @@ -1,162 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 4977448..ac17217 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,10 +12,10 @@ endif - if CONFIG_KERNEL - SUBDIRS += module - --extradir = @prefix@/src/spl-$(VERSION) -+extradir = @prefix@/libexec/spl - extra_HEADERS = spl.release.in spl_config.h.in - --kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION) -+kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) - nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) - endif - -diff --git a/include/Makefile.am b/include/Makefile.am -index 3200222..4a47aaa 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -13,6 +13,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include -+kerneldir = @prefix@/libexec/spl/include - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am -index e0da4b3..d6d7af0 100644 ---- a/include/fs/Makefile.am -+++ b/include/fs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/fs -+kerneldir = @prefix@/libexec/spl/include/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index 712e94e..4af9fb7 100644 ---- a/include/linux/Makefile.am -+++ b/include/linux/Makefile.am -@@ -18,6 +18,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/linux -+kerneldir = @prefix@/libexec/spl/include/linux - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am -index cfc8246..4fbd33d 100644 ---- a/include/rpc/Makefile.am -+++ b/include/rpc/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc -+kerneldir = @prefix@/libexec/spl/include/rpc - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am -index 10e7093..febecdf 100644 ---- a/include/sharefs/Makefile.am -+++ b/include/sharefs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs -+kerneldir = @prefix@/libexec/spl/include/sharefs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am -index 73c4a84..31a9f50 100644 ---- a/include/sys/Makefile.am -+++ b/include/sys/Makefile.am -@@ -107,7 +107,7 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys -+kerneldir = @prefix@/libexec/spl/include/sys - kernel_HEADERS = $(KERNEL_H) - endif - -diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am -index 2821cbe..a84ce8e 100644 ---- a/include/sys/fm/Makefile.am -+++ b/include/sys/fm/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm -+kerneldir = @prefix@/libexec/spl/include/sys/fm - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am -index 581083e..0c35fb7 100644 ---- a/include/sys/fs/Makefile.am -+++ b/include/sys/fs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs -+kerneldir = @prefix@/libexec/spl/include/sys/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/util/Makefile.am b/include/util/Makefile.am -index e2bf09f..3f5d6ce 100644 ---- a/include/util/Makefile.am -+++ b/include/util/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/util -+kerneldir = @prefix@/libexec/spl/include/util - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am -index 7faab0a..8148b3d 100644 ---- a/include/vm/Makefile.am -+++ b/include/vm/Makefile.am -@@ -10,6 +10,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/vm -+kerneldir = @prefix@/libexec/spl/include/vm - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/module/Makefile.in b/module/Makefile.in -index d4e62e1..73fa01c 100644 ---- a/module/Makefile.in -+++ b/module/Makefile.in -@@ -21,15 +21,15 @@ clean: - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ -- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ -+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ - INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ - KERNELRELEASE=@LINUX_VERSION@ - @# Remove extraneous build products when packaging -- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -- if [ -n "$(DESTDIR)" ]; then \ -+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -+ if [ -n "@prefix@" ]; then \ - find $$kmoddir -name 'modules.*' | xargs $(RM); \ - fi -- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ -+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 9a1baf8f7b9..776842da1dc 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -9,7 +9,7 @@ , gawk, gnugrep, gnused, systemd # Kernel dependencies -, kernel ? null, spl ? null, splUnstable ? null +, kernel ? null, spl ? null }: with stdenv.lib; @@ -51,7 +51,7 @@ let ''; nativeBuildInputs = [ autoreconfHook nukeReferences ] - ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); + ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] @@ -93,7 +93,7 @@ let configureFlags = [ "--with-config=${configFile}" - ] ++ optionals buildUser [ + ] ++ optionals buildUser [ "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" "--with-systemdunitdir=$(out)/etc/systemd/system" @@ -103,10 +103,11 @@ let "--sysconfdir=/etc" "--localstatedir=/var" "--enable-systemd" - ] ++ optionals buildKernel [ - "--with-spl=${spl}/libexec/spl" + ] ++ optionals buildKernel [ "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ] ++ optionals (buildKernel && spl != null) [ + "--with-spl=${spl}/libexec/spl" ]; enableParallelBuilding = true; @@ -179,19 +180,19 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-05-22"; + version = "2018-08-13"; - rev = "ba863d0be4cbfbea938b10e49fb6ff459ac9ec20"; - sha256 = "11dhigw1gybalwg2m6si148b6w195dj2lw38snqf6576wb5zndd0"; + rev = "64e96969a88c21aebb2f8d982a8c345e55a2ae6c"; + sha256 = "164fvsf9zqvq3vafnvjxafjl8gihmfqfsjwsmky16i90a6hs96gf"; isUnstable = true; extraPatches = [ (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-02-02.patch"; - sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch"; + url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-08-13.patch"; + sha256 = "1sdcr1w2jp3djpwlf1f91hrxxmc34q0jl388smdkxh5n5bpw5gzw"; }) ]; - spl = splUnstable; + spl = null; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fab09745a42..2404a1507bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14023,10 +14023,7 @@ with pkgs; sch_cake = callPackage ../os-specific/linux/sch_cake { }; - inherit (callPackage ../os-specific/linux/spl {}) - splStable splUnstable; - - spl = splStable; + spl = callPackage ../os-specific/linux/spl { }; sysdig = callPackage ../os-specific/linux/sysdig {}; From bcf59b9b514be0787e6d9f868be67d281a3f7949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 27 Jul 2018 19:38:37 +0900 Subject: [PATCH 095/258] javacard-devkit: init at 2.2.2 Oracle has already released 3.0.5, but versions after 2.2.2 appear to be Windows-only. Thanks-To: aszlig --- .../compilers/javacard-devkit/default.nix | 67 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/compilers/javacard-devkit/default.nix diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix new file mode 100644 index 00000000000..215b2e6db7d --- /dev/null +++ b/pkgs/development/compilers/javacard-devkit/default.nix @@ -0,0 +1,67 @@ +{ stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook +, pcsclite +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "javacard-devkit"; + version = "2.2.2"; + uscoreVersion = builtins.replaceStrings ["."] ["_"] version; + + src = requireFile { + name = "java_card_kit-${uscoreVersion}-linux.zip"; + url = "http://www.oracle.com/technetwork/java/javasebusiness/downloads/" + + "java-archive-downloads-javame-419430.html#java_card_kit-2.2.2-oth-JPR"; + sha256 = "1rzkw8izqq73ifvyp937wnjjc40a40drc4zsm0l1s6jyv3d7agb2"; + }; + + nativeBuildInputs = [ unzip oraclejdk8 makeWrapper autoPatchelfHook ]; + buildInputs = [ pcsclite ]; + + zipPrefix = "java_card_kit-${uscoreVersion}"; + + sourceRoot = "."; + unpackCmd = '' + unzip -p "$curSrc" "$zipPrefix/$zipPrefix-rr-bin-linux-do.zip" | jar x + ''; + + installPhase = '' + mkdir -p "$out/share/$pname" + cp -rt "$out/share/$pname" api_export_files + cp -rt "$out" lib + + for i in bin/*; do + case "$i" in + *.so) install -vD "$i" "$out/libexec/$pname/$(basename "$i")";; + *) target="$out/bin/$(basename "$i")" + install -vD "$i" "$target" + wrapProgram "$target" \ + --set JAVA_HOME "$JAVA_HOME" \ + --prefix CLASSPATH : "$out/share/$pname/api_export_files" + ;; + esac + done + + makeWrapper "$JAVA_HOME/bin/javac" "$out/bin/javacardc" \ + --prefix CLASSPATH : "$out/lib/api.jar" + ''; + + meta = { + description = "Official development kit by Oracle for programming for the Java Card platform"; + longDescription = '' + This Java Card SDK is the official SDK made available by Oracle for programming for the Java Card platform. + + Instructions for usage: + + First, compile your '.java' (NixOS-specific: you should not need to set the class path -- if you need, it's a bug): + javacardc -source 1.5 -target 1.5 [MyJavaFile].java + Then, convert the '.class' file into a '.cap': + converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version] + For more details, please refer to the documentation by Oracle + ''; + homepage = http://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.ekleog ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9f6c16e992..f41cf2bd8cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6787,6 +6787,8 @@ with pkgs; oraclejdk10distro = packageType: _: (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType; }); + javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; + jikes = callPackage ../development/compilers/jikes { }; julia_04 = callPackage ../development/compilers/julia { From be989c7af4addb252f3eff3cae83f0c7672ef2de Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 Aug 2018 12:53:30 +0000 Subject: [PATCH 096/258] ocamlPackages.javalib: 2.3.4 -> 2.3.5 (#45016) --- pkgs/development/ocaml-modules/javalib/default.nix | 12 +++++++----- pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index e0dc2408f13..6e533092dc6 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}: +{ stdenv, fetchurl, which, ocaml, findlib, camlp4 +, camlzip, camomile, extlib +}: if !stdenv.lib.versionAtLeast ocaml.version "4" then throw "javalib not supported for ocaml ${ocaml.version}" @@ -10,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37154/javalib-2.3.4.tar.bz2"; - sha256 = "1ajzbyli5a3y9s8f46913drpxdzlby3i4g3c2fqacmnbyvhpaqb6"; + url = "https://gforge.inria.fr/frs/download.php/file/37655/javalib-2.3.5.tar.bz2"; + sha256 = "1gks12ghcmv9lm8j4diw8bvjqxfl7xwk0sxbi227saxg9irpwwkd"; }; buildInputs = [ which ocaml findlib camlp4 ]; @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH; ''; - propagatedBuildInputs = [ camlzip extlib ]; + propagatedBuildInputs = [ camlzip camomile extlib ]; meta = with stdenv.lib; { description = "A library that parses Java .class files into OCaml data structures"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9206f2498da..ef0785abb72 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -298,7 +298,7 @@ let iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; javalib = callPackage ../development/ocaml-modules/javalib { - extlib = ocaml_extlib_maximal; + extlib = ocaml_extlib; }; dypgen = callPackage ../development/ocaml-modules/dypgen { }; From 1333ebce9897da11a39b4731ee6464ff45792343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 Aug 2018 14:55:50 +0200 Subject: [PATCH 097/258] zfsUnstable: compatible with 4.18 again --- pkgs/os-specific/linux/zfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 8c867dcfdf2..c689faad492 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -177,7 +177,7 @@ in { zfsUnstable = common rec { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.18"; + incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-08-13"; From a1762065c3696530789109d37781dedb0400e140 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Thu, 9 Aug 2018 15:17:43 +0100 Subject: [PATCH 098/258] redshift: install desktop files, and use absolute paths in them to avoid confusing geoclue agent --- nixos/modules/services/x11/redshift.nix | 3 +++ pkgs/applications/misc/redshift/default.nix | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 30d853841ea..b7dd7debcb6 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -116,6 +116,9 @@ in { } ]; + # needed so that .desktop files are installed, which geoclue cares about + environment.systemPackages = [ cfg.package ]; + services.geoclue2.enable = mkIf (cfg.provider == "geoclue2") true; systemd.user.services.redshift = diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index c6d3d6e1a9d..b8c49cb02a6 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -61,6 +61,15 @@ stdenv.mkDerivation rec { postFixup = "wrapPythonPrograms"; + # the geoclue agent may inspect these paths and expect them to be + # valid without having the correct $PATH set + postInstall = '' + substituteInPlace $out/share/applications/redshift.desktop \ + --replace 'Exec=redshift' "Exec=$out/bin/redshift" + substituteInPlace $out/share/applications/redshift.desktop \ + --replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk" + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { From 284fc9b4496aa2032ac1bb82a2556a3055084398 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Thu, 9 Aug 2018 15:20:28 +0100 Subject: [PATCH 099/258] geoclue: 2.4.10 -> 2.4.12 --- pkgs/development/libraries/geoclue/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 2588d7f3d54..8417719b706 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -7,17 +7,19 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "geoclue-${version}"; - version = "2.4.10"; + version = "2.4.12"; src = fetchurl { url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0h4n8jf7w457sglfdhghkyf8n4v4a5jrx8dgdy5zn35nbscx24l4"; + sha256 = "1jnad1f3rf8h05sz1lc172jnqdhqdpz76ff6m7i5ss3s0znf5l05"; }; outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig intltool gtk-doc docbook_xsl docbook_xml_dtd_412 wrapGAppsHook gobjectIntrospection + pkgconfig intltool wrapGAppsHook gobjectIntrospection + # devdoc + gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ @@ -41,11 +43,6 @@ stdenv.mkDerivation rec { "--disable-nmea-source" ]; - # https://gitlab.freedesktop.org/geoclue/geoclue/issues/73 - postInstall = '' - sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" - ''; - meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home; From 316669327c6cb0e85dc522f0b7af55db33474553 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Thu, 9 Aug 2018 15:29:07 +0100 Subject: [PATCH 100/258] geoclue2 service: add option to run demo agent --- nixos/modules/services/desktops/geoclue2.nix | 35 ++++++++++++++++--- .../services/x11/desktop-managers/gnome3.nix | 2 ++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index c5a000d5c6a..dafb0af2075 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -4,6 +4,10 @@ with lib; +let + # the demo agent isn't built by default, but we need it here + package = pkgs.geoclue2.override { withDemoAgent = config.services.geoclue2.enableDemoAgent; }; +in { ###### interface @@ -21,21 +25,42 @@ with lib; ''; }; + enableDemoAgent = mkOption { + type = types.bool; + default = true; + description = '' + Whether to use the GeoClue demo agent. This should be + overridden by desktop environments that provide their own + agent. + ''; + }; + }; }; ###### implementation - config = mkIf config.services.geoclue2.enable { - environment.systemPackages = [ pkgs.geoclue2 ]; + environment.systemPackages = [ package ]; - services.dbus.packages = [ pkgs.geoclue2 ]; - - systemd.packages = [ pkgs.geoclue2 ]; + services.dbus.packages = [ package ]; + systemd.packages = [ package ]; + + # this needs to run as a user service, since it's associated with the + # user who is making the requests + systemd.user.services = mkIf config.services.geoclue2.enableDemoAgent { + "geoclue-agent" = { + description = "Geoclue agent"; + script = "${package}/libexec/geoclue-2.0/demos/agent"; + # this should really be `partOf = [ "geoclue.service" ]`, but + # we can't be part of a system service, and the agent should + # be okay with the main service coming and going + wantedBy = [ "default.target" ]; + }; + }; }; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 9fb8f44b242..e000e34cafc 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -93,6 +93,8 @@ in { services.udisks2.enable = true; services.accounts-daemon.enable = true; services.geoclue2.enable = mkDefault true; + # GNOME should have its own geoclue agent + services.geoclue2.enableDemoAgent = false; services.dleyna-renderer.enable = mkDefault true; services.dleyna-server.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; From 80d4fa725bc0a61c11c51a392c95561442d795f5 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Thu, 9 Aug 2018 15:50:53 +0100 Subject: [PATCH 101/258] localtime: simplify module a little --- nixos/modules/services/system/localtime.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix index b9355bbb944..c7e897c9644 100644 --- a/nixos/modules/services/system/localtime.nix +++ b/nixos/modules/services/system/localtime.nix @@ -22,14 +22,8 @@ in { config = mkIf cfg.enable { services.geoclue2.enable = true; - security.polkit.extraConfig = '' - polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.timedate1.set-timezone" - && subject.user == "localtimed") { - return polkit.Result.YES; - } - }); - ''; + # so polkit will pick up the rules + environment.systemPackages = [ pkgs.localtime ]; users.users = [{ name = "localtimed"; From 3f2921b6104720a4db27eaff2313b87476692a6d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 14 Aug 2018 17:21:02 +0200 Subject: [PATCH 102/258] pdd: 1.3 -> 1.3.1 --- pkgs/tools/misc/pdd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix index d84f0f966e4..da595e0591a 100644 --- a/pkgs/tools/misc/pdd/default.nix +++ b/pkgs/tools/misc/pdd/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pdd"; - version = "1.3"; + version = "1.3.1"; src = fetchFromGitHub { owner = "jarun"; repo = "pdd"; rev = "v${version}"; - sha256 = "1r7861qg73jpchgmk8zcz0iki95ic1i3f77sd7j7vf5bvkikv739"; + sha256 = "0kl6d9nivf6jj1j70alz64iwbp3ip9rg4x506nannii2cfmmx5wr"; }; format = "other"; From 8ae47fa81a1b4c1bd7995f19ef9d927b5a596065 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Tue, 14 Aug 2018 01:07:04 -0400 Subject: [PATCH 103/258] symmetrica: Add darwin support --- .../science/math/symmetrica/default.nix | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index 6123fd7306d..a641993b393 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -5,20 +5,15 @@ stdenv.mkDerivation rec { name = "symmetrica-${version}"; version = "2.0"; + src = fetchurl { url = "http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/SYM2_0_tar.gz"; sha256 = "1qhfrbd5ybb0sinl9pad64rscr08qvlfzrzmi4p4hk61xn6phlmz"; name = "symmetrica-2.0.tar.gz"; }; + sourceRoot = "."; - installPhase = '' - mkdir -p "$out"/{lib,share/doc/symmetrica,include/symmetrica} - ar crs libsymmetrica.a *.o - ranlib libsymmetrica.a - cp libsymmetrica.a "$out/lib" - cp *.h "$out/include/symmetrica" - cp README *.doc "$out/share/doc/symmetrica" - ''; + patches = [ # don't show banner ("SYMMETRICA VERSION X - STARTING) # it doesn't contain very much helpful information and a banner is not ideal for a library @@ -34,13 +29,34 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/symmetrica/patches/int32.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0p33c85ck4kd453z687ni4bdcqr1pqx2756j7aq11bf63vjz4cyz"; }) + + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/symmetrica/patches/return_values.patch?id=1615f58890e8f9881c4228c78a6b39b9aab1303a"; + sha256 = "0dmczkicwl50sivc07w3wm3jpfk78wm576dr25999jdj2ipsb7nk"; + }) ]; + + postPatch = '' + substituteInPlace makefile --replace gcc cc + ''; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p "$out"/{lib,share/doc/symmetrica,include/symmetrica} + ar crs libsymmetrica.a *.o + ranlib libsymmetrica.a + cp libsymmetrica.a "$out/lib" + cp *.h "$out/include/symmetrica" + cp README *.doc "$out/share/doc/symmetrica" + ''; + meta = { inherit version; description = ''A collection of routines for representation theory and combinatorics''; license = stdenv.lib.licenses.publicDomain; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://www.symmetrica.de/; }; } From 47aa6abe96d26b116dae9615e0a37cdb32446dcf Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Tue, 14 Aug 2018 00:43:38 -0400 Subject: [PATCH 104/258] ratpoints: 2.1.3 -> 2.1.3.p4; add darwin support --- .../science/math/ratpoints/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index 82a6836bd62..2dd4778234d 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -1,20 +1,36 @@ -{stdenv, fetchurl, gmp}: +{ stdenv, fetchurl, fetchpatch, gmp }: stdenv.mkDerivation rec { name = "ratpoints-${version}"; - version = "2.1.3"; + version = "2.1.3.p4"; + src = fetchurl { url = "http://www.mathe2.uni-bayreuth.de/stoll/programs/ratpoints-${version}.tar.gz"; sha256 = "0zhad84sfds7izyksbqjmwpfw4rvyqk63yzdjd3ysd32zss5bgf4"; }; - buildInputs = [gmp]; - makeFlags = "INSTALL_DIR=$(out)"; + + enableParallelBuilding = true; + + patches = [ + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch?id=1615f58890e8f9881c4228c78a6b39b9aab1303a"; + sha256 = "0q3wajncyfr3gahd8gwk9x7g56zw54lpywrl63lqk7drkf60mrcl"; + }) + ]; + + buildInputs = [ gmp ]; + + makeFlags = [ "CC=cc" ]; + buildFlags = stdenv.lib.optional stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; + installFlags = [ "INSTALL_DIR=$(out)" ]; + preInstall = ''mkdir -p "$out"/{bin,share,lib,include}''; + meta = { inherit version; description = ''A program to find rational points on hyperelliptic curves''; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://www.mathe2.uni-bayreuth.de/stoll/programs/; updateWalker = true; }; From 82f651b97786ceb4498e57164f58c29b9c8e3682 Mon Sep 17 00:00:00 2001 From: David McKay Date: Tue, 14 Aug 2018 16:45:07 +0100 Subject: [PATCH 105/258] vscode: 1.25.1 -> 1.26.0 --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 7f16ce3596d..52733f26755 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.25.1"; + version = "1.26.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1qljnajk4h9ki5gvydh1b557fvhvcryvkrvypvz0pr804lpdqsmg"; - "x86_64-linux" = "0f1lpwyxfchmbymzzxv97w9cy1z5pdljhwm49mc5v84aygmvnmjq"; - "x86_64-darwin" = "1dgda1drij1c114xzv4hs44k7rx4x1vzghlxgii0h2rg641n6pbn"; + "i686-linux" = "fd150bee8e1be4f5461013b8fee19f855200d046643e4ea5387aad170ad5f12b"; + "x86_64-linux" = "618ca429e23777ef6b512c0cbd78bc711a7cf6f58752d9f805ced1dc62abb8f0"; + "x86_64-darwin" = "07c2d678596e4e1f0bdf35b7d72a6d46851bf169d89f134fa73ff4f9007efbc3"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; From e36ea4b1bf662e9975d38059d2c58dc050769b47 Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 14 Aug 2018 10:35:32 -0700 Subject: [PATCH 106/258] terragrunt: 0.14.6 -> 0.16.5 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 996c994cf4c..fdf254a4ec0 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.14.6"; + version = "0.16.5"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "14zg1h76wfg6aa78llcnza7kapnl5ks6m2vg73b90azfi49fmkwz"; + sha256 = "17xmk5qxlmz2g41jqd0b9ad6jd5yyw2wqi2h323bs4f3rpfkxzpd"; }; goDeps = ./deps.nix; From 8b9054e6e4d7fef1557c8be239bd05e1cc78686f Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 14 Aug 2018 19:56:20 +0200 Subject: [PATCH 107/258] translate-shell: 0.9.6.7 -> 0.9.6.8 --- pkgs/applications/misc/translate-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 8e8a22ed4e4..15c4b8185a2 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "translate-shell"; - version = "0.9.6.7"; + version = "0.9.6.8"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v${version}"; - sha256 = "0krcidjh32xwybr1v4nykgf0jjnffjqx125bvn3jh2a44cikyq3n"; + sha256 = "17fc5nlc594lvmihx39h4ddmi8ja3qqsyswzxadbaz7l3zm356b8"; }; buildInputs = [ makeWrapper ]; From 72a35533e0ca7f598c3dcafbac2c44efa0cfb368 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Sat, 11 Aug 2018 20:06:13 +0200 Subject: [PATCH 108/258] postgresql: fix tzdata path Signed-off-by: Christoph Hrdinka --- pkgs/servers/sql/postgresql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 4eb8d717309..a5c27eb7ec9 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -29,7 +29,7 @@ let "--with-libxml" "--sysconfdir=/etc" "--libdir=$(lib)/lib" - "--with-system-tzdata=${tzdata}" + "--with-system-tzdata=${tzdata}/share/zoneinfo" (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ]; From 53c265d0f9a4340911609d38631ad56ec6ec4af4 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Tue, 14 Aug 2018 20:56:22 +0200 Subject: [PATCH 109/258] rapid-photo-downloader: 0.9.9 -> 0.9.10 --- pkgs/applications/graphics/rapid-photo-downloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 4f31a10c2d1..d47f08c90b9 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "193l55wdxwxmammyxwzp90sg0qw5r316443la3m9611sdpcmy8w3"; + sha256 = "1i0lfj9gnfya49gxx59ls364z651fqagd4krnz9jhg9m0l48ljdf"; }; # Disable version check and fix install tests From 5d62b6698a18aa7794ab02e10614c39933653aaf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 22 Mar 2018 12:56:30 +0100 Subject: [PATCH 110/258] gnome3.atomix: init at 3.29.3 --- pkgs/desktops/gnome-3/default.nix | 4 +- .../desktops/gnome-3/games/atomix/default.nix | 37 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-3/games/atomix/default.nix diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 478dfc5d9f4..18db0e5ba81 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -34,7 +34,7 @@ lib.makeScope pkgs.newScope (self: with self; { ]; gamesPackages = with gnome3; [ swell-foop lightsoff iagno - tali quadrapassel gnome-sudoku aisleriot five-or-more + tali quadrapassel gnome-sudoku atomix aisleriot five-or-more four-in-a-row gnome-chess gnome-klotski gnome-mahjongg gnome-mines gnome-nibbles gnome-robots gnome-tetravex hitori gnome-taquin @@ -319,6 +319,8 @@ lib.makeScope pkgs.newScope (self: with self; { aisleriot = callPackage ./games/aisleriot { }; + atomix = callPackage ./games/atomix { }; + five-or-more = callPackage ./games/five-or-more { }; four-in-a-row = callPackage ./games/four-in-a-row { }; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix new file mode 100644 index 00000000000..8ea4b82ca03 --- /dev/null +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook +, gettext, gnome3, glib, gtk3, libgnome-games-support, gdk_pixbuf }: + +let + pname = "atomix"; + version = "3.29.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1k8bvwywpvw5f13pw40brk6c3rz2mdz9cd4zhcawg7qdm77dvcvb"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ]; + buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.defaultIconTheme ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "Puzzle game where you move atoms to build a molecule"; + homepage = https://wiki.gnome.org/Apps/Atomix; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} From 2f801195fc2b0709cb7aa92bd4d50bc053643f24 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 14 Aug 2018 21:48:04 +0200 Subject: [PATCH 111/258] gnome3.libgnome-games-support: propagate required dependencies --- .../gnome-3/misc/libgnome-games-support/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index 3b580abed12..7e28c90813a 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -13,7 +13,11 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ glib gtk3 libgee libintl ]; + buildInputs = [ libintl ]; + propagatedBuildInputs = [ + # Required by libgnome-games-support-1.pc + glib gtk3 libgee + ]; passthru = { updateScript = gnome3.updateScript { From 37276098349ceec4d8f2d9486d3d7f04e11bbaef Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 14 Aug 2018 21:06:09 +0200 Subject: [PATCH 112/258] msmtp: 1.6.6 -> 1.6.8 Also update homepage to match new project location. --- pkgs/applications/networking/msmtp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 94e8bd34087..2372685dc27 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; name = "${pname}-${version}"; - version = "1.6.6"; + version = "1.6.8"; src = fetchurl { - url = "mirror://sourceforge/msmtp/${name}.tar.xz"; - sha256 = "0ppvww0sb09bnsrpqnvlrn8vx231r24xn2iiwpy020mxc8gxn5fs"; + url = "https://marlam.de/msmtp/releases/${name}.tar.xz"; + sha256 = "1ysrnshvwhzwmvb2walw5i9jdzlvmckj7inr0xnvb26q0jirbzsm"; }; patches = [ @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; - homepage = http://msmtp.sourceforge.net/; + homepage = https://marlam.de/msmtp/; license = licenses.gpl3; maintainers = with maintainers; [ garbas peterhoeg ]; platforms = platforms.unix; From 6af971573a1146182d98675a1306c7386fb2c030 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 14 Aug 2018 22:14:55 +0200 Subject: [PATCH 113/258] intel-gpu-tools: 1.22 -> 1.23 --- .../tools/misc/intel-gpu-tools/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index d92b20a12b0..ba561522e1f 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps, utilmacros, gnome2 }: +, procps, utilmacros, gnome2, openssl }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.22"; + name = "intel-gpu-tools-${version}"; + version = "1.23"; src = fetchurl { - url = "https://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz"; - sha256 = "0p4swf9577p6hzglw1lh2sz63wjkk37b7691saj2qw8ha7fc2rix"; + url = "https://xorg.freedesktop.org/archive/individual/app/igt-gpu-tools-${version}.tar.xz"; + sha256 = "1l4s95m013p2wvddwr4cjqyvsgmc88zxx2887p1fbb1va5n0hjsd"; }; nativeBuildInputs = [ pkgconfig utilmacros ]; buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps - gnome2.gtkdoc ]; + gnome2.gtkdoc openssl ]; preConfigure = '' ./autogen.sh From 7372d3bf31bf4cc4a767eb52cdd0bbaff1f31058 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 14 Aug 2018 17:05:14 -0400 Subject: [PATCH 114/258] haskell.lib.getHaskellBuildInputs: Actually get the haskell build inputs. 5523ec8f3c78704c6e76b7675bfce41d24a3feb1 accidentally dropped the attribute lookup. --- pkgs/development/haskell-modules/lib.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index c9dc7254800..8790b56e501 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -301,7 +301,7 @@ rec { getHaskellBuildInputs = p: (overrideCabal p (args: { passthru = (args.passthru or {}) // { - _getHaskellBuildInputs = extractBuildInputs p.compiler args; + _getHaskellBuildInputs = (extractBuildInputs p.compiler args).haskellBuildInputs; }; }))._getHaskellBuildInputs; From 44a4370b1f3aa2b1b2416d8c09b8df6900f5c449 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 5 May 2018 18:09:46 +0200 Subject: [PATCH 115/258] python.pkgs.orderedset init at 2.0.1 --- .../python-modules/orderedset/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/orderedset/default.nix diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix new file mode 100644 index 00000000000..44a6a9e6b8d --- /dev/null +++ b/pkgs/development/python-modules/orderedset/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "orderedset"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "11643qr12ypxfffcminlsgl9xz751b2d0pnjl6zn8vfhxddjr57f"; + }; + + meta = with stdenv.lib; { + description = "An Ordered Set implementation in Cython"; + homepage = https://pypi.python.org/pypi/orderedset; + license = licenses.bsd3; + maintainers = maintainers.jtojnar; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ceb92f29218..d38b6e560a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8828,6 +8828,8 @@ in { }; }; + orderedset = callPackage ../development/python-modules/orderedset { }; + python-otr = buildPythonPackage rec { name = "${pname}-${version}"; pname = "python-otr"; From b98faf680cfb4a951d1b426dc81ea8f939701949 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 14 Aug 2018 17:49:21 -0400 Subject: [PATCH 116/258] yoda: 1.7.0 -> 1.7.1 --- pkgs/development/libraries/physics/yoda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 1dacdba1b1c..c86b0ed3d1c 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yoda-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "0fyf6ld1klzlfmr5sl1jxzck4a0h14zfkrff8397rn1fqnqbzmmk"; + sha256 = "0yq20fnckf6h0a53ghxsgia6ikq71ch9a0w0khq188r7rlg9gmzd"; }; pythonPath = []; # python wrapper support From 2ab014eb17b35b968cfd1746dbe1be1f31e6a738 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Mon, 13 Aug 2018 20:13:40 -0400 Subject: [PATCH 117/258] givaro: Add darwin support --- pkgs/development/libraries/givaro/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 3556acb0590..0773daa2d09 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -11,8 +11,12 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "199p8wyj5i63jbnk7j8qbdbfp5rm2lpmcxyk3mdjy9bz7ygx3hhy"; }; + + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [autoconf automake libtool gmpxx]; + configureFlags = [ "--disable-optimization" ] ++ stdenv.lib.optionals (!optimize) [ @@ -28,12 +32,18 @@ stdenv.mkDerivation rec { "--disable-fma" "--disable-fma4" ]; - doCheck = true; + + # On darwin, tests are linked to dylib in the nix store, so we need to make + # sure tests run after installPhase. + doInstallCheck = true; + installCheckTarget = "check"; + doCheck = false; + meta = { inherit version; description = ''A C++ library for arithmetic and algebraic computations''; license = stdenv.lib.licenses.cecill-b; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 2ae9907cc495e1f900ae76e5e42bfbffb91766d6 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 13 Aug 2018 09:25:43 +0900 Subject: [PATCH 118/258] virtualbox: Add tests for the VirtualBox Extension Pack. --- nixos/tests/virtualbox.nix | 39 +++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 008dab8459c..4207112cf16 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -293,6 +293,11 @@ let "--hostonlyadapter2 vboxnet0" ]; + # The VirtualBox Oracle Extension Pack lets you use USB 3.0 (xHCI). + enableExtensionPackVMFlags = [ + "--usbxhci on" + ]; + dhcpScript = pkgs: '' ${pkgs.dhcp}/bin/dhclient \ -lf /run/dhcp.leases \ @@ -323,13 +328,17 @@ let headless.services.xserver.enable = false; }; - mkVBoxTest = name: testScript: makeTest { + vboxVMsWithExtpack = mapAttrs createVM { + testExtensionPack.vmFlags = enableExtensionPackVMFlags; + }; + + mkVBoxTest = useExtensionPack: vms: name: testScript: makeTest { name = "virtualbox-${name}"; machine = { lib, config, ... }: { imports = let mkVMConf = name: val: val.machine // { key = "${name}-config"; }; - vmConfigs = mapAttrsToList mkVMConf vboxVMs; + vmConfigs = mapAttrsToList mkVMConf vms; in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs; virtualisation.memorySize = 2048; virtualisation.virtualbox.host.enable = true; @@ -337,6 +346,8 @@ let users.users.alice.extraGroups = let inherit (config.virtualisation.virtualbox.host) enableHardening; in lib.mkIf enableHardening (lib.singleton "vboxusers"); + virtualisation.virtualbox.host.enableExtensionPack = useExtensionPack; + nixpkgs.config.allowUnfree = useExtensionPack; }; testScript = '' @@ -353,7 +364,7 @@ let return join("\n", grep { $_ !~ /^UUID:/ } split(/\n/, $_[0]))."\n"; } - ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vboxVMs)} + ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vms)} $machine->waitForX; @@ -363,11 +374,11 @@ let ''; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aszlig wkennington ]; + maintainers = [ aszlig wkennington cdepillabout ]; }; }; -in mapAttrs mkVBoxTest { +in mapAttrs (mkVBoxTest false vboxVMs) { simple-gui = '' createVM_simple; $machine->succeed(ru "VirtualBox &"); @@ -473,4 +484,22 @@ in mapAttrs mkVBoxTest { destroyVM_test1; destroyVM_test2; ''; +} // mapAttrs (mkVBoxTest true vboxVMsWithExtpack) { + enable-extension-pack = '' + createVM_testExtensionPack; + vbm("startvm testExtensionPack"); + waitForStartup_testExtensionPack; + $machine->screenshot("cli_started"); + waitForVMBoot_testExtensionPack; + $machine->screenshot("cli_booted"); + + $machine->nest("Checking for privilege escalation", sub { + $machine->fail("test -e '/root/VirtualBox VMs'"); + $machine->fail("test -e '/root/.config/VirtualBox'"); + $machine->succeed("test -e '/home/alice/VirtualBox VMs'"); + }); + + shutdownVM_testExtensionPack; + destroyVM_testExtensionPack; + ''; } From efac36aa88fa8b7cba836a30ec1558aecf117662 Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Wed, 15 Aug 2018 13:19:20 +0800 Subject: [PATCH 119/258] carnix overrides: add gmp to rink-rs buildInputs & correct crateBin --- pkgs/build-support/rust/default-crate-overrides.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 9d22fcf8be1..d93e0a5f56d 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,6 +1,6 @@ { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, openssl, sqlite, zlib, dbus, dbus-glib, gdk_pixbuf, cairo, python3, - libsodium, postgresql, ... }: + libsodium, postgresql, gmp, ... }: let inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -58,6 +58,10 @@ in gdk-pixbuf = attrs: { buildInputs = [ gdk_pixbuf ]; }; + rink = attrs: { + buildInputs = [ gmp ]; + crateBin = [ { name = "rink"; path = "src/bin/rink.rs"; } ]; + }; cairo-rs = attrs: { buildInputs = [ cairo ]; }; From b2cf9529d641ddd4a3e7dc210f87d68b4653dfd2 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Wed, 15 Aug 2018 08:00:55 +0200 Subject: [PATCH 120/258] ptask: remove usage of nonexistent function is_error see https://github.com/json-c/json-c/issues/304 --- pkgs/applications/misc/ptask/default.nix | 2 +- pkgs/applications/misc/ptask/json_c_is_error.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/ptask/json_c_is_error.patch diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index e1a64c73a12..6cbc90806ca 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig makeWrapper ]; - patches = [ ./tw-version.patch ]; + patches = [ ./tw-version.patch ./json_c_is_error.patch ]; preFixup = '' wrapProgram "$out/bin/ptask" \ diff --git a/pkgs/applications/misc/ptask/json_c_is_error.patch b/pkgs/applications/misc/ptask/json_c_is_error.patch new file mode 100644 index 00000000000..435c8b26e6f --- /dev/null +++ b/pkgs/applications/misc/ptask/json_c_is_error.patch @@ -0,0 +1,13 @@ +diff --git a/src/tw.c b/src/tw.c +index 602f7b3..ca601cd 100644 +--- a/src/tw.c ++++ b/src/tw.c +@@ -163,7 +163,7 @@ static struct json_object *task_exec_json(const char *opts) + + free(cmd); + +- if (o && is_error(o)) ++ if (!o) + return NULL; + + return o; From 6e3d0efdc48d3388dc467d2bdd5d58706d00aa86 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Wed, 15 Aug 2018 09:54:58 +0200 Subject: [PATCH 121/258] python.pkgs.orderedset: fix ofborg checkMeta broken by 44a4370b1f3aa2b1b2416d8c09b8df6900f5c449 --- pkgs/development/python-modules/orderedset/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix index 44a6a9e6b8d..f1e6f1bf918 100644 --- a/pkgs/development/python-modules/orderedset/default.nix +++ b/pkgs/development/python-modules/orderedset/default.nix @@ -13,6 +13,6 @@ buildPythonPackage rec { description = "An Ordered Set implementation in Cython"; homepage = https://pypi.python.org/pypi/orderedset; license = licenses.bsd3; - maintainers = maintainers.jtojnar; + maintainers = [ maintainers.jtojnar ]; }; } From e2c98528e93594512261c18f46474bcec1663581 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 10 Aug 2018 21:59:53 +0300 Subject: [PATCH 122/258] qemu: add path to bin utilites --- .../virtualization/qemu/default.nix | 6 +++-- .../virtualization/qemu/fix-qemu-ga.patch | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/virtualization/qemu/fix-qemu-ga.patch diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 742c2fb03f7..aae1e7e6b69 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -71,8 +71,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "ga" ]; - patches = [ ./no-etc-install.patch ] - ++ optional nixosTestRunner ./force-uid0-on-9p.patch + patches = [ + ./no-etc-install.patch + ./fix-qemu-ga.patch + ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optional pulseSupport ./fix-hda-recording.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { diff --git a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch new file mode 100644 index 00000000000..c2f051e2b94 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch @@ -0,0 +1,22 @@ +diff --git a/qga/commands-posix.c b/qga/commands-posix.c +index 0dc219d..9d020d3 100644 +--- a/qga/commands-posix.c ++++ b/qga/commands-posix.c +@@ -102,6 +102,8 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) + reopen_fd_to_null(1); + reopen_fd_to_null(2); + ++ execle("/run/current-system/sw/bin/shutdown", "shutdown", "-h", shutdown_flag, "+0", ++ "hypervisor initiated shutdown", (char*)NULL, environ); + execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", + "hypervisor initiated shutdown", (char*)NULL, environ); + _exit(EXIT_FAILURE); +@@ -189,6 +191,8 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) + + /* Use '/sbin/hwclock -w' to set RTC from the system time, + * or '/sbin/hwclock -s' to set the system time from RTC. */ ++ execle("/run/current-system/sw/bin/hwclock", "hwclock", has_time ? "-w" : "-s", ++ NULL, environ); + execle("/sbin/hwclock", "hwclock", has_time ? "-w" : "-s", + NULL, environ); + _exit(EXIT_FAILURE); From ef98b96356fe0f3c7029ac2b0329c77a065673bc Mon Sep 17 00:00:00 2001 From: Ivan Jager Date: Wed, 15 Aug 2018 03:45:42 -0500 Subject: [PATCH 123/258] atd: 1.12.0 -> 2.0.0 (#45046) atdgen is now part of atd --- .../development/ocaml-modules/atd/default.nix | 38 +++++++------------ .../ocaml-modules/atdgen/default.nix | 25 ------------ pkgs/top-level/ocaml-packages.nix | 2 - 3 files changed, 13 insertions(+), 52 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/atdgen/default.nix diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index af52bd9aaaf..52a1fc36921 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -1,41 +1,29 @@ -{ stdenv, menhir, easy-format, ocaml, findlib, fetchurl, jbuilder, which }: - -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" - then { - version = "1.12.0"; - sha256 = "1pcd4fqbilv8zm2mc1nj2s26vc5y8vnisg1q1y6bjx23wxidb09y"; - buildPhase = "jbuilder build -p atd"; - inherit (jbuilder) installPhase; - } else { - version = "1.1.2"; - sha256 = "0ef10c63192aed75e9a4274e89c5f9ca27efb1ef230d9949eda53ad4a9a37291"; - buildPhase = ""; - installPhase = '' - mkdir -p $out/bin - make PREFIX=$out install - ''; - }; -in +{ stdenv, menhir, easy-format, ocaml, findlib, fetchFromGitHub, jbuilder, which, biniou, yojson }: stdenv.mkDerivation rec { - inherit (param) version buildPhase installPhase; + version = "2.0.0"; + name = "ocaml${ocaml.version}-atd-${version}"; - src = fetchurl { - url = "https://github.com/mjambon/atd/archive/v${version}.tar.gz"; - inherit (param) sha256; + src = fetchFromGitHub { + owner = "mjambon"; + repo = "atd"; + rev = version; + sha256 = "0alzmk97rxg7s6irs9lvf89dy9n3r769my5n4j9p9qyigcdgjaia"; }; createFindlibDestdir = true; buildInputs = [ which jbuilder ocaml findlib menhir ]; - propagatedBuildInputs = [ easy-format ]; + propagatedBuildInputs = [ easy-format biniou yojson ]; + + buildPhase = "jbuilder build"; + inherit (jbuilder) installPhase; meta = with stdenv.lib; { homepage = https://github.com/mjambon/atd; description = "Syntax for cross-language type definitions"; license = licenses.bsd3; - maintainers = [ maintainers.jwilberding ]; + maintainers = with maintainers; [ aij jwilberding ]; }; } diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix deleted file mode 100644 index 291dd03c8d1..00000000000 --- a/pkgs/development/ocaml-modules/atdgen/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, atd, yojson, biniou, buildOcaml, fetchurl, which}: - -buildOcaml rec { - name = "atdgen"; - version = "1.6.0"; - - src = fetchurl { - url = "https://github.com/mjambon/atdgen/archive/v${version}.tar.gz"; - sha256 = "1icdxgb7qqq1pcbfqi0ikryiwaljd594z3acyci8g3bnlq0yc7zn"; - }; - - installPhase = '' - mkdir -p $out/bin - make PREFIX=$out install - ''; - - buildInputs = [ which atd biniou yojson ]; - - meta = with stdenv.lib; { - homepage = https://github.com/mjambon/atdgen; - description = "Generates optimized boilerplate OCaml code for JSON and Biniou IO from type definitions"; - license = licenses.bsd3; - maintainers = [ maintainers.jwilberding ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ef0785abb72..5787f84335b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -50,8 +50,6 @@ let atd = callPackage ../development/ocaml-modules/atd { }; - atdgen = callPackage ../development/ocaml-modules/atdgen { }; - base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { From 8d2ab1d914897a9e09e6051497af43e88f18fd71 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Aug 2018 09:56:04 +0100 Subject: [PATCH 124/258] slack-cli: init at 0.18.0 slack-cli must be configured using the SLACK_CLI_TOKEN environment variable. Using `slack init` will not work because it tries to write to the Nix store. --- pkgs/tools/networking/slack-cli/default.nix | 25 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/slack-cli/default.nix diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix new file mode 100644 index 00000000000..3acf79932bc --- /dev/null +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -0,0 +1,25 @@ +# slack-cli must be configured using the SLACK_CLI_TOKEN environment +# variable. Using `slack init` will not work because it tries to write +# to the Nix store. + +{ stdenv, lib, fetchurl, makeWrapper, curl, jq }: + +stdenv.mkDerivation rec { + name = "slack-cli"; + version = "0.18.0"; + + src = fetchurl { + url = "https://github.com/rockymadden/slack-cli/archive/v${version}.tar.gz"; + sha256 = "0q19l88c1mvnzya58q21pc3v6mff56z43288kzk50000ri286wq2"; + }; + + buildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp src/slack $out/bin + wrapProgram $out/bin/slack --prefix PATH : ${lib.makeBinPath [ curl jq ]} + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 029a0a55138..c2f1f212a52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16695,6 +16695,8 @@ with pkgs; slack = callPackage ../applications/networking/instant-messengers/slack { }; + slack-cli = callPackage ../tools/networking/slack-cli { }; + singularity = callPackage ../applications/virtualization/singularity { }; spectrwm = callPackage ../applications/window-managers/spectrwm { }; From cc8e4a58848e881d29e7b03edd3493ddc49fe89c Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Wed, 15 Aug 2018 05:01:32 -0400 Subject: [PATCH 125/258] pythonPackages.multiprocess: 0.70.4 -> 0.70.6.1 (#45047) --- .../python-modules/multiprocess/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +----------------- 2 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/multiprocess/default.nix diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix new file mode 100644 index 00000000000..c5c53577505 --- /dev/null +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, dill }: + +buildPythonPackage rec { + pname = "multiprocess"; + version = "0.70.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ip5caz67b3q0553mr8gm8xwsb8x500jn8ml0gihgyfy52m2ypcq"; + }; + + propagatedBuildInputs = [ dill ]; + + # Python-version dependent tests + doCheck = false; + + meta = with lib; { + description = "Better multiprocessing and multithreading in python"; + homepage = https://github.com/uqfoundation/multiprocess; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d38b6e560a3..b1d2a6cbd0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7776,26 +7776,7 @@ in { multipledispatch = callPackage ../development/python-modules/multipledispatch { }; - multiprocess = buildPythonPackage rec { - name = "multiprocess-${version}"; - version = "0.70.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/multiprocess/${name}.tgz"; - sha256 = "73f8b9b7009860e3c3c8b9bdcad7e8366b130929775f89c114d4346a9cfcb31b"; - }; - - propagatedBuildInputs = with self; [ dill ]; - - # Python-version dependent tests - doCheck = false; - - meta = { - description = "Better multiprocessing and multithreading in python"; - homepage = https://github.com/uqfoundation; - license = licenses.bsd3; - }; - }; + multiprocess = callPackage ../development/python-modules/multiprocess { }; munkres = buildPythonPackage rec { name = "munkres-1.0.6"; From 16d475334409f7fa632929b2838421b4ffe34927 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Wed, 15 Aug 2018 05:02:55 -0400 Subject: [PATCH 126/258] pythonPackages.fastcache: init at 1.0.2 (#45048) --- .../python-modules/fastcache/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/fastcache/default.nix diff --git a/pkgs/development/python-modules/fastcache/default.nix b/pkgs/development/python-modules/fastcache/default.nix new file mode 100644 index 00000000000..5638e8412b5 --- /dev/null +++ b/pkgs/development/python-modules/fastcache/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "fastcache"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rl489zfbm2x67n7i6r7r4nhrhwk6yz3yc7x9y2rky8p95vhaw46"; + }; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "C implementation of Python3 lru_cache for Python 2 and 3"; + homepage = https://github.com/pbrady/fastcache; + license = licenses.mit; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1d2a6cbd0b..1546df815b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2537,6 +2537,8 @@ in { }; }; + fastcache = callPackage ../development/python-modules/fastcache { }; + functools32 = if isPy3k then null else buildPythonPackage rec { name = "functools32-${version}"; version = "3.2.3-2"; From ff9a38ee8974b2fe272da2cad1339d148bd15bd3 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Wed, 15 Aug 2018 12:00:43 +0200 Subject: [PATCH 127/258] ptask: prevent building on darwin as this fails as of now --- pkgs/applications/misc/ptask/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index 6cbc90806ca..81e316eb0ee 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "GTK-based GUI for taskwarrior"; license = licenses.gpl2; maintainers = [ maintainers.spacefrogg ]; + platforms = platforms.linux; }; } From ccc8dd222e574fea27923a4531422ca6d53383df Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Aug 2018 11:36:28 +0100 Subject: [PATCH 128/258] slack-cli: use fetchFromGitHub instead of fetchurl --- pkgs/tools/networking/slack-cli/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 3acf79932bc..5af7540a5d7 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -2,15 +2,17 @@ # variable. Using `slack init` will not work because it tries to write # to the Nix store. -{ stdenv, lib, fetchurl, makeWrapper, curl, jq }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, jq }: stdenv.mkDerivation rec { name = "slack-cli"; version = "0.18.0"; - src = fetchurl { - url = "https://github.com/rockymadden/slack-cli/archive/v${version}.tar.gz"; - sha256 = "0q19l88c1mvnzya58q21pc3v6mff56z43288kzk50000ri286wq2"; + src = fetchFromGitHub { + owner = "rockymadden"; + repo = "slack-cli"; + rev = "v${version}"; + sha256 = "022yr3cpfg0v7cxi62zzk08vp0l3w851qpfh6amyfgjiynnfyddl"; }; buildInputs = [ makeWrapper ]; From 838473d3c595d225d2d5a0dcb36771b834ebb4af Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Aug 2018 12:28:43 +0100 Subject: [PATCH 129/258] slack-cli: add version to name --- pkgs/tools/networking/slack-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 5af7540a5d7..23131d26655 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -5,7 +5,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, jq }: stdenv.mkDerivation rec { - name = "slack-cli"; + name = "slack-cli-${version}"; version = "0.18.0"; src = fetchFromGitHub { From d2eacdcd6529c816dc8b33c5a4d4e20d3748edbe Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Aug 2018 12:32:00 +0100 Subject: [PATCH 130/258] slack-cli: use nativeBuildInputs for makeWrapper --- pkgs/tools/networking/slack-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 23131d26655..55396f16cb0 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "022yr3cpfg0v7cxi62zzk08vp0l3w851qpfh6amyfgjiynnfyddl"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From dac2235c1a94f5ea2c06c55deff8df07595eeacc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Aug 2018 12:32:19 +0100 Subject: [PATCH 131/258] slack-cli: quote shell variables --- pkgs/tools/networking/slack-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 55396f16cb0..2e20fbe2c3c 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - mkdir -p $out/bin - cp src/slack $out/bin - wrapProgram $out/bin/slack --prefix PATH : ${lib.makeBinPath [ curl jq ]} + mkdir -p "$out/bin" + cp src/slack "$out/bin" + wrapProgram "$out/bin/slack" --prefix PATH : ${lib.makeBinPath [ curl jq ]} ''; } From cd21faff2be19a8bc01e122da7a6b433bf3928cf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 15 Aug 2018 13:54:27 +0200 Subject: [PATCH 132/258] pythonPackages.thumbor: 6.5.1 -> 6.5.2 6.5.2 allows Pillow==5.2.0 (see https://github.com/thumbor/thumbor/releases/tag/6.5.2). See https://hydra.nixos.org/build/79403232 for further reference. --- pkgs/development/python-modules/thumbor/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index 37d8f3a5134..ec33a5020d4 100644 --- a/pkgs/development/python-modules/thumbor/default.nix +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -1,17 +1,17 @@ -{ buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz +{ buildPythonPackage, tornado, pycrypto, pycurl, pytz , pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors , piexif, futures, statsd, thumborPexif, fetchPypi, isPy3k, lib }: buildPythonPackage rec { pname = "thumbor"; - version = "6.5.1"; + version = "6.5.2"; disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004 src = fetchPypi { inherit pname version; - sha256 = "0yalqwpxb6m0dz2qfnyv1pqqd5dd020wl7hc0n0bvsvxg1ib9if0"; + sha256 = "1icfnzwzi5lvnh576n7v3r819jaw15ph9ja2w3fwg5z9qs40xvl8"; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage rec { # for further reference. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A smart imaging service"; homepage = https://github.com/thumbor/thumbor/wiki; license = licenses.mit; From f94d08a304475971e1719079bee1b9e8c2241bbe Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 15 Aug 2018 14:51:40 +0200 Subject: [PATCH 133/258] twemoji-color-font: 1.3 -> 1.4 --- pkgs/data/fonts/twemoji-color-font/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index 9a8c6bf592a..eb37b4dad25 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { owner = "eosrei"; repo = "twemoji-color-font"; rev = "v${meta.version}"; - sha256 = "0i7krmg99nrrj7mbjjd2cw6dx24aja63571mcyp6d7q1z09asz9k"; + sha256 = "0z8r7z2r0r2wng4a7hvqvkcpd43l0d57yl402r7ci5bnmb02yvsa"; }; nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - version = "1.3"; + version = "1.4"; description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags"; longDescription = '' A color and B&W emoji SVGinOT font built from the Twitter Emoji for From 3116e6e6b93aa486adab31f8e6f2e8d3420d1f34 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Aug 2018 15:32:50 +0200 Subject: [PATCH 134/258] gem-config: add curses (#45068) --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 9d4f5679e26..76a044a56b2 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -80,6 +80,10 @@ in buildInputs = [ curl ]; }; + curses = attrs: { + buildInputs = [ ncurses ]; + }; + dep-selector-libgecode = attrs: { USE_SYSTEM_GECODE = true; postInstall = '' From 8fdab83dcf872368ef10966cb96d822bb4d2b612 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 15 Aug 2018 15:36:49 +0200 Subject: [PATCH 135/258] twemoji-color-font: restrict platforms to linux --- pkgs/data/fonts/twemoji-color-font/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index eb37b4dad25..eead97247e6 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/eosrei/twemoji-color-font/releases"; license = with licenses; [ cc-by-40 mit ]; maintainers = [ maintainers.fgaz ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From fe6ebf85b760813d43f6fc4b9447c110eefd340f Mon Sep 17 00:00:00 2001 From: Eric Wolf <1983821+typetetris@users.noreply.github.com> Date: Wed, 15 Aug 2018 15:53:20 +0200 Subject: [PATCH 136/258] ghc-8.0.2: Fix #44987 (#45014) nix-env -f '' -qaP -A haskell.packages.ghc802 will run again, but the packages depending on ghc-compact will still not build, as they have a constrain on base >= 4.10 and ghc 8.0.2 has base 4.9.1.0 --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 1a4638c51e1..f475512a8da 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -19,6 +19,7 @@ self: super: { filepath = null; ghc-boot = null; ghc-boot-th = null; + ghc-compact = null; ghc-prim = null; ghci = null; haskeline = null; From 984e0e8c1dcf8d5ecdc7123115b463260a284b9a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 14 Aug 2018 17:49:47 -0400 Subject: [PATCH 137/258] rivet: 2.7.0 -> 2.7.1 --- pkgs/development/libraries/physics/rivet/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 8c4a9288a15..98c9a845280 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rivet-${version}"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "007rwal8wx2k9gs0r6kym6ix0siz0x9l55q9myq41siirpf2jcpv"; + sha256 = "0ybv5dl3blgk9p9ayhknirxb6504kpygnkmizd5dr9ippys1i3c8"; }; patches = [ @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; preConfigure = '' + substituteInPlace Makefile.in \ + --replace "SUBDIRS = src pyext data include bin analyses doc test" "SUBDIRS = src pyext data include bin analyses test" + substituteInPlace analyses/Makefile.in \ + --replace "!(tmp)" "" substituteInPlace bin/rivet-buildplugin.in \ --replace '"which"' '"${which}/bin/which"' \ --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ From e276965a1626f4f8d4e033b3e256e0e14156b862 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Aug 2018 13:56:19 +0100 Subject: [PATCH 138/258] slack-cli: warn when not using SLACK_CLI_TOKEN --- pkgs/tools/networking/slack-cli/default.nix | 14 +++++++------- pkgs/tools/networking/slack-cli/wrapper.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/tools/networking/slack-cli/wrapper.nix diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 2e20fbe2c3c..ac7d0d4175c 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -1,8 +1,11 @@ -# slack-cli must be configured using the SLACK_CLI_TOKEN environment -# variable. Using `slack init` will not work because it tries to write -# to the Nix store. +# slack-cli must be configured using the SLACK_CLI_TOKEN environment variable. +# Using `slack init` will not work because it tries to write to the Nix store. +# +# There is no reason that we couldn't change the file path that slack-cli uses +# for token storage, except that it would make the Nix package inconsistent with +# upstream and other distributions. -{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, jq }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "slack-cli-${version}"; @@ -15,13 +18,10 @@ stdenv.mkDerivation rec { sha256 = "022yr3cpfg0v7cxi62zzk08vp0l3w851qpfh6amyfgjiynnfyddl"; }; - nativeBuildInputs = [ makeWrapper ]; - dontBuild = true; installPhase = '' mkdir -p "$out/bin" cp src/slack "$out/bin" - wrapProgram "$out/bin/slack" --prefix PATH : ${lib.makeBinPath [ curl jq ]} ''; } diff --git a/pkgs/tools/networking/slack-cli/wrapper.nix b/pkgs/tools/networking/slack-cli/wrapper.nix new file mode 100644 index 00000000000..3612aaa137e --- /dev/null +++ b/pkgs/tools/networking/slack-cli/wrapper.nix @@ -0,0 +1,15 @@ +{ lib, writeShellScriptBin, curl, jq }: + +slack-cli: + +writeShellScriptBin "slack" '' + [ "$1" = "init" -a -z "$SLACK_CLI_TOKEN" ] && cat >&2 <<-'MESSAGE' + WARNING: slack-cli must be configured using the SLACK_CLI_TOKEN environment + variable. Using `slack init` will not work because it tries to write to the + Nix store. + + MESSAGE + + export PATH=${lib.makeBinPath [ curl jq ]}:"$PATH" + exec ${slack-cli}/bin/slack "$@" +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2f1f212a52..f53b144cee9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16695,7 +16695,9 @@ with pkgs; slack = callPackage ../applications/networking/instant-messengers/slack { }; - slack-cli = callPackage ../tools/networking/slack-cli { }; + wrapSlackCli = callPackage ../tools/networking/slack-cli/wrapper.nix { }; + slack-cli-unwrapped = callPackage ../tools/networking/slack-cli { }; + slack-cli = wrapSlackCli slack-cli-unwrapped; singularity = callPackage ../applications/virtualization/singularity { }; From 0a57de6f5b138ab99bfb72efae742a715f46c46e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Aug 2018 14:10:38 +0100 Subject: [PATCH 139/258] slack-cli: add metadata --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/networking/slack-cli/default.nix | 6 ++++++ pkgs/tools/networking/slack-cli/wrapper.nix | 10 ++++++++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6daea45524a..8b6a6318326 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3247,6 +3247,11 @@ github = "qoelet"; name = "Kenny Shen"; }; + qyliss = { + email = "hi@alyssa.is"; + github = "alyssais"; + name = "Alyssa Ross"; + }; ragge = { email = "r.dahlen@gmail.com"; github = "ragnard"; diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index ac7d0d4175c..24d82782466 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -24,4 +24,10 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" cp src/slack "$out/bin" ''; + + meta = { + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.qyliss ]; + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/networking/slack-cli/wrapper.nix b/pkgs/tools/networking/slack-cli/wrapper.nix index 3612aaa137e..f31553bda37 100644 --- a/pkgs/tools/networking/slack-cli/wrapper.nix +++ b/pkgs/tools/networking/slack-cli/wrapper.nix @@ -2,7 +2,7 @@ slack-cli: -writeShellScriptBin "slack" '' +(writeShellScriptBin "slack" '' [ "$1" = "init" -a -z "$SLACK_CLI_TOKEN" ] && cat >&2 <<-'MESSAGE' WARNING: slack-cli must be configured using the SLACK_CLI_TOKEN environment variable. Using `slack init` will not work because it tries to write to the @@ -12,4 +12,10 @@ writeShellScriptBin "slack" '' export PATH=${lib.makeBinPath [ curl jq ]}:"$PATH" exec ${slack-cli}/bin/slack "$@" -'' +'') // { + unwrapped = slack-cli; + + meta = slack-cli.meta; + name = slack-cli.name; + version = slack-cli.version; +} From 026f49e28c535ad04a54d689c773275a7ab99f9f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Aug 2018 15:45:41 +0100 Subject: [PATCH 140/258] slack-cli: remove wrapper package --- pkgs/tools/networking/slack-cli/default.nix | 56 +++++++++++++-------- pkgs/tools/networking/slack-cli/wrapper.nix | 21 -------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 36 insertions(+), 45 deletions(-) delete mode 100644 pkgs/tools/networking/slack-cli/wrapper.nix diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 24d82782466..dc8b25d868c 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -5,29 +5,43 @@ # for token storage, except that it would make the Nix package inconsistent with # upstream and other distributions. -{ stdenv, fetchFromGitHub }: +{ stdenv, lib, writeShellScriptBin, fetchFromGitHub, curl, jq }: -stdenv.mkDerivation rec { - name = "slack-cli-${version}"; - version = "0.18.0"; +let + wrapper = writeShellScriptBin "slack" '' + [ "$1" = "init" -a -z "$SLACK_CLI_TOKEN" ] && cat >&2 <<-'MESSAGE' + WARNING: slack-cli must be configured using the SLACK_CLI_TOKEN environment + variable. Using `slack init` will not work because it tries to write to the + Nix store. - src = fetchFromGitHub { - owner = "rockymadden"; - repo = "slack-cli"; - rev = "v${version}"; - sha256 = "022yr3cpfg0v7cxi62zzk08vp0l3w851qpfh6amyfgjiynnfyddl"; - }; + MESSAGE - dontBuild = true; - - installPhase = '' - mkdir -p "$out/bin" - cp src/slack "$out/bin" + export PATH=${lib.makeBinPath [ curl jq ]}:"$PATH" + exec "$(dirname "$0")/.slack-wrapped" "$@" ''; - meta = { - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.qyliss ]; - platforms = stdenv.lib.platforms.unix; - }; -} +in stdenv.mkDerivation rec { + name = "slack-cli-${version}"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "rockymadden"; + repo = "slack-cli"; + rev = "v${version}"; + sha256 = "022yr3cpfg0v7cxi62zzk08vp0l3w851qpfh6amyfgjiynnfyddl"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p "$out/bin" + cp src/slack "$out/bin/.slack-wrapped" + ln -s ${wrapper}/bin/slack "$out/bin/slack" + ''; + + meta = { + license = lib.licenses.mit; + maintainers = [ lib.maintainers.qyliss ]; + platforms = lib.platforms.unix; + }; + } diff --git a/pkgs/tools/networking/slack-cli/wrapper.nix b/pkgs/tools/networking/slack-cli/wrapper.nix deleted file mode 100644 index f31553bda37..00000000000 --- a/pkgs/tools/networking/slack-cli/wrapper.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, writeShellScriptBin, curl, jq }: - -slack-cli: - -(writeShellScriptBin "slack" '' - [ "$1" = "init" -a -z "$SLACK_CLI_TOKEN" ] && cat >&2 <<-'MESSAGE' - WARNING: slack-cli must be configured using the SLACK_CLI_TOKEN environment - variable. Using `slack init` will not work because it tries to write to the - Nix store. - - MESSAGE - - export PATH=${lib.makeBinPath [ curl jq ]}:"$PATH" - exec ${slack-cli}/bin/slack "$@" -'') // { - unwrapped = slack-cli; - - meta = slack-cli.meta; - name = slack-cli.name; - version = slack-cli.version; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f53b144cee9..c2f1f212a52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16695,9 +16695,7 @@ with pkgs; slack = callPackage ../applications/networking/instant-messengers/slack { }; - wrapSlackCli = callPackage ../tools/networking/slack-cli/wrapper.nix { }; - slack-cli-unwrapped = callPackage ../tools/networking/slack-cli { }; - slack-cli = wrapSlackCli slack-cli-unwrapped; + slack-cli = callPackage ../tools/networking/slack-cli { }; singularity = callPackage ../applications/virtualization/singularity { }; From b63ec6452156ee46e8e5bbf360e122b4083dfa77 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 6 Jun 2018 22:38:40 +0200 Subject: [PATCH 141/258] lib/recursiveUpdateUntil: fix code to match documentation $ nix repl lib Welcome to Nix version 2.0.2. Type :? for help. Loading 'lib'... Added 350 variables. -- this is the exact example from the function's documentation: nix-repl> recursiveUpdateUntil (path: l: r: path == ["foo"]) { # first attribute set foo.bar = 1; foo.baz = 2; bar = 3; } { #second attribute set foo.bar = 1; foo.quz = 2; baz = 4; } { bar = 3; baz = 4; foo = { bar = 1; baz = 2; quz = 2; }; } -- although the documentation says: { foo.bar = 1; # 'foo.*' from the second set foo.quz = 2; # bar = 3; # 'bar' from the first set baz = 4; # 'baz' from the second set } --- lib/attrsets.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 0066fba362a..cda13ee43ee 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -384,11 +384,12 @@ rec { recursiveUpdateUntil = pred: lhs: rhs: let f = attrPath: zipAttrsWith (n: values: + let here = attrPath ++ [n]; in if tail values == [] - || pred attrPath (head (tail values)) (head values) then + || pred here (head (tail values)) (head values) then head values else - f (attrPath ++ [n]) values + f here values ); in f [] [rhs lhs]; From d817452e296b6578bbbf940cc6f899602792081e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 15 Aug 2018 00:13:32 +0200 Subject: [PATCH 142/258] lib/recursiveUpdateUntil: add a test & release note for fix --- lib/tests/misc.nix | 24 ++++++++++++++++++++++ nixos/doc/manual/release-notes/rl-1809.xml | 9 ++++++++ 2 files changed, 33 insertions(+) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 3f2d742e788..cf99aca58c0 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -213,6 +213,30 @@ runTests { }; +# ATTRSETS + + # code from the example + testRecursiveUpdateUntil = { + expr = recursiveUpdateUntil (path: l: r: path == ["foo"]) { + # first attribute set + foo.bar = 1; + foo.baz = 2; + bar = 3; + } { + #second attribute set + foo.bar = 1; + foo.quz = 2; + baz = 4; + }; + expected = { + foo.bar = 1; # 'foo.*' from the second set + foo.quz = 2; # + bar = 3; # 'bar' from the first set + baz = 4; # 'baz' from the second set + }; + }; + + # GENERATORS # these tests assume attributes are converted to lists # in alphabetical order diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index d527984f5ef..d831f851446 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -278,6 +278,8 @@ inherit (pkgs.nixos { lib.traceCallXml has been deprecated. Please complain if you use the function regularly. + + The attribute lib.nixpkgsVersion has been deprecated in favor of lib.version. Please refer to the discussion in @@ -285,6 +287,13 @@ inherit (pkgs.nixos { for further reference. + + + lib.recursiveUpdateUntil was not acting according to its + specification. It has been fixed to act according to the docstring, and a + test has been added. + + The module for has two new options now: From 0e374a1b9c27aa5d35a858aa74451c66417b305f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Aug 2018 16:53:11 +0100 Subject: [PATCH 143/258] slack-cli: fix dirname hack --- pkgs/tools/networking/slack-cli/default.nix | 67 +++++++++++---------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index dc8b25d868c..18f192d3535 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -7,41 +7,42 @@ { stdenv, lib, writeShellScriptBin, fetchFromGitHub, curl, jq }: -let - wrapper = writeShellScriptBin "slack" '' - [ "$1" = "init" -a -z "$SLACK_CLI_TOKEN" ] && cat >&2 <<-'MESSAGE' - WARNING: slack-cli must be configured using the SLACK_CLI_TOKEN environment - variable. Using `slack init` will not work because it tries to write to the - Nix store. +stdenv.mkDerivation rec { + name = "slack-cli-${version}"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "rockymadden"; + repo = "slack-cli"; + rev = "v${version}"; + sha256 = "022yr3cpfg0v7cxi62zzk08vp0l3w851qpfh6amyfgjiynnfyddl"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p "$out/bin" + cp src/slack "$out/bin/.slack-wrapped" + + cat <<-WRAPPER > "$out/bin/slack" + #!${stdenv.shell} + [ "\$1" = "init" -a -z "\$SLACK_CLI_TOKEN" ] && cat <<-'MESSAGE' >&2 + WARNING: slack-cli must be configured using the SLACK_CLI_TOKEN + environment variable. Using \`slack init\` will not work because it tries + to write to the Nix store. MESSAGE - export PATH=${lib.makeBinPath [ curl jq ]}:"$PATH" - exec "$(dirname "$0")/.slack-wrapped" "$@" + export PATH=${lib.makeBinPath [ curl jq ]}:"\$PATH" + exec "$out/bin/.slack-wrapped" "\$@" + WRAPPER + + chmod +x "$out/bin/slack" ''; -in stdenv.mkDerivation rec { - name = "slack-cli-${version}"; - version = "0.18.0"; - - src = fetchFromGitHub { - owner = "rockymadden"; - repo = "slack-cli"; - rev = "v${version}"; - sha256 = "022yr3cpfg0v7cxi62zzk08vp0l3w851qpfh6amyfgjiynnfyddl"; - }; - - dontBuild = true; - - installPhase = '' - mkdir -p "$out/bin" - cp src/slack "$out/bin/.slack-wrapped" - ln -s ${wrapper}/bin/slack "$out/bin/slack" - ''; - - meta = { - license = lib.licenses.mit; - maintainers = [ lib.maintainers.qyliss ]; - platforms = lib.platforms.unix; - }; - } + meta = { + license = lib.licenses.mit; + maintainers = [ lib.maintainers.qyliss ]; + platforms = lib.platforms.unix; + }; +} From c2b24892b0e59c02eff42085737483fd1d57788d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 15 Aug 2018 19:46:47 +0300 Subject: [PATCH 144/258] syslog-ng: enable reload service --- nixos/modules/services/logging/syslog-ng.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index 21be286a6e9..8466ff4630a 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -88,6 +88,7 @@ in { StandardOutput = "null"; Restart = "on-failure"; ExecStart = "${cfg.package}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP ${pidFile}"; }; }; }; From 067d5e6289a46d4ab80de1dc22b5f8da031cb839 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 15 Aug 2018 12:53:36 -0400 Subject: [PATCH 145/258] linux: 4.4.147 -> 4.4.148 --- 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 60113959665..0516c947e8c 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.147"; + version = "4.4.148"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "06mcilxd5qi8snycb5bhy52icbbwfl056xwmra66yknmpycyad67"; + sha256 = "10yrqizwkawbs332rl3fmr3cpwcl2j0mik4md7isg5xlkc00zc8r"; }; } // (args.argsOverride or {})) From c5f3a5b9826da0e354eb280514a4ef6b90b08349 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 15 Aug 2018 12:53:45 -0400 Subject: [PATCH 146/258] linux: 4.9.119 -> 4.9.120 --- 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 d29855a093e..add40aaa815 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.119"; + version = "4.9.120"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0d8bwsma9j7dhgymcfbchr8k3503w5vp3p18mfqv81x6l40pzqa9"; + sha256 = "14gx6gqahz74vaw8jd0wkxn0w05i7cyfgi24ld2q3p2yhq3gannp"; }; } // (args.argsOverride or {})) From 737f1b4c40e91f0d9954d747cbd387fad2591245 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 15 Aug 2018 12:53:55 -0400 Subject: [PATCH 147/258] linux: 4.14.62 -> 4.14.63 --- 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 400574a3144..0bfd3d0ac34 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.62"; + version = "4.14.63"; # 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 = "1ar29ikway5im17iw9ag1fxivr7sbj8nhxxw347xqmp1irz4vjji"; + sha256 = "1ly6pjvlfrlrclfnl98ghwal25z58lppnj6gj7x1m1mswzq54bnd"; }; } // (args.argsOverride or {})) From 4031c5fe0dd9b66828fd10fbf52b444db926b164 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 15 Aug 2018 12:54:03 -0400 Subject: [PATCH 148/258] linux: 4.17.14 -> 4.17.15 --- 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 fda3b77c0a8..7d29f9f805f 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.14"; + version = "4.17.15"; # 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 = "1bxsiishhw6ichifqglkbcmgc0518ih396yi23clvrsfyj6h6in8"; + sha256 = "0yg0hh1ld3d5cd4ll7f48p769wda2a1ap8fmnnsfsazidka5vf75"; }; } // (args.argsOverride or {})) From 084864bf2b20b9a82c40cfa20134853f7feac4c7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 15 Aug 2018 12:54:17 -0400 Subject: [PATCH 149/258] linux: 4.18 -> 4.18.1 --- pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index 4f183b696cc..691ab096e8a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18"; + version = "4.18.1"; # 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 = "1wgay4k8wj08fc711j290fvi81x75yib8iaa6r7csc7mkvsbrn0r"; + sha256 = "0hps1h8rs1cc8385m69754vwbjmwasr7bfv9f9nsv8fmx73aspvj"; }; } // (args.argsOverride or {})) From 27ddcc5babc818ef78b25b946b6d036c7c2901d2 Mon Sep 17 00:00:00 2001 From: David McKay Date: Wed, 15 Aug 2018 18:03:18 +0100 Subject: [PATCH 150/258] wavebox: init at 3.14.10 (#45021) --- maintainers/maintainer-list.nix | 5 ++ .../instant-messengers/wavebox/default.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 73 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/wavebox/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6daea45524a..ab9b6d76465 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3281,6 +3281,11 @@ email = "ravloony@gmail.com"; name = "Tom Macdonald"; }; + rawkode = { + email = "david.andrew.mckay@gmail.com"; + github = "rawkode"; + name = "David McKay"; + }; razvan = { email = "razvan.panda@gmail.com"; github = "razvan-panda"; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix new file mode 100644 index 00000000000..ce73acf8d59 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook +, xorg, gtk2, gtk3 , gnome2, gnome3, nss, alsaLib, udev, libnotify, xdg_utils }: + +with stdenv.lib; + +let + bits = "x86_64"; + + version = "3.14.10"; + + desktopItem = makeDesktopItem rec { + name = "Wavebox"; + exec = name; + icon = "wavebox"; + desktopName = name; + genericName = name; + categories = "Network;"; + }; + + tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; + +in stdenv.mkDerivation rec { + name = "wavebox-${version}"; + src = fetchurl { + url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}"; + sha256 = "06ce349f561c6122b2d326e9a1363fb358e263c81a7d1d08723ec567235bbd74"; + }; + + # don't remove runtime deps + dontPatchELF = true; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + buildInputs = with xorg; [ + libXScrnSaver libXtst + ] ++ [ + gtk3 nss gtk2 alsaLib gnome2.GConf + ]; + + runtimeDependencies = [ udev.lib libnotify ]; + + installPhase = '' + mkdir -p $out/bin $out/opt/wavebox + cp -r * $out/opt/wavebox + + # provide desktop item and icon + mkdir -p $out/share/applications $out/share/pixmaps + ln -s ${desktopItem}/share/applications/* $out/share/applications + ln -s $out/opt/wavebox/Wavebox-linux-x64/wavebox_icon.png $out/share/pixmaps/wavebox.png + ''; + + postFixup = '' + paxmark m $out/opt/wavebox/Wavebox + makeWrapper $out/opt/wavebox/Wavebox $out/bin/wavebox \ + --prefix PATH : ${xdg_utils}/bin + ''; + + meta = with stdenv.lib; { + description = "Wavebox messaging application"; + homepage = https://wavebox.io; + license = licenses.mpl20; + maintainers = with maintainers; [ rawkode ]; + platforms = ["x86_64-linux"]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 029a0a55138..7e955b93f7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18301,6 +18301,8 @@ with pkgs; viber = callPackage ../applications/networking/instant-messengers/viber { }; + wavebox = callPackage ../applications/networking/instant-messengers/wavebox { }; + sonic-pi = callPackage ../applications/audio/sonic-pi { ruby = ruby_2_3; }; From e7e77e108a97d7a952b11b1c68e99aadb052ba5f Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 15 Aug 2018 02:18:53 -0500 Subject: [PATCH 151/258] nextpnr: init at 2018.08.09 Signed-off-by: Austin Seipp --- .../development/compilers/nextpnr/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/compilers/nextpnr/default.nix diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix new file mode 100644 index 00000000000..5ec3b5f59d8 --- /dev/null +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake +, icestorm, python3, boost, qtbase +}: + +let + boostPython = boost.override { python = python3; enablePython = true; }; +in +stdenv.mkDerivation rec { + name = "nextpnr-${version}"; + version = "2018.08.09"; + + src = fetchFromGitHub { + owner = "yosyshq"; + repo = "nextpnr"; + rev = "2e02f2d6166c75b1fcec73d268e97e407071a372"; + sha256 = "1f98mkailn75gz5fvhjhnyr0gwa0r8mm3f2sbvgl0yvys8qi08wr"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boostPython python3 qtbase ]; + + enableParallelBuilding = true; + cmakeFlags = + [ "-DARCH=generic;ice40" + "-DICEBOX_ROOT=${icestorm}/share/icebox" + ]; + + meta = with stdenv.lib; { + description = "Place and route tool for FPGAs"; + homepage = https://github.com/yosyshq/nextpnr; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 059b706185d..73d0fcb0a6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7026,6 +7026,8 @@ with pkgs; neko = callPackage ../development/compilers/neko { }; + nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { }; + nasm = callPackage ../development/compilers/nasm { }; nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; From 4ea5a9161f5cf0dae3710b70da33e191337bde80 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:17:41 +0200 Subject: [PATCH 152/258] cppunit: add license --- pkgs/development/libraries/cppunit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 0690bd425ae..3f8b2d896ac 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"; }; - meta = { + meta = with stdenv.lib; { homepage = https://freedesktop.org/wiki/Software/cppunit/; description = "C++ unit testing framework"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.lgpl21; + platforms = platforms.linux ++ platforms.darwin; }; } From 2c2d02fce57ee5ecd220ca103cdad86f371c202e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:17:54 +0200 Subject: [PATCH 153/258] cracklib: add license --- pkgs/development/libraries/cracklib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index aa8b4231a86..b75f03fab7c 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/cracklib/cracklib; description = "A library for checking the strength of passwords"; + license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; From 546bbb69488461dfc7124295d26b2c850d889277 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:18:55 +0200 Subject: [PATCH 154/258] cpufrequtils: add license + homepage --- pkgs/os-specific/linux/cpufrequtils/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index e36aaa5e38d..04da31176da 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.libc.linuxHeaders libtool gettext ]; - meta = { + meta = with stdenv.lib; { description = "Tools to display or change the CPU governor settings"; - platforms = stdenv.lib.platforms.linux; + homepage = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html; + license = licenses.gpl2; + platforms = platforms.linux; }; } From de5b6b2bfe6043c9d552d064e0498b01c036a93a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:19:36 +0200 Subject: [PATCH 155/258] cramfsswap: add licenses + meta data --- pkgs/os-specific/linux/cramfsswap/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/os-specific/linux/cramfsswap/default.nix index 6f11a3bb7a7..d183bb25cb5 100644 --- a/pkgs/os-specific/linux/cramfsswap/default.nix +++ b/pkgs/os-specific/linux/cramfsswap/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { buildInputs = [zlib]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "swap endianess of a cram filesystem (cramfs)"; + homepage = "https://packages.debian.org/sid/utils/cramfsswap"; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 8c6dc9def7705c58df9e5463a16888b854a3c6cc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:20:08 +0200 Subject: [PATCH 156/258] cpio: add license --- pkgs/tools/archivers/cpio/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 2313f27f2e5..c38dc7bbfbe 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -31,10 +31,11 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/cpio/; description = "A program to create or extract from cpio archives"; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3; + platforms = platforms.all; priority = 6; # resolves collision with gnutar's "libexec/rmt" }; } From 47e8f3b137e03dfdd43885913a944cab664ea1ee Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:20:43 +0200 Subject: [PATCH 157/258] cromfs: add license --- pkgs/tools/archivers/cromfs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 68f7f02e741..57a8a8e9738 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fuse perl ]; - meta = { + meta = with stdenv.lib; { description = "FUSE Compressed ROM filesystem with lzma"; homepage = https://bisqwit.iki.fi/source/cromfs.html; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; }; } From c1801f612cf1a361ed3503137a701847b6c6c003 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:21:16 +0200 Subject: [PATCH 158/258] cowsay: add license --- pkgs/tools/misc/cowsay/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 0a7b079445d..bb874dd002a 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -15,10 +15,11 @@ stdenv.mkDerivation { bash ./install.sh $out ''; - meta = { + meta = with stdenv.lib; { description = "A program which generates ASCII pictures of a cow with a message"; - homepage = http://www.nog.net/~tony/warez/cowsay.shtml; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.rob ]; + homepage = https://en.wikipedia.org/wiki/Cowsay; + license = licenses.gpl1; + platforms = platforms.all; + maintainers = [ maintainers.rob ]; }; } From 8fa1389402aa994af545577dfaa2a8c1969dadc0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:24:49 +0200 Subject: [PATCH 159/258] cron: add license --- pkgs/tools/system/cron/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index d6347798053..374f0ac19d8 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { hardeningEnable = [ "pie" ]; preBuild = '' - # do not set sticky bit in /nix/store + # do not set sticky bit in /nix/store substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755 --replace 4755 0755 # do not strip during install, broken on cross and we'll do ourselves as needed substituteInPlace Makefile --replace ' -s cron' ' cron' @@ -36,8 +36,9 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; - meta = { + meta = with stdenv.lib; { description = "Daemon for running commands at specific times (Vixie Cron)"; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = licenses.bsd0; + platforms = with platforms; linux ++ darwin; }; } From 59027e28800dd5c2cd1c9d434c1a71d39be19266 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 15 Aug 2018 12:07:03 -0700 Subject: [PATCH 160/258] Revert "libvirt: fix dlopen("libjansson.so.4")" This reverts commit d46cfd2ff087816697f46d69f9f795ff878301c5, which broke libvirt + some dependent packages (notably nixops) on Darwin --- pkgs/development/libraries/libvirt/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 14db7d6a1c4..63f11daad28 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -59,10 +59,6 @@ in stdenv.mkDerivation rec { substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' - [ -f ${jansson}/lib/libjansson.so.4 ] || exit 1 - substituteInPlace src/util/virjsoncompat.c \ - --replace '"libjansson.so.4"' '"${jansson}/lib/libjansson.so.4"' - patchShebangs . # fixes /usr/bin/python references ''; From 0a40875439c1c1fa562317f27d8431c87b6ecc08 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 15 Aug 2018 21:12:00 +0200 Subject: [PATCH 161/258] openssl_1_1_0: 1.1.0h -> 1.1.0i this addresses: - Client DoS due to large DH parameter (CVE-2018-0732) - Cache timing vulnerability in RSA Key Generation (CVE-2018-0737) Changelog: https://www.openssl.org/news/changelog.html#x1 --- .../development/libraries/openssl/default.nix | 7 +--- .../openssl/revert-relaxed-quoting.patch | 37 ------------------- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/revert-relaxed-quoting.patch diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 35538b99060..b09809f8924 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -124,11 +124,8 @@ in { }; openssl_1_1_0 = common { - version = "1.1.0h"; - sha256 = "05x509lccqjscgyi935z809pwfm708islypwhmjnb6cyvrn64daq"; - patches = [ - ./revert-relaxed-quoting.patch - ]; + version = "1.1.0i"; + sha256 = "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb"; }; } diff --git a/pkgs/development/libraries/openssl/revert-relaxed-quoting.patch b/pkgs/development/libraries/openssl/revert-relaxed-quoting.patch deleted file mode 100644 index ebe7c0ef26c..00000000000 --- a/pkgs/development/libraries/openssl/revert-relaxed-quoting.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7ee2a43069913fb7c444c656048996ea92cc465e Mon Sep 17 00:00:00 2001 -From: Richard Levitte -Date: Wed, 28 Mar 2018 14:46:27 +0200 -Subject: [PATCH] Revert "util/dofile.pl: only quote stuff that actually needs - quoting" - -This wasn't a good solution, too many things depend on the quotes being -there consistently. - -This reverts commit 49cd47eaababc8c57871b929080fc1357e2ad7b8. - -Fixes #5772 - -Reviewed-by: Rich Salz -(Merged from https://github.com/openssl/openssl/pull/5773) - -(cherry picked from commit 00701e5ea84861b74d9d624f21a6b3fcb12e8acd) ---- - util/dofile.pl | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/util/dofile.pl b/util/dofile.pl -index fc72989b0fd..a932941cd5a 100644 ---- a/util/dofile.pl -+++ b/util/dofile.pl -@@ -99,9 +99,9 @@ package main; - # This adds quotes (") around the given string, and escapes any $, @, \, - # " and ' by prepending a \ to them. - sub quotify1 { -- my $s = my $orig = shift @_; -+ my $s = shift @_; - $s =~ s/([\$\@\\"'])/\\$1/g; -- $s ne $orig || $s =~ /\s/ ? '"'.$s.'"' : $s; -+ '"'.$s.'"'; - } - - # quotify_l LIST From 15064010fa2a0730f4c5f61f4dde24ccdd44b72b Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 15 Aug 2018 21:34:10 +0200 Subject: [PATCH 162/258] kontemplate: 1.6.0 -> 1.7.0 Upstream release notes available at: https://github.com/tazjin/kontemplate/releases/tag/v1.7.0 The upstream uses Nix as the build system and the changes to `deps.nix` are simply copied over from there. --- .../cluster/kontemplate/default.nix | 4 +- .../networking/cluster/kontemplate/deps.nix | 50 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index e5d649c68b7..1e03efddc06 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kontemplate-${version}"; - version = "1.6.0"; + version = "1.7.0"; goPackagePath = "github.com/tazjin/kontemplate"; goDeps = ./deps.nix; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "tazjin"; repo = "kontemplate"; rev = "v${version}"; - sha256 = "06qcf2cxs686kd7iqccmqd5chdzxgbkav95byjim7sgvq9qjajfi"; + sha256 = "0vzircajhrfq1nykwpl52cqgzyhy51w4ff7ldpgi95w3a4fz1hzz"; }; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix index db2692a79e7..f0a52f5266e 100644 --- a/pkgs/applications/networking/cluster/kontemplate/deps.nix +++ b/pkgs/applications/networking/cluster/kontemplate/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/semver"; - rev = "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"; - sha256 = "1625b5sxpmlz60jw67j1ljfcc09d4lhxg3z6gc4am8s2rrdgwij6"; + rev = "c84ddcca87bf5a941b138dde832a7e20b0159ad8"; + sha256 = "1dcfdr018a0yszjpvr3wshvq9cc3kvy95l55si556p617wsn1wan"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/sprig"; - rev = "e039e20e500c2c025d9145be375e27cf42a94174"; - sha256 = "1yhpyzq6ghwl0242phjpbc9358fcw63pxrcxsyv9n4dm0w15va3m"; + rev = "77bb58b7f5e10889a1195c21b9e7a96ee166f199"; + sha256 = "0q4g12f3nvda1skz33qzbbdd2vj3gjfwf361hyzlx20s71brk3bk"; }; } { @@ -50,8 +50,17 @@ fetch = { type = "git"; url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + rev = "e9ed3c6dfb39bb1a32197cb10d527906fe4da4b6"; + sha256 = "07cf0j3wbsl1gmn175mdgljcarfz4xbqd6pgc7b08a5lcn7zwhjz"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "dec09d789f3dba190787f8b4454c7d3c936fed9e"; + sha256 = "1hc4w67p6zkh2qk7wm1yrl69jjrjjk615mly5ll4iidn1m4mzi4i"; }; } { @@ -59,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/huandu/xstrings"; - rev = "3959339b333561bf62a38b424fd41517c2c90f40"; - sha256 = "0f1jyd80grpr88gwhljx2x0xgsyzw07807n4z4axxxlybh5f0nh1"; + rev = "7bb0250b58e5c15670406e6f93ffda43281305b1"; + sha256 = "1fc8q65xvsxpa12p8hcjqap2pf72zqlwpm165js9kwbgm2sf977c"; }; } { @@ -68,17 +77,8 @@ fetch = { type = "git"; url = "https://github.com/imdario/mergo"; - rev = "d806ba8c21777d504a2090a2ca4913c750dd3a33"; - sha256 = "12n3lfbfxvnag916c6dpxl48j29s482zwsqjc6wk4vb68qbz2nl3"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b"; - sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07"; + rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4"; + sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "ab89591268e0c8b748cbe4047b00197516011af5"; - sha256 = "1cbg8wlv1hmdps9ksa4kym5zy0mb2yjykw4ns7yqv7nmz4s5xajr"; + rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; + sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; }; } { @@ -95,8 +95,8 @@ fetch = { type = "git"; url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "1087e65c9441605df944fb12c33f0fe7072d18ca"; - sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } ] From 69e96f65ed8a53c1036bbed4692635a0caae8b8a Mon Sep 17 00:00:00 2001 From: "Andy Chun @noneucat" Date: Wed, 15 Aug 2018 12:43:37 -0700 Subject: [PATCH 163/258] mimic: init at 1.2.0.2 --- maintainers/maintainer-list.nix | 5 ++++ pkgs/applications/audio/mimic/default.nix | 35 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/applications/audio/mimic/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ab9b6d76465..441f4bc50bb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2877,6 +2877,11 @@ github = "nocoolnametom"; name = "Tom Doggett"; }; + noneucat = { + email = "andy@lolc.at"; + github = "noneucat"; + name = "Andy Chun"; + }; notthemessiah = { email = "brian.cohen.88@gmail.com"; github = "notthemessiah"; diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix new file mode 100644 index 00000000000..a4cd0c944dc --- /dev/null +++ b/pkgs/applications/audio/mimic/default.nix @@ -0,0 +1,35 @@ +{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig +, alsaLib, libtool, icu +, pulseaudioSupport ? true, libpulseaudio }: + +stdenv.mkDerivation rec { + name = "mimic-${version}"; + version = "1.2.0.2"; + + src = fetchFromGitHub { + rev = version; + repo = "mimic"; + owner = "MycroftAI"; + sha256 = "1wkpbwk88lsahzkc7pzbznmyy0lc02vsp0vkj8f1ags1gh0lc52j"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + alsaLib + libtool + icu + ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + + meta = { + description = "Mycroft's TTS engine, based on CMU's Flite (Festival Lite)"; + homepage = https://mimic.mycroft.ai/; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.noneucat ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73d0fcb0a6a..a478feee6fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17277,6 +17277,10 @@ with pkgs; minitube = libsForQt5.callPackage ../applications/video/minitube { }; + mimic = callPackage ../applications/audio/mimic { + pulseaudioSupport = config.pulseaudio or false; + }; + mimms = callPackage ../applications/audio/mimms {}; meh = callPackage ../applications/graphics/meh {}; From 5c395d5095ed9f04fffdbda5da74c5867350e540 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:25:03 +0200 Subject: [PATCH 164/258] cri-tools: add license --- pkgs/tools/virtualization/cri-tools/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 120727f3873..f57befce308 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchurl }: +{ buildGoPackage, fetchurl, lib }: buildGoPackage { name = "cri-tools-1.0.0-alpha.0"; @@ -10,6 +10,10 @@ buildGoPackage goPackagePath = "github.com/kubernetes-incubator/cri-tools"; subPackages = [ "cmd/crictl" "cmd/critest" ]; + meta = { + license = lib.licenses.asl20; + }; + goDeps = ./deps.nix; } From 672191678df952fcf381d41c7f647fbe66a96505 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 15 Aug 2018 22:33:37 +0200 Subject: [PATCH 165/258] =?UTF-8?q?fwupd:=201.1.0=20=E2=86=92=201.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index fec1b3ed6f0..f018b5c2a7d 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gtk-doc, pkgconfig, gobjectIntrospection, intltool +{ stdenv, fetchurl, gtk-doc, pkgconfig, gobjectIntrospection, intltool , libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib-networking , libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales , gnu-efi, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl @@ -7,7 +7,7 @@ }: let # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc - version = "1.1.0"; + version = "1.1.1"; python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]); installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]); @@ -18,7 +18,7 @@ in stdenv.mkDerivation { name = "fwupd-${version}"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "0flfpzb0fxgixxddpwak4s63i35kr915pdfq5mfrnxq4bwcj24yd"; + sha256 = "0szakfnp6pl8vv3ivb40p5j8pxapfp724a55s2dr1qzzdlbjd08s"; }; outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; @@ -37,13 +37,6 @@ in stdenv.mkDerivation { patches = [ ./fix-paths.patch - - # Allow localedir in lib output - # https://github.com/hughsie/fwupd/pull/626 - (fetchpatch { - url = https://github.com/hughsie/fwupd/commit/9822c387ea13419a0eb2624fcd13d50735cb89f8.patch; - sha256 = "12bk6ga2hvsswpc4gal95l2z5a6gp3vdjq16zm2npligcvf37b6i"; - }) ]; postPatch = '' From 4da408fa673d5e990fc4d6dfe97a6c158f4e7993 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Thu, 16 Aug 2018 00:01:54 +0300 Subject: [PATCH 166/258] gitkraken: 3.6.6 -> 4.0.1 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 9a7609684b5..80f0786af4d 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.6.6"; + version = "4.0.1"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "01ir325ls1fb6ml79c02c7dyi910lxw0avlwc0nzv8fy4aqavl6p"; + sha256 = "0y4r5d21mxwnwla9ggy9c4pm3zbz67yi9z06znkdz9x2chv1ci3n"; }; libPath = makeLibraryPath [ From 300fe1cc9a406784fc157461f13ddb7e7f00002f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 15 Aug 2018 22:02:50 +0300 Subject: [PATCH 167/258] syslog-ng: fix reload service --- nixos/modules/services/logging/syslog-ng.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index 8466ff4630a..985b93a5374 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -88,7 +88,7 @@ in { StandardOutput = "null"; Restart = "on-failure"; ExecStart = "${cfg.package}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP ${pidFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP `${pkgs.coreutils}/bin/cat ${pidFile}`"; }; }; }; From 67ea2c0ffe9a39111b780ce2995eb46c68d26cce Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 15 Aug 2018 23:33:55 +0200 Subject: [PATCH 168/258] samba: 4.7.6 -> 4.7.9 Version 4.7.9 is a security release. The versions 4.7.7 & 4.7.8 contain numerous bug fixes. This fixes a couple of security related issues: - https://www.samba.org/samba/security/CVE-2018-10858.html - https://www.samba.org/samba/security/CVE-2018-10918.html - https://www.samba.org/samba/security/CVE-2018-10919.html - https://www.samba.org/samba/security/CVE-2018-1139.html Changelogs for the version upgrades can be found below. - https://www.samba.org/samba/history/samba-4.7.7.html - https://www.samba.org/samba/history/samba-4.7.8.html - https://www.samba.org/samba/history/samba-4.7.9.html --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index eec80cb66bc..385674c12a8 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -22,11 +22,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.7.6"; + version = "4.7.9"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0vkxqp3wh7bpn1fd45lznmrpn2ma1fq75yq28vi08rggr07y7v8y"; + sha256 = "1v0pd2k4rfdzcqbzb3g5gjiy8rwqamppwzwy5swz4x5rxyr5567c"; }; outputs = [ "out" "dev" "man" ]; From f5da6ff71cab43311c52069ed473ceea848f149d Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Thu, 16 Aug 2018 00:44:41 +0300 Subject: [PATCH 169/258] flow: 0.77.0 -> 0.78.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 481247a41c4..0e190d83b5b 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.77.0"; + version = "0.78.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1wcbqw5vwb3wsz9dkhi2k159ms98kn1nw3g9lc2j9w1m8ki41lql"; + sha256 = "1ilim9z3z8hh1bnj1sdygwyxfdxjf93hdf3cmmq4swsclw73a90j"; }; installPhase = '' From 083c3183ff565bab88d1b8a1c13823a2c454e2fd Mon Sep 17 00:00:00 2001 From: Stephen Date: Wed, 15 Aug 2018 15:14:17 -0700 Subject: [PATCH 170/258] terragrunt: 0.16.5 -> 0.16.6 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index fdf254a4ec0..f35269eb271 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.16.5"; + version = "0.16.6"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "17xmk5qxlmz2g41jqd0b9ad6jd5yyw2wqi2h323bs4f3rpfkxzpd"; + sha256 = "0fzn2ymk8x0lzwfqlvnry8s6wf3q0sqn76lfardjyz6wgxl8011i"; }; goDeps = ./deps.nix; From 8c3db41c548b7eecb02ec1876a6d95b728db0011 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 15 Aug 2018 15:00:54 +0200 Subject: [PATCH 171/258] eclib: 20180710 -> 20180815 --- pkgs/development/libraries/eclib/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 62014489f30..2a43cbe8ee5 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -16,7 +16,7 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "eclib"; - version = "20180710"; # upgrade might break the sage interface + version = "20180815"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib @@ -25,16 +25,8 @@ stdenv.mkDerivation rec { owner = "JohnCremona"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1kmwpw971sipb4499c9b35q5pz6sms5qndqrvq7396d8hhwjg1i2"; + sha256 = "12syn83lnzx0xc4r1v3glfimbzndyilkpdmx50xrihbjz1hzczif"; }; - patches = [ - # One of the headers doesn't get installed. - # See https://github.com/NixOS/nixpkgs/pull/43476. - (fetchpatch { - url = "https://github.com/JohnCremona/eclib/pull/42/commits/c9b96429815e31a6e3372c106e31eef2a96431f9.patch"; - sha256 = "0cw26h94m66rbh8jjsfnb1bvc6z7ybh8zcp8xl5nhxjxiawhcl73"; - }) - ]; buildInputs = [ pari ntl From c03d0b52ac673d0cde36754a49a0eb1ab6667d27 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Aug 2018 00:44:34 +0200 Subject: [PATCH 172/258] evilvte: mark as insecure --- pkgs/applications/misc/evilvte/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index 1165ced11f9..b72fcde4a9e 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -31,5 +31,8 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.bodil ]; platforms = platforms.linux; + knownVulnerabilities = [ + "https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854585" + ]; }; } From 48a765e6412b0df2d7809a044ee713a59a428e15 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 Aug 2018 19:05:30 -0400 Subject: [PATCH 173/258] nixos/zeitgeist: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/desktops/zeitgeist.nix | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 nixos/modules/services/desktops/zeitgeist.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e19853efd73..67d7d11e84e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -247,6 +247,7 @@ ./services/desktops/gnome3/tracker-miners.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/telepathy.nix + ./services/desktops/zeitgeist.nix ./services/development/bloop.nix ./services/development/hoogle.nix ./services/editors/emacs.nix diff --git a/nixos/modules/services/desktops/zeitgeist.nix b/nixos/modules/services/desktops/zeitgeist.nix new file mode 100644 index 00000000000..20c82ccdd56 --- /dev/null +++ b/nixos/modules/services/desktops/zeitgeist.nix @@ -0,0 +1,26 @@ +# Zeitgeist + +{ config, lib, pkgs, ... }: + +with lib; + +{ + ###### interface + + options = { + services.zeitgeist = { + enable = mkEnableOption "zeitgeist"; + }; + }; + + ###### implementation + + config = mkIf config.services.zeitgeist.enable { + + environment.systemPackages = [ pkgs.zeitgeist ]; + + services.dbus.packages = [ pkgs.zeitgeist ]; + + systemd.packages = [ pkgs.zeitgeist ]; + }; +} From 22c15abe2073084025ad70ab58e39ee36e1e4d21 Mon Sep 17 00:00:00 2001 From: Bernard Fortz Date: Thu, 16 Aug 2018 02:46:09 +0200 Subject: [PATCH 174/258] cplex: init at 12.8 (#44029) * cplex: init at 12.8 * Removed bundled java from bin directory * Refactored * More refactoring * Added config option for releasePath * Minor cleanup --- .../science/math/cplex/default.nix | 82 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/applications/science/math/cplex/default.nix diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix new file mode 100644 index 00000000000..fe3913648f8 --- /dev/null +++ b/pkgs/applications/science/math/cplex/default.nix @@ -0,0 +1,82 @@ +{ stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath }: + +# To use this package, you need to download your own cplex installer from IBM +# and override the releasePath attribute to point to the location of the file. +# +# Note: cplex creates an individual build for each license which screws +# somewhat with the use of functions like requireFile as the hash will be +# different for every user. + +stdenv.mkDerivation rec { + name = "cplex-${version}"; + version = "128"; + + src = + if builtins.isNull releasePath then + throw '' + This nix expression requires that the cplex installer is already + downloaded to your machine. Get it from IBM: + https://developer.ibm.com/docloud/blog/2017/12/20/cplex-optimization-studio-12-8-now-available/ + + Set `cplex.releasePath = /path/to/download;` in your + ~/.config/nixpkgs/config.nix for `nix-*` commands, or + `config.cplex.releasePath = /path/to/download;` in your + `configuration.nix` for NixOS. + '' + else + releasePath; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ openjdk gtk2 xorg.libXtst glibcLocales ]; + + unpackPhase = "cp $src $name"; + + patchPhase = '' + sed -i -e 's|/usr/bin/tr"|tr" |' $name + ''; + + buildPhase = '' + sh $name -i silent -DLICENSE_ACCEPTED=TRUE -DUSER_INSTALL_DIR=$out + ''; + + installPhase = '' + mkdir -p $out/bin + ln -s $out/opl/bin/x86-64_linux/oplrun\ + $out/opl/bin/x86-64_linux/oplrunjava\ + $out/opl/oplide/oplide\ + $out/cplex/bin/x86-64_linux/cplex\ + $out/cpoptimizer/bin/x86-64_linux/cpoptimizer\ + $out/bin + ''; + + fixupPhase = + let + libraryPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ]; + in '' + interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + + for pgm in $out/opl/bin/x86-64_linux/oplrun $out/opl/bin/x86-64_linux/oplrunjava $out/opl/oplide/oplide; + do + patchelf --set-interpreter "$interpreter" $pgm; + wrapProgram $pgm \ + --prefix LD_LIBRARY_PATH : $out/opl/bin/x86-64_linux:${libraryPath} \ + --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive; + done + + for pgm in $out/cplex/bin/x86-64_linux/cplex $out/cpoptimizer/bin/x86-64_linux/cpoptimizer $out/opl/oplide/jre/bin/*; + do + if grep ELF $pgm > /dev/null; + then + patchelf --set-interpreter "$interpreter" $pgm; + fi + done + ''; + + meta = with stdenv.lib; { + description = "Optimization solver for mathematical programming"; + homepage = "https://www.ibm.com/be-en/marketplace/ibm-ilog-cplex"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ bfortz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53378170716..cf4ba4d1c4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1117,6 +1117,8 @@ with pkgs; flex = flex_2_5_35; }; + cplex = callPackage ../applications/science/math/cplex { releasePath = config.cplex.releasePath or null; }; + cpulimit = callPackage ../tools/misc/cpulimit { }; codesearch = callPackage ../tools/text/codesearch { }; From b8566965df20390a6c0aefe3e261d18965675599 Mon Sep 17 00:00:00 2001 From: Michael Mercier Date: Thu, 16 Aug 2018 02:54:41 +0200 Subject: [PATCH 175/258] Update simgrid 3.19.1 -> 3.20 + parallel tests + enable darwin (#42721) * simgrid: 3.19.1 -> 3.20 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/simgrid/versions. These checks were done: - built on NixOS - /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/smpicc passed the binary check. - /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/smpicxx passed the binary check. - /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/smpirun passed the binary check. - Warning: no invocation of /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/tesh had a zero exit code or showed the expected version - /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/simgrid-colorizer passed the binary check. - Warning: no invocation of /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/simgrid_update_xml had a zero exit code or showed the expected version - /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/simgrid_convert_TI_traces passed the binary check. - Warning: no invocation of /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/smpimain had a zero exit code or showed the expected version - /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/graphicator passed the binary check. - 6 of 9 passed binary check by having a zero exit code. - 4 of 9 passed binary check by having the new version present in output. - found 3.20 with grep in /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20 - directory tree listing: https://gist.github.com/edefc2f1a2e81412484edc2e45986e03 - du listing: https://gist.github.com/a44f7d57537e93152a8e6c569f8ed1ae * simgrid: 3.19.1 -> 3.20 + add darwin - Fix dependencies to enable build on darwin - Add ctest flag to enable parallel testing * Use simpler parallel testing logic because it is already done in nixpkgs/pkgs/stdenv/generic/setup.sh --- .../science/misc/simgrid/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 17a1719ba1e..b6cd8c294c1 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, cmake, elfutils, perl, python3, boost, valgrind +{ stdenv, fetchFromGitHub, cmake, perl, python3, boost, valgrind # Optional requirements # Lua 5.3 needed and not available now #, luaSupport ? false, lua5 , fortranSupport ? false, gfortran , buildDocumentation ? false, transfig, ghostscript, doxygen , buildJavaBindings ? false, openjdk -, modelCheckingSupport ? false, libunwind, libevent # Inside elfutils - , libelf, libevent, libdw +, modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw , debug ? false , moreTests ? false }: @@ -18,20 +18,20 @@ in stdenv.mkDerivation rec { name = "simgrid-${version}"; - version = "3.19.1"; + version = "3.20"; src = fetchFromGitHub { owner = "simgrid"; repo = "simgrid"; rev = "v${version}"; - sha256 = "0vpgcp40xv20hcpslx5wz2mf2phaq41f7x8yr0bm7mknqd3zwxih"; + sha256 = "0xb20qhvsah2dz2hvn850i3w9a5ghsbcx8vka2ap6xsdkxf593gy"; }; - nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind ] + nativeBuildInputs = [ cmake perl python3 boost valgrind ] ++ optionals fortranSupport [ gfortran ] ++ optionals buildJavaBindings [ openjdk ] ++ optionals buildDocumentation [ transfig ghostscript doxygen ] - ++ optionals modelCheckingSupport [ libunwind libevent ]; + ++ optionals modelCheckingSupport [ libunwind libevent elfutils ]; #buildInputs = optional luaSupport lua5; @@ -83,13 +83,15 @@ stdenv.mkDerivation rec { ''; doCheck = true; - + checkPhase = '' runHook preCheck - ctest --output-on-failure -E smpi-replay-multiple + + ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple + runHook postCheck ''; - + enableParallelBuilding = true; meta = { From c74013339e3f28fa19b8cdc86d1a9ddff212df28 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 15 Aug 2018 21:11:28 -0400 Subject: [PATCH 176/258] added the MLDBM package to perlPackages --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a644438c5a0..d219cae5c4e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9561,6 +9561,18 @@ let self = _self // overrides; _self = with self; { }; }; + MLDBM = buildPerlPackage rec { + name = "MLDBM-2.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHORNY/${name}.tar.gz"; + sha256 = "586880ed0c20801abbf6734747e13e0203edefece6ebc4f20ddb5059f02a17a2"; + }; + meta = { + description = "Store multi-level Perl hash structure in single level tied hash"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MNI-Perllib = pkgs.callPackage ../development/perl-modules/MNI {}; Mo = buildPerlPackage rec { From 6e910b2b3d3815f24280f707467b46becc7fa549 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 15 Aug 2018 14:55:09 -0500 Subject: [PATCH 177/258] aiger: clean up configurePhase, install multi-output objects/headers The library and header files are useful for other tools, such as the upcoming 'lingeling'. Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/aiger/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index 1a60c5e148c..03524fc6b22 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -13,18 +13,15 @@ stdenv.mkDerivation rec { configurePhase = '' # Set up picosat, so we can build 'aigbmc' - echo $(pwd) - ls .. mkdir ../picosat ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h ln -s ${picosat}/lib/picosat.o ../picosat/picosat.o ln -s ${picosat}/share/picosat.version ../picosat/VERSION - ls .. ./configure.sh ''; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin $dev/include $lib/lib # Do the installation manually, as the Makefile has odd # cyrillic characters, and this is easier than adding @@ -41,8 +38,13 @@ stdenv.mkDerivation rec { for x in ''${BINS[*]}; do install -m 755 -s $x $out/bin/$x done + + cp -v aiger.o $lib/lib + cp -v aiger.h $dev/include ''; + outputs = [ "out" "dev" "lib" ]; + meta = { description = "And-Inverter Graph (AIG) utilities"; homepage = http://fmv.jku.at/aiger/; From 68cc845295c1f2093ee2451865b7b0f4e3368366 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 15 Aug 2018 14:58:19 -0500 Subject: [PATCH 178/258] lingeling: init at pre1_03b4860d Signed-off-by: Austin Seipp --- .../science/logic/lingeling/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/science/logic/lingeling/default.nix diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix new file mode 100644 index 00000000000..000587a22e6 --- /dev/null +++ b/pkgs/applications/science/logic/lingeling/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub +, aiger +}: + +stdenv.mkDerivation rec { + name = "lingeling-${version}"; + # This is the version used in satcomp2018, which was + # relicensed, and also known as version 'bcj' + version = "pre1_03b4860d"; + + src = fetchFromGitHub { + owner = "arminbiere"; + repo = "lingeling"; + rev = "03b4860d14016f42213ea271014f2f13d181f504"; + sha256 = "1lw1yfy219p7rrk88sbq4zl24b70040zapbjdrpv5a6i0jsblksx"; + }; + + configurePhase = '' + ./configure.sh + + # Rather than patch ./configure, just sneak in use of aiger here, since it + # doesn't handle real build products very well (it works on a build-time + # dir, not installed copy)... This is so we can build 'blimc' + substituteInPlace ./makefile \ + --replace 'targets: liblgl.a' 'targets: liblgl.a blimc' \ + --replace '$(AIGER)/aiger.o' '${aiger.lib}/lib/aiger.o' \ + --replace '$(AIGER)/aiger.h' '${aiger.dev}/include/aiger.h' \ + --replace '-I$(AIGER)' '-I${aiger.dev}/include' + ''; + + installPhase = '' + mkdir -p $out/bin $lib/lib $dev/include + + cp lglib.h $dev/include + cp liblgl.a $lib/lib + + cp lingeling plingeling treengeling ilingeling blimc $out/bin + ''; + + outputs = [ "out" "dev" "lib" ]; + + meta = with stdenv.lib; { + description = "Fast SAT solver"; + homepage = http://fmv.jku.at/lingeling/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4865d792578..2bfb3481c39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20837,7 +20837,6 @@ with pkgs; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {}; tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {gtk = gtk2;}; - aiger = callPackage ../applications/science/logic/aiger {}; avy = callPackage ../applications/science/logic/avy {}; @@ -20846,6 +20845,8 @@ with pkgs; symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; + lingeling = callPackage ../applications/science/logic/lingeling {}; + ### SCIENCE / ELECTRONICS adms = callPackage ../applications/science/electronics/adms { }; From 9b64100add1222ca9c05b27bd2fbe5cf8d198d5b Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 15 Aug 2018 15:46:37 -0500 Subject: [PATCH 179/258] btor2tools: init at pre55_8c150b39 Signed-off-by: Austin Seipp --- .../science/logic/btor2tools/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/science/logic/btor2tools/default.nix diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix new file mode 100644 index 00000000000..ed3d9e63812 --- /dev/null +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "btor2tools-${version}"; + version = "pre55_8c150b39"; + + src = fetchFromGitHub { + owner = "boolector"; + repo = "btor2tools"; + rev = "8c150b39cdbcdef4247344acf465d75ef642365d"; + sha256 = "1r5pid4x567nms02ajjrz3v0zj18k0fi5pansrmc2907rnx2acxx"; + }; + + configurePhase = "./configure.sh -shared"; + + installPhase = '' + mkdir -p $out $dev/include/btor2parser/ $lib/lib + + cp -vr bin $out + cp -v src/btor2parser/btor2parser.h $dev/include/btor2parser + cp -v build/libbtor2parser.* $lib/lib + ''; + + outputs = [ "out" "dev" "lib" ]; + + meta = with stdenv.lib; { + description = "Fast SAT solver"; + homepage = http://fmv.jku.at/lingeling/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bfb3481c39..01ae7647649 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20841,6 +20841,8 @@ with pkgs; avy = callPackage ../applications/science/logic/avy {}; + btor2tools = callPackage ../applications/science/logic/btor2tools {}; + boolector = callPackage ../applications/science/logic/boolector {}; symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; From d5e496a2bba1276997463852f02e842eb52f22c4 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 15 Aug 2018 15:56:21 -0500 Subject: [PATCH 180/258] boolector: 2.4.1 -> 3.0.0, relicensed to MIT Signed-off-by: Austin Seipp --- .../science/logic/boolector/default.nix | 65 +++++++++++-------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index aa815e48db4..8e0ad22bba1 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,41 +1,50 @@ -{ stdenv, fetchurl, writeShellScriptBin }: +{ stdenv, fetchFromGitHub +, cmake, lingeling, btor2tools +}: stdenv.mkDerivation rec { name = "boolector-${version}"; - version = "2.4.1"; - src = fetchurl { - url = "http://fmv.jku.at/boolector/boolector-${version}-with-lingeling-bbc.tar.bz2"; - sha256 = "0mdf7hwix237pvknvrpazcx6s3ininj5k7vhysqjqgxa7lxgq045"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "boolector"; + repo = "boolector"; + rev = "refs/tags/${version}"; + sha256 = "15i3ni5klss423m57wcy1gx0m5wfrjmglapwg85pm7fb3jj1y7sz"; }; - prePatch = - let - lingelingPatch = writeShellScriptBin "lingeling-patch" '' - sed -i -e "1i#include " lingeling/lglib.h + nativeBuildInputs = [ cmake ]; + buildInputs = [ lingeling btor2tools ]; - ${crossFix}/bin/crossFix lingeling - ''; - crossFix = writeShellScriptBin "crossFix" '' - # substituteInPlace not available here - sed -i $1/makefile.in \ - -e 's@ar rc@$(AR) rc@' \ - -e 's@ranlib@$(RANLIB)@' - ''; - in '' - sed -i -e 's@mv lingeling\* lingeling@\0 \&\& ${lingelingPatch}/bin/lingeling-patch@' makefile - sed -i -e 's@mv boolector\* boolector@\0 \&\& ${crossFix}/bin/crossFix boolector@' makefile - ''; + cmakeFlags = + [ "-DSHARED=ON" + "-DUSE_LINGELING=YES" + "-DBTOR2_INCLUDE_DIR=${btor2tools.dev}/include" + "-DBTOR2_LIBRARIES=${btor2tools.lib}/lib/libbtor2parser.so" + "-DLINGELING_INCLUDE_DIR=${lingeling.dev}/include" + "-DLINGELING_LIBRARIES=${lingeling.lib}/lib/liblgl.a" + ]; installPhase = '' - mkdir $out - mv boolector/bin $out + mkdir -p $out/bin $lib/lib $dev/include + + cp -vr bin/* $out/bin + cp -vr lib/* $lib/lib + + rm -rf $out/bin/{examples,test} + + cd ../src + find . -iname '*.h' -exec cp --parents '{}' $dev/include \; + rm -rf $dev/include/tests ''; - meta = { - license = stdenv.lib.licenses.unfreeRedistributable; + outputs = [ "out" "dev" "lib" ]; + + meta = with stdenv.lib; { description = "An extremely fast SMT solver for bit-vectors and arrays"; - homepage = "http://fmv.jku.at/boolector"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + homepage = https://boolector.github.io; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; }; } From 0c119682cef99e25e99fc23018ef28c3af461c95 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 16 Aug 2018 01:52:30 +0000 Subject: [PATCH 181/258] p7zip: vendor debian patches A few months ago I moved these patches to the new debian alsa instance [1], but it looks like their `sha256`s on the tag at the remote have changed again. It doesn't appear that debian's source remote is stable in the way we need it to be; let's just vendor the patches to avoid future issues. [1] https://github.com/NixOS/nixpkgs/pull/41769 --- .../archivers/p7zip/12-CVE-2016-9296.patch | 23 ++++++++++++ .../archivers/p7zip/13-CVE-2017-17969.patch | 35 +++++++++++++++++++ pkgs/tools/archivers/p7zip/default.nix | 14 ++------ 3 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 pkgs/tools/archivers/p7zip/12-CVE-2016-9296.patch create mode 100644 pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch diff --git a/pkgs/tools/archivers/p7zip/12-CVE-2016-9296.patch b/pkgs/tools/archivers/p7zip/12-CVE-2016-9296.patch new file mode 100644 index 00000000000..42245c92c0a --- /dev/null +++ b/pkgs/tools/archivers/p7zip/12-CVE-2016-9296.patch @@ -0,0 +1,23 @@ +From: Robert Luberda +Date: Sat, 19 Nov 2016 08:48:08 +0100 +Subject: Fix nullptr dereference (CVE-2016-9296) + +Patch taken from https://sourceforge.net/p/p7zip/bugs/185/ +--- + CPP/7zip/Archive/7z/7zIn.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CPP/7zip/Archive/7z/7zIn.cpp b/CPP/7zip/Archive/7z/7zIn.cpp +index b0c6b98..7c6dde2 100644 +--- a/CPP/7zip/Archive/7z/7zIn.cpp ++++ b/CPP/7zip/Archive/7z/7zIn.cpp +@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedStreams( + if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i]) + ThrowIncorrect(); + } +- HeadersSize += folders.PackPositions[folders.NumPackStreams]; ++ if (folders.PackPositions) ++ HeadersSize += folders.PackPositions[folders.NumPackStreams]; + return S_OK; + } + diff --git a/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch b/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch new file mode 100644 index 00000000000..a9787c4a908 --- /dev/null +++ b/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch @@ -0,0 +1,35 @@ +From: =?utf-8?q?Antoine_Beaupr=C3=A9?= +Date: Fri, 2 Feb 2018 11:11:41 +0100 +Subject: Heap-based buffer overflow in 7zip/Compress/ShrinkDecoder.cpp + +Origin: vendor, https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/27d7/attachment/CVE-2017-17969.patch +Forwarded: https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/#27d7 +Bug: https://sourceforge.net/p/p7zip/bugs/204/ +Bug-Debian: https://bugs.debian.org/888297 +Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17969 +Reviewed-by: Salvatore Bonaccorso +Last-Update: 2018-02-01 +Applied-Upstream: 18.00-beta +--- + CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp +index 80b7e67..ca37764 100644 +--- a/CPP/7zip/Compress/ShrinkDecoder.cpp ++++ b/CPP/7zip/Compress/ShrinkDecoder.cpp +@@ -121,8 +121,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * + { + _stack[i++] = _suffixes[cur]; + cur = _parents[cur]; ++ if (cur >= kNumItems || i >= kNumItems) ++ break; + } +- ++ ++ if (cur >= kNumItems || i >= kNumItems) ++ break; ++ + _stack[i++] = (Byte)cur; + lastChar2 = (Byte)cur; + diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 4d8b2477ed5..4886217211d 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "p7zip-${version}"; @@ -10,16 +10,8 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch rec { - name = "CVE-2016-9296.patch"; - url = "https://salsa.debian.org/debian/p7zip/raw/debian/${version}+dfsg-6/debian/patches/12-${name}"; - sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m"; - }) - (fetchpatch rec { - name = "CVE-2017-17969.patch"; - url = "https://salsa.debian.org/debian/p7zip/raw/debian/${version}+dfsg-6/debian/patches/13-${name}"; - sha256 = "00pycdwx6gw7w591bg54ym6zhbxgn47p3zhms6mnmaycfzw09mkn"; - }) + ./12-CVE-2016-9296.patch + ./13-CVE-2017-17969.patch ]; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional From 1d07d8ec4cb378827ce67b1bed4c7446e5d546ef Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 16 Aug 2018 10:32:23 +0800 Subject: [PATCH 182/258] spectre-meltdown-checker: 0.38 -> 0.39 --- pkgs/tools/security/spectre-meltdown-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 4d90289f3f3..8b9365a5cec 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.38"; + version = "0.39"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "151w68i0bhryij79s9xny8wh2256zayc5gyrj0s5nwnhl9yxz0f1"; + sha256 = "1llp6iyvbykn9w7vnz1jklmy6gmbksk234b46mzjfvg7mvg91dc5"; }; prePatch = '' From cd951e39f2205f89e64261a577e289758121df25 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 16 Aug 2018 10:53:31 +0800 Subject: [PATCH 183/258] spectre-meltdown-checker: minor cleanup --- pkgs/tools/security/spectre-meltdown-checker/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 8b9365a5cec..c406316940e 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -19,16 +19,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installPhase = with stdenv.lib; '' - install -D spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker + runHook preInstall + + install -Dm755 spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker wrapProgram $out/bin/spectre-meltdown-checker \ --prefix PATH : ${makeBinPath [ binutils-unwrapped ]} + + runHook postInstall ''; meta = with stdenv.lib; { description = "Spectre & Meltdown vulnerability/mitigation checker for Linux"; homepage = https://github.com/speed47/spectre-meltdown-checker; license = licenses.gpl3; - platforms = platforms.linux; maintainers = with maintainers; [ dotlambda ]; + platforms = platforms.linux; }; } From aba87b85efaa1b2b31176ecbad4f6bf9a82f5d4a Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Tue, 14 Aug 2018 23:19:31 -0500 Subject: [PATCH 184/258] nixos/hydron: Various tweaks Make timer persistent Start timer after hydron Change interval from hourly to weekly --- nixos/modules/services/web-servers/hydron.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-servers/hydron.nix b/nixos/modules/services/web-servers/hydron.nix index c49efaede16..ed63230bc78 100644 --- a/nixos/modules/services/web-servers/hydron.nix +++ b/nixos/modules/services/web-servers/hydron.nix @@ -16,10 +16,10 @@ in with lib; { interval = mkOption { type = types.str; - default = "hourly"; + default = "weekly"; example = "06:00"; description = '' - How often we run hydron import and possibly fetch tags. Runs by default every hour. + How often we run hydron import and possibly fetch tags. Runs by default every week. The format is described in systemd.time @@ -137,9 +137,13 @@ in with lib; { systemd.timers.hydron-fetch = { description = "Automatically import paths into hydron and possibly fetch tags"; - after = [ "network.target" ]; + after = [ "network.target" "hydron.service" ]; wantedBy = [ "timers.target" ]; - timerConfig.OnCalendar = cfg.interval; + + timerConfig = { + Persistent = true; + OnCalendar = cfg.interval; + }; }; users = { From 4513bad4e76edd1f9843374046ccd3f2c992b4bb Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Wed, 15 Aug 2018 22:09:00 -0500 Subject: [PATCH 185/258] hydron: 2018-07-30 -> 2018-08-15 --- pkgs/servers/hydron/default.nix | 6 +++--- pkgs/servers/hydron/deps.nix | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 0be112d4e11..400f15565ef 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "hydron-unstable-${version}"; - version = "2018-07-30"; + version = "2018-08-15"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; - rev = "586af9da1e551b2a7128c154200e2e2e32d1af7e"; - sha256 = "1lif63kcllsbmv06n3b8ayx89k90lximyp23108blcq456wrf0zi"; + rev = "4c219dc016f18e11a50e52485cbeb28135921386"; + sha256 = "0xj705wdyajzli66p0cxvl47gx6z7nx9cbzm7lbbqn51qxw71p64"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix index 76e9e28ed5f..9b0890d36f4 100644 --- a/pkgs/servers/hydron/deps.nix +++ b/pkgs/servers/hydron/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a"; - sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg"; + rev = "8a7e65843414bc07f3d85bebaa10d7cc96253c29"; + sha256 = "0n7msdji0h7iysyqsi0iiq9i1hdgyyz9cwzxpc6qppz7cllnfpnn"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "93664eb81b19dcb232062bf55f92cf4d7c805a7f"; - sha256 = "0jdkb776f6gk0g8zi7r1vcfs6w0i33mn2327x6960jybli7bcfsp"; + rev = "326c44736983c316d20c036ce34ca79ce9b96b01"; + sha256 = "1a1dniz0zbihk7971z2ln6hlsbvkk13lghgjz346lw4lfc105kxk"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/lann/builder"; - rev = "1b87b36280d04fe7882d1512bf038ea2967ad534"; - sha256 = "015q46awbyp47vld07yi7d27i0lkd82r7qn5230bb9qxl4mcfiqc"; + rev = "47ae307949d02aa1f1069fdafc00ca08e1dbabac"; + sha256 = "1kg9jy1rciznj627hafpq2mi7hr5d3ssgqcpwrm3bnlk9sqnydil"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "49c15d80dfbc983ea25246ee959d970efe09ec09"; - sha256 = "1knkww5jfn73frm8m939ck91jkjfapk798xwscm4g991mpcd6j4v"; + rev = "c39426892332e1bb5ec0a434a079bf82f5d30c54"; + sha256 = "1w26avkg623xilnwnad0cq6768cfbs4mxk875382xh0da6ai50s3"; }; } ] From f1b9334c94c4905cc432813e7b056a25d487bba3 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Wed, 15 Aug 2018 22:22:11 -0500 Subject: [PATCH 186/258] meguca: 2018-08-02 -> 2018-08-13 --- pkgs/servers/meguca/default.nix | 6 ++-- pkgs/servers/meguca/server_deps.nix | 45 +++++++++++++++++------------ 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 45702e92621..f6f4ee2e121 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-08-02"; + version = "2018-08-13"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "meguca"; - rev = "9224ab13f6c08bcfee5a930088c35bbfbf7491e1"; - sha256 = "1cp7d8a216nap1fzxcb58dgkbxdazs14hs9705h1xgly86cvwgv0"; + rev = "f8b54370ba74b90f2814e6b42ac003a51fe02ce9"; + sha256 = "1036qlvvz0la3fp514kw5qrplm1zsh23ywn2drigniacmqz4m7dv"; fetchSubmodules = true; }; diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index 6ddb1dac8eb..cc08645547d 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "cebd809c54c4812b96aadd528be66e01bbe81437"; - sha256 = "0xfbxn921h95b5di9cay3bjb8ygam3h718z0plqjdnrqlvqxfbzx"; + rev = "8a7e65843414bc07f3d85bebaa10d7cc96253c29"; + sha256 = "0n7msdji0h7iysyqsi0iiq9i1hdgyyz9cwzxpc6qppz7cllnfpnn"; }; } { @@ -54,6 +54,15 @@ sha256 = "0maqk0rwp39kcc64w4mfkgcvn2q76hqwziwc3g7ckc1qpwxql5z3"; }; } + { + goPackagePath = "github.com/badoux/goscraper"; + fetch = { + type = "git"; + url = "https://github.com/badoux/goscraper"; + rev = "0213ced7087832e81e8892e8d044150cfc153856"; + sha256 = "0bw5g6h0hypd38z8gfbh40pbw824n4qhk3c0kasw6gn4darx972w"; + }; + } { goPackagePath = "github.com/bakape/mnemonics"; fetch = { @@ -68,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "93664eb81b19dcb232062bf55f92cf4d7c805a7f"; - sha256 = "0jdkb776f6gk0g8zi7r1vcfs6w0i33mn2327x6960jybli7bcfsp"; + rev = "326c44736983c316d20c036ce34ca79ce9b96b01"; + sha256 = "1a1dniz0zbihk7971z2ln6hlsbvkk13lghgjz346lw4lfc105kxk"; }; } { @@ -176,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/lann/builder"; - rev = "1b87b36280d04fe7882d1512bf038ea2967ad534"; - sha256 = "015q46awbyp47vld07yi7d27i0lkd82r7qn5230bb9qxl4mcfiqc"; + rev = "47ae307949d02aa1f1069fdafc00ca08e1dbabac"; + sha256 = "1kg9jy1rciznj627hafpq2mi7hr5d3ssgqcpwrm3bnlk9sqnydil"; }; } { @@ -248,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/otium/ytdl"; - rev = "325bc9755fb5979d67b65939b8ff88f480424c0e"; - sha256 = "0r6b9y2jb1cz1q2w722174lk3qvb3ipsi9jj3cizmhq2n6qqfpmk"; + rev = "b071cb3eb1579608df3b52084a017c5753b325e6"; + sha256 = "01ankrjgdcw0ncwv0xzqh74xy22vdl2nza0arga72zrakpgk8nw0"; }; } { @@ -275,8 +284,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "d329d24db4313262a3b0a24d8aeb1dc4bd294fb0"; - sha256 = "1jjmh1nd7lcsrxgr6ycv9m9iwmr8dfn5cxynnj16vw3qazihajk7"; + rev = "e4b0c6d7829bcf64435536c4a88f4088a3c76203"; + sha256 = "1s3m83wv1wjv95nhkbvml56c12z75x85wlmqill3zqvlm9az6bzg"; }; } { @@ -311,8 +320,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "c126467f60eb25f8f27e5a981f32a87e3965053f"; - sha256 = "0xvvzwxqi1dbrnsvq00klx4bnjalf90haf1slnxzrdmbadyp992q"; + rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; + sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; }; } { @@ -320,8 +329,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f4c29de78a2a91c00474a2e689954305c350adf9"; - sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x"; + rev = "c39426892332e1bb5ec0a434a079bf82f5d30c54"; + sha256 = "1w26avkg623xilnwnad0cq6768cfbs4mxk875382xh0da6ai50s3"; }; } { @@ -329,8 +338,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "3dc4335d56c789b04b0ba99b7a37249d9b614314"; - sha256 = "1105b7jqzz8g2bfkdbkj2pdzq4vhfmhm42khir88vjqfd1l7ha31"; + rev = "14742f9018cd6651ec7364dc6ee08af0baaa1031"; + sha256 = "17k06vwhnlb18n9rb1cdcdqyjcn353znfrr4c90xb3carz1sqfq5"; }; } { @@ -338,8 +347,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "96e34ec0e18a62a1e59880c7bf617b655efecb66"; - sha256 = "1n1p5zz0vyvlhac40hxml6c5xwpsw8rjx1pbls9381a0s19ncbdg"; + rev = "6e3c4e7365ddcc329f090f96e4348398f6310088"; + sha256 = "1r511ncipn7sdlssn06fpzcpy4mp4spagni4ryxq86p2b0bi8pn4"; }; } { From 9f6b6bc52ff1ed132523b6a20c5d214efe3f2129 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Wed, 15 Aug 2018 21:59:48 -0700 Subject: [PATCH 187/258] flash: 30.0.0.134 -> 30.0.0.154 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 775ae960eb7..84c4e620262 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,11 +98,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "30.0.0.134"; + version = "30.0.0.154"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1g6695w1ijqs8jbkbrb403ca1vvrf298ayvxslrvk70x6l7lp2ys"; + sha256 = "0bi9b6syx7x2avixgjwanrvynzanf89xm2g3nxazw9qgxxc1cp48"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 2384a9da19c..94d0e9e5bad 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "30.0.0.134"; + version = "30.0.0.154"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1xa2mcbcxpfrqdf37a98nvvsvyp0bm3lsv21ky3ps9cba8a13z80" + "04hfh0vn1n70gdpfydq0sj94d6rkbk80h4pmy3rsfvhg0x540wx8" else - "1jgl57ggcszdim51dcr0gsjmrdb2kdvxl0lv5zl83cvxcyz0z4p6" + "073327sszbvkglh5b18axmwv40sy2vyacdhcd1fx82qskv44sfda" else if arch == "x86_64" then - "0331r5af4zrvwc4h7dp5qyy91dfam5z03yjggls3x04i10nz5myw" + "03ypgzy88ck5rn1q971v0km9yw3p10ly1zkxh239v6nx0hs35w84" else - "011cf0kycs4ih45l23bp6rr2vm7w7jaj4pjvmqwjax4xrb5pzkic"; + "0rld7i659ccp4gvcvdkqkc1lajvlss5d4qndzf9aqiksvdknv62x"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 8420dbdaaa8..ba8a8de9320 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "30.0.0.134"; + version = "30.0.0.154"; src = fetchurl { url = @@ -59,9 +59,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1plmhv1799j0habmyxy7zhvilh823djmg4i387s6qifr5iv66pax" + "133zhgc5fh6s0xr93lv70xcrgvaj7lhjxk5w7xz79h3mp185p3g4" else - "13cb7sca5mw5b1iiimyxbfxwpmdh7aya8rnlhkv3fgk5a1jwrxqr"; + "1xz1l5q0zahalh0l4mkrwhmfrmcli3sckg3rcfnllizq9rbfzcmr"; }; nativeBuildInputs = [ unzip ]; From 313216a67086578c164cb4bb25f258dd299155a1 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 16 Aug 2018 08:05:38 +0200 Subject: [PATCH 188/258] webkitgtk: 2.20.4 -> 2.20.5 --- pkgs/development/libraries/webkitgtk/2.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index 5e30b2b7931..bb493d16a36 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.20.4"; + version = "2.20.5"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0cmfjbfxssgrwhgqmk7kqws91k6pha519bnyjrfsgy640max2zfc"; + sha256 = "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"; }; patches = optionals stdenv.isDarwin [ From efd4e66854eee4fdd99285f420c59b2c504d219a Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 16 Aug 2018 09:05:34 +0200 Subject: [PATCH 189/258] libotf: init 0.9.16 --- pkgs/tools/inputmethods/m17n-lib/otf.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/inputmethods/m17n-lib/otf.nix diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix new file mode 100644 index 00000000000..6e13b4a949c --- /dev/null +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, libXaw, freetype }: +stdenv.mkDerivation rec { + name = "libotf-0.9.16"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + sha256 = "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8"; + }; + + buildInputs = [ libXaw freetype ]; + + meta = { + homepage = http://www.nongnu.org/m17n/; + description = "Multilingual text processing library (libotf)"; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ bendlas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01ae7647649..2d2b8b1293b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1823,6 +1823,10 @@ with pkgs; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; + libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { + inherit (xorg) libXaw; + }; + skktools = callPackage ../tools/inputmethods/skk/skktools { }; skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; From ea5bcb78c2cc4dd7ed0ef58c21a962c9ffbd64cb Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 16 Aug 2018 09:26:07 +0200 Subject: [PATCH 190/258] emacs: update dependencies new config options, xwidgets support updated in emacs 26 cc @chaoflow @lovek323 @peti @the-kenny @jwiegley --- pkgs/applications/editors/emacs/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 01eaac7be5d..0a304fabe60 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,11 +1,12 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO +, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf +, systemd ? null , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null -, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null +, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null }: @@ -16,7 +17,7 @@ assert withGTK2 -> withX || stdenv.isDarwin; assert withGTK3 -> withX || stdenv.isDarwin; assert withGTK2 -> !withGTK3 && gtk2 != null; assert withGTK3 -> !withGTK2 && gtk3 != null; -assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null; +assert withXwidgets -> withGTK3 && webkitgtk != null; let toolkit = @@ -52,14 +53,14 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] - ++ lib.optionals stdenv.isLinux [ dbus libselinux ] + ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft - imagemagick gconf ] + imagemagick gconf m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2 ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; From 7856a66210ead88d9d1067edf09324415360d265 Mon Sep 17 00:00:00 2001 From: Brian Jones Date: Thu, 16 Aug 2018 16:42:29 +0900 Subject: [PATCH 191/258] Add maintainer boj --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f05231f1553..66d741e786c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -534,6 +534,11 @@ github = "bodil"; name = "Bodil Stokke"; }; + boj = { + email = "brian@uncannyworks.com"; + github = "boj"; + name = "Brian Jones"; + }; boothead = { email = "ben@perurbis.com"; github = "boothead"; From 928a53cd6c48f2678230b8f171d4775dd8c2f3f7 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 16 Aug 2018 09:50:06 +0200 Subject: [PATCH 192/258] dropbox: update installer base version cc @ttuegel --- 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 721bc6cd6f5..3450ad72048 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 = "52.3.56"; + version = "55.4.171"; arch = { "x86_64-linux" = "x86_64"; From fda7df678ddc0f8c99eb25649c40014fc316b45d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 16 Aug 2018 14:10:21 +0800 Subject: [PATCH 193/258] uicode-tool: init at 2.3.1 --- .../linux/microcode/iucode-tool.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/os-specific/linux/microcode/iucode-tool.nix diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix new file mode 100644 index 00000000000..485272b1401 --- /dev/null +++ b/pkgs/os-specific/linux/microcode/iucode-tool.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitLab, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "iucode-tool-${version}"; + version = "2.3.1"; + + src = fetchFromGitLab { + owner = "iucode-tool"; + repo = "iucode-tool"; + rev = "v${version}"; + sha256 = "04dlisw87dd3q3hhmkqc5dd58cp22fzx3rzah7pvcyij135yjc3a"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Intel® 64 and IA-32 processor microcode tool"; + homepage = https://gitlab.com/iucode-tool/iucode-tool; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae8b6708122..a3cbf5208a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13474,6 +13474,8 @@ with pkgs; microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; + iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { }; + inherit (callPackages ../os-specific/linux/apparmor { python = python3; }) libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches; From ff246c464dac740597423f972ff96b61b4e826fc Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 16 Aug 2018 14:11:50 +0800 Subject: [PATCH 194/258] microcodeIntel: 20180312 -> 20180807 --- .../linux/microcode/intel-microcode2ucode.c | 154 ------------------ pkgs/os-specific/linux/microcode/intel.nix | 21 ++- 2 files changed, 10 insertions(+), 165 deletions(-) delete mode 100644 pkgs/os-specific/linux/microcode/intel-microcode2ucode.c diff --git a/pkgs/os-specific/linux/microcode/intel-microcode2ucode.c b/pkgs/os-specific/linux/microcode/intel-microcode2ucode.c deleted file mode 100644 index c1660fae38a..00000000000 --- a/pkgs/os-specific/linux/microcode/intel-microcode2ucode.c +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Convert Intel microcode.dat into a single binary microcode.bin file - * - * Based on code by Kay Sievers - * Changed to create a single file by Thomas Bächler - */ - - -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct microcode_header_intel { - unsigned int hdrver; - unsigned int rev; - unsigned int date; - unsigned int sig; - unsigned int cksum; - unsigned int ldrver; - unsigned int pf; - unsigned int datasize; - unsigned int totalsize; - unsigned int reserved[3]; -}; - -union mcbuf { - struct microcode_header_intel hdr; - unsigned int i[0]; - char c[0]; -}; - -int main(int argc, char *argv[]) -{ - const char *filename = "/lib/firmware/microcode.dat"; - FILE *f; - char line[LINE_MAX]; - char buf[4000000]; - union mcbuf *mc; - size_t bufsize, count, start; - int rc = EXIT_SUCCESS; - - if (argv[1] != NULL) - filename = argv[1]; - - count = 0; - mc = (union mcbuf *) buf; - f = fopen(filename, "re"); - if (f == NULL) { - printf("open %s: %m\n", filename); - rc = EXIT_FAILURE; - goto out; - } - - while (fgets(line, sizeof(line), f) != NULL) { - if (sscanf(line, "%x, %x, %x, %x", - &mc->i[count], - &mc->i[count + 1], - &mc->i[count + 2], - &mc->i[count + 3]) != 4) - continue; - count += 4; - } - fclose(f); - - bufsize = count * sizeof(int); - printf("%s: %lu(%luk) bytes, %zu integers\n", - filename, - bufsize, - bufsize / 1024, - count); - - if (bufsize < sizeof(struct microcode_header_intel)) - goto out; - - f = fopen("microcode.bin", "we"); - if (f == NULL) { - printf("open microcode.bin: %m\n"); - rc = EXIT_FAILURE; - goto out; - } - - start = 0; - for (;;) { - size_t size; - unsigned int family, model, stepping; - unsigned int year, month, day; - - mc = (union mcbuf *) &buf[start]; - - if (mc->hdr.totalsize) - size = mc->hdr.totalsize; - else - size = 2000 + sizeof(struct microcode_header_intel); - - if (mc->hdr.ldrver != 1 || mc->hdr.hdrver != 1) { - printf("unknown version/format:\n"); - rc = EXIT_FAILURE; - break; - } - - /* - * 0- 3 stepping - * 4- 7 model - * 8-11 family - * 12-13 type - * 16-19 extended model - * 20-27 extended family - */ - family = (mc->hdr.sig >> 8) & 0xf; - if (family == 0xf) - family += (mc->hdr.sig >> 20) & 0xff; - model = (mc->hdr.sig >> 4) & 0x0f; - if (family == 0x06) - model += ((mc->hdr.sig >> 16) & 0x0f) << 4; - stepping = mc->hdr.sig & 0x0f; - - year = mc->hdr.date & 0xffff; - month = mc->hdr.date >> 24; - day = (mc->hdr.date >> 16) & 0xff; - - printf("\n"); - printf("signature: 0x%02x\n", mc->hdr.sig); - printf("flags: 0x%02x\n", mc->hdr.pf); - printf("revision: 0x%02x\n", mc->hdr.rev); - printf("date: %04x-%02x-%02x\n", year, month, day); - printf("size: %zu\n", size); - - if (fwrite(mc, size, 1, f) != 1) { - printf("write microcode.bin: %m\n"); - rc = EXIT_FAILURE; - goto out; - } - - start += size; - if (start >= bufsize) - break; - } - fclose(f); - printf("\n"); -out: - return rc; -} diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 857a3b580a8..403824fb3a4 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, libarchive }: +{ stdenv, fetchurl, libarchive, iucode-tool }: stdenv.mkDerivation rec { name = "microcode-intel-${version}"; - version = "20180312"; + version = "20180807"; src = fetchurl { - url = "https://downloadmirror.intel.com/27591/eng/microcode-${version}.tgz"; - sha256 = "0yg7q5blcqgq8jyjxhn9n48rxws77ylqzyn4kn10l6yzwan1yf0b"; + url = "https://downloadmirror.intel.com/28039/eng/microcode-${version}.tgz"; + sha256 = "0h4ygwx5brnrjz8v47aikrwhf0q3jhizxmzcii4bdjg64zffiy99"; }; - buildInputs = [ libarchive ]; + nativeBuildInputs = [ iucode-tool libarchive ]; sourceRoot = "."; - buildPhase = '' - gcc -O2 -Wall -o intel-microcode2ucode ${./intel-microcode2ucode.c} - ./intel-microcode2ucode microcode.dat - ''; - installPhase = '' + runHook preInstall + mkdir -p $out kernel/x86/microcode - mv microcode.bin kernel/x86/microcode/GenuineIntel.bin + iucode_tool -w kernel/x86/microcode/GenuineIntel.bin intel-ucode/ echo kernel/x86/microcode/GenuineIntel.bin | bsdcpio -o -H newc -R 0:0 > $out/intel-ucode.img + + runHook postInstall ''; meta = with stdenv.lib; { From 51169880bd41b24642c5440c4d51c459aa2a8b05 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Mon, 30 Jul 2018 20:13:32 +0200 Subject: [PATCH 195/258] nixos/samba: allow dummy conf file to be overridden This allows configuring samba clients on systems without a samba server. --- nixos/modules/services/network-filesystems/samba.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index b23266e8d43..10dc5831121 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -214,12 +214,10 @@ in } ]; # Always provide a smb.conf to shut up programs like smbclient and smbspool. - environment.etc = singleton - { source = - if cfg.enable then configFile - else pkgs.writeText "smb-dummy.conf" "# Samba is disabled."; - target = "samba/smb.conf"; - }; + environment.etc."samba/smb.conf".source = mkOptionDefault ( + if cfg.enable then configFile + else pkgs.writeText "smb-dummy.conf" "# Samba is disabled." + ); } (mkIf cfg.enable { From b2f17900700931ccc7a31c766f32ecbc2a24d4b7 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Mon, 30 Jul 2018 09:22:33 +0200 Subject: [PATCH 196/258] nixos/networkd: add missing options --- nixos/modules/system/boot/networkd.nix | 189 +++++++++++++++++++++---- 1 file changed, 160 insertions(+), 29 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index ce770d06760..a3b7d7ba07a 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -11,17 +11,29 @@ let checkLink = checkUnitConfig "Link" [ (assertOnlyFields [ "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name" - "MTUBytes" "BitsPerSecond" "Duplex" "WakeOnLan" + "MTUBytes" "BitsPerSecond" "Duplex" "AutoNegotiation" "WakeOnLan" "Port" + "TCPSegmentationOffload" "TCP6SegmentationOffload" "GenericSegmentationOffload" + "GenericReceiveOffload" "LargeReceiveOffload" "RxChannels" "TxChannels" + "OtherChannels" "CombinedChannels" ]) - (assertValueOneOf "MACAddressPolicy" ["persistent" "random"]) + (assertValueOneOf "MACAddressPolicy" ["persistent" "random" "none"]) (assertMacAddress "MACAddress") - (assertValueOneOf "NamePolicy" [ - "kernel" "database" "onboard" "slot" "path" "mac" - ]) (assertByteFormat "MTUBytes") (assertByteFormat "BitsPerSecond") (assertValueOneOf "Duplex" ["half" "full"]) - (assertValueOneOf "WakeOnLan" ["phy" "magic" "off"]) + (assertValueOneOf "AutoNegotiation" boolValues) + (assertValueOneOf "WakeOnLan" ["phy" "unicast" "multicast" "broadcast" "arp" "magic" "secureon" "off"]) + (assertValueOneOf "Port" ["tp" "aui" "bnc" "mii" "fibre"]) + (assertValueOneOf "TCPSegmentationOffload" boolValues) + (assertValueOneOf "TCP6SegmentationOffload" boolValues) + (assertValueOneOf "GenericSegmentationOffload" boolValues) + (assertValueOneOf "UDPSegmentationOffload" boolValues) + (assertValueOneOf "GenericReceiveOffload" boolValues) + (assertValueOneOf "LargeReceiveOffload" boolValues) + (range "RxChannels" 1 4294967295) + (range "TxChannels" 1 4294967295) + (range "OtherChannels" 1 4294967295) + (range "CombinedChannels" 1 4294967295) ]; checkNetdev = checkUnitConfig "Netdev" [ @@ -31,16 +43,21 @@ let (assertHasField "Name") (assertHasField "Kind") (assertValueOneOf "Kind" [ - "bridge" "bond" "vlan" "macvlan" "vxlan" "ipip" - "gre" "sit" "vti" "veth" "tun" "tap" "dummy" + "bond" "bridge" "dummy" "gre" "gretap" "ip6gre" "ip6tnl" "ip6gretap" "ipip" + "ipvlan" "macvlan" "macvtap" "sit" "tap" "tun" "veth" "vlan" "vti" "vti6" + "vxlan" "geneve" "vrf" "vcan" "vxcan" "wireguard" "netdevsim" ]) (assertByteFormat "MTUBytes") (assertMacAddress "MACAddress") ]; checkVlan = checkUnitConfig "VLAN" [ - (assertOnlyFields ["Id"]) + (assertOnlyFields ["Id" "GVRP" "MVRP" "LooseBinding" "ReorderHeader"]) (assertRange "Id" 0 4094) + (assertValueOneOf "GVRP" boolValues) + (assertValueOneOf "MVRP" boolValues) + (assertValueOneOf "LooseBinding" boolValues) + (assertValueOneOf "ReorderHeader" boolValues) ]; checkMacvlan = checkUnitConfig "MACVLAN" [ @@ -49,15 +66,41 @@ let ]; checkVxlan = checkUnitConfig "VXLAN" [ - (assertOnlyFields ["Id" "Group" "TOS" "TTL" "MacLearning"]) + (assertOnlyFields [ + "Id" "Remote" "Local" "TOS" "TTL" "MacLearning" "FDBAgeingSec" + "MaximumFDBEntries" "ReduceARPProxy" "L2MissNotification" + "L3MissNotification" "RouteShortCircuit" "UDPChecksum" + "UDP6ZeroChecksumTx" "UDP6ZeroChecksumRx" "RemoteChecksumTx" + "RemoteChecksumRx" "GroupPolicyExtension" "DestinationPort" "PortRange" + "FlowLabel" + ]) (assertRange "TTL" 0 255) (assertValueOneOf "MacLearning" boolValues) + (assertValueOneOf "ReduceARPProxy" boolValues) + (assertValueOneOf "L2MissNotification" boolValues) + (assertValueOneOf "L3MissNotification" boolValues) + (assertValueOneOf "RouteShortCircuit" boolValues) + (assertValueOneOf "UDPChecksum" boolValues) + (assertValueOneOf "UDP6ZeroChecksumTx" boolValues) + (assertValueOneOf "UDP6ZeroChecksumRx" boolValues) + (assertValueOneOf "RemoteChecksumTx" boolValues) + (assertValueOneOf "RemoteChecksumRx" boolValues) + (assertValueOneOf "GroupPolicyExtension" boolValues) + (assertRange "FlowLabel" 0 1048575) ]; checkTunnel = checkUnitConfig "Tunnel" [ - (assertOnlyFields ["Local" "Remote" "TOS" "TTL" "DiscoverPathMTU"]) + (assertOnlyFields [ + "Local" "Remote" "TOS" "TTL" "DiscoverPathMTU" "IPv6FlowLabel" "CopyDSCP" + "EncapsulationLimit" "Key" "InputKey" "OutputKey" "Mode" "Independent" + "AllowLocalRemote" + ]) (assertRange "TTL" 0 255) (assertValueOneOf "DiscoverPathMTU" boolValues) + (assertValueOneOf "CopyDSCP" boolValues) + (assertValueOneOf "Mode" ["ip6ip6" "ipip6" "any"]) + (assertValueOneOf "Independent" boolValues) + (assertValueOneOf "AllowLocalRemote" boolValues) ]; checkPeer = checkUnitConfig "Peer" [ @@ -66,10 +109,11 @@ let ]; tunTapChecks = [ - (assertOnlyFields ["OneQueue" "MultiQueue" "PacketInfo" "User" "Group"]) + (assertOnlyFields ["OneQueue" "MultiQueue" "PacketInfo" "VNetHeader" "User" "Group"]) (assertValueOneOf "OneQueue" boolValues) (assertValueOneOf "MultiQueue" boolValues) (assertValueOneOf "PacketInfo" boolValues) + (assertValueOneOf "VNetHeader" boolValues) ]; checkTun = checkUnitConfig "Tun" tunTapChecks; @@ -79,67 +123,121 @@ let checkBond = checkUnitConfig "Bond" [ (assertOnlyFields [ "Mode" "TransmitHashPolicy" "LACPTransmitRate" "MIIMonitorSec" - "UpDelaySec" "DownDelaySec" "GratuitousARP" + "UpDelaySec" "DownDelaySec" "LearnPacketIntervalSec" "AdSelect" + "FailOverMACPolicy" "ARPValidate" "ARPIntervalSec" "ARPIPTargets" + "ARPAllTargets" "PrimaryReselectPolicy" "ResendIGMP" "PacketsPerSlave" + "GratuitousARP" "AllSlavesActive" "MinLinks" ]) (assertValueOneOf "Mode" [ "balance-rr" "active-backup" "balance-xor" "broadcast" "802.3ad" "balance-tlb" "balance-alb" ]) (assertValueOneOf "TransmitHashPolicy" [ - "layer2" "layer3+4" "layer2+3" "encap2+3" "802.3ad" "encap3+4" + "layer2" "layer3+4" "layer2+3" "encap2+3" "encap3+4" ]) (assertValueOneOf "LACPTransmitRate" ["slow" "fast"]) + (assertValueOneOf "AdSelect" ["stable" "bandwidth" "count"]) + (assertValueOneOf "FailOverMACPolicy" ["none" "active" "follow"]) + (assertValueOneOf "ARPValidate" ["none" "active" "backup" "all"]) + (assertValueOneOf "ARPAllTargets" ["any" "all"]) + (assertValueOneOf "PrimaryReselectPolicy" ["always" "better" "failure"]) + (assertRange "ResendIGMP" 0 255) + (assertRange "PacketsPerSlave" 0 65535) + (assertRange "GratuitousARP" 0 255) + (assertValueOneOf "AllSlavesActive" boolValues) ]; checkNetwork = checkUnitConfig "Network" [ (assertOnlyFields [ - "Description" "DHCP" "DHCPServer" "IPForward" "IPMasquerade" "IPv4LL" "IPv4LLRoute" - "LLMNR" "MulticastDNS" "Domains" "Bridge" "Bond" "IPv6PrivacyExtensions" + "Description" "DHCP" "DHCPServer" "LinkLocalAddressing" "IPv4LLRoute" + "IPv6Token" "LLMNR" "MulticastDNS" "DNSOverTLS" "DNSSEC" + "DNSSECNegativeTrustAnchors" "LLDP" "EmitLLDP" "BindCarrier" "Address" + "Gateway" "DNS" "Domains" "NTP" "IPForward" "IPMasquerade" + "IPv6PrivacyExtensions" "IPv6AcceptRA" "IPv6DuplicateAddressDetection" + "IPv6HopLimit" "IPv4ProxyARP" "IPv6ProxyNDP" "IPv6ProxyNDPAddress" + "IPv6PrefixDelegation" "IPv6MTUBytes" "Bridge" "Bond" "VRF" "VLAN" + "IPVLAN" "MACVLAN" "VXLAN" "Tunnel" "ActiveSlave" "PrimarySlave" + "ConfigureWithoutCarrier" ]) - (assertValueOneOf "DHCP" ["both" "none" "v4" "v6"]) + # Note: For DHCP the values both, none, v4, v6 are deprecated + (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6" "both" "none" "v4" "v6"]) (assertValueOneOf "DHCPServer" boolValues) + (assertValueOneOf "LinkLocalAddressing" ["yes" "no" "ipv4" "ipv6"]) + (assertValueOneOf "IPv4LLRoute" boolValues) + (assertValueOneOf "LLMNR" ["yes" "resolve" "no"]) + (assertValueOneOf "MulticastDNS" ["yes" "resolve" "no"]) + (assertValueOneOf "DNSOverTLS" ["opportunistic" "no"]) + (assertValueOneOf "DNSSEC" ["yes" "allow-downgrade" "no"]) + (assertValueOneOf "LLDP" ["yes" "routers-only" "no"]) + (assertValueOneOf "EmitLLDP" ["yes" "no" "nearest-bridge" "non-tpmr-bridge" "customer-bridge"]) (assertValueOneOf "IPForward" ["yes" "no" "ipv4" "ipv6"]) (assertValueOneOf "IPMasquerade" boolValues) - (assertValueOneOf "IPv4LL" boolValues) - (assertValueOneOf "IPv4LLRoute" boolValues) - (assertValueOneOf "LLMNR" boolValues) - (assertValueOneOf "MulticastDNS" boolValues) (assertValueOneOf "IPv6PrivacyExtensions" ["yes" "no" "prefer-public" "kernel"]) + (assertValueOneOf "IPv6AcceptRA" boolValues) + (assertValueOneOf "IPv4ProxyARP" boolValues) + (assertValueOneOf "IPv6ProxyNDP" boolValues) + (assertValueOneOf "IPv6PrefixDelegation" boolValues) + (assertValueOneOf "ActiveSlave" boolValues) + (assertValueOneOf "PrimarySlave" boolValues) + (assertValueOneOf "ConfigureWithoutCarrier" boolValues) ]; checkAddress = checkUnitConfig "Address" [ - (assertOnlyFields ["Address" "Peer" "Broadcast" "Label"]) + (assertOnlyFields [ + "Address" "Peer" "Broadcast" "Label" "PreferredLifetime" "Scope" + "HomeAddress" "DuplicateAddressDetection" "ManageTemporaryAddress" + "PrefixRoute" "AutoJoin" + ]) (assertHasField "Address") + (assertValueOneOf "PreferredLifetime" ["forever" "infinity" "0" 0]) + (assertValueOneOf "HomeAddress" boolValues) + (assertValueOneOf "DuplicateAddressDetection" boolValues) + (assertValueOneOf "ManageTemporaryAddress" boolValues) + (assertValueOneOf "PrefixRoute" boolValues) + (assertValueOneOf "AutoJoin" boolValues) ]; checkRoute = checkUnitConfig "Route" [ - (assertOnlyFields ["Gateway" "Destination" "Metric"]) + (assertOnlyFields [ + "Gateway" "GatewayOnlink" "Destination" "Source" "Metric" + "IPv6Preference" "Scope" "PreferredSource" "Table" "Protocol" "Type" + "InitialCongestionWindow" "InitialAdvertisedReceiveWindow" "QuickAck" + "MTUBytes" + ]) (assertHasField "Gateway") ]; checkDhcp = checkUnitConfig "DHCP" [ (assertOnlyFields [ - "UseDNS" "UseMTU" "SendHostname" "UseHostname" "UseDomains" "UseRoutes" - "CriticalConnections" "VendorClassIdentifier" "RequestBroadcast" - "RouteMetric" + "UseDNS" "UseNTP" "UseMTU" "Anonymize" "SendHostname" "UseHostname" + "Hostname" "UseDomains" "UseRoutes" "UseTimezone" "CriticalConnection" + "ClientIdentifier" "VendorClassIdentifier" "UserClass" "DUIDType" + "DUIDRawData" "IAID" "RequestBroadcast" "RouteMetric" "RouteTable" + "ListenPort" "RapidCommit" ]) (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "UseNTP" boolValues) (assertValueOneOf "UseMTU" boolValues) + (assertValueOneOf "Anonymize" boolValues) (assertValueOneOf "SendHostname" boolValues) (assertValueOneOf "UseHostname" boolValues) - (assertValueOneOf "UseDomains" boolValues) + (assertValueOneOf "UseDomains" ["yes" "no" "route"]) (assertValueOneOf "UseRoutes" boolValues) - (assertValueOneOf "CriticalConnections" boolValues) + (assertValueOneOf "UseTimezone" boolValues) + (assertValueOneOf "CriticalConnection" boolValues) (assertValueOneOf "RequestBroadcast" boolValues) + (assertRange "RouteTable" 0 4294967295) + (assertValueOneOf "RapidCommit" boolValues) ]; checkDhcpServer = checkUnitConfig "DHCPServer" [ (assertOnlyFields [ "PoolOffset" "PoolSize" "DefaultLeaseTimeSec" "MaxLeaseTimeSec" - "EmitDNS" "DNS" "EmitNTP" "NTP" "EmitTimezone" "Timezone" + "EmitDNS" "DNS" "EmitNTP" "NTP" "EmitRouter" "EmitTimezone" "Timezone" ]) (assertValueOneOf "EmitDNS" boolValues) (assertValueOneOf "EmitNTP" boolValues) + (assertValueOneOf "EmitRouter" boolValues) (assertValueOneOf "EmitTimezone" boolValues) ]; @@ -461,6 +559,36 @@ let ''; }; + bridge = mkOption { + default = [ ]; + type = types.listOf types.str; + description = '' + A list of bridge interfaces to be added to the network section of the + unit. See systemd.network + 5 for details. + ''; + }; + + bond = mkOption { + default = [ ]; + type = types.listOf types.str; + description = '' + A list of bond interfaces to be added to the network section of the + unit. See systemd.network + 5 for details. + ''; + }; + + vrf = mkOption { + default = [ ]; + type = types.listOf types.str; + description = '' + A list of vrf interfaces to be added to the network section of the + unit. See systemd.network + 5 for details. + ''; + }; + vlan = mkOption { default = [ ]; type = types.listOf types.str; @@ -619,6 +747,9 @@ let ${concatStringsSep "\n" (map (s: "Gateway=${s}") def.gateway)} ${concatStringsSep "\n" (map (s: "DNS=${s}") def.dns)} ${concatStringsSep "\n" (map (s: "NTP=${s}") def.ntp)} + ${concatStringsSep "\n" (map (s: "Bridge=${s}") def.bridge)} + ${concatStringsSep "\n" (map (s: "Bond=${s}") def.bond)} + ${concatStringsSep "\n" (map (s: "VRF=${s}") def.vrf)} ${concatStringsSep "\n" (map (s: "VLAN=${s}") def.vlan)} ${concatStringsSep "\n" (map (s: "MACVLAN=${s}") def.macvlan)} ${concatStringsSep "\n" (map (s: "VXLAN=${s}") def.vxlan)} From 7952b51461c8ece7ebabe83e52ac682f2c179a01 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 16 Aug 2018 17:48:35 +0900 Subject: [PATCH 197/258] accountsservice: fix a bug --- nixos/modules/services/desktops/accountsservice.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix index 2a7450669ea..a19ac2a50c2 100644 --- a/nixos/modules/services/desktops/accountsservice.nix +++ b/nixos/modules/services/desktops/accountsservice.nix @@ -36,11 +36,11 @@ with lib; systemd.packages = [ pkgs.accountsservice ]; - systemd.services.accounts-daemon= { + systemd.services.accounts-daemon = { wantedBy = [ "graphical.target" ]; - } // (mkIf (!config.users.mutableUsers) { + } // (optionalAttrs (!config.users.mutableUsers) { environment.NIXOS_USERS_PURE = "true"; }); }; From 29503b1fece8de9f2dab1299c0220dc8e6de2068 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 15 Aug 2018 23:37:31 +0200 Subject: [PATCH 198/258] sqldeveloper: simplify, add darwin support Use unpackCmd and installPhase instead of overwriting buildCommand. This makes the derivation more readable, and adds binary stripping and shebang patching of the output as a bonus :-) Use makeWrapper instead of a custom wrapper script, and only export environment variables that are used. Set JAVA_HOME to ${jdk.home}, making it more generic and independent of the specific jdk path being used (was a different one on zulu). This fixes sqldeveloper on darwin, so add it to supported platforms (plus the known-working x86_64-linux) --- .../tools/database/sqldeveloper/default.nix | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index f2c756e30f1..b950ab0f10f 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, openjdk }: +{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: let version = "17.4.1.054.0712"; @@ -46,29 +46,23 @@ in nix-prefetch-url --type sha256 file:///path/to/${name} ''; - # obtained by `sha256sum sqldeveloper-${version}-no-jre.zip` sha256 = "7e92ca94d02489002db291c96f1d67f9b2501a8967ff3457103fcf60c1eb154a"; }; buildInputs = [ makeWrapper unzip ]; - buildCommand = '' - mkdir -p $out/bin - echo >$out/bin/sqldeveloper '#! ${stdenv.shell}' - echo >>$out/bin/sqldeveloper 'export JAVA_HOME=${openjdk}/lib/openjdk' - echo >>$out/bin/sqldeveloper 'export JDK_HOME=$JAVA_HOME' - echo >>$out/bin/sqldeveloper "cd $out/lib/${name}/sqldeveloper/bin" - echo >>$out/bin/sqldeveloper '${stdenv.shell} sqldeveloper "$@"' - chmod +x $out/bin/sqldeveloper + unpackCmd = "unzip $curSrc"; - mkdir -p $out/lib/ - cd $out - unzip ${src} - mv sqldeveloper $out/lib/${name} + installPhase = '' + mkdir -p $out/libexec $out/share/{applications,pixmaps} + mv * $out/libexec/ - install -D -m 444 $out/lib/$name/icon.png $out/share/pixmaps/sqldeveloper.png - mkdir -p $out/share/applications + mv $out/libexec/icon.png $out/share/pixmaps/sqldeveloper.png cp ${desktopItem}/share/applications/* $out/share/applications + + makeWrapper $out/libexec/sqldeveloper/bin/sqldeveloper $out/bin/sqldeveloper \ + --set JAVA_HOME ${jdk.home} \ + --run "cd $out/libexec/sqldeveloper/bin" ''; meta = with stdenv.lib; { @@ -84,7 +78,7 @@ in ''; homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/; license = licenses.unfree; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.ardumont ]; - platforms = platforms.linux; }; } From e97af33293bb946a29926a4278f905990a9204ec Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 16 Aug 2018 11:55:50 +0200 Subject: [PATCH 199/258] libqalculate: 2.6.0b -> 2.6.2 --- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 5c786898370..377d9fe50be 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "2.6.0b"; + version = "2.6.2"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1g0pmf33vrjabxmx6lyysgkxa6hg8qmwk0n5ncl4pr8sdkimswxw"; + sha256 = "1wfffki5ib65z9ndph2c4a17qx62f07q12adzabs7ij9gv94y9j5"; }; outputs = [ "out" "dev" "doc" ]; From f207998d792523ef969fc4be0e5419accc313277 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 16 Aug 2018 11:56:27 +0200 Subject: [PATCH 200/258] qalculate-gtk: 2.6.1 -> 2.6.2 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 7990088ffbe..59dbfdb509d 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "19jw1w29x0r1qq5r8gmqrqr00ml2pfi2w433723vjzxpfg2pp70r"; + sha256 = "1yzw6avhka7bbi071z9d8cipcghyjq2bg9x3arv1cf395xlnrmb9"; }; patchPhase = '' From 6bb751539f5ea59fc2aac71791f84cc6d8e74e07 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 Aug 2018 06:48:39 -0400 Subject: [PATCH 201/258] granite: 0.5 -> 5.0 (#45099) --- pkgs/development/libraries/granite/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 8243775c6bc..b8f35c8539a 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: stdenv.mkDerivation rec { name = "granite-${version}"; - version = "0.5"; + version = "5.0"; src = fetchFromGitHub { owner = "elementary"; repo = "granite"; rev = version; - sha256 = "15l8z1jkqhvappnr8jww27lfy3dwqybgsxk5iccyvnvzpjdh2s0h"; + sha256 = "015hkclcxirssg7a8s6mkns5xdk77m1jnkshlyfdw041nzyc5jh1"; }; cmakeFlags = [ @@ -17,18 +17,18 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - vala - pkgconfig cmake - ninja - perl gettext gobjectIntrospection + ninja + perl + pkgconfig + vala_0_40 ]; buildInputs = [ glib - gtk3 gnome3.libgee + gtk3 ]; meta = with stdenv.lib; { @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/elementary/granite; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = [ maintainers.vozz ]; + maintainers = with maintainers; [ vozz worldofpeace ]; }; } From 78fb4bd644dcb1dac30364ad04f16e4e28bc3669 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sun, 12 Aug 2018 19:33:59 +0200 Subject: [PATCH 202/258] nixos/qemu-vm: Don't explicitly mknod /dev/vda* And don't need to source the uevent files anymore either since $MAJOR or $MINOR aren't used elsewhere. [dezgeg: The reason these are no longer needed is that 0d27df280f7ed5 switched /tmp to a devtmpfs which automatically creates such device nodes] --- nixos/modules/virtualisation/qemu-vm.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 0abf7b11703..4e9c87222d0 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -156,9 +156,6 @@ let --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \ --hybrid 2 \ --recompute-chs /dev/vda - . /sys/class/block/vda2/uevent - mknod /dev/vda2 b $MAJOR $MINOR - . /sys/class/block/vda/uevent ${pkgs.dosfstools}/bin/mkfs.fat -F16 /dev/vda2 export MTOOLS_SKIP_CHECK=1 ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot From 0776585696938f56d61af18807b965345b4dd06f Mon Sep 17 00:00:00 2001 From: Karol Chmist Date: Thu, 16 Aug 2018 13:23:19 +0200 Subject: [PATCH 203/258] protonmail-bridge: Add warning about enabling gnome-keyring (#45108) --- pkgs/applications/networking/protonmail-bridge/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 2c13cc23b01..a4a127db73b 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -6,7 +6,9 @@ let description = '' An application that runs on your computer in the background and seamlessly encrypts - and decrypts your mail as it enters and leaves your computer + and decrypts your mail as it enters and leaves your computer. + + To work, gnome-keyring service must be enabled. ''; desktopItem = makeDesktopItem { From 995d005d842bc9f6d0fd73383cd1643f6b0e18ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 16 Aug 2018 12:35:14 +0100 Subject: [PATCH 204/258] linux_hardkernel_4_14: restrict platforms to armv7l-linux --- pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index 3fc08e64287..53d8accb185 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -6,7 +6,7 @@ buildLinux (args // rec { # modDirVersion needs to be x.y.z. modDirVersion = "4.14.55"; - # branchVersion needs to be x.y. + # branchVersion needs to be x.y. extraMeta.branch = "4.14"; src = fetchFromGitHub { @@ -28,4 +28,6 @@ buildLinux (args // rec { '' + (args.extraConfig or ""); + extraMeta.platforms = [ "armv7l-linux" ]; + } // (args.argsOverride or {})) From 560f95b5e38137c454faff91bb605a88b0c52d8b Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 16 Aug 2018 13:43:56 +0200 Subject: [PATCH 205/258] pprof: 2017-08-28 -> 2018-08-15 Signed-off-by: Vincent Demeester --- pkgs/development/tools/profiling/pprof/default.nix | 8 ++++---- pkgs/development/tools/profiling/pprof/deps.nix | 13 +++++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index f506db32d9a..9130f31f21d 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -2,16 +2,16 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "pprof-${version}"; - version = "2017-08-28"; - rev = "d19a98b9bcec464f178b20da0f936cef7e15462e"; + name = "pprof-unstable-${version}"; + version = "2018-08-15"; + rev = "781f11b1fcf71fae9d185e7189b5e686f575075a"; goPackagePath = "github.com/google/pprof"; src = fetchgit { inherit rev; url = "git://github.com/google/pprof"; - sha256 = "0wh589fndvvidisy0jy19y0ykw4l05paqd53s8kli7h9zdcl11gq"; + sha256 = "1nvzwcj6h4q0lsjlri3bym4axgv848w3xz57iz5p0wz9lcd5jsmf"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/profiling/pprof/deps.nix b/pkgs/development/tools/profiling/pprof/deps.nix index f8bd466423c..e76f6367996 100644 --- a/pkgs/development/tools/profiling/pprof/deps.nix +++ b/pkgs/development/tools/profiling/pprof/deps.nix @@ -1,12 +1,21 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e78746da79ba8e24e8b488c9880de"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + }; + } { goPackagePath = "github.com/ianlancetaylor/demangle"; fetch = { type = "git"; url = "https://github.com/ianlancetaylor/demangle"; - rev = "4883227f66371e02c4948937d3e2be1664d9be38"; - sha256 = "1yj7c9i1sg26fyx6cmz87x3qh71rldkl6h87x5gysqzipm9jg54l"; + rev = "fcd258a6f0b45dc345a407ee5568cf9a4d24a0ae"; + sha256 = "10hdzq6n4mb13g8ddqvwjwx14djfyxhh0gjc888vdihzvhyqhvrp"; }; } ] From b7e50d52f018d0670614a58851b4fc2c0f93818b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 16 Aug 2018 12:46:51 +0100 Subject: [PATCH 206/258] caffe: add darwin support (#44616) --- .../science/math/caffe/darwin.patch | 47 +++++++++++++++++ .../science/math/caffe/default.nix | 51 +++++++++++++++---- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/science/math/caffe/darwin.patch diff --git a/pkgs/applications/science/math/caffe/darwin.patch b/pkgs/applications/science/math/caffe/darwin.patch new file mode 100644 index 00000000000..e8fa6a683f7 --- /dev/null +++ b/pkgs/applications/science/math/caffe/darwin.patch @@ -0,0 +1,47 @@ +diff --git a/Makefile b/Makefile +index c823f66e..65b90c5e 100644 +--- a/Makefile ++++ b/Makefile +@@ -32,9 +32,9 @@ SRC_DIRS := $(shell find * -type d -exec bash -c "find {} -maxdepth 1 \ + LIBRARY_NAME := $(PROJECT) + LIB_BUILD_DIR := $(BUILD_DIR)/lib + STATIC_NAME := $(LIB_BUILD_DIR)/lib$(LIBRARY_NAME).a +-DYNAMIC_VERSION_MAJOR := 1 +-DYNAMIC_VERSION_MINOR := 0 +-DYNAMIC_VERSION_REVISION := 0 ++DYNAMIC_VERSION_MAJOR := 1 ++DYNAMIC_VERSION_MINOR := 0 ++DYNAMIC_VERSION_REVISION := 0 + DYNAMIC_NAME_SHORT := lib$(LIBRARY_NAME).so + #DYNAMIC_SONAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR) + DYNAMIC_VERSIONED_NAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR).$(DYNAMIC_VERSION_MINOR).$(DYNAMIC_VERSION_REVISION) +diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake +index c48255c8..cf4c580e 100644 +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -105,7 +105,6 @@ if(USE_OPENCV) + endif() + + # ---[ BLAS +-if(NOT APPLE) + set(BLAS "Atlas" CACHE STRING "Selected BLAS library") + set_property(CACHE BLAS PROPERTY STRINGS "Atlas;Open;MKL") + +@@ -123,17 +122,6 @@ if(NOT APPLE) + list(APPEND Caffe_LINKER_LIBS PUBLIC ${MKL_LIBRARIES}) + list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_MKL) + endif() +-elseif(APPLE) +- find_package(vecLib REQUIRED) +- list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${vecLib_INCLUDE_DIR}) +- list(APPEND Caffe_LINKER_LIBS PUBLIC ${vecLib_LINKER_LIBS}) +- +- if(VECLIB_FOUND) +- if(NOT vecLib_INCLUDE_DIR MATCHES "^/System/Library/Frameworks/vecLib.framework.*") +- list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_ACCELERATE) +- endif() +- endif() +-endif() + + # ---[ Python + if(BUILD_python) diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index d7357c5048d..e56c63e01bf 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -1,27 +1,39 @@ -{ stdenv, lib +{ stdenv, lib, runCommand , fetchFromGitHub +, fetchurl , cmake , boost , google-gflags , glog , hdf5-cpp -, leveldb -, lmdb , opencv3 , protobuf -, snappy , doxygen , openblas -, cudaSupport ? true, cudatoolkit +, Accelerate, CoreGraphics, CoreVideo +, lmdbSupport ? true, lmdb +, leveldbSupport ? true, leveldb, snappy +, cudaSupport ? stdenv.isLinux, cudatoolkit , cudnnSupport ? false, cudnn ? null , ncclSupport ? false, nccl ? null , pythonSupport ? false, python ? null, numpy ? null }: +assert leveldbSupport -> (leveldb != null && snappy != null); assert cudnnSupport -> cudaSupport; assert ncclSupport -> cudaSupport; assert pythonSupport -> (python != null && numpy != null); +let + toggle = bool: if bool then "ON" else "OFF"; + + test_model_weights = fetchurl { + url = "http://dl.caffe.berkeleyvision.org/bvlc_reference_caffenet.caffemodel"; + sha256 = "472d4a06035497b180636d8a82667129960371375bd10fcb6df5c6c7631f25e0"; + }; + +in + stdenv.mkDerivation rec { name = "caffe-${version}"; version = "1.0"; @@ -44,19 +56,27 @@ stdenv.mkDerivation rec { "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] else [ "-DCPU_ONLY=ON" ]) - ++ lib.optional ncclSupport "-DUSE_NCCL=ON"; + ++ ["-DUSE_NCCL=${toggle ncclSupport}"] + ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] + ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; - buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv3 openblas ] + buildInputs = [ boost google-gflags glog protobuf hdf5-cpp opencv3 openblas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn + ++ lib.optional lmdbSupport lmdb ++ lib.optional ncclSupport nccl - ++ lib.optionals pythonSupport [ python numpy ]; + ++ lib.optionals leveldbSupport [ leveldb snappy ] + ++ lib.optionals pythonSupport [ python numpy ] + ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ] + ; propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf; outputs = [ "bin" "out"]; propagatedBuildOutputs = []; # otherwise propagates out -> bin cycle + patches = [ ./darwin.patch ]; + preConfigure = lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") '' # CUDA 9.0 doesn't support sm_20 sed -i 's,20 21(20) ,,' cmake/Cuda.cmake @@ -71,6 +91,9 @@ stdenv.mkDerivation rec { # Internal static library. rm $out/lib/libproto.a + # Install models + cp -a ../models $out/share/Caffe/models + moveToOutput "bin" "$bin" '' + lib.optionalString pythonSupport '' mkdir -p $out/${python.sitePackages} @@ -78,6 +101,16 @@ stdenv.mkDerivation rec { rm -rf $out/python ''; + doInstallCheck = false; # build takes more than 30 min otherwise + installCheckPhase = '' + model=bvlc_reference_caffenet + m_path="$out/share/Caffe/models/$model" + $bin/bin/caffe test \ + -model "$m_path/deploy.prototxt" \ + -solver "$m_path/solver.prototxt" \ + -weights "${test_model_weights}" + ''; + meta = with stdenv.lib; { description = "Deep learning framework"; longDescription = '' @@ -88,6 +121,6 @@ stdenv.mkDerivation rec { homepage = http://caffe.berkeleyvision.org/; maintainers = with maintainers; [ jb55 ]; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00e80797bab..82451f6d3f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20905,6 +20905,7 @@ with pkgs; cudnnSupport = cudaSupport; # Used only for image loading. opencv3 = opencv3WithoutCuda; + inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; }; caffe2 = callPackage ../development/libraries/science/math/caffe2 { From 6c84945099a9dd82d252e7b57f3fc3a8fbffd11e Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 16 Aug 2018 21:50:41 +0900 Subject: [PATCH 207/258] lightdm: fix typos --- nixos/modules/services/x11/display-managers/lightdm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 6be15d8cdf4..06f017e9bf4 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -15,7 +15,7 @@ let inherit (pkgs) lightdm writeScript writeText; - # lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup + # lightdm runs with clearenv(), but we need a few things in the environment for X to startup xserverWrapper = writeScript "xserver-wrapper" '' #! ${pkgs.bash}/bin/bash @@ -209,7 +209,7 @@ in services.dbus.enable = true; services.dbus.packages = [ lightdm ]; - # lightdm uses the accounts daemon to rember language/window-manager per user + # lightdm uses the accounts daemon to remember language/window-manager per user services.accounts-daemon.enable = true; security.pam.services.lightdm = { From 7fbdd7fcf4242f406182c4b2671f25e1d2c86397 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 16 Aug 2018 17:56:44 +0900 Subject: [PATCH 208/258] lightdm: enable the accounts daemon to find dbus interface --- nixos/modules/services/desktops/accountsservice.nix | 6 ++++++ nixos/modules/services/x11/display-managers/lightdm.nix | 3 +++ 2 files changed, 9 insertions(+) diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix index a19ac2a50c2..933b9da2c83 100644 --- a/nixos/modules/services/desktops/accountsservice.nix +++ b/nixos/modules/services/desktops/accountsservice.nix @@ -32,6 +32,9 @@ with lib; environment.systemPackages = [ pkgs.accountsservice ]; + # Accounts daemon looks for dbus interfaces in $XDG_DATA_DIRS/accountsservice + environment.pathsToLink = [ "/share/accountsservice" ]; + services.dbus.packages = [ pkgs.accountsservice ]; systemd.packages = [ pkgs.accountsservice ]; @@ -40,6 +43,9 @@ with lib; wantedBy = [ "graphical.target" ]; + # Accounts daemon looks for dbus interfaces in $XDG_DATA_DIRS/accountsservice + environment.XDG_DATA_DIRS = "${config.system.path}/share"; + } // (optionalAttrs (!config.users.mutableUsers) { environment.NIXOS_USERS_PURE = "true"; }); diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 06f017e9bf4..dc82f7086c8 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -212,6 +212,9 @@ in # lightdm uses the accounts daemon to remember language/window-manager per user services.accounts-daemon.enable = true; + # Enable the accounts daemon to find lightdm's dbus interface + environment.systemPackages = [ lightdm ]; + security.pam.services.lightdm = { allowNullPassword = true; startSession = true; From 9a63f51454e54517e9987940825506bb49b690c4 Mon Sep 17 00:00:00 2001 From: Alex Whitt Date: Fri, 18 May 2018 21:36:34 -0400 Subject: [PATCH 209/258] nixos/synergy: Use graphical target (fixes #9468) --- nixos/modules/services/misc/synergy.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix index 7e8eadbe5f3..b89cb41ac3a 100644 --- a/nixos/modules/services/misc/synergy.nix +++ b/nixos/modules/services/misc/synergy.nix @@ -83,20 +83,20 @@ in config = mkMerge [ (mkIf cfgC.enable { - systemd.services."synergy-client" = { - after = [ "network.target" ]; + systemd.user.services."synergy-client" = { + after = [ "network.target" "graphical-session.target" ]; description = "Synergy client"; - wantedBy = optional cfgC.autoStart "multi-user.target"; + wantedBy = optional cfgC.autoStart "graphical-session.target"; path = [ pkgs.synergy ]; serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}"} ${cfgC.serverAddress}''; serviceConfig.Restart = "on-failure"; }; }) (mkIf cfgS.enable { - systemd.services."synergy-server" = { - after = [ "network.target" ]; + systemd.user.services."synergy-server" = { + after = [ "network.target" "graphical-session.target" ]; description = "Synergy server"; - wantedBy = optional cfgS.autoStart "multi-user.target"; + wantedBy = optional cfgS.autoStart "graphical-session.target"; path = [ pkgs.synergy ]; serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f ${optionalString (cfgS.address != "") "-a ${cfgS.address}"} ${optionalString (cfgS.screenName != "") "-n ${cfgS.screenName}" }''; serviceConfig.Restart = "on-failure"; From 42f5a23fc212e7fe8c5b8b7c96730f14ece0f9ee Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 15 Aug 2018 00:55:06 -0500 Subject: [PATCH 210/258] strace: 4.23 -> 4.24 --- 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 a5fd8f5cf64..cc68cc0394f 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.23"; + version = "4.24"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "1bcsq2gbpcb81ayryvn56a6kjx42fc21la6qgds35n0xbybacq3q"; + sha256 = "0d061cdzk6a1822ds4wpqxg10ny27mi4i9zjmnsbz8nz3vy5jkhz"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From d4f0848cae864edf8e6b3d72fc6e649d990dc800 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 16 Aug 2018 10:39:37 +0200 Subject: [PATCH 211/258] splix: install color profiles and enable JBIG --- pkgs/misc/cups/drivers/splix/default.nix | 50 +++++++++++++++++++----- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index bde918a7c48..9cb9aa3ec58 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -1,7 +1,27 @@ -{ stdenv, fetchsvn, cups, zlib }: -let rev = "315"; in -stdenv.mkDerivation rec { +{ stdenv, fetchsvn, fetchurl, cups, cups-filters, jbigkit, zlib }: + +let + rev = "315"; + + color-profiles = stdenv.mkDerivation { + name = "splix-color-profiles-20070625"; + + src = fetchurl { + url = "http://splix.ap2c.org/samsung_cms.tar.bz2"; + sha256 = "1156flics5m9m7a4hdmcc2nphbdyary6dfmbcrmsp9xb7ivsypdl"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/cups/profiles/samsung + cp * $out/share/cups/profiles/samsung/ + ''; + }; + +in stdenv.mkDerivation { name = "splix-svn-${rev}"; + src = fetchsvn { # We build this from svn, because splix hasn't been in released in several years # although the community has been adding some new printer models. @@ -10,15 +30,25 @@ stdenv.mkDerivation rec { sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl"; }; - preBuild = '' - makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model" + postPatch = '' + substituteInPlace src/pstoqpdl.cpp \ + --replace "RASTERDIR \"/\" RASTERTOQPDL" "\"$out/lib/cups/filter/rastertoqpdl\"" \ + --replace "RASTERDIR" "\"${cups-filters}/lib/cups/filter\"" \ ''; - buildInputs = [cups zlib]; + makeFlags = [ + "CUPSFILTER=$(out)/lib/cups/filter" + "CUPSPPD=$(out)/share/cups/model" + "CUPSPROFILE=${color-profiles}/share/cups/profiles" + ]; - meta = { - homepage = http://splix.sourceforge.net; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + buildInputs = [ cups zlib jbigkit ]; + + meta = with stdenv.lib; { + description = "CUPS drivers for SPL (Samsung Printer Language) printers"; + homepage = http://splix.ap2c.org; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau peti ]; }; } From c61b20396f23c56db602044010d28120dca7626e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Aug 2018 16:08:01 +0200 Subject: [PATCH 212/258] =?UTF-8?q?pulseeffects:=204.2.6=20=E2=86=92=204.2?= =?UTF-8?q?.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/audio/pulseeffects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 285c809b12a..313f737cd42 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -43,13 +43,13 @@ let ]; in stdenv.mkDerivation rec { name = "pulseeffects-${version}"; - version = "4.2.6"; + version = "4.2.8"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1b5h760bb1wgn4avirjjri5fcfqvnsr076qnhrdiqcic3vgircsm"; + sha256 = "0ckl0640n6lhk0gcmnmwngajkf46rrd8bxfh7xy5sq6qmm01dhdd"; }; nativeBuildInputs = [ From e4f45891866976f4df72d9ab635659b6e8c380e1 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 16 Aug 2018 08:13:36 +0300 Subject: [PATCH 213/258] syslog-ng: fix reload service --- nixos/modules/services/logging/syslog-ng.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index 985b93a5374..65e103ac2ba 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -85,10 +85,11 @@ in { after = [ "multi-user.target" ]; # makes sure hostname etc is set serviceConfig = { Type = "notify"; + PIDFile = pidFile; StandardOutput = "null"; Restart = "on-failure"; ExecStart = "${cfg.package}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP `${pkgs.coreutils}/bin/cat ${pidFile}`"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; }; From 429131ac79a2677342646828ec1b36503180f88f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 16 Aug 2018 10:00:32 -0400 Subject: [PATCH 214/258] Add back (optional) deterministic profiling patch for GHC 8.4 --- pkgs/development/compilers/ghc/8.4.3.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 7be209aa5fa..3f1f539cab7 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -30,6 +30,10 @@ , # 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" +, # Whether to backport https://phabricator.haskell.org/D4388 for + # deterministic profiling symbol names, at the cost of a slightly + # non-standard GHC API + deterministicProfiling ? false }: assert !enableIntegerSimple -> gmp != null; @@ -94,7 +98,11 @@ stdenv.mkDerivation (rec { sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3"; extraPrefix = "utils/hsc2hs/"; stripLen = 1; - })] + })] ++ stdenv.lib.optional deterministicProfiling + (fetchpatch { + url = "https://phabricator-files.haskell.org/file/data/yd2fclrwulila2quki5q/PHID-FILE-lr2j63hkglwauprxycrt/D4388.diff"; + sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s"; + }) ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch; postPatch = "patchShebangs ."; From 88a78b81d2dd8673841edcec8762c5ab93d710bb Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Thu, 16 Aug 2018 10:02:12 -0700 Subject: [PATCH 215/258] zoom-us: 2.2.128200.0702 -> 2.3.128305.0716 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 72812563b09..afc6f03edb4 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.2.128200.0702"; + version = "2.3.128305.0716"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0n9kyj94bj35gbpwiz4kq7hc8pwfqwnfqf003g4c8gx5pda3g56w"; + sha256 = "1jpw5sclr5bhif559hmnyiggjh6gkm1smiw34y3ad4k8xhag9dkh"; }; }; From 7fff759f6d2667721c2bdc88731c1dd49e7f0b6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 10:49:50 -0700 Subject: [PATCH 216/258] wireguard: 0.0.20180802 -> 0.0.20180809 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireguard-tools/versions. --- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index d2b124bf1a1..96e2a094ac0 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180802"; + version = "0.0.20180809"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1bz9hk3h57r160hxzwa942xkczhgrpwni9sr7gswrkfv3n0as3fa"; + sha256 = "07sbaignf8l4lndfxypgacaf2qmgyfkv1j5z7kn0cw5mgfsphmkx"; }; sourceRoot = "source/src/tools"; From 063942ccfe1bb67a246ea5e54c3cb273e38a5d75 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 10:58:44 -0700 Subject: [PATCH 217/258] you-get: 0.4.1099 -> 0.4.1128 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/you-get/versions. --- pkgs/tools/misc/you-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index e9cd23f5bbc..5254d109168 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1099"; + version = "0.4.1128"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1z9zhxv2vgbb20hgjiksyqm2zglwq71azbp27na1779hbqc467ik"; + sha256 = "0i0wspmgblxwvvbm3q8zz4l450fs3bccqxxfm0ysfgprgcy8fp3l"; }; meta = with stdenv.lib; { From c3e4b87dfbee71688f4e8a028ea07d65da6c33e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 11:22:23 -0700 Subject: [PATCH 218/258] xscreensaver: 5.39 -> 5.40 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xscreensaver/versions. --- pkgs/misc/screensavers/xscreensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index d93d982924d..f088b176c50 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "5.39"; + version = "5.40"; name = "xscreensaver-${version}"; src = fetchurl { url = "https://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "09i47h4hdgwxyqgrsnshl4l5dv5mrsp37h705cc22lwby601ikj8"; + sha256 = "1q2sr7h6ps6d3hk8895g12rrcqiihjl7py1ly077ikv4866r181h"; }; buildInputs = From 8a509c3fc9319652170adc385acb642250a433bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 11:28:27 -0700 Subject: [PATCH 219/258] snd: 18.5 -> 18.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/snd/versions. --- pkgs/applications/audio/snd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 272d4b6592a..7c96fd364c1 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.5"; + name = "snd-18.6"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "1m2rw1p9xr9428p9drd3w5irsi12lz23m605lzgk9gjamq9paywy"; + sha256 = "1jyqkkz2a6zw0jn9y15xd3027r8glkpw794fjk6hd3al1byjhz2z"; }; nativeBuildInputs = [ pkgconfig ]; From 87db3da091dc58a1f098a7fe7de921ca8ca89e8a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 11:35:39 -0700 Subject: [PATCH 220/258] timescaledb: 0.10.1 -> 0.11.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/timescaledb/versions. --- pkgs/servers/sql/postgresql/timescaledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index 1eaa7775793..fab515035ce 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "0.10.1"; + version = "0.11.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "07qkkf7lbwaig26iia54vdakwmv33f71p8saqifz9lf0zy6xn0w0"; + sha256 = "06xysf45r0c2sjfl6vgdbrm7pn7nxx2n0k29bm88q0ipyyp9fr0v"; }; # Fix the install phase which tries to install into the pgsql extension dir, From a9d29f47168f94b0ebd71ba5838e6b9a78253027 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 12:10:40 -0700 Subject: [PATCH 221/258] gitAndTools.tig: 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/tig/versions. --- .../version-management/git-and-tools/tig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 5b0ba0aba7d..6d2753e4543 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.4.0"; + version = "2.4.1"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = name; - sha256 = "1d5clkdgj0ip1j0k335pr4dabcnap6jr016q90i49p1jxixy96pb"; + sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; From 816f4ef18879a60734c3223d1b65abca520d9ee6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 16 Aug 2018 15:16:54 -0400 Subject: [PATCH 222/258] haskellPackages.cabal-plan: Remove broken patch. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d15d121776b..eeeacc0d224 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -951,12 +951,6 @@ self: super: { # https://github.com/yesodweb/Shelly.hs/issues/162 shelly = dontCheck super.shelly; - # Support ansi-terminal 0.7.x. - cabal-plan = appendPatch super.cabal-plan (pkgs.fetchpatch { - url = "https://github.com/haskell-hvr/cabal-plan/pull/16.patch"; - sha256 = "0i889zs46wn09d7iqdy99201zaqxb175cfs8jz2zi3mv4ywx3a0l"; - }); - # https://github.com/simonmichael/hledger/issues/852 hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch { url = "https://github.com/simonmichael/hledger/commit/007b9f8caaf699852511634752a7d7c86f6adc67.patch"; From 0bed16300c6fc843bb2e3739f0de93a260c01803 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 12:17:38 -0700 Subject: [PATCH 223/258] urlscan: 0.8.7 -> 0.8.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/urlscan/versions. --- pkgs/applications/misc/urlscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index c3071647c40..5f5754a6605 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.8.7"; + version = "0.8.9"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "1jxjcq869jimsq1ihk2fbjhp5lj7yga0hbp0msskxyz92afl1kz8"; + sha256 = "18wvfayib79lylv3g9ay3f85qanhrljvnfarwl9snfzklj4gkf2v"; }; propagatedBuildInputs = [ python3Packages.urwid ]; From fde1b2efe2658d949aee0690643791cc93c543ac Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:21:58 +0200 Subject: [PATCH 224/258] atop: add license --- pkgs/os-specific/linux/atop/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 7b4ac9e1f3b..739342b77fd 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -33,15 +33,16 @@ stdenv.mkDerivation rec { make systemdinstall $makeFlags ''; - meta = { - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [raskin]; + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = with maintainers; [ raskin ]; description = ''Console system performance monitor''; longDescription = '' Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. ''; inherit version; + license = licenses.gpl2; downloadPage = http://atoptool.nl/downloadatop.php; }; } From 1f3b568a6c3c91b8e285792ca906c0a148dae388 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:24:42 +0200 Subject: [PATCH 225/258] bc: add license --- pkgs/tools/misc/bc/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index 52bd28e9748..ea8cefd14d3 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -1,4 +1,6 @@ -{stdenv, autoreconfHook, buildPackages, fetchurl, flex, readline, ed, texinfo}: +{ stdenv, autoreconfHook, buildPackages +, fetchurl, flex, readline, ed, texinfo +}: stdenv.mkDerivation rec { name = "bc-1.07.1"; @@ -31,6 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU software calculator"; homepage = http://www.gnu.org/software/bc/; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; } From f5bd6b8bfee7d1fd1f7a504558c6dab2751b0103 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 12:33:50 -0700 Subject: [PATCH 226/258] qemu: 2.12.0 -> 2.12.1 (#44711) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qemu/versions. --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index aae1e7e6b69..1ff61129b0f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -22,8 +22,8 @@ with stdenv.lib; let - version = "2.12.0"; - sha256 = "17377xxbmwbrnh895a108z944pqi39hzrbw4jzgj8pcipi3s3x69"; + version = "2.12.1"; + sha256 = "1jp5y56682bgpfjapagxjfrjdvqkal34pj9qzn6kj8fqaad80l21"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; From bd2e865b44aac981ef93fcbafe099fda4cbbd31c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 16 Aug 2018 15:34:32 -0400 Subject: [PATCH 227/258] rivet: fix hash broken by upstream --- pkgs/development/libraries/physics/rivet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 98c9a845280..639da1687a7 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "0ybv5dl3blgk9p9ayhknirxb6504kpygnkmizd5dr9ippys1i3c8"; + sha256 = "08lhr10h97vqhy6ci4zna4ngx9875j32zs8ad5sy38xgbbrx3474"; }; patches = [ From 9c32d185d12f48a996b9b4fb3999c41d7445e548 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 16 Aug 2018 15:34:53 -0400 Subject: [PATCH 228/258] haskellPackages.hasktags: Disable broken testsuite. https://github.com/MarcWeber/hasktags/issues/52 --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index eeeacc0d224..20e228a4365 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1120,4 +1120,6 @@ self: super: { # Can be removed once yi-language >= 0.18 is in the LTS yi-core = super.yi-core.override { yi-language = self.yi-language_0_18_0; }; + # https://github.com/MarcWeber/hasktags/issues/52 + hasktags = dontCheck super.hasktags; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 17702d0416765ddafac24598da5a0d40734b69d8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:36:36 +0200 Subject: [PATCH 229/258] curl: add license --- lib/licenses.nix | 5 +++++ pkgs/tools/networking/curl/7_59.nix | 1 + pkgs/tools/networking/curl/default.nix | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 1ec0e5149c9..a5f1fc0f0f2 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -210,6 +210,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Common Public License 1.0"; }; + curl = { + fullName = "MIT/X11 derivate"; + url = "https://curl.haxx.se/docs/copyright.html"; + }; + doc = spdx { spdxId = "DOC"; fullName = "DOC License"; diff --git a/pkgs/tools/networking/curl/7_59.nix b/pkgs/tools/networking/curl/7_59.nix index 71a87a8e9d1..0482bcf5262 100644 --- a/pkgs/tools/networking/curl/7_59.nix +++ b/pkgs/tools/networking/curl/7_59.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation rec { description = "A command line tool for transferring files with URL syntax"; homepage = https://curl.haxx.se/; maintainers = with maintainers; [ lovek323 ]; + license = licenses.curl; platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index d15e6084a8b..d42cdcd4a34 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -105,6 +105,7 @@ stdenv.mkDerivation rec { description = "A command line tool for transferring files with URL syntax"; homepage = https://curl.haxx.se/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.all; + license = licenses.curl; + platforms = platforms.all; }; } From 64a39339f6dfebe33f72b3e3c779a2ab484061c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 12:43:31 -0700 Subject: [PATCH 230/258] singularity: 2.5.2 -> 2.6.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/singularity/versions. --- pkgs/applications/virtualization/singularity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index ff05cb75706..3bd222edbd7 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "singularity-${version}"; - version = "2.5.2"; + version = "2.6.0"; enableParallelBuilding = true; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "singularityware"; repo = "singularity"; rev = version; - sha256 = "09wv8xagr5fjfhra5vyig0f1frfp97g99baqkh4avbzpg296q933"; + sha256 = "0bi7acgppbkfbra8r29s1ldq02lazdww0z2h1rfvv8spr8dzzi94"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; From d15421f451316882e858920550cc8a7451a69137 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:44:29 +0200 Subject: [PATCH 231/258] cvs: add license --- pkgs/applications/version-management/cvs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 71fb7612b33..2063149dd78 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -32,9 +32,10 @@ stdenv.mkDerivation { doCheck = false; # fails 1 of 1 tests - meta = { + meta = with stdenv.lib; { homepage = http://cvs.nongnu.org; description = "Concurrent Versions System - a source control system"; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; # library is GPLv2, main is GPLv1 + platforms = platforms.all; }; } From 4cea1c16d13dc64aa989a7ffb27e4b77a06315fa Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 Aug 2018 14:45:52 -0500 Subject: [PATCH 232/258] ssdeep: 2.13 -> 2.14.1 (#45114) "New" project maintainer, move to github. --- pkgs/tools/security/ssdeep/default.nix | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index 50b16ad5839..1ff9c73d8b5 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { name = "ssdeep-${version}"; - version = "2.13"; + version = "2.14.1"; - src = fetchurl { - url = "mirror://sourceforge/ssdeep/${name}.tar.gz"; - sha256 = "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f"; + src = fetchFromGitHub { + owner = "ssdeep-project"; + repo = "ssdeep"; + rev = "release-${version}"; + sha256 = "1yx6yjkggshw5yl89m4kvyzarjdg2l3hs0bbjbrfzwp1lkfd8i0c"; }; + nativeBuildInputs = [ autoreconfHook ]; + # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; - # For some reason (probably a build system bug), the binary isn't - # properly linked to $out/lib to find libfuzzy.so - postFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' - rp=$(patchelf --print-rpath $out/bin/ssdeep) - patchelf --set-rpath $rp:$out/lib $out/bin/ssdeep - ''; - meta = { description = "A program for calculating fuzzy hashes"; homepage = "http://www.ssdeep.sf.net"; From 75e8dfeafa40d5d2892b5b1b83f11d5262994cd0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:46:53 +0200 Subject: [PATCH 233/258] diffutils: add licenses --- pkgs/tools/text/diffutils/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 60628e2139c..fff81fbc860 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -20,9 +20,10 @@ stdenv.mkDerivation rec { stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/diffutils/diffutils.html; description = "Commands for showing the differences between files (diff, cmp, etc.)"; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl3; + platforms = platforms.unix; }; } From d0e87cbfaf86d7dae4d291ecd8c9d8967affb91f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 12:48:05 -0700 Subject: [PATCH 234/258] xterm: 333 -> 335 (#45120) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xterm/versions. --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index aa36ccd49e2..292e4e5ba38 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-333"; + name = "xterm-335"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "0y7gl26mxw6kwqx9j9mi6lx1lp1v3nrlga19ddn07j2m9q0l479g"; + sha256 = "15nbgys4s2idhx6jzzc24g9bb1s6yps5fyg2bafvs0gkkcm1ggz0"; }; buildInputs = From f9a1aef084ab146ce162a0004e249d3c26612f94 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:51:07 +0200 Subject: [PATCH 235/258] flex: add license --- pkgs/development/tools/parsing/flex/2.5.35.nix | 5 +++-- pkgs/development/tools/parsing/flex/2.6.1.nix | 5 +++-- pkgs/development/tools/parsing/flex/default.nix | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index 1062a361413..3e40ddee9d9 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -17,10 +17,11 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; - meta = { + meta = with stdenv.lib; { branch = "2.5.35"; homepage = http://flex.sourceforge.net/; description = "A fast lexical analyser generator"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd2; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix index 954c2bbcb24..81685b6ee66 100644 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace "tests" " "; ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/westes/flex; description = "A fast lexical analyser generator"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd2; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 17323a06cc1..2a91baa80b3 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -41,9 +41,10 @@ stdenv.mkDerivation rec { dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/westes/flex; description = "A fast lexical analyser generator"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd2; + platforms = platforms.unix; }; } From e59f8fa490a5e3716dc7743a0276191758467a74 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:55:12 +0200 Subject: [PATCH 236/258] fortune: add license --- pkgs/tools/misc/fortune/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 59c0396eebe..8e955733598 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -23,8 +23,9 @@ stdenv.mkDerivation { rmdir $out/games ''; - meta = { + meta = with stdenv.lib; { description = "A program that displays a pseudorandom message from a database of quotations"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsdOriginal; + platforms = platforms.unix; }; } From a603e574007588a7df73f93d45ab3a3e54cc1821 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 12:57:59 -0700 Subject: [PATCH 237/258] signal-desktop: 1.15.4 -> 1.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/signal-desktop/versions. --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 00e94234405..516abb4c9c0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.15.4"; + version = "1.15.5"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "02k64hnfzq8d5g805n4bjm2x8xazskp8fwbmcbl2s2rshdwil1jz"; + sha256 = "1a63kyxbhdaz6izprg8wryvscmvfjii50xi1v5pxlf74x2pkxs8k"; }; phases = [ "unpackPhase" "installPhase" ]; From 67628c7a55b60d5e96180baf11f8873eaf7df80e Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 16 Aug 2018 23:03:22 +0300 Subject: [PATCH 238/258] pakcs: 2.0.2-b7 -> 2.0.2-b9 (#45118) --- pkgs/development/compilers/pakcs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 52639667745..412864cd160 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -8,7 +8,7 @@ let src = fetchurl { url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz"; - sha256 = "0fdzw2zz5vs6z20jn6a8jfvpr6dp7fs1rr01cy0xjnzg2mgmn42a"; + sha256 = "086nbsfv363cwrfxzhs54ggdwwkh1ms0pn0v1a4lvqlksjm7jdhv"; }; curry-frontend = (haskellPackages.override { From f1c0b5e498f0d9b78c384cd7082d15f26d848e55 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 22:04:31 +0200 Subject: [PATCH 239/258] grub-0.97: add license --- pkgs/tools/misc/grub/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index bb565bacfe7..6ba931ad80d 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -50,7 +50,8 @@ stdenv.mkDerivation { passthru.grubTarget = ""; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + license = licenses.gpl2; + platforms = platforms.linux; }; } From 698600d9a1a3a8577d8b4fd08c45a4109a4986d4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 22:05:13 +0200 Subject: [PATCH 240/258] iotop: add license --- pkgs/os-specific/linux/iotop/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index a19b3d4ec16..e2ded7a8fd0 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -10,9 +10,11 @@ python2Packages.buildPythonApplication rec { doCheck = false; - meta = { + meta = with stdenv.lib; { description = "A tool to find out the processes doing the most IO"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://guichaz.free.fr/iotop; + license = licenses.gpl2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } From 9f4e76be5ffa4e116de395e92de156be4cd0b0e4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 16 Aug 2018 22:06:06 +0200 Subject: [PATCH 241/258] signal-desktop: 1.15.4 -> 1.15.5 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 00e94234405..516abb4c9c0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.15.4"; + version = "1.15.5"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "02k64hnfzq8d5g805n4bjm2x8xazskp8fwbmcbl2s2rshdwil1jz"; + sha256 = "1a63kyxbhdaz6izprg8wryvscmvfjii50xi1v5pxlf74x2pkxs8k"; }; phases = [ "unpackPhase" "installPhase" ]; From 81fcce75668deb5314b67e6dfb20e229826447fe Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 22:12:21 +0200 Subject: [PATCH 242/258] less: add license --- pkgs/tools/misc/less/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 57eeb39f543..c961ea938ba 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -13,10 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.greenwoodsoftware.com/less/; description = "A more advanced file pager than ‘more’"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.unix; + license = licenses.gpl3; + maintainers = [ maintainers.eelco ]; }; } From c218a9cfe0f02d2b5f983de71334be0faf5be336 Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 16 Aug 2018 13:14:36 -0700 Subject: [PATCH 243/258] terraform_0_11: 0.11.7 -> 0.11.8 (#45117) --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 358a1f23147..edeac9671c1 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -104,8 +104,8 @@ in rec { terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; terraform_0_11 = pluggable (generic { - version = "0.11.7"; - sha256 = "0q5gl8yn1f8fas1v68lz081k88gbmlk7f2xqlwqmh01qpqjxd42q"; + version = "0.11.8"; + sha256 = "1kdmx21l32vj5kvkimkx0s5mxgmgkdwlgbin4f3iqjflzip0cddh"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From f7bb35ffc9c542c37054d450fe6e9138d221f99b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 13:20:45 -0700 Subject: [PATCH 244/258] shairport-sync: 3.2 -> 3.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/shairport-sync/versions. --- pkgs/servers/shairport-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index e880e490a6a..8dce7d59391 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.2"; + version = "3.2.1"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "07b0g5iyjmqyq6zxx5mv72kri66jw6wv6i3gzax6jhkdiag06lwm"; + sha256 = "1g9pd00c1x66cbp4gls93pvnrwbzl37q7p8jaag3h5d6f1431i51"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; From a2e24ae192fc4810404f16b10120ead1606b5b32 Mon Sep 17 00:00:00 2001 From: Sage Date: Thu, 16 Aug 2018 13:36:57 -0700 Subject: [PATCH 245/258] eureka-editor: Init at 1.21 (#44171) --- .../misc/eureka-editor/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/misc/eureka-editor/default.nix diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix new file mode 100644 index 00000000000..b8bd0a59bea --- /dev/null +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }: + +stdenv.mkDerivation rec { + name = "eureka-editor-${version}"; + version = "1.21"; + shortver = "121"; + + src = fetchzip { + url = "mirror://sourceforge/eureka-editor/Eureka/${version}/eureka-${shortver}-source.tar.gz"; + sha256 = "0fpj13aq4wh3f7473cdc5jkf1c71jiiqmjc0ihqa0nm3hic1d4yv"; + }; + + buildInputs = [ fltk zlib xdg_utils libjpeg xorg.libXinerama libGL ]; + + enableParallelBuilding = true; + + preBuild = '' + substituteInPlace src/main.cc \ + --replace /usr/local $out + substituteInPlace Makefile \ + --replace /usr/local $out \ + --replace "-o root " "" + ''; + + preInstall = '' + mkdir -p $out/bin $out/share/applications $out/share/icons $out/man/man6 + cp misc/eureka.desktop $out/share/applications + cp misc/eureka.ico $out/share/icons + cp misc/eureka.6 $out/man/man6 + ''; + + meta = with stdenv.lib; { + homepage = http://eureka-editor.sourceforge.net; + description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ neonfuz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82451f6d3f0..49fca19ed8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19614,6 +19614,8 @@ with pkgs; eternity = callPackage ../games/eternity-engine { }; + eureka-editor = callPackage ../applications/misc/eureka-editor { }; + extremetuxracer = callPackage ../games/extremetuxracer { libpng = libpng12; }; From a1f77fbf9cbbbcba19b40d46a6bbf917907764d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 13:38:48 -0700 Subject: [PATCH 246/258] react-native-debugger: 0.7.18 -> 0.7.20 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/react-native-debugger/versions. --- pkgs/development/tools/react-native-debugger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 775b744f839..a1b9090417c 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -38,11 +38,11 @@ let ]; in stdenv.mkDerivation rec { name = "react-native-debugger-${version}"; - version = "0.7.18"; + version = "0.7.20"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "186n438sy9wzrx2zdw4qq4hsz89wiy01bpfa6fdjisvxgz6r8sgw"; + sha256 = "0nd707plj2c96g0dl976dv8b6dlfh12pdqrmxvp0qc2m2j6y9vig"; }; buildInputs = [ unzip ]; From 489f23149f35f5f1ebac5ddaed58132b4bd875aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 13:49:52 -0700 Subject: [PATCH 247/258] rtv: 1.23.0 -> 1.24.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/rtv/versions. --- pkgs/applications/misc/rtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index be27e28c993..05b19bbbff9 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with python3Packages; buildPythonApplication rec { - version = "1.23.0"; + version = "1.24.0"; pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "0i6iqj3ly1bgsfa9403m5190mfl9yk1x4ific3v31wqfja985nsr"; + sha256 = "0vzhnqys8nr6ymsi1mnv092z3i7nwyhgnj4jv6mjifak9j3164fw"; }; # Tests try to access network From ff7d82d405f1772ec7930d443f26a37002264e11 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 14:33:38 -0700 Subject: [PATCH 248/258] picard-tools: 2.18.10 -> 2.18.11 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. --- 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 a08a54c94ec..0ddbdab4c1b 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.10"; + version = "2.18.11"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "1px5ar6iizm4czpc66hyyafandw6g9x9s1abj8klc78alvihciw4"; + sha256 = "03wkyz3bjx3n8bwambhz9lr09271r1wxycmx4p7m2naqs4afxb89"; }; buildInputs = [ jre makeWrapper ]; From 4207c41ee2ea90f732ee039018e4b3c8c9da15ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 14:50:20 -0700 Subject: [PATCH 249/258] pspg: 1.2.1 -> 1.3.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/pspg/versions. --- pkgs/tools/misc/pspg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index f68c87df5ce..a1492259e8c 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pspg-${version}"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "172kphgy6rjs4np1azxldi6mcknjaksj7vfjs3ijldkzz87i7w95"; + sha256 = "1m63bhhglrpc2g68i5bigrzlpvg98qs83jgvf2gsbc4gnx9hywk5"; }; nativeBuildInputs = [ pkgconfig ]; From ebc52846815619254ee32deefcaf519fef0d9ff6 Mon Sep 17 00:00:00 2001 From: Calvin Loncaric Date: Thu, 16 Aug 2018 15:36:45 -0700 Subject: [PATCH 250/258] gdal: allow version 1.11 on Darwin The GDAL 1.11 derivation has been Linux-only for its entire life, but builds just fine on Mac. --- pkgs/development/libraries/gdal/gdal-1_11.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 4d1cee5b916..84d130c3865 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = http://www.gdal.org/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } From d591f8a54d53873833e3441ff6a673fa9cd6bd39 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 17 Aug 2018 12:08:53 +0930 Subject: [PATCH 251/258] flow: 0.78.0 -> 0.79.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0e190d83b5b..bc9bb5d5fa3 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.78.0"; + version = "0.79.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1ilim9z3z8hh1bnj1sdygwyxfdxjf93hdf3cmmq4swsclw73a90j"; + sha256 = "1m8239jl0kmpgmk81mak6k3hmmikji6bb3v0zaknb1z3jl8aa1wb"; }; installPhase = '' From 97b444c2954171f3439635e30f3ab23dfde37ca1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 20:39:49 -0700 Subject: [PATCH 252/258] nnn: 1.8 -> 1.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nnn/versions. --- pkgs/applications/misc/nnn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index b4832a72c2b..d97f2d2c048 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "0sd8djig56163k0b0y4a7kg3malxlg08gayjw4zmvqaihvbbkc6v"; + sha256 = "0z7mr9lql5hz0518wzkj8fdsdp8yh17fr418arjxjn66md4kwgpg"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); From 571fb74f449aa173e231166515b41feb778524b8 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 17 Aug 2018 06:56:51 +0300 Subject: [PATCH 253/258] installer: Disable udisks Due to whoever-knows-what, udisks nowadays pulls in GTK+ et al. But it shouldn't be needed anyway in the installer, so disable it. --- nixos/modules/profiles/installation-device.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 57d947b5268..8e0e1ffb0c6 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -32,6 +32,7 @@ with lib; # Disable some other stuff we don't need. security.sudo.enable = false; + services.udisks2.enable = false; # Automatically log in at the virtual consoles. services.mingetty.autologinUser = "root"; From cea4be23bc64de7ce1006c2567838e83623bf99a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 17 Aug 2018 07:41:14 +0300 Subject: [PATCH 254/258] perlPackages.NetDBus: Reduce closure size The module compiles a native module that links to the DBus C libraries, so dbus (and pkgconfig) for that matter shouldn't be propagated. --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d219cae5c4e..48ef2c70847 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11213,8 +11213,9 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz"; sha256 = "8391696db9e96c374b72984c0bad9c7d1c9f3b4efe68f9ddf429a77548e0e269"; }; - buildInputs = [ TestPod TestPodCoverage ]; - propagatedBuildInputs = [ pkgs.pkgconfig pkgs.dbus XMLTwig ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ TestPod TestPodCoverage pkgs.dbus ]; + propagatedBuildInputs = [ XMLTwig ]; meta = { homepage = http://www.freedesktop.org/wiki/Software/dbus; description = "Extension for the DBus bindings"; From 58dc26180f43cd6565eb1049665daf2dbba83c5e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 17 Aug 2018 07:43:58 +0300 Subject: [PATCH 255/258] nixos: Fix iso_graphical evaluation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I broke it: in job ‘nixos.iso_graphical.x86_64-linux’: The option `services.udisks2.enable' has conflicting definitions, in `/nix/store/bwcjw1ddj94q83vbbnq1nnrs5aisaw59-source/nixos/modules/profiles/installation-device.nix' and `/nix/store/bwcjw1ddj94q83vbbnq1nnrs5aisaw59-source/nixos/modules/services/x11/desktop-managers/plasma5.nix'. --- nixos/modules/profiles/installation-device.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 8e0e1ffb0c6..ff4a23a18d0 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -31,8 +31,8 @@ with lib; #services.rogue.enable = true; # Disable some other stuff we don't need. - security.sudo.enable = false; - services.udisks2.enable = false; + security.sudo.enable = mkDefault false; + services.udisks2.enable = mkDefault false; # Automatically log in at the virtual consoles. services.mingetty.autologinUser = "root"; From 6e1d3cbe6b1d89da80bbb426373e670c9067dde9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 21:16:43 -0700 Subject: [PATCH 256/258] lighttpd: 1.4.49 -> 1.4.50 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lighttpd/versions. --- pkgs/servers/http/lighttpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 4596dac0908..b9894d1bc85 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -12,11 +12,11 @@ assert enableWebDAV -> sqlite != null; assert enableWebDAV -> libuuid != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.49"; + name = "lighttpd-1.4.50"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "02ff77cpvy1006cwfym38vf78xm18plyj636ll74r7kx2bblkpxf"; + sha256 = "1sr9avcnld22a5wl5s8vgrz8r86mybggm9z8zwabqz48v0986dr9"; }; nativeBuildInputs = [ pkgconfig ]; From 92b016572feb46af4ed5778633198514335110d0 Mon Sep 17 00:00:00 2001 From: Mathis Antony Date: Fri, 17 Aug 2018 15:31:04 +0800 Subject: [PATCH 257/258] overmind: add which runtime dependency --- pkgs/applications/misc/overmind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index 43711f0a876..ac985a5e4d2 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, tmux, makeWrapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, tmux, which, makeWrapper }: buildGoPackage rec { name = "overmind-${version}"; @@ -8,7 +8,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$bin/bin/overmind" --prefix PATH : "${stdenv.lib.makeBinPath [ tmux ]}" + wrapProgram "$bin/bin/overmind" --prefix PATH : "${stdenv.lib.makeBinPath [ tmux which ]}" ''; src = fetchFromGitHub { From 9a4e067a86d1fdff5127a13369bad485d9be1830 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Sun, 22 Jul 2018 22:24:15 -0700 Subject: [PATCH 258/258] cowsay: 3.0.3+dfsg1-16 -> 3.0.3+dfsg2 The old source no longer exists. --- pkgs/tools/misc/cowsay/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index bb874dd002a..4d55b70d007 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchgit, perl }: +{ stdenv, fetchurl, perl }: -stdenv.mkDerivation { - name = "cowsay-3.03+dfsg1-16"; +stdenv.mkDerivation rec{ + version = "3.03+dfsg2"; + name = "cowsay-${version}"; - src = fetchgit { - url = https://anonscm.debian.org/git/collab-maint/cowsay.git; - rev = "acb946c166fa3b9526b9c471ef1330f9f89f9c8b"; - sha256 = "1ji66nrdcc8sh79hwils3nbaj897s352r5wp7kzjwiym8bm2azk6"; + src = fetchurl { + url = "http://http.debian.net/debian/pool/main/c/cowsay/cowsay_${version}.orig.tar.gz"; + sha256 = "0ghqnkp8njc3wyqx4mlg0qv0v0pc996x2nbyhqhz66bbgmf9d29v"; }; buildInputs = [ perl ];