From 2f0af764c0c8383f05db0d37f004f347dd2f193c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Jul 2018 17:03:40 -0700 Subject: [PATCH 001/369] appstream-glib: 0.7.9 -> 0.7.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/appstream-glib/versions. --- pkgs/development/libraries/appstream-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 3a0868ccecb..8a148b63e8e 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -4,7 +4,7 @@ , libuuid, json-glib, meson, gperf, ninja }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.9"; + name = "appstream-glib-0.7.10"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "10b32qw7iy0v1jvmf18wqgs8d1cpy52zm5rzw0wv421n90qiyidk"; + sha256 = "1m4gww09id7hwzh4hri1y3hp7p0mdrf6fk9f924r2w66hlsdil0d"; }; nativeBuildInputs = [ From cccfa8f3953933147757d6790ad025e88de32dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Wed, 1 Aug 2018 13:53:33 +0900 Subject: [PATCH 002/369] global-platform-pro: init at 0.3.10-rc11 --- .../tools/global-platform-pro/default.nix | 89 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 91 insertions(+) create mode 100644 pkgs/development/tools/global-platform-pro/default.nix diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix new file mode 100644 index 00000000000..fdbeb82cf20 --- /dev/null +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -0,0 +1,89 @@ +{ stdenv, fetchFromGitHub, jdk, maven, writeText, makeWrapper, jre_headless, pcsclite }: + +# TODO: This is quite a bit of duplicated logic with gephy. Factor it out? +stdenv.mkDerivation rec { + pname = "global-platform-pro"; + version = "0.3.10-rc11"; + describeVersion = "v0.3.10-rc11-0-g8923747"; # git describe --tags --always --long --dirty + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "martinpaljak"; + repo = "GlobalPlatformPro"; + rev = "v${version}"; + sha256 = "0rk81x2y7vx1caxm6wa59fjrfxmjn7s8yxaxm764p8m2qxk3m4y2"; + }; + + patches = [ (writeText "${name}-version.patch" '' + diff --git a/pom.xml b/pom.xml + index 1e5a82d..1aa01fe 100644 + --- a/pom.xml + +++ b/pom.xml + @@ -121,14 +121,10 @@ + + + + - git + + echo + target/generated-resources/pro/javacard/gp/pro_version.txt + + - describe + - --tags + - --always + - --long + - --dirty + + ${describeVersion} + + + + '') ]; + + deps = stdenv.mkDerivation { + name = "${name}-deps"; + inherit src patches; + nativeBuildInputs = [ jdk maven ]; + buildPhase = '' + while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do + echo "timeout, restart maven to continue downloading" + done + ''; + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside + installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "15bbi7z9v601all9vr2azh8nk8rpz2vd91yvvw8id6birnbhn3if"; + }; + + nativeBuildInputs = [ jdk maven makeWrapper ]; + + buildPhase = '' + mvn package --offline -Dmaven.repo.local=$( \ + cp -dpR ${deps}/.m2 ./ && \ + chmod +w -R .m2 && \ + pwd \ + )/.m2 + ''; + + installPhase = '' + mkdir -p $out/lib/java $out/share/java + cp -R target/apidocs $out/doc + cp target/gp.jar $out/share/java + makeWrapper ${jre_headless}/bin/java $out/bin/gp \ + --add-flags "-jar $out/share/java/gp.jar" \ + --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib" + ''; + + meta = with stdenv.lib; { + description = "Command-line utility for managing applets and keys on Java Cards"; + longDescription = '' + This command-line utility can be used to manage applets and keys + on Java Cards. It is made available as the `gp` executable. + + The executable requires the PC/SC daemon running for correct execution. + If you run NixOS, it can be enabled with `services.pcscd.enable = true;`. + ''; + homepage = https://github.com/martinpaljak/GlobalPlatformPro; + license = with licenses; [ lgpl3 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9f6c16e992..8b1a5e30681 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -180,6 +180,8 @@ with pkgs; fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { }; + global-platform-pro = callPackage ../development/tools/global-platform-pro/default.nix { }; + graph-easy = callPackage ../tools/graphics/graph-easy { }; packer = callPackage ../development/tools/packer { }; From 944586699e7f501e80bb1f195c972a75141217a4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 4 Aug 2018 13:45:59 +0200 Subject: [PATCH 003/369] llvmPackages_34: remove unused --- .../compilers/llvm/3.4/clang-purity.patch | 19 ---- .../llvm/3.4/clang-separate-build.patch | 8 -- pkgs/development/compilers/llvm/3.4/clang.nix | 56 ----------- .../compilers/llvm/3.4/default.nix | 37 -------- .../compilers/llvm/3.4/dragonegg.nix | 35 ------- pkgs/development/compilers/llvm/3.4/lld.nix | 29 ------ pkgs/development/compilers/llvm/3.4/lldb.nix | 43 --------- .../llvm/3.4/llvm-separate-build.patch | 12 --- pkgs/development/compilers/llvm/3.4/llvm.nix | 94 ------------------- .../llvm/3.4/polly-separate-build.patch | 12 --- pkgs/development/compilers/llvm/3.4/polly.nix | 25 ----- pkgs/top-level/all-packages.nix | 8 -- 12 files changed, 378 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/3.4/clang-purity.patch delete mode 100644 pkgs/development/compilers/llvm/3.4/clang-separate-build.patch delete mode 100644 pkgs/development/compilers/llvm/3.4/clang.nix delete mode 100644 pkgs/development/compilers/llvm/3.4/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.4/dragonegg.nix delete mode 100644 pkgs/development/compilers/llvm/3.4/lld.nix delete mode 100644 pkgs/development/compilers/llvm/3.4/lldb.nix delete mode 100644 pkgs/development/compilers/llvm/3.4/llvm-separate-build.patch delete mode 100644 pkgs/development/compilers/llvm/3.4/llvm.nix delete mode 100644 pkgs/development/compilers/llvm/3.4/polly-separate-build.patch delete mode 100644 pkgs/development/compilers/llvm/3.4/polly.nix diff --git a/pkgs/development/compilers/llvm/3.4/clang-purity.patch b/pkgs/development/compilers/llvm/3.4/clang-purity.patch deleted file mode 100644 index c7021a58f9b..00000000000 --- a/pkgs/development/compilers/llvm/3.4/clang-purity.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur clang-3.4-orig/lib/Driver/Tools.cpp clang-3.4/lib/Driver/Tools.cpp ---- clang-3.4-orig/lib/Driver/Tools.cpp 2013-12-08 21:59:27.000000000 -0500 -+++ clang-3.4/lib/Driver/Tools.cpp 2014-01-27 12:48:29.421872597 -0500 -@@ -6477,15 +6477,6 @@ - } - } - -- if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::thumb || -- (!Args.hasArg(options::OPT_static) && -- !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString( -- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain))); -- } -- - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); - diff --git a/pkgs/development/compilers/llvm/3.4/clang-separate-build.patch b/pkgs/development/compilers/llvm/3.4/clang-separate-build.patch deleted file mode 100644 index 5fb67f169f4..00000000000 --- a/pkgs/development/compilers/llvm/3.4/clang-separate-build.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -Naur clang-3.4-orig/tools/extra/CMakeLists.txt clang-3.4/tools/extra/CMakeLists.txt ---- clang-3.4-orig/tools/extra/CMakeLists.txt 2013-11-07 19:08:23.000000000 -0500 -+++ clang-3.4/tools/extra/CMakeLists.txt 2014-01-20 11:47:22.678435223 -0500 -@@ -1,3 +1,4 @@ -+include(CheckLibraryExists) - check_library_exists(edit el_init "" HAVE_LIBEDIT) - - add_subdirectory(clang-apply-replacements) diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix deleted file mode 100644 index 863e7eb2247..00000000000 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }: - -stdenv.mkDerivation { - name = "clang-${version}"; - - unpackPhase = '' - unpackFile ${fetch "cfe" "045wjnp5j8xd2zjhvldcllnwlnrwz3dafmlk412z804d5xvzb9jv"} - mv cfe-${version}.src clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - # !!! Hopefully won't be needed for 3.5 - unpackFile ${llvm.src} - export cmakeFlags="$cmakeFlags -DCLANG_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*` - (cd llvm-* && patch -Np1 -i ${./llvm-separate-build.patch}) - ''; - - patches = [ ./clang-separate-build.patch ./clang-purity.patch ]; - - buildInputs = [ cmake libedit libxml2 zlib ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" - ] ++ - (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include") ++ - (stdenv.lib.optional (stdenv.cc.cc != null) "-DGCC_INSTALL_PREFIX=${stdenv.cc.cc}"); - - # Clang expects to find LLVMgold in its own prefix - # Clang expects to find sanitizer libraries in its own prefix - postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib - fi - - ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ - ''; - - passthru = { - isClang = true; - cc = stdenv.cc.cc; - # GCC_INSTALL_PREFIX points here, so just use it even though it may not - # actually be a gcc - gcc = stdenv.cc.cc; - hardeningUnsupportedFlags = [ "stackprotector" ]; - }; - - enableParallelBuilding = true; - - meta = { - description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.4/default.nix b/pkgs/development/compilers/llvm/3.4/default.nix deleted file mode 100644 index ef4e8d4bbc5..00000000000 --- a/pkgs/development/compilers/llvm/3.4/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ newScope, stdenv, isl, fetchurl }: -let - callPackage = newScope (self // { inherit stdenv isl version fetch; }); - - version = "3.4"; - - fetch = fetch_v version; - fetch_v = ver: name: sha256: fetchurl { - url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.gz"; - inherit sha256; - }; - - compiler-rt_src = fetch "compiler-rt" "0p5b6varxdqn7q3n77xym63hhq4qqxd2981pfpa65r1w72qqjz7k"; - clang-tools-extra_src = fetch "clang-tools-extra" "1d1822mwxxl9agmyacqjw800kzz5x8xr0sdmi8fgx5xfa5sii1ds"; - - self = { - llvm = callPackage ./llvm.nix rec { - version = "3.4.2"; - fetch = fetch_v version; - inherit compiler-rt_src; - }; - - clang = callPackage ./clang.nix rec { - version = "3.4.2"; - fetch = fetch_v version; - inherit clang-tools-extra_src; - }; - - lld = callPackage ./lld.nix {}; - - lldb = callPackage ./lldb.nix {}; - - polly = callPackage ./polly.nix {}; - - dragonegg = callPackage ./dragonegg.nix {}; - }; -in self diff --git a/pkgs/development/compilers/llvm/3.4/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix deleted file mode 100644 index b2f41914d96..00000000000 --- a/pkgs/development/compilers/llvm/3.4/dragonegg.nix +++ /dev/null @@ -1,35 +0,0 @@ -{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: - -stdenv.mkDerivation rec { - name = "dragonegg-${version}"; - - src = fetch "dragonegg" "1733czbvby1ww3xkwcwmm0km0bpwhfyxvf56wb0zv5gksp3kbgrl"; - - patches = [(fetchpatch { - url = "https://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/x86/ABIHack.inc" - + "?r1=208730&r2=208729&view=patch"; - sha256 = "1al82gqz90hzjx24p0wls029lw2bgnlgd209kgvxsp82p4z1v1c1"; - name = "bug-18548.patch"; - })]; - patchFlags = "-p2"; - - # The gcc the plugin will be built for (the same used building dragonegg) - GCC = "gcc"; - - buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ]; - - installPhase = '' - mkdir -p $out/lib $out/share/doc/${name} - cp -d dragonegg.so $out/lib - cp README COPYING $out/share/doc/${name} - ''; - - meta = { - homepage = http://dragonegg.llvm.org/; - description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - broken = true; - }; -} diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix deleted file mode 100644 index 0398a5a543a..00000000000 --- a/pkgs/development/compilers/llvm/3.4/lld.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetch, cmake, llvm, ncurses, zlib, python2, version }: - -stdenv.mkDerivation { - name = "lld-${version}"; - - src = fetch "lld" "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxz"; - - preUnpack = '' - # !!! Hopefully won't be needed for 3.5 - unpackFile ${llvm.src} - export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*` - ''; - - buildInputs = [ cmake ncurses zlib python2 ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - "-DLLD_PATH_TO_LLVM_BUILD=${llvm}" - ]; - - enableParallelBuilding = true; - - meta = { - description = "A set of modular code for creating linker tools"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix deleted file mode 100644 index c5ed82f53e5..00000000000 --- a/pkgs/development/compilers/llvm/3.4/lldb.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, llvm -, clang -, python2 -, version -}: - -stdenv.mkDerivation { - name = "lldb-${version}"; - - src = fetch "lldb" "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x4g"; - - patchPhase = '' - sed -i 's|/usr/bin/env||' \ - scripts/Python/finish-swig-Python-LLDB.sh \ - scripts/Python/build-swig-Python.sh - ''; - - buildInputs = [ cmake python2 which swig ncurses zlib libedit ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" - "-DLLDB_PATH_TO_CLANG_BUILD=${clang}" - "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 - ]; - - enableParallelBuilding = true; - - meta = { - description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.4/llvm-separate-build.patch b/pkgs/development/compilers/llvm/3.4/llvm-separate-build.patch deleted file mode 100644 index abfc11513cd..00000000000 --- a/pkgs/development/compilers/llvm/3.4/llvm-separate-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur llvm-3.4-orig/cmake/modules/TableGen.cmake llvm-3.4/cmake/modules/TableGen.cmake ---- llvm-3.4-orig/cmake/modules/TableGen.cmake 2013-10-06 21:00:07.000000000 -0400 -+++ llvm-3.4/cmake/modules/TableGen.cmake 2014-01-20 13:06:55.273022149 -0500 -@@ -78,8 +78,6 @@ - endif() - - macro(add_tablegen target project) -- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR}) -- - set(${target}_OLD_LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS}) - set(LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS} TableGen) - add_llvm_utility(${target} ${ARGN}) diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix deleted file mode 100644 index accdfbf23b5..00000000000 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv -, fetch -, fetchpatch -, perl -, groff -, cmake -, python2 -, libffi -, libbfd -, libxml2 -, ncurses -, version -, zlib -, compiler-rt_src -, debugVersion ? false -}: - -let - src = fetch "llvm" "1mzgy7r0dma0npi1qrbr1s5n4nbj1ipxgbiw0q671l4s0r3qs0qp"; -in stdenv.mkDerivation rec { - name = "llvm-${version}"; - - unpackPhase = '' - unpackFile ${src} - mv llvm-${version}.src llvm - sourceRoot=$PWD/llvm - unpackFile ${compiler-rt_src} - mv compiler-rt-* $sourceRoot/projects/compiler-rt - ''; - - buildInputs = - [ perl groff cmake libxml2 libffi python2 ] /* - ++ stdenv.lib.optional stdenv.isLinux valgrind */; - - propagatedBuildInputs = [ ncurses zlib ]; - - patches = stdenv.lib.optionals (!stdenv.isDarwin) [ - # llvm-config --libfiles returns (non-existing) static libs - ../fix-llvm-config.patch - ]; - - postPatch = stdenv.lib.optionalString (stdenv ? glibc) '' - ( - cd projects/compiler-rt - patch -p1 -F3 < ${ - fetchpatch { - name = "sigaltstack.patch"; # for glibc-2.26 - url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; - sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; - } - } - - sed -i "s,#include ,&\n#include ,g" \ - lib/asan/asan_linux.cc - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" - "-DLLVM_BUILD_TESTS=ON" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_REQUIRES_RTTI=1" - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - "-DCMAKE_CXX_FLAGS=-std=c++11" - ] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON"; - - postBuild = '' - rm -fR $out - - paxmark m bin/{lli,llvm-rtdyld} - - paxmark m unittests/ExecutionEngine/JIT/JITTests - paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests - paxmark m unittests/Support/SupportTests - ''; - - enableParallelBuilding = true; - - passthru.src = src; - - meta = { - description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"]; - }; -} diff --git a/pkgs/development/compilers/llvm/3.4/polly-separate-build.patch b/pkgs/development/compilers/llvm/3.4/polly-separate-build.patch deleted file mode 100644 index 618dd4dc3b1..00000000000 --- a/pkgs/development/compilers/llvm/3.4/polly-separate-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur polly-3.4-orig/CMakeLists.txt polly-3.4/CMakeLists.txt ---- polly-3.4-orig/CMakeLists.txt 2013-11-21 06:51:46.000000000 -0500 -+++ polly-3.4/CMakeLists.txt 2014-01-20 18:49:34.907919933 -0500 -@@ -53,7 +53,7 @@ - execute_process(COMMAND "${LLVM_INSTALL_ROOT}/bin/llvm-config" --cxxflags - OUTPUT_VARIABLE LLVM_CXX_FLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE) -- set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS}) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS}") - endif(NOT DEFINED LLVM_MAIN_SRC_DIR) - - set(POLLY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/pkgs/development/compilers/llvm/3.4/polly.nix b/pkgs/development/compilers/llvm/3.4/polly.nix deleted file mode 100644 index 1ea806a1266..00000000000 --- a/pkgs/development/compilers/llvm/3.4/polly.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetch, cmake, isl, python2, gmp, llvm, version }: - -stdenv.mkDerivation { - name = "polly-${version}"; - - src = fetch "polly" "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6lz"; - - patches = [ ./polly-separate-build.patch ]; - - buildInputs = [ cmake isl python2 gmp ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - "-DLLVM_INSTALL_ROOT=${llvm}" - ]; - - enableParallelBuilding = true; - - meta = { - description = "A polyhedral optimizer for llvm"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90576e34da0..1f14ab2cde0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6277,7 +6277,6 @@ with pkgs; clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; clang_35 = wrapCC llvmPackages_35.clang; - clang_34 = wrapCC llvmPackages_34.clang; clang-tools = callPackage ../development/tools/clang-tools { }; @@ -6874,16 +6873,9 @@ with pkgs; llvm_38 = llvmPackages_38.llvm; llvm_37 = llvmPackages_37.llvm; llvm_35 = llvmPackages_35.llvm; - llvm_34 = llvmPackages_34.llvm; llvmPackages = recurseIntoAttrs llvmPackages_5; - llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 ({ - isl = isl_0_12; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; - }); - llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({ isl = isl_0_14; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { From 39282575c56afdd9145c0ef982dd7ce05a7d40f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 8 Aug 2018 18:48:21 -0700 Subject: [PATCH 004/369] chromedriver: 2.40 -> 2.41 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chromedriver/versions. --- pkgs/development/tools/selenium/chromedriver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index a2cd55f52b9..eb91026c836 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,7 +6,7 @@ let allSpecs = { "x86_64-linux" = { system = "linux64"; - sha256 = "07b39j1glr53yxbbkkkkx12h8r44fybqkn4fd7s2lr1ysyq5vn1a"; + sha256 = "1iwmdkkxfmmiqzvj2bjh98db6j6zfb8s2m5kq15wmnq0g44gxski"; }; "x86_64-darwin" = { @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.40"; + version = "2.41"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; From 1acbc939c57138f036472b88508b1394b486b86e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 12 Aug 2018 10:51:56 +0000 Subject: [PATCH 005/369] stdenv: linux: inherit texinfo in stage4 instead of the final stdenv This reverts commit a809fdc8e1b0c1d49d40815d9bac0de27ddab5f1 and then achieves the same result (not rebuilding texinfo three times) but without dragging bootstrap tools into the closure. --- pkgs/stdenv/linux/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index ef46bdeb213..bd0be1c9f9d 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -263,7 +263,7 @@ in # because gcc (since JAR support) already depends on zlib, and # then if we already have a zlib we want to use that for the # other purposes (binutils and top-level pkgs) too. - inherit (prevStage) gettext gnum4 bison gmp perl zlib linuxHeaders; + inherit (prevStage) gettext gnum4 bison gmp perl texinfo zlib linuxHeaders; ${localSystem.libc} = getLibc prevStage; binutils = super.binutils.override { # Don't use stdenv's shell but our own @@ -344,7 +344,6 @@ in concatMap (p: [ (getBin p) (getLib p) ]) [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl - texinfo ] # Library dependencies ++ map getLib ( @@ -363,7 +362,7 @@ in inherit (prevStage) gzip bzip2 xz bash coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf - attr acl paxctl zlib pcre texinfo; + attr acl paxctl zlib pcre; ${localSystem.libc} = getLibc prevStage; } // lib.optionalAttrs (super.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. From 27d4088eb489b6137031cc8b693b22f070b3aef1 Mon Sep 17 00:00:00 2001 From: Casey Ransom Date: Thu, 26 Jul 2018 11:38:26 -0400 Subject: [PATCH 006/369] cli53: 0.4.4 -> 0.8.12 This is bigger change than the version would imply as the author has rewritten in Go and no longer supports the Python app. --- pkgs/tools/admin/cli53/default.nix | 34 ++++------- pkgs/tools/admin/cli53/deps.nix | 92 +++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index e70a7ba9b50..6fe568966e9 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -1,30 +1,20 @@ -{ lib, python2, fetchurl }: +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: -python2.pkgs.buildPythonApplication rec { +buildGoPackage rec { name = "cli53-${version}"; - version = "0.4.4"; + version = "0.8.12"; - src = fetchurl { - url = "mirror://pypi/c/cli53/${name}.tar.gz"; - sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig"; + goPackagePath = "github.com/barnybug/cli53"; + + src = fetchFromGitHub { + owner = "barnybug"; + repo = "cli53"; + rev = "2624c7c4b38a33cdbd166dad1d3e512830f453e4"; + sha256 = "0bhczmzrgf7ypnhhzdrgnvg8cw8ch1x1d0cgajc5kklq9ixv9ygi"; }; - postPatch = '' - substituteInPlace setup.py --replace "'argparse', " "" - ''; - - checkPhase = '' - ${python2.interpreter} -m unittest discover -s tests - ''; - - # Tests do not function - doCheck = false; - - propagatedBuildInputs = with python2.pkgs; [ - argparse - boto - dnspython - ]; + goDeps = ./deps.nix; meta = with lib; { description = "CLI tool for the Amazon Route 53 DNS service"; diff --git a/pkgs/tools/admin/cli53/deps.nix b/pkgs/tools/admin/cli53/deps.nix index 0cb0360e499..4742bc00851 100644 --- a/pkgs/tools/admin/cli53/deps.nix +++ b/pkgs/tools/admin/cli53/deps.nix @@ -1,3 +1,93 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev [ + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "3e7014382cdc91695381614d0110a3cff997ba72"; + sha256 = "1xnjhmb31k63k13aiiiispc7vkgnlxkbihslwwfsjc7b86vrllm5"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "20b96f641a5ea98f2f8619ff4f3e061cff4833bd"; + sha256 = "0mp18hlhnazg3sd02fhv88kbbipmhcrkb6n8imq8gk2dvmxk64ch"; + }; + } + { + goPackagePath = "github.com/gucumber/gucumber"; + fetch = { + type = "git"; + url = "https://github.com/gucumber/gucumber"; + rev = "71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc"; + sha256 = "1h1d9j515v1nyqsyb73v4ahlvm9n6z7hgl2ld8dryr4sw8q7ybw3"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b5"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "e4205768578dc90c2669e75a2f8a8bf77e3083a4"; + sha256 = "0247qcc9i41wrm73ivqs2wvy3vi3nb44m3nh27lnhd4a0ilir6wv"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/shiena/ansicolor"; + fetch = { + type = "git"; + url = "https://github.com/shiena/ansicolor"; + rev = "a422bbe96644373c5753384a59d678f7d261ff10"; + sha256 = "1dcn8a9z6a5dxa2m3fkppnajcls8lanbl38qggkf646yi5qsk1hc"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; + sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } ] From a52ad2569ab9183837bf73cb03e643d331dfbbd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 17 Aug 2018 00:19:40 +0900 Subject: [PATCH 007/369] fixup: points mentioned by timokau --- .../tools/global-platform-pro/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index fdbeb82cf20..ccf4632ad6e 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { sha256 = "0rk81x2y7vx1caxm6wa59fjrfxmjn7s8yxaxm764p8m2qxk3m4y2"; }; + # This patch hardcodes the return of a git command the build system tries to + # run. As `fetchFromGitHub` doesn't fetch a full-fledged git repository, + # this command can only fail at build-time. As a consequence, we include the + # `describeVersion` variable defined above here. patches = [ (writeText "${name}-version.patch" '' diff --git a/pom.xml b/pom.xml index 1e5a82d..1aa01fe 100644 @@ -43,12 +47,16 @@ stdenv.mkDerivation rec { inherit src patches; nativeBuildInputs = [ jdk maven ]; buildPhase = '' - while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do + while ! mvn package "-Dmaven.repo.local=$out/.m2" -Dmaven.wagon.rto=5000; do echo "timeout, restart maven to continue downloading" done ''; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; + installPhase = '' + find "$out/.m2" -type f \ + -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' \ + -delete + ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = "15bbi7z9v601all9vr2azh8nk8rpz2vd91yvvw8id6birnbhn3if"; @@ -57,19 +65,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ jdk maven makeWrapper ]; buildPhase = '' - mvn package --offline -Dmaven.repo.local=$( \ - cp -dpR ${deps}/.m2 ./ && \ - chmod +w -R .m2 && \ - pwd \ - )/.m2 + cp -dpR "${deps}/.m2" ./ + chmod -R +w .m2 + mvn package --offline -Dmaven.repo.local="$(pwd)/.m2" ''; installPhase = '' - mkdir -p $out/lib/java $out/share/java - cp -R target/apidocs $out/doc - cp target/gp.jar $out/share/java - makeWrapper ${jre_headless}/bin/java $out/bin/gp \ - --add-flags "-jar $out/share/java/gp.jar" \ + mkdir -p "$out/lib/java" "$out/share/java" + cp -R target/apidocs "$out/doc" + cp target/gp.jar "$out/share/java" + makeWrapper "${jre_headless}/bin/java" "$out/bin/gp" \ + --add-flags "-jar '$out/share/java/gp.jar'" \ --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib" ''; From 39cd3f370d66840bd22d2733a56fe9035e12fd09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 17 Aug 2018 00:25:44 +0900 Subject: [PATCH 008/369] fixup: reindent --- .../tools/global-platform-pro/default.nix | 162 +++++++++--------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index ccf4632ad6e..20c17e77d6e 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -2,94 +2,94 @@ # TODO: This is quite a bit of duplicated logic with gephy. Factor it out? stdenv.mkDerivation rec { - pname = "global-platform-pro"; - version = "0.3.10-rc11"; - describeVersion = "v0.3.10-rc11-0-g8923747"; # git describe --tags --always --long --dirty - name = "${pname}-${version}"; + pname = "global-platform-pro"; + version = "0.3.10-rc11"; + describeVersion = "v0.3.10-rc11-0-g8923747"; # git describe --tags --always --long --dirty + name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "martinpaljak"; - repo = "GlobalPlatformPro"; - rev = "v${version}"; - sha256 = "0rk81x2y7vx1caxm6wa59fjrfxmjn7s8yxaxm764p8m2qxk3m4y2"; - }; + src = fetchFromGitHub { + owner = "martinpaljak"; + repo = "GlobalPlatformPro"; + rev = "v${version}"; + sha256 = "0rk81x2y7vx1caxm6wa59fjrfxmjn7s8yxaxm764p8m2qxk3m4y2"; + }; - # This patch hardcodes the return of a git command the build system tries to - # run. As `fetchFromGitHub` doesn't fetch a full-fledged git repository, - # this command can only fail at build-time. As a consequence, we include the - # `describeVersion` variable defined above here. - patches = [ (writeText "${name}-version.patch" '' - diff --git a/pom.xml b/pom.xml - index 1e5a82d..1aa01fe 100644 - --- a/pom.xml - +++ b/pom.xml - @@ -121,14 +121,10 @@ - - - - - git - + echo - target/generated-resources/pro/javacard/gp/pro_version.txt - - - describe - - --tags - - --always - - --long - - --dirty - + ${describeVersion} - - - - '') ]; - - deps = stdenv.mkDerivation { - name = "${name}-deps"; - inherit src patches; - nativeBuildInputs = [ jdk maven ]; - buildPhase = '' - while ! mvn package "-Dmaven.repo.local=$out/.m2" -Dmaven.wagon.rto=5000; do - echo "timeout, restart maven to continue downloading" - done - ''; - # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = '' - find "$out/.m2" -type f \ - -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' \ - -delete - ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "15bbi7z9v601all9vr2azh8nk8rpz2vd91yvvw8id6birnbhn3if"; - }; - - nativeBuildInputs = [ jdk maven makeWrapper ]; + # This patch hardcodes the return of a git command the build system tries to + # run. As `fetchFromGitHub` doesn't fetch a full-fledged git repository, + # this command can only fail at build-time. As a consequence, we include the + # `describeVersion` variable defined above here. + patches = [ (writeText "${name}-version.patch" '' + diff --git a/pom.xml b/pom.xml + index 1e5a82d..1aa01fe 100644 + --- a/pom.xml + +++ b/pom.xml + @@ -121,14 +121,10 @@ + + + + - git + + echo + target/generated-resources/pro/javacard/gp/pro_version.txt + + - describe + - --tags + - --always + - --long + - --dirty + + ${describeVersion} + + + + '') ]; + deps = stdenv.mkDerivation { + name = "${name}-deps"; + inherit src patches; + nativeBuildInputs = [ jdk maven ]; buildPhase = '' - cp -dpR "${deps}/.m2" ./ - chmod -R +w .m2 - mvn package --offline -Dmaven.repo.local="$(pwd)/.m2" + while ! mvn package "-Dmaven.repo.local=$out/.m2" -Dmaven.wagon.rto=5000; do + echo "timeout, restart maven to continue downloading" + done ''; - + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside installPhase = '' - mkdir -p "$out/lib/java" "$out/share/java" - cp -R target/apidocs "$out/doc" - cp target/gp.jar "$out/share/java" - makeWrapper "${jre_headless}/bin/java" "$out/bin/gp" \ - --add-flags "-jar '$out/share/java/gp.jar'" \ - --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib" + find "$out/.m2" -type f \ + -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' \ + -delete ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "15bbi7z9v601all9vr2azh8nk8rpz2vd91yvvw8id6birnbhn3if"; + }; - meta = with stdenv.lib; { - description = "Command-line utility for managing applets and keys on Java Cards"; - longDescription = '' - This command-line utility can be used to manage applets and keys - on Java Cards. It is made available as the `gp` executable. + nativeBuildInputs = [ jdk maven makeWrapper ]; - The executable requires the PC/SC daemon running for correct execution. - If you run NixOS, it can be enabled with `services.pcscd.enable = true;`. - ''; - homepage = https://github.com/martinpaljak/GlobalPlatformPro; - license = with licenses; [ lgpl3 ]; - platforms = platforms.all; - }; + buildPhase = '' + cp -dpR "${deps}/.m2" ./ + chmod -R +w .m2 + mvn package --offline -Dmaven.repo.local="$(pwd)/.m2" + ''; + + installPhase = '' + mkdir -p "$out/lib/java" "$out/share/java" + cp -R target/apidocs "$out/doc" + cp target/gp.jar "$out/share/java" + makeWrapper "${jre_headless}/bin/java" "$out/bin/gp" \ + --add-flags "-jar '$out/share/java/gp.jar'" \ + --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib" + ''; + + meta = with stdenv.lib; { + description = "Command-line utility for managing applets and keys on Java Cards"; + longDescription = '' + This command-line utility can be used to manage applets and keys + on Java Cards. It is made available as the `gp` executable. + + The executable requires the PC/SC daemon running for correct execution. + If you run NixOS, it can be enabled with `services.pcscd.enable = true;`. + ''; + homepage = https://github.com/martinpaljak/GlobalPlatformPro; + license = with licenses; [ lgpl3 ]; + platforms = platforms.all; + }; } From ff3aeada34f6a3000746e0e4d1ab6a3dd7de59a2 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 16 Aug 2018 17:47:35 +0200 Subject: [PATCH 009/369] pythonPackages.django_2_0: 2.0.7 -> 2.0.8 --- pkgs/development/python-modules/django/2_0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 3c35b74bab6..0bfe43a20e1 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.0.7"; + version = "2.0.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "97886b8a13bbc33bfeba2ff133035d3eca014e2309dff2b6da0bdfc0b8656613"; + sha256 = "12z3b9v0zl7w9bm5sl7dpkk5w35ypalizfmnaj9jac41k8vfmbk8"; }; patches = stdenv.lib.optionals withGdal [ From 08a32ae34fac8a81536c47778d28d7d0e6c92324 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 16 Aug 2018 17:48:30 +0200 Subject: [PATCH 010/369] pythonPakcages.django_2_1: init at 2.1 --- .../development/python-modules/django/2_1.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/django/2_1.nix diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix new file mode 100644 index 00000000000..f63822f363a --- /dev/null +++ b/pkgs/development/python-modules/django/2_1.nix @@ -0,0 +1,43 @@ +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, + isPy3k, + geos, gdal, pytz, + withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + version = "2.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0dv184lgp7scq8cr4422rrvkd8npyiqww0zw50ygcim5smw6093z"; + }; + + patches = stdenv.lib.optionals withGdal [ + (substituteAll { + src = ./1.10-gis-libs.template.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }) + ]; + + # patch only $out/bin to avoid problems with starter templates (see #3134) + postFixup = '' + wrapPythonProgramsIn $out/bin "$out $pythonPath" + ''; + + propagatedBuildInputs = [ pytz ]; + + # too complicated to setup + doCheck = false; + + meta = with stdenv.lib; { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + license = licenses.bsd3; + maintainers = with maintainers; [ georgewhewell ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebbcccd6f3d..5f382901a55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4570,6 +4570,10 @@ in { gdal = self.gdal; }; + django_2_1 = callPackage ../development/python-modules/django/2_1.nix { + gdal = self.gdal; + }; + django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.18"; From 61e0b8d3be4a9dcf930c5625e38f3a2bf85575b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 17 Aug 2018 01:13:46 +0900 Subject: [PATCH 011/369] fixup: use the correct gephy package name --- pkgs/development/tools/global-platform-pro/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 20c17e77d6e..5848f131d73 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, jdk, maven, writeText, makeWrapper, jre_headless, pcsclite }: -# TODO: This is quite a bit of duplicated logic with gephy. Factor it out? +# TODO: This is quite a bit of duplicated logic with gephi. Factor it out? stdenv.mkDerivation rec { pname = "global-platform-pro"; version = "0.3.10-rc11"; From fd14b4d48de0b7ad6b4d5beeaaf6eadb50f68d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 17 Aug 2018 01:27:45 +0900 Subject: [PATCH 012/369] fixup: merge buildPhase and installPhase --- pkgs/development/tools/global-platform-pro/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 5848f131d73..8bdb14c7c65 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -46,13 +46,14 @@ stdenv.mkDerivation rec { name = "${name}-deps"; inherit src patches; nativeBuildInputs = [ jdk maven ]; - buildPhase = '' + installPhase = '' + # Download the dependencies while ! mvn package "-Dmaven.repo.local=$out/.m2" -Dmaven.wagon.rto=5000; do echo "timeout, restart maven to continue downloading" done - ''; - # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = '' + + # And keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files + # with lastModified timestamps inside find "$out/.m2" -type f \ -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' \ -delete From 6195eee47a11fbc73e655e619cc3162af245c25e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 17 Aug 2018 01:32:03 +0900 Subject: [PATCH 013/369] fixup: add links to upstream issues --- pkgs/development/tools/global-platform-pro/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 8bdb14c7c65..7c697bc5e57 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -3,7 +3,7 @@ # TODO: This is quite a bit of duplicated logic with gephi. Factor it out? stdenv.mkDerivation rec { pname = "global-platform-pro"; - version = "0.3.10-rc11"; + version = "0.3.10-rc11"; # Waiting for release https://github.com/martinpaljak/GlobalPlatformPro/issues/128 describeVersion = "v0.3.10-rc11-0-g8923747"; # git describe --tags --always --long --dirty name = "${pname}-${version}"; @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { # run. As `fetchFromGitHub` doesn't fetch a full-fledged git repository, # this command can only fail at build-time. As a consequence, we include the # `describeVersion` variable defined above here. + # + # See upstream issue https://github.com/martinpaljak/GlobalPlatformPro/issues/129 patches = [ (writeText "${name}-version.patch" '' diff --git a/pom.xml b/pom.xml index 1e5a82d..1aa01fe 100644 From faf30029ce77473440bf40428081f3c04967272f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 13:16:34 -0700 Subject: [PATCH 014/369] seafile-client: 6.2.3 -> 6.2.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/seafile-client/versions. --- pkgs/applications/networking/seafile-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index d28e241e746..06c84759a59 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -5,14 +5,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.2.3"; + version = "6.2.4"; name = "seafile-client-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "1wdpz7vxhn9mcc7kxhrz9c5dwd492akirz351wfi4xxy5np6p6kp"; + sha256 = "0z5li1d7ipsm1mp0lk6mls220v4vlmsqm8ym8kxlkinqbmkky0hz"; }; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; From d8b202698ce48e43dbe3f7fb9d704136615d1254 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 17 Aug 2018 01:34:39 +0200 Subject: [PATCH 015/369] mypy-protobuf: init at 1.6 --- .../python-modules/mypy-protobuf/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/mypy-protobuf/default.nix diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix new file mode 100644 index 00000000000..37e1b88a248 --- /dev/null +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonApplication, protobuf }: + +buildPythonApplication rec { + pname = "mypy-protobuf"; + version = "1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bmpd82qm7rjnzc4i275lm18mmz8anhrjhwq2ci179l64hrfr0nb"; + }; + + propagatedBuildInputs = [ protobuf ]; + + meta = with stdenv.lib; { + description = "Generate mypy stub files from protobuf specs"; + homepage = "https://github.com/dropbox/mypy-protobuf"; + license = licenses.asl20; + maintainers = with maintainers; [ lnl7 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebbcccd6f3d..1b1d2539115 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7866,6 +7866,8 @@ in { mypy = callPackage ../development/python-modules/mypy { }; + mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; + mwclient = buildPythonPackage rec { version = "0.8.3"; pname = "mwclient"; From 8bef91d84a51d7cc7c2774dd4b2fea840f95a91f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 17 Aug 2018 01:35:17 +0200 Subject: [PATCH 016/369] protobuf: fix missing google.protobuf.compiler --- pkgs/development/python-modules/protobuf/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 1a345b19ef9..9059080c919 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -28,7 +28,10 @@ buildPythonPackage rec { export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2 ''; - preBuild = optionalString (versionAtLeast protobuf.version "2.6.0") '' + preBuild = '' + # Workaround for https://github.com/google/protobuf/issues/2895 + ${python}/bin/${python.executable} setup.py build + '' + optionalString (versionAtLeast protobuf.version "2.6.0") '' ${python}/bin/${python.executable} setup.py build_ext --cpp_implementation ''; From f82f933437ca4365436ab05619c5d4a24589ad61 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 20:36:01 -0700 Subject: [PATCH 017/369] nsd: 4.1.23 -> 4.1.24 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nsd/versions. --- pkgs/servers/dns/nsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index f63a61bf219..ee09024dc0e 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.23"; + name = "nsd-4.1.24"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1zc59cj1851scwhwy3k6aals3fk13njyhda37k4a353bcyyxh3pn"; + sha256 = "04ck8ia6xq1xqdk2g922262xywzd070pl4iad7c0lqclwk48gdjg"; }; prePatch = '' From 841d3a5da3a55f37e6a6b803b3515979bf63ceb8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 17 Aug 2018 04:35:22 -0700 Subject: [PATCH 018/369] couchdb2: 2.1.2 -> 2.2.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/couchdb/versions. --- pkgs/servers/http/couchdb/2.0.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index 80caa377991..6e52bdc3270 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "couchdb-${version}"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; - sha256 = "1c1ghrmrcyjd3s3pzml6akxf8xxcqy4mfzn5xf8jg158dzarmk53"; + sha256 = "11brqv302j999sd5x8amhj9iqns9cbrlkjg2l9a8xbvkmf5fng0f"; }; nativeBuildInputs = [ makeWrapper ]; From 6573f3a60bc2c2a9675773ca0e76b41bf8cd4011 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 17 Aug 2018 05:45:10 -0700 Subject: [PATCH 019/369] checkstyle: 8.11 -> 8.12 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/checkstyle/versions. --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 34b9e53f6e4..b5e7328091e 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "8.11"; + version = "8.12"; name = "checkstyle-${version}"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "13x4m4rn7rix64baclcm2jqbizkj38njif2ba0ycmvyjm62smfwv"; + sha256 = "000048flqhkwnjn37bh07wgn6q4m12s3h3p9piqgvxswrjc95x3y"; }; phases = [ "installPhase" ]; From 6635879ff1c22ad055265e93e4721c75c7bb263a Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 17 Aug 2018 12:51:07 +0000 Subject: [PATCH 020/369] perl: remove duplicated code --- pkgs/development/interpreters/perl/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 40a70623dcb..b6e8e9abce7 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -97,12 +97,6 @@ let sed -i 's,\(libswanted.*\)pthread,\1,g' Configure ''; - preBuild = optionalString (!(stdenv ? cc && stdenv.cc.nativeTools)) - '' - # Make Cwd work on NixOS (where we don't have a /bin/pwd). - substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" - ''; - setupHook = ./setup-hook.sh; passthru.libPrefix = "lib/perl5/site_perl"; From 73f1448a1ff02de9766605f0ec4914d71f215bd8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 17 Aug 2018 06:50:10 -0700 Subject: [PATCH 021/369] bowtie2: 2.3.4.1 -> 2.3.4.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bowtie2/versions. --- pkgs/applications/science/biology/bowtie2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 829672d64cc..deccd8a54ee 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.3.4.1"; + version = "2.3.4.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "07cvcy6483araayj41arjzpxjmf4fmn4iqyl6gp6zmrbzw72wwzj"; + sha256 = "1gsfaf7rjg4nwhs7vc1vf63xd5r5v1yq58w7x3barycplzbvixzz"; }; buildInputs = [ zlib tbb ]; From 73ac45108a2dcd4e133e0abbede1dbf154c3f14b Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Sat, 18 Aug 2018 19:18:32 +0100 Subject: [PATCH 022/369] qtcreator: enable on aarch64 and armv7 Patch (from https://bugreports.qt.io/browse/QTCREATORBUG-8107) to allow botan to build on arm. --- ...ator-to-build-on-arm-aarch32-and-aar.patch | 94 +++++++++++++++++++ pkgs/development/tools/qtcreator/default.nix | 4 +- 2 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch diff --git a/pkgs/development/tools/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch b/pkgs/development/tools/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch new file mode 100644 index 00000000000..84e26871291 --- /dev/null +++ b/pkgs/development/tools/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch @@ -0,0 +1,94 @@ +From c6d02dba2911d93e2379cfb5e550b93558dd51bf Mon Sep 17 00:00:00 2001 +From: Greg Nietsky +Date: Tue, 4 Mar 2014 11:33:40 +0200 +Subject: [PATCH] Fix: Allow qt-creator to build on arm aarch32 and aarch64 + +Botan is imported hardwired for x86 this small patch allows it +too operate on arm other platforms could be added. + +Task-number: QTCREATORBUG-8107 +Change-Id: Iddea28f21c9fa1afd2fdd5d16a44e6c96a516a7a +--- + src/libs/3rdparty/botan/botan.cpp | 16 +++++++++++++++- + src/libs/3rdparty/botan/botan.h | 2 ++ + 2 files changed, 17 insertions(+), 1 deletion(-) + +diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp +index 917c385..4364a2e 100644 +--- a/src/libs/3rdparty/botan/botan.cpp ++++ b/src/libs/3rdparty/botan/botan.cpp +@@ -1101,6 +1101,8 @@ class Montgomery_Exponentiator : public Modular_Exponentiator + + #if (BOTAN_MP_WORD_BITS != 32) + #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32 ++#elif !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) ++typedef Botan::u64bit dword; + #endif + + #ifdef Q_OS_UNIX +@@ -1118,6 +1120,7 @@ extern "C" { + */ + inline word word_madd2(word a, word b, word* c) + { ++#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) + asm( + ASM("mull %[b]") + ASM("addl %[c],%[a]") +@@ -1127,6 +1130,11 @@ inline word word_madd2(word a, word b, word* c) + : "0"(a), "1"(b), [c]"g"(*c) : "cc"); + + return a; ++#else ++ dword z = (dword)a * b + *c; ++ *c = (word)(z >> BOTAN_MP_WORD_BITS); ++ return (word)z; ++#endif + } + + /* +@@ -1134,6 +1142,7 @@ inline word word_madd2(word a, word b, word* c) + */ + inline word word_madd3(word a, word b, word c, word* d) + { ++#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) + asm( + ASM("mull %[b]") + +@@ -1147,6 +1156,11 @@ inline word word_madd3(word a, word b, word c, word* d) + : "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc"); + + return a; ++#else ++ dword z = (dword)a * b + c + *d; ++ *d = (word)(z >> BOTAN_MP_WORD_BITS); ++ return (word)z; ++#endif + } + + } +@@ -2315,7 +2329,7 @@ namespace Botan { + + extern "C" { + +-#ifdef Q_OS_UNIX ++#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) + /* + * Helper Macros for x86 Assembly + */ +diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h +index 6a9cbe0..3bfdbc2 100644 +--- a/src/libs/3rdparty/botan/botan.h ++++ b/src/libs/3rdparty/botan/botan.h +@@ -81,7 +81,9 @@ + #endif + + #define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN ++#if !defined(__arm__) && !defined(__aarch64__) + #define BOTAN_TARGET_CPU_IS_X86_FAMILY ++#endif + #define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1 + + #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \ +-- +2.3.0 + diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 38d385d1d55..24191e3a129 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake makeWrapper ]; + patches = optional (stdenv.isAarch64 || stdenv.isAarch32) ./0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch; + doCheck = true; enableParallelBuilding = true; @@ -55,6 +57,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.qt.io/Category:Tools::QtCreator; license = "LGPL"; maintainers = [ maintainers.akaWolf ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; }; } From 8af2786ef6381f289a071a77cfc3aec64c6d58ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 19 Aug 2018 09:42:39 +0200 Subject: [PATCH 023/369] qtcreator: (nitpick) better cross-compilation correctness --- pkgs/development/tools/qtcreator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 24191e3a129..f427c1bf795 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake makeWrapper ]; - patches = optional (stdenv.isAarch64 || stdenv.isAarch32) ./0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch; + patches = optional stdenv.hostPlatform.isArm ./0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch; doCheck = true; From 5984ed283fa47860d43dcca65c4cea57ffa63d42 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 19 Aug 2018 08:09:38 -0400 Subject: [PATCH 024/369] started working on bringing the redmine package back to life using gitlab as an example --- nixos/modules/services/misc/redmine.nix | 97 ++-- .../redmine/2002_FHS_through_env_vars.patch | 100 ---- .../2003_externalize_session_config.patch | 72 --- .../redmine/2004_FHS_plugins_assets.patch | 11 - .../version-management/redmine/Gemfile | 116 +++++ .../version-management/redmine/Gemfile.lock | 278 ++++++----- .../version-management/redmine/Gemfile.nix | 332 ------------ .../version-management/redmine/README | 6 - .../version-management/redmine/bootstrap.nix | 47 -- .../version-management/redmine/default.nix | 97 ++-- .../version-management/redmine/gemset.nix | 472 ++++++++++++++++++ .../redmine/generate_nix_requirements.rb | 56 --- 12 files changed, 797 insertions(+), 887 deletions(-) delete mode 100644 pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch delete mode 100644 pkgs/applications/version-management/redmine/2003_externalize_session_config.patch delete mode 100644 pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch create mode 100644 pkgs/applications/version-management/redmine/Gemfile delete mode 100644 pkgs/applications/version-management/redmine/Gemfile.nix delete mode 100644 pkgs/applications/version-management/redmine/README delete mode 100644 pkgs/applications/version-management/redmine/bootstrap.nix create mode 100644 pkgs/applications/version-management/redmine/gemset.nix delete mode 100644 pkgs/applications/version-management/redmine/generate_nix_requirements.rb diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 9a9424449f8..81addca9e31 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -1,17 +1,13 @@ { config, lib, pkgs, ... }: -# TODO: support non-postgresql - with lib; let cfg = config.services.redmine; - ruby = pkgs.ruby; - databaseYml = '' production: - adapter: postgresql + adapter: mysql2 # postgresql database: ${cfg.databaseName} host: ${cfg.databaseHost} password: ${cfg.databasePassword} @@ -34,24 +30,11 @@ let # The default is to log in the 'log' directory of your Redmine instance. # Example: # scm_stderr_log_file: /var/log/redmine_scm_stderr.log - scm_stderr_log_file: ${cfg.stateDir}/redmine_scm_stderr.log + scm_stderr_log_file: ${cfg.stateDir}/log/redmine_scm_stderr.log ${cfg.extraConfig} ''; - unpackTheme = unpack "theme"; - unpackPlugin = unpack "plugin"; - unpack = id: (name: source: - pkgs.stdenv.mkDerivation { - name = "redmine-${id}-${name}"; - buildInputs = [ pkgs.unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unpackFile ${source} - ''; - }); - in { options = { @@ -66,7 +49,7 @@ in { stateDir = mkOption { type = types.str; - default = "/var/redmine"; + default = "/var/lib/redmine"; description = "The state directory, logs and plugins are stored here"; }; @@ -140,68 +123,52 @@ in { } ]; systemd.services.redmine = { - after = [ "network.target" "postgresql.service" ]; + after = [ "network.target" "mysql.service" ]; # postgresql.service wantedBy = [ "multi-user.target" ]; environment.RAILS_ENV = "production"; - environment.RAILS_ETC = "${cfg.stateDir}/config"; - environment.RAILS_LOG = "${cfg.stateDir}/log"; - environment.RAILS_VAR = "${cfg.stateDir}/var"; environment.RAILS_CACHE = "${cfg.stateDir}/cache"; - environment.RAILS_PLUGINS = "${cfg.stateDir}/plugins"; - environment.RAILS_PUBLIC = "${cfg.stateDir}/public"; - environment.RAILS_TMP = "${cfg.stateDir}/tmp"; environment.SCHEMA = "${cfg.stateDir}/cache/schema.db"; environment.HOME = "${pkgs.redmine}/share/redmine"; environment.REDMINE_LANG = "en"; - environment.GEM_HOME = "${pkgs.redmine}/share/redmine/vendor/bundle/ruby/1.9.1"; - environment.GEM_PATH = "${pkgs.bundler}/${pkgs.bundler.ruby.gemPath}"; path = with pkgs; [ imagemagickBig subversion mercurial cvs - config.services.postgresql.package + # config.services.postgresql.package + libmysql bazaar gitAndTools.git - # once we build binaries for darc enable it - #darcs + darcs ]; preStart = '' - # TODO: use env vars - for i in plugins public/plugin_assets db files log config cache var/files tmp; do - mkdir -p ${cfg.stateDir}/$i - done + rm -rf ${cfg.stateDir}/config + + mkdir -p ${cfg.stateDir}/cache + mkdir -p ${cfg.stateDir}/config + mkdir -p ${cfg.stateDir}/files + mkdir -p ${cfg.stateDir}/log + mkdir -p ${cfg.stateDir}/plugins + mkdir -p ${cfg.stateDir}/tmp + + mkdir -p /run/redmine + ln -fs ${cfg.stateDir}/files /run/redmine/files + ln -fs ${cfg.stateDir}/log /run/redmine/log + ln -fs ${cfg.stateDir}/plugins /run/redmine/plugins + ln -fs ${cfg.stateDir}/tmp /run/redmine/tmp + + cp -r ${pkgs.redmine}/share/redmine/config.dist/* ${cfg.stateDir}/config/ + ln -fs ${cfg.stateDir}/config /run/redmine/config + + ln -fs ${pkgs.writeText "configuration.yml" configurationYml} ${cfg.stateDir}/config/configuration.yml + ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.stateDir}/config/database.yml chown -R redmine:redmine ${cfg.stateDir} - chmod -R 755 ${cfg.stateDir} + chmod -R ug+rwX,o-rwx+x ${cfg.stateDir}/ - rm -rf ${cfg.stateDir}/public/* - cp -R ${pkgs.redmine}/share/redmine/public/* ${cfg.stateDir}/public/ - for theme in ${concatStringsSep " " (mapAttrsToList unpackTheme cfg.themes)}; do - ln -fs $theme/* ${cfg.stateDir}/public/themes/ - done - - rm -rf ${cfg.stateDir}/plugins/* - for plugin in ${concatStringsSep " " (mapAttrsToList unpackPlugin cfg.plugins)}; do - ln -fs $plugin/* ${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-} - done - - ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.stateDir}/config/database.yml - ln -fs ${pkgs.writeText "configuration.yml" configurationYml} ${cfg.stateDir}/config/configuration.yml - - if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then - if ! test -e "${cfg.stateDir}/db-created"; then - psql postgres -c "CREATE ROLE redmine WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.databasePassword}'" - ${config.services.postgresql.package}/bin/createdb --owner redmine redmine || true - touch "${cfg.stateDir}/db-created" - fi - fi - - cd ${pkgs.redmine}/share/redmine/ - ${ruby}/bin/rake db:migrate - ${ruby}/bin/rake redmine:plugins:migrate - ${ruby}/bin/rake redmine:load_default_data - ${ruby}/bin/rake generate_secret_token + ${pkgs.redmine}/share/redmine/bin/bundle exec rake generate_secret_token + ${pkgs.redmine}/share/redmine/bin/bundle exec rake db:migrate + ${pkgs.redmine}/share/redmine/bin/bundle exec rake redmine:load_default_data ''; serviceConfig = { @@ -211,7 +178,7 @@ in { Group = "redmine"; TimeoutSec = "300"; WorkingDirectory = "${pkgs.redmine}/share/redmine"; - ExecStart="${ruby}/bin/ruby ${pkgs.redmine}/share/redmine/script/rails server webrick -e production -P ${cfg.stateDir}/redmine.pid"; + ExecStart="${pkgs.redmine}/share/redmine/bin/bundle exec rails server webrick -e production -P ${cfg.stateDir}/redmine.pid --binding=0.0.0.0"; }; }; diff --git a/pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch b/pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch deleted file mode 100644 index 889b8c930e7..00000000000 --- a/pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch +++ /dev/null @@ -1,100 +0,0 @@ -Description: FHS through env vars -Forwarded: not-needed -Author: Jérémy Lal -Last-Update: 2013-09-28 ---- redmine.orig/app/models/attachment.rb -+++ redmine/app/models/attachment.rb -@@ -46,10 +46,10 @@ class Attachment < ActiveRecord::Base - "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"} - - cattr_accessor :storage_path -- @@storage_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files") -+ @@storage_path = Redmine::Configuration['attachments_storage_path'] || ENV['RAILS_VAR'] ? File.join(ENV['RAILS_VAR'], "files") : File.join(Rails.root, "files") - - cattr_accessor :thumbnails_storage_path -- @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails") -+ @@thumbnails_storage_path = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], "thumbnails") : File.join(Rails.root, "tmp", "thumbnails") - - before_save :files_to_final_location - after_destroy :delete_from_disk ---- redmine.orig/lib/redmine/configuration.rb -+++ redmine/lib/redmine/configuration.rb -@@ -32,7 +32,7 @@ module Redmine - # * :file: the configuration file to load (default: config/configuration.yml) - # * :env: the environment to load the configuration for (default: Rails.env) - def load(options={}) -- filename = options[:file] || File.join(Rails.root, 'config', 'configuration.yml') -+ filename = options[:file] || ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'configuration.yml') : File.join(Rails.root, 'config', 'configuration.yml') - env = options[:env] || Rails.env - - @config = @defaults.dup -@@ -103,7 +103,7 @@ module Redmine - end - - def load_deprecated_email_configuration(env) -- deprecated_email_conf = File.join(Rails.root, 'config', 'email.yml') -+ deprecated_email_conf = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'email.yml') : File.join(Rails.root, 'config', 'email.yml') - if File.file?(deprecated_email_conf) - warn "Storing outgoing emails configuration in config/email.yml is deprecated. You should now store it in config/configuration.yml using the email_delivery setting." - @config.merge!({'email_delivery' => load_from_yaml(deprecated_email_conf, env)}) ---- redmine.orig/lib/redmine/export/pdf.rb -+++ redmine/lib/redmine/export/pdf.rb -@@ -38,7 +38,7 @@ module Redmine - attr_accessor :footer_date - - def initialize(lang, orientation='P') -- @@k_path_cache = Rails.root.join('tmp', 'pdf') -+ @@k_path_cache = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'pdf') : Rails.root.join('tmp', 'pdf') - FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache) - set_language_if_valid lang - pdf_encoding = l(:general_pdf_encoding).upcase ---- redmine.orig/config/application.rb -+++ redmine/config/application.rb -@@ -52,8 +63,21 @@ module RedmineApp - # Do not include all helpers - config.action_controller.include_all_helpers = false - -+ # move tmp directory to RAILS_TMP -+ config.paths['tmp'] = ENV['RAILS_TMP'] -+ - config.session_store :cookie_store, :key => '_redmine_session' - -+ # log path -+ config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{Rails.env}.log") unless !ENV['RAILS_LOG'] -+ -+ config.paths['public'] = ENV['RAILS_PUBLIC'] unless !ENV['RAILS_PUBLIC'] -+ -+ config.cache_store = :file_store, File.join(ENV['RAILS_TMP'], "cache") -+ -+ # Set Active Record's database.yml path -+ config.paths['config/database'] = File.join(ENV['RAILS_ETC'], 'database.yml') unless !ENV['RAILS_ETC'] -+ - if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb')) - instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb')) - end ---- redmine.orig/lib/plugins/rfpdf/lib/tcpdf.rb -+++ redmine/lib/plugins/rfpdf/lib/tcpdf.rb -@@ -89,10 +89,10 @@ class TCPDF - @@k_small_ratio = 2/3.0 - - cattr_accessor :k_path_cache -- @@k_path_cache = Rails.root.join('tmp') -+ @@k_path_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp') - - cattr_accessor :k_path_url_cache -- @@k_path_url_cache = Rails.root.join('tmp') -+ @@k_path_url_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp') - - attr_accessor :barcode - ---- redmine.orig/lib/redmine/scm/adapters/abstract_adapter.rb -+++ redmine/lib/redmine/scm/adapters/abstract_adapter.rb -@@ -222,7 +222,7 @@ module Redmine - if @stderr_log_file.nil? - writable = false - path = Redmine::Configuration['scm_stderr_log_file'].presence -- path ||= Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s -+ path ||= ENV['RAILS_LOG'] ? File.join(ENV['RAILS_LOG'], "#{Rails.env}.scm.stderr.log").to_s : Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s - if File.exists?(path) - if File.file?(path) && File.writable?(path) - writable = true diff --git a/pkgs/applications/version-management/redmine/2003_externalize_session_config.patch b/pkgs/applications/version-management/redmine/2003_externalize_session_config.patch deleted file mode 100644 index 39af8e02e55..00000000000 --- a/pkgs/applications/version-management/redmine/2003_externalize_session_config.patch +++ /dev/null @@ -1,72 +0,0 @@ -Description: Externalize session config to yml in /etc -Forwarded: not-needed -Author: Jérémy Lal -Last-Update: 2010-01-10 ---- redmine.orig/lib/tasks/initializers.rake -+++ redmine/lib/tasks/initializers.rake -@@ -1,11 +1,12 @@ - desc 'Generates a secret token for the application.' -+task :generate_secret_token do - --file 'config/initializers/secret_token.rb' do -- path = File.join(Rails.root, 'config', 'initializers', 'secret_token.rb') -- secret = SecureRandom.hex(40) -- File.open(path, 'w') do |f| -- f.write <<"EOF" --# This file was generated by 'rake generate_secret_token', and should -+filename = ENV['YML_SESSION_FILENAME'] ? ENV['YML_SESSION_FILENAME'] : 'session.yml' -+path = File.join(ENV['RAILS_ETC'] ? ENV['RAILS_ETC'] : File.join(Rails.root, 'config'), filename) -+secret = SecureRandom.hex(40) -+File.open(path, 'w') do |f| -+ f.write <<"EOF" -+# This file was generated by 'rake generate_session_store', - # not be made visible to public. - # If you have a load-balancing Redmine cluster, you will need to use the - # same version of this file on each machine. And be sure to restart your -@@ -15,10 +18,18 @@ file 'config/initializers/secret_token.r - # change this key, all old sessions will become invalid! Make sure the - # secret is at least 30 characters and all random, no regular words or - # you'll be exposed to dictionary attacks. --RedmineApp::Application.config.secret_token = '#{secret}' -+ -+production: -+ key: _redmine_ -+ secret: #{secret} -+ -+development: -+ key: _redmine_ -+ secret: #{secret} -+ -+test: -+ key: _redmine_ -+ secret: #{secret} - EOF - end - end -- --desc 'Generates a secret token for the application.' --task :generate_secret_token => ['config/initializers/secret_token.rb'] ---- redmine.orig/config/application.rb -+++ redmine/config/application.rb -@@ -66,7 +66,20 @@ module RedmineApp - # move tmp directory to RAILS_TMP - config.paths['tmp'] = ENV['RAILS_TMP'] - -- config.session_store :cookie_store, :key => '_redmine_session' -+ # loads cookie based session session and secret keys -+ # this is needed here because initializers are loaded after plugins, -+ # and some plugins initialize ActionController which requires a secret to be set. -+ # crash if file not found -+ relativeUrlRoot = ENV['RAILS_RELATIVE_URL_ROOT'] -+ filename = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'session.yml') : File.join(File.dirname(__FILE__), '..', 'session.yml') -+ if File.exists?(filename) -+ sessionconfig = YAML::load_file(filename) -+ config.session_store :cookie_store, :key => sessionconfig[Rails.env]['key'], :path => (relativeUrlRoot.blank?) ? '/' : relativeUrlRoot -+ config.secret_token = sessionconfig[Rails.env]['secret'] -+ else -+ # temporary settings before session.yml is created -+ config.session_store :cookie_store, :key => '_redmine_session', :path => (relativeUrlRoot.blank?) ? '/' : relativeUrlRoot -+ end - - # log path - config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{Rails.env}.log") unless !ENV['RAILS_LOG'] diff --git a/pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch b/pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch deleted file mode 100644 index d9a6844a6a3..00000000000 --- a/pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- redmine.orig/lib/redmine/plugin.rb -+++ redmine/lib/redmine/plugin.rb -@@ -47,7 +47,7 @@ module Redmine #:nodoc: - self.directory = File.join(Rails.root, 'plugins') - - cattr_accessor :public_directory -- self.public_directory = File.join(Rails.root, 'public', 'plugin_assets') -+ self.public_directory = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'plugin_assets') : File.join(Rails.root, 'public', 'plugin_assets') - - @registered_plugins = {} - class << self diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile new file mode 100644 index 00000000000..2ff32549942 --- /dev/null +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -0,0 +1,116 @@ +source 'https://rubygems.org' + +if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0') + abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'." +end + +gem "rails", "4.2.8" +gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" +if RUBY_VERSION < "2.1" + gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5") +end +gem "jquery-rails", "~> 3.1.4" +gem "coderay", "~> 1.1.1" +gem "request_store", "1.0.5" +gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99") +gem "protected_attributes" +gem "actionpack-xml_parser" +gem "roadie-rails", "~> 1.1.1" +gem "roadie", "~> 3.2.1" +gem "mimemagic" +gem "mail", "~> 2.6.4" + +gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8") +gem "i18n", "~> 0.7.0" +gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" + +# Request at least rails-html-sanitizer 1.0.3 because of security advisories +gem "rails-html-sanitizer", ">= 1.0.3" + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] +gem "rbpdf", "~> 1.19.3" + +# Optional gem for LDAP authentication +group :ldap do + gem "net-ldap", "~> 0.12.0" +end + +# Optional gem for OpenID authentication +group :openid do + gem "ruby-openid", "~> 2.3.0", :require => "openid" + gem "rack-openid" +end + +platforms :mri, :mingw, :x64_mingw do + # Optional gem for exporting the gantt to a PNG file, not supported with jruby + group :rmagick do + gem "rmagick", ">= 2.14.0" + end + + # Optional Markdown support, not for JRuby + group :markdown do + gem "redcarpet", "~> 3.4.0" + end +end + +# Include database gems for the adapters found in the database +# configuration file +require 'erb' +require 'yaml' +gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw] +gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] +database_file = File.join(File.dirname(__FILE__), "config/database.yml") +if File.exist?(database_file) + database_config = YAML::load(ERB.new(IO.read(database_file)).result) + adapters = database_config.values.map {|c| c['adapter']}.compact.uniq + if adapters.any? + adapters.each do |adapter| + case adapter + when 'mysql2' + gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw] + when /postgresql/ + gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] + when /sqlite3/ + gem "sqlite3", (RUBY_VERSION < "2.0" && RUBY_PLATFORM =~ /mingw/ ? "1.3.12" : "~>1.3.12"), + :platforms => [:mri, :mingw, :x64_mingw] + when /sqlserver/ + gem "tiny_tds", (RUBY_VERSION >= "2.0" ? "~> 1.0.5" : "~> 0.7.0"), :platforms => [:mri, :mingw, :x64_mingw] + gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw] + else + warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems") + end + end + else + warn("No adapter found in config/database.yml, please configure it first") + end +else + warn("Please configure your config/database.yml first") +end + +#group :development do +# gem "rdoc", "~> 4.3" +# gem "yard" +#end + +#group :test do +# gem "minitest" +# gem "rails-dom-testing" +# gem "mocha" +# gem "simplecov", "~> 0.9.1", :require => false +# # TODO: remove this after upgrading to Rails 5 +# gem "test_after_commit", "~> 0.4.2" +# # For running UI tests +# gem "capybara" +# gem "selenium-webdriver", "~> 2.53.4" +#end + +local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") +if File.exists?(local_gemfile) + eval_gemfile local_gemfile +end + +# Load plugins' Gemfiles +Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| + eval_gemfile file +end diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index c660e73f4a0..589537c2af7 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,152 +1,162 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.19) - actionpack (= 3.2.19) - mail (~> 2.5.4) - actionpack (3.2.19) - activemodel (= 3.2.19) - activesupport (= 3.2.19) - builder (~> 3.0.0) + actionmailer (4.2.8) + actionpack (= 4.2.8) + actionview (= 4.2.8) + activejob (= 4.2.8) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.8) + actionview (= 4.2.8) + activesupport (= 4.2.8) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionpack-xml_parser (1.0.2) + actionpack (>= 4.0.0, < 5) + actionview (4.2.8) + activesupport (= 4.2.8) + builder (~> 3.1) erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) - activemodel (3.2.19) - activesupport (= 3.2.19) - builder (~> 3.0.0) - activerecord (3.2.19) - activemodel (= 3.2.19) - activesupport (= 3.2.19) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.19) - activemodel (= 3.2.19) - activesupport (= 3.2.19) - activesupport (3.2.19) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) - arel (3.0.3) - awesome_nested_set (2.1.6) - activerecord (>= 3.0.0) - builder (3.0.0) - capybara (2.1.0) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - childprocess (0.5.5) - ffi (~> 1.0, >= 1.0.11) - coderay (1.1.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.8) + activesupport (= 4.2.8) + globalid (>= 0.3.0) + activemodel (4.2.8) + activesupport (= 4.2.8) + builder (~> 3.1) + activerecord (4.2.8) + activemodel (= 4.2.8) + activesupport (= 4.2.8) + arel (~> 6.0) + activesupport (4.2.8) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + arel (6.0.4) + builder (3.2.3) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + css_parser (1.6.0) + addressable erubis (2.7.0) - fastercsv (1.5.5) - ffi (1.9.5) - hike (1.2.3) - i18n (0.6.11) - journey (1.0.4) - jquery-rails (2.0.3) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) - json (1.8.3) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - metaclass (0.0.4) - mime-types (1.25.1) - mini_portile (0.6.0) - mocha (1.0.0) - metaclass (~> 0.0.1) - multi_json (1.10.1) - net-ldap (0.3.1) - nokogiri (1.6.3.1) - mini_portile (= 0.6.0) - pg (0.17.1) - polyglot (0.3.5) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) + globalid (0.4.1) + activesupport (>= 4.2.0) + htmlentities (4.3.4) + i18n (0.7.0) + jquery-rails (3.1.5) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.6.6) + mime-types (>= 1.16, < 4) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2018.0812) + mimemagic (0.3.2) + mini_portile2 (2.3.0) + minitest (5.11.3) + mysql2 (0.4.10) + net-ldap (0.12.1) + nokogiri (1.8.4) + mini_portile2 (~> 2.3.0) + pg (0.18.4) + protected_attributes (1.1.4) + activemodel (>= 4.0.1, < 5.0) + public_suffix (3.0.3) + rack (1.6.10) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-ssl (1.3.4) - rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.19) - actionmailer (= 3.2.19) - actionpack (= 3.2.19) - activerecord (= 3.2.19) - activeresource (= 3.2.19) - activesupport (= 3.2.19) - bundler (~> 1.0) - railties (= 3.2.19) - railties (3.2.19) - actionpack (= 3.2.19) - activesupport (= 3.2.19) - rack-ssl (~> 1.3.2) + rails (4.2.8) + actionmailer (= 4.2.8) + actionpack (= 4.2.8) + actionview (= 4.2.8) + activejob (= 4.2.8) + activemodel (= 4.2.8) + activerecord (= 4.2.8) + activesupport (= 4.2.8) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.8) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (4.2.8) + actionpack (= 4.2.8) + activesupport (= 4.2.8) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (10.1.1) - rdoc (3.12.2) - json (~> 1.4) - redcarpet (2.3.0) - rmagick (2.13.3) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rbpdf (1.19.5) + htmlentities + rbpdf-font (~> 1.19.0) + rbpdf-font (1.19.1) + redcarpet (3.4.0) + request_store (1.0.5) + rmagick (2.16.0) + roadie (3.2.2) + css_parser (~> 1.4) + nokogiri (~> 1.5) + roadie-rails (1.1.1) + railties (>= 3.0, < 5.1) + roadie (~> 3.1) ruby-openid (2.3.0) - rubyzip (1.1.6) - selenium-webdriver (2.43.0) - childprocess (~> 0.5) - multi_json (~> 1.0) - rubyzip (~> 1.0) - websocket (~> 1.0) - shoulda (3.3.2) - shoulda-context (~> 1.0.1) - shoulda-matchers (~> 1.4.1) - shoulda-context (1.0.2) - shoulda-matchers (1.4.1) - activesupport (>= 3.0.0) - sprockets (2.2.2) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - thor (0.19.1) - tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.41) - websocket (1.2.1) - xpath (2.0.0) - nokogiri (~> 1.3) - yard (0.8.7.4) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) PLATFORMS ruby DEPENDENCIES - activerecord-jdbc-adapter (~> 1.3.2) - activerecord-jdbcpostgresql-adapter - awesome_nested_set (= 2.1.6) - builder (= 3.0.0) - capybara (~> 2.1.0) - coderay (~> 1.1.0) - fastercsv (~> 1.5.0) - jquery-rails (~> 2.0.2) - mime-types - mocha (~> 1.0.0) - net-ldap (~> 0.3.1) - pg (>= 0.11.0) + actionpack-xml_parser + coderay (~> 1.1.1) + i18n (~> 0.7.0) + jquery-rails (~> 3.1.4) + mail (~> 2.6.4) + mime-types (~> 3.0) + mimemagic + mysql2 (~> 0.4.6) + net-ldap (~> 0.12.0) + nokogiri (~> 1.8.1) + pg (~> 0.18.1) + protected_attributes rack-openid - rails (= 3.2.19) - rake (~> 10.1.1) - rdoc (>= 2.4.2) - redcarpet (~> 2.3.0) - rmagick (>= 2.0.0) + rails (= 4.2.8) + rails-html-sanitizer (>= 1.0.3) + rbpdf (~> 1.19.3) + redcarpet (~> 3.4.0) + request_store (= 1.0.5) + rmagick (>= 2.14.0) + roadie (~> 3.2.1) + roadie-rails (~> 1.1.1) ruby-openid (~> 2.3.0) - selenium-webdriver - shoulda (~> 3.3.2) - yard + tzinfo-data + +BUNDLED WITH + 1.16.1 diff --git a/pkgs/applications/version-management/redmine/Gemfile.nix b/pkgs/applications/version-management/redmine/Gemfile.nix deleted file mode 100644 index 77adfba334e..00000000000 --- a/pkgs/applications/version-management/redmine/Gemfile.nix +++ /dev/null @@ -1,332 +0,0 @@ -[ -{ -name = "actionmailer"; -hash = "cd9f0b22f755b0adeae13cf949adaf63fa1c068c72d0a100572c6a11aecd3ba7"; -url = "http://rubygems.org/downloads/actionmailer-3.2.19.gem"; -version = "3.2.19"; -} -{ -name = "actionpack"; -hash = "c58ca2342aff2062f4f478551ce46d81918ac93200bc62d099764d2cd7499fcd"; -url = "http://rubygems.org/downloads/actionpack-3.2.19.gem"; -version = "3.2.19"; -} -{ -name = "activemodel"; -hash = "4ea3abf790eca9ee8228e9e2a465350e258294270a639b63f0e1dfad236fe70e"; -url = "http://rubygems.org/downloads/activemodel-3.2.19.gem"; -version = "3.2.19"; -} -{ -name = "activerecord"; -hash = "052945ad510744aaa3e35a817a6f515a2316e7dd96df6460f75b36067bb60372"; -url = "http://rubygems.org/downloads/activerecord-3.2.19.gem"; -version = "3.2.19"; -} -{ -name = "activeresource"; -hash = "8617d24537ca937cc67aac46aaa29782510d66136605426d0a23a3585a839daf"; -url = "http://rubygems.org/downloads/activeresource-3.2.19.gem"; -version = "3.2.19"; -} -{ -name = "activesupport"; -hash = "2c837a59250da14b12a6b0cfb6774f0afae90aa749fd96ad4347344d8417ad3d"; -url = "http://rubygems.org/downloads/activesupport-3.2.19.gem"; -version = "3.2.19"; -} -{ -name = "arel"; -hash = "c0006e2169deee3b8cc2d258296388822eeb2db59832450b9b7316e1387d0da4"; -url = "http://rubygems.org/downloads/arel-3.0.3.gem"; -version = "3.0.3"; -} -{ -name = "awesome_nested_set"; -hash = "0dcd801aea5048f5ab907b62b4174b6763b191eaa4e1e11bb83f996f01349af8"; -url = "http://rubygems.org/downloads/awesome_nested_set-2.1.6.gem"; -version = "2.1.6"; -} -{ -name = "builder"; -hash = "fbd3e15e5de02245f7d649b3415b2c2875cdc9a14dccde89aa30fc14a314618e"; -url = "http://rubygems.org/downloads/builder-3.0.0.gem"; -version = "3.0.0"; -} -{ -name = "capybara"; -hash = "a9a19f8d6bb2dfcb1f05ea3e1727cb556d1cba0d234d1712b481e8d4f7bbb91e"; -url = "http://rubygems.org/downloads/capybara-2.1.0.gem"; -version = "2.1.0"; -} -{ -name = "childprocess"; -hash = "9b583295a11932d2eeffa1e8f5b8fb2fb0064a2f0111ad98c3b752b94f80bf33"; -url = "http://rubygems.org/downloads/childprocess-0.5.5.gem"; -version = "0.5.5"; -} -{ -name = "coderay"; -hash = "5a943c59e36f7ef9dd2677855735656413af02e3f302431e9c548aabe89f3c15"; -url = "http://rubygems.org/downloads/coderay-1.1.0.gem"; -version = "1.1.0"; -} -{ -name = "erubis"; -hash = "63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba"; -url = "http://rubygems.org/downloads/erubis-2.7.0.gem"; -version = "2.7.0"; -} -{ -name = "fastercsv"; -hash = "d098199e62e4e10eec436a9ea9b8c189dacd5c06f2825f00d1e0f1c29fdbc3b5"; -url = "http://rubygems.org/downloads/fastercsv-1.5.5.gem"; -version = "1.5.5"; -} -{ -name = "ffi"; -hash = "0d2ef90163eef8545689e8dfc27fb1245a2d82e3500d587de1e38290629e662f"; -url = "http://rubygems.org/downloads/ffi-1.9.5.gem"; -version = "1.9.5"; -} -{ -name = "hike"; -hash = "154e2f2593845e5bcd8ed2ba3092600c55c6ad8c630722857de3fdaf334ccc44"; -url = "http://rubygems.org/downloads/hike-1.2.3.gem"; -version = "1.2.3"; -} -{ -name = "i18n"; -hash = "b37dda25b30484f2674a851e24ae098a38564a61c976fa91a34bf8fceaa3923b"; -url = "http://rubygems.org/downloads/i18n-0.6.11.gem"; -version = "0.6.11"; -} -{ -name = "journey"; -hash = "7454b8612530784000fbb17ea2df749a71b70702a0ac8ebef4a1e7f05aecc10f"; -url = "http://rubygems.org/downloads/journey-1.0.4.gem"; -version = "1.0.4"; -} -{ -name = "jquery-rails"; -hash = "cc4eab342fb3b1fcbb2fc1c9a61b09ecd86d795b1f74d607994b0bc6fd5ef444"; -url = "http://rubygems.org/downloads/jquery-rails-2.0.3.gem"; -version = "2.0.3"; -} -{ -name = "json"; -hash = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; -url = "http://rubygems.org/downloads/json-1.8.3.gem"; -version = "1.8.3"; -} -{ -name = "mail"; -hash = "446585c38b062121252688dcc9cc70af1f470822e30db021bb97d185969e257c"; -url = "http://rubygems.org/downloads/mail-2.5.4.gem"; -version = "2.5.4"; -} -{ -name = "metaclass"; -hash = "8569685c902108b1845be4e5794d646f2a8adcb0280d7651b600dab0844fe942"; -url = "http://rubygems.org/downloads/metaclass-0.0.4.gem"; -version = "0.0.4"; -} -{ -name = "mime-types"; -hash = "88ef3c596481678710ffd4018fa40f1999b02d97babea39682ba7d5badd21f56"; -url = "http://rubygems.org/downloads/mime-types-1.25.1.gem"; -version = "1.25.1"; -} -{ -name = "mini_portile"; -hash = "762b3e241362de24b2eb2bb1b98638399b931e9e51bece5f8e2df7611eb16c26"; -url = "http://rubygems.org/downloads/mini_portile-0.6.0.gem"; -version = "0.6.0"; -} -{ -name = "mocha"; -hash = "788fd93c8009a7e0eebd155509953e5987f4681902aad666a294283baa09899a"; -url = "http://rubygems.org/downloads/mocha-1.0.0.gem"; -version = "1.0.0"; -} -{ -name = "multi_json"; -hash = "2c98979877e87df0b338ebf5c86091b390f53d62c11a8232bd51ca007e0b82d2"; -url = "http://rubygems.org/downloads/multi_json-1.10.1.gem"; -version = "1.10.1"; -} -{ -name = "net-ldap"; -hash = "953551665fb0d398740a72a26314c6d34bd70fa35419c96dc58351f17d9a5081"; -url = "http://rubygems.org/downloads/net-ldap-0.3.1.gem"; -version = "0.3.1"; -} -{ -name = "nokogiri"; -hash = "91761a654439406b5bed71adf6092d49829e26332b4c0e7c8a23a2e628442585"; -url = "http://rubygems.org/downloads/nokogiri-1.6.3.1.gem"; -version = "1.6.3.1"; -} -{ -name = "pg"; -hash = "e7933e8f7f184c28e820ed85ddfb3ad8a13933b2b2ab8656aa8f81cb0aa610a6"; -url = "http://rubygems.org/downloads/pg-0.17.1.gem"; -version = "0.17.1"; -} -{ -name = "polyglot"; -hash = "59d66ef5e3c166431c39cb8b7c1d02af419051352f27912f6a43981b3def16af"; -url = "http://rubygems.org/downloads/polyglot-0.3.5.gem"; -version = "0.3.5"; -} -{ -name = "rack"; -hash = "f7bf3faa8e09a2ff26475372de36a724e7470d6bdc33d189a0ec34b49605f308"; -url = "http://rubygems.org/downloads/rack-1.4.5.gem"; -version = "1.4.5"; -} -{ -name = "rack-cache"; -hash = "02bfed05f8b3266db804f2fa445801636ca2c6d211a3137ec796f88af5756e1c"; -url = "http://rubygems.org/downloads/rack-cache-1.2.gem"; -version = "1.2"; -} -{ -name = "rack-openid"; -hash = "8cd2305e738463a7da98791f9ac4df4cf3f6ed27908d982350430694ac2fe869"; -url = "http://rubygems.org/downloads/rack-openid-1.4.2.gem"; -version = "1.4.2"; -} -{ -name = "rack-ssl"; -hash = "d703764fa2a0d44a2163d6add65be89f5dba4477d1959b90d3727682a9c37dcf"; -url = "http://rubygems.org/downloads/rack-ssl-1.3.4.gem"; -version = "1.3.4"; -} -{ -name = "rack-test"; -hash = "7e920b6aac888e4a3846e5997fb1cbf456bdb5846322b58dc31697a54a38b306"; -url = "http://rubygems.org/downloads/rack-test-0.6.2.gem"; -version = "0.6.2"; -} -{ -name = "rails"; -hash = "33b64cf78dfcf3206d961ce03e8fe6d260081da696e60da39d0b2a4a160fe22b"; -url = "http://rubygems.org/downloads/rails-3.2.19.gem"; -version = "3.2.19"; -} -{ -name = "railties"; -hash = "c569009ee5c005190d208ac228087fdc094b10c6f0cf209f1d12c552b447cc10"; -url = "http://rubygems.org/downloads/railties-3.2.19.gem"; -version = "3.2.19"; -} -{ -name = "rake"; -hash = "85e446590871dd3469c80dfe70a0296c20b76a9006af6b728c1f47d0b460412d"; -url = "http://rubygems.org/downloads/rake-10.1.1.gem"; -version = "10.1.1"; -} -{ -name = "rdoc"; -hash = "a8e2b78f7e5ec4cc4716cd863975645f2f2377dc6db267a15e427e5fae2633ed"; -url = "http://rubygems.org/downloads/rdoc-3.12.2.gem"; -version = "3.12.2"; -} -{ -name = "redcarpet"; -hash = "5c9bcc307fba97ff5a25eec74f08365c17e929d2a5c707db32d6fc99ec81f0b9"; -url = "http://rubygems.org/downloads/redcarpet-2.3.0.gem"; -version = "2.3.0"; -} -{ -name = "rmagick"; -hash = "109f3b8be90afdea9abbdd2a79a955cd808b5cad65d937ed12676da22870d3b4"; -url = "http://rubygems.org/downloads/rmagick-2.13.3.gem"; -version = "2.13.3"; -} -{ -name = "ruby-openid"; -hash = "f69ed004e95f7094e23bfd8bc9ebfb1dc88a7b46637252ca2907a1189870ea7b"; -url = "http://rubygems.org/downloads/ruby-openid-2.3.0.gem"; -version = "2.3.0"; -} -{ -name = "rubyzip"; -hash = "a996435ee9698be6a09d3748f4d23ee15aaf45cbfef1749def165af6ea3c0a9e"; -url = "http://rubygems.org/downloads/rubyzip-1.1.6.gem"; -version = "1.1.6"; -} -{ -name = "selenium-webdriver"; -hash = "09fe4374d1541cb45403ad1238c2d88129f3afb985218635af087a06c99a521a"; -url = "http://rubygems.org/downloads/selenium-webdriver-2.43.0.gem"; -version = "2.43.0"; -} -{ -name = "shoulda"; -hash = "52e70b71cbfb7c01dace14e268a62d86c21ddd1e5ec0116c8b1e632d8e04e412"; -url = "http://rubygems.org/downloads/shoulda-3.3.2.gem"; -version = "3.3.2"; -} -{ -name = "shoulda-context"; -hash = "ee5559aa13248c70fdec6868a3c144adf7438c904c59d1a76b04a002e5151de5"; -url = "http://rubygems.org/downloads/shoulda-context-1.0.2.gem"; -version = "1.0.2"; -} -{ -name = "shoulda-matchers"; -hash = "c35693cbfa84213212dffbc2c87487427ef364927340151329a842f0a06086b9"; -url = "http://rubygems.org/downloads/shoulda-matchers-1.4.1.gem"; -version = "1.4.1"; -} -{ -name = "sprockets"; -hash = "fae893b7e86e83c1936f6f2a64db3550510f86eabdd5fa9f0f23fb25d7e0cf96"; -url = "http://rubygems.org/downloads/sprockets-2.2.2.gem"; -version = "2.2.2"; -} -{ -name = "thor"; -hash = "9ff834f031b5550c743bb8a3139317fefdae9cdebd02d60de376658f427fe522"; -url = "http://rubygems.org/downloads/thor-0.19.1.gem"; -version = "0.19.1"; -} -{ -name = "tilt"; -hash = "39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903"; -url = "http://rubygems.org/downloads/tilt-1.4.1.gem"; -version = "1.4.1"; -} -{ -name = "treetop"; -hash = "ffa68f201c0f62c26b0a1d13233d73194400596964696843f87ebb5d812f12ff"; -url = "http://rubygems.org/downloads/treetop-1.4.15.gem"; -version = "1.4.15"; -} -{ -name = "tzinfo"; -hash = "381b22fd1744a35d0a0239f563f505773681e626e6d900063b14cb9b1b68e98c"; -url = "http://rubygems.org/downloads/tzinfo-0.3.41.gem"; -version = "0.3.41"; -} -{ -name = "websocket"; -hash = "e626c8c3e8593735d900265fb1fc3439fd06b394069860177d8f40733b12ae9e"; -url = "http://rubygems.org/downloads/websocket-1.2.1.gem"; -version = "1.2.1"; -} -{ -name = "xpath"; -hash = "9ca4a1cc88d9ab16c591468cce7b5d00ee06a8a76b841f8438970c7a44c86c12"; -url = "http://rubygems.org/downloads/xpath-2.0.0.gem"; -version = "2.0.0"; -} -{ -name = "yard"; -hash = "e65a26f9b9dc6e2aa9b1d1d2e1a45bee3edf540a6a7e6c30fa6aa1df7f7a29b4"; -url = "http://rubygems.org/downloads/yard-0.8.7.4.gem"; -version = "0.8.7.4"; -} -] diff --git a/pkgs/applications/version-management/redmine/README b/pkgs/applications/version-management/redmine/README deleted file mode 100644 index 1cc4772568a..00000000000 --- a/pkgs/applications/version-management/redmine/README +++ /dev/null @@ -1,6 +0,0 @@ -to regenerate Gemfile.nix and Gemfile.lock you need to - - % nix-build bootstrap.nix - % cp result/Gemfile.nix ./ - % cp result/Gemfile.lock ./ - diff --git a/pkgs/applications/version-management/redmine/bootstrap.nix b/pkgs/applications/version-management/redmine/bootstrap.nix deleted file mode 100644 index 53757c37ed8..00000000000 --- a/pkgs/applications/version-management/redmine/bootstrap.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ pkgs ? import {} -}: - -with pkgs; - -let - -in stdenv.mkDerivation rec { - version = "2.5.2"; - name = "redmine-${version}"; - __noChroot = true; - src = fetchurl { - url = "http://www.redmine.org/releases/${name}.tar.gz"; - sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - ruby bundler libiconv libxslt libxml2 - libffi imagemagickBig postgresql which stdenv - ]; - installPhase = '' - unset http_proxy - unset ftp_proxy - - cp -R . $out - cp ${./generate_nix_requirements.rb} $out/generate_nix_requirements.rb - cd $out - - cat > config/database.yml < config/database.yml <> Gemfile - - # make rails server happy - mkdir -p tmp/pids - - # cleanup - rm config/database.yml - ''; - - meta = with stdenv.lib; { - homepage = http://www.redmine.org/; - platforms = platforms.linux; - maintainers = [ maintainers.garbas ]; - license = licenses.gpl2; - # Marked as broken due to needing an update for security issues. - # See: https://github.com/NixOS/nixpkgs/issues/18856 - broken = true; - }; -} + meta = with stdenv.lib; { + homepage = http://www.redmine.org/; + platforms = platforms.linux; + maintainers = [ maintainers.garbas ]; + license = licenses.gpl2; + }; + } diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix new file mode 100644 index 00000000000..7423fcdb9fb --- /dev/null +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -0,0 +1,472 @@ +{ + actionmailer = { + dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pr3cmr0bpgg5d0f6wy1z6r45n14r9yin8jnr4hi3ssf402xpc0q"; + type = "gem"; + }; + version = "4.2.8"; + }; + actionpack = { + dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09fbazl0ja80na2wadfp3fzmdmdy1lsb4wd2yg7anbj0zk0ap7a9"; + type = "gem"; + }; + version = "4.2.8"; + }; + actionpack-xml_parser = { + dependencies = ["actionpack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17am4nd7x6g8x7f8i35rzzv2qrxlkc230rbgzg98af0yf50j8gka"; + type = "gem"; + }; + version = "1.0.2"; + }; + actionview = { + dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mg4a8143q2wjhjq4mngl69jkv249z5jvg0jkdribdv4zkg586rp"; + type = "gem"; + }; + version = "4.2.8"; + }; + activejob = { + dependencies = ["activesupport" "globalid"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kazbpfgzz6cdmwjnlb9m671ps4qgggwv2hy8y9xi4h96djyyfqz"; + type = "gem"; + }; + version = "4.2.8"; + }; + activemodel = { + dependencies = ["activesupport" "builder"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11vhh7zmp92880s5sx8r32v2p0b7xg039mfr92pjynpkz4q901ld"; + type = "gem"; + }; + version = "4.2.8"; + }; + activerecord = { + dependencies = ["activemodel" "activesupport" "arel"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kk4dhn8jfhqfsf1dmb3a183gix6k46xr6cjkxj0rp51w2za1ns0"; + type = "gem"; + }; + version = "4.2.8"; + }; + activesupport = { + dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wibdzd2f5l5rlsw1a1y3j3fhw2imrrbkxggdraa6q9qbdnc66hi"; + type = "gem"; + }; + version = "4.2.8"; + }; + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; + arel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4"; + type = "gem"; + }; + version = "6.0.4"; + }; + builder = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + type = "gem"; + }; + version = "3.2.3"; + }; + coderay = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + type = "gem"; + }; + version = "1.1.2"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + type = "gem"; + }; + version = "1.0.5"; + }; + crass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; + type = "gem"; + }; + version = "1.0.4"; + }; + css_parser = { + dependencies = ["addressable"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61"; + type = "gem"; + }; + version = "1.6.0"; + }; + erubis = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + type = "gem"; + }; + version = "2.7.0"; + }; + globalid = { + dependencies = ["activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38"; + type = "gem"; + }; + version = "0.4.1"; + }; + htmlentities = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + i18n = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; + type = "gem"; + }; + version = "0.7.0"; + }; + jquery-rails = { + dependencies = ["railties" "thor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lk7xqmms45czylxs22kv5khlbm7a0yqcchqijxb9m10zsqc6lp5"; + type = "gem"; + }; + version = "3.1.5"; + }; + loofah = { + dependencies = ["crass" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yjs6wbcj3n06d3xjqpy3qbpx0bfa12h3x2rbpc2k33ldjlkx6zy"; + type = "gem"; + }; + version = "2.2.2"; + }; + mail = { + dependencies = ["mime-types"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9"; + type = "gem"; + }; + version = "2.6.6"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; + type = "gem"; + }; + version = "3.2.2"; + }; + mime-types-data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; + type = "gem"; + }; + version = "3.2018.0812"; + }; + mimemagic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00ibc1mhvdfyfyl103xwb45621nwyqxf124cni5hyfhag0fn1c3q"; + type = "gem"; + }; + version = "0.3.2"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + type = "gem"; + }; + version = "2.3.0"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + type = "gem"; + }; + version = "5.11.3"; + }; + mysql2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq"; + type = "gem"; + }; + version = "0.4.10"; + }; + net-ldap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z1j0zklbbx3vi91zcd2v0fnkfgkvq3plisa6hxaid8sqndyak46"; + type = "gem"; + }; + version = "0.12.1"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc"; + type = "gem"; + }; + version = "1.8.4"; + }; + pg = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; + type = "gem"; + }; + version = "0.18.4"; + }; + protected_attributes = { + dependencies = ["activemodel"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18lvrvmcwjvjr2mrn20vaf68a0q6mg4cy9f0m1i7x83p0ljhhyar"; + type = "gem"; + }; + version = "1.1.4"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + type = "gem"; + }; + version = "3.0.3"; + }; + rack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q"; + type = "gem"; + }; + version = "1.6.10"; + }; + rack-openid = { + dependencies = ["rack" "ruby-openid"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sg85yn981j3a0iri3ch4znzdwscvz29l7vrk3dafqw4fdg31llc"; + type = "gem"; + }; + version = "1.4.2"; + }; + rack-test = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; + type = "gem"; + }; + version = "0.6.3"; + }; + rails = { + dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dpbf3ybzbhqqkwg5vi60121860cr8fybvchrxk5wy3f2jcj0mch"; + type = "gem"; + }; + version = "4.2.8"; + }; + rails-deprecated_sanitizer = { + dependencies = ["activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj"; + type = "gem"; + }; + version = "1.0.3"; + }; + rails-dom-testing = { + dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6"; + type = "gem"; + }; + version = "1.0.9"; + }; + rails-html-sanitizer = { + dependencies = ["loofah"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; + type = "gem"; + }; + version = "1.0.4"; + }; + railties = { + dependencies = ["actionpack" "activesupport" "rake" "thor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bavl4hj7bnl3ryqi9rvykm410kflplgingkcxasfv1gdilddh4g"; + type = "gem"; + }; + version = "4.2.8"; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg"; + type = "gem"; + }; + version = "12.3.1"; + }; + rbpdf = { + dependencies = ["htmlentities" "rbpdf-font"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "021fda3gcz9pyydxnn40vs1nrkycwslb9ip4q0yg3hlip41k1b49"; + type = "gem"; + }; + version = "1.19.5"; + }; + rbpdf-font = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pxlr0l4vf785qpy55m439dyii63a26l0sd0yyhbwwcy9zm9hd1v"; + type = "gem"; + }; + version = "1.19.1"; + }; + redcarpet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + type = "gem"; + }; + version = "3.4.0"; + }; + request_store = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ky19wb6mpq6dxb81a0h4hnzx7a4ka99n9ay2syi68djbr4bkbbh"; + type = "gem"; + }; + version = "1.0.5"; + }; + rmagick = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m9x15cdlkcb9826s3s2jd97hxf50hln22p94x8hcccxi1lwklq6"; + type = "gem"; + }; + version = "2.16.0"; + }; + roadie = { + dependencies = ["css_parser" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0frp5yb07ib9y1k43shd4xjkb9a6wavhqq892l8yi9y73qi2cqbc"; + type = "gem"; + }; + version = "3.2.2"; + }; + roadie-rails = { + dependencies = ["railties" "roadie"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hxgl5marq2hi6lcc73f7g6afd7dz4w893rrgrbh7m3k8zrwjyk1"; + type = "gem"; + }; + version = "1.1.1"; + }; + ruby-openid = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yzaf2c1i88757554wk38rxqmj0xzgmwk2zx7gi98w2zx42d17pn"; + type = "gem"; + }; + version = "2.3.0"; + }; + sprockets = { + dependencies = ["concurrent-ruby" "rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + type = "gem"; + }; + version = "3.7.2"; + }; + sprockets-rails = { + dependencies = ["actionpack" "activesupport" "sprockets"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; + type = "gem"; + }; + version = "3.2.1"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl"; + type = "gem"; + }; + version = "0.20.0"; + }; + thread_safe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + type = "gem"; + }; + version = "1.2.5"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/version-management/redmine/generate_nix_requirements.rb b/pkgs/applications/version-management/redmine/generate_nix_requirements.rb deleted file mode 100644 index ed47d52c9c1..00000000000 --- a/pkgs/applications/version-management/redmine/generate_nix_requirements.rb +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env ruby - -require 'rubygems' -require 'bundler' -require 'fileutils' -require 'net/http' -require 'net/https' -require 'uri' - -TMP_DIR = "/tmp/gems" - -FileUtils.rm_rf(TMP_DIR) if File.exists?(TMP_DIR) -FileUtils.mkdir TMP_DIR - -GEMSERVER = "http://rubygems.org" - -# inspect Gemfile.lock -lockfile = Bundler::LockfileParser.new(Bundler.read_file("Gemfile.lock")) - -to_mirror = {} - -uri = URI(GEMSERVER) -http = Net::HTTP.new(uri.host, uri.port) -http.use_ssl = uri.scheme == 'https' - -requirements = {} - -lockfile.specs.each do |s| - possible_gem_name = "#{s.name}-#{s.version.to_s}.gem" - - Dir.chdir TMP_DIR do - filename = `gem fetch #{s.name} -v #{s.version.to_s}`.split()[1] - hash = `sha256sum #{filename}.gem` - url = "#{GEMSERVER}/downloads/#{filename}.gem" - puts url - requirements[s.name] = { :version => s.version.to_s, - :hash => hash.split().first, - :url => url,} - - end -end - -filename = 'Gemfile.nix' - -File.open(filename, 'w') do |file| - file.puts "[" - requirements.each do |name, info| - file.puts "{" - file.puts ['name = ', '"', name, '";'].join('') - file.puts ['hash = ', '"', info[:hash], '";'].join('') - file.puts ['url = ', '"', info[:url], '";'].join('') - file.puts ['version = ', '"', info[:version], '";'].join('') - file.puts "}" - end - file.puts "]" -end From 9e4d2d723abbe76e02945e45d4024ad91d9bc63c Mon Sep 17 00:00:00 2001 From: rittelle <33598633+rittelle@users.noreply.github.com> Date: Mon, 13 Aug 2018 00:01:25 +0200 Subject: [PATCH 025/369] eagle: 7.7 -> 9.1.2 Updated eagle to version to 9.1.2 while keeping version 7.7 as eagle7. --- .../science/electronics/eagle/eagle.nix | 83 +++++++++++++++++++ .../eagle/{default.nix => eagle7.nix} | 2 +- .../eagle/{eagle_fixer.c => eagle7_fixer.c} | 0 pkgs/top-level/all-packages.nix | 7 +- 4 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/science/electronics/eagle/eagle.nix rename pkgs/applications/science/electronics/eagle/{default.nix => eagle7.nix} (98%) rename pkgs/applications/science/electronics/eagle/{eagle_fixer.c => eagle7_fixer.c} (100%) diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix new file mode 100644 index 00000000000..b97ede41396 --- /dev/null +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, makeDesktopItem, patchelf +, libXrender, libXrandr, libXcursor, libX11, libXext, libXi, libxcb +, cups , libGL, glib, nss, nspr, expat, alsaLib +, qtbase, qtdeclarative, qtsvg, qtlocation, qtwebchannel, qtwebengine +}: + +let + libPath = stdenv.lib.makeLibraryPath + [ libXrender libXrandr libXcursor libX11 libXext libXi libxcb + libGL glib nss nspr expat alsaLib + qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine + ]; + in + stdenv.mkDerivation rec { + name = "eagle-${version}"; + version = "9.1.2"; + + src = fetchurl { + url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; + sha256 = "0y7ahl9z5a7l9cjk8hzmyv6ga8chlry5rr8v116q5mnsgs4i11an"; + }; + + desktopItem = makeDesktopItem { + name = "eagle"; + exec = "eagle"; + icon = "eagle"; + comment = "Schematic capture and PCB layout"; + desktopName = "Eagle"; + genericName = "Schematic editor"; + categories = "Application;Development;"; + }; + + buildInputs = + [ libXrender libXrandr libXcursor libX11 libXext libXi libxcb + libGL glib nss nspr expat alsaLib + qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine + ]; + + doConfigure = false; + doBuild = false; + + installPhase = '' + # Extract eagle tarball + mkdir "$out" + tar -xzf "$src" -C "$out" + + # Install manpage + mkdir -p "$out"/share/man/man1 + ln -s "$out"/eagle-${version}/doc/eagle.1 "$out"/share/man/man1/eagle.1 + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/eagle-${version}/lib:${stdenv.cc.cc.lib}/lib" \ + "$out"/eagle-${version}/eagle + + mkdir -p "$out"/bin + ln -s "$out"/eagle-${version}/eagle "$out"/bin/eagle + + # Remove bundled libraries that are available in nixpkgs + # TODO: There still may be unused bundled libraries + rm "$out"/eagle-${version}/lib/libQt5*.so.5 + rm "$out"/eagle-${version}/lib/{libxcb-*.so.*,libX*.so.*,libxshmfence.so.1} + rm "$out"/eagle-${version}/lib/{libEGL.so.1,libglapi.so.0,libgbm.so.1} + + # No longer needed (we don't use the bundled Qt libraries) + rm -r "$out"/eagle-${version}/libexec + rm -r "$out"/eagle-${version}/plugins + + # Make desktop item + mkdir -p "$out"/share/applications + cp "$desktopItem"/share/applications/* "$out"/share/applications/ + mkdir -p "$out"/share/icons + ln -s "$out/eagle-${version}/bin/eagle-logo.png" "$out"/share/icons/eagle.png + ''; + + meta = with stdenv.lib; { + description = "Schematic editor and PCB layout tool from Autodesk (formerly CadSoft)"; + homepage = https://www.autodesk.com/products/eagle/overview; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.rittelle ]; + }; + } diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix similarity index 98% rename from pkgs/applications/science/electronics/eagle/default.nix rename to pkgs/applications/science/electronics/eagle/eagle7.nix index b9294ef3639..9b8827187b2 100644 --- a/pkgs/applications/science/electronics/eagle/default.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { # Build LD_PRELOAD library that redirects license file access to the home # directory of the user mkdir -p "$out"/lib - gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl + gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle7_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl # Make wrapper script dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)" diff --git a/pkgs/applications/science/electronics/eagle/eagle_fixer.c b/pkgs/applications/science/electronics/eagle/eagle7_fixer.c similarity index 100% rename from pkgs/applications/science/electronics/eagle/eagle_fixer.c rename to pkgs/applications/science/electronics/eagle/eagle7_fixer.c diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f88df38c559..153609030ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20805,7 +20805,12 @@ with pkgs; adms = callPackage ../applications/science/electronics/adms { }; - eagle = callPackage ../applications/science/electronics/eagle { }; + # Since version 8 Eagle requires an Autodesk account and a subscription + # in contrast to single payment for the charged editions. + # This is the last version with the old model. + eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix { }; + + eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; From 9e2755b7b3fd921f827e7e26457e1f0f0233d2ee Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Sun, 19 Aug 2018 23:34:30 +0900 Subject: [PATCH 026/369] feedgnuplot: fix build feedgnuplot has no devdoc. --- pkgs/tools/graphics/feedgnuplot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 4e371ffd2b0..3708bc9c0fc 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -19,6 +19,8 @@ buildPerlPackage rec { sha256 = "1bjnx36rsxlj845w9apvdjpza8vd9rbs3dlmgvky6yznrwa6sm02"; }; + outputs = [ "out" ]; + nativeBuildInputs = [ makeWrapper gawk ]; buildInputs = [ gnuplot perl ] From 05d85a267fdc825e26bfb426a799324783a951b4 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Fri, 17 Aug 2018 10:01:50 +0200 Subject: [PATCH 027/369] nixos/doc: New installer note on unattended installs --- nixos/doc/manual/installation/installing.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 6066d025adb..6f8e0f613b1 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -326,10 +326,9 @@ Retype new UNIX password: *** - To prevent the password prompt, set - = false; in - configuration.nix, which allows unattended - installation necessary in automation. + For unattended installations, it is possible to use + nixos-install --no-root-passwd + in order to disable the password prompt entirely. From c8e9df966996dca47b1aa824609a12a0bffff5b1 Mon Sep 17 00:00:00 2001 From: "Scott W. Dunlop" Date: Sun, 19 Aug 2018 11:11:22 -0700 Subject: [PATCH 028/369] maintainers: add @swdunlop --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 99aa6c76e7d..b1295f46ab6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3868,6 +3868,11 @@ github = "swarren83"; name = "Shawn Warren"; }; + swdunlop = { + email = "swdunlop@gmail.com"; + github = "swdunlop"; + name = "Scott W. Dunlop"; + }; swflint = { email = "swflint@flintfam.org"; github = "swflint"; From 61cf6545f7eb7b0b388a858b14bd7abedbd40037 Mon Sep 17 00:00:00 2001 From: "Scott W. Dunlop" Date: Sun, 19 Aug 2018 11:12:51 -0700 Subject: [PATCH 029/369] gnatsd: init at 1.2.0 --- pkgs/servers/gnatsd/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/servers/gnatsd/default.nix diff --git a/pkgs/servers/gnatsd/default.nix b/pkgs/servers/gnatsd/default.nix new file mode 100644 index 00000000000..81ea4056e09 --- /dev/null +++ b/pkgs/servers/gnatsd/default.nix @@ -0,0 +1,26 @@ +{ buildGoPackage, fetchFromGitHub, lib }: + +with lib; + +buildGoPackage rec { + name = "gnatsd-${version}"; + version = "1.2.0"; + rev = "v${version}"; + + goPackagePath = "github.com/nats-io/gnatsd"; + + src = fetchFromGitHub { + inherit rev; + owner = "nats-io"; + repo = "gnatsd"; + sha256 = "186xywzdrmvlhlh9wgjs71rqvgab8vinlr3gkzkknny82nv7hcjw"; + }; + + meta = { + description = "High-Performance server for NATS"; + license = licenses.asl20; + maintainers = [ maintainers.swdunlop ]; + homepage = https://nats.io/; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d65691ba2b7..bd1f39291d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12901,6 +12901,8 @@ with pkgs; glabels = callPackage ../applications/graphics/glabels { }; + gnatsd = callPackage ../servers/gnatsd { }; + gofish = callPackage ../servers/gopher/gofish { }; grafana = callPackage ../servers/monitoring/grafana { }; From ed5b1946c6a8515d00fbb15fa2756391de5b00fb Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 19 Aug 2018 21:52:28 +0200 Subject: [PATCH 030/369] ldc: 1.10.0 -> 1.11.0 --- pkgs/development/compilers/ldc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index bb364930218..e39d6ae8e20 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.10.0" -, ldcSha256 ? "0wc3vlblsz4qdwa9ay9plv9nvfd07zj2byqqffaa4a5gvjwf5dlr" +, version ? "1.11.0" +, ldcSha256 ? "0w4z261gzji31hn1xdnmi9dfkbyydpy6rz8aj4456q5w8yp4yil5" }: let From 89e483489277cb2ccf01b5af63405da6ad34e91f Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 19 Aug 2018 21:53:13 +0200 Subject: [PATCH 031/369] dmd: 2.081.1 -> 2.081.2 --- pkgs/development/compilers/dmd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 1e9e62efb63..90e5cfe7411 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -2,10 +2,10 @@ , makeWrapper, unzip, which , curl, tzdata, gdb, darwin , callPackage, targetPackages, ldc -, version ? "2.081.1" -, dmdSha256 ? "1xdz7p0pdzwkn57ai93mavgdkd8xb1sr2brlc6y3c12x84h43s8z" -, druntimeSha256 ? "1vl8ag6rjvqqmc5bn5jk3yfynjb9ggy3hw1awwl7c76bq4f7nbif" -, phobosSha256 ? "0h1jdc3yai1l42bxjdlyi9hf9qadh76v925rjk2q4ibv2fzl56b7" +, version ? "2.081.2" +, dmdSha256 ? "1wwk4shqldvgyczv1ihmljpfj3yidq7mxcj69i9kjl7jqx54hw62" +, druntimeSha256 ? "0dqfsy34q2q7mk2gsi4ix3vgqg7szg3m067fghgx53vnvrzlpsc0" +, phobosSha256 ? "1dan59lc4wggsrv5aax7jsxnzg7fz37xah84k1cbwjb3xxhhkd9n" }: let From 4d0203d2d330ee1d668b219d92e8437fd4261705 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 19 Aug 2018 21:56:50 +0200 Subject: [PATCH 032/369] dtools: 2.081.1 -> 2.081.2 --- pkgs/development/tools/dtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 0cbb753fbf5..b1703cd45dd 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.081.1"; + version = "2.081.2"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "1xdz7p0pdzwkn57ai93mavgdkd8xb1sr2brlc6y3c12x84h43s8z"; + sha256 = "1wwk4shqldvgyczv1ihmljpfj3yidq7mxcj69i9kjl7jqx54hw62"; name = "dmd"; }) (fetchFromGitHub { From 2c35ea0412a3bab282a09af29d2619c21ac2b114 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 19 Aug 2018 20:58:17 +0100 Subject: [PATCH 033/369] pythonPackages.nixpart0: fix nixops deploy re-introduce the unused "udevSoMajor" variable for nixops backward-compatibilty. This was removed by the treewide 52f53c69ce6dbc5538f7e4cd22f9d93baf1f64a2 cleanup --- pkgs/tools/filesystems/nixpart/0.4/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 758e130e4ad..6a1c12e3e72 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, python, buildPythonApplication # Propagated to blivet , useNixUdev ? true +# Needed by NixOps +, udevSoMajor ? null # Propagated dependencies , pkgs, urlgrabber }: From bb7568daf7ef25b364f596782cc94a33f2fc28ca Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 19 Aug 2018 16:29:44 -0400 Subject: [PATCH 034/369] reworked the redmine service added some security features like database.passwordFile --- nixos/modules/services/misc/redmine.nix | 255 ++++++++++-------- .../version-management/redmine/default.nix | 5 +- 2 files changed, 151 insertions(+), 109 deletions(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 81addca9e31..90830b8ef80 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -5,100 +5,120 @@ with lib; let cfg = config.services.redmine; - databaseYml = '' + bundle = "${pkgs.redmine}/share/redmine/bin/bundle"; + + databaseYml = pkgs.writeText "database.yml" '' production: - adapter: mysql2 # postgresql - database: ${cfg.databaseName} - host: ${cfg.databaseHost} - password: ${cfg.databasePassword} - username: ${cfg.databaseUsername} - encoding: utf8 + adapter: ${cfg.database.type} + database: ${cfg.database.name} + host: ${cfg.database.host} + port: ${toString cfg.database.port} + username: ${cfg.database.user} + password: #dbpass# ''; - configurationYml = '' + configurationYml = pkgs.writeText "configuration.yml" '' default: - # Absolute path to the directory where attachments are stored. - # The default is the 'files' directory in your Redmine instance. - # Your Redmine instance needs to have write permission on this - # directory. - # Examples: - # attachments_storage_path: /var/redmine/files - # attachments_storage_path: D:/redmine/files - attachments_storage_path: ${cfg.stateDir}/files + scm_subversion_command: ${pkgs.subversion}/bin/svn + scm_mercurial_command: ${pkgs.mercurial}/bin/hg + scm_git_command: ${pkgs.gitAndTools.git}/bin/git + scm_cvs_command: ${pkgs.cvs}/bin/cvs + scm_bazaar_command: ${pkgs.bazaar}/bin/bzr + scm_darcs_command: ${pkgs.darcs}/bin/darcs - # Absolute path to the SCM commands errors (stderr) log file. - # The default is to log in the 'log' directory of your Redmine instance. - # Example: - # scm_stderr_log_file: /var/log/redmine_scm_stderr.log - scm_stderr_log_file: ${cfg.stateDir}/log/redmine_scm_stderr.log - - ${cfg.extraConfig} + ${cfg.extraConfig} ''; -in { +in +{ options = { services.redmine = { enable = mkOption { type = types.bool; default = false; - description = '' - Enable the redmine service. - ''; + description = "Enable the Redmine service."; + }; + + user = mkOption { + type = types.str; + default = "redmine"; + description = "User under which Redmine is ran."; + }; + + group = mkOption { + type = types.str; + default = "redmine"; + description = "Group under which Redmine is ran."; }; stateDir = mkOption { type = types.str; default = "/var/lib/redmine"; - description = "The state directory, logs and plugins are stored here"; + description = "The state directory, logs and plugins are stored here."; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Extra configuration in configuration.yml"; + description = '' + Extra configuration in configuration.yml. + + See https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration + ''; }; - themes = mkOption { - type = types.attrsOf types.path; - default = {}; - description = "Set of themes"; - }; + database = { + type = mkOption { + type = types.enum [ "mysql2" "postgresql" ]; + example = "postgresql"; + default = "mysql2"; + description = "Database engine to use."; + }; - plugins = mkOption { - type = types.attrsOf types.path; - default = {}; - description = "Set of plugins"; - }; + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Database host address."; + }; - #databaseType = mkOption { - # type = types.str; - # default = "postgresql"; - # description = "Type of database"; - #}; + port = mkOption { + type = types.int; + default = 3306; + description = "Database host port."; + }; - databaseHost = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Database hostname"; - }; + name = mkOption { + type = types.str; + default = "redmine"; + description = "Database name."; + }; - databasePassword = mkOption { - type = types.str; - default = ""; - description = "Database user password"; - }; + user = mkOption { + type = types.str; + default = "redmine"; + description = "Database user."; + }; - databaseName = mkOption { - type = types.str; - default = "redmine"; - description = "Database name"; - }; + password = mkOption { + type = types.str; + default = ""; + description = '' + The password corresponding to . + Warning: this is stored in cleartext in the Nix store! + Use instead. + ''; + }; - databaseUsername = mkOption { - type = types.str; - default = "redmine"; - description = "Database user"; + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/redmine-dbpassword"; + description = '' + A file containing the password corresponding to + . + ''; + }; }; }; }; @@ -106,83 +126,106 @@ in { config = mkIf cfg.enable { assertions = [ - { assertion = cfg.databasePassword != ""; - message = "services.redmine.databasePassword must be set"; + { assertion = cfg.database.passwordFile != null || cfg.database.password != ""; + message = "either services.redmine.database.passwordFile or services.redmine.database.password must be set"; } ]; - users.users = [ - { name = "redmine"; - group = "redmine"; - uid = config.ids.uids.redmine; - } ]; - - users.groups = [ - { name = "redmine"; - gid = config.ids.gids.redmine; - } ]; + environment.systemPackages = [ pkgs.redmine ]; systemd.services.redmine = { - after = [ "network.target" "mysql.service" ]; # postgresql.service + after = [ "network.target" (if cfg.database.type == "mysql2" then "mysql.service" else "postgresql.service") ]; wantedBy = [ "multi-user.target" ]; + environment.HOME = "${pkgs.redmine}/share/redmine"; environment.RAILS_ENV = "production"; environment.RAILS_CACHE = "${cfg.stateDir}/cache"; - environment.SCHEMA = "${cfg.stateDir}/cache/schema.db"; - environment.HOME = "${pkgs.redmine}/share/redmine"; environment.REDMINE_LANG = "en"; + environment.SCHEMA = "${cfg.stateDir}/cache/schema.db"; path = with pkgs; [ imagemagickBig - subversion - mercurial - cvs - # config.services.postgresql.package - libmysql bazaar - gitAndTools.git + cvs darcs + gitAndTools.git + mercurial + subversion ]; preStart = '' + # start with a fresh config directory every time rm -rf ${cfg.stateDir}/config + cp -r ${pkgs.redmine}/share/redmine/config.dist ${cfg.stateDir}/config - mkdir -p ${cfg.stateDir}/cache - mkdir -p ${cfg.stateDir}/config - mkdir -p ${cfg.stateDir}/files - mkdir -p ${cfg.stateDir}/log - mkdir -p ${cfg.stateDir}/plugins - mkdir -p ${cfg.stateDir}/tmp - + # create the basic state directory layout pkgs.redmine expects mkdir -p /run/redmine - ln -fs ${cfg.stateDir}/files /run/redmine/files - ln -fs ${cfg.stateDir}/log /run/redmine/log - ln -fs ${cfg.stateDir}/plugins /run/redmine/plugins - ln -fs ${cfg.stateDir}/tmp /run/redmine/tmp - cp -r ${pkgs.redmine}/share/redmine/config.dist/* ${cfg.stateDir}/config/ - ln -fs ${cfg.stateDir}/config /run/redmine/config + for i in config files log plugins tmp; do + mkdir -p ${cfg.stateDir}/$i + ln -fs ${cfg.stateDir}/$i /run/redmine/$i + done - ln -fs ${pkgs.writeText "configuration.yml" configurationYml} ${cfg.stateDir}/config/configuration.yml - ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.stateDir}/config/database.yml + # ensure cache directory exists for db:migrate command + mkdir -p ${cfg.stateDir}/cache + + # link in the application configuration + ln -fs ${configurationYml} ${cfg.stateDir}/config/configuration.yml - chown -R redmine:redmine ${cfg.stateDir} chmod -R ug+rwX,o-rwx+x ${cfg.stateDir}/ - ${pkgs.redmine}/share/redmine/bin/bundle exec rake generate_secret_token - ${pkgs.redmine}/share/redmine/bin/bundle exec rake db:migrate - ${pkgs.redmine}/share/redmine/bin/bundle exec rake redmine:load_default_data + # handle database.passwordFile + DBPASS=$(head -n1 ${cfg.database.passwordFile}) + cp -f ${databaseYml} ${cfg.stateDir}/config/database.yml + sed -e "s,#dbpass#,$DBPASS,g" -i ${cfg.stateDir}/config/database.yml + chmod 440 ${cfg.stateDir}/config/database.yml + + # generate a secret token if required + if ! test -e "${cfg.stateDir}/config/initializers/secret_token.rb"; then + ${bundle} exec rake generate_secret_token + chmod 440 ${cfg.stateDir}/config/initializers/secret_token.rb + fi + + # ensure everything is owned by ${cfg.user} + chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir} + + ${bundle} exec rake db:migrate + ${bundle} exec rake redmine:load_default_data ''; serviceConfig = { PermissionsStartOnly = true; # preStart must be run as root Type = "simple"; - User = "redmine"; - Group = "redmine"; + User = cfg.user; + Group = cfg.group; TimeoutSec = "300"; WorkingDirectory = "${pkgs.redmine}/share/redmine"; - ExecStart="${pkgs.redmine}/share/redmine/bin/bundle exec rails server webrick -e production -P ${cfg.stateDir}/redmine.pid --binding=0.0.0.0"; + ExecStart="${bundle} exec rails server webrick -e production -P ${cfg.stateDir}/redmine.pid --binding=0.0.0.0"; }; }; + users.extraUsers = optionalAttrs (cfg.user == "redmine") (singleton + { name = "redmine"; + group = cfg.group; + home = cfg.stateDir; + createHome = true; + uid = config.ids.uids.redmine; + }); + + users.extraGroups = optionalAttrs (cfg.group == "redmine") (singleton + { name = "redmine"; + gid = config.ids.gids.redmine; + }); + + warnings = optional (cfg.database.password != "") + ''config.services.redmine.database.password will be stored as plaintext + in the Nix store. Use database.passwordFile instead.''; + + # Create database passwordFile default when password is configured. + services.redmine.database.passwordFile = + (mkDefault (toString (pkgs.writeTextFile { + name = "redmine-database-password"; + text = cfg.database.password; + }))); + }; } diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index dc88a51f86a..3c3fd4da33d 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,4 +1,3 @@ - { stdenv, fetchurl, bundlerEnv, ruby }: let @@ -28,9 +27,9 @@ in mkdir -p $out/share cp -r . $out/share/redmine - for i in config files log plugins tmp; do # TODO: add 'public' to this list? + for i in config files log plugins tmp; do rm -rf $out/share/redmine/$i - ln -sf /run/redmine/$i $out/share/redmine/ + ln -fs /run/redmine/$i $out/share/redmine/ done ''; From c93c0f3ae42e19ea054c2c1f69b22cd4a310c8e2 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 19 Aug 2018 16:41:49 -0400 Subject: [PATCH 035/369] removed some local development stuff --- nixos/modules/services/misc/redmine.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 90830b8ef80..f763ba21d0b 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -197,7 +197,7 @@ in Group = cfg.group; TimeoutSec = "300"; WorkingDirectory = "${pkgs.redmine}/share/redmine"; - ExecStart="${bundle} exec rails server webrick -e production -P ${cfg.stateDir}/redmine.pid --binding=0.0.0.0"; + ExecStart="${bundle} exec rails server webrick -e production -P ${cfg.stateDir}/redmine.pid"; }; }; From e180796caae6ea053c316c04f22d519848ed3563 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 19 Aug 2018 16:42:08 -0400 Subject: [PATCH 036/369] updated Gemfile... still needs to be fixed up though --- pkgs/applications/version-management/redmine/Gemfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 2ff32549942..744d6bfdd74 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -58,8 +58,11 @@ end # configuration file require 'erb' require 'yaml' + +# NixOS - manually added to ensure mysql and postgres will always be include gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw] gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] + database_file = File.join(File.dirname(__FILE__), "config/database.yml") if File.exist?(database_file) database_config = YAML::load(ERB.new(IO.read(database_file)).result) @@ -88,6 +91,7 @@ else warn("Please configure your config/database.yml first") end +# NixOS - manually removed because I couldn't figure out how to get "bundle exec rails server webrick -e production" to ignore these groups #group :development do # gem "rdoc", "~> 4.3" # gem "yard" From 9024d2e15d117176686b29994992e23da68d7428 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Aug 2018 14:47:22 -0700 Subject: [PATCH 037/369] wayland-protocols: 1.15 -> 1.16 (#45123) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wayland-protocols/versions. --- pkgs/development/libraries/wayland/protocols.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 7b619ebb35e..54fa9447775 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "wayland-protocols-${version}"; - version = "1.15"; + version = "1.16"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1qlyf9cllr2p339xxplznh023qcwj5iisp02ikx7ps349dx75fys"; + sha256 = "1icqikvhgv9kcf8lcqml3w9fb8q3igr4c3471jb6mlyw3yaqa53b"; }; nativeBuildInputs = [ pkgconfig ]; From cb7434c92365b04fe1a15bd9021b8a755297f4bd Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 19 Aug 2018 10:15:34 -0400 Subject: [PATCH 038/369] google-musicmanager: beta_1.0.243.1116-r0 -> beta_1.0.467.4929-r0 --- .../audio/google-musicmanager/default.nix | 78 ++++++++++++------- pkgs/top-level/all-packages.nix | 11 ++- 2 files changed, 58 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 72bec52b266..4cd3010ec3d 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -1,12 +1,9 @@ -{ stdenv, fetchurl, readline, patchelf, ncurses, qt48, libidn, expat, flac -, libvorbis }: +{ stdenv, fetchurl +, flac, expat, libidn, qtbase, qtwebkit, libvorbis }: +assert stdenv.system == "x86_64-linux"; -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; -let - archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; -in stdenv.mkDerivation rec { - version = "beta_1.0.243.1116-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.467.4929-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; @@ -16,37 +13,58 @@ stdenv.mkDerivation rec { # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-amd64/Packages # which will contain the links to all available *.debs for the arch. - src = if stdenv.system == "x86_64-linux" - then fetchurl { - url = archUrl name "amd64"; - sha256 = "54f97f449136e173492d36084f2c01244b84f02d6e223fb8a40661093e0bec7c"; - } - else fetchurl { - url = archUrl name "i386"; - sha256 = "121a7939015e2270afa3f1c73554102e2b4f2e6a31482ff7be5e7c28dd101d3c"; - }; + src = fetchurl { + url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_amd64.deb"; + sha256 = "0yaprpbp44var88kdj1h11fqkhgcklixr69jyia49v9m22529gg2"; + }; unpackPhase = '' ar vx ${src} - tar -xvf data.tar.lzma + tar xvf data.tar.xz + tar xvf control.tar.gz ''; - buildInputs = [ patchelf ]; - - buildPhase = '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/opt/google/musicmanager:${stdenv.lib.makeLibraryPath [ readline ncurses stdenv.cc.libc.out qt48 stdenv.cc.cc libidn expat flac libvorbis ]}" opt/google/musicmanager/MusicManager + prePatch = '' + sed -i "s@\(Exec=\).*@\1$out/bin/google-musicmanager@" opt/google/musicmanager/google-musicmanager.desktop ''; - dontPatchELF = true; - dontStrip = true; - installPhase = '' - mkdir -p "$out" - cp -r opt "$out" - mkdir "$out/bin" - ln -s "$out/opt/google/musicmanager/google-musicmanager" "$out/bin" + mkdir -p $out/bin + mkdir -p $out/lib + mkdir -p $out/share/applications + + cp -r opt $out + find -name "*.so*" -exec cp "{}" $out/lib \; + ln -s $out/opt/google/musicmanager/google-musicmanager $out/bin + ln -s $out/opt/google/musicmanager/google-musicmanager.desktop $out/share/applications + + for i in 16 32 48 128 + do + iconDirectory=$out/usr/share/icons/hicolor/"$i"x"$i"/apps + + mkdir -p $iconDirectory + ln -s $out/opt/google/musicmanager/product_logo_"$i".png $iconDirectory/google-musicmanager.png + done + ''; + + postFixup = '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/minidump_upload):${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + $out/opt/google/musicmanager/minidump_upload + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/MusicManager):$out/lib:${stdenv.lib.makeLibraryPath [ + flac + expat + libidn + qtbase + qtwebkit + libvorbis + stdenv.cc.cc.lib + ]}" \ + $out/opt/google/musicmanager/MusicManager ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94a65d3bdf3..ccc60c9cd30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16232,7 +16232,16 @@ with pkgs; inherit (ocamlPackages) google-drive-ocamlfuse; - google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; + google-musicmanager = callPackage ../applications/audio/google-musicmanager { + inherit (qt5) qtbase qtwebkit; + # Downgrade to 1.34 to get libidn.so.11 + libidn = (libidn.overrideAttrs (oldAttrs: { + src = fetchurl { + url = "mirror://gnu/libidn/libidn-1.34.tar.gz"; + sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; + }; + })).out; + }; googler = callPackage ../applications/misc/googler { python = python3; From b2b9e68d1cfa5c419b6353caf09f376bd10bcf9a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 14 Aug 2018 19:33:31 +0200 Subject: [PATCH 039/369] pythonPackages.dominate: init at 2.3.1 --- .../python-modules/dominate/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/dominate/default.nix diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix new file mode 100644 index 00000000000..86b3271990d --- /dev/null +++ b/pkgs/development/python-modules/dominate/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "dominate"; + version = "2.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s9s9j9xmhkzw7apqx170fyvc0f800fd4a5jfn8xvj9k6vryd32b"; + }; + + doCheck = !isPy3k; + + meta = with lib; { + homepage = https://github.com/Knio/dominate/; + description = "Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API"; + license = licenses.lgpl3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ceb92f29218..c54e5c96221 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -254,6 +254,8 @@ in { docrep = callPackage ../development/python-modules/docrep { }; + dominate = callPackage ../development/python-modules/dominate { }; + emcee = callPackage ../development/python-modules/emcee { }; email_validator = callPackage ../development/python-modules/email-validator { }; From 28d7d7c2ca921c20f980d4d4ff3dfab571fab4b4 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 14 Aug 2018 19:34:04 +0200 Subject: [PATCH 040/369] pythonPackages.visitor: init at 0.1.3 --- .../python-modules/visitor/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/visitor/default.nix diff --git a/pkgs/development/python-modules/visitor/default.nix b/pkgs/development/python-modules/visitor/default.nix new file mode 100644 index 00000000000..78dc29bbeb0 --- /dev/null +++ b/pkgs/development/python-modules/visitor/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "visitor"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "02j87v93c50gz68gbgclmbqjcwcr7g7zgvk7c6y4x1mnn81pjwrc"; + }; + + meta = with lib; { + homepage = https://github.com/mbr/visitor; + description = "A tiny pythonic visitor implementation"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c54e5c96221..12ca5c3d2fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17303,6 +17303,8 @@ EOF vine = callPackage ../development/python-modules/vine { }; + visitor = callPackage ../development/python-modules/visitor { }; + whitenoise = callPackage ../development/python-modules/whitenoise { }; XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; From 4433f403311079038ea1dbbcdaebfe69e2fa1e74 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 14 Aug 2018 19:34:57 +0200 Subject: [PATCH 041/369] pythonPackages.flask-bootstrap: init at 3.3.7.1 --- .../flask-bootstrap/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/flask-bootstrap/default.nix diff --git a/pkgs/development/python-modules/flask-bootstrap/default.nix b/pkgs/development/python-modules/flask-bootstrap/default.nix new file mode 100644 index 00000000000..7c12b79bb2f --- /dev/null +++ b/pkgs/development/python-modules/flask-bootstrap/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, flask, visitor, dominate }: + +buildPythonPackage rec { + pname = "Flask-Bootstrap"; + version = "3.3.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1j1s2bplaifsnmr8vfxa3czca4rz78xyhrg4chx39xl306afs26b"; + }; + + propagatedBuildInputs = [ flask visitor dominate ]; + + meta = with lib; { + homepage = https://github.com/mbr/flask-bootstrap; + description = "Ready-to-use Twitter-bootstrap for use in Flask."; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12ca5c3d2fc..ef9bd40255b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5369,6 +5369,8 @@ in { flask-babel = callPackage ../development/python-modules/flask-babel { }; + flask-bootstrap = callPackage ../development/python-modules/flask-bootstrap { }; + flask-caching = callPackage ../development/python-modules/flask-caching { }; flask-common = callPackage ../development/python-modules/flask-common { }; From f40c61cc15c39673b13a72672ba9fe93ac5a975b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 14 Aug 2018 19:35:28 +0200 Subject: [PATCH 042/369] pythonPackages.flask-api: init at 1.0 --- .../python-modules/flask-api/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/flask-api/default.nix diff --git a/pkgs/development/python-modules/flask-api/default.nix b/pkgs/development/python-modules/flask-api/default.nix new file mode 100644 index 00000000000..cee93a75920 --- /dev/null +++ b/pkgs/development/python-modules/flask-api/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, flask, markdown }: + +buildPythonPackage rec { + pname = "Flask-API"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dffcy2hdkajbvl2wkz9dam49v05x9d87cf2mh2cyvza2c5ah47w"; + }; + + propagatedBuildInputs = [ flask markdown ]; + + meta = with lib; { + homepage = https://github.com/miracle2k/flask-assets; + description = "Browsable web APIs for Flask"; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef9bd40255b..babd71c9e1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5363,6 +5363,8 @@ in { flask = callPackage ../development/python-modules/flask { }; + flask-api = callPackage ../development/python-modules/flask-api { }; + flask_assets = callPackage ../development/python-modules/flask-assets { }; flask-autoindex = callPackage ../development/python-modules/flask-autoindex { }; From 01bbc716e23cb378012029faa87afc651f211abc Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 14 Aug 2018 19:35:54 +0200 Subject: [PATCH 043/369] pythonPackages.flask-paginate: init at 0.5.1 --- .../python-modules/flask-paginate/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/flask-paginate/default.nix diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix new file mode 100644 index 00000000000..7af4aa2b8dd --- /dev/null +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, flask }: + +buildPythonPackage rec { + pname = "flask-paginate"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pgk6ngqzh7lgq2nr6hraqp3z76f3f0kjhai50vxb6j1civ8v3mn"; + }; + + propagatedBuildInputs = [ flask ]; + + meta = with lib; { + homepage = https://github.com/lixxu/flask-paginate; + description = "Pagination support for Flask"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index babd71c9e1b..ff0459cf7e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5397,6 +5397,8 @@ in { flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { }; + flask-paginate = callPackage ../development/python-modules/flask-paginate { }; + flask_principal = callPackage ../development/python-modules/flask-principal { }; flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; From dce1332c5a8d8862e03c37799fec32f7d725ef18 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 14 Aug 2018 19:37:14 +0200 Subject: [PATCH 044/369] buku: 3.7 -> 3.8 --- pkgs/applications/misc/buku/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 83ba02933fd..dacfa908b51 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,28 +1,23 @@ { stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "3.7"; + version = "3.8"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "0qc6xkrhf2phaj9fhym19blr4rr2vllvnyljjz909xr4vsynvb41"; - }; - - patches = fetchpatch { - url = https://github.com/jarun/Buku/commit/495d6eac4d9371e8ce6d3f601e2bb9e5e74962b4.patch; - sha256 = "0py4l5qcgdzqr0iqmcc8ddld1bspk8iwypz4dcr88y70j86588gk"; + sha256 = "0gv26c4rr1akcaiff1nrwil03sv7d58mfxr86pgsw6nwld67ns0r"; }; checkInputs = [ pytestcov - pytest-catchlog hypothesis pytest pylint flake8 + pyyaml ]; propagatedBuildInputs = [ @@ -30,6 +25,14 @@ with python3.pkgs; buildPythonApplication rec { beautifulsoup4 requests urllib3 + flask + flask-api + flask-bootstrap + flask-paginate + flask_wtf + arrow + werkzeug + click ]; preCheck = '' @@ -43,7 +46,7 @@ with python3.pkgs; buildPythonApplication rec { --replace "self.assertEqual(url, 'https://www.google.com')" "" ''; - installPhase = '' + postInstall = '' make install PREFIX=$out mkdir -p $out/share/zsh/site-functions $out/share/bash-completion/completions $out/share/fish/vendor_completions.d From 456a1346a8a0327fac7a22fb81a7275681b101e4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 00:16:08 +0200 Subject: [PATCH 045/369] fontconfig-ultimate: add meta data --- pkgs/development/libraries/fontconfig-ultimate/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix index a2e5f69202c..9aeb12344ec 100644 --- a/pkgs/development/libraries/fontconfig-ultimate/default.nix +++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix @@ -38,4 +38,11 @@ stdenv.mkDerivation { cp fontconfig_patches/free/*.conf $out/etc/fonts/presets/free cp fontconfig_patches/ms/*.conf $out/etc/fonts/presets/ms ''; + + meta = with stdenv.lib; { + description = "Font configuration files, patches, scripts and source packages (Infinality & friends)"; + homepage = https://github.com/bohoomil/fontconfig-ultimate; + license = licenses.mit; + platforms = platforms.all; + }; } From 49ee72b744770797978ea8325deb785cdcf816ed Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 00:20:07 +0200 Subject: [PATCH 046/369] fpc: add license + homepage --- pkgs/development/compilers/fpc/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 2f4cb10bd4d..51544783d8c 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = "NOGDB=1 FPC=${startFPC}/bin/fpc"; installFlags = "INSTALL_PREFIX=\${out}"; - + postInstall = '' for i in $out/lib/fpc/*/ppc*; do ln -fs $i $out/bin/$(basename $i) @@ -35,10 +35,12 @@ stdenv.mkDerivation rec { bootstrap = startFPC; }; - meta = { + meta = with stdenv.lib; { description = "Free Pascal Compiler from a source distribution"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + homepage = https://www.freepascal.org; + maintainers = [ maintainers.raskin ]; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.linux; inherit version; }; } From 05290a6c019034063e34eb85dc7055d7a092efeb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 00:27:04 +0200 Subject: [PATCH 047/369] fping: add license --- pkgs/tools/networking/fping/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 2b19c8e6a05..adcb59135ee 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; - meta = { + meta = with stdenv.lib; { homepage = http://fping.org/; description = "Send ICMP echo probes to network hosts"; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = with stdenv.lib.platforms; all; + maintainers = with maintainers; [ the-kenny ]; + license = licenses.bsd0; + platforms = platforms.all; }; } From 552b20f4b813a44d3a15da769740ad0e17e8ab92 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 00:31:19 +0200 Subject: [PATCH 048/369] frab: add meta data --- pkgs/servers/web-apps/frab/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/web-apps/frab/default.nix b/pkgs/servers/web-apps/frab/default.nix index 8ee6afaa849..657bd423f3f 100644 --- a/pkgs/servers/web-apps/frab/default.nix +++ b/pkgs/servers/web-apps/frab/default.nix @@ -43,4 +43,10 @@ stdenv.mkDerivation rec { passthru = { inherit env ruby; }; + + meta = with stdenv.lib; { + description = "Web-based conference planning and management system"; + homepage = https://github.com/frab/frab; + license = licenses.mit; + }; } From 84d13849dfd857e9a8c4c78e4435c2b8046f621f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 00:39:49 +0200 Subject: [PATCH 049/369] funambol-client-cpp: add license --- pkgs/development/libraries/funambol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index d0850128ebc..100c00eea49 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook unzip ]; - meta = { + meta = with stdenv.lib; { description = "SyncML client sdk by Funambol project"; homepage = http://www.funambol.com; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.agpl3; + platforms = platforms.unix; }; } From da7a32ef17a1d6540a2dbc7036cc594132008ecf Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 00:47:52 +0200 Subject: [PATCH 050/369] fuse: add license --- pkgs/os-specific/linux/fuse/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 7cc58c19c07..d23ae7594be 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -72,6 +72,7 @@ in stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Kernel module and library that allows filesystems to be implemented in user space"; platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl21 ]; maintainers = [ maintainers.primeos ]; }; } From a16062720d20b4f9904986744c7ada63254bd960 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 00:51:30 +0200 Subject: [PATCH 051/369] fusesmb: add license, remove dead homepage link --- pkgs/tools/filesystems/fusesmb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/pkgs/tools/filesystems/fusesmb/default.nix index 5a3451810a1..286403c70c4 100644 --- a/pkgs/tools/filesystems/fusesmb/default.nix +++ b/pkgs/tools/filesystems/fusesmb/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { description = "Samba mounted via FUSE"; - homepage = http://www.ricardis.tudelft.nl/~vincent/fusesmb/; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 3d79bc684b61defedcebde463801f650ee813d5e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 00:55:52 +0200 Subject: [PATCH 052/369] fxload: add license --- pkgs/os-specific/linux/fxload/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 8485b0e6032..61bd2a229ab 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "fxload-2002_04_11"; - + src = fetchurl { url = mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz; sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m"; @@ -27,9 +27,10 @@ stdenv.mkDerivation { mkdir -p $out/share/usb ''; - meta = { + meta = with stdenv.lib; { homepage = http://linux-hotplug.sourceforge.net/?selected=usb; description = "Tool to upload firmware to Cypress EZ-USB microcontrollers"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 51a22165ce6000c7559eaaf6f422633966ff8a3b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 00:57:54 +0200 Subject: [PATCH 053/369] gamin: add license --- pkgs/development/libraries/gamin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index a4e0bcfb52b..4cff2245740 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (rec { homepage = https://people.gnome.org/~veillard/gamin/; description = "A file and directory monitoring system"; maintainers = with maintainers; [ lovek323 ]; + license = licenses.gpl2; platforms = platforms.unix; }; } From a3d148a64cc66fca074ec9ce2788477e6e3e2233 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 01:00:25 +0200 Subject: [PATCH 054/369] gcab: add license --- pkgs/development/libraries/gcab/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 0758d125227..dc0ca5fffa3 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig, meson, ninja, glibcLocales, git, vala, glib, zlib }: +{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig +, meson, ninja, glibcLocales, git, vala, glib, zlib +}: stdenv.mkDerivation rec { name = "gcab-${version}"; @@ -22,6 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; + license = licenses.lgpl21; maintainers = [ maintainers.lethalman ]; }; From 52f6778230f29f85fa23ce6af9fc5a8c58e6d314 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 01:04:09 +0200 Subject: [PATCH 055/369] gcl:; add license --- pkgs/development/compilers/gcl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index f503427b326..233372caa80 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -36,9 +36,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fgnu89-inline"; - meta = { + meta = with stdenv.lib; { description = "GNU Common Lisp compiler working via GCC"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl2; + platforms = platforms.linux; }; } From ea51558cfad3c74cdf49afe9ca62033438877abe Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 20 Aug 2018 01:21:36 +0200 Subject: [PATCH 056/369] eunomia-font: init at 0.200 --- pkgs/data/fonts/eunomia/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/eunomia/default.nix diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix new file mode 100644 index 00000000000..56fa718f867 --- /dev/null +++ b/pkgs/data/fonts/eunomia/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "200"; + pname = "eunomia"; +in + +fetchzip rec { + name = "${pname}-font-${majorVersion}.${minorVersion}"; + + url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; + sha256 = "0lpmczs1d4p9dy4s0dnvv7bl5cd0f6yzyasfrkxij5s86glps38b"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype/${pname} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + ''; + + meta = with stdenv.lib; { + homepage = http://dotcolon.net/font/eunomia/; + description = "A futuristic decorative font."; + platforms = platforms.all; + maintainers = with maintainers; [ leenaars ]; + license = licenses.ofl; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e4bc24aa95..d9eb3e47974 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14786,6 +14786,8 @@ with pkgs; elliptic_curves = callPackage ../data/misc/elliptic_curves { }; + eunomia = callPackage ../data/fonts/eunomia { }; + faba-icon-theme = callPackage ../data/icons/faba-icon-theme { }; faba-mono-icons = callPackage ../data/icons/faba-mono-icons { }; From 55570268f228b5f6c29f65c14f2c103da9d16da9 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 20 Aug 2018 01:43:55 +0200 Subject: [PATCH 057/369] f5_6-font: init at 0.110 --- pkgs/data/fonts/f5_6/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/f5_6/default.nix diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/data/fonts/f5_6/default.nix new file mode 100644 index 00000000000..25cab717cee --- /dev/null +++ b/pkgs/data/fonts/f5_6/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "110"; + pname = "f5_6"; +in + +fetchzip rec { + name = "${pname}-font-${majorVersion}.${minorVersion}"; + + url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; + sha256 = "04p6lccd26rhjbpq3ddxi5vkk3lk8lqbpnk8lakjzixp3fgdqpp4"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype/${pname} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + ''; + + meta = with stdenv.lib; { + homepage = "http://dotcolon.net/font/${pname}/"; + description = "A weighted decorative font."; + platforms = platforms.all; + maintainers = with maintainers; [ leenaars ]; + license = licenses.ofl; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9eb3e47974..cd5b8f35747 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14788,6 +14788,8 @@ with pkgs; eunomia = callPackage ../data/fonts/eunomia { }; + f5_6 = callPackage ../data/fonts/f5_6 { }; + faba-icon-theme = callPackage ../data/icons/faba-icon-theme { }; faba-mono-icons = callPackage ../data/icons/faba-mono-icons { }; From 88eb81e19ba11f4c776916c5d9d5c9fa776e46b6 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 20 Aug 2018 01:50:35 +0200 Subject: [PATCH 058/369] ferrum-font: init at 0.200 --- pkgs/data/fonts/ferrum/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/ferrum/default.nix diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/data/fonts/ferrum/default.nix new file mode 100644 index 00000000000..bbe185bd848 --- /dev/null +++ b/pkgs/data/fonts/ferrum/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "200"; + pname = "ferrum"; +in + +fetchzip rec { + name = "${pname}-font-${majorVersion}.${minorVersion}"; + + url = "http://dotcolon.net/DL/font/${pname}.zip"; + sha256 = "1w1b3ch7ik4264f05lxms01ls0aargvlx770a9szm682dfmizn8w"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype/${pname} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + ''; + + meta = with stdenv.lib; { + homepage = "http://dotcolon.net/font/${pname}/"; + description = "A decorative font."; + platforms = platforms.all; + maintainers = with maintainers; [ leenaars ]; + license = licenses.cc0; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd5b8f35747..f4f9a45a850 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14794,6 +14794,8 @@ with pkgs; faba-mono-icons = callPackage ../data/icons/faba-mono-icons { }; + ferrum = callPackage ../data/fonts/ferrum { }; + fixedsys-excelsior = callPackage ../data/fonts/fixedsys-excelsior { }; graphs = callPackage ../data/misc/graphs { }; From c1c432564d7f3583353d0d76129fdf389f86a18b Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 20 Aug 2018 01:56:48 +0200 Subject: [PATCH 059/369] aileron-font: init at 0.102 --- pkgs/data/fonts/aileron/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/aileron/default.nix diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/data/fonts/aileron/default.nix new file mode 100644 index 00000000000..52a96f16db0 --- /dev/null +++ b/pkgs/data/fonts/aileron/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "102"; + pname = "aileron"; +in + +fetchzip rec { + name = "${pname}-font-${majorVersion}.${minorVersion}"; + + url = "http://dotcolon.net/DL/font/${pname}.zip"; + sha256 = "04xnzdy9plzd2p02yq367h37m5ygx0w8cpkdv39cc3754ljlsxim"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype/${pname} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + ''; + + meta = with stdenv.lib; { + homepage = "http://dotcolon.net/font/${pname}/"; + description = "A helvetica font in nine weights"; + platforms = platforms.all; + maintainers = with maintainers; [ leenaars ]; + license = licenses.cc0; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4f9a45a850..60b5d78423e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14678,6 +14678,8 @@ with pkgs; adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; + aileron = callPackage ../data/fonts/aileron { }; + andagii = callPackage ../data/fonts/andagii { }; android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { }; From f3ba6e2f58b32803cc3e8fab11f047446c856122 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 20 Aug 2018 02:02:21 +0200 Subject: [PATCH 060/369] route159-font: init at 1.10 --- pkgs/data/fonts/route159/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/route159/default.nix diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix new file mode 100644 index 00000000000..7e2480a77dc --- /dev/null +++ b/pkgs/data/fonts/route159/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +let + majorVersion = "1"; + minorVersion = "10"; + pname = "route159"; +in + +fetchzip rec { + name = "${pname}-font-${majorVersion}.${minorVersion}"; + + url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; + sha256 = "1nv5csg73arvvwpac7ylh4j9n0s3qp79rbv2s4jvs2bf6gqhsq7h"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype/${pname} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + ''; + + meta = with stdenv.lib; { + homepage = "http://dotcolon.net/font/{pname}/"; + description = "A weighted sans serif font"; + platforms = platforms.all; + maintainers = with maintainers; [ leenaars ]; + license = licenses.ofl; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60b5d78423e..2d76c3e32a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15037,6 +15037,8 @@ with pkgs; proggyfonts = callPackage ../data/fonts/proggyfonts { }; + route159 = callPackage ../data/fonts/route159 { }; + sampradaya = callPackage ../data/fonts/sampradaya { }; sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { }; From a5b5536e2a720aeb559f10ff8f50b1ca7f36725a Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Mon, 20 Aug 2018 02:17:46 +0000 Subject: [PATCH 061/369] krb5: add linux keyring support This requires some minor hoop-hopping because it's involved in the Linux bootstrap, but it's nothing too complicated. Fixes #43289 --- pkgs/development/libraries/kerberos/krb5.nix | 3 ++- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 8f9c75c441d..4e3ba399cc3 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds -, openssl, openldap, libedit +, openssl, openldap, libedit, keyutils # Extra Arguments , type ? "" @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { # Provides the mig command used by the build scripts ++ optional stdenv.isDarwin bootstrap_cmds; buildInputs = [ openssl ] + ++ optionals (stdenv.hostPlatform.isLinux) [ keyutils ] ++ optionals (!libOnly) [ openldap libedit ]; preConfigure = "cd ./src"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60aa4d9e89c..11ad94fb065 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14196,7 +14196,8 @@ with pkgs; kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod }; - keyutils = callPackage ../os-specific/linux/keyutils { }; + # Using fetchurlBoot because this is used by kerberos (on Linux), which curl depends on + keyutils = callPackage ../os-specific/linux/keyutils { fetchurl = fetchurlBoot; }; libselinux = callPackage ../os-specific/linux/libselinux { }; From 09bdc30afb90a0304ba48bff8c8dfdba9d6bdc67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:10:37 +0100 Subject: [PATCH 062/369] Fabric: add license --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebbcccd6f3d..23f7e05fa22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2442,6 +2442,11 @@ in { doCheck = (!isPyPy); # https://github.com/fabric/fabric/issues/11891 propagatedBuildInputs = with self; [ paramiko pycrypto ]; buildInputs = with self; [ fudge_9 nose ]; + meta = { + description = "Pythonic remote execution"; + homepage = https://www.fabfile.org/; + license = licenses.bsd2; + }; }; faulthandler = if ! isPy3k From 7f991de7453f6200c9db2b892cd8afd1d831078b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:13:06 +0100 Subject: [PATCH 063/369] SDL_image: add license --- pkgs/development/libraries/SDL_image/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 56701e80b1f..961a0a7f5aa 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = "http://www.libsdl.org/projects/SDL_image/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + license = licenses.zlib; }; } From 1afba8790bfa7c19405fb6a8400b6cacfd5ec551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:13:58 +0100 Subject: [PATCH 064/369] SDL_mixer: add license --- pkgs/development/libraries/SDL_mixer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index d328d80d389..887319062be 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://www.libsdl.org/projects/SDL_mixer/; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + license = licenses.zlib; }; } From e180e018fea272359017ca98f4f36f98935d7f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:18:16 +0100 Subject: [PATCH 065/369] Xaw3d: add license, move build tools nativeBuildInputs --- pkgs/development/libraries/Xaw3d/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 0a71186cd4c..0a7f02f17e5 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}: +{ stdenv, fetchurl +, imake, gccmakedep, bison, flex, pkgconfig +, xlibsWrapper, libXmu, libXpm, libXp }: stdenv.mkDerivation { name = "Xaw3d-1.6.3"; @@ -6,12 +8,13 @@ stdenv.mkDerivation { url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2; sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [imake gccmakedep libXpm libXp bison flex]; - propagatedBuildInputs = [xlibsWrapper libXmu]; + nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ]; + buildInputs = [ libXpm libXp ]; + propagatedBuildInputs = [ xlibsWrapper libXmu ]; - meta = { + meta = with stdenv.lib; { description = "3D widget set based on the Athena Widget set"; platforms = stdenv.lib.platforms.unix; + license = licenses.mit; }; } From d59447c444eeb963305b5274664a2eb8ab584ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:21:30 +0100 Subject: [PATCH 066/369] 915resolution: add license --- pkgs/os-specific/linux/915resolution/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index 9591d4ef4cc..ce21887f19f 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "915resolution-0.5.3"; - + src = fetchurl { url = "http://915resolution.mango-lang.org/${name}.tar.gz"; sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n"; @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = http://915resolution.mango-lang.org/; description = "A tool to modify Intel 800/900 video BIOS"; platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.publicDomain; }; } From 0e159e042e7236de364724e53071e327614b8aec Mon Sep 17 00:00:00 2001 From: CharlesHD Date: Mon, 20 Aug 2018 11:16:21 +0200 Subject: [PATCH 067/369] hdate: init at version 1.6.02 --- maintainers/maintainer-list.nix | 5 +++++ pkgs/applications/misc/hdate/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 pkgs/applications/misc/hdate/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7f15d80a778..5bb5045c6c7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -673,6 +673,11 @@ github = "changlinli"; name = "Changlin Li"; }; + CharlesHD = { + email = "charleshdespointes@gmail.com"; + github = "CharlesHD"; + name = "Charles Huyghues-Despointes"; + }; chaoflow = { email = "flo@chaoflow.net"; github = "chaoflow"; diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/applications/misc/hdate/default.nix new file mode 100644 index 00000000000..e2f5f653d47 --- /dev/null +++ b/pkgs/applications/misc/hdate/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "1.6.02"; + name = "hdate-${version}"; + src = fetchurl { + url = "https://sourceforge.net/projects/libhdate/files/libhdate/libhdate-${version}/libhdate-${version}.tar.bz2"; + sha256 = "3c930a8deb57c01896dc37f0d7804e5a330ee8e88c4ff610b71f9d2b02c17762"; + }; + meta = { + description = "Hebrew calendar and solar astronomical times library and utilities"; + homepage = https://sourceforge.net/projects/libhdate/; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 835a12a6095..a5d6e624d86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1362,6 +1362,8 @@ with pkgs; gti = callPackage ../tools/misc/gti { }; + hdate = callPackage ../applications/misc/hdate { }; + heatseeker = callPackage ../tools/misc/heatseeker { }; hebcal = callPackage ../tools/misc/hebcal {}; From 78e94456fd02259aa3192332ce0230f8c90ed2ae Mon Sep 17 00:00:00 2001 From: CharlesHD Date: Thu, 14 Jun 2018 14:46:44 +0200 Subject: [PATCH 068/369] dozenal: init at version v12010904 --- pkgs/applications/misc/dozenal/default.nix | 61 +++++++++++++++++++ .../misc/dozenal/lua-header.patch | 16 +++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 79 insertions(+) create mode 100644 pkgs/applications/misc/dozenal/default.nix create mode 100644 pkgs/applications/misc/dozenal/lua-header.patch diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix new file mode 100644 index 00000000000..b5ae9fb567c --- /dev/null +++ b/pkgs/applications/misc/dozenal/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, ncurses, hdate, lua5_2 }: + +stdenv.mkDerivation rec { + version = "12010904"; + name = "dozenal-${version}"; + src = fetchFromGitHub { + owner = "dgoodmaniii"; + repo = "dozenal"; + rev = "v${version}"; + sha256 = "1ic63gpdda762x6ks3al71dwgmsy2isicqyr2935bd245jx8s209"; + }; + makeFlags = [ + # author do not use configure and prefix directly using $prefix + "prefix=$(out)" + # graphical version of dozdc requires xforms, which is not i nixpkgs so I turned it down + "XFORMS_FLAGS=-UXFORMS" + "LUALIB=-llua" + "bindir=$(prefix)/bin/" + ]; + # some include hardcodes the lua libraries path. This is a patch for that + patches = [ ./lua-header.patch ]; + preBuild = "cd dozenal"; + buildInputs = [ ncurses hdate lua5_2 ]; + # I remove gdozdc, as I didn't figure all it's dependency yet. + postInstall = "rm $out/bin/gdozdc"; + + meta = { + description = "A complete suite of dozenal (base twelve) programs"; + longDescription = '' + Programs + + doz --- a converter; converts decimal numbers into dozenal. Accepts + input in standard or exponential notation (i.e., "1492.2" or "1.4922e3"). + dec --- a converter; converts dozenal numbers into decimal. Accepts input + in standard or exponential notation (i.e., "X44;4" or "X;444e2"). + dozword --- converts a dozenal number (integers only) into words, + according to the Pendlebury system. + dozdc --- a full-featured scientific calculator which works in the + dozenal base. RPN command line. + tgmconv --- a converter for all standard measurements; converts to and + from TGM, Imperial, customary, and SI metric. + dozpret --- a pretty-printer for dozenal numbers; inserts spacing (or + other characters) as desired, and can also transform transdecimal digits + from 'X' to 'E' into any character or sequence of characters desired. + dozdate --- a more-or-less drop-in replacement for GNU and BSD date, it + outputs the date and time in dozenal, as well as containing some TGM + extensions. + dozstring --- a simple byte converter; absorbs a string either from + standard input or a command line argument, leaving it identical but + for the numbers, which it converts into dozenal. Options for padding + and for not converting specific numbers. + doman --- a converter which takes a dozenal integer and + emits its equivalent in a non-place-value system, such as + Roman numerals. Arbitrary ranks and symbols may be used. + Defaults to dozenal Roman numerals. + ''; + homepage = https://github.com/dgoodmaniii/dozenal/; + maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/dozenal/lua-header.patch b/pkgs/applications/misc/dozenal/lua-header.patch new file mode 100644 index 00000000000..45b76e159a1 --- /dev/null +++ b/pkgs/applications/misc/dozenal/lua-header.patch @@ -0,0 +1,16 @@ +diff -ruN dozenal-12010904/dozenal/dozcal/call_lua.c dozenal-patched/dozenal/dozcal/call_lua.c +--- dozenal-12010904/dozenal/dozcal/call_lua.c 2017-09-04 19:25:01.000000000 +0200 ++++ dozenal-patched/dozenal/dozcal/call_lua.c 2018-06-13 10:19:57.821950327 +0200 +@@ -38,9 +38,9 @@ + #include"utility.h" + #include"conv.h" + #include"proc_date.h" +-#include +-#include +-#include ++#include ++#include ++#include + + void bail(lua_State *L, int err_code, char *filename); + int file_prefix(char **s, char *t); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5d6e624d86..d43829d117c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1216,6 +1216,8 @@ with pkgs; pythonPackages = python3Packages; }; + dozenal = callPackage ../applications/misc/dozenal { }; + dpic = callPackage ../tools/graphics/dpic { }; dragon-drop = callPackage ../tools/X11/dragon-drop { From 8d539c9933f6e8593e51ff2af41cb6023fc16f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 20 Aug 2018 11:23:36 +0200 Subject: [PATCH 069/369] knot-dns, knot-resolver: major updates They're in a single commit, as splitting would break knot-resolver build. https://gitlab.labs.nic.cz/knot/knot-dns/blob/v2.7.1/NEWS https://gitlab.labs.nic.cz/knot/knot-resolver/blob/v3.0.0/NEWS --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 2bdd758b980..77d8e8fb17d 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.6.8"; + version = "2.7.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "0daee8efd6262f10c54ee6f5fb99ca4d0f72e275513ec0902032af594cac1b15"; + sha256 = "7d6ae20ada0f0ee7700d5df17f47f86b49eb21ee34977d0d70de6a0947371381"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index fbca2951766..b859645b111 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,11 +12,11 @@ inherit (stdenv.lib) optional concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "2.4.1"; + version = "3.0.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "e8044316cd897ad29b3c5284de06652e1568c4d5861e3147ec2191fbacd8d9ff"; + sha256 = "68a0137e0e15061ee7dec53a2e424aa3266611720db3843853c6e7774a414f40"; }; outputs = [ "out" "dev" ]; From b5546faf291a71cf1a6bc2efdc2f067f75d15561 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Mon, 20 Aug 2018 11:39:32 +0200 Subject: [PATCH 070/369] pythonPackages.pycrc: init at 1.21 --- .../python-modules/pycrc/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/pycrc/default.nix diff --git a/pkgs/development/python-modules/pycrc/default.nix b/pkgs/development/python-modules/pycrc/default.nix new file mode 100644 index 00000000000..e9ea8646b41 --- /dev/null +++ b/pkgs/development/python-modules/pycrc/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "PyCRC"; + version = "1.21"; + + src = fetchPypi { + inherit pname version; + sha256 = "d3b0e788b501f48ae2ff6eeb34652343c9095e4356a65df217ed29b51e4045b6"; + }; + + meta = with lib; { + homepage = https://github.com/cristianav/PyCRC; + description = "Python libraries for CRC calculations (it supports CRC-16, CRC-32, CRC-CCITT, etc)"; + license = licenses.gpl3; + maintainers = with maintainers; [ guibou ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92dd3b5cee4..3918b6b1db3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -382,6 +382,8 @@ in { pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { }); + pycrc = callPackage ../development/python-modules/pycrc { }; + pycrypto = callPackage ../development/python-modules/pycrypto { }; pycryptodome = callPackage ../development/python-modules/pycryptodome { }; From fbab1a3caec8f62c14b347974350db8f684d887c Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 20 Aug 2018 11:43:36 +0200 Subject: [PATCH 071/369] facette: 0.4.0 -> 0.4.1 --- pkgs/servers/monitoring/facette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix index 3858720bed5..f13fc739be4 100644 --- a/pkgs/servers/monitoring/facette/default.nix +++ b/pkgs/servers/monitoring/facette/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "facette-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "facette"; repo = "facette"; rev = "${version}"; - sha256 = "1m7krq439qlf7b4l4bfjw0xfvjgj67w59mh8rf7c398rky04p257"; + sha256 = "0p28s2vn18cqg8p7bzhb38wky0m98d5xv3wvf1nmg1kmwhwim6mi"; }; nativeBuildInputs = [ go pkgconfig nodejs nodePackages.npm pandoc ]; buildInputs = [ rrdtool ]; From e3cbeef9a859fb287c01eb38267d4b95f9c8327c Mon Sep 17 00:00:00 2001 From: Jake Woods Date: Sun, 12 Aug 2018 12:00:54 +1000 Subject: [PATCH 072/369] undervolt: init at 0.2.8 --- pkgs/os-specific/linux/undervolt/default.nix | 27 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/os-specific/linux/undervolt/default.nix diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix new file mode 100644 index 00000000000..e9c033acd99 --- /dev/null +++ b/pkgs/os-specific/linux/undervolt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + version = "0.2.8"; + pname = "undervolt"; + + src = fetchFromGitHub { + owner = "georgewhewell"; + repo = "undervolt"; + rev = "${version}"; + sha256 = "0crkqc5zq0gpyg031hfwdxymfc2gc1h8b6m0axzlh7gvnxlf5hra"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/georgewhewell/undervolt/; + description = "A program for undervolting Intel CPUs on Linux"; + + longDescription = '' + Undervolt is a program for undervolting Intel CPUs under Linux. It works in a similar + manner to the Windows program ThrottleStop (i.e, MSR 0x150). You can apply a fixed + voltage offset to one of 5 voltage planes, and override your systems temperature + target (CPU will throttle when this temperature is reached). + ''; + license = licenses.gpl2; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c2322d5f84..d3569abffbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22179,4 +22179,6 @@ with pkgs; powershell = callPackage ../shells/powershell { }; doing = callPackage ../applications/misc/doing { }; + + undervolt = callPackage ../os-specific/linux/undervolt { }; } From 4142020e459b52658fd56714f50cf4ccc56d66e4 Mon Sep 17 00:00:00 2001 From: Jake Woods Date: Sun, 12 Aug 2018 12:02:08 +1000 Subject: [PATCH 073/369] nixos/undervolt: adding undervolt module We want to be able to configure persistent undervolting in the NixOS configuration --- nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/undervolt.nix | 134 ++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 nixos/modules/services/hardware/undervolt.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 396e9120407..2846afea8fb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -281,6 +281,7 @@ ./services/hardware/upower.nix ./services/hardware/usbmuxd.nix ./services/hardware/thermald.nix + ./services/hardware/undervolt.nix ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix ./services/logging/fluentd.nix diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix new file mode 100644 index 00000000000..e5ef0601de3 --- /dev/null +++ b/nixos/modules/services/hardware/undervolt.nix @@ -0,0 +1,134 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.undervolt; +in { + options.services.undervolt = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to undervolt intel cpus. + ''; + }; + + verbose = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable verbose logging. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.undervolt; + defaultText = "pkgs.undervolt"; + description = '' + undervolt derivation to use. + ''; + }; + + coreOffset = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The amount of voltage to offset the CPU cores by. Accepts a floating point number. + ''; + }; + + gpuOffset = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The amount of voltage to offset the GPU by. Accepts a floating point number. + ''; + }; + + uncoreOffset = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The amount of voltage to offset uncore by. Accepts a floating point number. + ''; + }; + + analogioOffset = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The amount of voltage to offset analogio by. Accepts a floating point number. + ''; + }; + + temp = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The temperature target. Accepts a floating point number. + ''; + }; + + tempAc = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The temperature target on AC power. Accepts a floating point number. + ''; + }; + + tempBat = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The temperature target on battery power. Accepts a floating point number. + ''; + }; + }; + + config = mkIf cfg.enable { + boot.kernelModules = [ "msr" ]; + + environment.systemPackages = [ cfg.package ]; + + systemd.services.undervolt = { + path = [ pkgs.undervolt ]; + + description = "Intel Undervolting Service"; + serviceConfig = { + Type = "oneshot"; + Restart = "no"; + + # `core` and `cache` are both intentionally set to `cfg.coreOffset` as according to the undervolt docs: + # + # Core or Cache offsets have no effect. It is not possible to set different offsets for + # CPU Core and Cache. The CPU will take the smaller of the two offsets, and apply that to + # both CPU and Cache. A warning message will be displayed if you attempt to set different offsets. + ExecStart = '' + ${pkgs.undervolt}/bin/undervolt \ + ${optionalString cfg.verbose "--verbose"} \ + ${optionalString (cfg.coreOffset != null) "--core ${cfg.coreOffset}"} \ + ${optionalString (cfg.coreOffset != null) "--cache ${cfg.coreOffset}"} \ + ${optionalString (cfg.gpuOffset != null) "--gpu ${cfg.gpuOffset}"} \ + ${optionalString (cfg.uncoreOffset != null) "--uncore ${cfg.uncoreOffset}"} \ + ${optionalString (cfg.analogioOffset != null) "--analogio ${cfg.analogioOffset}"} \ + ${optionalString (cfg.temp != null) "--temp ${cfg.temp}"} \ + ${optionalString (cfg.tempAc != null) "--temp-ac ${cfg.tempAc}"} \ + ${optionalString (cfg.tempBat != null) "--temp-bat ${cfg.tempBat}"} + ''; + }; + }; + + systemd.timers.undervolt = { + description = "Undervolt timer to ensure voltage settings are always applied"; + partOf = [ "undervolt.service" ]; + wantedBy = [ "multi-user.target" ]; + timerConfig = { + OnBootSec = "2min"; + OnUnitActiveSec = "30"; + }; + }; + }; +} From be69261989b7ad87f2ef461b1721fd0d0bb2275c Mon Sep 17 00:00:00 2001 From: Florian Peter Date: Mon, 20 Aug 2018 19:08:25 +0800 Subject: [PATCH 074/369] nodejs-8_x: 8.11.3 -> 8.11.4 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 9410f017a9c..96d96f08741 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "8.11.3"; - sha256 = "1q3fc791ng1sgk0i5qnxpxri7235nkjm50zx1z34c759vhgpaz2p"; + version = "8.11.4"; + sha256 = "02d6a9sq81mbvap6h1ckwrang6wrxbkg0xxzn06wn2vbv7k7vkpv"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; } From 0be340f45595d98877b32bb9ed3ca95db234f776 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 13:37:23 +0200 Subject: [PATCH 075/369] slurm: 17.11.7 -> 17.11.9-2 --- pkgs/servers/computing/slurm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 64e4005f53f..a191d7a721d 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.11.7"; + version = "17.11.9-2"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. src = fetchFromGitHub { owner = "SchedMD"; repo = "slurm"; - # The release tags use - instead of ., and have an extra -1 suffix. - rev = "${builtins.replaceStrings ["."] ["-"] name}-1"; - sha256 = "00dgirjd75i1x6pj80avp18hx5gr3dsnh13vbkqbf0iwpd72qyhp"; + # The release tags use - instead of . + rev = "${builtins.replaceStrings ["."] ["-"] name}"; + sha256 = "1lq4ac6yjai6wh979dciw8v3d99zbd3w36rfh0vpncqm672fg1qy"; }; outputs = [ "out" "dev" ]; From f0a354437be8431f4b0f29d99f406911a3eef15e Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Mon, 20 Aug 2018 14:06:27 +0200 Subject: [PATCH 076/369] mpd: 0.20.20 -> 0.20.21 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 82c159ebc82..500f612eb02 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -36,7 +36,7 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "20"; + minor = "21"; in stdenv.mkDerivation rec { name = "mpd-${version}"; @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0v7xpsr8b4d0q9vh1wni0qbkbkxdjpn639qm2q553ckk5idas4lm"; + sha256 = "0qchvycwiai5gwkvvf44nc1jw16yhpcjmlppqlrlvicgzsanhmy3"; }; patches = [ ./x86.patch ]; From 2ec116130e5d57dce3ad4ab55eab053116cddc38 Mon Sep 17 00:00:00 2001 From: Markov Dmitry Date: Mon, 20 Aug 2018 15:19:54 +0300 Subject: [PATCH 077/369] mmc-utils: update to upstream --- pkgs/os-specific/linux/mmc-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index b491d5bbda7..533cd90a2d3 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "mmc-utils-${version}"; - version = "2015-11-18"; + version = "2018-03-27"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; - rev = "44f94b925894577f9ffcf2c418dd013a5e582648"; - sha256 = "0hkdzc71pdnscbpdpgwljcchiyancarldjyd0w609sy18bky833x"; + rev = "b4fe0c8c0e57a74c01755fa9362703b60d7ee49d"; + sha256 = "01llwan5j40mv5p867f31lm87qh0hcyhy892say60y5pxc0mzpyn"; }; makeFlags = "CC=${stdenv.cc.targetPrefix}cc"; From bbf5f232e0bf1a7dab8043ea670735fa7e6181a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 20 Aug 2018 14:05:02 +0100 Subject: [PATCH 078/369] Literate: mark as broken Incompatible with our dlang compiler, see https://github.com/NixOS/nixpkgs/pull/45355#issuecomment-414285384 --- pkgs/development/tools/literate-programming/Literate/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 4bc3e77dbaa..3f22f5b775f 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { homepage = http://literate.zbyedidia.webfactional.com/; license = licenses.mit; platforms = platforms.unix; + broken = true; # 2018-08-20 (https://github.com/NixOS/nixpkgs/pull/45355#issuecomment-414285384) }; } From 1b313a12dabe5e1584a9412d382cd4e84f526601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 20 Aug 2018 14:41:49 +0100 Subject: [PATCH 079/369] checkstyle: add wrapper in bin --- .../tools/analysis/checkstyle/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index b5e7328091e..690db9a30e1 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { version = "8.12"; @@ -9,11 +9,16 @@ stdenv.mkDerivation rec { sha256 = "000048flqhkwnjn37bh07wgn6q4m12s3h3p9piqgvxswrjc95x3y"; }; - phases = [ "installPhase" ]; + nativeBuildInputs = [ makeWrapper jre ]; + + unpackPhase = ":"; installPhase = '' - mkdir -p $out/checkstyle - cp $src $out/checkstyle/checkstyle-all.jar + runHook preInstall + install -D $src $out/checkstyle/checkstyle-all.jar + makeWrapper ${jre}/bin/java $out/bin/checkstyle \ + --add-flags "-jar $out/checkstyle/checkstyle-all.jar" + runHook postInstall ''; meta = with stdenv.lib; { From 35b8140eac6f6ea6cd473ce3dac125ceb73b2661 Mon Sep 17 00:00:00 2001 From: aanderse Date: Mon, 20 Aug 2018 09:49:08 -0400 Subject: [PATCH 080/369] perlPackages.NetSFTPForeign: init at 1.89 (#45380) * added Net::SFTP::Foreign module from CPAN * missed patching binary path * fixed up the license --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 19f09ee99b9..fc778ae3b84 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11370,6 +11370,22 @@ let }; }; + NetSFTPForeign = buildPerlPackage rec { + name = "Net-SFTP-Foreign-1.89"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; + sha256 = "9bd33e130581c1fc3eb6108eaf9056c1507428cace04a572f7afe816d83b08a7"; + }; + propagatedBuildInputs = [ pkgs.openssl ]; + patchPhase = '' + sed -i "s|$ssh_cmd = 'ssh'|$ssh_cmd = '${pkgs.openssh}/bin/ssh'|" lib/Net/SFTP/Foreign/Backend/Unix.pm + ''; + meta = { + description = "Secure File Transfer Protocol client"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetServerCoro = buildPerlPackage rec { name = "Net-Server-Coro-1.3"; src = fetchurl { From 2ba51acaeb7831f57c314854d5f55c980229723d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Aug 2018 15:04:22 +0200 Subject: [PATCH 081/369] =?UTF-8?q?gegl=5F0=5F4:=200.4.6=20=E2=86=92=200.4?= =?UTF-8?q?.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gegl/4.0.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 4a72e1fa9b0..c8b7b3b8eca 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -3,18 +3,18 @@ , libwebp, gnome3, libintl }: let - version = "0.4.6"; + version = "0.4.8"; in stdenv.mkDerivation rec { name = "gegl-${version}"; + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; + src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "1rcsa60z09jjayk0q6jam4w8rivh400a08bv2xykiv5qyr1yp5zk"; + sha256 = "0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i"; }; - # needs fonts otherwise, don't know how to pass them - configureFlags = [ "--disable-docs" ]; - enableParallelBuilding = true; doCheck = true; From 4b60e77002263c6f8f97d9dcded0c566cf5528e4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Aug 2018 15:08:23 +0200 Subject: [PATCH 082/369] =?UTF-8?q?gimp:=202.10.4=20=E2=86=92=202.10.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/graphics/gimp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 8e18d531605..15033b8b2b0 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes +{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 @@ -9,14 +9,14 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.10.4"; + version = "2.10.6"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "14pi0q3wwkapy0inqxk1hjsa2h8lff1z4wgdsyrk29jaw66pdc7z"; + sha256 = "07qh2ljbza2mph1gh8sicn27qihhj8hx3ivvry2874cfh8ghgj2f"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ]; + nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ]; propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc buildInputs = [ babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes From 0e0e96384726b0ec28a5625b1a23db4babaebe87 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 20 Aug 2018 16:10:06 +0200 Subject: [PATCH 083/369] facette: mark as broken since it requires internet It _is_ buildable, just not without an internet connection (like in hydra) --- pkgs/servers/monitoring/facette/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix index f13fc739be4..efa62e261b7 100644 --- a/pkgs/servers/monitoring/facette/default.nix +++ b/pkgs/servers/monitoring/facette/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = https://facette.io/; license = licenses.bsd3; maintainers = with maintainers; [ fgaz ]; + broken = true; # not really broken, it just requires an internet connection to build. see #45382 }; } From 2b36ced49e04253a0d9c1208480ccab6993132d6 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 20 Aug 2018 16:36:48 +0200 Subject: [PATCH 084/369] Adding vdemeester (myself) as runc and containerd package maintainer Signed-off-by: Vincent Demeester --- pkgs/applications/virtualization/containerd/default.nix | 2 +- pkgs/applications/virtualization/runc/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 882ee3047f0..2fa93af4831 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = https://containerd.tools/; description = "A daemon to control runC"; license = licenses.asl20; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline vdemeester ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 7172b172ef2..c1ec514640d 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { homepage = https://runc.io/; description = "A CLI tool for spawning and running containers according to the OCI specification"; license = licenses.asl20; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline vdemeester ]; platforms = platforms.linux; }; } From 44d07eda712c5891c198ed57245be7851761f183 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 20 Aug 2018 16:34:54 +0200 Subject: [PATCH 085/369] penna-font: init at 0.10 --- pkgs/data/fonts/penna/default.nix | 32 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/data/fonts/penna/default.nix diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix new file mode 100644 index 00000000000..893553a62ce --- /dev/null +++ b/pkgs/data/fonts/penna/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "10"; + pname = "penna"; +in + +fetchzip rec { + name = "${pname}-font-${majorVersion}.${minorVersion}"; + + url = "http://dotcolon.net/DL/font/${pname}.zip"; + sha256 = "0hk15yndm56l6rbdykpkry2flffx0567mgjcqcnsx1iyzwwla5km"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype/${pname} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + ''; + + meta = with stdenv.lib; { + homepage = "http://dotcolon.net/font/{pname}/"; + description = "Geometric sans serif designed by Sora Sagano"; + longDescription = '' + Penna is a geometric sans serif designed by Sora Sagano, + with outsized counters in the uppercase and a lowercase + with a small x-height. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ leenaars ]; + license = licenses.cc0; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d76c3e32a3..26fb1708806 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15019,6 +15019,8 @@ with pkgs; pari-seadata-small = callPackage ../data/misc/pari-seadata-small {}; + penna = callPackage ../data/fonts/penna { }; + poly = callPackage ../data/fonts/poly { }; polytopes_db = callPackage ../data/misc/polytopes_db { }; From 675bf00fd2c308583fb1ecf8c8a7910f5aa87b69 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 20 Aug 2018 16:43:57 +0200 Subject: [PATCH 086/369] seshat-font: init at 0.100 --- pkgs/data/fonts/seshat/default.nix | 37 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/data/fonts/seshat/default.nix diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix new file mode 100644 index 00000000000..36e4f2fa10f --- /dev/null +++ b/pkgs/data/fonts/seshat/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "100"; + pname = "seshat"; +in + +fetchzip rec { + name = "${pname}-font-${majorVersion}.${minorVersion}"; + + url = "http://dotcolon.net/DL/font/${pname}.zip"; + sha256 = "1zzgc2d0jrris92p3irmxjhdq8aj99alz0z7dlz25qf37lcilrir"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype/${pname} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + ''; + + meta = with stdenv.lib; { + homepage = "http://dotcolon.net/font/{pname}/"; + description = "Roman body font designed for main text by Sora Sagano"; + longDescription = '' + Seshat is a Roman body font designed for the main text. By + referring to the classical balance, we changed some lines by + omitting part of the lines such as "A" and "n". + + Also, by attaching the strength of the thickness like Optima + to the main drawing, it makes it more sharp design. + + It incorporates symbols and ligatures used in the European region. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ leenaars ]; + license = licenses.cc0; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26fb1708806..dfac67d886d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15047,6 +15047,8 @@ with pkgs; scowl = callPackage ../data/misc/scowl { }; + seshat = callPackage ../data/fonts/seshat { }; + shaderc = callPackage ../development/compilers/shaderc { }; mime-types = callPackage ../data/misc/mime-types { }; From ef6c7ae2a15a0cd4d1d8a9257a5a114709ff1aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 20 Aug 2018 11:49:11 -0300 Subject: [PATCH 087/369] numix-icon-theme: 2017-12-25 -> 18.07.17 --- pkgs/data/icons/numix-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 6b6b77ae5e8..fcff9a451a7 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "numix-icon-theme"; - version = "17-12-25"; + version = "18.07.17"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0q3hpq2jc9iwnzzqpb12g1qzjsw4ckhdqkfqf6nirl87r5drkv6j"; + sha256 = "0clh55kmhc52d33dfm2c6h3lg6ddfh8a088ir9lv1camn9kj55bd"; }; nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; From 5e37eef2a7a9729111fa37b1ce8bde5f625a49b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 20 Aug 2018 16:49:55 +0200 Subject: [PATCH 088/369] seafile-shared: 6.2.3 -> 6.2.4 --- pkgs/misc/seafile-shared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 90aac977643..6fba977e008 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: stdenv.mkDerivation rec { - version = "6.2.3"; + version = "6.2.4"; name = "seafile-shared-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "019q5xsrhl6x8ngy0mzjdakm7m63gxyw8v7a223zwpw0i86l8hms"; + sha256 = "0v6wvw8x3zfcapi0lk71mg89gy3gw2qmdiq6mhw6qbbrzvqprlmr"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; From e77133c9f064316acff031dbf6d57da0d9ef0d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 20 Aug 2018 11:58:37 -0300 Subject: [PATCH 089/369] numix-icon-theme-circle: 18-02-16 -> 18.08.17 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 5982074991f..83166105209 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { - version = "18-02-16"; + version = "18.08.17"; package-name = "numix-icon-theme-circle"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "0q08q1czsk6h0dxqscbgryr12xaakp4zbch37z0jxpwh087gnq4f"; + sha256 = "1nxgm5vf2rzbg8qh48iy0vdj12ffahlp9qhj8h0k1li03s3nf15h"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; From 5dbfd2f187e970da195e754b5a6895005eeac8e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 20 Aug 2018 12:04:55 -0300 Subject: [PATCH 090/369] numix-icon-theme-square: 18-02-16 -> 18.08.17 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 99871abe5d4..b1f92f4a350 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "numix-icon-theme-square"; - version = "18-02-16"; + version = "18.08.17"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "1gjwc0s6a7q1jby5bcwxkcmbs470m81y8s0clsm0qhcmcn1c36xj"; + sha256 = "0pn5m73zd240bk2kilcgv57xn7grhbcj5ay4w1jzzn1f4ifaa0w8"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Numix icon theme (square version)"; homepage = https://numixproject.org; license = licenses.gpl3; - platforms = platforms.linux; # Maybe other non-darwin Unix + platforms = platforms.all; maintainers = with maintainers; [ romildo ]; }; } From 7474f6747c76819fcf3d0fb48766d909b7c2e46d Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 20 Aug 2018 17:50:08 +0200 Subject: [PATCH 091/369] medio-font: init at 0.200 --- pkgs/data/fonts/medio/default.nix | 32 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/data/fonts/medio/default.nix diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix new file mode 100644 index 00000000000..8b484b3b5ef --- /dev/null +++ b/pkgs/data/fonts/medio/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "200"; + pname = "medio"; +in + +fetchzip rec { + name = "${pname}-font-${majorVersion}.${minorVersion}"; + + url = "http://dotcolon.net/DL/font/${pname}.zip"; + sha256 = "0gxcmhjlsh2pzsmj78vw4v935ax7hfk533ddlhfhfma52zyxyh7x"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype/${pname} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + ''; + + meta = with stdenv.lib; { + homepage = "http://dotcolon.net/font/{pname}/"; + description = "Serif font designed by Sora Sagano"; + longDescription = '' + Medio is a serif font designed by Sora Sagano, based roughly + on the proportions of the font Tenderness (from the same designer), + but with hairline serifs in the style of a Didone. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ leenaars ]; + license = licenses.cc0; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfac67d886d..d4e5ab6eb5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14948,6 +14948,8 @@ with pkgs; media-player-info = callPackage ../data/misc/media-player-info {}; + medio = callPackage ../data/fonts/medio { }; + mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { }; monoid = callPackage ../data/fonts/monoid { }; From f3139dd378770c2c184763ce5064f9a9236e9c29 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 20 Aug 2018 17:55:50 +0200 Subject: [PATCH 092/369] tenderness-font: init at 0.601 --- pkgs/data/fonts/tenderness/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/tenderness/default.nix diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/data/fonts/tenderness/default.nix new file mode 100644 index 00000000000..29682cc1299 --- /dev/null +++ b/pkgs/data/fonts/tenderness/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "601"; + pname = "tenderness"; +in + +fetchzip rec { + name = "${pname}-font-${majorVersion}.${minorVersion}"; + + url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; + sha256 = "0d88l5mzq0k63zsmb8d5w3hfqxy04vpv4j0j8nmj1xv6kikhhybh"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype/${pname} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + ''; + + meta = with stdenv.lib; { + homepage = "http://dotcolon.net/font/${pname}/"; + description = "Serif font designed by Sora Sagano with old-style figures"; + platforms = platforms.all; + maintainers = with maintainers; [ leenaars ]; + license = licenses.ofl; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4e5ab6eb5f..6ede5492b39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15143,6 +15143,8 @@ with pkgs; tempora_lgc = callPackage ../data/fonts/tempora-lgc { }; + tenderness = callPackage ../data/fonts/tenderness { }; + terminus_font = callPackage ../data/fonts/terminus-font { }; terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; From 3771ffd82eb6c7ff04374d401f8ce737bd65f21d Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Mon, 20 Aug 2018 14:53:39 +0200 Subject: [PATCH 093/369] tilix: 1.8.1 -> 1.8.3 --- pkgs/applications/misc/tilix/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index f30c6a63948..e101005e44e 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus -, gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd +, gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd, libsecret , perlPackages, wrapGAppsHook, xdg_utils }: stdenv.mkDerivation rec { name = "tilix-${version}"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; rev = "${version}"; - sha256 = "19dx3hlj40cqwph98pcifkm6axfszfr0v9k6sr3caw4ycml84ci1"; + sha256 = "05x2nyyb5w3122j90g0f7lh9jl7xi1nk176sl01vl2ks7zar00dq"; }; nativeBuildInputs = [ autoreconfHook dmd desktop-file-utils perlPackages.Po4a pkgconfig xdg_utils wrapGAppsHook ]; - buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus ]; + buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus libsecret ]; preBuild = '' makeFlagsArray=( @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { postInstall = with gnome3; '' ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + + wrapProgram $out/bin/tilix \ + --prefix LD_LIBRARY_PATH ":" "${libsecret}/lib" ''; From 3cf43547f4be03d1d6eb0bbfc557e2dbc13b4095 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 20 Aug 2018 13:09:15 -0400 Subject: [PATCH 094/369] lib: Use lib.fixed-points.extends to avoid repetition Another attempt after my sloppy https://github.com/NixOS/nixpkgs/commit/48ccdf322d9e7a68d0caf5833511ee3e53ec7d3a. @Infinisil, thanks again, reverted in https://github.com/NixOS/nixpkgs/commit/4794aa5de233b5bf2d1c3245946379699d023467 and explained my mistakes in https://github.com/NixOS/nixpkgs/commit/48ccdf322d9e7a68d0caf5833511ee3e53ec7d3a#commitcomment-29678643. I start with their work and provide this proof of this commit's correctness: ```nix (lib.fixedPoints.extends (lib.flip g) f) # now ((f: rattrs: self: let super = rattrs self; in super // f self super) (lib.flip g) f) # inline extends (self: let super = f self; in super // (lib.flip g) self super) # beta reduce (self: let super = f self; in super // g super self) # beta reduce (self_: let super = f self_; in super // g super self_) # alpha rename (self_: let super = f self_; in super // g super self_) # original, same ``` Eventually we might harmonize `overrideScope`'s `g` parameter with the general pattern, but I leave that breaking change as a separate step. Best not to refactor and break at once, and at least the abstractions make the oddity clearer. --- lib/customisation.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 48028042890..0107ed33d9e 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -195,9 +195,10 @@ rec { let self = f self // { newScope = scope: newScope (self // scope); callPackage = self.newScope {}; + # TODO(@Ericson2314): Haromonize argument order of `g` with everything else overrideScope = g: makeScope newScope - (self_: let super = f self_; in super // g super self_); + (lib.fixedPoints.extends (lib.flip g) f); packages = f; }; in self; From 95b7e987fb3f212c7ea229dedabafd80d35df78f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 19:22:10 +0200 Subject: [PATCH 095/369] gdata-sharp: add license --- pkgs/development/libraries/gdata-sharp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index 40e9b0ed90d..a9b79dac7b8 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -34,6 +34,8 @@ in stdenv.mkDerivation rec { The Google Data APIs provide a simple protocol for reading and writing data on the web. ''; + + license = licenses.asl20; platforms = platforms.linux; }; } From f3f05c9b6ade6c4120c92398a6bc3dec53537da3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 19:27:49 +0200 Subject: [PATCH 096/369] gdcm: add license --- pkgs/development/libraries/gdcm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index a4eab462046..cba31f45d55 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -26,14 +26,15 @@ stdenv.mkDerivation rec { buildInputs = [ cmake vtk ]; propagatedBuildInputs = [ ]; - meta = { + meta = with stdenv.lib; { description = "The grassroots cross-platform DICOM implementation"; longDescription = '' Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. GDCM includes a file format definition and a network communications protocol, both of which should be extended to provide a full set of tools for a researcher or small medical imaging vendor to interface with an existing medical database. ''; homepage = http://gdcm.sourceforge.net/; - platforms = stdenv.lib.platforms.all; + license = with licenses; [ bsd3 asl20 ]; + platforms = platforms.all; }; } From 98c7cf76a64690c4d27c20b7b865fa6017fcb9de Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 19:32:10 +0200 Subject: [PATCH 097/369] gdk_pixbuf: add license --- pkgs/development/libraries/gdk-pixbuf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 94536f8f5b6..3fb50e98c1c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -116,6 +116,7 @@ stdenv.mkDerivation rec { description = "A library for image loading and manipulation"; homepage = http://library.gnome.org/devel/gdk-pixbuf/; maintainers = [ maintainers.eelco ]; + license = licenses.lgpl21; platforms = platforms.unix; }; } From 24513e08d7e773b1b81b7baed9e70e371f888666 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 19:35:29 +0200 Subject: [PATCH 098/369] geany: fix license geany-with-vte: inherit meta data from geany --- pkgs/applications/editors/geany/default.nix | 2 +- pkgs/applications/editors/geany/with-vte.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index ed77e6f4b47..24954a602cc 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { - Plugin interface ''; homepage = https://www.geany.org/; - license = "GPL"; + license = licenses.gpl2; maintainers = []; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix index 7689ebad0f0..ac35560c7f6 100644 --- a/pkgs/applications/editors/geany/with-vte.nix +++ b/pkgs/applications/editors/geany/with-vte.nix @@ -1,7 +1,7 @@ { runCommand, makeWrapper, geany, gnome2 }: let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name; in -runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; } " +runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } " mkdir -p $out ln -s ${geany}/share $out makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib From a0f6e0552d6433d33ce0a655610b3266e4126749 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 19:39:08 +0200 Subject: [PATCH 099/369] gens-gs: add license --- pkgs/misc/emulators/gens-gs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index f5ba2ef218d..c8f1af34fa9 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU_combined }: -stdenv.mkDerivation { +stdenv.mkDerivation { name = "gens-gs-7"; src = fetchurl { @@ -15,10 +15,11 @@ stdenv.mkDerivation { # See http://ubuntuforums.org/showthread.php?p=10535837 NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; - meta = { + meta = with stdenv.lib; { homepage = https://segaretro.org/Gens/GS; description = "A Genesis/Mega Drive emulator"; platforms = [ "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + maintainers = [ maintainers.eelco ]; }; } From dbc97ef68caa475dcb5bdd29102a4c663accc9bc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 19:50:39 +0200 Subject: [PATCH 100/369] gettext: add license --- pkgs/development/libraries/gettext/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 07db27dcc79..469dcbf75bb 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Well integrated set of translation tools and documentation"; longDescription = '' @@ -76,8 +76,9 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gettext/; - maintainers = with lib.maintainers; [ zimbatm vrthra ]; - platforms = lib.platforms.all; + maintainers = with maintainers; [ zimbatm vrthra ]; + license = licenses.gpl2Plus; + platforms = platforms.all; }; } From 79a86ca11cef824c99c71d23f33044ce67db4cc4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 20 Aug 2018 12:44:29 -0500 Subject: [PATCH 101/369] audit-tmpdir: fix processing of files with spaces, quote variables --- pkgs/build-support/setup-hooks/audit-tmpdir.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh index ffaa61f2d80..0f515842ebc 100644 --- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh +++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh @@ -27,7 +27,7 @@ auditTmpdir() { fi if isScript "$i"; then - if [ -e "$(dirname $i)/.$(basename $i)-wrapped" ]; then + if [ -e "$(dirname "$i")/.$(basename "$i")-wrapped" ]; then if grep -q -F "$TMPDIR" "$i"; then echo "wrapper script $i contains a forbidden reference to $TMPDIR" exit 1 From 6efaa88fccd445af25408d072299792789be7f54 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 20 Aug 2018 18:12:13 +0000 Subject: [PATCH 102/369] $toplevel/system: buildPlatform.system -> hostPlatform.system --- nixos/modules/system/activation/top-level.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index da29e08b369..18f661ba89b 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -74,7 +74,7 @@ let echo -n "$configurationName" > $out/configuration-name echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version echo -n "$nixosLabel" > $out/nixos-version - echo -n "$system" > $out/system + echo -n "${pkgs.stdenv.hostPlatform.system}" > $out/system mkdir $out/fine-tune childCount=0 From 72f5078bebd8cad9614fe61535567d7ce4b737d3 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 20 Aug 2018 18:20:57 +0000 Subject: [PATCH 103/369] top-level.nix: stdenv.platform -> stdenv.hostPlatform.platform because stdenv.platform is stdenv.buildPlatform.platform --- nixos/modules/system/activation/top-level.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index da29e08b369..96a669d8146 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -46,7 +46,7 @@ let ln -s ${kernelPath} $out/kernel ln -s ${config.system.modulesTree} $out/kernel-modules - ${optionalString (pkgs.stdenv.platform.kernelDTB or false) '' + ${optionalString (pkgs.stdenv.hostPlatform.platform.kernelDTB or false) '' ln -s ${config.boot.kernelPackages.kernel}/dtbs $out/dtbs ''} @@ -175,7 +175,7 @@ in system.boot.loader.kernelFile = mkOption { internal = true; - default = pkgs.stdenv.platform.kernelTarget; + default = pkgs.stdenv.hostPlatform.platform.kernelTarget; type = types.str; description = '' Name of the kernel file to be passed to the bootloader. From dd3090f3b0f496f910dedd15b076090d5628e6fa Mon Sep 17 00:00:00 2001 From: Milan Svoboda Date: Mon, 20 Aug 2018 20:49:10 +0200 Subject: [PATCH 104/369] kitty: 0.11.2 -> 0.11.3 --- pkgs/applications/misc/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 0c894fb0b61..d3fff65a399 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -7,7 +7,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.11.2"; + version = "0.11.3"; name = "kitty-${version}"; format = "other"; @@ -15,7 +15,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0vmxgyxrgaqijwd51ldd8pkz7jn9hdcfib1dqr0ai614286v69hw"; + sha256 = "1fql8ayxvip8hgq9gy0dhqfvngv13gh5bf71vnc3agd80kzq1n73"; }; buildInputs = [ From 1bf19218d7234a598290189fc0028339d398b63a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 19:57:41 +0200 Subject: [PATCH 105/369] giflib-4.1: add license + description --- pkgs/development/libraries/giflib/4.1.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix index c70bda03487..941a7c27fea 100644 --- a/pkgs/development/libraries/giflib/4.1.nix +++ b/pkgs/development/libraries/giflib/4.1.nix @@ -10,9 +10,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { + description = "A library for reading and writing gif images"; branch = "4.1"; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; }; } From 3c1819fcce25555a55cb0dd3018445642b5c4506 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 20:02:23 +0200 Subject: [PATCH 106/369] ginac: add license --- pkgs/applications/science/math/ginac/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 18b13e11d35..18a5281bebb 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "GiNaC is Not a CAS"; homepage = http://www.ginac.de/; maintainers = with maintainers; [ lovek323 ]; + license = licenses.gpl2; platforms = platforms.all; }; } From 002ae44fa1ef54363a1f16974117dc7f87136549 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 20:04:06 +0200 Subject: [PATCH 107/369] gio-sharp: add license + homepage --- pkgs/development/libraries/gio-sharp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index 804da49fda9..b0a115eb4a5 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GIO API bindings"; + homepage = https://github.com/mono/gio-sharp; + license = licenses.mit; platforms = platforms.linux; }; } From 8acffe39b7d1a268616f2f637214c6025baa8355 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 20:08:12 +0200 Subject: [PATCH 108/369] gitlab: add meta data --- pkgs/applications/version-management/gitlab/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 71c62b75868..90d16d84660 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -104,4 +104,10 @@ stdenv.mkDerivation rec { inherit rubyEnv; ruby = rubyEnv.wrappedRuby; }; + + meta = with stdenv.lib; { + description = "Web-based Git-repository manager"; + homepage = https://gitlab.com; + license = licenses.mit; + }; } From 39d7a557d43ef625e4bccc7826e4062e48c03eb3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 20:11:06 +0200 Subject: [PATCH 109/369] gl117: add license + homepage --- pkgs/games/gl-117/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix index f654dfc1573..b9694811fa5 100644 --- a/pkgs/games/gl-117/default.nix +++ b/pkgs/games/gl-117/default.nix @@ -13,12 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU_combined SDL freeglut SDL_mixer autoconf automake libtool ]; - meta = { + meta = with stdenv.lib; { description = "An air combat simulator"; - maintainers = with stdenv.lib.maintainers; - [ - raskin - ]; - platforms = stdenv.lib.platforms.linux; + homepage = https://sourceforge.net/projects/gl-117; + maintainers = with maintainers; [ raskin ]; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 859ea1da4ebbeb91ef40a4bdce3f02aa5e0e6ba8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 20:12:38 +0200 Subject: [PATCH 110/369] glock: add license --- pkgs/development/tools/glock/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix index 98813f143cb..35f7a2bfdea 100644 --- a/pkgs/development/tools/glock/default.nix +++ b/pkgs/development/tools/glock/default.nix @@ -19,6 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://github.com/robfig/glock; description = "A command-line tool to lock Go dependencies to specific revisions"; + license = licenses.mit; maintainers = [ maintainers.rushmorem ]; }; } From a1129ef9cb1f528cb0730e6246880b6c113c781a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 20:16:00 +0200 Subject: [PATCH 111/369] glsurf: add license --- pkgs/applications/science/math/glsurf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index a5382934705..4de683cdce9 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf; description = "A program to draw implicit surfaces and curves"; + license = stdenv.lib.licenses.lgpl21; }; } From 06aabd8ef2b2f913615d9f5165e75e04b0d609d9 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 20:24:02 +0200 Subject: [PATCH 112/369] glusterfs: add license + homepage --- pkgs/tools/filesystems/glusterfs/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 416dde364c6..f4aa9a52fce 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -181,13 +181,12 @@ rec { inherit (s) url sha256; }; - meta = { + meta = with stdenv.lib; { inherit (s) version; description = "Distributed storage system"; - maintainers = [ - stdenv.lib.maintainers.raskin - ]; - platforms = with stdenv.lib.platforms; - linux ++ freebsd; + homepage = https://www.gluster.org; + license = licenses.lgpl3Plus; # dual licese: choice of lgpl3Plus or gpl2 + maintainers = [ maintainers.raskin ]; + platforms = with platforms; linux ++ freebsd; }; } From c0037624473afbf3623071b97a8d4edea2df403e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 20:28:40 +0200 Subject: [PATCH 113/369] gnet: add license --- pkgs/development/libraries/gnet/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index c9431420194..0b2fb9fef6c 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A network library, written in C, object-oriented, and built upon GLib"; homepage = https://developer.gnome.org/gnet/; + license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; From 2d31bede61b76cd556dd19892c1224d16721a190 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 20:37:04 +0200 Subject: [PATCH 114/369] gnuplot: add license --- pkgs/tools/graphics/gnuplot/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index d50adaa387f..f2be9fafc60 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -61,6 +61,15 @@ stdenv.mkDerivation rec { homepage = http://www.gnuplot.info/; description = "A portable command-line driven graphing utility for many platforms"; platforms = platforms.linux ++ platforms.darwin; + license = { + # Essentially a BSD license with one modifaction: + # Permission to modify the software is granted, but not the right to + # distribute the complete modified source code. Modifications are to + # be distributed as patches to the released version. Permission to + # distribute binaries produced by compiling modified sources is granted, + # provided you: ... + url = https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright; + }; maintainers = with maintainers; [ lovek323 ]; }; } From dc379a4b8ef26f7e4bb1a00874ec98bece772472 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 20:43:43 +0200 Subject: [PATCH 115/369] gnupth: add license --- pkgs/development/libraries/pth/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index 6118d9c41d6..90dc647233d 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pth-2.0.7"; - + src = fetchurl { url = "mirror://gnu/pth/${name}.tar.gz"; sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") ''; - meta = { + meta = with stdenv.lib; { description = "The GNU Portable Threads library"; homepage = http://www.gnu.org/software/pth; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl21Plus; + platforms = platforms.all; }; } From 27c74747f7e24c3be1154495cb75b6790ebe19f2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 20:45:34 +0200 Subject: [PATCH 116/369] gnuvd: add license --- pkgs/tools/misc/gnuvd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix index 9f489fee7ec..9369c31fdeb 100644 --- a/pkgs/tools/misc/gnuvd/default.nix +++ b/pkgs/tools/misc/gnuvd/default.nix @@ -8,9 +8,10 @@ stdenv.mkDerivation { sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz"; }; - meta = { + meta = with stdenv.lib; { description = "Command-line dutch dictionary application"; homepage = http://www.djcbsoftware.nl/code/gnuvd/; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + platforms = platforms.unix; }; } From 7d85ade0ccf4fdb0b93fdbd18a07249a360144d4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 20 Aug 2018 15:18:07 -0400 Subject: [PATCH 117/369] treewide: Purge `stdenv.platform` and top-level `platform` Progress towards #27069 --- nixos/modules/installer/netboot/netboot.nix | 4 ++-- .../system/boot/loader/generations-dir/generations-dir.nix | 2 +- .../modules/system/boot/loader/raspberrypi/raspberrypi.nix | 2 +- nixos/release.nix | 4 ++-- pkgs/build-support/vm/default.nix | 2 +- pkgs/development/compilers/chez/default.nix | 3 ++- pkgs/development/libraries/v8/3.16.14.nix | 2 +- pkgs/os-specific/gnu/default.nix | 2 +- pkgs/os-specific/linux/kernel/hardened-config.nix | 2 +- pkgs/os-specific/linux/rtl8723bs/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 ++---- pkgs/top-level/stage.nix | 5 +---- 12 files changed, 16 insertions(+), 20 deletions(-) diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index a4eda3c52dc..a2c8e26f62c 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -28,7 +28,7 @@ with lib; ++ (if pkgs.stdenv.system == "aarch64-linux" then [] else [ pkgs.grub2 pkgs.syslinux ]); - system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget; + system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.platform.kernelTarget; fileSystems."/" = { fsType = "tmpfs"; @@ -86,7 +86,7 @@ with lib; system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" '' #!ipxe - kernel ${pkgs.stdenv.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} initrd initrd boot ''; diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix index f8a00784034..2d27611946e 100644 --- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -13,7 +13,7 @@ let }; # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk - platform = pkgs.stdenv.platform; + inherit (pkgs.stdenv.hostPlatform) platform; in diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index f974d07da9e..9bec24c53f5 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -15,7 +15,7 @@ let inherit configTxt; }; - platform = pkgs.stdenv.platform; + inherit (pkgs.stdenv.hostPlatform) platform; builderUboot = import ./builder_uboot.nix { inherit config; inherit pkgs; inherit configTxt; }; diff --git a/nixos/release.nix b/nixos/release.nix index 1d1f8009f27..b25c684ff47 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -83,7 +83,7 @@ let in tarball // { meta = { - description = "NixOS system tarball for ${system} - ${stdenv.platform.name}"; + description = "NixOS system tarball for ${system} - ${stdenv.hostPlatform.platform.name}"; maintainers = map (x: lib.maintainers.${x}) maintainers; }; inherit config; @@ -106,7 +106,7 @@ let let configEvaled = import lib/eval-config.nix config; build = configEvaled.config.system.build; - kernelTarget = configEvaled.pkgs.stdenv.platform.kernelTarget; + kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget; in pkgs.symlinkJoin { name = "netboot"; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 221e19ca5ed..67c67c88177 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,6 +1,6 @@ { pkgs , kernel ? pkgs.linux -, img ? pkgs.stdenv.platform.kernelTarget +, img ? pkgs.stdenv.hostPlatform.platform.kernelTarget , storeDir ? builtins.storeDir , rootModules ? [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ] diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 3ffd024305d..09d68084e77 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -61,7 +61,8 @@ stdenv.mkDerivation rec { ** ** Ideally in the future this would be less of a hack and could be ** done by Chez itself. Alternatively, there could just be a big - ** case statement matching to the different stdenv.platform values... + ** case statement matching to the different stdenv.hostPlatform.platform + ** values... */ postInstall = '' m="$(ls ./work/boot)" diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index e1a9336e3a5..a7dddd14124 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -6,7 +6,7 @@ let arch = if stdenv.isAarch32 then (if stdenv.is64bit then "arm64" else "arm") else (if stdenv.is64bit then "x64" else "ia32"); - armHardFloat = stdenv.isAarch32 && (stdenv.platform.gcc.float or null) == "hard"; + armHardFloat = stdenv.isAarch32 && (stdenv.hostPlatform.platform.gcc.float or null) == "hard"; in stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 5dc52c766f1..d5760003525 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -3,7 +3,7 @@ args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool , texinfo, glibcCross, hurdPartedCross, libuuid, samba , gccCrossStageStatic, gcc -, pkgsi686Linux, newScope, platform, config +, pkgsi686Linux, newScope, config , targetPlatform, buildPlatform , overrides ? {} , buildPackages, pkgs diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 309b5f6c74e..84d1dd8a378 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -22,7 +22,7 @@ ${optionalString (versionAtLeast version "4.10") '' BUG_ON_DATA_CORRUPTION y ''} -${optionalString (stdenv.platform.kernelArch == "x86_64") '' +${optionalString (stdenv.hostPlatform.platform.kernelArch == "x86_64") '' DEFAULT_MMAP_MIN_ADDR 65536 # Prevent allocation of first 64K of memory # Reduce attack surface by disabling various emulations diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index 0263d17ead0..b1e01f705dc 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ nukeReferences ]; makeFlags = concatStringsSep " " [ - "ARCH=${stdenv.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way. + "ARCH=${stdenv.hostPlatform.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way. "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us. ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 027e4632f38..a7491632fb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13742,9 +13742,7 @@ with pkgs; nmon = callPackage ../os-specific/linux/nmon { }; # GNU/Hurd core packages. - gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { - inherit platform; - }); + gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { }); hwdata = callPackage ../os-specific/linux/hwdata { }; @@ -13865,7 +13863,7 @@ with pkgs; kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") + ++ lib.optionals ((stdenv.hostPlatform.platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 5b802aea075..06978d1067b 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -82,11 +82,8 @@ let platformCompat = self: super: let inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; in { - stdenv = super.stdenv // { - inherit (super.stdenv.buildPlatform) platform; - }; inherit buildPlatform hostPlatform targetPlatform; - inherit (buildPlatform) system platform; + inherit (buildPlatform) system; }; splice = self: super: import ./splice.nix lib self (buildPackages != null); From 943786eccf393f9539e00104f65271c88baf83fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 7 Aug 2018 19:57:35 +0200 Subject: [PATCH 118/369] nixos/terraria: Wait for daemon to stop --- nixos/modules/services/games/terraria.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index ddf17599296..31f8edca20c 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -18,6 +18,16 @@ let (boolFlag "secure" cfg.secure) (boolFlag "noupnp" cfg.noUPnP) ]; + stopScript = pkgs.writeScript "terraria-stop" '' + #!${pkgs.runtimeShell} + + if ! [ -d "/proc/$1" ]; then + exit 0 + fi + + ${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter exit Enter + ${getBin pkgs.coreutils}/bin/tail --pid="$1" -f /dev/null + ''; in { options = { @@ -124,10 +134,10 @@ in serviceConfig = { User = "terraria"; - Type = "oneshot"; - RemainAfterExit = true; + Type = "forking"; + GuessMainPID = true; ExecStart = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}"; - ExecStop = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter \"exit\" Enter"; + ExecStop = "${stopScript} $MAINPID"; }; postStart = '' From 27ecfd34e8b676438ae03be601bfca46c4f61b7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 20 Aug 2018 13:48:40 -0700 Subject: [PATCH 119/369] ace: 6.5.0 -> 6.5.1 (#45258) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ace/versions. --- pkgs/development/libraries/ace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index d1ddb17ba2f..a1741513642 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.0"; + version = "6.5.1"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "0mzkyn7bjw3h8q22ajg765dflwxnsz6b20ql23gcbqkxfjvvdyyv"; + sha256 = "1vwhyk0lrpnn78xx212d16lf7vl2q6651wc8vxqbd296x6wbnh2y"; }; enableParallelBuilding = true; From 85cbf2e6e76706fc7c786d3a52fcf6240dd0310e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 20 Aug 2018 16:52:24 -0400 Subject: [PATCH 120/369] nixos/netboot: Remove redundant setting @volth tells me that is the default for `system.boot.loader.kernelFile` anyways. --- nixos/modules/installer/netboot/netboot.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index a2c8e26f62c..ea640173c6d 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -28,7 +28,6 @@ with lib; ++ (if pkgs.stdenv.system == "aarch64-linux" then [] else [ pkgs.grub2 pkgs.syslinux ]); - system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.platform.kernelTarget; fileSystems."/" = { fsType = "tmpfs"; From 60fc04c34b2087c67c1c826fbe354c69d9f8dd69 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 20 Aug 2018 17:26:42 -0400 Subject: [PATCH 121/369] haskell lib: Add appendConfigureFlags For consistency and completeness; other helpers have these "plural" variants too. --- pkgs/development/haskell-modules/lib.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 8790b56e501..54616abc4ba 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -129,10 +129,12 @@ rec { > haskell.lib.appendConfigureFlag haskellPackages.servant "--profiling-detail=all-functions" */ - appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; }); + appendConfigureFlag = drv: x: appendConfigureFlags drv [x]; + appendConfigureFlags = drv: xs: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ xs; }); appendBuildFlag = drv: x: overrideCabal drv (drv: { buildFlags = (drv.buildFlags or []) ++ [x]; }); appendBuildFlags = drv: xs: overrideCabal drv (drv: { buildFlags = (drv.buildFlags or []) ++ xs; }); + /* removeConfigureFlag drv x is a Haskell package like drv, but with all cabal configure arguments that are equal to x removed. From 29cdef4b8940398ec5f53354ea989092053dbea1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 21 Aug 2018 00:19:31 +0200 Subject: [PATCH 122/369] linuxPackages_4_18.beegfs-module: broken --- pkgs/os-specific/linux/beegfs/kernel-module.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/beegfs/kernel-module.nix b/pkgs/os-specific/linux/beegfs/kernel-module.nix index eff0e741e61..286252b927b 100644 --- a/pkgs/os-specific/linux/beegfs/kernel-module.nix +++ b/pkgs/os-specific/linux/beegfs/kernel-module.nix @@ -41,5 +41,6 @@ in stdenv.mkDerivation { platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl2; maintainers = with maintainers; [ markuskowa ]; + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } From dd2f3fd8f8f83472387e80fe2df4840cdf955be8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 21 Aug 2018 00:19:56 +0200 Subject: [PATCH 123/369] linuxPackages_4_18.exfat-nofuse: broken --- pkgs/os-specific/linux/exfat/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 0adeac7115d..8cc481334e3 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ makefu ]; platforms = lib.platforms.linux; + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } From 8a66aacad75deb49ca0d20ee2577a9fc6be1a1f7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 21 Aug 2018 00:21:34 +0200 Subject: [PATCH 124/369] linuxPackages_4_18.openafs: broken --- pkgs/servers/openafs/1.6/module.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index bf4f36bb250..2818996e5d4 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -51,7 +51,8 @@ in stdenv.mkDerivation rec { license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.z77z maintainers.spacefrogg ]; - broken = versionOlder kernel.version "3.18"; + broken = versionOlder kernel.version "3.18" || + versionAtLeast kernel.version "4.18"; }; } From 358ca401da42c95b1c8c315c3b6d3d842bb4b9ec Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 21 Aug 2018 00:21:48 +0200 Subject: [PATCH 125/369] linuxPackages_4_18.openafs_1_8: broken --- pkgs/servers/openafs/1.8/module.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 356d3cf37c3..8eeac8696c0 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -54,7 +54,9 @@ in stdenv.mkDerivation rec { license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.z77z maintainers.spacefrogg ]; - broken = (versionOlder kernel.version "3.18") || stdenv.targetPlatform.isAarch64; + broken = (versionOlder kernel.version "3.18") || + (versionAtLeast kernel.version "4.18") || + stdenv.targetPlatform.isAarch64; }; } From 462c91d02a7eff2964c020a9830b6c093e71708e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 21 Aug 2018 00:20:55 +0200 Subject: [PATCH 126/369] linuxPackages_4_18.phc-intel: broken --- pkgs/os-specific/linux/phc-intel/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 68acbb83531..75fce129e93 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -48,5 +48,6 @@ in stdenv.mkDerivation rec { downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } From 9f55f04da25306ce762d716d194f39734fea14ee Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 21 Aug 2018 00:32:13 +0200 Subject: [PATCH 127/369] linuxPackages_4_18.spl: broken --- pkgs/os-specific/linux/spl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 58c4fc53a41..845b041c776 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } From 54903b3c12107cd0ad17088334d4285f6e51992d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 21 Aug 2018 00:21:18 +0200 Subject: [PATCH 128/369] linuxPackages_4_18.tbs: broken --- pkgs/os-specific/linux/tbs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index fec70e8c485..b6eb2f1150a 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -59,5 +59,6 @@ in stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = -1; + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } From b4531605c3f3be99d7e8e2ad101b09cc9b1f3a33 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 18 Aug 2018 14:44:46 +0200 Subject: [PATCH 129/369] apmplanner2: init at 2.0.26 I would like to see more Ground Control Stations in the nixpkgs. --- .../science/robotics/apmplanner2/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/science/robotics/apmplanner2/default.nix diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix new file mode 100644 index 00000000000..7ae44418fff --- /dev/null +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, qmake +, qtbase, qtscript, qtwebkit, qtserialport, qtsvg, qtdeclarative, qtquickcontrols2 +, alsaLib, libsndfile, flite, openssl, udev, SDL2 +}: + +stdenv.mkDerivation rec { + name = "apmplanner2-${version}"; + version = "2.0.26"; + src = fetchFromGitHub { + owner = "ArduPilot"; + repo = "apm_planner"; + rev = "${version}"; + sha256 = "0bnyi1r8k8ij5sq2zqv7mfbrxm0xdw97qrx3sk4rinqv2g6h6di4"; + }; + + qtInputs = [ + qtbase qtscript qtwebkit qtserialport qtsvg qtdeclarative qtquickcontrols2 + ]; + + buildInputs = [ alsaLib libsndfile flite openssl udev SDL2 ] ++ qtInputs; + nativeBuildInputs = [ qmake ]; + + qmakeFlags = [ "apm_planner.pro" ]; + + # this ugly hack is necessary, as `bin/apmplanner2` needs the contents of `share/APMPlanner2` inside of `bin/` + preFixup = "ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/"; + + enableParallelBuilding = true; + + meta = { + description = "Ground station software for autonomous vehicles"; + longDescription = '' + A GUI ground control station for autonomous vehicles using the MAVLink protocol. + Includes support for the APM and PX4 based controllers. + ''; + homepage = http://ardupilot.org/planner2/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.wucke13 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cb04f97305..1a97273a27b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21138,6 +21138,10 @@ with pkgs; withRootSupport = true; }); + ### SCIENCE/ROBOTICS + + apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; + ### MISC android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; From c14320353df87bc53d23b156e26202fe44a23492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 20 Aug 2018 21:15:07 -0300 Subject: [PATCH 130/369] numix-icon-theme: restrict platforms to linux --- pkgs/data/icons/numix-icon-theme/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index fcff9a451a7..35f624a00f5 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { description = "Numix icon theme"; homepage = https://numixproject.org; license = licenses.gpl3; - platforms = platforms.all; + # darwin cannot deal with file names differing only in case + platforms = platforms.linux; maintainers = with maintainers; [ romildo jgeerds ]; }; } From 0909282b1bc7c717d3f16c62c380e1d3073b84ea Mon Sep 17 00:00:00 2001 From: Carlos D Date: Tue, 21 Aug 2018 10:16:59 +1000 Subject: [PATCH 131/369] haskellPackages.mattermost-api: skip check --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3164d23ca53..d363d2e87b6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -212,6 +212,9 @@ self: super: builtins.intersectAttrs super { # Needs access to locale data, but looks for it in the wrong place. scholdoc-citeproc = dontCheck super.scholdoc-citeproc; + # Disable tests because they require a mattermost server + mattermost-api = dontCheck super.mattermost-api; + # Expect to find sendmail(1) in $PATH. mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; From 3863e40507fadf68db01352a399a4402712ae104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 20 Aug 2018 21:29:02 -0300 Subject: [PATCH 132/369] numix-icon-theme-circle: restrict platforms to linux --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 83166105209..5ac0998fb29 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { description = "Numix icon theme (circle version)"; homepage = https://numixproject.org; license = licenses.gpl3; - platforms = platforms.all; + # darwin cannot deal with file names differing only in case + platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; }; } From 8a7dfa63db95d12ee9183cea13a7d4dc0f75f20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 20 Aug 2018 21:38:41 -0300 Subject: [PATCH 133/369] numix-icon-theme-square: restrict platforms to linux --- pkgs/data/icons/numix-icon-theme-square/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index b1f92f4a350..875e1025927 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { description = "Numix icon theme (square version)"; homepage = https://numixproject.org; license = licenses.gpl3; - platforms = platforms.all; + # darwin cannot deal with file names differing only in case + platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; } From 23340918d97df787735b62b50090db72a69c8dc4 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 20 Aug 2018 21:23:54 -0400 Subject: [PATCH 134/369] vdiff-magit: Include git in nativeBuildInputs (#45314) Like magit, vdiff-magit expects git to be present at install time. --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ .../editors/emacs-modes/melpa-stable-packages.nix | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index a420c542556..bec845b815c 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -202,6 +202,12 @@ self: # missing OCaml utop = markBroken super.utop; + vdiff-magit = + (super.vdiff-magit.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + })); + # upstream issue: missing file header voca-builder = markBroken super.voca-builder; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index f3b77c708a7..61086b96230 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -194,6 +194,12 @@ self: # missing OCaml utop = markBroken super.utop; + vdiff-magit = + (super.vdiff-magit.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + })); + # upstream issue: missing file header voca-builder = markBroken super.voca-builder; From 69e5ddc456479a899b03cf547ad550982af67636 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 21 Aug 2018 09:33:40 +0800 Subject: [PATCH 135/369] unifiLTS: 5.6.37 -> 5.6.39 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 9002987c387..88e6e92ef66 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -44,8 +44,8 @@ in rec { # https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions unifiLTS = generic { - version = "5.6.37"; - sha256 = "0kiksqsbmmfva1blbpg2wl4c3w7j6dzzqmwp6028g7bh303c47qa"; + version = "5.6.39"; + sha256 = "025qq517j32r1pnabg2q8lhy65c6qsk17kzw3aijhrc2gpgj2pa7"; }; unifiStable = generic { From cabdb0c711b498bde7d422076a57772fd4cc255b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 21 Aug 2018 09:33:59 +0800 Subject: [PATCH 136/369] unifiStable: 5.7.23 -> 5.8.28 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 88e6e92ef66..cd422c420cc 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -49,8 +49,8 @@ in rec { }; unifiStable = generic { - version = "5.7.23"; - sha256 = "14jkhp9jl341zsyk5adh3g98mhqwfbd42c7wahzc31bxq8a0idp7"; + version = "5.8.28"; + sha256 = "1zyc6n54dwqy9diyqnzlwypgnj3hqcv0lfx47s4rkq3kbm49nwnl"; }; unifiTesting = generic { From 69567fc0a7cd42c8b08b36176355d3edcedc4a3a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 21 Aug 2018 09:34:15 +0800 Subject: [PATCH 137/369] unifiTesting: 5.8.14 -> 5.9.22 --- pkgs/servers/unifi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index cd422c420cc..7436c06d7b8 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -54,8 +54,8 @@ in rec { }; unifiTesting = generic { - version = "5.8.14"; - suffix = "-7ef9535d1b"; - sha256 = "09gr7zkck6npjhhmd27c9ymyna6anwj3w9v9zjicz9skbrddkccq"; + version = "5.9.22"; + suffix = "-d2a4718971"; + sha256 = "1xxpvvn0815snag4bmmsdm8zh0cb2qjrhnvlkgn8i478ja1r3n54"; }; } From 4826f9b828a751ce18316f8341cf1f2a38f1aea7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Aug 2018 20:47:20 -0500 Subject: [PATCH 138/369] qtwebengine: remove old darwin patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit file apparently doesn’t exist anymore --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index dc5f2ae96b3..7d342330491 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -103,8 +103,6 @@ EOF # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - substituteInPlace src/3rdparty/chromium/sandbox/mac/bootstrap_sandbox.cc \ - --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" ''; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; From 2616568541a6dac46e10303d29eafed698213c91 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Tue, 21 Aug 2018 08:07:33 +0200 Subject: [PATCH 139/369] Literate: 2017-05-28 -> 2018-08-20 --- .../tools/literate-programming/Literate/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 3f22f5b775f..8fbbcdb6e5f 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, dmd, dub }: stdenv.mkDerivation { - name = "Literate-2017-05-28"; + name = "Literate-2018-08-20"; src = fetchgit { url = "https://github.com/zyedidia/Literate.git"; - rev = "23928d64bb19b5101dbcc794da6119beaf59f679"; - sha256 = "094lramvacarzj8443ns18zyv7dxnivwi7kdk5xi5r2z4gx338iq"; + rev = "737567e49c9e12ac56222c147191da58ea1521e2"; + sha256 = "19v8v66lv8ayg3irqkbk7ln5lkmgwpx4wgz8h3yr81arl40bbzqs"; }; buildInputs = [ dmd dub ]; @@ -18,6 +18,5 @@ stdenv.mkDerivation { homepage = http://literate.zbyedidia.webfactional.com/; license = licenses.mit; platforms = platforms.unix; - broken = true; # 2018-08-20 (https://github.com/NixOS/nixpkgs/pull/45355#issuecomment-414285384) }; } From 5d4e3cc2f55c03f125c40fad52c1eb6a4a718b23 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 21 Aug 2018 15:53:12 +0800 Subject: [PATCH 140/369] vips: Add darwin support --- pkgs/tools/graphics/vips/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 4a5a19fefca..e2688e930cf 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, expat, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, + ApplicationServices, python27, libpng ? null }: @@ -12,18 +13,17 @@ stdenv.mkDerivation rec { sha256 = "1nymm4vzscb68aifin9q742ff64b4k4ddppq1060w8hf6h7ay0l7"; }; - buildInputs = - [ pkgconfig glib libxml2 fftw orc lcms - imagemagick openexr libtiff libjpeg - libgsf libexif python27 libpng - expat - ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxml2 fftw orc lcms + imagemagick openexr libtiff libjpeg + libgsf libexif python27 libpng expat ] + ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; meta = with stdenv.lib; { homepage = http://www.vips.ecs.soton.ac.uk; description = "Image processing system for large images"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ kovirobi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7491632fb5..13912f76a99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21893,7 +21893,9 @@ with pkgs; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { }; vimb = wrapFirefox vimb-unwrapped { }; - vips = callPackage ../tools/graphics/vips { }; + vips = callPackage ../tools/graphics/vips { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; nip2 = callPackage ../tools/graphics/nip2 { }; virglrenderer = callPackage ../development/libraries/virglrenderer { }; From a875fcc5d0231b60609501d7f5ce14a8416d0686 Mon Sep 17 00:00:00 2001 From: Karol Chmist Date: Tue, 21 Aug 2018 11:46:37 +0200 Subject: [PATCH 141/369] dotty: 0.8.0 -> 0.9.0 (#45423) --- pkgs/development/compilers/scala/dotty-bare.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 0c9625c04d5..96d19725c8b 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "0.8.0-RC1"; + version = "0.9.0-RC1"; name = "dotty-bare-${version}"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; - sha256 = "e5b7a9bb6f1007146a440ddfff871cc312075e5d69b9ab7e279ad7c3514f7065"; + sha256 = "1c24692081231415cb560ff1288ede3f0d28c8b994ce8ca7c7b06edf7978bfb8"; }; propagatedBuildInputs = [ jre ] ; From 50eb4a08da1b6f4795f33bac11a85dce723558a0 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Tue, 21 Aug 2018 12:53:38 +0300 Subject: [PATCH 142/369] fd: 7.0.0 -> 7.1.0 (#45422) --- pkgs/tools/misc/fd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 889f9d56d93..48ca8ad65c7 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "0qykzkwrj4w3i5h1a328kadd7fgd91w0z2n4xr6i3csyaiwwgd1x"; + sha256 = "11x9zqhahgyf0icfnl8xzdb2mn35jrmvxmnz5xzh581mmhs355m2"; }; - cargoSha256 = "1qicgfaqzjm7sjzgxkci6bg495n227pyicj4ycds5z6mfy15hi4q"; + cargoSha256 = "02r0lvfh37y1bij0fqmgyh8rywap714zvxrk0l108y8cqkq2ghnd"; preFixup = '' mkdir -p "$out/man/man1" From 78c8520c86a909151218cd2258a11d776845a8db Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Tue, 21 Aug 2018 09:57:35 +0000 Subject: [PATCH 143/369] hugo: 0.47 -> 0.47.1 (#45419) --- pkgs/applications/misc/hugo/default.nix | 4 ++-- pkgs/applications/misc/hugo/deps.nix | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 8293e0434cd..a6a489492e3 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.47"; + version = "0.47.1"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1h62ix285mx977mgawyanyvsqqic1xx0gmi1r5wn43w9yc29wr0z"; + sha256 = "0n27vyg66jfx4lwswsmdlybly8c9gy5rk7yhy7wzs3rwzlqv1jzj"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 061a6612ee7..47487029ea0 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "8021a62ea0dfe0ed2e6107f5ccd37e0d4a92a996"; - sha256 = "1c32sqfz78g9wxvpng8n9r404lf2lgjn9b24mg8y3rxylx29gks7"; + rev = "0bd5694c78c9c3d9a3cd06a706a8f3c59296a9ac"; + sha256 = "1laxccmzi7q51zxn81ringmdwp8iaipivrl375yc3gq56d70sp0r"; }; } { @@ -140,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/gobuffalo/envy"; - rev = "2d0f467653f3d961ce9ada4d32a230bdcb3bfe11"; - sha256 = "0p9raqrsqg2z1hq2kbvbq5qcwqihjqf28xnfh62214p7ak9b9x8n"; + rev = "3c96536452167a705ca5a70b831d3810e1e10452"; + sha256 = "0ixqpdmb7kjlarkv0qlbwnbr194sajx9flysnhcldzmciqgk5bqs"; }; } { @@ -347,8 +347,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "7c4570c3ebeb8129a1f7456d0908a8b676b6f9f1"; - sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7"; + rev = "ff0d02e8555041edecbd0ce27f32c6ea4b214483"; + sha256 = "1ilw6b2nir1bg7hmx8hrn60za37qqm18xvamv90fx5vxq85fsml9"; }; } { @@ -446,8 +446,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "aaf60122140d3fcf75376d319f0554393160eb50"; - sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv"; + rev = "922f4815f713f213882e8ef45e0d315b164d705c"; + sha256 = "1ci1rxk2d6hmfsjjc19n2sxhyn4jqr5ia3ykyah1h08p0pn7k52w"; }; } { @@ -464,8 +464,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "1c9583448a9c3aa0f9a6a5241bf73c0bd8aafded"; - sha256 = "0g0nc549pmdmvja4mdqh0kgvznnw6wliqmx5wrnj02l3a23vizmi"; + rev = "4ea2f632f6e912459fe60b26b1749377f0d889d5"; + sha256 = "16pdi4mmjlcrjdcz7k559jqnsvkhdmff68bbqq7ii1lp8vrpqqmy"; }; } { From 3ec19b174f04bd8eab390212bd2015e8e2339381 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Tue, 21 Aug 2018 13:00:11 +0300 Subject: [PATCH 144/369] watchexec: 1.8.6 -> 1.9.0 (#45426) --- pkgs/tools/misc/watchexec/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index b1704c3b46c..e376568d350 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,25 +1,23 @@ { stdenv, rustPlatform, fetchFromGitHub }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { name = "watchexec-${version}"; - version = "1.8.6"; + version = "1.9.0"; src = fetchFromGitHub { - owner = "mattgreen"; + owner = "watchexec"; repo = "watchexec"; - rev = "${version}"; - sha256 = "1jib51dbr6s1iq21inm2xfsjnz1730nyd3af1x977iqivmwdisax"; + rev = version; + sha256 = "0zp5s2dy5zbar0virvy1izjpvvgwbz7rvjmcy6bph6rb5c4bhm70"; }; - cargoSha256 = "0sm1jvx1y18h7y66ilphsqmkbdxc76xly8y7kxmqwdi4lw54i9vl"; + cargoSha256 = "1li84kq9myaw0zwx69y72f3lx01s7i9p8yays4rwvl1ymr614y1l"; meta = with stdenv.lib; { description = "Executes commands in response to file modifications"; - homepage = https://github.com/mattgreen/watchexec; + homepage = https://github.com/watchexec/watchexec; license = with licenses; [ asl20 ]; maintainers = [ maintainers.michalrus ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } From 92125b381d3487e49d4e63c3b7feaa3cc6b4a82a Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Tue, 21 Aug 2018 13:08:30 +0300 Subject: [PATCH 145/369] bat: 0.4.1 -> 0.5.0 (#45425) --- pkgs/tools/misc/bat/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 01fbe67e5f2..b8a2b391395 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -2,16 +2,17 @@ rustPlatform.buildRustPackage rec { name = "bat-${version}"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "bat"; rev = "v${version}"; - sha256 = "0fiif6b8g2hdb05s028dbcpav6ax0qap2hbsr9p2bld4z7j7321m"; + sha256 = "0ms1hmv6qx15p47l07h7szwq0bgphhskc0xca2l641159h55r6dg"; + fetchSubmodules = true; }; - cargoSha256 = "0w0y3sfrpk8sn9rls90kjqrqr62pd690ripdfbvb5ipkzizp429l"; + cargoSha256 = "1dzm44kcx3plh74qr4wghl3wqwr62hcxzlcv7mhh0vvk3z36c8d4"; nativeBuildInputs = [ cmake pkgconfig zlib ]; From 7cca16e9f1d491879cb472263449f4228a086a20 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 21 Aug 2018 13:29:17 +0300 Subject: [PATCH 146/369] spidermonkey_52: Fix on ARMv6 Arch Linux applies the CFLAGS always, as does Debian, so do the same. --- pkgs/development/interpreters/spidermonkey/52.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index bfbc48e753b..ecbb1abb40c 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -13,6 +13,12 @@ in stdenv.mkDerivation rec { buildInputs = [ readline icu zlib nspr ]; nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; + # Apparently this package fails to build correctly with modern compilers, which at least + # on ARMv6 causes polkit testsuite to break with an assertion failure in spidermonkey. + # These flags were stolen from: + # https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/js52 + NIX_CFLAGS_COMPILE = "-fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp"; + patches = [ # needed to build gnome3.gjs (fetchpatch { From 47d2f92a054b340dfc39d1a4fb30e26ffd023a2e Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 5 Jun 2018 03:18:11 -0400 Subject: [PATCH 147/369] make-ext4-fs: Fix cross compiling --- nixos/lib/make-ext4-fs.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 35a8afae4a7..88be8b73ab3 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -6,16 +6,19 @@ , storePaths , volumeLabel , uuid ? "44444444-4444-4444-8888-888888888888" +, e2fsprogs +, libfaketime +, perl }: let - sdClosureInfo = pkgs.closureInfo { rootPaths = storePaths; }; + sdClosureInfo = pkgs.buildPackages.closureInfo { rootPaths = storePaths; }; in pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; - nativeBuildInputs = with pkgs; [e2fsprogs.bin libfaketime perl]; + nativeBuildInputs = [e2fsprogs.bin libfaketime perl]; buildCommand = '' From f0957b9477822fde2403324ffb4b4780d7b353ae Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 5 Jun 2018 03:19:08 -0400 Subject: [PATCH 148/369] sd-image: Fix cross compiling --- nixos/modules/installer/cd-dvd/sd-image.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 311a5ff6967..2371be9d89a 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -12,13 +12,12 @@ with lib; let - rootfsImage = import ../../../lib/make-ext4-fs.nix { - inherit pkgs; + rootfsImage = pkgs.callPackage ../../../lib/make-ext4-fs.nix ({ inherit (config.sdImage) storePaths; volumeLabel = "NIXOS_SD"; } // optionalAttrs (config.sdImage.rootPartitionUUID != null) { uuid = config.sdImage.rootPartitionUUID; - }; + }); in { options.sdImage = { @@ -94,10 +93,10 @@ in sdImage.storePaths = [ config.system.build.toplevel ]; - system.build.sdImage = pkgs.stdenv.mkDerivation { + system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux }: stdenv.mkDerivation { name = config.sdImage.imageName; - buildInputs = with pkgs; [ dosfstools e2fsprogs mtools libfaketime utillinux ]; + nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux ]; buildCommand = '' mkdir -p $out/nix-support $out/sd-image @@ -138,7 +137,7 @@ in (cd boot; mcopy -bpsvm -i ../bootpart.img ./* ::) dd conv=notrunc if=bootpart.img of=$img seek=$START count=$SECTORS ''; - }; + }) {}; boot.postBootCommands = '' # On the first boot do some maintenance tasks From c28898dc70593ffc1057450790be1edb97311a64 Mon Sep 17 00:00:00 2001 From: Ben Ford Date: Tue, 21 Aug 2018 13:25:32 +0100 Subject: [PATCH 149/369] zerotierone: fix route handling on Linux (#45391) Add some substitutions for the ip calls in ManagedRoutes. Fixes #45022 --- pkgs/tools/networking/zerotierone/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index ac7e0148228..2853c595e43 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { }; preConfigure = '' + substituteInPlace ./osdep/ManagedRoute.cpp \ + --replace '/usr/sbin/ip' '${iproute}/bin/ip' + + substituteInPlace ./osdep/ManagedRoute.cpp \ + --replace '/sbin/ip' '${iproute}/bin/ip' + substituteInPlace ./osdep/LinuxEthernetTap.cpp \ --replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",' From 4d0756d2868a48e656d6ec94ecc3e2adb3249281 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 05:33:37 -0700 Subject: [PATCH 150/369] nwjs: 0.32.1 -> 0.32.2 (#45179) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nwjs/versions. --- pkgs/development/tools/nwjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 2020dc93d0f..90c377c4472 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { name = "nwjs-${version}"; - version = "0.32.1"; + version = "0.32.2"; src = fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then - "b96fc5af62adf0567cc376c6b90cc401c9216bb01eb4767189208a29fbae5e5b" else + "0f0p17mbr24zhzm2cf77ddy6yj4k0k181dzf4gxdf8szd5vxpliy" else "0a3b712abfa0c3e7e808b1d08ea5d53375a71060e7d144fdcb58c4fe88fa2250"; }; From 69dd5d53142848899819c885b66b8c1768d3159d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 05:34:05 -0700 Subject: [PATCH 151/369] proselint: 0.10.0 -> 0.10.2 (#45170) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/proselint/versions. --- pkgs/tools/text/proselint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index 64553392e85..c536cbbaaad 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { name = "proselint-${version}"; - version = "0.10.0"; + version = "0.10.2"; doCheck = false; # fails to pass because it tries to run in home directory src = fetchurl { url = "mirror://pypi/p/proselint/${name}.tar.gz"; - sha256 = "0kmr95mf2gij40qy4660ryfanw13vxlhpmivqia1mdbii8iziyhg"; + sha256 = "017risn0j1bjy9ygzfgphjnyjl4gk7wbrr4qv1vvrlan60wyp1rs"; }; propagatedBuildInputs = [ click future six ]; From fea3840fef113da246ca3358bbcdaeb8ac664aa0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 05:42:46 -0700 Subject: [PATCH 152/369] libical: 3.0.3 -> 3.0.4 (#45196) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libical/versions. --- pkgs/development/libraries/libical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 1efc16b2bf5..718233b0ffa 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libical-${version}"; - version = "3.0.3"; + version = "3.0.4"; outputs = [ "out" "dev" "devdoc" ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "0dhlfn6n136di4fbqd74gdaibyh5zz1vac5x8ii3bjc2d5h7hw8h"; + sha256 = "1qgpbdjd6jsivw87v5w52268kqp0rv780kli8cgb3ndlv592wlbm"; }; nativeBuildInputs = [ From 573f52451a823ee086b9b70f3e554ca54ca5ca62 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 05:47:48 -0700 Subject: [PATCH 153/369] iproute: 4.17.0 -> 4.18.0 (#45218) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/iproute2/versions. --- pkgs/os-specific/linux/iproute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index d8197edc46c..f1abf0fbe92 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.17.0"; + version = "4.18.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0vmynikcamfhakvwyk5dsffy0ymgi5mdqiwybdvqfn1ijaq93abg"; + sha256 = "0ida5njr9nacg6ym3rjvl3cc9czw0hn4akhzbqf8f4zmjl6cgrm9"; }; preConfigure = '' From 3fc5aa6cd43c6147b6d030ce5715a7ea36c70569 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 05:48:22 -0700 Subject: [PATCH 154/369] neo4j: 3.4.1 -> 3.4.5 (#45187) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neo4j/versions. --- pkgs/servers/nosql/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index fe4d285713f..c1fe1a84d15 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.4.1"; + version = "3.4.5"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "1hgpgkmz0rgdppk1rl41017369qp9lfbrdk7j3qc5dq54x8rxbjp"; + sha256 = "1fzzj227r5xjls6j5mkjam8pnhbyiqv1799n8k812pk4fqvq4lxg"; }; buildInputs = [ makeWrapper jre8 which gawk ]; From 2918ab7797f132e1ce24472d151ba54fc9e75fa3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 05:48:59 -0700 Subject: [PATCH 155/369] byobu: 5.125 -> 5.127 (#45261) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/byobu/versions. --- pkgs/tools/misc/byobu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 026c626ff77..931058cca2f 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python, perl, textual-window-manager }: stdenv.mkDerivation rec { - version = "5.125"; + version = "5.127"; name = "byobu-" + version; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; - sha256 = "1nx9vpyfn9zs8iyqnqdlskr8lqh4zlciijwd9qfpzmd50lkwh8jh"; + sha256 = "0fznlj454vgxgzfw3avmvvjpawggs66da5l8k6v0lnzzd75wgbsb"; }; doCheck = true; From 2524ad67da82f35d367e905994bd442b094f89c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 05:49:38 -0700 Subject: [PATCH 156/369] ntp: 4.2.8p11 -> 4.2.8p12 (#45180) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ntp/versions. --- pkgs/tools/networking/ntp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 19a90e2c13c..8c4462c36bc 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { - name = "ntp-4.2.8p11"; + name = "ntp-4.2.8p12"; src = fetchurl { url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "13i7rp1va29ffjdk08fvsfl6n47zzwsp147zhgb550k8agvkjjpi"; + sha256 = "0m04ndn0674kcf9x0aggjya07a3hlig2nlzzpwk7vmqka0mj56vh"; }; # The hardcoded list of allowed system calls for seccomp is From 7a72c4da1b5dae83d006f01d5a38d1542f15704c Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 21 Aug 2018 14:58:55 +0200 Subject: [PATCH 157/369] pythonPakcages.django: 1.11.13 -> 1.11.15 --- pkgs/development/python-modules/django/1_11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index ada73a7e818..ba65297dbb9 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "1.11.13"; + version = "1.11.15"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "19d4c1rlbhmbvbxvskvqjb2aw4dnf2cqi1hhdh11ykdy1a7gxba6"; + sha256 = "0h2sl02x2mxr3rl3dy750pzm5kvmx77116fys8rrgw164kc3b0mi"; }; patches = stdenv.lib.optionals withGdal [ From 690a8017de9f9e9bed8609c1798d6d4309d9794a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 05:59:11 -0700 Subject: [PATCH 158/369] eccodes: 2.8.0 -> 2.8.2 (#45251) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/eccodes/versions. --- pkgs/development/libraries/eccodes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 5f70a7571ba..5cd004c8d13 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.8.0"; + version = "2.8.2"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "06rf6yzrszfqm74sq3485c7h6m0xjnz35sm31xkk70fxgk129fp0"; + sha256 = "0aki7llrdfj6273yjy8yv0d027sdbv8xs3iv68fb69s0clyygrin"; }; nativeBuildInputs = [ cmake ]; From e59d109e09906c8b68f8984f8587dee1b63b4e96 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 21 Aug 2018 15:00:47 +0200 Subject: [PATCH 159/369] appstream-glib: remove gcab dependency --- pkgs/development/libraries/appstream-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 8a148b63e8e..48dfe9ad894 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib , gtk-doc, libarchive, gobjectIntrospection, libxslt, pngquant -, sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42 +, sqlite, libsoup, attr, acl, docbook_xsl, docbook_xml_dtd_42 , libuuid, json-glib, meson, gperf, ninja }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gettext sqlite libsoup - gcab attr acl libuuid json-glib + attr acl libuuid json-glib libarchive gobjectIntrospection gperf ]; propagatedBuildInputs = [ gtk3 ]; From abfd2143e42d12da06ce01225801100ec8036581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Aug 2018 15:39:35 +0200 Subject: [PATCH 160/369] uriparser: 0.8.5 -> 0.8.6 fixes #45343 --- .../libraries/uriparser/default.nix | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 9b4e3a74afe..c716ae7f8db 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -2,27 +2,20 @@ stdenv.mkDerivation rec { name = "uriparser-${version}"; - version = "0.8.5"; + version = "0.8.6"; + # Release tarball differs from source tarball src = fetchurl { - url = "mirror://sourceforge/project/uriparser/Sources/${version}/${name}.tar.bz2"; - sha256 = "1p9c6lr39rjl4bbzi7wl2nsg72gcz8qhicxh9v043qyr0dfcvsjq"; + url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2"; + sha256 = "0m2a5bf5b00ybagxmsa8mdj9mhc62vcm0qimy1ivfza1fbjsf287"; }; + nativeBuildInputs = [ pkgconfig cpptest doxygen graphviz ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cpptest doxygen graphviz ]; - - # There is actually no .map files to install in doc for v0.8.4 - # (dot outputs only SVG and PNG in this release) - preBuild = '' - substituteInPlace doc/Makefile.am --replace " html/*.map" "" - substituteInPlace doc/Makefile.in --replace " html/*.map" "" - ''; - + doCheck = true; meta = with stdenv.lib; { - homepage = http://uriparser.sourceforge.net/; + homepage = https://uriparser.github.io/; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. From 12940685c3390e1f7009dbc8c83b6f307f5f618e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 21 Aug 2018 17:27:11 +0300 Subject: [PATCH 161/369] fsg: fix src --- pkgs/games/fsg/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index d7487c22e28..b662588acaa 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation { name = "fsg-4.4"; src = fetchurl { - url = http://www.sourcefiles.org/Games/Simulation/Other/fsg-src-4.4.tar.gz; + name = "fsg-src-4.4.tar.gz"; + url = "https://github.com/ctrlcctrlv/wxsand/blob/master/fsg-src-4.4-ORIGINAL.tar.gz?raw=true"; sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c"; }; From 719140f8403967848bfc160f19ef9196261d20bf Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 21 Aug 2018 17:30:59 +0300 Subject: [PATCH 162/369] fusesmb: mark as broken --- pkgs/tools/filesystems/fusesmb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/pkgs/tools/filesystems/fusesmb/default.nix index 286403c70c4..ada9445218b 100644 --- a/pkgs/tools/filesystems/fusesmb/default.nix +++ b/pkgs/tools/filesystems/fusesmb/default.nix @@ -22,5 +22,7 @@ stdenv.mkDerivation rec { description = "Samba mounted via FUSE"; license = licenses.gpl2; platforms = platforms.linux; + broken = true; # Needs vulnerable Samba, missing source link + # 2018-08-21 }; } From 3fb5440074cac7433fd6f75a5e5d0f2859eb0207 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Tue, 21 Aug 2018 18:50:59 +0200 Subject: [PATCH 163/369] xapian_1_2_22: fix build (#45424) apply notmuch patch conditionally for 1.4.7 only --- pkgs/development/libraries/xapian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 8c0d065247b..f93f7ed8746 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -11,7 +11,7 @@ let inherit sha256; }; - patches = [ + patches = stdenv.lib.optional (version == "1.4.7") [ # fix notmuch build, see https://notmuchmail.org/faq/#index12h2 # cannot fetchpatch this because base directory differs # TODO: remove on next xapian update From e18d57f0e2e826497b92db6a9e6a29e8bf5012a6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 21 Aug 2018 12:05:58 -0500 Subject: [PATCH 164/369] iosevka-bin: 1.14.3 -> 2.0.0 (#45407) "iosevka" needs some work to update to 2.0.0 (config file must be used instead of arguments to make) but don't know that the two necessarily need to be at the same version. Also I "think" that using the 'ttc' zip is the equivalent of what was previously the "pack" but noting this here since haven't found this documented elsewhere and am not entirely sure. --- pkgs/data/fonts/iosevka/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 95093f4eefc..e9be004c2b7 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -1,18 +1,18 @@ { stdenv, fetchzip }: let - version = "1.14.3"; + version = "2.0.0"; in fetchzip rec { name = "iosevka-bin-${version}"; - url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; + url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka ''; - sha256 = "0qc5i6ijr25d2jwi5r4bcvbaw74y1p05a5fvlwss3l9rhmmxsfpl"; + sha256 = "17ldxs8rn4y5mzpc6h5rms4khk9fp4d1ixz5bh0pglh1kdansz45"; meta = with stdenv.lib; { homepage = https://be5invis.github.io/Iosevka/; From c47aafde87ee3d6bc5d4109a259799bdc2910ef2 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 21 Aug 2018 19:11:37 +0200 Subject: [PATCH 165/369] bowtie2: broken on aarch64 never built as far back as hydra logs go. --- pkgs/applications/science/biology/bowtie2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index deccd8a54ee..675c7d4eb0b 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://bowtie-bio.sf.net/bowtie2; maintainers = with maintainers; [ rybern ]; platforms = platforms.all; + broken = stdenv.isAarch64; }; } From 8b480313e5200f82292c8dcb0f906c0edf2083d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 10:22:16 -0700 Subject: [PATCH 166/369] jbuilder: 1.0.0 -> 1.0.1 (#45216) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jbuilder/versions. --- pkgs/development/tools/ocaml/jbuilder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index 142a30eba8d..c30478132cf 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "jbuilder-${version}"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ocaml"; repo = "dune"; rev = "${version}"; - sha256 = "08gb7l2rrfrsqvigna1cvvphww80zlvj7lqvaj4m4y9llanmnxcg"; + sha256 = "0k6r9qrbwlnb4rqwqys5fr7khwza7n7d8wpgl9jbb3xpag2zl3q9"; }; buildInputs = with ocamlPackages; [ ocaml findlib ]; From 1061c329ca346ccd0fb691905001e0e4a1e70e4f Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Tue, 21 Aug 2018 20:23:23 +0300 Subject: [PATCH 167/369] gitkraken: 4.0.1 -> 4.0.2 (#45433) --- 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 80f0786af4d..051ea080fb4 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 = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "0y4r5d21mxwnwla9ggy9c4pm3zbz67yi9z06znkdz9x2chv1ci3n"; + sha256 = "0dnckd75fcgc9wa4ivbnw2djmk4phzzr891snhxpsvb1dhlc7rgx"; }; libPath = makeLibraryPath [ From 080b8cca172da4909d556d5c3f4b349bc57264f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 8 Aug 2018 23:07:36 +0200 Subject: [PATCH 168/369] python3.pkgs.netdisco: 1.5.0 -> 2.0.0 --- pkgs/development/python-modules/netdisco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index e60233c3590..1e404370284 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "netdisco"; - version = "1.5.0"; + version = "2.0.0"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = pname; rev = version; - sha256 = "1lr0zpzdjkhcaihyxq8wv7c1wjm7xgx2sl8xmwp1kyivkgybk6n9"; + sha256 = "08x5ab7v6a20753y9br7pvfm6a054ywn7y7gh6fydqski0gad6l7"; }; propagatedBuildInputs = [ requests zeroconf netifaces ]; From 5786cba889356447d326c2129516be28b933f0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Aug 2018 01:33:44 +0200 Subject: [PATCH 169/369] python.pkgs.pyjwt: 1.5.3 -> 1.6.4 --- .../python-modules/pyjwt/default.nix | 24 +++++++++++++++ pkgs/top-level/python-packages.nix | 30 +------------------ 2 files changed, 25 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/pyjwt/default.nix diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix new file mode 100644 index 00000000000..f7d3e32f992 --- /dev/null +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi +, cryptography, ecdsa +, pytestrunner, pytestcov, pytest }: + +buildPythonPackage rec { + pname = "PyJWT"; + version = "1.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176"; + }; + + propagatedBuildInputs = [ cryptography ecdsa ]; + + checkInputs = [ pytestrunner pytestcov pytest ]; + + meta = with lib; { + description = "JSON Web Token implementation in Python"; + homepage = https://github.com/jpadilla/pyjwt; + license = licenses.mit; + maintainers = with maintainers; [ prikhi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a8e621b540..27ce0f309a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10667,35 +10667,7 @@ in { }; }; - pyjwt = buildPythonPackage rec { - version = "1.5.3"; - name = "pyjwt-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "progrium"; - repo = "pyjwt"; - rev = version; - sha256 = "109zb3ka2lvp00r9nawa0lmljfikvhcj5yny19kcipz8mqia1gs8"; - }; - - buildInputs = with self; [ pytestrunner pytestcov pytest coverage ]; - propagatedBuildInputs = with self; [ cryptography ecdsa ]; - - # We don't need this specific version - postPatch = '' - substituteInPlace setup.py --replace "pytest==2.7.3" "pytest" - ''; - - meta = { - description = "JSON Web Token implementation in Python"; - longDescription = "A Python implementation of JSON Web Token draft 01"; - homepage = https://github.com/progrium/pyjwt; - downloadPage = https://github.com/progrium/pyjwt/releases; - license = licenses.mit; - maintainers = with maintainers; [ prikhi ]; - platforms = platforms.unix; - }; - }; + pyjwt = callPackage ../development/python-modules/pyjwt { }; pykickstart = buildPythonPackage rec { name = "pykickstart-${version}"; From 41c13780cbce8ce5020b36d54150924461272964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Aug 2018 02:47:41 +0200 Subject: [PATCH 170/369] python.pkgs.cryptography: remove assert broken when overriding When overriding cryptography and cryptograohy_vectors, the assertion fails because `version` still refers to the old value. --- pkgs/development/python-modules/cryptography/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 2a8736e29de..52244ae4d96 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -20,12 +20,10 @@ , hypothesis }: -let - version = "2.3"; -in assert version == cryptography_vectors.version; buildPythonPackage rec { +buildPythonPackage rec { # also bump cryptography_vectors pname = "cryptography"; - inherit version; + version = "2.3"; src = fetchPypi { inherit pname version; @@ -64,4 +62,4 @@ in assert version == cryptography_vectors.version; buildPythonPackage rec { # IOKit's dependencies are inconsistent between OSX versions, so this is the best we # can do until nix 1.11's release __impureHostDeps = [ "/usr/lib" ]; -} \ No newline at end of file +} From 33be3c463022748449c46e4027d23ceb3d74671c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Aug 2018 02:27:55 +0200 Subject: [PATCH 171/369] home-assistant: 0.75.2 -> 0.76.1 Also simplify the way overrides are defined for better readability and use the opportunity to introduce a packageOverrides option. --- nixos/tests/home-assistant.nix | 9 +- .../home-assistant/component-packages.nix | 16 +++- pkgs/servers/home-assistant/default.nix | 93 +++++++++---------- pkgs/servers/home-assistant/frontend.nix | 4 +- .../home-assistant/parse-requirements.py | 2 +- 5 files changed, 66 insertions(+), 58 deletions(-) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 0c027eaca61..2d74b59bca4 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -2,7 +2,8 @@ import ./make-test.nix ({ pkgs, ... }: let configDir = "/var/lib/foobar"; - apiPassword = "secret"; + apiPassword = "some_secret"; + mqttPassword = "another_secret"; in { name = "home-assistant"; @@ -33,7 +34,9 @@ in { }; frontend = { }; http.api_password = apiPassword; - mqtt = { }; # Use hbmqtt as broker + mqtt = { # Use hbmqtt as broker + password = mqttPassword; + }; binary_sensor = [ { platform = "mqtt"; @@ -62,7 +65,7 @@ in { # Toggle a binary sensor using MQTT $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"off\"'"); - $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${apiPassword}' -m let_there_be_light"); + $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -m let_there_be_light"); $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'"); # Print log to ease debugging diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 30b16ea3bde..bc389146e75 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.75.2"; + version = "0.76.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -112,6 +112,7 @@ "binary_sensor.netatmo" = ps: with ps; [ ]; "binary_sensor.nx584" = ps: with ps; [ ]; "binary_sensor.octoprint" = ps: with ps; [ ]; + "binary_sensor.openuv" = ps: with ps; [ ]; "binary_sensor.pilight" = ps: with ps; [ ]; "binary_sensor.ping" = ps: with ps; [ ]; "binary_sensor.qwikswitch" = ps: with ps; [ ]; @@ -337,6 +338,7 @@ "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ]; "device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ]; "device_tracker.ping" = ps: with ps; [ ]; + "device_tracker.ritassist" = ps: with ps; [ ]; "device_tracker.sky_hub" = ps: with ps; [ ]; "device_tracker.snmp" = ps: with ps; [ pysnmp ]; "device_tracker.swisscom" = ps: with ps; [ ]; @@ -383,7 +385,6 @@ "fan.mqtt" = ps: with ps; [ paho-mqtt ]; "fan.template" = ps: with ps; [ ]; "fan.tuya" = ps: with ps; [ ]; - "fan.velbus" = ps: with ps; [ ]; "fan.wink" = ps: with ps; [ ]; "fan.xiaomi_miio" = ps: with ps; [ construct ]; "fan.zha" = ps: with ps; [ ]; @@ -536,7 +537,6 @@ "light.tplink" = ps: with ps; [ ]; "light.tradfri" = ps: with ps; [ ]; "light.tuya" = ps: with ps; [ ]; - "light.velbus" = ps: with ps; [ ]; "light.vera" = ps: with ps; [ ]; "light.wemo" = ps: with ps; [ ]; "light.wink" = ps: with ps; [ ]; @@ -600,6 +600,7 @@ "media_player.denon" = ps: with ps; [ ]; "media_player.denonavr" = ps: with ps; [ ]; "media_player.directv" = ps: with ps; [ ]; + "media_player.dlna_dmr" = ps: with ps; [ ]; "media_player.dunehd" = ps: with ps; [ ]; "media_player.emby" = ps: with ps; [ ]; "media_player.epson" = ps: with ps; [ ]; @@ -625,6 +626,7 @@ "media_player.pandora" = ps: with ps; [ pexpect ]; "media_player.philips_js" = ps: with ps; [ ]; "media_player.pioneer" = ps: with ps; [ ]; + "media_player.pjlink" = ps: with ps; [ ]; "media_player.plex" = ps: with ps; [ ]; "media_player.roku" = ps: with ps; [ ]; "media_player.russound_rio" = ps: with ps; [ ]; @@ -691,7 +693,7 @@ "notify.gntp" = ps: with ps; [ ]; "notify.group" = ps: with ps; [ ]; "notify.hipchat" = ps: with ps; [ ]; - "notify.html5" = ps: with ps; [ pyjwt aiohttp-cors ]; + "notify.html5" = ps: with ps; [ aiohttp-cors ]; "notify.instapush" = ps: with ps; [ ]; "notify.ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "notify.joaoapps_join" = ps: with ps; [ ]; @@ -723,7 +725,6 @@ "notify.synology_chat" = ps: with ps; [ ]; "notify.syslog" = ps: with ps; [ ]; "notify.telegram" = ps: with ps; [ python-telegram-bot ]; - "notify.telstra" = ps: with ps; [ ]; "notify.twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "notify.twitter" = ps: with ps; [ ]; @@ -736,6 +737,7 @@ "onboarding" = ps: with ps; [ aiohttp-cors ]; "onboarding.const" = ps: with ps; [ ]; "onboarding.views" = ps: with ps; [ ]; + "openuv" = ps: with ps; [ ]; "panel_custom" = ps: with ps; [ aiohttp-cors ]; "panel_iframe" = ps: with ps; [ aiohttp-cors ]; "persistent_notification" = ps: with ps; [ ]; @@ -850,6 +852,7 @@ "sensor.eliqonline" = ps: with ps; [ ]; "sensor.emoncms" = ps: with ps; [ ]; "sensor.enocean" = ps: with ps; [ ]; + "sensor.enphase_envoy" = ps: with ps; [ ]; "sensor.envirophat" = ps: with ps; [ ]; "sensor.envisalink" = ps: with ps; [ ]; "sensor.etherscan" = ps: with ps; [ ]; @@ -942,6 +945,7 @@ "sensor.openexchangerates" = ps: with ps; [ ]; "sensor.openhardwaremonitor" = ps: with ps; [ ]; "sensor.opensky" = ps: with ps; [ ]; + "sensor.openuv" = ps: with ps; [ ]; "sensor.openweathermap" = ps: with ps; [ pyowm ]; "sensor.otp" = ps: with ps; [ ]; "sensor.pi_hole" = ps: with ps; [ ]; @@ -965,6 +969,7 @@ "sensor.rfxtrx" = ps: with ps; [ ]; "sensor.ring" = ps: with ps; [ ]; "sensor.ripple" = ps: with ps; [ ]; + "sensor.rmvtransport" = ps: with ps; [ ]; "sensor.sabnzbd" = ps: with ps; [ ]; "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; "sensor.season" = ps: with ps; [ ephem ]; @@ -1085,6 +1090,7 @@ "switch.bbb_gpio" = ps: with ps; [ ]; "switch.broadlink" = ps: with ps; [ ]; "switch.command_line" = ps: with ps; [ ]; + "switch.deconz" = ps: with ps; [ ]; "switch.deluge" = ps: with ps; [ deluge-client ]; "switch.demo" = ps: with ps; [ ]; "switch.digital_ocean" = ps: with ps; [ digital-ocean ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5446398aa8b..9950c7bb81b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -6,60 +6,59 @@ # Additional packages to add to propagatedBuildInputs , extraPackages ? ps: [] +# Override Python packages using +# self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); } +# Applied after defaultOverrides +, packageOverrides ? self: super: { } + # Skip pip install of required packages on startup , skipPip ? true }: let - py = python3.override { + defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py - packageOverrides = self: super: { - aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "3.3.2"; + (mkOverride "aiohttp" "3.3.2" + "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12") + (mkOverride "astral" "1.6.1" + "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d") + (mkOverride "attrs" "18.1.0" + "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b") + (mkOverride "pyjwt" "1.6.4" + "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176") + (mkOverride "cryptography" "2.3.1" + "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6") + (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1 + "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46") + (mkOverride "requests" "2.19.1" + "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a") + (mkOverride "voluptuous" "0.11.5" + "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") + + # used by check_config script + # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved + (mkOverride "colorlog" "3.1.4" + "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d") + + # hass-frontend does not exist in python3.pkgs + (self: super: { + hass-frontend = self.callPackage ./frontend.nix { }; + }) + ]; + + mkOverride = attrname: version: sha256: + self: super: { + ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { + inherit version; src = oldAttrs.src.override { - inherit version; - sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12"; + inherit version sha256; }; }); - requests = super.requests.overridePythonAttrs (oldAttrs: rec { - version = "2.19.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a"; - }; - }); - voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec { - version = "0.11.5"; - src = oldAttrs.src.override { - inherit version; - sha256 = "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef"; - }; - }); - attrs = super.attrs.overridePythonAttrs (oldAttrs: rec { - version = "18.1.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b"; - }; - }); - astral = super.astral.overridePythonAttrs (oldAttrs: rec { - version = "1.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d"; - }; - }); - # used by check_config script - # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved - colorlog = super.colorlog.overridePythonAttrs (oldAttrs: rec { - version = "3.1.4"; - src = oldAttrs.src.override { - inherit version; - sha256 = "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d"; - }; - }); - hass-frontend = super.callPackage ./frontend.nix { }; }; + + py = python3.override { + # Put packageOverrides at the start so they are applied after defaultOverrides + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; componentPackages = import ./component-packages.nix; @@ -74,7 +73,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.75.2"; + hassVersion = "0.76.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -89,12 +88,12 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1ib76wz3f6jfi7a0w2v561g8vf5w4p2b2d79667api6ynvbw2l9d"; + sha256 = "0bqvb6wsbv1irp92ijdvx62vqicsqhyk301ixf8yb2d1dwwwmid3"; }; propagatedBuildInputs = [ # From setup.py - requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs + aiohttp astral async-timeout attrs certifi jinja2 pyjwt cryptography pip pytz pyyaml requests voluptuous # From http, frontend, recorder and config.config_entries components sqlalchemy aiohttp-cors hass-frontend voluptuous-serialize ] ++ componentBuildInputs ++ extraBuildInputs; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 864a91683ee..e73b239bb05 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180804.0"; + version = "20180818.0"; src = fetchPypi { inherit pname version; - sha256 = "50a9e74efe2b56fbc34fba07205829e0ea77315183e85c235d177cabff3b62ee"; + sha256 = "b6101c342e49c943c59e3525d6741cd3a23af94b65549d59bdeee8cf3f07b294"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 068b89d9a9f..95b73192698 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs ])" +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ aiohttp astral async-timeout attrs certifi jinja2 pyjwt cryptography pip pytz pyyaml requests voluptuous ])" # # This script downloads Home Assistant's source tarball. # Inside the homeassistant/components directory, each component has an associated .py file, From d72617d0a60a9d1030399af78a2f607908df2973 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 10:27:37 -0700 Subject: [PATCH 172/369] crispyDoom: 5.2 -> 5.3 (#45248) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/crispy-doom/versions. --- pkgs/games/crispy-doom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index 3c4744ebe1a..6b6aad25141 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -1,10 +1,10 @@ { stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchurl }: stdenv.mkDerivation rec { - name = "crispy-doom-5.2"; + name = "crispy-doom-5.3"; src = fetchurl { url = "https://github.com/fabiangreffrath/crispy-doom/archive/${name}.tar.gz"; - sha256 = "0arj2pn66ygzdlws80irdhald9sj0wr7cbckfs69z34ij21zzfgz"; + sha256 = "1d6pha540rwmnari2yys6bhfhm21aaz7n4p1341n8w14vagwv3ik"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; From 13f719a3a94c5c182f3f9dd27cad6cf84e589171 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 10:28:30 -0700 Subject: [PATCH 173/369] jackett: 0.9.1 -> 0.9.41 (#45209) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions. --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index ec825f856ce..774f8df94a7 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.9.1"; + version = "0.9.41"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1hj6ilhv98yzhfjvrgqrsgaz7bd1yqaayifir8ivsvqq8085nlf6"; + sha256 = "0ndzn1p876rkj56g6vscgkmyzi1k0gmqby4rmrb4ilxzjpskii8m"; }; buildInputs = [ makeWrapper ]; From cb44c3ff4cf2c15c7e870df482126bd09ce46588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 21 Aug 2018 19:32:13 +0200 Subject: [PATCH 174/369] xorg.libX11: 1.6.5 -> 1.6.6 (security) CVE-2018-14598, CVE-2018-14599, CVE-2018-14600 https://lists.x.org/archives/xorg-announce/2018-August/002915.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6f94929ffd6..c9e8dd04c47 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -740,11 +740,11 @@ let }) // {inherit windowswmproto libX11 libXext xextproto ;}; libX11 = (mkDerivation "libX11" { - name = "libX11-1.6.5"; + name = "libX11-1.6.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2; - sha256 = "0pa3cfp6h9rl2vxmkph65250gfqyki0ccqyaan6bl9d25gdr0f2d"; + url = mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2; + sha256 = "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 70f3a35505e..6e67e8eb6e1 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -60,7 +60,7 @@ mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2 +mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 From d7f0ef170232195fa1168bbcd5e8b3baef573c92 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 21 Aug 2018 20:38:26 +0300 Subject: [PATCH 175/369] altermime: fix homepage/src URL --- pkgs/tools/networking/altermime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index fee133b1d73..a77fd56f673 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.3.11"; src = fetchurl { - url = "http://www.pldaniels.com/${baseName}/${name}.tar.gz"; + url = "https://pldaniels.com/${baseName}/${name}.tar.gz"; sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7"; }; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license.fullName = "alterMIME LICENSE"; - downloadPage = "http://www.pldaniels.com/altermime/"; + downloadPage = "https://pldaniels.com/altermime/"; }; } From bcb5005a4db1a1aaa14f667ca066e97ba802ba6d Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 21 Aug 2018 19:47:51 +0200 Subject: [PATCH 176/369] spidermonkey_1_8_5: broken on aarch64 never built on hydra as far back as 2017-03-08 --- pkgs/development/interpreters/spidermonkey/1.8.5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index f333aa0b96d..bd53450de4e 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + broken = stdenv.isAarch64; # 2018-08-21, broken since 2017-03-08 }; } From 529c62cd47f62b8a41adce784b7586c546e56983 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 21 Aug 2018 20:51:41 +0300 Subject: [PATCH 177/369] gensgs: update src link --- pkgs/misc/emulators/gens-gs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index c8f1af34fa9..418d6440b69 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gens-gs-7"; src = fetchurl { - url = http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz; + url = http://retrocdn.net/images/6/6d/Gens-gs-r7.tar.gz; sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; From 8cf9425fa43e0559d826b7fed0698fc3cbc7e604 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 10:53:58 -0700 Subject: [PATCH 178/369] libqmi: 1.20.0 -> 1.20.2 (#45206) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libqmi/versions. --- pkgs/development/libraries/libqmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index a0f5ac73767..5bfa1427ab6 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }: stdenv.mkDerivation rec { - name = "libqmi-1.20.0"; + name = "libqmi-1.20.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "1d3fca477sdwbv4bsq1cl98qc8sixrzp0gqjcmjj8mlwfk9qqhi1"; + sha256 = "0i6aw8jyxv84d5x8lj2g9lb8xxf1dyad8n3q0kw164pyig55jd67"; }; outputs = [ "out" "dev" "devdoc" ]; From 8d5c22c989c0180169dd18f1844b2e07848a974c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 10:58:12 -0700 Subject: [PATCH 179/369] libmbim: 1.16.0 -> 1.16.2 (#45201) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libmbim/versions. --- pkgs/development/libraries/libmbim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 431770ef12d..d0784097779 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }: stdenv.mkDerivation rec { - name = "libmbim-1.16.0"; + name = "libmbim-1.16.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "1hpsjc7bzmakzvj8z9fffvqknc38fa8ridpmklq46jyxxnz51jn8"; + sha256 = "0qmjvjbgs9m8qsaiq5arikzglgaas9hh1968bi7sy3905kp4yjgb"; }; outputs = [ "out" "dev" "man" ]; From 1cbc8c1e573f761e53f5ee62fdd30cb930771c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Wed, 22 Aug 2018 03:00:46 +0900 Subject: [PATCH 180/369] javacard-devkit: allow overriding the java binary (#45416) --- pkgs/development/compilers/javacard-devkit/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix index 215b2e6db7d..b088e07c49e 100644 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ b/pkgs/development/compilers/javacard-devkit/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { *.so) install -vD "$i" "$out/libexec/$pname/$(basename "$i")";; *) target="$out/bin/$(basename "$i")" install -vD "$i" "$target" + sed -i -e 's|^$JAVA_HOME/bin/java|''${JAVA:-$JAVA_HOME/bin/java}|' "$target" wrapProgram "$target" \ --set JAVA_HOME "$JAVA_HOME" \ --prefix CLASSPATH : "$out/share/$pname/api_export_files" @@ -55,7 +56,9 @@ stdenv.mkDerivation rec { 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': + Then, test with 'jcwde' (NixOS-specific: you can change the java version used to run jcwde with eg. JAVA=jdb): + CLASSPATH=. jcwde [MyJcwdeConfig].app & sleep 1 && apdutool [MyApdus].apdu + Finally, convert the '.class' file into a '.cap': converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version] For more details, please refer to the documentation by Oracle ''; From 40442c852a5e0e2895c9ac03ac92b1c82fa4a543 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 11:05:54 -0700 Subject: [PATCH 181/369] fanficfare: 2.27.0 -> 2.28.0 (#45238) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fanficfare/versions. --- pkgs/tools/text/fanficfare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index e54933453b3..b31d4cf93e6 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python27Packages }: python27Packages.buildPythonApplication rec { - version = "2.27.0"; + version = "2.28.0"; name = "fanficfare-${version}"; nameprefix = ""; src = fetchurl { url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; - sha256 = "02m1fr38hvxc1kby38xz9r75x5pcm8nly4d4ibnaf9i06xkg1pn0"; + sha256 = "18icxs9yaazz9swa2g4ppjsdbl25v22fdv4c1c3xspj3hwksjlvw"; }; propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; From 73d7232ee7cea377f56fd8f4b9f0c371b9b92555 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 11:09:54 -0700 Subject: [PATCH 182/369] unixODBC: 2.3.6 -> 2.3.7 (#45133) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/unixODBC/versions. --- pkgs/development/libraries/unixODBC/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index ccd243e1f73..1275df69f59 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unixODBC-${version}"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz"; - sha256 = "0sads5b8cmmj526gyjba7ccknl1vbhkslfqshv1yqln08zv3gdl8"; + sha256 = "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5"; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; From d1dbd50d856d3873b0f2c70fdb2c7ec1b7eff477 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 21 Aug 2018 18:10:21 +0000 Subject: [PATCH 183/369] bibtex2html: 1.98 -> 1.99 (#45434) --- pkgs/tools/misc/bibtex2html/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index e34eea8b10c..89d68461431 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bibtex2html-${version}"; - version = "1.98"; + version = "1.99"; src = fetchurl { - url = https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz; - sha256 = "1mh6hxmc9qv05hgjc11m2zh5mk9mk0kaqp59pny18ypqgfws09g9"; + url = https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.99.tar.gz; + sha256 = "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j"; }; buildInputs = [ ocaml ]; From d5003f5f737b055b0bb97df74004cce9d0c7f5fa Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 17 Aug 2018 09:13:44 -0400 Subject: [PATCH 184/369] added a helper function to make a PERL5LIB environment variable for a list of perlPackages and all associated runtime dependencies --- pkgs/top-level/perl-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7f09630debf..51413009e68 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -28,6 +28,14 @@ let checkPhase = "./Build test"; }); + # Helper function to make a PERL5LIB environment variable for a list of perlPackages and all associated runtime dependencies + makePerl5Lib = deps: + with stdenv; + lib.concatStringsSep ":" [ + (lib.makePerlPath deps) + (lib.concatStringsSep ":" (map (dep: dep + "/lib/perl5/site_perl") (builtins.filter (dep: dep != null) (lib.flatten (map (dep: lib.getOutput "propagatedBuildInputs" dep) deps))))) + ] + ; ack = buildPerlPackage rec { name = "ack-2.24"; From 74d446176e66d6250ce977011d49a8dd72d6b114 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 17 Aug 2018 14:16:38 -0400 Subject: [PATCH 185/369] as requested: - moved function into strings.nix - renamed function from makePerl5Lib - removed duplicates entries in the resulting value - rewrote the function from scratch after learning a few things (much cleaner now) --- lib/default.nix | 2 +- lib/strings.nix | 16 ++++++++++++++++ pkgs/top-level/perl-packages.nix | 8 -------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index c1a4a1e39a8..dd6fcec75e2 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -80,7 +80,7 @@ let inherit (strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep concatImapStringsSep makeSearchPath makeSearchPathOutput - makeLibraryPath makeBinPath makePerlPath optionalString + makeLibraryPath makeBinPath makePerlPath makeFullPerlPath optionalString hasPrefix hasSuffix stringToCharacters stringAsChars escape escapeShellArg escapeShellArgs replaceChars lowerChars upperChars toLower toUpper addContextFrom splitString diff --git a/lib/strings.nix b/lib/strings.nix index 7cd09a10939..64b5e83ff9b 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -126,6 +126,22 @@ rec { */ makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl"; + /* Construct a perl search path recursively including all dependencies (such as $PERL5LIB) + + Example: + pkgs = import { } + makeFullPerlPath [ pkgs.perlPackages.CGI ] + => "/nix/store/fddivfrdc1xql02h9q500fpnqy12c74n-perl-CGI-4.38/lib/perl5/site_perl:/nix/store/8hsvdalmsxqkjg0c5ifigpf31vc4vsy2-perl-HTML-Parser-3.72/lib/perl5/site_perl:/nix/store/zhc7wh0xl8hz3y3f71nhlw1559iyvzld-perl-HTML-Tagset-3.20/lib/perl5/site_perl" + */ + makeFullPerlPath = deps: + let + recurse = dep: + [ dep ] ++ dep.propagatedBuildInputs ++ (map (arg: recurse arg) dep.propagatedBuildInputs) + ; + in + makePerlPath (lib.unique (lib.flatten (map (arg: recurse arg) deps))) + ; + /* Depending on the boolean `cond', return either the given string or the empty string. Useful to concatenate against a bigger string. diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 51413009e68..7f09630debf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -28,14 +28,6 @@ let checkPhase = "./Build test"; }); - # Helper function to make a PERL5LIB environment variable for a list of perlPackages and all associated runtime dependencies - makePerl5Lib = deps: - with stdenv; - lib.concatStringsSep ":" [ - (lib.makePerlPath deps) - (lib.concatStringsSep ":" (map (dep: dep + "/lib/perl5/site_perl") (builtins.filter (dep: dep != null) (lib.flatten (map (dep: lib.getOutput "propagatedBuildInputs" dep) deps))))) - ] - ; ack = buildPerlPackage rec { name = "ack-2.24"; From 343e10aaa6c1db3313cf744427538b170182a9ad Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 20 Aug 2018 18:35:02 -0400 Subject: [PATCH 186/369] function rewritten by @Infinisil --- lib/strings.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 64b5e83ff9b..af932ce6ecf 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -133,14 +133,7 @@ rec { makeFullPerlPath [ pkgs.perlPackages.CGI ] => "/nix/store/fddivfrdc1xql02h9q500fpnqy12c74n-perl-CGI-4.38/lib/perl5/site_perl:/nix/store/8hsvdalmsxqkjg0c5ifigpf31vc4vsy2-perl-HTML-Parser-3.72/lib/perl5/site_perl:/nix/store/zhc7wh0xl8hz3y3f71nhlw1559iyvzld-perl-HTML-Tagset-3.20/lib/perl5/site_perl" */ - makeFullPerlPath = deps: - let - recurse = dep: - [ dep ] ++ dep.propagatedBuildInputs ++ (map (arg: recurse arg) dep.propagatedBuildInputs) - ; - in - makePerlPath (lib.unique (lib.flatten (map (arg: recurse arg) deps))) - ; + makeFullPerlPath = deps: makePerlPath (lib.misc.closePropagation deps); /* Depending on the boolean `cond', return either the given string or the empty string. Useful to concatenate against a bigger string. From c53e00425795c2eea7f17f5a863f8b204aa14a55 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 21 Aug 2018 13:11:12 +0200 Subject: [PATCH 187/369] bazel: distinguish darwin patches from generic patches The '' + '' somewhere in the middle is easily missed and extremely inelegant. Also removes unnecessary `stdenv` qualifiers from calls to `lib`. --- .../tools/build-managers/bazel/default.nix | 120 +++++++++--------- 1 file changed, 62 insertions(+), 58 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index acb58863e6b..27ec84f861e 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -9,7 +9,7 @@ }: let - srcDeps = stdenv.lib.singleton ( + srcDeps = lib.singleton ( fetchurl { url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip"; sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { version = "0.15.2"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; @@ -74,71 +74,75 @@ stdenv.mkDerivation rec { } ''; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - # Disable Bazel's Xcode toolchain detection which would configure compilers - # and linkers from Xcode instead of from PATH - export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 + postPatch = let + darwinPatches = '' + # Disable Bazel's Xcode toolchain detection which would configure compilers + # and linkers from Xcode instead of from PATH + export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 - # Framework search paths aren't added by bintools hook - # https://github.com/NixOS/nixpkgs/pull/41914 - export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + # Framework search paths aren't added by bintools hook + # https://github.com/NixOS/nixpkgs/pull/41914 + export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" - # libcxx includes aren't added by libcxx hook - # https://github.com/NixOS/nixpkgs/pull/41589 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + # libcxx includes aren't added by libcxx hook + # https://github.com/NixOS/nixpkgs/pull/41589 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" - # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ - scripts/bootstrap/compile.sh \ - src/tools/xcode/realpath/BUILD \ - src/tools/xcode/stdredirect/BUILD \ - tools/osx/BUILD + # don't use system installed Xcode to run clang, use Nix clang instead + sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD - # clang installed from Xcode has a compatibility wrapper that forwards - # invocations of gcc to clang, but vanilla clang doesn't - sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl + # clang installed from Xcode has a compatibility wrapper that forwards + # invocations of gcc to clang, but vanilla clang doesn't + sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl - sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl - wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) - for wrapper in "''${wrappers[@]}"; do - sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper - done - '' + '' - find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do - substituteInPlace "$path" \ - --replace /bin/bash ${customBash}/bin/bash \ - --replace /usr/bin/env ${coreutils}/bin/env - done - # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. - substituteInPlace scripts/bootstrap/compile.sh \ - --replace /bin/sh ${customBash}/bin/bash + sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl + wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + for wrapper in "''${wrappers[@]}"; do + sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper + done + ''; + genericPatches = '' + find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do + substituteInPlace "$path" \ + --replace /bin/bash ${customBash}/bin/bash \ + --replace /usr/bin/env ${coreutils}/bin/env + done + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. + substituteInPlace scripts/bootstrap/compile.sh \ + --replace /bin/sh ${customBash}/bin/bash - echo "build --experimental_distdir=${distDir}" >> .bazelrc - echo "fetch --experimental_distdir=${distDir}" >> .bazelrc - echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc - echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc - echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc - echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + echo "build --experimental_distdir=${distDir}" >> .bazelrc + echo "fetch --experimental_distdir=${distDir}" >> .bazelrc + echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc + echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc + echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc + echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc + sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - # --experimental_strict_action_env (which will soon become the - # default, see bazelbuild/bazel#2574) hardcodes the default - # action environment to a value that on NixOS at least is bogus. - # So we hardcode it to something useful. - substituteInPlace \ - src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \ - --replace /bin:/usr/bin ${defaultShellPath} + # --experimental_strict_action_env (which will soon become the + # default, see bazelbuild/bazel#2574) hardcodes the default + # action environment to a value that on NixOS at least is bogus. + # So we hardcode it to something useful. + substituteInPlace \ + src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \ + --replace /bin:/usr/bin ${defaultShellPath} - # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash - echo "PATH=$PATH:${defaultShellPath}" >> runfiles.bash.tmp - cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp - mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash + # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash + echo "PATH=$PATH:${defaultShellPath}" >> runfiles.bash.tmp + cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp + mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash - patchShebangs . - ''; + patchShebangs . + ''; + in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + + genericPatches; buildInputs = [ jdk From ec3c3c824eb5bbdc2baeabff6b221b68e7166160 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 21 Aug 2018 14:08:18 +0200 Subject: [PATCH 188/369] bazel: substitute the perl path for bash completions --- pkgs/development/tools/build-managers/bazel/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 27ec84f861e..8d4b95c8808 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, runCommand, makeWrapper , jdk, zip, unzip, bash, writeCBin, coreutils -, which, python, gnused, gnugrep, findutils +, which, python, perl, gnused, gnugrep, findutils # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -139,6 +139,11 @@ stdenv.mkDerivation rec { cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash + # the bash completion requires perl + # https://github.com/bazelbuild/bazel/issues/5943 + substituteInPlace scripts/bazel-complete-template.bash \ + --replace "perl" "${perl}/bin/perl" + patchShebangs . ''; in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches From 5a07d74387184fc6df9341bc3f1ab1e5b81c038c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 11:15:44 -0700 Subject: [PATCH 189/369] infiniband-diags: 2.0.0 -> 2.1.0 (#45210) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/infiniband-diags/versions. --- pkgs/tools/networking/infiniband-diags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/infiniband-diags/default.nix b/pkgs/tools/networking/infiniband-diags/default.nix index 2ed5346b551..fbca48fa17c 100644 --- a/pkgs/tools/networking/infiniband-diags/default.nix +++ b/pkgs/tools/networking/infiniband-diags/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "infiniband-diags-${version}"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "infiniband-diags"; rev = version; - sha256 = "06x8yy3ly1vzraznc9r8pfsal9mjavxzhgrla3q2493j5jz0sx76"; + sha256 = "1qgyyvnig28x1m47df0zx6b2rcb5nm1k8r02zx7wzfb5pn9k2zh1"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig makeWrapper ]; From 1816f09f00b830729924adad92ace44363110c6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 11:17:28 -0700 Subject: [PATCH 190/369] freetds: 1.00.91 -> 1.00.94 (#45234) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/freetds/versions. --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 52d439918aa..4f07316bd3f 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.91"; + version = "1.00.94"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "04c344xdvh2j36r01ph7yhy5rb1668il0z9vyphwdy6qqwywh622"; + sha256 = "1r03ns0jp2sbbivys5bks376vbdqbnx8v764kjh74gpbajjmkksz"; }; buildInputs = [ From bd9bca4c01a587a540e7122baeac69f1c7b10ac3 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 21 Aug 2018 20:38:09 +0200 Subject: [PATCH 191/369] mono5: mark 5.x broken on aarch64 5.x has been broken on hydra since 2017-07-06 --- pkgs/development/compilers/mono/generic-cmake.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index 57d5fc0c83b..9665f5006ed 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -80,11 +80,13 @@ stdenv.mkDerivation rec { inherit enableParallelBuilding; - meta = { + meta = with stdenv.lib; { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; - platforms = with stdenv.lib.platforms; darwin ++ linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ]; - license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? + platforms = with platforms; darwin ++ linux; + maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; + license = licenses.free; # Combination of LGPL/X11/GPL ? + # 2018-08-21: mono 5.x is broken on aarch64 since at least 2017-07-06 + broken = stdenv.isAarch64 && (versionAtLeast version "5"); }; } From 185cd8baa8ad83ccc7672fde2074963465556744 Mon Sep 17 00:00:00 2001 From: baracoder Date: Tue, 21 Aug 2018 20:51:54 +0200 Subject: [PATCH 192/369] smartgithg: 17.1.4 -> 18.1.4 (#45250) --- .../applications/version-management/smartgithg/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 519f339a508..106b66bcfec 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "smartgithg-${version}"; - version = "17_1_4"; + version = "18_1_4"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz"; - sha256 = "1x8s1mdxg7m3fy3izgnb1smrn4ng3q31x0sqnjlchkb5vx7gp5rh"; + sha256 = "18gyfcs5g7xq8fqnn1zjzx350jaynrniain0giay8sxych12p4cm"; }; nativeBuildInputs = [ makeWrapper ]; @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { mkdir -pv ${pkg_path} # unpacking should have produced a dir named 'smartgit' cp -a smartgit/* ${pkg_path} + # prevent using packaged jre + rm -r ${pkg_path}/jre mkdir -pv ${bin_path} jre=${jre.home} makeWrapper ${pkg_path}/bin/smartgit.sh ${bin_path}/smartgit \ @@ -45,6 +47,7 @@ stdenv.mkDerivation rec { --prefix JRE_HOME : ${jre} \ --prefix JAVA_HOME : ${jre} \ --prefix SMARTGITHG_JAVA_HOME : ${jre} + sed -i '/ --login/d' ${pkg_path}/bin/smartgit.sh patchShebangs $out cp ${bin_path}/smartgit ${bin_path}/smartgithg From e04f5c925e07840636c46f74b1069c64b1eb28c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 11:53:28 -0700 Subject: [PATCH 193/369] acpica-tools: 20180629 -> 20180810 (#45255) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/acpica-tools/versions. --- pkgs/tools/system/acpica-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 7e480a0a17d..c738b611f94 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "acpica-tools-${version}"; - version = "20180629"; + version = "20180810"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "0kwssazw7pqgxvxj41q5r0g83bqqk64f2lrpnfjn9p6v58zizlbh"; + sha256 = "1wqy5kizmlk8y92vqhj387j5j9cfzaxxn55r490jxibl1qfr2hr6"; }; NIX_CFLAGS_COMPILE = "-O3"; From 28e51c7ceac1c3df219dbf8388bf122f817459b7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 21 Aug 2018 14:58:14 -0400 Subject: [PATCH 194/369] ghc: Use stable URL for deterministic profiling patch. --- pkgs/development/compilers/ghc/8.4.3.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 923b5b6647b..522dd9cfbf0 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -99,8 +99,9 @@ stdenv.mkDerivation (rec { extraPrefix = "utils/hsc2hs/"; stripLen = 1; })] ++ stdenv.lib.optional deterministicProfiling - (fetchpatch { - url = "https://phabricator-files.haskell.org/file/data/yd2fclrwulila2quki5q/PHID-FILE-lr2j63hkglwauprxycrt/D4388.diff"; + (fetchpatch rec { + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D4388.diff"; sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s"; }) ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch; From c93660a7a434246da36ed4913f235092f2f25a7c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 25 Apr 2018 20:30:22 +0200 Subject: [PATCH 195/369] harfbuzz: add CoreText support --- pkgs/development/libraries/harfbuzz/default.nix | 13 ++++++++++--- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index f75d08022c6..ff60afc1f2b 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. +, ApplicationServices, CoreText +, withCoreText ? false , withIcu ? false # recommended by upstream as default, but most don't needed and it's big , withGraphite2 ? true # it is small and major distros do include it , python @@ -27,12 +29,17 @@ stdenv.mkDerivation { outputBin = "dev"; configureFlags = [ - ( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default - ( "--with-icu=" + (if withIcu then "yes" else "no") ) + # not auto-detected by default + "--with-coretext=${if withCoreText then "yes" else "no"}" + "--with-graphite2=${if withGraphite2 then "yes" else "no"}" + "--with-icu=${if withIcu then "yes" else "no"}" ]; nativeBuildInputs = [ pkgconfig libintl ]; - buildInputs = [ glib freetype cairo ]; # recommended by upstream + + buildInputs = [ glib freetype cairo ] # recommended by upstream + ++ stdenv.lib.optionals withCoreText [ ApplicationServices CoreText ]; + propagatedBuildInputs = [] ++ optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 302ff26ed40..a859fd56fa4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9767,10 +9767,12 @@ with pkgs; }; libheimdal = heimdal.override { type = "lib"; }; - harfbuzz = callPackage ../development/libraries/harfbuzz { }; + harfbuzz = callPackage ../development/libraries/harfbuzz { + inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreText; + }; harfbuzz-icu = harfbuzz.override { - withIcu = true; withGraphite2 = true; + withIcu = true; }; harfbuzz-icu-58 = harfbuzz-icu.override { icu = icu58; From 10267bfc9073174871772a34ebafd4c946a9f09f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 25 Apr 2018 21:35:28 +0200 Subject: [PATCH 196/369] harfbuzz: avoid rebuilds --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index ff60afc1f2b..383f7f60f9b 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation { configureFlags = [ # not auto-detected by default - "--with-coretext=${if withCoreText then "yes" else "no"}" "--with-graphite2=${if withGraphite2 then "yes" else "no"}" "--with-icu=${if withIcu then "yes" else "no"}" - ]; + ] + ++ stdenv.lib.optional withCoreText "--with-coretext=yes"; nativeBuildInputs = [ pkgconfig libintl ]; From 80aca28e34f44a2fe7dafb225dd600980a4d80a7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 27 May 2018 14:25:55 +0200 Subject: [PATCH 197/369] harfbuzz: add harfbuzzFull and remove other variants --- .../networking/browsers/chromium/common.nix | 4 ++-- pkgs/tools/typesetting/tectonic/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 23 +++++++++++-------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ff9b8b10b18..ebc700a7f37 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -82,8 +82,8 @@ let xdg_utils yasm minizip libwebp libusb1 re2 zlib ffmpeg libxslt libxml2 - # harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together - # so we can't build with one from system and other from source + # harfbuzz # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source ]; # build paths and release info diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index fa8af008955..0d082eac4bb 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, rustPlatform -, darwin, fontconfig, harfbuzz-icu, openssl, pkgconfig }: +, darwin, fontconfig, harfbuzz, openssl, pkgconfig }: rustPlatform.buildRustPackage rec { name = "tectonic-${version}"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontconfig harfbuzz-icu openssl ] + buildInputs = [ fontconfig harfbuzz openssl ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); # tests fail due to read-only nix store diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a859fd56fa4..d274aec077c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9770,13 +9770,12 @@ with pkgs; harfbuzz = callPackage ../development/libraries/harfbuzz { inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreText; }; - harfbuzz-icu = harfbuzz.override { + + harfbuzzFull = harfbuzz.override { + withCoreText = stdenv.isDarwin; withGraphite2 = true; withIcu = true; }; - harfbuzz-icu-58 = harfbuzz-icu.override { - icu = icu58; - }; hawknl = callPackage ../development/libraries/hawknl { }; @@ -11574,7 +11573,7 @@ with pkgs; inherit stdenv fetchurl makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; - harfbuzz = harfbuzz-icu; + harfbuzz = harfbuzzFull; inherit libGL; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; @@ -11588,7 +11587,7 @@ with pkgs; inherit stdenv fetchurl makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; - harfbuzz = harfbuzz-icu; + harfbuzz = harfbuzzFull; inherit libGL; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; @@ -11603,7 +11602,7 @@ with pkgs; inherit stdenv fetchurl fetchFromGitHub makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; - harfbuzz = harfbuzz-icu; + harfbuzz = harfbuzzFull; inherit libGL; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; @@ -12123,7 +12122,9 @@ with pkgs; tecla = callPackage ../development/libraries/tecla { }; - tectonic = callPackage ../tools/typesetting/tectonic { }; + tectonic = callPackage ../tools/typesetting/tectonic { + harfbuzz = harfbuzzFull; + }; tepl = callPackage ../development/libraries/tepl { }; @@ -12318,13 +12319,15 @@ with pkgs; webkitgtk = webkitgtk220x; webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { - harfbuzz = harfbuzz-icu-58; + harfbuzz = harfbuzzFull.override { + icu = icu58; + }; gst-plugins-base = gst_all_1.gst-plugins-base; inherit (darwin) libobjc; }; webkitgtk220x = callPackage ../development/libraries/webkitgtk/2.20.nix { - harfbuzz = harfbuzz-icu; + harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; stdenv = overrideCC stdenv gcc6; }; From 72d161f548701a2a8dab334dee76b63bccc0f07c Mon Sep 17 00:00:00 2001 From: CrystalGamma Date: Tue, 21 Aug 2018 21:31:34 +0200 Subject: [PATCH 198/369] [RFC] ppc64le enablement (#45340) * ppc64le enablement * gcc, glibc: properly handle __float128 * lib/systems, stdenv: syntax cleanup * gcc7: remove ugly hack * gcc: add/update __float128 flags * stdenv: add another pair of quotes for consistency * gcc: move __float128 flag for ppc64le-glibc into common/platform-flags.nix --- lib/systems/doubles.nix | 2 +- lib/systems/examples.nix | 8 ++++++ lib/systems/inspect.nix | 1 + lib/systems/parse.nix | 2 ++ lib/systems/platforms.nix | 17 +++++++++++ .../bintools-wrapper/default.nix | 4 +-- pkgs/development/compilers/gcc/7/default.nix | 3 +- pkgs/development/compilers/gcc/8/default.nix | 3 +- .../compilers/gcc/common/platform-flags.nix | 3 ++ pkgs/development/compilers/gcc/ppc-musl.patch | 18 ++++++++++++ .../linux/kernel/manual-config.nix | 10 +++++-- pkgs/os-specific/linux/musl/default.nix | 5 ++-- pkgs/stdenv/default.nix | 1 + .../scripts/unpack-bootstrap-tools.sh | 3 ++ pkgs/stdenv/linux/default.nix | 2 ++ .../linux/make-bootstrap-tools-cross.nix | 28 ++++++++++--------- 16 files changed, 87 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/compilers/gcc/ppc-musl.patch diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index c6618083ce7..adc454406b8 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -44,5 +44,5 @@ in rec { openbsd = filterDoubles predicates.isOpenBSD; unix = filterDoubles predicates.isUnix; - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux"]; + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "powerpc64le-linux"]; } diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 31772ba0054..3828b2f84c6 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -8,6 +8,14 @@ rec { # # Linux # + powernv = { + config = "powerpc64le-unknown-linux-gnu"; + platform = platforms.powernv; + }; + musl-power = { + config = "powerpc64le-unknown-linux-musl"; + platform = platforms.powernv; + }; sheevaplug = rec { config = "armv5tel-unknown-linux-gnueabi"; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 0c70f2a7cd5..ac34ed45695 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -11,6 +11,7 @@ rec { isi686 = { cpu = cpuTypes.i686; }; isx86_64 = { cpu = cpuTypes.x86_64; }; isPowerPC = { cpu = cpuTypes.powerpc; }; + isPower = { cpu = { family = "power"; }; }; isx86 = { cpu = { family = "x86"; }; }; isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index b07396a9dfd..7ee3479c333 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -90,6 +90,8 @@ rec { mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; powerpc = { bits = 32; significantByte = bigEndian; family = "power"; }; + powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; }; + powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; }; riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; }; riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; }; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 8027f6b9fc1..56783d99e3d 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -20,6 +20,22 @@ rec { kernelAutoModules = false; }; + powernv = { + name = "PowerNV"; + kernelArch = "powerpc"; + kernelBaseConfig = "powernv_defconfig"; + kernelTarget = "zImage"; + kernelInstallTarget = "install"; + kernelFile = "vmlinux"; + kernelAutoModules = true; + # avoid driver/FS trouble arising from unusual page size + kernelExtraConfig = '' + PPC_64K_PAGES n + PPC_4K_PAGES y + IPV6 y + ''; + }; + ## ## ARM ## @@ -458,5 +474,6 @@ rec { "armv7l-linux" = armv7l-hf-multiplatform; "aarch64-linux" = aarch64-multiplatform; "mipsel-linux" = fuloong2f_n32; + "powerpc64le-linux" = powernv; }.${system} or pcBase; } diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 3635b0ef046..7948f726c62 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation { else if targetPlatform.isWindows then "pe" else "elf" + toString targetPlatform.parsed.cpu.bits; endianPrefix = if targetPlatform.isBigEndian then "big" else "little"; - sep = optionalString (!targetPlatform.isMips) "-"; + sep = optionalString (!targetPlatform.isMips && !targetPlatform.isPower) "-"; arch = /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" else if targetPlatform.isAarch32 then endianPrefix + "arm" @@ -183,7 +183,7 @@ stdenv.mkDerivation { "mips64" = "btsmip"; "mips64el" = "ltsmip"; }.${targetPlatform.parsed.cpu.name} - else if targetPlatform.isPowerPC then "powerpc" + else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc" else if targetPlatform.isSparc then "sparc" else throw "unknown emulation for platform: " + targetPlatform.config; in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 0c51868aef8..c5541da0790 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -54,7 +54,8 @@ let version = "7.3.0"; url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs"; }) - ++ optional langFortran ../gfortran-driving.patch; + ++ optional langFortran ../gfortran-driving.patch + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index fa19e9c533d..5d7be163783 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -49,7 +49,8 @@ let version = "8.2.0"; url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; sha256 = ""; # TODO: uncomment and check hash when available. }) */ - ++ optional langFortran ../gfortran-driving.patch; + ++ optional langFortran ../gfortran-driving.patch + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix index 9a6d3f8f620..ba6d5912fe8 100644 --- a/pkgs/development/compilers/gcc/common/platform-flags.nix +++ b/pkgs/development/compilers/gcc/common/platform-flags.nix @@ -10,4 +10,7 @@ in lib.concatLists [ (lib.optional (p ? fpu) "--with-fpu=${p.fpu}") (lib.optional (p ? float) "--with-float=${p.float}") (lib.optional (p ? mode) "--with-mode=${p.mode}") + (lib.optional + (let tp = targetPlatform; in tp.isPower && tp.libc == "glibc" && tp.is64bit && tp.isLittleEndian) + "--with-long-double-128") ] diff --git a/pkgs/development/compilers/gcc/ppc-musl.patch b/pkgs/development/compilers/gcc/ppc-musl.patch new file mode 100644 index 00000000000..bc90888a379 --- /dev/null +++ b/pkgs/development/compilers/gcc/ppc-musl.patch @@ -0,0 +1,18 @@ +diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h +index cbee89140dd..e1f26b0a096 100644 +--- a/gcc/config/rs6000/sysv4.h ++++ b/gcc/config/rs6000/sysv4.h +@@ -996,13 +996,7 @@ ncrtn.o%s" + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, + +-#ifdef LOCAL_INCLUDE_DIR +-#define INCLUDE_DEFAULTS_MUSL_LOCAL \ +- { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ +- { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, +-#else + #define INCLUDE_DEFAULTS_MUSL_LOCAL +-#endif + + #ifdef PREFIX_INCLUDE_DIR + #define INCLUDE_DEFAULTS_MUSL_PREFIX \ diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 80721c4b401..33aa22abaf2 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -98,6 +98,7 @@ let sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' done sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|' + sed -i scripts/ld-version.sh -e "s|/usr/bin/awk|${buildPackages.gawk}/bin/awk|" ''; configurePhase = '' @@ -145,9 +146,12 @@ let ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; # Some image types need special install targets (e.g. uImage is installed with make uinstall) - installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else - if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall" else - "install") ]; + installTargets = [ ( + if platform ? kernelInstallTarget then platform.kernelInstallTarget + else if platform.kernelTarget == "uImage" then "uinstall" + else if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall" + else "install" + ) ]; postInstall = (optionalString installsFirmware '' mkdir -p $out/lib/firmware diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index d6936ccd650..e586539db08 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, hostPlatform , linuxHeaders ? null , useBSDCompatHeaders ? true }: @@ -61,11 +61,12 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--syslibdir=$out/lib") ''; + CFLAGS="-fstack-protector-strong" + lib.optionalString hostPlatform.isPower " -mlong-double-64"; + configureFlags = [ "--enable-shared" "--enable-static" "--enable-debug" - "CFLAGS=-fstack-protector-strong" "--enable-wrapper=all" ]; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 203cf545940..210e0439c0b 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -47,6 +47,7 @@ in "aarch64-linux" = stagesLinux; "mipsel-linux" = stagesLinux; "powerpc-linux" = /* stagesLinux */ stagesNative; + "powerpc64le-linux" = stagesLinux; "x86_64-darwin" = stagesDarwin; "x86_64-solaris" = stagesNix; "i686-cygwin" = stagesNative; diff --git a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh index 85e74aea89e..64583f80fa8 100644 --- a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh @@ -9,6 +9,9 @@ echo Patching the bootstrap tools... if test -f $out/lib/ld.so.?; then # MIPS case LD_BINARY=$out/lib/ld.so.? +elif test -f $out/lib/ld64.so.?; then + # ppc64(le) + LD_BINARY=$out/lib/ld64.so.? else # i686, x86_64 and armv5tel LD_BINARY=$out/lib/ld-*so.? diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index bd0be1c9f9d..c7fc2ebac35 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -16,11 +16,13 @@ "armv7l-linux" = import ./bootstrap-files/armv7l.nix; "aarch64-linux" = import ./bootstrap-files/aarch64.nix; "mipsel-linux" = import ./bootstrap-files/loongson2f.nix; + "powerpc64le-linux" = import ./bootstrap-files/ppc64le.nix; }; "musl" = { "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix; "armv6l-linux" = import ./bootstrap-files/armv6l-musl.nix; "x86_64-linux" = import ./bootstrap-files/x86_64-musl.nix; + "powerpc64le-linux" = import ./bootstrap-files/ppc64le-musl.nix; }; }; archLookupTable = table.${localSystem.libc} diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 0dd65bd2478..d1ee317a2bc 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -5,16 +5,18 @@ let localSystem = { inherit system; }; inherit crossSystem; }; - -in with (import ../../../lib).systems.examples; { - armv5tel = make sheevaplug; - scaleway = make scaleway-c1; - pogoplug4 = make pogoplug4; - armv6l = make raspberryPi; - armv7l = make armv7l-hf-multiplatform; - aarch64 = make aarch64-multiplatform; - x86_64-musl = make musl64; - armv6l-musl = make muslpi; - aarch64-musl = make aarch64-multiplatform-musl; - riscv64 = make riscv64; -} + lib = import ../../../lib; +in lib.mapAttrs (n: make) (with lib.systems.examples; { + armv5tel = sheevaplug; + scaleway = scaleway-c1; + pogoplug4 = pogoplug4; + armv6l = raspberryPi; + armv7l = armv7l-hf-multiplatform; + aarch64 = aarch64-multiplatform; + x86_64-musl = musl64; + armv6l-musl = muslpi; + aarch64-musl = aarch64-multiplatform-musl; + riscv64 = riscv64; + powerpc64le = powernv; + powerpc64le-musl = musl-power; +}) From 2bcb700b058f0e215d93541b256b447744d32fe4 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 21 Aug 2018 21:36:06 +0200 Subject: [PATCH 199/369] msmtp: support passwordeval without final '\n' This applies an upstream patch that removes the requirement for passwordeval commands to print a `\n` character after the password. --- pkgs/applications/networking/msmtp/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 2372685dc27..4e2f9e636d5 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig +{ stdenv, lib, fetchpatch, fetchurl, autoreconfHook, pkgconfig , openssl, netcat-gnu, gnutls, gsasl, libidn, Security , withKeyring ? true, libsecret ? null , systemd ? null }: @@ -19,6 +19,14 @@ in stdenv.mkDerivation rec { patches = [ ./paths.patch + + # To support passwordeval commands that do not print a final + # newline. + (fetchpatch { + name = "passwordeval-without-nl.patch"; + url = "https://gitlab.marlam.de/marlam/msmtp/commit/df22dccf9d1af06fcd09dfdd0d6a38e1372dd5e8.patch"; + sha256 = "06gbhvzi46zqigmmsin2aard7b9v3ihx62hbz5ljmfbj9rfs1x5y"; + }) ]; buildInputs = [ openssl gnutls gsasl libidn ] From 4ad233e518d25e60d06bb3cb41307f8270f3f18e Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 21 Aug 2018 22:03:58 +0200 Subject: [PATCH 200/369] Revert "libvirt: fix dlopen("libjansson.so.4")" This reverts commit 929a53f2814982247f34fa296f6c1dd0435caf20. Upstream has reverted their move from yajl to jansson after 4.6.0 because of major issues. No point in trying to fix it. Let's revert to libvirt 4.5.0 and wait for the next upstream release. --- pkgs/development/libraries/libvirt/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4b104a04c15..63f11daad28 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -60,9 +60,7 @@ in stdenv.mkDerivation rec { --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' patchShebangs . # fixes /usr/bin/python references - substituteInPlace src/util/virjsoncompat.c --replace \ - '"libjansson.so.4"' '"${jansson}/lib/libjansson${stdenv.targetPlatform.extensions.sharedLibrary}"' - ''; + ''; configureFlags = [ "--localstatedir=/var" From 528f4a2d1f7e040ff4cb03733a1b604196e61a6c Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 21 Aug 2018 22:07:05 +0200 Subject: [PATCH 201/369] Revert "libvirt: jansson required for qemu suppport" This reverts commit df05344d960895d8b076341ca0d8a0c7333f24b4. Upstream has reverted their move from yajl to jansson after 4.6.0 because of major issues. Let's revert to libvirt 4.5.0 and wait for the next upstream release. --- pkgs/development/libraries/libvirt/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 63f11daad28..e584af775d2 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, jansson +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi }: @@ -35,11 +35,11 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap jansson + libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen @@ -66,7 +66,6 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/var/lib" "--with-libpcap" - "--with-qemu" "--with-vmware" "--with-vbox" "--with-test" From 6b5b7d96fb0bb292b43362077b6eb03a905f1cbf Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 21 Aug 2018 22:08:21 +0200 Subject: [PATCH 202/369] Revert "libvirt: 4.5.0 -> 4.6.0 (#44566)" This reverts commit 88352408958d905c77ad0461036196282c39cf69. 4.6.0 is quite broken. Let's wait for the next release. --- pkgs/development/libraries/libvirt/default.nix | 6 +++--- pkgs/development/python-modules/libvirt/default.nix | 4 ++-- pkgs/top-level/perl-packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index e584af775d2..02c13e413e3 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -16,19 +16,19 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "4.6.0"; + version = "4.5.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "0rj0azi766g0xdxydvkq9nj95hhsiwqgclzzmyxvk2axhb8nrb5l"; + sha256 = "02dbfyi80im37gdsxglb4fja78q63b8ahmgdc5kh8lx51kf5xsg7"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "1lv1s93k056wylrlc7j4q45zir9z4qshzcl454spy2wb8cdn3h4s"; + sha256 = "0ija9a02znajsa2pbxamrmz87zwpmba9s29vdzzqqqw5c1rdpcr6"; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 71e9adf11d2..26b42020fc3 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libvirt"; - version = "4.6.0"; + version = "4.5.0"; src = assert version == libvirt.version; fetchgit { url = git://libvirt.org/libvirt-python.git; rev = "v${version}"; - sha256 = "0yrgibd5c9wy82ak8g9ykar6fma1wf7xzmmc47657lzm70m5av68"; + sha256 = "0w2rzkxv7jsq4670m0j5c6p4hpyi0r0ja6wd3wdvixcwc6hhx407"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7f09630debf..5add53c0dc2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14400,12 +14400,12 @@ let }; SysVirt = buildPerlModule rec { - version = "4.6.0"; + version = "4.5.0"; name = "Sys-Virt-${version}"; src = assert version == pkgs.libvirt.version; pkgs.fetchgit { url = git://libvirt.org/libvirt-perl.git; rev = "v${version}"; - sha256 = "0qs84sdrq85i3xc0drbk71jjm9vq1n8izdwy5zsd5r7dqays5slf"; + sha256 = "18ns94i29c9x0j50pz9r1vcif6baayz769sa7b51v8kcvam9j52s"; }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; From c6191c8abff1d3eef083619ee34b8bc60cba79ff Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 21 Aug 2018 16:21:11 -0400 Subject: [PATCH 203/369] nixos/cfssl: don't create user/group unless service is enabled --- nixos/modules/services/security/cfssl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/cfssl.nix b/nixos/modules/services/security/cfssl.nix index 1eb2f65ba60..ee6d5d91fe1 100644 --- a/nixos/modules/services/security/cfssl.nix +++ b/nixos/modules/services/security/cfssl.nix @@ -146,7 +146,7 @@ in { }; }; - config = { + config = mkIf cfg.enable { users.extraGroups.cfssl = { gid = config.ids.gids.cfssl; }; @@ -159,7 +159,7 @@ in { uid = config.ids.uids.cfssl; }; - systemd.services.cfssl = mkIf cfg.enable { + systemd.services.cfssl = { description = "CFSSL CA API server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; From 8b04cfc63a11be34725beb0d24574f5647886558 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 13:44:32 -0700 Subject: [PATCH 204/369] serd: 0.28.0 -> 0.30.0 (#44687) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/serd/versions. --- pkgs/development/libraries/serd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index ac9183cffe9..67e0ff31c8e 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "serd-${version}"; - version = "0.28.0"; + version = "0.30.0"; src = fetchurl { url = "https://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1v4ai4zyj1q3255nghicns9817jkwb3bh60ssprsjmnjfj41mwhx"; + sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf"; }; nativeBuildInputs = [ pkgconfig python ]; From 41d97415d1355ca16017b04c275c94c70b7b0205 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 13:45:12 -0700 Subject: [PATCH 205/369] sord: 0.16.0 -> 0.16.2 (#44690) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sord/versions. --- pkgs/development/libraries/sord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 207c6f2d30a..465ec5b8fe8 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sord-${version}"; - version = "0.16.0"; + version = "0.16.2"; src = fetchurl { url = "https://download.drobilla.net/${name}.tar.bz2"; - sha256 = "0nh3i867g9z4kdlnk82cg2kcw8r02qgifxvkycvzb4vfjv4v4g4x"; + sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89"; }; nativeBuildInputs = [ pkgconfig ]; From 60970294550aa78517ae8b19b4f99c0ccf170f4a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 21 Aug 2018 15:49:21 -0500 Subject: [PATCH 206/369] tootle: init 0.1.5 (#45431) --- pkgs/applications/misc/tootle/default.nix | 38 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/misc/tootle/default.nix diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix new file mode 100644 index 00000000000..b2aab54c104 --- /dev/null +++ b/pkgs/applications/misc/tootle/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub +, meson, ninja, pkgconfig +, gnome3, vala, gobjectIntrospection, wrapGAppsHook +, gtk3, granite +, json-glib, glib, glib-networking +}: + +let + pname = "tootle"; + version = "0.1.5"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "bleakgrey"; + repo = pname; + rev = version; + sha256 = "022h1rh1jk3m1f9al0s1rylmnqnkydyc81idfc8jf1g0frnvn5i6"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection wrapGAppsHook ]; + buildInputs = [ + gtk3 granite json-glib glib glib-networking + gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas + ]; + + postPatch = '' + chmod +x ./meson/post_install.py + patchShebangs ./meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Simple Mastodon client designed for elementary OS"; + homepage = https://github.com/bleakgrey/tootle; + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 302ff26ed40..1c804b47afe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18772,6 +18772,8 @@ with pkgs; toot = callPackage ../applications/misc/toot { }; + tootle = callPackage ../applications/misc/tootle { }; + toxic = callPackage ../applications/networking/instant-messengers/toxic { }; toxiproxy = callPackage ../development/tools/toxiproxy { }; From ebac61b0d086d75cbf450d091c21ae1040081cbd Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 21 Aug 2018 22:54:54 +0200 Subject: [PATCH 207/369] libvirt: explicitly configure qemu support it is enabled by default in 4.5.0 but conditional in 4.6.0 so let's already put it in here to avoid issues on the next bump. --- pkgs/development/libraries/libvirt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 02c13e413e3..fd35864fe34 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen @@ -66,6 +66,7 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/var/lib" "--with-libpcap" + "--with-qemu" "--with-vmware" "--with-vbox" "--with-test" From caf2cae44bc2717f2b94ae589c495f0c8d911908 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 21 Aug 2018 20:58:56 +0000 Subject: [PATCH 208/369] fetchpatch: patchutils -> buildPackages.patchutils --- pkgs/build-support/fetchpatch/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index 40a7675b7ac..89d72f512f7 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -4,7 +4,7 @@ # often change with updating of git or cgit. # stripLen acts as the -p parameter when applying a patch. -{ lib, fetchurl, patchutils }: +{ lib, fetchurl, buildPackages }: { stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args: fetchurl ({ @@ -14,10 +14,10 @@ fetchurl ({ echo "error: Fetched patch file '$out' is empty!" 1>&2 exit 1 fi - "${patchutils}/bin/lsdiff" "$out" \ + "${buildPackages.patchutils}/bin/lsdiff" "$out" \ | sort -u | sed -e 's/[*?]/\\&/g' \ | xargs -I{} \ - "${patchutils}/bin/filterdiff" \ + "${buildPackages.patchutils}/bin/filterdiff" \ --include={} \ --strip=${toString stripLen} \ ${lib.optionalString (extraPrefix != null) '' @@ -32,7 +32,7 @@ fetchurl ({ cat "$out" 1>&2 exit 1 fi - ${patchutils}/bin/filterdiff \ + ${buildPackages.patchutils}/bin/filterdiff \ -p1 \ ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \ ${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \ @@ -46,7 +46,7 @@ fetchurl ({ exit 1 fi '' + lib.optionalString revert '' - ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile" + ${buildPackages.patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile" mv "$tmpfile" "$out" '' + (args.postFetch or ""); meta.broken = excludes != [] && includes != []; From 60942ead1cb97da965957d0ff1b00d67dea8efe2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 21 Aug 2018 21:40:52 +0000 Subject: [PATCH 209/369] obuild: 0.1.8 -> 0.1.10 (#45444) --- pkgs/development/tools/ocaml/obuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 1de95f73037..41cde6f8ab7 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml }: -let version = "0.1.8"; in +let version = "0.1.10"; in stdenv.mkDerivation { name = "obuild-${version}"; src = fetchzip { url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz"; - sha256 = "1q1k2qqd08j1zakvydgvwgwpyn0ll7rs65gap0pvg3amnh5cp3wd"; + sha256 = "15arsgbhk1c39vd8qhpa3pag94m44bwvzggdvkibx6hnpkv8z9bn"; }; buildInputs = [ ocaml ]; From 27f66004194ca05f172c905b4f2d1c7aacf8cb06 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 14:43:27 -0700 Subject: [PATCH 210/369] nodejs-slim-10_x: 10.7.0 -> 10.9.0 (#45172) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nodejs-slim/versions. --- pkgs/development/web/nodejs/v10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 1d307c77f9f..ee88b231366 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.7.0"; - sha256 = "0qp93ddbnvadimj11wnznwhkq8vq1f7q259iq8siy5b7r936kvil"; + version = "10.9.0"; + sha256 = "00hdachbmcf9pyd1iksprsi5mddwp6z59mb3lr81z8ynfbmzhzni"; } From 35ae816e17dcd215e6f8ade19436e5730ee95902 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 21 Aug 2018 22:07:35 +0000 Subject: [PATCH 211/369] ocamlPackages.io-page: 1.6.1 -> 2.0.1 (#45393) --- .../ocaml-modules/io-page/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index 24aa2557082..72b7a3a54ce 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, configurator, cstruct }: -let version = "1.6.1"; in +let version = "2.0.1"; in stdenv.mkDerivation { - name = "ocaml-io-page-${version}"; + name = "ocaml${ocaml.version}-io-page-${version}"; src = fetchzip { - url = "https://github.com/mirage/io-page/archive/v${version}.tar.gz"; - sha256 = "1djwks3ss12m55q6h4jsvfsy848cxfnpaxkilw10h26xj6jchflz"; + url = "https://github.com/mirage/io-page/archive/${version}.tar.gz"; + sha256 = "1rw04dwrlx5hah5dkjf7d63iff82j9cifr8ifjis5pdwhgwcff8i"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib jbuilder configurator ]; propagatedBuildInputs = [ cstruct ]; - createFindlibDestdir = true; + inherit (jbuilder) installPhase; meta = { homepage = https://github.com/mirage/io-page; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; + license = stdenv.lib.licenses.isc; description = "IO memory page library for Mirage backends"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; From 3c08c87ae9b77d3605a047685a1624898a8fbbfb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 7 Aug 2018 19:09:14 -0500 Subject: [PATCH 212/369] radare2: 2.7.0 -> 2.8.0 --- .../tools/analysis/radare2/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 0264305134c..43a05b5193d 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -17,13 +17,13 @@ let inherit (stdenv.lib) optional; # # DO NOT EDIT! Automatically generated by ./update.py - version_commit = "18681"; - gittap = "2.7.0"; - gittip = "6e08e452a7ec231a73997c44b4ff556c2998c7d9"; - version = "2.7.0"; - sha256 = "1a9z8w897256dhh3yhyfnshz3n2nrc4plc2i06cm5sznhl6x9xfx"; - cs_tip = "ec8a5ce98fa0422a395489ed47da912b15d77441"; - cs_sha256 = "080a64bqck28a2xfjwz29ddcr8p6hc6gi67mgry3pca289qrkk3q"; + version_commit = "19004"; + gittap = "2.8.0"; + gittip = "a76b965410aba07b4ef8b96d90b25b271c2003dd"; + version = "2.8.0"; + sha256 = "1d9rkzc3vychy2h1bnywwx4why83rr18r0lvvl1cqx87ad5awcjk"; + cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; + cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; # in stdenv.mkDerivation rec { @@ -46,7 +46,9 @@ stdenv.mkDerivation rec { }; in '' if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi - ln -s ${capstone} shlr/capstone + # When using meson, it expects capstone source relative to build directory + mkdir -p build/shlr + ln -s ${capstone} build/shlr/capstone ''; postInstall = '' From ec7af525bae2816cc26785aced3034706f7e81e1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 8 Aug 2018 06:35:02 -0500 Subject: [PATCH 213/369] radare2-cutter: use newer r2, fix (latest rev used by cutter-git) --- pkgs/development/tools/analysis/radare2-cutter/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index ff2b4d3b54f..b427499ad99 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -13,8 +13,10 @@ let src = fetchFromGitHub { owner = "radare"; repo = "radare2"; - rev = "a98557bfbfa96e9f677a8c779ee78085ee5a23bb"; - sha256 = "04jl1lq3dqljb6vagzlym4wc867ayhx1v52f75rkfz0iybsh249r"; + # XXX: The revision used here should match what Cutter uses as submodule. + # For now it's the revision cutter-git uses for r2. + rev = "c9ec8b54b9ba32ba6712f319825f8d032e573e68"; + sha256 = "04ri3wis8l1mbcp2gx419x7yfimljn7xa01izch71jy2h2mzk3z6"; }; }); version = "1.6"; From 6897945879859956c4165efdd4bdf04ab930fa69 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 21 Aug 2018 17:20:55 -0400 Subject: [PATCH 214/369] nixos/networkd: replace range with assertRange --- nixos/modules/system/boot/networkd.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index a3b7d7ba07a..c11aaeaeb6d 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -30,10 +30,10 @@ let (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) + (assertRange "RxChannels" 1 4294967295) + (assertRange "TxChannels" 1 4294967295) + (assertRange "OtherChannels" 1 4294967295) + (assertRange "CombinedChannels" 1 4294967295) ]; checkNetdev = checkUnitConfig "Netdev" [ From 4c6171c173ef5e50ecbbc1157c035147462ee721 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Tue, 21 Aug 2018 09:51:33 +0200 Subject: [PATCH 215/369] nixos/dhcpcd: Wait for devices to settle --- nixos/modules/services/networking/dhcpcd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 019c8fd9ec4..efdbca5d52e 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -161,8 +161,9 @@ in { description = "DHCP Client"; wantedBy = [ "multi-user.target" ] ++ optional (!hasDefaultGatewaySet) "network-online.target"; - wants = [ "network.target" ]; + wants = [ "network.target" "systemd-udev-settle.service" ]; before = [ "network.target" ]; + after = [ "systemd-udev-settle.service" ]; # Stopping dhcpcd during a reconfiguration is undesirable # because it brings down the network interfaces configured by From 8e4d051c622366e37ca19276aaf88d47648e4dce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 15:35:17 -0700 Subject: [PATCH 216/369] sratom: 0.6.0 -> 0.6.2 (#44695) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sratom/versions. --- pkgs/development/libraries/audio/sratom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 4709d034853..acfbced5272 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sratom-${version}"; - version = "0.6.0"; + version = "0.6.2"; src = fetchurl { url = "https://download.drobilla.net/${name}.tar.bz2"; - sha256 = "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4"; + sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a"; }; nativeBuildInputs = [ pkgconfig ]; From 8bb5054494383f70cfd32326e03df7d01941c178 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Tue, 21 Aug 2018 16:01:28 +1000 Subject: [PATCH 217/369] docker-credential-gcr: remove platforms --- pkgs/tools/admin/docker-credential-gcr/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 52b68a7477c..71bef380544 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -23,6 +23,5 @@ buildGoPackage rec { homepage = https://github.com/GoogleCloudPlatform/docker-credential-gcr; license = licenses.asl20; maintainers = with maintainers; [ suvash ]; - platforms = platforms.linux; }; } From 13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 21 Aug 2018 15:15:02 -0500 Subject: [PATCH 218/369] Revert "Merge pull request #44767 from obsidiansystems/wrapper-env-var-path" This reverts commit 89efc27f571368b475ce87e71445be10a9d1121a, reversing changes made to d0f11020ca55dfe20ecad05005343e3a3e3cbd90. --- .../bintools-wrapper/setup-hook.sh | 8 ++--- pkgs/build-support/cc-wrapper/setup-hook.sh | 8 ++--- pkgs/development/compilers/ghc/8.0.2.nix | 19 ++++++------ pkgs/development/compilers/ghc/8.2.2.nix | 16 +++++----- pkgs/development/compilers/ghc/8.4.3.nix | 16 +++++----- pkgs/development/compilers/ghc/8.6.1.nix | 16 +++++----- pkgs/development/compilers/ghc/head.nix | 16 +++++----- .../libraries/gcc/libgcc/default.nix | 31 ++++++++++++++++--- 8 files changed, 76 insertions(+), 54 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 2cf606cce7c..f65b792485a 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -59,11 +59,11 @@ for cmd in \ ar as ld nm objcopy objdump readelf ranlib strip strings size windres do if - cmd_path=$(PATH=$_PATH command -v "@targetPrefix@${cmd}") + PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null then upper_case="$(echo "$cmd" | tr "[:lower:]" "[:upper:]")" - export "${role_pre}${upper_case}=${cmd_path}"; - export "${upper_case}${role_post}=${cmd_path}"; + export "${role_pre}${upper_case}=@targetPrefix@${cmd}"; + export "${upper_case}${role_post}=@targetPrefix@${cmd}"; fi done @@ -72,5 +72,5 @@ done export NIX_HARDENING_ENABLE # No local scope in sourced file -unset -v role_pre role_post cmd cmd_path upper_case +unset -v role_pre role_post cmd upper_case set +u diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 619e75a3974..28060de7411 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -109,10 +109,10 @@ fi export NIX_${role_pre}CC=@out@ -export ${role_pre}CC=@out@/bin/@named_cc@ -export ${role_pre}CXX=@out@/bin/@named_cxx@ -export CC${role_post}=@out@/bin/@named_cc@ -export CXX${role_post}=@out@/bin/@named_cxx@ +export ${role_pre}CC=@named_cc@ +export ${role_pre}CXX=@named_cxx@ +export CC${role_post}=@named_cc@ +export CXX${role_post}=@named_cxx@ # If unset, assume the default hardening flags. : ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"} diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index fdbe4cf902f..ddd9c27589a 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -102,16 +102,15 @@ stdenv.mkDerivation rec { done # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. - export CC="$CC_FOR_TARGET" - export CXX="$CXX_FOR_TARGET" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" - export AS="$AS_FOR_TARGET" - export AR="$AR_FOR_TARGET" - export NM="$NM_FOR_TARGET" - export RANLIB="$RANLIB_FOR_TARGET" - export READELF="$READELF_FOR_TARGET" - export STRIP="$STRIP_FOR_TARGET" + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 6ff1a248372..79c910e5fd2 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -134,16 +134,16 @@ stdenv.mkDerivation rec { done # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. - export CC="$CC_FOR_TARGET" - export CXX="$CXX_FOR_TARGET" + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" - export AS="$AS_FOR_TARGET" - export AR="$AR_FOR_TARGET" - export NM="$NM_FOR_TARGET" - export RANLIB="$RANLIB_FOR_TARGET" - export READELF="$READELF_FOR_TARGET" - export STRIP="$STRIP_FOR_TARGET" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 522dd9cfbf0..f30c8dd8622 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -115,16 +115,16 @@ stdenv.mkDerivation (rec { done # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. - export CC="$CC_FOR_TARGET" - export CXX="$CXX_FOR_TARGET" + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" - export AS="$AS_FOR_TARGET" - export AR="$AR_FOR_TARGET" - export NM="$NM_FOR_TARGET" - export RANLIB="$RANLIB_FOR_TARGET" - export READELF="$READELF_FOR_TARGET" - export STRIP="$STRIP_FOR_TARGET" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index a94c9e3d3f1..fdb60ce3f2e 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -98,16 +98,16 @@ stdenv.mkDerivation (rec { done # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. - export CC="$CC_FOR_TARGET" - export CXX="$CXX_FOR_TARGET" + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" - export AS="$AS_FOR_TARGET" - export AR="$AR_FOR_TARGET" - export NM="$NM_FOR_TARGET" - export RANLIB="$RANLIB_FOR_TARGET" - export READELF="$READELF_FOR_TARGET" - export STRIP="$STRIP_FOR_TARGET" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index b0b6ed3bab0..2824ce669ee 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -100,16 +100,16 @@ stdenv.mkDerivation rec { done # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. - export CC="$CC_FOR_TARGET" - export CXX="$CXX_FOR_TARGET" + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" - export AS="$AS_FOR_TARGET" - export AR="$AR_FOR_TARGET" - export NM="$NM_FOR_TARGET" - export RANLIB="$RANLIB_FOR_TARGET" - export READELF="$READELF_FOR_TARGET" - export STRIP="$STRIP_FOR_TARGET" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" echo -n "${buildMK}" > mk/build.mk echo ${version} >VERSION diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index ef605d8702f..0a29ab6927f 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -46,16 +46,22 @@ stdenvNoLibs.mkDerivation rec { mkdir -p "$buildRoot/gcc" cd "$buildRoot/gcc" ( + export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD + export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD + export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD + export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD + export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD + export AS=$AS_FOR_BUILD export CC=$CC_FOR_BUILD export CPP=$CPP_FOR_BUILD export CXX=$CXX_FOR_BUILD export LD=$LD_FOR_BUILD - export AS_FOR_TARGET=$AS - export CC_FOR_TARGET=$CC - export CPP_FOR_TARGET=$CPP - export LD_FOR_TARGET=$LD + export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS + export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC + export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP + export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD export NIX_BUILD_CFLAGS_COMPILE+=' -DGENERATOR_FILE=1' @@ -81,6 +87,23 @@ stdenvNoLibs.mkDerivation rec { cd "$buildRoot/gcc/${hostPlatform.config}/libgcc" configureScript=$sourceRoot/configure chmod +x "$configureScript" + + export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD + export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD + export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD + export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD + export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD + + export AS=${stdenvNoLibs.cc}/bin/$AS + export CC=${stdenvNoLibs.cc}/bin/$CC + export CPP=${stdenvNoLibs.cc}/bin/$CPP + export CXX=${stdenvNoLibs.cc}/bin/$CXX + export LD=${stdenvNoLibs.cc.bintools}/bin/$LD + + export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS_FOR_TARGET + export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC_FOR_TARGET + export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP_FOR_TARGET + export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD_FOR_TARGET ''; gccConfigureFlags = [ From 5a012fdbb3f7752b333cb631c39d73518e930559 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 21 Aug 2018 15:37:15 -0500 Subject: [PATCH 219/369] Revert "openjdk: fixup build after #44767" This reverts commit 38eea804e6c02542085c9f232cdd699d96c95a23. --- pkgs/development/compilers/openjdk/8.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index e82f40fc089..948948ebc44 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -106,12 +106,6 @@ let # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + stdenv.lib.optionalString stdenv.cc.isGNU '' NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" - '' - # The configure script was confused by our passing these with full paths, - # so we explicitly override them to short variants. - + '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ ''; configureFlags = [ From f7bc33abf09c9a111b7b1d7f4eb6d322ace3efda Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 21 Aug 2018 15:37:52 -0500 Subject: [PATCH 220/369] Revert "treewide: fixup breakage due to absolute compiler path" This reverts commit d0888d150333a2c523cd1e46606d6219afe23dc2. --- pkgs/applications/graphics/exrtools/default.nix | 5 ----- pkgs/applications/misc/kiwix/default.nix | 5 ----- pkgs/applications/science/logic/aiger/default.nix | 3 --- pkgs/applications/science/logic/verit/default.nix | 5 ----- pkgs/applications/virtualization/open-vm-tools/default.nix | 5 ----- pkgs/development/libraries/podofo/default.nix | 5 ----- pkgs/development/libraries/zeroc-ice/default.nix | 5 ----- pkgs/development/ocaml-modules/zarith/default.nix | 3 --- pkgs/games/warmux/default.nix | 5 ----- pkgs/games/warzone2100/default.nix | 5 ----- 10 files changed, 46 deletions(-) diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index 01af81d4de7..7980d09fed1 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -9,11 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; }; - preConfigure = '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ - ''; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ stdenv openexr libpng12 libjpeg ]; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index cfba3a0c83d..c37d26f3dbc 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -81,11 +81,6 @@ stdenv.mkDerivation rec { cd ../../.. ''; - preConfigure = '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ - ''; - configureFlags = [ "--disable-static" "--disable-staticbins" diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index a03e777a033..03524fc6b22 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -12,9 +12,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configurePhase = '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ - # Set up picosat, so we can build 'aigbmc' mkdir ../picosat ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix index d8873604b21..ca3673d7bf9 100644 --- a/pkgs/applications/science/logic/verit/default.nix +++ b/pkgs/applications/science/logic/verit/default.nix @@ -15,11 +15,6 @@ stdenv.mkDerivation rec { # --disable-static actually enables static linking here... dontDisableStatic = true; - preConfigure = '' - CC=${stdenv.cc.targetPrefix}gcc - CXX=${stdenv.cc.targetPrefix}g++ - ''; - makeFlags = [ "LEX=${flex}/bin/flex" ]; preInstall = '' diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 13fa9d369b6..e42c1d5dd1e 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -41,11 +41,6 @@ stdenv.mkDerivation rec { sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c ''; - preConfigure = '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ - ''; - configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ] ++ lib.optional (!withX) "--without-x"; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 51e2b505974..9a43470de3b 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -19,11 +19,6 @@ stdenv.mkDerivation rec { # TODO(@Dridus) remove the ++ libc at next hash break buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc; - preConfigure = '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ - ''; - cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; meta = { diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 4369a9765e5..063d64c6905 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -27,11 +27,6 @@ stdenv.mkDerivation rec { --replace xcrun "" ''; - preConfigure = '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ - ''; - makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ]; enableParallelBuilding = true; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 7b76919241d..e5d95497058 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -28,10 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gmp ]; patchPhase = "patchShebangs ./z_pp.pl"; - configurePhase = '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib ''; preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib"; diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index 29e8042ac7a..a56afbbf44b 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -19,11 +19,6 @@ stdenv.mkDerivation rec { gettext intltool libtool perl ]; - preConfigure = '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ - ''; - configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h"); patches = [ ./gcc-fix.patch ]; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 65e5669d86a..6165cacfdca 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -30,11 +30,6 @@ stdenv.mkDerivation rec { --replace "which %s" "${which}/bin/which %s" ''; - preConfigure = '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ - ''; - configureFlags = [ "--with-distributor=NixOS" ]; hardeningDisable = [ "format" ]; From 29573133569af11328ad9fd67c78f9a120605eca Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 21 Aug 2018 17:37:15 -0500 Subject: [PATCH 221/369] r2, r2-cutter: refactor and bump cutter to 1.7 --- .../default.nix => radare2/cutter.nix} | 19 +--- .../tools/analysis/radare2/default.nix | 90 +++---------------- .../tools/analysis/radare2/generic.nix | 75 ++++++++++++++++ .../tools/analysis/radare2/r2-for-cutter.nix | 16 ++++ pkgs/top-level/all-packages.nix | 10 ++- 5 files changed, 116 insertions(+), 94 deletions(-) rename pkgs/development/tools/analysis/{radare2-cutter/default.nix => radare2/cutter.nix} (68%) create mode 100644 pkgs/development/tools/analysis/radare2/generic.nix create mode 100644 pkgs/development/tools/analysis/radare2/r2-for-cutter.nix diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2/cutter.nix similarity index 68% rename from pkgs/development/tools/analysis/radare2-cutter/default.nix rename to pkgs/development/tools/analysis/radare2/cutter.nix index b427499ad99..4269661a4ff 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -4,22 +4,11 @@ # Qt , qtbase, qtsvg, qtwebengine # buildInputs -, radare2 +, r2-for-cutter , python3 }: let - r2 = radare2.overrideDerivation (o: { - name = "radare2-for-cutter-${version}"; - src = fetchFromGitHub { - owner = "radare"; - repo = "radare2"; - # XXX: The revision used here should match what Cutter uses as submodule. - # For now it's the revision cutter-git uses for r2. - rev = "c9ec8b54b9ba32ba6712f319825f8d032e573e68"; - sha256 = "04ri3wis8l1mbcp2gx419x7yfimljn7xa01izch71jy2h2mzk3z6"; - }; - }); - version = "1.6"; + version = "1.7"; in stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; @@ -28,7 +17,7 @@ stdenv.mkDerivation rec { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1ps52yf94yfnws3nn1iiwch2jy33dyvi7j47xkmh0m5fpdqi5xk7"; + sha256 = "0z9wzxd5hw0ivakrg3xiv4zx1rjj032hlmizq0pxj22xjrj1gg9n"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; @@ -43,7 +32,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ qmake pkgconfig ]; - buildInputs = [ qtbase qtsvg qtwebengine r2 python3 ]; + buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ]; qmakeFlags = [ "CONFIG+=link_pkgconfig" diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 43a05b5193d..07a81516c98 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,82 +1,16 @@ -{stdenv, fetchFromGitHub -, ninja, meson , pkgconfig -, libusb, readline, libewf, perl, zlib, openssl -, gtk2 ? null, vte ? null, gtkdialog ? null -, python ? null -, ruby ? null -, lua ? null -, useX11, rubyBindings, pythonBindings, luaBindings -}: +{ callPackage, ...} @ args: -assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); -assert rubyBindings -> ruby != null; -assert pythonBindings -> python != null; - - -let - inherit (stdenv.lib) optional; +callPackage ./generic.nix (args // { # # DO NOT EDIT! Automatically generated by ./update.py - version_commit = "19004"; - gittap = "2.8.0"; - gittip = "a76b965410aba07b4ef8b96d90b25b271c2003dd"; - version = "2.8.0"; - sha256 = "1d9rkzc3vychy2h1bnywwx4why83rr18r0lvvl1cqx87ad5awcjk"; - cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; - cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; + src_info = { + version_commit = "19004"; + gittap = "2.8.0"; + gittip = "a76b965410aba07b4ef8b96d90b25b271c2003dd"; + version = "2.8.0"; + sha256 = "1d9rkzc3vychy2h1bnywwx4why83rr18r0lvvl1cqx87ad5awcjk"; + cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; + cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; + }; # -in -stdenv.mkDerivation rec { - name = "radare2-${version}"; - - src = fetchFromGitHub { - owner = "radare"; - repo = "radare2"; - rev = version; - inherit sha256; - }; - - postPatch = let - capstone = fetchFromGitHub { - owner = "aquynh"; - repo = "capstone"; - # version from $sourceRoot/shlr/Makefile - rev = cs_tip; - sha256 = cs_sha256; - }; - in '' - if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi - # When using meson, it expects capstone source relative to build directory - mkdir -p build/shlr - ln -s ${capstone} build/shlr/capstone - ''; - - postInstall = '' - ln -s $out/bin/radare2 $out/bin/r2 - install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm - ''; - - mesonFlags = [ - "-Dr2_version_commit=${version_commit}" - "-Dr2_gittap=${gittap}" - "-Dr2_gittip=${gittip}" - ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig ninja meson ]; - buildInputs = [ readline libusb libewf perl zlib openssl] - ++ optional useX11 [gtkdialog vte gtk2] - ++ optional rubyBindings [ruby] - ++ optional pythonBindings [python] - ++ optional luaBindings [lua]; - - meta = { - description = "unix-like reverse engineering framework and commandline tools"; - homepage = http://radare.org/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [raskin makefu mic92]; - platforms = with stdenv.lib.platforms; linux; - inherit version; - }; -} +}) diff --git a/pkgs/development/tools/analysis/radare2/generic.nix b/pkgs/development/tools/analysis/radare2/generic.nix new file mode 100644 index 00000000000..074cbdddbbf --- /dev/null +++ b/pkgs/development/tools/analysis/radare2/generic.nix @@ -0,0 +1,75 @@ +{stdenv, fetchFromGitHub +, src_info, callPackage +, ninja, meson , pkgconfig +, libusb, readline, libewf, perl, zlib, openssl +, gtk2 ? null, vte ? null, gtkdialog ? null +, python ? null +, ruby ? null +, lua ? null +, useX11, rubyBindings, pythonBindings, luaBindings +}: + +assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); +assert rubyBindings -> ruby != null; +assert pythonBindings -> python != null; + + +let + inherit (stdenv.lib) optional; +in stdenv.mkDerivation (with src_info; rec { + name = "radare2-${version}"; + + src = fetchFromGitHub { + owner = "radare"; + repo = "radare2"; + rev = version; + inherit sha256; + }; + + postPatch = let + capstone = fetchFromGitHub { + owner = "aquynh"; + repo = "capstone"; + # version from $sourceRoot/shlr/Makefile + rev = cs_tip; + sha256 = cs_sha256; + }; + in '' + if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi + # When using meson, it expects capstone source relative to build directory + mkdir -p build/shlr + ln -s ${capstone} build/shlr/capstone + ''; + + postInstall = '' + ln -s $out/bin/radare2 $out/bin/r2 + install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm + ''; + + mesonFlags = [ + "-Dr2_version_commit=${version_commit}" + "-Dr2_gittap=${gittap}" + "-Dr2_gittip=${gittip}" + # 2.8.0 expects this, but later it becomes an option with default=false. + "-Dcapstone_in_builddir=true" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig ninja meson ]; + buildInputs = [ readline libusb libewf perl zlib openssl] + ++ optional useX11 [gtkdialog vte gtk2] + ++ optional rubyBindings [ruby] + ++ optional pythonBindings [python] + ++ optional luaBindings [lua]; + + meta = { + description = "unix-like reverse engineering framework and commandline tools"; + homepage = http://radare.org/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [raskin makefu mic92]; + platforms = with stdenv.lib.platforms; linux; + inherit version; + }; +}) + diff --git a/pkgs/development/tools/analysis/radare2/r2-for-cutter.nix b/pkgs/development/tools/analysis/radare2/r2-for-cutter.nix new file mode 100644 index 00000000000..e63d4442bec --- /dev/null +++ b/pkgs/development/tools/analysis/radare2/r2-for-cutter.nix @@ -0,0 +1,16 @@ +{ callPackage, ...} @ args: + +callPackage ./generic.nix (args // { + # + # DO NOT EDIT! Automatically generated by ./update.py + src_info = { + version_commit = "19256"; + gittap = "2.8.0-118-gb0547831f"; + gittip = "b0547831f127b7357e3c93bc43933482a4d6213b"; + version = "2.9.0-git"; + sha256 = "1ix42kipd1aayb494ajbxawzc1cwikm9fxk343d1kchxx4a30a1m"; + cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; + cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; + }; + # +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 302ff26ed40..f32d98a6d29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8540,7 +8540,15 @@ with pkgs; rubyBindings = config.radare.rubyBindings or false; luaBindings = config.radare.luaBindings or false; }; - radare2-cutter = libsForQt5.callPackage ../development/tools/analysis/radare2-cutter { }; + r2-for-cutter = callPackage ../development/tools/analysis/radare2/r2-for-cutter.nix { + inherit (gnome2) vte; + lua = lua5; + useX11 = config.radare.useX11 or false; + pythonBindings = config.radare.pythonBindings or false; + rubyBindings = config.radare.rubyBindings or false; + luaBindings = config.radare.luaBindings or false; + }; + radare2-cutter = libsForQt5.callPackage ../development/tools/analysis/radare2/cutter.nix { }; ragel = ragelStable; From 61c0adfbc11da6cbc20ec7482ac1b96ae7d1d2a5 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Wed, 8 Aug 2018 14:04:35 +0700 Subject: [PATCH 222/369] astroid: 0.11.1 -> 0.13 Couple of things were updated to make this work. 1. webkitgtk24x-gtk3 that is marked unsafe has been replaced with webkitgtk (2.20.*) as astroid has recently indicated that [>= 2.20 is acceptable](https://github.com/astroidmail/astroid/commit/48ce7e3010d2ee99ccba18798b4f5333867bd1a2) 2. protobuf built input was added to satisfy requirements 3. astroid was not functional at all without proper icons so gnome3.defaultIconTheme were added to buildInputs 4. By default, astroid will use `gvim` as a setting for the embedded editor, however that didn't work well with nixpkgs. vim is now bundled with astroid by default. This setting can be overridden by the user in astroid's config file. --- .../mailreaders/astroid/default.nix | 36 +++++++++++++++---- .../mailreaders/astroid/run_tests.diff | 10 ++++++ 2 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/networking/mailreaders/astroid/run_tests.diff diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 9a348fc03f7..0cb07b8ce75 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,22 +1,44 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3 -, libsass, notmuch, boost, wrapGAppsHook, glib-networking }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk +, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable +, makeWrapper, python3, python3Packages +, vim ? vim_configurable.override { + features = "normal"; + gui = "auto"; + } +}: stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.11.1"; + version = "0.13"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "1z48rvlzwi7bq7j55rnb0gg1a4k486yj910z2cxz1p46lxk332j1"; + sha256 = "105x5g44hng3fi03h67j3an53088148jbq8726nmcp0zs0cy9gac"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas - notmuch boost gnome3.gsettings-desktop-schemas - glib-networking ]; + buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas + python3 python3Packages.pygobject3 + notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme + glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); + + patches = [ + # TODO: remove when https://github.com/astroidmail/astroid/pull/531 + # is released + ./run_tests.diff + ]; + + postPatch = '' + sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc + sed -i "s~ -geom 10x10~~g" src/config.cc + ''; + + postInstall = '' + wrapProgram "$out/bin/astroid" --set CHARSET=en_us.UTF-8 + ''; meta = with stdenv.lib; { homepage = https://astroidmail.github.io/; diff --git a/pkgs/applications/networking/mailreaders/astroid/run_tests.diff b/pkgs/applications/networking/mailreaders/astroid/run_tests.diff new file mode 100644 index 00000000000..21b466741ce --- /dev/null +++ b/pkgs/applications/networking/mailreaders/astroid/run_tests.diff @@ -0,0 +1,10 @@ +diff --git a/tests/run_test.sh b/tests/run_test.sh +index f2ea7d7..927c61d 100755 +--- a/tests/run_test.sh ++++ b/tests/run_test.sh +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /usr/bin/env bash + # + # Set up environment and run test specified on command line + From d944690b7b7a512268467e0bc9d45ca6bcdf9824 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Aug 2018 17:49:13 -0700 Subject: [PATCH 223/369] mercurialFull: 4.6.2 -> 4.7 (#45186) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mercurial-full/versions. --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 74ca47b046a..73cf4d74e18 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.6.2"; + version = "4.7"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "1bv6wgcdx8glihjjfg22khhc52mclsn4kwfqvzbzlg0b42h4xl0w"; + sha256 = "17rl1lyvr3qa5x73xyiwnv09wwiwjd18f01gvispzyvpgx1v3309"; }; inherit python; # pass it so that the same version can be used in hg2git From 23581b125bff62e3c14e61739e5aa09ceb9c004a Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Wed, 22 Aug 2018 14:08:38 +1000 Subject: [PATCH 224/369] nodePackages_10_x: add node-gyp --- .../node-packages/node-packages-v10.json | 3 + .../node-packages/node-packages-v10.nix | 2474 ++++++++++++++++- 2 files changed, 2430 insertions(+), 47 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 50cc105e7ff..088ff9aa6f2 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -2,5 +2,8 @@ "bower" , "coffee-script" , "grunt-cli" +, "node-gyp" +, "node-gyp-build" +, "node-pre-gyp" , "pnpm" ] diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 488f1782dda..7dcb6abef79 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -13,6 +13,159 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; + "ajv-5.5.2" = { + name = "ajv"; + packageName = "ajv"; + version = "5.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; + sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "are-we-there-yet-1.1.5" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + }; + }; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; + "arr-flatten-1.1.0" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; + }; + }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + }; + "array-each-1.0.1" = { + name = "array-each"; + packageName = "array-each"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"; + sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; + }; + }; + "array-slice-1.1.0" = { + name = "array-slice"; + packageName = "array-slice"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"; + sha512 = "B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w=="; + }; + }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "atob-2.1.2" = { + name = "atob"; + packageName = "atob"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.8.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; + }; + }; "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; @@ -22,6 +175,33 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; + "block-stream-0.0.9" = { + name = "block-stream"; + packageName = "block-stream"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; + sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; + }; + }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -31,6 +211,96 @@ let sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; + "braces-2.3.2" = { + name = "braces"; + packageName = "braces"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; + }; + }; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "chownr-1.0.1" = { + name = "chownr"; + packageName = "chownr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; + sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; + }; + }; + "class-utils-0.3.6" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; + }; + }; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + }; + "combined-stream-1.0.6" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; "concat-map-0.0.1" = { name = "concat-map"; packageName = "concat-map"; @@ -40,31 +310,499 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "findup-sync-0.3.0" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"; - sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16"; - }; - }; - "glob-5.0.15" = { - name = "glob"; - packageName = "glob"; - version = "5.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; - sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; - }; - }; - "grunt-known-options-1.1.0" = { - name = "grunt-known-options"; - packageName = "grunt-known-options"; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"; - sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "detect-file-1.0.0" = { + name = "detect-file"; + packageName = "detect-file"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + }; + "extglob-2.0.4" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-1.1.0" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; + sha1 = "c053477817c86b51daa853c81e059b733d023614"; + }; + }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + }; + "findup-sync-2.0.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; + }; + }; + "fined-1.1.0" = { + name = "fined"; + packageName = "fined"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz"; + sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; + }; + }; + "flagged-respawn-1.0.0" = { + name = "flagged-respawn"; + packageName = "flagged-respawn"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz"; + sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"; + }; + }; + "for-in-1.0.2" = { + name = "for-in"; + packageName = "for-in"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + }; + "for-own-1.0.0" = { + name = "for-own"; + packageName = "for-own"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"; + sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.2" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; + sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + }; + "fs-minipass-1.2.5" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; + sha512 = "JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "fstream-1.0.11" = { + name = "fstream"; + packageName = "fstream"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; + sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; + }; + }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "glob-7.1.2" = { + name = "glob"; + packageName = "glob"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; + sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; + }; + }; + "global-modules-1.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; + sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; + }; + }; + "global-prefix-1.0.2" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + }; + "graceful-fs-4.1.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + }; + }; + "grunt-known-options-1.1.1" = { + name = "grunt-known-options"; + packageName = "grunt-known-options"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz"; + sha512 = "cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ=="; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.0" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz"; + sha512 = "+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA=="; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + }; + "homedir-polyfill-1.0.1" = { + name = "homedir-polyfill"; + packageName = "homedir-polyfill"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; + sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "iconv-lite-0.4.23" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.23"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz"; + sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA=="; + }; + }; + "ignore-walk-3.0.1" = { + name = "ignore-walk"; + packageName = "ignore-walk"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; + sha512 = "DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ=="; }; }; "inflight-1.0.6" = { @@ -85,6 +823,384 @@ let sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + }; + }; + "interpret-1.1.0" = { + name = "interpret"; + packageName = "interpret"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; + sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; + }; + }; + "is-absolute-1.0.0" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; + sha512 = "dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA=="; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + }; + }; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + }; + }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + }; + }; + "is-relative-1.0.0" = { + name = "is-relative"; + packageName = "is-relative"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; + sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "is-unc-path-1.0.0" = { + name = "is-unc-path"; + packageName = "is-unc-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"; + sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; + }; + }; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.3.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; + sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; + }; + }; + "kind-of-6.0.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; + sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="; + }; + }; + "liftoff-2.5.0" = { + name = "liftoff"; + packageName = "liftoff"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz"; + sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; + }; + }; + "make-iterator-1.0.1" = { + name = "make-iterator"; + packageName = "make-iterator"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz"; + sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw=="; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "micromatch-3.1.10" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; + }; + }; + "mime-db-1.35.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.35.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz"; + sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="; + }; + }; + "mime-types-2.1.19" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.19"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz"; + sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw=="; + }; + }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -94,6 +1210,87 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "minipass-2.3.4" = { + name = "minipass"; + packageName = "minipass"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-2.3.4.tgz"; + sha512 = "mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w=="; + }; + }; + "minizlib-1.1.0" = { + name = "minizlib"; + packageName = "minizlib"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; + sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA=="; + }; + }; + "mixin-deep-1.3.1" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; + sha512 = "8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ=="; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "nanomatch-1.2.13" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; + }; + }; + "needle-2.2.2" = { + name = "needle"; + packageName = "needle"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.2.2.tgz"; + sha512 = "mW7W8dKuVYefCpNzE3Z7xUmPI9wSrSL/1qH31YGMxmSOAnjatS3S9Zv3cmiHrhx3Jkp1SrWWBdOFXjfF48Uq3A=="; + }; + }; "nopt-3.0.6" = { name = "nopt"; packageName = "nopt"; @@ -103,6 +1300,114 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; + "nopt-4.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + }; + }; + "npm-bundled-1.0.5" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz"; + sha512 = "m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g=="; + }; + }; + "npm-packlist-1.1.11" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz"; + sha512 = "CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA=="; + }; + }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; + "object.defaults-1.1.0" = { + name = "object.defaults"; + packageName = "object.defaults"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; + sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; + }; + }; + "object.map-1.0.1" = { + name = "object.map"; + packageName = "object.map"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"; + sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; + }; + }; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -112,6 +1417,60 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + }; + }; + "parse-filepath-1.0.2" = { + name = "parse-filepath"; + packageName = "parse-filepath"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"; + sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; + }; + }; + "parse-passwd-1.0.0" = { + name = "parse-passwd"; + packageName = "parse-passwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -121,13 +1480,571 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "resolve-1.1.7" = { + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; + "path-root-0.1.1" = { + name = "path-root"; + packageName = "path-root"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"; + sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; + }; + }; + "path-root-regex-0.1.2" = { + name = "path-root-regex"; + packageName = "path-root-regex"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"; + sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; + "process-nextick-args-2.0.0" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="; + }; + }; + "psl-1.1.29" = { + name = "psl"; + packageName = "psl"; + version = "1.1.29"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz"; + sha512 = "AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; + "readable-stream-2.3.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + }; + }; + "rechoir-0.6.2" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; + sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; + }; + }; + "regex-not-1.0.2" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; + }; + }; + "repeat-element-1.1.3" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "request-2.88.0" = { + name = "request"; + packageName = "request"; + version = "2.88.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + }; + }; + "resolve-1.8.1" = { name = "resolve"; packageName = "resolve"; - version = "1.1.7"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz"; + sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA=="; + }; + }; + "resolve-dir-1.0.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; + }; + }; + "rimraf-2.6.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; + sha512 = "lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + }; + "semver-5.5.1" = { + name = "semver"; + packageName = "semver"; + version = "5.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz"; + sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "set-value-0.4.3" = { + name = "set-value"; + packageName = "set-value"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; + sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; + }; + }; + "set-value-2.0.0" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; + sha512 = "hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg=="; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "snapdragon-0.8.2" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; + }; + }; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; + }; + }; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-resolve-0.5.2" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; + sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; + }; + }; + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; + }; + }; + "sshpk-1.14.2" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; + sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; + "tar-2.2.1" = { + name = "tar"; + packageName = "tar"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"; + sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; + }; + }; + "tar-4.4.6" = { + name = "tar"; + packageName = "tar"; + version = "4.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz"; + sha512 = "tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg=="; + }; + }; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "to-regex-3.0.2" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + }; + "tough-cookie-2.4.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "unc-path-regex-0.1.2" = { + name = "unc-path-regex"; + packageName = "unc-path-regex"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; + sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; + }; + }; + "union-value-1.0.0" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; + sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "use-3.1.1" = { + name = "use"; + packageName = "use"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "uuid-3.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; + }; + }; + "v8flags-3.0.2" = { + name = "v8flags"; + packageName = "v8flags"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/v8flags/-/v8flags-3.0.2.tgz"; + sha512 = "6sgSKoFw1UpUPd3cFdF7QGnrH6tDeBgW1F3v9gy8gLY0mlbiBXq8soy8aQpY6xeeCjH5K+JvC62Acp7gtl7wWA=="; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "which-1.3.1" = { + name = "which"; + packageName = "which"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; "wrappy-1.0.2" = { @@ -139,6 +2056,15 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; + "yallist-3.0.2" = { + name = "yallist"; + packageName = "yallist"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz"; + sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; + }; + }; }; in { @@ -179,27 +2105,263 @@ in grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; packageName = "grunt-cli"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz"; - sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8"; + url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.3.1.tgz"; + sha512 = "UwBRu/QpAjDc53DRLEkyilFdL0zenpxu+fddTIlsF/KJqdNcHaQmvyu1W3cDesZ9rqqZdKK5A8+QDIyLUEWoZQ=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.11" - sources."concat-map-0.0.1" - sources."findup-sync-0.3.0" - sources."glob-5.0.15" - sources."grunt-known-options-1.1.0" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."minimatch-3.0.4" - sources."nopt-3.0.6" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."resolve-1.1.7" - sources."wrappy-1.0.2" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-each-1.0.1" + sources."array-slice-1.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."atob-2.1.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."cache-base-1.0.1" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."collection-visit-1.0.0" + sources."component-emitter-1.2.1" + sources."copy-descriptor-0.1.1" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" + sources."detect-file-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."expand-tilde-2.0.2" + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."findup-sync-2.0.0" + sources."fined-1.1.0" + sources."flagged-respawn-1.0.0" + sources."for-in-1.0.2" + sources."for-own-1.0.0" + sources."fragment-cache-0.2.1" + sources."get-value-2.0.6" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" + sources."grunt-known-options-1.1.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."homedir-polyfill-1.0.1" + sources."ini-1.3.5" + sources."interpret-1.1.0" + sources."is-absolute-1.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-relative-1.0.0" + sources."is-unc-path-1.0.0" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."liftoff-2.5.0" + sources."make-iterator-1.0.1" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."micromatch-3.1.10" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."ms-2.0.0" + sources."nanomatch-1.2.13" + sources."nopt-4.0.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-visit-1.0.1" + sources."object.defaults-1.1.0" + sources."object.map-1.0.1" + sources."object.pick-1.3.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."parse-filepath-1.0.2" + sources."parse-passwd-1.0.0" + sources."pascalcase-0.1.1" + 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" + sources."rechoir-0.6.2" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."resolve-1.8.1" + sources."resolve-dir-1.0.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."safe-regex-1.1.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."unc-path-regex-0.1.2" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" + sources."v8flags-3.0.2" + sources."which-1.3.1" ]; buildInputs = globalBuildInputs; meta = { @@ -210,13 +2372,231 @@ in production = true; bypassCache = true; }; + node-gyp = nodeEnv.buildNodePackage { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz"; + sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; + }; + dependencies = [ + sources."abbrev-1.1.1" + 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-1.0.0" + sources."asynckit-0.4.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."brace-expansion-1.1.11" + sources."caseless-0.12.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.6" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."dashdash-1.14.1" + sources."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.3.2" + sources."fs.realpath-1.0.0" + sources."fstream-1.0.11" + sources."gauge-2.7.4" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.1.0" + sources."has-unicode-2.0.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" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + 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."jsprim-1.4.1" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."nopt-3.0.6" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.0" + sources."psl-1.1.29" + sources."punycode-1.4.1" + sources."qs-6.5.2" + sources."readable-stream-2.3.6" + sources."request-2.88.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."sshpk-1.14.2" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."tar-2.2.1" + sources."tough-cookie-2.4.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" + sources."which-1.3.1" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Node.js native addon build tool"; + homepage = "https://github.com/nodejs/node-gyp#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + node-gyp-build = nodeEnv.buildNodePackage { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz"; + sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Build tool and bindings loader for node-gyp that supports prebuilds"; + homepage = https://github.com/mafintosh/node-gyp-build; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + node-pre-gyp = nodeEnv.buildNodePackage { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz"; + sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."chownr-1.0.1" + sources."code-point-at-1.1.0" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."debug-2.6.9" + sources."deep-extend-0.6.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."fs-minipass-1.2.5" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."glob-7.1.2" + sources."has-unicode-2.0.1" + sources."iconv-lite-0.4.23" + sources."ignore-walk-3.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.3.4" + sources."minizlib-1.1.0" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."needle-2.2.2" + sources."nopt-4.0.1" + sources."npm-bundled-1.0.5" + sources."npm-packlist-1.1.11" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."process-nextick-args-2.0.0" + (sources."rc-1.2.8" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."readable-stream-2.3.6" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.5.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-4.4.6" + sources."util-deprecate-1.0.2" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + sources."yallist-3.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Node.js native addon binary install tool"; + homepage = "https://github.com/mapbox/node-pre-gyp#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + }; pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.13.1"; + version = "2.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.1.tgz"; - sha512 = "xwIluOOA+GV6Rz5jvVS2hcGlrqjEWaaU7/PUECdG8H/Eo9I4xban/XhedQ8jIrqt1P7KLDV0/+ENlmYusdL/Zw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.5.tgz"; + sha512 = "JImNFSl+9EpBYJ4B3mvlAqkh1r8qweq1RsEsQ0BAUgL3+ZsMFtWYjRRlElg0u5FXwU+11p8s1bePIRTCQTKZ4g=="; }; buildInputs = globalBuildInputs; meta = { From cdf90258e6bf911db2b56280301014a88c91be65 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Wed, 22 Aug 2018 11:38:01 +0300 Subject: [PATCH 225/369] rust-cbindgen: 0.6.1 -> 0.6.2 --- pkgs/development/tools/rust/cbindgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 0dcc1287791..c3040ec567c 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "03qzqy3indqghqy7rnli1zrrlnyfkygxjpb2s7041cik54kf2krw"; + sha256 = "0hifmn9578cf1r5m4ajazg3rhld2ybd2v48xz04vfhappkarv4w2"; }; cargoSha256 = "0c3xpzff8jldqbn5a25yy6c2hlz5xy636ml6sj5d24wzcgwg5a2i"; From 9232c6dc36c241d6bc692b432e3fdb23eb1fd655 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Wed, 22 Aug 2018 12:17:15 +0200 Subject: [PATCH 226/369] chromedriver: update darwin hash for 2.41 --- pkgs/development/tools/selenium/chromedriver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index eb91026c836..238c3bc704d 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -11,7 +11,7 @@ let "x86_64-darwin" = { system = "mac64"; - sha256 = "11hs4mmlvxjaanq41h0dljj4sff0lfwk31svvdmzfg91idlikpsz"; + sha256 = "1blp4ig5fm6ar8mxm78dc2gvv7n82mq3kqswbyjrcizl91qs4cpx"; }; }; From 9f48572af8f78652732049ce1b3f19c7fa5bb5c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 Aug 2018 03:22:06 -0700 Subject: [PATCH 227/369] lilv: 0.24.2 -> 0.24.4 (#44743) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lilv/versions. --- pkgs/development/libraries/audio/lilv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 710c5b1a92c..f28e374c852 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lilv-${version}"; - version = "0.24.2"; + version = "0.24.4"; src = fetchurl { url = "https://download.drobilla.net/${name}.tar.bz2"; - sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p"; + sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3"; }; nativeBuildInputs = [ pkgconfig ]; From 9cc57c1d61c242a0a681db8345b2696d7a2872b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 Aug 2018 03:28:36 -0700 Subject: [PATCH 228/369] fwup: 1.2.3 -> 1.2.5 (#45239) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fwup/versions. --- pkgs/tools/misc/fwup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index be86f6496f0..97eedd9be25 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "1.2.3"; + version = "1.2.5"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "16v5s9xwdsii7pcphrb0a7aib2zprrw6n4fyc8w8c11gbkg27r4d"; + sha256 = "0kraip4lr3fvcxvvq1dwjw7fyzs6bcjg14xn0g52985krxxn5pdc"; }; doCheck = true; From 96bf79c2a13c1c564c66011d038af81b911ae932 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 22 Aug 2018 05:32:24 -0500 Subject: [PATCH 229/369] 1password: 0.5.1 -> 0.5.3 (#45452) --- pkgs/applications/misc/1password/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index a44ce2d8b4c..94dfc68fb59 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { name = "1password-${version}"; - version = "0.5.1"; + version = "0.5.3"; src = if stdenv.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "08kzjilxpkvlwqjyxnic1n6xiy6gkndijwxdksm59k7c56mdawsz"; + sha256 = "05s223h1yps4k9kmignl0r5sbh6w7m1hnlmafnf1kiwv7gacvxjc"; stripRoot = false; } else if stdenv.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "1bsbzaqws0z991r6rkjrxay74fj4g5ld4d748ygr0950zwi1m3h7"; + sha256 = "0p9x1fx0309v8dxxaf88m8x8q15zzqywfmjn6v5wb9v3scp9396v"; stripRoot = false; } else if stdenv.system == "x86_64-darwin" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; - sha256 = "1dhr8m9icip27v802gxl1vhl9rf0jq5awirdm72lqmlypj86df0g"; + sha256 = "1z2xp9bn93gr4ha6zx65va1fb58a2xlnnmpv583y96gq3vbnqdcj"; stripRoot = false; } else throw "Architecture not supported"; From dc8cae21a822f198a7442f59c0f60b0c383b01ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 22 Aug 2018 11:45:34 +0100 Subject: [PATCH 230/369] radare2: rework update script to include cutter's radare2 version --- .../tools/analysis/radare2/default.nix | 103 ++++++++++++++- .../tools/analysis/radare2/generic.nix | 75 ----------- .../tools/analysis/radare2/r2-for-cutter.nix | 16 --- .../tools/analysis/radare2/update.py | 123 +++++++++++++----- pkgs/top-level/all-packages.nix | 14 +- 5 files changed, 193 insertions(+), 138 deletions(-) delete mode 100644 pkgs/development/tools/analysis/radare2/generic.nix delete mode 100644 pkgs/development/tools/analysis/radare2/r2-for-cutter.nix diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 07a81516c98..85559269f27 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,16 +1,109 @@ -{ callPackage, ...} @ args: +{stdenv, fetchFromGitHub +, callPackage +, ninja, meson , pkgconfig +, libusb, readline, libewf, perl, zlib, openssl +, gtk2 ? null, vte ? null, gtkdialog ? null +, python ? null +, ruby ? null +, lua ? null +, useX11, rubyBindings, pythonBindings, luaBindings +}: -callPackage ./generic.nix (args // { +assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); +assert rubyBindings -> ruby != null; +assert pythonBindings -> python != null; + + +let + inherit (stdenv.lib) optional; + + generic = { + version_commit, + gittap, + gittip, + rev, + version, + sha256, + cs_tip, + cs_sha256 + }: + stdenv.mkDerivation rec { + name = "radare2-${version}"; + + src = fetchFromGitHub { + owner = "radare"; + repo = "radare2"; + inherit rev sha256; + }; + + postPatch = let + capstone = fetchFromGitHub { + owner = "aquynh"; + repo = "capstone"; + # version from $sourceRoot/shlr/Makefile + rev = cs_tip; + sha256 = cs_sha256; + }; + in '' + if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi + # When using meson, it expects capstone source relative to build directory + mkdir -p build/shlr + ln -s ${capstone} build/shlr/capstone + ''; + + postInstall = '' + ln -s $out/bin/radare2 $out/bin/r2 + install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm + ''; + + mesonFlags = [ + "-Dr2_version_commit=${version_commit}" + "-Dr2_gittap=${gittap}" + "-Dr2_gittip=${gittip}" + # 2.8.0 expects this, but later it becomes an option with default=false. + "-Dcapstone_in_builddir=true" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig ninja meson ]; + buildInputs = [ readline libusb libewf perl zlib openssl] + ++ optional useX11 [gtkdialog vte gtk2] + ++ optional rubyBindings [ruby] + ++ optional pythonBindings [python] + ++ optional luaBindings [lua]; + + meta = { + description = "unix-like reverse engineering framework and commandline tools"; + homepage = http://radare.org/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [raskin makefu mic92]; + platforms = with stdenv.lib.platforms; linux; + inherit version; + }; + }; +in { # # DO NOT EDIT! Automatically generated by ./update.py - src_info = { - version_commit = "19004"; + radare2 = generic { + version_commit = "19251"; gittap = "2.8.0"; gittip = "a76b965410aba07b4ef8b96d90b25b271c2003dd"; + rev = "2.8.0"; version = "2.8.0"; sha256 = "1d9rkzc3vychy2h1bnywwx4why83rr18r0lvvl1cqx87ad5awcjk"; cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; }; + r2-for-cutter = generic { + version_commit = "19251"; + gittap = "2.8.0-118-gb0547831f"; + gittip = "b0547831f127b7357e3c93bc43933482a4d6213b"; + rev = "b0547831f127b7357e3c93bc43933482a4d6213b"; + version = "2018-08-07"; + sha256 = "1ix42kipd1aayb494ajbxawzc1cwikm9fxk343d1kchxx4a30a1m"; + cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; + cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; + }; # -}) +} diff --git a/pkgs/development/tools/analysis/radare2/generic.nix b/pkgs/development/tools/analysis/radare2/generic.nix deleted file mode 100644 index 074cbdddbbf..00000000000 --- a/pkgs/development/tools/analysis/radare2/generic.nix +++ /dev/null @@ -1,75 +0,0 @@ -{stdenv, fetchFromGitHub -, src_info, callPackage -, ninja, meson , pkgconfig -, libusb, readline, libewf, perl, zlib, openssl -, gtk2 ? null, vte ? null, gtkdialog ? null -, python ? null -, ruby ? null -, lua ? null -, useX11, rubyBindings, pythonBindings, luaBindings -}: - -assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); -assert rubyBindings -> ruby != null; -assert pythonBindings -> python != null; - - -let - inherit (stdenv.lib) optional; -in stdenv.mkDerivation (with src_info; rec { - name = "radare2-${version}"; - - src = fetchFromGitHub { - owner = "radare"; - repo = "radare2"; - rev = version; - inherit sha256; - }; - - postPatch = let - capstone = fetchFromGitHub { - owner = "aquynh"; - repo = "capstone"; - # version from $sourceRoot/shlr/Makefile - rev = cs_tip; - sha256 = cs_sha256; - }; - in '' - if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi - # When using meson, it expects capstone source relative to build directory - mkdir -p build/shlr - ln -s ${capstone} build/shlr/capstone - ''; - - postInstall = '' - ln -s $out/bin/radare2 $out/bin/r2 - install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm - ''; - - mesonFlags = [ - "-Dr2_version_commit=${version_commit}" - "-Dr2_gittap=${gittap}" - "-Dr2_gittip=${gittip}" - # 2.8.0 expects this, but later it becomes an option with default=false. - "-Dcapstone_in_builddir=true" - ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig ninja meson ]; - buildInputs = [ readline libusb libewf perl zlib openssl] - ++ optional useX11 [gtkdialog vte gtk2] - ++ optional rubyBindings [ruby] - ++ optional pythonBindings [python] - ++ optional luaBindings [lua]; - - meta = { - description = "unix-like reverse engineering framework and commandline tools"; - homepage = http://radare.org/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [raskin makefu mic92]; - platforms = with stdenv.lib.platforms; linux; - inherit version; - }; -}) - diff --git a/pkgs/development/tools/analysis/radare2/r2-for-cutter.nix b/pkgs/development/tools/analysis/radare2/r2-for-cutter.nix deleted file mode 100644 index e63d4442bec..00000000000 --- a/pkgs/development/tools/analysis/radare2/r2-for-cutter.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ callPackage, ...} @ args: - -callPackage ./generic.nix (args // { - # - # DO NOT EDIT! Automatically generated by ./update.py - src_info = { - version_commit = "19256"; - gittap = "2.8.0-118-gb0547831f"; - gittip = "b0547831f127b7357e3c93bc43933482a4d6213b"; - version = "2.9.0-git"; - sha256 = "1ix42kipd1aayb494ajbxawzc1cwikm9fxk343d1kchxx4a30a1m"; - cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; - cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; - }; - # -}) diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index 1f16a00905c..ac1eb63401b 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -3,13 +3,15 @@ # USAGE - just run the script: ./update.py # When editing this file, make also sure it passes the mypy typecheck # and is formatted with yapf. -import urllib.request -import json -import tempfile -import subprocess import fileinput +import json import re +import subprocess +import tempfile +import urllib.request +from datetime import datetime from pathlib import Path +from typing import Dict def sh(*args: str) -> str: @@ -18,50 +20,107 @@ def sh(*args: str) -> str: def prefetch_github(owner: str, repo: str, ref: str) -> str: - return sh("nix-prefetch-url", "--unpack", - f"https://github.com/{owner}/{repo}/archive/{ref}.tar.gz") + return sh( + "nix-prefetch-url", + "--unpack", + f"https://github.com/{owner}/{repo}/archive/{ref}.tar.gz", + ) -def main() -> None: +def get_radare2_rev() -> str: url = "https://api.github.com/repos/radare/radare2/releases/latest" with urllib.request.urlopen(url) as response: release = json.load(response) # type: ignore - version = release["tag_name"] + return release["tag_name"] + + +def get_r2_cutter_rev() -> str: + url = "https://api.github.com/repos/radareorg/cutter/contents/" + with urllib.request.urlopen(url) as response: + data = json.load(response) # type: ignore + for entry in data: + if entry["name"] == "radare2": + return entry["sha"] + raise Exception("no radare2 submodule found in github.com/radareorg/cutter") + + +def git(dirname: str, *args: str) -> str: + return sh("git", "-C", dirname, *args) + + +def get_repo_info(dirname: str, rev: str) -> Dict[str, str]: + sha256 = prefetch_github("radare", "radare2", rev) + + cs_tip = None + with open(Path(dirname).joinpath("shlr", "Makefile")) as makefile: + for l in makefile: + match = re.match("CS_TIP=(\S+)", l) + if match: + cs_tip = match.group(1) + assert cs_tip is not None + + cs_sha256 = prefetch_github("aquynh", "capstone", cs_tip) + + return dict( + rev=rev, + sha256=sha256, + version_commit=git(dirname, "rev-list", "--all", "--count"), + gittap=git(dirname, "describe", "--tags", "--match", "[0-9]*"), + gittip=git(dirname, "rev-parse", "HEAD"), + cs_tip=cs_tip, + cs_sha256=cs_sha256, + ) + + +def write_package_expr(version: str, info: Dict[str, str]) -> str: + return f"""generic {{ + version_commit = "{info["version_commit"]}"; + gittap = "{info["gittap"]}"; + gittip = "{info["gittip"]}"; + rev = "{info["rev"]}"; + version = "{version}"; + sha256 = "{info["sha256"]}"; + cs_tip = "{info["cs_tip"]}"; + cs_sha256 = "{info["cs_sha256"]}"; + }}""" + + +def main() -> None: + radare2_rev = get_radare2_rev() + r2_cutter_rev = get_r2_cutter_rev() + with tempfile.TemporaryDirectory() as dirname: - - def git(*args: str) -> str: - return sh("git", "-C", dirname, *args) - - git("clone", "--branch", version, "https://github.com/radare/radare2", - ".") - sha256 = prefetch_github("radare", "radare2", version) + git( + dirname, + "clone", + "--branch", + radare2_rev, + "https://github.com/radare/radare2", + ".", + ) nix_file = str(Path(__file__).parent.joinpath("default.nix")) - cs_tip = None - with open(Path(dirname).joinpath("shlr", "Makefile")) as makefile: - for l in makefile: - match = re.match("CS_TIP=(\S+)", l) - if match: - cs_tip = match.group(1) - assert cs_tip is not None + radare2_info = get_repo_info(dirname, radare2_rev) - cs_sha256 = prefetch_github("aquynh", "capstone", cs_tip) + git(dirname, "checkout", r2_cutter_rev) + + timestamp = git(dirname, "log", "-n1", "--format=%at") + r2_cutter_version = datetime.fromtimestamp(int(timestamp)).strftime("%Y-%m-%d") + + r2_cutter_info = get_repo_info(dirname, r2_cutter_rev) in_block = False with fileinput.FileInput(nix_file, inplace=True) as f: for l in f: if "#" in l: in_block = True - print(f""" # + print( + f""" # # DO NOT EDIT! Automatically generated by ./update.py - version_commit = "{git("rev-list", "--all", "--count")}"; - gittap = "{git("describe", "--tags", "--match", "[0-9]*")}"; - gittip = "{git("rev-parse", "HEAD")}"; - version = "{version}"; - sha256 = "{sha256}"; - cs_tip = "{cs_tip}"; - cs_sha256 = "{cs_sha256}"; - #""") + radare2 = {write_package_expr(radare2_rev, radare2_info)}; + r2-for-cutter = {write_package_expr(r2_cutter_version, r2_cutter_info)}; + #""" + ) elif "#" in l: in_block = False elif not in_block: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f32d98a6d29..b3e1d455d4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8532,22 +8532,16 @@ with pkgs; rubyBindings = config.radare.rubyBindings or false; luaBindings = config.radare.luaBindings or false; }; - radare2 = callPackage ../development/tools/analysis/radare2 { + + inherit (callPackages ../development/tools/analysis/radare2 { inherit (gnome2) vte; lua = lua5; useX11 = config.radare.useX11 or false; pythonBindings = config.radare.pythonBindings or false; rubyBindings = config.radare.rubyBindings or false; luaBindings = config.radare.luaBindings or false; - }; - r2-for-cutter = callPackage ../development/tools/analysis/radare2/r2-for-cutter.nix { - inherit (gnome2) vte; - lua = lua5; - useX11 = config.radare.useX11 or false; - pythonBindings = config.radare.pythonBindings or false; - rubyBindings = config.radare.rubyBindings or false; - luaBindings = config.radare.luaBindings or false; - }; + }) radare2 r2-for-cutter; + radare2-cutter = libsForQt5.callPackage ../development/tools/analysis/radare2/cutter.nix { }; ragel = ragelStable; From 36d8beb426a1f4113c5e94b42012a1b284236a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 22 Aug 2018 11:48:13 +0100 Subject: [PATCH 231/369] radare2: update.py should be formatted with black now --- pkgs/development/tools/analysis/radare2/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index ac1eb63401b..fae6a52a392 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -2,7 +2,7 @@ #!nix-shell -p nix -p python3 -p git -i python # USAGE - just run the script: ./update.py # When editing this file, make also sure it passes the mypy typecheck -# and is formatted with yapf. +# and is formatted with black. import fileinput import json import re From 42545f528800fe0ecc3402dafff5f0ceeaaa0a7d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 Aug 2018 03:54:36 -0700 Subject: [PATCH 232/369] libblockdev: 2.18 -> 2.19 (#45193) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libblockdev/versions. --- pkgs/development/libraries/libblockdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index b5402984d16..585f6f18bba 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.18"; + version = "2.19"; in stdenv.mkDerivation rec { name = "libblockdev-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "03gbmji401nz1sff2zp61dhal80qls4blqwadj2p4ckbxdlmid4i"; + sha256 = "1ny31vaarzbpw0h863p2r5cvjsfs77d33nnisf8bhjc6ps6js3ys"; }; outputs = [ "out" "dev" "devdoc" ]; From 158e3cb0da88e887cb9d980482867fbc3567fef1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 13:04:04 +0200 Subject: [PATCH 233/369] numactl: 2.0.11 -> 2.0.12 --- pkgs/os-specific/linux/numactl/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 9928897ae4d..bb20a742e6a 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -2,23 +2,18 @@ stdenv.mkDerivation rec { name = "numactl-${version}"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "numactl"; repo = "numactl"; rev = "v${version}"; - sha256 = "0bcffqawwbyrnza8np0whii25mfd0dria35zal9v3l55xcrya3j9"; + sha256 = "0crhpxwakp0gvd7wwpbkfd3brnrdf89lkbf03axnbrs0b6kaygg2"; }; nativeBuildInputs = [ autoreconfHook ]; - patches = [ - (fetchpatch { - url = https://raw.githubusercontent.com/gentoo/gentoo/b64d15e731e3d6a7671f0ec6c34a20203cf2609d/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch; - sha256 = "05277kv3x12n2xlh3fgnmxclxfc384mkwb0v9pd91046khj6h843"; - }) - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { url = https://git.alpinelinux.org/cgit/aports/plain/testing/numactl/musl.patch?id=0592b128c71c3e70d493bc7a13caed0d7fae91dd; sha256 = "080b0sygmg7104qbbh1amh3b322yyiajwi2d3d0vayffgva0720v"; }); From 2741c99060424f0a15228ba523b1e008802bc5c1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 13:04:47 +0200 Subject: [PATCH 234/369] numactl: update license and homepage --- pkgs/os-specific/linux/numactl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index bb20a742e6a..7dbf0abce7e 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library and tools for non-uniform memory access (NUMA) machines"; - homepage = http://oss.sgi.com/projects/libnuma/; - license = licenses.gpl2; + homepage = https://github.com/numactl/numactl; + license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21 platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ wkennington ]; }; From c26c7f931aae7a2bb43dc3709bac021139c9e930 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Aug 2018 12:50:25 +0200 Subject: [PATCH 235/369] nixUnstable: 2.1pre6338_45bcf541 -> 2.1pre6377_954d1f4d --- pkgs/tools/package-management/nix/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 56bfdb046a8..662e640ef22 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz +{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , busybox-sandbox-shell @@ -33,10 +33,15 @@ let ++ lib.optionals is20 [ brotli ] # Since 1.12 ++ lib.optional withLibseccomp libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) - (aws-sdk-cpp.override { + ((aws-sdk-cpp.override { apis = ["s3" "transfer"]; customMemoryManagement = false; - }) + }).overrideDerivation (args: { + patches = args.patches or [] ++ [(fetchpatch { + url = https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch; + sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1"; + })]; + })) ++ lib.optional fromGit boost; propagatedBuildInputs = [ boehmgc ]; @@ -144,12 +149,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-2.1${suffix}"; - suffix = "pre6338_45bcf541"; + suffix = "pre6377_954d1f4d"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "45bcf5416a0ce53361fd37c6b27ba4ef6a34ce96"; - sha256 = "0ps45n78wnczz99dd9fs54ydxwh2cjq73zbvmak0y49nhc3p0vvv"; + rev = "954d1f4d0a35063ff431b258beebadf753cb9efe"; + sha256 = "0wnljxljvcwmniydgxlsjqmbgghmljs75m6083y2nkjql7dnrm7g"; }; fromGit = true; })) // { perl-bindings = perl-bindings { From 4c6aa54f862f749626d0472a626924e932a6f080 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Aug 2018 13:21:05 +0200 Subject: [PATCH 236/369] nixUnstable: Include a copy of libboost_context This shaves 47 MiB off the closure size. (libboost_context.so is only 19 KiB.) --- pkgs/tools/package-management/nix/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 662e640ef22..c06a4f41afb 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -49,6 +49,15 @@ let # Seems to be required when using std::atomic with 64-bit types NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; + preConfigure = + # Copy libboost_context so we don't get all of Boost in our closure. + # https://github.com/NixOS/nixpkgs/issues/45462 + lib.optionalString fromGit + '' + mkdir -p $out/lib + cp ${boost}/lib/libboost_context* $out/lib + ''; + configureFlags = [ "--with-store-dir=${storeDir}" "--localstatedir=${stateDir}" From 40ec3ffc3ef16c781c52b146c1ea7f20c65a462e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 Aug 2018 07:54:58 -0400 Subject: [PATCH 237/369] linux: 4.4.150 -> 4.4.151 --- 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 4b2f3bf6c38..31f489c4faf 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.150"; + version = "4.4.151"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1xdfq11pa4ayi89vynbddq5k47f01szc04lbl5aaxpnch982jj8g"; + sha256 = "1s49h2my2jysh1i38vygqlcj9bz8fzg6vsv9k3ln3pi6hqqqrsjz"; }; } // (args.argsOverride or {})) From 0451339392c3a91fad9caf6bf691c6af6bad83ab Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 Aug 2018 07:55:07 -0400 Subject: [PATCH 238/369] linux: 4.9.122 -> 4.9.123 --- 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 a8e059e9950..9b9072d302e 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.122"; + version = "4.9.123"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0v7qdkdlgpv83v4lzm59jgaxy1l7dzkqjr3fcahqrnrcdf3r0vx4"; + sha256 = "0wahbq08cixh63099n13wal3xkw48gnka6w8biax1gwckymww4ld"; }; } // (args.argsOverride or {})) From 368a050f731452493f8c3434e9484c6be40d674f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 Aug 2018 07:55:19 -0400 Subject: [PATCH 239/369] linux: 4.14.65 -> 4.14.66 --- 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 f32af516953..de983418b7b 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.65"; + version = "4.14.66"; # 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 = "1v55nmg1x9ygisgf0pjd3lygvjin3i6ld24anl6nggmrdd00r60j"; + sha256 = "04q48syzmz84s045bqwyzrr37wcria8waggb5fki2kc69k563053"; }; } // (args.argsOverride or {})) From 26fb5f2d7b940b23bbf9e4669683d62e6b58e546 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 Aug 2018 07:55:30 -0400 Subject: [PATCH 240/369] linux: 4.17.17 -> 4.17.18 --- 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 ffce27178b6..126c3284d05 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.17"; + version = "4.17.18"; # 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 = "1g525zi7x3j7niqasrm8jwalf391p6pwa17zmr0iibal6xf3di1x"; + sha256 = "03wvnw4xl48na08c29qq57a39kgvb67ayxfqqv4n06vpf8vmx2sd"; }; } // (args.argsOverride or {})) From 899e19ad045db36cf5b89518490e5299f619a0d5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 Aug 2018 07:55:41 -0400 Subject: [PATCH 241/369] linux: 4.18.3 -> 4.18.4 --- 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 b69d994f3b5..768a4c96542 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.3"; + version = "4.18.4"; # 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 = "1m23hjd02bg8mqnd8dc4z4m3kxds1cyrc6j5saiwnhzbz373rvc1"; + sha256 = "0hm8id6nv3j2g7l1fzkl4vr9wfx43s8hdspg1yc4fz6vbdxwinqj"; }; } // (args.argsOverride or {})) From 38fa082e79751534f40fdb8f4226019258a1c176 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 23 Jul 2018 17:16:34 +0000 Subject: [PATCH 242/369] ocamlPackages.piqi: fix build with OCaml 4.06 --- pkgs/development/ocaml-modules/piqi/default.nix | 6 +++--- .../ocaml-modules/piqi/safe-string.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/ocaml-modules/piqi/safe-string.patch diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index f8126f91d87..c7baa87a331 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4, which, ulex, easy-format, ocaml_optcomp, xmlm, base64}: +{ stdenv, fetchurl, ocaml, findlib, which, ulex, easy-format, ocaml_optcomp, xmlm, base64 }: stdenv.mkDerivation rec { version = "0.6.13"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l"; }; - buildInputs = [ocaml findlib camlp4 which ocaml_optcomp]; + buildInputs = [ ocaml findlib which ocaml_optcomp ]; propagatedBuildInputs = [ulex xmlm easy-format base64]; - patches = [ ./no-ocamlpath-override.patch ]; + patches = [ ./no-ocamlpath-override.patch ./safe-string.patch ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/piqi/safe-string.patch b/pkgs/development/ocaml-modules/piqi/safe-string.patch new file mode 100644 index 00000000000..fbc2864d534 --- /dev/null +++ b/pkgs/development/ocaml-modules/piqi/safe-string.patch @@ -0,0 +1,13 @@ +--- a/piqilib/piqi_json_parser.mll ++++ b/piqilib/piqi_json_parser.mll +@@ -189,8 +189,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos in + let s = lexbuf.lex_buffer in + let start = lexbuf.lex_start_pos in +- check_adjust_utf8 v lexbuf s start len; +- Buffer.add_substring v.buf s start len ++ check_adjust_utf8 v lexbuf (Bytes.unsafe_to_string s) start len; ++ Buffer.add_subbytes v.buf s start len + + let map_lexeme f lexbuf = + let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos in From c63e5c13d271dbdc534d477c494a08463d8f53f9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 23 Jul 2018 17:23:07 +0000 Subject: [PATCH 243/369] ocamlPackages.piqi-ocaml: fix build with OCaml 4.06 --- pkgs/development/ocaml-modules/piqi-ocaml/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 38b56ac7beb..bbe38ac8994 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, piqi, camlp4 }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, piqi, camlp4 }: stdenv.mkDerivation rec { version = "0.7.5"; @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv"; }; + patches = [ (fetchpatch { + url = https://github.com/alavrik/piqi-ocaml/commit/336e8fdb84e77f4105e9bbb5ab545b8729101308.patch; + sha256 = "071s4xjyr6xx95v6az2lbl2igc87n7z5jqnnbhfq2pidrxakd0la"; + })]; + buildInputs = [ ocaml findlib piqi camlp4 ]; createFindlibDestdir = true; From 1f723abfac79132afa4215bb3ab6f146385033c4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 9 Aug 2018 13:18:37 -0500 Subject: [PATCH 244/369] boost168: init Drop patch from 1.67 that's already included. --- pkgs/development/libraries/boost/1.68.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.68.nix diff --git a/pkgs/development/libraries/boost/1.68.nix b/pkgs/development/libraries/boost/1.68.nix new file mode 100644 index 00000000000..081b105e2d2 --- /dev/null +++ b/pkgs/development/libraries/boost/1.68.nix @@ -0,0 +1,11 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, hostPlatform, buildPlatform, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.68_0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_68_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_68_0.html + sha256 = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e54505a17f7..2aecdc83789 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8915,6 +8915,7 @@ with pkgs; boost165 = callPackage ../development/libraries/boost/1.65.nix { }; boost166 = callPackage ../development/libraries/boost/1.66.nix { }; boost167 = callPackage ../development/libraries/boost/1.67.nix { }; + boost168 = callPackage ../development/libraries/boost/1.68.nix { }; boost16x = boost167; boost = boost16x; From 2d9bd29cc5c949b84fd595334b6e223c22be438b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 22 Aug 2018 08:12:20 -0500 Subject: [PATCH 245/369] texlive: fix fmtutil invocation, generate all formats Otherwise they will have to be generated by users lazily, which is probably not the right trade-off. Noticed this because lack of formats was causing problems on a few documents since they will (a TL2018 change, I believe) attempt to be written to the nix build user's ~/.texlive2018. --- pkgs/tools/typesetting/tex/texlive/combine.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 79eebde5448..8b3e320fd26 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -203,7 +203,7 @@ in buildEnv { perl `type -P mktexlsr.pl` ./share/texmf texlinks.sh "$out/bin" && wrapBin - (perl `type -P fmtutil.pl` --sys --refresh || true) | grep '^fmtutil' # too verbose + (perl `type -P fmtutil.pl` --sys --all || true) | grep '^fmtutil' # too verbose #texlinks.sh "$out/bin" && wrapBin # do we need to regenerate format links? perl `type -P updmap.pl` --sys --syncwithtrees --force perl `type -P mktexlsr.pl` ./share/texmf-* # to make sure From 77085f832448c10ff17e3dcf5921584db27d73dd Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Wed, 22 Aug 2018 20:10:32 +0200 Subject: [PATCH 246/369] navit: svn-5576 -> 0.5.1 (#45465) --- pkgs/applications/misc/navit/default.nix | 68 +++++++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 49 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 362d28d2607..4db5ed4f8eb 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,30 +1,58 @@ -{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined, -libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}: -stdenv.mkDerivation rec { - name = "navit-svn-3537"; +{ stdenv, fetchFromGitHub, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined, +libXmu, freeglut, pcre, dbus-glib, glib, librsvg, freeimage, libxslt, +qtbase, qtquickcontrols, qtsvg, qtdeclarative, qtlocation, qtsensors, qtmultimedia, qtspeech, espeak, +cairo, gdk_pixbuf, pango, atk, patchelf, fetchurl, bzip2, +python, gettext, quesoglc, gd, postgresql, cmake, shapelib, SDL_ttf, fribidi}: - src = fetchsvn { - url = svn://svn.code.sf.net/p/navit/code/trunk/navit; - rev = 5576; - sha256 = "1xx62l5srfhh9cfi7n3pxj8hpcgr1rpa0hzfmbrqadzv09z36723"; +stdenv.mkDerivation rec { + name = "navit-${version}"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "navit-gps"; + repo = "navit"; + rev = "v${version}"; + sha256 = "0jf2gjh2sszr5y5c2wvamfj2qggi2y5k3ynb32pak9vhf5xyl5xj"; }; - hardeningDisable = [ "format" ]; - - buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined - libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ]; - - nativeBuildInputs = [ pkgconfig cmake ]; + sample_map = fetchurl { + url = "http://www.navit-project.org/maps/osm_bbox_11.3,47.9,11.7,48.2.osm.bz2"; + name = "sample_map.bz2"; + sha256 = "0vg6b6rhsa2cxqj4rbhfhhfss71syhnfa6f1jg2i2d7l88dm5x7d"; + }; + #hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ]; - cmakeFlags = [ "-DSAMPLE_MAP=n" ]; + # TODO: fix speech options. + cmakeFlags = [ "-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-Dsupport/espeak=FALSE" "-Dspeech/qt5_espeak=FALSE" ]; - meta = { - homepage = http://www.navit-project.org/; + buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined freeimage libxslt + libXmu freeglut python gettext quesoglc gd postgresql qtbase SDL_ttf fribidi pcre qtquickcontrols + espeak qtmultimedia qtspeech qtsensors qtlocation qtdeclarative qtsvg dbus-glib librsvg shapelib glib + cairo gdk_pixbuf pango atk ]; + + nativeBuildInputs = [ pkgconfig cmake patchelf bzip2 ]; + + # we dont want blank screen by defaut + postInstall = '' + # emulate DSAMPLE_MAP + mkdir -p $out/share/navit/maps/maps + bzcat "${sample_map}" | $out/bin/maptool "$out/share/navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin" + ''; + + # TODO: fix upstream? + postFixup = '' + for lib in $(find "$out/lib/navit/" -iname "*.so" ); do + patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} $lib + done + ''; + + meta = with stdenv.lib; { + homepage = http://www.navit-project.org; description = "Car navigation system with routing engine using OSM maps"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e54505a17f7..77e3047c20b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17714,7 +17714,7 @@ with pkgs; navipowm = callPackage ../applications/misc/navipowm { }; - navit = callPackage ../applications/misc/navit { }; + navit = libsForQt5.callPackage ../applications/misc/navit { }; netbeans = callPackage ../applications/editors/netbeans { }; From 090985a443d3801f2ed04e85c8319ffe591dc96c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 22 Aug 2018 13:26:05 -0500 Subject: [PATCH 247/369] firefox: remove --disable-xcode-checks Apparently it's not needed anymore! --- pkgs/applications/networking/browsers/firefox/common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index b8a5faddc34..944844d6b84 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -185,7 +185,6 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=${default-toolkit}" ] - ++ lib.optional stdenv.isDarwin "--disable-xcode-checks" ++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell" ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ # on i686-linux: --with-libclang-path is not available in this configuration From fd6f78059522f0fb3d559fffcb5b9928121cbee3 Mon Sep 17 00:00:00 2001 From: Udo Spallek Date: Wed, 22 Aug 2018 20:29:18 +0200 Subject: [PATCH 248/369] trytond: 4.8.3 -> 4.8.4 --- pkgs/applications/office/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index 36a54769961..dc63acd6db6 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -5,10 +5,10 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { pname = "trytond"; - version = "4.8.3"; + version = "4.8.4"; src = python2Packages.fetchPypi { inherit pname version; - sha256 = "11d01dc984d9274229b5c80f883679d130a55e14e9124b051274fce9aea4ef77"; + sha256 = "1935045b1b4674de602b4279a9cfd0a14431624a28ccb490234cffecb81fbca7"; }; # Tells the tests which database to use From e8b55c1b5c3883633a5ac059c8ffadb1c6b32f06 Mon Sep 17 00:00:00 2001 From: Udo Spallek Date: Wed, 22 Aug 2018 20:29:46 +0200 Subject: [PATCH 249/369] tryton: 4.8.4 -> 4.8.5 --- pkgs/applications/office/tryton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 8037cc636ae..0543bb07a11 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -14,10 +14,10 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { pname = "tryton"; - version = "4.8.4"; + version = "4.8.5"; src = python2Packages.fetchPypi { inherit pname version; - sha256 = "6cf3091424853e1270d61f3a9b15ad8e6b36a44c28becf216c324ca8dc1474b0"; + sha256 = "43759d22b061a7a392a534d19a045fafd442ce98a0e390ee830127367dcaf4b4"; }; nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; propagatedBuildInputs = with python2Packages; [ From ee152d56872404413e4856a3962daf248eae02da Mon Sep 17 00:00:00 2001 From: Jona Stubbe Date: Wed, 22 Aug 2018 19:29:04 +0200 Subject: [PATCH 250/369] strace: check machine personalities for all non-x86 architectures This allows strace to be built for ppc64le as well. --- pkgs/development/tools/misc/strace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 1e449d722c3..33a46e16a3a 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k - configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check"; + configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; # fails 1 out of 523 tests with # "strace-k.test: failed test: ../../strace -e getpid -k ../stack-fcall output mismatch" From 54ba2c9afca07b0f14763b3697d00b637b2461e0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 Aug 2018 16:08:40 -0400 Subject: [PATCH 251/369] docker: 18.06.0 -> 18.06.1 --- pkgs/applications/virtualization/docker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index d52b5365b5e..e83a1af4466 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -198,13 +198,13 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_06 = dockerGen rec { - version = "18.06.0-ce"; - rev = "0ffa8257ec673ed6849b73b03fb01b0cac90fdb3"; # git commit - sha256 = "1w6jgqbc53pkgfkf2p6z5g316q1r5jvnw4lq11j4qdkw7vy8q5d9"; + version = "18.06.1-ce"; + rev = "e68fc7a215d7133c34aa18e3b72b4a21fd0c6136"; # git commit + sha256 = "1bqd6pv5hga4j1s8jm8q5qdnfbjf8lw1ghdk0bw9hhqkn7rcnrv4"; runcRev = "69663f0bd4b60df09991c08812a60108003fa340"; runcSha256 = "1l37r97l3ra4ph069w190d05r0a43s76nn9jvvlkbwrip1cp6gyq"; - containerdRev = "d64c661f1d51c48782c9cec8fda7604785f93587"; - containerdSha256 = "0pk1kii8bmlvziblrqwb88w5cd486pmb7vw8p7kcyn9lqsw32ria"; + containerdRev = "468a545b9edcd5932818eb9de8e72413e616e86e"; + containerdSha256 = "1rp015cm5fw9kfarcmfhfkr1sh0iz7kvqls6f8nfhwrrz5armd5v"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; From 1d6cb40afb9806e9f2960499ae7adfa97b7086c4 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 22 Aug 2018 22:48:33 +0200 Subject: [PATCH 252/369] gitlab-runner: 11.1.0 -> 11.2.0 (#45479) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 479bfe35e96..0b6d0cd28ef 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.1.0"; + version = "11.2.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0l7j69isnp6wlix3ysjxcr9dgcx5a0j9z2k0bsl714ff339js6j5"; + sha256 = "1dphrws6118l0ryvgny0z5h9fsdbwckm4x21bh8hwb6bxdbqr0yn"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "16x9wbyd90jgyn7x45j9cyrdfz4hg8qav132schqrrdfrgjyrb4x"; + sha256 = "162lzbi7z9afp470w0qkcja728jyb48s7krzinmvg45fb3fb0lfn"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0b632jnqbj74nx27nlpiia6nq8668gf41lcb4s24gw9jnfmrwhym"; + sha256 = "1y4fb5jbks6xab7zim10s112h11bq04hh3lddmhm4f2nyqcmlrqh"; }; patches = [ ./fix-shell-path.patch ]; From 6d64024734d661acd71d2eeb6eb86823b7689998 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Wed, 22 Aug 2018 13:57:22 -0700 Subject: [PATCH 253/369] keybase: 2.1.0 -> 2.5.0 (#44698) --- pkgs/tools/security/keybase/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 9 ++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 1bccd4c9f95..beea202a956 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,8 +1,10 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub +, AVFoundation ? null, AudioToolbox ? null, ImageIO ? null, CoreMedia ? null +, Foundation ? null, CoreGraphics ? null, MediaToolbox ? null }: buildGoPackage rec { name = "keybase-${version}"; - version = "2.1.0"; + version = "2.5.0"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,9 +15,10 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "16izsx5944byc930i6pqsbyrp316yyy8z5xvmzj0g8rgawajdx5h"; + sha256 = "0fa55nizld8q0szhlpsf75ifb53js3crh98xmf8mn4bvms7d0x09"; }; + buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; buildFlags = [ "-tags production" ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e372fe4fdf..82c68a7bcb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3407,7 +3407,14 @@ with pkgs; kexectools = callPackage ../os-specific/linux/kexectools { }; - keybase = callPackage ../tools/security/keybase { }; + keybase = callPackage ../tools/security/keybase { + # Reasoning for the inherited apple_sdk.frameworks: + # 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox + # 2. the rest are added from here: https://github.com/keybase/client/blob/68bb8c893c5214040d86ea36f2f86fbb7fac8d39/go/chat/attachments/preview_darwin.go#L7 + # #cgo LDFLAGS: -framework AVFoundation -framework CoreFoundation -framework ImageIO -framework CoreMedia -framework Foundation -framework CoreGraphics -lobjc + # with the exception of CoreFoundation, due to the warning in https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-sdk/frameworks.nix#L25 + inherit (darwin.apple_sdk.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; + }; kbfs = callPackage ../tools/security/kbfs { }; From cd691380cc7d670443e904aabe7150df702d353e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Cugnet Date: Wed, 22 Aug 2018 22:58:32 +0200 Subject: [PATCH 254/369] erlang: Enable parallel building --- pkgs/development/interpreters/erlang/generic-builder.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index ba0a00b3037..eb685f1d718 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -57,6 +57,8 @@ in stdenv.mkDerivation ({ debugInfo = enableDebugInfo; + enableParallelBuilding = true; + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense prePatch = '' substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' From 2dec33b60d6dec60cf015662ac027d3448da9214 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 22 Aug 2018 21:13:48 +0000 Subject: [PATCH 255/369] framac: 20171101 (Sulfur) -> 20180502 (Chlorine) (#45455) --- pkgs/development/tools/analysis/frama-c/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index c950228907a..2f517eb0084 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -9,17 +9,17 @@ in stdenv.mkDerivation rec { name = "frama-c-${version}"; - version = "20171101"; - slang = "Sulfur"; + version = "20180502"; + slang = "Chlorine"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz"; - sha256 = "1vwjfqmm1r36gkybsy3a7m89q5zicf4rnz5vlsn9imnpjpl9gjw1"; + sha256 = "1m4r8h8n1z957pylyf9b0kjblh59imnqm1bkb4s6rdwl4a1gbjgc"; }; why2 = fetchurl { - url = "http://why.lri.fr/download/why-2.39.tar.gz"; - sha256 = "0nf17jl00s7q9z8gkbamnf7mglvxqrm3967c17ic4c9xz8g125a8"; + url = "http://why.lri.fr/download/why-2.40.tar.gz"; + sha256 = "0h1mbpxsgwvf3pbl0qbg22j6f4v1ffka24ap1ajbjk9b1yb3ali8"; }; nativeBuildInputs = [ autoconf makeWrapper ]; From 1471e865d2f23689b6ff053ea8a4091211e8bf1e Mon Sep 17 00:00:00 2001 From: markuskowa Date: Wed, 22 Aug 2018 23:16:06 +0200 Subject: [PATCH 256/369] openmpi: fix hwloc NUMA cpu allocation capability (#45459) --- pkgs/development/libraries/openmpi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 1748ebd5f3c..a279fe79940 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib +, numactl # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -24,7 +25,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = with stdenv; [ gfortran zlib ] - ++ lib.optional isLinux libnl + ++ lib.optionals isLinux [ libnl numactl ] ++ lib.optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; From a89492b0f067bd0171557a40ce771b6b477bdb90 Mon Sep 17 00:00:00 2001 From: Tycho Grouwstra Date: Wed, 22 Aug 2018 23:32:10 +0200 Subject: [PATCH 257/369] webtorrent-desktop: fix .desktop Path entries (#45477) Fixes the `Path=/opt/webtorrent-desktop` entries [here](https://github.com/webtorrent/webtorrent-desktop/blob/41511c56153b878b0dd39b2adac9525fb66fb35c/static/linux/share/applications/webtorrent-desktop.desktop#L11-L13) -- presently these prevent users from launching the application using the `.desktop` entry. --- pkgs/applications/video/webtorrent_desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index b03ca2328b3..c99aed0c1af 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -73,7 +73,7 @@ # Fix the desktop link substituteInPlace $out/share/applications/webtorrent-desktop.desktop \ - --replace /opt/webtorrent-desktop/WebTorrent $out/bin/WebTorrent + --replace /opt/webtorrent-desktop $out/bin ''; meta = with stdenv.lib; { From 7c62994271cbaa2026076e7b554640325524217e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 22 Aug 2018 16:33:46 -0500 Subject: [PATCH 258/369] sudo: 1.8.23 -> 1.8.24 (#45476) --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 0a760807afb..71cf239d72c 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.23"; + name = "sudo-1.8.24"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0yg62wq8rcrbr7qvh3wgfg2g4bwanbi50cr2lf2cfyy8dydx4qyq"; + sha256 = "1s2v49n905wf3phmdnaa6v1dwck2lrcin0flg85z7klf35x5b25l"; }; prePatch = '' From 7deef2e869bb8c9f49887e800074da98457b7c7a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 22 Aug 2018 16:34:40 -0500 Subject: [PATCH 259/369] busybox: 1.29.1 -> 1.29.2 (#45473) Website's summary of changes: > Bug fix release. 1.29.2 has fixes for fdisk (compat fixes, allow 2TB+ sizes), gzip (FEATURE_GZIP_LEVELS was producing badly-compressed .gz), hexedit (segfault fix). --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index c5f63d6671c..69fe94a1fe4 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -32,14 +32,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.29.1"; + name = "busybox-1.29.2"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw"; + sha256 = "0qax9926qx9lpxiw75f4hkknz1pg0zcn5pkjx5gqfibs2ipgmlk7"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; From 69512da1850036b1346790a459b3e01ede3863ac Mon Sep 17 00:00:00 2001 From: Valentin Heidelberger <31535155+va1entin@users.noreply.github.com> Date: Wed, 22 Aug 2018 23:51:56 +0200 Subject: [PATCH 260/369] keepassxc 2.3.3 -> 2.3.4 (#45482) --- pkgs/applications/misc/keepassx/community.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 5c5769db1b4..b6258491a8c 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -26,13 +26,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassxc-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "08cj1nxbjy2m80h3irnra2qha7fc5ahhzcgkyk9jv4zyys9xv998"; + sha256 = "1gja402dsbws4z8ybnhqbw7rc9svgqnshqjgf7158d6x0ni386m3"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ From 7fa62f2df0c416ab520ba34290d2c91c6ab2539e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Cugnet Date: Thu, 23 Aug 2018 00:00:07 +0200 Subject: [PATCH 261/369] elixir_1_6: fix minimum OTP version --- pkgs/development/interpreters/elixir/1.6.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix index fa631ebb387..ebd6a7ea511 100644 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -3,5 +3,5 @@ mkDerivation rec { version = "1.6.5"; sha256 = "0il1fraz6c8qbqv4wrp16jqrkf3xglfa9f3sdm6q4vv8kjf3lxxb"; - minimumOTPVersion = "18"; + minimumOTPVersion = "19"; } From b16e1e63cb667bff5353b1fea5aab8c316471a55 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Cugnet Date: Thu, 23 Aug 2018 00:00:29 +0200 Subject: [PATCH 262/369] elixir_1_7: fix minimum OTP version --- pkgs/development/interpreters/elixir/1.7.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix index 865e5b5e96f..321a41f50e1 100644 --- a/pkgs/development/interpreters/elixir/1.7.nix +++ b/pkgs/development/interpreters/elixir/1.7.nix @@ -3,5 +3,5 @@ mkDerivation rec { version = "1.7.2"; sha256 = "0wnrx6wlpmr23ypm8za0c4dl952nj4rjylcsdzz0xrma92ylrqfq"; - minimumOTPVersion = "18"; + minimumOTPVersion = "19"; } From c847fbb54eec529556ab0c9816ff6da50e462554 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 22 Aug 2018 23:44:14 +0200 Subject: [PATCH 263/369] grafana: 5.2.2 -> 5.2.3 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 4385a4e020c..fb7418551ae 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.2.2"; + version = "5.2.3"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "17w8ljq4p1sxcdpsiz4221gwhi3ykggpisnx1wdw22g2160q9sdj"; + sha256 = "08ws8kpqxl0rihw8xa93285gal6f6c3imymdi9iif13vsn458hiw"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1frbk13sww3sw09mpkijii1kf7m19hqg58ps8gvs4dvxg12bbv3l"; + sha256 = "098xrzq7wkizww9552bk8cn300336y51qfzf1fkfwrn1fqf9nswl"; }; postPatch = '' From bd054f64f5e03994fee7fcb4c629ca6eab8576a4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Cugnet Date: Wed, 22 Aug 2018 23:51:17 +0200 Subject: [PATCH 264/369] elixir_1_6: 1.6.5 -> 1.6.6 --- pkgs/development/interpreters/elixir/1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix index ebd6a7ea511..73afcbd1597 100644 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.6.5"; - sha256 = "0il1fraz6c8qbqv4wrp16jqrkf3xglfa9f3sdm6q4vv8kjf3lxxb"; + version = "1.6.6"; + sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl"; minimumOTPVersion = "19"; } From d4ef7c677222c9ec9beead50ffe45825459a4b49 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 23 Aug 2018 01:42:21 +0000 Subject: [PATCH 265/369] usb-storage -> uas Following up https://github.com/NixOS/nixpkgs/pull/23665 Bootable USB-drives are not limited to ISO-images, there can be "normal" MBR/GPT-partitioned disk connected via USB-rack. Also, "uas" implies "usb-storage", so there is no need to mention both. --- nixos/modules/installer/cd-dvd/iso-image.nix | 2 +- nixos/modules/profiles/all-hardware.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 08923970cd3..1ac9e5c5c74 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -318,7 +318,7 @@ in options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ]; }; - boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" "uas" ]; + boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" ]; boot.blacklistedKernelModules = [ "nouveau" ]; diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 0d7124be0a5..19f821ae17f 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -33,7 +33,7 @@ # USB support, especially for booting from USB CD-ROM # drives. - "usb_storage" + "uas" # Firewire support. Not tested. "ohci1394" "sbp2" From c9c3663d3eb210500ad30276a6e4ee7394391c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 23 Aug 2018 07:43:55 +0200 Subject: [PATCH 266/369] pass: Fix dependencies on Darwin password-store on Darwin does not pass unit tests in sandboxed builds: - 'openssl base64' is used on Darwin to compute base64. Add openssl to the environment of pass. - t0200-edit-tests.sh tests 'pass edit', which uses hdid on Darwin. However hdid is not available in the sandbox. --- pkgs/tools/security/pass/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 1f0126005f8..007ffdf3e3f 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, pkgs, fetchurl, buildEnv -, coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode -, makeWrapper +, coreutils, gnused, getopt, git, tree, gnupg, openssl, which, procps +, qrencode , makeWrapper , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin @@ -66,7 +66,8 @@ let which qrencode procps - ] ++ ifEnable x11Support [ dmenu xclip xdotool ]); + ] ++ optional stdenv.isDarwin openssl + ++ ifEnable x11Support [ dmenu xclip xdotool ]); postFixup = '' # Link extensions env @@ -97,6 +98,9 @@ let -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \ -e '/which gpg/ d' \ tests/setup.sh + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # 'pass edit' uses hdid, which is not available from the sandbox. + rm -f tests/t0200-edit-tests.sh ''; doCheck = false; From b97ea32ff07d38ef41dd8962fbf681adfcb614ee Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 23:40:22 +0200 Subject: [PATCH 267/369] batik: add meta data --- pkgs/applications/graphics/batik/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index a27590ccd4d..4032e2e3fee 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { buildInputs = [unzip]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Java based toolkit for handling SVG"; + homepage = https://xmlgraphics.apache.org/batik; + license = licenses.asl20; + platforms = platforms.unix; }; } From b76029d568c8cba5ece45bd05be2197e612a45c6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 23:42:05 +0200 Subject: [PATCH 268/369] dia: add license --- pkgs/applications/graphics/dia/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 4780c823697..a1f26f7bc09 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -28,10 +28,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { description = "Gnome Diagram drawing software"; homepage = http://live.gnome.org/Dia; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ raskin ]; + license = licenses.gpl2; + platforms = platforms.unix; }; } From 4cee9af6093d0d10ed20be920551814604cc29e2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 23:47:20 +0200 Subject: [PATCH 269/369] gqview: add license --- pkgs/applications/graphics/gqview/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index a892f98ac47..75140bd005d 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { description = "A fast image viewer"; homepage = http://gqview.sourceforge.net; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + platforms = platforms.unix; }; } From 74a12299dd7601f92f845ad3159ac7673f98cbbf Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 23:51:23 +0200 Subject: [PATCH 270/369] imagemagick: add license --- pkgs/applications/graphics/ImageMagick/7.0.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 86aafa9697d..c4afd6b3bed 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; + license = licenses.asl20; maintainers = with maintainers; [ the-kenny wkennington ]; }; } From af3e44722d9d2c6a1bb5bc6a04b8fd2bbe7651b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:25:22 +0100 Subject: [PATCH 271/369] _9pfs: add license + homepage --- pkgs/tools/filesystems/9pfs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index 37ec4105472..2e34c9dd485 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -22,9 +22,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - #homepage = https://github.com/spewspew/9pfs; # the account apparently doesn't exist + homepage = https://github.com/mischief/9pfs; description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; + license = with lib.licenses; [ lpl-102 bsd2 ]; }; } From f120ee3c5dc5eaf8483fc1738c188afadc2906a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:29:28 +0100 Subject: [PATCH 272/369] aacskeys: add license --- pkgs/development/libraries/aacskeys/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aacskeys/default.nix b/pkgs/development/libraries/aacskeys/default.nix index b90db614e4a..9e28bfd4fe2 100644 --- a/pkgs/development/libraries/aacskeys/default.nix +++ b/pkgs/development/libraries/aacskeys/default.nix @@ -38,9 +38,10 @@ stdenv.mkDerivation { install -Dm444 ProcessingDeviceKeysSimple.txt $out/share/${baseName} ''; - meta = { + meta = with stdenv.lib; { homepage = http://forum.doom9.org/showthread.php?t=123311; description = "A library and program to retrieve decryption keys for HD discs"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.publicDomain; }; } From 229a2332f6d0dcdbff0c494b32051bf9deed33f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:33:45 +0100 Subject: [PATCH 273/369] aefs: add license --- pkgs/tools/filesystems/aefs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index d081f08ffc7..9ea4d092548 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fuse }: - + stdenv.mkDerivation rec { name = "aefs-0.4pre259-8843b7c"; - + src = fetchurl { url = "http://tarballs.nixos.org/${name}.tar.bz2"; sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq"; @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { buildInputs = [ fuse ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.st.ewi.tudelft.nl/~dolstra/aefs/; description = "A cryptographic filesystem implemented in userspace using FUSE"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; + license = licenses.gpl2; }; } From 7a052946396f95190317cf19fe4fe2d1c17c1689 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 23:55:25 +0200 Subject: [PATCH 274/369] photivo: add license --- pkgs/applications/graphics/photivo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 73bbd5003bd..4843898eb64 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ ]; + platforms = platforms.linux; + license = licenses.gpl3; }; } From c365453fed32b553aa1eba8f6a8023a2dcb2c41a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 23:58:11 +0200 Subject: [PATCH 275/369] qiv: add license --- pkgs/applications/graphics/qiv/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 02f5f33f6e6..8e6058d6998 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -17,10 +17,11 @@ stdenv.mkDerivation (rec { substituteInPlace Makefile --replace /man/ /share/man/ ''; - meta = { + meta = with stdenv.lib; { description = "Quick image viewer"; homepage = http://spiegl.de/qiv/; inherit version; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; }) From a58466596f508b34d7feaa919a8511734608817e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 23 Aug 2018 00:01:38 +0200 Subject: [PATCH 276/369] flac: add license --- pkgs/applications/audio/flac/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 99aedae1912..fb5390cb46e 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = https://xiph.org/flac/; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; - maintainers = [ ]; + license = licenses.bsd3; }; } From 2acd90106243c14a4d920d93d37ec7d4d871be67 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 23 Aug 2018 00:04:35 +0200 Subject: [PATCH 277/369] cdparanoia: add licenses --- pkgs/applications/audio/cdparanoia/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 96330d4e955..c419d141d1b 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -34,9 +34,10 @@ stdenv.mkDerivation rec { cp ${gnu-config}/config.guess configure.guess ''; - meta = { + meta = with stdenv.lib; { homepage = https://xiph.org/paranoia; description = "A tool and library for reading digital audio from CDs"; - platforms = stdenv.lib.platforms.unix; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + platforms = platforms.unix; }; } From 2025bd892e13107669e5bb90298501155de2f302 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 23 Aug 2018 11:57:07 +0200 Subject: [PATCH 278/369] epeg: add license --- pkgs/applications/graphics/epeg/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index ef694dec652..3645cc56572 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { homepage = https://github.com/mattes/epeg; description = "Insanely fast JPEG/ JPG thumbnail scaling"; platforms = platforms.linux ++ platforms.darwin; + license = { + url = "https://github.com/mattes/epeg#license"; + }; maintainers = with maintainers; [ nh2 ]; }; } From 29b92e9cb0bbc3f946c78fcc23067daaaa747e9f Mon Sep 17 00:00:00 2001 From: Adam Oliver Zsigmond Date: Thu, 23 Aug 2018 12:19:35 +0200 Subject: [PATCH 279/369] postman: 6.1.4 -> 6.2.5 --- pkgs/development/web/postman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 277c53b26e6..0c8daaee6ef 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "postman-${version}"; - version = "6.1.4"; + version = "6.2.5"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "2f93a860f87d842c0e0433b55cd7c46e04d1d20c0adcae8680332585dffd86eb"; + sha256 = "9fd52b4c4ac744d3c70f28e39dbfeda3d03a8640c562e82e3744c2f9d0f8ade1"; name = "${name}.tar.gz"; }; From 43eb8b9a9346359671395cb85f6a747e4f9b42f4 Mon Sep 17 00:00:00 2001 From: CrystalGamma Date: Thu, 23 Aug 2018 15:30:19 +0200 Subject: [PATCH 280/369] texlive-bin: disable mfluajit on ppc64(le) (#45475) LuaJIT currently has no 64-bit Power support and so breaks the build on such platforms. --- pkgs/tools/typesetting/tex/texlive/bin.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 8e7551b4e41..b313fc0b53d 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -95,12 +95,13 @@ core = stdenv.mkDerivation rec { configureFlags = common.configureFlags ++ [ "--without-x" ] # disable xdvik and xpdfopen - ++ map (what: "--disable-${what}") [ + ++ map (what: "--disable-${what}") ([ "dvisvgm" "dvipng" # ghostscript dependency "luatex" "luajittex" "mp" "pmp" "upmp" "mf" # cairo would bring in X and more "xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small - ] + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) "mfluajit") ++ [ "--without-system-harfbuzz" "--without-system-icu" ] # bogus configure + ; enableParallelBuilding = true; From 50449183849e8a1dc5acd2ed310a66e07935080d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Aug 2018 15:43:34 +0200 Subject: [PATCH 281/369] radicale: 2.1.9 -> 2.1.10 --- pkgs/servers/radicale/default.nix | 55 ++++++++++--------------------- 1 file changed, 18 insertions(+), 37 deletions(-) diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index b0cfc32e911..1d8d97f4bde 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -1,54 +1,36 @@ { stdenv, fetchFromGitHub, python3 }: -let - version = "2.1.9"; - sha256 = "1sywxn7j9bq39qwq74h327crc44j9049cykai1alv44agx8s1nhz"; - - python = python3.override { - packageOverrides = self: super: { - - # Packages pinned in setup.py. - # Starting with next release, a vendored version of vobject will be used. - python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec { - version = "2.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca"; - }; - }); - vobject = super.vobject.overridePythonAttrs (oldAttrs: rec { - version = "0.9.5"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0f56cae196303d875682b9648b4bb43ffc769d2f0f800958e0a506af867b1243"; - }; - }); - - }; - }; -in - -python.pkgs.buildPythonApplication { - name = "radicale-${version}"; - inherit version; +python3.pkgs.buildPythonApplication rec { + pname = "Radicale"; + version = "2.1.10"; + # No tests in PyPI tarball src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = version; - inherit sha256; + sha256 = "0ik9gvljxhmykkzzcv9kmkp4qjwgdrl9f7hp6300flx5kmqlcjb1"; }; - doCheck = false; + # We only want functional tests + postPatch = '' + sed -i "s/pytest-cov\|pytest-flake8\|pytest-isort//g" setup.py + sed -i "/^addopts/d" setup.cfg + ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ vobject + python-dateutil passlib - pytz + ]; + + checkInputs = with python3.pkgs; [ + pytestrunner + pytest ]; meta = with stdenv.lib; { - homepage = http://www.radicale.org/; + homepage = https://www.radicale.org/; description = "CalDAV CardDAV server"; longDescription = '' The Radicale Project is a complete CalDAV (calendar) and CardDAV @@ -58,7 +40,6 @@ python.pkgs.buildPythonApplication { on mobile phones or computers. ''; license = licenses.gpl3Plus; - platforms = platforms.all; maintainers = with maintainers; [ edwtjo pSub aneeshusa infinisil ]; }; } From 487773fb0b165f9bcf09425f9ae932109afa7c64 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Thu, 23 Aug 2018 23:45:39 +1000 Subject: [PATCH 282/369] bazel-deps: update to 2018-08-16 (#45499) --- .../tools/build-managers/bazel/bazel-deps/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix index 76e2ad1e7ca..af8cd5faacd 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix @@ -2,7 +2,7 @@ buildBazelPackage rec { name = "bazel-deps-${version}"; - version = "2018-05-31"; + version = "2018-08-16"; meta = with stdenv.lib; { homepage = "https://github.com/johnynek/bazel-deps"; @@ -15,8 +15,8 @@ buildBazelPackage rec { src = fetchFromGitHub { owner = "johnynek"; repo = "bazel-deps"; - rev = "dd7d0086d3a61c1d5c3370a0300824d0c75946e4"; - sha256 = "1h9ddgk6vn0bhnnkwwz4n1iqv2rcdj521dxhdwj5wwpndbciw855"; + rev = "942a0b03cbf159dd6e0f0f40787d6d8e4e832d81"; + sha256 = "0ls2jvz9cxa169a8pbbykv2d4dik4ipf7dj1lkqx5g0ss7lgs6q5"; }; bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar"; @@ -26,7 +26,7 @@ buildBazelPackage rec { fetchAttrs = { preInstall = '' # Remove all built in external workspaces, Bazel will recreate them when building - rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*} + rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,embedded_jdk,\@embedded_jdk.marker,local_*,\@local_*} # For each external workspace, remove all files that aren't referenced by Bazel # Many of these files are non-hermetic (for example .git/refs/remotes/origin/HEAD) files_to_delete=() @@ -66,7 +66,7 @@ buildBazelPackage rec { find . -type d -empty -delete ''; - sha256 = "0fh9jjwk3aq0kklhl9zyy8hj8gjm1y1fy4ygjinm0469w9jdgc3g"; + sha256 = "0jkzf1hay0h8ksk9lhfvdliac6c5d7nih934i1xjbrn6zqlivy19"; }; buildAttrs = { From 873290154af8f374d09ac0ebd1e1e4c60ef20919 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 23 Aug 2018 09:54:48 -0400 Subject: [PATCH 283/369] hipchat: 4.30.5.1676 -> 4.30.5.1682 --- .../networking/instant-messengers/hipchat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index ac00fb7bbd3..56f0f367c22 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -3,7 +3,7 @@ , libGL, xcbutilkeysyms, xdg_utils, libtool }: let - version = "4.30.5.1676"; + version = "4.30.5.1682"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -43,7 +43,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "1fmvarq7zf1cnah2d1l7rxhbiw3dmjcxsldys5is63y204hdh04y"; + sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96"; }; buildInputs = [ makeWrapper ]; From 4e65df60d96e17ba604bb7f834349b1b2627f83d Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 23 Aug 2018 14:52:37 +0000 Subject: [PATCH 284/369] pcre2: fetch src from HTTPS instead of FTP Same change as in https://github.com/NixOS/nixpkgs/pull/44828, for the same reasons. --- pkgs/development/libraries/pcre2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 49357a5970c..bbc4dfae86c 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pcre2-${version}"; version = "10.31"; src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; + url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2"; sha256 = "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0"; }; From f31bd3afeae283c1832a68bf9f98f189d8b17ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Aug 2018 17:34:01 +0200 Subject: [PATCH 285/369] libsearpc: 3.0.8 -> 3.1.0 --- .../development/libraries/libsearpc/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index c2f0da91005..3ba80198fd7 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -1,15 +1,14 @@ {stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}: stdenv.mkDerivation rec { - version = "3.0.8"; + version = "3.1.0"; name = "libsearpc-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "libsearpc"; - # Tag is missing: https://github.com/haiwen/libsearpc/commit/12a01268825e9c7e17794c58c367e3b4db912ad9 - rev = "12a01268825e9c7e17794c58c367e3b4db912ad9"; - sha256 = "00ck1hl1x0pn22q3ba32dq3ckc4nrsg58irsmrnmalqbsffhcim0"; + rev = "v${version}"; + sha256 = "1zf8xxsl95wdx0372kl8s153hd8q3lhwwvwr2k96ia8scbn2ylkp"; }; patches = [ ./libsearpc.pc.patch ]; @@ -22,13 +21,11 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - buildPhase = "make -j1"; - - meta = { + meta = with stdenv.lib; { homepage = https://github.com/haiwen/libsearpc; description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; }; } From ce19fc55abf65f22dc7c36bf7792fba8f1266c4d Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Thu, 23 Aug 2018 17:59:18 +0200 Subject: [PATCH 286/369] clion: 2018.2.1 -> 2018.2.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 676514a614a..b41ce5b0545 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -249,12 +249,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.2.1"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "16fr5760nkzgx8785x6hh7s96x097y6vdx7w1f9ipg71vv25cscq"; /* updated by script */ + sha256 = "1wjrki0awjyjmv7hh5rkhbpx40yqjssgh4nv61fvg189aric4rzj"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml From e64831c79fb0083285d0231cdd64c70d3dc70c78 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Thu, 23 Aug 2018 17:59:57 +0200 Subject: [PATCH 287/369] datagrip: 2018.2.1 -> 2018.2.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index b41ce5b0545..69f8e657981 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -262,12 +262,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2018.2.1"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1jfkxr790wr8ffn7ph694hfzahs2akjcfk4rfsvjv1dccqb0167k"; /* updated by script */ + sha256 = "0sfcl6bcq5hzwx1fdn8zfyl4qqjcmjmzwspa7v7niyqhbj5zdba9"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip 2018.2"; From 3a57481654f7e48900558cf253b3489310ead144 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Thu, 23 Aug 2018 18:00:35 +0200 Subject: [PATCH 288/369] idea-community: 2018.2.1 -> 2018.2.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 69f8e657981..81f93909a9b 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -288,12 +288,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.2.1"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "04dqyzkkrwvcdy1raard77v2315d44h29cpc9p98bjidvjd6bhsx"; /* updated by script */ + sha256 = "1495zkccss1bkh803p6065nypqj72zra9dbnlx3iz4kkbawr7j15"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA Release"; From 0d763c9f3e97d275b69557b11a7c34d3b1b7b8de Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Thu, 23 Aug 2018 18:01:11 +0200 Subject: [PATCH 289/369] idea-ultimate: 2018.2.1 -> 2018.2.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 81f93909a9b..f74f566d77f 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -301,12 +301,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.2.1"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "0ydidg9pk8bqf5jb1z0fw2m88v6mi38b4ddgmh5c9d9p44g6mddv"; /* updated by script */ + sha256 = "04jzsmnfmxxf264dla6scshk576z8w8sv78mpzb2mc1ndwviwflx"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA Release"; From e05e2c5d106196d2afcb4409e69b04b4f79555c0 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Thu, 23 Aug 2018 18:02:08 +0200 Subject: [PATCH 290/369] phpstorm: 2018.2.1 -> 2018.2.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f74f566d77f..83d8aa4c8cd 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -314,12 +314,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2018.2.1"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "042qhdkl4v5q4cdbqfbiwj6s3acivdb5kmbyn4jix8pg8r37yfnm"; /* updated by script */ + sha256 = "1sjxavkfjg4g9rgjqjjb9d6wg53dwfs8n65w3qbp87c7x3pl006r"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm 2018.2"; From b40cdd0a77f30b9481b2f5ae9d5e35bf49118969 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Thu, 23 Aug 2018 18:02:44 +0200 Subject: [PATCH 291/369] pycharm-community: 2018.2.1 -> 2018.2.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 83d8aa4c8cd..31c1b0dcb7b 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -327,12 +327,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.2.1"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "14vnwqk0x0anvzmdv2ddc3qc9g5fll2ql02mi12k425j30fl2z2q"; /* updated by script */ + sha256 = "0nq4xwqczppdrswi826yzjdzqpiwl4iyi70d7g6ncqd9wyiay4z4"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm Release"; From a4275efede5aa65bb59d00b6441e96191a35ef55 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Thu, 23 Aug 2018 18:03:30 +0200 Subject: [PATCH 292/369] pycharm-professional: 2018.2.1 -> 2018.2.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 31c1b0dcb7b..40d0d1c707b 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -340,12 +340,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.2.1"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1h4f9l577w2ps0y79x79yhpbrsv3j5nwr1lr1890phmp6zri6wyf"; /* updated by script */ + sha256 = "1cf8z1wb532qhxlf0z4d791x084drfxzlaxq28hzy4f450bqbkp7"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm Release"; From e1147d90a768f930d4ae40e1ace89b0f35e371e2 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Thu, 23 Aug 2018 18:04:26 +0200 Subject: [PATCH 293/369] rider: 2018.1.3 -> 2018.2 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 40d0d1c707b..531b869f8ee 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -353,15 +353,15 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2018.1.3"; /* updated by script */ + version = "2018.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "00wskr60mjipyp44wrpc3pn6awc92djn7rwhc08nrar3zv0j4mgg"; /* updated by script */ + sha256 = "0yigw9g53i6xamwva8vcd38f0aysxqkf77avms4l7l63dkap99nq"; /* updated by script */ }; wmClass = "jetbrains-rider"; - update-channel = "Rider 2018.1.3"; + update-channel = "Rider 2018.2"; }; ruby-mine = buildRubyMine rec { From 8db26ed5b511f8f18f656764add417849d705538 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Thu, 23 Aug 2018 18:05:03 +0200 Subject: [PATCH 294/369] webstorm: 2018.2.1 -> 2018.2.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 531b869f8ee..b46dddfc73e 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -379,12 +379,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.2.1"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1jbzkp13qn4n58kbcsszm2gfnywjma2yvn48g0vi14v7x6zihhxd"; /* updated by script */ + sha256 = "1a31q7wrg4ihap8j6n2cg98ml1zic78drkrp0p554rgsnh7v4hwr"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm Release"; From 5c5baaf17d688151d5c72eb6535ca499ba916fdf Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 23 Aug 2018 06:19:02 -0700 Subject: [PATCH 295/369] treewide: remove mailing list references --- .github/CONTRIBUTING.md | 2 +- README.md | 1 - doc/reviewing-contributions.xml | 9 +++++---- nixos/doc/manual/manual.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 981036bf4a0..576beb18de6 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -43,7 +43,7 @@ See the nixpkgs manual for more details on [standard meta-attributes](https://ni ## Writing good commit messages -In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list archives, pull request discussions or upstream changes, it may require a lot of work. +In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work. For package version upgrades and such a one-line commit message is usually sufficient. diff --git a/README.md b/README.md index 86bc8534b3c..004bba34530 100644 --- a/README.md +++ b/README.md @@ -38,5 +38,4 @@ For pull-requests, please rebase onto nixpkgs `master`. Communication: * [Discourse Forum](https://discourse.nixos.org/) -* [Mailing list](https://groups.google.com/forum/#!forum/nix-devel) * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index 88bb1efdfd3..b2a2675c3e6 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -605,10 +605,11 @@ policy. --> - In a case a contributor leaves definitively the Nix community, he should - create an issue or notify the mailing list with references of packages and - modules he maintains so the maintainership can be taken over by other - contributors. + In a case a contributor leaves definitively the Nix community, he + should create an issue or post on Discourse with + references of packages and modules he maintains so the + maintainership can be taken over by other contributors. diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 61b21203f50..e9338efbc02 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -17,8 +17,8 @@ If you encounter problems, please report them on the nix-devel - mailing list or on the Discourse + or on the #nixos channel on Freenode. Bugs should be reported in From 3afef4a3da247330a3ab10f7839cbe6b6e33aaf6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 23 Aug 2018 20:54:46 +0300 Subject: [PATCH 296/369] fbterm: update source link towards the current Google's archive for Google Code --- pkgs/os-specific/linux/fbterm/default.nix | 2 +- pkgs/os-specific/linux/fbterm/default.upstream | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 pkgs/os-specific/linux/fbterm/default.upstream diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index 70c1a8cfdf5..dd3eec6f53c 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -6,7 +6,7 @@ let version="1.7.0"; name="fbterm-1.7.0"; hash="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; - url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz"; sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; }; buildInputs = [gpm freetype fontconfig ncurses] diff --git a/pkgs/os-specific/linux/fbterm/default.upstream b/pkgs/os-specific/linux/fbterm/default.upstream deleted file mode 100644 index 387ef8862fb..00000000000 --- a/pkgs/os-specific/linux/fbterm/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url http://code.google.com/p/fbterm/downloads/list -version_link '[.]tar[.][a-z0-9]+$' -process 'code[.]google[.]com//' '' From c2e583fc7593219e1d19c3c15a3365f36e4b1eab Mon Sep 17 00:00:00 2001 From: Yardanico <21169548+Yardanico@users.noreply.github.com> Date: Thu, 23 Aug 2018 20:58:09 +0300 Subject: [PATCH 297/369] Mark nvidia driver as broken on 4.18 Addition to https://github.com/NixOS/nixpkgs/pull/45410 --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 0ededc08050..eeb5a3588e3 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -84,6 +84,7 @@ let platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ maintainers.vcunat ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; }; From 7974e45689a3ab39b43971d39940a3612899b752 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 23 Aug 2018 13:09:16 -0500 Subject: [PATCH 298/369] firefox: readd --disable-xcode-checks Only works on version 61 apparently, but it is needed. --- pkgs/applications/networking/browsers/firefox/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 944844d6b84..bfdb5fcc010 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -185,6 +185,7 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=${default-toolkit}" ] + ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast version "61") "--disable-xcode-checks" ++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell" ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ # on i686-linux: --with-libclang-path is not available in this configuration From e34b30764795cc7143fcc0ece2f67a9c845aa593 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Thu, 23 Aug 2018 19:20:18 +0100 Subject: [PATCH 299/369] qtcreator: apply patch on aarch64 This fixes a mistake in a previous commit which meant the patch required to build qtcreator was only applied on Aarch32, not both Aarch32 and Aarch64. --- pkgs/development/tools/qtcreator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index f427c1bf795..1f0e8795dd6 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake makeWrapper ]; - patches = optional stdenv.hostPlatform.isArm ./0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch; + patches = optional (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) ./0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch; doCheck = true; From 8c2b4ad4544284c9070a50d81169885cd8a090cc Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 23 Aug 2018 21:14:59 +0200 Subject: [PATCH 300/369] bats: 0.4.0 -> 1.1.0 --- pkgs/development/interpreters/bats/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index bf262d4f050..081f1a547d6 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bats-${version}"; - version = "0.4.0"; + version = "1.1.0"; src = fetchzip { - url = "https://github.com/sstephenson/bats/archive/v${version}.tar.gz"; - sha256 = "05xpvfm0xky1532i3hd2l3wznxzh99bv2hxgykwdpxh18h6jr6jm"; + url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz"; + sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz"; }; patchPhase = "patchShebangs ./install.sh"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = "./install.sh $out"; meta = with stdenv.lib; { - homepage = https://github.com/sstephenson/bats; + homepage = https://github.com/bats-core/bats-core; description = "Bash Automated Testing System"; maintainers = [ maintainers.lnl7 ]; license = licenses.mit; From 70d5f16898a5a4cac06229af9263d14ecef7b085 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Thu, 23 Aug 2018 22:35:05 +0200 Subject: [PATCH 301/369] astrolabe-generator: init at 3.3 (#45429) --- .../astronomy/astrolabe-generator/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/science/astronomy/astrolabe-generator/default.nix diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix new file mode 100644 index 00000000000..3150d41ca9f --- /dev/null +++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, jre, makeWrapper, unzip }: + +stdenv.mkDerivation rec { + name = "astrolabe-generator-${version}"; + version = "3.3"; + + src = fetchurl { + url = "https://github.com/wymarc/astrolabe-generator/releases/download/v${version}/AstrolabeGenerator-${version}.zip"; + sha256 = "141gfmrqa1mf2qas87qig4phym9fg9gbrcfl2idzd5gi91824dn9"; + }; + + buildInputs = [ jre ]; + nativeBuildInputs = [ makeWrapper unzip ]; + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/{bin,share/java} + cp AstrolabeGenerator-${version}.jar $out/share/java + + makeWrapper ${jre}/bin/java $out/bin/AstrolabeGenerator \ + --add-flags "-jar $out/share/java/AstrolabeGenerator-${version}.jar" + ''; + + meta = with stdenv.lib;{ + homepage = https://www.astrolabeproject.com; + description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools"; + license = licenses.gpl3; + maintainers = [ maintainers.genesis ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86de6b19318..58618da901a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21145,6 +21145,8 @@ with pkgs; stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; + astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { }; + tulip = callPackage ../applications/science/misc/tulip { cmake = cmake_2_8; }; From 599963c81e3118c0c1eb02ffc3c1ff2155b5d80b Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 23 Aug 2018 22:40:54 +0200 Subject: [PATCH 302/369] testdisk-photorec: init at 7.0 (#45329) --- .../system/testdisk-photorec/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/tools/system/testdisk-photorec/default.nix diff --git a/pkgs/tools/system/testdisk-photorec/default.nix b/pkgs/tools/system/testdisk-photorec/default.nix new file mode 100644 index 00000000000..5342cf857ac --- /dev/null +++ b/pkgs/tools/system/testdisk-photorec/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, fetchurl +, ncurses +, libuuid +, libjpeg +, zlib +, ntfs3g +, e2fsprogs +}: + +stdenv.mkDerivation rec { + name = "testdisk-photorec-${version}"; + version = "7.0"; + src = fetchurl { + url = "https://www.cgsecurity.org/testdisk-${version}.tar.bz2"; + sha256 = "0ba4wfz2qrf60vwvb1qsq9l6j0pgg81qgf7fh22siaz649mkpfq0"; + }; + buildInputs = [ + ncurses + libuuid + # optional: + libjpeg + zlib + ntfs3g + e2fsprogs + #libewf # makes it fail to build + #qt4 # for qphotorec, which does not build in 7.0 + ]; + meta = with stdenv.lib; { + homepage = https://www.cgsecurity.org/wiki/Main_Page; + downloadPage = https://www.cgsecurity.org/wiki/TestDisk_Download; + description = "Data recovery utilities"; + longDescription = '' + TestDisk is a powerful free data recovery software. It was primarily + designed to help recover lost partitions and/or make non-booting disks + bootable again when these symptoms are caused by faulty software: certain + types of viruses or human error (such as accidentally deleting a + Partition Table). + + PhotoRec is a file data recovery software designed to recover lost files + including video, documents and archives from hard disks, CD-ROMs, and + lost pictures (thus the Photo Recovery name) from digital camera memory. + PhotoRec ignores the file system and goes after the underlying data, so + it will still work even if your media's file system has been severely + damaged or reformatted. + ''; + license = licenses.gpl2; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58618da901a..210777c08c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5445,6 +5445,8 @@ with pkgs; termplay = callPackage ../tools/misc/termplay { }; + testdisk-photorec = callPackage ../tools/system/testdisk-photorec { }; + tewisay = callPackage ../tools/misc/tewisay { }; texmacs = if stdenv.isDarwin From 847291228f9928e824399f0d99bc9de190ac38fc Mon Sep 17 00:00:00 2001 From: Jonathan Queiroz Date: Thu, 23 Aug 2018 18:07:20 -0300 Subject: [PATCH 303/369] subberthehut: init at 20 (#45366) --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/misc/subberthehut/default.nix | 28 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/subberthehut/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 93560881214..657e5696041 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1970,6 +1970,11 @@ github = "jpotier"; name = "Martin Potier"; }; + jqueiroz = { + email = "nixos@johnjq.com"; + github = "jqueiroz"; + name = "Jonathan Queiroz"; + }; jraygauthier = { email = "jraygauthier@gmail.com"; github = "jraygauthier"; diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix new file mode 100644 index 00000000000..e5cc5ad4198 --- /dev/null +++ b/pkgs/tools/misc/subberthehut/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }: +stdenv.mkDerivation rec { + name = "subberthehut-${version}"; + version = "20"; + + src = fetchFromGitHub { + owner = "mus65"; + repo = "subberthehut"; + rev = version; + sha256 = "19prdqbk19h0wak318g2jn1mnfm7l7f83a633bh0rhskysmqrsj1"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xmlrpc_c glib zlib ]; + + installPhase = '' + install -Dm755 subberthehut $out/bin/subberthehut + install -Dm644 bash_completion $out/share/bash-completion/completions/subberthehut + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/mus65/subberthehut; + description = "An OpenSubtitles.org downloader"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ jqueiroz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91841ee609d..83def493803 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5302,6 +5302,8 @@ with pkgs; su-exec = callPackage ../tools/security/su-exec {}; + subberthehut = callPackage ../tools/misc/subberthehut { }; + subsurface = libsForQt5.callPackage ../applications/misc/subsurface { }; sudo = callPackage ../tools/security/sudo { }; From af5b528c9577f0fd6ce311fc68727eb1815b1422 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 23 Aug 2018 21:07:45 +0000 Subject: [PATCH 304/369] ocamlPackages.camlp5: 7.05 -> 7.06 (#45326) --- pkgs/development/tools/ocaml/camlp5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 31cd7ccfd2c..da88a09d771 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-7.05"; + name = "camlp5${if transitional then "_transitional" else ""}-7.06"; src = fetchzip { - url = https://github.com/camlp5/camlp5/archive/rel705.tar.gz; - sha256 = "16igfyjl2jja4f1mibjfzk0c2jr09nxsz6lb63x1jkccmy6430q2"; + url = https://github.com/camlp5/camlp5/archive/rel706.tar.gz; + sha256 = "02zg6qjkzx58zmp79364s5jyqhh56nclcz1jzhh53hk37g9f96qf"; }; buildInputs = [ ocaml ]; From 35f80e39cc09376efdea635a9824c8dfb765bbfb Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 23 Aug 2018 16:56:10 -0400 Subject: [PATCH 305/369] spl: fix version --- pkgs/os-specific/linux/spl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 58c4fc53a41..b171dd6c0a7 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -10,11 +10,12 @@ assert kernel != null; stdenv.mkDerivation rec { name = "spl-${version}-${kernel.version}"; + version = "0.7.9"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; - rev = "spl-0.7.9"; + rev = "spl-${version}"; sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; }; From e3d262e0d4abe85e3e165641ab258f447a0dbe78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Aug 2018 22:02:34 +0100 Subject: [PATCH 306/369] tor: fix build by upgrading openssl One test segfaulted with openssl_1_0_x. openssl_1_1 seems to work fine. As libevent still uses openssl_1_0_x we disable ssl support there to avoid having to different ssl versions linked into tor. Longterm it would be a better solution to upgrade openssl also in libevent. But this would require more testing/time as we have many dependent packages of libevent and we would probably need turn to on openssl 1.1 by default globally. After all libevent is rather small compared to tor. --- pkgs/top-level/all-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83def493803..12d5c542c43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5527,7 +5527,13 @@ with pkgs; tokei = callPackage ../development/tools/misc/tokei { }; - tor = callPackage ../tools/security/tor { }; + tor = callPackage ../tools/security/tor { + openssl = openssl_1_1_0; + # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. + libevent = libevent.override { + sslSupport = false; + }; + }; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; From 3852e136b0c4aa2ebaf453219c7763500fcd7248 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 14:18:04 -0700 Subject: [PATCH 307/369] arangodb: 3.3.12 -> 3.3.14 (#45272) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/arangodb/versions. --- pkgs/servers/nosql/arangodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index f3d3fed23a4..9281bdd0af7 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.12"; + version = "3.3.14"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "18mx7bcxll1za91q090g3hps3mwrlqdg40lvs61kibci3amma7j2"; + sha256 = "00l0mvnyv8y0p13pyxx3hzsnwna9qfq7yjdpisvayipbl7zpvadc"; }; buildInputs = [ From 3c00ac35721af19353f4851d8f7f0fdaf6fdf93e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 14:18:59 -0700 Subject: [PATCH 308/369] metabase: 0.29.3 -> 0.30.0 (#45182) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/metabase/versions. --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 588f1dda50c..5387a93b5e6 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.29.3"; + version = "0.30.0"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "18yvjxlgdbg7h7ipj1wlic5m0gv5s2943c72shs44jvic6g42pzv"; + sha256 = "1wnzd2g1qxqpqjsqq1kfr0zrvjvqg54dvznbhf3637b0iqq3ahkh"; }; nativeBuildInputs = [ makeWrapper ]; From 9188d0a0a832ec41c979a4d63a6a5c82a82b52f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 14:20:13 -0700 Subject: [PATCH 309/369] syslogng: 3.16.1 -> 3.17.2 (#45131) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/syslog-ng/versions. --- pkgs/tools/system/syslog-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 7abf9e85ab8..4164adcb25b 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.16.1"; + version = "3.17.2"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "0a9snxvs3fsv0gm5q9xkrcg0hwgs3c8q1rb434cnzn4qbqfnzvn7"; + sha256 = "02y593ar1c4503ww7mhn0p5ajfl3q6769c6m311m6srwl5y1yq3k"; }; nativeBuildInputs = [ pkgconfig which ]; From 291de70ed6b736285ae4de6e3e556c0fc86c2348 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 23 Aug 2018 17:26:41 -0400 Subject: [PATCH 310/369] scs: init at 2.0.2 (#45294) --- .../libraries/science/math/scs/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/libraries/science/math/scs/default.nix diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix new file mode 100644 index 00000000000..0539083e823 --- /dev/null +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, blas, liblapack, gfortran }: + +stdenv.mkDerivation rec { + name = "scs-${version}"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "cvxgrp"; + repo = "scs"; + rev = "v${version}"; + sha256 = "17lbcmcsniqlyzgbzmjipfd0rrk25a8hzh7l5wl2wp1iwsd8c3a9"; + }; + + buildInputs = [ blas liblapack gfortran.cc.lib ]; + + # Actually link and add libgfortran to the rpath + patchPhase = '' + sed -i 's/#-lgfortran/-lgfortran/' scs.mk + ''; + + doCheck = true; + + # Test demo requires passing any int as $1; 42 chosen arbitrarily + checkPhase = '' + ./out/demo_socp_indirect 42 + ''; + + installPhase = '' + mkdir -p $out/lib + cp -r include $out/ + cp out/*.a out/*.so $out/lib/ + ''; + + meta = with stdenv.lib; { + description = "Splitting Conic Solver"; + longDescription = '' + Numerical optimization package for solving large-scale convex cone problems + ''; + homepage = https://github.com/cvxgrp/scs; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2304eefb29..b816e8e7923 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20719,6 +20719,10 @@ with pkgs; petsc = callPackage ../development/libraries/science/math/petsc { }; + scs = callPackage ../development/libraries/science/math/scs { + liblapack = liblapackWithoutAtlas; + }; + sage = callPackage ../applications/science/math/sage { nixpkgs = pkgs; }; From 86b51e40adc94afe1235b3fa2a38c332a470c072 Mon Sep 17 00:00:00 2001 From: Guillaume Loetscher Date: Fri, 24 Aug 2018 00:42:47 +0200 Subject: [PATCH 311/369] Bumping mono to 5.4.1.6 (#45516) --- pkgs/servers/emby/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index f781e1114eb..baeefc7ff9c 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs, unzip, sqlite, makeWrapper, mono46, ffmpeg, ... }: +{ stdenv, fetchurl, pkgs, unzip, sqlite, makeWrapper, mono54, ffmpeg, ... }: stdenv.mkDerivation rec { name = "emby-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeWrapper ]; propagatedBuildInputs = with pkgs; [ - mono46 + mono54 sqlite ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r * $out/bin - makeWrapper "${mono46}/bin/mono" $out/bin/MediaBrowser.Server.Mono \ + makeWrapper "${mono54}/bin/mono" $out/bin/MediaBrowser.Server.Mono \ --add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" ''; From af4e506d267074618f3733bbad02aa831a8c6ec8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 24 Aug 2018 00:45:42 +0200 Subject: [PATCH 312/369] synthv1: 0.9.0 -> 0.9.2 (#45517) --- pkgs/applications/audio/synthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 53875389a4c..8ed71ce6c39 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1skynjg6ip0qfbqqkybfjh6xcwxagq89ghl08f7sp7j0sz5qdcwp"; + sha256 = "1r60l286n8y4a4rrlnbc3h7xk4s2pvqykvskls89prxg0lkpz7kl"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; From 8018df51f1f0840e242e28e349f55efed676a440 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 24 Aug 2018 00:45:59 +0200 Subject: [PATCH 313/369] guitarix: 0.37.1 -> 0.37.2 (#45518) --- pkgs/applications/audio/guitarix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 5c34293e7f9..041f847585d 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -2,7 +2,7 @@ , avahi, bluez, boost, eigen, fftw, glib, glib-networking , glibmm, gsettings-desktop-schemas, gtkmm2, libjack2 , ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom -, wrapGAppsHook, zita-convolver, zita-resampler +, wrapGAppsHook, zita-convolver, zita-resampler, curl , optimizationSupport ? false # Enable support for native CPU extensions }: @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.37.1"; + version = "0.37.3"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "064k0jzxqgx9gwf8za6jziansabzrwzjaim3qx1743ify5g3gaai"; + sha256 = "1wfm8wrwrnqpb4ihy75n7l9i6vml536jlq9pdx2pblbc4ba3paac"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { avahi bluez boost eigen fftw glib glibmm glib-networking.out gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf libsndfile lilv lv2 serd sord sratom zita-convolver - zita-resampler + zita-resampler curl ]; configureFlags = [ From 86add9944ee26e95faba3d936948be3a570819cd Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 24 Aug 2018 00:58:36 +0200 Subject: [PATCH 314/369] drumkv1: 0.9.0 -> 0.9.2 (#45519) --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 3594fd881b2..555a44e89eb 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "1vm8lrk3lykdic6fyfpl12jx1xg6rcaid242s8sij30p1ix4zdab"; + sha256 = "1z9l43z91d01b9rzam2cj9qmmg6s5y65fjvb83ms4iaa1p0mnwrn"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; From 33aa225a9d9a9a8877f14a0e2bf0077216709db1 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 24 Aug 2018 01:02:33 +0200 Subject: [PATCH 315/369] padthv1: 0.9.0 -> 0.9.2 (#45520) --- pkgs/applications/audio/padthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 5cecdc8187d..ece0a70a7e9 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "0c519qk2g0dk8gqf9ywqfp7dnr4b25lsnxxbf2l1spnnvf8nysvh"; + sha256 = "1alfl0l5qdll0w5lwhrwzj5dina1big1zmjg5imi9h06dzhz51xl"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; From 7c826371c492d673eab5a20b185e4ac312deeae5 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 24 Aug 2018 01:05:12 +0200 Subject: [PATCH 316/369] samplv1: 0.9.0 -> 0.9.2 (#45521) --- pkgs/applications/audio/samplv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 4eeb893ee96..f6ff38b0042 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "0g67vm9ilmq5nlvk0f3abia9pbinr4ck5v4mll6igni1rxz2n7wk"; + sha256 = "0rfcp4v971qfhw1hb43hw12wlxmg2q13l0m1h93pyfi5l4mfjkds"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; From d0b111cddd3a519a437b5fd81327ea147319ffbb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 19:46:22 -0700 Subject: [PATCH 317/369] python27Packages.rpm: 4.14.1 -> 4.14.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rpm/versions. --- pkgs/tools/package-management/rpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index a46550d59cd..27793f44801 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "rpm-${version}"; - version = "4.14.1"; + version = "4.14.2"; src = fetchurl { url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; - sha256 = "0fvrjq6jsvbllb5q6blchzh7p5flk61rz34g4g9mp9iwrhn0xx23"; + sha256 = "0armd7dqr8bl0isx8l4xlylm7dikasmxhhcbz336fkp2x30w5jw0"; }; outputs = [ "out" "dev" "man" ]; From 31ccd587f73183a76c605e08a4df3c45b2d6d342 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 21:15:33 -0700 Subject: [PATCH 318/369] libsForQt5.qtkeychain: 0.9.0 -> 0.9.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/qtkeychain-qt5/versions. --- pkgs/development/libraries/qtkeychain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 15be8490c1e..220c6241096 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -9,13 +9,13 @@ assert stdenv.isDarwin -> darwin != null; stdenv.mkDerivation rec { name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}"; - version = "0.9.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` + version = "0.9.1"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = "v${version}"; - sha256 = "1vff0jrycq6c204ch0w7fix5bsv90aw8pl9yiicx9r5ady0i29m7"; # v0.9.0 + sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1 }; cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ] From 70636aa3979c342c44d1fd43da000308c0dc5bc0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 20:27:34 -0700 Subject: [PATCH 319/369] remmina: 1.2.31.2 -> 1.2.31.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/remmina/versions. --- pkgs/applications/networking/remote/remmina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index ed093c6e65d..14ab36c78fd 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.2.31.2"; + version = "1.2.31.3"; desktopItem = makeDesktopItem { name = "remmina"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "09jdrs2hbr9wyd5yqw5bri41rnfnxxyh98mlv6ig2phlvs9cg73d"; + sha256 = "0lvang4587wz292c3k3s8n4icc25cia1phmij34ndrl1f9lg34dp"; }; nativeBuildInputs = [ pkgconfig ]; From f3dff8dafc1840d5f541d2f924bfbd7f071c1de3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 21:21:58 -0700 Subject: [PATCH 320/369] qt5ct: 0.35 -> 0.36 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qt5ct/versions. --- pkgs/tools/misc/qt5ct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index a43335626ac..72ba4863c40 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -4,11 +4,11 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "qt5ct-${version}"; - version = "0.35"; + version = "0.36"; src = fetchurl { url = "mirror://sourceforge/qt5ct/${name}.tar.bz2"; - sha256 = "0xzgd12cvm4vyzl8qax6izdmaf46bf18h055z6k178s8pybm1sqw"; + sha256 = "12gfhchp05xn311zsxh41k3anyrscg53r5d06dasyxyk6hpr9hwg"; }; nativeBuildInputs = [ qmake qttools ]; From 1bc48e63fd5bbf15aaef1813f31c1d237ae200f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Mon, 20 Aug 2018 11:53:41 +0900 Subject: [PATCH 321/369] wabt: init at 1.0.5 --- pkgs/development/tools/wabt/default.nix | 41 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/tools/wabt/default.nix diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix new file mode 100644 index 00000000000..26347d4b278 --- /dev/null +++ b/pkgs/development/tools/wabt/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, cmake, python3 }: + +stdenv.mkDerivation rec { + name = "wabt-${version}"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "WebAssembly"; + repo = "wabt"; + rev = version; + sha256 = "1cbak3ach7cna98j2r0v3y38c59ih2gv0p6f43qp782pyj07hzfy"; + }; + + nativeBuildInputs = [ cmake ]; + cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + buildInputs = [ python3 ]; + + meta = with stdenv.lib; { + description = "The WebAssembly Binary Toolkit"; + longDescription = '' + WABT (we pronounce it "wabbit") is a suite of tools for WebAssembly, + including: + * wat2wasm: translate from WebAssembly text format to the WebAssembly + binary format + * wasm2wat: the inverse of wat2wasm, translate from the binary format + back to the text format (also known as a .wat) + * wasm-objdump: print information about a wasm binary. Similiar to + objdump. + * wasm-interp: decode and run a WebAssembly binary file using a + stack-based interpreter + * wat-desugar: parse .wat text form as supported by the spec interpreter + (s-expressions, flat syntax, or mixed) and print "canonical" flat + format + * wasm2c: convert a WebAssembly binary file to a C source and header + ''; + homepage = https://github.com/WebAssembly/wabt; + license = licenses.asl20; + maintainers = with maintainers; [ ekleog ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de141ef6a76..34d5ae13dc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7410,6 +7410,8 @@ with pkgs; love_11 = callPackage ../development/interpreters/love/11.1.nix { }; love = love_0_10; + wabt = callPackage ../development/tools/wabt { }; + ### LUA MODULES lua4 = callPackage ../development/interpreters/lua-4 { }; From f6d29b9d19c526f1f52e1cd0060c922e857a54da Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 23:06:24 -0700 Subject: [PATCH 322/369] pkcs11helper: 1.25 -> 1.25.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/pkcs11-helper/versions. --- pkgs/development/libraries/pkcs11helper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 3667aa69635..5cf5d34b9af 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pkcs11-helper-${version}"; - version = "1.25"; + version = "1.25.1"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${name}"; - sha256 = "1m7vd3f9dphcwnwz4vn2gh7byxzjfc836z0lg440yrilww20yhpy"; + sha256 = "1nvj6kdbps860kw64m2rz3v2slyn7jkagfdmskrl6966n99iy2ns"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From d80bab87894bf545a5b9966033c38df33e1f6501 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 23:19:14 -0700 Subject: [PATCH 323/369] pidgin-sipe: 1.23.2 -> 1.23.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pidgin-sipe/versions. --- .../instant-messengers/pidgin-plugins/sipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 73346888a33..2d3a10cec5e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }: -let version = "1.23.2"; in +let version = "1.23.3"; in stdenv.mkDerivation { name = "pidgin-sipe-${version}"; src = fetchurl { url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz"; - sha256 = "1xj4nn5h103q4agar167xwcp98qf8knrgs918nl07qaxp9g4558w"; + sha256 = "0aaiblnagncb0lhdwb8qbps6hxxmyfjg7sdi15lrkl98i3fahg4n"; }; meta = with stdenv.lib; { From a883bbbfbed7db87f622aa494af8104ce769471c Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Fri, 24 Aug 2018 08:20:42 +0200 Subject: [PATCH 324/369] mopidy-iris: 3.23.2 -> 3.24.0 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 01d7befddd6..9d47018055c 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.23.2"; + version = "3.24.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1zf4ck19z3nh1x9a847ay1qnkyvi6s6866kp6q6dh1xpn7i9rmx7"; + sha256 = "19aympbkiil68j9jpvk1pgl4hplfs0vpc0d4vmzmpbcslkpirx2g"; }; propagatedBuildInputs = [ From 7ddffd7fb7f1ad06cb1cba61cbe921afedce4ca3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 23:27:07 -0700 Subject: [PATCH 325/369] parallel: 20180722 -> 20180822 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/parallel/versions. --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index f92f03c4cc7..7af5e12081b 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20180722"; + name = "parallel-20180822"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "06635p9w4kl0mvqlbgglsndl1zm06f65ckzrjl9p8n4cswf443fg"; + sha256 = "0jjs7fpvdjjb5v0j39a6k7hq9h5ap3db1j7vg1r2dq4swk23h9bm"; }; nativeBuildInputs = [ makeWrapper perl ]; From a229933de60384ff5f191392665f55282fe42a48 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 23:47:11 -0700 Subject: [PATCH 326/369] opensubdiv: 3.3.2 -> 3.3.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opensubdiv/versions. --- pkgs/development/libraries/opensubdiv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 51270427397..614df6fb063 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "opensubdiv-${version}"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceChars ["."] ["_"] version}"; - sha256 = "0j3vh52w1pnld2a2cm6z7iicni1f617qzg0d8xh3p7l0s2dxjibh"; + sha256 = "1rld4hgl9yrbnk5sd6bhvnm8jdnqq09hq93hrmx0nhccccximi9z"; }; outputs = [ "out" "dev" ]; From 9dfb851c6ffe4a86180661af66ed8e16ee5ca06d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 00:21:53 -0700 Subject: [PATCH 327/369] neovim-qt: 0.2.8 -> 0.2.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/neovim-qt/versions. --- pkgs/applications/editors/neovim/qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index d17d5c1e85d..baeb3879735 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "neovim-qt-${version}"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "190yg6kkw953h8wajlqr2hvs2fz65y6z0blmywlg1nff724allaq"; + sha256 = "014zqfbbv7q85z64h1iw88l37vhrvhjv7xxd0a76j7d1m2769kqs"; }; cmakeFlags = [ From 7bf88248e866f122c2b50ce0bf6bdac88e9a3d88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 00:27:12 -0700 Subject: [PATCH 328/369] nbd: 3.17 -> 3.18 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nbd/versions. --- pkgs/tools/networking/nbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 6b6d99e745e..0f7f75b989e 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.17"; + name = "nbd-3.18"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "12fil2hb3gkxslr3nl9kak93n4iyhfs3zdwrmx9vjcxblfqnnp6r"; + sha256 = "0cb0sjiv0j9sh9dk24nrjm7sa0axbrcp2av5hc91g1ryzk764dyq"; }; buildInputs = From 4e705dd95261d4fb583ad04d9c4e6666d4b297f6 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 24 Aug 2018 09:38:25 +0200 Subject: [PATCH 329/369] distrho: unstable-2018-01-01 -> 2018-04-16 (#45522) --- pkgs/applications/audio/distrho/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 3aa8aa371e6..5885e0f73f5 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -2,13 +2,14 @@ , pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { - name = "distrho-ports-unstable-2018-01-01"; + name = "distrho-ports-${version}"; + version = "2018-04-16"; src = fetchFromGitHub { owner = "DISTRHO"; repo = "DISTRHO-Ports"; - rev = "b200e7409aa9f6612c4d948932f6ce6f0a087f5a"; - sha256 = "0672r0a9s6skzkxpjdraziwh5k8ivrfzvi4zcpkcg3zrv2hia2vz"; + rev = version; + sha256 = "0l4zwl4mli8jzch32a1fh7c88r9q17xnkxsdw17ds5hadnxlk12v"; }; patchPhase = '' @@ -46,6 +47,6 @@ stdenv.mkDerivation rec { TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger ''; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From c5f6d13301935220c46f72b73f4d36b43ac3ac87 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 24 Aug 2018 09:53:30 +0200 Subject: [PATCH 330/369] packer: 1.2.4 -> 1.2.5 (#45527) https://github.com/hashicorp/packer/blob/master/CHANGELOG.md#125-july-16-2018 --- pkgs/development/tools/packer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index ae624c549eb..851c6f01b20 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.2.4"; + version = "1.2.5"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "06prn2mq199476zlxi5hxk5yn21mqzbqk8v0fy8s6h91g8h6205n"; + sha256 = "0wbf0iqfqphwy2snspf34j16ar4ghk0f1zsw8n8vj8gviiivlr7p"; }; meta = with stdenv.lib; { From 84d1667392e08c0fbb9c0d7d9042fe3d912005a6 Mon Sep 17 00:00:00 2001 From: Jonathan Queiroz Date: Fri, 24 Aug 2018 04:54:12 -0300 Subject: [PATCH 331/369] pythonPackages.libkeepass: init at 0.3.0 (#45528) --- .../python-modules/libkeepass/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/libkeepass/default.nix diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix new file mode 100644 index 00000000000..b707b343056 --- /dev/null +++ b/pkgs/development/python-modules/libkeepass/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage +, lxml, pycryptodome, colorama }: + +buildPythonPackage rec { + pname = "libkeepass"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "3ed79ea786f7020b14b83c082612ed8fbcc6f8edf65e1697705837ab9e40e9d7"; + }; + + propagatedBuildInputs = [ lxml pycryptodome colorama ]; + + # No tests on PyPI + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/libkeepass/libkeepass; + description = "A library to access KeePass 1.x/KeePassX (v3) and KeePass 2.x (v4) files"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jqueiroz ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e40e1e56e3..9f67ee94d05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6927,6 +6927,8 @@ in { inherit (pkgs.linuxPackages) nvidia_x11; }; + libkeepass = callPackage ../development/python-modules/libkeepass { }; + librepo = toPythonModule (pkgs.librepo.override { inherit python; }); From 3b2b9c53156ed0083a3bd2df5ef32499de80ab6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 00:59:48 -0700 Subject: [PATCH 332/369] praat: 6.0.40 -> 6.0.42 (#45545) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/praat/versions. --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 8d49c49f0c6..d322553fdaa 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "praat-${version}"; - version = "6.0.40"; + version = "6.0.42"; src = fetchurl { url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "168qrrr59qxii265vba7pj6f61lzq5lk9c43zcda0wmmjp87bq1x"; + sha256 = "1llcj1cq4k60lnr6jkdshd4l9nkg9yc2xmaqiinqryxrb58jmpcv"; }; configurePhase = '' From 9e0cb36d1890493c64cac9345cb5fc25085c6fc9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 01:05:21 -0700 Subject: [PATCH 333/369] xpad: 5.0.0 -> 5.1.0 (#45529) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xpad/versions. --- pkgs/applications/misc/xpad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index 01df5d32ab1..fdd468a9c06 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "xpad-${version}"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2"; - sha256 = "02yikxg6z9bwla09ka001ppjlpbv5kbza3za9asazm5aiz376mkb"; + sha256 = "0l0g5x8g6dwhf5ksnqqrjjsycy57kcvdslkmsr6bl3vrsjd7qml3"; }; nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; From 8cad4ee793d615491a6c7c9ffc30d5c7270faa7c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Aug 2018 10:57:50 +0800 Subject: [PATCH 334/369] firefox-devedition-bin: 62.0b17 -> 62.0b19 --- .../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 fc24898b964..40d9f07bda6 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.0b17"; + version = "62.0b19"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ach/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ach/firefox-62.0b19.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "e039e831474ad897e02025413a582b55b27c67fa7e4745042f4f8be5f6c9fa7f40e4d82d05597629ffc11e8f02568ac5ba80dab6028f58ab56663d54c2e15a73"; + sha512 = "b50d4951fd847fad54ea876013352712e983732278ab383d252416fe3ff18f27e8f9d5e69ba3e641af0863ec4b1fd7ca7d1b3f83950d3f22a6cdcdccb537df89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/af/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/af/firefox-62.0b19.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "51d6b84e6ace621c670e443a75565e18a6aaab48e3f19598d3710bb4545cd317a753cf07090fe9dcbb8f11ad905900b3fc6d6b020218717ccd4666f4b791743b"; + sha512 = "db4e7f8b5731686452ca56247e989f986166f40d0f43f605cb2ac6eb40f2090ec4c49ee2377c3bcf00ffb6f89ffddb572244c3afec88faa9338ea53d6f5ba57c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/an/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/an/firefox-62.0b19.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "9bd7222734ab1ebbbe196baf7c21ff0a6d4e2a60f31f870d02310a9d79f63ad5cc423da0b96f2f5026f59d8dc2a1ca10612faf680e2b39c75da8305b3de733ce"; + sha512 = "24216d7e0d3fa99a0163eaece6ae0c73666f75ca145fdff1c52ba91661d0b14d5d02e89c6d48688d07b32fdc854fc6fd6589f879f23b32386d13359c214bae77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ar/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ar/firefox-62.0b19.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "b8ce2b0cbb18c9bbd9efe40859b65b9f0bc3c98b3085f90619ed84aa13a949adf46862d6cfc5d2e519e198a5b4659ee7c6658cc07904ab71990e20d1147c3b4a"; + sha512 = "1f34a59c7713c0b4c828abd83e288a85980d89e8e3d1d2862b67ec415510b7018f3ea1d70cfd10ede968fb999e7e1de2f9178d1cf2424838d69fcd256349dbea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/as/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/as/firefox-62.0b19.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "3f1db020f7dc88dadf13b12b3c5c74ef5ee4cf61f1a0e1faa49e403ef7c5307420118c049288cdc0151b47f075781a5164a9b4539f2b0e3072cedfbcadfcf076"; + sha512 = "d5df954a5fd33c895a255b74e0933fdc27df363dc11c54d29b56df0c23ec30b50de5a4d301ee0a07a5bd0b853bddadf0653e7c1ae8f767fb8ec9b6648a8e8b0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ast/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ast/firefox-62.0b19.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "6a91664c66d275c5adc08c22f611905b2e15d5739ef0af9514e923c8ad4baae479cf5bb2240861ff9075ce99180f6a9cb136968e65367dbf53a0ad9621720ea9"; + sha512 = "3b77ac9c8bc2871365171b35967664aa48de7ec05daa4b3b5b27580279e278a84fae727a05f7cffb1453f525bf786a41c0a105c3d5a8c36aaae896872ec481d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/az/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/az/firefox-62.0b19.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "83db2d53eb86da5e409645812b1bd48c0f315e0afd6047567c62685b62efa7362cb46374defdfd935ecaef8e83b469ad5f27b99d12eee286f7cb12efbee4ae9f"; + sha512 = "212e319695696f777d41b9bd708401113e9acd9a6bcbd6bf671d5832642d3573198c4248c0b66444cd9ee0a8857698d1736a7f730fcc6ee679d36dfe147ebd45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/be/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/be/firefox-62.0b19.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "13bd2cc3266c63ec87bd7cf1d843b4d93c6178a2501d5b19e797493da20b7b4963d224553aa9b246d49cd444c394127c91e2fb772f9fb60135b798d9ff856e52"; + sha512 = "d00441bf268981f4e6c7cb7ff3f402e2e25b05f9a40bf02498bdc04727cf999cca5a13cc549490682aeae2bdabcdef79dcee277f783df5f4b99b20cef4692ee2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bg/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/bg/firefox-62.0b19.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "2ba3401663f896b58aee0f19ffb088429765627852f0406d6c60c2285d441f17639d4cf102101f2be7a29ea0d15f615db4fa3b3584466b06d8ed52096ee98178"; + sha512 = "b092569cf0ff4031900b272ddbababd921d0e870b17ef0e37f39adc024844f79d27304871a7aa410f2bf6442457655c1e94cdac19c852506a5a25582280536a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bn-BD/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/bn-BD/firefox-62.0b19.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "e39d0760ad12719b0919659bd0976a362a6df65bb2c035a7e0f6e3e58f771e821b8ce02fcbf32b7cdd5d2ffc0de6b4b40ed7301f1be0293596b509a09a2c4c4f"; + sha512 = "2657869292dcc8788a3d9639ca6b4a29ca798c07c49d8baec8f56a5425c24479061e63e49537398e621cf4078b49d1718440efdfb27c622905191de42ffd36ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bn-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/bn-IN/firefox-62.0b19.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "7929ca419228b0c3aeca4131b1952fa1b754278d77134abc4c1b4ee2e91f8b6349f5e6a4f1a721506262ab321196cd977cd446787c9ee2a3b2d84dc2610bed0e"; + sha512 = "dd1f0055560511ff0bc4124b76aa133f113052a5a61ccd739c0bc013e13bf0a98fab82456158ca0bd2714bb7b5541eff56b80c7b9125e76982481645b3c66052"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/br/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/br/firefox-62.0b19.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "750ca92294db2f3180e0bbe2c449b42b5ebb28ed71a5b5f0fde1a0f033867cc642d244bacc3578eae5dffb787b9732510f7790c4ffaf2c742916550e5193c30c"; + sha512 = "45cabc8ca67cec48fa17a78fbbb2f6608e33d74a5ce67895cfab1503eed6d111bbce954d18ae4640e2f65eeed8ec3d1db363138574464bca29dddfbdd617f2eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/bs/firefox-62.0b19.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "585b4cd4d7ef1d9cc2930f9b3fe12509468b52ba0f99efce40e56e28e3fb53c60248bf6362edcdca518a49e9667b07a1ddcd6bbb33487673137246b404a0fd02"; + sha512 = "8c80bf7578ff9894fa4d9e4d324f8fd39520110c9a9740447981104833d59a6ff782da76ecc5f54ea30c9d59b53a06cbc82060a1fee78e4d71b93180017ba16a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ca/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ca/firefox-62.0b19.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "65c5de7ede82ee5c92903e37935a08be96b164c20031d389205171de6d4afbd37b87acde1717c0c26fc4bfa942fffca97a03023de5c4a6b8b4e9ead07c8b3528"; + sha512 = "f1cf9a5917a7a2a79c6c50e3d66adf4c0c1ab82f7a27baeda58e8d068722a8ad7758eecc1f0d0f06b63c327fa4f3287c0b3f973c96ceefdcd9c9f92e8bd062a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cak/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/cak/firefox-62.0b19.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f4aeb3ed7fde6c2efc50c4170fd52af33d223352df99fe80ae7f9ffc79281bd6cca55540060724ed237f81f083a1052e389003cc66fc910f1d70beacd59b2b65"; + sha512 = "7db5cd08913b24a76885bde03d64a29b65b215ffe4e0d7293761617096f27c77b10a1da31e964d22e71104f23deb1e40b200be7aeb2850d9f6b0a53cfd181f6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/cs/firefox-62.0b19.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2bc2db8f32b38c4fd6176f674bc2b6fd01a0b743c7a9b1a882f37357a22eceff62f55207aff17f8fe61808ecc2ca5b813471c3bb3e0accd840bb45e34f05edc0"; + sha512 = "bdc506d7c6426847b24eeb34ad2b25813c6093e6cc4b1f009f6516bba9a6845acad6bc658f28439c66807221e589b59434816d8fa3981d0a68e6e9aaa046fd2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cy/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/cy/firefox-62.0b19.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "42a7ca67d0f882adf403384634e84c8606b6b155af5afe463829a791f5605969ebb2569c74d84bdf4b45f7bf1b0297b1b3b68c2a404bf8c4487dae06b43564a3"; + sha512 = "b66af4d78e65f4e19e0e4a4360448d978acbb7e4cb0707727ecf3bb9c1210f127563fdca8c4406987954ddbad4537fda14a967d316f1b697613ea80b4d6b68e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/da/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/da/firefox-62.0b19.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "942836a33ed6044ea8de524ff235614f7b05cb4efc09b04782154497b19d8dd548dc46f630fa49a4da619c09e88a337359c9102f605139369d1682c9b408cbf1"; + sha512 = "4bf65f71df3dd829316b998ddfd8491b409daae82f7f67592a557aa9a9726831d5f60bd4bc8a03f747f88410ae9f0947cbb111b079612b2a3bce03b64a44fe1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/de/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/de/firefox-62.0b19.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "c11ff6ce36a730b00a42eb134209ecf18759894074c8956062d82135540bc3e6667df228ef680b8b7a04be8d3c55b808fa65c8b4f55f41874319d93da1db0012"; + sha512 = "3d287151bb8b9e8104245545c1d3fb3726c2452455f10be5b0237be9add9b8d831cdcb92c48108d1db7ce5d1d39cabc1dd1813d844107f6ce7b9f014e15f53af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/dsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/dsb/firefox-62.0b19.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "568f5b808c9038668e1c1c42b6fb5097d016dfd62192219fa8cb42613206e6814cd58308cf9967c634a332b135a9303e5e27e85768ac0f2cae482ac0566e440b"; + sha512 = "c7e78c337fb10edc86e92cd8b1769ad1188004e269f382b0ff066bcd36609eb7040f37fe3c5a5f9132411eb8f622e2bc54db61c6270fdb5171767e6dae70c80c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/el/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/el/firefox-62.0b19.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9ecf0d27ce9f4f5f7ddf5d9ccaff82cccb47f4083ac0113175a909657362bab7ce80812752ae425de9adb7e87daadd6d3f512543b636bdf9d7bbfa8a908e248d"; + sha512 = "20ad1a00a48ba6bd127a95f3b80f8166d868dd20af677d65c7ff416c193532ff0650fbeeb28ca699bc23462c11dd4a47479093353edde68b30dd1865cb985c5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-CA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/en-CA/firefox-62.0b19.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "1a9e0bc564d36ecdc8e906eb079bf6d3368007cc5e8fbeee7520eeb75d9299e111a556745d594274bb7882e8a513ca0894d3018ddd6ac9177dc2c1d336804dce"; + sha512 = "9650e47e17f0d30006738b5be3a2406464b2bd6e5245af45e5c4aea0465598cb90a40801c5dfe0d79859ba6f9b1bfb4e2881ef8aedcbb3e2f4ceb644de886e8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-GB/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/en-GB/firefox-62.0b19.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "b3cb6de9a31029cf019db888eb5c4680fa20f4d21f0dd9afca02b35ad039c4c0d844bd0ec8d9790aee0b583951874846d30b6f506f21db2617af4ccf5ab98304"; + sha512 = "3cf3ffdcd06b6f13bae12e6529d849b4c76b3aea071df95375a4563e3810bf796c3bc7b77263f879e3b0d654831c0318dffd05a505c269c03f73c090e07383ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-US/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/en-US/firefox-62.0b19.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "6a4cccd98f9bbd25ffe07087c847e22d62e467baeadc467b33c057b96a94b93e2821b13f8d6d9773ac7c182e06ec2b42b9c6abfe9b20fa869b72d2d7873ab213"; + sha512 = "7c380d593521b6c4893f77f8edf5f5f67bbd5cdc2d3d7e30a54f65ac0b21bc6e7190aeee4ee3009473763442efb7e6cf61fd269aa698b064f5bc8d9ae672c235"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-ZA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/en-ZA/firefox-62.0b19.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "b7246ad58dda67f3b8958a54817bc80610427f2978d0a8398fcf38164f8f9c96137fdaa2305be3830a42143b5549b1a3a017adaec9c5c9a2d07060daa85c5e92"; + sha512 = "835d7d6ccbf0877a576872a250f5691a3d6ccb959d26c3c0035eae4bc475561d98e567ebafd091c9e21a4239883e0d0cf10961508eb6ec1ddd59de5fff958f2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/eo/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/eo/firefox-62.0b19.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "fcf8915c6cbbc578c81888459db625236a3f3ceee7eb0076c43427731aa9ccd4476b4d1a5dc5656ccbc5d5a75cec550d4e4c39c894529651a499db4fd8137c81"; + sha512 = "19a3143c9426ca4ba8c49d3a5ae334f4cdf8d898c35d3f16b410a7d30775ce80d5e3a1672dc8a89bb69e8e83ae76f2f3740079f0981fe00864e2782dbe576d23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-AR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/es-AR/firefox-62.0b19.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "9cb80b1d9182e7f9e24d1ab71c6dad4d283b11f0c8fc1074c5e20a7b847d008575edae6ac1d48eaf64c9acb239198348a08b930231dad156b3209149571f6a0e"; + sha512 = "48a1371bbfb6124f94aeab3b66bcfbd960e58532828894246b3e88c62968fffbb97aa6e4aae6970b892673a7e5b275d33c55fa5b05658c511494d4bf631355d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-CL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/es-CL/firefox-62.0b19.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "633e9ca0911086309b6fdb15389fbacc88f32a3db0fa8d7420d7eec3cf11fbbf1f548f050e3e88ad0cd397f055a94aa9516a2e2c4fc2eb793f0e8e38a096ef3f"; + sha512 = "d6d82e0c5746583ffe56eb51d9911551d4925c2614cc563531422d5b892ef59fc43e3c27bd02dd94e638341fe268533ab022bf7eea769e02797ac3b02446ed4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-ES/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/es-ES/firefox-62.0b19.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ffbb61dc9fb1902c334d7d4cd023fbe09d3cf1e2b44bd1a1d5f286ecae5b8612b40b498ccfd01c86ce6d3e5b986adb9a6a889909095d182e003f06bc0df3bbe6"; + sha512 = "a1fe512fbd0da67ee43808b35c3098cd750eb9ed34ff9d168098208b87357f831569dced36a93bce17bc65045520fc40e703f527dcd640ce5aa6560567c11fc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-MX/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/es-MX/firefox-62.0b19.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "489e1b834bc02fb54500e9521ef18971e5a17f03be582447bb68330e6cd679a3f8fa59655e46f7f9f8c8d6093d8b9a17a5500b53a75e8e2f48670b9f0560ba56"; + sha512 = "9d27baaf14441af81c3287d2433db9e270eaf3086655b6ddae6818fb6b62543b5f8bff3db69b9ffbf5d74c1737f21701206beb6ba908a133056f47e8890b945d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/et/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/et/firefox-62.0b19.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7e6c9888adb48210b40b7652e5d02d4bceab9f11e4b83df43d334cf0dee6eb4da408d1a9e63c6fab0ceef5995476c0534555096e91c59456104634eca3851bb3"; + sha512 = "2328f2b77326302af454dcd0d6a51e416d2f5a9a0ab0955dd7b827bae5ff7cc456ed8e1ee54e18beb38d5f4f8689360ecc3f99b2ea392c494447ee81c8599ad7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/eu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/eu/firefox-62.0b19.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "d17b5e9810428a4268497fbe94b529b8151dd38e44a15e99b9e2bdfb756da2f9a9d02d3905a4b6314076281a87a2a687827cc81cb98dd9eebf7a6bd73f9406ba"; + sha512 = "15a1cc490283e13efe3149932d4dbcdc1f6790d153bb4ba4ba45a03104a076a75416392797fbe505ab5b7a4d34e4f601f835e20b5c0eb88e702dde12e8814c48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fa/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/fa/firefox-62.0b19.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "2a4eda4aff30d19d855015451cf1ac20540d6b462d6435d9d36a7aef6c5cc986991f84e8e24ab0c2dd19cb2556a15d96e8e28cc05c72ea028f91f98749945e79"; + sha512 = "8e43aab77ec3383c045d4571abaab9a640247b03aa924ebbc1ccf2de045f8a48b00e3baaf7bb72443273eb8a87faa09ad71ab39370020c199ca73e5ec47075d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ff/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ff/firefox-62.0b19.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "dfca1b04004b51a8ddd77c68be9e85e0ece4147d074c53f912029934163e56e3e09cac1281f8bb4514393c3f5aaa9acea27d45a59707a80b75fab933e25f51c3"; + sha512 = "8b43ac14bfd02a9d1106c8df666b4cf9841e1dc76edc45253acc06fdb3128f7d20319b119ed2fe82ba1660ba184959afdcdd68faa526bd8acf8aa87501f89c92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/fi/firefox-62.0b19.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "bf28291a72fde1f62799b5b4794774ae3df1596d1a07678696781949e6f1c05f9751f5c43b1cb21191e7c16d4c8c67f295c53358d9995da41d086b4ce907607c"; + sha512 = "4605739c04011c0154a9c09619f89bf24722100e16d1a14d20f165ac1a134ec5b411e535fd7f3719128515fcc0846da17567850cda429cff87fe86d6e14a47da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/fr/firefox-62.0b19.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7ab5d5b2ac6dffc0cbffa22971eaa72999475bdaa5baf3dbffd5ce4c2b01027a4c6ef517d4369f86f692395721d9032dff667c0b07ca402ca8d1ffc3e96febd2"; + sha512 = "d519b3613a97de7045138966b61b1b7723aad482be3b9e6add48b283f9236829e6370a08590d07bc88db5176bd2be76afee9b76bc48d5d98404a13a8e3faa727"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fy-NL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/fy-NL/firefox-62.0b19.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "7fd419e89cefa2b387b0fb23cfc252ce3a1a628c0313eea8153a8e82da2f74abe069c8c88a3ff80e0bd3c38ec91ca7b6ea7a41251aed3077cbb69d10ca398ae4"; + sha512 = "5501069a571efe740c77a632f7309fe1c82f00ab4b26628655b9f76137f95d9061e909075200e12189d1612f0307c11b366fd37e00d598091c7c73989d5c9fc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ga-IE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ga-IE/firefox-62.0b19.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "73676ef0c8568d1d97a7725bb4e4334581bd0e09c3d4d93b276ef9345626841c83659791046872dc04631ada4facec7386e07969b9d6a5b8fd37aeaedbf82a6d"; + sha512 = "f4805258476063f905c481fd8c51ea4fa2dbadc62fb64aa91eafc94ff3c3cfeec736a2912d8db09d3e09d5624019df97d3fb538878b2f24178589afacff40349"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gd/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/gd/firefox-62.0b19.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "fa8bec8df767f62bd361e346deba0de6d994f7d84334a2adc18cac6c8b4454ef2be6e772e34fad41b5c608b9b2e82802acf171c50acc3dd75a5b16bc66768105"; + sha512 = "a8d9f97c92ecb74279fc4496f4d9b7a98d3587baa84f850c6d2a278cd47bf74ccebd9c35d5c9902568b6df4cd1385464687c5d175c2d96339bfb720b2a50b5b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/gl/firefox-62.0b19.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f58e80c8cda4777bf49ec736dd1cb17e25b7efeaa791d385ad8af63ddf0f6ff01fb4935f8e006b73555c2c351d32566a13164ecc00ca611bd2a6e5403a2a5fdd"; + sha512 = "bf407f24cec21bc1cc8cbe306442bf8d3bb01f1898b103967b67ed2c99fff01848febb28b860f8aa8bae050af9892b527f8e6db7006e14e496817c0db28d5753"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/gn/firefox-62.0b19.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "9665884890f6512e5f460ae7ffad24340a545df9f14fe20a39ff6e8363dbabf095bada881239b57203a0b4da1bba9b16551c60d09510a9fd2cd7fc6d5c1d74cd"; + sha512 = "5e78995a672af6195e4195f4a01f5c0c9d3e699f3db88fbcd4a56608ae6e92496fd06d952216abda6aad908e64763b664c22e177ccf8053e9f1a99a3138cbffc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gu-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/gu-IN/firefox-62.0b19.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "92bf250acc6e0fac999ed4adde4d5412ec87bfd4b70478dc0313a322be55ced401aeffbe3fa1fc77b8fcf8c8da5e47490147e49565eca9c0a0ac37e50b31cdbc"; + sha512 = "30bc61c0ea4dfa58de393031d7296fd2d813a0d9b23275c6c2542e4565b03a8e1e818cef893410373177d3880988f37f29a45695cfa466af3cbc80bd424d08b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/he/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/he/firefox-62.0b19.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "be1157e943bfca4e516dd442ac697cb7182590ce15bb7cad3ea11ae438c5fbdd8b86b3102bcbde78f7a2dcdee54ef0886b130276c5897e3eb55f364ad0c0bf34"; + sha512 = "8e6d00cad24e0250b4d8540f0f1ab01ebf1724228694652630be411474460db77cb737bbf104b1f75b1f40e0b79c69bcf7556e8b3269185032bb86d88c8d55c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hi-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/hi-IN/firefox-62.0b19.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "30616cd4e6ba7fd9d98bb7b4b95a86bbb956e58d6403aa9646009d26dff2a2f9e743d4807cc178babd083b5725454384fc646a266b0b036a1ee03d9f6380ba53"; + sha512 = "c58dea84ad4d40de02a97a6e54defc84b709034220f90d176242d07ed412b7d0a9103e3574e91dbeb76fcd118e46bdbc3f8f6ffe520fbaeb26966323ce9d5c7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/hr/firefox-62.0b19.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "5736c7ad3467dd7cb01128184ee4de44fde57add1df07d0538387f527b1ba7e0c02a1d50a3e90610d368ec6bcc86b12a63a2aaa6fa37b842ca258b604e0648d9"; + sha512 = "3dff0e8141c5d2a6c6d04c6213aa253be8016bf846c3944b97a3351576864544d130fcfecfb44c14b0e2a4e172fc7f200615a7596688d804a9cb6428ffe07b69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/hsb/firefox-62.0b19.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "74cde3231acba2627134639efece862877eb66b6852b64d3477069258bc9f6cd333d602f5e6f4216515268acc8e264a54e24b6139aee0564275b74c424847e4a"; + sha512 = "c61286e752d0c24eeb96d3c3909141b5942f86aa28cc02519a96678568044cc32562f16bff0fea1d694f9254d4a05df8abcdb5bd6a29489a399207a593d83fc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/hu/firefox-62.0b19.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "2ac18b1795fb09d39a6dfd4a60d1e99f0107309868a90c8aeb29e721408b886dfc8a53f8fce0572ae91b004586e4752cbf2fcb5a5f907557599cb588fbe8ea19"; + sha512 = "94abc44fa04d59d7f92a890bbc922655083c532c28193ca264e902a23235db9f4cfdc37a5e978753b1f8e65a93760d579696bd4ff314df8983924574947c1f8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hy-AM/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/hy-AM/firefox-62.0b19.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "a58c8aba9a0ba03adc349bb75a236c06a31d9e627b85ad46b112e1a34b77b9d14d4ee6636fab0b3b1eeedfb494db7129371928e638540393bb9dc468f13bb7e1"; + sha512 = "631bce404fc6d8a891f05e4354586805088967ea4929d1206faae7ea5c8939dfc1b38e920e5a81004bc0f8e75f9ec5cecb5f4c955418b8ce228019a46f567961"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ia/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ia/firefox-62.0b19.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "02b3134b0e46c3029732876017b87464d9c5e69fb298381cedd70dae789c4a79c6948f0b0650cb567eec989fbdc1c0cac077a084627e858a5449dd5196ce39de"; + sha512 = "8009c1d134be35413f7100147cd532e46fe9b6858e7cd491f351f9927461cd7cee9461a3e6a03785317b94429ef382279f689b0313cb18199a65e1b2bf8f90a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/id/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/id/firefox-62.0b19.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "4ab61d1f55f29c7657183e514c90b58f7be50e6e421a579bf95efe03257d58d9c751e8bcfcf35dd5116a7c898b61fa56c3ddd39150d38fa99b7f0608f2d42c3e"; + sha512 = "6abcf53d5cf46ef24a36f64a47952f623d8fa86271e913f3dc1948f16898d671976d57fde2ecc1d0de977442f3c7670534b6a6f4e20fbf46f0932bcf9155b64d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/is/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/is/firefox-62.0b19.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "c226d9cc2481c199973efb047f98a92b47d325cef30513756bf62d2df10cef578b21a182d36c8bc8f3510c48f143229139f3e2758e916944bc1f0c8fdf56230a"; + sha512 = "f052a55b65ab5663218d51ee52537bdfd38e01bddecb5da18e3657465ece8735e8c96b4f74caf687f441e2150db49e271b06f7ac0bc58580cc67054ca3d6ed3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/it/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/it/firefox-62.0b19.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "99bb797482557cdbcca6a1ac50c4214d807ca6db2248e39e6c98b6d2d627763652f21654b937a380f521530186de602e0dc8ecd0eb1a2f11dd99904aa2f9719a"; + sha512 = "2f675645457fcc07813ee952b0bdc5963d9d8545e9e9c81b6387af9be106da1acc5bc71b1675ab1b1d896a94c510061ccca8ebc3f790194791255e7bbb792461"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ja/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ja/firefox-62.0b19.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8d15ca85b7754529bfb275acc46f61129031a7a9cba7c7caad31e9608c677e2049f4a09bbdcf1f6d3c1b550dd4a8196349bff8937eafbbfdb190e8606ac0aeb2"; + sha512 = "ea5fdd68fdd4886a2fcd02a55c9c69397a52faee68eca7da784972d348477898b911a2740dd29791d81be87f654fba782cfd80cec756ddbba4548f7846ec868f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ka/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ka/firefox-62.0b19.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "df10d32090a66973e4dda4d94d9c736e0a18f00c701235a20e58164914e3de59653903aba094558f7d7b3ba05b8d5abaa06ca0469437fef8d9d97f868b0ae776"; + sha512 = "269f521edee64aeeda6e87fe73a89f57fda2e91194e5eeb76798e2de87dc197de5cc29ffae074502e9a15fb6d2a0aa11aaff6413bdb93781b0c0f6ce3c9c445e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kab/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/kab/firefox-62.0b19.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "29199f1589d24d982561fc41087b94999d4c0baa352188501b7cdfe50b110892b33cd2ab9f6fa3bf8420b58b2d7a9416a74e9cb553888dc16c1365ac0ae8eb5d"; + sha512 = "ca61c3c1f8e87a1ce02a3cf561ec1e6b7e8ced9a9ee5862a52a7cf12614adbad78a0150e0f0e2612911ac1f29862e7090fa2dfbbe8d7caeebc81e99a84b086d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/kk/firefox-62.0b19.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "92d552f5757576f2c9c3be7c7fd283a179c47f1b8c51675a4f8269235a29a3d887bd2ea6a8a30633c132223223d50e0e2ce65a50003df2638f537d18d09c9705"; + sha512 = "6eff5b246e9b629f78b6508fa2b819a1f8b6736fe14c9225950ba7025acd34447c6e9b62d014e491e58a3910ddc0af74d127408a3a5f2fb02b6efeab1c6d9cfa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/km/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/km/firefox-62.0b19.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "5dcf9ad9af1685968c011fd22436ce226884967a51c9ff2b05f54d90f853d95b3e586137f5c2e24922f685d7c709cb8077a23365b5c226639ee4c89a21f61767"; + sha512 = "c73434d11ce098b13d9b1b909bbf02d36ce9e8b0edffbc5a28bfcb38b0a1272007f966dc317b4aa89cd09193c6f667ce36ae24bb3f6d4aa621d3d947160206b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/kn/firefox-62.0b19.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "8f7730140f816d6ed4abf7a61a89c8e6ce8fb1242b3bdfa9d8209c87c3e2c7f592f946789aee57eef33176671748b04615d3d8f433c39a3c5e92501bb663e00f"; + sha512 = "2efe0b4773421fc03eeb7968f1d0a9c8e502f5d7ed03d407346f4e69be59f00fbcec6e785bfea0fbd8523e54b1c8c8c55d1573172e74fc174efe3ff83810253f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ko/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ko/firefox-62.0b19.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "267f33b76df130d1dd06750d547db570a68539a05c9e6a1795ec02898d78fd54cf72a1dbfa8b74c71882472b11929b7eb35cc5c792e374d803236db7be64d5d7"; + sha512 = "8a04c65eb29196ca0b0e1929d55777cbb45aca33811469362f8804b81e9ad00fde7aeaefe93ea5a7ed5b9195bcd4e3444b87097e43cdf50a2c50430d8353fc97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lij/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/lij/firefox-62.0b19.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3f55b56575eefc2b515d540f6be6f907b215c244381cdc858231b85e8687f8bffb6dfb25cbdaee38ab536055a134a206816afb71307c61e343e5ee473189df48"; + sha512 = "58b6fb1fece6db701c1eb78982fed9f55fa8744aadbf606263752323a105ec76a8a453e2b0b8eee776a16b8240d8c2bfb6dd2d1b2415a019bfe727e6fde7cfb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lt/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/lt/firefox-62.0b19.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4af80a0b429fd1800fc6979384ebbaa3e9b13c136f48d12b2cb25a13f10886d85f864aa8a635b59e827ad8d203a91b7c2200278bb04ced4db20e5c68984a150d"; + sha512 = "0c53245b4c513da99ff118618bd8b7f1182a16a01e7b17a2c6cc194109ef1003aaa3b121ba1b6876c5dcb46036bbac759b2c814fbc18474543d8a181f993260f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lv/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/lv/firefox-62.0b19.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "2ecf95f3334eb40af526e40018021cae7a4ceec929e02f97dad31d468231691b7e4bb29f4bc0a6699a90b45c8ac7df59699ab3c75c7e4dd1c76746b4dc62c542"; + sha512 = "b28415f184e2d47fc180da3c28d7a08b38eab0a6828fbcbf5368906fbaa5909752ea5bcf6cdc72c53b26215b050485286c79cc44fca49bac6e0ac3f46be9c5c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mai/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/mai/firefox-62.0b19.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "833466d1d6eaf4352a1488e104cdeaac1fe7d05e96836a2187f71c9fe81653a7e26d0a488605d79918c8004a9776c86d1f29ef22df14f505dc58415f89f7dd6e"; + sha512 = "8a77764917f0c2e4bb0816b710b284907381e868d19b6f9211108e4e2f2b069f54b1cecfa34b1ffcc4f75e0f427999dafe6839c1df39bd86a08a21e6c13bacb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/mk/firefox-62.0b19.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "76813a7bb7e01d8d0c9d4ac1c3069af5cead2447480490605797459944e8280c9350fe9df7f12a8dae491710d0d374021b99c0d4b902cb734619b9863b4d3ab2"; + sha512 = "7400c72c3eb7d293f7eac768720545c85799b1aa333b8380d3f582d122cee197d5d37e5057bdcc59a0e7f03fdf99ab68edd068d0ba4a25262440ed56b526b4c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ml/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ml/firefox-62.0b19.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "9e30775adf279cbde154f0fd392acb4592b9c75dce0532435753bda755120c2d2eb61f6b968dc5de7e70856339a6238f36cdf413029d92e8fe2b537f00866154"; + sha512 = "ae6c8b526108c6d4eeaf2c57b7ac005267ba4b0698277b707f965dca9e8f9b7f72d1c070ae05f45478590ce7710b127e0bd74503e5902df8c32b7ae236908c2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/mr/firefox-62.0b19.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "65ef02670895f237303184e90d06bdb6373af3f0282209588937be77c859db483843638080c35c112c2206f927b2f4221d3cd1adcc3f16d0c2d5b0a1aff7f225"; + sha512 = "62738816529bd867a1a3237056a65a228c28f9060a8e6fd15793a2d5e97c966bfee6d6f10a4772ec16a9958333b90c457a5bf3c6b7075b503654acef19b33ecc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ms/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ms/firefox-62.0b19.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8419e15179296fc16a5d5f5d09cfe65aa0b678756c7e27faaae14b7f2bcbc724e43d5f7b710d3e79ca67beee60e5c5f452e9596779e208f58c77883e1693ed66"; + sha512 = "a81ac8315dd06e8a89870d1279d3b1d19f1751333688231637f85f8eae9a4aeeaa081aca467ee2fc568ec3a2baaeea61a4d11e282d7dc8682001d4c13d91cfff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/my/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/my/firefox-62.0b19.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "50f99e38d85d59addabe4f2437e09c82f5e6e8a8fcaf3d42fbc234cca0c541c735d930d3cfaf7b5b6e3d7c51f1ce82cc06450fae52cfd6ac5e0ccce9e518f166"; + sha512 = "fe5d3f320424f1f2d79690938743006621b1134295077471f8e72076fd10ae132ec07c46e9f5afc87b2b6801d6185359f72e1b62d880b12590e4780e408312a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nb-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/nb-NO/firefox-62.0b19.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c9b27b683ad5b3a015843aab9b1cc73bf1bb216d5a762c273631c04306b8710cd9570109eb9d81366adec16b1138c3a4d860f2dc2497d537185fd60409676322"; + sha512 = "fc58d444401d37108e0f28a212e690aee3ec6261642a85e34d8aecef757556c75a0b420c7222e260a63b6d8424f0f00655a08556425a1c92863fed127b73aab9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ne-NP/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ne-NP/firefox-62.0b19.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "e4c6ea3b5e8e895ba9311ff16413323ff982b93583be3751a2a004a855d3174f85fd3898c9f95aa88e00d307e59c474b995f3be99ba52d73759fd4b13ca6cc99"; + sha512 = "bf1b3242a1d6a9a6d83dd4e07e5a8b25d3a4ec5c2b0902781ffa2745e4c440e7201290366f8d3e291a7c7746431338b45a6cb7a2c72c3f0790d94bc9cc631ff5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/nl/firefox-62.0b19.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "cb79da779d9a27177923b211b99f06eba1b769b9419beefd9140ccd538628dc8ded5f40d87c1393093f6a7873f24d6e8b8e18b23e691e583859ba79b8fb5caa4"; + sha512 = "ffe6d6454fe4598b1dafe1e167e50813a425180ed38c0e343c57b1366e99f1191eb45ae87b8a5a1c8c6d2314edf955d70a7d575a15f09e7c9d6e2b8ce41c9ce1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nn-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/nn-NO/firefox-62.0b19.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6a7bf35979b1fc27816551429cd90cbd24c391d26aa322ab0e7267bf5202181c0a07092878be6a558f767e9c51e91ee9ee2d53a89d4a005b0f0a3ceac1859f41"; + sha512 = "be6c847d267c8fc281947f09e4a45ac4d4e462e625d18ac3df066d3e73e663ef94e4dc8861798533cfbee9429225017524242fb6a8bcdfd6e032f977946212c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/oc/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/oc/firefox-62.0b19.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "299a816776656628638a5c59dc165e8edbd3e84213059ad829615fb246a6de78a6a0db53585d0f27b23e1f4aea83eed4b216f7851fb918c46484550f203accd7"; + sha512 = "82e960f2a1ec8b989ace8b871143a43f00ab6d854927ccb2b7ecfa13259e519cfe90cbe4bb5578f66bee7e03c90d43ffd201e9ca81f1b3139c4f3b2d05231082"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/or/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/or/firefox-62.0b19.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "9a915f6f438937142ed1664b142e2d45663f56384c2be35cc1597762d6b0d681bad5456c9fad947c7b552855086a7055691e8a33e74faa486879e4fda0d594a5"; + sha512 = "65cb8748b22aa245e4280dfa839ac94bfd3617cbb6fb17aec26b354cfeaa1b0f80a75839bffcffc3bf7802a8895953b937495da5f912ab9b865fb62085d8bc27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pa-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/pa-IN/firefox-62.0b19.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "251657a065f5de9ac28e4425310048cf7960835704586530b201bb69f790c7513ec5b9590fd00b2e1b92992b3574892e311b5955bb3e725908dbd2d76ee5851b"; + sha512 = "5959240644293a8bd3f962ba6552a55aac24c4824fdd77827faaaf6821c80bc237297344c50bdc8ca918733c707502ea5998332e94394d4d26117301de88fc82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/pl/firefox-62.0b19.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "129b1b986d3bbd8f3c0895ac1705cc488f5de652cde35be767996825523a65533fd7f75564897722976e6b8be67a0711e3819056f36917048ef97306440e6c66"; + sha512 = "cd1048f71e413e8e6ec673ffabf83fabfb2cdbd102c73b8c7e13cd1115e0540e5f6539949838a1026aef6f6a4ee0889858ddc2b3ac5f5b108d2a5fd12858df26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pt-BR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/pt-BR/firefox-62.0b19.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f15f4bb22322a95aa2cd10b33cf3e7c74a6cca22a229260118993c08fa7e3f1643a54efe9fa4d6c2241d5c1fcb60b430bf88ef963cca8a2f98c3ec9172866eed"; + sha512 = "36d97a9428348303e5a7fd464904dad502e7e064d42d0eaa512db58167400ed7a0a23bd5eb3aa9d3a91b07ae20b00c8bbe6423c91f1991f6a83d800d324e17b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pt-PT/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/pt-PT/firefox-62.0b19.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "b46124a50862d268c25cba907f1788bc0b22ce926e3ea76c17bcc32b00b07cce53c3502b927d208a664c04c93405a2d199c26f56075c0c0e0e0c639ac86b249b"; + sha512 = "5f716699dd0a14cdf9a5586e733ea513c30d58eba09b724907b2b968fa5105f45df8f38b88641bd395b1ee59132f74a946e31832a4a583964a45c113304df75b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/rm/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/rm/firefox-62.0b19.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b28faa2983476e110cec7fa1bbee4ee65b064d84a18908f7698c40f2d551b3e1796358b14fac9a1de32336566e15d7684572435015c4e5ee874a8e96210e483b"; + sha512 = "08f99141e1eb015e356d5678e7b1127cc458ac1b69ddaefa3b100e89a38944d3ba3b47f17c782077dd0a0cc095919e4a95051f85fa1164684818a6f8fd2e3f0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ro/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ro/firefox-62.0b19.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "676a127961cfc1a68d65c05266da3debab12441a642f6f98f3b52db5cb830efb25d7ca2bcd4ff88efd606437f5aa729c152a5a616ccca65aa51060197691a4ee"; + sha512 = "250f4aabf38576ebc99eb5b46776b74bd4fae7fccc422e95d2aeec7e09c27ebc0c08246f875ccb1e3371d9ed74720fc14a6f89b68e3906ffb4247120947c3e33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ru/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ru/firefox-62.0b19.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "68351211b3ef98f1930f90b807c114065b675d81f84d07cec5ffdcca5e3a9b41eb0390b7e88c0a2942056bd08e4cd5ab340abe11563886c85118c799e0acf1cc"; + sha512 = "70e2b7de93590ccb8a56b3647f1f74bdd1ed3c1ba5820c9277249799b6176dbd3cd70a1d3d76463254772197efd730f493435e265852fe4595c631dbc32a0b95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/si/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/si/firefox-62.0b19.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "34a4af9561360c154e2e9ffd0556f3e87cff6cf2cab90459916c88967678c6b410690607b9a131c0b0aecafe418a6e368666defb5d3b16df7c0d2641e95c42a7"; + sha512 = "23fe7fa4d676e484533e726c73cfce2dc6dbbb14f13c78ace534940942f2f642c4d7ffdfbbb417efcd493cc6685d82b3f942d334d4447e42805a98886176b7a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/sk/firefox-62.0b19.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "450bb4c94f380ea801679c8d4e44cbd520a3137486572ab7bb3e521ae9dfed55568c460f83f1383fcf30c581a526c9d03801cb3175e2fe70796ba88428aa729b"; + sha512 = "e8248e7a4645d0aa44709bcb9e7a62c235c1de4e0c86916b4c6f0454a77eb0c4f0ef9a15381b5d2163f5bca9b38e0cf60f7c4f709bf129c95204450d5005e8f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/sl/firefox-62.0b19.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "dc7aab2a519419a4d0b14a4ac5e137440569e35af383fc88638d6aa1c91a5c722b62bdaded5cb18f2cc66f88115a7ec74590f9c98edf18736c6d2833e435ff8f"; + sha512 = "a9f31b6ddbda5636fd0b8da9dbefe91ae953941487a6a58847b96e720392ba04efe20a7a7cc0200ac06100d2d766a7b0619b6e5dbb383c7b019b6c59851b2be0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/son/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/son/firefox-62.0b19.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "d1d676333f6ebd8ba564e1aa49a003b0ae901646c86d4d58649fa92db92bf67d0d93d6a2f4878361a704553a2fe922bcb0c657872f5e759f0358d0e44a6d2539"; + sha512 = "1f9711460d0c1d047b33ceac3c3a02a56c2da725a2bb7a4e5d7492e916eaee334e6e117a4c6658815185542fbf095512f2f3f5c5ec469518c12005e95f9bb2ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sq/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/sq/firefox-62.0b19.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "736f0f8b577bdd2934d306a1674b1342590b62fb472d79d1eae65741dd0c670a400edf7e7d5caacdb2bace402b37fd3f86076a03088ef1343ee1fac02343f4e2"; + sha512 = "9328ae5eddb1ca7257113a370a225911667b8ccc087a18751f471ad4a4f68317891c8ebfe13d4c841c0c094420c238697ef9911c2cbc87d50204bb4ae549a715"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/sr/firefox-62.0b19.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "74fd745b38a39d562f5c8a2a410dc67b3fa2bd82f30e9155b00eff81b1f85d18fb2604a1730cab6a440390fcea9cb66c018d0a2b008870b443c3bc08f776ea5f"; + sha512 = "ea4ab10db3eec1ee433b3e8c3ff2395174960a70c710a743bb5ed136c21480345ab8745c53a5c7159f5a7e324ff47d3a9c4fbef4db482a863ca98f1f7dc59ba1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sv-SE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/sv-SE/firefox-62.0b19.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a411a89b0289ab47674efbf7bd43a9f80ab79c25b826ceb21ea7968067a78c9e10dcd8fbb101dca57492d5167fd8b604d15aa1fdee7a458b34843815b2880dae"; + sha512 = "aa0963e67ada3814d133c60f08b89d5527f0d108a2a0cdb68c78ce2609ecf228707c3f4ea770536e8830e6fccc574a43f63a77ee1518ec2cd80a494fa0302eed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ta/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ta/firefox-62.0b19.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "88efc962145833472bcfedb760f85dd9099b596d574509df7eb982a41ee4eead4b336eee60ea79ea0a376f7fa625db1236b730b690ddb13259c8a06fd03c17d4"; + sha512 = "b044bae66e79f58a01589790b1c14797574dcd86f0981cbd1d1e54d123c57b4111f9b39682b613c9d29718562d4c38577c712089ae77d14b6bdf2998dbb1835c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/te/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/te/firefox-62.0b19.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "6be44084b417b0dc52917524317081c7bf1f75398518b7a9be939b2f539c28bad563b7adfa9b42e875daeef80075c5d5aa728dc8dabded1ef7457cba7a601e5a"; + sha512 = "a7025734fea2cc7e80cfacbf854b7ddeb265c314534aa7db4305047685a781282a7498886aa6195e6e7d6e7c39498ea35b902307a810b757d253199853175e75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/th/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/th/firefox-62.0b19.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "7216aa7d6cc26fe7c98539d0dac48c68530971d8bc99385379d250b5cef3838215f9eefb10b5b05a4d18ce949beed47b75c755880a1a1601faf3feee17967894"; + sha512 = "155db0d35fe0e1c7c44748f3e0a9fdc62053692b4984b9dd743573e64e3c21c96944daeb09e7d86ee2cb910aa4379ddf46fc93b2f0afb0b254a3540e0636359f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/tr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/tr/firefox-62.0b19.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "9b8078a149e85a8c13af01280f248e2713c4e83e9d0999a5fb0f0eed539355ce6bac3a9a2d4122db06d96206b02a34f6b51a8e5198d3046c3547ff1be85069c6"; + sha512 = "bb272a6d2fd57059962d42b5c95d3d58dcd18fa0fac9638ecb392b56b23e94b1f8d55fad313af0815a8f01d8e9975b502c90cb9fdd080733eb5c3d19f036ef16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/uk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/uk/firefox-62.0b19.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "f018e84596c981b135638dcbdcb8d4424bc1626ba48eeb26b83713c45afca5f0a90b38841ab0c08196acd91981090d20e63ec0810a8f6f9b51cd2e5302ae9062"; + sha512 = "2dfeaabd2f679710c22c948945350dc04b029dba2c7932b4e80c5597a08b624a61674fa411a3b0a5cd9d5cae0a7bc2437b0e6c3115254e7b5f9dcce5ff3c2756"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ur/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ur/firefox-62.0b19.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "96fc4019d827bfce46684b2e447197e6a22b09843967c25e2dbc7c38341117c4f55bc2d16d4b5a63445b29ae08efde697c93bc4f677d3498bbc2bfc8f346a8f7"; + sha512 = "44f7c5dbc914e7ecb62c4e42298fa75ee0c426149f66d9e48ff567c8d3215cc8dd4cf11e288b05f1687b7b7bc494d7575e5cf70707b12dbc34414364f3a7415d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/uz/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/uz/firefox-62.0b19.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "ed6c25d7f4205999816c2cc7f2cfb7ce682087656f1721af8a8f4530217dd79f23032830252be629bbea0d6a19422ca7b307dcda341dbf287a7dd9b901ccb197"; + sha512 = "15149fc5087348988aeff5ff0020d2a4c79f03d1c64670d4f082c00985cd7b4d2471c1a3d75e0b77c12e81ff6241c2403470cbf710ee964636178e0bc20eb990"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/vi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/vi/firefox-62.0b19.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6e5a6a59694fe9a2b386e79b874cfe92282d177959c447c7f500f9ea805d9e07cb7c1d57eb10f1c8e3426f142f28c1db03cd7935321fe81f6548d4331197b259"; + sha512 = "f8a95ada33cb201a73f79b6b53d4f5d6cbd2b42b35fecd09198715a29f8f6db6e1bb7cafe086bf4ccd62c2c17436ee266ee4f6a179ee3dc7f33b476a1547c9c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/xh/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/xh/firefox-62.0b19.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "628ee5f3b03527e222a55f434b6c266d98b10d7fd41249641e478233fc877f28c84825366d5151e43f3c604a0c3df6e7a0753b3a04213e88b169daee7da71c26"; + sha512 = "4fe10180109350eb7d437809ff1038add6bb5bf7d21bef768eec595956f017d5ac6a2c861566eeb6f9c9d433a0ec15be914a7e67de3c5dfdf0ed1130eaa2408b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/zh-CN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/zh-CN/firefox-62.0b19.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e47cd677d2278c5a6bea963c2d38c8f3505ea295481cd934a5534e4b6f1cd2b5ad81fb7f8dfab1f2a1dcb4face3ad514f56e1c7824f559946a5fbe5cb4022ce1"; + sha512 = "26e34ac878020371d5f7d53a177b094adb31633fbc7cae695767a49244b5c3f1c7d43eed48cd03165af94aef64ea0b8b3ed0650615933d1f5500af7a05fbc4e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/zh-TW/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/zh-TW/firefox-62.0b19.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "cdcac4355ded1ae2fe0900a44e077e2f9a768cb0207dcff57f9559721338e1e9f62d4688dd2397f84cba6c7e010c1431302f91e42c9d2c7bb24a732674d73957"; + sha512 = "9b92ffe5b6f493c8eae40601e5da651c89e47325467b60cf471a8ecd30c7c960c5b6020bd00867225f0a5839b49ceb6701bd38806847b4e25a7903588dc6ca3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ach/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ach/firefox-62.0b19.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a0f0c7bbc8ce8861cd3ace0acaf3c92a9da788d0583ab7c83557d6431623f80e729faeae14ac3807853d95883466a5cdb2ff25a72b255b84a3cae00dd5536904"; + sha512 = "17ca79bd93f98e42c00382368b4574589f9d75775926191b7644fa2ecb5130e9ae484c98ea8c04433cdad4a7948af77d621f34f70fafb7df019e8e343792d69e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/af/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/af/firefox-62.0b19.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "04d5e91ca8d227fd3790d36e7eb846cea50b0328bda59f0751b57fd8befc6dc9c74937b4a77ab0acf9c57b62283e4df22cc457c21283f37eb857deb77c428b63"; + sha512 = "2aeca38267ac03b36a749de71425f6252fea90fd372a7aae64b08fa816aef7f7f4b3926d67f1ecbc4cf2768ef5985e10b410f7b2acb8325ca2f9671fcb7707d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/an/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/an/firefox-62.0b19.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "d4531e9ece8dc30b47aab6053ece67241ff052ed3b4f31d8cf4ffb9a3ace48abbfd2dee6d6632e3f963955d6b352f09bde2a2012d8c48ff0bc12c961763fd70a"; + sha512 = "af2fd8362ccb558fe78370a3bcaa9a6c07c416b5babc31efc1ce693da17b01b1241a4af97db335c273b7d7b9da0553d8e85d674a5635f3e57a405184112a74e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ar/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ar/firefox-62.0b19.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "4b5d1c3b2f9b8c8bfe8a8ffad3a62cbeda296ccd521c8e937967031434cc74ca3f7e431d4a1b852907d07ab35e5fe11f9fb74eb592bb317cf67bb93ece5b8787"; + sha512 = "926678df760eac0cb9ed6244a39cf5ac082ea31f1f19984c8a39739d8ae6cd3c7be6a45a7951612fde98b800b3b6d86c2a29ad9bd1be613c1a0d4a5112d0c7d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/as/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/as/firefox-62.0b19.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "7b6b5795882034bc8e790ec42930cbe8f52f2f0daf63ab8a7b9eac27ca7cc4e0ea604ca08faa8dc8e560d550bf6400b27b2e70f9b8597c011e0c59b56101ae25"; + sha512 = "78bbbf24822ecfba8c944f56a86206016a4d6cf56a7bdbc75bb93a1d59e26944721f576dfb74bea48567de0d45cfc5a4f29fe62782d2a195ef50206e3fdef184"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ast/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ast/firefox-62.0b19.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "e4995dadc334deb20c0892f2f980cba5ecc9c06191580308a462c23cb972486891a981e81db7ae54f230aaafafb0608bb231d8a4c272bfb570674d8babebd57f"; + sha512 = "74273fa11ca2f076d4e75ba38d0d0e5290d37e1da6875aa73461d57c366180a1872c555e949aa55c720f3a56cef8e2397307f342ad618b92b1f7659b35c933b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/az/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/az/firefox-62.0b19.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "59b0cb8fc86339608550188866198ede84cacec5f82593fde8368c379feb68152611e6129fd2dad8e00f07bb183455f9201849b22c38599078873cc3ea352e53"; + sha512 = "aa98d47926924881177ff380470b9fe92e0dd7af10b92a32122d50f7ac9fd2bc3a763283c70f6834f0fe416c69324458537bcd73975ecfb783f8ba0544c6e477"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/be/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/be/firefox-62.0b19.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "bfb82a8b580eb42939b00ff2d92cc83d0d2471d195a8f7aac5e808496a9e8a078f974093301dfcbcd16759b1f8b69134e911de35043062fec9f7ce2612315bb4"; + sha512 = "929ad032ff589a3c2e8d2c6fad331812cb8af22a8ff8c1fc2b681e01257358055ac8d677b976b8bf65c05da1b9780125d090b4e52d92a64c3954af248d166e91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bg/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/bg/firefox-62.0b19.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "d878c71266f98a4778840f1f1766180edc7c40ff7ba976d984ec0307fd3c69ac945c343f7a440c592b04c11be68acaaff2d99fef39adacb66fa82cd2213ec858"; + sha512 = "679b340bef2041f7ee59d44dcd660ea8d515d864955fd629f311a8b017f5669ee5b5cdfb0052d97ecab8949f56ae1a4947eb4e0806271d1f543de2f14bb3e3ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bn-BD/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/bn-BD/firefox-62.0b19.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "856e9755cab299753252a67c8d0eeba489a2ce7a87af032c5b55105f90ea1de28db3e99cd4aa09ac251ca3e5babcb53934a26ae57f1231656611773b3c988da5"; + sha512 = "94ed76078be93a0b2ce9c8f0182f82ee1e30e996858b921b9c750634f3eb67ccefc6fc067c94f92aeb25dbe6f918f53bbf6781d9efc9ef341e51cde38c638e4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bn-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/bn-IN/firefox-62.0b19.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "c121a4b4f468ab4a015c2fe4d2470a2c61f4c7d001df6501dac8ae9dfa3f939c36e7764e822aef94f172725b03df7c48e9d5ed46b658c7bbe69d5b1de534c10f"; + sha512 = "a46107010721b99967aa09ebd5d8f867ff54e10c48bbcb1827abd7673e2957f3ff3ec2e51cf92e1b334ee738423c125239e2136203bb16faa006c584dca48204"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/br/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/br/firefox-62.0b19.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "b2904226d994c9c699f24c39fb8b0f50f8cf192efda15a3ddc3915a60728fcb50b4942df514214a46ce29695f3c3c044bd33d55bf74ba965af729c85124caddf"; + sha512 = "544a3896e39aa2ce5d0ded2310ad9b202f11acc3b5866bfd3ecb1dd2018704b0b1d58957e68543fbf8447b560082c8d4d37e16fd218c2ea482dd4c72204746e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/bs/firefox-62.0b19.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "6f0f553c749072dbcfcd5da45da7bd1fb2276a10770938a0c14070b2093be2eceb0684b6c53b67e07ccf1d8b7e61b60021abeeba57d4a13e2b9d62deef012051"; + sha512 = "8d023af96db42358d1d414a8eecdf95388010c2315e8419ca453b36f9f7209713fc3024fb45dc1fb180d2ba518472c45ede3930852f125d7c47dc34df095907a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ca/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ca/firefox-62.0b19.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "707bb26b6cc24ce9267a813f266cdfb5ea788dfbea502fadac5cf49a54440c8d9831e87d5e5bd49e8002a4622d2545becc2452e2536387c70e25c1d7147a0848"; + sha512 = "2fff607f25c1a8a251abd8c17063a03593cfa6f269728486d2a8083106b762f912c8bf3ff9fabe3ffd24c31cfa07089bb81e6abf6b8f2e7ce20a441914061785"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cak/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/cak/firefox-62.0b19.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "717c98a64fbec95ef1763a86a35466cedcba7b657309b3bce7a833ccdfb3f278922909fe74e8a875ee0387db76a8f9f4182de8dc1e7eb17ee59b2e424ef6a871"; + sha512 = "ff33295a3f83dfc435603bd8c66b5b8fdb0571733e32b5a7878a711fa27495714f5777a40bee1328341a35f1f96188157197bdd974d406df9173cd979942cfe7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/cs/firefox-62.0b19.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "54a1163d642b77210d3127b56dbbf0cac60b3afee6f8b5884f85be8c81570445e74e3e7709aa8bfa1d5e132e05d2c6899ad854a38d42389d553206b7284e3c64"; + sha512 = "5dd4ceccfdb400e97f7df2ac6f5a860d5a0a9f79f31670f2a8342f620b704a302a69a053081bc168067dcfed076da6a1eb73f7b1a651d3bea356a1bc4bc68ff1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cy/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/cy/firefox-62.0b19.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "f160ce85f5430bafe9f43275a7bd0c1f420c767983b5f25580e63de7d962a61259067628dd73381f18ffd7b9bb70f297a744d2af5fad96ada80e03619fd23984"; + sha512 = "82f3de3ad1ab8eadef4ee9e91da44aa82b998b2e0ca5192f376ab89d4a4d135462bcb917212e75a66590e2421f80ea3dbde9852f44c28acbf107cdebcb69f791"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/da/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/da/firefox-62.0b19.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "18f2f42819bb23f5690ba64153c4c4acab1519138fb2ca9150ac923d69a4495f171abf3a5cddb429ad09a090221df6461628ad8184c5bd05182108a7a2120cd0"; + sha512 = "9386133830e6e4118fdf258ca500d5666e8cef193feedb2dfb89d7b024f394f119784832e63a1424c55c34fb7d359f7b43de305b6a5be6086eb7cffc216d4786"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/de/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/de/firefox-62.0b19.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "ef480f7d900f45800060984543b4eb3bd7308cd8b8f032eff06bba5506654fc96921752da72b73986ca55125ab16a2aefac97d5996f705be9ce9b47d6faab726"; + sha512 = "371e2be270761524365a5918d09149b6c0a4405bb6c68408561c6af811323557812ad762e8354b1c580c40cb462eeddeee3b40311cd1603f6783b7a4c95fc7e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/dsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/dsb/firefox-62.0b19.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "8c05ebe73ed32e25b11d36800b9e1103605f4963e02b1b72a1ac35a8ae10aef2f516431cdf4aa32ab376c15b4bf07bb927daad020a7693949687ec46904e2aee"; + sha512 = "c70803c2c407f5370a05a120e150941643c5cccee44f9e5a1ffad8a48a68b396e9ac62c9d691b5ee4450f9679a63383c57026d73c3ed7b0b6f1c782b841b9b93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/el/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/el/firefox-62.0b19.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "80da58193df534fdd8bc2886dca3f21986a32b8b940bdc1077f259edcdaed353a8f1437f968cb9dad5b46e06f94356354fea17c66781834be4b22d4775bb72ff"; + sha512 = "d9df45941a626c742e79a7d8fb89505542c15fdb955d72f16988738fc8c33062d0f1ce1453b6226daf97c964071505b24a204968998e7f453bed7f55391ddb55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-CA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/en-CA/firefox-62.0b19.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "6cf787b5b646ffbb43442a2066985dbbd2a99aa0959dea691bccf4d0a727213f4eef3bdc232ddb1e4c58411c3412ea06d11f3f3f985ffcf646b44f2015bab4b2"; + sha512 = "0ca220f6d9e6ae8e4f4ea9258e32f108f3c64dccd222b8680ca1ca3be01c9e0ad0c8803f5614c520e605722f581ddf7023dee60785c1a0fc81d16afddf14c774"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-GB/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/en-GB/firefox-62.0b19.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "bccbc642ac8f4dea2365c9d2d4efea2987d06c1708dbc51ce6293c5c2ae02568dbcad6b101ca1c8c4cf1e0e43d8fa8e6ef60a2a9e811e13544ae1579658530a6"; + sha512 = "191653ed0e193b61fbd65cd53ede35220f7d1f18447145f08034c935aca667a2adca43252d0f685c7ac1638995a0566de75899e41cb7fd1296db8800042ee887"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-US/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/en-US/firefox-62.0b19.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "5e7c6a524ffab57954ca30ce717aeb0aec555d933d5584f530c8dc3194b6ed8fc8a57e2d4d1c48539aab2b6bf7bbea51617a0faa0c4a9441ea42bc19902cc874"; + sha512 = "bc9c9ff41f54d40953c136515e1076553488b5b3c8aec781869ba5a37017e6dd2ed8acc32e728797bf80e24eaaace51b3399c3a6115cdaba48dbe4b4bae8a420"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-ZA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/en-ZA/firefox-62.0b19.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "e214e1f6d179ea4ff2b6bcb79c58625d269e1e41c17f506fb3e80f5cf33f7e24851baf9c28c7f1792555b576913009ef3b7c648e91725e75cd47711ef280b471"; + sha512 = "b0c3d3dadd8fbc3d132e308124c95225e3af3bf6263cac3fba6497654460bf08a38e064b4b57741046929480d2069fe6b13bc12657be1225340d8b35f3fefb0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/eo/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/eo/firefox-62.0b19.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "ca05ac344bb68941ef82926cd9548036a3ecdb0fafbd71aff1d75b6c90b82e55ed8f3a9f00800656c146356a4a59624835e23ef572e5a04872c7966d9019e661"; + sha512 = "6ef35dc9382048e7b5f30207e6be26ecd679d8650b2ac08818c61fda60bcfa1e9d77a2aaf0a89ef11e3ce58937bbb504abe58fe192a524baf71661b3b79001b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-AR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/es-AR/firefox-62.0b19.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "7ad38902eea68a200b4da512580840d54f6457515d7c3d763619cbc021315dd0b153e224c448ae99e7122e9dfcf53cb6f059aeaaa6319d8911e092e6bcc5d6d0"; + sha512 = "8a01cedb4790d513b9ba19e1312e4e1b5e01c165539d45a7cb4f53c16d4b60e5e9d0047656bd6f2e4dc7464158db2584661874f9661c92583195c1ae16e057ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-CL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/es-CL/firefox-62.0b19.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "19dfac04335e93ca66cb3767e7547224df13c278043bcece2a437ca1b63ca30e9930232f6aa8314d063557d4ed6889780ce5d0807b056e97d49a767aff495ce7"; + sha512 = "ae7c1d179f3fd9873ec6f1ab75dc2e6b5e914ee5c316c54ea0e1d7affa5e1b3cc732db5a6e9438ea27df8856153835b509e8e29493df4b0f66951856e35f4a92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-ES/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/es-ES/firefox-62.0b19.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "f7d72327058245c76b8e577bbe62cee4b1c6333836386ae5a473e56ed825cdad023c3af9038ba23b1527c1f0beb4815765b8309321984bc9f13d67987ab0d03f"; + sha512 = "54dd008f4a6afdf20b863b52fa836bee881e0edb99cb984147acffaec7e4e49be3c9089cec01e2a676c72282937d20fa3ed5c1733db3818225ef19e56e42ec40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-MX/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/es-MX/firefox-62.0b19.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "c9c637305140f02d26a1d0bcb99d3419e7f30f12d46c39e611ad8893d918b770633d08b4a82c6f5d11b06621e32a530ff7a065deaa958eca6787fc4f0024192b"; + sha512 = "5a249832f559d45ccae4e7b797debcb3fe1e53d83c661563b49def547be4a223fd173c60dd534f04a43aa4dc03b01f33a18aaed871d3f2b39e1e37f32dc34d0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/et/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/et/firefox-62.0b19.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "585df3ec775bccb61a602a3e62cf7faadf0091d2fc328c74b0aa8810cbf3d614edb418f95873c56eedb5cd2ad3efb211cc972f6425404f10b0f43b5bb1480152"; + sha512 = "beea97c45552577feaad9922a59cb46777140727b6a29a97f4700bed7bc4401809f9dc27d78fe4676bb91018fcefd01825cda15d99d2294e9460a73f652e3a9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/eu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/eu/firefox-62.0b19.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "071688f8e892d8deb70f65f0176a4909b337e1350fe0d0fb9cf1a66ff69bd6979083ed99543f14212f0936ccac084afc98979655645fdd9cb37250f2639e86ec"; + sha512 = "4c384cfed1fd41dae30526a0204bf6fc2cbdabc98539c2be868c3e05d4b432c4b8b1a696d7138f05d91e56c3091d957d219e7939fab1798035a26ef3b1e25a50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fa/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/fa/firefox-62.0b19.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "efaa758e950f1ca0f4c011ff1da8ffa5d6d3c9c23784ab3a2cf253bae95d6d25ad8fbdb05167118099ef6ea0037ae341c4c4356cb5af849db2f63b923e616e6c"; + sha512 = "ab331ff73db4406fcbb8a7a2fea04bbceb293d886b98af3813558c604972bda68be9d06d57b66b9dba4fb2f7d357e3aba9c901447c56c3723c7816ece8447df7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ff/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ff/firefox-62.0b19.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "1b30f20f6959803c6f105588d612d2d0d88209f2103d829d56f4788b43c4faedc827fcd150a0af0c4987532bd4bc7ccd7591afc34e6e22d18ec304841d9c450c"; + sha512 = "3d4c7866bdcfeb2670069e616fc87c99fb6a36777932bbc9c891ff9ea8815c4441a8bebee56971b9d96275c01360604652ad999f0e6782888c0e7776420dd5e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/fi/firefox-62.0b19.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "97157deb509825073d484222b5402d8c8aa239285b9af7f12e92649672c1fe1d9454ad5a88d38424272956fbcddf069ffff2b8d80da809ad65f65ac185d50e8c"; + sha512 = "ba8fe71e3db9295c17985512834e40d81a8c78796612c3116a0faa8d60b9422f6d45f86cf7e4c737c4729e87a16d544230ef874d70d10c77bd1b711acbc7bc74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/fr/firefox-62.0b19.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "49e01d81c93f464e1b028af91113123513af7d0f4cff5f76f7ea1b32201a962c49f0744545ec82e0314aa2c74004199d2734a8aa236d057c6673cb2f8df37b32"; + sha512 = "c3eed53c00258b2fde094d4faf2fea78b31643738a27452cdb9a0fd381d91bb03591f034c9a654e15972b23858beb38710216275871e780b274597be15e76634"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fy-NL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/fy-NL/firefox-62.0b19.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "e121aa2fcb0c023ce339d2764f58ae489b1fddaecdd4751d76c6ddfaa2297e071a5cc0901e36fd089dbf3db2eba74ecee57e379d7b2bf0e71a887b87a4fb9425"; + sha512 = "a740cfde83de0fe696f49de31e9a49781a553fcf33924977663c087524934b03eda177b82d5be3ef8741b0c366cd8fdc296d1da544f0b1b52b50993924a9ab04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ga-IE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ga-IE/firefox-62.0b19.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "719d35a8d603dee4be8806dedb253979d89cb8eb912fb389b6b7889c5bada5cfd5c797eddb3612b9ff57147df1ee2e55df9272619e7f88ee63944bdf9697c050"; + sha512 = "7b345ca7ee03c693d3eb8dd0d2177765a5771957ffb125192708f47d33720fe505244af85b11cc9c019c426a8b19cb0efcfdc4e8b8910f1eeafd1aa5ec046dcf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gd/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/gd/firefox-62.0b19.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "63a247caa38e0a9fb34c99f6949272fb1139db5944a4fb2f13b3ad1ea19fffedacbe70c3a409c1189de5d89790cfb03ac69c22bb224f6318010b752f520ac4fb"; + sha512 = "bf36c77bb538e039f5a3301680e702d8253e98b3d9f41426986d4778237effa613c670a46db534d968bff21f047eb2d710f31c1f136640b70315b06c2058d9ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/gl/firefox-62.0b19.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "93a3feda1be1d74eab798e60532b99196ed343999d7b7b49ddb5de98663657cdc894e310e705cdd8e0f1a1e0333292014fa47e787f15908d691ccd3e51fe27e5"; + sha512 = "9d475dfd45134dbb3478375e0ebf7853e3f12d073b5c2a6dba6163e0accf570aa954e8b6cf18927351d6086e0e0e07f6ffc0d88851ca294975cbad5e0d3c2ec2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/gn/firefox-62.0b19.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d8b94e55d6770646ea47ace57364c0eafe47d62a2dc57a40a2c7db7e74109b04478e7e8cad08d29a553eeb2c23bac896476b049f9ba99f62f1b0e585f7f6f403"; + sha512 = "11d3dcdfad7b9786329ab9fc4800d32f92f1d390b332e6b0be3f293d11fe7b9e981196dbc2d48482dab9ccb8d6ddb4d3057abe83df565faa1a04f8b44e2512ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gu-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/gu-IN/firefox-62.0b19.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "1361f71c0a98fdfe727e8cdcde445c01244d63520a37036c95abaa2175b450fa029a634e6b0b044771ddaca310a92db2d5526eb8111bbf3dda7e605d95e6cfc8"; + sha512 = "15af55c3d45a3c8d3334e4214870f38148762ce2401d0a10346a804c5bf361e7f785d21091f2828b0458bedb65277004f87c61c0dc87ff6e09f654d2ec1d72f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/he/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/he/firefox-62.0b19.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "0468b5ccca77ce311059cb204caa3f9fabba2218a33c6d1accb3adeafbc9523bd21611a2c0d2ba926c3bd9c1026323a054de2bb6017344013535665da9ae2d4e"; + sha512 = "55c14b14d1254019d20a727f721c027d2c46b68eedb49ed848347c13f58577405f98d180b751df8b4ac17e7cc3f531c3ed8dcd9814cfd5b3e84085a33163f727"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hi-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/hi-IN/firefox-62.0b19.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "76900afd9f8bbf8d8aded010695fefb9b45a7fe06908e55b39f7447c850716f5c4139cff722aec342ec88fd3b84f81bdde607d30e7d6dcfcc4e6a37b5a7ea973"; + sha512 = "e68243a6011d6f5da237f0ae230cb23f02d91e32f3ec3943db83ec3db9280f4eb5f967e3cc6337569bbb5939c4a993ac7bb075b938470e2e5c3bf55d6158bf26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/hr/firefox-62.0b19.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "59f5dcad6e28a127dc702458d15f094ec106013f996a136e07b6a7214751cfdb9e50dbb46bd3eb202156612a8e67e4ee6bc82843dc0868a7595e9cc9afd48b9c"; + sha512 = "b87d5e15e9a703f52676fe85ecbc24d8cf5969222c2ccd26899b105e92d93e95ff038b12053c837c0e32a83a6d1fb07f6697d85610052d1e6ac389797adffbda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/hsb/firefox-62.0b19.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "62496712ebfd4813c428639f05d936c9444e59725a4f1b43ea2eb164468d90f8a3f8c4b20280f61a4049bda348f4fb973647f921c3da384e05313bf748230917"; + sha512 = "5511df205ea5143fcb5529840fb62ad66cd48fa4af473031b27ba85ae2bb8b98bd9bce0acdcd1ac5ed0f3aec71c11ee501ffcda2f136d67265d1f672163ea403"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/hu/firefox-62.0b19.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "51d0c976525fb2beeb53b83254d8b1a3211618e65f44a2e9dfc02eba6bdea229aec340242615481e4170a182316242986f09efcb7db14f83c86710ab13688981"; + sha512 = "5cb02f6e0e3a6c4a0e115b882afdf376e9e322d954aa7241e98690838e4ebbf39edf8ee7c6546d6c4f9b98681d48a49d5031befdfaaea35c95c6e25b8877982c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hy-AM/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/hy-AM/firefox-62.0b19.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "d131287920a31ab5daca21708204e405681c7e1e6c860cb10b16b475e42ce1160cb7084e31833bffe317e47710729027fe2f77bcffd35e715b661ac81bb1748e"; + sha512 = "da936656f0915a96364ff3db5ba69e8bd0918a201e1c9519bb1357ea7ea622300e3c09f35823ed15b82bf97d8f24f93116373e11753e5e83d36b8d0b9454819b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ia/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ia/firefox-62.0b19.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "50434e6bfcea74603cd9a5d8f660295e8c433423abaa5e27b192522936fb88d93a27ad6ee64fa136d120af6ab1183a7d21bd85bb3577291863f0b4509d8ec8b4"; + sha512 = "1551ef7edc2bd31ba37f937b9af0dfb011ffa51d61bfbfc9cb4375b1fa9d306c51ffc8bf7daa79455296d1f4085a131b73d575fec4ff2d08d2a8506912eb606d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/id/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/id/firefox-62.0b19.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "e3d73385e4120d91dd08fb3abc4f6268f6d10cce23ebd34553e3037c176f27f39c90f8fce59a0416cee210e73b1cf57b2c92596b3b4634700d8287a89dc3e014"; + sha512 = "7f370bc17574002f931e4b75befb3f6e343bcb32e142bb8eab8be419ee8a83eaadc2439f93ea75f742eb3a76a889870aeeb450e11685b39550cb0fcf77876922"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/is/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/is/firefox-62.0b19.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "775d84a419e24914f31cc4d34dbfde547e42c35e41397f4ff462a80ed7f91cb87ebdda4a248735d402ad57bb00cd8d7084618a381c89f53d6ed17bdeccd93762"; + sha512 = "608c9f812c5836616f19bd751ac580a930475a0a9d567a349269f68eb56780e4c55162b18db851451e52aa96950d06988bd581027608d4e1209de7e05ac39c6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/it/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/it/firefox-62.0b19.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "27e315aeea864d91b422c4e6c698e9de06fe14867c12fe8b455ef284ebfa80c3a00774df7003150ec24abb05f8717577092feb4a41931071836a09fceeb3893c"; + sha512 = "96dbaabcd0e07563f488fa6889950bd2a09c5ebf49898a04e0c77e303b0be97a26793db8cb500df2631cccf922b0f384f3871aa7a8d2b9854cb93a23405410e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ja/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ja/firefox-62.0b19.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "966d8519de5579a30a1cf8cbd275602cf39d3390ae9f70bc56709ffe71b0937c7ac4ec6788c3b972739376f76114037da6b54d94c091e035a8fdb5c3832cd4a5"; + sha512 = "d1ea35ac65a52a7744048177efb6cfa826821b3145bb100cba03e98ec97ab268a88a24550d901631c6d8365999cce794509e1a20e8accff6ee5b301ac6ff4975"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ka/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ka/firefox-62.0b19.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "029b687417bd612ef8d26e209795c8691ba310d95c2d6ef4603a71a0c334a96c12e54b79ef1b02f35385f28f2d7d399b7c8bda494d3c8e8aa7041f6a9e9771a4"; + sha512 = "1c78b10bcaf5d1c2b8164495b3e5ea535084922e20219b3f4f1fb41e4edf1c5ccd9a49dbc3a7e9fe9da7bb6e86488c54abc177cd4fd63679ff3082934d0274fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kab/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/kab/firefox-62.0b19.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "bf07ffe28d321b12435f441674d28d26cc076f0f3bf5a4c74b481581bb2bd1204c66a7ff76698759c22436cbe9c101b337a007c7d44530f6d2d87e89dbd5d95e"; + sha512 = "47ff7f5864d4ed04c94ef0442f90c373a5c6a1cb5ee0c1300bd1c3577f1f5845c5fed6d19eb590ec42e4b9fe75de44a3e737a8f915dfffffcb33273cf814b804"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/kk/firefox-62.0b19.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "2fe956a4f39c6e42beabe512ce45406ba586b462a604bafe3ed325e7625ff1558bcd0e200c147438741a6dc010d9fdbdd1728391ec660600e60883f91fe0f203"; + sha512 = "4a4b9092af41e88faaee11586b6404bcfa1f31ce40b045415a1af8f6082158ca310b47f0613109600d53381a119fc695c746c1536599af4208e476afcabf09cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/km/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/km/firefox-62.0b19.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "abc5c7b2bea6d67f7ad229a00859740c37675a584f3835608bbc6e9b0e1a267f81cb4e29436dbaa67035fc1824f2a8c8d25de59b328fed512a4c6741fe737448"; + sha512 = "c380f003bf7b71f60c83ede15c26018fa218469d98290107359c79bf4983ca0a7d82500bc90aab35513df7fb90060424aee055522d34f2f79832957eae763ed2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/kn/firefox-62.0b19.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "a26e3c8ebb41f40bf8211da74f8057bf058dcff95606a9614ad75340b9a1f1bb2c21f368beadcdf953a43a837d7ffa899a3869fbaac0464136216c9351a8173f"; + sha512 = "905a0c92409bda30a52f68005d65702d01121156ed8c450897f2809416280c3b734ea31a5ae0301d613746162cd7f039026266f7adc43e15d62c7d6ac7731ee1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ko/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ko/firefox-62.0b19.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "1b6d2dec4f3cfdd1e6f80c7bd35007d17394e7cfc16f8e5c469f3c8dfffddd9917dc775f0adf3e86d2956caedacae98d78b25961061dc7e214394fdff3737d33"; + sha512 = "916ba0b88ebfb66da8407d1ede81d8a113fb2408a8fc1de885be541cd09db6a3ed65efb746e2946b862ce2fef235b4901ce1075c8f6bb9b1a47614d717797c42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lij/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/lij/firefox-62.0b19.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "6749c691ce78968dff64f124b992c9e45882cfb245f6e406c8ec2a74278828d419beed30ecb8762f2330590474db5a209f0720c574f1eb4f1fb0739c80f040ec"; + sha512 = "2d614790ef2d050bbb6b2728170fd658327b28faf193e4e02616858165a9ada67825add643f58594c94f3a9465191d6cfa9dd597c55c8b1179766ab4ba4a3a81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lt/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/lt/firefox-62.0b19.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "cceb2c1dcd6146194fc6f542b901723d9101ae03157567b4b6f0a9ce680a7c3d18e7ea959a4b772a75e138ef19e0c6ae7aa70e2c51304ef8568264c1e1e5a5d8"; + sha512 = "9659f84976304b84ae0b51f10885bf6caee0c6567b58466f394c058d0e47cb4a38f22f92086235cfc0077a3eae10de18612f178b3bd59ae830e2ac93553e79de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lv/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/lv/firefox-62.0b19.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "1f9a6f75d4f4cf44f6bf3244e9b0fde13358914602579a25b8e8146010321b0fd31de81aa55aecf759163ab54d4c48b580272d3261b1d534da26c1ab8664beaf"; + sha512 = "425ebf254d41c868960cf90a015771cbdbdf2e0c33fd17f6b038fb2b63bae8491379e4cf4424fc55904560ad53dc05928911ac908ea5aaeafceb5409e337c04b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mai/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/mai/firefox-62.0b19.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "de067af17fc6460fbe046fa661eb85e609061e68975ef8f3ba22492a6ada228a09ad92933a385ce184688a4d40477995d54cd548ae03ef37c73d53039599e97c"; + sha512 = "0d2204236c66f67297531c8602b5d27c86663ce47b37451d83a72e822571e6382ef5133c424b5cf0eb8a10a2e03e6779c605e735b0e548946fc51eda70b937bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/mk/firefox-62.0b19.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "9c2033a0403b76301559a306c76cb29ed0a5267db915bb0771c0c808b16bf95e822e2c5e7dbade943eef1b3789ad5ac1bdbdfd01fdc0c18b49f08b35e6bca983"; + sha512 = "54bcc2fdd892565306335c4bf15e75be16bee5856f6c618a9dacbe1f22a42c0fc635e2447700166dd1269459e6d063831c22abf1a51fbafa6200feb742867836"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ml/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ml/firefox-62.0b19.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "a0f606071b04b1822b7a8d51f46b989dd7520b7cf1330fcefed1c8e6d09b095e11c176f9f94f123acbf9eb61293e8b765f3ab4f303442b4a10993418e25cdcc9"; + sha512 = "0f67cbd2ae4cd6c2e067c424247c95d6aa6260d762f3e96d6a9799cf8e8e0065b9d26c06716d62278940b271be822a94861553435d7b689bed9c61d7723688c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/mr/firefox-62.0b19.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "67b307e0a45dd6f2bea45377a22ba6dfd5437dac5ad3ac0995ee14091608bae6b86a3489b8dab9cfd87879d763271d70d7e7683b4cbbef5c1bc488ef94ef553a"; + sha512 = "470213aa3e25a4c85ada8036ba9c7f81a4659a22022e67c887072a66c02a8ad1fc2cc42012f8a8ac75e54af5a173d6d80b2692c3cdb435bd934f18722a1b579c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ms/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ms/firefox-62.0b19.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "099133a0a252f2b123328c66c6530fbe98280ac1fc5cbe8b2da4537fad4b5bd265e972843d9dc4bc937ec03329ac258e9dd7c931843d8d8859a75ccccc2802a8"; + sha512 = "de30a81fab969e944de2336deef2bbde662561e1f8309a1befdf92bffadcc8f8b9544173301933dab54dd49993dfe252fb4dc6b29fc2dd383c944a6b7e5d8c8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/my/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/my/firefox-62.0b19.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "857b59f4c1613e4243345ef9819f88932918b4cb708f94bcfdb2537145e19c2825cc6fe2166073606ac282c10250c552f1d4c482d991a33f1224cecb5186811e"; + sha512 = "3753ff41f0f5626702d600a147246fd37c7ca724c457217b11930a8f9d64fa4f54cfc61428ac7900d9297f14d8348291d8cdef64f16b51258cc9e9a4736168ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nb-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/nb-NO/firefox-62.0b19.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "edd41419b95e5ca51eed3562207240db6cdf85965bd77e85e8a6cb7395e292cdd6c5af444934d922cd5495000f8c46d22774fc7fa7d371236b22147fecbc4560"; + sha512 = "732fd39f7e9c6b56a1137025e9cbeadcf8f431a1c0b9d161ba1bc7679dfe4ac357abb8862ca58c681efbe8cc2434330bfff9fdbf3af5ea7bf03fd4ca0ec25b3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ne-NP/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ne-NP/firefox-62.0b19.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6eae78f9e49cc61a6cd217b4059b0aa91942b3122207c716fd35a726ef9402a11bf35e2ec84fe51e0548e286bd0f447019b3f1190411662252fd7d96e0de6ada"; + sha512 = "7dda0f7e98d5b1c6296410f42025d51d58bbf17fddbaa0aaeec2ce87511e0e182d3374deb033b30edeb661ad477671c3457d36a5e2f075f7b44527ce6a5caae4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/nl/firefox-62.0b19.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c5005b61225e26940a30b6f49f6d92dccb976c324a4422812e9414170961e60933754da76f50ae4b0f6cfddc3ca300ed4439376545d1770331da619af89c3673"; + sha512 = "605d948f8d0ed5a2264a6e93bac89c857319617f65cac841652ecca3aaf88c283fd9ca4d3b9d63ce436ae993d7c8145be92e5e1aaee365f36be147275550cac2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nn-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/nn-NO/firefox-62.0b19.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "03ebe1aca85db5d5c0886f08adf3c5d0b8e6a9576eb1941f28123a87440297cbb0fc0957cf847d59d85dbd1aee4ffae8a9ee11b3d9005258a1ecc89c6c2692dd"; + sha512 = "4a679b681b01af5084265982d4cc89b435bd4bf4e58ec98bd1ad9fc7d134c6bff1841657cd9c327ac1cd42c2bc79fb99064e6c5aed70539b5b0d03051f753a57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/oc/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/oc/firefox-62.0b19.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "8629f8ce3d89472be12f321658e7de12c652c540b116ce6e8e192f4f697d08159298e977eb09fc5e24243d73e679f54d586a444d99542f6b35e1018d9a9c74f4"; + sha512 = "ce9131685c56cdbafc920c0d88300f34bda4aaeb3478b9ca3c19363c9ee8eece740e083bb86a5938e9a5fc3fc54dba46523fae6b1b0de43c2d4e0221bce91d6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/or/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/or/firefox-62.0b19.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "f9af314dd17d16f981124117bd3705c9d20b0ee75552356d1b6423a07b6620dffc05e516490f435407647d7ff800411f2118a5d190090fba5da33d59cc3dae92"; + sha512 = "3ab4cd737c0c1e75f68e4483f9a7ed0cb56633427eacb8796d391f2f49606ba3a7d926eddd9a49298b13d1d3c39e01e391b03d83db23c22f835dc865555a5a7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pa-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/pa-IN/firefox-62.0b19.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "14e472a2db37fdd16d092741df7300aac32670bfcced278a1f2d4c19750ecc9b7342b5f8f100d7a4c92a8bd2788da90ce9f7c3c9de65963daba0398f292a2d4a"; + sha512 = "d84a947386dba337c172d8bbbe904b4be579a5bf9b5ab6bd43c1cc8e0cabf01b72e7178d2321ee1665e64a4e38b34fb864a6aa53db06135de1da7fedd27751cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/pl/firefox-62.0b19.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "6d303012540dff3d0d62037893559099cb015d4a4ae491f9a30ae5586b5ce747233fb9ce85aff018b3f675782ba20cc50de5ed8137dc0fee43fd50a4d0db208d"; + sha512 = "cef8df7a206a26af3299b0f17fc1b8d8f95c7702952b4ef8a25b640bb398825434a6984aec21a29cc17c3e97b9d99fdee2617b8d06c1982c12c9f4732fa057b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pt-BR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/pt-BR/firefox-62.0b19.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "172b1ed2481a2c42f22fae52333e254c9240062d2b197682f056a9782ae8405b8d33aaecc580b4a2418449d7af99d2f95da0b6929195e2f81e0d5af84bceedf7"; + sha512 = "b3f31d6c46e83cf46ee97bbf3875730d152b4db30fa59c8099ec2c977debb214b933f944e33132afa685a2f3efa86c7276713666e6764d66781eb87f555659f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pt-PT/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/pt-PT/firefox-62.0b19.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "646f0c2d24028bf02af352b0cee3118c37890a013cd17a37d8c260c8b8d2ecdbe1a258177b2e82057ee1b0ee18748b3c22e5d10b454626f560e63b0d95b28fc2"; + sha512 = "308948a335c4b3901c75e8ebe269844a6a75727213c4d08f00a5016407efdb0859d604c1d8d99200a4142291a18cded8bdc8b9a362ebce1964c19e0a7dfa3495"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/rm/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/rm/firefox-62.0b19.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "25a2049dbc5d0bb7223989bd8cd3cbda0bb31a1a41a72fdb2d094f8f31977929e22dabcb792e72152c40fd45ad4b82efa1f4023a4e1ee2ab26c3dd6b0c06047a"; + sha512 = "e115c4f369a9b668c0f5450ef3c28e3c5e66822686bfe5796a227459c5ce4329fb356bce408f906b11cc1e0dceaff6b941f12b0c041fd27b0f777f3eb4fe7718"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ro/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ro/firefox-62.0b19.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "1e718ddd6e94769e7de9a458b9b4c914061a6902100f9a941b49d8f6a2f128d5460a9b932b4efaa7a8036ff64792e05713d11bc9c90022ea06639ca704a392cd"; + sha512 = "bb26ebb73ea63c1cea9cbb2b62158236c98f0558ec953f7a5d9d17ee407dcfa2981b774eae319a825680b8092dd44fe6e9df796ac2982946f74c7ea5fd5df8eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ru/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ru/firefox-62.0b19.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "575675c09aa212a8952808238b783b7728ba973981c1d91af7178a8f80be26a64edfa0ac2ea8ef8ed99d3d7b0fbdc88113f6b8e56dc4ba77e75e40cd7fe30013"; + sha512 = "7e9f12559df60601676e76a38c0c99f0f155d7ef6e7a88f3086b048151c7fec56d3259bf34f37399b1c396def3ea4ac729c12b83792843063f645b13d94b8a95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/si/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/si/firefox-62.0b19.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a8457d36199a6bc80b40747e553d97921fe670b5bd5b23b74163788ccce8c2b5c978da0d20e8ccb4546f76ed6697b7833b30132008d85a6d26e1056ab17e4f23"; + sha512 = "2785c0a12c4a09e7263085741f59dbfc9d8ceac93992a0d1f7181a34a09b44aac8a7baeb42cd047dce6301c1735bdc64f498c9895363527965a4efd500294c48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/sk/firefox-62.0b19.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4db245112df4feff3a9683e5cd451935dc43044e07c5e44d60dd8e425dc3fee3fabfee0b2478045cdef3bb69a7a948f0bf5bdb894c3104c41a1ad2a2c3d5b2fd"; + sha512 = "20e33d2a6ed8989a889e55f9439d5878d295f1b25e88ece5416b21902aae95a662b0b198d5a690067d04d83ba514bc944e8c4e5863dc0bca6fc2a6cf0be137b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/sl/firefox-62.0b19.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "08c3774a94dfeb9d9f984aafc298336e8785f06d4fde3ef9b260e53a8c6f21c9531d5d52a9e09a81b68a17275d6b1d725f3fb894df0366a7b4e2de1669fe94a7"; + sha512 = "d67d23d6570bcd1d7914ff465aac68faec728d5afbfea2eecaf1faeb7165e5c270f5cde1acd2e0cfb8b00151039a1b92cd641d91332913c959a92cb5b7953cbb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/son/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/son/firefox-62.0b19.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "f30bab848220c3969c572783f7fad6395a2c6933b57383146bc1799dd5e5dcbeaf679af9ccac90a72cb607360f2adf8b20c75503c314cdc9cf99a0d18eca2c93"; + sha512 = "6baa5392250b8738d10f0af54327da729650727a5c7419283e33b468ff1bc550a73d588cacfad429c924c700e92f1bfd28ca89a8876408d56a9d8e6e3c1f14e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sq/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/sq/firefox-62.0b19.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "cd07a455109ac035f3adcb81bce85dc7ca9fd871498e808dc91c4eed3775fb1b4b752b769769ac79a2e8bdb781c1425c3990bf3a6df40cdfc2b6dce6e99b7c70"; + sha512 = "205be0861e846aae214cc2fcc172a2bd77c9de6a7edec77e2bde2d420804982c817b608620c54179a10a753f10ead8069285559d8f613e340cb4d33414678ba8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/sr/firefox-62.0b19.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "e5e2c694f464d781ce67e6e5738784538e22f8fbbf02853a6dad9d6d31ee4914b2ab9e2fc2a609eb353c4a040d58ade875f9b64f061cef97e2c5de1e386ec469"; + sha512 = "0428925e3e1afb69f3610d8992ec1380e55e6688c04aba3983feb404665c8d2ae05eb8d2cbf2eee446e9e9065de493a7ac71cabed764dbdd9bf0f01c2e5d476c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sv-SE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/sv-SE/firefox-62.0b19.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b714ca1dfe8aa648fa9fce2a5b1c35d01d7f5bd8088afb91b18ee02a60bc9063183c5e93044bbfb88bbe5a7274cdb0a9c20aa9a044195febaeb2156ccf10a650"; + sha512 = "39a750b9e9edf2648133792002cc4bc5f9a8fd62bb1580c0a8da02f31ae23d6a288140056e3465d18165dcdf22612dba3012e9843475811a30b68a865f16bc8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ta/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ta/firefox-62.0b19.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "18d93447e531436500f6ac56a60f7e550e2677c8a0fef730c44ffb62a6c36c3a9de81b37dd6636c687a2ebaae3a1594e8ad522b9fad4c7233c6f51c2fe1c3a04"; + sha512 = "3adaf77a893327d0f7f3ada02d56e9d38c64ff81357418e72a728ca2abb7284973cff4016d72284568cefb265a00ee0a1bb58b71ef2189c8ad36d4c701fa9b43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/te/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/te/firefox-62.0b19.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a4f06d18f8bd33707f0ab7fe68ed169ca14be68800c69a7264b9b30e4f563a349f9e5af357f20af5ad1382323699b74219f95c00187558d0b923a28583204b18"; + sha512 = "e5392018f9e17d01623bd29ee28310764e93774d96fbfb73061d2c9281981c893e731bf3e4044514a4f05d81a4c03647f81c26ef4c89b32ec37ff71a0fc31958"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/th/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/th/firefox-62.0b19.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "8d7a09e43f4f184f07b5d67a49fd2d48691166cdd4bbfb4338d5f9f721cafa0a0d9a4cad3b886bf883764edbef592a11acef1028b06e1d023d7a86827c861cc0"; + sha512 = "bfa74ea342566d589a7c1b52fa566f9ab7bdaac9662e5a3970c30eb7cf41fe6c99b3303992f160e79c441e7ca2c9582f71a84635f001c78d9638cddcf4b5d15a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/tr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/tr/firefox-62.0b19.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "aa390ed3142e80a089b6363a41e674f62f7b423cf01d8a49f89f9646d5e3e3b79a7d14b044386b9a2bc11ae7648668b502d31f27561937e94c4cba057f5e8499"; + sha512 = "390244c6db478a32e58a8c4732b6035f955274f7b1d62545cc7eeac25ebc355eb701947c77f96e1f185ba843918e44d1b619ce9bd9acfd49b944890a973a8f47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/uk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/uk/firefox-62.0b19.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "b878a398a0cb21b53176da0ab40f9bcc29fc31dfe82639ab266c6d6aafae4ead7d7914d17d916eb0e3a733d9eb45fae1c1534ed473cb64b145325253afe7d999"; + sha512 = "2eb8b9b3648956d54fb465c1d783afe160c6e06186165546654ab63f9a557da9bdeab18e1c9453a8bc2d9082f45c067d2538828b455283f42bc2935ba77b6301"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ur/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ur/firefox-62.0b19.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c828613d82a1df96fc5045539e173633761b24339a1386dc2528d275519b2b511dfaf83baa560ce0e34a05e5db192f2cbfd8595eecaf3ce922de1d8bf1555216"; + sha512 = "f358018a9c2848930c70ccdaedb4088d829bdcd08a6e488e65d70b8ee878a477f80ea4736c55a61b3f58c0f7d5753bf73764985e84693a0e18804964f262644a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/uz/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/uz/firefox-62.0b19.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "9bd604b913c7ade0a61e5244ccd8d0fddc209d8bd7dcf232ccaef3019a31d416f2ff0da0a267349a5f1458e2d80f1af1eb98969904708a486b9ac06b917e60ed"; + sha512 = "dca67812c686f46f74318802ce2ee334e5cbc38878e514631c55963607789673e1fa6d2bc4c45a130247f7bbe1373a27c70fc726a5338a51d391e40e040e213b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/vi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/vi/firefox-62.0b19.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "93ed4c1d8e394d549bca34177ae5180390ce8a9d469ef0fc5fd858a0e61bc8f9f7184917826b72269f28f79793040286bb94760c5a06609325f41e2baf22d7cf"; + sha512 = "71dc5939c88a9bada577621ec8972a9c253d51cbda818df47fcaf068ad41f25f89efa0280ba269a057658510ca668480524fc45b354356230b1a87f415792ec6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/xh/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/xh/firefox-62.0b19.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fa28b9e1f6f3598e0936c916a7d9b93866caecaecb9c07f497d63b57dbd2ca37f6110ca2e2b63361e30c2ff2961d97dc2eb9b88b9deeee6ea3a6969a46cdada8"; + sha512 = "1880cf34fe3ee330c1da83fa78e56780e175408f5219bc5d8912f2bc8cf7ca3058e759c40cbd5dcd2248d0752c2f289ccbae348176d8e3cdfabfe845f2343d54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/zh-CN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/zh-CN/firefox-62.0b19.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7f5d84e863a76c2ecc53b0b7ce1cae5f48818586ce8f7ce14c42a423f0d3336ece9a84c35d89613df286f7f0165b63de0a38079a007fb40f7b3bd12f16ec5afd"; + sha512 = "53f4d16c2e5f9f924344e4dbfb57246ff9056f6d41a996a6308aa8fc36989148d87db22ed1f2f29870127d560b4a711313e6d99dde0276a81c9e338823001c80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/zh-TW/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/zh-TW/firefox-62.0b19.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "0f904bb2d25dd1f481dc7a5579a64c6bc3e14d4f6038a9ffda0ac8b24549cd1cf2f3bf337f4221c15532e25372c1eaf76a243485434551ae12ad569e26cb4fb1"; + sha512 = "7f59f4de77dd5f6f0c31e9062c26206e62c8920f7e2abfe0f7da72de7ac8804bd0cb5591cf59e13c7c44869440d06a57b62297abb14e72646278e98c870cd2a4"; } ]; } From 62940059dfdcd7837a5dd8fb82522a8031db2eb5 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Aug 2018 10:58:02 +0800 Subject: [PATCH 335/369] firefox-beta-bin: 62.0b17 -> 62.0b19 --- .../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 47389e21328..331dbc543ac 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.0b17"; + version = "62.0b19"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ach/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ach/firefox-62.0b19.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "7e32f8fae2e8a863fabed1ca2da1d13d89873aa6450687021cf77fbdf8b8f7a589590ffe7dfb20fc6f4fda8bfd21cbb50e7d2ceb1fcebb32765926e85532a56c"; + sha512 = "559274af510eaebab2cdd9cba8cb668bcf926fa5cdc583b1e26bcb4a50307cb318839038314ae17e0cd793e7c2173de5d69e606d90ae32f256d24714dfc26d7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/af/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/af/firefox-62.0b19.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "b20b67c44eca5b615febb4983479f3ae4d8ebcc2b014b30445974d3a0f47672439f2121f4665cabc8ecefc955ee6f70651af24d46c7f324f898715565ba49864"; + sha512 = "ee291b325468c3d31ae0e97984da5a32c552050a8a9da8a075f5925b0fa54975066bd3bbcc57a15e0bab219e2b45a9fcba6b6e831109dc80a4f16728b4f19a7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/an/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/an/firefox-62.0b19.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "120ee79642bb4695b9b7ca7c1bf21e6774031be52a271da7042f6c45710d2bcf4405a4bb322245814c82c8f891067cc39309c69c5a61b40b908eedd804d9fdfb"; + sha512 = "49e63e03482753bcc1163229b6c7b00334255c11359482805eb26bb3ae30dfd407d9b667dd2c043019b5910b47d62d14c89b2330795c655778e6617ec1f8706f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ar/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ar/firefox-62.0b19.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "85f16989d0f80aa21df59270d98306eaf260fd74c3e28c00a15f546c5fef9eabb39a079645cfb7c51b1edeec63433cd62d8871d75728489220a3def049b47b78"; + sha512 = "2acc91e3a22550e851714b4b1e45dc36f2bb61d79484f9a9eb2266fd0d75c356c461ad04af818458344c6bc6983ab2b92d84ddbe73acc39f29836aff36dd7bef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/as/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/as/firefox-62.0b19.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "2a7d134b7f50d8ada8772daed52825f008a5efa7759de29393c6fe578c03e5952221fd9108e751671d3849492e2a567c1f1cd614d356fded4b3b11a7dd21a4e7"; + sha512 = "1fe5e5fd3bf2ec8d077937e24c1175487853467037cb10c22bd2022bbeb454dd860f3c1356a88e1d4fa9ed6b7f0539917b0af858bd6aa6b2be7bf77a82fc05e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ast/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ast/firefox-62.0b19.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "522785be0747916af7d77cf93a5d9c8917f7b0b244497ee2dde9c2abdc49ab1bf916393865211db42b2118086b0e114d228ef8ecb95384bdc2818f08487c6a57"; + sha512 = "0a7680fab1b7de375462e35e1fca3b07c2f75f4a8526c3a7f76a213b14d5089c00165c84fb76b701ff4a8efef16eea067f5dfff53653cae6f996cdd9ba1a0d43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/az/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/az/firefox-62.0b19.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "1bb6022ffeb6d0c6f263dc2bb2e111733baa00a7a06e0830a0e8103505a016a68c3b88244fe6f1764dab12c9b7682eebd547b62c38d3cd974fd4a0ede49a63b9"; + sha512 = "afbb90dd5be84771a417e3557e155b0927bc78210e22375b38a9aea4d41ea6d815ef46f2db90f7efb403b01c7f2b98b17ebed4c04d7011cbc20c12899562ac2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/be/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/be/firefox-62.0b19.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "8197ecf380fcadda666d71cdb45eef73dae713b73268fca1f1f3cab152c08cf4f8f923c5878d5f4e07c55ecc564080db31f64d8ad26ec2ad9bf1c0bde47b3b18"; + sha512 = "d6ed275a8b3610df1ce7aed24d8a7dc196ec50f0b57944ec7096a04b14993161f50f55d7aa5ed266aefeb042591a3f883548d1c59568cfdb62aa9cf68033641e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bg/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/bg/firefox-62.0b19.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "e6039c1291ebd11c37ac233f105778e8bb19b3b7e3fe9622a01c6a9f3bdbeff74b24569284b7083da29febda260fa71429ac105f656e4c9f599deb132f497cd9"; + sha512 = "e8e60dae4bfab73e41749eb4378bbdd2d16b7fa4e6c6e31816a1019361c09eee12b48ea60f1690e5e29b11ef69a22aa6b09e10a718cd1452ce966f4183692007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bn-BD/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/bn-BD/firefox-62.0b19.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "5d9a8af84b4944fb962da196ec065349b2109461506630625211d234ce7339e47bdcefdbf1c590a14c21cf740c10f31c1b5e6bf374dd696ecf2bbf5bbbeb232e"; + sha512 = "cd4630ecda7a4b7bc83470ce1ba0bbe6914e98fdd4a8fd39221f777c220e5950093207625b4d5059a9a7b8cb0bc8f6dbc8363152b7f8998a21417bd555f29453"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bn-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/bn-IN/firefox-62.0b19.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "df7d1ccc455bbb55358da614f72ad878bb28f882ef82e2a007b743ce94f218cf3f469ac0b7ee968814e9fe87dac1c5c41b8b380f76f78f358e621077b2266a98"; + sha512 = "762336bb75dca428e918c08a23d85fa0193357f5b38bba355c977d0723b54c17252e18ea016f7def876841a76ba920c8e731e64376fbb941a565ac88d82c090d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/br/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/br/firefox-62.0b19.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ee172b89d05b727d895998c42af19d7d5a1f9040bdaf323a780dbe9b39937ccd91a721409ef34276cbf81fe3bb0a43bc6534335fb68bb38de8f50194fccc887f"; + sha512 = "5c3c1d88f8d133abecbe67122dd19501e06cbe87a6166733fda64e740406ea30b8a2d5efce0215c1572de4416f8405db4750b8315d50f5c1e1038848ba857053"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/bs/firefox-62.0b19.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "2ea8db7e182744d607d683aa55a482ce0da78d3c035b841597c8d7382cdf843e3afe274cc82b97b3244e5306f03b7b34f1964e772bfbdaa42cf98bd960d45872"; + sha512 = "71c23e6794978a9750460e107ca173f1755987215023a6399010405940de741ef8e1731b6c23bd2ce62b39d74442824530b7812b2e5da52ee9f5b6810d249166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ca/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ca/firefox-62.0b19.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "aa0b2eabba996fd8073a09898a9e42f2d5c8fabd81ed02bd74a14bc5d9f9e00ea4f20dc647f461e5bd44b8783f12449de6407c440a6435796610ddd709fe4578"; + sha512 = "1c3c9bf9cb9f18e5cc0851c7b98c9975e4f961e38de03c40044db3cb9473976f68d76afeb1a4d3481a0e5814662a327b7b42f07db98c6cbaf54acf914fea5420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cak/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/cak/firefox-62.0b19.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "e93b043f81d8f3e559f732b2b667774fabbee643a5ebc8fd6fdbaf1ffbdf33b8bb0d85035f2233a40da2c611cfeb7740230bf53de57bc4db65bb96046d29eb1d"; + sha512 = "f24816ae06ca74cedea0e19d43fdea38d79598f9416f3fcc8bb23cca9ca6c1a662d2fb631cef9e3290a5f819b5c634f639e671a81825cadf703bc977e929132b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/cs/firefox-62.0b19.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "6fa2edd2ed70b4ed8a37e3b5e61f1130bb2c69c5a34b03d2a28d7840834c0db51ba7239be548dc792df03f4832344376bfea9dc542fbd8771a10bb5ef05968eb"; + sha512 = "73c65012f8a01f798a5bf3f77b336b811ba90a0d339880484db7b95565c74beef2be731d396491dd8cd79f7cc3256f5731ffbbd3876b15eb0f5c6452341207f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cy/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/cy/firefox-62.0b19.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "dc4f02881550ce4f77cbb66c7f3033c41d0697c5d86b8ee52396955b3d3f81fb870c60f82728cc4a8d7e647af7f08c1deda4d1f30b8c140c58786576c3460d56"; + sha512 = "62b170155a39e292363307ab969da2ff9c2e82798aea7eb2d04670d5326d6d7d101b2cc935eb920e6c617ff1ad9b6935607adb5897061f9dddc108c5b322ba87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/da/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/da/firefox-62.0b19.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "df887b8627e3587fd1fa94055a9e39bd3b42ff5d0d9b2d3ad761a674700c0081f769fded2e9b5262316c81020d4ad58b421185851fbb1c770a023ff94b2b26c5"; + sha512 = "eed60cf7ac7ab8497204b322d416c783aaa7300f607dcefa2bcfeb92d0ed7a9368379dda2ff72b309ea39a68dd02d5888a67acbd2b524e3785ea9ebbf18a4540"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/de/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/de/firefox-62.0b19.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "6195000ee4013587a2f4cceb368b8283a99094f2617b0a350c62ec3e562a049b49c01691a876dbfce77c7d26c3354c00b9340bb0f8fe822000f012fecf19b842"; + sha512 = "58176c23d3b413c3da7f019ab36b9e2f79c9f97e08b3bfdf6316ff3b657d3c12d0146618520fa02d7378e9e36cc519e14e78239d7f94a6c1c6925d3bc79d45b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/dsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/dsb/firefox-62.0b19.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c44a694a85b2f443faa78fbd2ca9cbbd94a91fe1f33c2438a0d027767896f842edbbe668bfeaa9f79a00e98d7ad89b45173273a13b9b0825952f39ffac256397"; + sha512 = "c3f4a4406b3dbd466f26dfd239b5e8eda062718fb4683925471980ad403d7569aede2d20cf1bb74569c911253d2aa372d21bfa2842988a4652e6a09672a0fa24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/el/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/el/firefox-62.0b19.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "f20f82982b59b223e8bd2f62c6c0fd38517799cb425619104e38e28526aec8b21eefb9b76fe9f6c7be6282a902144ccbf1033cfdc2202d927336cbac9d9c8c58"; + sha512 = "03633de8e557ead1b1efb62862f55e306fdceae37cc963a2af28b6dfaaa685d2d05b550d25f62188e6f5b1550b8a2daead2a62710b8080d7b7394baad075a82e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-CA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/en-CA/firefox-62.0b19.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "163c3cb96fd01bfe1cf06f3f725f612f966903ed64f8f924008288e040402e252a490b7153b9a916040c25c074856b179eae4a89d511f4d7bc73dcd985367406"; + sha512 = "eb6ca404f0d09af7785f9ec9d069fbf69169bb219733e7220bf9b93d9825158ead1709d8e15e50f9ebf1442e9cd1024c6f1fc02bd0a1e0c71c8b110acb92b414"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-GB/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/en-GB/firefox-62.0b19.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "147b7d01424a53245d0f73440961280bdcbca765b2580594db60fb0a398daa483f913d799543e97903393dec2e09d66ae437f1ce2d64a70c6ec74fe0017511d2"; + sha512 = "bfd59902d24778e770731c22137f7932531a340c99d4fb8e9461b68795a50a41a3214213eb234bc32750b0ef28f6f9804314f6d0660e209104d8f659dc3ab176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-US/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/en-US/firefox-62.0b19.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e822437b28e12d38bd701afab12c77d3667bb30e40420db8bee9e7ab85a77b8e3fbf00300ec2711753b25503aa7d2fb870c646ce652335cdde9fca436e04324d"; + sha512 = "6221bd0514aa1a634d2bb0f62d970f4bf5cbfa71544c9b5468f04440ddb98580ee43c4f270f947da838bfb984cfd01b4a4a85a6690810a96ce42fe1356bff4bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-ZA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/en-ZA/firefox-62.0b19.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "f0a5a20d9f99ab7815834ef58ded2900f32bfc84f998894b0098e22e33eb192f906c6d8eb95aa6f16e23df6413a841c681284796a85af85d9d8787c9dcd20b17"; + sha512 = "6b5b135061467e3d24f9c01e8b01c56ac1fd4b9109e0c4e36852e5a9cc693611e54c8a4df06eefada33ba3fbc7d9cfc88b167905a0ccbc32582ab8bf6ac24cb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/eo/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/eo/firefox-62.0b19.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "722e579e85603f959488b98c45904e65f87d424d914b90df79e1e763cc84602d03dc25891c46c7ff2abb37f296c97193f08e6f90de01b64cc15b6da48678da6a"; + sha512 = "1ef1e7e13d70cf874c4d49e3be56a02628ccd8839e55eac5ca1ea8174cdc321b3397ab1771dbc343fd24652c96eaadc2f15c45d17f3232d8b9f0644764487576"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-AR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/es-AR/firefox-62.0b19.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f0533cc71133daaf7de1fb200b7f6394e8cf7aa0113f4816096674b588c1d393381cea1607e94311a85621bc58197a923af2772a32b424966b1e5187c9a3aec0"; + sha512 = "f5aa44b03039562332b3b7074fb1605e4b48b8422ec17321ee22f85a8e02c844b58b05f8b776282855a33bf6bcf79731b33ef8a0594cd8f437f52dce5a3e7958"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-CL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/es-CL/firefox-62.0b19.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "a12837c9698e04b697fee3b7fbbfba1d69ec795b80bd05e64e0db90e53faded0201fdf9808c8302b7b5cd15c1dc8f092a9a3ad2084da7de58dc1248e03c2f5bf"; + sha512 = "b79887f5d70338a35703afe3115f8a86dd2d094657020924e3344a1de83055c200e090d639ca25f32916da352a08bba9971ee3f7c4ca1a038b5e05845c0fe3f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-ES/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/es-ES/firefox-62.0b19.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "8ed88af39e201686a3c2f6bb42690726b1fb727d1978568f9968d588272f0c90565f69c2ba39ff0d24ea7855206d1ed6b8cb924e5079007ac205ca9962222af0"; + sha512 = "3c0a0d67c7705236fbf4f5f5714af97c9dd94325cb8c391b3c660d027fb536112d1d82f26a78ac660d46c226404672cf89b1ca7c762a32cdcbbe844cead1fa54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-MX/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/es-MX/firefox-62.0b19.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "aa40c774af32560d751b938bd002a42dc144de9ab1f2f250e8c19fd564a5087d635662a50c052b14cdcb845a682b25c805b0ea54b7957dc0f36ca9b26803a081"; + sha512 = "0d951f4918505bf3d8b996cd036a69b7fdac7ed9b85f38dfb0a056bf23bb8b4bd2ba3609100e510034bfe02849701e24559fb7f42dcea27f34ce7354199085b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/et/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/et/firefox-62.0b19.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "43599868abe6827f8f17cc01157c5ab0a942654be65ad9285282da314dad3e22210a98b3039e8f35e9e3db49af0a18551c4f98f0b2bb1829a3987f0e00d525f6"; + sha512 = "819640d6696d631b08043b88aead8491951005149a06e40cc8345c10fb2098cd5ff94360e33fb85ea5fd9e1f93c35aa2831d863bccf26af456c219f5f9468189"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/eu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/eu/firefox-62.0b19.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a9f7cbc0253b10430c0c24648fb2ed5a0a20504ba306e1247a432f7d77d8b2ec9ad9ec2cd3c28079733e4b9ebddfe7488b1db8e3a835f1404e6b579066384d2b"; + sha512 = "12346ca24daa896c6eda4bbe5cd337894b043150ec6dbcf912a5faba3f8efd3f9c74d70694a799701631ae543607a1042cb7f2274df1188eb77c45a55298373d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fa/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/fa/firefox-62.0b19.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "51135e2c5303d0d237a7b1016cec133bc2c490ace618eee703a49c0c9dd9f08a8af563a6a864ebc985b8962645f05750690e3a554da2194de42dae397ab97d1b"; + sha512 = "1b526ca30f5d92a7fda1d91efb4818d21820ab459c347747060881d7871e8cd2be5504c960659c142a629faf8a267642f4318a504c65a48ecd4b6db484814d82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ff/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ff/firefox-62.0b19.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "64b32c975093e936e938daca63944ab118df082d04f84567beb081b413844181d574dac1d858084f33abc4bb79d3c154f661775ec0918a052ca59ab2679ecd0e"; + sha512 = "e8e364711585c47ac2bfd8ec4bd3aa26faefa51ffce918d6b89c2fe62dc21984bd85401b524c150b5a8930cbf5ac9a7c85c6ce12c98c561ea4fad34e0ae4471a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/fi/firefox-62.0b19.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a4510c29801a4ca7609ab61dc1429a1f3034a61544a9a59ef4d8b64db7269f8d6f9c25f500a13da4af7741d035a7b29e064da457aa8c3beaea57e8b134ce66ab"; + sha512 = "e8d7b39b9fd73d398e69eef421e62aa61251d53e60c9d08f78fb318fda82704417676195a73724f8ed118461836f4c934b201fff1f4eb3fa4b070c068b2f70b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/fr/firefox-62.0b19.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "09547877fdb386abd306081d764df6aa4ccc0218aff9f84453f97e79609004bfee2f3d702fcbaef5eaad1194acac7788514da21903dbfa59d5bb54d70bf705aa"; + sha512 = "5f06105264875d98108b4261824f4f6385615f56079fe2ef08b8e6aa6991fde738cd7e1d45b582ba025ca6308e706dc4d487ac2128909a419bf47d9ec09f3f71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fy-NL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/fy-NL/firefox-62.0b19.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a9d150098a3adeb0a88587e66594c297ea3b16d17a4c7331707ed94ab6c0565c9a9045d5cd863a97ff2d98464bc728701501fe57a50fd7ce6e3d36697be1fc58"; + sha512 = "0a4fe4a1cf40247399c9d5b4d8cf275f122f19d37ad8e2c8807c28a7b3eb752ae6a6dd01e8901c2f6feafed32367eee4f25d0d21b65d1b8196b971cea1292f4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ga-IE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ga-IE/firefox-62.0b19.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "babe69b1a9b9a469db354546822c9fddb52e17fb6aa196eaf05de24e51cb8a1337994f4d92e412fe4c92de5a79f4561c799cc44cae039e0de6c8ea25a91516c6"; + sha512 = "d9f9dea5bb8c1e854ef359e5978fbafbd8c07a2fc1eb3238a3ae22dffcb88cdde0c4189c1f60bbc50be58f16447478a3adac9c6d6c60d629cd2a2e66b94627aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gd/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/gd/firefox-62.0b19.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "68a5ddfb2c450e034a8491ccfb5de00a807f89ee9d65f4fe42bc9bb7dfb7c2b26c3a0eb79039992c7989105549f177f087599ca84a50257417a1aee0920d2f2a"; + sha512 = "cb5ea6d8af9ce3653ce73b0bb12c6f78c3ca26d49e88f076dbd1fe1e9a667c091657d4749594566b2cdb9e488792e7b653e20307334bb1c25661a125fe15bc9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/gl/firefox-62.0b19.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "22aa041a0f076ba986f13e835909bbdc0958a61d6ea92933a392b17335e9698b398fb4534f9c830dac3fdf94e8633cbdf1fb9348199b6e60de1a0a97047a8144"; + sha512 = "252c3a82913578e069a76331c95db4335040b8f2fe194bea259d74b05804b65f94a7ac878c9c822790d00e1c1fb7df80904328acd45fa5f2b4534d42f3a8c00b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/gn/firefox-62.0b19.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a8bed372475435fa95e387ca23189f3d3130055a1ca211e7a51fa74b47835bcf04503bfd65f31747fa30e370ffac644cdadd0df3a25e097d56b909bf8c2651ec"; + sha512 = "7dd1adf33f8add5a2996edf1f674b502813fe4ad069eae5e520f413f069ea37ba1fa9dbf3f9957229824f0215db312075c5867a6d98ebd92cdec8dd49aecc816"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gu-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/gu-IN/firefox-62.0b19.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "067d16fa5afd8fd83f5e27d26b282c80b4793e85f53c12436730b6577b5ff5de009e2da8305a65883b04149f9120dc365de9b2681e3fa4479f1e201cc7ce2385"; + sha512 = "41a28b5deee2a2b2b57734269d14d124e0d9300415478a21ebeb04a94ff50645bcfc0632368f8a93cef1b1936de9fcf34e76da2e8ded871b79094b050f2bdec2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/he/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/he/firefox-62.0b19.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "d7ae260f75f7d7931849fc55811e26ed51169870d4e3f574a692b92d5454de69428b803c5c9f9d3e090c79857577b02a82820ac75c52306a12eabd2ef72ab38d"; + sha512 = "ad4fb9b564fa24151212447e4a7dcfb9da9e074155651d5b7473184206c4682be451fc808e27866861bbf1a79bdfbbe22cc0561611f1e9c5f8511fc5b7dfed38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hi-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/hi-IN/firefox-62.0b19.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f508a9889691484120c457b3838b1a6de00af0f7ddd23a736cfb8efa9db1886b8cdb9cdd2e9e134aa44af86e8ff8efa4b4f967ce31abf8d283488e379d01665e"; + sha512 = "deb7ac4c0bcf397366c05fbc1e5d0e77de4abcb48034db982d3380133b8309d4b2fc3609e782310e2b1b10c04669ed8d40182c983e0cbb155d8300a5449d7f64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/hr/firefox-62.0b19.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "ed40057ccbd2da2a675b83f28ee69759921dbefe2490573269fce6b2b671ee1e1b480dd75a773e22ab594381996f1e1f5aab6b0145a8a4612cfcae601439dc9b"; + sha512 = "e7b086a0f1a1ca666ed28b772d77590b564bffa1c5857c1f4b2a10a0a20fa22d2902a91477f9a881461795108b2cef0ed36feff8c9d891cde3c413d7b514b01a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/hsb/firefox-62.0b19.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "ef4c1b377ccd898585b7aefa02bceac1d9d8ecbcd02f0679ad029743222c479f3dc57c211ec9872d5bf2f58e50336d5f248c46ce4d46536da7b0aff03cbaf135"; + sha512 = "de55608a2937abd2ea8cb3d01cae7d6fa1a0be8d2c8bbd9629a15b5957da76c43e078fb0a3f7b8826a1070b43c93724a7111583d427303f962dd73d1d3bed778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/hu/firefox-62.0b19.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "fadf57fe984884b4caa678cff5ccaefcdfc9f560ccb33c8f449ad87df19d3177ab0205bf5ceaa60e5e874d05c1262f3cf465a0723c24453655e60280b7f06b19"; + sha512 = "7e99bde3de39561d63ef5d1a41142c94c39fb2a7d8d7755cc41bdd641733dbf7a4ec672a80d2ef55cf2626ae515def5d87f53eb75188c9e640285802aecdb300"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hy-AM/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/hy-AM/firefox-62.0b19.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "53f7db4751de67b40d31de66228ad0deeafe8216a217661069a1931de3dc7d050f4e8d9a4721df5680a5d784203709fea5851f887b9c22f2b232150b2b969cf5"; + sha512 = "03d2beef09a95715f257c6ee252aa9f5997196e5a07c10233e885916a3ce916498c28a2febb0422316fbe437699371ff2402de163c4038bc5d4c28fe8aa9c783"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ia/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ia/firefox-62.0b19.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "58ad97f682f24ebfafdef3641c59410b6e252bb4e30fcee3c7b51bad7081fd76eaa15e116759e2a6844cf50ce0b597ac8fb7be8eb48618d1615d3654af2a8bdb"; + sha512 = "bbe947e8b37dfa3786f7cb7418a0c10d0ac53f3dc4a3556d8122f8b0a4a174c9c192d6ceb66eb004114c205e131ea0d20691861a80a5f339d76077ba99255d42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/id/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/id/firefox-62.0b19.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "e5e8a41fddfff24b958310dc89945d2a89455f00dc04906c0604e153350c99a49b1c051da60ca139928a380db6d51408d8de9299248caa7319e9e2bfab6d4e8b"; + sha512 = "e7b52633455b8b198a43d869ce853e4b389d6a5c01d2b76b4f1b7b0e1504201cee008e226efe2be952169cf28ecc56ef16fa167de0106e15a590a5b27928d5c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/is/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/is/firefox-62.0b19.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "cb2a6793fc7c08d8e6727a12b5449e4afef224b4f764b14cbaece7d9c78abaedb0eadde140becf9a8e5eecf0359e4d365f502545838683a5bdb49a844a1e60f4"; + sha512 = "d5f838c5e11e92fe217cb0307df38cadfa2a88a06c8e17f40df6b421fa111733ec4d647d0b51b5e2f5beaad53db7a9eb9cec2c44cd10e47c8453afa69e5e8d54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/it/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/it/firefox-62.0b19.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "607fb8a8267d125a639e0ae6c906df579874df537fcaa54aaf7d5dd42d17fe1e7b3aac680fd25a18fa4c2dd8cd68bd7dc168bf59df28d7aac80082982cabe8ee"; + sha512 = "fe08835cd8f14cc2fc5f2be5b06ce031fbc0e2b5c72554e499f60de1856eb7111338159fcf9b89ae2b3d5366ed69b9f650b4fbad220b397e14d21627b3d0f489"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ja/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ja/firefox-62.0b19.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "2e803d9c3a633f2daba2768299dc3c8f52b67f4a511c20bbcb608962e28189768d242af3797fa06cdabf8a89c3179ce229e690b19eb2f3baab754f30595761bb"; + sha512 = "c65c8f19f2fda8ffe69f1d0fb0435202f2ae90aa52a9a2d7f6f1d48a3e5d5f2553746c58dad462aad3141f91e60f1b176e25d63eb00305f6f6022f7c3b30d784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ka/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ka/firefox-62.0b19.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c6d559bbc1eeec0e26e7b374e867bb9bce9663310578ebe518150e977a46fb9fdf5f23446d37e64141c6fd4da89c6f79edd08bba7c450c78cb07c3e66e5c0771"; + sha512 = "b3be04d82c5005bae51643fb2974d34e2c89194730c2c35cec6c1f8aa093e2372f72ef9b8819b014141722a94b6851e5986e47958871b4d72acf0e4c5326cda7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kab/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/kab/firefox-62.0b19.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "8e7e979c3abfc711f3cb48c5baa61839f1e3973fd35a74964400d402cfdea31a69310a94e49dffff63411a94b169e19a9d508c83553541fd42f307652a72d5bd"; + sha512 = "717e6f91898b75ec0c549a750707d2ef7f637128bf3bb5697a90a7728879843a11d66cb28afb7b06abd71bc49d990505ac4f41d64208a081b17d2f06791cdb16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/kk/firefox-62.0b19.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "e13112297a1d154866d9933d1bf6daaeeb4de05f149ad0737268ad7f4fd42c8be1af9c111a2604368c1c633a2e50f009153845b688fd8c7f42e6d94a429c6607"; + sha512 = "bc686871cb2105172700cd94c2c7804a1737e2ea7dbc951ace99e202785b28e952600a3ec73b3319562ce3975c3c9ce24535a6501107ca87fd4cd7347d681eb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/km/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/km/firefox-62.0b19.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "fa9bc4df90efe92d0b803ae0d88cbab6008d8312bc3d3bdb79913eca7fd6864c9141520772f0ca17f85d7763186630410238dd1a3fe8f62915d0beebd8d3027b"; + sha512 = "59b63ffea55056ab7b6b4aee8b394c3ffcd00ab9bbbc46167378da2de8abe81c4890d6ceb8f7317c9a4bbd7c81a644e21cfa3f0641acc0895a8e04c027e1f1cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/kn/firefox-62.0b19.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "10fedd6b5e5f2fc7a3160c7ae8e7d48e336534a2a9c5133621166ffe9bb8ea81cb08dd44df8e92a2db9638df0b6aa7861dafafa436b63c9b509cfcf4e4c26ed1"; + sha512 = "97430540beb955cd74b0e47c1c0279f0cbda9543e8b20f1864adb569147fa2bdf52f8b09bad64d7d3f441915197c75817cf54ffee8f8efbc75cd7a19a0189628"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ko/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ko/firefox-62.0b19.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "88a76d6c3dff55eef87b380594ee64367e60b3a42ca8b8a7d76f7d4dce8d7b1e51bf7a06dfd6d2f43e804ac5840f1748a275210abef98dab5f6ba3819a674b10"; + sha512 = "5f50c47d091e096e0f493710726c6b38c5a0abbb819c90487127a58362de97014704feae87bdae27772a2cfc8dd2ca67b91421fb420b23ed89fedbe0d96d8243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lij/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/lij/firefox-62.0b19.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9e4bf43b24577d60113455d52eb6363a3372d5fdcc22e63dc173dd1455a6385391f5a676a499f22809b883d18b78c1abe186d328fb2357a464e891d7d27434db"; + sha512 = "eebfda03bb276f2b0b35081f45c9d5a8de533ad38f76767225af6aabb4b5324ddf8713e82e5085bbd1a70ad39099cddfb6e33d06e26d0357cd73154e0bc557ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lt/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/lt/firefox-62.0b19.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "9a56ccd577e112b072a42a65e99a35a5404d7127b438b6522e9787f5b75dcdd20e4d42f8f370d218e48554514059bc3d625f1b13395cc1b3e79fd7069c276057"; + sha512 = "e16d392173019779498a44831d8aa9cd0170953592e225233104f5296f6189892692ede6b72511ec256a6254f4a6fd6e5b2f609f16fe64e6ac812ac4e37f4906"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lv/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/lv/firefox-62.0b19.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "67d2ad4f29ca504ad1b515af5de47eefa48678d70b67b7853273bd98944a4a6398822c2cc0e2135e0fc1a8c45152c939a4bbb06dea36d6917a854431bae62f75"; + sha512 = "08554205118cc0aab0c353fb332b9c9e3708be8839ad89fd643af34a036904b43d5dedf9739e560f7497d0db133f09301562d15fbb49b59cd86ad6b9795658ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mai/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/mai/firefox-62.0b19.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "d969b4adfc93dc808c41ebeeb0b44668d09fc4ae47b6f324a3bac7c4c304ba914785fa1bfe38bcd0467935665e7853e1fc38621b70c2e6dbb3004c9e67c78ec4"; + sha512 = "e0bbeb51d8f2d5ba1ee8385ba8445c1a3608f635b916fb8619151a9fbb12b0132a805a2de39c4eebd4ad217c150ef4382e049f4af903ca2c5ea05cb45112059a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/mk/firefox-62.0b19.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "289a00ebb4070dfd94230b6bbc1fa3db40b96f9f10d2062d81fcd8b34b6f950ef87a68a50270220052246adefa046b00e38f63b79200143fbb0c8be7f65872b5"; + sha512 = "e12cd61155b9bffa83b30c3d26606b4b9731a51ef24a50388bc8893595a31f7fee1f8cb0d3d4b5d41568825413e8a8a72fae474936e053776b3820a1b7ba24e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ml/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ml/firefox-62.0b19.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "6c85958a7f09075f3c271b62c20a6d02bf18ec36da494f884b3a18b7ec5fc0df91c5ec5a3b14d1ca7501f6a804acd8b56888c331b55c565511a41caba8a8bd8c"; + sha512 = "019a00e838f66e2d2171be66c48bba8e3fedbc6b1f0ab71d5fee7657213b1042cc3160619e997334275aa77625a7cb47a8d10448401ef5023752f6d4904d06eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/mr/firefox-62.0b19.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "8b63d0b332ea5c7328df9dee470010ebc9dd17ae342ef43961e5f87f685646a7cec18a114a028bf0bba0df15e5eb2a04794ee28aacaacf50f75294a9268e9b77"; + sha512 = "f68f2c27e8140742a7630b1b45634877e54cb44f72f7b6e3db596583b89669b98cf9196ca7b9e50b37f6e44b5ac59112b568020a700f7bed3b98684e47c913b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ms/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ms/firefox-62.0b19.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8639a93a8fa49c7ab3d0ee9c9e966bd7a5b6e99d93ee4c675e307c9720f09a485add3f81e936ee4aa1928fadc427e157e86d9497d67d3a06e15a9b7012087073"; + sha512 = "d03a130089b7e07e6e793b9da023a3917b6766d8b6a60176c9dc78752fd0c7d6dc655bfca770a624d4554ab472a321f124239dc160b40c7f6909fb78b580275c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/my/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/my/firefox-62.0b19.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "3220272d6a6c8d853d5caa4e18351cb9565f0fe806cd67f7206251f0d3d0118b0a8e5469d8b170aad07d0f6ccb805068a5dae79f6c9f18958b68839470adcff2"; + sha512 = "6fa7d8c3f771b84607b84c6cca74264d1bd7ffdf504fc8e1d58806f964d604de3782244281f18d6ec7a1a90555b195319dd42a9782273d3dde633dd405298a9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nb-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/nb-NO/firefox-62.0b19.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c6c166d486eef5540e4b6f0ceed6a1ff638f4aa5e87efa680e03b0108b23679e91dac02eb06ee933981411770967a1dcdbb35afadb1269f8b46faabad92faf9e"; + sha512 = "c7b21db1bfe32285bdd51af80b48b6b96da5066f65c0417470f091a26916512b0312b7d7924f84f29b06184de974cf485a10565f9556f872f7abea02b59e35d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ne-NP/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ne-NP/firefox-62.0b19.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b59dd15e2f89ebe15a361c3a175ee763773d9ef7d85f58aabf775bd16f016f857ab01c094e271e5b8e56ce77114de57e31cc617b1c58a38a521b9c8a21ca000a"; + sha512 = "b1a3a6c26ae756c422d3f09eebd243a228c03690e5eb2316dec4c90b9e08d444ceed95bb39e794a0aa9ec038f2d6c5fefa5b11a4e1f3c12ad558624c4074f68c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/nl/firefox-62.0b19.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "d363573109c810116b4f9efd2b3f87b456ff3d825808be21754ea34659b5ed8ea5fe87018149178e7f91433b2a7b8c61f7c4a59264fdccaae5acec2344597f1f"; + sha512 = "3fb56ee294992191b4fd1a09e2bc4e8905708f7402f25a8fcc6321b2d3771ec3e46344610e51faa7ebfcc127d3ae92937fb01184b596f46bdc1b9d32be190f85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nn-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/nn-NO/firefox-62.0b19.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "457a86dbd230cb5f87955ac01af4fa58c2b4b625d67bb8657dc3fe01ac625935469b3d72f6065fdbb18a18af1db9b402b4d2540457e8c54bf2816a0a7b667db9"; + sha512 = "4ea0e6a353deec6cdc17331d8f4a7291fe189bb6e1623c1e11e59d0e4590b7cc6d29e289249acaa43b5e7fd2613de2441b69bf94a957400623ecc4b876cbefb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/oc/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/oc/firefox-62.0b19.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "662e3e3fcf70c90d95fed5864a5807ca1ff64058d3d0ea31542a66985f19c9783ecbe0b4becd018ce2760318477a01ce1c6c5a1ef0077293f3fbdb5244b2db45"; + sha512 = "6b3803eb5fc2c73093457fe2626baae476cb5af514d4f3ae7fd640ff70e5c1deb7c25a54994afe0bd07041d39f397875ef772927035c907c171e3d70f0c20d33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/or/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/or/firefox-62.0b19.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "81d954f0b5e1b8fa820cb9b860a7a09ea5ef4702febbee123c0cedea11360b84fd06d3f9ca79c008e734fa5a7021c6c276b31a864e30a3b91f8a239854feefb6"; + sha512 = "720e95e295d1c9238308bdb75f06470ec82538a0396eb8be3949ea6421502b17837501266c729655ddc884f56688423890db504f809c207501c60ec31a3fa7cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pa-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/pa-IN/firefox-62.0b19.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "8bc73c2fa797acb388950921eecae58d4f499f78d6f51afd62218f974e6763b2ee3ee366fcd5acfbce759bafcc03798726d38ad0dbc9c33c2026d6bb6c0fcd4a"; + sha512 = "7caf36cf6ffc5106762607b4d8f37e911af9d1f98de6e32adaf84888696c4836a3f812c0c74dd89f1a1badbc0a74e1d723a82c9459ac5e360626f01a0b65b0c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/pl/firefox-62.0b19.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "30391e5e9c34347997ba8824a77c60a3ca6fcef1039275c8147eabe8ca7f79849ce4320deb7b2e8610e83942b968e90b484483c9ceb2b9d0dba012aab26668a5"; + sha512 = "81d5e92eb1f04df384a79a31bbbcd3fdd3f950547d3560bfabd2f98646de7626a94d9edd6a7286cb339cb08e88f4f03826695153c9b97f8778080a4d12148d07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pt-BR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/pt-BR/firefox-62.0b19.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "69d450c2370320e6ed9541185fdb53ac8ebfbfd3a2806525950c5e97d1cdc4c1c587b5bda9f290673e83529aa0cacc5f282650b7d38a43cdc9d179239e39ed93"; + sha512 = "b368920ef21571a92b72c6d79cd5d8feb263eef62d73d18ea57d40ed654d03c4d3a45e8e9b966f4962be840b97016813f503873653620ff829c21e312ed9f2a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pt-PT/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/pt-PT/firefox-62.0b19.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "e731b618af837016e58034014ca6c183215b3ad3aed2cdf21b41b14d4a807f690ef7f642c73906ac72a76cef0f89484261b46b25f6761d6367bc39a4f0ff4d9a"; + sha512 = "5ea7f257217d1c5566013c867e6f405dd9d2f407ed1e770d228108df9e21b1895865dd8a92e39d1dec402369e13373d812bc0a37af85014c55a2742e2e6402a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/rm/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/rm/firefox-62.0b19.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "95e5d85c77e752ca569ea48b79c0e1dd99e77532a8176ba61e3737a770a717863485230bc50ee3e2c09a6c441c6d98b7e8ecd432ce281247202631e16c7397dd"; + sha512 = "188cc208d61eabb29e5251c3c4f4684887efe9a3ac87a76f3107cf2059fe9b0e9525dfe4526793741bffc3f9a584fdc1953310d53acaeb3e2529d0e462cd7393"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ro/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ro/firefox-62.0b19.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "a61cadb8a75051f93c4f644f6c5a0a03fdf7f8ec376a712a9999755bceb343140ea670df6df643e77900b2b8e164e9a4214a12bf15f5e805d0f30bb03f68c30c"; + sha512 = "c8213f5c7afd67bc29d549767dbce002becc99e24e4ce0752efd1134e5a217d819a72d00c5b2ff83726e2a31defce2ef9218cc7e4d8e0d7472e898670cc4bb64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ru/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ru/firefox-62.0b19.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "47a4a306eac7388e71a1ce7ebc4714e0934d676315d97f0ba94675fe746eedbf0e3daee7b5605a9fd7109eb6aa8ac3fa4331f5064043ac1b9e859a26989270ed"; + sha512 = "071ae0f78c8b8ee711183fbfbaa1d30e085006533d5ed29ed5fdbfd3ff3ec828d5203da0e1b0ee5246ab1ae7810e7ceb68d1431ede48c885e8cbba8fbd4e9b46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/si/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/si/firefox-62.0b19.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "36c021da18c2d95d24144b18ba878e6b068abc465c056a913d1693bf2973be628a68f7f4bbd3e8cd822c97e674d61b3ce8251e1e98c1f7e97b98ea93cd89450e"; + sha512 = "1ff0dee05b433548db1b894fc8aa83864139dbe82576cbdd97340500270465a29c35c76fa5e757e1b9ddb4cb79bed51db31897970d3206f945d43a6053a7e761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/sk/firefox-62.0b19.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c2dfecdd93932eac75af5dcee4e75b7ff0dc5d09cb391f113205b05b4e0bb345606f1e1be1a1dacb46eca9f39d5fd0987d2d4d53ad5f71e771f9ba3703dc2f45"; + sha512 = "37e18481fe4963ebb4beaa8d5c7826440df005661e59e4f7ef54ce93d50021e6c76d31a3d7e7d7e28c7802fda00d36b4db3913f925413ac5e3515eacefa330b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/sl/firefox-62.0b19.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3247716a11ee8b140219a8825298eba191a7c07bbb18decf8284d7a14a7583e80766d2580133d506a3235fec4494e3322635654ed4d1e624990e0a45649d780b"; + sha512 = "cdc077256eadff717b81b554a58795b8f86fdec1401003d8d18f33dfdbe7f9f8b7feab2e1c2c6ce0864ffa53f0090639201d1982cb14b278b7133552a5664ca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/son/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/son/firefox-62.0b19.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "d2354d10182ab21d951dde2c2d714f30f855a199a198be64ec81d00f6089cd32000efe0ae074f24d46daf7c99eac7ba88538838eb3df30ca4a59968cacac43d1"; + sha512 = "ed35fdf2e0a90a8fb8db4f6809f0460d8d7be384d0c67523ccce6d666f7c2bf94a44890a96922906a0c3743fa35e78ae04d811d8d50c559fff44ba7ea03bb5bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sq/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/sq/firefox-62.0b19.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "667a8eefa2188422848a8f6af0ed424adb6b8e815c11e3660cea18ea1568d4097342f0d094d8e39e3ab264b87ae451b7873f1a53ae129582b6ed00a45eaad417"; + sha512 = "265b3a88e73f4fdabc2bb1dd3c43d4430194a6238f3cc8e9da4726a916794b20a03f0af1d350a3c74e1befd33a28f2b93eb2bc2c4dc8ccaf5759b7ed77012ba0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/sr/firefox-62.0b19.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "aaa74d3a4bb948e63e5c0f7ce049822a9add2c30bc69d6c9d96b54fd35212b999affb0c76b6ce52c5142cda992bf7a2a8b33e47e81540a481ef91896c1b86ded"; + sha512 = "a2da5dd3bcec2df69585ea4d74a6149e1fc95a6d121f9fc4d32af8864c01aee120b2ed4b60babdcc97839a72703334e5f053b4eca1471f5cf068d7cc9c7e3f42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sv-SE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/sv-SE/firefox-62.0b19.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "f20617ddad0974675faf5872ed5959d9d903d80926a39a8065739a997164e3eecc51c3c5eebb4564916993e1915b88544dc4a2c3fda9c73cba956d65fa8431d3"; + sha512 = "33c9ce9ff4639c4fa6a13c14122b0c6fb028d7a63c217f63a8455a775b099318df8d938cd3a3f6f3b769f63a8c10163f98d9743706bb147ce0edc5d51f266e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ta/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ta/firefox-62.0b19.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "07758ae74963a24c2315e72333a98abc212e1e6d0cb58a8fb7385c224dfdeb76f6af06159a74a0dd3669ac75de5396952dc87220cf0840c2570937331fc031c7"; + sha512 = "bcd817de0f734d5d493bee08e754b6caf9868a828627e18eed7ba933be54a339d9c819a107182f578c6449f6161805f98d50d14b4b6341a0868c3a7eb817bd17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/te/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/te/firefox-62.0b19.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "152dfd4cd0ea7b39bf1eb79ee61ffb77289274049e9b760a5e05001265d3a2029b13db764fbabef6c8b6736f592f55b047cf01330e7e1cd3f058689942095ec0"; + sha512 = "b3018073b1432b3b4ace7ea0214a8a354104bd5567597743a9317d91ca77defb3b25ddaa46b7fcad81291b53165e3bb47a6e95cfbbf6bb9171da5e4bb0a9efd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/th/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/th/firefox-62.0b19.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "88ee9a99415036a4a1623575d574bc3fbe23c69acceed6fb174a73ffb9e728aeb85cc80f9ddd3b1a8da302e1fdcef5c1d5501a21e816eed5b19e76bc3b868fce"; + sha512 = "2f8fd5f93e3e19495182d7490cdbed7999603205b6f0312ef387c27d735e1374dec9e3c947f30ce5a21a5223284f31b4ce7f2b69432456a7d029f4de59367b25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/tr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/tr/firefox-62.0b19.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "361201558aab5800fdc3686522fa02222e41271357cddc21c8d89e1ac78b21222cf06ac41189c2eb870fd89e6066f6324b6450a274a25fab273a6d6964d96aac"; + sha512 = "b3962d7eba1a25c150ab87d5278c4b7941e420c12e0ab252f0ea811d37575e16d6964bcc958d50a1b1b99f82cdf1c32bae015499e686bf8f04bac6b0323dabfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/uk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/uk/firefox-62.0b19.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "1314249f6c869c75888dfdc24a7decb66923760ed10b1db63a245a0843864a928b66b3a831e2e5d137a09f63dc099f8f19c16da5a6e622a50a3907155ed2550c"; + sha512 = "8eceb4fe4244e38ae3ffe4a42d5fd12c3d6c3ee654584013d1c903958a05d228f07d3fb83c601de4b9a701c6e9bfef2ae9cdccf7df753128afa9804840311461"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ur/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ur/firefox-62.0b19.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "9f7d9c144bec3644d469672840f8854210832a5a47fd8d6454f35257f52de21b760a9e1f70c5ff4042c145c14fa10bce23a080b577060b868f779d85b01b8c0d"; + sha512 = "5aba832961f49f96c5e3aa189d13f1cd4b5abb6aa0d253be110f0bab59ea1bd819a2e72528608f35f03f28437ba9423a12780b1da5af1aaaf7a752d04014a4da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/uz/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/uz/firefox-62.0b19.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "be28cb4dba902e706f10ca3db8eddcd18a95ae6ad742686591997cfa7909de2c2d37f4b3a9154708a8ef1cca062b6f5275fe566fe1a33f2e6d56e4ad1b62a56f"; + sha512 = "cd26c9e56f37be7c93f754aaf40ba3f29471a0017b52c422001d556710a011d84c67af411dafff61a26ba8b1388ba4811bd8954064df4331d55a1d7f775cb4ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/vi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/vi/firefox-62.0b19.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "b576d962621a5c8ff5ce61d67b7a3d08f22cf7cc1a48edaee1fafbadaac4d2633d89385d3d9f57d00a12ad38eda41c6c1428ebf2b9884dc9cb9437c1a84456d9"; + sha512 = "4104e9b2ab3f4132834c9ca816ea9e2b4c7d08fa90efec940a1701358674919c700f6bc6862006b6b4d830bc086db0a4b1aef738801854c505f59ec9a10de38b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/xh/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/xh/firefox-62.0b19.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "eb8dd68eb51c7f19f52f23819e934891b06565376b13accd0da0074619cd35ae74ec2f1476a7319f4746a136fb734bd94e8c8faa8db40eaa03ec001db79f7373"; + sha512 = "7fe85c144626b904a0daebb6db79c2c2c66d11fec892de941584c6a93f8112673a6c448f4e77c215451332e31e78a9bedb4e83eaead4f34b7b2ab247662fd77c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/zh-CN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/zh-CN/firefox-62.0b19.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "3982dfaa8067642470e47ac27ab47cd8a2e21b76e972786c333ff7035879ad186e4b8bb95acf70dd7a77d5a65059c0e9f00c47da0a81b0c720f16dfa900d1062"; + sha512 = "b669904183e607e4eef3cbaa96749924771d8e67ee142b5ce0d855c11a0e24921711ee42382993ae2b8dfc2978b7bdc84a4cb934122286e93b94f762cd888924"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/zh-TW/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/zh-TW/firefox-62.0b19.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "ee934bff4c51fe60838457054449d4ca438d4ef163535e583c8692e8e3f3dbfe1d7affe0ecb89e544c22bd7afc775966bd0438094d538451a919ce3da48b7e96"; + sha512 = "111194874160ec7bf004dba3a74acd726aa3b0d464a1ecb2b031f1424a56d887c718739633e830a45f9f4c11be693ecbcb3b9fac716c1d78a09d83af32e09048"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ach/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ach/firefox-62.0b19.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "7036e33fde1fb0b9bf5b39874604fbac9c17d4cd635b2ce473088def9007256d0096cdadc3182a9707ae547777af5638186962170e5e11cfa484df194923c9a0"; + sha512 = "42080230edb95635ee3261ea3776957dd5dc5ab9ad80146e4c5fe5f288aa1a7910747738900a067960bf10b1cb37f2150c4048540364bb3933d1f95478ffcf82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/af/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/af/firefox-62.0b19.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "1ff3092cafcd0a6d0774d6f8cba93c47db3a0ee7001af8c3f06286059cd5ab34ff8715440a7b8a57eda6bbdbab8ed2230c02117e250ae6cc28297d97680ce61b"; + sha512 = "ef31f65054f4e970217e2e6c7d507a74e94a44ebba7c11b43fb86ed0ef6b85589a7d4e5acbb186445c0bc1dff05d67b598de0edd06e0b80d263bdcd200992e9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/an/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/an/firefox-62.0b19.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "1b1a33f4c826d6e9238db6a7e24e028a2ce06092bc7efad9ce708a06ef8f4e33fb2520e35c899dc703ae81ab12fe9e89813d3603bffb1ee3acd52bf44fbfc526"; + sha512 = "c4302fa1bc3b635a960d095eeff62055b1148b433cc9839b54daab9162e87a5f59ca47b091ef40ca6eeb78102e8e9df2e90b2157a05ae5819044640648b4421e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ar/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ar/firefox-62.0b19.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "ff57419c24d73a6c4dedcfd02be88bbca1c78f3f43fb0d1a8ab8eb464eb38a15889d126fa553301ee3a66d50d77f2b8ef88e1809ff7cfce8dd4132c00ef1128c"; + sha512 = "fb98616ad769dbf08403007712b0230379159b0f2c23e6419597c5329aa856f04060f75fdf465ba4a9874d19c41305eb88acbc7381269c95bca33391754d4195"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/as/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/as/firefox-62.0b19.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "1c5b21bd57a3d064eafade32ff89070a46f6c13797f504e0aca3990f298062a5ebe074e1bb821253e81a06d9492d902cbd5b9e0ed981aa66bc18d85bbf82d30e"; + sha512 = "628d9a2bed4f46e80e6347862730314a5e4e776d8a40835675435a5645f416b8efb05841a291d49392a75f93a27122448db5bb87e1e5f02ad7cef0ebbcb7f2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ast/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ast/firefox-62.0b19.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "5869edce6bbb1984e15c84cde58c77c88732c7b04aa2ce52195857b2a549c04d4ef9af1a90c80845d2beff8f6a6ec1331ec789d7ffd6f7848d2e9a67e76fc43c"; + sha512 = "c8d108583d9e5308d5ad351c2cb5db989d19a7386a2fc9c0ae334ca42c1254c1cd0770271c2eadb1dfbf8f2fa214e3d9a62ff48e1f02acbc10ce9b37120cc91b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/az/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/az/firefox-62.0b19.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "6b035d2d0ec5b9d2bdba120cc76823970edbe2193a95a5b55d869418213e03d6dca58dbf555400592ab3626c06700f5910869b1a459ecc0bfc69c8f49bdfdd81"; + sha512 = "e2a5dea9e009fa90f5ff50ef32db243837df739a4adf4e91dbcff516011372d80c045e3c399f44cb155212d7221f1ae2c9dd8ce3633c62aa6b4756e6e2bcb32f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/be/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/be/firefox-62.0b19.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "02e0903e940890924f6f5622fceff812c73576c3c7efb965c9ae32dbca50f7b9ec44dce69d127ab9a6ac5b0a4d3bad8fb7b5b5f7a4f7840859b221f5132243f8"; + sha512 = "1c3f4a486b72382c23d3c515b2b0fc4cc61ae9567122d1346c4aa519cde4ddde7e0fe14f501f854b54731e78ed25de4860fef494932216c912a9e5ecfb9d45c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bg/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/bg/firefox-62.0b19.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "2acbe46e29bd576c287add7bbec292a2c306f40402d525611c9572b7751f2122753acaecc441b1f121d24dea922e493a8e0c86180c6eea98beced8c0df986ccf"; + sha512 = "4f06b5db528b458fa7ec45220fec6304b52b2fd585f036c5f61a96bcc97d2d4974227c492c453e944a2e359dab438235122e2a9abfe6246d58fed2c253549807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bn-BD/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/bn-BD/firefox-62.0b19.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "baf4938003380adf8136aa00c0f8d0bb08d84714b12bcef2f3403f73d1540e9a289c65991b39be53ca6a329d72f5ea93960e3801ddadcf0f3aabecd64f4a1495"; + sha512 = "afe70d03b7df384916aaa9e43f8d7776b04ed3e9af0ae5910ae476d10e340ed5a12c705048a17c428d6ee9b03bbd76e4f4aa6f8f0ee860742df50ef9f6668e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bn-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/bn-IN/firefox-62.0b19.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "e9ef2861c948286acca6fe8600eddc9adf95af26f9b12349f60896b4aea62c838be784ae44da5a175b2458ce4b1b29894ce45c4b927bc777844aa76d745473bb"; + sha512 = "f22dd9777c64b8eea423bc3d2f44366493612f48b973f37d063259e2c06772fd3e8dfb72f78d96adcacf4865c86ba1b4a2600869517e62d20995c1ad19657819"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/br/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/br/firefox-62.0b19.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "0f90520613ac75a78720786a6b1bed17a3765081ef5c7f398286270c92b92940b98b566b40233192f968375c61e285257776ccbee22280a9c807eb7f7e198d19"; + sha512 = "8e917aad4e19c063f43e68d184bb55cf87cd076dc09a0df5339a8d917369e436474f773c5340684a8968a605beae3232efaf8a8bd7b9d22b19997f7c4e437395"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/bs/firefox-62.0b19.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "de03884b41c072bea3950d8d920fb6eeec6bdefba4f28295639567050d4ca89efa29f9ab169ee6c7dc2cee2b8127a83853124c25e282bfe7ede5bab9cacdea1d"; + sha512 = "e3c7de9f737959d8810f4dbd20739a253a020cc31e4cf8129652e6b7e592f3d20e0484d189e8422e8fcda934773391b2d4ed07d2aa9e041e0a93eaaef6c31b92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ca/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ca/firefox-62.0b19.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "157d6179152e33d85eced2dbda53294d94ef1b217f469bc63483de254d66cddae0d4a378c3d13bffc6f7ca07e669fa2755b82cfc66e5ac09bdcc2f075c3713fd"; + sha512 = "7d0756d779432b6e697d974fadf7a8dcfabcaae00381d032d815c05a04aae6d5bafecdb007772ee35eae9365664f11bc92aa67148e6c6e10e4c21c4f4a7e22a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cak/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/cak/firefox-62.0b19.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "37bb3290f6a5f54ecf505faac44651f8c0566ef2a5e47f0aee4084931afd1226651eb35b66bb9cb2a8e41afd06b2163433fc3435a415fbfda7e81e0f7f3a779f"; + sha512 = "63bc5677a50241ca97c81b4e899e71d7ac2f6045653d53fb245c676976dfa4b76898e362b10dd9a4ef1e688ac1c938cf822b1d8ae2df6849b607497f9001563f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/cs/firefox-62.0b19.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e5098770cc159925e4d89bf27d5d72dcedbac6fbee42ffcdf26694f9d3a0710e5be4dc198241a3236fe06109e4b6e4d86b1dfa3d669effe42adb574141e16fdf"; + sha512 = "2cb381c40cae5f09879f10a8482bc9c5cd9af07e2fe965638aed7bb4ba2ebbefc2fab97aee4504020647fb60f9468fb1a955bffce2baa0b9579970fca6c30d51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cy/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/cy/firefox-62.0b19.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "ddfbe195d60b949637f33c627aa9a4c9e2ad1f04788ee5f35040e251aac303f8876bba7d350aeebef11ae5bada037e31f96b8f46771ade8fa425b70d2a4a759b"; + sha512 = "091e659f18372351346a20eadd9368f63cbca0fc7ae3b235e924ebb9f3ff7616e8c3b2d89595101174c37ea0a4c1b6ea5279b300126981274524cd19695270f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/da/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/da/firefox-62.0b19.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "40df7ffa3472e2bcdd35a2549e6ba52a7846417c92eb058a84e32dd355e7c6724b6b75fe617956b970ee0c3565450f9a84458d86eb282b1f1de8b789c6eca2fd"; + sha512 = "344bf81550e658e8ece8b915edc699ef9c59567f1bd202993c1a038c4e37c34b1029d399f1fe34d0bfdc333c464547f32c8fdfd90187c6c3f0e2ad25d3227446"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/de/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/de/firefox-62.0b19.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "3702da040d3478a4562a30f8758eaf5e574ff664c1b2a4a7b676a436e4172b294fdcc120b1cc043c3d060315c10c40a2f0f9506eed6cbb9dbfc80279d65f76cd"; + sha512 = "8d1e587498a304639ff876d764da49bae0d58746ccbc60964a708d6987381a4b6150ffb8526f6bc053b7a4fe5495cf0a898628bf6f45ed62f6360458a3ed462f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/dsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/dsb/firefox-62.0b19.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "54a5c5d242579314997c41b0e26fb7751f19c97ea9b43c8ba1f3a7dcb5b6681123aef82159c4be9600564062b20667dfd1197be0d44e6b9ac3064d682c7eb2c3"; + sha512 = "bea2f50bb8d6e2483710bea0746bb746c5c38fd43a48f33509a0ee1c823691d7aeb67f6f594dd3ba0ad3fc684fcc21a3ee375f6a9bdd7ee9d20e08d6f4ab5e17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/el/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/el/firefox-62.0b19.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "cd76f6f7d54818e8ade65147921a0160948500d7bc9cebfaefd1c8a2dada91a2c5bf277222fbef1421ea9748ff799cc2213e300dd1c767c56b4b0ef977dac556"; + sha512 = "bb9419efdcf6b7d7cf7a05c352ef386404dc1c1b096f9485d8b7f2ec9d2e893ef4250f01939423e4f69c2fb4a3b95abdeaa2072e2e73467cd6fb7f499bca5a85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-CA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/en-CA/firefox-62.0b19.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "046c5fabaac28242019b208ed66a71d1824f6e055042576cfb8ef026906dcd7b25ad75aa962ec609884967288bb58b78e915865d858b8620123c0168637c3364"; + sha512 = "77f186155dcfe94ae672e48f5fa56e2fd96eab65af5ef745b68282aa03a399c038cd8f9f6d26f672e85a007c13c29258a10456203bc46a117188dc04e965be29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-GB/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/en-GB/firefox-62.0b19.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "852c4763231c2fa64330b417a1eb710e8fb04fc11821e2881697e8c3a42d375478a37156efb0e23839f147074b8116e29ecd6dff04e77a4a9b9fad57d73fe5c9"; + sha512 = "7d6520ad23eaf42148d5fe297f4d59d88e33151cbc1395aa212b2486712e07b90c6662d530221537375421daac1392637b97a81726277687443fae41b07395cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-US/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/en-US/firefox-62.0b19.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "68dd635f30b450c6501617fabdfd0104ac9ecd89a9c400acb1ea7481782c4fd4da601531cb13d0ca3a79be34adbb62d35b70ea9d275339319da39915e51be6e2"; + sha512 = "bb8d7fb03a95d1eee6f7f1861014b727995ce4594095e0cfca224902645c2ac1acc853fb2844584745cb6aba60d7e9cc99073c8c365b0787059cd385c18b6b69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-ZA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/en-ZA/firefox-62.0b19.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "1e287c91c6451284a62c27d91916aaa2adae0d66bd7b2fa77003b8a5ff5030fd7219a42b9cfe6b1d100303a7758f591e88489f09ce9c4c6240b8f3dab7ce3044"; + sha512 = "4696a33cf8a1de84da0df195b3b79bef21046fb3bcfab7a2fa6e6d30e047e6217f0375c4b4540f32815ac02feef89f5ecf4df87e0324b9fcd79817c8a4762325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/eo/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/eo/firefox-62.0b19.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "71466b5a790cb8eded34971266c2d8d21204b4caeee5b6497d0bbaba176417f1b89a2644902942b47e10a4656bc522339db2a0852470cfeba5e9d6daca731dc6"; + sha512 = "3a37a36daef69c66927bfd572ff64943ed5c6eb0e76cedc730d408bafae22d118c60dc1132238f369363d7c3ca259f8421615f5596df1fc11a5fe08c447f04ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-AR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/es-AR/firefox-62.0b19.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "90c6a17bedee44faca5e01f6982a67afd65bc05ca604c056c427ec4c52b7d96e19de8d98751e73dca840e33902080b36bbadcbba7cd1e89c8147f89d324d3893"; + sha512 = "a5673b3d24446a486c1e301afb0138ce754aa56c28117cab53b21f70203f75880aa2e4e5f5e7dbe3d511f5f730a9c754556dcc657063fd762e8611439bc5e0d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-CL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/es-CL/firefox-62.0b19.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "da66ec9771e13333a5def77cfe3a744d05ba9153ee21f604005340aa2b880273bc1c38066107733d4e0abc0ed828afd1bc77f6ee2be5e790f15a6e369fdc8b89"; + sha512 = "a5e152cbee8a6c96e3c4926bcb62db406f1387b32a98987b2c7d94a56f044b0e453c956e4b6f5245221b2e4e7325fdc1521276112014d2022ebc574524cce597"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-ES/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/es-ES/firefox-62.0b19.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4daa9db65e3c4ef3479ba4e0ac8819e8df0b711d87e9457ed3a2025fc9a0ca7de06f2b5f7224364798eaf3b0d56ab81b44ba5e2245cc8f52dd465312818f4c6a"; + sha512 = "02b8006faee84aef78de4c10d7ed66d949094a20ab1d6ed22ff6d305a9052dc47779dd8421ac414fa945d13bce1f2764a549fd2804c4069ec980e9b20dfa9c9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-MX/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/es-MX/firefox-62.0b19.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "1da64fe7c723606ff7b2d3502b7d4cfc2f0866a78649bef876ed8e357612a2bb2eb37f85f0e909f5809937584259c5aa92db2976a5e358d70ed3a05f294f41ea"; + sha512 = "16060be7efb5aa24fab444f5a0bf2e108af054e867cd1414e85519361046058d3054a353add6f28091ba1755e3fcad063cfef287cf199f4c9b7f0b4b56304848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/et/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/et/firefox-62.0b19.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "fda5d73cb75dcde2f131eb0036f3275761709dbbf5839cbe282566d5370c4daf81966250b59bd3b5db6bd768d939062f35e88c3cd454cbc10f2b575878324f26"; + sha512 = "d594fc3d2096ffe94c4688a9d987f47cb439c8c177155658eab4544b89b33f7408b4fef9eb47bed9de3df97fffe840f3db7f030cbe144aeddea3f13bafa06dfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/eu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/eu/firefox-62.0b19.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "21f80e21f4f2fb496298883df334768c096f834c5dd82a71720e63a11d94d64515ae692f192bf540c13bf245497cf8c37776bd1c53fa57158e751865a0947dad"; + sha512 = "10cf4c333b1abffcc213236440c498a06bfab334526b38476ec0ce98417ff31f1d1cc7ffcce292faf00a86d60fe17a8d1a09db9df3dc3158455e070efcca7ea4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fa/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/fa/firefox-62.0b19.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "f254bf9b8715217a62fc9b604db47aaa2985864a7cbe925591cdf4233b81bd73acf5e7eb34daa7506400d5efc86c9eecb8ee9ba6dfaef4e43c03142ca595ab3a"; + sha512 = "1bda36454255375e2927596d9ba3f884728e3c47b51334f34e406ef28b15a799cb4bb86432c1e0d05fc4acb7cb8d812788a0b48cdc55d7513a7464daf2e3a6a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ff/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ff/firefox-62.0b19.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "0c0b97a0297e886feb7b18e3081e460fc3f237365ed04280a1587814631261dd1c8c35a0610659d43e70a36927413ef20e46067c13d0daa6e47b9c3f058bfef6"; + sha512 = "763e2f24bfe6800eb35b27baa22a2827264b37fda2ed7274f488fb92d086f5f52f4978d958fc74f38dfae5e4ca2a269cbcdc42c96f59916f95423d63d2eabc84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/fi/firefox-62.0b19.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "318e324647c847d6a12ef0bb74dcf2d75367b423a9c2d89222ae4a193f9f775ce85617e9cc72d3b960ed216a9f48fb67fd0f51dd36e2ab8330208866a852b04d"; + sha512 = "96908ebb5053927f9cc032c673821d8d8f24968b26cde657fb0cac264835c66ff16417bd4149dff58e5ce577c57207f1fcb113d9e8a6495cfa1f0608a8cf7783"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/fr/firefox-62.0b19.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "c9f7033354260a72a24f94f481f5cc67bf91fbcc9170a63eddc48307972de57b937d4fa31e1eab4db1ecb9dc1f05dc56b2e38c35a946445a1d77535a1d41b433"; + sha512 = "43db8b673b6526e9178f5d50c641c9da5e7881ed6d3d181bc1440d314018afb9821c8149daf893ca7108724acf2405968309d2b91407adab87ad3968167a4e18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fy-NL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/fy-NL/firefox-62.0b19.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "08a6c18f6b4beaef405e9e9292a197c42510ef50a3071fd3c20687a94ecb2bcd52076a234fbafc4b9be82c8111498d1fd35468bc604def726e3187e9119f496b"; + sha512 = "c79953daae0720d61be1a616ba72f70b38f772c45ff0ac8043c45dcc46bae939df0270534c394625eadf5834d9cbf5b80787cb3b6eeef227b8812eb6a303cee3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ga-IE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ga-IE/firefox-62.0b19.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "f23c2be81ad724862b4408560c8b28b28a9133290a1f2af37db4afbdeedb713cba0bfb23cb436c671ef1d4b42fb10c2398416e347d75afe3e77d215a9f0349d2"; + sha512 = "e7dbd35bcffcbfe39500fa583f1d3a80a51df1344c69086beee74aee9c1bc33c72c7667d550d0edfc190d96212511e95c17eb276aa29e28bbe9fff3cdd3cea90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gd/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/gd/firefox-62.0b19.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "46f1069551fb83ba5502438f27082d591f1ec4d24e689c825115553baa6d39eb026203de30bd6a50ff082a65b73514e7007f0419375a05bc2acebd38d323fd6d"; + sha512 = "4c11c6ccc84b3323f0c06e98ef16d0b7689b1032ab973ad9f9bc9ed7dfe8b295c0d1d9ea3ceeba5ef265ccfb84672b9f8603841563699639355508e222931bdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/gl/firefox-62.0b19.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "6864803363c3f61cbb8bf903da7275c90f8fcd0d8997a9828392e4fa2199d75e46d5690c55fa8980437a999af3322cc5927cd576d675602c049fa15b605ede1d"; + sha512 = "b9168e7a2331d1ea1655822b2e52353f21ade6a51cbec4a174ea7e4bdc4082dda00a582152068ce89c4c15f71dcdc6c63d6bf2b0b777e0a645d1e80ad0d3bcaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/gn/firefox-62.0b19.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "9932f1f2ca3b0646bd63aaae3bf118e91f39957581ec03fcd6ee4138abe00b9142acde3afef6ef31f802f9a5ce5e64755af912fb6e70d49f9baf4abf497fb82f"; + sha512 = "5894625324cc483e1d258b35d95ea3d3edaf3a8fe3ac934ebcacfbf2dff5c133e25c1d65b603e8738138d982417414abf8abe465d8b393bc49f0f635aa7e59d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gu-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/gu-IN/firefox-62.0b19.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "b0a216cc4194990b993ad31156325ea5296d16901a0b6cbb3e792142ddd7e38b728331b68d73d2878b24042d0015ba7a0550d3ddb1c5898119a9cc4a5e91bb7c"; + sha512 = "605b74d8f95b3b1857e8c6860364d7446eafc1fb02477e4a6dbb47c6e911f0dec289c51015566be9af8856a5ffa966adf306e5190cbcdbbeb48e6a5d36026c18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/he/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/he/firefox-62.0b19.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "123a4d8b8be454276ed6003051adbe2c87f0222d96c20902fce3820efb5149c4a1d8af13763974339936d5d1b25695ccab68f7d13d773899f19c2346735ebf2a"; + sha512 = "3adcbe0d6943922125a088dc4d92badbf674adcfde5a38346cf4a1eb45c415cb74612d070e68e7ff1ae35fc92774fdace05f7afd0d3fc49303ef4492dd1fee0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hi-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/hi-IN/firefox-62.0b19.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "030dd5862dd46ea72079f0dcccd4439bd766b98072d7e0d92d1260a1c2e2f2f2e48cd7a8ffe0be25449c5598a308a18093e273338eda2bb49502a3e8afe6f670"; + sha512 = "34abb67fb1fa3a5913c6a278401678a9d735f18ac1f5264f1d31e5f3cfdee617fb9dc5db864f9c089f481aad890a2fc2b7f133ea563134a246cb40a70771ae28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/hr/firefox-62.0b19.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "c7ce79360d517ce4012ffc0c472e04139e2e65a068a97e38677e327cbeca054f54973dbc1344e1cfd36155e17d5a3e9a13b118fae0a3251d1f6de36bf45359af"; + sha512 = "e7a9e8e11c4a9b07f3206421386e53b906f21dbcebef342a7b76fc5f5c800cd0fd188cd5dbc5f0e1956329b749209b4ff268b913c87d79558df2c00726008c85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/hsb/firefox-62.0b19.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "397902ace1c3e21d564e55dbf86a218408df70fcf185a4b30406abfaed6bf8e1184fb8077d9b606a350100ae471484bb4a48c433bd889cc38f9655e7475a2949"; + sha512 = "56f23d54131204ad093d256dcd2a81affaec5e8159ecb7d9454b01475bcee32ddaea1951b97c1cf34505fb0d5e1eb36a3316e1171821b0a663aa422fb759612b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/hu/firefox-62.0b19.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "982a9b5aeb1ef8762828d0cc974d8a7b77d457591f662a35f3d0f56c158aafe6b026bbb75b8f58746f4389afe08a90240238fac7994ddcf7ad1edc8567f3e547"; + sha512 = "28b96bd1a025d886bcbac761410454c9a489c801dd11049f0a71e8754d6e7a5adb90046e9ee913356989d07b2c8d60657586259af2f6d6f175babb9e28fb56f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hy-AM/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/hy-AM/firefox-62.0b19.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "32d842954afccfd9433621e9d9a7fc7c4ac3915b07b0e85e7caa10dad55e338768bef50077d129368059621d3af3354b5033077517089c1aa70c8d21043735bf"; + sha512 = "983a8fc5331a1f04ba31c9b6712d3c2678435fb6c219e47c370d5555988bbf5c07d8cb30c70c80ad47d429ce75894838fdca839750ffd71131b6fe4f88872182"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ia/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ia/firefox-62.0b19.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "d165c88b6288f10eb7b5f11402528a077b22cde681738d9371c4ecc5fa01c691593b7599cd605224631aaa3d93eb05d89923a939aa025a929fbc35bb9f09ae1b"; + sha512 = "03700bb8ff07f85fc2c305104fce031dc0206f3ce771eaabaefa9ddd4e3354ed821a597b4fe7973a333c8fe4e7e90a0189428a8cf2300030a4404e827d0e8953"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/id/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/id/firefox-62.0b19.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "1324b6c140db320d6ac43521091b9b77d52800e76f3f9741c83a7382bdad8522b8467c75d82c48b61d0018c40671e0bb23870b112a8957cf8256a72c009886c5"; + sha512 = "052266a6047be98b1c7cc5425643677768f9eb50724e6da5fc2810688432641c10b4dc64012313f47ddab8074f40a05e0fb0af204098369f969d342a67f10bb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/is/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/is/firefox-62.0b19.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "6b10cda6efae14942aadf96b3d1a2b7ae58790be601ea46e04225d356c5ad1109eb9ac7a6983dfa21d8c2e6710219f8d3a05605b2a80a498fc6bddbf2abbee09"; + sha512 = "fee6a7bc009b857766481d858990d1a454d325de9f70e4096c1f5b026db0e6f75a4c8a829e50499af909aa3a17731e995b2168a876bb197cfa219dae109c1bd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/it/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/it/firefox-62.0b19.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "f43b85b59581eec108f882f8bdf2886b658a00b46c9f651a28d9cfd09af02f4c49b70ca72dae5cedb26c5ba246e8b01dd483dba6de42da170f12a73a6f02e87d"; + sha512 = "3cb3a1868f2702cd709f7e8a998b9e81a196bc2d83cce0874b1c32d4f8a0e0552d63141b65f10044ad8899b7892648cf92c0d68a40bcd72af792848bb4fdfb69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ja/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ja/firefox-62.0b19.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "3f2e08852c9400ec7e7402b5d9dc97e0002ca4d3099e0b101697f8581e8ef318ecc77f286aff1d33d945cabac20e7af4296327a25bfdac44293362ec416d59e2"; + sha512 = "dd2112c69c33878acc315f12851e1b8db72d3a3edbd7aeb1ff5a5704b95f80a74098eaf54c4b902f4e46f91167a07526c89bbb27e0306599448d3c1e3602ecdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ka/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ka/firefox-62.0b19.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "a9d68aee2257e50220d739053c6ff18d8fc18b8ed56e49e5b3bc49694805575ca427c7f00f4267f52700d0880f1bbd39c9e9b18a6b0706454024e46f4de34de4"; + sha512 = "98468aff4d6eaaef0c3e88a97d577615b6d7f6cf240f3affee71b1aa153873def2f425e120876e942a0d4e6e81a8feeb26316552757890ddf47ed3425309f73d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kab/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/kab/firefox-62.0b19.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "01b17ffa5140f86e5d51bf8093e99fbd50cae29e7ffe6813b61c6788a0363b7edb2680cb922e9172c7f9e2f1a8fd934938a3883184f9a9cff99c597b65663919"; + sha512 = "713c9e9557086a6978882be7e966519bca6831748474d115208e5ce3fee9b1419beda7662a7e7b690c1ed65fc2bcd5063a95b27698d89fe3f81af7d1c8924424"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/kk/firefox-62.0b19.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8403cb0799b57a5dcb703f5aeb2c75acdf1e141785bcc91097eee8daacd51cda79c31755fc71c608794440146a8762ea53f20ab39a62870cdefbe5f59448b930"; + sha512 = "6143fa689d862e5be7f7cfba54d1dbfb39b9d0866203811962100bf4e3d4430b0a6fbde27c474c39e0c1c4b95b3b68128f71a3b17171e1ee99b1df2eb6786512"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/km/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/km/firefox-62.0b19.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "75fa171c93bcbffaefa44b5c8e66ea049e6234f4a97d51260cdd14a2beb9c9a62a1bf05453253afe6de5f7cee5677ad3ea96cf151d7632809f2e50fbf21d7fa8"; + sha512 = "18d64d90a0c7991124efa0d1003cd1e2081b2b0001fd96713221dca3a36ab06b222e4b62192952f15763180ac6b570e866af4fdd8993060e52eb5345f41297df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/kn/firefox-62.0b19.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "0a6ad18cbe339f925d6254a314ef0cdf3c3b007765eabb96c3decf3b17b359c7122bd4346c5e3b0539236defbb7f31cf23dc0b7971af2d008618bfc60d932047"; + sha512 = "946aa182fe0cb7c7a7337b75a922111deffcabefb02efc00c4e2131107f167983c4be80a16430dce07dfe8b9fc5ffa144cc12da52bcae7292e9af7b8536c714a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ko/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ko/firefox-62.0b19.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "2daee318ce7984a519abdbdd7cb86fe87689c21af736b25c6e942518a50ed8e83178d2a16a81c61d829cfd5c87a657f357b6d23d6301368ed4bf886f07f75b97"; + sha512 = "849d6004429b3ad8dd767c3ed872e1d17f741f0aa472821f25954d54847ed14075ba54afb7b2e58c40d7f82ba2c83b35d4d57d7ee364002a6b3065cf8ef75f79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lij/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/lij/firefox-62.0b19.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "aa64a352d7179b95f95a3a5dc39bedbcfa96a7c77686065b0ee5bde8eacbe684cad1231cbaa9755c4476a3a9a4187ef97fbeb6741f18afd2430ef43a6f9a8cc7"; + sha512 = "6dab88f19c36e6f253b6db7acdc049810d4687b90df59d40cd0eedbbd24fcd5639682b665542bbdd63583ca56977f053b87473a86bdd9bb4c0d2b14ad1c35d74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lt/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/lt/firefox-62.0b19.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "4505b712e03bae127f5168c221360543f29681aeeffa088ad66631dfb6c268c3ca24bad11c84439f690ed4a4d67138812ee74117644a803b1345d548638eaf89"; + sha512 = "b67e464e3556b1b9703dcaeefc66e0997e6f8758553f29307fbb56a074cd49717dd2badba8b3839a5504ec4d5f39cdb46f48d3916b20e656ffa03f9d0e72dd9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lv/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/lv/firefox-62.0b19.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "bfc47b18ad8ee9c65c8520c8b57214d3493c897d0d1bfbec32ad961aa740217247755610b029039c0282932b8c1de19e9b34d801ceb96b3d4969829944de1858"; + sha512 = "b63d60992c4879f734075ad2bc149c898ce44dfe8d05fe02c302000694e89e0b195d30901403c618afc8ed842df5f2bdec967d946340176b65a4d79f60205e8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mai/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/mai/firefox-62.0b19.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "1d96dcbf58668827b055be628160c90f4e2d1a3e8178cf953e89e30e9bb041ecd5c1d409be905f6bd6d1780dd278ae105d1a82ec7226196614faee83f333f7a3"; + sha512 = "cd5ecfe1ca8bfb49ba9f7b8686de18e0a9fe7a170dc59213b53748d937331bb4e718f70a45ce988c2b9a057c7d561bedf4e571cf7e45e782648ba7be7b1bb7d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/mk/firefox-62.0b19.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "71a561df96f60272e7dded20f30ec8632d8df0a675ffa0730b1e2c61e131d30f70f710958fa38d5bf647cb372b763975cabbf11b81f187b154af3416aab8d2c0"; + sha512 = "8a0cb09f5b360171fd1533a005837afde6418812511ec9d3a98f8f992b064b5b38c5016cc210ec48c570d777ea3de4476eb8017cc27fa1fe3162e2b226d7bc79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ml/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ml/firefox-62.0b19.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "563beafe7aacaeeac411aae9b2fe2706d9ecc497984322caa6ba4e44957c24f16e06e1db90605b4085c708f563a416eaee15d2b7daf9ac481c947957ec25b5fb"; + sha512 = "7034a93dbacf468c74e52c9d11117f88ceedb081d8d5fbaa75f7270db50ab2b0a27b423c7910c5d12e8c8e5458649048aec3775931edd2ccb40fe03305dfe097"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/mr/firefox-62.0b19.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "bc728d67aee3f0e831316dda5415efdcd5835d3c4f29a575cc0c2772703551b4752ace541d9535f9da56132f94fe8ce116ca19c5ae07b70958fdd934f74c151a"; + sha512 = "e075bbf14928fa722d0cbaf20dee7045380a2b1253c7c2f1691f8291da038ba82c4ec590151f0710515fd71d9d7beb606a2da357ca3cc140fcd51abb6660a382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ms/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ms/firefox-62.0b19.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b368091fb415d2397e95029728a5e97e07b78c2d2119b5e3d2b0d00fb0fbd3484b397e7efa1976adf61cb8de3cacd63f7984b0b9341979a9e3b2e1b61a4563c8"; + sha512 = "af676287595903e792b5289bde01885794d2a51b16cdeeaa479138af550f9f1e2c0a1531a509834935e3d26854b3e855d5e4d1670eff73599aa3fde43a5659dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/my/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/my/firefox-62.0b19.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "ad489157ff5ee3932162741e4c1746112c161cea1780e8c7764798b765aa1a821cf794f259d9ce5c3c852f575af6bf0112ce2ef90259b9432cb9c57a76508cfe"; + sha512 = "5513f7ff66988b4c4404ac7efc52c9ac4ffe916cd5a196d5fb2418e832de975b07737f21a55bec5d6f9196fde04a9311f1d06fbc31a018bd192d0a9bf71e70bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nb-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/nb-NO/firefox-62.0b19.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "ade119bcef7a54c05fb81ecaa30b4543225d78490f93611988d9df10992aedecae962d9d50cf6ecb09e9e83466423da8714c5dd9ec2d5588f0ca2d3fabe38fa5"; + sha512 = "4495a163636dc90e49cf6cd77e193b25d157bd0079b7521af4735f81efad9002adade8ae31b80af492ed6dac00174fcca3343bfa580113274f960ff152b51439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ne-NP/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ne-NP/firefox-62.0b19.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "a375b759aedbb9aeaee233b2bcc0d9c7958d2aa989ccc6cb7e6100de6c10b1957fd0a73ad24620db1c0380f455e06559bf6b991f6616591bb547ad247d15703c"; + sha512 = "761e123de862289aa25a95e8f527ea9f338d730ca50ac848c53abd4427a3bb6f49eaa0df16e4ff235bdd2680a9c0dda7bfce125f3470aaec0ea184ab1dda65da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/nl/firefox-62.0b19.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "06dc4e376936fa64ea081d047c224baf43dfe14eef8a6f27ef9ae0d475f5dda5bdf171432061e31bdf368da0eb2ab6b694d31df868a86c9ac0636ee701da9fcd"; + sha512 = "6a4405ac9cb88ce172b3c7525ca92aa8acd0bc30a2b41d6ac7f0cd27de26026ce203b256006d65b1793b165f3835c70f98b6716bbb5014a7f3b973ee602972db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nn-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/nn-NO/firefox-62.0b19.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "6bb9bf90a1e0e747568f97b82f3b35eb6f552025a6d2e052b359e667451e336583c6bdfc6a3746d24a3bc5ccacf72301cf079811046a4adbb221003a70e89da5"; + sha512 = "f35f40bf4e1ad3706ef6b8088c94a2e33a5cc407e1609bf5540c0c62a4d3d4e7c48e126be1c6e716f91207532ce516379b07acdfd8ecc247a7a54c0faa84d5bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/oc/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/oc/firefox-62.0b19.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "9991b32bdea0e392a955178f9b64dd243e74da3ec95c52a9dd5b42e399534893503840cecec8329cbf2478b58b08b94b15c53288a02a12b2a41e0af12bc0ff08"; + sha512 = "0321965a798a4e321913d75b633d9a9a8211a894a30bf35036ecc796dd0eaebe6395733dd009ade0fac730704aef5256e6836ff0415f44840de40c8af20628b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/or/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/or/firefox-62.0b19.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "e61e0d63ae95aefaa17ec5ba1b128bf0bdd3de1a81037ccd61d746021a32d7274530acfc332c1b25b08708f03e0d15fbacea1c9d9c196f19c77fee2305e255f9"; + sha512 = "2397be90b55b387ad5aa020b393dba5601127988b609929bfb1ec48d5097e4fa03f0757242bcf07a5a6ad21babe0162c8d7c20cdb59c55049a8608c042b9795a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pa-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/pa-IN/firefox-62.0b19.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "49149c7636028e69c61dd8129fa149037c5cd13aedf1e83f137ff5cbb4a368b0a222c225dacc213f31ccaee323f31831b5271cd8adc04ffcdadbe6d71943963c"; + sha512 = "ddd62ede6cbf7a20dc9dcfbb4a3821bcd662c1054a10a457c360ef560bf351bfecaaa2b0e71f703939d66a450bcaef2435d2222bd0aaf799b82db38b08028c16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/pl/firefox-62.0b19.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a1827c77ba0d48903f9e4ac2ffbaff2bd404db41335313f27dc1e024cb2b5d724f67456f01d01c0eb0406141259e351e1d19184ee6bf61660b8204d518c7fb4a"; + sha512 = "d6551c64a426f27f4c80508e3a358687fda88a886e7ff698c28eacd00022aedaffe809bda6985d1f52abdf2bf4fd10892366f4c31fcf0b95e78839fa09e05d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pt-BR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/pt-BR/firefox-62.0b19.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "c8dc8882a7f465a51813c09e46a07cf0ba42b4be3e40c7adfeda22238e8f492c74c224fc54965cc9a1145fe82a0eaab61ecd64503c1870f341825c3054cbf01c"; + sha512 = "dc45d6aace4130a3b44e02d16e1dac88db0774309a6b014c8029a432fedf0912bfce23ba5a143c3908a2c30ba2d65939a207c6e7fb70cb46f731e8fe4b9eb7d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pt-PT/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/pt-PT/firefox-62.0b19.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b0376a03c13d892b4484ea207eb31cc2e7db1333d7fec82654a96cca1ca2a724f74f552f1baea2aa9c2580055a9aa934d1a2ad3d4ca41b50ac554a9f65b7146a"; + sha512 = "c90188b1f84d031787fc11900e66540d1c1b41e65af9eabae2f9abe1c662b934fda18775b8811e0578da57388944fa123cf28a8c73d49948cd2841f791234818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/rm/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/rm/firefox-62.0b19.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "f356ecf9f19a8fb314340851f101375e7667d8c99792398ad5e5c17745db181c1a1e3513ac56597f2d75bd915a4c6a6c12f3ac71682aeaa13aaa952eaad9477c"; + sha512 = "30ee0faf69f1d376bba25e84248fdfeece44b0b3e2c56b755add262fd0794a59a2e2ab22c2bc9f2dc6d0f23aaad7aadaf5e3497de38ae5e64affb1fc0ebb15e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ro/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ro/firefox-62.0b19.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "549a9b2e1e6e7935434186ca3d3c4b97520b0261fd9c3f95253ace286021e43785237ff7d3afda5d497dce366eaea09e11e172cb1271031f3c1cab0c55a07772"; + sha512 = "db4801605204fa133c58b2b79962a3d542f96060dd94a1213b12779bc84525072f71789f15d2fecc83285d0f3bba4d377ec7bf5361867fb794e2662f1f24e638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ru/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ru/firefox-62.0b19.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "79256f61f98035dcb063e45ee27c06eeb1e088e2dbe4429b1a5feb2664b8b37b2851f23c836d57e0272b9fed73be22ee029373107b2fd19813f7d9466ebc5900"; + sha512 = "a5fa2dc6543112f133327373fc5f7fcf84eec595f38233f1390d70ac8e38e968e3b03c47de13edd91c9e7ceb6b29183b6687e3ffa8659ae4c58908f88f3f8244"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/si/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/si/firefox-62.0b19.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "907241d6ba61f53ead341cba2de045a8e6c31805954469a84792035472b9dfa6f8175716f765d332590259651fb5e17a96d1fa3d4fb0f12279b6cda9d1f0c5a8"; + sha512 = "48ff4167cf562c04d29316d877eb8855f02e48e2197705b3f924a8f627b85005b235294ff629afe56fcdac726a0e0b66fbded7090e29fa1997a94234cea8b944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/sk/firefox-62.0b19.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a8932f837cbe336fe74a223196f2f3d4383be4b1c8f53d793fdf9a9fb66a65527fb65321160df2eaf1328c8b1cafc7558c3e14a06d7d49bd93f24657e24deb76"; + sha512 = "cc6d578518cb0de59880bab71c4888643cbc71f74fac7cc7a4cd1a61628fd6e1c775bbeeb9d5ba26756a0b6a5a1408723de5132c0d9013ec4e1157e0e91dca92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/sl/firefox-62.0b19.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f1a76d7a77f1ff67a0defdd51fc2ed246e06ee00e11a80e58e35f4d35e081e1a0520f3f11fbdf3314a722c0f4c033cf6915ee792b8d98bc75b5552f92527dd4e"; + sha512 = "433a0fecf6eb3da12ea04e15eecf3ed825eacdbe329bcd522ba8a1505dc8eb81b78b7bfd84fceb029565dfc1b09fb1e38205291c700fbdc96589476c00a93178"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/son/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/son/firefox-62.0b19.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "f31660a7c3e85f759611d695fd44db021fe004f990e5c2680906f60b8650eedbc6d624cd54f5a6f17ab0c46d27bfc260789b2f294908a9c77d1cbcbfbf90baea"; + sha512 = "e8ba4761a776dc2686846ce2597ed9a15d61a1973a7c0d952a2de64ef922d4f322ce24891bfbbff80a1b9a07ca3cc1d777807badfed7f68f7b5a3c9ec5836048"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sq/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/sq/firefox-62.0b19.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "823d671493e005bf7311dc563916d28e9fb6c04378366a5be8a9ea39a0b5e6606a299682b0e58599a02853c6be592f1778dcbecf42650d200b5e8d4a9883ea50"; + sha512 = "2fd023d89f493c42016f4ea3f3f16bb5879f2c1f6859cad728b6c649e7901dd6efd4f2f7ba5f161ed98e31d476d3f1faf7cb5fef7936bd88bc1ea283d144805d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/sr/firefox-62.0b19.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c397bf56d12ff28b36ffbfd132c3d304017069cb12415a085bcb7f27898136bd8363c8366ee75324aa136442d93733223e1493204163aefc792eaa531a50c3b9"; + sha512 = "c107e8c8b2f9afd708a498b190e4044cde74bc81867e66d14c4cdb35b5d356e25d94e9816d2bb21eedab6283029ee4dc29ea04704eb0ebc6ead921ea374b3bd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sv-SE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/sv-SE/firefox-62.0b19.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7fff653a86fa12dff883366b0d76898ee3fc0b6c93ec91617e0b27254df873f7c5b8b3b5217f0082e474808a465fbc254ab682c521b36f031eda75c5558128b2"; + sha512 = "debda5bf7f2a275cb0434fba6527f396fa55fd3f154333a688fa0187aabee78b881e0bb1704604ac4c58fe705e54ce5480488c38a85232746631fbfb389be646"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ta/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ta/firefox-62.0b19.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "9b7d327e5e72135bcc4591d7ed2aa606dabb2e292b6ccc480c8665b247a24fa0721ed23ecfe242cb50604f7f211435be63915c1bbdc828e4590a91802d277155"; + sha512 = "230f3253cac800fc268ca9c3507a2f4dcfcab220b719dfa20e1760be8a4e2f789ccf7a726832eef570afd7b3fc25b58a8d321ee15404252e48b49050bc86d851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/te/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/te/firefox-62.0b19.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0067469eadde18e120645a55701454381010530fe7cea3370efdee5e728b2b0258771ab3c39ada75727c796d44be5bc1487479103649964aa4926f8e23ba9c69"; + sha512 = "d88dcc1bce5f33ce14c6577005f4e70b803c67437dc1e33928483fbb88abb9dd175c81cbf0e22947ed8b319d1b02cbfcc1d1b73958f85845768cdcca5adeb52c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/th/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/th/firefox-62.0b19.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "3157d512fac92eb23db2774128d509277ac8047e525b14c98f9b7b291c2697fb4917144605451b1acbc76cf9f104e0c39d8a4b9c0e90d8bb206613802c2edd91"; + sha512 = "134f6cc7de767b25e07755cea23ae35641d09129835db4659d5ed92536231a8fd57e857cdcb4871285dec93b4af764264a4ea1c36c35bf636682275139edca38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/tr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/tr/firefox-62.0b19.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "38e928345d279831f5c7ed1c6c4e618377d5a92e69b65f7b3d9bcfd16f24c32018bcdd8fe384350a6e846996de783897619ce8d6b734dd92cdf3f1308b9cb582"; + sha512 = "d42b3867ebe0de0e9a6ba14adf2203ee96e2bca569bed2e55c2b46d8149f5babc6eae898a855745cd9fc2e6e016297b7357d25e5b413c786bbaa5607a3abaf05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/uk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/uk/firefox-62.0b19.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "14745f76dcaf57d2a365a0eafa253e7849ab1eb168877de7a9d20a142228581190766eb7c0064edd966301d63c728aea63190d2a2fa6d2e803a96f28f15bf9ad"; + sha512 = "634636013a50960aadf383aab9ba75c3bcc679dbe300ca3eb8b804e066c9c9a41cc5e2d4d321e18903ec41bb93ba084bafd8c3c61681da0a7e0388eb52f93a53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ur/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ur/firefox-62.0b19.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "7fc7d0ab990b64dbd611ea3e76939ed438a1a63360e746beab30a057fa053717e92c35706ab8f2ac81c52a9bd92d62cffbbf99d3ac85cfb092bbb2868f47a092"; + sha512 = "d4cb618f46a45354bdc1abfe03ed3eadfaaabbbbd6e88e90b4617ae27887c3ead7e2e46248c845c3d026e14cbdbfa4bc7e332653c89c621dc5711cc5b7decc89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/uz/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/uz/firefox-62.0b19.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "256b8c553e61796b439ae3d4f90248ae07bd7c13b9a32ce3baeb24901941ff8d6ec6ab810122b6a6da713c0a1b3737ad66e6d798d6cf62fea87885541920f6ce"; + sha512 = "6aed20b40c85d9901484982c81506b9ff5eb8bb2a0747db65287b4486cb43feaeed884de23a6326bc45009ca598c732e503c30e2f269f840da3d7bca3b64bee6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/vi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/vi/firefox-62.0b19.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "152a826f7ca28351a6395728ca6ae1fea3623bf154e00e2bd0e56ef14ef819225a65d12dd7cb6a483b2a2e1e08a3da39082d9997a7116b2a05c66b45f8cd77bc"; + sha512 = "37c303611f1994dc3470f07fc95b53b1aae4586f36f616c24796fd25463900f85bfaf682397882be1cbda2703c1fc88e285875b6497d311ad1376dc869b6ddc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/xh/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/xh/firefox-62.0b19.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b5aa2d4450c34eedaadd120da155622590e053e2b5bce0328e1e314be339a7e9def21417d18c094602cadf5fcb674fef0ec6691fecc00e2f92336c393cbc0f66"; + sha512 = "b881dff8d3cb79351329bee61960eed91a3959ca1c6592563d12b50ad58ddd5f38157b372c2aa2a605f93f1ada1dbb6ace65c668697dca24637447e4532b0a5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/zh-CN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/zh-CN/firefox-62.0b19.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "9c4d18c8cd48e63a0142ac2af142e75581cb57d242e779b4fb6d18fb3e90fa748952275409fa174261ca8fbebdf4d69251b0681a4b4a0aa03cf03240bd97e855"; + sha512 = "994caa136ab8c9470bad545b31c0e2bd738a006bd4340d5d1c03987e43e000b233388449221b681a57bc036f5395a647741d119d434d8cafdcdfc8bdfbf787ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/zh-TW/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/zh-TW/firefox-62.0b19.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "13238f853646c2249e3eb13e140507ed2e3551151ebf0c5db3c8146239bf1a943c794d77beda40e97d93ce0eca955ba3a1b618431fd34180d2adebd8c405a137"; + sha512 = "0fb7989cea38a7efd2c1575d891463d806ad7a6e5af9c91205bb527b587dddd2a769a49491c82687c31df96a10a4794e822eec4c16c10ac2d28b781483fe6c53"; } ]; } From 7a98ab9e9bb890a612f80ee928a1c9b9bf1cf02e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 01:28:20 -0700 Subject: [PATCH 336/369] s4cmd: 2.0.1 -> 2.1.0 (#45536) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/s4cmd/versions. --- pkgs/tools/networking/s4cmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix index 20f129357df..8088cc0ec4d 100644 --- a/pkgs/tools/networking/s4cmd/default.nix +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "s4cmd"; - version = "2.0.1"; + version = "2.1.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "14gfpnj4xa1sq3x3zd29drpzsygn998y32szwm069ma0w9jwjjz6"; + sha256 = "0d4mx98i3qhvlmr9x898mjvf827smzx6x5ji6daiwgjdlxc60mj2"; }; propagatedBuildInputs = with python3Packages; [ boto3 pytz ]; From 8ea7ad67fd19f3fc7866084c8648b6fd2d1c79e9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 16 Aug 2018 11:44:04 +0200 Subject: [PATCH 337/369] opencolorio: 1.0.9 -> 1.1.0 --- pkgs/development/libraries/opencolorio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 3b0e60fca39..751d845f773 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "opencolorio-${version}"; - version = "1.0.9"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.9.zip"; - sha256 = "14j80dgbb6f09z63aqh2874vhzpga6zksz8jmqnj1zh87x15pqnr"; + sha256 = "1vi5pcgj7gv8fp6cdnhszwfh7lh38rl2rk4c5yzsvmgcb7xf48bx"; }; outputs = [ "bin" "out" "dev" ]; From beaa0984c63f6e93a9ddfae18c70d39602e90cca Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 16 Aug 2018 11:52:46 +0200 Subject: [PATCH 338/369] ilmbase, openexr: 2.2.1 -> 2.3.0 --- pkgs/development/libraries/ilmbase/default.nix | 8 +++++--- pkgs/development/libraries/openexr/default.nix | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 156b4f72749..3989e941b6b 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, automake, autoconf, libtool, which }: stdenv.mkDerivation rec { - name = "ilmbase-2.2.1"; + name = "ilmbase-${version}"; + version = "2.3.0"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; - sha256 = "17k0hq19wplx9s029kjrq6c51x2ryrfmaavcappkd0g67gk0dhna"; + url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz"; + sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5"; }; outputs = [ "out" "dev" ]; preConfigure = '' + patchShebangs ./bootstrap ./bootstrap ''; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 293274a5776..bb9d163dc4a 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: stdenv.mkDerivation rec { - name = "openexr-${lib.getVersion ilmbase}"; + name = "openexr-${version}"; + version = lib.getVersion ilmbase; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; - sha256 = "1kdf2gqznsdinbd5vcmqnif442nyhdf9l7ckc51410qm2gv5m6lg"; + url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz"; + sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x"; }; patches = [ @@ -15,6 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "doc" ]; preConfigure = '' + patchShebangs ./bootstrap ./bootstrap ''; From 0ac35abc98572f66e6330917c26b8a026485990f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 03:06:20 -0700 Subject: [PATCH 339/369] kotlin: 1.2.60 -> 1.2.61 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kotlin/versions. --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 03891c9c6c8..757773eed52 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.60"; + version = "1.2.61"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0gb29a8ayj12g4g10dcasw3d3csphq5rv9jn9c6m02myr6azcygz"; + sha256 = "1gsvilsbgwdvyvxjnlvs0rhrgm6x9dapziwgwgg9kbi9a0w4avdy"; }; propagatedBuildInputs = [ jre ] ; From 5305f5c273b9af099fb2e8b167bd2ddc96208b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 24 Aug 2018 11:20:21 +0900 Subject: [PATCH 340/369] pg_top: do not use docbook for longDescription --- pkgs/tools/misc/pg_top/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index 4de33433115..4f4bd7e754c 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -14,13 +14,11 @@ stdenv.mkDerivation rec { description = "A 'top' like tool for PostgreSQL"; longDescription = '' pg_top allows you to: - - View currently running SQL statement of a process. - View query plan of a currently running SQL statement. - View locks held by a process. - View user table statistics. - View user index statistics. - + * View currently running SQL statement of a process. + * View query plan of a currently running SQL statement. + * View locks held by a process. + * View user table statistics. + * View user index statistics. ''; homepage = http://ptop.projects.postgresql.org/; From 00aee56f3d6ce95b8c179b14654edb931bc91340 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 24 Aug 2018 15:27:36 +0200 Subject: [PATCH 341/369] Revert "miniupnpd: 2.1 -> 2.1.20180706 (#43186)" This reverts commit 5d56adb4fdf75657b0d2bb8d890adf1f857d328a. --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 0c546ff9109..07112d1497a 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, iptables, libuuid, pkgconfig }: stdenv.mkDerivation rec { - name = "miniupnpd-2.1.20180706"; + name = "miniupnpd-2.1"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "01mhv3lgpj2shs3666zwlhvfiv1mpf4h9mv35g8gihyq8k82ybgw"; + sha256 = "1hg0zzvvzfgpnmngmd3ffnsk9x18lwlxlpw5jgh7y6b1jrvr824m"; name = "${name}.tar.gz"; }; From 672a0ebd806295115fc26c14ca9820ec74e82439 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 24 Aug 2018 14:59:02 +0200 Subject: [PATCH 342/369] nixos/tests/wordpress: fix test - explicitly add dbHost to fix test - remove unnecessary options that are set by default anyway --- nixos/tests/wordpress.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index 2c0bbbfd716..5003e25a7d5 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -18,9 +18,6 @@ import ./make-test.nix ({ pkgs, ... }: enable = true; logPerVirtualHost = true; adminAddr="js@lastlog.de"; - extraModules = [ - { name = "php7"; path = "${pkgs.php}/modules/libphp7.so"; } - ]; virtualHosts = [ { @@ -30,7 +27,7 @@ import ./make-test.nix ({ pkgs, ... }: { serviceType = "wordpress"; dbPassword = "wordpress"; - wordpressUploads = "/data/uploads"; + dbHost = "127.0.0.1"; languages = [ "de_DE" "en_GB" ]; } ]; From 7fd5afebfe8ec8b1931117d0dbc35743e806bf96 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 24 Aug 2018 15:34:48 +0200 Subject: [PATCH 343/369] androidStudioPackages.{dev,canary}: 3.3.0.5 -> 3.3.0.6 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2ae7d421bba..150401ec0bd 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "016nyn1pqviy089hg0dq7m4cqb39fdxdcy4zknkaq7dmgv1dj6x9"; }; latestVersion = { # canary & dev - version = "3.3.0.5"; # "Android Studio 3.3 Canary 6" - build = "182.4954005"; - sha256Hash = "0b8ias75f3p5nrmgp7iqz4n4r4dbwhgagqmyc1fqfd36wbglyaf4"; + version = "3.3.0.6"; # "Android Studio 3.3 Canary 7" + build = "182.4968538"; + sha256Hash = "159sya24p99pj9q0mj1sbcz2609ackz54x4pj3q1mxhiamsn1y2q"; }; in rec { # Old alias From 27bdee98473e42e2768f8b2222139fc658738d42 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 24 Aug 2018 15:37:22 +0200 Subject: [PATCH 344/369] androidStudioPackages.beta: 3.2.0.22 -> 3.2.0.23 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 150401ec0bd..8a45604824c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2"; }; betaVersion = { - version = "3.2.0.22"; # "Android Studio 3.2 Beta 5" - build = "181.4913314"; - sha256Hash = "016nyn1pqviy089hg0dq7m4cqb39fdxdcy4zknkaq7dmgv1dj6x9"; + version = "3.2.0.23"; # "Android Studio 3.2 RC 1" + build = "181.4963425"; + sha256Hash = "0b3mmafpnc07chiy3fv3vlrarkiwbb0c62x3qk26kpxq1l6m8bgw"; }; latestVersion = { # canary & dev version = "3.3.0.6"; # "Android Studio 3.3 Canary 7" From 8ab01376a8e734c11c0cb89e83985c174272c19d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 24 Aug 2018 09:52:00 -0400 Subject: [PATCH 345/369] linux: 4.4.151 -> 4.4.152 --- 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 31f489c4faf..84e04b82e16 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.151"; + version = "4.4.152"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1s49h2my2jysh1i38vygqlcj9bz8fzg6vsv9k3ln3pi6hqqqrsjz"; + sha256 = "1jyky74cbaz76x5bpkgw3d45kim3y8brnjp854qkx8462s4pdvhv"; }; } // (args.argsOverride or {})) From 2d151a401f605120108e3f81d1c36ab63278da6d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 24 Aug 2018 09:54:00 -0400 Subject: [PATCH 346/369] linux: 4.9.123 -> 4.9.124 --- 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 9b9072d302e..8fa710a0e46 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.123"; + version = "4.9.124"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0wahbq08cixh63099n13wal3xkw48gnka6w8biax1gwckymww4ld"; + sha256 = "04a3iqy6divkd9bamn60d0v8jkls2jbip7qn0m82dlcdikab19jw"; }; } // (args.argsOverride or {})) From ca53fc402feeec9d9cf316e525bcbf0a598030ca Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 24 Aug 2018 09:54:14 -0400 Subject: [PATCH 347/369] linux: 4.14.66 -> 4.14.67 --- 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 de983418b7b..bbc98592503 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.66"; + version = "4.14.67"; # 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 = "04q48syzmz84s045bqwyzrr37wcria8waggb5fki2kc69k563053"; + sha256 = "1fkha288nv5vk2l13dj0xj09c2pxvipysdaaga7sfcvjq9nhajrz"; }; } // (args.argsOverride or {})) From e90743b8657c6ff4a2672fbd702aaf88e032c3dc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 24 Aug 2018 09:54:33 -0400 Subject: [PATCH 348/369] linux: 4.17.18 -> 4.17.19 --- 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 126c3284d05..c9a79fd23cb 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.18"; + version = "4.17.19"; # 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 = "03wvnw4xl48na08c29qq57a39kgvb67ayxfqqv4n06vpf8vmx2sd"; + sha256 = "05wz76qq70bfhfwd1zwzfmzq4rlgz40jpi9plb31njx1y7vkx6xs"; }; } // (args.argsOverride or {})) From 4f1b91dcb60c031132e51048040e9b53fdafcf11 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 24 Aug 2018 09:54:49 -0400 Subject: [PATCH 349/369] linux: 4.18.4 -> 4.18.5 --- 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 768a4c96542..bbd0bbfbb21 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.4"; + version = "4.18.5"; # 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 = "0hm8id6nv3j2g7l1fzkl4vr9wfx43s8hdspg1yc4fz6vbdxwinqj"; + sha256 = "1ga7ys6s5d9dk1ly9722sbik1y6kbc3w6nw9pw86zpzdh0v0l2gv"; }; } // (args.argsOverride or {})) From 4f519e5dc8d41acfc31ded7b1bbb46b55aa23e3a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 24 Aug 2018 15:51:36 +0200 Subject: [PATCH 350/369] fscrypt: 0.2.3 -> 0.2.4 (security, CVE-2018-6558) --- pkgs/os-specific/linux/fscrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 267e31d427c..da787d84d79 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { name = "fscrypt-${version}"; - version = "0.2.3"; + version = "0.2.4"; goPackagePath = "github.com/google/fscrypt"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - sha256 = "126bbxim4nj56kplvyv528i88mfray50r2rc6ysblkmaw6x0fd9c"; + sha256 = "10gbyqzgi30as1crvqbb4rc5p8zzbzk1q5j080h1gnz56qzwivr8"; }; buildInputs = [ pam ]; From 94bf97311d3990b50a9da134096dbb6678ab3994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 24 Aug 2018 18:14:18 +0200 Subject: [PATCH 351/369] kexi: Fixes build with QT5.11 --- pkgs/applications/office/kexi/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 2aa19dea1c2..66fde2497e3 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, + mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, boost, qttools, qtwebkit, breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets, @@ -29,6 +29,13 @@ mkDerivation rec { propagatedUserEnvPkgs = [ kproperty ]; + patches = [ + (fetchpatch { + url = "https://phabricator.kde.org/file/data/6iwzltiifyqwjnzbvyo6/PHID-FILE-li4a7j35wkdkm2qdtnp4/D11503.diff"; + sha256 = "0yj717m4x1zb4xjy1ayhz78xkxpawxgsvjgvf5iw81jnlr8absq9"; + }) + ]; + meta = with lib; { description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker"; longDescription = '' From 1f4eb992c4745eab63dbe9d76d60d4f887e90989 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 09:23:09 -0700 Subject: [PATCH 352/369] gparted: 0.31.0 -> 0.32.0 (#45576) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gparted/versions. --- pkgs/tools/misc/gparted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index ca078c16ab6..a3c30c15e5f 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gparted-0.31.0"; + name = "gparted-0.32.0"; src = fetchurl { url = "mirror://sourceforge/gparted/${name}.tar.gz"; - sha256 = "1fh7rpgb4xxdhgyjsirb83zvjfc5mfngb8a1pjbv7r6r6jj4jyrv"; + sha256 = "1fjp4c8jc0kjbbih1x1vs9v40d9lncma642kflnmy0bixxnvh7df"; }; configureFlags = [ "--disable-doc" ]; From 702fa7a7176d41c19b559f9b6fc263b3a121174d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 09:27:29 -0700 Subject: [PATCH 353/369] nlohmann_json: 3.1.2 -> 3.2.0 (#45559) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nlohmann_json/versions. --- pkgs/development/libraries/nlohmann_json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 8db3a3d92ff..0221722e487 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "3.1.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "1mpr781fb2dfbyscrr7nil75lkxsazg4wkm749168lcf2ksrrbfi"; + sha256 = "0585r6ai9x1bhspffn5w5620wxfl1q1gj476brsnaf7wwnr60hwk"; }; nativeBuildInputs = [ cmake ]; From e7d82391fec221eaba54ce14c0ff4006195bcee0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 09:32:30 -0700 Subject: [PATCH 354/369] inadyn: 2.3.1 -> 2.4 (#45573) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/inadyn/versions. --- pkgs/tools/networking/inadyn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 6178181193c..8029415a98c 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "inadyn-${version}"; - version = "2.3.1"; + version = "2.4"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "0m2lkmvklhnggv1kim0rikq1gxxc984lsg4gpn8s6lzv6y0axbya"; + sha256 = "1h24yavp1246zn5isypvxrilp6xj2266qr52w2r24qxicr8b320y"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 030cf559237c767dd2ab3f1cddba737c498d0961 Mon Sep 17 00:00:00 2001 From: sjau Date: Fri, 24 Aug 2018 18:36:32 +0200 Subject: [PATCH 355/369] Plex: 1.13.4 -> 1.13.5 (#45578) --- pkgs/servers/plex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 6f7f9e74ec5..88a8d0e8707 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.13.4.5271"; - vsnHash = "200287a06"; - sha256 = "c8aa459f680ad9db92f285dae2f3dcffbf082324e1b7ea2f356bdbe745fe6b8e"; + version = "1.13.5.5291"; + vsnHash = "6fa5e50a8"; + sha256 = "1h0r7hxxw5jf2dn8w4cnj71dm873y2j0l87rg8pf0r3cyx6rhxnx"; }; in stdenv.mkDerivation rec { From 64a9aa32ae9a0c73daa64983ea30638bdf244488 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 24 Aug 2018 19:04:37 +0200 Subject: [PATCH 356/369] davmail: 4.8.0 -> 4.8.6 (#45584) --- pkgs/applications/networking/davmail/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index b491f287e70..31493e46f53 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,17 +1,19 @@ -{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper }: +{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper, unzip }: stdenv.mkDerivation rec { - name = "davmail-4.8.0"; + name = "davmail-4.8.6"; src = fetchurl { - url = "mirror://sourceforge/davmail/4.8.0/davmail-linux-x86_64-4.8.0-2479.tgz"; - sha256 = "0e650c4a060d64fd2b270ddb00baa906aac617865d5e60c9f526a281cdb27b62"; + url = "mirror://sourceforge/davmail/4.8.6/davmail-4.8.6-2600.zip"; + sha256 = "1wk4jxb46qlyipxj57flqadgm4mih243rhqq9sp9m5pifjqrw9dp"; }; - nativeBuildInputs = [ makeWrapper ]; + sourceRoot = "."; + + nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' mkdir -p $out/share/davmail - cp -R ./* $out/share/davmail + cp -vR ./* $out/share/davmail makeWrapper $out/share/davmail/davmail.sh $out/bin/davmail \ --prefix PATH : ${jre}/bin \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} From a02374ca14b924c91109358cf43014e5d23620e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 10:15:39 -0700 Subject: [PATCH 357/369] flatpak-builder: 0.99.3 -> 1.0.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/flatpak-builder/versions. --- pkgs/development/tools/flatpak-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index b4a35b3a21c..33f9ade4681 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -36,7 +36,7 @@ }: let - version = "0.99.3"; + version = "1.0.0"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "0sq3rcy3vwa36p6wq63wdvkk0hrs3qj1ngk26j9947nc14z39plk"; + sha256 = "0ysnz0dwc8wfd31afwssg9prvaqdga7z4mybnrzy8sgm0hi5p2l5"; }; nativeBuildInputs = [ From f4745bef6c3e18b40b8f696dc7ed6f5976c4541b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Aug 2018 14:02:36 +0100 Subject: [PATCH 358/369] makeWrapper: document --set-default --- .../build-support/setup-hooks/make-wrapper.sh | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index f75b285bacf..5d5ddcaa8d7 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -11,15 +11,18 @@ assertExecutable() { # makeWrapper EXECUTABLE ARGS # ARGS: -# --argv0 NAME : set name of executed process to NAME -# (otherwise it’s called …-wrapped) -# --set VAR VAL : add VAR with value VAL to the executable’s environment -# --unset VAR : remove VAR from the environment -# --run COMMAND : run command before the executable -# The command can push extra flags to a magic list variable -# extraFlagsArray, which are then added to the invocation -# of the executable -# --add-flags FLAGS : add FLAGS to invocation of executable +# --argv0 NAME : set name of executed process to NAME +# (otherwise it’s called …-wrapped) +# --set VAR VAL : add VAR with value VAL to the executable’s +# environment +# --set-default VAR VAL : like --set, but only adds VAR if not already set in +# the environment +# --unset VAR : remove VAR from the environment +# --run COMMAND : run command before the executable +# The command can push extra flags to a magic list +# variable extraFlagsArray, which are then added to +# the invocation of the executable +# --add-flags FLAGS : add FLAGS to invocation of executable # --prefix ENV SEP VAL : suffix/prefix ENV with VAL, separated by SEP # --suffix From 45b5bef60ffecaae57cdbe1ef9969508af43e258 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 11:15:16 -0700 Subject: [PATCH 359/369] openorienteering-mapper: 0.8.1.2 -> 0.8.2 (#45552) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/OpenOrienteering-Mapper/versions. --- pkgs/applications/gis/openorienteering-mapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 7b79cd062a8..6ed6326f16e 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "OpenOrienteering-Mapper-${version}"; - version = "0.8.1.2"; + version = "0.8.2"; buildInputs = [ gdal qtbase qttools qtlocation qtimageformats qtsensors clipper zlib proj doxygen cups]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "0f7zxzl2n46qy86k6n3f6a7l1nhba58i28l8ngp3drf74qffaa33"; + sha256 = "02lga6nlal4c7898zc3lv1pcwyv1wpkn7v2xji2kgq68r6aw6j59"; }; cmakeFlags = From 5903cc1b2d3e003029c22461b38941351a4d9baf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 24 Aug 2018 16:00:00 -0500 Subject: [PATCH 360/369] hub: 2.5.0 -> 2.5.1 (#45599) --- .../version-management/git-and-tools/hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 12b7b8965ef..113d7f78b90 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hub-${version}"; - version = "2.5.0"; + version = "2.5.1"; goPackagePath = "github.com/github/hub"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "github"; repo = "hub"; rev = "v${version}"; - sha256 = "03nj3b17m700l3pib9jlzxz2vh8w54srv6x63l53sb4dff3izfsz"; + sha256 = "0a5i351v998vdwf883qhh39c15x56db01fr9hscz4ha7r9550pqg"; }; buildInputs = [ groff ronn ruby utillinux ] ++ From 4768d2e13a4572826e169c331b2a96ae92d02dae Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 24 Aug 2018 12:22:05 +0200 Subject: [PATCH 361/369] todoman: init at 3.4.0 --- pkgs/applications/office/todoman/default.nix | 56 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/office/todoman/default.nix diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix new file mode 100644 index 00000000000..65fa7e061fe --- /dev/null +++ b/pkgs/applications/office/todoman/default.nix @@ -0,0 +1,56 @@ +{ stdenv, python3, glibcLocales }: + +let + inherit (python3.pkgs) buildPythonApplication fetchPypi; +in +buildPythonApplication rec { + pname = "todoman"; + version = "3.4.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "09441fdrwz2irsbrxnpwys51372z6rn6gnxn87p95r3fv9gmh0fw"; + }; + + LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux + "${glibcLocales}/lib/locale/locale-archive"; + LANG = "en_US.UTF-8"; + LC_TYPE = "en_US.UTF-8"; + + buildInputs = [ glibcLocales ]; + propagatedBuildInputs = with python3.pkgs; + [ atomicwrites click click-log configobj humanize icalendar parsedatetime + python-dateutil pyxdg tabulate urwid ]; + + checkInputs = with python3.pkgs; + [ flake8 flake8-import-order freezegun hypothesis pytest pytestrunner pytestcov ]; + + makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" + "--set CHARSET en_us.UTF-8" ]; + + preCheck = '' + # Remove one failing test that only checks whether the command line works + rm tests/test_main.py + ''; + + meta = { + homepage = https://github.com/pimutils/todoman; + description = "Standards-based task manager based on iCalendar"; + longDescription = '' + Todoman is a simple, standards-based, cli todo (aka: task) manager. Todos + are stored into icalendar files, which means you can sync them via CalDAV + using, for example, vdirsyncer. + + Todos are read from individual ics files from the configured directory. + This matches the vdir specification. There’s support for the most common TODO + features for now (summary, description, location, due date and priority) for + now. Runs on any Unix-like OS. It’s been tested on GNU/Linux, BSD and macOS. + Unsupported fields may not be shown but are never deleted or altered. + + Todoman is part of the pimutils project + ''; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34d5ae13dc7..cd92d952c23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18784,6 +18784,8 @@ with pkgs; todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; + todoman = callPackage ../applications/office/todoman { }; + toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { }; tomahawk = callPackage ../applications/audio/tomahawk { From bd1ebb0fa05fbf2a7bcce268debf9c98c4454ed4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 14:02:20 -0700 Subject: [PATCH 362/369] clipmenu: 5.4.0 -> 5.5.0 (#45604) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/clipmenu/versions. --- pkgs/applications/misc/clipmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index 679724ed062..6dd68123b13 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { name = "clipmenu-${version}"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "cdown"; repo = "clipmenu"; rev = version; - sha256 = "1qbpca0wny6i222vbikfl2znn3fynhbl4100qs8v4wn27ra5p0mi"; + sha256 = "15if7bwqviyynbrcwrn04r418cfnxf2mkmq112696np24bggvljg"; }; buildInputs = [ makeWrapper ]; From bf5d8a72c10fc3f3a0d51770676e652e93c72e5a Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 24 Aug 2018 22:43:52 +0200 Subject: [PATCH 363/369] pam_ldap: fix build an upstream perl script needed during build wasn't found, fix path --- pkgs/os-specific/linux/pam_ldap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index e7f2c8278e1..5b34a8bc82b 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs ./vers_string + substituteInPlace vers_string --replace "cvslib.pl" "./cvslib.pl" ''; preInstall = " From 519012bcdfe83d9155bd0a304f02481085baa6b9 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 24 Aug 2018 22:50:31 +0200 Subject: [PATCH 364/369] nss_ldap: fix build an upstream perl script needed during build wasn't found, fix path --- pkgs/os-specific/linux/nss_ldap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index ef0bdc4f126..c23eb19a482 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { preConfigure = '' patchShebangs ./vers_string sed -i s,vers_string,./vers_string, Makefile* + substituteInPlace vers_string --replace "cvslib.pl" "./cvslib.pl" ''; patches = [ ./crashes.patch ]; From 2abe3956e46b4cbac2096766e49cca384049947a Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 25 Aug 2018 00:13:47 +0200 Subject: [PATCH 365/369] todoman: limit to linux glibcLocales doesn't exist on Darwin --- pkgs/applications/office/todoman/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 65fa7e061fe..a7d93c3b0cb 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { rm tests/test_main.py ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/pimutils/todoman; description = "Standards-based task manager based on iCalendar"; longDescription = '' @@ -50,7 +50,8 @@ buildPythonApplication rec { Todoman is part of the pimutils project ''; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ leenaars ]; + license = licenses.isc; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.linux; }; } From 8f61e96c1e368433cb01a291c6e1948bf187551e Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sat, 25 Aug 2018 00:18:59 +0200 Subject: [PATCH 366/369] nixos/datadog-agent: Fix type of use_dogstatsd (#45587) --- nixos/modules/services/monitoring/datadog-agent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index f8ee34ebdf8..e545e06b349 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -11,7 +11,7 @@ let api_key = ""; confd_path = "/etc/datadog-agent/conf.d"; additional_checksd = "/etc/datadog-agent/checks.d"; - use_dogstatsd = "yes"; + use_dogstatsd = true; } // optionalAttrs (cfg.logLevel != null) { log_level = cfg.logLevel; } // optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; } From b7e695461e63a451f65095bc2e9ceffd553827d1 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 25 Aug 2018 00:39:58 +0200 Subject: [PATCH 367/369] apmplanner2: fixed wrong path in .desktop file The `apmplanner2.desktop` file defaults to `/usr/share/...` regardless which out prefix is given to make. So I chose to fix it manually. --- .../applications/science/robotics/apmplanner2/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index 7ae44418fff..2d579a80369 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -23,8 +23,12 @@ stdenv.mkDerivation rec { qmakeFlags = [ "apm_planner.pro" ]; # this ugly hack is necessary, as `bin/apmplanner2` needs the contents of `share/APMPlanner2` inside of `bin/` - preFixup = "ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/"; - + preFixup = '' + ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/ + substituteInPlace $out/share/applications/apmplanner2.desktop \ + --replace /usr $out + ''; + enableParallelBuilding = true; meta = { From 65c2e09d9acf4dc6111c98636bdffd74c6c19552 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 16:28:42 -0700 Subject: [PATCH 368/369] aws-sdk-cpp: 1.4.82 -> 1.5.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/aws-sdk-cpp/versions. --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 9f41bf1af47..9afb03e0d0c 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.4.82"; + version = "1.5.17"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "1m5xylcwx5vhz0q3srlq9rbr4x9kydd77mf45agd60clq25sxs69"; + sha256 = "0mmzf3js6090kk9vdwrmib5cjny43mqf044iynkhkglzvwhadc8z"; }; # FIXME: might be nice to put different APIs in different outputs From 7f8b1dd32f45463b2fce58e8f33f4ddffbaa1a76 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Wed, 15 Aug 2018 22:10:31 +0200 Subject: [PATCH 369/369] systemd: added groups kvm, render they need to exist according to the README of systemd --- nixos/modules/config/users-groups.nix | 2 ++ nixos/modules/misc/ids.nix | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index ddec21b5f6e..426e1666a81 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -524,6 +524,8 @@ in { utmp.gid = ids.gids.utmp; adm.gid = ids.gids.adm; input.gid = ids.gids.input; + kvm.gid = ids.gids.kvm; + render.gid = ids.gids.render; }; system.activationScripts.users = stringAfter [ "stdio" ] diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index bffd8aff78b..0928e368d80 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -326,6 +326,8 @@ cfssl = 299; cassandra = 300; qemu-libvirtd = 301; + # kvm = 302; # unused + # render = 303; # unused # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -612,6 +614,8 @@ cfssl = 299; cassandra = 300; qemu-libvirtd = 301; + kvm = 302; # default udev rules from systemd requires these + render = 303; # default udev rules from systemd requires these # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal