From a8cfe8867e5ca1829c00920d6c0c16508d37c08a Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Thu, 12 Dec 2019 19:31:34 +0100 Subject: [PATCH 001/243] pdftk: keep old version as insurance --- pkgs/tools/typesetting/pdftk/legacy.nix | 42 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/typesetting/pdftk/legacy.nix diff --git a/pkgs/tools/typesetting/pdftk/legacy.nix b/pkgs/tools/typesetting/pdftk/legacy.nix new file mode 100644 index 00000000000..72f25ef099b --- /dev/null +++ b/pkgs/tools/typesetting/pdftk/legacy.nix @@ -0,0 +1,42 @@ +{ fetchurl, stdenv, gcj, unzip }: + +stdenv.mkDerivation { + name = "pdftk-2.02"; + + src = fetchurl { + url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip"; + sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi"; + }; + + nativeBuildInputs = [ gcj unzip ]; + + hardeningDisable = [ "fortify" "format" ]; + + preBuild = '' + cd pdftk + sed -e 's@/usr/bin/@@g' -i Makefile.* + NIX_ENFORCE_PURITY= \ + make \ + LIBGCJ="${gcj.cc}/share/java/libgcj-${gcj.cc.version}.jar" \ + GCJ=gcj GCJH=gcjh GJAR=gjar \ + -iC ../java all + ''; + + # Makefile.Debian has almost fitting defaults + makeFlags = [ "-f" "Makefile.Debian" "VERSUFF=" ]; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + cp pdftk $out/bin + cp ../pdftk.1 $out/share/man/man1 + ''; + + + meta = { + description = "Simple tool for doing everyday things with PDF documents"; + homepage = https://www.pdflabs.com/tools/pdftk-server/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [raskin]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4baf7fcdd9..1de2dc74842 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20554,6 +20554,7 @@ in pdfcpu = callPackage ../applications/graphics/pdfcpu { }; pdftk = callPackage ../tools/typesetting/pdftk { }; + pdftk-legacy = lowPrio (callPackage ../tools/typesetting/pdftk/legacy.nix { }); pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfpc = callPackage ../applications/misc/pdfpc { From 9fdff1c5e0cc183cdb745d789546dde57f467182 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Wed, 11 Dec 2019 23:17:39 +0100 Subject: [PATCH 002/243] pdftk: reinit at 3.0.8 --- pkgs/tools/typesetting/pdftk/default.nix | 105 +++++++++++++++++------ 1 file changed, 79 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 72f25ef099b..b30d6269c34 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -1,42 +1,95 @@ -{ fetchurl, stdenv, gcj, unzip }: +{ stdenv, fetchFromGitLab, gradle_5, jre, perl, writeText, runtimeShell }: -stdenv.mkDerivation { - name = "pdftk-2.02"; +let + pname = "pdftk"; + version = "3.0.8"; - src = fetchurl { - url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip"; - sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi"; + src = fetchFromGitLab { + owner = "pdftk-java"; + repo = "pdftk"; + rev = "v${version}"; + sha256 = "1bj4a9g5mbxd859mmawzs0mpm0jw7ap4n1imcwkwz142r9x1g6rk"; }; - nativeBuildInputs = [ gcj unzip ]; + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit src version; - hardeningDisable = [ "fortify" "format" ]; + nativeBuildInputs = [ gradle_5 perl ]; - preBuild = '' - cd pdftk - sed -e 's@/usr/bin/@@g' -i Makefile.* - NIX_ENFORCE_PURITY= \ - make \ - LIBGCJ="${gcj.cc}/share/java/libgcj-${gcj.cc.version}.jar" \ - GCJ=gcj GCJH=gcjh GJAR=gjar \ - -iC ../java all + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle -Dfile.encoding=utf-8 shadowJar; + ''; + + # Mavenize dependency paths + # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "12b7lw1zpj69pv4bpbrm6pi0ip02ay3dfj3vcy2jyikfbwdb3qcz"; + }; + + # Point to our local deps repo + gradleInit = writeText "init.gradle" '' + logger.lifecycle 'Replacing Maven repositories with ${deps}...' + gradle.projectsLoaded { + rootProject.allprojects { + buildscript { + repositories { + clear() + maven { url '${deps}' } + } + } + repositories { + clear() + maven { url '${deps}' } + } + } + } + + settingsEvaluated { settings -> + settings.pluginManagement { + repositories { + maven { url '${deps}' } + } + } + } ''; - # Makefile.Debian has almost fitting defaults - makeFlags = [ "-f" "Makefile.Debian" "VERSUFF=" ]; +in stdenv.mkDerivation rec { + inherit pname version src; + + nativeBuildInputs = [ gradle_5 ]; + + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle --offline --no-daemon --info --init-script ${gradleInit} shadowJar + ''; installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - cp pdftk $out/bin - cp ../pdftk.1 $out/share/man/man1 + mkdir -p $out/{bin,share/pdftk,share/man/man1} + cp build/libs/pdftk.jar $out/share/pdftk + + cat << EOF > $out/bin/pdftk + #!${runtimeShell} + exec ${jre}/bin/java -jar "$out/share/pdftk/pdftk.jar" "\$@" + EOF + chmod a+x "$out/bin/pdftk" + + cp ${src}/pdftk.1 $out/share/man/man1 ''; - meta = { - description = "Simple tool for doing everyday things with PDF documents"; - homepage = https://www.pdflabs.com/tools/pdftk-server/; + description = "Command-line tool for working with PDFs"; + homepage = "https://gitlab.com/pdftk-java/pdftk"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ raskin averelld ]; + platforms = stdenv.lib.platforms.unix; }; } From bc6c029e129abc1a7fb37a1b0a7b694f1cb60042 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 9 Jan 2020 04:20:00 -0500 Subject: [PATCH 003/243] gitAndTools.git-filter-repo: init at 2.25.0 --- .../git-and-tools/default.nix | 4 +++ .../git-and-tools/git-filter-repo/default.nix | 27 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 2e99ca666dc..50131345618 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -40,6 +40,10 @@ let git-fame = callPackage ./git-fame {}; + git-filter-repo = callPackage ./git-filter-repo { + pythonPackages = python3Packages; + }; + gita = python3Packages.callPackage ./gita {}; # The full-featured Git. diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix new file mode 100644 index 00000000000..af21296cffa --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pythonPackages }: + +stdenv.mkDerivation rec { + pname = "git-filter-repo"; + version = "2.25.0"; + + src = fetchurl { + url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "1772if8ajaw80dsdw4ic6vjw24dq0b9w87qlkn0iw4b8r9yxp37a"; + }; + + buildInputs = [ pythonPackages.python ]; + + dontBuild = true; + + installPhase = '' + install -Dm755 -t $out/bin git-filter-repo + install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1 + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/newren/git-filter-repo"; + description = "Quickly rewrite git repository history (filter-branch replacement)"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} From 204b722bed338449d436e7a1945311ae10db1da7 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 9 Jan 2020 16:24:56 +0200 Subject: [PATCH 004/243] cargo-update: 1.5.2 -> 2.5.0 --- .../cargo-update/cargo-lock.patch | 739 +++++++++ .../cargo-update/cargo-update.nix | 1334 ----------------- .../cargo-update/default.nix | 54 +- 3 files changed, 770 insertions(+), 1357 deletions(-) create mode 100644 pkgs/tools/package-management/cargo-update/cargo-lock.patch delete mode 100644 pkgs/tools/package-management/cargo-update/cargo-update.nix diff --git a/pkgs/tools/package-management/cargo-update/cargo-lock.patch b/pkgs/tools/package-management/cargo-update/cargo-lock.patch new file mode 100644 index 00000000000..7872a4bf18b --- /dev/null +++ b/pkgs/tools/package-management/cargo-update/cargo-lock.patch @@ -0,0 +1,739 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 000000000..76f256f46 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,733 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "array_tool" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "arrayref" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "arrayvec" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "base64" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "blake2b_simd" ++version = "0.5.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "byteorder" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cargo-update" ++version = "2.5.0" ++dependencies = [ ++ "array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "json 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "jobserver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dirs" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dirs-sys" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "embed-resource" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "git2" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "idna" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "jobserver" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "json" ++version = "0.11.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazysort" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libgit2-sys" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libssh2-sys 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "libssh2-sys" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.0.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "maybe-uninit" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memchr" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.53" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "redox_users" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rust-argon2" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.104" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.104" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "smallvec" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "syn" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tabwriter" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "url" ++version = "2.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vswhom" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "vswhom-sys" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winreg" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[metadata] ++"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" ++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271" ++"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" ++"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" ++"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" ++"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" ++"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" ++"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" ++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" ++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" ++"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" ++"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" ++"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" ++"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" ++"checksum embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bbaba4684ab0af1cbb3ef0b1f540ddc4b57b31940c920ea594efe09ab86e2a6c" ++"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" ++"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26" ++"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" ++"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" ++"checksum jobserver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "230ae9adf468173aecd4176c7233bddc84a15871a586c5971ace9a55f881c075" ++"checksum json 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)" = "92c245af8786f6ac35f95ca14feca9119e71339aaab41e878e7cdd655c97e9e5" ++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" ++"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" ++"checksum libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16" ++"checksum libssh2-sys 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "5fcd5a428a31cbbfe059812d74f4b6cd3b9b7426c2bdaec56993c5365da1c328" ++"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" ++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" ++"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" ++"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" ++"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc" ++"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" ++"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" ++"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" ++"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" ++"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" ++"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" ++"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8" ++"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" ++"checksum tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9128e3a9149e51494cad59712a286e149fcb74e443d2298d69bd6eaa42cc4ebb" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" ++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++"checksum unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" ++"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" ++"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" ++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" ++"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" ++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" diff --git a/pkgs/tools/package-management/cargo-update/cargo-update.nix b/pkgs/tools/package-management/cargo-update/cargo-update.nix deleted file mode 100644 index 9b8cf24605a..00000000000 --- a/pkgs/tools/package-management/cargo-update/cargo-update.nix +++ /dev/null @@ -1,1334 +0,0 @@ -# Generated by carnix 0.6.6: carnix -o cargo-update.nix --src ./. Cargo.lock --standalone -{ lib, stdenv, buildRustCrate, fetchgit }: -let kernel = stdenv.hostPlatform.parsed.kernel.name; - abi = stdenv.hostPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; - updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); - mapFeatures = features: map (fun: fun { features = features; }); - mkFeatures = feat: lib.lists.foldl (features: featureName: - if feat.${featureName} or false then - [ featureName ] ++ features - else - features - ) [] (builtins.attrNames feat); -in -rec { - cargo_update = f: cargo_update_1_5_2 { features = cargo_update_1_5_2_features { cargo_update_1_5_2 = f; }; }; - advapi32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "advapi32-sys"; - version = "0.2.0"; - authors = [ "Peter Atashian " ]; - sha256 = "1l6789hkz2whd9gklwz1m379kcvyizaj8nnzj3rn4a5h79yg59v7"; - libName = "advapi32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.6.4"; - authors = [ "Andrew Gallant " ]; - sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888"; - libName = "aho_corasick"; - crateBin = [ { name = "aho-corasick-dot"; } ]; - inherit dependencies buildDependencies features; - }; - ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ansi_term"; - version = "0.11.0"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; - sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; - inherit dependencies buildDependencies features; - }; - array_tool_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "array_tool"; - version = "1.0.3"; - authors = [ "Daniel P. Clark <6ftdan@gmail.com>" ]; - sha256 = "0igg0zvhcvjc15vgg6vjxjfifn2w4scjq9c8i1b2abv1sy2cgc86"; - inherit dependencies buildDependencies features; - }; - atty_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "atty"; - version = "0.2.10"; - authors = [ "softprops " ]; - sha256 = "1h26lssj8rwaz0xhwwm5a645r49yly211amfmd243m3m0jl49i2c"; - inherit dependencies buildDependencies features; - }; - bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.9.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; - inherit dependencies buildDependencies features; - }; - bitflags_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "1.0.3"; - authors = [ "The Rust Project Developers" ]; - sha256 = "162p4w4h1ad76awq6b5yivmls3d50m9cl27d8g588lsps6g8s5rw"; - inherit dependencies buildDependencies features; - }; - cargo_update_1_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cargo-update"; - version = "1.5.2"; - authors = [ "nabijaczleweli " "Yann Simon " "ven " "Cat Plus Plus " "Liigo " "azyobuzin " "Tatsuyuki Ishi " "Tom Prince " "Mateusz Mikuła " "sinkuu " "Alex Burka " "Matthias Krüger " "Daniel Holbert " ]; - src = ./.; - crateBin = [ { name = "cargo-install-update"; path = "src/main.rs"; } { name = "cargo-install-update-config"; path = "src/main-config.rs"; } ]; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - cc_1_0_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cc"; - version = "1.0.15"; - authors = [ "Alex Crichton " ]; - sha256 = "1zmcv4zf888byhay2qakqlc9b8snhy5ccfs35zb6flywmlj8f2c0"; - inherit dependencies buildDependencies features; - }; - clap_2_31_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "clap"; - version = "2.31.2"; - authors = [ "Kevin K. " ]; - sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72"; - inherit dependencies buildDependencies features; - }; - cmake_0_1_31_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cmake"; - version = "0.1.31"; - authors = [ "Alex Crichton " ]; - sha256 = "18j5fci486s7v5yjvv2ik3nsp4lk0fn0b8js5k6c4dviml476vz2"; - inherit dependencies buildDependencies features; - }; - curl_sys_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "curl-sys"; - version = "0.4.5"; - authors = [ "Carl Lerche " "Alex Crichton " ]; - sha256 = "149nswzwzr1lx0ki8awbppm7kf8nb268pc3zhzmvbs5fliq075qw"; - libPath = "lib.rs"; - libName = "curl_sys"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - embed_resource_1_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "embed-resource"; - version = "1.1.4"; - authors = [ "nabijaczleweli " "Cat Plus Plus " "Liigo " "azyobuzin " "Peter Atashian " ]; - sha256 = "1n07qys5904mkcididfgh1m6g8nfgl93pdpygaqn4dkhm5cxssfd"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon"; - version = "0.3.3"; - authors = [ "Raph Levien " ]; - sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon-sys"; - version = "0.3.3"; - authors = [ "Raph Levien " ]; - sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; - inherit dependencies buildDependencies features; - }; - git2_0_6_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "git2"; - version = "0.6.11"; - authors = [ "Alex Crichton " ]; - sha256 = "0jznfnk2n7nk250cj52k3mxjqgan7gwyrh3h7dkhqqs2zfx4ylvd"; - inherit dependencies buildDependencies features; - }; - idna_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "idna"; - version = "0.1.4"; - authors = [ "The rust-url developers" ]; - sha256 = "15j44qgjx1skwg9i7f4cm36ni4n99b1ayx23yxx7axxcw8vjf336"; - inherit dependencies buildDependencies features; - }; - json_0_11_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "json"; - version = "0.11.13"; - authors = [ "Maciej Hirsz " ]; - sha256 = "03227jaj6rjlfigsk4rmc0b83b1djlh42grfjaxk0d2xvgdb893i"; - inherit dependencies buildDependencies features; - }; - kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - authors = [ "Peter Atashian " ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "1.0.0"; - authors = [ "Marvin Löbel " ]; - sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh"; - inherit dependencies buildDependencies features; - }; - lazysort_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazysort"; - version = "0.2.0"; - authors = [ "Ben Ashford" ]; - sha256 = "0dv9bryg10hj8cycmdxpcc9y14i958yjr2hm4c3i9168q0y7njdz"; - inherit dependencies buildDependencies features; - }; - libc_0_2_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.40"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83"; - inherit dependencies buildDependencies features; - }; - libgit2_sys_0_6_19_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libgit2-sys"; - version = "0.6.19"; - authors = [ "Alex Crichton " ]; - sha256 = "13044s468adsx3sq4qvr4vnbr6nr5hq23lls8wn0a415jdl3qbcg"; - libPath = "lib.rs"; - libName = "libgit2_sys"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - libssh2_sys_0_2_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libssh2-sys"; - version = "0.2.7"; - authors = [ "Alex Crichton " ]; - sha256 = "1mr683x23l7f0mmc10vd5fnarfqpd7wqxs3rxyhq2igrh3fn0m2v"; - libPath = "lib.rs"; - libName = "libssh2_sys"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - libz_sys_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libz-sys"; - version = "1.0.18"; - authors = [ "Alex Crichton " ]; - sha256 = "0lr0rvmmfbfa4g7mhi0l93i8jq86pfcssdv4d40kzfy45ajdcgim"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - matches_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "matches"; - version = "0.1.6"; - authors = [ "Simon Sapin " ]; - sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "2.0.1"; - authors = [ "Andrew Gallant " "bluss" ]; - sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr"; - inherit dependencies buildDependencies features; - }; - openssl_probe_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "openssl-probe"; - version = "0.1.2"; - authors = [ "Alex Crichton " ]; - sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a"; - inherit dependencies buildDependencies features; - }; - openssl_sys_0_9_30_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "openssl-sys"; - version = "0.9.30"; - authors = [ "Alex Crichton " "Steven Fackler " ]; - sha256 = "1p5y3md4crbmg0lcfkdl8pp3kf9k82vghjy28x7ix5mji3j2p87a"; - inherit dependencies buildDependencies features; - }; - percent_encoding_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "percent-encoding"; - version = "1.0.1"; - authors = [ "The rust-url developers" ]; - sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - pkg_config_0_3_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.11"; - authors = [ "Alex Crichton " ]; - sha256 = "177kbs465skvzmb2d9bh7aa5lqm0npfig12awcbd34c6k6nlyr5h"; - inherit dependencies buildDependencies features; - }; - proc_macro2_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "proc-macro2"; - version = "0.3.8"; - authors = [ "Alex Crichton " ]; - sha256 = "0ixnavxcd6sk1861hjgnfxly7qgq4ch1iplsx0nclvjjkwg39qdc"; - inherit dependencies buildDependencies features; - }; - quote_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quote"; - version = "0.5.2"; - authors = [ "David Tolnay " ]; - sha256 = "062cnp12j09x0z0nj4j5pfh26h35zlrks07asxgqhfhcym1ba595"; - inherit dependencies buildDependencies features; - }; - rand_0_3_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.3.22"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0wrj12acx7l4hr7ag3nz8b50yhp8ancyq988bzmnnsxln67rsys0"; - inherit dependencies buildDependencies features; - }; - rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.4.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; - inherit dependencies buildDependencies features; - }; - redox_syscall_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.37"; - authors = [ "Jeremy Soller " ]; - sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v"; - libName = "syscall"; - inherit dependencies buildDependencies features; - }; - redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_termios"; - version = "0.1.1"; - authors = [ "Jeremy Soller " ]; - sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - regex_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex"; - version = "0.2.11"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0r50cymxdqp0fv1dxd22mjr6y32q450nwacd279p9s7lh0cafijj"; - inherit dependencies buildDependencies features; - }; - regex_syntax_0_5_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.5.6"; - authors = [ "The Rust Project Developers" ]; - sha256 = "10vf3r34bgjnbrnqd5aszn35bjvm8insw498l1vjy8zx5yms3427"; - inherit dependencies buildDependencies features; - }; - semver_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver"; - version = "0.9.0"; - authors = [ "Steve Klabnik " "The Rust Project Developers" ]; - sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63"; - inherit dependencies buildDependencies features; - }; - semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver-parser"; - version = "0.7.0"; - authors = [ "Steve Klabnik " ]; - sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; - inherit dependencies buildDependencies features; - }; - serde_1_0_55_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde"; - version = "1.0.55"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1vpslfs3j8xbl3srmzppa34h0908q0sj4hyrmlrpklhldii5vbqh"; - inherit dependencies buildDependencies features; - }; - serde_derive_1_0_55_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive"; - version = "1.0.55"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1ggcidzgi51l3lsdf8gg46ivn61py8rnrf6garpcxwmdbfcc8lgk"; - procMacro = true; - inherit dependencies buildDependencies features; - }; - strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "strsim"; - version = "0.7.0"; - authors = [ "Danny Guo " ]; - sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; - inherit dependencies buildDependencies features; - }; - syn_0_13_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "syn"; - version = "0.13.10"; - authors = [ "David Tolnay " ]; - sha256 = "0dbvdxlpvx7f8iw5cbv88vbyszp72df8y8zhl36gj73g1xwdqfhx"; - inherit dependencies buildDependencies features; - }; - tabwriter_1_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tabwriter"; - version = "1.0.4"; - authors = [ "Andrew Gallant " ]; - sha256 = "02yk7db101lqn24wnm15yy8xb095kv9bnkdvyj7vqhx40vixyibd"; - inherit dependencies buildDependencies features; - }; - termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "termion"; - version = "1.5.1"; - authors = [ "ticki " "gycos " "IGI-111 " ]; - sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; - inherit dependencies buildDependencies features; - }; - textwrap_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "textwrap"; - version = "0.9.0"; - authors = [ "Martin Geisler " ]; - sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; - inherit dependencies buildDependencies features; - }; - thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread_local"; - version = "0.3.5"; - authors = [ "Amanieu d'Antras " ]; - sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6"; - inherit dependencies buildDependencies features; - }; - toml_0_4_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "toml"; - version = "0.4.6"; - authors = [ "Alex Crichton " ]; - sha256 = "0rfl7lyb5f67spk69s604nw87f97g7fvv36hj9v88qlr2bwyrn8v"; - inherit dependencies buildDependencies features; - }; - ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ucd-util"; - version = "0.1.1"; - authors = [ "Andrew Gallant " ]; - sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; - inherit dependencies buildDependencies features; - }; - unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-bidi"; - version = "0.3.4"; - authors = [ "The Servo Project Developers" ]; - sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; - libName = "unicode_bidi"; - inherit dependencies buildDependencies features; - }; - unicode_normalization_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-normalization"; - version = "0.1.7"; - authors = [ "kwantam " ]; - sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; - inherit dependencies buildDependencies features; - }; - unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.4"; - authors = [ "kwantam " ]; - sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; - inherit dependencies buildDependencies features; - }; - unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-xid"; - version = "0.1.0"; - authors = [ "erick.tryzelaar " "kwantam " ]; - sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; - inherit dependencies buildDependencies features; - }; - unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unreachable"; - version = "1.0.0"; - authors = [ "Jonathan Reem " ]; - sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; - inherit dependencies buildDependencies features; - }; - url_1_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "url"; - version = "1.7.0"; - authors = [ "The rust-url developers" ]; - sha256 = "0333ynhkp47hna88aamz1zpk4lxyzx4ab9n7yhc75g14w27cv8jj"; - inherit dependencies buildDependencies features; - }; - utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "utf8-ranges"; - version = "1.0.0"; - authors = [ "Andrew Gallant " ]; - sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; - inherit dependencies buildDependencies features; - }; - vcpkg_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vcpkg"; - version = "0.2.3"; - authors = [ "Jim McGrath " ]; - sha256 = "0achi8sfy0wm4q04gj7nwpq9xfx8ynk6vv4r12a3ijg26hispq0c"; - inherit dependencies buildDependencies features; - }; - vec_map_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vec_map"; - version = "0.8.1"; - authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; - sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi"; - inherit dependencies buildDependencies features; - }; - void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "void"; - version = "1.0.2"; - authors = [ "Jonathan Reem " ]; - sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; - inherit dependencies buildDependencies features; - }; - winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.2.8"; - authors = [ "Peter Atashian " ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; - inherit dependencies buildDependencies features; - }; - winapi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.3.4"; - authors = [ "Peter Atashian " ]; - sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; - authors = [ "Peter Atashian " ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; - inherit dependencies buildDependencies features; - }; - winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-i686-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian " ]; - sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-x86_64-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian " ]; - sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winreg_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winreg"; - version = "0.4.0"; - authors = [ "Igor Shaula " ]; - sha256 = "1zhk2a6qwyfpvwjd929qs0y6zzxl7g90pnz59qhazfg72m36iwda"; - inherit dependencies buildDependencies features; - }; - advapi32_sys_0_2_0 = { features?(advapi32_sys_0_2_0_features {}) }: advapi32_sys_0_2_0_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - advapi32_sys_0_2_0_features = f: updateFeatures f ({ - advapi32_sys_0_2_0.default = (f.advapi32_sys_0_2_0.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ { - dependencies = mapFeatures features ([ memchr_2_0_1 ]); - }; - aho_corasick_0_6_4_features = f: updateFeatures f ({ - aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true); - memchr_2_0_1.default = true; - }) [ memchr_2_0_1_features ]; - ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - ansi_term_0_11_0_features = f: updateFeatures f ({ - ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.errhandlingapi = true; - winapi_0_3_4.processenv = true; - }) [ winapi_0_3_4_features ]; - array_tool_1_0_3 = { features?(array_tool_1_0_3_features {}) }: array_tool_1_0_3_ {}; - array_tool_1_0_3_features = f: updateFeatures f ({ - array_tool_1_0_3.default = (f.array_tool_1_0_3.default or true); - }) []; - atty_0_2_10 = { features?(atty_0_2_10_features {}) }: atty_0_2_10_ { - dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - atty_0_2_10_features = f: updateFeatures f ({ - atty_0_2_10.default = (f.atty_0_2_10.default or true); - libc_0_2_40.default = (f.libc_0_2_40.default or false); - termion_1_5_1.default = true; - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.minwinbase = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.processenv = true; - winapi_0_3_4.winbase = true; - }) [ termion_1_5_1_features libc_0_2_40_features winapi_0_3_4_features ]; - bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { - features = mkFeatures (features.bitflags_0_9_1 or {}); - }; - bitflags_0_9_1_features = f: updateFeatures f (rec { - bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true); - bitflags_0_9_1.example_generated = - (f.bitflags_0_9_1.example_generated or false) || - (f.bitflags_0_9_1.default or false) || - (bitflags_0_9_1.default or false); - }) []; - bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ { - features = mkFeatures (features.bitflags_1_0_3 or {}); - }; - bitflags_1_0_3_features = f: updateFeatures f ({ - bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true); - }) []; - cargo_update_1_5_2 = { features?(cargo_update_1_5_2_features {}) }: cargo_update_1_5_2_ { - dependencies = mapFeatures features ([ array_tool_1_0_3 clap_2_31_2 git2_0_6_11 json_0_11_13 lazy_static_1_0_0 lazysort_0_2_0 regex_0_2_11 semver_0_9_0 serde_1_0_55 serde_derive_1_0_55 tabwriter_1_0_4 toml_0_4_6 url_1_7_0 ]); - buildDependencies = mapFeatures features ([ embed_resource_1_1_4 ]); - }; - cargo_update_1_5_2_features = f: updateFeatures f ({ - array_tool_1_0_3.default = true; - cargo_update_1_5_2.default = (f.cargo_update_1_5_2.default or true); - clap_2_31_2.default = true; - embed_resource_1_1_4.default = true; - git2_0_6_11.default = true; - json_0_11_13.default = true; - lazy_static_1_0_0.default = true; - lazysort_0_2_0.default = true; - regex_0_2_11.default = true; - semver_0_9_0.default = true; - semver_0_9_0.serde = true; - serde_1_0_55.default = true; - serde_derive_1_0_55.default = true; - tabwriter_1_0_4.default = true; - toml_0_4_6.default = true; - url_1_7_0.default = true; - }) [ array_tool_1_0_3_features clap_2_31_2_features git2_0_6_11_features json_0_11_13_features lazy_static_1_0_0_features lazysort_0_2_0_features regex_0_2_11_features semver_0_9_0_features serde_1_0_55_features serde_derive_1_0_55_features tabwriter_1_0_4_features toml_0_4_6_features url_1_7_0_features embed_resource_1_1_4_features ]; - cc_1_0_15 = { features?(cc_1_0_15_features {}) }: cc_1_0_15_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.cc_1_0_15 or {}); - }; - cc_1_0_15_features = f: updateFeatures f (rec { - cc_1_0_15.default = (f.cc_1_0_15.default or true); - cc_1_0_15.rayon = - (f.cc_1_0_15.rayon or false) || - (f.cc_1_0_15.parallel or false) || - (cc_1_0_15.parallel or false); - }) []; - clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ { - dependencies = mapFeatures features ([ bitflags_1_0_3 textwrap_0_9_0 unicode_width_0_1_4 ] - ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_10 ] else []) - ++ (if features.clap_2_31_2.strsim or false then [ strsim_0_7_0 ] else []) - ++ (if features.clap_2_31_2.vec_map or false then [ vec_map_0_8_1 ] else [])) - ++ (if !(kernel == "windows") then mapFeatures features ([ ] - ++ (if features.clap_2_31_2.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []); - features = mkFeatures (features.clap_2_31_2 or {}); - }; - clap_2_31_2_features = f: updateFeatures f (rec { - ansi_term_0_11_0.default = true; - atty_0_2_10.default = true; - bitflags_1_0_3.default = true; - clap_2_31_2.ansi_term = - (f.clap_2_31_2.ansi_term or false) || - (f.clap_2_31_2.color or false) || - (clap_2_31_2.color or false); - clap_2_31_2.atty = - (f.clap_2_31_2.atty or false) || - (f.clap_2_31_2.color or false) || - (clap_2_31_2.color or false); - clap_2_31_2.clippy = - (f.clap_2_31_2.clippy or false) || - (f.clap_2_31_2.lints or false) || - (clap_2_31_2.lints or false); - clap_2_31_2.color = - (f.clap_2_31_2.color or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.default = (f.clap_2_31_2.default or true); - clap_2_31_2.strsim = - (f.clap_2_31_2.strsim or false) || - (f.clap_2_31_2.suggestions or false) || - (clap_2_31_2.suggestions or false); - clap_2_31_2.suggestions = - (f.clap_2_31_2.suggestions or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.term_size = - (f.clap_2_31_2.term_size or false) || - (f.clap_2_31_2.wrap_help or false) || - (clap_2_31_2.wrap_help or false); - clap_2_31_2.vec_map = - (f.clap_2_31_2.vec_map or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.yaml = - (f.clap_2_31_2.yaml or false) || - (f.clap_2_31_2.doc or false) || - (clap_2_31_2.doc or false); - clap_2_31_2.yaml-rust = - (f.clap_2_31_2.yaml-rust or false) || - (f.clap_2_31_2.yaml or false) || - (clap_2_31_2.yaml or false); - strsim_0_7_0.default = true; - textwrap_0_9_0.default = true; - textwrap_0_9_0.term_size = - (f.textwrap_0_9_0.term_size or false) || - (clap_2_31_2.wrap_help or false) || - (f.clap_2_31_2.wrap_help or false); - unicode_width_0_1_4.default = true; - vec_map_0_8_1.default = true; - }) [ atty_0_2_10_features bitflags_1_0_3_features strsim_0_7_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_1_features ansi_term_0_11_0_features ]; - cmake_0_1_31 = { features?(cmake_0_1_31_features {}) }: cmake_0_1_31_ { - dependencies = mapFeatures features ([ cc_1_0_15 ]); - }; - cmake_0_1_31_features = f: updateFeatures f ({ - cc_1_0_15.default = true; - cmake_0_1_31.default = (f.cmake_0_1_31.default or true); - }) [ cc_1_0_15_features ]; - curl_sys_0_4_5 = { features?(curl_sys_0_4_5_features {}) }: curl_sys_0_4_5_ { - dependencies = mapFeatures features ([ libc_0_2_40 libz_sys_1_0_18 ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then mapFeatures features ([ openssl_sys_0_9_30 ]) else []) - ++ (if abi == "msvc" then mapFeatures features ([]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]); - }; - curl_sys_0_4_5_features = f: updateFeatures f ({ - cc_1_0_15.default = true; - curl_sys_0_4_5.default = (f.curl_sys_0_4_5.default or true); - libc_0_2_40.default = true; - libz_sys_1_0_18.default = true; - openssl_sys_0_9_30.default = true; - pkg_config_0_3_11.default = true; - winapi_0_3_4.default = true; - winapi_0_3_4.winsock2 = true; - winapi_0_3_4.ws2def = true; - }) [ libc_0_2_40_features libz_sys_1_0_18_features cc_1_0_15_features pkg_config_0_3_11_features openssl_sys_0_9_30_features winapi_0_3_4_features ]; - embed_resource_1_1_4 = { features?(embed_resource_1_1_4_features {}) }: embed_resource_1_1_4_ { - dependencies = (if kernel == "windows" && abi == "msvc" then mapFeatures features ([ winreg_0_4_0 ]) else []); - }; - embed_resource_1_1_4_features = f: updateFeatures f ({ - embed_resource_1_1_4.default = (f.embed_resource_1_1_4.default or true); - winreg_0_4_0.default = (f.winreg_0_4_0.default or false); - }) [ winreg_0_4_0_features ]; - fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { - dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]); - }; - fuchsia_zircon_0_3_3_features = f: updateFeatures f ({ - bitflags_1_0_3.default = true; - fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); - fuchsia_zircon_sys_0_3_3.default = true; - }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ]; - fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; - fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f ({ - fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); - }) []; - git2_0_6_11 = { features?(git2_0_6_11_features {}) }: git2_0_6_11_ { - dependencies = mapFeatures features ([ bitflags_0_9_1 libc_0_2_40 libgit2_sys_0_6_19 url_1_7_0 ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then mapFeatures features ([ ] - ++ (if features.git2_0_6_11.openssl-probe or false then [ openssl_probe_0_1_2 ] else []) - ++ (if features.git2_0_6_11.openssl-sys or false then [ openssl_sys_0_9_30 ] else [])) else []); - features = mkFeatures (features.git2_0_6_11 or {}); - }; - git2_0_6_11_features = f: updateFeatures f (rec { - bitflags_0_9_1.default = true; - git2_0_6_11.curl = - (f.git2_0_6_11.curl or false) || - (f.git2_0_6_11.default or false) || - (git2_0_6_11.default or false); - git2_0_6_11.default = (f.git2_0_6_11.default or true); - git2_0_6_11.https = - (f.git2_0_6_11.https or false) || - (f.git2_0_6_11.default or false) || - (git2_0_6_11.default or false); - git2_0_6_11.openssl-probe = - (f.git2_0_6_11.openssl-probe or false) || - (f.git2_0_6_11.https or false) || - (git2_0_6_11.https or false); - git2_0_6_11.openssl-sys = - (f.git2_0_6_11.openssl-sys or false) || - (f.git2_0_6_11.https or false) || - (git2_0_6_11.https or false); - git2_0_6_11.ssh = - (f.git2_0_6_11.ssh or false) || - (f.git2_0_6_11.default or false) || - (git2_0_6_11.default or false); - libc_0_2_40.default = true; - libgit2_sys_0_6_19.curl = - (f.libgit2_sys_0_6_19.curl or false) || - (git2_0_6_11.curl or false) || - (f.git2_0_6_11.curl or false); - libgit2_sys_0_6_19.default = true; - libgit2_sys_0_6_19.https = - (f.libgit2_sys_0_6_19.https or false) || - (git2_0_6_11.https or false) || - (f.git2_0_6_11.https or false); - libgit2_sys_0_6_19.ssh = - (f.libgit2_sys_0_6_19.ssh or false) || - (git2_0_6_11.ssh or false) || - (f.git2_0_6_11.ssh or false); - openssl_probe_0_1_2.default = true; - openssl_sys_0_9_30.default = true; - url_1_7_0.default = true; - }) [ bitflags_0_9_1_features libc_0_2_40_features libgit2_sys_0_6_19_features url_1_7_0_features openssl_probe_0_1_2_features openssl_sys_0_9_30_features ]; - idna_0_1_4 = { features?(idna_0_1_4_features {}) }: idna_0_1_4_ { - dependencies = mapFeatures features ([ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]); - }; - idna_0_1_4_features = f: updateFeatures f ({ - idna_0_1_4.default = (f.idna_0_1_4.default or true); - matches_0_1_6.default = true; - unicode_bidi_0_3_4.default = true; - unicode_normalization_0_1_7.default = true; - }) [ matches_0_1_6_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ]; - json_0_11_13 = { features?(json_0_11_13_features {}) }: json_0_11_13_ {}; - json_0_11_13_features = f: updateFeatures f ({ - json_0_11_13.default = (f.json_0_11_13.default or true); - }) []; - kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - kernel32_sys_0_2_2_features = f: updateFeatures f ({ - kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazy_static_1_0_0 or {}); - }; - lazy_static_1_0_0_features = f: updateFeatures f (rec { - lazy_static_1_0_0.compiletest_rs = - (f.lazy_static_1_0_0.compiletest_rs or false) || - (f.lazy_static_1_0_0.compiletest or false) || - (lazy_static_1_0_0.compiletest or false); - lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true); - lazy_static_1_0_0.nightly = - (f.lazy_static_1_0_0.nightly or false) || - (f.lazy_static_1_0_0.spin_no_std or false) || - (lazy_static_1_0_0.spin_no_std or false); - lazy_static_1_0_0.spin = - (f.lazy_static_1_0_0.spin or false) || - (f.lazy_static_1_0_0.spin_no_std or false) || - (lazy_static_1_0_0.spin_no_std or false); - }) []; - lazysort_0_2_0 = { features?(lazysort_0_2_0_features {}) }: lazysort_0_2_0_ { - dependencies = mapFeatures features ([ rand_0_3_22 ]); - features = mkFeatures (features.lazysort_0_2_0 or {}); - }; - lazysort_0_2_0_features = f: updateFeatures f ({ - lazysort_0_2_0.default = (f.lazysort_0_2_0.default or true); - rand_0_3_22.default = true; - }) [ rand_0_3_22_features ]; - libc_0_2_40 = { features?(libc_0_2_40_features {}) }: libc_0_2_40_ { - features = mkFeatures (features.libc_0_2_40 or {}); - }; - libc_0_2_40_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or true); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (f.libc_0_2_40.default or false) || - (libc_0_2_40.default or false); - }) []; - libgit2_sys_0_6_19 = { features?(libgit2_sys_0_6_19_features {}) }: libgit2_sys_0_6_19_ { - dependencies = mapFeatures features ([ libc_0_2_40 libz_sys_1_0_18 ] - ++ (if features.libgit2_sys_0_6_19.curl-sys or false then [ curl_sys_0_4_5 ] else []) - ++ (if features.libgit2_sys_0_6_19.libssh2-sys or false then [ libssh2_sys_0_2_7 ] else [])) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] - ++ (if features.libgit2_sys_0_6_19.openssl-sys or false then [ openssl_sys_0_9_30 ] else [])) else []); - buildDependencies = mapFeatures features ([ cc_1_0_15 cmake_0_1_31 pkg_config_0_3_11 ]); - features = mkFeatures (features.libgit2_sys_0_6_19 or {}); - }; - libgit2_sys_0_6_19_features = f: updateFeatures f (rec { - cc_1_0_15.default = true; - cmake_0_1_31.default = true; - curl_sys_0_4_5.default = true; - libc_0_2_40.default = true; - libgit2_sys_0_6_19.curl-sys = - (f.libgit2_sys_0_6_19.curl-sys or false) || - (f.libgit2_sys_0_6_19.curl or false) || - (libgit2_sys_0_6_19.curl or false); - libgit2_sys_0_6_19.default = (f.libgit2_sys_0_6_19.default or true); - libgit2_sys_0_6_19.libssh2-sys = - (f.libgit2_sys_0_6_19.libssh2-sys or false) || - (f.libgit2_sys_0_6_19.ssh or false) || - (libgit2_sys_0_6_19.ssh or false); - libgit2_sys_0_6_19.openssl-sys = - (f.libgit2_sys_0_6_19.openssl-sys or false) || - (f.libgit2_sys_0_6_19.https or false) || - (libgit2_sys_0_6_19.https or false); - libssh2_sys_0_2_7.default = true; - libz_sys_1_0_18.default = true; - openssl_sys_0_9_30.default = true; - pkg_config_0_3_11.default = true; - }) [ curl_sys_0_4_5_features libc_0_2_40_features libssh2_sys_0_2_7_features libz_sys_1_0_18_features cc_1_0_15_features cmake_0_1_31_features pkg_config_0_3_11_features openssl_sys_0_9_30_features ]; - libssh2_sys_0_2_7 = { features?(libssh2_sys_0_2_7_features {}) }: libssh2_sys_0_2_7_ { - dependencies = mapFeatures features ([ libc_0_2_40 libz_sys_1_0_18 ]) - ++ (if abi == "msvc" then mapFeatures features ([]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ openssl_sys_0_9_30 ]) else []); - buildDependencies = mapFeatures features ([ cmake_0_1_31 pkg_config_0_3_11 ]); - }; - libssh2_sys_0_2_7_features = f: updateFeatures f ({ - cmake_0_1_31.default = true; - libc_0_2_40.default = true; - libssh2_sys_0_2_7.default = (f.libssh2_sys_0_2_7.default or true); - libz_sys_1_0_18.default = true; - openssl_sys_0_9_30.default = true; - pkg_config_0_3_11.default = true; - }) [ libc_0_2_40_features libz_sys_1_0_18_features cmake_0_1_31_features pkg_config_0_3_11_features openssl_sys_0_9_30_features ]; - libz_sys_1_0_18 = { features?(libz_sys_1_0_18_features {}) }: libz_sys_1_0_18_ { - dependencies = mapFeatures features ([ libc_0_2_40 ]) - ++ (if abi == "msvc" then mapFeatures features ([]) else []); - buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]); - }; - libz_sys_1_0_18_features = f: updateFeatures f ({ - cc_1_0_15.default = true; - libc_0_2_40.default = true; - libz_sys_1_0_18.default = (f.libz_sys_1_0_18.default or true); - pkg_config_0_3_11.default = true; - }) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ]; - matches_0_1_6 = { features?(matches_0_1_6_features {}) }: matches_0_1_6_ {}; - matches_0_1_6_features = f: updateFeatures f ({ - matches_0_1_6.default = (f.matches_0_1_6.default or true); - }) []; - memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ { - dependencies = mapFeatures features ([ ] - ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_40 ] else [])); - features = mkFeatures (features.memchr_2_0_1 or {}); - }; - memchr_2_0_1_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or false); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (memchr_2_0_1.use_std or false) || - (f.memchr_2_0_1.use_std or false); - memchr_2_0_1.default = (f.memchr_2_0_1.default or true); - memchr_2_0_1.libc = - (f.memchr_2_0_1.libc or false) || - (f.memchr_2_0_1.default or false) || - (memchr_2_0_1.default or false) || - (f.memchr_2_0_1.use_std or false) || - (memchr_2_0_1.use_std or false); - memchr_2_0_1.use_std = - (f.memchr_2_0_1.use_std or false) || - (f.memchr_2_0_1.default or false) || - (memchr_2_0_1.default or false); - }) [ libc_0_2_40_features ]; - openssl_probe_0_1_2 = { features?(openssl_probe_0_1_2_features {}) }: openssl_probe_0_1_2_ {}; - openssl_probe_0_1_2_features = f: updateFeatures f ({ - openssl_probe_0_1_2.default = (f.openssl_probe_0_1_2.default or true); - }) []; - openssl_sys_0_9_30 = { features?(openssl_sys_0_9_30_features {}) }: openssl_sys_0_9_30_ { - dependencies = mapFeatures features ([ libc_0_2_40 ]) - ++ (if abi == "msvc" then mapFeatures features ([]) else []); - buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]); - }; - openssl_sys_0_9_30_features = f: updateFeatures f ({ - cc_1_0_15.default = true; - libc_0_2_40.default = true; - openssl_sys_0_9_30.default = (f.openssl_sys_0_9_30.default or true); - pkg_config_0_3_11.default = true; - }) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ]; - percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {}; - percent_encoding_1_0_1_features = f: updateFeatures f ({ - percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true); - }) []; - pkg_config_0_3_11 = { features?(pkg_config_0_3_11_features {}) }: pkg_config_0_3_11_ {}; - pkg_config_0_3_11_features = f: updateFeatures f ({ - pkg_config_0_3_11.default = (f.pkg_config_0_3_11.default or true); - }) []; - proc_macro2_0_3_8 = { features?(proc_macro2_0_3_8_features {}) }: proc_macro2_0_3_8_ { - dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]); - features = mkFeatures (features.proc_macro2_0_3_8 or {}); - }; - proc_macro2_0_3_8_features = f: updateFeatures f (rec { - proc_macro2_0_3_8.default = (f.proc_macro2_0_3_8.default or true); - proc_macro2_0_3_8.proc-macro = - (f.proc_macro2_0_3_8.proc-macro or false) || - (f.proc_macro2_0_3_8.default or false) || - (proc_macro2_0_3_8.default or false) || - (f.proc_macro2_0_3_8.nightly or false) || - (proc_macro2_0_3_8.nightly or false); - unicode_xid_0_1_0.default = true; - }) [ unicode_xid_0_1_0_features ]; - quote_0_5_2 = { features?(quote_0_5_2_features {}) }: quote_0_5_2_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_8 ]); - features = mkFeatures (features.quote_0_5_2 or {}); - }; - quote_0_5_2_features = f: updateFeatures f (rec { - proc_macro2_0_3_8.default = (f.proc_macro2_0_3_8.default or false); - proc_macro2_0_3_8.proc-macro = - (f.proc_macro2_0_3_8.proc-macro or false) || - (quote_0_5_2.proc-macro or false) || - (f.quote_0_5_2.proc-macro or false); - quote_0_5_2.default = (f.quote_0_5_2.default or true); - quote_0_5_2.proc-macro = - (f.quote_0_5_2.proc-macro or false) || - (f.quote_0_5_2.default or false) || - (quote_0_5_2.default or false); - }) [ proc_macro2_0_3_8_features ]; - rand_0_3_22 = { features?(rand_0_3_22_features {}) }: rand_0_3_22_ { - dependencies = mapFeatures features ([ libc_0_2_40 rand_0_4_2 ]) - ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []); - features = mkFeatures (features.rand_0_3_22 or {}); - }; - rand_0_3_22_features = f: updateFeatures f (rec { - fuchsia_zircon_0_3_3.default = true; - libc_0_2_40.default = true; - rand_0_3_22.default = (f.rand_0_3_22.default or true); - rand_0_3_22.i128_support = - (f.rand_0_3_22.i128_support or false) || - (f.rand_0_3_22.nightly or false) || - (rand_0_3_22.nightly or false); - rand_0_4_2.default = true; - }) [ libc_0_2_40_features rand_0_4_2_features fuchsia_zircon_0_3_3_features ]; - rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ { - dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] - ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_40 ] else [])) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - features = mkFeatures (features.rand_0_4_2 or {}); - }; - rand_0_4_2_features = f: updateFeatures f (rec { - fuchsia_zircon_0_3_3.default = true; - libc_0_2_40.default = true; - rand_0_4_2.default = (f.rand_0_4_2.default or true); - rand_0_4_2.i128_support = - (f.rand_0_4_2.i128_support or false) || - (f.rand_0_4_2.nightly or false) || - (rand_0_4_2.nightly or false); - rand_0_4_2.libc = - (f.rand_0_4_2.libc or false) || - (f.rand_0_4_2.std or false) || - (rand_0_4_2.std or false); - rand_0_4_2.std = - (f.rand_0_4_2.std or false) || - (f.rand_0_4_2.default or false) || - (rand_0_4_2.default or false); - winapi_0_3_4.default = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.ntsecapi = true; - winapi_0_3_4.profileapi = true; - winapi_0_3_4.winnt = true; - }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ]; - redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {}; - redox_syscall_0_1_37_features = f: updateFeatures f ({ - redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true); - }) []; - redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { - dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]); - }; - redox_termios_0_1_1_features = f: updateFeatures f ({ - redox_syscall_0_1_37.default = true; - redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); - }) [ redox_syscall_0_1_37_features ]; - regex_0_2_11 = { features?(regex_0_2_11_features {}) }: regex_0_2_11_ { - dependencies = mapFeatures features ([ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_5_6 thread_local_0_3_5 utf8_ranges_1_0_0 ]); - features = mkFeatures (features.regex_0_2_11 or {}); - }; - regex_0_2_11_features = f: updateFeatures f (rec { - aho_corasick_0_6_4.default = true; - memchr_2_0_1.default = true; - regex_0_2_11.default = (f.regex_0_2_11.default or true); - regex_0_2_11.pattern = - (f.regex_0_2_11.pattern or false) || - (f.regex_0_2_11.unstable or false) || - (regex_0_2_11.unstable or false); - regex_syntax_0_5_6.default = true; - thread_local_0_3_5.default = true; - utf8_ranges_1_0_0.default = true; - }) [ aho_corasick_0_6_4_features memchr_2_0_1_features regex_syntax_0_5_6_features thread_local_0_3_5_features utf8_ranges_1_0_0_features ]; - regex_syntax_0_5_6 = { features?(regex_syntax_0_5_6_features {}) }: regex_syntax_0_5_6_ { - dependencies = mapFeatures features ([ ucd_util_0_1_1 ]); - }; - regex_syntax_0_5_6_features = f: updateFeatures f ({ - regex_syntax_0_5_6.default = (f.regex_syntax_0_5_6.default or true); - ucd_util_0_1_1.default = true; - }) [ ucd_util_0_1_1_features ]; - semver_0_9_0 = { features?(semver_0_9_0_features {}) }: semver_0_9_0_ { - dependencies = mapFeatures features ([ semver_parser_0_7_0 ] - ++ (if features.semver_0_9_0.serde or false then [ serde_1_0_55 ] else [])); - features = mkFeatures (features.semver_0_9_0 or {}); - }; - semver_0_9_0_features = f: updateFeatures f (rec { - semver_0_9_0.default = (f.semver_0_9_0.default or true); - semver_0_9_0.serde = - (f.semver_0_9_0.serde or false) || - (f.semver_0_9_0.ci or false) || - (semver_0_9_0.ci or false); - semver_parser_0_7_0.default = true; - serde_1_0_55.default = true; - }) [ semver_parser_0_7_0_features serde_1_0_55_features ]; - semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {}; - semver_parser_0_7_0_features = f: updateFeatures f ({ - semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true); - }) []; - serde_1_0_55 = { features?(serde_1_0_55_features {}) }: serde_1_0_55_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.serde_1_0_55 or {}); - }; - serde_1_0_55_features = f: updateFeatures f (rec { - serde_1_0_55.default = (f.serde_1_0_55.default or true); - serde_1_0_55.serde_derive = - (f.serde_1_0_55.serde_derive or false) || - (f.serde_1_0_55.derive or false) || - (serde_1_0_55.derive or false); - serde_1_0_55.std = - (f.serde_1_0_55.std or false) || - (f.serde_1_0_55.default or false) || - (serde_1_0_55.default or false); - serde_1_0_55.unstable = - (f.serde_1_0_55.unstable or false) || - (f.serde_1_0_55.alloc or false) || - (serde_1_0_55.alloc or false); - }) []; - serde_derive_1_0_55 = { features?(serde_derive_1_0_55_features {}) }: serde_derive_1_0_55_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_8 quote_0_5_2 syn_0_13_10 ]); - features = mkFeatures (features.serde_derive_1_0_55 or {}); - }; - serde_derive_1_0_55_features = f: updateFeatures f ({ - proc_macro2_0_3_8.default = true; - quote_0_5_2.default = true; - serde_derive_1_0_55.default = (f.serde_derive_1_0_55.default or true); - syn_0_13_10.default = true; - syn_0_13_10.visit = true; - }) [ proc_macro2_0_3_8_features quote_0_5_2_features syn_0_13_10_features ]; - strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; - strsim_0_7_0_features = f: updateFeatures f ({ - strsim_0_7_0.default = (f.strsim_0_7_0.default or true); - }) []; - syn_0_13_10 = { features?(syn_0_13_10_features {}) }: syn_0_13_10_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_8 unicode_xid_0_1_0 ] - ++ (if features.syn_0_13_10.quote or false then [ quote_0_5_2 ] else [])); - features = mkFeatures (features.syn_0_13_10 or {}); - }; - syn_0_13_10_features = f: updateFeatures f (rec { - proc_macro2_0_3_8.default = (f.proc_macro2_0_3_8.default or false); - proc_macro2_0_3_8.proc-macro = - (f.proc_macro2_0_3_8.proc-macro or false) || - (syn_0_13_10.proc-macro or false) || - (f.syn_0_13_10.proc-macro or false); - quote_0_5_2.default = (f.quote_0_5_2.default or false); - quote_0_5_2.proc-macro = - (f.quote_0_5_2.proc-macro or false) || - (syn_0_13_10.proc-macro or false) || - (f.syn_0_13_10.proc-macro or false); - syn_0_13_10.clone-impls = - (f.syn_0_13_10.clone-impls or false) || - (f.syn_0_13_10.default or false) || - (syn_0_13_10.default or false); - syn_0_13_10.default = (f.syn_0_13_10.default or true); - syn_0_13_10.derive = - (f.syn_0_13_10.derive or false) || - (f.syn_0_13_10.default or false) || - (syn_0_13_10.default or false); - syn_0_13_10.parsing = - (f.syn_0_13_10.parsing or false) || - (f.syn_0_13_10.default or false) || - (syn_0_13_10.default or false); - syn_0_13_10.printing = - (f.syn_0_13_10.printing or false) || - (f.syn_0_13_10.default or false) || - (syn_0_13_10.default or false); - syn_0_13_10.proc-macro = - (f.syn_0_13_10.proc-macro or false) || - (f.syn_0_13_10.default or false) || - (syn_0_13_10.default or false); - syn_0_13_10.quote = - (f.syn_0_13_10.quote or false) || - (f.syn_0_13_10.printing or false) || - (syn_0_13_10.printing or false); - unicode_xid_0_1_0.default = true; - }) [ proc_macro2_0_3_8_features quote_0_5_2_features unicode_xid_0_1_0_features ]; - tabwriter_1_0_4 = { features?(tabwriter_1_0_4_features {}) }: tabwriter_1_0_4_ { - dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); - features = mkFeatures (features.tabwriter_1_0_4 or {}); - }; - tabwriter_1_0_4_features = f: updateFeatures f (rec { - tabwriter_1_0_4.default = (f.tabwriter_1_0_4.default or true); - tabwriter_1_0_4.lazy_static = - (f.tabwriter_1_0_4.lazy_static or false) || - (f.tabwriter_1_0_4.ansi_formatting or false) || - (tabwriter_1_0_4.ansi_formatting or false); - tabwriter_1_0_4.regex = - (f.tabwriter_1_0_4.regex or false) || - (f.tabwriter_1_0_4.ansi_formatting or false) || - (tabwriter_1_0_4.ansi_formatting or false); - unicode_width_0_1_4.default = true; - }) [ unicode_width_0_1_4_features ]; - termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { - dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []); - }; - termion_1_5_1_features = f: updateFeatures f ({ - libc_0_2_40.default = true; - redox_syscall_0_1_37.default = true; - redox_termios_0_1_1.default = true; - termion_1_5_1.default = (f.termion_1_5_1.default or true); - }) [ libc_0_2_40_features redox_syscall_0_1_37_features redox_termios_0_1_1_features ]; - textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ { - dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); - }; - textwrap_0_9_0_features = f: updateFeatures f ({ - textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true); - unicode_width_0_1_4.default = true; - }) [ unicode_width_0_1_4_features ]; - thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ { - dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]); - }; - thread_local_0_3_5_features = f: updateFeatures f ({ - lazy_static_1_0_0.default = true; - thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true); - unreachable_1_0_0.default = true; - }) [ lazy_static_1_0_0_features unreachable_1_0_0_features ]; - toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ { - dependencies = mapFeatures features ([ serde_1_0_55 ]); - }; - toml_0_4_6_features = f: updateFeatures f ({ - serde_1_0_55.default = true; - toml_0_4_6.default = (f.toml_0_4_6.default or true); - }) [ serde_1_0_55_features ]; - ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {}; - ucd_util_0_1_1_features = f: updateFeatures f ({ - ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true); - }) []; - unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ { - dependencies = mapFeatures features ([ matches_0_1_6 ]); - features = mkFeatures (features.unicode_bidi_0_3_4 or {}); - }; - unicode_bidi_0_3_4_features = f: updateFeatures f (rec { - matches_0_1_6.default = true; - unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true); - unicode_bidi_0_3_4.flame = - (f.unicode_bidi_0_3_4.flame or false) || - (f.unicode_bidi_0_3_4.flame_it or false) || - (unicode_bidi_0_3_4.flame_it or false); - unicode_bidi_0_3_4.flamer = - (f.unicode_bidi_0_3_4.flamer or false) || - (f.unicode_bidi_0_3_4.flame_it or false) || - (unicode_bidi_0_3_4.flame_it or false); - unicode_bidi_0_3_4.serde = - (f.unicode_bidi_0_3_4.serde or false) || - (f.unicode_bidi_0_3_4.with_serde or false) || - (unicode_bidi_0_3_4.with_serde or false); - }) [ matches_0_1_6_features ]; - unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {}; - unicode_normalization_0_1_7_features = f: updateFeatures f ({ - unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true); - }) []; - unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { - features = mkFeatures (features.unicode_width_0_1_4 or {}); - }; - unicode_width_0_1_4_features = f: updateFeatures f ({ - unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); - }) []; - unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ { - features = mkFeatures (features.unicode_xid_0_1_0 or {}); - }; - unicode_xid_0_1_0_features = f: updateFeatures f ({ - unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true); - }) []; - unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { - dependencies = mapFeatures features ([ void_1_0_2 ]); - }; - unreachable_1_0_0_features = f: updateFeatures f ({ - unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); - void_1_0_2.default = (f.void_1_0_2.default or false); - }) [ void_1_0_2_features ]; - url_1_7_0 = { features?(url_1_7_0_features {}) }: url_1_7_0_ { - dependencies = mapFeatures features ([ idna_0_1_4 matches_0_1_6 percent_encoding_1_0_1 ]); - features = mkFeatures (features.url_1_7_0 or {}); - }; - url_1_7_0_features = f: updateFeatures f (rec { - idna_0_1_4.default = true; - matches_0_1_6.default = true; - percent_encoding_1_0_1.default = true; - url_1_7_0.default = (f.url_1_7_0.default or true); - url_1_7_0.encoding = - (f.url_1_7_0.encoding or false) || - (f.url_1_7_0.query_encoding or false) || - (url_1_7_0.query_encoding or false); - url_1_7_0.heapsize = - (f.url_1_7_0.heapsize or false) || - (f.url_1_7_0.heap_size or false) || - (url_1_7_0.heap_size or false); - }) [ idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_1_features ]; - utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; - utf8_ranges_1_0_0_features = f: updateFeatures f ({ - utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); - }) []; - vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {}; - vcpkg_0_2_3_features = f: updateFeatures f ({ - vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true); - }) []; - vec_map_0_8_1 = { features?(vec_map_0_8_1_features {}) }: vec_map_0_8_1_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.vec_map_0_8_1 or {}); - }; - vec_map_0_8_1_features = f: updateFeatures f (rec { - vec_map_0_8_1.default = (f.vec_map_0_8_1.default or true); - vec_map_0_8_1.serde = - (f.vec_map_0_8_1.serde or false) || - (f.vec_map_0_8_1.eders or false) || - (vec_map_0_8_1.eders or false); - }) []; - void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { - features = mkFeatures (features.void_1_0_2 or {}); - }; - void_1_0_2_features = f: updateFeatures f (rec { - void_1_0_2.default = (f.void_1_0_2.default or true); - void_1_0_2.std = - (f.void_1_0_2.std or false) || - (f.void_1_0_2.default or false) || - (void_1_0_2.default or false); - }) []; - winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f ({ - winapi_0_2_8.default = (f.winapi_0_2_8.default or true); - }) []; - winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ { - dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else []) - ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); - features = mkFeatures (features.winapi_0_3_4 or {}); - }; - winapi_0_3_4_features = f: updateFeatures f ({ - winapi_0_3_4.default = (f.winapi_0_3_4.default or true); - winapi_i686_pc_windows_gnu_0_4_0.default = true; - winapi_x86_64_pc_windows_gnu_0_4_0.default = true; - }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; - winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f ({ - winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); - }) []; - winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; - winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({ - winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); - }) []; - winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; - winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({ - winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); - }) []; - winreg_0_4_0 = { features?(winreg_0_4_0_features {}) }: winreg_0_4_0_ { - dependencies = mapFeatures features ([ advapi32_sys_0_2_0 kernel32_sys_0_2_2 winapi_0_2_8 ]); - features = mkFeatures (features.winreg_0_4_0 or {}); - }; - winreg_0_4_0_features = f: updateFeatures f (rec { - advapi32_sys_0_2_0.default = true; - kernel32_sys_0_2_2.default = true; - winapi_0_2_8.default = true; - winreg_0_4_0.default = (f.winreg_0_4_0.default or true); - winreg_0_4_0.ktmw32-sys = - (f.winreg_0_4_0.ktmw32-sys or false) || - (f.winreg_0_4_0.transactions or false) || - (winreg_0_4_0.transactions or false); - winreg_0_4_0.rustc-serialize = - (f.winreg_0_4_0.rustc-serialize or false) || - (f.winreg_0_4_0.serialization-rustc or false) || - (winreg_0_4_0.serialization-rustc or false); - winreg_0_4_0.serialization-rustc = - (f.winreg_0_4_0.serialization-rustc or false) || - (f.winreg_0_4_0.default or false) || - (winreg_0_4_0.default or false); - winreg_0_4_0.transactions = - (f.winreg_0_4_0.transactions or false) || - (f.winreg_0_4_0.default or false) || - (winreg_0_4_0.default or false) || - (f.winreg_0_4_0.serialization-rustc or false) || - (winreg_0_4_0.serialization-rustc or false); - }) [ advapi32_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; -} diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index 50dc748e07e..07651665645 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -1,29 +1,37 @@ -{ stdenv, callPackage, defaultCrateOverrides, fetchFromGitHub, cmake, curl, libssh2, libgit2, openssl, zlib }: +{ stdenv +, rustPlatform +, fetchFromGitHub +, cmake +, curl +, libgit2 +, libssh2 +, openssl +, pkg-config +, zlib }: -((callPackage ./cargo-update.nix {}).cargo_update {}).override { - crateOverrides = defaultCrateOverrides // { - cargo-update = attrs: rec { - name = "cargo-update-${version}"; - version = "1.5.2"; +rustPlatform.buildRustPackage rec { + pname = "cargo-update"; + version = "2.5.0"; - src = fetchFromGitHub { - owner = "nabijaczleweli"; - repo = "cargo-update"; - rev = "v${version}"; - sha256 = "1bvrdgcw2akzd78wgvsisvghi8pvdk3szyg9s46qxv4km9sf88s7"; - }; + src = fetchFromGitHub { + owner = "nabijaczleweli"; + repo = pname; + rev = "v${version}"; + sha256 = "143aczay7i3zbhbvv4cjf6hns5w8j52rfdaq8ff0r8v3qghd2972"; + }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libssh2 libgit2 openssl zlib ] - ++ stdenv.lib.optional stdenv.isDarwin curl; + cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "0mxc752hmd7r29camq4f4qzwx0w008rqlq07j2r26z4ygvlrkc3a"; - meta = with stdenv.lib; { - description = "A cargo subcommand for checking and applying updates to installed executables"; - homepage = https://github.com/nabijaczleweli/cargo-update; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ gerschtli ]; - platforms = platforms.all; - }; - }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libgit2 libssh2 openssl pkg-config zlib ] + ++ stdenv.lib.optional stdenv.isDarwin curl; + + meta = with stdenv.lib; { + description = "A cargo subcommand for checking and applying updates to installed executables"; + homepage = "https://github.com/nabijaczleweli/cargo-update"; + license = licenses.mit; + maintainers = with maintainers; [ gerschtli ]; + platforms = platforms.all; }; } From 1bd8b17959aea449c38a0bf15585b13b2eeb9965 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 9 Jan 2020 16:25:20 +0200 Subject: [PATCH 005/243] cargo-update: add filalex77 to maintainers --- pkgs/tools/package-management/cargo-update/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index 07651665645..241213b9409 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { description = "A cargo subcommand for checking and applying updates to installed executables"; homepage = "https://github.com/nabijaczleweli/cargo-update"; license = licenses.mit; - maintainers = with maintainers; [ gerschtli ]; + maintainers = with maintainers; [ gerschtli filalex77 ]; platforms = platforms.all; }; } From cb8ba82f15e5747adf5eb098460ff3d4c37985c8 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 20 Jan 2020 23:59:40 +0100 Subject: [PATCH 006/243] sta: init at 2016-01-25 --- pkgs/tools/misc/sta/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/sta/default.nix diff --git a/pkgs/tools/misc/sta/default.nix b/pkgs/tools/misc/sta/default.nix new file mode 100644 index 00000000000..aa27ddf0838 --- /dev/null +++ b/pkgs/tools/misc/sta/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook }: +stdenv.mkDerivation { + pname = "sta"; + version = "unstable-2016-01-25"; + + src = fetchFromGitHub { + owner = "simonccarter"; + repo = "sta"; + rev = "2aa2a6035dde88b24978b875e4c45e0e296f77ed"; + sha256 = "05804f106nb89yvdd0csvpd5skwvnr9x4qr3maqzaw0qr055mrsk"; + }; + + buildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Simple statistics from the command line interface (CLI), fast"; + longDescription = '' + This is a lightweight, fast tool for calculating basic descriptive + statistics from the command line. Inspired by + https://github.com/nferraz/st, this project differs in that it is written + in C++, allowing for faster computation of statistics given larger + non-trivial data sets. + ''; + license = licenses.mit; + homepage = "https://github.com/simonccarter/sta"; + maintainers = with maintainers; [ infinisil ]; + platforms = platforms.all; + badPlatforms = platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec21cb75b45..8cd61d18657 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5103,6 +5103,8 @@ in multitime = callPackage ../tools/misc/multitime { }; + sta = callPackage ../tools/misc/sta {}; + multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in { multitrandata = callPackage ../tools/text/multitran/data { }; From 2646554b2547335e38a534b69829be38906a4610 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 29 Jan 2020 08:32:01 -0800 Subject: [PATCH 007/243] edk2: 201905 -> 201911 --- pkgs/development/compilers/edk2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 97af433d606..47aa8e249f8 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -14,13 +14,13 @@ else edk2 = stdenv.mkDerivation { pname = "edk2"; - version = "201905"; + version = "201911"; # submodules src = fetchgit { url = "https://github.com/tianocore/edk2"; rev = "edk2-stable${edk2.version}"; - sha256 = "0fk40h4nj4qg8shg0yd1zj4iyspslms5fx95ysi04akv90k5sqkn"; + sha256 = "1rmvb4w043v25cppsqxqrpzqqcay3yrzsrhhzm2q9bncrj56vm8q"; }; buildInputs = [ libuuid pythonEnv ]; From 194f9ce7196670992a19ad0db8765d489aae5532 Mon Sep 17 00:00:00 2001 From: Christoph Stich Date: Mon, 3 Feb 2020 18:17:22 +0000 Subject: [PATCH 008/243] julia-1.3.1 version bump Added all-packages.nix --- pkgs/development/compilers/julia/1.3.nix | 168 ++++++++++++++++++ .../julia/use-system-utf8proc-julia-1.3.patch | 24 +++ pkgs/top-level/all-packages.nix | 6 + 3 files changed, 198 insertions(+) create mode 100644 pkgs/development/compilers/julia/1.3.nix create mode 100644 pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix new file mode 100644 index 00000000000..efb9ce39198 --- /dev/null +++ b/pkgs/development/compilers/julia/1.3.nix @@ -0,0 +1,168 @@ +{ stdenv, fetchurl, fetchzip, fetchFromGitHub +# build tools +, gfortran, m4, makeWrapper, patchelf, perl, which, python2 +, cmake +# libjulia dependencies +, libunwind, readline, utf8proc, zlib +# standard library dependencies +, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 +# linear algebra +, openblas, arpack +# llvm +, llvm +}: + +with stdenv.lib; + +# All dependencies must use the same OpenBLAS. +let + arpack_ = arpack; +in +let + arpack = arpack_.override { inherit openblas; }; +in + +let + majorVersion = "1"; + minorVersion = "3"; + maintenanceVersion = "1"; + src_sha256 = "0q9a7yc3b235psrwl5ghyxgwly25lf8n818l8h6bkf2ymdbsv5p6"; + version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; +in + +stdenv.mkDerivation rec { + pname = "julia"; + inherit version; + + src = fetchzip { + url = "https://github.com/JuliaLang/julia/releases/download/v${majorVersion}.${minorVersion}.${maintenanceVersion}/julia-${majorVersion}.${minorVersion}.${maintenanceVersion}-full.tar.gz"; + sha256 = src_sha256; + }; + + prePatch = '' + export PATH=$PATH:${cmake}/bin + ''; + + patches = [ + ./use-system-utf8proc-julia-1.3.patch + + # Julia recompiles a precompiled file if the mtime stored *in* the + # .ji file differs from the mtime of the .ji file. This + # doesn't work in Nix because Nix changes the mtime of files in + # the Nix store to 1. So patch Julia to accept mtimes of 1. + ./allow_nix_mtime.patch + ]; + + postPatch = '' + patchShebangs . contrib + for i in backtrace cmdlineargs; do + mv test/$i.jl{,.off} + touch test/$i.jl + done + rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl + rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl + sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl + sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl + ''; + + buildInputs = [ + arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr + pcre2.dev openblas openlibm openspecfun readline utf8proc + zlib + ] + ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] + ; + + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; + + makeFlags = + let + arch = head (splitString "-" stdenv.system); + march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch} + or (throw "unsupported architecture: ${arch}"); + # Julia requires Pentium 4 (SSE2) or better + cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch} + or (throw "unsupported architecture: ${arch}"); + in [ + "ARCH=${arch}" + "MARCH=${march}" + "JULIA_CPU_TARGET=${cpuTarget}" + "PREFIX=$(out)" + "prefix=$(out)" + "SHELL=${stdenv.shell}" + + "USE_SYSTEM_BLAS=1" + "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" + "LIBBLAS=-lopenblas" + "LIBBLASNAME=libopenblas" + + "USE_SYSTEM_LAPACK=1" + "LIBLAPACK=-lopenblas" + "LIBLAPACKNAME=libopenblas" + + "USE_SYSTEM_ARPACK=1" + "USE_SYSTEM_FFTW=1" + "USE_SYSTEM_GMP=1" + "USE_SYSTEM_LIBGIT2=1" + "USE_SYSTEM_LIBUNWIND=1" + + "USE_SYSTEM_MPFR=1" + "USE_SYSTEM_OPENLIBM=1" + "USE_SYSTEM_OPENSPECFUN=1" + "USE_SYSTEM_PATCHELF=1" + "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" + "USE_SYSTEM_READLINE=1" + "USE_SYSTEM_UTF8PROC=1" + "USE_SYSTEM_ZLIB=1" + + "USE_BINARYBUILDER=0" + ]; + + LD_LIBRARY_PATH = makeLibraryPath [ + arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm + openspecfun pcre2 + ]; + + enableParallelBuilding = true; + + doCheck = !stdenv.isDarwin; + checkTarget = "testall"; + # Julia's tests require read/write access to $HOME + preCheck = '' + export HOME="$NIX_BUILD_TOP" + ''; + + preBuild = '' + sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile + sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} + ''; + + postInstall = '' + # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, + # as using a wrapper with LD_LIBRARY_PATH causes segmentation + # faults when program returns an error: + # $ julia -e 'throw(Error())' + find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do + if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then + ln -sv $lib $out/lib/julia/$(basename $lib) + fi + done + ''; + + passthru = { + inherit majorVersion minorVersion maintenanceVersion; + site = "share/julia/site/v${majorVersion}.${minorVersion}"; + }; + + meta = { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = https://julialang.org/; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + broken = stdenv.isi686; + }; +} diff --git a/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch b/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch new file mode 100644 index 00000000000..63e0ba9ab05 --- /dev/null +++ b/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch @@ -0,0 +1,24 @@ +--- + src/flisp/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + + +diff --git a/src/flisp/Makefile b/src/flisp/Makefile +index d97075e..6bebca7 100644 +--- a/src/flisp/Makefile ++++ b/src/flisp/Makefile +@@ -32,9 +32,9 @@ OBJS := $(SRCS:%.c=$(BUILDDIR)/%.o) + DOBJS := $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj) + LLT_release := $(LLT_BUILDDIR)/libsupport.a + LLT_debug := $(LLT_BUILDDIR)/libsupport-debug.a +-LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC) +-LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC) +-LIBS := ++LIBFILES_release := $(LLT_release) $(LIBUV) ++LIBFILES_debug := $(LLT_debug) $(LIBUV) ++LIBS := $(LIBUTF8PROC) + ifneq ($(OS),WINNT) + LIBS += -lpthread + endif + +-- diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c8fe84c0b6..761c456e101 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8502,6 +8502,12 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; + julia_13 = callPackage ../development/compilers/julia/1.3.nix { + gmp = gmp6; + openblas = openblasCompat; + inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + }; + julia_1 = julia_10; julia = julia_1; From d6f5459da9c7fc941cf97eb1eccf0458872def18 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 10 Feb 2020 21:28:33 +0300 Subject: [PATCH 009/243] osm2pgsql: enable on darwin --- pkgs/tools/misc/osm2pgsql/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 8905f9eb36a..6137abd9293 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: +{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql +, withLuaJIT ? false, lua, luajit }: stdenv.mkDerivation rec { pname = "osm2pgsql"; @@ -13,7 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat proj bzip2 zlib boost postgresql lua ]; + buildInputs = [ expat proj bzip2 zlib boost postgresql ] + ++ stdenv.lib.optional withLuaJIT luajit + ++ stdenv.lib.optional (!withLuaJIT) lua; + + cmakeFlags = stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; @@ -21,7 +26,7 @@ stdenv.mkDerivation rec { description = "OpenStreetMap data to PostgreSQL converter"; homepage = "https://github.com/openstreetmap/osm2pgsql"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ jglukasik ]; }; } From 8b260ebe688f002853a643f0c0a58d765550f69b Mon Sep 17 00:00:00 2001 From: Elyhaka <57923898+Elyhaka@users.noreply.github.com> Date: Tue, 11 Feb 2020 08:08:36 +0100 Subject: [PATCH 010/243] pop-gtk-theme: 2019-12-17 -> 2020-02-10 --- pkgs/data/themes/pop-gtk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index 151fadddc16..9bb2beae4d3 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pop-gtk-theme"; - version = "2019-12-17"; + version = "2020-02-10"; src = fetchFromGitHub { owner = "pop-os"; repo = "gtk-theme"; - rev = "77601545f049251bce9c63a07f0d9819aa27cb60"; - sha256 = "0bmkcdr1z9m3inrw33zprq2a4jawql4724a84nr89r19xllj2z1s"; + rev = "ed888e9dd5de142cb899e362beedaf694594cc7e"; + sha256 = "0ryr1jx9pzij6pkv7sam07f90w5lbrzx0fj5vdxl94612mh76aad"; }; nativeBuildInputs = [ From be5597fc9d2f4fefac097d3c6e9364bedf548078 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 11 Feb 2020 11:48:45 +0100 Subject: [PATCH 011/243] buildRustCrate: remove superfluous dependency overrides MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By overriding each dependency on every level of the dependency tree we are creating a lot of unnecessary instances of the same derivation Looking at the output size of `nix-instantiate --trace-function-calls -vvvv …` and the execution time I got about a 10x improvement after applying this change. It was probably good intentions that lead to these overrides but in practice no tooling (that I know of) really needs this. `carnix` and `crate2nix` are fine without those overrides. Furthermore I believe that it is the job of the tooling around `buildRustCrate` to provide a coherent set of overrides. By not enforcing all of the overrides, debug flags, verbosity, … to be the same throughout the closure we also allow consumers to override specific aspects of the crates. Some (older?) crates might need different `crateOverrides` then newer crates with the same name. Currently such situations can not (easily) be implemented with the override in-place. --- pkgs/build-support/rust/build-rust-crate/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 569b48d25ae..94b64a1225c 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -62,9 +62,6 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr extraRustcOpts_ = extraRustcOpts; buildTests_ = buildTests; - # take a list of crates that we depend on and override them to fit our overrides, rustc, release, … - makeDependencies = map (dep: lib.getLib (dep.override { inherit release verbose crateOverrides; })); - # crate2nix has a hack for the old bash based build script that did split # entries at `,`. No we have to work around that hack. # https://github.com/kolloch/crate2nix/blame/5b19c1b14e1b0e5522c3e44e300d0b332dc939e7/crate2nix/templates/build.nix.tera#L89 @@ -93,8 +90,8 @@ stdenv.mkDerivation (rec { name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; depsBuildBuild = [ rust stdenv.cc ]; buildInputs = (crate.buildInputs or []) ++ buildInputs_; - dependencies = makeDependencies dependencies_; - buildDependencies = makeDependencies buildDependencies_; + dependencies = map lib.getLib dependencies_; + buildDependencies = map lib.getLib buildDependencies_; completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies); completeBuildDeps = lib.unique ( From 87d9d9a374b2bd18a87bd953caf043f457304c47 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 11 Feb 2020 21:15:08 +0900 Subject: [PATCH 012/243] flashplayer: 32.0.0.314 -> 32.0.0.330 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index c4a09c8063d..e600d134e9c 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.314"; + version = "32.0.0.330"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "05xcscpzglpfpiiqc3ngs5snxli99irjk18g5vdhw91jk9808gnl"; + sha256 = "08gpx0fq0r1sz5smfdgv4fkfwq1hdijv4dw432d6jdz8lq09y1nk"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 5ecb6bfb076..3d711f92d1c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.314"; + version = "32.0.0.330"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "076l93wjcy15sic88cyq6msp87gdhcvbk4ym2vbvvjz2bav2z456" + "1k7h1p6g1vf96v31j1n8638jdxacap0729n0dnmh6l0h5q518k1b" else - "0kxr8d6fh00akqgk3lwv0z6rk7xswislicsbh9b9p33f19mj7c8a" + "0gabgllx79s6rhv0zivfj6z79rcsdrzrdm94xdr19c11dsbqxd6b" else if arch == "x86_64" then - "0a3hvp0qmqlann8k875ajf0i70cv0an1a3mr8kbgji46dxqvwjxz" + "1pf3k1x8c2kbkc9pf9y5n4jilp3g41v8v0q5ng77sbnl92s35zsj" else - "0jyywas2z7ssgzng82qgnp01gy6nccqavkbx9529m07xrclvqbxn"; + "1xibm6ffm09c553g100cgb6grnk21dfq8m81yy0jskph157vg962"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 353aff7e707..b003a1b3f5c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.314"; + version = "32.0.0.330"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0zlin94rip13rn58m7v5l6m20ylnw59l77rbg5j5qyxkr53zawdz" + "0wrkg2in4c0bnbifm06m4rdggzs8zbaxwrh6z3mpbf4p3bl6xg84" else - "0pfrm02iwa01pqx3adqj0sw27p1ddlz9knjky6x248ak8zywsqr2"; + "08qxa3zanlgmn8sn7crz242adx10jqymd4gzf1m0zlczw20ar09c"; }; nativeBuildInputs = [ unzip ]; From 7926ad01f97fd9afab1792dc0546919f4fe1ead4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 11 Feb 2020 15:56:28 -0300 Subject: [PATCH 013/243] mate: update the version in the update script --- pkgs/desktops/mate/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/update.sh b/pkgs/desktops/mate/update.sh index fe294ae4985..d214e07f8cd 100755 --- a/pkgs/desktops/mate/update.sh +++ b/pkgs/desktops/mate/update.sh @@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" root=../../.. export NIXPKGS_ALLOW_UNFREE=1 -mate_version=1.22 +mate_version=1.24 theme_version=3.22 materepo=https://pub.mate-desktop.org/releases/${mate_version} themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version} From 1905a3719359d237d5e36257bef9b2d892d40d3a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Feb 2020 00:39:35 +0000 Subject: [PATCH 014/243] allegro5: 5.2.5.0 -> 5.2.6.0 --- pkgs/development/libraries/allegro/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 5f5368f2866..d2021e23b53 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "allegro"; - version = "5.2.5.0"; + version = "5.2.6.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "1jrnizpwznyxz2c7zb75lfy7l51ww5jlqfaahcrycfj1xay9mpqp"; + sha256 = "1xbhvriyh10ka2j7jgjkpa6mlzp6av909hhr9sk317vjvf0z0mqz"; }; buildInputs = [ From f2c564b1242a6ba7c4d0c2f37b03de5b4d63c853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 12 Feb 2020 09:46:37 +0100 Subject: [PATCH 015/243] kdepim-runtime: Remove obsolete patch to fix compilation The facebook plugin is currently disabled by upstream. --- .../kde/kdepim-runtime/00-no-facebook.patch | 12 ------------ pkgs/applications/kde/kdepim-runtime/default.nix | 3 --- pkgs/applications/kde/kdepim-runtime/series | 1 - 3 files changed, 16 deletions(-) delete mode 100644 pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch delete mode 100644 pkgs/applications/kde/kdepim-runtime/series diff --git a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch deleted file mode 100644 index 46722ff5fba..00000000000 --- a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt -index 99f7dbf..03e953b 100644 ---- a/resources/CMakeLists.txt -+++ b/resources/CMakeLists.txt -@@ -45,7 +45,6 @@ add_subdirectory( imap ) - if (Libkolabxml_FOUND) - add_subdirectory( kolab ) - endif() --add_subdirectory( facebook ) - add_subdirectory( maildir ) - - add_subdirectory( openxchange ) diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 6d7bd0daa96..65719514f96 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -14,7 +14,6 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes @@ -22,6 +21,4 @@ mkDerivation { kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns ]; - # Attempts to build some files before dependencies have been generated - enableParallelBuilding = false; } diff --git a/pkgs/applications/kde/kdepim-runtime/series b/pkgs/applications/kde/kdepim-runtime/series deleted file mode 100644 index cc3e104775f..00000000000 --- a/pkgs/applications/kde/kdepim-runtime/series +++ /dev/null @@ -1 +0,0 @@ -00-no-facebook.patch From 21fceb367f2237a0498c485ff6cd1e8fed815ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:18 -0300 Subject: [PATCH 016/243] mate.atril: 1.22.3 -> 1.24.0 --- pkgs/desktops/mate/atril/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index ecb9ea2e377..b12a543d11c 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, texlive, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "atril"; - version = "1.22.3"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06hmyw7fwdrdyl3n79b8qxlrwbzf240n82arzmlg62q9zxzdc0is"; + sha256 = "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y"; }; nativeBuildInputs = [ @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { mate.caja mate.mate-desktop hicolor-icon-theme + texlive.bin.core # for synctex, used by the pdf back-end ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple multi-page document viewer for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; From c17f188de0de013827e453d4f6748b901b386731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:18 -0300 Subject: [PATCH 017/243] mate.caja: 1.22.3 -> 1.24.0 --- .../mate/caja/caja-extension-dirs.patch | 22 ++++++++++++++++--- pkgs/desktops/mate/caja/default.nix | 6 ++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/mate/caja/caja-extension-dirs.patch b/pkgs/desktops/mate/caja/caja-extension-dirs.patch index 7490a368efd..0b1453bd468 100644 --- a/pkgs/desktops/mate/caja/caja-extension-dirs.patch +++ b/pkgs/desktops/mate/caja/caja-extension-dirs.patch @@ -1,11 +1,24 @@ +From 35e9e6a6f3ba6cbe62a3957044eb67864f5d8e66 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= +Date: Tue, 11 Feb 2020 17:49:13 -0300 +Subject: [PATCH] Look for caja extentions at $CAJA_EXTENTSION_DIRS + +CAJA_EXTENSION_DIRS is a list of paths where caja extensions are +looked for. It is needed for distributions like NixOS that do not +install all extensions in the same directory. In NixOS each package is +installed in a self contained directory. +--- + libcaja-private/caja-module.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c -index 023c22e..414913b 100644 +index d54d7cf..9794e56 100644 --- a/libcaja-private/caja-module.c +++ b/libcaja-private/caja-module.c -@@ -258,11 +258,25 @@ caja_module_setup (void) +@@ -258,11 +258,25 @@ void + caja_module_setup (void) { static gboolean initialized = FALSE; - GList *res; + gchar *caja_extension_dirs; + gchar **dir_vector; @@ -28,3 +41,6 @@ index 023c22e..414913b 100644 load_module_dir (CAJA_EXTENSIONDIR); eel_debug_call_at_shutdown (free_module_objects); +-- +2.25.0 + diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index c460a2cf2dc..6508dfa3b8d 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "caja"; - version = "1.22.3"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1w2liq9h1kr5zyaaq82xz8pic04qi5sra8kaycfg1iddmknkfqn7"; + sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0"; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "File manager for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; From d5f9737d1a676968cc264939a6a7c6d8d2893a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:18 -0300 Subject: [PATCH 018/243] mate.caja-dropbox: 1.22.1 -> 1.24.0 --- pkgs/desktops/mate/caja-dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 820b1e905ec..2ced1ddf62b 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { pname = "caja-dropbox"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18cnd3yw2ingvl38mhmfbl5k0kfg8pzcf2649j00i6v90cwiril5"; + sha256 = "1rcn82q58mv9hn5xamvzay2pw1szfk6zns94362476fcp786lji2"; }; patches = [ From 97631fe8b3a973c1e0cde3a326498db718cddb06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:18 -0300 Subject: [PATCH 019/243] mate.caja-extensions: 1.22.1 -> 1.24.0 --- pkgs/desktops/mate/caja-extensions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 10595bbbaec..1704b5051b2 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "caja-extensions"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xzhphzvaxbwyyp242pnhl5zjrkiznj90i0xjmy7pvi155pmp16h"; + sha256 = "175v5c05nrdliya23rbqma49alldq67dklmvpq18nq71sfry4pp6"; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of extensions for Caja file manager"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From c8d4d775d021defb8696a2f9485b14752d593960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:19 -0300 Subject: [PATCH 020/243] mate.engrampa: 1.22.3 -> 1.24.0 --- pkgs/desktops/mate/engrampa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 9569b1919e4..de685badafc 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "engrampa"; - version = "1.22.3"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17pn1qgr1a13jxv50qcnzqcw8gr96g7jz2z2y1wbwy7i44bknv6n"; + sha256 = "13cak3qgrzqj74x9jq1sf155793v2bqqz4mk4i04g9f9xn3g85fl"; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Archive Manager for MATE"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; From 0841600674b0d2d59ea793e76a104ccdee0514d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:19 -0300 Subject: [PATCH 021/243] mate.eom: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/eom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 457a9e56c5d..2a535e321b5 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eom"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0za1lw4awg1i0ls0r9iw0ail2hqa34y1dx65b50bw9kx9kbfyl9l"; + sha256 = "0zzximp2534bky0vac219alafblw6m0lis0gncq92017s6c1mb77"; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "An image viewing and cataloging program for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; From fc1a17d0f114e2f5aeef1098d45de0a28d0bb135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:19 -0300 Subject: [PATCH 022/243] mate.libmatekbd: 1.22.0 -> 1.24.0 --- pkgs/desktops/mate/libmatekbd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 6364b89204a..f4c2241aebb 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmatekbd"; - version = "1.22.0"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8"; + sha256 = "1sq7gwr9q3hq4q0vx32qqa68qcqf5by9mqyxnq6lwgaq8ydq16ab"; }; nativeBuildInputs = [ pkgconfig intltool ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Keyboard management library for MATE"; - homepage = https://github.com/mate-desktop/libmatekbd; + homepage = "https://github.com/mate-desktop/libmatekbd"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From b143f1867d8138aceba02a0f83b7978a23673bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:19 -0300 Subject: [PATCH 023/243] mate.libmatemixer: 1.22.0 -> 1.24.0 --- pkgs/desktops/mate/libmatemixer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 9c2dc412d4d..ca73c550cb1 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libmatemixer"; - version = "1.22.0"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9"; + sha256 = "08vkdp2kzy27xwscwp2jj5nz0yblrka2482l6cx3wl4dnk0rpznm"; }; nativeBuildInputs = [ pkgconfig intltool ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mixer library for MATE"; - homepage = https://github.com/mate-desktop/libmatemixer; + homepage = "https://github.com/mate-desktop/libmatemixer"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; From e1cc75eaa3490e7ffa8f0cd51db392729ac38e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:19 -0300 Subject: [PATCH 024/243] mate.libmateweather: 1.22.1 -> 1.24.0 --- pkgs/desktops/mate/libmateweather/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 0c14cdb96b5..f6c3c9b4e8a 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmateweather"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1y3z82ymc7q6z8ly9f6nys0hbs373fjnvr6j7zwlgf6zc88f71h3"; + sha256 = "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d"; }; nativeBuildInputs = [ pkgconfig intltool ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to access weather information from online services for MATE"; - homepage = https://github.com/mate-desktop/libmateweather; + homepage = "https://github.com/mate-desktop/libmateweather"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From bd9bee5fd456ca8e7c83b11ac9b3c9f5f979bc2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:19 -0300 Subject: [PATCH 025/243] mate.marco: 1.22.4 -> 1.24.0 --- pkgs/desktops/mate/marco/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index fd551c0cc78..2a2bd9a4664 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "marco"; - version = "1.22.4"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0z8q4nwm43imbnbxz348ylgzfl25sknb19kml57d6z6flxws19k3"; + sha256 = "0hcbyv8czymhwz5q9rwig7kkhlhik6y080bls736f3wsbqnnirc2"; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MATE default window manager"; - homepage = https://github.com/mate-desktop/marco; + homepage = "https://github.com/mate-desktop/marco"; license = [ licenses.gpl2 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From 10e1405b16e9ed753bded0c1825a0ff83c2392cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:19 -0300 Subject: [PATCH 026/243] mate.mate-applets: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/mate-applets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 3b5a4ccf2a2..2af9c6940d4 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-applets"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1c32rkkry6kka2arrx5psjj037j79icp5jr1s0qh596dvsgxciqc"; + sha256 = "0nm3amb3v458mxv1mbz9y8f4230gldmydmkkm7vqxsrxbccynkxq"; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Applets for use with the MATE panel"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; From e812e5053b7c1a42728fae94ccc97710e2a70ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:20 -0300 Subject: [PATCH 027/243] mate.mate-backgrounds: 1.22.0 -> 1.24.0 --- pkgs/desktops/mate/mate-backgrounds/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 4b41caba710..6cb7d365ff6 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "mate-backgrounds"; - version = "1.22.0"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9"; + sha256 = "16rmsy02fyq6mj6xgc5mdyh146z3zmkn7iwsi44s962aqwbpn4i8"; }; nativeBuildInputs = [ intltool ]; meta = with stdenv.lib; { description = "Background images and data for MATE"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From 9b60f99c1f4912890690c4aec3534d6f9afc8d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:20 -0300 Subject: [PATCH 028/243] mate.mate-calc: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/mate-calc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index d89e1e35d92..7a1d97a1968 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-calc"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1as4gshydcf84vynq8ijd9n8pslz5jpw6aj18ri4bdc91a6q3rpg"; + sha256 = "0f7hc1gg41kcwcyvsqqg79qylrp0qqymris8qizk2x3cfvvg7261"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Calculator for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; From 6ba2a2c04f9bd4f768bc353569ed8b5ca68435d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:20 -0300 Subject: [PATCH 029/243] mate.mate-common: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/mate-common/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index b0a7096c5e7..c9ed7cd51f6 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "mate-common"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xx7qrw8kc6355r1a1nybncf8s2rxjb2nqzw0gv2r5j5sqx8fzgf"; + sha256 = "06w25mk2w7rfnkwpnav8pcrvip1zdd0zd1qc6d975ksmg66r1vz7"; }; meta = { description = "Common files for development of MATE packages"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; From 97fec8cfbb8ffe4adde39087165e8ca5e4b8af06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:20 -0300 Subject: [PATCH 030/243] mate.mate-control-center: 1.22.2 -> 1.24.0 Also the patches have been integrated upstream. --- ...ch-system-themes-in-system-data-dirs.patch | 81 ------------- .../mate/mate-control-center/default.nix | 16 +-- .../mate-control-center.keybindings-dir.patch | 106 ------------------ 3 files changed, 5 insertions(+), 198 deletions(-) delete mode 100644 pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch delete mode 100644 pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch diff --git a/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch b/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch deleted file mode 100644 index fb2917b36bb..00000000000 --- a/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 74fb65a2574c93a2b20a51875a5e336f727ff4bc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Wed, 25 Dec 2019 18:48:38 -0300 -Subject: [PATCH] Search system themes in system data dirs - ---- - capplets/common/gtkrc-utils.c | 20 ++++++++++++-------- - capplets/common/mate-theme-info.c | 18 +++++++++++------- - 2 files changed, 23 insertions(+), 15 deletions(-) - -diff --git a/capplets/common/gtkrc-utils.c b/capplets/common/gtkrc-utils.c -index 011c8a1..27e01da 100644 ---- a/capplets/common/gtkrc-utils.c -+++ b/capplets/common/gtkrc-utils.c -@@ -60,15 +60,19 @@ gchar* gtkrc_find_named(const gchar* name) - - if (!path) - { -- gchar* theme_dir = gtk_rc_get_theme_dir(); -- path = g_build_filename(theme_dir, name, subpath, NULL); -- g_free(theme_dir); -+ const gchar * const * dirs = g_get_system_data_dirs(); - -- if (!g_file_test(path, G_FILE_TEST_EXISTS)) -- { -- g_free (path); -- path = NULL; -- } -+ if (dirs != NULL) -+ for (; !path && *dirs != NULL; ++dirs) -+ { -+ path = g_build_filename(*dirs, "themes", name, subpath, NULL); -+ -+ if (!g_file_test(path, G_FILE_TEST_EXISTS)) -+ { -+ g_free (path); -+ path = NULL; -+ } -+ } - } - - return path; -diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c -index 54ae3ae..a738f0b 100644 ---- a/capplets/common/mate-theme-info.c -+++ b/capplets/common/mate-theme-info.c -@@ -1763,6 +1763,7 @@ mate_theme_color_scheme_equal (const gchar *s1, const gchar *s2) - void - mate_theme_init () - { -+ const gchar * const * dirs; - GFile *top_theme_dir; - gchar *top_theme_dir_string; - static gboolean initted = FALSE; -@@ -1783,13 +1784,16 @@ mate_theme_init () - theme_hash_by_uri = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - theme_hash_by_name = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - -- /* Add all the toplevel theme dirs. */ -- /* $datadir/themes */ -- top_theme_dir_string = gtk_rc_get_theme_dir (); -- top_theme_dir = g_file_new_for_path (top_theme_dir_string); -- g_free (top_theme_dir_string); -- add_top_theme_dir_monitor (top_theme_dir, 1, NULL); -- g_object_unref (top_theme_dir); -+ /* Add all the toplevel theme dirs following the XDG Base Directory Specification */ -+ dirs = g_get_system_data_dirs (); -+ if (dirs != NULL) -+ for (; *dirs != NULL; ++dirs) { -+ top_theme_dir_string = g_build_filename (*dirs, "themes", NULL); -+ top_theme_dir = g_file_new_for_path (top_theme_dir_string); -+ g_free (top_theme_dir_string); -+ add_top_theme_dir_monitor (top_theme_dir, 1, NULL); -+ g_object_unref (top_theme_dir); -+ } - - /* ~/.themes */ - top_theme_dir_string = g_build_filename (g_get_home_dir (), ".themes", NULL); --- -2.24.1 - diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 2451c403c82..beae8dc63ec 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, - desktop-file-utils, dconf, gtk3, mate, hicolor-icon-theme, wrapGAppsHook + desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-control-center"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ybdjibi6wgqn3587a66ckxp2qkvl4mcvv2smhflyxksl5djrjgh"; + sha256 = "192plsh83m2qz7jgakns2yvhqbj53v7i54iwb0z26i2awy0j9rcd"; }; nativeBuildInputs = [ @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { libappindicator-gtk3 gtk3 dconf + polkit hicolor-icon-theme mate.mate-desktop mate.libmatekbd @@ -37,13 +38,6 @@ stdenv.mkDerivation rec { mate.mate-settings-daemon ]; - patches = [ - # see https://github.com/mate-desktop/mate-control-center/pull/528 - ./0001-Search-system-themes-in-system-data-dirs.patch - # look up keyboard shortcuts in system data dirs - ./mate-control-center.keybindings-dir.patch - ]; - configureFlags = [ "--disable-update-mimedb" ]; preFixup = '' @@ -57,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to configure the MATE desktop"; - homepage = https://github.com/mate-desktop/mate-control-center; + homepage = "https://github.com/mate-desktop/mate-control-center"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch b/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch deleted file mode 100644 index 4a3036ae16e..00000000000 --- a/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch +++ /dev/null @@ -1,106 +0,0 @@ -From faeb322b01d3856f3cf163470cc38f4e88a8527c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Sun, 28 Apr 2019 21:45:39 -0300 -Subject: [PATCH] Use system data dirs to locate key bindings - ---- - capplets/keybindings/Makefile.am | 3 +- - .../keybindings/mate-keybinding-properties.c | 58 ++++++++++++------- - 2 files changed, 39 insertions(+), 22 deletions(-) - -diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am -index e5efb109..9501dd8f 100644 ---- a/capplets/keybindings/Makefile.am -+++ b/capplets/keybindings/Makefile.am -@@ -33,8 +33,7 @@ AM_CPPFLAGS = \ - $(MATECC_CAPPLETS_CFLAGS) \ - -DMATELOCALEDIR="\"$(datadir)/locale\"" \ - -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ -- -DMATECC_UI_DIR="\"$(uidir)\"" \ -- -DMATECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\"" -+ -DMATECC_UI_DIR="\"$(uidir)\"" - CLEANFILES = \ - $(MATECC_CAPPLETS_CLEANFILES) \ - $(desktop_DATA) \ -diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c -index 4f257333..cf1891d2 100644 ---- a/capplets/keybindings/mate-keybinding-properties.c -+++ b/capplets/keybindings/mate-keybinding-properties.c -@@ -1033,39 +1033,57 @@ static void - reload_key_entries (GtkBuilder *builder) - { - gchar **wm_keybindings; -- GDir *dir; -- const char *name; - GList *list, *l; -+ const gchar * const * data_dirs; -+ GHashTable *loaded_files; -+ guint i; - - wm_keybindings = wm_common_get_current_keybindings(); - - clear_old_model (builder); - -- dir = g_dir_open (MATECC_KEYBINDINGS_DIR, 0, NULL); -- if (!dir) -- return; -- -- list = NULL; -- for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir)) -+ loaded_files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); -+ data_dirs = g_get_system_data_dirs (); -+ for (i = 0; data_dirs[i] != NULL; i++) - { -- if (g_str_has_suffix (name, ".xml")) -+ g_autofree gchar *dir_path = NULL; -+ GDir *dir; -+ const gchar *name; -+ -+ dir_path = g_build_filename (data_dirs[i], "mate-control-center", "keybindings", NULL); -+ g_debug ("Keybinding dir: %s", dir_path); -+ -+ dir = g_dir_open (dir_path, 0, NULL); -+ if (!dir) -+ continue; -+ -+ for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir)) - { -- list = g_list_insert_sorted (list, g_strdup (name), -- (GCompareFunc) g_ascii_strcasecmp); -- } -- } -- g_dir_close (dir); -+ if (g_str_has_suffix (name, ".xml") == FALSE) -+ continue; -+ -+ if (g_hash_table_lookup (loaded_files, name) != NULL) -+ { -+ g_debug ("Not loading %s, it was already loaded from another directory", name); -+ continue; -+ } - -+ g_hash_table_insert (loaded_files, g_strdup (name), g_strdup (dir_path)); -+ } -+ -+ g_dir_close (dir); -+ } -+ list = g_hash_table_get_keys (loaded_files); -+ list = g_list_sort(list, (GCompareFunc) g_str_equal); - for (l = list; l != NULL; l = l->next) - { -- gchar *path; -- -- path = g_build_filename (MATECC_KEYBINDINGS_DIR, l->data, NULL); -- append_keys_to_tree_from_file (builder, path, wm_keybindings); -- g_free (l->data); -- g_free (path); -+ g_autofree gchar *path = NULL; -+ path = g_build_filename (g_hash_table_lookup (loaded_files, l->data), l->data, NULL); -+ g_debug ("Keybinding file: %s", path); -+ append_keys_to_tree_from_file (builder, path, wm_keybindings); - } - g_list_free (list); -+ g_hash_table_destroy (loaded_files); - - /* Load custom shortcuts _after_ system-provided ones, - * since some of the custom shortcuts may also be listed From 2edf5522dd82a645d401bd588ecfad8015ec2fd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:20 -0300 Subject: [PATCH 031/243] mate.mate-desktop: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/mate-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 2dca83bcd46..48d672a6478 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-desktop"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18w5r9p3bqpvxqqy2am7z686xf65cz5vhj247kki8s2yvvap6rlh"; + sha256 = "0l4bbj6nz315s5ndq5sw1jcgi3s1whk59bj12c4mbpsvmlb33adg"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library with common API for various MATE modules"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; From 873fb6fe492cbf14e4b7663da814c437c0aa3fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:20 -0300 Subject: [PATCH 032/243] mate.mate-icon-theme: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/mate-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index d374092c48a..b639bcf282d 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-icon-theme"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0r2bk4flb6kjj97badj2lnml4lfwpl2ym5hkf7r6f7cj8g6pzc4r"; + sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Icon themes from MATE"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; From 3e8fdffd12909e4ed75beb061604ded68bf2b139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:20 -0300 Subject: [PATCH 033/243] mate.mate-indicator-applet: 1.22.1 -> 1.24.0 --- pkgs/desktops/mate/mate-indicator-applet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index b2e07d0a3e7..731c1c83572 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-indicator-applet"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05j5s6r4kx1rbz0j7a7xv38d0kbdi1r8iv8b6nx3lkbkdzq1x0w2"; + sha256 = "0m7pvbs5hhy5f400wqb8wp0dw3pyjpjnjax9qzc73j97l1k3zawf"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/mate-desktop/mate-indicator-applet; + homepage = "https://github.com/mate-desktop/mate-indicator-applet"; description = "MATE panel indicator applet"; longDescription = '' A small applet to display information from various applications From b8facf93add0e0a1c3e003d7b940c9dd3809370a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:20 -0300 Subject: [PATCH 034/243] mate.mate-media: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/mate-media/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 156a305a63f..1f1f77ae518 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-media"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m8q2rqbxzvh82yj63syd8sbfjrc8y4a8caa42zs66j9x60d1agw"; + sha256 = "1d5dx79yfqghjaxrdrdh053nfnvkbx8p3ma7j87s7rsvy5irs963"; }; buildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Media tools for MATE"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo maintainers.chpatrick ]; From 8e031050e04e581a67e435b55a5a5d30f0998e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:21 -0300 Subject: [PATCH 035/243] mate.mate-menus: 1.22.1 -> 1.24.0 --- pkgs/desktops/mate/mate-menus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 299c9b0e60f..93ba4f59efc 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-menus"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kh6y76f1rhp3nr22rp93bx77wcgqnygag2ir076cqkppayjc3c0"; + sha256 = "1vv4j38h7mrbfrsj99k25z6y7b5dg30fzd2qnhk7pl8ca8s1jhrd"; }; nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Menu system for MATE"; - homepage = https://github.com/mate-desktop/mate-menus; + homepage = "https://github.com/mate-desktop/mate-menus"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From 6c63b7a1dc59ff38296b8ab1a242f8b3d08a0ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:21 -0300 Subject: [PATCH 036/243] mate.mate-netbook: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/mate-netbook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 337e2bfdb3b..63284bb5188 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-netbook"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m38v2276s2d3zs7smxyf70nyl7bcwp5665zgva28lvs8ip3gijx"; + sha256 = "1bmk9gq5gcqkvfppa7i1hqfph8sajc3xs189s4ha97g0ifwd98a8"; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Installing these utilities is recommended for netbooks and similar devices with low resolution displays. ''; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with licenses; [ gpl3 lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From 8fdadaed8d9bbbc8cd80b04d155ddad057f37bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:21 -0300 Subject: [PATCH 037/243] mate.mate-notification-daemon: 1.22.1 -> 1.24.0 --- .../mate/mate-notification-daemon/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index a83bbcb3ffb..e1e276d1b19 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libcanberra-gtk3, - libnotify, libwnck3, gtk3, wrapGAppsHook }: + libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-notification-daemon"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f8m3m94iqj2x61dzwwvwq2qlsl2ma8pqr6rfns5pzd0nj0waz0m"; + sha256 = "0y362b51lb8nq2cw254qc39x8hpficn5rxddzp0fxqxakrh7vcif"; }; nativeBuildInputs = [ pkgconfig intltool + libxml2 # for xmllint wrapGAppsHook ]; @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; meta = with stdenv.lib; { - description = "Notification daemon for MATE"; - homepage = https://github.com/mate-desktop/mate-notification-daemon; + description = "Notification daemon for MATE Desktop"; + homepage = "https://github.com/mate-desktop/mate-notification-daemon"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From 5440c15b3c1ebf95190a0f3a90fd7b5ff7261cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:21 -0300 Subject: [PATCH 038/243] mate.mate-panel: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/mate-panel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 06e9b386adb..7436415ff6d 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sm0fniywcxg8rbakhhc37bamwq1x3jqqyaqcvqwxvm6jg1hc97y"; + sha256 = "1hrh10pqk8mva1ix2nmsp3cbbn81cgqy0b9lqhsl0b5p0s40i7in"; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The MATE panel"; - homepage = https://github.com/mate-desktop/mate-panel; + homepage = "https://github.com/mate-desktop/mate-panel"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From cad58c2d8c1fc65c40348ac806451dd6a76e3c8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:22 -0300 Subject: [PATCH 039/243] mate.mate-polkit: 1.22.0 -> 1.24.0 --- pkgs/desktops/mate/mate-polkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index e11bcb10257..8847046dd95 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-polkit"; - version = "1.22.0"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0"; + sha256 = "1450bqzlnvwy3xa98lj102j2cf7piqbxcd1cy2zp41rdl8ri3gvn"; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Integrates polkit authentication for MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From 107711cf81b4e6660b81ba713e4c4e2c2e90adfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:22 -0300 Subject: [PATCH 040/243] mate.mate-power-manager: 1.22.2 -> 1.24.0 --- .../mate/mate-power-manager/default.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 3f84e60f9b6..2e9a04ff855 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,14 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-power-manager"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12pnj7y01k1fhfhswxmf6q9yyb0772am5anm338hzfhjp0lcxlbn"; + sha256 = "1h6wm8vna97iayhwqh7rfsc87715np12nxa72w27p4zl54bdkdlg"; }; + nativeBuildInputs = [ + pkgconfig + intltool + libtool + wrapGAppsHook + ]; + buildInputs = [ glib itstool @@ -19,23 +26,17 @@ stdenv.mkDerivation rec { libnotify dbus-glib upower + polkit mate.mate-panel ]; - nativeBuildInputs = [ - pkgconfig - intltool - libtool - wrapGAppsHook - ]; - configureFlags = [ "--enable-applets" ]; meta = with stdenv.lib; { description = "The MATE Power Manager"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = [ maintainers.romildo maintainers.chpatrick ]; + maintainers = with maintainers; [ romildo chpatrick ]; }; } From b1b0a4ce98ca0da93d023724cb5fd2acfda0b7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:22 -0300 Subject: [PATCH 041/243] mate.mate-screensaver: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/mate-screensaver/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 23e8080f01f..3c5216ec8f3 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-screensaver"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1y8828g4bys8y4r5y478z6i7dgdqm2wkymi5fq75vxx4lzq919cb"; + sha256 = "0gpw6x9d0b77f14vjl7ghq5dya1mwcnvmgigg00manfwlksr5zby"; }; nativeBuildInputs = [ pkgconfig intltool + libxml2 # provides xmllint wrapGAppsHook ]; @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Screen saver and locker for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From a9abcf28a9785d87f7e75b6c5caba8c2714fc123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:22 -0300 Subject: [PATCH 042/243] mate.mate-sensors-applet: 1.22.1 -> 1.24.0 --- pkgs/desktops/mate/mate-sensors-applet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 0c20880d7ec..1f401c8e561 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-sensors-applet"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rv19jxxviqqwk2wlhxlm98jsxa26scvs7ilp2i6plhn3ap2alq3"; + sha256 = "1izjgzj3xb93arim8w891x8as85phdmlhdnr2yc8ixg7xpblsq2s"; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/mate-desktop/mate-sensors-applet; + homepage = "https://github.com/mate-desktop/mate-sensors-applet"; description = "MATE panel applet for hardware sensors"; license = with licenses; [ gpl2Plus ]; platforms = platforms.linux; From d1353577654ddd165d35d640ecc23557475c8824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:22 -0300 Subject: [PATCH 043/243] mate.mate-session-manager: 1.22.3 -> 1.24.0 --- pkgs/desktops/mate/mate-session-manager/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 61dec6b3484..6fe1996c6b5 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus-glib, systemd, - libSM, libXtst, gtk3, hicolor-icon-theme, mate, + libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-session-manager"; - version = "1.22.3"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ys26af75xl1psck8v32gygxipd8ms1xgpvdhwmnj7bqhabhh249"; + sha256 = "01scj5d1xlri9b2id8gm9kfni9nzhdjdf7rag7fvcxwqp7baz3h3"; }; nativeBuildInputs = [ @@ -27,11 +27,13 @@ stdenv.mkDerivation rec { gtk3 mate.mate-desktop hicolor-icon-theme + epoxy + polkit ]; meta = with stdenv.lib; { description = "MATE Desktop session manager"; - homepage = https://github.com/mate-desktop/mate-session-manager; + homepage = "https://github.com/mate-desktop/mate-session-manager"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From 4f501cdebca3ad7ceef14f9795551b1e60e6ff53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:23 -0300 Subject: [PATCH 044/243] mate.mate-settings-daemon: 1.22.1 -> 1.24.0 --- .../mate/mate-settings-daemon/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index f126918afca..2eff667511d 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,27 +1,18 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, - wrapGAppsHook, fetchpatch, autoreconfHook }: + wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-settings-daemon"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0idw02z0iig0pfxvlhc4dq4sr7kl1w50xscvg0jzzswnxid2l4ip"; + sha256 = "1hc5a36wqpjv9i2lgrn1h12s8y910xab3phx5vzbzq47kj6m3gw9"; }; - patches = [ - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/mate-desktop/mate-settings-daemon/pull/296.patch"; - sha256 = "00dfn8h47zw3wr7yya82vvp19wsw51whn8jwgayn4hkjd161s9nm"; - }) - ]; - nativeBuildInputs = [ - autoreconfHook # drop with the above patch intltool pkgconfig wrapGAppsHook @@ -47,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MATE settings daemon"; - homepage = https://github.com/mate-desktop/mate-settings-daemon; + homepage = "https://github.com/mate-desktop/mate-settings-daemon"; license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From 7a390eae5799cbd43e6d6d5b62fbca1918796d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:23 -0300 Subject: [PATCH 045/243] mate.mate-system-monitor: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/mate-system-monitor/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 982d2d77b3e..ce281ebdda1 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-system-monitor"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1d4l5rv01343jf8bk2j5hxvrbp3d705nd4v2pdrjn4h5dw8nxsl1"; + sha256 = "1cb36lrsn4fhsryl2kl4yq0qhp1p4r7k21w3fc2ywjga8fdxx6y5"; }; nativeBuildInputs = [ @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { libgtop libwnck3 librsvg + polkit systemd ]; @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System monitor for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From fd6551f156df4c307c729d71d55753722761cbb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:23 -0300 Subject: [PATCH 046/243] mate.mate-terminal: 1.22.1 -> 1.24.0 --- pkgs/desktops/mate/mate-terminal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 905e5643898..1100bd4d241 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-terminal"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08210ry5lrivsgzqpdaxrchhpj0n5s1q0x4pxmwdpnksjpcj11mn"; + sha256 = "0nc23nmbkya2fgf7j65z85dcibwi5akkr8nscqrvk039ckirhk97"; }; buildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The MATE Terminal Emulator"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = licenses.gpl3; platforms = platforms.unix; }; From c80bec5de7b9202ada2febffc3bd88ceea07f445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:23 -0300 Subject: [PATCH 047/243] mate.mate-user-guide: 1.22.3 -> 1.24.0 --- pkgs/desktops/mate/mate-user-guide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 386b53837b1..d635fa8da6d 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-user-guide"; - version = "1.22.3"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zv8arsxnbab0qk3ck9i1wp3d4gfclcv6vq6nh5i8zjz6rpp9cjs"; + sha256 = "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f"; }; nativeBuildInputs = [ itstool intltool libxml2 ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MATE User Guide"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus fdl12 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From 5306b93657a72ab29f11e702f86d3b7ddf154aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:23 -0300 Subject: [PATCH 048/243] mate.mate-user-share: 1.22.1 -> 1.24.0 --- pkgs/desktops/mate/mate-user-share/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 7f5e4e10f14..a8777fa4dd7 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-user-share"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k"; + sha256 = "1h4aabcby96nsg557brzzb0an1qvnawhim2rinzlzg4fhkvdfnr5"; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "User level public file sharing for the MATE desktop"; - homepage = https://github.com/mate-desktop/mate-user-share; + homepage = "https://github.com/mate-desktop/mate-user-share"; license = with licenses; [ gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From 97ed661278a31811cba21d14f8d5e5f30cc52f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:23 -0300 Subject: [PATCH 049/243] mate.mate-utils: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/mate-utils/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 0afeb00610b..0d4ab907ef2 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-utils"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i6fnm3y1hj8r57x4jpc4ixqs77zln8f7477d0haypflxm3s4kjr"; + sha256 = "1b16n1628gcsym5mph6lr9x5xm4rgkxsa8xwr2wlx8g2gw2775i1"; }; nativeBuildInputs = [ @@ -22,13 +22,18 @@ stdenv.mkDerivation rec { libgtop libcanberra-gtk3 libxml2 + udisks2 mate.mate-panel hicolor-icon-theme ]; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Utilities for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From 096bb530c079bf7697418dc99536f0df359462b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:23 -0300 Subject: [PATCH 050/243] mate.mozo: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/mozo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 365a471dd7a..eb5361787a8 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mozo"; - version = "1.22.2"; + version = "1.24.0"; format = "other"; doCheck = false; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1lzcwsz940v218frwzhpywp1an9x3cgfvqr7r8dplpdapvd0khrs"; + sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3"; }; nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ]; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "MATE Desktop menu editor"; - homepage = https://github.com/mate-desktop/mozo; + homepage = "https://github.com/mate-desktop/mozo"; license = with licenses; [ lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From 31c6e56635f2c358b0b1143d7d130308fc7e289e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:24 -0300 Subject: [PATCH 051/243] mate.pluma: 1.22.2 -> 1.24.0 --- pkgs/desktops/mate/pluma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index cb1e3de376e..f617799beda 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pluma"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1gsj8grdhzb1jvl5zwd8zjc9cj9ys2ndny04gy4bbh80sjaj6xva"; + sha256 = "1vmndhlhy3qkf3xs5kkv0xhbv5ar25pqz0kp17hc4qhgjzycfr0r"; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Powerful text editor for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; From d0533644fa4deba40d010ef43e8f95c1e152914a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:51:24 -0300 Subject: [PATCH 052/243] mate.python-caja: 1.22.1 -> 1.24.0 --- pkgs/desktops/mate/python-caja/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index c566c8a6953..041bd3e121c 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "python-caja"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07hkvs4a6anrvh28zjsrj8anbcz32p19hslhq66yhcvh0hh4kvqk"; + sha256 = "1wp61q64cgzr3syd3niclj6rjk87wlib5m86i0myf5ph704r3qgg"; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Python binding for Caja components"; - homepage = https://github.com/mate-desktop/python-caja; + homepage = "https://github.com/mate-desktop/python-caja"; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; From d5a1f3616660a86f503cf882f9fde5d8fdcf10d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:52:08 -0300 Subject: [PATCH 053/243] mate.mate-icon-theme-faenza: quote homepage --- pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index a4fa6fedae3..dd8b5662119 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Faenza icon theme from MATE"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; From badd457e8cbe078cb53d2048d342ad5921802e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 14:53:06 -0300 Subject: [PATCH 054/243] mate.mate-themes: quote homepage --- pkgs/desktops/mate/mate-themes/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index c994513273b..8a444702f63 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of themes from MATE"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; From 95ae0156149fc9475340c45c722c5110b204123b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 15:01:21 -0300 Subject: [PATCH 055/243] mate.atril: add maintainer --- pkgs/desktops/mate/atril/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index b12a543d11c..4d402ffd9f5 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -32,10 +32,11 @@ stdenv.mkDerivation rec { makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ]; - meta = { + meta = with stdenv.lib; { description = "A simple multi-page document viewer for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } From 8aa38e74d07a1b5657de3fe8cc9017ff1474143c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 12 Feb 2020 15:02:59 -0300 Subject: [PATCH 056/243] mate.mate-terminal: add maintainer --- pkgs/desktops/mate/mate-terminal/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 1100bd4d241..f09c119fc81 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = licenses.gpl3; platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } From e4f65629dbab46933f8d872b32ddfa41df366bc6 Mon Sep 17 00:00:00 2001 From: Christoph Stich Date: Mon, 3 Feb 2020 18:17:22 +0000 Subject: [PATCH 057/243] julia_13: julia-1.3.1 version bump Added all-packages.nix --- pkgs/development/compilers/julia/1.3.nix | 168 ++++++++++++++++++ .../julia/use-system-utf8proc-julia-1.3.patch | 24 +++ pkgs/top-level/all-packages.nix | 6 + 3 files changed, 198 insertions(+) create mode 100644 pkgs/development/compilers/julia/1.3.nix create mode 100644 pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix new file mode 100644 index 00000000000..efb9ce39198 --- /dev/null +++ b/pkgs/development/compilers/julia/1.3.nix @@ -0,0 +1,168 @@ +{ stdenv, fetchurl, fetchzip, fetchFromGitHub +# build tools +, gfortran, m4, makeWrapper, patchelf, perl, which, python2 +, cmake +# libjulia dependencies +, libunwind, readline, utf8proc, zlib +# standard library dependencies +, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 +# linear algebra +, openblas, arpack +# llvm +, llvm +}: + +with stdenv.lib; + +# All dependencies must use the same OpenBLAS. +let + arpack_ = arpack; +in +let + arpack = arpack_.override { inherit openblas; }; +in + +let + majorVersion = "1"; + minorVersion = "3"; + maintenanceVersion = "1"; + src_sha256 = "0q9a7yc3b235psrwl5ghyxgwly25lf8n818l8h6bkf2ymdbsv5p6"; + version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; +in + +stdenv.mkDerivation rec { + pname = "julia"; + inherit version; + + src = fetchzip { + url = "https://github.com/JuliaLang/julia/releases/download/v${majorVersion}.${minorVersion}.${maintenanceVersion}/julia-${majorVersion}.${minorVersion}.${maintenanceVersion}-full.tar.gz"; + sha256 = src_sha256; + }; + + prePatch = '' + export PATH=$PATH:${cmake}/bin + ''; + + patches = [ + ./use-system-utf8proc-julia-1.3.patch + + # Julia recompiles a precompiled file if the mtime stored *in* the + # .ji file differs from the mtime of the .ji file. This + # doesn't work in Nix because Nix changes the mtime of files in + # the Nix store to 1. So patch Julia to accept mtimes of 1. + ./allow_nix_mtime.patch + ]; + + postPatch = '' + patchShebangs . contrib + for i in backtrace cmdlineargs; do + mv test/$i.jl{,.off} + touch test/$i.jl + done + rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl + rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl + sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl + sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl + ''; + + buildInputs = [ + arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr + pcre2.dev openblas openlibm openspecfun readline utf8proc + zlib + ] + ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] + ; + + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; + + makeFlags = + let + arch = head (splitString "-" stdenv.system); + march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch} + or (throw "unsupported architecture: ${arch}"); + # Julia requires Pentium 4 (SSE2) or better + cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch} + or (throw "unsupported architecture: ${arch}"); + in [ + "ARCH=${arch}" + "MARCH=${march}" + "JULIA_CPU_TARGET=${cpuTarget}" + "PREFIX=$(out)" + "prefix=$(out)" + "SHELL=${stdenv.shell}" + + "USE_SYSTEM_BLAS=1" + "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" + "LIBBLAS=-lopenblas" + "LIBBLASNAME=libopenblas" + + "USE_SYSTEM_LAPACK=1" + "LIBLAPACK=-lopenblas" + "LIBLAPACKNAME=libopenblas" + + "USE_SYSTEM_ARPACK=1" + "USE_SYSTEM_FFTW=1" + "USE_SYSTEM_GMP=1" + "USE_SYSTEM_LIBGIT2=1" + "USE_SYSTEM_LIBUNWIND=1" + + "USE_SYSTEM_MPFR=1" + "USE_SYSTEM_OPENLIBM=1" + "USE_SYSTEM_OPENSPECFUN=1" + "USE_SYSTEM_PATCHELF=1" + "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" + "USE_SYSTEM_READLINE=1" + "USE_SYSTEM_UTF8PROC=1" + "USE_SYSTEM_ZLIB=1" + + "USE_BINARYBUILDER=0" + ]; + + LD_LIBRARY_PATH = makeLibraryPath [ + arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm + openspecfun pcre2 + ]; + + enableParallelBuilding = true; + + doCheck = !stdenv.isDarwin; + checkTarget = "testall"; + # Julia's tests require read/write access to $HOME + preCheck = '' + export HOME="$NIX_BUILD_TOP" + ''; + + preBuild = '' + sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile + sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} + ''; + + postInstall = '' + # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, + # as using a wrapper with LD_LIBRARY_PATH causes segmentation + # faults when program returns an error: + # $ julia -e 'throw(Error())' + find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do + if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then + ln -sv $lib $out/lib/julia/$(basename $lib) + fi + done + ''; + + passthru = { + inherit majorVersion minorVersion maintenanceVersion; + site = "share/julia/site/v${majorVersion}.${minorVersion}"; + }; + + meta = { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = https://julialang.org/; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + broken = stdenv.isi686; + }; +} diff --git a/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch b/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch new file mode 100644 index 00000000000..63e0ba9ab05 --- /dev/null +++ b/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch @@ -0,0 +1,24 @@ +--- + src/flisp/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + + +diff --git a/src/flisp/Makefile b/src/flisp/Makefile +index d97075e..6bebca7 100644 +--- a/src/flisp/Makefile ++++ b/src/flisp/Makefile +@@ -32,9 +32,9 @@ OBJS := $(SRCS:%.c=$(BUILDDIR)/%.o) + DOBJS := $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj) + LLT_release := $(LLT_BUILDDIR)/libsupport.a + LLT_debug := $(LLT_BUILDDIR)/libsupport-debug.a +-LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC) +-LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC) +-LIBS := ++LIBFILES_release := $(LLT_release) $(LIBUV) ++LIBFILES_debug := $(LLT_debug) $(LIBUV) ++LIBS := $(LIBUTF8PROC) + ifneq ($(OS),WINNT) + LIBS += -lpthread + endif + +-- diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c8fe84c0b6..761c456e101 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8502,6 +8502,12 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; + julia_13 = callPackage ../development/compilers/julia/1.3.nix { + gmp = gmp6; + openblas = openblasCompat; + inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + }; + julia_1 = julia_10; julia = julia_1; From c4fe8c0f69f9701fa5c7ae819285de8c8c9bdbf6 Mon Sep 17 00:00:00 2001 From: Christoph Stich Date: Thu, 13 Feb 2020 11:57:14 +0000 Subject: [PATCH 058/243] julia_13: Fixed darwin dependencies --- pkgs/development/compilers/julia/1.3.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index efb9ce39198..5b1300ba240 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -8,8 +8,8 @@ , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra , openblas, arpack -# llvm -, llvm +# Darwin frameworks +, CoreServices, ApplicationServices }: with stdenv.lib; @@ -83,6 +83,8 @@ stdenv.mkDerivation rec { # Julia requires Pentium 4 (SSE2) or better cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch} or (throw "unsupported architecture: ${arch}"); + # Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM + # https://github.com/JuliaLang/julia/tree/master/deps/patches in [ "ARCH=${arch}" "MARCH=${march}" From 9cfe5a7a541052cffa78c94af5f04883125424c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 13 Feb 2020 15:56:29 +0000 Subject: [PATCH 059/243] nixos/redis: add requirePassFile option Avoids having the password in the nix store. --- nixos/modules/services/databases/redis.nix | 47 +++++++++++++++------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 70895fa53e4..5c817422aae 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -150,10 +150,20 @@ in requirePass = mkOption { type = with types; nullOr str; default = null; - description = "Password for database (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)"; + description = '' + Password for database (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE). + Use requirePassFile to store it outside of the nix store in a dedicated file. + ''; example = "letmein!"; }; + requirePassFile = mkOption { + type = with types; nullOr path; + default = null; + description = "File with password for the database."; + example = "/run/keys/redis-password"; + }; + appendOnly = mkOption { type = types.bool; default = false; @@ -192,6 +202,10 @@ in ###### implementation config = mkIf config.services.redis.enable { + assertions = [{ + assertion = cfg.requirePass != null -> cfg.requirePassFile == null; + message = "You can only set one services.redis.requirePass or services.redis.requirePassFile"; + }]; boot.kernel.sysctl = (mkMerge [ { "vm.nr_hugepages" = "0"; } ( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } ) @@ -208,21 +222,26 @@ in environment.systemPackages = [ cfg.package ]; - systemd.services.redis = - { description = "Redis Server"; + systemd.services.redis = { + description = "Redis Server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/redis-server ${redisConfig}"; - RuntimeDirectory = "redis"; - StateDirectory = "redis"; - Type = "notify"; - User = "redis"; - }; + preStart = '' + install -m 600 ${redisConfig} /run/redis/redis.conf + '' + optionalString (cfg.requirePassFile != null) '' + password=$(cat ${escapeShellArg cfg.requirePassFile}) + echo "requirePass $password" >> /run/redis/redis.conf + ''; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/redis-server /run/redis/redis.conf"; + RuntimeDirectory = "redis"; + StateDirectory = "redis"; + Type = "notify"; + User = "redis"; }; - + }; }; - } From f96163891a4d09827ec5e7c31226a533c79a7e00 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 13 Feb 2020 16:04:39 -0500 Subject: [PATCH 060/243] refind: 0.11.4 -> 0.11.5 --- pkgs/tools/bootloaders/refind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index cf0ad78d1d7..bebbb4d978c 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -14,12 +14,12 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.11.4"; + version = "0.11.5"; srcName = "refind-src-${version}"; src = fetchurl { url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz"; - sha256 = "1bjd0dl77bc5k6g3kc7s8m57vpbg2zscph9qh84xll9rc10g3fir"; + sha256 = "0pphl37y1zfrcai821aab9k097yp669hn1j07cas1nppinafg78v"; }; patches = [ From 9648094ec736b8b116ca818567b33b40ca3c2abf Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 13 Feb 2020 16:04:48 -0500 Subject: [PATCH 061/243] refind: Add samueldr to maintainers --- pkgs/tools/bootloaders/refind/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index bebbb4d978c..81686a456d0 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { Linux kernels that provide EFI stub support. ''; homepage = http://refind.sourceforge.net/; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres samueldr ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; license = licenses.gpl3Plus; }; From 6ef1edbeaa02f4e6adcaadcab009fe765e2b7032 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Feb 2020 03:38:53 +0000 Subject: [PATCH 062/243] rspamd: 2.2 -> 2.3 --- pkgs/servers/mail/rspamd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 3d04d35a3c5..15a651d8a32 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -10,13 +10,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "0rqiz4xm20w80q8p4grcgqcrg14yiddsay0aw00f0v82h4apw7k8"; + sha256 = "1v4kbvj9r0hs8jaisq3fr0rg0qndpbhc5h8cbpfpprmkbw4nj6pf"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; From dd95c8149aadff4bc8b0c8a8f7ace18e5facd53a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 14 Feb 2020 04:20:00 -0500 Subject: [PATCH 063/243] racket: 7.5 -> 7.6 Changelog: https://download.racket-lang.org/v7.6.html --- pkgs/development/interpreters/racket/default.nix | 4 ++-- pkgs/development/interpreters/racket/minimal.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index f12d1f1090f..3e9716af550 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "7.5"; # always change at once with ./minimal.nix + version = "7.6"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "0b74v0pqkx57x2gk0m4sp94jaf6bi1mci4ix9vx4sh2442sbds1j"; + sha256 = "0yagy7qrnz96gwafnj3whh2vs54788k1ci3vkm100h68gsw638b8"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index df7c72c4a68..9e817b76000 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "0478f0phkjch10ncsl8lm8a1m8qvgchrkgzpcaxyhmg2clyjgn8r"; + sha256 = "0id094q9024hj2n3907l7dblp3iix1v5289xzskmh5c26xfygp9y"; }; meta = oldAttrs.meta // { From f74988f8a593798437df52f3298e8250eb5c1771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 14 Feb 2020 09:27:50 -0300 Subject: [PATCH 064/243] mate.marco: add dependence on mate-settings-daemon Settings schema 'org.mate.peripherals-mouse' is needed by marco-1.24.x and is provided by mate-settings-daemon. --- pkgs/desktops/mate/marco/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 2a2bd9a4664..5d6f13a1779 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "marco"; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { libstartup_notification gtk3 gnome3.zenity + mate-settings-daemon ]; meta = with stdenv.lib; { From 698a3c65d5fc033a1e43713a4153a514291fa8d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 14 Feb 2020 11:09:49 -0300 Subject: [PATCH 065/243] mate: all applications have been migrated from intltools to gettext --- pkgs/desktops/mate/atril/default.nix | 4 ++-- pkgs/desktops/mate/caja-extensions/default.nix | 4 ++-- pkgs/desktops/mate/caja/default.nix | 4 ++-- pkgs/desktops/mate/engrampa/default.nix | 4 ++-- pkgs/desktops/mate/eom/default.nix | 4 ++-- pkgs/desktops/mate/libmatekbd/default.nix | 4 ++-- pkgs/desktops/mate/libmatemixer/default.nix | 4 ++-- pkgs/desktops/mate/libmateweather/default.nix | 4 ++-- pkgs/desktops/mate/marco/default.nix | 4 ++-- pkgs/desktops/mate/mate-applets/default.nix | 4 ++-- pkgs/desktops/mate/mate-backgrounds/default.nix | 4 ++-- pkgs/desktops/mate/mate-calc/default.nix | 4 ++-- pkgs/desktops/mate/mate-control-center/default.nix | 4 ++-- pkgs/desktops/mate/mate-desktop/default.nix | 4 ++-- pkgs/desktops/mate/mate-icon-theme/default.nix | 4 ++-- pkgs/desktops/mate/mate-indicator-applet/default.nix | 4 ++-- pkgs/desktops/mate/mate-media/default.nix | 4 ++-- pkgs/desktops/mate/mate-menus/default.nix | 4 ++-- pkgs/desktops/mate/mate-netbook/default.nix | 4 ++-- pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 ++-- pkgs/desktops/mate/mate-panel/default.nix | 4 ++-- pkgs/desktops/mate/mate-polkit/default.nix | 4 ++-- pkgs/desktops/mate/mate-power-manager/default.nix | 4 ++-- pkgs/desktops/mate/mate-screensaver/default.nix | 4 ++-- pkgs/desktops/mate/mate-sensors-applet/default.nix | 4 ++-- pkgs/desktops/mate/mate-session-manager/default.nix | 4 ++-- pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 ++-- pkgs/desktops/mate/mate-system-monitor/default.nix | 4 ++-- pkgs/desktops/mate/mate-terminal/default.nix | 4 ++-- pkgs/desktops/mate/mate-user-guide/default.nix | 4 ++-- pkgs/desktops/mate/mate-user-share/default.nix | 4 ++-- pkgs/desktops/mate/mate-utils/default.nix | 4 ++-- pkgs/desktops/mate/mozo/default.nix | 4 ++-- pkgs/desktops/mate/pluma/default.nix | 5 +++-- pkgs/desktops/mate/python-caja/default.nix | 4 ++-- 35 files changed, 71 insertions(+), 70 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 4d402ffd9f5..b7a7e16d462 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, texlive, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, texlive, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "atril"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 1704b5051b2..cb1a82c7e0e 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "caja-extensions"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 6508dfa3b8d..c1cc371d463 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "caja"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index de685badafc..06f7f8de6df 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "engrampa"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 2a535e321b5..a5cfd8be88e 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "eom"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index f4c2241aebb..6c1bd31d62b 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libxklavier }: stdenv.mkDerivation rec { pname = "libmatekbd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1sq7gwr9q3hq4q0vx32qqa68qcqf5by9mqyxnq6lwgaq8ydq16ab"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ gtk3 libxklavier ]; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index ca73c550cb1..ee2cd628453 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, intltool, glib +{ config, stdenv, fetchurl, pkgconfig, gettext, glib , alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , ossSupport ? false @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "08vkdp2kzy27xwscwp2jj5nz0yblrka2482l6cx3wl4dnk0rpznm"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ glib ] ++ stdenv.lib.optional alsaSupport alsaLib diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index f6c3c9b4e8a..cf9daf8b34c 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libsoup, tzdata }: stdenv.mkDerivation rec { pname = "libmateweather"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ gtk3 libsoup tzdata ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 5d6f13a1779..a1d8eed8d28 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "marco"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 2af9c6940d4..e7d4eda2f34 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-applets"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 6cb7d365ff6..4b649c6b293 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool }: +{ stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { pname = "mate-backgrounds"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16rmsy02fyq6mj6xgc5mdyh146z3zmkn7iwsi44s962aqwbpn4i8"; }; - nativeBuildInputs = [ intltool ]; + nativeBuildInputs = [ gettext ]; meta = with stdenv.lib; { description = "Background images and data for MATE"; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 7a1d97a1968..c0e82c391e8 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-calc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index beae8dc63ec..c8119a923d1 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, +{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, dbus-glib, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext itstool desktop-file-utils wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 48d672a6478..96f035e7115 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-desktop"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index b639bcf282d..59a19af5480 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: +{ stdenv, fetchurl, pkgconfig, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "mate-icon-theme"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na"; }; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; + nativeBuildInputs = [ pkgconfig gettext iconnamingutils ]; buildInputs = [ librsvg ]; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 731c1c83572..b9cb58ffe76 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-indicator-applet"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 1f1f77ae518..3ff6fe163ad 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-media"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext libtool wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 93ba4f59efc..2ad108ba750 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection, python3 }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, python3 }: stdenv.mkDerivation rec { pname = "mate-menus"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1vv4j38h7mrbfrsj99k25z6y7b5dg30fzd2qnhk7pl8ca8s1jhrd"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + nativeBuildInputs = [ pkgconfig gettext gobject-introspection ]; buildInputs = [ glib python3 ]; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 63284bb5188..8669205168c 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-netbook"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index e1e276d1b19..172dd1a6108 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libcanberra-gtk3, +{ stdenv, fetchurl, pkgconfig, gettext, glib, libcanberra-gtk3, libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext libxml2 # for xmllint wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 7436415ff6d..d98d90c1606 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-panel"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection - intltool + gettext itstool pkgconfig wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 8847046dd95..e65e37d9281 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: stdenv.mkDerivation rec { pname = "mate-polkit"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection - intltool + gettext pkgconfig ]; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 2e9a04ff855..71dfb9c1a20 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext libtool wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 3c5216ec8f3..8acde9fb396 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-screensaver"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext libxml2 # provides xmllint wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 1f401c8e561..92cc283ab33 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 6fe1996c6b5..0aedcd3cc34 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus-glib, systemd, +{ stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd, libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, wrapGAppsHook }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext xtrans wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 2eff667511d..af50ba8d8e4 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, +{ stdenv, fetchurl, pkgconfig, gettext, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - intltool + gettext pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index ce281ebdda1..84e5ae5d5d9 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-system-monitor"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index f09c119fc81..a0f98a864c1 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-terminal"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index d635fa8da6d..89a5e9720e6 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, itstool, libxml2, yelp }: +{ stdenv, fetchurl, gettext, itstool, libxml2, yelp }: stdenv.mkDerivation rec { pname = "mate-user-guide"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f"; }; - nativeBuildInputs = [ itstool intltool libxml2 ]; + nativeBuildInputs = [ itstool gettext libxml2 ]; buildInputs = [ yelp ]; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index a8777fa4dd7..eddf5ea4b29 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-user-share"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext itstool libxml2 wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 0d4ab907ef2..e36ff69a6fa 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-utils"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext itstool inkscape wrapGAppsHook diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index eb5361787a8..3abadc00fe4 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchurl, pkgconfig, intltool, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: +{ stdenv, python3, fetchurl, pkgconfig, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: python3.pkgs.buildPythonApplication rec { pname = "mozo"; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig gettext gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ]; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index f617799beda..fe4a8e48821 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pluma"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext + perl itstool isocodes wrapGAppsHook diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 041bd3e121c..ad4e46555aa 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, python3Packages }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, mate, python3Packages }: stdenv.mkDerivation rec { pname = "python-caja"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext python3Packages.wrapPython ]; From b13ccf503b1240a3c043e60532a33cf3a4fe1448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 14 Feb 2020 18:03:20 -0300 Subject: [PATCH 066/243] mate.mate-user-guide: use absolute path of yelp --- pkgs/desktops/mate/mate-user-guide/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 89a5e9720e6..c092bb56961 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ yelp ]; + postPatch = '' + substituteInPlace mate-user-guide.desktop.in.in \ + --replace "Exec=yelp" "Exec=${yelp}/bin/yelp" + ''; + meta = with stdenv.lib; { description = "MATE User Guide"; homepage = "https://mate-desktop.org"; From ba42fef9a76dd9b7b0d3e4f56d445f1506f52002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 14 Feb 2020 18:31:52 -0300 Subject: [PATCH 067/243] nixos/mate: add yelp to systemPackages Without this the Contents item in the Help menu of applications fails to launch. --- nixos/modules/services/x11/desktop-managers/mate.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 4a6f2ca727d..910a246d776 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -86,6 +86,7 @@ in pkgs.shared-mime-info pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ pkgs.mate.mate-settings-daemon + pkgs.yelp # for 'Contents' in 'Help' menus ]; programs.dconf.enable = true; From ceb87a4c269e92d671bf208b6951808a1dfdb921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 14 Feb 2020 18:52:51 -0300 Subject: [PATCH 068/243] mate: enable parallel building --- pkgs/desktops/mate/atril/default.nix | 2 ++ pkgs/desktops/mate/caja-dropbox/default.nix | 2 ++ pkgs/desktops/mate/caja-extensions/default.nix | 2 ++ pkgs/desktops/mate/caja/default.nix | 2 ++ pkgs/desktops/mate/engrampa/default.nix | 2 ++ pkgs/desktops/mate/eom/default.nix | 2 ++ pkgs/desktops/mate/libmatekbd/default.nix | 2 ++ pkgs/desktops/mate/libmatemixer/default.nix | 2 ++ pkgs/desktops/mate/libmateweather/default.nix | 2 ++ pkgs/desktops/mate/marco/default.nix | 2 ++ pkgs/desktops/mate/mate-applets/default.nix | 2 ++ pkgs/desktops/mate/mate-backgrounds/default.nix | 2 ++ pkgs/desktops/mate/mate-calc/default.nix | 2 ++ pkgs/desktops/mate/mate-common/default.nix | 2 ++ pkgs/desktops/mate/mate-desktop/default.nix | 2 ++ pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 2 ++ pkgs/desktops/mate/mate-icon-theme/default.nix | 2 ++ pkgs/desktops/mate/mate-indicator-applet/default.nix | 2 ++ pkgs/desktops/mate/mate-media/default.nix | 2 ++ pkgs/desktops/mate/mate-menus/default.nix | 2 ++ pkgs/desktops/mate/mate-netbook/default.nix | 2 ++ pkgs/desktops/mate/mate-notification-daemon/default.nix | 2 ++ pkgs/desktops/mate/mate-panel/default.nix | 2 ++ pkgs/desktops/mate/mate-polkit/default.nix | 2 ++ pkgs/desktops/mate/mate-power-manager/default.nix | 2 ++ pkgs/desktops/mate/mate-screensaver/default.nix | 2 ++ pkgs/desktops/mate/mate-sensors-applet/default.nix | 2 ++ pkgs/desktops/mate/mate-session-manager/default.nix | 2 ++ pkgs/desktops/mate/mate-settings-daemon/default.nix | 2 ++ pkgs/desktops/mate/mate-system-monitor/default.nix | 2 ++ pkgs/desktops/mate/mate-terminal/default.nix | 2 ++ pkgs/desktops/mate/mate-themes/default.nix | 2 ++ pkgs/desktops/mate/mate-user-guide/default.nix | 2 ++ pkgs/desktops/mate/mate-user-share/default.nix | 2 ++ pkgs/desktops/mate/mozo/default.nix | 2 ++ pkgs/desktops/mate/pluma/default.nix | 2 ++ pkgs/desktops/mate/python-caja/default.nix | 2 ++ 37 files changed, 74 insertions(+) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index b7a7e16d462..e71ca81142a 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A simple multi-page document viewer for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 2ced1ddf62b..7b2387721dc 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Dropbox extension for Caja file manager"; homepage = "https://github.com/mate-desktop/caja-dropbox"; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index cb1a82c7e0e..89191dc302b 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Set of extensions for Caja file manager"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index c1cc371d463..9f1ec9f587b 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-update-mimedb" ]; + enableParallelBuilding = true; + meta = { description = "File manager for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 06f7f8de6df..1f1be3e2857 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; + enableParallelBuilding = true; + meta = { description = "Archive Manager for MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index a5cfd8be88e..d7c54604089 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; + enableParallelBuilding = true; + meta = { description = "An image viewing and cataloging program for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 6c1bd31d62b..4c70c252806 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libxklavier ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Keyboard management library for MATE"; homepage = "https://github.com/mate-desktop/libmatekbd"; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index ee2cd628453..6bc9fe54ec3 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional ossSupport "--enable-oss"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Mixer library for MATE"; homepage = "https://github.com/mate-desktop/libmatemixer"; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index cf9daf8b34c..4774339db8b 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { preFixup = "rm -f $out/share/icons/mate/icon-theme.cache"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Library to access weather information from online services for MATE"; homepage = "https://github.com/mate-desktop/libmateweather"; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index a1d8eed8d28..3d36f51ab14 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { mate-settings-daemon ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MATE default window manager"; homepage = "https://github.com/mate-desktop/marco"; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index e7d4eda2f34..7f77a566807 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Applets for use with the MATE panel"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 4b649c6b293..85bf57ff1c0 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Background images and data for MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index c0e82c391e8..2de156d02de 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { libxml2 ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Calculator for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index c9ed7cd51f6..d2bd073e4a2 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "06w25mk2w7rfnkwpnav8pcrvip1zdd0zd1qc6d975ksmg66r1vz7"; }; + enableParallelBuilding = true; + meta = { description = "Common files for development of MATE packages"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 96f035e7115..6a5f8b13bf1 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { isocodes ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Library with common API for various MATE modules"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index dd8b5662119..26d8f86985b 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { done ''; + enableParallelBuilding = true; + meta = { description = "Faenza icon theme from MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 59a19af5480..4a1ea4c41fc 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { done ''; + enableParallelBuilding = true; + meta = { description = "Icon themes from MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index b9cb58ffe76..235929dce0c 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = "https://github.com/mate-desktop/mate-indicator-applet"; description = "MATE panel indicator applet"; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 3ff6fe163ad..c02201c855f 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Media tools for MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 2ad108ba750..7d418c90b4a 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Menu system for MATE"; homepage = "https://github.com/mate-desktop/mate-menus"; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 8669205168c..4c3338ef907 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { mate.mate-panel ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MATE utilities for netbooks"; longDescription = '' diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 172dd1a6108..32d0cc9ed8e 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Notification daemon for MATE Desktop"; homepage = "https://github.com/mate-desktop/mate-notification-daemon"; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index d98d90c1606..dce65675189 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "The MATE panel"; homepage = "https://github.com/mate-desktop/mate-panel"; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index e65e37d9281..2ab52624041 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { polkit ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Integrates polkit authentication for MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 71dfb9c1a20..37ff34e081a 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-applets" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "The MATE Power Manager"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 8acde9fb396..1c80b19aa5b 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Screen saver and locker for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 92cc283ab33..c7b7d5ba191 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = "https://github.com/mate-desktop/mate-sensors-applet"; description = "MATE panel applet for hardware sensors"; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 0aedcd3cc34..1db0947bf2a 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { polkit ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MATE Desktop session manager"; homepage = "https://github.com/mate-desktop/mate-session-manager"; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index af50ba8d8e4..30db743c276 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MATE settings daemon"; homepage = "https://github.com/mate-desktop/mate-settings-daemon"; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 84e5ae5d5d9..480cf8de1de 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-systemd" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "System monitor for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index a0f98a864c1..fc030152bcd 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "The MATE Terminal Emulator"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 8a444702f63..b2a0eea6d5e 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { gtk-update-icon-cache "$out"/share/icons/ContrastHigh ''; + enableParallelBuilding = true; + meta = { description = "A set of themes from MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index c092bb56961..20ab8a9a361 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { --replace "Exec=yelp" "Exec=${yelp}/bin/yelp" ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MATE User Guide"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index eddf5ea4b29..ba27ae6ce10 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { "--with-cajadir=$(out)/lib/caja/extensions-2.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "User level public file sharing for the MATE desktop"; homepage = "https://github.com/mate-desktop/mate-user-share"; diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 3abadc00fe4..7bad399623a 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -18,6 +18,8 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 glib ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MATE Desktop menu editor"; homepage = "https://github.com/mate-desktop/mozo"; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index fe4a8e48821..5a12ffc3782 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { mate.mate-desktop ]; + enableParallelBuilding = true; + meta = { description = "Powerful text editor for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index ad4e46555aa..570eaefb599 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Python binding for Caja components"; homepage = "https://github.com/mate-desktop/python-caja"; From be2ceb2efc0a150d68755189bc47c6240270bcdf Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 13 Feb 2020 21:41:35 -0800 Subject: [PATCH 069/243] fish: 3.0.2 -> 3.1.0 fish-shell 3.1.0 was just released today with many niceties (including the ability to have bash-like temporary env vars e.g. `VAR="var1" command` instead of needing to use `env VAR="var1" command`). To see the full list of changes, please visit https://github.com/fish-shell/fish-shell/releases/tag/3.1.0. --- pkgs/shells/fish/default.nix | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 5f59c33af0d..013cebfd7ec 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -90,7 +90,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.0.2"; + version = "3.1.0"; etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; @@ -98,7 +98,7 @@ let # There are differences between the release tarball and the tarball github packages from the tag # Hence we cannot use fetchFromGithub url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl"; + sha256 = "0s2356mlx7fp9kgqgw91lm5ds2i9iq9hq071fbqmcp3875l1xnz5"; }; nativeBuildInputs = [ cmake ]; @@ -109,11 +109,10 @@ let ''; patches = [ - # Fixes "Integer 243 in '243 (243)' followed by non-digit" error with systemctl completion. - # https://github.com/fish-shell/fish-shell/issues/5689 (will be included in fish 3.1.0) + # Fixes compilation on old Apple SDKs (fetchpatch { - url = "https://github.com/fish-shell/fish-shell/commit/c6ec4235136e82c709e8d7b455f7c463f9714b48.patch"; - sha256 = "02m6pkhhx6y21csydznsxkbpnwhcpzyz99xgd9ryh7s03v7wbigw"; + url = "https://github.com/fish-shell/fish-shell/commit/10385d422b3e2a823faebfdaf13edd0e7f48a27f.patch"; + sha256 = "0hj13kyjf5wr9j5afd4mfylcr7mz68ilbncbcf307drk1lv1lvrn"; }) ]; @@ -128,7 +127,7 @@ let sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ -i "$out/share/fish/functions/grep.fish" sed -i "s|which |${which}/bin/which |" \ - "$out/share/fish/functions/type.fish" + "$out/share/fish/functions/type.fish" sed -e "s|\|cut|\|${coreutils}/bin/cut|" \ -i "$out/share/fish/functions/fish_prompt.fish" sed -e "s|gettext |${gettext}/bin/gettext |" \ @@ -136,18 +135,18 @@ let -i "$out/share/fish/functions/_.fish" sed -e "s|uname|${coreutils}/bin/uname|" \ -i "$out/share/fish/functions/__fish_pwd.fish" \ - "$out/share/fish/functions/prompt_pwd.fish" + "$out/share/fish/functions/prompt_pwd.fish" sed -e "s|sed |${gnused}/bin/sed |" \ -i "$out/share/fish/functions/alias.fish" \ - "$out/share/fish/functions/prompt_pwd.fish" + "$out/share/fish/functions/prompt_pwd.fish" sed -i "s|nroff |${groff}/bin/nroff |" \ - "$out/share/fish/functions/__fish_print_help.fish" - sed -i "s|/sbin /usr/sbin||" \ - "$out/share/fish/functions/__fish_complete_subcommand_root.fish" - sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ + "$out/share/fish/functions/__fish_print_help.fish" + sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ -i "$out/share/fish/functions/fish_default_key_bindings.fish" - sed -e "s|python3|${getBin python3}/bin/python3|" \ + sed -e "s|python3|${getBin python3}/bin/python3|" \ -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} + sed -i "s|/usr/local/sbin /sbin /usr/sbin||" \ + $out/share/fish/completions/{sudo.fish,doas.fish} '' + optionalString stdenv.isLinux '' sed -e "s| ul| ${utillinux}/bin/ul|" \ From 124ff1a3fadd488e72e2f04a1f1db6284a0638af Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Feb 2020 00:38:26 +0000 Subject: [PATCH 070/243] gnome3.accerciser: 3.34.3 -> 3.34.4 --- pkgs/desktops/gnome-3/apps/accerciser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 8fd4a092376..41b40244f57 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; - version = "3.34.3"; + version = "3.34.4"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1ixyxfv2h5921x82d0r39v952ggclnf2xba5li01qmshl6b21kcc"; + sha256 = "0f1dixq5hc55dl3y0fr85bkrc2zk08n4dacqcjifij1dys4ks3z1"; }; nativeBuildInputs = [ From 2a4402d51afc8a6f4e094cc68376845e871b8ca4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Feb 2020 00:49:00 +0000 Subject: [PATCH 071/243] atlassian-cli: 9.1.0 -> 9.1.1 --- pkgs/applications/office/atlassian-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 021eadb6476..88da2442ecf 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atlassian-cli"; - version = "9.1.0"; + version = "9.1.1"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "06431nmz2k1d7vdpnyr88j777sfaa0vrfvxbr9zikn65176mkw7k"; + sha256 = "0mdf4ybp0a6c816210g76lx901qwxw727ipyiph5kbdzl4jlrpgm"; extraPostFetch = "chmod go-w $out"; }; From 66bcc484acf58d3ac92016bdfd5ece0e31b506d4 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Wed, 29 Jan 2020 19:25:03 -0800 Subject: [PATCH 072/243] swiftformat: 0.44.0 -> 0.44.2 --- pkgs/development/tools/swiftformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix index e87728b1a30..ac4502b05ab 100644 --- a/pkgs/development/tools/swiftformat/default.nix +++ b/pkgs/development/tools/swiftformat/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "swiftformat"; - version = "0.44.0"; + version = "0.44.2"; src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; rev = "${version}"; - sha256 = "13s6syzpxklkv07s1dzdccnqz6p316rrhjpxg8y8dy19ynj5jzvg"; + sha256 = "17g4w8kmkrhcp7lrfi525ck9jhcm96d0nn93yadacdjcdnchmih1"; }; preConfigure = "LD=$CC"; From 59886a75d9b7a2ff018828fb95ca6b6950cc5e49 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Feb 2020 02:53:01 +0000 Subject: [PATCH 073/243] avocode: 4.2.2 -> 4.3.0 --- pkgs/applications/graphics/avocode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index f15804038e7..c5c29459b45 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0f4cmai2d1x7wbqllxp9na6gxgqfxqav8n4g9azyvm6ymd8zjnx8"; + sha256 = "0ifb4nsh1mw61gb0hqphr1fmdkq1rjbrvvc9hvpclqg7wc7awids"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ From f2e5bb967fb23a51940eb3c6c99fe56feb296cf6 Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Fri, 14 Feb 2020 19:54:45 -0700 Subject: [PATCH 074/243] mullvad-vpn: 2020.1 -> 2020.2 --- pkgs/applications/networking/mullvad-vpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 4ec37dc5b54..d673c75764a 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -40,11 +40,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2019.10"; + version = "2020.2"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "0nckbhfpf4r5l5h22jcv93b5i9y2sc8lhcaffsg2ld804h5ygbbq"; + sha256 = "4f5970714684a86fba44b742d77f9bbe1147a111330e487d160d9844f34ae3d5"; }; nativeBuildInputs = [ From 8c58c44aaed3c05f817de9f0bf151bd927cb1abd Mon Sep 17 00:00:00 2001 From: Simon Chatterjee Date: Sat, 15 Feb 2020 16:37:24 +0000 Subject: [PATCH 075/243] haskell generic-builder: fix Darwin regression for lmdb Recent updates to the generic builder have caused haskellPackages.lmdb-simple to fail to build on Darwin, since it cannot see the lmdb C dynamic library included by its dependent haskellPackages.lmdb. The C dynamic library has suffix `.so` not `.dylib`, so this fix allows for that. Closes #80190, but that issue may identify a preferable solution. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 513987dae7b..ac22f903c9b 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -384,7 +384,7 @@ stdenv.mkDerivation ({ done for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do - for lib in "$d/"*.dylib; do + for lib in "$d/"*.{dylib,so}; do ln -s "$lib" "$dynamicLinksDir" done done From c83cc9c364649560a7a0dafc610c09cf24e39408 Mon Sep 17 00:00:00 2001 From: CRTified Date: Sat, 15 Feb 2020 20:44:36 +0100 Subject: [PATCH 076/243] nixos/docker-containers: Move ExecStartPre/ExecStopPost to preStart/postStop This commit fixes #76620. It moves ExecStartPre and ExecStopPost to preStart and postStop, as these options are composable. It thus allows adding additional initialisation scripts or cleanup scripts to the systemd unit of the docker container. --- .../modules/virtualisation/docker-containers.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/docker-containers.nix index cae39a56f52..5ab990a3d7c 100644 --- a/nixos/modules/virtualisation/docker-containers.nix +++ b/nixos/modules/virtualisation/docker-containers.nix @@ -210,7 +210,16 @@ let wantedBy = [] ++ optional (container.autoStart) "multi-user.target"; after = [ "docker.service" "docker.socket" ] ++ mkAfter; requires = after; + path = [ pkgs.docker ]; + preStart = '' + docker rm -f ${name} || true + ${optionalString (container.imageFile != null) '' + docker load -i ${container.imageFile} + ''} + ''; + postStop = "docker rm -f ${name} || true"; + serviceConfig = { ExecStart = concatStringsSep " \\\n " ([ "${pkgs.docker}/bin/docker run" @@ -229,12 +238,7 @@ let ++ map escapeShellArg container.cmd ); - ExecStartPre = - ["-${pkgs.docker}/bin/docker rm -f ${name}"] ++ - (optional (container.imageFile != null) "${pkgs.docker}/bin/docker load -i ${container.imageFile}"); - - ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || ${pkgs.docker}/bin/docker stop ${name}"''; - ExecStopPost = "-${pkgs.docker}/bin/docker rm -f ${name}"; + ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || docker stop ${name}"''; ### There is no generalized way of supporting `reload` for docker ### containers. Some containers may respond well to SIGHUP sent to their From ec3daae1fc259ad2f7530327815453d4b3a93090 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sat, 15 Feb 2020 23:21:12 +0100 Subject: [PATCH 077/243] tor-browser-bundle-bin: 9.0.4 -> 9.0.5 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index c925483147b..4fafe19b379 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -90,19 +90,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.0.4"; + version = "9.0.5"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "14zlf02i447hcdr4qap8af1k4aziznfp9m2ygqz05zsy8icm1j2k"; + sha256 = "1d4c3mrvqd6v086mwn3rnv776y2j3y45agnd0k5njqnmr53ybn2s"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "1bmih91gsh698fp2mbnjcq8vmwhg822wanmn99r0xhkmgpi4zw2s"; + sha256 = "040nh79hjkg5afvzshzhp7588dbi1pcpjsyk8phfqaapds74ma8y"; }; }; in From 9917c35480929e3965a1ca75c81a60394c8c66c1 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 15 Feb 2020 19:06:53 -0500 Subject: [PATCH 078/243] xidlehook: fix build by migrating off legacy fetchCargo Currently broken; see #79975 for details. Would also be fixed by #80153 eventually, but since we want to upgrade either way we might as well do so now. https://hydra.nixos.org/job/nixpkgs/trunk/xidlehook.x86_64-linux --- pkgs/tools/X11/xidlehook/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 49ebe825053..a4bc2295f1b 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -16,10 +16,7 @@ rustPlatform.buildRustPackage rec { }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0jdkcxvlw7s8pz1ka3d2w97356a2axvlwfgyh2dz7nmfzpjx64x0"; + cargoSha256 = "0wakw3pqgwfwarjfb3h0a2javrhnf509v3j547a7p9k5kbjb5np0"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig patchelf python3 ]; From dd65399e04c439ce9635565f6b087547e56339eb Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 16 Feb 2020 01:08:46 +0100 Subject: [PATCH 079/243] siji: split output into out, bdf, otb --- pkgs/data/fonts/siji/default.nix | 48 ++++++++++++++++++++++---------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index a0acf78d855..336fe48f54d 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -1,26 +1,44 @@ -{ lib, fetchzip }: +{ stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }: -let - date = "2016-05-13"; -in fetchzip { - name = "siji-${date}"; +stdenv.mkDerivation rec { + name = "siji-${version}"; + version = "2016-05-13"; - url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip; + src = fetchzip { + url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip; + sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; + }; - postFetch = '' - unzip -j $downloadedFile + nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; - install -D *.pcf -t $out/share/fonts/pcf - install -D *.bdf -t $out/share/fonts/bdf + buildPhase = '' + # compress pcf fonts + gzip -n -9 pcf/* + + # convert bdf fonts to otb + for i in bdf/*; do + name=$(basename $i .bdf) + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -o "$name.otb" "$i" + done ''; - sha256 = "1ymcbirdbkqaf0xs2y00l0wachb4yxh1fgqm5avqwvccs0lsfj1d"; + postInstall = '' + install -m 644 -D pcf/* -t "$out/share/fonts/misc" + install -m 644 -D bdf/* -t "$bdf/share/fonts/misc" + install -m 644 -D *.otb -t "$otb/share/fonts/misc" + mkfontdir "$out/share/fonts/misc" + mkfontdir "$bdf/share/fonts/misc" + mkfontdir "$otb/share/fonts/misc" + ''; - meta = { + outputs = [ "out" "bdf" "otb" ]; + + meta = with stdenv.lib; { homepage = https://github.com/stark/siji; description = "An iconic bitmap font based on Stlarch with additional glyphs"; - license = lib.licenses.gpl2; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.asymmetric ]; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.asymmetric ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8192f56c1b..2a20b46d7e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17920,7 +17920,8 @@ in inter-ui = callPackage ../data/fonts/inter-ui { }; inter = callPackage ../data/fonts/inter { }; - siji = callPackage ../data/fonts/siji { }; + siji = callPackage ../data/fonts/siji + { inherit (buildPackages.xorg) mkfontscale fonttosfnt; }; sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; From b5a6818a7f58e4930e25cfc22e9d06167dc66b62 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 16 Feb 2020 01:50:14 +0100 Subject: [PATCH 080/243] tamsyn: generate otb and split output --- pkgs/data/fonts/tamsyn/default.nix | 33 +++++++++++++++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix index 380024e7e1a..10f96b2b17a 100644 --- a/pkgs/data/fonts/tamsyn/default.nix +++ b/pkgs/data/fonts/tamsyn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, fontforge, mkfontscale }: let version = "1.11"; @@ -11,27 +11,32 @@ in stdenv.mkDerivation { sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp"; }; - nativeBuildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ fontforge mkfontscale ]; unpackPhase = '' tar -xzf $src --strip-components=1 ''; - installPhase = '' - # install the pcf fonts (for xorg applications) - fontDir="$out/share/fonts/tamsyn" - mkdir -p "$fontDir" - mv *.pcf "$fontDir" - mv *.psf.gz "$fontDir" + postBuild = '' + # convert pcf fonts to otb + for i in *.pcf; do + name=$(basename "$i" .pcf) + fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otb\")" + done - cd "$fontDir" - mkfontdir - mkfontscale + # compress pcf fonts + gzip -n -9 *.pcf ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "13l7ighfmn3kmqmchlksfg8ss22ndjk71rs0f9fn5p5zk7s4dn5x"; + installPhase = '' + install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc" + install -m 644 -D *.psf.gz -t "$out/share/consolefonts" + install -m 644 -D *.otb -t "$otb/share/fonts/misc" + mkfontdir "$out/share/fonts/misc" + mkfontdir "$otb/share/fonts/misc" + ''; + + outputs = [ "out" "otb" ]; meta = with stdenv.lib; { description = "A monospace bitmap font aimed at programmers"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8192f56c1b..1652c0011be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17951,7 +17951,7 @@ in inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; - tamsyn = callPackage ../data/fonts/tamsyn { }; + tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; }; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { gtk = res.gtk2; From 31971254d70802d8c248dedc50882247824c3bb1 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 15 Feb 2020 23:09:32 -0500 Subject: [PATCH 081/243] wasm-gc: remove package The upstream repository has been archived, with a note that this should never be needed: https://github.com/alexcrichton/wasm-gc It also happens to have custom patch logic that will fail the newer cargo verification in #79975 --- .../interpreters/wasm-gc/default.nix | 28 --------------- .../interpreters/wasm-gc/fix-build.patch | 34 ------------------- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 pkgs/development/interpreters/wasm-gc/default.nix delete mode 100644 pkgs/development/interpreters/wasm-gc/fix-build.patch diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix deleted file mode 100644 index 585a90c505b..00000000000 --- a/pkgs/development/interpreters/wasm-gc/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "wasm-gc"; - version = "0.1.6"; - - src = fetchFromGitHub { - owner = "alexcrichton"; - repo = "wasm-gc"; - rev = version; - sha256 = "1lc30xxqp3vv1r269xzznh2lf2dzdq89bi5f1vmqjw4yc3xmawm7"; - }; - - cargoPatches = [ ./fix-build.patch ]; # Cargo.lock is not up-to-date - - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "073dnn80sl4adh7vi6q9sx2vkmy27gxy7ysxz17iz12p7pfcagm2"; - - meta = with stdenv.lib; { - description = "gc-sections for wasm"; - homepage = "https://github.com/alexcrichton/wasm-gc"; - maintainers = with maintainers; [ ekleog ]; - platforms = platforms.all; - license = with licenses; [ mit asl20 ]; - }; -} diff --git a/pkgs/development/interpreters/wasm-gc/fix-build.patch b/pkgs/development/interpreters/wasm-gc/fix-build.patch deleted file mode 100644 index 3144dd89837..00000000000 --- a/pkgs/development/interpreters/wasm-gc/fix-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 923ed91..71f17c8 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -212,16 +212,16 @@ dependencies = [ - - [[package]] - name = "wasm-gc" --version = "0.1.1" -+version = "0.1.6" - dependencies = [ - "env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-gc-api 0.1.5", -+ "wasm-gc-api 0.1.6", - ] - - [[package]] - name = "wasm-gc-api" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-wasm 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -234,7 +234,7 @@ version = "0.1.0" - dependencies = [ - "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-gc-api 0.1.5", -+ "wasm-gc-api 0.1.6", - ] - - [[package]] - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8192f56c1b..9d202271a23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9506,8 +9506,6 @@ in proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; - wasm-gc = callPackage ../development/interpreters/wasm-gc { }; - ### DEVELOPMENT / MISC @@ -11488,7 +11486,7 @@ in }; gdal = callPackage ../development/libraries/gdal { - pythonPackages = python3Packages; + pythonPackages = python3Packages; }; gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; From 02b760b2a825c95d899bb704b618bfb5fc478efc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 13 Feb 2020 08:11:59 -0600 Subject: [PATCH 082/243] spleen: 1.6.0 -> 1.7.0 --- pkgs/data/fonts/spleen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 42645fda664..c3cfec244e3 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,7 +2,7 @@ let pname = "spleen"; - version = "1.6.0"; + version = "1.7.0"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; @@ -19,7 +19,7 @@ in fetchurl { # create fonts.dir so NixOS xorg module adds to fp ${mkfontscale}/bin/mkfontdir "$d" ''; - sha256 = "0x1xiw4gyfkyvwqg0f47rl92zq76d0c6jfncdnq8m2wwpxz9697b"; + sha256 = "17dn6spfr8wv63sy009djb4q12q635m13wsyirzn074qabhr9ggg"; meta = with lib; { description = "Monospaced bitmap fonts"; From 71a97479b5dd7e927ac409890eb8d28fc032845c Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 15 Feb 2020 23:33:58 -0500 Subject: [PATCH 083/243] cargo-asm: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/development/tools/rust/cargo-asm/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index af9f2fa82ff..9d2279fe598 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0zn5p95hsmhvk2slc9hakrpvim6l4zbpgkks2x64ndwyfmzyykws"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1k9mc29y4487ssf5whvr8xig7j4jh0rpcrhclp6siw8xamygijdm"; + cargoSha256 = "1xsfwzn2b7hmb7hwgfa4ss7qfas8957gkw7zys0an9hdj5qr3ywb"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From 05764cf5bf033ee6959503ebdf6b116291bacd3b Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 15 Feb 2020 23:54:54 -0500 Subject: [PATCH 084/243] cargo-deb: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/tools/package-management/cargo-deb/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix index 6672e31e302..493633d99f0 100644 --- a/pkgs/tools/package-management/cargo-deb/default.nix +++ b/pkgs/tools/package-management/cargo-deb/default.nix @@ -17,10 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0j64dcczxdr9zdch4a241d5adgipzz8sgbw00min9k3p8hbljd9n"; + cargoSha256 = "0ji6d5a23rzhkkk27iigqcf2zw3mx1p1ap0cryqcj43z5ixdygiw"; meta = with lib; { description = "Generate Debian packages from information in Cargo.toml"; From d4212f7036fa8016ba1451246e7a9c1b7ca4e453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 16 Feb 2020 08:19:23 +0100 Subject: [PATCH 085/243] softmaker-office: 972 -> 974 Changelog: https://www.softmaker.com/en/servicepacks-office-changelog --- pkgs/applications/office/softmaker/softmaker_office.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix index 73a7d9bd35b..ed4903d6474 100644 --- a/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/pkgs/applications/office/softmaker/softmaker_office.nix @@ -2,13 +2,13 @@ callPackage ./generic.nix (args // rec { pname = "softmaker-office"; - version = "972"; + version = "974"; edition = "2018"; suiteName = "SoftMaker Office"; src = fetchurl { url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; - sha256 = "06kgkmqg5269a4vm14i89mw8m1x9yy9ajw0dhfcvjizadyzmlqn1"; + sha256 = "0z1g76lhja92s25x6y0h55wmqza2d3pjbshn5b9rn2784gjgj7hn"; }; archive = "office${edition}.tar.lzma"; From a4014a71ed437a41bcea3157a231f5f5d4753f4d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Feb 2020 15:14:36 +0000 Subject: [PATCH 086/243] homebank: 5.3.1 -> 5.3.2 --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 683cddde5ec..3cda543eda1 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.3.1"; + name = "homebank-5.3.2"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "119lyr8c33n8sa3s4l8s33ajwhyv0qgpmaigkyaqnccbkw1qdhhv"; + sha256 = "1fr4060yqlciay98dypvifmfvr8y2kbpj89d86mcvq9gb00vij2b"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; From e7f3e3e2d8723880d1c841cbc6f631528794b0ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Feb 2020 05:06:04 +0000 Subject: [PATCH 087/243] clickhouse: 19.13.6.51 -> 19.17.8.54 --- pkgs/servers/clickhouse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 4c586efe177..90cdfc3e705 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "19.13.6.51"; + version = "19.17.8.54"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "0mcwfam1nrs2g54syw7vvpfkjn3l4gfzvla7xbg92lr03fn6kbn2"; + sha256 = "0ck6kcifj7y4i2j1jj1a9vf5nfpp9mxk5x8y8557zp9yayjm9qyr"; }; nativeBuildInputs = [ cmake libtool ninja ]; From 4f0f4ae25c24a652702427cb3590a2eaab896b5e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Feb 2020 10:43:24 +0000 Subject: [PATCH 088/243] liquibase: 3.8.5 -> 3.8.6 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index e3ad2a5bcbc..990fbba7226 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.8.5"; + version = "3.8.6"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0wvz188i1214b904xrhvba90hyfrlc4za3aibbdqfm86wm3qzh6s"; + sha256 = "19x6v8kji3mjpf3r0khmlvgkljm269r16w8p4yvknsw4rf0rl9x4"; }; buildInputs = [ jre makeWrapper ]; From 0a625e2d3454c2fb5a502b3da9c1e890122bbab1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Feb 2020 07:56:42 +0000 Subject: [PATCH 089/243] freeorion: 0.4.8 -> 0.4.9 --- pkgs/games/freeorion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index dfad954f0f0..527e4168083 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "0.4.8"; + version = "0.4.9"; pname = "freeorion"; src = fetchFromGitHub { owner = "freeorion"; repo = "freeorion"; rev = "v${version}"; - sha256 = "1lj1q2ljjgbbiqxb53wdrrcz0zxxr3vv9jqrhbzvfsss7q808jfw"; + sha256 = "18xigx4qla225ybf7mc1w8zfm81nhcm1i5181n5l2fbndvslb1wf"; }; buildInputs = [ From 9d304bd60ba44bfdc8623857b3a4ec9bee023fb8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 16 Feb 2020 09:26:58 +0100 Subject: [PATCH 090/243] python2Packages.spyder-kernels: fix build --- .../python-modules/spyder-kernels/2.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/spyder-kernels/2.nix diff --git a/pkgs/development/python-modules/spyder-kernels/2.nix b/pkgs/development/python-modules/spyder-kernels/2.nix new file mode 100644 index 00000000000..86daec23d95 --- /dev/null +++ b/pkgs/development/python-modules/spyder-kernels/2.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, + jupyter_client, pyzmq }: + +buildPythonPackage rec { + pname = "spyder-kernels"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "01354b7fa180a87212cc005553b31a7300159b108d36828e301d3782291323f7"; + }; + + propagatedBuildInputs = [ + cloudpickle + ipykernel + wurlitzer + jupyter_client + pyzmq + ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Jupyter kernels for Spyder's console"; + homepage = "https://github.com/spyder-ide/spyder-kernels"; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9dfa595f231..bed57a8ed62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1459,8 +1459,8 @@ in { sniffio = callPackage ../development/python-modules/sniffio { }; - spyder-kernels = callPackage ../development/python-modules/spyder-kernels {}; - spyder = callPackage ../development/python-modules/spyder {}; + spyder-kernels = if isPy3k then callPackage ../development/python-modules/spyder-kernels {} + else callPackage ../development/python-modules/spyder-kernels/2.nix {}; tenacity = callPackage ../development/python-modules/tenacity { }; From 3ff3e2ce1f4bce7882c02cd1a0ba8a561d9c3716 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 16 Feb 2020 09:27:14 +0100 Subject: [PATCH 091/243] python2Packages.spyder: fix build --- pkgs/development/python-modules/spyder/2.nix | 70 ++++++++++++++++++++ pkgs/top-level/python-packages.nix | 3 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/spyder/2.nix diff --git a/pkgs/development/python-modules/spyder/2.nix b/pkgs/development/python-modules/spyder/2.nix new file mode 100644 index 00000000000..b707d4a0abc --- /dev/null +++ b/pkgs/development/python-modules/spyder/2.nix @@ -0,0 +1,70 @@ +{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, + psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, + qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, + spyder-kernels, qtpy, pyzmq, chardet +, pyqtwebengine +}: + +buildPythonPackage rec { + pname = "spyder"; + version = "3.3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1"; + }; + + nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; + + propagatedBuildInputs = [ + jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring + numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels + pygments qtpy pyzmq chardet pyqtwebengine + ]; + + # There is no test for spyder + doCheck = false; + + desktopItem = makeDesktopItem { + name = "Spyder"; + exec = "spyder"; + icon = "spyder"; + comment = "Scientific Python Development Environment"; + desktopName = "Spyder"; + genericName = "Python IDE"; + categories = "Application;Development;Editor;IDE;"; + }; + + postPatch = '' + # remove dependency on pyqtwebengine + # this is still part of the pyqt 5.11 version we have in nixpkgs + sed -i /pyqtwebengine/d setup.py + substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" + ''; + + # Create desktop item + postInstall = '' + mkdir -p $out/share/icons + cp spyder/images/spyder.svg $out/share/icons + cp -r $desktopItem/share/applications/ $out/share + ''; + + dontWrapQtApps = true; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = with stdenv.lib; { + description = "Scientific python development environment"; + longDescription = '' + Spyder (previously known as Pydee) is a powerful interactive development + environment for the Python language with advanced editing, interactive + testing, debugging and introspection features. + ''; + homepage = "https://github.com/spyder-ide/spyder/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bed57a8ed62..bab1135c2a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1462,6 +1462,9 @@ in { spyder-kernels = if isPy3k then callPackage ../development/python-modules/spyder-kernels {} else callPackage ../development/python-modules/spyder-kernels/2.nix {}; + spyder = if isPy3k then callPackage ../development/python-modules/spyder {} + else callPackage ../development/python-modules/spyder/2.nix {}; + tenacity = callPackage ../development/python-modules/tenacity { }; tokenserver = callPackage ../development/python-modules/tokenserver {}; From d70bdb7047fe40c811f8d5cedf654bfc81826ec7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 16 Feb 2020 09:47:12 +0100 Subject: [PATCH 092/243] pythonPackages.helpdev: init at 0.6.10 --- .../python-modules/helpdev/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/helpdev/default.nix diff --git a/pkgs/development/python-modules/helpdev/default.nix b/pkgs/development/python-modules/helpdev/default.nix new file mode 100644 index 00000000000..5977ec3aee2 --- /dev/null +++ b/pkgs/development/python-modules/helpdev/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, importlib-metadata +, psutil +}: + +buildPythonPackage rec { + pname = "helpdev"; + version = "0.6.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "9e61d24458b7506809670222ca656b139e67d46c530cd227a899780152d7b44e"; + }; + + propagatedBuildInputs = [ + importlib-metadata + psutil + ]; + + # No tests included in archive + doCheck = false; + + meta = { + description = "Extracts information about the Python environment easily"; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bab1135c2a0..927bfa285ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2759,6 +2759,8 @@ in { hbmqtt = callPackage ../development/python-modules/hbmqtt { }; + helpdev = callPackage ../development/python-modules/helpdev { }; + hickle = callPackage ../development/python-modules/hickle { }; hiro = callPackage ../development/python-modules/hiro {}; From 11641a16fab102deec2853ba42b36d4b527838f4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 16 Feb 2020 09:47:28 +0100 Subject: [PATCH 093/243] pythonPackages.qdarkstyle: 2.6.8 -> 2.8 --- .../python-modules/qdarkstyle/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix index 425bb21a687..a1893c88e0e 100644 --- a/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/pkgs/development/python-modules/qdarkstyle/default.nix @@ -1,18 +1,25 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, helpdev +, qtpy +}: buildPythonPackage rec { pname = "qdarkstyle"; - version = "2.6.8"; + version = "2.8"; src = fetchPypi { inherit version; pname = "QDarkStyle"; - sha256 = "18l2ynq2x8jd380nr47xy947c3qdmhv8nnxnan03y5d51azm8yh3"; + sha256 = "6a967c4b664446f8bed9df12d1032cf68cb54f186bfc9cbfdbbc756bf9a5d475"; }; # No tests available doCheck = false; + propagatedBuildInputs = [ helpdev qtpy ]; + meta = with lib; { description = "A dark stylesheet for Python and Qt applications"; homepage = https://github.com/ColinDuquesnoy/QDarkStyleSheet; From a4645dfa33799683caca77296cf185cb9179eec9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 16 Feb 2020 09:47:45 +0100 Subject: [PATCH 094/243] pythonPackages.python-jsonrpc-server: 0.2.0 -> 0.3.4 --- .../python-modules/python-jsonrpc-server/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 29c6950070a..f972187d6fc 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,17 +1,17 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder , pytest, mock, pytestcov, coverage -, future, futures +, future, futures, ujson }: buildPythonPackage rec { pname = "python-jsonrpc-server"; - version = "0.2.0"; + version = "0.3.4"; src = fetchFromGitHub { owner = "palantir"; repo = "python-jsonrpc-server"; rev = version; - sha256 = "054b0xm5z3f82jwp7zj21pkh7gwj9jd933jhymdx49n1n1iynfn0"; + sha256 = "sha256:027sx5pv4i9a192kr00bjjcxxprh2xyr8q5372q8ghff3xryk9dd"; }; postPatch = '' @@ -26,7 +26,7 @@ buildPythonPackage rec { pytest ''; - propagatedBuildInputs = [ future ] + propagatedBuildInputs = [ future ujson ] ++ stdenv.lib.optional (pythonOlder "3.2") futures; meta = with stdenv.lib; { From ebc94344f7780209df4e402105390e72253ff5c3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 16 Feb 2020 09:47:58 +0100 Subject: [PATCH 095/243] pythonPackages.python-language-server: 0.29.1 -> 0.31.8 --- .../python-language-server/default.nix | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index b029373bdca..74eadd9b2de 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8 -, pytest, mock, pytestcov, coverage, setuptools +, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] # The following packages are optional and @@ -21,30 +21,45 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.29.1"; + version = "0.31.8"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "0hsp0h8vma8z6f0mg311hp59h6hayl7zzxmy295x5fl2l9iiakfv"; + sha256 = "sha256:1h0w7x7d9g3z7vmxn5w7qxdkjya3sl0xfnklfaaaj8dkb5mjldpi"; }; # The tests require all the providers, disable otherwise. doCheck = providers == ["*"]; checkInputs = [ - pytest mock pytestcov coverage + pytestCheckHook mock pytestcov coverage # rope is technically a dependency, but we don't add it by default since we # already have jedi, which is the preferred option rope ]; - checkPhase = '' - HOME=$TEMPDIR pytest + dontUseSetuptoolsCheck = true; + + preCheck = '' + export HOME=$TEMPDIR ''; - propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ] + # Tests failed since update to 0.31.8 + disabledTests = [ + "test_pyqt_completion" + "test_numpy_completions" + "test_pandas_completions" + "test_matplotlib_completions" + "test_snippet_parsing" + + ]; + # checkPhase = '' + # HOME=$TEMPDIR pytest -k "not test_pyqt_completion and not + # ''; + + propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ] ++ stdenv.lib.optional (withProvider "autopep8") autopep8 ++ stdenv.lib.optional (withProvider "mccabe") mccabe ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle From 68a8115e10674435dec121a47df013c1283c8d01 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 03:49:11 -0500 Subject: [PATCH 096/243] gnome-podcasts: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/applications/audio/gnome-podcasts/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index c28754e471a..47945de7833 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -32,10 +32,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1h0n8zclb8a1b1ri83viiwwzlj3anm38m4cp38aqyf6q40qga35q"; + cargoSha256 = "1dlbdxsf9p2jzrsclm43k95y8m3zcd41qd9ajg1ii3fpnahi58kd"; nativeBuildInputs = [ meson From 1f03a3434f5781ea198b9e8852edbb784be76ca0 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 03:53:12 -0500 Subject: [PATCH 097/243] alacritty: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/applications/misc/alacritty/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 34d2b510a03..a4d77715199 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -62,10 +62,7 @@ in buildRustPackage rec { sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1kc9n10kb4j87x337pzl6wpi0qj5ib2mqmrjag2yld3138dag71n"; + cargoSha256 = "182j8ah67b2gw409vjfml3p41i00zh0klx9m8bwfkm64y2ki2bip"; nativeBuildInputs = [ cmake From 4ba018085e4e7599bfbc2c53949b17406f94a64d Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 03:54:36 -0500 Subject: [PATCH 098/243] loc: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/development/misc/loc/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 78a89baeafb..ba4ab6bf615 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -13,10 +13,7 @@ buildRustPackage rec { sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "06iqzpg5jz1xd2amajvlf7yaz9kr3q2ipbhx71whvv9mwplmxmbi"; + cargoSha256 = "1fgv1kxiif48q9mm60ygn88r5nkxfyiacmvbgwp0jxiacv8r7779"; meta = with stdenv.lib; { homepage = https://github.com/cgag/loc; From 3a773045e662b7ba14cbddb9e6c94f54e86a86aa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 16 Feb 2020 09:52:25 +0100 Subject: [PATCH 099/243] python3Packages: attempt to fix build, mark as broken Earlier spyder was updated to 4.0.0. This build fails. Adding new dependencies, it still fails, because it needs a very specific version of jedi. This is problematic, we cannot have these tight constraints in the Python packages set. We could revert to 3.x. It builds, however, I expect it to have runtime issues due to jedi as well. https://github.com/spyder-ide/spyder/issues/11047 --- pkgs/development/python-modules/spyder/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 47094fcb993..65fabc6c7bc 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -1,25 +1,25 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, +{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, intervaltree, jedi, pycodestyle, psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, - spyder-kernels, qtpy, pyzmq, chardet + spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server , pyqtwebengine }: buildPythonPackage rec { pname = "spyder"; - version = "4.0.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "f2bfece9743188e3d1da68f02271a7c6eb7f0a3b692c3df4952458ab96b037a8"; + sha256 = "4b279c16487d224368dd2213e1517185fa59fc528f539601fffb34ea97accb7b"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; propagatedBuildInputs = [ - jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring + intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels - pygments qtpy pyzmq chardet pyqtwebengine + pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server ]; # There is no test for spyder @@ -66,5 +66,6 @@ buildPythonPackage rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ gebner ]; + broken = true; }; } From 7605f60665e35a8039818fbe7a7e4064fbf5578f Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 03:57:15 -0500 Subject: [PATCH 100/243] async: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/development/tools/async/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix index 65c1a0fa78d..dad1e2f6574 100644 --- a/pkgs/development/tools/async/default.nix +++ b/pkgs/development/tools/async/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "19ypflbayi5l0mb8yw7w0a4bq9a3w8nl9jsxapp9m3xggzmsvrxx"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1qf52xsd15rj8y9w65zyab7akvzry76k1d4gxvxlz7ph3sl7jl3y"; + cargoSha256 = "1zgds5rjjikvaj0rxc7slyvkjn067s0v8vdnxn3vsv819q5yd707"; meta = with stdenv.lib; { description = "A tool to parallelize shell commands"; From 16eb59cecb6b6f9e72e4f484ff94ad6ed0c73b4e Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 15 Feb 2020 23:45:47 -0500 Subject: [PATCH 101/243] rust-bindgen: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/development/tools/rust/bindgen/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index db1ad9f0ea9..c064ebc4e7e 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0zxqryqks9in9q7az0lrw8fq9wnc5p4yf6b1fxnzy2j6qhlw2c5c"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1wy5xdkf9ql2l9qavi0fh7hwjvly108f4l2m1k947412fyjwr7x7"; + cargoSha256 = "1fdgm83l9d469garfbgny6jk1fvwnwh32sybz9g7s2qzrvzzrx1d"; libclang = llvmPackages.libclang.lib; #for substituteAll From 53a967f138d0187311b3e90f0ab0a502890edc7a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 13 Feb 2020 21:13:41 -0600 Subject: [PATCH 102/243] readline80: p1 -> p4 https://ftp.gnu.org/gnu/readline/readline-8.0-patches/readline80-002 https://ftp.gnu.org/gnu/readline/readline-8.0-patches/readline80-003 https://ftp.gnu.org/gnu/readline/readline-8.0-patches/readline80-004 --- pkgs/development/libraries/readline/readline-8.0-patches.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/readline/readline-8.0-patches.nix b/pkgs/development/libraries/readline/readline-8.0-patches.nix index 433da83dab9..2fac6a413c7 100644 --- a/pkgs/development/libraries/readline/readline-8.0-patches.nix +++ b/pkgs/development/libraries/readline/readline-8.0-patches.nix @@ -2,4 +2,7 @@ patch: [ (patch "001" "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq") +(patch "002" "1xy8mv8xm8hsfixwp3ci9kfx3dii3y92cq27wwd0jq75y6zzxc1n") +(patch "003" "1vza7sxjcsr2z295ij12nzgncdil1vb6as3mqy4m7svi1chv5pcl") +(patch "004" "0k1rfx9w32lglxg564yvp0mw6jg6883p8ac2f2lxxqpf80m3vami") ] From afc321fa914323ab611885946a9442477dabb05b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 13 Feb 2020 21:18:24 -0600 Subject: [PATCH 103/243] bash_5: 5p11 -> 5p16 https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-012 https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-013 https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-014 https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-015 https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-016 --- pkgs/shells/bash/bash-5.0-patches.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/shells/bash/bash-5.0-patches.nix b/pkgs/shells/bash/bash-5.0-patches.nix index 1f24a6dec12..e6481aa4da1 100644 --- a/pkgs/shells/bash/bash-5.0-patches.nix +++ b/pkgs/shells/bash/bash-5.0-patches.nix @@ -12,4 +12,9 @@ patch: [ (patch "009" "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d") (patch "010" "04ca5bjv456v538mkspzvn4xb2zdphh31r4fpvfm9p5my0jw7yyn") (patch "011" "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c") +(patch "012" "0cz21qg2gbr40lfgza7g02bqi2qknwqgxnq459pjj640d0cywhr9") +(patch "013" "16h9nwz3yzwj7fnxvlidjymdc4yr30h818433gh9j1x3in6igmzm") +(patch "014" "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx") +(patch "015" "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5") +(patch "016" "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz") ] From 4eb84c9ed4e07b115f0e84ad9bf8466cd63284d9 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 16 Feb 2020 10:46:35 +0100 Subject: [PATCH 104/243] terminus_font: generate otb and split output --- pkgs/data/fonts/terminus-font/default.nix | 35 +++++++++++++++++++---- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 358ab959cd0..88ae9ac72c2 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, python3 +, libfaketime, fonttosfnt +, bdftopcf, mkfontscale +}: stdenv.mkDerivation rec { pname = "terminus-font"; @@ -9,16 +12,36 @@ stdenv.mkDerivation rec { sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l"; }; - nativeBuildInputs = [ python3 bdftopcf mkfontdir mkfontscale ]; - - patchPhase = '' - substituteInPlace Makefile --replace 'fc-cache' '#fc-cache' - ''; + nativeBuildInputs = + [ python3 bdftopcf libfaketime + fonttosfnt mkfontscale + ]; enableParallelBuilding = true; + postPatch = '' + substituteInPlace Makefile --replace 'fc-cache' '#fc-cache' + ''; + + postBuild = '' + # convert unicode bdf fonts to otb + for i in *.bdf; do + name=$(basename $i .bdf) + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -o "$name.otb" "$i" + done + ''; + + postInstall = '' + # install otb fonts (for GTK applications) + install -m 644 -D *.otb -t "$otb/share/fonts/misc"; + mkfontdir "$otb/share/fonts/misc" + ''; + installTargets = [ "install" "fontdir" ]; + outputs = [ "out" "otb" ]; + meta = with stdenv.lib; { description = "A clean fixed width font"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8192f56c1b..aadb74aa4da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17971,7 +17971,8 @@ in tenderness = callPackage ../data/fonts/tenderness { }; - terminus_font = callPackage ../data/fonts/terminus-font { }; + terminus_font = callPackage ../data/fonts/terminus-font + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; From 1df3c86f2e0b58ae53d6d074ec484d547ff9dacb Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 16 Feb 2020 02:23:57 -0800 Subject: [PATCH 105/243] moolticute: 0.30.8 -> 0.42.32-testing (#80222) --- pkgs/applications/misc/moolticute/default.nix | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index e734e44a2e0..e3154b7cd1c 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -1,36 +1,44 @@ -{ stdenv, fetchurl -, libusb1, pkgconfig, qmake, qtbase, qttools, qtwebsockets +{ lib, mkDerivation, fetchFromGitHub +, libusb1 +, pkg-config +, qmake +, qtbase +, qttools +, qtwebsockets }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "moolticute"; - version = "0.30.8"; + version = "0.42.32-testing"; - src = fetchurl { - url = "https://github.com/mooltipass/moolticute/archive/v${version}.tar.gz"; - sha256 = "1qi18r2v0mpw1y007vjgzhiia89fpgsbg2wirxgngl21yxdns1pf"; + src = fetchFromGitHub { + owner = "mooltipass"; + repo = pname; + rev = "v${version}"; + sha256 = "1kx1p2h65dilj1pbzf36d1mxwym19kvln1sqg8fb7na8q7lk4b05"; }; + outputs = [ "out" "udev" ]; + + nativeBuildInputs = [ pkg-config qmake qttools ]; + buildInputs = [ libusb1 qtbase qtwebsockets ]; + preConfigure = "mkdir -p build && cd build"; - nativeBuildInputs = [ pkgconfig qmake qttools ]; qmakeFlags = [ "../Moolticute.pro" ]; - outputs = [ "out" "udev" ]; preInstall = '' mkdir -p $udev/lib/udev/rules.d sed -n '/^ \+cat > "$tmpfile" <<- EOF$/,/^EOF$/p' ../data/moolticute.sh | sed '1d;$d' > $udev/lib/udev/rules.d/50-mooltipass.rules ''; - - buildInputs = [ libusb1 qtbase qtwebsockets ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI app and daemon to work with Mooltipass device via USB"; longDescription = '' To install udev rules, add `services.udev.packages == [ moolticute.udev ]` into `nixos/configuration.nix`. ''; - homepage = https://github.com/mooltipass/moolticute; + homepage = "https://github.com/mooltipass/moolticute"; license = licenses.gpl3Plus; maintainers = [ maintainers.kirikaza ]; platforms = platforms.linux; From f9be656873dacbc5f51f0cea41e5c4ea0f358b2b Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sun, 16 Feb 2020 11:53:49 +0100 Subject: [PATCH 106/243] shorewall: fix warnings due to types.loaOf being deprecated (#80154) --- nixos/modules/services/networking/shorewall.nix | 8 +------- nixos/modules/services/networking/shorewall6.nix | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/networking/shorewall.nix b/nixos/modules/services/networking/shorewall.nix index 0f94d414fcf..c59a5366915 100644 --- a/nixos/modules/services/networking/shorewall.nix +++ b/nixos/modules/services/networking/shorewall.nix @@ -33,7 +33,6 @@ in { The attribute name defines the name of the config, and the attribute value defines the content of the config. ''; - apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text); }; }; }; @@ -63,12 +62,7 @@ in { ''; }; environment = { - etc = lib.mapAttrsToList - (name: file: - { source = file; - target = "shorewall/${name}"; - }) - cfg.configs; + etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {text=conf;}) cfg.configs; systemPackages = [ cfg.package ]; }; }; diff --git a/nixos/modules/services/networking/shorewall6.nix b/nixos/modules/services/networking/shorewall6.nix index 9c22a037c0b..374e407cc7a 100644 --- a/nixos/modules/services/networking/shorewall6.nix +++ b/nixos/modules/services/networking/shorewall6.nix @@ -33,7 +33,6 @@ in { The attribute name defines the name of the config, and the attribute value defines the content of the config. ''; - apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text); }; }; }; @@ -63,12 +62,7 @@ in { ''; }; environment = { - etc = lib.mapAttrsToList - (name: file: - { source = file; - target = "shorewall6/${name}"; - }) - cfg.configs; + etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {text=conf;}) cfg.configs; systemPackages = [ cfg.package ]; }; }; From 37d9b45b04033a5458c151430717f10f77a4f292 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 16 Feb 2020 13:44:16 +0100 Subject: [PATCH 107/243] tewi-font: 2015-06-07 -> 2.0.2 --- pkgs/data/fonts/tewi/default.nix | 43 +++++++++++++++----------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index fbc29cdf5fb..c3c88dd08c4 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -1,38 +1,35 @@ -{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}: +{ stdenv, fetchFromGitHub, python3, bdftopcf, mkfontscale }: stdenv.mkDerivation rec { - date = "2015-06-07"; - name = "tewi-font-${date}"; + pname = "tewi-font"; + version = "2.0.2"; - src = fetchgit { - url = "https://github.com/lucy/tewi-font"; - rev = "ff930e66ae471da4fdc226ffe65fd1ccd13d4a69"; - sha256 = "0c7k847cp68w20frzsdknpss2cwv3lp970asyybv65jxyl2jz3iq"; + src = fetchFromGitHub { + owner = "lucy"; + repo = pname; + rev = version; + sha256 = "1axv9bv10xlcmgfyjh3z5kn5fkg3m6n1kskcs5hvlmyb6m1zk91j"; }; - nativeBuildInputs = [ bdftopcf mkfontdir mkfontscale ]; - buildPhase = '' - for i in *.bdf; do - bdftopcf -o ''${i/bdf/pcf} $i - done + nativeBuildInputs = [ python3 bdftopcf mkfontscale ]; - gzip -n *.pcf + postPatch = '' + # do not update fontconfig cache + sed '32,33d' -i Makefile + + # make gzip deterministic + sed 's/gzip -9/gzip -9 -n/g' -i Makefile + + # fix python not found + patchShebangs scripts/merge ''; installPhase = '' fontDir="$out/share/fonts/misc" - mkdir -p "$fontDir" - mv *.pcf.gz "$fontDir" - - cd "$fontDir" - mkfontdir - mkfontscale + install -m 644 -D out/* -t "$fontDir" + mkfontdir "$fontDir" ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "14dv3m1svahjyb9c1x1570qrmlnynzg0g36b10bqqs8xvhix34yq"; - meta = with stdenv.lib; { description = "A nice bitmap font, readable even at small sizes"; longDescription = '' From 128030139e5aea981d308708005cfb81ebb8676a Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 16 Feb 2020 14:01:52 +0100 Subject: [PATCH 108/243] tewi-font: generate otb and split output --- pkgs/data/fonts/tewi/default.nix | 28 +++++++++++++++++++++++----- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index c3c88dd08c4..6245032246c 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, python3, bdftopcf, mkfontscale }: +{ stdenv, fetchFromGitHub, python3 +, bdftopcf, mkfontscale +, libfaketime, fonttosfnt +}: stdenv.mkDerivation rec { pname = "tewi-font"; @@ -11,12 +14,12 @@ stdenv.mkDerivation rec { sha256 = "1axv9bv10xlcmgfyjh3z5kn5fkg3m6n1kskcs5hvlmyb6m1zk91j"; }; - nativeBuildInputs = [ python3 bdftopcf mkfontscale ]; + nativeBuildInputs = + [ python3 bdftopcf mkfontscale + libfaketime fonttosfnt + ]; postPatch = '' - # do not update fontconfig cache - sed '32,33d' -i Makefile - # make gzip deterministic sed 's/gzip -9/gzip -9 -n/g' -i Makefile @@ -24,12 +27,27 @@ stdenv.mkDerivation rec { patchShebangs scripts/merge ''; + postBuild = '' + # convert bdf fonts to otb + for i in *.bdf; do + name=$(basename "$i" .bdf) + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -o "$name.otb" "$i" + done + ''; + installPhase = '' fontDir="$out/share/fonts/misc" install -m 644 -D out/* -t "$fontDir" mkfontdir "$fontDir" + + fontDir="$otb/share/fonts/misc" + install -m 644 -D *.otb -t "$fontDir" + mkfontdir "$fontDir" ''; + outputs = [ "out" "otb" ]; + meta = with stdenv.lib; { description = "A nice bitmap font, readable even at small sizes"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8192f56c1b..135e059186d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25475,7 +25475,8 @@ in tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; - tewi-font = callPackage ../data/fonts/tewi {}; + tewi-font = callPackage ../data/fonts/tewi + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; From 74aae635e5ac043cba49d321150a802d17553cbc Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 15 Feb 2020 17:34:00 -0500 Subject: [PATCH 109/243] nix-index: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/tools/package-management/nix-index/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index f41dd715fcf..da7469ea646 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -12,10 +12,9 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - cargoSha256 = "06idjb5h5fahqklyxnss2zffrvvfbcw0hjh1mcrf1872s4x78ags"; + cargoSha256 = "0apdr9z18p6m4lfjv8k9zv2mqc7vssd2d536zfv1pns0pdqsfw50"; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl curl ] ++ stdenv.lib.optional stdenv.isDarwin Security; From 4ebe020cc7d07b13a2f4bee29249c51acfa9db6b Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Thu, 13 Feb 2020 09:51:27 +0100 Subject: [PATCH 110/243] quake3e: 2019-11-29 -> 2020-01-23 --- pkgs/games/quake3/quake3e/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 1e179f2f956..7d6ac0afe45 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "Quake3e"; - version = "2019-11-29"; + version = "2020-01-23"; src = fetchFromGitHub { owner = "ec-"; repo = pname; rev = version; - sha256 = "1gpfl72rzwiawhcj3ir38sqdb95y7w7lm7wgj44lbn99z7bvkcn3"; + sha256 = "0crqn32nkqhlagamkp5nr0vl474ad4wx5ms7yr85s6zybpsk5jnz"; }; buildInputs = [ curl libGL libX11 libXxf86dga alsaLib libXrandr libXxf86vm libXext ]; @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pmiddend ]; + badPlatforms = [ platforms.aarch64 ]; }; } From 91a106d4b429296980e4a48d1432e8283a58d72b Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Sun, 16 Feb 2020 16:04:44 +0100 Subject: [PATCH 111/243] vscode, vscodium: 1.42.0 -> 1.42.1 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index b6861a9023f..cd3e5676e8c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,15 +11,15 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1bb7icdjzprrsxllx2q478m1p3qf5sbs3rs3bavvb3hzyyf4bifn"; - x86_64-darwin = "1hqpfmp5s135kb9777s96sr0zbls002h1980qbgf7r2hmc0mpnx0"; + x86_64-linux = "0c067qp3aa5kqya3y8pzc9cvyzsafizhgjp9dsibnfl08lvz9hbs"; + x86_64-darwin = "0vi94nk8p3vp30nx60mwqcmfqbrmrqwvfdjbah0zm480dcjzz7dv"; }.${system}; in callPackage ./generic.nix rec { # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update - version = "1.42.0"; + version = "1.42.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index d4676d421d0..eafe1718c2f 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0f6ic24w6s9wfirzk5rvysn96gj1naj6b81al9743mllaf32ad5q"; - x86_64-darwin = "0fgyhb2wxkvrc90zzw5w2k3ggwbinmax286gbff3sjlrzbs5sj64"; + x86_64-linux = "1pac3rv7ps23ymynvy8dwd5k2154aln33ksr75z1d8w859x3f1dy"; + x86_64-darwin = "1imzgqynbd65c7gbfp2gb1cxjbazx7afvbdvbqnm5qg7pvq22rni"; }.${system}; sourceRoot = { @@ -25,7 +25,7 @@ in # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update - version = "1.42.0"; + version = "1.42.1"; pname = "vscodium"; executableName = "codium"; From 29d2b6385f00634e9d2b537427c3474ea8b417c1 Mon Sep 17 00:00:00 2001 From: David Wood Date: Sun, 16 Feb 2020 14:19:01 +0000 Subject: [PATCH 112/243] mdcat: 0.15.0 -> 0.15.1 --- pkgs/tools/text/mdcat/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 7a97a110381..9bb3d7469ef 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -2,22 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - sha256 = "1x9c3cj3y8wvwr74kbz6nrdh61rinr98gcp3hnjpi6c3vg3xx4wh"; + sha256 = "0qvlnjw0h2hnap1crnprdrynqvg7pywq32qin5fdkk4fv496wjhs"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1kc434pa72n9xll2r4ddmd9xdwv3ls36cwsmdry392j41zmics51"; + cargoSha256 = "12s0dakv37vvvd43xzkydr7w3cpp7sizk8s1kalg4b0xz6ydghcp"; checkInputs = [ ansi2html ]; checkPhase = '' From 731c793fed56573368d872c0b362f608d9ef788e Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 03:45:41 -0500 Subject: [PATCH 113/243] rsclock: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/applications/misc/rsclock/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index a66f4c9a2cf..4f63ed057b7 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "03mhlp5hi3nlybb9dkwf1gxgsg056mjq2zsxnb5qh8pdxw7fmdxk"; + cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl"; meta = with stdenv.lib; { description = "A simple terminal clock written in Rust"; From 5434a66f914b696997102789a1d42eaf9e62d116 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 03:58:11 -0500 Subject: [PATCH 114/243] taizen: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/applications/misc/taizen/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index 1eb4123a4cc..bf9770acacd 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0h8ybhb17pqhhfjcmq1l70kp8g1yyq38228lcf86byk3r2ar2rkg"; + cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni"; meta = with lib; { homepage = https://crates.io/crates/taizen; From bb2cb2d5e246f12be34cb83ad6923ee88a16a9d2 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 03:45:06 -0500 Subject: [PATCH 115/243] pastel: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/applications/misc/pastel/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 426c5162500..7b070e32ca5 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1pfhwqj9kxm9p0mpdw7qyvivgby2bmah05kavf0a5zhzvq4v4sg0"; + cargoSha256 = "1hkqahsrhmgcpgp0pvfpc0wmwqivnqylsxzjrz63k1s9ssdv9syy"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From 5375b833bc478f4320d991604428ae029a057ef5 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 03:56:06 -0500 Subject: [PATCH 116/243] chit: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/development/tools/chit/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index 965f1200235..9859739a1df 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -15,10 +15,7 @@ buildRustPackage rec { sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0k6z69a09ps55w2rdgnf92yscw6rlbcpb4q9yf3rsav15pgpqvw8"; + cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ]; buildInputs = [] From e73928ba4d47f41bf40e4c58589c5a7bdff890fc Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 00:00:59 -0500 Subject: [PATCH 117/243] panopticon: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/development/tools/analysis/panopticon/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 87512355b85..85fd8c93529 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -24,10 +24,7 @@ rustPlatform.buildRustPackage rec { git ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1fsxd7yzb38h1d52yyz7kj1v0riycjydb1b1bn1zkhgwm5sm2kbs"; + cargoSha256 = "1hdsn011y9invfy7can8c02zwa7birj9y1rxhrj7wyv4gh3659i0"; doCheck = false; postInstall = '' From f85a6d959c606d7d1e8e5812215d99d170987290 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 15 Feb 2020 23:56:47 -0500 Subject: [PATCH 118/243] fractal: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- .../networking/instant-messengers/fractal/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 9e052c101ad..896ca4f38a6 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -35,10 +35,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0r98km3c8naj3mdr1wppzj823ir7jnsia7r3cbg3vsq8q52i480r"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1n9n4d057cz44sh1iy2hb2adplhnrhvr8drnp0v2h8yw73a5shvv"; + cargoSha256 = "10fgw9m6gdazrca73g43sgvsghhac7xc3bg7hr0vpynzqyfigwa9"; nativeBuildInputs = [ cargo From dc851d40519724cdd3252fc6d5c8a87b03302f96 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 15 Feb 2020 23:24:46 -0500 Subject: [PATCH 119/243] wishbone-utils: 0.2.8 -> 0.6.9 The upstreeam repository has moved its URL here: https://github.com/xobs/wishbone-utils This also contains some cleanup to make the cargo tarball checker find the cargo lockfile in the source directory; see #79975 for details. --- .../tools/misc/wishbone-tool/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix index 10de4a8157a..8c2e27d6450 100644 --- a/pkgs/development/tools/misc/wishbone-tool/default.nix +++ b/pkgs/development/tools/misc/wishbone-tool/default.nix @@ -1,26 +1,31 @@ { lib, fetchFromGitHub, rustPlatform, libusb }: + let - version = "0.2.8"; + version = "0.6.9"; src = fetchFromGitHub { - owner = "xobs"; + owner = "litex-hub"; repo = "wishbone-utils"; rev = "v${version}"; - sha256 = "0v6s5yl0y6bd2snf12x6c77rwvqkg6ybi1sm4wr7qdgbwq563nxp"; + sha256 = "0gq359ybxnqvcp93cn154bs9kwlai62gnm71yvl2nhzjdlcr3fhp"; }; in rustPlatform.buildRustPackage { pname = "wishbone-tool"; inherit version; - src = "${src}/wishbone-tool"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - cargoSha256 = "0pj8kf6s1c666p4kc6q1hlvaqm0lm9aqnsx5r034g1y8sxnnyri2"; + src = "${src}/wishbone-tool"; + + # N.B. The cargo vendor consistency checker searches in "source" for lockfile + cargoDepsHook = '' + ln -s wishbone-tool source + ''; + cargoSha256 = "0d5kcwy0cgxqfxf2xysw65ng84q4knhp4fgvh6dwqhf0nsca9gvs"; + buildInputs = [ libusb ]; meta = with lib; { description = "Manipulate a Wishbone device over some sort of bridge"; - homepage = "https://github.com/xobs/wishbone-utils#wishbone-tool"; + homepage = "https://github.com/litex-hub/wishbone-utils"; license = licenses.bsd2; maintainers = with maintainers; [ edef ]; platforms = platforms.linux; From 2494471a140ff025359272cac4bc4105ed0a8071 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 02:46:36 -0500 Subject: [PATCH 120/243] cntr: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/applications/virtualization/cntr/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index c5bbab39643..f046e0e44b2 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx"; + cargoSha256 = "088drkpkgq8psv5j6igxyhfvvbalzg6nd98r9z0nxkawck5i2clz"; meta = with stdenv.lib; { description = "A container debugging tool based on FUSE"; From 201d464f1207961f535f3b70fb305dd016dcd882 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 15 Feb 2020 18:41:54 -0500 Subject: [PATCH 121/243] pijul: fix build by migrating off legacy fetchCargo Currently broken; see #79975 for details. Would also be fixed by #80153 eventually, but since we want to upgrade either way we might as well do so now. https://hydra.nixos.org/job/nixpkgs/trunk/pijul.x86_64-linux --- .../version-management/pijul/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index c2df8c971b0..c6c0f0a52f4 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -20,8 +20,18 @@ in rustPlatform.buildRustPackage rec { sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; }; + cargoSha256 = "0rf8qmgzgyl718yznbskzafyg963ygibjmqncd93zdandgl9nj5v"; + + # N.B. The cargo depfile checker expects us to have unpacked the src tarball + # into the standard dirname "source". + cargoDepsHook = '' + ln -s ${pname}-${version} source + ''; + + # TODO: Delete once pijul fixes upstream: + # https://nest.pijul.com/pijul_org/pijul/discussions/447 postPatch = '' - pushd ../${pname}-${version}-vendor/thrussh/ + pushd ../${pname}-${version}-vendor.tar.gz/thrussh/ patch -p1 < ${./thrussh-build-fix.patch} substituteInPlace .cargo-checksum.json --replace \ 9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \ @@ -45,11 +55,6 @@ in rustPlatform.buildRustPackage rec { doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k"; - meta = with stdenv.lib; { description = "A distributed version control system"; homepage = https://pijul.org; From 2aa4fba8d13532c249a2e814017633e2737ded0a Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 25 Dec 2019 17:46:06 +0000 Subject: [PATCH 122/243] doc/ociTools: exec is a shell builtin, not an external command --- doc/builders/images/ocitools.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/builders/images/ocitools.xml b/doc/builders/images/ocitools.xml index f61075b242f..e8cd3472f54 100644 --- a/doc/builders/images/ocitools.xml +++ b/doc/builders/images/ocitools.xml @@ -25,7 +25,7 @@ buildContainer { args = [ (with pkgs; writeScript "run.sh" '' #!${bash}/bin/bash - ${coreutils}/bin/exec ${bash}/bin/bash + exec ${bash}/bin/bash '').outPath ]; mounts = { From 3990b914c34e9e4503ebdea71e241f91e3bc788c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 16 Feb 2020 08:31:03 -0800 Subject: [PATCH 123/243] manual: use quoted homepage urls --- doc/languages-frameworks/go.xml | 2 +- doc/languages-frameworks/idris.section.md | 2 +- doc/languages-frameworks/ocaml.xml | 4 ++-- doc/languages-frameworks/python.section.md | 6 +++--- doc/languages-frameworks/rust.section.md | 2 +- doc/stdenv/meta.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index e8cf27d0565..84b146532b1 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -42,7 +42,7 @@ pet = buildGoModule rec { meta = with lib; { description = "Simple command-line snippet manager, written in Go"; - homepage = https://github.com/knqyf263/pet; + homepage = "https://github.com/knqyf263/pet"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index 8d7962d7fb9..f071b9ce178 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -96,7 +96,7 @@ build-idris-package { meta = { description = "Idris YAML lib"; - homepage = https://github.com/Heather/Idris.Yaml; + homepage = "https://github.com/Heather/Idris.Yaml"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/doc/languages-frameworks/ocaml.xml b/doc/languages-frameworks/ocaml.xml index a0ea209b493..3f72092ec15 100644 --- a/doc/languages-frameworks/ocaml.xml +++ b/doc/languages-frameworks/ocaml.xml @@ -36,7 +36,7 @@ buildDunePackage rec { doCheck = true; meta = { - homepage = https://github.com/inhabitedtype/angstrom; + homepage = "https://github.com/inhabitedtype/angstrom"; description = "OCaml parser combinators built for speed and memory efficiency"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; @@ -63,7 +63,7 @@ buildDunePackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/flowtype/ocaml-wtf8; + homepage = "https://github.com/flowtype/ocaml-wtf8"; description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; license = licenses.mit; maintainers = [ maintainers.eqyiel ]; diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 2f66bf6d610..650ed342858 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -241,7 +241,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/pytoolz/toolz; + homepage = "https://github.com/pytoolz/toolz"; description = "List processing tools and functional utilities"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; @@ -335,7 +335,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy multipledispatch dateutil ]; meta = with lib; { - homepage = https://github.com/ContinuumIO/datashape; + homepage = "https://github.com/ContinuumIO/datashape"; description = "A data description language"; license = licenses.bsd2; maintainers = with maintainers; [ fridh ]; @@ -369,7 +369,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = https://lxml.de; + homepage = "https://lxml.de"; license = licenses.bsd3; maintainers = with maintainers; [ sjourdois ]; }; diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 099872fba13..f23926eee3b 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A fast line-oriented regex search tool, similar to ag and ack"; - homepage = https://github.com/BurntSushi/ripgrep; + homepage = "https://github.com/BurntSushi/ripgrep"; license = licenses.unlicense; maintainers = [ maintainers.tailhook ]; platforms = platforms.all; diff --git a/doc/stdenv/meta.xml b/doc/stdenv/meta.xml index 9371196818a..45f7834eb2c 100644 --- a/doc/stdenv/meta.xml +++ b/doc/stdenv/meta.xml @@ -11,7 +11,7 @@ meta = with stdenv.lib; { GNU Hello is a program that prints "Hello, world!" when you run it. It is fully customizable. ''; - homepage = https://www.gnu.org/software/hello/manual/; + homepage = "https://www.gnu.org/software/hello/manual/"; license = licenses.gpl3Plus; maintainers = [ maintainers.eelco ]; platforms = platforms.all; From 1a492b64cfcaa8ca71be3e630c682a4628fe0f47 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Sun, 16 Feb 2020 18:09:33 +0000 Subject: [PATCH 124/243] lnd 0.8.1 -> lnd 0.9.0 --- pkgs/applications/blockchains/lnd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index fd18b3fa399..dd45746c8df 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.8.1-beta"; + version = "0.9.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0f9fx2y66l3wxiax2vl2966avamjarkv3vbn9dy0wbxkwg4pfayb"; + sha256 = "1hq105s9ykp6nsn4iicjnl3mwspqkbfsswkx7sgzv3jggg08fkq9"; }; - modSha256 = "1i6xw2amkg4azvzybcl4pqxif9c0mv8ayrhz9hm8x85bz7i6a787"; + modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq"; meta = with lib; { description = "Lightning Network Daemon"; From 39fd6223c866e4d57e12bfc70b2a45ab459f945c Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Sun, 16 Feb 2020 10:24:58 -0800 Subject: [PATCH 125/243] restic: switch to default go compiler --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eaa8525fc6..ac069a1e259 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15755,11 +15755,7 @@ in redstore = callPackage ../servers/http/redstore { }; - restic = callPackage ../tools/backup/restic { - # Version 0.9.5 fails to build with go 1.13 due to dependency: - # go: bazil.org/fuse@v0.0.0-20180421153158-65cc252bf669: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:56450->[::1]:53: read: connection refused - buildGoPackage = buildGo112Package; - }; + restic = callPackage ../tools/backup/restic { }; restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; From 3e8e6bacd5aa81a7870b24a5a4fafaa510cca3c9 Mon Sep 17 00:00:00 2001 From: elseym Date: Sun, 16 Feb 2020 19:44:25 +0100 Subject: [PATCH 126/243] plex: 1.18.4.2171 -> 1.18.6.2368 --- pkgs/servers/plex/raw.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 380e5bb4be5..2586171a7cf 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.18.4.2171-ac2afe5f8"; + version = "1.18.6.2368-97add474d"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "10x4cf1c826vj9gqr7r6k70rrjifmi36sd7imfi7pdw5swizjzqv"; + sha256 = "0d2nnvw9qpmsra6g044bz192v67igcp1mfayy4sk0j2yqgiqvcgl"; }; outputs = [ "out" "basedb" ]; From a5dc839bcc5cda8c384faea045021b91e853b4f8 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 13:46:58 -0500 Subject: [PATCH 127/243] uq: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/misc/uq/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix index 3f3ba291dd7..fe3a1e2a5d1 100755 --- a/pkgs/misc/uq/default.nix +++ b/pkgs/misc/uq/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1s22v2wz5h3l5l447zl54bhdk6avkk2ycrbbpxcx1442lllbss4w"; + cargoSha256 = "1fv13rbghfw7114h7sda04gpqrjrsgnnki0p9kdd6r6sk5cbhn9x"; meta = with lib; { description = "A simple, user-friendly alternative to sort | uniq"; From 36279a03ed7b1c2c3f83aa1852f8c047ec982838 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 13:51:41 -0500 Subject: [PATCH 128/243] cargo-about: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/tools/package-management/cargo-about/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index bee0ee7d3d8..82da6b7b93c 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -10,10 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0bsay1vqi5b3z7qjwbkwx3ikmpjzc0kswbajm50xmcwlg8jrn420"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1mqicibpa9sxac8v2kk8vfvxcis2wkdkklia2pbspc0pz3h0c8if"; + cargoSha256 = "1ynalwaqa70ihgras3frp5l3xniz58hwp108wkxn6zj8lwxbxfgx"; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; From 98d2f4e96b9af1664e9d1ac3885b6f6457f20978 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 13:53:35 -0500 Subject: [PATCH 129/243] cargo-deps: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/tools/package-management/cargo-deps/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/tools/package-management/cargo-deps/default.nix index b5dafc544fb..d0768300d82 100644 --- a/pkgs/tools/package-management/cargo-deps/default.nix +++ b/pkgs/tools/package-management/cargo-deps/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "16181p7ghvy9mqippg1xi2cw7yxvicis8v6n39wly5qw05i57aw2"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1a9svdw1cgk6s7gqpsq3r25wxa2gr2xddqkc1cjk7hf6sk327cpv"; + cargoSha256 = "1zk6pf7agqs1mpld40rn05cwp4wy0vpjnn5ip6m83bxm8b3i87wk"; meta = with lib; { description = "Cargo subcommand for building dependency graphs of Rust projects"; From 8625e276b216b0613c519369861527530b8028f5 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 13:55:19 -0500 Subject: [PATCH 130/243] emplace: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/tools/package-management/emplace/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 6b39ed9d1c4..321897369db 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1y77cla6bgy8pjb21cawx7cb69hhri4r7gyjkhnjyiixkh945mwj"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "119llsc8m7qda2cjnd45ndml148z8074f76xygkz6fp3m1c2z3pw"; + cargoSha256 = "1vkcr239axxqya0iin74jxkmx6z9nwb67pjjdh89v4qwjvwhiqg3"; meta = with lib; { description = "Mirror installed software on multiple machines"; From 46d46b7a6968ece9000b2a0af3a322df0c7447dc Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 13:56:02 -0500 Subject: [PATCH 131/243] cargo-graph: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/tools/package-management/cargo-graph/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/tools/package-management/cargo-graph/default.nix index 1f0b11ad978..4d35e284040 100644 --- a/pkgs/tools/package-management/cargo-graph/default.nix +++ b/pkgs/tools/package-management/cargo-graph/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0myg26cssmbakz53dl61lswsbaqnjqlbc30c2571pq8f7gvz2qv5"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1k4byg77s1iqhry96pl57mbsvd32sbnvf60dlbd62pvan39rispg"; + cargoSha256 = "0fzj88iy57c39yi8pf3agfmsf2dck06f0yqmlnsaxvvp4cknkw1n"; meta = with lib; { description = "A cargo subcommand for creating GraphViz DOT files and dependency graphs"; From 2926041c6ab010516418dcea988edaa6974e02d4 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 13:57:12 -0500 Subject: [PATCH 132/243] cargo-edit: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/tools/package-management/cargo-edit/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 77753dc3349..b15400e576e 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "16gpljbzk6cibry9ssnl22xbcsx2cr57mrs3x3n6cfmldbp6bhbr"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1cjpbfgbqzlfs5hck2j3d2v719fwandpnc7bdk4243j7j0k1ng9q"; + cargoSha256 = "1zwkar914zyghky09lgk0s374m5d6yccn0m15bqlgxxyymg4b59y"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; From 66e5cc0bd2d712998ca4f2eb4f797f592fc86e94 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 15:10:10 -0500 Subject: [PATCH 133/243] cargo-outdated: 0.9.1 -> 0.9.5 Upstream is now vendoring the Cargo.lock file for reproducible app builds, so we can now remove the patching workaround. However, they're missing a git tag, so we have to do some work to find the right git commit. --- .../cargo-outdated/cargo-lock.patch | 1283 ----------------- .../cargo-outdated/default.nix | 15 +- .../cargo-outdated/update-cargo-lock.sh | 18 - 3 files changed, 7 insertions(+), 1309 deletions(-) delete mode 100644 pkgs/tools/package-management/cargo-outdated/cargo-lock.patch delete mode 100755 pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh diff --git a/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch b/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch deleted file mode 100644 index 7e0528eda2a..00000000000 --- a/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch +++ /dev/null @@ -1,1283 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..0f18cc6 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,1277 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "adler32" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "atty" -+version = "0.2.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "autocfg" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+ -+[[package]] -+name = "backtrace" -+version = "0.3.40" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" -+dependencies = [ -+ "backtrace-sys", -+ "cfg-if", -+ "libc", -+ "rustc-demangle", -+] -+ -+[[package]] -+name = "backtrace-sys" -+version = "0.1.32" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" -+dependencies = [ -+ "cc", -+ "libc", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "bstr" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "bytesize" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010" -+ -+[[package]] -+name = "c2-chacha" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -+dependencies = [ -+ "ppv-lite86", -+] -+ -+[[package]] -+name = "cargo" -+version = "0.40.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03504435a39de1303decb9c9a7416e875f16d4b94769d4d0dd5e1bfb21229640" -+dependencies = [ -+ "atty", -+ "bytesize", -+ "clap", -+ "core-foundation", -+ "crates-io", -+ "crossbeam-utils", -+ "crypto-hash", -+ "curl", -+ "curl-sys", -+ "env_logger 0.6.2", -+ "failure", -+ "filetime", -+ "flate2", -+ "fs2", -+ "fwdansi", -+ "git2", -+ "git2-curl", -+ "glob", -+ "hex 0.4.0", -+ "home", -+ "humantime", -+ "ignore", -+ "im-rc", -+ "jobserver", -+ "lazy_static", -+ "lazycell", -+ "libc", -+ "libgit2-sys", -+ "log", -+ "memchr", -+ "miow", -+ "num_cpus", -+ "opener", -+ "percent-encoding", -+ "remove_dir_all", -+ "rustc-workspace-hack", -+ "rustfix", -+ "same-file", -+ "semver", -+ "serde", -+ "serde_ignored", -+ "serde_json", -+ "shell-escape", -+ "strip-ansi-escapes", -+ "tar", -+ "tempfile", -+ "termcolor", -+ "toml", -+ "unicode-width", -+ "url", -+ "walkdir", -+ "winapi", -+] -+ -+[[package]] -+name = "cargo-outdated" -+version = "0.9.1" -+dependencies = [ -+ "cargo", -+ "docopt", -+ "env_logger 0.7.1", -+ "failure", -+ "semver", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "tabwriter", -+ "tempfile", -+ "termcolor", -+ "toml", -+] -+ -+[[package]] -+name = "cc" -+version = "1.0.48" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" -+dependencies = [ -+ "jobserver", -+ "num_cpus", -+] -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+ -+[[package]] -+name = "clap" -+version = "2.33.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -+dependencies = [ -+ "ansi_term", -+ "atty", -+ "bitflags", -+ "strsim 0.8.0", -+ "textwrap", -+ "unicode-width", -+ "vec_map", -+] -+ -+[[package]] -+name = "commoncrypto" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" -+dependencies = [ -+ "commoncrypto-sys", -+] -+ -+[[package]] -+name = "commoncrypto-sys" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "core-foundation" -+version = "0.6.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -+ -+[[package]] -+name = "crates-io" -+version = "0.28.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9dc57b7035c84bcaaa14d89221491b624a32977c230ce6bb77ae191e880c48e1" -+dependencies = [ -+ "curl", -+ "failure", -+ "percent-encoding", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "url", -+] -+ -+[[package]] -+name = "crc32fast" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "crossbeam-channel" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" -+dependencies = [ -+ "crossbeam-utils", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.6.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" -+dependencies = [ -+ "cfg-if", -+ "lazy_static", -+] -+ -+[[package]] -+name = "crypto-hash" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a77162240fd97248d19a564a565eb563a3f592b386e4136fb300909e67dddca" -+dependencies = [ -+ "commoncrypto", -+ "hex 0.3.2", -+ "openssl", -+ "winapi", -+] -+ -+[[package]] -+name = "curl" -+version = "0.4.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283" -+dependencies = [ -+ "curl-sys", -+ "libc", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "socket2", -+ "winapi", -+] -+ -+[[package]] -+name = "curl-sys" -+version = "0.4.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f659f3ffac9582d6177bb86d1d2aa649f4eb9d0d4de9d03ccc08b402832ea340" -+dependencies = [ -+ "cc", -+ "libc", -+ "libnghttp2-sys", -+ "libz-sys", -+ "openssl-sys", -+ "pkg-config", -+ "vcpkg", -+ "winapi", -+] -+ -+[[package]] -+name = "docopt" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" -+dependencies = [ -+ "lazy_static", -+ "regex", -+ "serde", -+ "strsim 0.9.3", -+] -+ -+[[package]] -+name = "env_logger" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" -+dependencies = [ -+ "atty", -+ "humantime", -+ "log", -+ "regex", -+ "termcolor", -+] -+ -+[[package]] -+name = "env_logger" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -+dependencies = [ -+ "atty", -+ "humantime", -+ "log", -+ "regex", -+ "termcolor", -+] -+ -+[[package]] -+name = "failure" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" -+dependencies = [ -+ "backtrace", -+ "failure_derive", -+] -+ -+[[package]] -+name = "failure_derive" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "synstructure", -+] -+ -+[[package]] -+name = "filetime" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "redox_syscall", -+ "winapi", -+] -+ -+[[package]] -+name = "flate2" -+version = "1.0.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" -+dependencies = [ -+ "cfg-if", -+ "crc32fast", -+ "libc", -+ "libz-sys", -+ "miniz_oxide", -+] -+ -+[[package]] -+name = "fnv" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" -+ -+[[package]] -+name = "foreign-types" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+dependencies = [ -+ "foreign-types-shared", -+] -+ -+[[package]] -+name = "foreign-types-shared" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+ -+[[package]] -+name = "fs2" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "fwdansi" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208" -+dependencies = [ -+ "memchr", -+ "termcolor", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.1.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "git2" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26" -+dependencies = [ -+ "bitflags", -+ "libc", -+ "libgit2-sys", -+ "log", -+ "openssl-probe", -+ "openssl-sys", -+ "url", -+] -+ -+[[package]] -+name = "git2-curl" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cd6527e480187ce19aaf4fa6acfb7657b25628ce31cb8ffabdfca3bf731524c5" -+dependencies = [ -+ "curl", -+ "git2", -+ "log", -+ "url", -+] -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+ -+[[package]] -+name = "globset" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" -+dependencies = [ -+ "aho-corasick", -+ "bstr", -+ "fnv", -+ "log", -+ "regex", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "hex" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" -+ -+[[package]] -+name = "hex" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" -+ -+[[package]] -+name = "home" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a3753954f7bd71f0e671afb8b5a992d1724cf43b7f95a563cd4a0bde94659ca8" -+dependencies = [ -+ "scopeguard", -+ "winapi", -+] -+ -+[[package]] -+name = "humantime" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -+dependencies = [ -+ "quick-error", -+] -+ -+[[package]] -+name = "idna" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -+dependencies = [ -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "ignore" -+version = "0.4.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7" -+dependencies = [ -+ "crossbeam-channel", -+ "globset", -+ "lazy_static", -+ "log", -+ "memchr", -+ "regex", -+ "same-file", -+ "thread_local", -+ "walkdir", -+ "winapi-util", -+] -+ -+[[package]] -+name = "im-rc" -+version = "13.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a0197597d095c0d11107975d3175173f810ee572c2501ff4de64f4f3f119806" -+dependencies = [ -+ "rustc_version", -+ "sized-chunks", -+ "typenum", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -+ -+[[package]] -+name = "jobserver" -+version = "0.1.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160" -+dependencies = [ -+ "getrandom", -+ "libc", -+ "log", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+ -+[[package]] -+name = "lazycell" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" -+ -+[[package]] -+name = "libc" -+version = "0.2.66" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -+ -+[[package]] -+name = "libgit2-sys" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16" -+dependencies = [ -+ "cc", -+ "libc", -+ "libssh2-sys", -+ "libz-sys", -+ "openssl-sys", -+ "pkg-config", -+] -+ -+[[package]] -+name = "libnghttp2-sys" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02254d44f4435dd79e695f2c2b83cd06a47919adea30216ceaf0c57ca0a72463" -+dependencies = [ -+ "cc", -+ "libc", -+] -+ -+[[package]] -+name = "libssh2-sys" -+version = "0.2.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fcd5a428a31cbbfe059812d74f4b6cd3b9b7426c2bdaec56993c5365da1c328" -+dependencies = [ -+ "cc", -+ "libc", -+ "libz-sys", -+ "openssl-sys", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "libz-sys" -+version = "1.0.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" -+dependencies = [ -+ "cc", -+ "libc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "log" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "matches" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+ -+[[package]] -+name = "memchr" -+version = "2.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" -+dependencies = [ -+ "adler32", -+] -+ -+[[package]] -+name = "miow" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226" -+dependencies = [ -+ "socket2", -+ "winapi", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "opener" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "13117407ca9d0caf3a0e74f97b490a7e64c0ae3aa90a8b7085544d0c37b6f3ae" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "openssl" -+version = "0.10.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" -+dependencies = [ -+ "bitflags", -+ "cfg-if", -+ "foreign-types", -+ "lazy_static", -+ "libc", -+ "openssl-sys", -+] -+ -+[[package]] -+name = "openssl-probe" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+ -+[[package]] -+name = "openssl-sys" -+version = "0.9.53" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" -+dependencies = [ -+ "autocfg", -+ "cc", -+ "libc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "percent-encoding" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" -+dependencies = [ -+ "unicode-xid", -+] -+ -+[[package]] -+name = "quick-error" -+version = "1.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" -+ -+[[package]] -+name = "quote" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "rand" -+version = "0.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" -+dependencies = [ -+ "getrandom", -+ "libc", -+ "rand_chacha", -+ "rand_core", -+ "rand_hc", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -+dependencies = [ -+ "c2-chacha", -+ "rand_core", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+dependencies = [ -+ "getrandom", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+dependencies = [ -+ "rand_core", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.1.56" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -+ -+[[package]] -+name = "regex" -+version = "1.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+ "thread_local", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -+ -+[[package]] -+name = "rustc-workspace-hack" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb" -+ -+[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+dependencies = [ -+ "semver", -+] -+ -+[[package]] -+name = "rustfix" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7150ac777a2931a53489f5a41eb0937b84e3092a20cd0e73ad436b65b507f607" -+dependencies = [ -+ "failure", -+ "log", -+ "serde", -+ "serde_json", -+] -+ -+[[package]] -+name = "ryu" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" -+ -+[[package]] -+name = "same-file" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "schannel" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" -+dependencies = [ -+ "lazy_static", -+ "winapi", -+] -+ -+[[package]] -+name = "scopeguard" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" -+ -+[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+dependencies = [ -+ "semver-parser", -+ "serde", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+ -+[[package]] -+name = "serde" -+version = "1.0.103" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.103" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_ignored" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7248fdcbd17d3f2604fc2a02d0ecc844d9a7bf52bf95fc196d9f0a38f6da6a0e" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.44" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" -+dependencies = [ -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "shell-escape" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "170a13e64f2a51b77a45702ba77287f5c6829375b04a69cf2222acd17d0cfab9" -+ -+[[package]] -+name = "sized-chunks" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f01db57d7ee89c8e053245deb77040a6cc8508311f381c88749c33d4b9b78785" -+dependencies = [ -+ "typenum", -+] -+ -+[[package]] -+name = "smallvec" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" -+ -+[[package]] -+name = "socket2" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "redox_syscall", -+ "winapi", -+] -+ -+[[package]] -+name = "strip-ansi-escapes" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9d63676e2abafa709460982ddc02a3bb586b6d15a49b75c212e06edd3933acee" -+dependencies = [ -+ "vte", -+] -+ -+[[package]] -+name = "strsim" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+ -+[[package]] -+name = "strsim" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" -+ -+[[package]] -+name = "syn" -+version = "1.0.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "synstructure" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "tabwriter" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9128e3a9149e51494cad59712a286e149fcb74e443d2298d69bd6eaa42cc4ebb" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "tar" -+version = "0.4.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3" -+dependencies = [ -+ "filetime", -+ "libc", -+ "redox_syscall", -+] -+ -+[[package]] -+name = "tempfile" -+version = "3.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "rand", -+ "redox_syscall", -+ "remove_dir_all", -+ "winapi", -+] -+ -+[[package]] -+name = "termcolor" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" -+dependencies = [ -+ "wincolor", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "thread_local" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -+dependencies = [ -+ "lazy_static", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "typenum" -+version = "1.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" -+ -+[[package]] -+name = "unicode-bidi" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+dependencies = [ -+ "matches", -+] -+ -+[[package]] -+name = "unicode-normalization" -+version = "0.1.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf" -+dependencies = [ -+ "smallvec", -+] -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -+ -+[[package]] -+name = "url" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" -+dependencies = [ -+ "idna", -+ "matches", -+ "percent-encoding", -+] -+ -+[[package]] -+name = "utf8parse" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" -+ -+[[package]] -+name = "vcpkg" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" -+ -+[[package]] -+name = "vec_map" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -+ -+[[package]] -+name = "vte" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f42f536e22f7fcbb407639765c8fd78707a33109301f834a594758bedd6e8cf" -+dependencies = [ -+ "utf8parse", -+] -+ -+[[package]] -+name = "walkdir" -+version = "2.2.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" -+dependencies = [ -+ "same-file", -+ "winapi", -+ "winapi-util", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" -+ -+[[package]] -+name = "winapi" -+version = "0.3.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-util" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "wincolor" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" -+dependencies = [ -+ "winapi", -+ "winapi-util", -+] diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 667a1a21a2d..7fc7d93f927 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,20 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.1"; + version = "0.9.5"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; - rev = "v${version}"; - sha256 = "02gsarwm4gjkr9m4sfbjwp37xmqhch8qpyy027bxqkg8iyipxm69"; + # This is the git commit that produced 0.9.5, according to crates.io, but + # the tag is missing in git. See here for details: + # https://github.com/kbknapp/cargo-outdated/issues/206 + rev = "7685da3265749bb7ae2b436a132f51d19b409bff"; + sha256 = "08prksns7d3g7ha601z8p28p36rg44rjl5ph76vg6nriww96zzca"; }; - cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1ywmrvkwwwwh99l4j8vc4cyk8qjd0jx8hn68yr2h31ya1bzcqbd1"; + cargoSha256 = "0kxfavyd9slpp2kzxhjp47q1pzw9rlmn7yhxnjsg88sxbjxfzv95"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh b/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh deleted file mode 100755 index 21ee27c59b7..00000000000 --- a/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -# This updates cargo-lock.patch for the cargo-outdated version listed in default.nix. - -set -eu -o verbose - -here=$PWD -version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2) -checkout=$(mktemp -d) -git clone -b "v$version" --depth=1 https://github.com/kbknapp/cargo-outdated "$checkout" -cd "$checkout" - -cargo generate-lockfile -git add -f Cargo.lock -git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch - -cd "$here" -rm -rf "$checkout" From 6888cae7d672465f9eab60ff53df22622ed8c571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Sun, 16 Feb 2020 21:29:14 +0100 Subject: [PATCH 134/243] skaffold: 1.2.0 -> 1.3.1 --- pkgs/development/tools/skaffold/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index d485ac19996..325338c376a 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.2.0"; - # rev is the 1.2.0 commit, mainly for skaffold version command output - rev = "80f82f42fe271aea1058f4a37776d52ab5a7c441"; + version = "1.3.1"; + # rev is the 1.3.1 commit, mainly for skaffold version command output + rev = "6ba887a42438d1da578a005cf550e618fee6dfb8"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "17gdxifv3n2kcmz1pvs2ni2llq30zw6dwxgy5crs97h7hjdk29fw"; + sha256 = "1ph7qyk5khdinxbhgqhhja8fz8b6q8yz5rj5xh0nwaff4bmlfd99"; }; meta = { From 56c4800e7f9d57b102bb53326f24c10847cec8a1 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Sun, 16 Feb 2020 22:58:34 +0200 Subject: [PATCH 135/243] postgresql-wal-receiver: fix test for Pg12 (#80268) Fixes https://github.com/NixOS/nixpkgs/issues/80060 --- nixos/tests/postgresql-wal-receiver.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix index 791b041ba95..372dd9d8c1c 100644 --- a/nixos/tests/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql-wal-receiver.nix @@ -6,17 +6,24 @@ with import ../lib/testing.nix { inherit system pkgs; }; with pkgs.lib; let + makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: let + postgresqlDataDir = "/var/db/postgresql/test"; replicationUser = "wal_receiver_user"; replicationSlot = "wal_receiver_slot"; replicationConn = "postgresql://${replicationUser}@localhost"; baseBackupDir = "/tmp/pg_basebackup"; walBackupDir = "/tmp/pg_wal"; - recoveryConf = pkgs.writeText "recovery.conf" '' + atLeast12 = versionAtLeast postgresqlPackage.version "12.0"; + restoreCommand = '' restore_command = 'cp ${walBackupDir}/%f %p' ''; - makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: makeTest { + recoveryFile = if atLeast12 + then pkgs.writeTextDir "recovery.signal" "" + else pkgs.writeTextDir "recovery.conf" "${restoreCommand}"; + + in makeTest { name = "postgresql-wal-receiver-${subTestName}"; meta.maintainers = with maintainers; [ pacien ]; @@ -29,6 +36,9 @@ let wal_level = archive # alias for replica on pg >= 9.6 max_wal_senders = 10 max_replication_slots = 10 + '' + optionalString atLeast12 '' + ${restoreCommand} + recovery_end_command = 'touch recovery.done' ''; authentication = '' host replication ${replicationUser} all trust @@ -45,6 +55,9 @@ let slot = replicationSlot; directory = walBackupDir; }; + # This is only to speedup test, it isn't time racing. Service is set to autorestart always, + # default 60sec is fine for real system, but is too much for a test + systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = mkForce 5; }; testScript = '' @@ -70,7 +83,7 @@ let # prepare WAL and recovery $machine->succeed('chmod a+rX -R ${walBackupDir}'); $machine->execute('for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done'); # make use of partial segments too - $machine->succeed('cp ${recoveryConf} ${postgresqlDataDir}/recovery.conf && chmod 666 ${postgresqlDataDir}/recovery.conf'); + $machine->succeed('cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*'); # replay WAL $machine->systemctl('start postgresql'); From 940e6968f1ec155e242b27bcfd0618a5ab9a9ee0 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:05:21 -0500 Subject: [PATCH 136/243] nixdoc: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/tools/nix/nixdoc/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 4f64750892a..6ea28dbea2b 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1hy8w73fir4wnqx7zfvfqh7s24w95x9nkw55kmizvrwf0glw9m4n"; + cargoSha256 = "1vamwynkbnffs8ryr2zb1a41cymjvr8zzh1bifyh9hpkx2k11rs3"; meta = with stdenv.lib; { description = "Generate documentation for Nix functions"; From 8541c35fab9a185eb164317a8ce6c2fa3fb0ee18 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:05:50 -0500 Subject: [PATCH 137/243] cargo-release: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/tools/package-management/cargo-release/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 1e5d1fe3512..9b7d915a349 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1w9w43i5br94vg5m4idabh67p4ffsx2lmc2g0ak2k961vl46wr0q"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "075fvvd4c8f3kz6i6ny835h6jpa3c1v3miwfwwrdyy49a85lzjyj"; + cargoSha256 = "1x54c6wk5cbnqcy1qpsff8lwqxs0d4qf0v71r7wl0kjp8mrmmhl4"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; From 36cf8ad6856f2ae524b299e40c9b3cfc10b7b4e1 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:06:47 -0500 Subject: [PATCH 138/243] nixpkgs-fmt: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/tools/nix/nixpkgs-fmt/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index eac8d1293d2..1088884dca6 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -10,10 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1iylldgyvrcarfigpbhicg6j6qyipfiqn7gybza7qajfzyprjqfa"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "04my7dlp76dxs1ydy2sbbca8sp3n62wzdxyc4afcmrg8anb0ghaf"; + cargoSha256 = "1jxvy4w9jxv898wgqyj9bpkhnc7pkj9dxg5x0b39xsnkzl2lr239"; meta = with lib; { description = "Nix code formatter for nixpkgs"; From bc8753b9a51d72e5ccd68eef6ec9bc28b9ed1ffd Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:07:16 -0500 Subject: [PATCH 139/243] cargo-audit: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/tools/package-management/cargo-audit/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 2d9bb71c569..6c56fbe476d 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -10,10 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1977ykablfi4mc6j2iil0bxc6diy07vi5hm56xmqj3n37ziavf1m"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0zbnsq0cif0yppn8ygxhcsrshkbf1c801f8waqqb2d1rjsrhb93y"; + cargoSha256 = "0bpqsg8mv94ivwmbfxfcnd89yx5vry33395ynqrzhqq9s1jwq0dq"; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; From 91aafa8476c56e0ab7b97786405e1d109fa338b4 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:09:16 -0500 Subject: [PATCH 140/243] tectonic: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; no functional change expected. --- pkgs/tools/typesetting/tectonic/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index b6d8cb67c11..7e4c7dafefe 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0dycv135bkpf71iwlwh8rwwvn287d605nl7v8mjxlrsayiivdmn9"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0bkgh73kqcdv3j9hr3m13wrdhls3zrk7aii9shzbzl6rnp2ry1az"; + cargoSha256 = "1axrf7d01gmhvrap13rydfvwcsg0lk1zw7z1i7zzm898bc7c02qn"; nativeBuildInputs = [ pkgconfig ]; From 805db0db45d3df38e45d4cdc101717d778e630de Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:23:11 -0500 Subject: [PATCH 141/243] maturin: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/development/tools/rust/maturin/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index cb8d13b47d9..8edd69c28be 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -14,10 +14,7 @@ in rustPlatform.buildRustPackage rec { sha256 = "1siqd8k6grlbj9n1a75jq8px1pzvzpr2ph689g53rjngf1k44zqk"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "18678qzrzj044aj5nvyjn5hvby0i0x23gx26nhcf1nqcjn3fr32l"; + cargoSha256 = "10x8kr4qxvvmzpr1n41ybsb6rnii2qz5bdhnk0zpfnr2n9215p8s"; nativeBuildInputs = [ pkgconfig ]; From 5eeaac4433a26e83791cde27a60c6c62f423422c Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:40:31 -0500 Subject: [PATCH 142/243] coloursum: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/tools/text/coloursum/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index 27e349c9d93..f38ada46c11 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1piz0l7qdcvjzfykm6rzqc8s1daxp3cj3923v9cmm41bc2v0p5q0"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "091flc5ymx0y43ld6bdmig5cy479b90bkmwv3yaysi5kpr28skvh"; + cargoSha256 = "1w0q5w0bf1682jvzcml8cgmr9mrgi4if0p63wzchyjav330dp6pk"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From 93aadd5f4ae95758cb44db0a5892a4f98e8581d9 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:40:35 -0500 Subject: [PATCH 143/243] todiff: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/applications/misc/todiff/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index d4321e3b88e..f55b3852e5b 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0xn5p71qk0ahd2drklja16xwv7zw0797kkzpiv563kffzvd1p8id"; + cargoSha256 = "1vyc230a2b0dry2057mkdkrjb7s9d0p43fnz4q67aqrpyr4jxwx2"; checkPhase = "cargo test --features=integration_tests"; From f31c9a0414151dcf8757adf4c1767a7833f19f80 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:42:57 -0500 Subject: [PATCH 144/243] mq-cli: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/tools/system/mq-cli/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix index f685259429d..afde8b8f9d2 100644 --- a/pkgs/tools/system/mq-cli/default.nix +++ b/pkgs/tools/system/mq-cli/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "03ab6jbcgmbgg9hn7ihk8814sjwdmrr9p4xlll6nfdad4a7gq3yn"; + cargoSha256 = "19ccylnmmlm2d8kc178cffpjwrjlia6b4v3nzvxcs81a396ymr7b"; meta = with lib; { description = "CLI tool to manage POSIX message queues"; From c87fa84f3dd0e1b6696bccc101e2c83fbccdb8cd Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:43:44 -0500 Subject: [PATCH 145/243] just: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/development/tools/just/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 20f85461946..5641a14e1ab 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0a4bml9nxvyh110a60l4lc11yr2ds5r8d3iplslccrkq1ka96av9"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0dbgjc21q0zaadsjvq3s6y6f4dmsybxb6g2sg8w2d3phkm9j921z"; + cargoSha256 = "0wp61zjws9r1aapkapvq2vmad5kylkpw03wa82qhhq30knkpvr7b"; checkInputs = [ coreutils bash dash ]; From f4195e6a6b548bcce9f2e5275455c837b9e06a8c Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:45:14 -0500 Subject: [PATCH 146/243] ruplacer: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/tools/text/ruplacer/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index d868f9e2529..535a00b7b4d 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0yj753d9wsnp4s5a71ph241jym5rfz3161a1v3qxfc4w23v86j1q"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1lzw4x40j25khf68x5srj8i05c11ls5y7km206vxn19vsy9ah4k9"; + cargoSha256 = "0wrv4k63pc1v0apmxmmci9qaykcv9ig3nfxy6id5caqrckp73cr4"; buildInputs = (stdenv.lib.optional stdenv.isDarwin Security); From c917e7cbc63568fc14c8794c6daad7bbf80ed874 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:48:38 -0500 Subject: [PATCH 147/243] amber: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/tools/text/amber/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 95ffc592bfe..70bfaafbcec 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0k70rk19hwdlhhqm91x12xcb8r09kzpijs0xwhplrwdh86qfxymx"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0hh3sgcdcp0llgf3i3dysrr3vry3fv3fzzf44ad1953d5mnyhvap"; + cargoSha256 = "0g8n3r6bdsfl1417wnss3ggnv5ywz8mx53hjglshmln40552znh3"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From a1927899f7589483e4441e8ef14429060ffff6a3 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:49:11 -0500 Subject: [PATCH 148/243] rq: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/development/tools/rq/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 7394d7a645a..5fe73ed33f0 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0z971fpyj4v5hjp6q4yxgxv069h9idkpkcixb14gxi7kpiswprvz"; + cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67"; buildInputs = [ llvmPackages.clang-unwrapped v8 ]; From 9f8b5e80eeff9aa06d1cdc5635a75090c2962ef0 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:51:53 -0500 Subject: [PATCH 149/243] ytop: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/tools/system/ytop/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix index 8732bf88ad7..79dcf41b722 100644 --- a/pkgs/tools/system/ytop/default.nix +++ b/pkgs/tools/system/ytop/default.nix @@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "11pcchwahcwdvmfwfs6j2zg23grlw538wfs90mvqy2mpccj7d3ys"; + cargoSha256 = "0c4xp63fm1n7x8brmx7avqjvcbqi32k6x5ps7h0fh0ign452y7fz"; verifyCargoDeps = true; meta = with stdenv.lib; { From 93da4c8485818d738f6aafd5fc5f1e752c920eb4 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:54:18 -0500 Subject: [PATCH 150/243] scaff: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/development/tools/scaff/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix index 034376d337c..f81ca70c6a9 100644 --- a/pkgs/development/tools/scaff/default.nix +++ b/pkgs/development/tools/scaff/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1s5v50205l2h33pccyafrjv3a6lpb62inhm8z81hkvx53bqifvd7"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "17rnzwlgrpr6isbajaccxa83msvvskxyqrc4cirgjmc7aqa0ilbh"; + cargoSha256 = "0k6msvly3yhzl1hhs4zv31qzbllwmw16i55dbznlgp1c8icy2pwr"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; From 8f818022a6f1a37ed03f576f6c9768dad5e0e3d4 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:54:39 -0500 Subject: [PATCH 151/243] sd: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/tools/text/sd/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 889dde46dea..1b6e4d945d4 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1vxljmd1vh245yhv095i3l44pk915zr2pix4v9r8pz2fynp2nnmj"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1shqphbpn3ib28hnyib7mh1i5q56nshj864jm209s8qggbp96wp1"; + cargoSha256 = "0n4c0snmjfyk3z2mbzpqgb6ggyv4nqszdda035g3rzpbavzx9xb5"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; From ac277262780527296eea600c79e26240ed743c84 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:57:41 -0500 Subject: [PATCH 152/243] rnix-lsp: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/development/tools/rnix-lsp/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix index 0cb40242504..e938526ecbf 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/rnix-lsp/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0fy620c34kxl27sd62x9mj0555bcdmnmbsxavmyiwb497z1m9wnn"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1wm5m7b6zr6wg1k59rmqis1zp9i2990p7y0ml852hxv34an7pp5d"; + cargoSha256 = "0xmaa7rds7hlagfxj65pv9vgflcv4nwbwbw4g7cyj88cbb1kbxxj"; meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; From 05045718748917a7c1f96f79b331e5892224a924 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 16 Feb 2020 16:57:54 -0500 Subject: [PATCH 153/243] xsv: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/tools/text/xsv/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index b81b7b10982..72a586d2b22 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1xlbszr9ccv924ww45lnc0qqb7nxj2cnc41480xbpvsdqsdrgbhs"; + cargoSha256 = "1q59nvklh5r2mrsz656z6js3j2l6rqyhfz6l0yq28df5kyahk91b"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From b0a26b3b525d30a9c80a0ce68b2fadc3edde474f Mon Sep 17 00:00:00 2001 From: James Cook Date: Sun, 16 Feb 2020 22:12:44 +0000 Subject: [PATCH 154/243] Remove myself as maintainer. I'm not really that familiar with these two packages. --- pkgs/development/libraries/libgnurl/default.nix | 2 +- pkgs/tools/misc/apt-offline/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index a1e8ef76394..339146da2b9 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fork of libcurl used by GNUnet"; homepage = "https://gnunet.org/en/gnurl.html"; - maintainers = with maintainers; [ falsifian vrthra ]; + maintainers = with maintainers; [ vrthra ]; platforms = platforms.linux; license = licenses.curl; }; diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 921c1af4ad6..7e29c63347d 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Offline APT package manager"; license = licenses.gpl3; - maintainers = [ maintainers.falsifian ]; + maintainers = [ ]; platforms = platforms.linux; }; } From 21bfc57dd9eb5c7c58b6ab0bfa707cbc7cf04e98 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sun, 16 Feb 2020 17:39:12 +0000 Subject: [PATCH 155/243] tinyprog: fix pkg_resources crash --- pkgs/development/tools/misc/tinyprog/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix index 580414f4d9d..65d2ce37814 100644 --- a/pkgs/development/tools/misc/tinyprog/default.nix +++ b/pkgs/development/tools/misc/tinyprog/default.nix @@ -24,6 +24,7 @@ with python3Packages; buildPythonApplication rec { tqdm six packaging + setuptools pyusb ]; From eb1ffda13c1ddd6a3766461a95eda1c6949aa57b Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sun, 16 Feb 2020 23:47:44 +0100 Subject: [PATCH 156/243] libfishsound at 1.0.0 --- .../libraries/libfishsound/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/libfishsound/default.nix diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix new file mode 100644 index 00000000000..fae96c8d3f7 --- /dev/null +++ b/pkgs/development/libraries/libfishsound/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, libvorbis, speex, flac, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libfishsound-1.0.0"; + + src = fetchurl { + url = "http://downloads.xiph.org/releases/libfishsound/${name}.tar.gz"; + sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf"; + }; + + propagatedBuildInputs = [ libvorbis speex flac ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + homepage = https://xiph.org/fishsound/; + description = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. + +libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. + +FishSound has been developed and tested on GNU/Linux, Darwin/MacOSX and Win32. It probably also works on other Unix-like systems via GNU autoconf. For Win32: nmake Makefiles, Visual Studio .NET 2003 solution files and Visual C++ 6.0 workspace files are all provided in the source distribution.''; + platforms = platforms.unix; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eaa8525fc6..b81306abc5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12438,6 +12438,8 @@ in libfilezilla = callPackage ../development/libraries/libfilezilla { }; + libfishsound = callPackage ../development/libraries/libfishsound { }; + libfm = callPackage ../development/libraries/libfm { }; libfm-extra = libfm.override { extraOnly = true; From 528e27b33cdbb79253c031b4578aed344e8620bc Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sun, 16 Feb 2020 23:52:24 +0100 Subject: [PATCH 157/243] sonic-visualiser: 2.4.1 -> 4.0.1 The program is no longer broken. --- .../audio/sonic-visualiser/default.nix | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 6164c1cfe93..d1c981de2d5 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,21 +2,23 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, qtbase, redland -, qmake, rubberband, serd, sord, vampSDK, fftwFloat +, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland +, rubberband, serd, sord, vampSDK, fftwFloat +, capnproto, liboggz, libfishsound, libid3tag, opusfile +, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "sonic-visualiser"; - version = "2.4.1"; + version = "4.0.1"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${pname}-${version}.tar.gz"; - sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz"; + sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6"; }; buildInputs = - [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband + [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland serd sord @@ -26,23 +28,22 @@ stdenv.mkDerivation rec { libpulseaudio libmad libogg # ? - # fishsound + libfishsound liblo libX11 + capnproto + liboggz + libid3tag + opusfile ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; - configurePhase = '' - for i in sonic-visualiser svapp svcore svgui; - do cd $i && qmake PREFIX=$out && cd ..; - done - ''; + enableParallelBuilding = true; - installPhase = '' - mkdir -p $out/{bin,share/sonic-visualiser} - cp sonic-visualiser $out/bin/ - cp -r samples $out/share/sonic-visualiser/ + # comment out the tests + preConfigure = '' + sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro ''; meta = with stdenv.lib; { @@ -51,6 +52,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; platforms = platforms.linux; - broken = true; }; } From 7957f43b6a2249487685dacc9f40e7d84f04d1df Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 17 Feb 2020 00:13:05 +0100 Subject: [PATCH 158/243] youtube-dl: 2020.01.24 -> 2020.02.16 https://github.com/ytdl-org/youtube-dl/releases/tag/2020.02.16 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 59fd4fa70c9..1fc8acdda2c 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.01.24"; + version = "2020.02.16"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1zrnbjnwv315f9a83lk5c0gl4ianvp6q2kinxvqlv604sabcq78b"; + sha256 = "1ip0p7gifwmkls8ppfvz89j1lh82dg60zmvabj8njnhj170ikkdb"; }; nativeBuildInputs = [ makeWrapper ]; From 10af1a139b97bafe9765925d2003b5c4a2584a7a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 16 Feb 2020 23:08:52 +0000 Subject: [PATCH 159/243] qtads: 2.1.99.2019-04-12 -> 3.0.0 --- pkgs/games/qtads/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/qtads/default.nix b/pkgs/games/qtads/default.nix index dda7799aacb..f36581776cb 100644 --- a/pkgs/games/qtads/default.nix +++ b/pkgs/games/qtads/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, qmake +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qmake , SDL2, fluidsynth, libsndfile, libvorbis, mpg123, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qtads"; - version = "2.1.99.2019-04-12"; + version = "3.0.0"; src = fetchFromGitHub { owner = "realnc"; repo = pname; - rev = "43289a830a18c66a293c2b1ee75a08e92e8dd5dc"; - sha256 = "0zscf6nmjjc4i7c38iy8znv2s453xc49gn7knyi3g1l6iinjwbx7"; + rev = "v${version}"; + sha256 = "02kk2hs20h9ffhylwms9f8zikmmlrz1nvbrm97gis9iljkyx035c"; }; nativeBuildInputs = [ pkgconfig qmake ]; From b30dc0ff8934e8add2978737d252c49fadf62b0b Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 13 Feb 2020 17:06:43 +0100 Subject: [PATCH 160/243] expect: patch configure after the autoreconf phase, not before it Fixes: #79863 --- pkgs/tools/misc/expect/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 4a6f62f995b..6c9f348b8a1 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - postPatch = '' + preConfigure = '' sed -i "s,/bin/stty,$(type -p stty),g" configure ''; From b87e7d00f3f2ede7b982c1fad3dc0805b586e13f Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Mon, 17 Feb 2020 00:59:48 +0100 Subject: [PATCH 161/243] openjdk8: 8u222b10 -> 8u242b08 --- pkgs/development/compilers/openjdk/8.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 4231845792a..f47d7939e48 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -29,49 +29,49 @@ let jdk8 = fetchurl { name = "jdk8-${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "0qpmr267qcxhmw398zbl1axd161yxn4k4hfz1jlxlmdvg70p7h90" else "1crs4hmzmgm6fkwfq0d3xz9lph0nd33fngrqv2rz1mkkqcrjx18z"; }; langtools = fetchurl { name = "langtools-${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "1rhhi4kgmxvnyl3ic5p008p1n7zyji5nw99blm1lr5fw7ry7df24" else "1aaxd1rl7dlk4kxdivvqvripsbn0d5vny0jvjksycsm97vrfiry4"; }; hotspot = fetchurl { name = "hotspot-${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "0lphrhjqlavd6qlkh7h4sd2bqf5gd0cchkcnvy87703fbd7gy5ii" else "18i4if16zikgda9k5bgqyx0p2104db23zlnclq512178z0p9yycb"; }; corba = fetchurl { name = "corba-${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "18h0v566v420d00na6x4jrs41v4aa39byk15fi8k6dcn0dmirhvg" else "1298k8p2dsj7xc4h2ayk5nl4ssrcgncn06ysyqrmnwrb8gj8s1w4"; }; jdk = fetchurl { name = "jdk-${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "0xxy7rkj8ah263nnzkd4mg9dai5qix3l9cyilm47dig5hv7g8aq0" else "0vqlbks3cy3cnmnrnhbjkqinvp8bcy2h96xvx81cvlza4s2hszvz"; }; jaxws = fetchurl { name = "jaxws-${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "0ajqm2l9g5w5ag5s4vl4ldpbm99pqa6d342hrzvv7psqn3zf6ar5" else "1wg9fbiz09arj0llavnzrmbhw8nx0dw8dcjkrzxw78rj1cadflzc"; }; jaxp = fetchurl { name = "jaxp-${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "03zjh6xvza05abxz9d9j2w9xndw9n07f8lrn6dymj7f4imals831" else "1i5xrk8r8pcgnc68zrgp3hd1a1nzcm99swpmdnlb424qlg5nnrcf"; }; nashorn = fetchurl { name = "nashorn-${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "0n809w264ndxksva9c81x0m1fsyg8c627w571f72xxxl9c1bnrmp" else "0qlxaz7sriy709vcyzz48s2v4p5h4d31my33whip018c4j5gkfqq"; }; openjdk8 = stdenv.mkDerivation { From c23db52a657c0be17fd53a3c0386c10e3c253336 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 17 Feb 2020 01:07:00 +0100 Subject: [PATCH 162/243] unifont: generate otb and split output --- pkgs/data/fonts/unifont/default.nix | 31 +++++++++++++++++++---------- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index a80beee342b..fc41263fee7 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, mkfontscale, mkfontdir }: +{ stdenv, fetchurl, mkfontscale +, libfaketime, fonttosfnt +}: stdenv.mkDerivation rec { pname = "unifont"; @@ -14,23 +16,32 @@ stdenv.mkDerivation rec { sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf"; }; - nativeBuildInputs = [ mkfontscale mkfontdir ]; + nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; - phases = "installPhase"; + phases = [ "buildPhase" "installPhase" ]; + + buildPhase = + '' + # convert pcf font to otb + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -g 2 -m 2 -v -o "unifont.otb" "${pcf}" + ''; installPhase = '' - mkdir -p $out/share/fonts $out/share/fonts/truetype - cp -v ${pcf} $out/share/fonts/unifont.pcf.gz - cp -v ${ttf} $out/share/fonts/truetype/unifont.ttf - cd $out/share/fonts + # install otb fonts + install -m 644 -D unifont.otb "$otb/share/fonts/unifont.otb" + mkfontdir "$otb/share/fonts" + + # install pcf and ttf fonts + install -m 644 -D ${pcf} $out/share/fonts/unifont.pcf.gz + install -m 644 -D ${ttf} $out/share/fonts/truetype/unifont.ttf + cd "$out/share/fonts" mkfontdir mkfontscale ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0n3ms2k2mk7j6144l05c45smggwf3j5cwkaxhw93wf9hd1lhpwq1"; + outputs = [ "out" "otb" ]; meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8192f56c1b..b05e565b981 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18013,7 +18013,8 @@ in unihan-database = callPackage ../data/misc/unihan-database { }; - unifont = callPackage ../data/fonts/unifont { }; + unifont = callPackage ../data/fonts/unifont + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; unifont_upper = callPackage ../data/fonts/unifont_upper { }; From a0cd12263eed1e6545f6d7ced20b964c3be1fdc8 Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Sun, 16 Feb 2020 21:50:30 -0300 Subject: [PATCH 163/243] Add my githubId --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6cd21475d5a..92a7fec22e4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2257,6 +2257,7 @@ ericdallo = { email = "ercdll1337@gmail.com"; github = "ericdallo"; + githubId = 7820865; name = "Eric Dallo"; }; ericsagnes = { From 419d0ad370b8bbe3fa5d54dd261c9e997cd60e42 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sun, 16 Feb 2020 16:52:24 +0100 Subject: [PATCH 164/243] jftui: init at 0.2.2 --- pkgs/applications/video/jftui/default.nix | 46 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/video/jftui/default.nix diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix new file mode 100644 index 00000000000..82774ada09e --- /dev/null +++ b/pkgs/applications/video/jftui/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, fetchpatch, clang, + pkg-config, curl, mpv, yajl }: + +stdenv.mkDerivation rec { + pname = "jftui"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "Aanok"; + repo = pname; + rev = "v${version}"; + sha256 = "0g93w8ahyh2v0cv2fyj5a7v6qyznavwk0dcxx1qw4kczdgmlxnkx"; + }; + + patches = [ + # Remove this patch with next version + (fetchpatch { + name = "curl-capability-check-fix"; + url = "https://github.com/Aanok/jftui/commit/d63996b8bc0d2ac4b04c5de4169bc7f8ec9b2a30.patch"; + sha256 = "1d595mkzgx3carq2cykxpvmf5klgdlyaq94fk9wj8812yswqlsr7"; + }) + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + clang + curl + mpv + yajl + ]; + + installPhase = '' + install -Dm555 build/jftui $out/bin/jftui + ''; + + meta = with stdenv.lib; { + description = "Jellyfin Terminal User Interface "; + homepage = "https://github.com/Aanok/jftui"; + license = licenses.unlicense; + maintainers = [ maintainers.nyanloutre ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac069a1e259..f280b642308 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20117,6 +20117,8 @@ in inherit (darwin) libobjc; }; + jftui = callPackage ../applications/video/jftui { }; + lilyterm = callPackage ../applications/misc/lilyterm { inherit (gnome2) vte; gtk = gtk2; From 46a93a7fdb2bccf0feaa6b3945251b4b1b1378d4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 16 Feb 2020 15:54:41 -0800 Subject: [PATCH 165/243] expect: use postPatch for stty patch --- pkgs/tools/misc/expect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 6c9f348b8a1..9fcff332de6 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - preConfigure = '' - sed -i "s,/bin/stty,$(type -p stty),g" configure + postPatch = '' + sed -i "s,/bin/stty,$(type -p stty),g" configure.in ''; configureFlags = [ From d186c7f1c71ff0fd4747599c847aa48b5125a594 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 Feb 2020 18:43:32 +0000 Subject: [PATCH 166/243] seqdiag: 0.9.6 -> 2.0.0 --- pkgs/development/python-modules/seqdiag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index 1f6307f2cbb..052c2fc3d0f 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "seqdiag"; - version = "0.9.6"; + version = "2.0.0"; src = fetchurl { url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz"; - sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf"; + sha256 = "0k7j4f9j3d0325piwvbv90nfh0wzfk2n6s73s6h6nsxmqshcgswk"; }; buildInputs = [ pep8 nose unittest2 docutils ]; From d6e1193d39208ce7c83078ead244694165bbb8bd Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 16 Feb 2020 19:09:03 -0800 Subject: [PATCH 167/243] pythonPackages.seqdiag: disable python2 No longer supported upstream ``` ERROR: Package 'seqdiag' requires a different Python: 2.7.17 not in '>=3.5' ``` --- pkgs/development/python-modules/seqdiag/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index 052c2fc3d0f..feddc24985a 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +{ stdenv, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils , blockdiag }: buildPythonPackage rec { pname = "seqdiag"; version = "2.0.0"; + disabled = isPy27; src = fetchurl { url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz"; From f0d53bd6f9f0cbd806d0f486e4bf7d4d69062f1b Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Tue, 21 Jan 2020 13:20:26 -0500 Subject: [PATCH 168/243] pythonPackages.docloud: init at 1.0.375 The IBM Decision Optimization on Cloud Python client. Requirement of docplex, which is a dependency of qiskit-aqua. --- .../python-modules/docloud/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/docloud/default.nix diff --git a/pkgs/development/python-modules/docloud/default.nix b/pkgs/development/python-modules/docloud/default.nix new file mode 100644 index 00000000000..f1ec269f7cb --- /dev/null +++ b/pkgs/development/python-modules/docloud/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "docloud"; + version = "1.0.375"; + + src = fetchPypi { + inherit pname version; + sha256 = "996d55407498fd01e6c6c480f367048f92255e9ca9db0e9ea19aaef91328a441"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Pypi's tarball doesn't contain tests. Source not available. + doCheck = false; + pythonImportsCheck = [ "docloud" ]; + + meta = with lib; { + description = "The IBM Decision Optimization on Cloud Python client"; + homepage = "https://onboarding-oaas.docloud.ibmcloud.com/software/analytics/docloud/"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 927bfa285ba..ca130a8df05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2544,6 +2544,8 @@ in { docker_pycreds = callPackage ../development/python-modules/docker-pycreds {}; + docloud = callPackage ../development/python-modules/docloud { }; + docopt = callPackage ../development/python-modules/docopt { }; doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; From c71f63a3378d60c3fe73d7a0f0f1acd4970ec8e6 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 3 Feb 2020 17:24:54 -0500 Subject: [PATCH 169/243] ecos: 2.0.6 -> 2.0.7 Bump ecos module. --- .../libraries/science/math/ecos/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix index 77973a95449..2ba69a34a4a 100644 --- a/pkgs/development/libraries/science/math/ecos/default.nix +++ b/pkgs/development/libraries/science/math/ecos/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ecos"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "embotech"; repo = "ecos"; - rev = "v${version}"; - sha256 = "11v958j66wq30gxpjpkgl7n3rvla845lygz8fl39pgf1vk9sdyc7"; + rev = version; + sha256 = "1hsndim5kjvcwk5svqa4igawzahj982180xj1d7yd0dbjlgxc7w7"; }; buildPhase = '' @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight conic solver for second-order cone programming"; - homepage = https://www.embotech.com/ECOS; + homepage = "https://www.embotech.com/ECOS"; + downloadPage = "https://github.com/embotech/ecos/releases"; license = licenses.gpl3; platforms = platforms.all; - maintainers = [ maintainers.bhipple ]; + maintainers = with maintainers; [ bhipple ]; }; } From 78c147c164fed876b84c6744586b0ceb52c4f6c3 Mon Sep 17 00:00:00 2001 From: "Farkas, Arnold" Date: Mon, 27 Jan 2020 03:47:40 -0500 Subject: [PATCH 170/243] pythonPackages.vertica-python: init at 0.10.2 --- .../python-modules/vertica-python/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/vertica-python/default.nix diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix new file mode 100644 index 00000000000..24af3599869 --- /dev/null +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, future, dateutil, six, pytest, mock, parameterized }: + +buildPythonPackage rec { + pname = "vertica-python"; + version = "0.10.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "c35d0e7ac8da2af47a65efc72d5d8351caa93e4829e549f229aa7e375593f896"; + }; + + propagatedBuildInputs = [ future dateutil six ]; + + checkInputs = [ pytest mock parameterized ]; + + # Integration tests require an accessible Vertica db + checkPhase = '' + pytest --ignore vertica_python/tests/integration_tests + ''; + + meta = with lib; { + description = "Native Python client for Vertica database"; + homepage = "https://github.com/vertica/vertica-python"; + license = licenses.asl20; + maintainers = [ maintainers.arnoldfarkas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca130a8df05..ed7a00d5e81 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5720,6 +5720,8 @@ in { vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + vertica-python = callPackage ../development/python-modules/vertica-python { }; + virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkgconfig; }; From 7855afeef7eda3b4d63815b5e927038dc1676e50 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 11 Sep 2019 23:20:31 +0300 Subject: [PATCH 171/243] mbutil: init at 0.3.0 --- pkgs/applications/misc/mbutil/default.nix | 24 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/misc/mbutil/default.nix diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix new file mode 100644 index 00000000000..b108d1a5647 --- /dev/null +++ b/pkgs/applications/misc/mbutil/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonApplication, fetchFromGitHub, nose }: + +buildPythonApplication rec { + pname = "mbutil"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "mapbox"; + repo = pname; + rev = "v${version}"; + sha256 = "06d62r89h026asaa4ryzb23m86j0cmbvy54kf4zl5f35sgiha45z"; + }; + + checkInputs = [ nose ]; + checkPhase = "nosetests"; + + meta = with lib; { + description = "An importer and exporter for MBTiles"; + homepage = "https://github.com/mapbox/mbutil"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f280b642308..19de9f2d10f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5005,6 +5005,8 @@ in boost = boost155; }; + mbutil = python3Packages.callPackage ../applications/misc/mbutil { }; + mc = callPackage ../tools/misc/mc { }; mcabber = callPackage ../applications/networking/instant-messengers/mcabber { }; From 79969356682e7ea642a0ee934080cc769a689790 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Feb 2020 14:23:52 +0000 Subject: [PATCH 172/243] libsixel: 1.8.4 -> 1.8.6 --- pkgs/development/libraries/libsixel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 9973f337398..3c3beb5f1a7 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - version = "1.8.4"; + version = "1.8.6"; pname = "libsixel"; src = fetchFromGitHub { repo = "libsixel"; rev = "v${version}"; owner = "saitoha"; - sha256 = "1zckahfl0j7k68jf87iwdc4yx7fkfhxwa7lrf22dnz36d2iq785v"; + sha256 = "1saxdj6sldv01g6w6yk8vr7px4bl31xca3a82j6v1j3fw5rbfphy"; }; configureFlags = [ From 52981cedfd9f194d9c16903527d16f122efbb072 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 17 Feb 2020 00:42:54 +0100 Subject: [PATCH 173/243] mautrix-whatsapp: 2020-01-12 -> 2020-02-09 --- pkgs/servers/mautrix-whatsapp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index bb72ce1b45f..578f125ee2b 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,16 +2,16 @@ buildGoModule { pname = "mautrix-whatsapp-unstable"; - version = "2020-01-12"; + version = "2020-02-09"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "39e46833b471b0cf262d4ff57fcd61530b5d2b9e"; - sha256 = "1r1f52advibb97vrhi2gw0d0scnsvfbmfqizsbpjmgm7ci9jjhcl"; + rev = "260555b69ccd20f247405e4d8cab3d49fabda070"; + sha256 = "1ykhwrp8bvhzzw4lg4m1w430ybgzd0zqgrs4jrvfd1m0als2iff7"; }; - modSha256 = "18bcv7x49bqnzwhafh8fvyv9z2d4j6w0iyqql0alq57hy7h7lxik"; + modSha256 = "0ypj79rjwj5bls6aq2cz0d034dnv1sddl43iz51b4fl2bfv0drm9"; meta = with stdenv.lib; { homepage = https://github.com/tulir/mautrix-whatsapp; From ed944d4ceeb60a09f607da983e1cd9df73e1c2c6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 17 Feb 2020 07:45:51 +0100 Subject: [PATCH 174/243] nextcloud-client: 2.6.2 -> 2.6.3 https://github.com/nextcloud/desktop/releases/tag/v2.6.3 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index c362de2daa3..53d073caee4 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "1adicl0msjwbvvi0nxqb1zmka51nn2b88plsynrap5fm0xp40j39"; + sha256 = "17w1bx305w656jkiv55lwncxwdly8rf2dsisqw3c9bc7vz19l6p8"; }; patches = [ From 2721f9d549d1f18973ab23eb1ccaa1369d398bc2 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sun, 16 Feb 2020 23:26:28 -0800 Subject: [PATCH 175/243] fish-foreign-env: update stderr redirection in patch Caret stderr redirection has been deprecated and will be removed in a future version. --- .../fish/fish-foreign-env/suppress-harmless-warnings.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch b/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch index 5e4569f0a15..6eed3515212 100644 --- a/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch +++ b/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch @@ -14,7 +14,7 @@ index 34a25e3..3d94135 100644 - set -g -x $key $value + if contains $key $ignore -+ set -g -x $key $value ^/dev/null ++ set -g -x $key $value 2>/dev/null + else + set -g -x $key $value + end From e718c3a68558ff3b209df41fc5c3c79ef4788ad4 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sun, 16 Feb 2020 23:34:35 -0800 Subject: [PATCH 176/243] iosevka: don't show build progress The node progress "bar" looks like crap when using `nix-build`. Redirect the infinite scrolling screen to `/dev/null` to calm the output down. Errors will still print because stderr isn't redirected. --- pkgs/data/fonts/iosevka/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index e2111065826..e6e3aeba9de 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - npm run build -- ttf::$pname + npm run build -- ttf::$pname >/dev/null runHook postBuild ''; From cfc21ad059c2bd850deee0d75350144c2cd4d4b8 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 17 Feb 2020 09:36:53 +0100 Subject: [PATCH 177/243] Revert "haskell generic-builder: fix Darwin regression for lmdb" This reverts commit 8c58c44aaed3c05f817de9f0bf151bd927cb1abd. This causes a mass rebuild and should go to staging instead before master --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index ac22f903c9b..513987dae7b 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -384,7 +384,7 @@ stdenv.mkDerivation ({ done for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do - for lib in "$d/"*.{dylib,so}; do + for lib in "$d/"*.dylib; do ln -s "$lib" "$dynamicLinksDir" done done From d7bc3a753452faed3dac6ad9914dcdd0e4bee2f0 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 17 Feb 2020 09:57:35 +0100 Subject: [PATCH 178/243] tests: fix more loaOf deprecation warnings --- nixos/tests/glusterfs.nix | 19 ++++++++++--------- nixos/tests/nfs/simple.nix | 14 +++++++------- nixos/tests/orangefs.nix | 10 +++++----- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/nixos/tests/glusterfs.nix b/nixos/tests/glusterfs.nix index 8f9cb8973d5..cb07bc09511 100644 --- a/nixos/tests/glusterfs.nix +++ b/nixos/tests/glusterfs.nix @@ -4,10 +4,11 @@ let client = { pkgs, ... } : { environment.systemPackages = [ pkgs.glusterfs ]; fileSystems = pkgs.lib.mkVMOverride - [ { mountPoint = "/gluster"; - fsType = "glusterfs"; - device = "server1:/gv0"; - } ]; + { "/gluster" = + { device = "server1:/gv0"; + fsType = "glusterfs"; + }; + }; }; server = { pkgs, ... } : { @@ -22,11 +23,11 @@ let virtualisation.emptyDiskImages = [ 1024 ]; fileSystems = pkgs.lib.mkVMOverride - [ { mountPoint = "/data"; - device = "/dev/disk/by-label/data"; - fsType = "ext4"; - } - ]; + { "/data" = + { device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; + }; }; in { name = "glusterfs"; diff --git a/nixos/tests/nfs/simple.nix b/nixos/tests/nfs/simple.nix index a1a09ee0f45..c49ebddc2fd 100644 --- a/nixos/tests/nfs/simple.nix +++ b/nixos/tests/nfs/simple.nix @@ -5,13 +5,13 @@ let client = { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride - [ { mountPoint = "/data"; - # nfs4 exports the export with fsid=0 as a virtual root directory - device = if (version == 4) then "server:/" else "server:/data"; - fsType = "nfs"; - options = [ "vers=${toString version}" ]; - } - ]; + { "/data" = + { # nfs4 exports the export with fsid=0 as a virtual root directory + device = if (version == 4) then "server:/" else "server:/data"; + fsType = "nfs"; + options = [ "vers=${toString version}" ]; + }; + }; networking.firewall.enable = false; # FIXME: only open statd }; diff --git a/nixos/tests/orangefs.nix b/nixos/tests/orangefs.nix index 46d7a6a72f8..24b7737058c 100644 --- a/nixos/tests/orangefs.nix +++ b/nixos/tests/orangefs.nix @@ -10,11 +10,11 @@ let virtualisation.emptyDiskImages = [ 4096 ]; fileSystems = pkgs.lib.mkVMOverride - [ { mountPoint = "/data"; - device = "/dev/disk/by-label/data"; - fsType = "ext4"; - } - ]; + { "/data" = + { device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; + }; services.orangefs.server = { enable = true; From f8e031b2988c6ae907270ccea9207ec390ff7f5e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 17 Feb 2020 04:20:00 -0500 Subject: [PATCH 179/243] circleci-cli: 0.1.5879 -> 0.1.6072 --- pkgs/development/tools/misc/circleci-cli/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index a590d4a6106..f4bdd0c09af 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.5879"; + version = "0.1.6072"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1471g56apaw0c5dpa0jrr7hvzh3kbwfr3yr0m4mz2dlf27d481ac"; + sha256 = "1sbzl6y7974sib14qr2qa6d20cs54h6a3mc1whbxifg87cw02qjn"; }; - modSha256 = "0cvmcsl00jfikpkw3f7k5zw65156z5g5l2b6s5803a2i9d613268"; + modSha256 = "1pxqc2a1hb6bk67sd2c37zwg6n7h0jay3yqsjcs4jc0bqv48gzip"; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ]; preBuild = '' substituteInPlace data/data.go \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4728ae975e7..da0a9e76c7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2409,11 +2409,7 @@ in ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { - # Version 0.1.5879 fails to build with go 1.13 due to: - # build github.com/CircleCI-Public/circleci-cli: cannot load github.com/gobuffalo/packr/v2: github.com/gobuffalo/packr@v1.21.0: reading file:///nix/store/hh9hrfdg3gbqz37sa3hx44mkzkxpkkyw-circleci-cli-0.1.5879-go-modules/github.com/gobuffalo/packr/@v/v1.21.0.zip: Not Found - buildGoModule = buildGo112Module; - }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; circus = callPackage ../tools/networking/circus { }; From d9a19e97cb4ca95af0255cc2abbed14cf1b4e6e1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 17 Feb 2020 04:20:00 -0500 Subject: [PATCH 180/243] ytop: 0.4.0 -> 0.5.1 --- pkgs/tools/system/ytop/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix index 79dcf41b722..7bd97507bea 100644 --- a/pkgs/tools/system/ytop/default.nix +++ b/pkgs/tools/system/ytop/default.nix @@ -4,19 +4,18 @@ assert stdenv.isDarwin -> IOKit != null; rustPlatform.buildRustPackage rec { pname = "ytop"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "cjbassi"; repo = pname; rev = version; - sha256 = "1158nlg5b93jyljwvf9f2m8m3ph8sksk5dh9sfnvbiifbk4gizv7"; + sha256 = "1wpxn8i5112pzs8b03shl627r2yz70lvzjhd6f5crwhsnir06h5x"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - cargoSha256 = "0c4xp63fm1n7x8brmx7avqjvcbqi32k6x5ps7h0fh0ign452y7fz"; - verifyCargoDeps = true; + cargoSha256 = "0wmlmkq4y2923i5kjhprw2hd2v5qls49ncs6h8g9rdlmwd7qdl86"; meta = with stdenv.lib; { description = "A TUI system monitor written in Rust"; From 5ef4af7afcaa3b85cf936efabe46b481b9dea3b7 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 17 Feb 2020 04:50:44 -0500 Subject: [PATCH 181/243] doomseeker: add qt wrapper, cleanup (#79794) This avoids using NIX_CFLAGS_COMPILE by switching to hardeningDisable. The hack is also only needed for darwin sources and is not specific to clang. Co-authored-by: Dmitry Kalinkin --- pkgs/applications/misc/doomseeker/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index fbe21dd9a5b..da36e89db1f 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,6 +1,6 @@ -{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: +{ stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: -stdenv.mkDerivation { +mkDerivation { pname = "doomseeker"; version = "2018-03-05"; @@ -13,13 +13,10 @@ stdenv.mkDerivation { patches = [ ./fix_paths.patch ./qt_build_fix.patch ]; + nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/; From 4e0a6bc4be0e5fb516e92f932b52572244e95f4b Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 17 Feb 2020 11:45:44 +0100 Subject: [PATCH 182/243] symlinkJoin: fix "bash: Argument list too long" error When the `paths` argument is too big `symlinkJoin` will fail with: ``` while setting up the build environment: executing '/nix/store/rm1hz1lybxangc8sdl7xvzs5dcvigvf7-bash-4.4-p23/bin/bash': Argument list too long ``` This is fixed by passing `paths` as a file instead of as an environment variable. --- pkgs/build-support/trivial-builders.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 5210b7d7ba2..e107db2db5c 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -255,11 +255,14 @@ rec { }: let args = removeAttrs args_ [ "name" "postBuild" ] - // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults + // { + inherit preferLocalBuild allowSubstitutes; + passAsFile = [ "paths" ]; + }; # pass the defaults in runCommand name args '' mkdir -p $out - for i in $paths; do + for i in $(cat $pathsPath); do ${lndir}/bin/lndir -silent $i $out done ${postBuild} From 270a1e4f8a45fdff2dc5f32d30882f6dab87ca9f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 17 Feb 2020 11:57:28 +0100 Subject: [PATCH 183/243] unscii: cleanup and split outputs The font is very large and duplicated across many formats, some of which cannot be compressed, like `.hex` or `.svg`. For normal use (eg. X11, GTK applications) these formats are not necessary, so they are moved to another output reducing the default closure size. --- pkgs/data/fonts/unscii/default.nix | 45 ++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index cd4d0dc42cd..93fe8cdfb74 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -1,32 +1,55 @@ -{stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}: +{ stdenv, fetchurl, perl, bdftopcf +, fontforge, SDL, SDL_image, mkfontscale +}: + stdenv.mkDerivation rec { pname = "unscii"; version = "1.1"; - # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + src = fetchurl { url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz"; sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1"; }; - nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge - SDL SDL_image]; + + nativeBuildInputs = + [ (perl.withPackages (p: [ p.TextCharWidth ])) + bdftopcf fontforge SDL SDL_image + mkfontscale + ]; + preConfigure = '' patchShebangs . ''; - installPhase = '' - install -m444 -Dt $out/share/fonts *.hex *.pcf - install -m444 -Dt $out/share/fonts/truetype *.ttf - install -m444 -Dt $out/share/fonts/opentype *.otf - install -m444 -Dt $out/share/fonts/svg *.svg - install -m444 -Dt $out/share/fonts/web *.woff + + postBuild = '' + # compress pcf fonts + gzip -9 -n *.pcf ''; + installPhase = '' + # install fonts for use in X11 and GTK applications + install -m444 -Dt "$out/share/fonts/misc" *.pcf.gz + install -m444 -Dt "$out/share/fonts/opentype" *.otf + mkfontdir "$out/share/fonts/misc" + mkfontscale "$out/share/fonts/opentype" + + # install other formats in $extra + install -m444 -Dt "$extra/share/fonts/truetype" *.ttf + install -m444 -Dt "$extra/share/fonts/svg" *.svg + install -m444 -Dt "$extra/share/fonts/web" *.woff + install -m444 -Dt "$extra/share/fonts/misc" *.hex + mkfontscale "$extra"/share/fonts/* + ''; + + outputs = [ "out" "extra" ]; + meta = { inherit version; description = ''Bitmapped character-art-friendly Unicode fonts''; # Basically GPL2+ with font exception — because of the Unifont-augmented # version. The reduced version is public domain. license = http://unifoundry.com/LICENSE.txt; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = [ stdenv.lib.maintainers.raskin ]; homepage = http://pelulamu.net/unscii/; }; } From dfd86fc8821915e75d9c3e15bded4203df1e7fe5 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 17 Feb 2020 12:56:16 +0100 Subject: [PATCH 184/243] dbeaver: 6.3.4 -> 6.3.5 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 98aebc32dba..e5590bfe855 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "6.3.4"; + version = "6.3.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1b4ac7vsfz3c9vk7yv33pcfflcxl5fcnbzfdva1yfq63v28g38gk"; + sha256 = "1ssxgnd23cy6br7sbfszvx283c5vz9hgfhx0vqyvm13wyr67hk45"; }; installPhase = '' From 92c97a3915be841ea8b5440a2f5eb3f299f21058 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Braun Date: Wed, 5 Feb 2020 19:29:09 +0100 Subject: [PATCH 185/243] terragrunt: 0.17.4 -> 0.21.11 --- .../networking/cluster/terragrunt/default.nix | 5 +- .../networking/cluster/terragrunt/deps.nix | 412 ++++++++++++++++-- 2 files changed, 371 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index ddeb5851037..49f55370bc4 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "terragrunt"; - version = "0.17.4"; + version = "0.21.11"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "13hlv0ydmv8gpzgg6bfr7rp89xfw1bkgd0j684armw8zq29cmv3a"; + sha256 = "1w64skk67i0sxjd2mkyqh3nglc32wc7schk7h8fwszpa1rw4dfcn"; }; goDeps = ./deps.nix; @@ -18,6 +18,7 @@ buildGoPackage rec { buildInputs = [ makeWrapper ]; preBuild = '' + find go/src -name vendor | xargs -I % sh -c 'echo Removing %; rm -rf %' buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") ''; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index 8432a8366b7..51cb455ce7c 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -1,129 +1,453 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { - goPackagePath = "github.com/aws/aws-sdk-go"; + goPackagePath = "cloud.google.com/go"; fetch = { type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "25253087ea42da08900c4c1fc34c04bdb4a97d5a"; - sha256 = "0p6mf53f4l9b26yc4qlm1s7yls73hsw8klyfhmnxhk2mq8k6ix4m"; + url = "https://code.googlesource.com/gocloud"; + rev = "28a4bc8c44b3acbcc482cff0cdf7de29a4688b61"; + sha256 = "0j40msxm72m8gs87rpwkk19iagjj387r42xwxszmrna7il8g0sbl"; }; } { - goPackagePath = "github.com/bgentry/go-netrc"; + goPackagePath = "github.com/agext/levenshtein"; + fetch = { + type = "git"; + url = "https://github.com/agext/levenshtein"; + rev = "0ded9c86537917af2ff89bc9c78de6bd58477894"; + sha256 = "19d7q69yhcg7gl81j038rkbjz8yjb4qwnsqrmxa4zvhgzlc7d130"; + }; + } + { + goPackagePath = "github.com/apparentlymart/go-cidr"; + fetch = { + type = "git"; + url = "https://github.com/apparentlymart/go-cidr"; + rev = "b1115bf8e14a60131a196f908223e4506b0ddc35"; + sha256 = "0r938rb18c9cr2k417cwwd4pfq74aabpjp9pzvk4qkxc5279igl3"; + }; + } + { + goPackagePath = "github.com/apparentlymart/go-textseg"; + fetch = { + type = "git"; + url = "https://github.com/apparentlymart/go-textseg"; + rev = "fb01f485ebef760e5ee06d55e1b07534dda2d295"; + sha256 = "0n9xcyj7p5y8mbqilk9zprfyqvgm2y9f1g440wqw9dnn3s4fi1k4"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "572908275ed4e38fef7ccb7d507f2faacaa7ab36"; + sha256 = "07bn3v0c4pd38qdp0a0kgmsvh7q30f14qp7pbbls3jzmvpxh49zs"; + }; + } + { + goPackagePath = "github.com/bgentry/go-netrc"; fetch = { type = "git"; url = "https://github.com/bgentry/go-netrc"; - rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; + rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l"; }; } { - goPackagePath = "github.com/go-errors/errors"; + goPackagePath = "github.com/bmatcuk/doublestar"; + fetch = { + type = "git"; + url = "https://github.com/bmatcuk/doublestar"; + rev = "2437321e1473408f122a95f65df3d8841fec4fba"; + sha256 = "0z1jg4l746825qs95sffbc69av1yj0l37n8rjmmnwf7hxh5glxzp"; + }; + } + { + goPackagePath = "github.com/creack/pty"; + fetch = { + type = "git"; + url = "https://github.com/creack/pty"; + rev = "3a6a957789163cacdfe0e291617a1c8e80612c11"; + sha256 = "1v52599qq76dwq742mffakzj6mxqqccv2szn3hjicjld56nmd2d3"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; fetch = { type = "git"; url = "https://github.com/go-errors/errors"; - rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; + rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; }; } { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "6f77996f0c42f7b84e5a2b252227263f93432e9b"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "beaecbbdd8af86aa3acf14180d53828ce69400b2"; + sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm"; + }; + } + { + goPackagePath = "github.com/gruntwork-io/terratest"; + fetch = { + type = "git"; + url = "https://github.com/gruntwork-io/terratest"; + rev = "a02960d4ef0711ae95ae2651271b4e073f88da4e"; + sha256 = "0mywsimj8if8j2jbp8sf4igl5lcdlj81hd3lif86fsmyrma090vw"; + }; + } + { + goPackagePath = "github.com/hashicorp/errwrap"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/errwrap"; + rev = "8a6fb523712970c966eefc6b39ed2c5e74880354"; + sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; - sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; + rev = "eda1e5db218aad1db63ca4642c8906b26bcf2744"; + sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk"; }; } { - goPackagePath = "github.com/hashicorp/go-getter"; + goPackagePath = "github.com/hashicorp/go-getter"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "64040d90d4ab861e7e833d689dc76a0f176d8dec"; - sha256 = "0g25nx42z6ykd7jqzlrxf161h8lqrpxpddmbspl4w3a84wphhgms"; + rev = "f9ec369200fd2163b8f452e5e45696d83ae3f4b6"; + sha256 = "1h69946nsmpp06iqg85whwvjrfqlk1gf9q7y01f0r3sf0cb28f30"; }; } { - goPackagePath = "github.com/hashicorp/go-version"; + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "886a7fbe3eb1c874d46f623bfa70af45f425b3d1"; + sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-safetemp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-safetemp"; + rev = "c9a55de4fe06c920a71964b53cfe3dd293a3c743"; + sha256 = "0gydks8bkq88adlzmv8qj3rvljx15j94c8lyrp88ji2jn6dvv643"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-uuid"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-uuid"; + rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"; + sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-version"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-version"; - rev = "23480c0665776210b5fbbac6eaaee40e3e6a96b7"; - sha256 = "056zs67diq3m7skmmq3pnz6wymfcg55dfs5zf86xkfqqpj10kyf7"; + rev = "ac23dc3fea5d1a983c43f6a0f6e2c13f0195d8bd"; + sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z"; }; } { - goPackagePath = "github.com/hashicorp/hcl"; + goPackagePath = "github.com/hashicorp/golang-lru"; fetch = { type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "f40e974e75af4e271d97ce0fc917af5898ae7bda"; - sha256 = "1w5w3m40xv85gngw8g1kjbcgah1vl4ardbpg2cxgj1svf80zazxx"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"; + sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; }; } { - goPackagePath = "github.com/mattn/go-zglob"; + goPackagePath = "github.com/hashicorp/hcl2"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl2"; + rev = "318e80eefe28c3aa01b434c61bcf4c83a0cc6b25"; + sha256 = "1wlm47qk84ggn6lanafirc49kaq998r1nw2xdcv4ghdxy2ijc0rj"; + }; + } + { + goPackagePath = "github.com/hashicorp/terraform"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/terraform"; + rev = "abec0acf40d8e31ac612a244cf3886fb3bcce0bb"; + sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "e1f7b56ace729e4a73a29a6b4fac6cd5fcda7ab3"; + sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; + }; + } + { + goPackagePath = "github.com/mattn/go-zglob"; fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "4959821b481786922ac53e7ef25c61ae19fb7c36"; - sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449"; + rev = "2ea3427bfa539cca900ca2768d8663ecc8a708c1"; + sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz"; }; } { - goPackagePath = "github.com/mitchellh/go-homedir"; + goPackagePath = "github.com/mitchellh/go-homedir"; fetch = { type = "git"; url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + rev = "af06845cf3004701891bf4fdb884bfe4920b3727"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; }; } { - goPackagePath = "github.com/mitchellh/go-testing-interface"; + goPackagePath = "github.com/mitchellh/go-testing-interface"; fetch = { type = "git"; url = "https://github.com/mitchellh/go-testing-interface"; - rev = "a61a99592b77c9ba629d254a693acffaeb4b7e28"; - sha256 = "139hq835jpgk9pjg94br9d08nka8bfm7zyw92zxlwrkska4pgigx"; + rev = "6d0b8010fcc857872e42fc6c931227569016843c"; + sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw"; }; } { - goPackagePath = "github.com/mitchellh/mapstructure"; + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"; + sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; - sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; }; } { - goPackagePath = "github.com/stretchr/testify"; + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69"; - sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691"; + rev = "ffdc059bfe9ce6a4e144ba849dbedead332c6053"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; }; } { - goPackagePath = "github.com/ulikunitz/xz"; + goPackagePath = "github.com/ulikunitz/xz"; fetch = { type = "git"; url = "https://github.com/ulikunitz/xz"; - rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; - sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; + rev = "6f934d456d51e742b4eeab20d925a827ef22320a"; + sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831"; }; } { - goPackagePath = "github.com/urfave/cli"; + goPackagePath = "github.com/urfave/cli"; fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; - sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; + rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; }; } -] + { + goPackagePath = "github.com/zclconf/go-cty"; + fetch = { + type = "git"; + url = "https://github.com/zclconf/go-cty"; + rev = "6fd39ad70c3a6bbdb1b4e47444e4cce72f901200"; + sha256 = "0mb0ws70jg93vlamzhdvyvyfq6x0s0ll5gf44yanb1dhlz6i1f90"; + }; + } + { + goPackagePath = "github.com/zclconf/go-cty-yaml"; + fetch = { + type = "git"; + url = "https://github.com/zclconf/go-cty-yaml"; + rev = "bc34c981dadb5ed30af852693e3aba8fb6546f42"; + sha256 = "0dams5g61n88rk7zq7sy0yap873ksjafhf81hn2fg2dpfjhcd3y2"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "9c377598961b706d1542bd2d84d538b5094d596e"; + sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "5c40567a22f818bd14a1ea7245dad9f8ef0691aa"; + sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "461777fb6f67e8cb9d70cda16573678d085a74cf"; + sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"; + sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "93c9922d18aeb82498a065f07aec7ad7fa60dfb7"; + sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "890e5eb51fe205e56dc55eb68d63e82039730816"; + sha256 = "05r2wsjnmszsz4y59w8q6qknc7zq1mc56kya61i2133dqxyc55ai"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880"; + sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "eb0b1bdb6ae60fcfc41b8d907b50dfb346112301"; + sha256 = "0g00wfxd4z886bglyszcvfpgzak0476axqyfaqv3va62ndbqpk90"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "501c41df7f472c740d0674ff27122f3f48c80ce7"; + sha256 = "0hla9rjvyi6wjak4cw39ic8jkdcd0lsymhrz9sa52bfybxsczf38"; + }; + } +] \ No newline at end of file From 66dc93c716a98b9748fad64ff0360107f32500e0 Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Mon, 17 Feb 2020 06:23:54 +0100 Subject: [PATCH 186/243] Update QOwnNotes to 20.2.5 --- pkgs/applications/office/qownnotes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 30569512129..fa2c67709fb 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "19.12.15"; + version = "20.2.5"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: - # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "11i3cn1j365nwinaksfpi1hn7j6bqgjzhawkl6c294lzahngba9w"; + # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-20.2.5.tar.xz.sha256 + sha256 = "c26d2a86a521cd243ec0a4788e7627e91cb5877dace73d93dd7d35dd02e9e4c5"; }; nativeBuildInputs = [ qmake qttools ]; From f5a5695edd3e8a2d86d1759790017264efd314e9 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 17 Feb 2020 14:47:54 +0100 Subject: [PATCH 187/243] libreoffice-fresh: 6.3.0.4 -> 6.3.5.2 --- .../office/libreoffice/default.nix | 13 --- .../office/libreoffice/src-fresh/download.nix | 80 +++++++++---------- .../office/libreoffice/src-fresh/primary.nix | 10 +-- .../office/libreoffice/src-still/override.nix | 14 ++++ 4 files changed, 59 insertions(+), 58 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c8bb58d2921..12ffb9ce048 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -61,19 +61,6 @@ in (stdenv.mkDerivation rec { patches = [ ./xdg-open-brief.patch - - # Poppler-0.82 compatibility - # https://gerrit.libreoffice.org/81545 - (fetchpatch { - url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch"; - sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n"; - }) - # Poppler-0.83 compatibility - # https://gerrit.libreoffice.org/84384 - (fetchpatch { - url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch"; - sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2"; - }) ]; tarballPath = "external/tarballs"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 4df8ce1059b..78482326be2 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -1,10 +1,10 @@ [ { - name = "libabw-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; - sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; + name = "libabw-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; - md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; + md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; @@ -147,11 +147,11 @@ md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { - name = "expat-2.2.5.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; - sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; + name = "expat-2.2.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; - md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; + md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; @@ -462,11 +462,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2019-04-03.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; - sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; + name = "language-subtag-registry-2019-09-16.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2"; + sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a"; md5 = ""; - md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; + md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -546,18 +546,18 @@ md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; } { - name = "libxml2-2.9.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; - sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; + name = "libxml2-2.9.10.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; - md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; + md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { - name = "libxslt-1.1.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; - sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; + name = "libxslt-1.1.34.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; - md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; + md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -623,11 +623,11 @@ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.45-with-nspr-4.21.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; - sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; + name = "nss-3.47.1-with-nspr-4.23.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; + sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; md5 = ""; - md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; + md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -658,11 +658,11 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2r.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; - sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; + name = "openssl-1.0.2t.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; - md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; + md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { name = "liborcus-0.14.1.tar.gz"; @@ -707,11 +707,11 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.74.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; - sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; + name = "poppler-0.82.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; - md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; + md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; @@ -721,11 +721,11 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; - sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; + name = "Python-3.5.9.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz"; + sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049"; md5 = ""; - md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; + md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -805,11 +805,11 @@ md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { - name = "libvisio-0.1.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; - sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; + name = "libvisio-0.1.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; - md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; + md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 28bf127c398..d3da7d09b70 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,8 +8,8 @@ rec { major = "6"; minor = "3"; - patch = "0"; - tweak = "4"; + patch = "5"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,19 +17,19 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7"; + sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009"; + sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z"; + sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6"; }; } diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 7192af01949..a089dd1e2c7 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -3,4 +3,18 @@ attrs: { configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags; meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; + patches = = attrs.patches ++ [ + # Poppler-0.82 compatibility + # https://gerrit.libreoffice.org/81545 + (fetchpatch { + url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch"; + sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n"; + }) + # Poppler-0.83 compatibility + # https://gerrit.libreoffice.org/84384 + (fetchpatch { + url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch"; + sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2"; + }) + ]; } From a508b6e606ee4c165a90a10881c0df8308ab4ce8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 9 Feb 2020 18:26:40 +0100 Subject: [PATCH 188/243] jose: init at 10 --- pkgs/development/libraries/jose/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/jose/default.nix diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix new file mode 100644 index 00000000000..4c3095681ed --- /dev/null +++ b/pkgs/development/libraries/jose/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, zlib, jansson, openssl +}: + +stdenv.mkDerivation rec { + pname = "jose"; + version = "10"; + + src = fetchFromGitHub { + owner = "latchset"; + repo = pname; + rev = "v${version}"; + sha256 = "15ac8a656m66rd9qg4dj53smykwaagqv606h18w7fiqn0ykxl4vi"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ zlib jansson openssl ]; + + outputs = [ "out" "dev" "man" ]; + enableParallelBuilding = true; + + meta = { + description = "C-language implementation of Javascript Object Signing and Encryption"; + homepage = "https://github.com/latchset/jose"; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1994c2eafe..7ec52b06a0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12060,6 +12060,8 @@ in jemalloc450 = callPackage ../development/libraries/jemalloc/jemalloc450.nix { }; + jose = callPackage ../development/libraries/jose { }; + jshon = callPackage ../development/tools/parsing/jshon { }; json2hcl = callPackage ../development/tools/json2hcl { }; From 38ae7d1c6ff342bcfb76f2640592b3619e29a185 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 9 Feb 2020 18:31:38 +0100 Subject: [PATCH 189/243] luksmeta: init at 9 --- .../libraries/luksmeta/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/luksmeta/default.nix diff --git a/pkgs/development/libraries/luksmeta/default.nix b/pkgs/development/libraries/luksmeta/default.nix new file mode 100644 index 00000000000..9e01605d2df --- /dev/null +++ b/pkgs/development/libraries/luksmeta/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc +, cryptsetup +}: + +stdenv.mkDerivation rec { + pname = "luksmeta"; + version = "9"; + + src = fetchFromGitHub { + owner = "latchset"; + repo = pname; + rev = "v${version}"; + sha256 = "10nslwk7m1qwskd12c204ipa3cbad0q6fn0v084z2f7q6xxbkd2d"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ]; + buildInputs = [ cryptsetup ]; + + meta = { + description = "Simple library for storing metadata in the LUKSv1 header"; + homepage = "https://github.com/latchset/luksmeta/"; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ec52b06a0e..6c06c4901f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13283,6 +13283,10 @@ in luabind_luajit = luabind.override { lua = luajit; }; + luksmeta = callPackage ../development/libraries/luksmeta { + asciidoc = asciidoc-full; + }; + lzo = callPackage ../development/libraries/lzo { }; opencl-clang = callPackage ../development/libraries/opencl-clang { }; From 37f35dc7790e7ffada83e91e98cbf8c4bdd9ed73 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 9 Feb 2020 18:35:52 +0100 Subject: [PATCH 190/243] clevis: init at 12 --- pkgs/tools/security/clevis/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/security/clevis/default.nix diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix new file mode 100644 index 00000000000..4acec7c8a5b --- /dev/null +++ b/pkgs/tools/security/clevis/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, asciidoc +, jansson, jose, cryptsetup, curl, libpwquality, luksmeta +}: + +stdenv.mkDerivation rec { + pname = "clevis"; + version = "12"; + + src = fetchFromGitHub { + owner = "latchset"; + repo = pname; + rev = "v${version}"; + sha256 = "1dbyl3c21h841w9lrrq6gd5y6dhamr0z5ixd87jz86cn02lznp5m"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig asciidoc ]; + buildInputs = [ jansson jose cryptsetup curl libpwquality luksmeta ]; + + outputs = [ "out" "man" ]; + + meta = { + description = "Automated Encryption Framework"; + homepage = "https://github.com/latchset/clevis"; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c06c4901f3..4ecd71dde87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1431,6 +1431,10 @@ in clasp = callPackage ../tools/misc/clasp { }; + clevis = callPackage ../tools/security/clevis { + asciidoc = asciidoc-full; + }; + cli53 = callPackage ../tools/admin/cli53 { }; cli-visualizer = callPackage ../applications/misc/cli-visualizer { }; From 71cc7796e1d52a53a6cbd73bbdb32f6319dbf50c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 9 Feb 2020 18:40:03 +0100 Subject: [PATCH 191/243] tang: init at 7 --- pkgs/servers/tang/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/servers/tang/default.nix diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix new file mode 100644 index 00000000000..5aa261bd8a4 --- /dev/null +++ b/pkgs/servers/tang/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc +, jansson, jose, http-parser, systemd +}: + +stdenv.mkDerivation rec { + pname = "tang"; + version = "7"; + + src = fetchFromGitHub { + owner = "latchset"; + repo = pname; + rev = "v${version}"; + sha256 = "0y5w1jrq5djh9gpy2r98ja7676nfxss17s1dk7jvgblsijx9qsd7"; + }; + + configureFlags = [ + "--localstatedir=/var" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ]; + buildInputs = [ jansson jose http-parser systemd ]; + + outputs = [ "out" "man" ]; + + meta = { + description = "Server for binding data to network presence."; + homepage = "https://github.com/latchset/tang"; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ecd71dde87..e0827c15d33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15664,6 +15664,10 @@ in libmemcached = null; # Detection is broken upstream }; + tang = callPackage ../servers/tang { + asciidoc = asciidoc-full; + }; + timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; From f9a34082e64594b6ad62a77b08be0eef8d034813 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 17 Feb 2020 15:11:53 +0100 Subject: [PATCH 192/243] dovecot: 2.3.9.2 -> 2.3.9.3 Fixes CVE-2020-7046 & CVE-2020-7957: https://dovecot.org/pipermail/dovecot-news/2020-February/000429.html --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 3aff9f53ce7..12da51f9f23 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.9.2"; + name = "dovecot-2.3.9.3"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "1yc6hi4hqg4hcc4495sf4m5f1lnargphi6dawj43if21vncgp127"; + sha256 = "0lcnqib63nv32xr3nr4s3x8k77mbgrhc13swjl2xqnzw4fabd7zq"; }; enableParallelBuilding = true; From c75860918f0e470bcc881414bd039d7c6c541a21 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 17 Feb 2020 08:12:48 -0600 Subject: [PATCH 193/243] kinit: Increase environment size limit start_kdeinit reads its environment over a pipe from start_kdeinit_wrapper. For security, each environment entry must be smaller than 4kb by default. Qt-based applications in Nixpkgs may have larger environments, and the recent upgrade to Plasma 5.17 pushed start_kdeinit_wrapper over the limit. The limit is now extended to 16kb. This problem was not detected during testing because the failure is silent: start_kdeinit will continue with an empty environment. In other circumstances, this strategy might work, but it does not work on NixOS. This failure is now treated as a fatal error. Fixes: #79707 --- ...libpath.patch => 0001-kinit-libpath.patch} | 22 ++++++++++---- .../kinit/0002-start_kdeinit-path.patch | 25 ++++++++++++++++ ...bs.patch => 0003-kdeinit-extra-libs.patch} | 25 ++++++++++++---- ...004-start_kdeinit-environ-hard-limit.patch | 29 +++++++++++++++++++ .../kde-frameworks/kinit/default.nix | 7 ++++- .../kinit/start_kdeinit-path.patch | 13 --------- 6 files changed, 96 insertions(+), 25 deletions(-) rename pkgs/development/libraries/kde-frameworks/kinit/{kinit-libpath.patch => 0001-kinit-libpath.patch} (72%) create mode 100644 pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch rename pkgs/development/libraries/kde-frameworks/kinit/{kdeinit-extra_libs.patch => 0003-kdeinit-extra-libs.patch} (67%) create mode 100644 pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch delete mode 100644 pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch similarity index 72% rename from pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch rename to pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch index b949723fb54..21477394c91 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch @@ -1,8 +1,17 @@ -Index: kinit-5.32.0/src/kdeinit/kinit.cpp -=================================================================== ---- kinit-5.32.0.orig/src/kdeinit/kinit.cpp -+++ kinit-5.32.0/src/kdeinit/kinit.cpp -@@ -623,19 +623,15 @@ static pid_t launch(int argc, const char +From 715c5f461b4992dac066601202a673bc551a5e33 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 16 Feb 2020 14:23:31 -0600 +Subject: [PATCH 1/4] kinit-libpath + +--- + src/kdeinit/kinit.cpp | 22 +++++++++------------- + 1 file changed, 9 insertions(+), 13 deletions(-) + +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 8fff17a..0801b75 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp +@@ -622,19 +622,15 @@ static pid_t launch(int argc, const char *_name, const char *args, if (!libpath.isEmpty()) { if (libpath_relative) { @@ -31,3 +40,6 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp } } else { l.load(); +-- +2.23.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch new file mode 100644 index 00000000000..bf25b98d6c5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch @@ -0,0 +1,25 @@ +From 129cd0ae1e983adc10dbe84e87bcc6f31cb13db8 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 16 Feb 2020 14:23:44 -0600 +Subject: [PATCH 2/4] start_kdeinit-path + +--- + src/start_kdeinit/start_kdeinit_wrapper.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/start_kdeinit/start_kdeinit_wrapper.c b/src/start_kdeinit/start_kdeinit_wrapper.c +index 891f50c..ef664ad 100644 +--- a/src/start_kdeinit/start_kdeinit_wrapper.c ++++ b/src/start_kdeinit/start_kdeinit_wrapper.c +@@ -23,7 +23,7 @@ + #include + #include + +-#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" ++#define EXECUTE "/run/wrappers/bin/start_kdeinit" + + #if KDEINIT_OOM_PROTECT + +-- +2.23.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch similarity index 67% rename from pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch rename to pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch index d5b1a4accaa..9df8505b292 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch @@ -1,7 +1,16 @@ -Index: kinit-5.32.0/src/kdeinit/kinit.cpp -=================================================================== ---- kinit-5.32.0.orig/src/kdeinit/kinit.cpp -+++ kinit-5.32.0/src/kdeinit/kinit.cpp +From 4f5d0de7e35744cdbfa9e280ee7e15a54cf21abb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 16 Feb 2020 14:24:07 -0600 +Subject: [PATCH 3/4] kdeinit-extra-libs + +--- + src/kdeinit/kinit.cpp | 22 ++++------------------ + 1 file changed, 4 insertions(+), 18 deletions(-) + +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 0801b75..622dd5f 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp @@ -96,9 +96,9 @@ static const char *extra_libs[] = { "libKF5Parts.5.dylib", "libKF5Plasma.5.dylib" @@ -15,7 +24,7 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp #endif }; #endif -@@ -1533,20 +1531,6 @@ static int initXconnection() +@@ -1524,20 +1524,6 @@ static int initXconnection() } #endif @@ -36,7 +45,8 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp extern "C" { static void secondary_child_handler(int) -@@ -1692,7 +1676,7 @@ int main(int argc, char **argv) +@@ -1679,7 +1665,7 @@ int main(int argc, char **argv) + #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { for (const char *extra_lib : extra_libs) { - const QString extra = findSharedLib(QString::fromLatin1(extra_lib)); @@ -44,3 +54,6 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp if (!extra.isEmpty()) { QLibrary l(extra); l.setLoadHints(QLibrary::ExportExternalSymbolsHint); +-- +2.23.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch b/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch new file mode 100644 index 00000000000..34d4726150c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch @@ -0,0 +1,29 @@ +From 41e94983dcfbc1667f1b18c5b566aa5c5975edcb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 17 Feb 2020 04:45:03 -0600 +Subject: [PATCH 4/4] start_kdeinit-environ-hard-limit + +--- + src/start_kdeinit/start_kdeinit.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/start_kdeinit/start_kdeinit.c b/src/start_kdeinit/start_kdeinit.c +index f2db3e9..4ff2602 100644 +--- a/src/start_kdeinit/start_kdeinit.c ++++ b/src/start_kdeinit/start_kdeinit.c +@@ -148,7 +148,11 @@ int main(int argc, char **argv) + ++i) { + unsigned len; + if (read(0, &len, sizeof(unsigned)) == sizeof(unsigned) +- && len && len < (1 << 12)) { ++ && len) { ++ if (len >= (1 << 14)) { ++ fprintf(stderr, "%s: exceeded environment length limit", argv[0]); ++ return 1; ++ } + env[ i ] = malloc(len + 1); + if ((unsigned) read(0, env[ i ], len) == len) { + env[ i ][ len ] = '\0'; +-- +2.23.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index 42a1e157a91..116f475e2f8 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -14,7 +14,12 @@ mkDerivation { buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./0001-kinit-libpath.patch + ./0002-start_kdeinit-path.patch + ./0003-kdeinit-extra-libs.patch + ./0004-start_kdeinit-environ-hard-limit.patch + ]; CXXFLAGS = [ ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"'' ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"'' diff --git a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch deleted file mode 100644 index e3bfc2ebe6b..00000000000 --- a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c -=================================================================== ---- kinit-5.24.0.orig/src/start_kdeinit/start_kdeinit_wrapper.c -+++ kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c -@@ -23,7 +23,7 @@ - #include - #include - --#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" -+#define EXECUTE "/run/wrappers/bin/start_kdeinit" - - #if KDEINIT_OOM_PROTECT - From 85e09daf435677c3d5fe96f36223bb3549cd20d9 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 17 Feb 2020 15:26:19 +0100 Subject: [PATCH 194/243] riot-web: 1.5.8 -> 1.5.9 --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2156214db6b..48e1beed2e7 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "112zjlmxy2s8qcd227laf1lfvbbwwcipn51xb779hy2dci48kpkx"; + sha256 = "1qibbgjzhiwn1lnfm3pbfn6jahphgyf6625mp4v0ah2is75x16ys"; }; installPhase = let From 5bd923057c59221c2f3dd02864f9aebcd91b137f Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 17 Feb 2020 15:26:31 +0100 Subject: [PATCH 195/243] riot-desktop: 1.5.6 -> 1.5.9 --- .../instant-messengers/riot/riot-desktop-package.json | 2 +- .../networking/instant-messengers/riot/riot-desktop.nix | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index c49934b96f7..11e2cf5c7e4 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.6", + "version": "1.5.9", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 9b6f591bd42..bf0feda4278 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.5.6"; + version = "1.5.9"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "148rg6wc84xy53bj16v5riw78s999ridid59x6v9jas827l0bdpk"; + sha256 = "13bskp8nj1h44y7x4dibnfa8sdnzl744x4xckcw5lxnlkccfr69m"; }; in mkYarnPackage rec { @@ -29,7 +29,6 @@ in mkYarnPackage rec { # resources mkdir -p "$out/share/riot" ln -s '${riot-web}' "$out/share/riot/webapp" - cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator" cp -r './deps/riot-web' "$out/share/riot/electron" cp -r './deps/riot-web/img' "$out/share/riot" rm "$out/share/riot/electron/node_modules" From 789182cb8f2024c83a2ea8fb0bc309be51dc7d0b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 17 Feb 2020 16:02:25 +0100 Subject: [PATCH 196/243] ucs-fonts: add license and homepage --- pkgs/data/fonts/ucs-fonts/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 0ea0363763d..7f808af18f2 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation { outputHash = "12fh3kbsib0baqwk6148fnzqrj9gs4vnl7yd5n9km72sic1z1xwk"; meta = with stdenv.lib; { + homepage = https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html; description = "Unicode bitmap fonts"; maintainers = [ maintainers.raskin ]; platforms = platforms.all; From 895042956f279ae8ebc9fd026664cea8198f71ec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 17 Feb 2020 16:35:53 +0100 Subject: [PATCH 197/243] nixos/release-small.nix: List constituents of the 'tested' job by name https://github.com/NixOS/hydra/issues/715 --- nixos/release-small.nix | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 74c16e990f3..7b86a91357e 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -82,18 +82,42 @@ in rec { vim; }; - tested = lib.hydraJob (pkgs.releaseTools.aggregate { + tested = pkgs.releaseTools.aggregate { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; maintainers = [ lib.maintainers.eelco ]; }; constituents = - let all = x: map (system: x.${system}) supportedSystems; in - [ nixpkgs.tarball - (all nixpkgs.jdk) - ] - ++ lib.collect lib.isDerivation nixos; - }); + [ "nixos.channel" + "nixos.dummy.x86_64-linux" + "nixos.iso_minimal.x86_64-linux" + "nixos.manual.x86_64-linux" + "nixos.tests.boot.biosCdrom.x86_64-linux" + "nixos.tests.containers-imperative.x86_64-linux" + "nixos.tests.containers-ip.x86_64-linux" + "nixos.tests.firewall.x86_64-linux" + "nixos.tests.installer.lvm.x86_64-linux" + "nixos.tests.installer.separateBoot.x86_64-linux" + "nixos.tests.installer.simple.x86_64-linux" + "nixos.tests.ipv6.x86_64-linux" + "nixos.tests.login.x86_64-linux" + "nixos.tests.misc.x86_64-linux" + "nixos.tests.nat.firewall-conntrack.x86_64-linux" + "nixos.tests.nat.firewall.x86_64-linux" + "nixos.tests.nat.standalone.x86_64-linux" + "nixos.tests.nfs3.simple.x86_64-linux" + "nixos.tests.openssh.x86_64-linux" + "nixos.tests.php-pcre.x86_64-linux" + "nixos.tests.predictable-interface-names.predictable.x86_64-linux" + "nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux" + "nixos.tests.predictable-interface-names.unpredictable.x86_64-linux" + "nixos.tests.predictable-interface-names.unpredictableNetworkd.x86_64-linux" + "nixos.tests.proxy.x86_64-linux" + "nixos.tests.simple.x86_64-linux" + "nixpkgs.jdk.x86_64-linux" + "nixpkgs.tarball" + ]; + }; } From c91aade77fd5b98e2bf0d7c920c07b1a8abb4b2d Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Mon, 17 Feb 2020 16:48:11 +0100 Subject: [PATCH 198/243] mscgen: enable on darwin (#79996) Co-authored-by: Dmitry Kalinkin --- pkgs/tools/graphics/mscgen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 832a48baab7..613a906a7b4 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { printing. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; }; } From 35bae4f749eb45dd0dcbc7994af15da76bec752d Mon Sep 17 00:00:00 2001 From: jakobrs Date: Mon, 17 Feb 2020 16:50:21 +0100 Subject: [PATCH 199/243] electron: correct casing of MacOS (#80362) --- pkgs/development/tools/electron/3.x.nix | 2 +- pkgs/development/tools/electron/generic.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/electron/3.x.nix b/pkgs/development/tools/electron/3.x.nix index a902f279a49..f66d1a57a04 100644 --- a/pkgs/development/tools/electron/3.x.nix +++ b/pkgs/development/tools/electron/3.x.nix @@ -69,7 +69,7 @@ let unzip $src mv Electron.app $out/Applications mkdir -p $out/bin - ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron + ln -s $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron ''; }; in diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index b2ce076933d..a06989ad254 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -70,7 +70,7 @@ let unzip $src mv Electron.app $out/Applications mkdir -p $out/bin - ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron + ln -s $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron ''; }; in From c9e5cca071223b8869ac12111131e27eb17ff95d Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 17 Feb 2020 16:54:13 +0100 Subject: [PATCH 200/243] riot-web: add config overrides for privacy Preventing the app from phoning home by default. GitHub: closes https://github.com/NixOS/nixpkgs/issues/80358 --- .../instant-messengers/riot/riot-web.nix | 19 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2156214db6b..c31f0cc06cb 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -1,9 +1,16 @@ -{ lib, stdenv, fetchurl, writeText, conf ? null }: +{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }: # Note for maintainers: # Versions of `riot-web` and `riot-desktop` should be kept in sync. -stdenv.mkDerivation rec { +let + noPhoningHome = { + disable_guests = true; # disable automatic guest account registration at matrix.org + piwik = false; # disable analytics + }; + configOverrides = writeText "riot-config-overrides.json" (builtins.toJSON (noPhoningHome // conf)); + +in stdenv.mkDerivation rec { pname = "riot-web"; version = "1.5.8"; @@ -12,16 +19,12 @@ stdenv.mkDerivation rec { sha256 = "112zjlmxy2s8qcd227laf1lfvbbwwcipn51xb779hy2dci48kpkx"; }; - installPhase = let - configFile = if (conf != null) - then writeText "riot-config.json" conf - else "$out/config.sample.json"; - in '' + installPhase = '' runHook preInstall mkdir -p $out/ cp -R . $out/ - ln -s ${configFile} $out/config.json + ${jq}/bin/jq -s '.[0] * .[1]' "config.sample.json" "${configOverrides}" > "$out/config.json" runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1994c2eafe..2e5f1c38845 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2115,7 +2115,7 @@ in riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix { }; riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { - conf = config.riot-web.conf or null; + conf = config.riot-web.conf or {}; }; ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix { From b2492bc444dfab0bf809018a7af3fb6d277f6c98 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 17 Feb 2020 16:00:58 +0000 Subject: [PATCH 201/243] rnnoise: 0.0.1 (2017-10-10) -> 2019-04-24 --- pkgs/development/libraries/rnnoise/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/development/libraries/rnnoise/default.nix index fe6b75446b2..7a1f69e86c7 100644 --- a/pkgs/development/libraries/rnnoise/default.nix +++ b/pkgs/development/libraries/rnnoise/default.nix @@ -1,21 +1,25 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation (rec { - name = "rnnoise-${version}"; - version = "0.0.1"; + pname = "rnnoise"; + version = "2019-04-24"; src = fetchFromGitHub { owner = "xiph"; repo = "rnnoise"; - rev = "91ef401f4c3536c6de999ac609262691ec888c4c"; - sha256 = "1h2ibg67gfcwnpvkq1rx0sngf9lk9j8pqsmsmmk5hclvrr2lp3yb"; + rev = "9acc1e5a633e0961a5895a73204df24744f199b6"; + sha256 = "17xip4z0skpzas7wrdyi87j46mbz9jncpj554m8654bqpkxis0pr"; }; nativeBuildInputs = [ autoreconfHook ]; + postInstall = '' + install -Dt $out/bin examples/.libs/rnnoise_demo + ''; + meta = with lib; { homepage = https://people.xiph.org/~jm/demo/rnnoise/; - description = "Recurrent neural network for audio noise reduction."; + description = "Recurrent neural network for audio noise reduction"; license = licenses.bsd3; maintainers = [ maintainers.nh2 ]; platforms = platforms.all; From 06e7100bf9a818f3c184328728354c310abc346e Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 17 Feb 2020 17:06:23 +0100 Subject: [PATCH 202/243] ucs-fonts: generate pcf, otb and split output --- pkgs/data/fonts/ucs-fonts/default.nix | 43 +++++++++++++++++++-------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 7f808af18f2..d363f01309b 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, bdftopcf +, libfaketime, fonttosfnt, mkfontscale +}: stdenv.mkDerivation { pname = "ucs-fonts"; @@ -21,25 +23,40 @@ stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = + [ bdftopcf libfaketime fonttosfnt + mkfontscale + ]; - phases = [ "unpackPhase" "installPhase" ]; + buildPhase = '' + for i in *.bdf; do + name=$(basename "$i" .bdf) - installPhase = '' - mkdir -p $out/share/fonts - cp *.bdf $out/share/fonts - cd $out/share/fonts - mkfontdir - mkfontscale + # generate pcf fonts (for X11 applications) + bdftopcf -t "$i" | gzip -n -9 -c > "$name.pcf.gz" + + # generate otb fonts (for GTK applications) + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -o "$name.otb" "$i" + done ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "12fh3kbsib0baqwk6148fnzqrj9gs4vnl7yd5n9km72sic1z1xwk"; + installPhase = '' + install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc" + install -m 644 -D *.bdf -t "$bdf/share/fonts/misc" + install -m 644 -D *.otb -t "$otb/share/fonts/misc" + + mkfontdir "$out/share/fonts/misc" + mkfontdir "$bdf/share/fonts/misc" + mkfontdir "$otb/share/fonts/misc" + ''; + + outputs = [ "out" "bdf" "otb" ]; meta = with stdenv.lib; { - homepage = https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html; + homepage = "https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html"; description = "Unicode bitmap fonts"; + license = licenses.publicDomain; maintainers = [ maintainers.raskin ]; platforms = platforms.all; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa7eba6a652..75f20daefef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17986,7 +17986,9 @@ in ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; - ucs-fonts = callPackage ../data/fonts/ucs-fonts { }; + ucs-fonts = callPackage ../data/fonts/ucs-fonts + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { }; From 2de3caf01109891cfc2645b0ad07ac36aedadd1e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 17 Feb 2020 17:14:30 +0100 Subject: [PATCH 203/243] nixos/release-combined.nix: List constituents of the 'tested' job by name https://github.com/NixOS/hydra/issues/715 --- nixos/release-combined.nix | 178 +++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 98 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 41f8c3d9d52..e47e64edb29 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -38,108 +38,90 @@ in rec { nixpkgs = nixpkgsSrc; })) [ "unstable" ]; - tested = pkgs.lib.hydraJob (pkgs.releaseTools.aggregate { + tested = pkgs.releaseTools.aggregate { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; maintainers = with pkgs.lib.maintainers; [ eelco fpletz ]; }; - constituents = - let - # Except for the given systems, return the system-specific constituent - except = systems: x: map (system: x.${system}) (pkgs.lib.subtractLists systems supportedSystems); - all = x: except [] x; - in [ - nixos.channel - (all nixos.dummy) - (all nixos.manual) - - nixos.iso_plasma5.x86_64-linux or [] - nixos.iso_minimal.aarch64-linux or [] - nixos.iso_minimal.i686-linux or [] - nixos.iso_minimal.x86_64-linux or [] - nixos.ova.x86_64-linux or [] - nixos.sd_image.aarch64-linux or [] - - #(all nixos.tests.containers) - (all nixos.tests.containers-imperative) - (all nixos.tests.containers-ip) - nixos.tests.chromium.x86_64-linux or [] - (all nixos.tests.firefox) - (all nixos.tests.firefox-esr) - (all nixos.tests.firewall) - (all nixos.tests.fontconfig-default-fonts) - (all nixos.tests.gnome3-xorg) - (all nixos.tests.gnome3) - (all nixos.tests.pantheon) - nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only - (except ["aarch64-linux"] nixos.tests.installer.lvm) - (except ["aarch64-linux"] nixos.tests.installer.luksroot) - (except ["aarch64-linux"] nixos.tests.installer.separateBoot) - (except ["aarch64-linux"] nixos.tests.installer.separateBootFat) - (except ["aarch64-linux"] nixos.tests.installer.simple) - (except ["aarch64-linux"] nixos.tests.installer.simpleLabels) - (except ["aarch64-linux"] nixos.tests.installer.simpleProvided) - (except ["aarch64-linux"] nixos.tests.installer.simpleUefiSystemdBoot) - (except ["aarch64-linux"] nixos.tests.installer.swraid) - (except ["aarch64-linux"] nixos.tests.installer.btrfsSimple) - (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvols) - (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvolDefault) - (except ["aarch64-linux"] nixos.tests.boot.biosCdrom) - #(except ["aarch64-linux"] nixos.tests.boot.biosUsb) # disabled due to issue #15690 - (except ["aarch64-linux"] nixos.tests.boot.uefiCdrom) - (except ["aarch64-linux"] nixos.tests.boot.uefiUsb) - (all nixos.tests.boot-stage1) - (all nixos.tests.hibernate) - nixos.tests.docker.x86_64-linux or [] - (all nixos.tests.ecryptfs) - (all nixos.tests.env) - (all nixos.tests.ipv6) - (all nixos.tests.i3wm) - (except ["aarch64-linux"] nixos.tests.keymap.azerty) - (except ["aarch64-linux"] nixos.tests.keymap.colemak) - (except ["aarch64-linux"] nixos.tests.keymap.dvorak) - (except ["aarch64-linux"] nixos.tests.keymap.dvp) - (except ["aarch64-linux"] nixos.tests.keymap.neo) - (except ["aarch64-linux"] nixos.tests.keymap.qwertz) - (all nixos.tests.plasma5) - (all nixos.tests.lightdm) - (all nixos.tests.login) - (all nixos.tests.misc) - (all nixos.tests.mutableUsers) - (all nixos.tests.nat.firewall) - (all nixos.tests.nat.firewall-conntrack) - (all nixos.tests.nat.standalone) - (all nixos.tests.networking.scripted.loopback) - (all nixos.tests.networking.scripted.static) - (all nixos.tests.networking.scripted.dhcpSimple) - (all nixos.tests.networking.scripted.dhcpOneIf) - (all nixos.tests.networking.scripted.bond) - (all nixos.tests.networking.scripted.bridge) - (all nixos.tests.networking.scripted.macvlan) - (all nixos.tests.networking.scripted.sit) - (all nixos.tests.networking.scripted.vlan) - (all nixos.tests.nfs3.simple) - (all nixos.tests.nfs4.simple) - (all nixos.tests.openssh) - (all nixos.tests.php-pcre) - (all nixos.tests.predictable-interface-names.predictable) - (all nixos.tests.predictable-interface-names.unpredictable) - (all nixos.tests.predictable-interface-names.predictableNetworkd) - (all nixos.tests.predictable-interface-names.unpredictableNetworkd) - (all nixos.tests.printing) - (all nixos.tests.proxy) - (all nixos.tests.sddm.default) - (all nixos.tests.simple) - (all nixos.tests.switchTest) - (all nixos.tests.udisks2) - (all nixos.tests.xfce) - - nixpkgs.tarball - (all allSupportedNixpkgs.emacs) - # The currently available aarch64 JDK is unfree - (except ["aarch64-linux"] allSupportedNixpkgs.jdk) - ]; - }); + constituents = [ + "nixos.channel" + "nixos.dummy.x86_64-linux" + "nixos.iso_minimal.aarch64-linux" + "nixos.iso_minimal.i686-linux" + "nixos.iso_minimal.x86_64-linux" + "nixos.iso_plasma5.x86_64-linux" + "nixos.manual.x86_64-linux" + "nixos.ova.x86_64-linux" + "nixos.sd_image.aarch64-linux" + "nixos.tests.boot.biosCdrom.x86_64-linux" + "nixos.tests.boot-stage1.x86_64-linux" + "nixos.tests.boot.uefiCdrom.x86_64-linux" + "nixos.tests.boot.uefiUsb.x86_64-linux" + "nixos.tests.chromium.x86_64-linux" + "nixos.tests.containers-imperative.x86_64-linux" + "nixos.tests.containers-ip.x86_64-linux" + "nixos.tests.docker.x86_64-linux" + "nixos.tests.ecryptfs.x86_64-linux" + "nixos.tests.env.x86_64-linux" + "nixos.tests.firefox.x86_64-linux" + "nixos.tests.firewall.x86_64-linux" + "nixos.tests.fontconfig-default-fonts.x86_64-linux" + "nixos.tests.gnome3.x86_64-linux" + "nixos.tests.gnome3-xorg.x86_64-linux" + "nixos.tests.hibernate.x86_64-linux" + "nixos.tests.i3wm.x86_64-linux" + "nixos.tests.installer.btrfsSimple.x86_64-linux" + "nixos.tests.installer.btrfsSubvolDefault.x86_64-linux" + "nixos.tests.installer.btrfsSubvols.x86_64-linux" + "nixos.tests.installer.luksroot.x86_64-linux" + "nixos.tests.installer.lvm.x86_64-linux" + "nixos.tests.installer.separateBootFat.x86_64-linux" + "nixos.tests.installer.separateBoot.x86_64-linux" + "nixos.tests.installer.simpleLabels.x86_64-linux" + "nixos.tests.installer.simpleProvided.x86_64-linux" + "nixos.tests.installer.simpleUefiSystemdBoot.x86_64-linux" + "nixos.tests.installer.simple.x86_64-linux" + "nixos.tests.installer.swraid.x86_64-linux" + "nixos.tests.ipv6.x86_64-linux" + "nixos.tests.lightdm.x86_64-linux" + "nixos.tests.login.x86_64-linux" + "nixos.tests.misc.x86_64-linux" + "nixos.tests.mutableUsers.x86_64-linux" + "nixos.tests.nat.firewall-conntrack.x86_64-linux" + "nixos.tests.nat.firewall.x86_64-linux" + "nixos.tests.nat.standalone.x86_64-linux" + "nixos.tests.networking.scripted.bond.x86_64-linux" + "nixos.tests.networking.scripted.bridge.x86_64-linux" + "nixos.tests.networking.scripted.dhcpOneIf.x86_64-linux" + "nixos.tests.networking.scripted.dhcpSimple.x86_64-linux" + "nixos.tests.networking.scripted.loopback.x86_64-linux" + "nixos.tests.networking.scripted.macvlan.x86_64-linux" + "nixos.tests.networking.scripted.sit.x86_64-linux" + "nixos.tests.networking.scripted.static.x86_64-linux" + "nixos.tests.networking.scripted.vlan.x86_64-linux" + "nixos.tests.nfs3.simple.x86_64-linux" + "nixos.tests.nfs4.simple.x86_64-linux" + "nixos.tests.openssh.x86_64-linux" + "nixos.tests.pantheon.x86_64-linux" + "nixos.tests.php-pcre.x86_64-linux" + "nixos.tests.plasma5.x86_64-linux" + "nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux" + "nixos.tests.predictable-interface-names.predictable.x86_64-linux" + "nixos.tests.predictable-interface-names.unpredictableNetworkd.x86_64-linux" + "nixos.tests.predictable-interface-names.unpredictable.x86_64-linux" + "nixos.tests.printing.x86_64-linux" + "nixos.tests.proxy.x86_64-linux" + "nixos.tests.sddm.default.x86_64-linux" + "nixos.tests.simple.x86_64-linux" + "nixos.tests.switchTest.x86_64-linux" + "nixos.tests.udisks2.x86_64-linux" + "nixos.tests.xfce.x86_64-linux" + "nixos.tests.zfs.installer.i686-linux" + "nixpkgs.emacs.x86_64-linux" + "nixpkgs.jdk.x86_64-linux" + "nixpkgs.tarball" + ]; + }; } From eb401313106aec6bb29eff5e80e919fb3486e133 Mon Sep 17 00:00:00 2001 From: OmnipotentEntity Date: Mon, 17 Feb 2020 11:31:21 -0500 Subject: [PATCH 204/243] geant4: 10.6.0 -> 10.6.1 (#80365) --- .../libraries/physics/geant4/datasets.nix | 4 ++-- .../libraries/physics/geant4/default.nix | 15 +++------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index 5e783b0e950..df44fa275f5 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -42,8 +42,8 @@ in { name = "G4EMLOW"; - version = "7.9"; - sha256 = "1zrsvk2ahlwss6mgjrma6d2ii49vlzcd5r3ccw94c7m9rnk9mgsa"; + version = "7.9.1"; + sha256 = "1jrw0izw732bywq1k1srs3x2z0m3y2h377kcvwbwcr0wa1p10342"; envvar = "LE"; } diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 97e8cf9c7c4..1897071b125 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -36,23 +36,14 @@ }: stdenv.mkDerivation rec { - version = "10.6.0"; + version = "10.6.1"; pname = "geant4"; src = fetchurl{ - url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.tar.gz"; - sha256 = "169ikv2sssfbqml7bs146dj035xifxm9b12r4rzmgpvswfhca90l"; + url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p01.tar.gz"; + sha256 = "0ssxg7dd7vxljb3fdyb0llg7gsxack21qjfsb3n23k107a19yibk"; }; - # This patch fixes crash when set -u is enabled - patches = [ - (fetchpatch { - name = "bash-variable-fix.patch"; - url = "https://bugzilla-geant4.kek.jp/attachment.cgi?id=606&action=diff&collapsed=&headers=1&format=raw"; - sha256 = "1bg9wg174fbqbjsjm1gz9584a7rq9p1szxr2fq9yfvqaf78289k6"; - }) - ]; - cmakeFlags = [ "-DGEANT4_INSTALL_DATA=OFF" "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}" From eaa47284113cda19a037b7fcbaa892ddb596b813 Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Mon, 17 Feb 2020 09:34:07 -0800 Subject: [PATCH 205/243] luaPackages.luv: 1.30.0-0 -> 1.34.1-1 --- pkgs/development/lua-modules/generated-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 58af59c1971..2a4146577ff 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1326,11 +1326,11 @@ luuid = buildLuarocksPackage { }; luv = buildLuarocksPackage { pname = "luv"; - version = "1.30.0-0"; + version = "1.34.1-1"; src = fetchurl { - url = https://luarocks.org/luv-1.30.0-0.src.rock; - sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; + url = https://luarocks.org/luv-1.34.1-1.src.rock; + sha256 = "044cyp25xn35nj5qp1hx04lfkzrpa6adhqjshq2g7wvbga77p1q0"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; From 11a9dfeb96dd84a7fbd44498b1950890d51faa5b Mon Sep 17 00:00:00 2001 From: Alex Gryzlov Date: Mon, 17 Feb 2020 20:08:27 +0100 Subject: [PATCH 206/243] idrisPackages.tparsec: 2019-09-19 -> 2020-02-11 --- pkgs/development/idris-modules/tparsec.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index 599ca72c615..67020898ff3 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -5,7 +5,7 @@ }: build-idris-package { name = "tparsec"; - version = "2019-09-19"; + version = "2020-02-11"; ipkgName = "TParsec"; @@ -14,8 +14,8 @@ build-idris-package { src = fetchFromGitHub { owner = "gallais"; repo = "idris-tparsec"; - rev = "cbaea6ec7e5b62536666329940f3ffb5b8b59036"; - sha256 = "0bzdv90a83irn7ca268acl19mjg9vxjmc4saa4naj4hdmg7srb2v"; + rev = "943c64dfcb4e1582696f68312fad88145dc3a8e4"; + sha256 = "0pyhkafhx2pwim91ada6qrgacvahl9bpv5m486y8fph4qzf4z6mx"; }; meta = { From a2f3ec7a60dfa8cd7e34c78617ac11cabb3c0b22 Mon Sep 17 00:00:00 2001 From: Kim Lindberger Date: Mon, 17 Feb 2020 20:41:43 +0100 Subject: [PATCH 207/243] synergy: Build application bundle on Darwin + other fixes (#80354) Includes the following fixes for Darwin: - Build an application bundle - Don't install the .desktop file and icons - Get rid of unused cmake variables - Don't list avahi as a dependency, since it's not used --- pkgs/applications/misc/synergy/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 69c2e37e352..645ed7433b3 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, cmake, avahi-compat +{ stdenv, lib, fetchFromGitHub, cmake, openssl , ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver -, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, openssl +, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, avahi-compat , withGUI ? true, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -35,20 +35,19 @@ stdenv.mkDerivation rec { chmod -R +w ext/ ''; - cmakeFlags = lib.optionals stdenv.isDarwin [ - "-DOSX_TARGET_MAJOR=10" - "-DOSX_TARGET_MINOR=7" - ] ++ lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"; + cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"; nativeBuildInputs = [ cmake ] ++ lib.optional withGUI wrapQtAppsHook; dontWrapQtApps = true; buildInputs = [ - openssl avahi-compat + openssl ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Carbon Cocoa CoreServices ScreenSaver - ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; + ] ++ lib.optionals stdenv.isLinux [ + xlibsWrapper libX11 libXi libXtst libXrandr xinput avahi-compat + ]; installPhase = '' mkdir -p $out/bin @@ -56,10 +55,15 @@ stdenv.mkDerivation rec { '' + lib.optionalString withGUI '' cp bin/synergy $out/bin/ wrapQtApp $out/bin/synergy --prefix PATH : ${lib.makeBinPath [ openssl ]} + '' + lib.optionalString stdenv.isLinux '' mkdir -p $out/share/icons/hicolor/scalable/apps cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/ mkdir -p $out/share/applications substitute ../res/synergy.desktop $out/share/applications/synergy.desktop --replace /usr/bin $out/bin + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications/ + mv bundle/Synergy.app $out/Applications/ + ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS ''; doCheck = true; From 9b4424cbb74a42dd3ff879302f6f8a4489b6fcf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 17 Feb 2020 21:04:32 +0100 Subject: [PATCH 208/243] efivar: fixup build on i686 I don't think it really needs LTO. --- pkgs/tools/system/efivar/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index f02923de349..71389af7423 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { sha256 = "0lc38npydp069nlcga25wzzm204ww9l6mpjfn6wmhdfhn0pgjwky"; }) ]; + # We have no LTO here since commit 22284b07. + postPatch = if stdenv.isi686 then "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults" else null; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt ]; From 9425bab10a809d5f412ff68242958b687301a84a Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 17 Feb 2020 22:08:35 +0100 Subject: [PATCH 209/243] libreoffice-still: 6.2.6.2 -> 6.3.5.2, libreoffice-fresh: 6.3.5.2 -> 6.4.1.1 --- .../office/libreoffice/default.nix | 10 +- .../office/libreoffice/src-fresh/download.nix | 70 +++++---- .../office/libreoffice/src-fresh/override.nix | 12 +- .../office/libreoffice/src-fresh/primary.nix | 12 +- .../office/libreoffice/src-still/download.nix | 144 +++++++++--------- .../office/libreoffice/src-still/override.nix | 24 +-- .../office/libreoffice/src-still/primary.nix | 11 +- 7 files changed, 147 insertions(+), 136 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 12ffb9ce048..a7d8f4c7d40 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -57,7 +57,8 @@ in (stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal"; + NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal" + + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; patches = [ ./xdg-open-brief.patch @@ -222,7 +223,6 @@ in (stdenv.mkDerivation rec { sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" @@ -283,7 +283,6 @@ in (stdenv.mkDerivation rec { "--enable-python=system" "--enable-dbus" "--enable-release-build" - (lib.enableFeature kdeIntegration "kde4") "--enable-epm" "--with-jdk-home=${jdk.home}" "--with-ant-home=${ant}/lib/ant" @@ -297,8 +296,6 @@ in (stdenv.mkDerivation rec { "--with-system-openldap" "--with-system-coinmp" - "--with-alloc=system" - # Without these, configure does not finish "--without-junit" @@ -336,6 +333,7 @@ in (stdenv.mkDerivation rec { "--without-system-mdds" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" + "--without-system-qrcodegen" "--without-system-xmlsec" ]; @@ -377,4 +375,4 @@ in (stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; -}).overrideAttrs ((importVariant "override.nix") args) +}).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; })) diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 78482326be2..bc329e5a8f8 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -336,11 +336,11 @@ md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; } { - name = "harfbuzz-2.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; - sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; + name = "harfbuzz-2.6.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; + sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966"; md5 = ""; - md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; + md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -364,18 +364,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-63_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz"; - sha256 = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"; + name = "icu4c-65_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-65_1-src.tgz"; + sha256 = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948"; md5 = ""; - md5name = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d-icu4c-63_1-src.tgz"; + md5name = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948-icu4c-65_1-src.tgz"; } { - name = "icu4c-63_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-data.zip"; - sha256 = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c"; + name = "icu4c-65_1-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-65_1-data.zip"; + sha256 = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6"; md5 = ""; - md5name = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c-icu4c-63_1-data.zip"; + md5name = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6-icu4c-65_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -510,6 +510,13 @@ md5 = ""; md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } + { + name = "libffi-3.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"; + sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"; + md5 = ""; + md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; + } { name = "libgpg-error-1.27.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; @@ -581,11 +588,11 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.4.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2"; - sha256 = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81"; + name = "mdds-1.5.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.5.0.tar.bz2"; + sha256 = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d"; md5 = ""; - md5name = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2"; + md5name = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d-mdds-1.5.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -665,11 +672,11 @@ md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { - name = "liborcus-0.14.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz"; - sha256 = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f"; + name = "liborcus-0.15.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.15.3.tar.gz"; + sha256 = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2"; md5 = ""; - md5name = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f-liborcus-0.14.1.tar.gz"; + md5name = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2-liborcus-0.15.3.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -686,11 +693,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3794.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; - sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; + name = "pdfium-3963.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3963.tar.bz2"; + sha256 = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895"; md5 = ""; - md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; + md5name = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895-pdfium-3963.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -721,11 +728,18 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.9.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz"; - sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049"; + name = "Python-3.7.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.7.6.tar.xz"; + sha256 = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f"; md5 = ""; - md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz"; + md5name = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f-Python-3.7.6.tar.xz"; + } + { + name = "QR-Code-generator-1.4.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; + sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a"; + md5 = ""; + md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; } { name = "libqxp-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix index 464965121d9..60e08735d2e 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -1,4 +1,10 @@ -{ stdenv, ... }: -attrs: { - NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; +{ stdenv, kdeIntegration, ... }: +attrs: +{ + postConfigure = attrs.postConfigure + '' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' + ''; + configureFlags = attrs.configureFlags ++ [ + (stdenv.lib.enableFeature kdeIntegration "kf5") + ]; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index d3da7d09b70..ec7f9e52bbb 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -7,9 +7,9 @@ rec { }; major = "6"; - minor = "3"; - patch = "5"; - tweak = "2"; + minor = "4"; + patch = "1"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -17,19 +17,19 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz"; + sha256 = "03fqpkilz4yi35l447hb9r8gjwj23l61bpdkwg21jm8blm8kkvyj"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv"; + sha256 = "0a7arjlxxy7hjm1brxwd124bf1gkbl92bgygi3sbbhbsv07pjdcr"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6"; + sha256 = "1hfllrdyxrg5mgqry3dcrhjbdrd0d27k5mvv4sfj7nwjlmjh8rqq"; }; } diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index b5a721b5679..78482326be2 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -1,10 +1,10 @@ [ { - name = "libabw-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; - sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; + name = "libabw-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; - md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; + md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; @@ -28,11 +28,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_66_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2"; - sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; + name = "boost_1_69_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2"; + sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; md5 = ""; - md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2"; + md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2"; } { name = "breakpad.zip"; @@ -147,11 +147,11 @@ md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { - name = "expat-2.2.5.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; - sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; + name = "expat-2.2.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; - md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; + md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; @@ -231,11 +231,11 @@ md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { - name = "source-serif-font-2.007R.tar.gz"; - url = "http://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz"; - sha256 = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb"; + name = "source-serif-pro-3.000R.tar.gz"; + url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; + sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; md5 = ""; - md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz"; + md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; @@ -308,11 +308,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.8.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2"; - sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78"; + name = "freetype-2.9.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; + sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; md5 = ""; - md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2"; + md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -329,18 +329,18 @@ md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { - name = "graphite2-minimal-1.3.10.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; - sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; + name = "graphite2-minimal-1.3.13.tgz"; + url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"; + sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36"; md5 = ""; - md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; + md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; } { - name = "harfbuzz-1.8.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2"; - sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd"; + name = "harfbuzz-2.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; + sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; md5 = ""; - md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2"; + md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -462,11 +462,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2019-04-03.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; - sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; + name = "language-subtag-registry-2019-09-16.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2"; + sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a"; md5 = ""; - md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; + md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -539,25 +539,25 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.27.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz"; - sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6"; + name = "xmlsec1-1.2.28.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"; + sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"; md5 = ""; - md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz"; + md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; } { - name = "libxml2-2.9.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; - sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; + name = "libxml2-2.9.10.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; - md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; + md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { - name = "libxslt-1.1.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; - sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; + name = "libxslt-1.1.34.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; - md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; + md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -602,11 +602,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.14.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz"; - sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9"; + name = "libmwaw-0.3.15.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"; + sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1"; md5 = ""; - md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; + md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -623,11 +623,11 @@ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.45-with-nspr-4.21.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; - sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; + name = "nss-3.47.1-with-nspr-4.23.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; + sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; md5 = ""; - md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; + md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -658,11 +658,11 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2r.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; - sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; + name = "openssl-1.0.2t.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; - md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; + md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { name = "liborcus-0.14.1.tar.gz"; @@ -686,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3550.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2"; - sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679"; + name = "pdfium-3794.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; + sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; md5 = ""; - md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2"; + md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -707,11 +707,11 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.74.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; - sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; + name = "poppler-0.82.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; - md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; + md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; @@ -721,11 +721,11 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; - sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; + name = "Python-3.5.9.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz"; + sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049"; md5 = ""; - md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; + md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -805,11 +805,11 @@ md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { - name = "libvisio-0.1.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; - sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; + name = "libvisio-0.1.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; - md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; + md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index a089dd1e2c7..c0880aa3ecb 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,20 +1,12 @@ -{ stdenv, ... }: +{ stdenv, kdeIntegration, ... }: attrs: { - configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags; + postConfigure = attrs.postConfigure + '' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' + ''; + configureFlags = stdenv.lib.remove "--without-system-qrcodegen" + (attrs.configureFlags ++ [ + (stdenv.lib.enableFeature kdeIntegration "kde5") + ]); meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; - patches = = attrs.patches ++ [ - # Poppler-0.82 compatibility - # https://gerrit.libreoffice.org/81545 - (fetchpatch { - url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch"; - sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n"; - }) - # Poppler-0.83 compatibility - # https://gerrit.libreoffice.org/84384 - (fetchpatch { - url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch"; - sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2"; - }) - ]; } diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index a27087a1b05..d3da7d09b70 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -7,8 +7,8 @@ rec { }; major = "6"; - minor = "2"; - patch = "6"; + minor = "3"; + patch = "5"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,18 +17,19 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq"; + sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz"; }; + # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh"; + sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz"; + sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6"; }; } From d9bedd0e3ee0537701c5727e2dbf32469779fc24 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 18 Feb 2020 07:30:55 +1000 Subject: [PATCH 210/243] crun: 0.12.1 -> 0.12.2.1 https://github.com/containers/crun/blob/0.12.2.1/NEWS --- pkgs/applications/virtualization/crun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index f976ede79c4..9eaf2d6c5c2 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "crun"; - version = "0.12.1"; + version = "0.12.2.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0dj6lf5yflbsybv7qkx19xvcfy5pv46k9mys7imr7akr9r1bcl5s"; + sha256 = "16hjkkr1fp542ycyp87pj626mzfrza5mcb82hhkp4a8m8bqmpzp4"; fetchSubmodules = true; }; From e25f0b3e3d62126c419e4c7e00a20ad8da5957cc Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Mon, 17 Feb 2020 18:29:02 -0500 Subject: [PATCH 211/243] scalapack: 2.1 -> 2.1.0 2.1 seems to have disappeared --- pkgs/development/libraries/science/math/scalapack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index fda902f320c..a226dd2fc63 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "scalapack"; - version = "2.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Reference-ScaLAPACK"; repo = pname; rev = "v${version}"; - sha256 = "042q9kc383h7y0had9a37702z4s0szavss063ljvfdsbjy07gzb1"; + sha256 = "1c10d18gj3kvpmyv5q246x35hjxaqn4ygy1cygaydhyxnm4klzdj"; }; nativeBuildInputs = [ cmake openssh ]; From 461ea02544e523d5c2afa29d6566daa08912af44 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 17 Feb 2020 18:32:35 -0500 Subject: [PATCH 212/243] flatpak: propagate glib and ostree Pantheon's sideload broke: ``` meson.build:17:0: ERROR: Could not generate cargs for flatpak: Package ostree-1 was not found in the pkg-config search path. Perhaps you should add the directory containing `ostree-1.pc' to the PKG_CONFIG_PATH environment variable Package 'ostree-1', required by 'flatpak', not found ``` https://hydra.nixos.org/build/113077888 ZHF: #80379 --- pkgs/development/libraries/flatpak/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 2c44b045a2f..54afc53ac98 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -128,7 +128,6 @@ stdenv.mkDerivation rec { bzip2 dbus dconf - glib gpgme json-glib libarchive @@ -136,7 +135,6 @@ stdenv.mkDerivation rec { libseccomp libsoup lzma - ostree polkit python3 systemd @@ -148,6 +146,12 @@ stdenv.mkDerivation rec { librsvg # for flatpak-validate-icon ]; + # Required by flatpak.pc + propagatedBuildInputs = [ + glib + ostree + ]; + checkInputs = [ valgrind ]; From d744b4f9281d2d954ee06025e76e65da513f4cae Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 18 Feb 2020 09:41:31 +1000 Subject: [PATCH 213/243] flatpak: 1.6.1 -> 1.6.2 https://github.com/flatpak/flatpak/releases/tag/1.6.2 --- pkgs/development/libraries/flatpak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 2c44b045a2f..a73efffc7ed 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -55,14 +55,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.6.1"; + version = "1.6.2"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1x3zh2xashsq1nh4s85qq45hcnwfbnwzln2wlk10g7149nia6f7w"; + sha256 = "02k9p5n60gz2k85n805n9niic4miw0mfh0i7yk1vrc8vaa5h69wd"; }; patches = [ From d7c7b4890e83198a3741d9038d450d6bbdaaca3c Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Mon, 3 Feb 2020 19:08:37 -0500 Subject: [PATCH 214/243] maintainers: add i077 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 92a7fec22e4..a8762be1143 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3003,6 +3003,12 @@ githubId = 12491746; name = "Masato Yonekawa"; }; + i077 = { + email = "nixpkgs@imranhossa.in"; + github = "i077"; + githubId = 2789926; + name = "Imran Hossain"; + }; iand675 = { email = "ian@iankduncan.com"; github = "iand675"; From 2599fd06a2b4fc370baab140776c9d39896560a9 Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Mon, 3 Feb 2020 19:08:59 -0500 Subject: [PATCH 215/243] todoist-electron: init at 1.19 --- .../misc/todoist-electron/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/applications/misc/todoist-electron/default.nix diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix new file mode 100644 index 00000000000..cb0ee20f555 --- /dev/null +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf +, gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat +, udev, libpulseaudio, utillinux, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "todoist-electron"; + version = "1.19"; + + src = fetchurl { + url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}.0_amd64.deb"; + sha256 = "1w0l7k7wmbhwzv71cffsir0q7zg9m0617fmyvd4a01b6flpxrpfx"; + }; + + desktopItem = makeDesktopItem { + name = "Todoist"; + exec = "todoist"; + desktopName = "Todoist"; + categories = "Utility;Productivity"; + }; + + nativeBuildInputs = [ makeWrapper dpkg ]; + unpackPhase = '' + mkdir pkg + dpkg-deb -x $src pkg + sourceRoot=pkg + ''; + installPhase = let + libPath = lib.makeLibraryPath ([ + stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus + nss nspr alsaLib libpulseaudio cups expat udev utillinux + ] ++ (with xorg; [ + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb + libXrender libX11 libXtst libXScrnSaver + ])); + in '' + mkdir -p "$out/bin" + mv opt "$out/" + + # Patch binary + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:\$ORIGIN" \ + $out/opt/Todoist/todoist + + # Hacky workaround for RPATH problems + makeWrapper $out/opt/Todoist/todoist $out/bin/todoist \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio udev ]} + + # Desktop item + mkdir -p "$out/share" + ln -s "${desktopItem}/share/applications" "$out/share/applications" + ''; + + meta = with lib; { + homepage = "https://github.com/KryDos/todoist-linux"; + description = "The Linux wrapper for Todoist web version"; + platforms = [ "x86_64-linux" ]; + license = licenses.isc; + maintainers = with maintainers; [ i077 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2785da848b8..8c2010f426e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10699,6 +10699,8 @@ in todoist = callPackage ../applications/misc/todoist { }; + todoist-electron = callPackage ../applications/misc/todoist-electron { }; + todolist = callPackage ../applications/misc/todolist { }; travis = callPackage ../development/tools/misc/travis { }; From 6be8389b04913a034143474d7b93bdc79dee6b34 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 18 Feb 2020 00:52:55 +0100 Subject: [PATCH 216/243] python/aiohttp: disable test on 32bit platforms The test `test_cookiejar` is failing because a time_t constant can't be represented on 32bit platforms. --- pkgs/development/python-modules/aiohttp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 0cecdb0291e..737d1eec3c2 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -54,6 +55,7 @@ buildPythonPackage rec { and not handle_keepalive_on_closed_connection \ and not proxy_https_bad_response \ and not partially_applied_handler \ + ${lib.optionalString stdenv.is32bit "and not test_cookiejar"} \ and not middleware" \ --ignore=test_connector.py ''; From af19743739fe25c259a91ccd694e08dc7743bc99 Mon Sep 17 00:00:00 2001 From: "Farkas, Arnold" Date: Mon, 27 Jan 2020 04:19:42 -0500 Subject: [PATCH 217/243] pythonPackages.sqlitedict: init at 1.6.0 --- .../python-modules/sqlitedict/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/sqlitedict/default.nix diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix new file mode 100644 index 00000000000..5037aa2c368 --- /dev/null +++ b/pkgs/development/python-modules/sqlitedict/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: + +buildPythonPackage rec { + pname = "sqlitedict"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "RaRe-Technologies"; + repo = "sqlitedict"; + rev = version; + sha256 = "1yq94lgpny9qcfbsl39npjvrsjfggi3lj2kpzcsxcfdfgxag6m2m"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + description = "Persistent, thread-safe dict"; + homepage = "https://github.com/RaRe-Technologies/sqlitedict"; + license = licenses.asl20; + maintainers = [ maintainers.arnoldfarkas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed7a00d5e81..9731cab24b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5878,6 +5878,8 @@ in { sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; + sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + sqlobject = callPackage ../development/python-modules/sqlobject { }; sqlmap = callPackage ../development/python-modules/sqlmap { }; From 26f1d1e81b22803a54377f9ac9ceb767f02e2770 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 17 Feb 2020 19:14:10 -0500 Subject: [PATCH 218/243] flatpak: add dev output --- pkgs/development/libraries/flatpak/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 54afc53ac98..42733922687 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { version = "1.6.1"; # TODO: split out lib once we figure out what to do with triggerdir - outputs = [ "out" "man" "doc" "installedTests" ]; + outputs = [ "out" "dev" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; From 1e1ad96cf6cfeabd7eee2dafba56aeff8e3e4848 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 18 Feb 2020 03:23:19 +0200 Subject: [PATCH 219/243] procs: 0.9.9 -> 0.9.11 --- pkgs/tools/admin/procs/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 51ff06817cb..9fdb8ac2197 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,26 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.9.9"; + version = "0.9.11"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "1dvwn991widribk563jn3461f1913bpga0yyfr5mnf4p4p8s59j6"; + sha256 = "0nz06q1rdrqgprclgr30la2vp4bx0qgibh22vdlqpd4rzi3x0h2r"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "11wv02nn6gp32zzcd6kmsh6ky0dzyk1qqhb5vxvmq2nxhxjlddwv"; + cargoSha256 = "0hmz19ndfcg7bsrjk89ck9x99ibsvghqwmvgcd89vxmjr5h13rsg"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = "A modern replacement for ps written in Rust"; homepage = "https://github.com/dalance/procs"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = [ maintainers.dalance ]; platforms = with platforms; linux ++ darwin; }; From f00f60ffbb05bc71c0e00b94464846c996ba5e33 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 18 Feb 2020 03:25:35 +0200 Subject: [PATCH 220/243] procs: add filalex77 as a maintainer --- pkgs/tools/admin/procs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 9fdb8ac2197..453bbfb426a 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { description = "A modern replacement for ps written in Rust"; homepage = "https://github.com/dalance/procs"; license = licenses.mit; - maintainers = [ maintainers.dalance ]; + maintainers = with maintainers; [ dalance filalex77 ]; platforms = with platforms; linux ++ darwin; }; } From 59bf79ec4b30b8f747e7f8fa9de7fd0c33a36074 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 17 Feb 2020 21:05:17 -0500 Subject: [PATCH 221/243] pantheon.elementary-files: 4.3.0 -> 4.4.0 https://github.com/elementary/files/releases/tag/4.4.0 --- pkgs/desktops/pantheon/apps/elementary-files/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index ae43a372acc..858e49900c5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "4.3.0"; + version = "4.4.0"; repoName = "files"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0brckm0vi9lh8l4g3cy37pbyrdh6g0mdsv3cpii069y2drrh8mz5"; + sha256 = "1l5ki203agy3wkhnxf89ziy4xfmn7m3q0qz1hyrzy7a7qaslq3bg"; }; passthru = { From fdcb86de65f502c73e9edcbe3c14b9a7804949ee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Feb 2020 17:16:08 -0800 Subject: [PATCH 222/243] python3Packages.django_extensions: 2.2.5 -> 2.2.8 --- .../django-extensions/default.nix | 74 ++++++++++--------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index d6254253676..08b2460b1bb 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -1,55 +1,63 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder -, six, typing, pygments -, django, shortuuid, python-dateutil, pytest -, pytest-django, pytestcov, mock, vobject -, werkzeug, glibcLocales, factory_boy +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, python +, django +, factory_boy +, glibcLocales +, mock +, pygments +, pytest +, pytestcov +, pytest-django +, python-dateutil +, shortuuid +, six +, tox +, typing +, vobject +, werkzeug }: buildPythonPackage rec { pname = "django-extensions"; - version = "2.2.5"; + version = "2.2.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0053yqq4vq3mwy7zkfs5vfm3g8j9sfy3vrc6xby83qlj9wz43ipi"; + sha256 = "1gd3nykwzh3azq1p9cvgkc3l5dwrv7y86sfjxd9llbyj8ky71iaj"; }; - # This patch fixes a single failing test and can be removed when updating this pkg - # to the next version - patches = [ - (fetchpatch { - url = "https://github.com/django-extensions/django-extensions/commit/1d21786da2e6868d98ae34c82079e1e03ad1aa97.patch"; - sha256 = "0d81zpj0f8a7ijrfb12j0b67fgj89k3axaskz1nwqsr4wc6n4bw2"; - }) - ]; + LC_ALL = "en_US.UTF-8"; + __darwinAllowLocalNetworking = true; - postPatch = '' - substituteInPlace setup.py --replace "'tox'," "" - - # not yet pytest 5 compatible? - rm tests/management/commands/test_set_fake_emails.py - rm tests/management/commands/test_set_fake_passwords.py - rm tests/management/commands/test_validate_templates.py - - # pip should not be used during tests... - rm tests/management/commands/test_pipchecker.py - ''; - - propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") typing; + propagatedBuildInputs = [ six ] + ++ lib.optional (pythonOlder "3.5") typing; checkInputs = [ - django shortuuid python-dateutil pytest - pytest-django pytestcov mock vobject - werkzeug glibcLocales factory_boy pygments + django + factory_boy + glibcLocales + mock + pygments # not explicitly declared in setup.py, but some tests require it + pytest + pytestcov + pytest-django + python-dateutil + shortuuid + tox + vobject + werkzeug ]; - LC_ALL = "en_US.UTF-8"; + # tests not compatible with pip>=20 + checkPhase = '' + rm tests/management/commands/test_pipchecker.py + ${python.interpreter} setup.py test + ''; meta = with lib; { description = "A collection of custom extensions for the Django Framework"; - homepage = https://github.com/django-extensions/django-extensions; + homepage = "https://github.com/django-extensions/django-extensions"; license = licenses.mit; }; } From 60c4596dcbc2be668274f15f45a856f5e721fa14 Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Thu, 13 Feb 2020 13:31:08 +0100 Subject: [PATCH 223/243] pythonPackages.bayesian-optimization: init at 1.0.1 --- .../bayesian-optimization/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/bayesian-optimization/default.nix diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix new file mode 100644 index 00000000000..1f1d33fe329 --- /dev/null +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +, scikitlearn +, scipy +, pytest +}: + +buildPythonPackage rec { + pname = "bayesian-optimization"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "fmfn"; + repo = "BayesianOptimization"; + rev = "v${version}"; + sha256 = "07sqymg6k5512k7wq4kbp7rsrkb4g90n0ck1f0b9s6glyfpcy4pq"; + }; + + propagatedBuildInputs = [ + scikitlearn + scipy + ]; + + checkInputs = [ pytest ]; + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + description = "A Python implementation of global optimization with gaussian processes"; + homepage = "https://github.com/fmfn/BayesianOptimization"; + license = licenses.mit; + maintainers = [ maintainers.juliendehos ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9731cab24b2..9037b9e3998 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -484,6 +484,8 @@ in { bashlex = callPackage ../development/python-modules/bashlex { }; + bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { }; + bayespy = callPackage ../development/python-modules/bayespy { }; beanstalkc = callPackage ../development/python-modules/beanstalkc { }; From c416e032d5dbe9a86b751bb0de0a24e12e4d3151 Mon Sep 17 00:00:00 2001 From: "Farkas, Arnold" Date: Mon, 27 Jan 2020 04:39:40 -0500 Subject: [PATCH 224/243] pythonPackages.untangle: init at 1.1.1 --- .../python-modules/untangle/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/untangle/default.nix diff --git a/pkgs/development/python-modules/untangle/default.nix b/pkgs/development/python-modules/untangle/default.nix new file mode 100644 index 00000000000..f8f172e78b1 --- /dev/null +++ b/pkgs/development/python-modules/untangle/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, python }: + +buildPythonPackage rec { + pname = "untangle"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "stchris"; + repo = "untangle"; + # 1.1.1 is not tagged on GitHub + rev = "61b57cd771a40df7d1621e9ec3c68d9acd733d31"; + sha256 = "0ffvlfyyl82xi4akz1lls32lrnlrn44ik41v8x8xh9ghy0n0ick7"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = with lib; { + description = "Convert XML documents into Python objects"; + homepage = "http://github.com/stchris/untangle"; + license = licenses.mit; + maintainers = [ maintainers.arnoldfarkas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9037b9e3998..63cde6669fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6115,6 +6115,8 @@ in { unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; + untangle = callPackage ../development/python-modules/untangle { }; + traceback2 = callPackage ../development/python-modules/traceback2 { }; trackpy = callPackage ../development/python-modules/trackpy { }; From c3b5bdaba015f9fd1b8afff4ccee41ba29b6c655 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Mon, 17 Feb 2020 20:27:01 -0500 Subject: [PATCH 225/243] ruamel: moved from bitbucket to sourceforge --- pkgs/development/python-modules/ruamel_base/default.nix | 2 +- pkgs/development/python-modules/ruamel_yaml/default.nix | 2 +- .../python-modules/ruamel_yaml_clib/default.nix | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ruamel_base/default.nix b/pkgs/development/python-modules/ruamel_base/default.nix index ba6a79fdd63..0395c6246e1 100644 --- a/pkgs/development/python-modules/ruamel_base/default.nix +++ b/pkgs/development/python-modules/ruamel_base/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Common routines for ruamel packages"; - homepage = https://bitbucket.org/ruamel/base; + homepage = https://sourceforge.net/projects/ruamel-base/; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 88b2de830b7..cba566e1d66 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; - homepage = https://bitbucket.org/ruamel/yaml; + homepage = https://sourceforge.net/projects/ruamel-yaml/; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix index 19c208f2716..f86f5102b19 100644 --- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchFromBitbucket +, fetchhg , ruamel_base , ruamel_ordereddict , isPy3k @@ -10,9 +10,8 @@ buildPythonPackage rec { pname = "ruamel.yaml.clib"; version = "0.2.0"; - src = fetchFromBitbucket { - owner = "ruamel"; - repo = "yaml.clib"; + src = fetchhg { + url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code"; rev = version; sha256 = "0kq6zi96qlm72lzj90fc2rfk6nm5kqhk6qxdl8wl9s3a42b0v6wl"; }; @@ -22,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; - homepage = https://bitbucket.org/ruamel/yaml; + homepage = https://sourceforge.net/projects/ruamel-yaml-clib/; license = licenses.mit; }; From 15a97f8d03db670ed53e84464e225311a60ea172 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Mon, 17 Feb 2020 23:05:21 -0500 Subject: [PATCH 226/243] ruamel: quote urls, update ordereddict url --- pkgs/development/python-modules/ruamel_base/default.nix | 2 +- pkgs/development/python-modules/ruamel_ordereddict/default.nix | 2 +- pkgs/development/python-modules/ruamel_yaml/default.nix | 2 +- pkgs/development/python-modules/ruamel_yaml_clib/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ruamel_base/default.nix b/pkgs/development/python-modules/ruamel_base/default.nix index 0395c6246e1..f7e473f9f56 100644 --- a/pkgs/development/python-modules/ruamel_base/default.nix +++ b/pkgs/development/python-modules/ruamel_base/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Common routines for ruamel packages"; - homepage = https://sourceforge.net/projects/ruamel-base/; + homepage = "https://sourceforge.net/projects/ruamel-base/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/pkgs/development/python-modules/ruamel_ordereddict/default.nix index ee329a65166..da4e891b2b3 100644 --- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix +++ b/pkgs/development/python-modules/ruamel_ordereddict/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A version of dict that keeps keys in insertion resp. sorted order"; - homepage = https://bitbucket.org/ruamel/ordereddict; + homepage = "https://sourceforge.net/projects/ruamel-ordereddict/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index cba566e1d66..bdfde326d76 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; - homepage = https://sourceforge.net/projects/ruamel-yaml/; + homepage = "https://sourceforge.net/projects/ruamel-yaml/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix index f86f5102b19..46b55c04d30 100644 --- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; - homepage = https://sourceforge.net/projects/ruamel-yaml-clib/; + homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/"; license = licenses.mit; }; From 0b91dad9ee106d565f8c32816a339743234b775e Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 17 Feb 2020 20:19:20 -0500 Subject: [PATCH 227/243] tealdeer: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/tools/misc/tealdeer/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index 1666d22626b..5e4b1bec1e6 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1v9wq4k7k4lmdz6xy6kabchjpbx9lds20yh6va87shypdh9iva29"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0y1y74fgxcv8a3cmyf30p6gg12r79ln7inir8scj88wbmwgkbxsp"; + cargoSha256 = "0rr9mqylcs3nb7wgilp810qia0rv2pnalyhh28q0wnqyz0kqfrzr"; buildInputs = [ openssl cacert curl ] ++ (stdenv.lib.optional stdenv.isDarwin Security); From 0ded378b10a17d2e7525bcd2002e89e10ecd7967 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 18 Feb 2020 06:05:09 +0000 Subject: [PATCH 228/243] aseprite: fix build with glibc 2.30 Otherwise it fails with: In file included from /build/source/src/allegro/include/allegro/base.h:41, from /build/source/src/allegro/include/allegro.h:25, from /build/source/src/./she/alleg4/alleg_surface.h:11, from /build/source/src/she/alleg4/alleg_surface.cpp:11: /build/source/src/allegro/include/allegro/alcompat.h:44:22: error: conflicting declaration of C function 'fixed fadd(fixed, fixed)' 44 | AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y)) | ^~~~ /build/source/src/allegro/include/allegro/internal/alconfig.h:164:49: note: in definition of macro 'AL_ALIAS' 164 | static __attribute__((unused)) __inline__ DECL \ | ^~~~ In file included from /nix/store/y57skwl8a5vbkrjrc30ygdw9vr1p6n19-gcc-9.2.0/include/c++/9.2.0/cmath:45, from /nix/store/y57skwl8a5vbkrjrc30ygdw9vr1p6n19-gcc-9.2.0/include/c++/9.2.0/math.h:36, from /build/source/src/./base/base.h:13, from /build/source/src/./config.h:40, from /build/source/src/she/alleg4/alleg_surface.cpp:8: /nix/store/2v6pi2wj3lcsc3j48n7flx9mgqyii1lv-glibc-2.30-dev/include/bits/mathcalls-narrow.h:24:20: note: previous declaration 'float fadd(double, double)' 24 | __MATHCALL_NARROW (__MATHCALL_NAME (add), __MATHCALL_REDIR_NAME (add), 2); | ^~~~~~~~~~~~~~~ --- .../editors/aseprite/allegro-glibc-2.30.patch | 8 ++++++++ pkgs/applications/editors/aseprite/default.nix | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch diff --git a/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch b/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch new file mode 100644 index 00000000000..94c70da276c --- /dev/null +++ b/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch @@ -0,0 +1,8 @@ +diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt +index 4909ff1..02fa145 100644 +--- a/src/she/CMakeLists.txt ++++ b/src/she/CMakeLists.txt +@@ -23,2 +23,3 @@ if(USE_ALLEG4_BACKEND) + add_definitions(-DUSE_MOUSE_POLLER) ++ add_definitions(-DALLEGRO_NO_FIX_ALIASES) + endif() diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 170fde7b9ca..fb744ef5955 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -36,7 +36,9 @@ stdenv.mkDerivation rec { skia libGL ]; - patches = lib.optionals unfree [ + patches = if !unfree then [ + ./allegro-glibc-2.30.patch + ] else [ (fetchpatch { url = "https://github.com/lfont/aseprite/commit/f1ebc47012d3fed52306ed5922787b4b98cc0a7b.patch"; sha256 = "03xg7x6b9iv7z18vzlqxhcfphmx4v3qhs9f5rgf38ppyklca5jyw"; From 4b212b91afca7ba6354a499be765bee339d3a171 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 17 Feb 2020 20:13:10 -0500 Subject: [PATCH 229/243] mdbook: upgrade cargo fetcher and cargoSha256 Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully. --- pkgs/tools/text/mdbook/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 6f9f8577501..2aad1755cff 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0gcrv54iswphzxxkmak1c7pmmpakiri6jk50j4bxrsplwjr76f7n"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "00grlxjz61vxinr18f28ga6610yjxcq48lr75wmyc5wq317j12fn"; + cargoSha256 = "12i9w9dgji36yvvdks0vkjjkh32nbnhz76sgrl2827pj49h9vnn0"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; From 3ad2c20fe69048e68b49b61717cf911380262320 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 18 Feb 2020 06:57:40 +0000 Subject: [PATCH 230/243] aseprite-unfree: fix build It fails with: src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp:15:10: fatal error: GL/glx.h: No such file or directory 15 | #include --- pkgs/applications/editors/aseprite/skia.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix index 8bf2adf484e..c89ebd4ad0c 100644 --- a/pkgs/applications/editors/aseprite/skia.nix +++ b/pkgs/applications/editors/aseprite/skia.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchgit, python2, gn, ninja -, fontconfig, expat, icu58, libjpeg, libpng, libwebp, zlib +, fontconfig, expat, icu58, libglvnd, libjpeg, libpng, libwebp, zlib , mesa, libX11 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ python2 gn ninja ]; buildInputs = [ - fontconfig expat icu58 libjpeg libpng libwebp zlib + fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib mesa libX11 ]; From 43ee8097d927cc72bc01a9001547d517975177c9 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 18 Feb 2020 07:49:03 +0000 Subject: [PATCH 231/243] aseprite-unfree: 1.2.11 -> 1.2.16.3 Restore the comment explaining the split between free and unfree versions deleted in caa4e6dcb24fe5f0d9bc334049f90bbece8fa461. --- pkgs/applications/editors/aseprite/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index fb744ef5955..6e6d7db8177 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -6,12 +6,16 @@ , cmark }: +# Unfree version is not redistributable: +# https://dev.aseprite.org/2016/09/01/new-source-code-license/ +# Consider supporting the developer: https://aseprite.org/#buy + let skia = callPackage ./skia.nix {}; in stdenv.mkDerivation rec { pname = "aseprite"; - version = if unfree then "1.2.11" else "1.1.7"; + version = if unfree then "1.2.16.3" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; @@ -19,7 +23,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; fetchSubmodules = true; sha256 = if unfree - then "1illr51jpg5g6nx29rav9dllyy5lzyyn7lj2fhrnpz1ysqgaq5p8" + then "16yn7y9xdc5jd50cq7bmsm320gv23pp71lr8hg2nmynzc8ibyda8" else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; From 9408c29404ee55afe4773f2af19a337b22c6121c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 18 Feb 2020 01:35:49 +0100 Subject: [PATCH 232/243] mint: 0.5.0 -> 0.7.1 This also fixes the build with the latest crystal version --- pkgs/development/compilers/mint/default.nix | 8 ++++---- pkgs/development/compilers/mint/shards.nix | 14 ++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 5f72bd3649b..78cce113e9b 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchFromGitHub, crystal, zlib, openssl_1_0_2, duktape, which, libyaml }: +{ lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }: crystal.buildCrystalPackage rec { - version = "0.5.0"; + version = "0.7.1"; pname = "mint"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; + sha256 = "18cg96kl4dn89bj6fm3080zzyd1r7rsfi17agdjjayd2v9fgs95l"; }; - buildInputs = [ openssl_1_0_2 ]; + buildInputs = [ openssl ]; # Update with # nix-shell -p crystal2nix --run crystal2nix diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index dc6866e3af3..b3583ac2cba 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -8,8 +8,8 @@ ameba = { owner = "veelenga"; repo = "ameba"; - rev = "v0.9.1"; - sha256 = "05q2ki9dpg23pllalv5p27f1m287kiicp97ziz0z7vv0vg1r8smj"; + rev = "v0.10.1"; + sha256 = "0dcw7px7g0c5pxpdlirhirqzhcc7gdwdfiwb9kgm4x1k74ghjgxq"; }; baked_file_system = { owner = "schovi"; @@ -26,8 +26,8 @@ dotenv = { owner = "gdotdesign"; repo = "cr-dotenv"; - rev = "v0.2.0"; - sha256 = "0zi2y1j2546xjhdzn7icmry0cjv82cx2cqmpgx5ml37c2pnb7kp7"; + rev = "v0.3.1"; + sha256 = "1xp7c3g8dj1hqk2b885qr4y0s8661gpp9q28lv6rhr0ckllc6zgz"; }; exception_page = { owner = "crystal-loot"; @@ -47,6 +47,12 @@ rev = "v0.4.0"; sha256 = "1w9ib6j4xhwxdxx58nzc06gw7ci7vga03vgj1z1bnklamb0b0l0k"; }; + markd = { + owner = "icyleaf"; + repo = "markd"; + rev = "v0.2.0"; + sha256 = "0n27fndd77mlkgw1r4pf0sa8fz4gwsh7dpnjck95c0ml91cr8j1a"; + }; radix = { owner = "luislavena"; repo = "radix"; From 50593c6f1eb93c0404fae1bd4d0a740c92bc2da1 Mon Sep 17 00:00:00 2001 From: Rakesh Gupta Date: Tue, 18 Feb 2020 12:55:03 +0530 Subject: [PATCH 233/243] Added additional dependency boto3, needed for s3 cache support --- pkgs/applications/misc/mapproxy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index efdfbaadd3d..e5826c09d77 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -38,6 +38,7 @@ buildPythonApplication rec { substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" ''; propagatedBuildInputs = [ + boto3 # needed for caches service pillow pyyaml pyproj From 327c4b7ea60975af35c31dd0dcb428dfe62a00d8 Mon Sep 17 00:00:00 2001 From: MetaDark Date: Mon, 17 Feb 2020 14:02:43 -0500 Subject: [PATCH 234/243] protontricks: 1.4 -> 1.4.1 --- pkgs/tools/package-management/protontricks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 2b7fbd28c7e..c2bdf327124 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -6,13 +6,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "1aarx6g8ykw1jvygfngmz8apdvfj26rcq10bwl228612kwigh7s2"; + sha256 = "083ncg6yjd7s3dx91zd52w166x709mnxknwwr78ggka8d8vlyi0b"; }; # Fix interpreter in mock run.sh for tests From eb2ab1861494302e749ddd31f4622e2f0517c921 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 18 Feb 2020 08:53:48 +0100 Subject: [PATCH 235/243] milkytracker: set cmake sdl variable to fix build ZHF: #80379 --- pkgs/applications/audio/milkytracker/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 7f86e2c2071..bc508f92e3b 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ]; + # Somehow this does not get set automatically + cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ]; + meta = with stdenv.lib; { description = "Music tracker application, similar to Fasttracker II"; homepage = http://milkytracker.org; From f5956774188194c8f5b5acbfe4392f91ece6a593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Feb 2020 10:19:44 +0100 Subject: [PATCH 236/243] efibootmgr: fixup build on i686 Same as efivar; I believe it doesn't really needs LTO. I checked: nix build -f nixos/release-combined.nix nixos.iso_minimal.i686-linux --- pkgs/tools/system/efibootmgr/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 272809e486c..a2487324849 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "1sbijvlpv4khkix3vix9mbhzffj8lp8zpnbxm9gnzjz8yssz9p5h"; }) ]; + # We have no LTO here since commit 22284b07. + postPatch = if stdenv.isi686 then "sed '/^CFLAGS/s/-flto//' -i Make.defaults" else null; makeFlags = [ "EFIDIR=nixos" ]; From 329102c47bd1c68f0acdf4feec64232202948c7a Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Tue, 18 Feb 2020 09:06:56 +0200 Subject: [PATCH 237/243] Merge #80328: postgresql: minor updates (security) Forward-picked from merge 036c524a2e in staging to master, as upstream claims it fixes CVE-2020-1720. https://www.postgresql.org/about/news/2011/ --- pkgs/servers/sql/postgresql/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 890ac2d3777..b9cd50aa5fe 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -183,41 +183,41 @@ let in self: { postgresql_9_5 = self.callPackage generic { - version = "9.5.20"; + version = "9.5.21"; psqlSchema = "9.5"; - sha256 = "03fygn3nn6l6ar66sldy5akdg1gynny3yxbrpvmmp5ygfnrm2mwj"; + sha256 = "0b3kzc0431bvp55jns42q9h1119gy075mp4aywnkq93pm17nxdby"; this = self.postgresql_9_5; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.16"; + version = "9.6.17"; psqlSchema = "9.6"; - sha256 = "1rr2dgv4ams8r2lp13w85c77rkmzpb88fjlc28mvlw6zq2fblv2w"; + sha256 = "1hm0w6n988n9qn2wylhjq02i5ayzb16rzhgkcv09fpsl68ny7qgn"; this = self.postgresql_9_6; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.11"; + version = "10.12"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "02fcmvbh0mhplj3s2jd24s642ysx7bggnf0h8bs5amh7dgzi8p8d"; + sha256 = "1rsab4zf4rx7pvvhlwhb04kb95aiad9cwazc4ksbvg2gij47z3rq"; this = self.postgresql_10; inherit self; }; postgresql_11 = self.callPackage generic { - version = "11.6"; + version = "11.7"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "0w1iq488kpzfgfnlw4k32lz5by695mpnkq461jrgsr99z5zlz4j9"; + sha256 = "04x343i4v0w4jf1v5ial8rwsizs1qhdjfbanbnibdys6i0xfjjij"; this = self.postgresql_11; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.1"; + version = "12.2"; psqlSchema = "12"; - sha256 = "1vc3hjcbgkdfczc1ipkk02rahabn7fabpb7qs203jxpnpamz76x0"; + sha256 = "1pmmd59pvfs50gsi728bw9f1jl59xghsjdanfimph0659x6cq7dd"; this = self.postgresql_12; inherit self; }; From c058060402b50028c25767385d2804808e6e03e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-=C3=89tienne=20Meunier?= Date: Tue, 18 Feb 2020 11:54:23 +0000 Subject: [PATCH 238/243] nodePackages.webpack-dev-server: init at 3.10.3 --- .../node-packages/node-packages-v10.json | 2 + .../node-packages/node-packages-v10.nix | 3164 +++++++++++------ .../node-packages/node-packages-v12.nix | 55 +- .../node-packages/node-packages-v13.nix | 43 +- 4 files changed, 2118 insertions(+), 1146 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index d5f7b95ab97..cbae97149d3 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -158,6 +158,8 @@ , "web-ext" , "webpack" , "webpack-cli" +, "webpack-dev-server" +, "copy-webpack-plugin" , "webtorrent-cli" , "wring" , "write-good" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index c97f9d7ab49..5497679f4f6 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -22,31 +22,31 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.900.1" = { + "@angular-devkit/architect-0.900.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.900.1"; + version = "0.900.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.1.tgz"; - sha512 = "zzB3J0fXFoYeJpgF5tsmZ7byygzjJn1IPiXBdnbNqcMbil1OPOhq+KdD4ZFPyXNwBQ3w02kOwPdNqB++jbPmlQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.2.tgz"; + sha512 = "uClqp4QEY/m6CB7SsNZGdVNTEgMzkI1Fkt0TOdE9huN1iCi/0+h3nQb+NZ1vBqD2afg9EqDwIPu2KCU0p1BR2A=="; }; }; - "@angular-devkit/core-9.0.1" = { + "@angular-devkit/core-9.0.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.1.tgz"; - sha512 = "HboJI/x+SJD9clSOAMjHRv0eXAGRAdEaqJGmjDfdFMP2wznfsBiC6cgcHC17oM4jRWFhmWMR8Omc7CjLZJawJg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.2.tgz"; + sha512 = "lEmfYs7+oHmXEQ3y97QGm73zs7i6chpx+ZSaBUvMM9oCKj/lytcn+diVG+t4hMavH6TK0lai7DO1rAbYkbmdrA=="; }; }; - "@angular-devkit/schematics-9.0.1" = { + "@angular-devkit/schematics-9.0.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.1.tgz"; - sha512 = "Cuub9eJm1TWygKTOowRbxMASA8QWeHWzNEU2V3TqUF1Tqy/iPf4cpuMijkFysXjTn2bi2HA9t26AwQkwymbliA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.2.tgz"; + sha512 = "+MiSBWErz8hxcbyHioCQtTnFpbqaoCEQEknK0vCb15fFEY2Hi3u2TXK59QNKsqn8w+Mye5dHYhwmpsAC8Wcgtw=="; }; }; "@antora/asciidoc-loader-2.2.0" = { @@ -157,13 +157,13 @@ let sha512 = "3d6SqtknM3PiLRw2wLtcMVVfmyHtfNuWo8+ZBRmUrZs8HfhGteV8/s4vpiOJZmLYhW4KLFgIgG09lFdD5t78Ow=="; }; }; - "@apollo/federation-0.11.3" = { + "@apollo/federation-0.12.0" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.11.3"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.11.3.tgz"; - sha512 = "6KK9noDoWXujIgmp7RHcA9quQTByM8b4saxmujeO4RnZmMQq4bcpN8AJAykulE1x3DuHqeUbLNl3s7gGlEhOWw=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.12.0.tgz"; + sha512 = "jJb4CzJDLWghkVkhQE5go9XvekQZgL8MsHAGWHzrgHXfUNHZhAjkxODH0duPEq2WunGSp6rSu4rerW1cC89JvA=="; }; }; "@apollo/protobufjs-1.0.3" = { @@ -1111,13 +1111,13 @@ let sha512 = "neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ=="; }; }; - "@babel/runtime-corejs2-7.8.4" = { - name = "_at_babel_slash_runtime-corejs2"; - packageName = "@babel/runtime-corejs2"; + "@babel/runtime-corejs3-7.8.4" = { + name = "_at_babel_slash_runtime-corejs3"; + packageName = "@babel/runtime-corejs3"; version = "7.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.8.4.tgz"; - sha512 = "7jU2FgNqNHX6yTuU/Dr/vH5/O8eVL9U85MG5aDw1LzGfCvvhXC1shdXfVzCQDsoY967yrAKeLujRv7l8BU+dZA=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.4.tgz"; + sha512 = "+wpLqy5+fbQhvbllvlJEVRIpYj+COUWnnsm+I4jZlA8Lo7/MJmBhGTCHyk1/RWfOqBRJ2MbadddG6QltTKTlrg=="; }; }; "@babel/template-7.8.3" = { @@ -2137,13 +2137,13 @@ let sha512 = "6+iaCMh/JXJaB2QWikqvGE9//wLEVYYwZd5sud8aLoLKog1Q75naZh2vlGVtg5Mq/NqpqGQvdIjJb3Bm+64AUQ=="; }; }; - "@oclif/config-1.13.3" = { + "@oclif/config-1.14.0" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.13.3"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.13.3.tgz"; - sha512 = "qs5XvGRw+1M41abOKCjd0uoeHCgsMxa2MurD2g2K8CtQlzlMXl0rW5idVeimIg5208LLuxkfzQo8TKAhhRCWLg=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.14.0.tgz"; + sha512 = "KsOP/mx9lzTah+EtGqLUXN3PDL0J3zb9/dTneFyiUK2K6T7vFEGhV6OasmqTh4uMZHGYTGrNPV8x/Yw6qZNL6A=="; }; }; "@oclif/errors-1.2.2" = { @@ -2479,22 +2479,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.0.1" = { + "@schematics/angular-9.0.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.1.tgz"; - sha512 = "lQ8Qc697ef2jvEf1+tElAUsbOnbUAMo3dnOUVw9RlYO90pHeG3/OdWBMH1kjn3jbjuKuvCVZH3voJUUcLDx6eg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.2.tgz"; + sha512 = "H6ZyxLYoIN68bbNKnUjBCPtB0fcwnpIyTkqXQHa3B4HITcU3uee4PLAl3xCkTS2NGv8m/0eWND9zt5wryGf8PQ=="; }; }; - "@schematics/update-0.900.1" = { + "@schematics/update-0.900.2" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.900.1"; + version = "0.900.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.1.tgz"; - sha512 = "p2xfctTtT5kMAaCTBENxi69m5IhsvdTwwwokb9zVHJYAC6D1K//q1bl30mTe6U2YE3hSPWND2S14ahXw8PyN8g=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.2.tgz"; + sha512 = "CRDb2pax8DtSyO32b2D5uKlQZ+s5h9feD4oEMvm2zU7z/4wcoTNC0T9ols20aHYeNhKYD9FuMI3KQWlgMTPgbw=="; }; }; "@serverless/cli-1.4.0" = { @@ -2524,13 +2524,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.3.0" = { + "@serverless/enterprise-plugin-3.4.0" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.3.0.tgz"; - sha512 = "hj0lkoi3uJsxVu8V2dkfVZL2HS7GNGW1N5Sa3SRKxnHrGKpErTZGEnIHzPp5dw7H2Q4lE8LD191O4JdTk7GE9A=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.4.0.tgz"; + sha512 = "QaJUQwtej6LsBlmPldPYNHOApjrHrpGvreVcXy2GBqr0hpPFy+o2xmSKek+NDjmpyzHraeHKb5DoKemTWUxsTg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -3163,13 +3163,13 @@ let sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; - "@types/koa-2.11.0" = { + "@types/koa-2.11.1" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.0.tgz"; - sha512 = "Hgx/1/rVlJvqYBrdeCsS7PDiR2qbxlMt1RnmNWD4Uxi5FF9nwkYqIldo7urjc+dfNpk+2NRGcnAYd4L5xEhCcQ=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.1.tgz"; + sha512 = "/kqQs+8Qd9GL0cdl39HEhK91k7xq6+Zci76RUdqtTLj1Mg1aVG7zwJm3snkeyFUeAvY8noY27eMXgqg1wHZgwA=="; }; }; "@types/koa-compose-3.2.5" = { @@ -3226,22 +3226,22 @@ let sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; }; }; - "@types/node-10.17.14" = { + "@types/node-10.17.15" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.14"; + version = "10.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.14.tgz"; - sha512 = "G0UmX5uKEmW+ZAhmZ6PLTQ5eu/VPaT+d/tdLd5IFsKRPcbe6lPxocBtcYBFSaLaCW8O60AX90e91Nsp8lVHCNw=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.15.tgz"; + sha512 = "daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A=="; }; }; - "@types/node-13.7.0" = { + "@types/node-13.7.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.7.0"; + version = "13.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.7.0.tgz"; - sha512 = "GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz"; + sha512 = "Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA=="; }; }; "@types/node-6.14.9" = { @@ -4252,13 +4252,13 @@ let sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="; }; }; - "acorn-walk-7.0.0" = { + "acorn-walk-7.1.1" = { name = "acorn-walk"; packageName = "acorn-walk"; - version = "7.0.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.0.0.tgz"; - sha512 = "7Bv1We7ZGuU79zZbb6rRqcpxo3OY+zrdtloZWoyD8fmGX+FeXRjE+iuGkZjSXLVovLzrsvMGMy0EkwA0E0umxg=="; + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz"; + sha512 = "wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ=="; }; }; "adbkit-2.11.1" = { @@ -4297,13 +4297,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.19.0" = { + "addons-linter-1.20.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.19.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.19.0.tgz"; - sha512 = "pnfrdQqatZeEnBcRcMq9KWZJRmS9YiPyWu3gZbJl12Ee3dUlvke+2C0DcYhNfm4hciRB4wrr4OiQTYAXh1CyzA=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.20.0.tgz"; + sha512 = "EIyJnIkvXhBKgOzVFR873uGa4ny07odIl8i8qWxHAuVJWM/ZQtLouAbndA+cVRDbD66sK6HsO1oWN6WkdCr/uA=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -4423,15 +4423,6 @@ let sha512 = "CW/n1wxF8RpEuuiq6Vbn9S8m0VSYDMnZESqaJ6F2cWN9fY8rei2qaxweIaRgq+ek8TqfoFIsUjaGNKGGEHElSg=="; }; }; - "aggregate-error-1.0.0" = { - name = "aggregate-error"; - packageName = "aggregate-error"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz"; - sha1 = "888344dad0220a72e3af50906117f48771925fac"; - }; - }; "aggregate-error-3.0.1" = { name = "aggregate-error"; packageName = "aggregate-error"; @@ -4675,6 +4666,15 @@ let sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; }; }; + "ansi-colors-3.2.4" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz"; + sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="; + }; + }; "ansi-colors-4.1.1" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -4747,6 +4747,15 @@ let sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; }; }; + "ansi-html-0.0.7" = { + name = "ansi-html"; + packageName = "ansi-html"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz"; + sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; + }; + }; "ansi-red-0.1.1" = { name = "ansi-red"; packageName = "ansi-red"; @@ -4981,13 +4990,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.22.0" = { + "apollo-2.22.1" = { name = "apollo"; packageName = "apollo"; - version = "2.22.0"; + version = "2.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.22.0.tgz"; - sha512 = "9Xmfdx/q0YU1LkcZIV1chAy1iY+bNTsgzamhw71gMg6qto94qnEYBX531Cv+80V+Bx6/f0ZGgofmgPPJx4KCTA=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.22.1.tgz"; + sha512 = "FONVPKvK0gg+loWCh7KOAAa/HlvbKcR7pdiC3Mtpohe3RWKqKb/QLsBPHjCgz1mjVyVL+05Cv/SjnQ9WHUO6/g=="; }; }; "apollo-cache-1.3.4" = { @@ -5044,13 +5053,13 @@ let sha512 = "sanUIqXWyyDpxY3fYOVU+Hsxwxdj5fmn3Zcy6CcMGnWmh9o7tautQAuod2a63wrDs1jcNQcFq3EKIpeB+2xECw=="; }; }; - "apollo-codegen-core-0.36.0" = { + "apollo-codegen-core-0.36.1" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.36.0"; + version = "0.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.0.tgz"; - sha512 = "RorGvym1AFZzrPwLCWznMcyHCfzCWZb7IktC1TyvvgSuKA9whAGLbkLB9tXk7gE3bcmkRmNaWJUWfb+8iZ+rRg=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.1.tgz"; + sha512 = "PSucYRG29+BAnQE8A4KhGqUK0LdFfAiep8az1qNDq6RDfqVhdqzMF32ZpQWuEx7cz4YTRcBs9cg2/ZjXxAgJwA=="; }; }; "apollo-codegen-flow-0.20.0" = { @@ -5062,13 +5071,13 @@ let sha512 = "XgKE19B0Q74PBLVqHP/77NcCFrcvrN9wi3CcotH+FV8BeHTjvpHlilTsQMmd2STPt19cCvY2Qtz0EOeLXTUQ2Q=="; }; }; - "apollo-codegen-flow-0.34.0" = { + "apollo-codegen-flow-0.34.1" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.34.0"; + version = "0.34.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.0.tgz"; - sha512 = "Vc4i0lV9O0D3vrwWvKkiFWqeUxgl81jAGNGSy2pOhfDut84kS85GbR0fO4eQ8JTLYqh/PquT3Oq6Q5UfSQQE9w=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.1.tgz"; + sha512 = "q28f5rY+KwVWNoPyTJHSSJfA+y9JdXFxvzDZNQ7odUKuLZRDJSswYZkBYk/Nq/rkl7RwOJ7qgwEG6AxhPMvH1g=="; }; }; "apollo-codegen-flow-legacy-0.20.0" = { @@ -5089,13 +5098,13 @@ let sha512 = "NbnMOfUXXovlTGRj4mIZGXB9HvidQhwKfAmdYHox5peHPkjjsqEzxGCIuWCSnubWiCF2uHZnQoIkg4sXWf0KLw=="; }; }; - "apollo-codegen-scala-0.35.0" = { + "apollo-codegen-scala-0.35.1" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.35.0"; + version = "0.35.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.0.tgz"; - sha512 = "QBhaYX+F4B0nESLP+n1GvDZ03EWRo31dfEA2eu+DUx+Nez1kMzbohFOFDaN7h1DADIarPyELQ3CQb5yDrzFMMw=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.1.tgz"; + sha512 = "9yywcpwZiclKRXXSFGYuJcQIOTlPyPKSYH/+Rls1Vu5CafPGgkhIJQLtvtc80PJMaK1vmYVvsrDsAO91Tu/frw=="; }; }; "apollo-codegen-swift-0.20.0" = { @@ -5107,13 +5116,13 @@ let sha512 = "L9Y4StbXw0t/nuF+miz0ybSt/io6tsLc063Yeh1A8GCvhFFQyXE/yK0Rf3nO1Bl5Z9UZ5o8Aae9kK4GSWYIGNQ=="; }; }; - "apollo-codegen-swift-0.36.0" = { + "apollo-codegen-swift-0.36.1" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.36.0"; + version = "0.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.0.tgz"; - sha512 = "i6AoxYunQhUeXauZdsY9DunvdGMAd83DwRHxH/XCbwOcjSWTflnSxd8JJzNA6uMOI7lN276k8XpYQMB+xaNKig=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.1.tgz"; + sha512 = "no5bq4xiTqeT591bpGTdy3ATfflmmQXc9h6q935lVrak5uqGigd72RPWHNeN/BbnGg6khaL9jBbSs2+VqrOGug=="; }; }; "apollo-codegen-typescript-0.20.0" = { @@ -5125,13 +5134,13 @@ let sha512 = "mzlIJXz+5WPwzeALqRHHR9aPPEf6IlhSrjCawpUHmFU1NK9hgwbguYCEYZv9mKkYBUUgDY+9cGFK1cafJX70AQ=="; }; }; - "apollo-codegen-typescript-0.36.0" = { + "apollo-codegen-typescript-0.36.1" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.36.0"; + version = "0.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.0.tgz"; - sha512 = "mnhUXrZ1Ynqvav7mWxQHNWg+ShtgRsub7z4NwlURQjI1UfQRtrQKRQzY8Q/3ihTUSTYoD0tHeBv8ZJcVXq0dWw=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.1.tgz"; + sha512 = "iQ2FGxA9Neb5728eqtvC9J4Ig6heOEMdgVcfsIrUQRTRKiPp7iIKc2DS8ReMX6LMdRhm000ldcquJFQJldFjLg=="; }; }; "apollo-codegen-typescript-legacy-0.20.0" = { @@ -5143,15 +5152,6 @@ let sha512 = "0/h5hce2FIGn6Y4+EHMeMINQxFwcgjw1vU+xV3KGaaEgyEAEQ3/n9pyz43M8mOm/JVgg8Eb4CtM1AtCkRQuFGw=="; }; }; - "apollo-datasource-0.6.4" = { - name = "apollo-datasource"; - packageName = "apollo-datasource"; - version = "0.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.6.4.tgz"; - sha512 = "u4eu6Q94q6KuZacZfdo4vCevA81F4QWeTYEXUvoksQMJpiacPHHe0DJrofKVKvxngUp5kCi1RnPXSc6kBY+/oA=="; - }; - }; "apollo-datasource-0.7.0" = { name = "apollo-datasource"; packageName = "apollo-datasource"; @@ -5161,13 +5161,13 @@ let sha512 = "Yja12BgNQhzuFGG/5Nw2MQe0hkuQy2+9er09HxeEyAf2rUDIPnhPrn1MDoZTB8MU7UGfjwITC+1ofzKkkrZobA=="; }; }; - "apollo-engine-reporting-1.5.0" = { + "apollo-engine-reporting-1.6.0" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.5.0.tgz"; - sha512 = "Pe2DelijZ2QHqkqv8E97iOb32l+FIMT2nxpQsuH+nWi+96cCFJJJHjm3RLAPEUuvGOgW9dFYQP3J91EyC5O0tQ=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.6.0.tgz"; + sha512 = "prA17Tp/WYBJdCd4ey1CnGX8d4Xis1n9PsFmT7x8PV/oNpxG21/x3yNw5kPBZuKAoKz8yEggYtHhkYie1ZBjPQ=="; }; }; "apollo-engine-reporting-protobuf-0.4.4" = { @@ -5188,15 +5188,6 @@ let sha512 = "B9BgpQGR1ndeDtb4Gtor0J4CITQ+OPACZrVW6lgStnljKEe9ZB76DZ1dAd3OCeizAswW6Lo9uvfK8jhVS5nBhQ=="; }; }; - "apollo-graphql-0.3.7" = { - name = "apollo-graphql"; - packageName = "apollo-graphql"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.3.7.tgz"; - sha512 = "ghW16xx9tRcyL38Pw6G5OidMnYn+CNUGZWmvqQgEO2nRy4T0ONPZZBOvGrIMtJQ70oEykNMKGm0zm6PdHdxd8Q=="; - }; - }; "apollo-graphql-0.4.0" = { name = "apollo-graphql"; packageName = "apollo-graphql"; @@ -5206,13 +5197,13 @@ let sha512 = "abCHcKln1EGbzSItW087EjBI5wnluikyUqEn4VsdeWHCtdENWpHCn/MnM0+jJa1prNasxN7tCukp4nMpJYYVqg=="; }; }; - "apollo-language-server-1.19.0" = { + "apollo-language-server-1.19.1" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.19.0.tgz"; - sha512 = "BkrfKs0k+Pr3GXnnS1pbuX9qKhFLBRbImFwO1fka2fmeQ8J2uZc8oSHR3TZ7jWEYA7DQsTPNu1SD4GFfE750UA=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.19.1.tgz"; + sha512 = "Xq9DL+7rl1I78hU5TTJG1zxfPWbz08l/XOthI+rCEhzhIFafzOlUjrtJziuYr1AmAAjA9CJLzaaUDC9ixm+Sfw=="; }; }; "apollo-link-1.2.13" = { @@ -5296,13 +5287,13 @@ let sha512 = "L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw=="; }; }; - "apollo-server-core-2.10.0" = { + "apollo-server-core-2.10.1" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.10.0.tgz"; - sha512 = "x/UK6XvU307W8D/pzTclU04JIjRarcbg5mFPe0nVmO4OTc26uQgKi1WlZkcewXsAUnn+nDwKVn2c2G3dHEgXzQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.10.1.tgz"; + sha512 = "BVITSJRMnj+CWFkjt7FMcaoqg/Ni9gfyVE9iu8bUc1IebBfFDcQj652Iolr7dTqyUziN2jbf0wfcybKYJLQHQQ=="; }; }; "apollo-server-env-2.4.3" = { @@ -5323,13 +5314,13 @@ let sha512 = "Y0PKQvkrb2Kd18d1NPlHdSqmlr8TgqJ7JQcNIfhNDgdb45CnqZlxL1abuIRhr8tiw8OhVOcFxz2KyglBi8TKdA=="; }; }; - "apollo-server-express-2.10.0" = { + "apollo-server-express-2.10.1" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.10.0.tgz"; - sha512 = "adDQts4QmkX2ENU7JibV1EwRl3ESnpnpImXIMvg8Cm7kX2wSbzwm8LecQNujwWJtkAPTCEAcnPBDyKwWjTQ6/g=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.10.1.tgz"; + sha512 = "NkuWGBOCTiju/aDjfvDImm+4yzfrM0dwiRxu9fKwwh2h1oYBUKJNqjQ1mzJRi0ks6Sn1egwl/fQkTBTkWwGx7Q=="; }; }; "apollo-server-plugin-base-0.6.10" = { @@ -6466,13 +6457,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.614.0" = { + "aws-sdk-2.620.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.614.0"; + version = "2.620.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.614.0.tgz"; - sha512 = "o7utaxDMo9ri1VyPKw8Kcmpy5uZOqMeok2cgur70iZ94zsLIRnHKrBv1wMBbyRGuUbfJRq76HGAS9QxdiSqQHw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.620.0.tgz"; + sha512 = "j+PGKbYwk5OjzbCFbxzRkcJVEvfdn9YFkrU8dJdjleYf9AzUSUpTjMyZsyUPOKxJxdNdA9FYTs43WdtSKHZa0A=="; }; }; "aws-sign2-0.6.0" = { @@ -7870,13 +7861,13 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; - "boolean-3.0.0" = { + "boolean-3.0.1" = { name = "boolean"; packageName = "boolean"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/boolean/-/boolean-3.0.0.tgz"; - sha512 = "OElxJ1lUSinuoUnkpOgLmxp0DC4ytEhODEL6QJU0NpxE/mI4rUSh8h1P1Wkvfi3xQEBcxXR2gBIPNYNuaFcAbQ=="; + url = "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz"; + sha512 = "HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA=="; }; }; "boom-2.10.1" = { @@ -8221,13 +8212,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.8.6" = { + "browserslist-4.8.7" = { name = "browserslist"; packageName = "browserslist"; - version = "4.8.6"; + version = "4.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.8.6.tgz"; - sha512 = "ZHao85gf0eZ0ESxLfCp73GG9O/VTytYDIkIiZDlURppLTI9wErSM/5yAKEq6rcUdxBLjMELmrYUJGg5sxGKMHg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.8.7.tgz"; + sha512 = "gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA=="; }; }; "btoa-lite-1.0.0" = { @@ -8941,13 +8932,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001025" = { + "caniuse-lite-1.0.30001027" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001025"; + version = "1.0.30001027"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001025.tgz"; - sha512 = "SKyFdHYfXUZf5V85+PJgLYyit27q4wgvZuf8QTOk1osbypcROihMBlx9GRar2/pIcKH2r4OehdlBr9x6PXetAQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz"; + sha512 = "7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg=="; }; }; "capture-stack-trace-1.0.1" = { @@ -9427,13 +9418,13 @@ let sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485"; }; }; - "chownr-1.1.3" = { + "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz"; - sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; "chroma-js-2.1.0" = { @@ -9823,6 +9814,15 @@ let sha512 = "bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA=="; }; }; + "cli-truncate-2.1.0" = { + name = "cli-truncate"; + packageName = "cli-truncate"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz"; + sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; + }; + }; "cli-ux-4.9.3" = { name = "cli-ux"; packageName = "cli-ux"; @@ -10903,13 +10903,13 @@ let sha512 = "CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ=="; }; }; - "configstore-5.0.0" = { + "configstore-5.0.1" = { name = "configstore"; packageName = "configstore"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-5.0.0.tgz"; - sha512 = "eE/hvMs7qw7DlcB5JPRnthmrITuHMmACUJAp89v6PT6iOqzoLS7HRWhBtuHMlhNHo2AhUSA/3Dh1bKNJHcublQ=="; + url = "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz"; + sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; }; }; "connect-1.9.2" = { @@ -10948,6 +10948,15 @@ let sha512 = "ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ=="; }; }; + "connect-history-api-fallback-1.6.0" = { + name = "connect-history-api-fallback"; + packageName = "connect-history-api-fallback"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; + sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; + }; + }; "connect-multiparty-2.2.0" = { name = "connect-multiparty"; packageName = "connect-multiparty"; @@ -11479,15 +11488,6 @@ let sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; }; - "core-js-3.6.0" = { - name = "core-js"; - packageName = "core-js"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.6.0.tgz"; - sha512 = "AHPTNKzyB+YwgDWoSOCaid9PUSEF6781vsfiK8qUz62zRR448/XgK2NtCbpiUGizbep8Lrpt0Du19PpGGZvw3Q=="; - }; - }; "core-js-3.6.4" = { name = "core-js"; packageName = "core-js"; @@ -11506,6 +11506,15 @@ let sha512 = "zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA=="; }; }; + "core-js-pure-3.6.4" = { + name = "core-js-pure"; + packageName = "core-js-pure"; + version = "3.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz"; + sha512 = "epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw=="; + }; + }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -12982,6 +12991,15 @@ let sha512 = "QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ=="; }; }; + "default-gateway-4.2.0" = { + name = "default-gateway"; + packageName = "default-gateway"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz"; + sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; + }; + }; "default-resolution-2.0.0" = { name = "default-resolution"; packageName = "default-resolution"; @@ -13108,6 +13126,15 @@ let sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095"; }; }; + "del-4.1.1" = { + name = "del"; + packageName = "del"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz"; + sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; + }; + }; "delay-4.3.0" = { name = "delay"; packageName = "delay"; @@ -13594,13 +13621,13 @@ let sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; }; }; - "dispensary-0.48.1" = { + "dispensary-0.49.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.48.1"; + version = "0.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.48.1.tgz"; - sha512 = "oC9ItJ7YtO/DKsp24T90k7z0NxfkZQkvJ3USTxUoVjBKrfMRz1/kMd+NcFgDG+KrJg14GChiv1sbdFdxeKRUUw=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.49.0.tgz"; + sha512 = "szH0vDORmGWEfwQgIqrhmrMpSGU2yXL3z7oe0NGx4sCbmnJdXXr5SQvRccPNCPrRuRPn2zPIITvwD9Lf+pcOew=="; }; }; "diveSync-0.3.0" = { @@ -13711,15 +13738,6 @@ let sha512 = "cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw=="; }; }; - "dockerfile-ast-0.0.16" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.16.tgz"; - sha512 = "+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw=="; - }; - }; "dockerfile-ast-0.0.18" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; @@ -13729,13 +13747,22 @@ let sha512 = "SEp95qCox1KAzf8BBtjHoBDD0a7/eNlZJ6fgDf9RxqeSEDwLuEN9YjdZ/tRlkrYLxXR4i+kqZzS4eDRSqs8VKQ=="; }; }; - "dockerfile-language-service-0.0.8" = { + "dockerfile-ast-0.0.20" = { + name = "dockerfile-ast"; + packageName = "dockerfile-ast"; + version = "0.0.20"; + src = fetchurl { + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.20.tgz"; + sha512 = "VGFMBT0Av1Sk4SCjafsv2S/MCVy6+AuhLW+958wS2df86wb90JPl+WJXhTTGHk5DQVwQX0NoQQBzQQP1U7GaWg=="; + }; + }; + "dockerfile-language-service-0.0.9" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; - version = "0.0.8"; + version = "0.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.8.tgz"; - sha512 = "peko1rQtZ81e3QK3VLZgkCKkCMnuoSqZxCQuudyEbtYqqAe6jJ4r0bwOnWD9hyH/FMg7jMvI5uLsoo7/dHLNYw=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.9.tgz"; + sha512 = "g+TFMRG/Vv+yKqYJ2EE5KZlmwbPShWhlGhyG6tFEhUlHUt2Cd3wMr35popmc5Y9ra3OPwR3nY9cQFWIt8OP1Kw=="; }; }; "dockerfile-utils-0.0.11" = { @@ -13747,13 +13774,13 @@ let sha512 = "LNdPIgcl58343dF4KNCHvFzUScUhgLI9BRAR+Vln6D1tVBGvv1k5/qHuxWRCAM2uyFbj73QVkKMScXPhY7TqfQ=="; }; }; - "dockerfile-utils-0.0.13" = { + "dockerfile-utils-0.0.14" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.0.13"; + version = "0.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.13.tgz"; - sha512 = "+MAmhEnQ16B7+3C2UDWpmIS1D8EiKvpl4LDRjrMv94bOusaeRcLagRR0AvgV6NWT+oiRxDMLDyay6yjm6LESsw=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.14.tgz"; + sha512 = "9S77f18SmnI4hJ1Ndv1h1/gPxm74uV/n9E/2JMp6I9D3cSLrNdBZwq3FpNiXX1TRJQAn+Ufl/5b7YzH63NZ6jA=="; }; }; "doctrine-2.1.0" = { @@ -14341,13 +14368,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.346" = { + "electron-to-chromium-1.3.353" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.346"; + version = "1.3.353"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.346.tgz"; - sha512 = "Yy4jF5hJd57BWmGPt0KjaXc25AmWZeQK75kdr4zIzksWVtiT6DwaNtvTb9dt+LkQKwUpvBfCyyPsXXtbY/5GYw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.353.tgz"; + sha512 = "CkG24biyy9qQTQs8U2vGQaiyWSFDxAXP/UGHBveXZ1TGoWOAw+eYZXryrX0UeIMKnQjcaHx33hzYuydv98kqGQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -15044,6 +15071,15 @@ let sha512 = "VHDcDg9AwFoeQU9ULPCJCw6P95gr9Er65M+bccefEVD/OOb+WMyQIYw58rpm0F+zcfRJNf394I+BMH8JeU97Hw=="; }; }; + "escape-goat-2.1.1" = { + name = "escape-goat"; + packageName = "escape-goat"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz"; + sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; + }; + }; "escape-html-1.0.1" = { name = "escape-html"; packageName = "escape-html"; @@ -15197,13 +15233,13 @@ let sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; }; }; - "eslint-plugin-vue-6.1.2" = { + "eslint-plugin-vue-6.2.1" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "6.1.2"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.1.2.tgz"; - sha512 = "M75oAB+2a/LNkLKRbeEaS07EjzjIUaV7/hYoHAfRFeeF8ZMmCbahUn8nQLsLP85mkar24+zDU3QW2iT1JRsACw=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.1.tgz"; + sha512 = "MiIDOotoWseIfLIfGeDzF6sDvHkVvGd2JgkvjyHtN3q4RoxdAXrAMuI3SXTOKatljgacKwpNAYShmcKZa4yZzw=="; }; }; "eslint-scope-3.7.1" = { @@ -15368,13 +15404,13 @@ let sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; }; }; - "esquery-1.0.1" = { + "esquery-1.1.0" = { name = "esquery"; packageName = "esquery"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz"; - sha512 = "SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz"; + sha512 = "MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q=="; }; }; "esrecurse-4.2.1" = { @@ -15683,6 +15719,15 @@ let sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }; }; + "eventsource-1.0.7" = { + name = "eventsource"; + packageName = "eventsource"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"; + sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; + }; + }; "everyauth-0.4.5" = { name = "everyauth"; packageName = "everyauth"; @@ -15719,15 +15764,6 @@ let sha1 = "b09c2a9309bc0ef0501479472db3180f8d4c3edd"; }; }; - "execa-0.10.0" = { - name = "execa"; - packageName = "execa"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz"; - sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw=="; - }; - }; "execa-0.7.0" = { name = "execa"; packageName = "execa"; @@ -16412,6 +16448,15 @@ let sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; }; }; + "faye-websocket-0.10.0" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + }; + }; "faye-websocket-0.11.3" = { name = "faye-websocket"; packageName = "faye-websocket"; @@ -16511,13 +16556,13 @@ let sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; }; }; - "figures-3.1.0" = { + "figures-3.2.0" = { name = "figures"; packageName = "figures"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz"; - sha512 = "ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg=="; + url = "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"; + sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; }; }; "file-entry-cache-2.0.0" = { @@ -16898,15 +16943,6 @@ let sha512 = "LNRvR4hr/S8cXXkIY5pTgVP7L3tq6LlYWcg9nWBuW7o1NMxKZo6oOVa/6GIekMGI0Iw7uC+HWimMe9u/VAeKqw=="; }; }; - "fkill-5.3.0" = { - name = "fkill"; - packageName = "fkill"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-5.3.0.tgz"; - sha512 = "AHe4x/k9xHlSNPRya0FOCd42qa6ggmW4gtdy6mR0R1vdWtNq9zMd8nmMR5LB7fTNOA1f1nOU+uqaQHP7NMWmVA=="; - }; - }; "fkill-6.2.0" = { name = "fkill"; packageName = "fkill"; @@ -16916,6 +16952,15 @@ let sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg=="; }; }; + "fkill-7.0.0" = { + name = "fkill"; + packageName = "fkill"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fkill/-/fkill-7.0.0.tgz"; + sha512 = "i61SqvPdfCxl1/VQulh9SXrC+4dudCtINzTHbKaEx3Jr0kD9SvxKDeXzej7Saurnj3al/jMJwQnsUc62VrBMHQ=="; + }; + }; "flagged-respawn-1.0.1" = { name = "flagged-respawn"; packageName = "flagged-respawn"; @@ -18618,6 +18663,15 @@ let sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; }; + "globby-7.1.1" = { + name = "globby"; + packageName = "globby"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz"; + sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; + }; + }; "globby-8.0.2" = { name = "globby"; packageName = "globby"; @@ -18654,13 +18708,13 @@ let sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; }; }; - "globule-1.3.0" = { + "globule-1.3.1" = { name = "globule"; packageName = "globule"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/globule/-/globule-1.3.0.tgz"; - sha512 = "YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg=="; + url = "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz"; + sha512 = "OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g=="; }; }; "glogg-1.0.2" = { @@ -19077,13 +19131,13 @@ let sha512 = "CgXlq3PGpBRj8RMnLSYs46Hvl5q9Up9kwuMAcYlvS4sNgH5j4Ao7hbY+HI62PaYTeIdffiJidLEIeZVCmZCrFA=="; }; }; - "grouped-queue-0.3.3" = { + "grouped-queue-1.0.0" = { name = "grouped-queue"; packageName = "grouped-queue"; - version = "0.3.3"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz"; - sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"; + url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-1.0.0.tgz"; + sha512 = "XslfWrAGCYovQjveHODR0hllUrsn3UtvPFTkamHbgVHmkUA6eCIDmw3JDWVLJvuntTvYjwaPGamlyzK4/HAEOA=="; }; }; "growl-1.10.5" = { @@ -19212,6 +19266,15 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; + "handle-thing-2.0.0" = { + name = "handle-thing"; + packageName = "handle-thing"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz"; + sha512 = "d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ=="; + }; + }; "handlebars-4.5.3" = { name = "handlebars"; packageName = "handlebars"; @@ -19851,6 +19914,15 @@ let sha512 = "ezZMWtHXm7Eb7Rq4Mwnx2vs79WUx2QmRg3+ZqeGroKzfDO+EprOcgRPYghsOP9JuYBfK18VojmRTGCg8Ma+ktw=="; }; }; + "hpack.js-2.1.6" = { + name = "hpack.js"; + packageName = "hpack.js"; + version = "2.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"; + sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; + }; + }; "hsl-regex-1.0.0" = { name = "hsl-regex"; packageName = "hsl-regex"; @@ -20004,13 +20076,13 @@ let sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; }; }; - "http-cache-semantics-4.0.3" = { + "http-cache-semantics-4.0.4" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; - sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew=="; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz"; + sha512 = "Z2EICWNJou7Tr9Bd2M2UqDJq3A9F2ePG9w3lIpjoyuSyXFP9QbniJVu3XQYytuw5ebmG7dXSXO9PgAjJG8DDKA=="; }; }; "http-call-5.3.0" = { @@ -20022,6 +20094,15 @@ let sha512 = "ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w=="; }; }; + "http-deceiver-1.2.7" = { + name = "http-deceiver"; + packageName = "http-deceiver"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"; + sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; + }; + }; "http-errors-1.6.3" = { name = "http-errors"; packageName = "http-errors"; @@ -20122,6 +20203,15 @@ let sha512 = "uGuJaBWQWDQCJI5ip0d/VTYZW0nRrlLWXA4A7P1jrsa+f77rW2yXz315oBt6zGCF6l8C2tlMxY7ffULCj+5FhA=="; }; }; + "http-proxy-middleware-0.19.1" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "0.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; + sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -21013,6 +21103,15 @@ let sha1 = "ae9fbf93b984878785d50a8de1b356956058cf5c"; }; }; + "internal-ip-4.3.0" = { + name = "internal-ip"; + packageName = "internal-ip"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"; + sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; + }; + }; "interpret-1.1.0" = { name = "interpret"; packageName = "interpret"; @@ -21958,6 +22057,24 @@ let sha512 = "2Xj8sA0zDrAcaoWfBiNmc6VPWAgKDpim0T3J9Djq7vbm1UjwbUWzeuLu/FwC46g3cBbAn0E5R0xwVtOobM6Xxg=="; }; }; + "is-path-cwd-2.2.0" = { + name = "is-path-cwd"; + packageName = "is-path-cwd"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; + }; + }; + "is-path-in-cwd-2.1.0" = { + name = "is-path-in-cwd"; + packageName = "is-path-in-cwd"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="; + }; + }; "is-path-inside-1.0.1" = { name = "is-path-inside"; packageName = "is-path-inside"; @@ -21967,6 +22084,15 @@ let sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; }; }; + "is-path-inside-2.1.0" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; + }; + }; "is-path-inside-3.0.2" = { name = "is-path-inside"; packageName = "is-path-inside"; @@ -22759,13 +22885,13 @@ let sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4"; }; }; - "js-base64-2.5.1" = { + "js-base64-2.5.2" = { name = "js-base64"; packageName = "js-base64"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz"; - sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz"; + sha512 = "Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ=="; }; }; "js-beautify-1.10.3" = { @@ -23182,6 +23308,15 @@ let sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; }; }; + "json3-3.3.3" = { + name = "json3"; + packageName = "json3"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; + sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; + }; + }; "json5-0.5.1" = { name = "json5"; packageName = "json5"; @@ -23651,6 +23786,15 @@ let sha512 = "U7ioE8AimvRVLfw4LffyOIRhL2xVgmE8T22L6i0BucSnBUyv4w+I7VN/zVZwRKHOI6ZRUcdMdWHQ8KSUvGpEog=="; }; }; + "killable-1.0.1" = { + name = "killable"; + packageName = "killable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz"; + sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; + }; + }; "kind-of-1.1.0" = { name = "kind-of"; packageName = "kind-of"; @@ -25586,13 +25730,13 @@ let sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; - "loglevel-1.6.6" = { + "loglevel-1.6.7" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz"; - sha512 = "Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz"; + sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A=="; }; }; "loglevel-colored-level-prefix-1.0.0" = { @@ -26054,13 +26198,13 @@ let sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; - "make-dir-3.0.0" = { + "make-dir-3.0.2" = { name = "make-dir"; packageName = "make-dir"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz"; - sha512 = "grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw=="; + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz"; + sha512 = "rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w=="; }; }; "make-error-1.3.5" = { @@ -26576,13 +26720,13 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.1" = { + "mdn-browser-compat-data-1.0.3" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.1.tgz"; - sha512 = "FxRIu4UYu4rRdFs5JFf6del6J+OpbOq2tYfIEK7N/PtEtz6yGVcWcytmh5L5hZxe58kuxUzjgR8+/0TRyRzRqA=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.3.tgz"; + sha512 = "5n7c20IVrUiuOPSuhbkd5xoJPSzEEGsoMrmrdEtPHIw6gRPzonydcsguAmqGfSBd4d2DRoDQg533sijLUpeJLg=="; }; }; "mdn-data-2.0.4" = { @@ -26792,6 +26936,15 @@ let sha512 = "rYRjVukgBR9sptGI3IfpAjZc4SkupddhAenUhPTGprnqM8Qh863PxfXxXWlfvHpMIAkJCok28Bm7ZlOKB4U+MA=="; }; }; + "memorystore-1.6.2" = { + name = "memorystore"; + packageName = "memorystore"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.2.tgz"; + sha512 = "HQM+cZB/kY1+jj57It22FsptJ3nuZRYxnwh3rWZEvDZO1zuzhIrX9uyFcjP9AhFQvM5WS6vZKtn3veohDH4S7w=="; + }; + }; "memorystream-0.3.1" = { name = "memorystream"; packageName = "memorystream"; @@ -26837,13 +26990,13 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-6.0.0" = { + "meow-6.0.1" = { name = "meow"; packageName = "meow"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-6.0.0.tgz"; - sha512 = "x4rYsjigPBDAxY+BGuK83YLhUIqui5wYyZoqb6QJCUOs+0fiYq+i/NV4Jt8OgIfObZFxG9iTyvLDu4UTohGTFw=="; + url = "https://registry.npmjs.org/meow/-/meow-6.0.1.tgz"; + sha512 = "kxGTFgT/b7/oSRSQsJ0qsT5IMU+bgZ1eAdSA3kIV7onkW0QWo/hL5RbGlMfvBjHJKPE1LaPX0kdecYFiqYWjUw=="; }; }; "merge-1.2.1" = { @@ -27188,13 +27341,13 @@ let sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; }; }; - "mimic-response-2.0.0" = { + "mimic-response-2.1.0" = { name = "mimic-response"; packageName = "mimic-response"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz"; - sha512 = "8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ=="; + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; }; "min-document-2.19.0" = { @@ -27836,13 +27989,13 @@ let sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; }; }; - "multicast-dns-7.2.0" = { + "multicast-dns-7.2.1" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.0.tgz"; - sha512 = "Tu2QORGOFANB124NWQ/JTRhMf/ODouVLEuvu5Dz8YWEU55zQgRgFGnBHfIh5PbfNDAuaRl7yLB+pgWhSqVxi2Q=="; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.1.tgz"; + sha512 = "qJaNecNV4wV5FqZ+aBHOgUcHaJXpEMZhiERmuu7CM0YrCyIsgevVLZJGXeyxMAiofN+jby8oAGr8BpQk6xmptw=="; }; }; "multicast-dns-service-types-1.1.0" = { @@ -28178,13 +28331,13 @@ let sha512 = "Hv9USGyH8EsPy0o8pPWE7x3YRIfuZDgMBirzjU6XLebhiSK2g53JlfqgolD0c39ne6wXAfaBNcIAvYe22Bav+Q=="; }; }; - "nanoguard-1.2.2" = { + "nanoguard-1.3.0" = { name = "nanoguard"; packageName = "nanoguard"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nanoguard/-/nanoguard-1.2.2.tgz"; - sha512 = "IMVIZkHP7Ep01foXurcJR59Hj/0yyApNK3JWpVHq2QVdLgo8wGU/ZsodlpL7jJ/m24+lxT0eyavrLCEuYQK2fg=="; + url = "https://registry.npmjs.org/nanoguard/-/nanoguard-1.3.0.tgz"; + sha512 = "K/ON5wyflyPyZskdeT3m7Y2gJVkm3QLdKykMCquAbK8A2erstyMpZUc3NG8Nz5jKdfatiYndONrlmLF8+pGl+A=="; }; }; "nanoid-2.1.11" = { @@ -28650,6 +28803,15 @@ let sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; }; }; + "next-tick-1.1.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz"; + sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; + }; + }; "nextgen-events-1.3.0" = { name = "nextgen-events"; packageName = "nextgen-events"; @@ -28740,13 +28902,13 @@ let sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg=="; }; }; - "node-abi-2.14.0" = { + "node-abi-2.15.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.14.0"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.14.0.tgz"; - sha512 = "y54KGgEOHnRHlGQi7E5UiryRkH8bmksmQLj/9iLAjoje743YS+KaKB/sDYXgqtT0J16JT3c3AYJZNI98aU/kYg=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.15.0.tgz"; + sha512 = "FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg=="; }; }; "node-addon-api-1.7.1" = { @@ -28903,6 +29065,15 @@ let sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; }; }; + "node-forge-0.9.0" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz"; + sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; + }; + }; "node-gyp-3.8.0" = { name = "node-gyp"; packageName = "node-gyp"; @@ -29074,13 +29245,13 @@ let sha512 = "wEiT7bSeU9oVHPK7S+mHb3cR6cIf9l205wTiHzhnUAuoDJS+IdwQkkpFgKTYmkL4Py2LvqCU90h85YpQul7QFQ=="; }; }; - "node-releases-1.1.48" = { + "node-releases-1.1.49" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.48"; + version = "1.1.49"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.48.tgz"; - sha512 = "Hr8BbmUl1ujAST0K0snItzEA5zkJTQup8VNTKNfT6Zw8vTJkIiagUPNfxHmgDOyfFYNfKAul40sD0UEYTvwebw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.49.tgz"; + sha512 = "xH8t0LS0disN0mtRCh+eByxFPie+msJUBL/lJDBuap53QGiYPa9joh83K4pCZgWJ+2L4b9h88vCVdXQ60NO2bg=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -29452,13 +29623,13 @@ let sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; }; }; - "npm-packlist-2.0.3" = { + "npm-packlist-2.1.0" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.0.3.tgz"; - sha512 = "geT5P1y+58INE/jlxBHNsucRX7jpZAgW+XkxAe1NWN7N9SNwpueWTUPRoVdJH+hFpqcdAChRUE/HWsXQI+8JaQ=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.0.tgz"; + sha512 = "XXqrT4WXVc8M1cdL7LCOUflEdyvCu9lKmM5j5mFwXAK8hUMRxzClNml8ox2d8YIDhS7p51AP6zYWNsgNiWuSLQ=="; }; }; "npm-path-2.0.4" = { @@ -29524,22 +29695,22 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-4.0.2" = { + "npm-registry-fetch-4.0.3" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz"; - sha512 = "Z0IFtPEozNdeZRPh3aHHxdG+ZRpzcbQaJLthsm3VhNf6DScicTFRHZzK82u8RsJUsUHkX+QH/zcB/5pmd20H4A=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.3.tgz"; + sha512 = "WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw=="; }; }; - "npm-registry-fetch-6.0.0" = { + "npm-registry-fetch-6.0.2" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "6.0.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-6.0.0.tgz"; - sha512 = "TSzEzudrky0ArPskchM/7F5SrawBY5acMNtRqFuacEI2lCKEyfBjaENuuIU5Uq2CyHfJ+gWp5QlCprolKa5wKg=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-6.0.2.tgz"; + sha512 = "fffWUYR6J5u11URMuCSOsrr35YO3lNa41ckzIj1XPaznsRTFemIcLCU59A347xQcliUFSB2CJJeQVy5OiIVBcg=="; }; }; "npm-run-4.1.2" = { @@ -29650,13 +29821,13 @@ let sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; }; }; - "num-sort-1.0.0" = { + "num-sort-2.0.0" = { name = "num-sort"; packageName = "num-sort"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/num-sort/-/num-sort-1.0.0.tgz"; - sha1 = "cabec1fd5f4da4aca995af90b7a0f379944e1dbd"; + url = "https://registry.npmjs.org/num-sort/-/num-sort-2.0.0.tgz"; + sha512 = "tqzBd1/b4CPp94zlhOmWDEZ9kUue6Kmg6CpRp7RKJPZQKjNve8Ui3DkqOeZCIlmGrAzJDpdZP9ZEANC4EqYPsw=="; }; }; "number-is-nan-1.0.1" = { @@ -29993,6 +30164,15 @@ let sha1 = "304e97c85adda70ecd7f08da450678ef90f0b707"; }; }; + "obuf-1.1.2" = { + name = "obuf"; + packageName = "obuf"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"; + sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; + }; + }; "obv-0.0.1" = { name = "obv"; packageName = "obv"; @@ -30461,6 +30641,15 @@ let sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; }; }; + "original-1.0.2" = { + name = "original"; + packageName = "original"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz"; + sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; + }; + }; "os-browserify-0.3.0" = { name = "os-browserify"; packageName = "os-browserify"; @@ -30785,13 +30974,13 @@ let sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; }; }; - "p-queue-6.2.1" = { + "p-queue-6.3.0" = { name = "p-queue"; packageName = "p-queue"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.2.1.tgz"; - sha512 = "wV8yC/rkuWpgu9LGKJIb48OynYSrE6lVl2Bx6r8WjbyVKrFAzzQ/QevAvwnDjlD+mLt8xy0LTDOU1freOvMTCg=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz"; + sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA=="; }; }; "p-reduce-1.0.0" = { @@ -30803,6 +30992,15 @@ let sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; }; }; + "p-retry-3.0.1" = { + name = "p-retry"; + packageName = "p-retry"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz"; + sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w=="; + }; + }; "p-some-4.1.0" = { name = "p-some"; packageName = "p-some"; @@ -31955,13 +32153,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-5.14.0" = { + "pino-5.15.0" = { name = "pino"; packageName = "pino"; - version = "5.14.0"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.14.0.tgz"; - sha512 = "Vj1f2wAojTGesogT0hsA/ua8ALltCOBCcA1nkEoDfnTsVWpgBu5UVSY7OdjiGmrMOKHBm24nd3nKXzyPUYJ3ig=="; + url = "https://registry.npmjs.org/pino/-/pino-5.15.0.tgz"; + sha512 = "7+FXMTA3H3sNP5+2miY2K9JKnAAW5GKuhHfNWsukFCsPprGQY3ctqpwbV74wAHW3Nl93cEEQ1G82MgOLM8P7TQ=="; }; }; "pino-std-serializers-2.4.2" = { @@ -32253,15 +32451,6 @@ let sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; }; - "postcss-7.0.24" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.24.tgz"; - sha512 = "Xl0XvdNWg+CblAXzNvbSOUvgJXwSjmbAKORqyw9V2AlHrm1js2gFw9y3jibBAhpKZi8b5JzJCVh/FyzPsTtgTA=="; - }; - }; "postcss-7.0.26" = { name = "postcss"; packageName = "postcss"; @@ -32532,13 +32721,13 @@ let sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; }; }; - "postcss-selector-parser-3.1.1" = { + "postcss-selector-parser-3.1.2" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz"; - sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865"; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; + sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; "postcss-selector-parser-5.0.0" = { @@ -32892,6 +33081,15 @@ let sha512 = "X11vso1oNLtyDa2j8fsMol2fph1+5PoQ4vpEc1it/rM8eLuRTmrmTg4jfn82WhNur241AYitgjKCgmlgMRZesw=="; }; }; + "process-exists-4.0.0" = { + name = "process-exists"; + packageName = "process-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-exists/-/process-exists-4.0.0.tgz"; + sha512 = "BnlcYPiZjSW+fye12g9B7UeCzMAOdMkxuTz3zcytJ2BHwYZf2RoKvuuwUcJLeXlGj58x9YQrvhT21PmKhUc4UQ=="; + }; + }; "process-nextick-args-1.0.7" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -33036,13 +33234,13 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "prompts-2.3.0" = { + "prompts-2.3.1" = { name = "prompts"; packageName = "prompts"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.3.0.tgz"; - sha512 = "NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg=="; + url = "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz"; + sha512 = "qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA=="; }; }; "promzard-0.3.0" = { @@ -33243,13 +33441,22 @@ let sha512 = "DSpMj8PI5W7v2G4+rE+BymTKZPjlu6t/M1N6rPAa6Hwn+/e8jDmFJaq8/kpoGCvwd75g2h5DbjF2MduOMNyrsQ=="; }; }; - "ps-list-5.0.1" = { + "ps-list-6.3.0" = { name = "ps-list"; packageName = "ps-list"; - version = "5.0.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ps-list/-/ps-list-5.0.1.tgz"; - sha512 = "HfafYofNB+Ud+/xdptoYPCkDQ6u1jo9bpgbcyiPtBQ2z+mr1Bb3zGeeXQ30ymBUq3aEJrKLnnvpSZU7WKEiihA=="; + url = "https://registry.npmjs.org/ps-list/-/ps-list-6.3.0.tgz"; + sha512 = "qau0czUSB0fzSlBOQt0bo+I2v6R+xiQdj78e1BR/Qjfl5OHWJ/urXi8+ilw1eHe+5hSeDI1wrwVTgDp2wst4oA=="; + }; + }; + "ps-list-7.0.0" = { + name = "ps-list"; + packageName = "ps-list"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-list/-/ps-list-7.0.0.tgz"; + sha512 = "ZDhdxqb+kE895BAvqIdGnWwfvB43h7KHMIcJC0hw7xLbbiJoprS+bqZxuGZ0jWdDxZEvB3jpnfgJyOn3lmsH+Q=="; }; }; "ps-tree-0.0.3" = { @@ -33981,6 +34188,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "pupa-2.0.1" = { + name = "pupa"; + packageName = "pupa"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz"; + sha512 = "hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA=="; + }; + }; "purgecss-1.4.2" = { name = "purgecss"; packageName = "purgecss"; @@ -34791,13 +35007,13 @@ let sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; - "readable-stream-3.5.0" = { + "readable-stream-3.6.0" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz"; - sha512 = "gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; "readdir-scoped-modules-1.1.0" = { @@ -35178,13 +35394,13 @@ let sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"; }; }; - "regjsparser-0.6.2" = { + "regjsparser-0.6.3" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.2.tgz"; - sha512 = "E9ghzUtoLwDekPT0DYCp+c4h+bvuUpe6rRHCTYn6eGoqj1LgKXxT6I0Il4WbjhQkOghzi/V+y03bPKvbllL93Q=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.3.tgz"; + sha512 = "8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA=="; }; }; "rehype-sort-attribute-values-2.0.1" = { @@ -35466,6 +35682,15 @@ let sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; + "request-2.88.2" = { + name = "request"; + packageName = "request"; + version = "2.88.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; + }; + }; "request-2.9.203" = { name = "request"; packageName = "request"; @@ -36636,6 +36861,24 @@ let sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d"; }; }; + "select-hose-2.0.0" = { + name = "select-hose"; + packageName = "select-hose"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"; + sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; + }; + }; + "selfsigned-1.10.7" = { + name = "selfsigned"; + packageName = "selfsigned"; + version = "1.10.7"; + src = fetchurl { + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz"; + sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA=="; + }; + }; "semaphore-async-await-1.5.1" = { name = "semaphore-async-await"; packageName = "semaphore-async-await"; @@ -36789,13 +37032,13 @@ let sha512 = "WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A=="; }; }; - "semver-7.1.2" = { + "semver-7.1.3" = { name = "semver"; packageName = "semver"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.2.tgz"; - sha512 = "BJs9T/H8sEVHbeigqzIEo57Iu/3DG6c4QoqTfbQB3BPA4zgzAomh/Fk9E7QtjWQ8mx2dgA9YCfSF4y9k9bHNpQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz"; + sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA=="; }; }; "semver-compare-1.0.0" = { @@ -37122,13 +37365,13 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; - "seventh-0.7.30" = { + "seventh-0.7.34" = { name = "seventh"; packageName = "seventh"; - version = "0.7.30"; + version = "0.7.34"; src = fetchurl { - url = "https://registry.npmjs.org/seventh/-/seventh-0.7.30.tgz"; - sha512 = "GDX4eZEZXQFqURkUA802R3GkawzGA8zm2QS9AfFqPcJKakoytxhI0soTRfhEqNhqh0RrRFO/EraffrAULaxiQQ=="; + url = "https://registry.npmjs.org/seventh/-/seventh-0.7.34.tgz"; + sha512 = "9YR6YjZIckltwsfomtsUuyHEGSx7gNHdXDX+hPmvVeHJLiGpFnLRm3izKWCVjb70cYZYUfdlA9osUEqtH/J6uQ=="; }; }; "sha.js-2.4.11" = { @@ -37329,13 +37572,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-2.0.4" = { + "sign-addon-2.0.5" = { name = "sign-addon"; packageName = "sign-addon"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-2.0.4.tgz"; - sha512 = "QKfE558nIQ2o9VACAIMQBI4I+IhlL+k9bxhVsQUb4B6Bu+tC8IDSlnHrydcYPf3AB6K+g+BVzbDD1JlSw4bRDg=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-2.0.5.tgz"; + sha512 = "dVjIWe1VJ2VQCdScREWXWECmJhgjpJMqwPKkW+L78PPx2Jyr/t+//kNHqG1hYrmIsvQN7vGjAjv9s7ix0vw0zA=="; }; }; "signal-exit-3.0.2" = { @@ -37797,13 +38040,13 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.8.0" = { + "snyk-mvn-plugin-2.9.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.8.0.tgz"; - sha512 = "Jt6lsVOFOYj7rp0H2IWz/BZS9xxaO0jEFTAoafLCocJIWWuGhPpVocCqmh/hrYAdKY9gS4gVOViMJ3EvcC1r1Q=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.9.0.tgz"; + sha512 = "FBl78wCHNm0P/QOlipvOxzN2LrXlS6NBN0zXWYZ09P0hG65rmA3gKTg0QsHUjIBh1Pg9bw5aG4r/AHle6a6g6w=="; }; }; "snyk-nodejs-lockfile-parser-1.17.0" = { @@ -38040,6 +38283,24 @@ let sha512 = "/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ=="; }; }; + "sockjs-0.3.19" = { + name = "sockjs"; + packageName = "sockjs"; + version = "0.3.19"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz"; + sha512 = "V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw=="; + }; + }; + "sockjs-client-1.4.0" = { + name = "sockjs-client"; + packageName = "sockjs-client"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz"; + sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; + }; + }; "socks-2.3.3" = { name = "socks"; packageName = "socks"; @@ -38463,6 +38724,24 @@ let sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb"; }; }; + "spdy-4.0.1" = { + name = "spdy"; + packageName = "spdy"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz"; + sha512 = "HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA=="; + }; + }; + "spdy-transport-3.0.0" = { + name = "spdy-transport"; + packageName = "spdy-transport"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"; + sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; + }; + }; "speedometer-0.1.4" = { name = "speedometer"; packageName = "speedometer"; @@ -38670,13 +38949,13 @@ let sha512 = "qe3qpvchJ+gnH8M/ge4rpL+7eRbSmsEAzNwHkDdrW06OBcziQ6/KuAdmcR6joxCbNeoAXAZF+inkefgE16okXA=="; }; }; - "ssb-client-4.8.0" = { + "ssb-client-4.9.0" = { name = "ssb-client"; packageName = "ssb-client"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.8.0.tgz"; - sha512 = "5nfx08Cgl176IyK1uQrHO3SBord1rUDKUJvrz9ddgYWIL78+/puk3zs26rt3BqDTPWBtd/Txdy9OLHBYNDhK8A=="; + url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.9.0.tgz"; + sha512 = "5wPrVA82Uk3deV2oiCZEbm1kMp9r/5xTT2VvwwMLZS3fDD9FnLOi0kjUUh3OTP+jGBK7bVHRmnvXIVy6ETnSpA=="; }; }; "ssb-config-2.3.9" = { @@ -40407,13 +40686,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.21.1" = { + "systeminformation-4.22.0" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.21.1"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.21.1.tgz"; - sha512 = "IQMy+ieSThY+MfLZaCdQsGCteMah4nhsDQcnT9DhocoJnhMKVUqDY025j1i+MSm7qdUCMXS5oV7dvttr+pSodw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.0.tgz"; + sha512 = "Sq6H99xxvBeN54kUdM9DCdbesSLb+S5MZnUD2qy7gutyfS0REYZ4QN6tfsWbYhcsaocrvcpCwoOHblbO+caN4A=="; }; }; "syswide-cas-5.3.0" = { @@ -40642,15 +40921,6 @@ let sha512 = "+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw=="; }; }; - "taskkill-2.0.0" = { - name = "taskkill"; - packageName = "taskkill"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/taskkill/-/taskkill-2.0.0.tgz"; - sha1 = "a354305702a964357033027aa949eaed5331b784"; - }; - }; "taskkill-3.1.0" = { name = "taskkill"; packageName = "taskkill"; @@ -40804,13 +41074,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.32.3" = { + "terminal-kit-1.33.10" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.32.3"; + version = "1.33.10"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.32.3.tgz"; - sha512 = "9iRH+8HbY6KSjOUVF7Ja9s8SyYEJ2eMNI9vfsNvMnDOG9iXly2bLyK1WIwZF7mSZZCZshUiNkuM25BDN3Nj81Q=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.33.10.tgz"; + sha512 = "xKJAeyfm9EIkHWWz0C/GXbYW5LytAMzuVT9xZdI9kgLnm9Z7lNkly0WdBCH8WOPD4inZpKjNzBKr0StEOJXBNA=="; }; }; "terser-3.17.0" = { @@ -41704,6 +41974,15 @@ let sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; }; }; + "tr46-2.0.0" = { + name = "tr46"; + packageName = "tr46"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-2.0.0.tgz"; + sha512 = "LrErSqfhdUw73AC/eXV2fEmNkvgSYxfm5lvxnLvuVgoVDknvD28Pa5FeDGc8RuVouDxUD3GnHHFv7xnBp7As5w=="; + }; + }; "transliteration-1.6.6" = { name = "transliteration"; packageName = "transliteration"; @@ -42073,13 +42352,13 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "tweetnacl-1.0.2" = { + "tweetnacl-1.0.3" = { name = "tweetnacl"; packageName = "tweetnacl"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.2.tgz"; - sha512 = "+8aPRjmXgf1VqvyxSlBUzKzeYqVS9Ai8vZ28g+mL7dNQl1jlUTCMDZnvNQdAS1xTywMkIXwJsfipsR/6s2+syw=="; + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz"; + sha512 = "6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="; }; }; "tweetnacl-auth-0.3.1" = { @@ -42487,13 +42766,13 @@ let sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; }; }; - "uncss-0.17.2" = { + "uncss-0.17.3" = { name = "uncss"; packageName = "uncss"; - version = "0.17.2"; + version = "0.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/uncss/-/uncss-0.17.2.tgz"; - sha512 = "hu2HquwDItuGDem4YsJROdAD8SknmWtM24zwhQax6J1se8tPjV1cnwPKhtjodzBaUhaL8Zb3hlGdZ2WAUpbAOg=="; + url = "https://registry.npmjs.org/uncss/-/uncss-0.17.3.tgz"; + sha512 = "ksdDWl81YWvF/X14fOSw4iu8tESDHFIeyKIeDrK6GEVTQvqJc1WlOEXqostNwOCi3qAj++4EaLsdAgPmUbEyog=="; }; }; "undeclared-identifiers-1.1.3" = { @@ -42505,13 +42784,13 @@ let sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; }; }; - "undefsafe-2.0.2" = { + "undefsafe-2.0.3" = { name = "undefsafe"; packageName = "undefsafe"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz"; - sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76"; + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz"; + sha512 = "nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A=="; }; }; "underscore-1.2.1" = { @@ -42883,22 +43162,22 @@ let sha512 = "dFil/AN6vqhnQWNCZk0GF/G3+Q5YwsB+PqjnzvpO2wzdRtUJ1E8PN+XRE/PRr/G3FzKjRTJU0haqE0Ekl+O3Ag=="; }; }; - "unist-util-modify-children-1.1.5" = { + "unist-util-modify-children-1.1.6" = { name = "unist-util-modify-children"; packageName = "unist-util-modify-children"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.5.tgz"; - sha512 = "XeL5qqyoS3TEueCKEzHusWXE9JBDJPE4rl6LmcLOwlzv0RIZrcMNqKx02GSK3Ms4v45ldu+ltPxG42FBMVdPZw=="; + url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.6.tgz"; + sha512 = "TOA6W9QLil+BrHqIZNR4o6IA5QwGOveMbnQxnWYq+7EFORx9vz/CHrtzF36zWrW61E2UKw7sM1KPtIgeceVwXw=="; }; }; - "unist-util-position-3.0.4" = { + "unist-util-position-3.1.0" = { name = "unist-util-position"; packageName = "unist-util-position"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.4.tgz"; - sha512 = "tWvIbV8goayTjobxDIr4zVTyG+Q7ragMSMeKC3xnPl9xzIc0+she8mxXLM3JVNDDsfARPbCd3XdzkyLdo7fF3g=="; + url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz"; + sha512 = "w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA=="; }; }; "unist-util-remove-position-1.1.4" = { @@ -42937,13 +43216,13 @@ let sha512 = "AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw=="; }; }; - "unist-util-visit-children-1.1.3" = { + "unist-util-visit-children-1.1.4" = { name = "unist-util-visit-children"; packageName = "unist-util-visit-children"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-1.1.3.tgz"; - sha512 = "/GQ8KNRrG+qD30H76FZNc6Ok+8XTu8lxJByN5LnQ4eQfqxda2gP0CPsCX63BRB26ZRMNf6i1c+jlvNlqysEoFg=="; + url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-1.1.4.tgz"; + sha512 = "sA/nXwYRCQVRwZU2/tQWUqJ9JSFM1X3x7JIOsIgSzrFHcfVt6NkzDtKzyxg2cZWkCwGF9CO8x4QNZRJRMK8FeQ=="; }; }; "unist-util-visit-parents-2.1.2" = { @@ -43162,6 +43441,15 @@ let sha512 = "p9zf71hWt5GVXM4iEBujpUgx8mK9AWiCCapEJm/O1z5ntCim83Z1ATqzZFBHFYqx03laMqv8LiDgs/7ikXjf/g=="; }; }; + "update-notifier-4.1.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz"; + sha512 = "w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew=="; + }; + }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -44359,6 +44647,15 @@ let sha512 = "QL7Fe1FT6PdLtVzwJeZ78pTic4eZbzLRy7yAQgPb9xalqqgZESR0+yDZPwJrM3E7PzOmwHBceYcJR54eQZ7Kng=="; }; }; + "vscode-languageserver-6.1.1" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz"; + sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ=="; + }; + }; "vscode-languageserver-protocol-3.14.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -44368,13 +44665,13 @@ let sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g=="; }; }; - "vscode-languageserver-protocol-3.15.2" = { + "vscode-languageserver-protocol-3.15.3" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.15.2"; + version = "3.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.2.tgz"; - sha512 = "GdL05JKOgZ76RDg3suiGCl9enESM7iQgGw4x93ibTh4sldvZmakHmTeZ4iUApPPGKf6O3OVBtrsksBXnHYaxNg=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz"; + sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -44629,6 +44926,15 @@ let sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA=="; }; }; + "wbuf-1.7.3" = { + name = "wbuf"; + packageName = "wbuf"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"; + sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; + }; + }; "wcwidth-1.0.1" = { name = "wcwidth"; packageName = "wcwidth"; @@ -44692,22 +44998,31 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.41.5" = { - name = "webpack"; - packageName = "webpack"; - version = "4.41.5"; + "webidl-conversions-5.0.0" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.41.5.tgz"; - sha512 = "wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw=="; + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; + sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; }; }; - "webpack-cli-3.3.10" = { + "webpack-4.41.6" = { + name = "webpack"; + packageName = "webpack"; + version = "4.41.6"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz"; + sha512 = "yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA=="; + }; + }; + "webpack-cli-3.3.11" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.10"; + version = "3.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz"; - sha512 = "u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz"; + sha512 = "dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g=="; }; }; "webpack-core-0.6.9" = { @@ -44719,6 +45034,24 @@ let sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2"; }; }; + "webpack-dev-middleware-3.7.2" = { + name = "webpack-dev-middleware"; + packageName = "webpack-dev-middleware"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; + sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw=="; + }; + }; + "webpack-log-2.0.0" = { + name = "webpack-log"; + packageName = "webpack-log"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz"; + sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; + }; + }; "webpack-sources-1.4.3" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -44818,6 +45151,15 @@ let sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; }; }; + "whatwg-url-8.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.0.0.tgz"; + sha512 = "41ou2Dugpij8/LPO5Pq64K5q++MnRCBpEHvQr26/mArEKTkCV5aoXIqyhuYtE0pkqScXwhf2JP57rkRTYM29lQ=="; + }; + }; "whatwg-url-compat-0.6.5" = { name = "whatwg-url-compat"; packageName = "whatwg-url-compat"; @@ -45737,13 +46079,13 @@ let sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; }; }; - "xregexp-4.2.4" = { + "xregexp-4.3.0" = { name = "xregexp"; packageName = "xregexp"; - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/xregexp/-/xregexp-4.2.4.tgz"; - sha512 = "sO0bYdYeJAJBcJA8g7MJJX7UrOZIfJPd8U2SC7B2Dd/J24U0aQNoGp33shCaBSWeb0rD5rh6VBUIXOkGal1TZA=="; + url = "https://registry.npmjs.org/xregexp/-/xregexp-4.3.0.tgz"; + sha512 = "7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g=="; }; }; "xsalsa20-1.1.0" = { @@ -45953,15 +46295,6 @@ let sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; }; }; - "yargs-14.0.0" = { - name = "yargs"; - packageName = "yargs"; - version = "14.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-14.0.0.tgz"; - sha512 = "ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow=="; - }; - }; "yargs-14.2.2" = { name = "yargs"; packageName = "yargs"; @@ -45971,13 +46304,13 @@ let sha512 = "/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA=="; }; }; - "yargs-15.0.2" = { + "yargs-15.1.0" = { name = "yargs"; packageName = "yargs"; - version = "15.0.2"; + version = "15.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.0.2.tgz"; - sha512 = "GH/X/hYt+x5hOat4LMnCqMd8r5Cv78heOMIJn1hr7QPPBqfeC6p89Y78+WB9yGDvfpCvgasfmWLzNzEioOUD9Q=="; + url = "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz"; + sha512 = "T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg=="; }; }; "yargs-3.10.0" = { @@ -46223,13 +46556,13 @@ let sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; }; }; - "yeoman-environment-2.7.0" = { + "yeoman-environment-2.8.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.7.0.tgz"; - sha512 = "YNzSUWgJVSgnm0qgLON4Gb2nTm+kywBiWjK4MbvosjUP2YJJ30lNhEx7ukyzKRPUlsavd5IsuALtF6QaVrq81A=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.8.0.tgz"; + sha512 = "BbJeEna23Qx90fBiJt1awcZ9okfPY/rP3xZYsk1rD3x8LuQgpo4BfegPvQT1sqqh2+gYVZmYZMv5pS8+Muyr9Q=="; }; }; "yn-3.1.1" = { @@ -46346,17 +46679,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.1.tgz"; - sha512 = "/nykTIqZq1plxaXVoMzAqjnExGhkYoSoq88AE4Mb31d6n/SW2DFh62C3hze+atI6YLqeFaPhYuA5zG+z3oOXbQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.2.tgz"; + sha512 = "ih3bnvav94MXI9YpwJ4AaETfUGwzc+S2jg4vkfYMuBeWO8kJ7Ma4f2ZriIwWyfHWHlBLHDF6OjAVdisBKPpQag=="; }; dependencies = [ - sources."@angular-devkit/architect-0.900.1" - sources."@angular-devkit/core-9.0.1" - sources."@angular-devkit/schematics-9.0.1" - sources."@schematics/angular-9.0.1" - (sources."@schematics/update-0.900.1" // { + sources."@angular-devkit/architect-0.900.2" + sources."@angular-devkit/core-9.0.2" + sources."@angular-devkit/schematics-9.0.2" + sources."@schematics/angular-9.0.2" + (sources."@schematics/update-0.900.2" // { dependencies = [ (sources."npm-package-arg-7.0.0" // { dependencies = [ @@ -46395,7 +46728,7 @@ in sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."cli-cursor-3.1.0" sources."cli-spinners-2.2.0" sources."cli-width-2.2.0" @@ -46436,7 +46769,7 @@ in sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."figgy-pudding-3.5.1" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."flush-write-stream-1.1.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -46541,7 +46874,7 @@ in sources."semver-5.7.1" ]; }) - sources."npm-registry-fetch-4.0.2" + sources."npm-registry-fetch-4.0.3" sources."oauth-sign-0.9.0" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" @@ -46585,7 +46918,7 @@ in ]; }) sources."readdir-scoped-modules-1.1.0" - sources."request-2.88.0" + sources."request-2.88.2" sources."resolve-1.15.1" sources."restore-cursor-3.1.0" sources."retry-0.10.1" @@ -46639,11 +46972,7 @@ in sources."through-2.3.8" sources."through2-2.0.5" sources."tmp-0.0.33" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -46875,7 +47204,7 @@ in }) sources."handlebars-4.5.3" sources."has-symbols-1.0.1" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."ignore-5.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -46914,7 +47243,7 @@ in sources."matcher-2.0.0" sources."mime-db-1.43.0" sources."mime-types-2.1.26" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" sources."minimist-1.2.0" @@ -46956,7 +47285,7 @@ in sources."pumpify-1.5.1" sources."queue-4.5.1" sources."quick-lru-4.0.1" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."remove-bom-buffer-3.0.0" (sources."remove-bom-stream-1.2.0" // { dependencies = [ @@ -47156,12 +47485,7 @@ in sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."request-2.88.0" // { - dependencies = [ - sources."punycode-1.4.1" - sources."tough-cookie-2.4.3" - ]; - }) + sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."restore-cursor-2.0.0" @@ -47227,14 +47551,10 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" - (sources."@apollo/federation-0.11.3" // { - dependencies = [ - sources."apollo-graphql-0.3.7" - ]; - }) + sources."@apollo/federation-0.12.0" (sources."@apollo/protobufjs-1.0.3" // { dependencies = [ - sources."@types/node-10.17.14" + sources."@types/node-10.17.15" ]; }) sources."@apollographql/apollo-tools-0.4.3" @@ -47377,7 +47697,7 @@ in sources."semver-5.7.1" ]; }) - sources."@oclif/config-1.13.3" + sources."@oclif/config-1.14.0" (sources."@oclif/errors-1.2.2" // { dependencies = [ sources."clean-stack-1.3.0" @@ -47442,12 +47762,12 @@ in sources."@types/graphql-upload-8.0.3" sources."@types/http-assert-1.5.1" sources."@types/keygrip-1.0.2" - sources."@types/koa-2.11.0" + sources."@types/koa-2.11.1" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@types/node-fetch-2.5.4" sources."@types/normalize-package-data-2.4.0" sources."@types/range-parser-1.2.3" @@ -47479,7 +47799,7 @@ in sources."normalize-path-2.1.1" ]; }) - (sources."apollo-2.22.0" // { + (sources."apollo-2.22.1" // { dependencies = [ sources."graphql-tag-2.10.1" sources."strip-ansi-5.2.0" @@ -47489,21 +47809,17 @@ in sources."apollo-cache-control-0.8.11" sources."apollo-cache-inmemory-1.6.5" sources."apollo-client-2.6.8" - sources."apollo-codegen-core-0.36.0" - sources."apollo-codegen-flow-0.34.0" - sources."apollo-codegen-scala-0.35.0" - sources."apollo-codegen-swift-0.36.0" - sources."apollo-codegen-typescript-0.36.0" + sources."apollo-codegen-core-0.36.1" + sources."apollo-codegen-flow-0.34.1" + sources."apollo-codegen-scala-0.35.1" + sources."apollo-codegen-swift-0.36.1" + sources."apollo-codegen-typescript-0.36.1" sources."apollo-datasource-0.7.0" - sources."apollo-engine-reporting-1.5.0" + sources."apollo-engine-reporting-1.6.0" sources."apollo-engine-reporting-protobuf-0.4.4" sources."apollo-env-0.6.1" sources."apollo-graphql-0.4.0" - (sources."apollo-language-server-1.19.0" // { - dependencies = [ - sources."apollo-datasource-0.6.4" - ]; - }) + sources."apollo-language-server-1.19.1" sources."apollo-link-1.2.13" sources."apollo-link-context-1.0.19" sources."apollo-link-error-1.1.12" @@ -47513,10 +47829,10 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.19" sources."apollo-server-caching-0.5.1" - sources."apollo-server-core-2.10.0" + sources."apollo-server-core-2.10.1" sources."apollo-server-env-2.4.3" sources."apollo-server-errors-2.3.4" - sources."apollo-server-express-2.10.0" + sources."apollo-server-express-2.10.1" sources."apollo-server-plugin-base-0.6.10" sources."apollo-server-types-0.2.10" sources."apollo-tracing-0.8.11" @@ -47611,7 +47927,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.8.6" + sources."browserslist-4.8.7" sources."buffer-5.4.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -47629,7 +47945,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001025" + sources."caniuse-lite-1.0.30001027" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -47794,7 +48110,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.346" + sources."electron-to-chromium-1.3.353" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -47929,7 +48245,7 @@ in sources."slash-2.0.0" ]; }) - sources."globule-1.3.0" + sources."globule-1.3.1" sources."good-listener-1.2.2" (sources."got-6.7.1" // { dependencies = [ @@ -47976,7 +48292,7 @@ in sources."hosted-git-info-2.8.5" (sources."htmlparser2-3.10.1" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) (sources."http-call-5.3.0" // { @@ -48201,7 +48517,7 @@ in sources."is-wsl-2.1.1" ]; }) - sources."node-releases-1.1.48" + sources."node-releases-1.1.49" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" @@ -48353,7 +48669,7 @@ in sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."regjsgen-0.5.1" - (sources."regjsparser-0.6.2" // { + (sources."regjsparser-0.6.3" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -48361,7 +48677,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."request-2.88.0" + sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."resolve-1.15.1" @@ -48587,11 +48903,7 @@ in sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" sources."touch-3.1.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."treeify-1.1.0" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" @@ -48604,7 +48916,7 @@ in sources."type-is-1.6.18" sources."typescript-3.7.5" sources."unbzip2-stream-1.3.3" - (sources."undefsafe-2.0.2" // { + (sources."undefsafe-2.0.3" // { dependencies = [ sources."debug-2.6.9" ]; @@ -49169,7 +49481,7 @@ in sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."request-2.88.0" + sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."safe-buffer-5.2.0" @@ -49179,11 +49491,7 @@ in sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" sources."symbol-tree-3.2.4" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tr46-1.0.1" sources."tunnel-agent-0.6.0" sources."turndown-4.0.2" @@ -49383,7 +49691,7 @@ in sources."JSONStream-1.3.5" sources."acorn-7.1.0" sources."acorn-node-1.8.2" - sources."acorn-walk-7.0.0" + sources."acorn-walk-7.1.1" sources."asn1.js-4.10.1" (sources."assert-1.5.0" // { dependencies = [ @@ -49510,7 +49818,7 @@ in sources."stream-combiner2-1.1.1" (sources."stream-http-3.1.0" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."stream-splicer-2.0.1" @@ -49573,7 +49881,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.14" + sources."@types/node-10.17.15" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.11.0" @@ -49639,7 +49947,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" ]; }) @@ -49858,7 +50166,7 @@ in sources."readline2-0.1.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."request-2.88.0" + sources."request-2.88.2" sources."resolve-1.15.1" sources."rimraf-2.7.1" sources."router-0.6.2" @@ -49926,11 +50234,7 @@ in sources."thirty-two-0.0.2" ]; }) - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."trim-newlines-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -50106,7 +50410,7 @@ in sources."ms-2.1.2" sources."one-time-0.0.4" sources."process-nextick-args-2.0.1" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."requires-port-1.0.0" sources."safe-buffer-5.2.0" sources."simple-swizzle-0.2.2" @@ -50150,7 +50454,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.11.0" @@ -50582,11 +50886,10 @@ in sources."registry-url-3.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ - sources."punycode-1.4.1" sources."qs-6.5.2" - sources."tough-cookie-2.4.3" + sources."tough-cookie-2.5.0" ]; }) sources."resolve-1.14.2" @@ -50775,10 +51078,10 @@ in cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.0.0.tgz"; - sha512 = "fxNNpGrnuVMbaDBpHdgwReMy48BelhAoS6OUUX6Zv5nMwSPZOMxL/kB5VxM9xQoB1vvw38zG9drLRS8gvavxeg=="; + url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.0.tgz"; + sha512 = "LJhHvFragWvIsJH1kjhzZwGSagukewJZ5nV5yjMc5TILs+Z/CbZSvX0W9t9XC26Mw32j56UHjR3co5kAXaeTwg=="; }; dependencies = [ sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -50786,7 +51089,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -50936,7 +51239,7 @@ in }) sources."locate-path-2.0.0" sources."loud-rejection-1.6.0" - sources."make-dir-3.0.0" + sources."make-dir-3.0.2" sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" @@ -51127,7 +51430,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -51269,10 +51572,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.3.1.tgz"; - sha512 = "ORmuc0m6zCt65Vqh5c/h0Z0RbWBqMssEHjD4Zx/j/L4+KvdkXqKFuwfU0I/bDpGMqSqpSq1AzuPy67KCxA/TkA=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.4.0.tgz"; + sha512 = "BR5jXjJH6Bz0vHAIoF0pH2K+hX+Frd93UGZjjCUB1k1JJDZbM+QyigTXZ08ddJ02AQ+iYfNyM77WgDwKQBl00g=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -51304,7 +51607,7 @@ in sources."tmp-0.0.33" ]; }) - sources."figures-3.1.0" + sources."figures-3.2.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fstream-1.0.12" @@ -51818,7 +52121,7 @@ in sources."mime-2.4.4" sources."mime-db-1.43.0" sources."mime-types-2.1.26" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -51835,14 +52138,14 @@ in }) sources."ms-2.1.2" sources."multi-random-access-2.1.1" - sources."multicast-dns-7.2.0" + sources."multicast-dns-7.2.1" sources."multistream-2.1.1" sources."mute-stream-0.0.8" sources."mutexify-1.2.0" sources."nan-2.14.0" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" - sources."nanoguard-1.2.2" + sources."nanoguard-1.3.0" sources."nanomatch-1.2.13" sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" @@ -51923,7 +52226,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."request-2.88.0" + sources."request-2.88.2" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."revalidator-0.1.8" @@ -52056,11 +52359,7 @@ in sources."ms-2.0.0" ]; }) - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" (sources."township-client-1.3.2" // { dependencies = [ sources."is-number-2.1.0" @@ -52099,7 +52398,7 @@ in (sources."utp-native-2.1.7" // { dependencies = [ sources."node-gyp-build-4.2.0" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."unordered-set-2.0.1" ]; }) @@ -52302,16 +52601,16 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.0.21"; + version = "0.0.22"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.21.tgz"; - sha512 = "lZ7VFAlS4vTm5MvxmwpREcYMARB3RQaGX0OZdcY8oSytsu4i5mMGVa6mi9/pZ9soqcUC08uxEA8EcqIeL3lyAA=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.22.tgz"; + sha512 = "Vf/Zieb/BBs/VQnaxntshlTExR3FyE6FO1NxS+yO3SVqzcEVHYkHMC8f/+XRRROVHFh41YfzVfPhSxdCxfbviQ=="; }; dependencies = [ - sources."dockerfile-ast-0.0.16" - (sources."dockerfile-language-service-0.0.8" // { + sources."dockerfile-ast-0.0.20" + (sources."dockerfile-language-service-0.0.9" // { dependencies = [ - (sources."dockerfile-utils-0.0.13" // { + (sources."dockerfile-utils-0.0.14" // { dependencies = [ sources."vscode-languageserver-types-3.6.0" ]; @@ -52324,15 +52623,10 @@ in sources."vscode-languageserver-types-3.6.0" ]; }) - sources."vscode-jsonrpc-4.0.0" - sources."vscode-languageserver-5.2.1" - (sources."vscode-languageserver-protocol-3.14.1" // { - dependencies = [ - sources."vscode-languageserver-types-3.14.0" - ]; - }) + sources."vscode-jsonrpc-5.0.1" + sources."vscode-languageserver-6.1.1" + sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-types-3.15.1" - sources."vscode-uri-1.0.8" ]; buildInputs = globalBuildInputs; meta = { @@ -52347,10 +52641,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.20.1"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.20.1.tgz"; - sha512 = "nolk1wEQZOETEq8x6eBVHRhBPNUsLRS1Z4zjzjsf8lK6S1DO9e1dNMMgTdFq2LwNNhIxdSkFyQjie4382UbgQg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.21.0.tgz"; + sha512 = "Ym6TP6yWNXwueViA0e2cByyGfbr1sFThsI3vzQHy3xiDKZVDcMCE2eFiUen342VksZznzM0R8L61SQ3T39hBTw=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -52359,7 +52653,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.614.0" + sources."aws-sdk-2.620.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -52415,7 +52709,7 @@ in sources."once-1.4.0" sources."optimist-0.6.1" sources."p-finally-1.0.0" - sources."p-queue-6.2.1" + sources."p-queue-6.3.0" sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" @@ -52429,7 +52723,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."request-2.88.0" + sources."request-2.88.2" sources."requestretry-4.1.0" sources."s3-stream-upload-2.0.2" sources."s3signed-0.1.0" @@ -52452,9 +52746,9 @@ in ]; }) sources."through-2.3.8" - (sources."tough-cookie-2.4.3" // { + (sources."tough-cookie-2.5.0" // { dependencies = [ - sources."punycode-1.4.1" + sources."punycode-2.1.1" ]; }) sources."tunnel-agent-0.6.0" @@ -52804,7 +53098,7 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.1.2" sources."esprima-4.0.1" - sources."esquery-1.0.1" + sources."esquery-1.1.0" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -52812,7 +53106,7 @@ in sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."flat-cache-2.0.1" sources."flatted-2.0.1" @@ -52963,7 +53257,7 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.1.2" sources."esprima-4.0.1" - sources."esquery-1.0.1" + sources."esquery-1.1.0" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -52971,7 +53265,7 @@ in sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."flat-cache-2.0.1" sources."flatted-2.0.1" @@ -53220,7 +53514,7 @@ in sources."readable-stream-2.3.7" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."request-2.88.0" + sources."request-2.88.2" sources."request-progress-2.0.1" sources."resolve-1.15.1" sources."restore-cursor-1.0.1" @@ -53240,11 +53534,7 @@ in sources."supports-color-2.0.0" sources."throttleit-1.0.0" sources."tmp-0.0.31" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."trim-newlines-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -53271,180 +53561,193 @@ in fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; - version = "5.2.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-5.2.0.tgz"; - sha512 = "8MT/0AQi9hFOo1j4qQ0URs0FdSoOLGJSNn3CM+1QQj9LKvs2w34yvoSGAJu2EfNvB+W/KJ8wLDyoK7Bs5YdC9w=="; + url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-6.0.0.tgz"; + sha512 = "YlxeZ1Oid9No7mUMVAuHX1hHhzaydXihUNM2s52y/EkCyVAbQyrSt7+E/Ij+jLO3houXG2k4d2pz4vev0jVqlQ=="; }; dependencies = [ - sources."aggregate-error-1.0.0" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."array-find-index-1.0.2" - sources."arrify-1.0.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" - sources."chalk-2.4.2" + sources."@babel/code-frame-7.8.3" + (sources."@babel/highlight-7.8.3" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."@types/color-name-1.1.1" + sources."@types/minimist-1.2.0" + sources."@types/normalize-package-data-2.4.0" + sources."aggregate-error-3.0.1" + sources."ansi-escapes-4.3.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."arrify-2.0.1" + sources."astral-regex-2.0.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.1.2" + sources."chalk-3.0.0" sources."chardet-0.7.0" - sources."clean-stack-1.3.0" - sources."cli-cursor-2.1.0" - sources."cli-truncate-1.1.0" + sources."clean-stack-2.2.0" + sources."cli-cursor-3.1.0" + sources."cli-truncate-2.1.0" sources."cli-width-2.2.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."core-util-is-1.0.2" - sources."cross-spawn-6.0.5" - sources."cross-spawn-async-2.2.5" - sources."csv-parser-1.12.1" - sources."currently-unhandled-0.4.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.1" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ sources."map-obj-1.0.1" ]; }) + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" sources."esc-exit-2.0.2" sources."escape-string-regexp-1.0.5" - sources."execa-0.10.0" + sources."esutils-2.0.3" + sources."execa-4.0.0" sources."external-editor-3.1.0" - sources."figures-2.0.0" - sources."find-up-2.1.0" - sources."fkill-5.3.0" - sources."from2-2.3.0" - sources."generate-function-1.1.0" - sources."generate-object-property-1.2.0" - sources."get-stream-3.0.0" - sources."graceful-fs-4.2.3" - sources."has-flag-3.0.0" + sources."figures-3.2.0" + sources."find-up-4.1.0" + (sources."fkill-7.0.0" // { + dependencies = [ + sources."ps-list-7.0.0" + ]; + }) + sources."get-stream-5.1.0" + sources."hard-rejection-2.1.0" + sources."has-flag-4.0.0" sources."hosted-git-info-2.8.5" + sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" - sources."indent-string-3.2.0" - sources."inherits-2.0.4" - (sources."inquirer-6.5.2" // { + sources."indent-string-4.0.0" + (sources."inquirer-7.0.4" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" sources."strip-ansi-5.2.0" + sources."supports-color-5.5.0" + ]; + }) + (sources."inquirer-autocomplete-prompt-1.0.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."figures-2.0.0" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) - sources."inquirer-autocomplete-prompt-1.0.2" - sources."into-stream-2.0.1" sources."is-arrayish-0.2.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."is-promise-2.1.0" - sources."is-property-1.0.2" - sources."is-stream-1.1.0" - sources."isarray-1.0.0" + sources."is-stream-2.0.0" sources."isexe-2.0.0" + sources."js-tokens-4.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-stringify-safe-5.0.1" - sources."load-json-file-4.0.0" - sources."locate-path-2.0.0" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" sources."lodash-4.17.15" - sources."loud-rejection-1.6.0" sources."lru-cache-4.1.5" - sources."map-obj-2.0.0" - sources."meow-5.0.0" - sources."mimic-fn-1.2.0" - sources."minimist-1.2.0" - sources."minimist-options-3.0.2" - sources."mute-stream-0.0.7" - sources."ndjson-1.5.0" - (sources."neat-csv-2.1.0" // { + sources."map-obj-4.1.0" + sources."meow-6.0.1" + sources."merge-stream-2.0.0" + sources."mimic-fn-2.1.0" + sources."min-indent-1.0.0" + (sources."minimist-options-4.0.2" // { dependencies = [ - sources."get-stream-2.3.1" + sources."arrify-1.0.1" ]; }) - sources."nice-try-1.0.5" + sources."mute-stream-0.0.8" sources."normalize-package-data-2.5.0" - sources."npm-run-path-2.0.2" - sources."num-sort-1.0.0" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."onetime-2.0.1" + sources."npm-run-path-4.0.1" + sources."num-sort-2.0.0" + sources."once-1.4.0" + sources."onetime-5.1.0" sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."parse-json-4.0.0" - sources."path-exists-3.0.0" - sources."path-key-2.0.1" + sources."p-finally-2.0.1" + sources."p-limit-2.2.2" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parse-json-5.0.0" + sources."path-exists-4.0.0" + sources."path-key-3.1.1" sources."path-parse-1.0.6" - sources."path-type-3.0.0" (sources."pid-from-port-1.1.3" // { dependencies = [ sources."cross-spawn-5.1.0" sources."execa-0.9.0" + sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."path-key-2.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" ]; }) - sources."pify-3.0.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - (sources."process-exists-3.1.0" // { - dependencies = [ - sources."ps-list-4.1.0" - ]; - }) - sources."process-nextick-args-2.0.1" - sources."ps-list-5.0.1" + sources."process-exists-4.0.0" + sources."ps-list-6.3.0" sources."pseudomap-1.0.2" - sources."quick-lru-1.1.0" - sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" - sources."readable-stream-2.3.7" - sources."redent-2.0.0" + sources."pump-3.0.0" + sources."quick-lru-4.0.1" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + sources."read-pkg-up-7.0.1" + sources."redent-3.0.0" sources."resolve-1.15.1" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."run-async-2.3.0" sources."rxjs-6.5.4" - sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sec-1.0.0" sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.2" - sources."slice-ansi-1.0.0" + sources."slice-ansi-3.0.0" sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" - sources."split2-2.2.0" - sources."string-width-2.1.1" - sources."string_decoder-1.1.1" - sources."strip-ansi-4.0.0" - sources."strip-bom-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" - sources."strip-indent-2.0.0" - sources."supports-color-5.5.0" - (sources."taskkill-2.0.0" // { + sources."strip-final-newline-2.0.0" + sources."strip-indent-3.0.0" + sources."supports-color-7.1.0" + (sources."taskkill-3.1.0" // { dependencies = [ - sources."execa-0.1.1" - ]; - }) - (sources."tasklist-3.1.1" // { - dependencies = [ - sources."pify-2.3.0" + sources."execa-3.4.0" ]; }) sources."through-2.3.8" - sources."through2-2.0.5" sources."tmp-0.0.33" - sources."trim-newlines-2.0.0" + sources."trim-newlines-3.0.0" sources."tslib-1.10.0" - sources."util-deprecate-1.0.2" + sources."type-fest-0.8.1" sources."validate-npm-package-license-3.0.4" - sources."which-1.3.1" - sources."xtend-4.0.2" + sources."which-2.0.2" + sources."wrappy-1.0.2" sources."yallist-2.1.2" - sources."yargs-parser-10.1.0" + sources."yargs-parser-16.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -54043,7 +54346,7 @@ in (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ sources."sha.js-2.4.11" - sources."tweetnacl-1.0.2" + sources."tweetnacl-1.0.3" ]; }) sources."sodium-chloride-1.1.2" @@ -54051,7 +54354,7 @@ in sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-caps-1.1.0" - (sources."ssb-client-4.8.0" // { + (sources."ssb-client-4.9.0" // { dependencies = [ sources."ssb-config-3.4.4" ]; @@ -54173,7 +54476,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."conf-6.2.0" - sources."configstore-5.0.0" + sources."configstore-5.0.1" sources."cross-spawn-7.0.1" sources."crypto-random-string-2.0.0" sources."debounce-fn-3.0.1" @@ -54193,13 +54496,14 @@ in sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" sources."error-ex-1.3.2" + sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esutils-2.0.3" sources."execa-4.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."find-up-3.0.0" sources."fuse.js-3.4.6" sources."get-stream-5.1.0" @@ -54214,7 +54518,7 @@ in sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."hosted-git-info-2.8.5" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."import-lazy-2.1.0" @@ -54278,9 +54582,9 @@ in ]; }) sources."lowercase-keys-1.0.1" - sources."make-dir-3.0.0" + sources."make-dir-3.0.2" sources."map-obj-4.1.0" - sources."meow-6.0.0" + sources."meow-6.0.1" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" @@ -54317,6 +54621,7 @@ in sources."prepend-http-2.0.0" sources."pump-3.0.0" sources."punycode-2.1.1" + sources."pupa-2.0.1" sources."quick-lru-4.0.1" sources."rc-1.2.8" (sources."read-pkg-5.2.0" // { @@ -54373,7 +54678,7 @@ in sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" - sources."update-notifier-4.0.0" + sources."update-notifier-4.1.0" sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."validate-npm-package-license-3.0.4" @@ -54497,7 +54802,7 @@ in sources."chalk-2.4.2" sources."change-case-3.1.0" sources."chardet-0.7.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" @@ -54645,7 +54950,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."finalhandler-1.1.2" sources."find-0.2.9" sources."find-up-2.1.0" @@ -54709,7 +55014,7 @@ in sources."header-case-1.0.1" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.5" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -54781,7 +55086,7 @@ in }) sources."isstream-0.1.2" sources."iterall-1.3.0" - sources."js-base64-2.5.1" + sources."js-base64-2.5.2" sources."js-yaml-3.13.1" sources."jsbn-0.1.1" sources."jsesc-2.5.2" @@ -54972,7 +55277,7 @@ in sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" sources."replaceall-0.1.6" - sources."request-2.88.0" + sources."request-2.88.2" sources."request-promise-4.2.5" sources."request-promise-core-1.1.3" sources."require-directory-2.1.1" @@ -55056,11 +55361,7 @@ in sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."traverse-chain-0.1.0" sources."trim-right-1.0.1" sources."tslib-1.10.0" @@ -55478,7 +55779,7 @@ in sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."systeminformation-4.21.1" + sources."systeminformation-4.22.0" sources."term-canvas-0.0.5" sources."wordwrap-0.0.3" sources."x256-0.0.2" @@ -56541,7 +56842,7 @@ in sources."npm-2.15.12" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."safe-buffer-5.2.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.3.0" @@ -56692,7 +56993,7 @@ in ]; }) sources."chardet-0.7.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" sources."co-4.6.0" @@ -56745,7 +57046,7 @@ in sources."extend-3.0.2" sources."external-editor-3.1.0" sources."fast-levenshtein-2.0.6" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."file-uri-to-path-1.0.0" sources."form-data-2.5.1" sources."formidable-1.2.1" @@ -56878,7 +57179,7 @@ in sources."pump-3.0.0" sources."qs-6.9.1" sources."raw-body-2.4.1" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" sources."rimraf-3.0.2" sources."rsvp-3.6.2" @@ -57249,7 +57550,7 @@ in sources."read-pkg-2.0.0" sources."read-pkg-up-2.0.0" sources."readable-stream-2.3.7" - sources."request-2.88.0" + sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."resolve-1.15.1" @@ -57305,11 +57606,7 @@ in sources."tiny-emitter-2.1.0" sources."toml-3.0.0" sources."topsort-0.0.2" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."ts-process-promises-1.0.2" sources."tslib-1.9.3" sources."ttf2woff-2.0.1" @@ -57591,7 +57888,7 @@ in sources."caseless-0.12.0" sources."chalk-2.4.2" sources."charenc-0.0.2" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."chroma-js-2.1.0" sources."clean-css-4.2.3" sources."clean-html-1.5.0" @@ -57828,7 +58125,7 @@ in sources."mime-2.4.4" sources."mime-db-1.43.0" sources."mime-types-2.1.26" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."minipass-3.1.1" @@ -57852,7 +58149,7 @@ in sources."needle-2.4.0" sources."nextgen-events-1.3.0" sources."no-case-2.3.2" - (sources."node-abi-2.14.0" // { + (sources."node-abi-2.15.0" // { dependencies = [ sources."semver-5.7.1" ]; @@ -57917,15 +58214,13 @@ in sources."random-bytes-1.0.0" sources."rc-1.2.8" sources."read-chunk-2.1.0" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."reduce-flatten-1.0.1" sources."redux-3.7.2" sources."relateurl-0.2.7" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" - sources."punycode-1.4.1" - sources."tough-cookie-2.4.3" ]; }) sources."request-promise-core-1.1.3" @@ -57942,7 +58237,7 @@ in sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" - sources."seventh-0.7.30" + sources."seventh-0.7.34" (sources."sharp-0.23.4" // { dependencies = [ sources."tar-5.0.5" @@ -58016,7 +58311,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.32.3" + sources."terminal-kit-1.33.10" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -58356,19 +58651,24 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.15.1.tgz"; - sha512 = "6Vc6tC1uLasnMd6Ksnq+4gSQcRqLuSJ/yLoIG4fr4P8f5dAR1gbCqgaVRlk8jfRune0NXcrfDrz7liwAD2WEeQ=="; + url = "https://registry.npmjs.org/json-server/-/json-server-0.16.0.tgz"; + sha512 = "vdqfkMAiHUCHMkTRgxNJsd0c+lnczxFCxM8bewyalEiunDD8XWXsvgsezAt4iycqWV5aVoR//irtyUX50ZpSdA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" sources."accepts-1.3.7" sources."ajv-6.11.0" - sources."ansi-align-3.0.0" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."string-width-3.1.0" + ]; + }) sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.2.1" sources."array-flatten-1.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -58378,7 +58678,7 @@ in sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" - sources."boxen-3.2.0" + sources."boxen-4.2.0" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -58388,13 +58688,18 @@ in }) sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."chalk-2.4.2" + sources."chalk-3.0.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" - sources."cliui-5.0.0" + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."clone-response-1.0.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."compressible-2.0.18" (sources."compression-1.7.4" // { @@ -58402,7 +58707,7 @@ in sources."bytes-3.0.0" ]; }) - sources."configstore-4.0.0" + sources."configstore-5.0.1" sources."connect-pause-0.1.1" sources."content-disposition-0.5.3" sources."content-type-1.0.4" @@ -58410,8 +58715,7 @@ in sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cors-2.8.5" - sources."cross-spawn-5.1.0" - sources."crypto-random-string-1.0.0" + sources."crypto-random-string-2.0.0" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" @@ -58421,7 +58725,7 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."dot-prop-4.2.0" + sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" @@ -58429,10 +58733,9 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."errorhandler-1.5.1" + sources."escape-goat-2.1.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."execa-0.7.0" sources."express-4.17.1" (sources."express-urlrewrite-1.2.0" // { dependencies = [ @@ -58444,26 +58747,22 @@ in sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" - sources."find-up-3.0.0" + sources."find-up-4.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."get-caller-file-2.0.5" - sources."get-stream-3.0.0" + sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."global-dirs-0.1.1" - (sources."got-9.6.0" // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - }) + sources."global-dirs-2.0.1" + sources."got-9.6.0" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-yarn-2.1.0" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" @@ -58474,16 +58773,14 @@ in sources."ipaddr.js-1.9.0" sources."is-ci-2.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."is-installed-globally-0.1.0" - sources."is-npm-3.0.0" - sources."is-obj-1.0.1" - sources."is-path-inside-1.0.1" + sources."is-installed-globally-0.3.1" + sources."is-npm-4.0.0" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.2" sources."is-promise-2.1.0" - sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" - sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jju-1.4.0" sources."jsbn-0.1.1" @@ -58495,13 +58792,12 @@ in sources."jsprim-1.4.1" sources."keyv-3.1.0" sources."latest-version-5.1.0" - sources."locate-path-3.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.15" sources."lodash-id-0.14.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" - sources."make-dir-1.3.0" + sources."make-dir-3.0.2" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" (sources."method-override-3.0.0" // { @@ -58520,22 +58816,18 @@ in sources."nanoid-2.1.11" sources."negotiator-0.6.2" sources."normalize-url-4.5.0" - sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."p-cancelable-1.1.0" - sources."p-finally-1.0.0" sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."package-json-6.5.0" sources."parseurl-1.3.3" - sources."path-exists-3.0.0" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" + sources."path-exists-4.0.0" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" sources."pify-3.0.0" @@ -58543,17 +58835,17 @@ in sources."pluralize-8.0.0" sources."prepend-http-2.0.0" sources."proxy-addr-2.0.5" - sources."pseudomap-1.0.2" sources."psl-1.7.0" sources."pump-3.0.0" sources."punycode-2.1.1" + sources."pupa-2.0.1" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" ]; @@ -58565,11 +58857,7 @@ in sources."safer-buffer-2.1.2" sources."semver-6.3.0" sources."semver-compare-1.0.0" - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."semver-diff-3.1.1" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" @@ -58579,59 +58867,57 @@ in sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."steno-0.4.4" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."strip-eof-1.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" - sources."term-size-1.2.0" - sources."to-readable-stream-1.0.0" - sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { + (sources."string-width-4.2.0" // { dependencies = [ - sources."punycode-1.4.1" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."strip-ansi-6.0.0" ]; }) + sources."strip-ansi-5.2.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-7.1.0" + sources."term-size-2.2.0" + sources."to-readable-stream-1.0.0" + sources."toidentifier-1.0.0" + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-fest-0.3.1" + sources."type-fest-0.8.1" sources."type-is-1.6.18" - sources."unique-string-1.0.0" + sources."typedarray-to-buffer-3.1.5" + sources."unique-string-2.0.0" sources."unpipe-1.0.0" - sources."update-notifier-3.0.1" + sources."update-notifier-4.1.0" sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."which-1.3.1" sources."which-module-2.0.0" - (sources."widest-line-2.0.1" // { + sources."widest-line-3.1.0" + (sources."wrap-ansi-6.2.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" ]; }) - sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" - sources."xdg-basedir-3.0.0" + sources."write-file-atomic-3.0.1" + sources."xdg-basedir-4.0.0" sources."y18n-4.0.0" - sources."yallist-2.1.2" - sources."yargs-14.2.2" - sources."yargs-parser-15.0.0" + sources."yargs-15.1.0" + sources."yargs-parser-16.1.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Serves JSON files through REST routes."; + description = "Get a full fake REST API with zero coding in less than 30 seconds"; homepage = https://github.com/typicode/json-server; license = "MIT"; }; @@ -59330,7 +59616,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -59398,7 +59684,7 @@ in sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."ci-info-2.0.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -59468,7 +59754,7 @@ in sources."concat-stream-2.0.0" sources."meow-4.0.1" sources."minimist-1.2.0" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."copy-concurrently-1.0.5" @@ -59943,7 +60229,7 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."repeating-2.0.1" - sources."request-2.88.0" + sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."resolve-1.15.1" @@ -60086,11 +60372,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tr46-1.0.1" sources."trim-newlines-2.0.0" sources."trim-off-newlines-1.0.1" @@ -60185,10 +60467,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.11.0"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.11.0.tgz"; - sha512 = "dAui5qzfxuWY7BIEt9/gy5EbDhwDb44rqaIUFYeu8wEE8huMZ/PzB+gNFONEG5DUPrOrOGcAjGeYVg6AFiA9KQ=="; + url = "https://registry.npmjs.org/less/-/less-3.11.1.tgz"; + sha512 = "tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g=="; }; dependencies = [ sources."ajv-6.11.0" @@ -60238,16 +60520,13 @@ in sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."request-2.88.0" + sources."request-2.88.2" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."source-map-0.6.1" sources."sshpk-1.16.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" + sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" @@ -60974,7 +61253,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" ]; @@ -61084,11 +61363,7 @@ in ]; }) sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -61229,7 +61504,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -61423,7 +61698,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.8.6" + sources."browserslist-4.8.7" sources."buffer-5.4.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -61446,7 +61721,7 @@ in }) sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001025" + sources."caniuse-lite-1.0.30001027" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -61473,7 +61748,7 @@ in sources."normalize-path-3.0.0" ]; }) - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { @@ -61603,7 +61878,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.346" + sources."electron-to-chromium-1.3.353" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" @@ -61795,7 +62070,7 @@ in ]; }) sources."get-stream-4.1.0" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."normalize-url-4.5.0" sources."p-cancelable-1.1.0" ]; @@ -61980,7 +62255,7 @@ in sources."punycode-1.4.1" ]; }) - (sources."node-releases-1.1.48" // { + (sources."node-releases-1.1.49" // { dependencies = [ sources."semver-6.3.0" ]; @@ -62166,7 +62441,7 @@ in sources."regex-not-1.0.2" sources."regexpu-core-4.6.0" sources."regjsgen-0.5.1" - (sources."regjsparser-0.6.2" // { + (sources."regjsparser-0.6.3" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -62394,7 +62669,7 @@ in sources."vm-browserify-1.1.2" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.41.5" // { + (sources."webpack-4.41.6" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -62437,7 +62712,7 @@ in sources."ms-2.0.0" ]; }) - (sources."webpack-cli-3.3.10" // { + (sources."webpack-cli-3.3.11" // { dependencies = [ sources."enhanced-resolve-4.1.0" sources."memory-fs-0.4.1" @@ -62498,10 +62773,10 @@ in madoko = nodeEnv.buildNodePackage { name = "madoko"; packageName = "madoko"; - version = "1.1.8"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/madoko/-/madoko-1.1.8.tgz"; - sha512 = "SYChn9LZ7X8hXFHe/y11cebSC4N1+F7LncYCunRX2IW4u5w2y0J2wWw+RicYm6+JZORI61EdzgJFWqQDjgsAEQ=="; + url = "https://registry.npmjs.org/madoko/-/madoko-1.2.0.tgz"; + sha512 = "MTpclhNPFArohFqLNqA+3/6JycVgwiFD8d6i7zuELvs1BDKQv8m4fw2SOSnkFddFnU/FcYLl0P0UkIe0YZ4GZA=="; }; dependencies = [ sources."amdefine-1.0.1" @@ -62580,16 +62855,12 @@ in sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."request-2.88.0" + sources."request-2.88.2" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sshpk-1.16.1" sources."supports-color-5.5.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" @@ -62835,7 +63106,11 @@ in sources."ecc-jsbn-0.1.2" sources."end-of-stream-0.1.5" sources."errno-0.1.7" - sources."es5-ext-0.10.53" + (sources."es5-ext-0.10.53" // { + dependencies = [ + sources."next-tick-1.0.0" + ]; + }) sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -63132,7 +63407,7 @@ in sources."multipipe-0.1.2" sources."nanomatch-1.2.13" sources."natives-1.1.6" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."normalize-path-2.1.1" sources."now-and-later-2.0.1" sources."oauth-sign-0.8.2" @@ -63618,9 +63893,9 @@ in sources."ms-2.1.2" sources."one-time-0.0.4" sources."process-nextick-args-2.0.1" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."safe-buffer-5.2.0" - sources."semver-7.1.2" + sources."semver-7.1.3" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."string_decoder-1.3.0" @@ -63691,7 +63966,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -63753,7 +64028,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.7" - sources."request-2.88.0" + sources."request-2.88.2" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -63765,11 +64040,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."tar-4.4.13" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" @@ -64123,7 +64394,7 @@ in sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" @@ -64292,7 +64563,7 @@ in }) sources."caseless-0.12.0" sources."cheerio-0.22.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."clone-2.1.2" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" @@ -64585,7 +64856,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."regenerator-runtime-0.13.3" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" @@ -64728,7 +64999,7 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -64836,7 +65107,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."request-2.88.0" + sources."request-2.88.2" sources."resolve-1.15.1" sources."retry-0.10.1" sources."rimraf-2.6.3" @@ -64862,11 +65133,7 @@ in sources."strip-ansi-3.0.1" sources."tar-4.4.13" sources."temp-0.9.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" @@ -64994,7 +65261,7 @@ in sources."timed-out-4.0.1" sources."to-regex-range-5.0.1" sources."touch-3.1.0" - (sources."undefsafe-2.0.2" // { + (sources."undefsafe-2.0.3" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -65083,7 +65350,7 @@ in }) sources."camelcase-5.3.1" sources."chalk-3.0.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."ci-info-2.0.0" sources."cint-8.2.1" sources."clean-stack-2.2.0" @@ -65148,7 +65415,7 @@ in sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.2" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."http-proxy-agent-3.0.0" sources."https-proxy-agent-4.0.0" sources."humanize-ms-1.2.1" @@ -65241,19 +65508,19 @@ in sources."npm-normalize-package-bin-1.0.1" (sources."npm-package-arg-8.0.0" // { dependencies = [ - sources."semver-7.1.2" + sources."semver-7.1.3" ]; }) - sources."npm-packlist-2.0.3" + sources."npm-packlist-2.1.0" (sources."npm-pick-manifest-5.0.0" // { dependencies = [ - sources."semver-7.1.2" + sources."semver-7.1.3" ]; }) - (sources."npm-registry-fetch-6.0.0" // { + (sources."npm-registry-fetch-6.0.2" // { dependencies = [ sources."safe-buffer-5.2.0" - sources."semver-7.1.2" + sources."semver-7.1.3" ]; }) sources."npm-run-path-2.0.2" @@ -65270,7 +65537,7 @@ in sources."package-json-6.5.0" (sources."pacote-10.3.2" // { dependencies = [ - sources."semver-7.1.2" + sources."semver-7.1.3" ]; }) sources."path-exists-4.0.0" @@ -65284,7 +65551,7 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" - sources."prompts-2.3.0" + sources."prompts-2.3.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" (sources."rc-1.2.8" // { @@ -65509,7 +65776,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."request-2.88.0" + sources."request-2.88.2" sources."retry-0.6.0" sources."rimraf-2.7.1" sources."safe-buffer-5.2.0" @@ -65537,11 +65804,7 @@ in sources."rimraf-2.1.4" ]; }) - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."underscore-1.4.4" @@ -65796,7 +66059,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.8.6" + sources."browserslist-4.8.7" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -65813,7 +66076,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001025" + sources."caniuse-lite-1.0.30001027" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -65943,13 +66206,13 @@ in sources."domexception-1.0.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."dot-prop-4.2.0" + sources."dot-prop-5.2.0" sources."dotenv-5.0.1" sources."dotenv-expand-5.1.0" sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.346" + sources."electron-to-chromium-1.3.353" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -66052,7 +66315,7 @@ in }) (sources."htmlparser2-3.10.1" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."http-errors-1.7.3" @@ -66095,7 +66358,7 @@ in sources."is-glob-4.0.1" sources."is-html-1.1.0" sources."is-number-3.0.0" - sources."is-obj-1.0.1" + sources."is-obj-2.0.0" sources."is-plain-object-2.0.4" sources."is-regex-1.0.5" sources."is-resolvable-1.1.0" @@ -66199,7 +66462,7 @@ in sources."punycode-1.4.1" ]; }) - (sources."node-releases-1.1.48" // { + (sources."node-releases-1.1.49" // { dependencies = [ sources."semver-6.3.0" ]; @@ -66261,7 +66524,7 @@ in sources."postcss-merge-longhand-4.0.11" (sources."postcss-merge-rules-4.0.3" // { dependencies = [ - sources."postcss-selector-parser-3.1.1" + sources."postcss-selector-parser-3.1.2" ]; }) sources."postcss-minify-font-values-4.0.2" @@ -66269,7 +66532,7 @@ in sources."postcss-minify-params-4.0.2" (sources."postcss-minify-selectors-4.0.2" // { dependencies = [ - sources."postcss-selector-parser-3.1.1" + sources."postcss-selector-parser-3.1.2" ]; }) (sources."postcss-modules-extract-imports-1.1.0" // { @@ -66354,7 +66617,7 @@ in }) sources."regexpu-core-4.6.0" sources."regjsgen-0.5.1" - (sources."regjsparser-0.6.2" // { + (sources."regjsparser-0.6.3" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -66362,12 +66625,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - (sources."request-2.88.0" // { - dependencies = [ - sources."punycode-1.4.1" - sources."tough-cookie-2.4.3" - ]; - }) + sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" @@ -66463,7 +66721,7 @@ in sources."strip-ansi-4.0.0" (sources."stylehacks-4.0.3" // { dependencies = [ - sources."postcss-selector-parser-3.1.1" + sources."postcss-selector-parser-3.1.2" ]; }) sources."supports-color-5.5.0" @@ -66493,7 +66751,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" - (sources."uncss-0.17.2" // { + (sources."uncss-0.17.3" // { dependencies = [ sources."cssesc-3.0.0" sources."is-absolute-url-3.0.3" @@ -67153,8 +67411,8 @@ in sources."raw-body-2.4.0" sources."re-emitter-1.1.4" sources."read-torrent-1.3.1" - sources."readable-stream-3.5.0" - (sources."request-2.88.0" // { + sources."readable-stream-3.6.0" + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" ]; @@ -67233,11 +67491,7 @@ in sources."once-1.3.3" ]; }) - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -67321,7 +67575,7 @@ in sources."fs.realpath-1.0.0" sources."gaze-1.1.3" sources."glob-7.1.6" - sources."globule-1.3.0" + sources."globule-1.3.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isexe-2.0.0" @@ -67355,7 +67609,7 @@ in sources."JSONStream-1.3.5" sources."acorn-7.1.0" sources."acorn-node-1.8.2" - sources."acorn-walk-7.0.0" + sources."acorn-walk-7.1.1" sources."asn1.js-4.10.1" (sources."assert-1.5.0" // { dependencies = [ @@ -67405,7 +67659,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."console-browserify-1.2.0" @@ -67438,7 +67692,7 @@ in sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.6" - sources."globule-1.3.0" + sources."globule-1.3.1" sources."graceful-fs-4.2.3" sources."has-1.0.3" sources."hash-base-3.0.4" @@ -67537,7 +67791,7 @@ in sources."stream-combiner2-1.1.1" (sources."stream-http-3.1.0" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."stream-splicer-2.0.1" @@ -67869,7 +68123,7 @@ in (sources."openid-2.0.6" // { dependencies = [ sources."qs-6.5.2" - sources."request-2.88.0" + sources."request-2.88.2" ]; }) sources."pause-0.0.1" @@ -67889,11 +68143,7 @@ in sources."stream-counter-0.2.0" sources."string-1.6.1" sources."string_decoder-0.10.31" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid2-0.0.3" @@ -67914,10 +68164,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.2.tgz"; - sha512 = "BJs9T/H8sEVHbeigqzIEo57Iu/3DG6c4QoqTfbQB3BPA4zgzAomh/Fk9E7QtjWQ8mx2dgA9YCfSF4y9k9bHNpQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz"; + sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA=="; }; buildInputs = globalBuildInputs; meta = { @@ -68057,11 +68307,11 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-3.3.0" // { + (sources."@serverless/enterprise-plugin-3.4.0" // { dependencies = [ sources."fs-extra-8.1.0" sources."node-fetch-2.6.0" - sources."semver-7.1.2" + sources."semver-6.3.0" sources."uuid-3.4.0" ]; }) @@ -68108,7 +68358,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.614.0" // { + (sources."aws-sdk-2.620.0" // { dependencies = [ sources."buffer-4.9.1" sources."uuid-3.3.2" @@ -68302,7 +68552,7 @@ in sources."external-editor-3.1.0" sources."fast-levenshtein-2.0.6" sources."fd-slicer-1.1.0" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."file-type-8.1.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" @@ -68359,7 +68609,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."https-proxy-agent-4.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" @@ -68623,7 +68873,7 @@ in sources."split-string-3.1.0" (sources."split2-3.1.1" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."sprintf-js-1.0.3" @@ -68915,7 +69165,7 @@ in sources."raw-body-2.4.0" sources."read-1.0.7" sources."readable-stream-1.1.14" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" ]; @@ -68966,11 +69216,7 @@ in sources."tinycolor-0.0.1" sources."to-array-0.1.3" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -69393,10 +69639,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.290.2"; + version = "1.292.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.290.2.tgz"; - sha512 = "siieHkSY/b3Yw1Gf84L07j65m2Bht1PamAbX3cmZ1zAzsUxfXpqZq5W9PlAp5z1d0Tp1vxsQmXw6UGW0K1Tq1Q=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.292.0.tgz"; + sha512 = "ga4ouBqRc897Ts80yzdZG25zqGgbU3ah8VKtLyRjK1ZmApHy+PRi2zBVJcwMspyfhyaCh47vr1siIqHler4rxg=="; }; dependencies = [ sources."@snyk/cli-interface-2.3.0" @@ -69417,7 +69663,7 @@ in sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/js-yaml-3.12.2" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@types/restify-4.3.6" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.3" @@ -69437,7 +69683,7 @@ in sources."balanced-match-1.0.0" (sources."bl-3.0.0" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" ]; }) @@ -69687,7 +69933,7 @@ in ]; }) sources."snyk-module-1.9.1" - (sources."snyk-mvn-plugin-2.8.0" // { + (sources."snyk-mvn-plugin-2.9.0" // { dependencies = [ sources."@snyk/cli-interface-2.3.1" sources."debug-4.1.1" @@ -69747,7 +69993,7 @@ in sources."supports-color-5.5.0" (sources."tar-stream-2.1.0" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" ]; }) @@ -70355,7 +70601,7 @@ in sources."level-errors-2.0.1" (sources."level-iterator-stream-4.0.2" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."level-js-4.0.2" @@ -70708,7 +70954,7 @@ in (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ sources."sha.js-2.4.11" - sources."tweetnacl-1.0.2" + sources."tweetnacl-1.0.3" ]; }) sources."sodium-chloride-1.1.2" @@ -70720,7 +70966,7 @@ in sources."split-string-3.1.0" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" - sources."ssb-client-4.8.0" + sources."ssb-client-4.9.0" sources."ssb-config-3.4.4" sources."ssb-db-19.2.0" sources."ssb-ebt-5.6.7" @@ -70948,7 +71194,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.614.0" // { + (sources."aws-sdk-2.620.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -71221,7 +71467,7 @@ in sources."isstream-0.1.2" sources."jmespath-0.15.0" sources."jpeg-turbo-0.4.0" - sources."js-base64-2.5.1" + sources."js-base64-2.5.2" sources."js-stringify-1.0.2" sources."js-yaml-3.2.7" sources."jsbn-0.1.1" @@ -71427,7 +71673,7 @@ in }) sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."assert-plus-1.0.0" sources."aws-sign2-0.7.0" @@ -71436,8 +71682,9 @@ in sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."oauth-sign-0.9.0" + sources."punycode-2.1.1" sources."qs-6.5.2" - sources."tough-cookie-2.4.3" + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" ]; }) @@ -72372,7 +72619,7 @@ in sources."source-map-0.6.1" ]; }) - sources."undefsafe-2.0.2" + sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ sources."is-extendable-0.1.1" @@ -72438,7 +72685,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."ajv-6.11.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -72511,7 +72758,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."ramda-0.25.0" - sources."request-2.88.0" + sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."safe-buffer-5.2.0" @@ -72530,13 +72777,9 @@ in sources."strip-ansi-5.2.0" sources."telegraf-3.36.0" sources."telegram-typings-3.6.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" - sources."tweetnacl-1.0.2" + sources."tweetnacl-1.0.3" sources."uri-js-4.2.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -73165,12 +73408,12 @@ in sources."unified-message-control-1.0.4" sources."unique-string-1.0.0" sources."unist-util-is-3.0.0" - sources."unist-util-modify-children-1.1.5" - sources."unist-util-position-3.0.4" + sources."unist-util-modify-children-1.1.6" + sources."unist-util-position-3.1.0" sources."unist-util-remove-position-1.1.4" sources."unist-util-stringify-position-1.1.2" sources."unist-util-visit-1.4.1" - sources."unist-util-visit-children-1.1.3" + sources."unist-util-visit-children-1.1.4" sources."unist-util-visit-parents-2.1.2" sources."untildify-2.1.0" sources."unzip-response-2.0.1" @@ -73365,7 +73608,7 @@ in sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."object.values-1.1.1" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."safe-buffer-5.2.0" sources."sentence-splitter-3.2.0" sources."string.prototype.trimleft-2.1.1" @@ -73431,10 +73674,10 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.1.tgz"; - sha512 = "TUnOIMXl850Px9bl3H522UeeStmh92EYwXXnkMZOBIerHwFLG2KaaH+qGN+FaL0EugKj6WY8QKG6jOufGAiJsQ=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.2.tgz"; + sha512 = "Z96YepMqs2iS3shN8BxegxLQg0g6CQdmvooJ6MA/pmJPZyD+EMuBHqXOkE52GRuz2Z73m3vnh3/BLaryzsMNtw=="; }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" @@ -73461,10 +73704,10 @@ in textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; packageName = "textlint-rule-terminology"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.1.tgz"; - sha512 = "955Q289wCubt67iar/U3jnsPvwHkRhWnOM0gqE3fQDBMJkFsoDnYNummU8CmAPXK7usnbwa2r48q0s4FtATWbw=="; + url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.3.tgz"; + sha512 = "RpbATk2+M35bAXnDQZGL54ILNPXHy8e8GIl3AJLiywG251L2bQYqvAhLaA7ad9qsrDOXQiGFIkd562KnP5CPkw=="; }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" @@ -73581,7 +73824,7 @@ in sources."@types/color-name-1.1.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -73631,7 +73874,7 @@ in sources."caseless-0.12.0" sources."chalk-3.0.0" sources."cheerio-1.0.0-rc.3" - sources."chownr-1.1.3" + sources."chownr-1.1.4" (sources."clone-response-1.0.2" // { dependencies = [ sources."mimic-response-1.0.1" @@ -73737,7 +73980,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -73791,7 +74034,7 @@ in sources."mime-1.6.0" sources."mime-db-1.42.0" sources."mime-types-2.1.25" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -73880,11 +74123,11 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."regenerator-runtime-0.13.3" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" ]; @@ -73949,11 +74192,7 @@ in sources."to-array-0.1.4" sources."to-readable-stream-2.1.0" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -74458,7 +74697,7 @@ in sources."universalify-0.1.2" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.15.2" + sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-types-3.15.1" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" @@ -74708,7 +74947,7 @@ in sources."map-age-cleaner-0.1.3" sources."media-typer-0.3.0" sources."mem-4.3.0" - (sources."memorystore-1.6.1" // { + (sources."memorystore-1.6.2" // { dependencies = [ sources."debug-3.1.0" ]; @@ -74795,7 +75034,7 @@ in ]; }) sources."readable-stream-2.3.7" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" ]; @@ -74862,18 +75101,14 @@ in sources."debug-4.1.1" sources."mime-2.4.4" sources."ms-2.1.2" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."semver-6.3.0" ]; }) sources."temp-0.9.1" sources."to-array-0.1.4" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -74940,7 +75175,7 @@ in sources."vscode-css-languageservice-3.0.13" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.15.2" + sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" sources."vscode-languageserver-types-3.15.1" sources."vscode-nls-4.1.1" @@ -74978,7 +75213,7 @@ in }) sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.15.2" + sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" sources."vscode-languageserver-types-3.15.1" sources."vscode-nls-3.2.5" @@ -75204,7 +75439,7 @@ in ]; }) sources."recursive-readdir-2.2.2" - sources."request-2.88.0" + sources."request-2.88.2" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" sources."run-async-2.3.0" @@ -75249,11 +75484,7 @@ in sources."tmp-0.0.33" sources."to-buffer-1.1.1" sources."toml-2.3.6" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" @@ -75316,7 +75547,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -75523,7 +75754,7 @@ in sources."ignore-4.0.6" ]; }) - (sources."eslint-plugin-vue-6.1.2" // { + (sources."eslint-plugin-vue-6.2.1" // { dependencies = [ sources."acorn-7.1.0" sources."debug-4.1.1" @@ -75537,7 +75768,7 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-5.0.1" sources."esprima-4.0.1" - sources."esquery-1.0.1" + sources."esquery-1.1.0" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -75663,7 +75894,7 @@ in sources."hosted-git-info-2.8.5" sources."html-void-elements-1.0.5" sources."html-whitespace-sensitive-tag-names-1.0.1" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" (sources."import-fresh-3.2.1" // { @@ -75752,7 +75983,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.rest-4.0.5" sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.6" + sources."loglevel-1.6.7" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -76186,7 +76417,7 @@ in sources."unist-util-find-1.0.1" sources."unist-util-inspect-4.1.4" sources."unist-util-is-2.1.3" - sources."unist-util-modify-children-1.1.5" + sources."unist-util-modify-children-1.1.6" sources."unist-util-remove-position-1.1.4" sources."unist-util-stringify-position-2.0.2" sources."unist-util-visit-1.4.1" @@ -76233,7 +76464,7 @@ in sources."vscode-emmet-helper-1.2.17" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.15.2" + sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-types-3.15.1" sources."vscode-nls-4.1.1" sources."vscode-textbuffer-1.0.0" @@ -76287,39 +76518,40 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-4.0.0.tgz"; - sha512 = "778HKIoWpIrZzOq7rPA7Fu7YQ/fnZ6w9XCKUqGJRjo2NgOtgtkLmkd7lCw3gU7KJYe7hurI5XYossJMgjmyNaQ=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-4.1.0.tgz"; + sha512 = "nhAeZ3BHI4rCT/J+s7JHg0U3G6qUMV8Bi44ohWm8X6GjlQV8tGcD6rkvN4Zk2zzMGaF9sHUOcRjyN79Ih8P/PQ=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + (sources."@babel/highlight-7.8.3" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."@babel/polyfill-7.7.0" sources."@babel/runtime-7.7.7" - sources."@babel/runtime-corejs2-7.8.4" + sources."@babel/runtime-corejs3-7.8.4" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."JSONSelect-0.2.1" sources."acorn-6.4.0" sources."acorn-jsx-5.1.0" sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.19.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."decamelize-1.2.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."yargs-14.0.0" - ]; - }) + sources."addons-linter-1.20.0" sources."adm-zip-0.4.14" sources."ajv-6.10.2" sources."ajv-keywords-1.5.1" @@ -76333,7 +76565,7 @@ in }) sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.2.1" sources."any-promise-1.3.0" sources."anymatch-2.0.0" (sources."archiver-2.1.1" // { @@ -76409,16 +76641,10 @@ in (sources."boxen-4.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."emoji-regex-8.0.0" - sources."has-flag-4.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" ]; }) sources."brace-expansion-1.1.11" @@ -76447,7 +76673,7 @@ in sources."callsites-0.2.0" sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."chalk-2.4.2" + sources."chalk-3.0.0" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.3" (sources."chokidar-2.1.8" // { @@ -76479,11 +76705,13 @@ in sources."cli-boxes-2.2.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - (sources."cliui-5.0.0" // { + (sources."cliui-6.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) sources."clone-1.0.4" @@ -76491,8 +76719,8 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.8" @@ -76514,9 +76742,10 @@ in sources."string_decoder-1.1.1" ]; }) - sources."configstore-5.0.0" + sources."configstore-5.0.1" sources."copy-descriptor-0.1.1" sources."core-js-2.6.11" + sources."core-js-pure-3.6.4" sources."core-util-is-1.0.2" sources."crc-3.8.0" (sources."crc32-stream-2.0.0" // { @@ -76551,7 +76780,7 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - (sources."dispensary-0.48.1" // { + (sources."dispensary-0.49.0" // { dependencies = [ sources."async-3.1.1" ]; @@ -76590,12 +76819,18 @@ in (sources."eslint-5.16.0" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."debug-4.1.1" sources."espree-5.0.1" + sources."has-flag-3.0.0" sources."ms-2.1.2" sources."semver-5.7.1" sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" ]; }) (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { @@ -76650,7 +76885,7 @@ in ]; }) sources."esprima-4.0.1" - sources."esquery-1.0.1" + sources."esquery-1.1.0" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -76713,7 +76948,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."find-up-3.0.0" + sources."find-up-4.1.0" (sources."firefox-profile-1.3.0" // { dependencies = [ sources."async-2.5.0" @@ -76769,7 +77004,7 @@ in sources."har-validator-5.1.3" sources."has-1.0.3" sources."has-ansi-2.0.0" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -76779,7 +77014,7 @@ in }) sources."has-yarn-2.1.0" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" @@ -76797,7 +77032,13 @@ in (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" sources."strip-ansi-5.2.0" + sources."supports-color-5.5.0" ]; }) sources."interpret-1.2.0" @@ -76887,7 +77128,7 @@ in sources."levn-0.3.0" sources."lighthouse-logger-1.2.0" sources."lines-and-columns-1.1.6" - sources."locate-path-3.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.15" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" @@ -76898,12 +77139,16 @@ in sources."lodash.once-4.1.1" sources."lodash.sortby-4.7.0" sources."lowercase-keys-1.0.1" - sources."make-dir-3.0.0" + (sources."make-dir-3.0.2" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.1" + sources."mdn-browser-compat-data-1.0.3" (sources."mem-5.1.1" // { dependencies = [ sources."mimic-fn-2.1.0" @@ -76942,7 +77187,11 @@ in sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-forge-0.7.6" - sources."node-notifier-6.0.0" + (sources."node-notifier-6.0.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" @@ -76982,9 +77231,13 @@ in sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."package-json-6.5.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."pako-1.0.11" (sources."parent-module-1.0.1" // { dependencies = [ @@ -76995,19 +77248,28 @@ in sources."parse5-3.0.3" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pino-5.14.0" + sources."pino-5.15.0" sources."pino-std-serializers-2.4.2" sources."pluralize-1.2.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.24" // { + (sources."postcss-7.0.26" // { dependencies = [ + sources."ansi-styles-3.2.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" sources."supports-color-6.1.0" ]; }) @@ -77026,7 +77288,7 @@ in sources."strip-json-comments-2.0.1" ]; }) - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" (sources."readdirp-2.2.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -77047,11 +77309,20 @@ in sources."regexpp-2.0.1" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" - sources."relaxed-json-1.0.3" + (sources."relaxed-json-1.0.3" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."request-2.88.0" + sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."require-uncached-1.0.3" @@ -77070,8 +77341,12 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-6.3.0" - sources."semver-diff-3.1.1" + sources."semver-7.1.1" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -77085,13 +77360,22 @@ in sources."shell-quote-1.6.1" sources."shelljs-0.7.8" sources."shellwords-0.1.1" - (sources."sign-addon-2.0.4" // { + (sources."sign-addon-2.0.5" // { dependencies = [ - sources."core-js-3.6.0" + sources."core-js-3.6.4" + sources."punycode-1.4.1" + sources."request-2.88.0" + sources."tough-cookie-2.4.3" ]; }) sources."signal-exit-3.0.2" - sources."slice-ansi-2.1.0" + (sources."slice-ansi-2.1.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -77172,7 +77456,7 @@ in sources."strip-bom-stream-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-3.0.1" - sources."supports-color-5.5.0" + sources."supports-color-7.1.0" (sources."table-5.4.6" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -77203,12 +77487,8 @@ in sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."tosource-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tr46-1.0.1" + sources."tough-cookie-2.5.0" + sources."tr46-2.0.0" sources."traverse-0.4.6" sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" @@ -77237,16 +77517,7 @@ in ]; }) sources."upath-1.2.0" - (sources."update-notifier-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.1.0" - ]; - }) + sources."update-notifier-4.0.0" sources."uri-js-4.2.2" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" @@ -77257,8 +77528,8 @@ in sources."verror-1.10.0" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - sources."webidl-conversions-4.0.2" - sources."whatwg-url-7.1.0" + sources."webidl-conversions-5.0.0" + sources."whatwg-url-8.0.0" sources."when-3.7.7" sources."which-1.3.1" sources."which-module-2.0.0" @@ -77273,11 +77544,13 @@ in }) sources."winreg-0.0.12" sources."word-wrap-1.2.3" - (sources."wrap-ansi-5.1.0" // { + (sources."wrap-ansi-6.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) sources."wrappy-1.0.2" @@ -77287,30 +77560,20 @@ in sources."xdg-basedir-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - sources."xregexp-4.2.4" + sources."xregexp-4.3.0" sources."xtend-4.0.2" sources."y18n-4.0.0" - (sources."yargs-15.0.2" // { + (sources."yargs-15.1.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" - sources."cliui-6.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."decamelize-1.2.0" sources."emoji-regex-8.0.0" - sources."find-up-4.1.0" sources."is-fullwidth-code-point-3.0.0" - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" - sources."path-exists-4.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."wrap-ansi-6.2.0" - sources."yargs-parser-16.1.0" ]; }) - (sources."yargs-parser-13.1.1" // { + (sources."yargs-parser-16.1.0" // { dependencies = [ sources."decamelize-1.2.0" ]; @@ -77342,10 +77605,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.41.5"; + version = "4.41.6"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.41.5.tgz"; - sha512 = "wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz"; + sha512 = "yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA=="; }; dependencies = [ sources."@webassemblyjs/ast-1.8.5" @@ -77424,7 +77687,7 @@ in sources."cacache-12.0.3" sources."cache-base-1.0.1" sources."chokidar-2.1.8" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { @@ -77823,10 +78086,10 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.10"; + version = "3.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz"; - sha512 = "u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz"; + sha512 = "dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g=="; }; dependencies = [ sources."ansi-regex-4.1.0" @@ -78149,6 +78412,744 @@ in bypassCache = true; reconstructLock = true; }; + webpack-dev-server = nodeEnv.buildNodePackage { + name = "webpack-dev-server"; + packageName = "webpack-dev-server"; + version = "3.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz"; + sha512 = "e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ=="; + }; + dependencies = [ + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-13.7.1" + sources."accepts-1.3.7" + sources."ajv-6.11.0" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.4.1" + sources."ansi-colors-3.2.4" + sources."ansi-html-0.0.7" + sources."ansi-regex-2.1.1" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-flatten-2.1.2" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."async-2.6.3" + sources."async-each-1.0.3" + sources."async-limiter-1.0.1" + sources."atob-2.1.2" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."batch-0.6.1" + sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."bytes-3.1.0" + sources."debug-2.6.9" + ]; + }) + sources."bonjour-3.5.0" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."buffer-indexof-1.1.1" + sources."bytes-3.0.0" + sources."cache-base-1.0.1" + sources."camelcase-5.3.1" + sources."chokidar-2.1.8" + (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."cliui-4.1.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."component-emitter-1.3.0" + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."safe-buffer-5.1.2" + ]; + }) + sources."concat-map-0.0.1" + sources."connect-history-api-fallback-1.6.0" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + (sources."debug-4.1.1" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-equal-1.1.1" + sources."default-gateway-4.2.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."del-4.1.1" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."detect-node-2.0.4" + sources."dns-equal-1.0.0" + sources."dns-packet-1.3.1" + sources."dns-txt-2.0.2" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."errno-0.1.7" + sources."es-abstract-1.17.4" + sources."es-to-primitive-1.2.1" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."eventemitter3-4.0.0" + sources."eventsource-1.0.7" + sources."execa-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + 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."is-extendable-0.1.1" + sources."kind-of-5.1.0" + ]; + }) + (sources."express-4.17.1" // { + dependencies = [ + sources."array-flatten-1.1.1" + sources."debug-2.6.9" + sources."safe-buffer-5.1.2" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."fast-deep-equal-3.1.1" + sources."fast-json-stable-stringify-2.1.0" + sources."faye-websocket-0.10.0" + sources."file-uri-to-path-1.0.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."find-up-3.0.0" + (sources."follow-redirects-1.10.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."for-in-1.0.2" + sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.11" + sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."glob-7.1.6" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + sources."graceful-fs-4.2.3" + sources."handle-thing-2.0.0" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."hpack.js-2.1.6" + sources."html-entities-1.2.1" + sources."http-deceiver-1.2.7" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-parser-js-0.4.10" + sources."http-proxy-1.18.0" + sources."http-proxy-middleware-0.19.1" + sources."iconv-lite-0.4.24" + sources."import-local-2.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."internal-ip-4.3.0" + sources."invert-kv-2.0.0" + sources."ip-1.1.5" + sources."ip-regex-2.1.0" + sources."ipaddr.js-1.9.0" + sources."is-absolute-url-3.0.3" + sources."is-accessor-descriptor-1.0.0" + sources."is-arguments-1.0.4" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-callable-1.1.5" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-4.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-path-cwd-2.2.0" + sources."is-path-in-cwd-2.1.0" + sources."is-path-inside-2.1.0" + sources."is-plain-object-2.0.4" + sources."is-regex-1.0.5" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.3" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."json-schema-traverse-0.4.1" + sources."json3-3.3.3" + sources."killable-1.0.1" + sources."kind-of-6.0.3" + sources."lcid-2.0.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.15" + sources."loglevel-1.6.7" + sources."map-age-cleaner-0.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."media-typer-0.3.0" + sources."mem-4.3.0" + sources."memory-fs-0.4.1" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."micromatch-3.1.10" + sources."mime-1.6.0" + sources."mime-db-1.43.0" + sources."mime-types-2.1.26" + sources."mimic-fn-2.1.0" + sources."minimalistic-assert-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mixin-deep-1.3.2" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."multicast-dns-6.2.3" + sources."multicast-dns-service-types-1.1.0" + sources."nan-2.14.0" + sources."nanomatch-1.2.13" + sources."negotiator-0.6.2" + sources."nice-try-1.0.5" + sources."node-forge-0.9.0" + sources."normalize-path-3.0.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.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-inspect-1.7.0" + sources."object-is-1.0.2" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.pick-1.3.0" + sources."obuf-1.1.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."opn-5.5.0" + sources."original-1.0.2" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.2.2" + sources."p-locate-3.0.0" + sources."p-map-2.1.0" + sources."p-retry-3.0.1" + sources."p-try-2.2.0" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-to-regexp-0.1.7" + sources."pify-4.0.1" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkg-dir-3.0.0" + (sources."portfinder-1.0.25" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."posix-character-classes-0.1.1" + sources."process-nextick-args-2.0.1" + sources."proxy-addr-2.0.5" + sources."prr-1.0.1" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."qs-6.7.0" + sources."querystring-0.2.0" + sources."querystringify-2.1.1" + sources."range-parser-1.2.1" + (sources."raw-body-2.4.0" // { + dependencies = [ + sources."bytes-3.1.0" + ]; + }) + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."readdirp-2.2.1" + sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.3.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."requires-port-1.0.0" + sources."resolve-cwd-2.0.0" + sources."resolve-from-3.0.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."retry-0.12.0" + sources."rimraf-2.7.1" + sources."safe-buffer-5.2.0" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."schema-utils-1.0.0" + sources."select-hose-2.0.0" + sources."selfsigned-1.10.7" + sources."semver-6.3.0" + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."setprototypeof-1.1.0" + ]; + }) + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."setprototypeof-1.1.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + 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."is-extendable-0.1.1" + 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."sockjs-0.3.19" + (sources."sockjs-client-1.4.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."faye-websocket-0.11.3" + sources."ms-2.1.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.0" + sources."spdy-4.0.1" + (sources."spdy-transport-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.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."statuses-1.5.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."strip-ansi-3.0.1" + sources."strip-eof-1.0.0" + sources."supports-color-6.1.0" + sources."thunky-1.1.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."toidentifier-1.0.0" + sources."type-is-1.6.18" + (sources."union-value-1.0.1" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) + sources."unpipe-1.0.0" + (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."upath-1.2.0" + sources."uri-js-4.2.2" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-parse-1.4.7" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."vary-1.1.2" + sources."wbuf-1.7.3" + (sources."webpack-dev-middleware-3.7.2" // { + dependencies = [ + sources."mime-2.4.4" + ]; + }) + sources."webpack-log-2.0.0" + sources."websocket-driver-0.7.3" + sources."websocket-extensions-0.1.3" + sources."which-1.3.1" + sources."which-module-2.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."wrappy-1.0.2" + sources."ws-6.2.1" + sources."y18n-4.0.0" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Serves a webpack app. Updates the browser on changes."; + homepage = "https://github.com/webpack/webpack-dev-server#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + copy-webpack-plugin = nodeEnv.buildNodePackage { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz"; + sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg=="; + }; + dependencies = [ + sources."ajv-6.11.0" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.4.1" + sources."ansi-colors-3.2.4" + sources."aproba-1.2.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."balanced-match-1.0.0" + sources."big.js-5.2.2" + sources."bluebird-3.7.2" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.1.1" + sources."cacache-12.0.3" + sources."chownr-1.1.4" + sources."commondir-1.0.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."copy-concurrently-1.0.5" + sources."core-util-is-1.0.2" + sources."cyclist-1.0.1" + sources."dir-glob-2.2.2" + sources."duplexify-3.7.1" + sources."emojis-list-2.1.0" + sources."end-of-stream-1.4.4" + sources."fast-deep-equal-3.1.1" + sources."fast-json-stable-stringify-2.1.0" + sources."figgy-pudding-3.5.1" + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."flush-write-stream-1.1.1" + sources."from2-2.3.0" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."glob-7.1.6" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + (sources."globby-7.1.1" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."graceful-fs-4.2.3" + sources."iferr-0.1.5" + sources."ignore-3.3.10" + sources."imurmurhash-0.1.4" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."isarray-1.0.0" + sources."json-schema-traverse-0.4.1" + (sources."json5-1.0.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."loader-utils-1.2.3" + sources."locate-path-3.0.0" + sources."lru-cache-5.1.1" + sources."make-dir-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mississippi-3.0.0" + sources."mkdirp-0.5.1" + sources."move-concurrently-1.0.1" + sources."normalize-path-3.0.0" + sources."once-1.4.0" + sources."p-limit-2.2.2" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."parallel-transform-1.2.0" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-4.0.1" + sources."pkg-dir-3.0.0" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."readable-stream-2.3.7" + sources."rimraf-2.7.1" + sources."run-queue-1.0.3" + sources."safe-buffer-5.1.2" + sources."schema-utils-1.0.0" + sources."semver-5.7.1" + sources."serialize-javascript-2.1.2" + sources."slash-1.0.0" + sources."ssri-6.0.1" + sources."stream-each-1.2.3" + sources."stream-shift-1.0.1" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + sources."typedarray-0.0.6" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."uri-js-4.2.2" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."webpack-log-2.0.0" + sources."wrappy-1.0.2" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Copy files && directories with webpack"; + homepage = https://github.com/webpack-contrib/copy-webpack-plugin; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; @@ -78169,7 +79170,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.14" + sources."@types/node-10.17.15" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -78193,7 +79194,7 @@ in dependencies = [ sources."debug-4.1.1" sources."decompress-response-4.2.1" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."ms-2.1.2" sources."simple-get-3.1.0" ]; @@ -78288,7 +79289,7 @@ in (sources."load-ip-set-2.1.0" // { dependencies = [ sources."decompress-response-4.2.1" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."simple-get-3.1.0" ]; }) @@ -78332,7 +79333,7 @@ in (sources."parse-torrent-7.0.1" // { dependencies = [ sources."decompress-response-4.2.1" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."simple-get-3.1.0" ]; }) @@ -78356,7 +79357,7 @@ in sources."randombytes-2.1.0" sources."range-parser-1.2.1" sources."range-slice-stream-2.0.0" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."record-cache-1.1.0" (sources."render-media-3.4.0" // { dependencies = [ @@ -78428,7 +79429,7 @@ in dependencies = [ sources."debug-4.1.1" sources."decompress-response-4.2.1" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."ms-2.1.2" sources."simple-get-3.1.0" ]; @@ -78564,7 +79565,7 @@ in ]; }) sources."bin-version-check-3.0.0" - sources."boolean-3.0.0" + sources."boolean-3.0.1" (sources."boxen-1.3.0" // { dependencies = [ sources."camelcase-4.1.0" @@ -78736,7 +79737,7 @@ in sources."glob-to-regexp-0.3.0" (sources."global-agent-2.1.8" // { dependencies = [ - sources."semver-7.1.2" + sources."semver-7.1.3" ]; }) sources."global-dirs-0.1.1" @@ -78750,7 +79751,7 @@ in ]; }) sources."graceful-fs-4.2.3" - sources."grouped-queue-0.3.3" + sources."grouped-queue-1.0.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -79026,10 +80027,9 @@ in sources."repeat-string-1.6.1" sources."repeating-2.0.1" sources."replace-ext-0.0.1" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ - sources."punycode-1.4.1" - sources."tough-cookie-2.4.3" + sources."tough-cookie-2.5.0" ]; }) sources."resolve-1.15.1" @@ -79264,7 +80264,7 @@ in ]; }) sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-2.7.0" // { + (sources."yeoman-environment-2.8.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index 1c6a3821925..198bd0d3324 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -256,13 +256,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "chownr-1.1.3" = { + "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz"; - sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; "class-utils-0.3.6" = { @@ -1741,15 +1741,6 @@ let sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; }; }; - "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"; - }; - }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -1822,13 +1813,13 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "request-2.88.0" = { + "request-2.88.2" = { name = "request"; packageName = "request"; - version = "2.88.0"; + version = "2.88.2"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; - sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; "resolve-1.15.1" = { @@ -2227,13 +2218,13 @@ let sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; }; }; - "tough-cookie-2.4.3" = { + "tough-cookie-2.5.0" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; "tunnel-agent-0.6.0" = { @@ -2760,7 +2751,7 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -2868,7 +2859,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."request-2.88.0" + sources."request-2.88.2" sources."resolve-1.15.1" sources."retry-0.10.1" sources."rimraf-2.6.3" @@ -2894,11 +2885,7 @@ in sources."strip-ansi-3.0.1" sources."tar-4.4.13" sources."temp-0.9.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" @@ -2947,7 +2934,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -3009,7 +2996,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.7" - sources."request-2.88.0" + sources."request-2.88.2" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -3021,11 +3008,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."tar-4.4.13" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" @@ -3080,7 +3063,7 @@ in sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix index 0335d6fc377..6e6c0cb4736 100644 --- a/pkgs/development/node-packages/node-packages-v13.nix +++ b/pkgs/development/node-packages/node-packages-v13.nix @@ -157,13 +157,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "chownr-1.1.3" = { + "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz"; - sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; "code-point-at-1.1.0" = { @@ -850,15 +850,6 @@ let sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; }; }; - "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"; - }; - }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -886,13 +877,13 @@ let sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; - "request-2.88.0" = { + "request-2.88.2" = { name = "request"; packageName = "request"; - version = "2.88.0"; + version = "2.88.2"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; - sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; "resolve-1.15.1" = { @@ -1120,13 +1111,13 @@ let sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA=="; }; }; - "tough-cookie-2.4.3" = { + "tough-cookie-2.5.0" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; "tunnel-agent-0.6.0" = { @@ -1284,7 +1275,7 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -1392,7 +1383,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."request-2.88.0" + sources."request-2.88.2" sources."resolve-1.15.1" sources."retry-0.10.1" sources."rimraf-2.6.3" @@ -1418,11 +1409,7 @@ in sources."strip-ansi-3.0.1" sources."tar-4.4.13" sources."temp-0.9.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" From 52920a6b2c1052f8c02ec4332b865b0c7112e21c Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 18 Feb 2020 13:26:40 +0100 Subject: [PATCH 239/243] firefox: 73.0 -> 73.0.1 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index dd9222fef03..2a5a82aed6a 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -16,10 +16,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "73.0"; + ffversion = "73.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2da2jn3gwck6qys3ys146jsjl9fgq10s3ii62y4ssnhl76ryir8f1mv9i1d6hyv8381hplasnxb553d5bgwnq87ymgqabakmr48n2p1"; + sha512 = "1vdz711v44xdiry5vm4rrg7fjkrlnyn5jjkaq0bcf98jwrn9bjklmgwblrrnvmpc9pjd2ff3m7354q7vy6gd6c3yh2jhbq91v2w5yl9"; }; patches = [ From 0c403efde9a57c58585a75c1678c08a32e3f877c Mon Sep 17 00:00:00 2001 From: edef Date: Thu, 13 Feb 2020 11:14:31 +0000 Subject: [PATCH 240/243] google-cloud-sdk: disable checking for gsutil updates The update checking mechanism references the tests, and thus dbaafbbf73ef5aeb2fa7d5aea73bb32b9d78e4f3 turned it into a crash at startup. It isn't much use in nixpkgs, so we're better off without it. --- pkgs/tools/admin/google-cloud-sdk/default.nix | 1 + .../gsutil-disable-updates.patch | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 07a81a5c525..93cbb63ce9c 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -42,6 +42,7 @@ in stdenv.mkDerivation rec { patches = [ ./gcloud-path.patch + ./gsutil-disable-updates.patch ]; installPhase = '' diff --git a/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch b/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch new file mode 100644 index 00000000000..de44ea7e791 --- /dev/null +++ b/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch @@ -0,0 +1,50 @@ +diff --git a/platform/gsutil/gslib/command_runner.py b/platform/gsutil/gslib/command_runner.py +index 06ca5e5..4a4e225 100644 +--- a/platform/gsutil/gslib/command_runner.py ++++ b/platform/gsutil/gslib/command_runner.py +@@ -61,7 +61,6 @@ from gslib.utils.text_util import InsistAsciiHeaderValue + from gslib.utils.text_util import print_to_fd + from gslib.utils.unit_util import SECONDS_PER_DAY + from gslib.utils.update_util import LookUpGsutilVersion +-from gslib.tests.util import HAS_NON_DEFAULT_GS_HOST + + + def HandleHeaderCoding(headers): +@@ -331,17 +330,6 @@ class CommandRunner(object): + Returns: + Return value(s) from Command that was run. + """ +- command_changed_to_update = False +- if (not skip_update_check and +- self.MaybeCheckForAndOfferSoftwareUpdate(command_name, debug)): +- command_name = 'update' +- command_changed_to_update = True +- args = [_StringToSysArgType('-n')] +- +- # Check for opt-in analytics. +- if system_util.IsRunningInteractively() and collect_analytics: +- metrics.CheckAndMaybePromptForAnalyticsEnabling() +- + if not args: + args = [] + +@@ -414,18 +402,10 @@ class CommandRunner(object): + ShutDownGsutil() + if GetFailureCount() > 0: + return_code = 1 +- if command_changed_to_update: +- # If the command changed to update, the user's original command was +- # not executed. +- return_code = 1 +- print('\n'.join( +- textwrap.wrap( +- 'Update was successful. Exiting with code 1 as the original command ' +- 'issued prior to the update was not executed and should be re-run.' +- ))) + return return_code + + def MaybeCheckForAndOfferSoftwareUpdate(self, command_name, debug): ++ return False + """Checks the last time we checked for an update and offers one if needed. + + Offer is made if the time since the last update check is longer From 5bda7e7fb2655eab3f8ae5cf1839baf5a35d00a6 Mon Sep 17 00:00:00 2001 From: edef Date: Thu, 13 Feb 2020 11:14:31 +0000 Subject: [PATCH 241/243] google-cloud-sdk: remove gsutil test The command module references the tests, and since all command modules get imported at startup, dbaafbbf73ef5aeb2fa7d5aea73bb32b9d78e4f3 turned it into a startup crash. Unless you're actively hacking on gsutil, this command isn't much use, so we're better off without it. --- pkgs/tools/admin/google-cloud-sdk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 93cbb63ce9c..326d15a9318 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -84,6 +84,7 @@ in stdenv.mkDerivation rec { # remove tests and test data find $out -name tests -type d -exec rm -rf '{}' + + rm $out/google-cloud-sdk/platform/gsutil/gslib/commands/test.py # compact all the JSON find $out -name \*.json | while read path; do From bdcee483b657df03e46e1a6357671adaddbc838f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 17 Sep 2019 19:48:22 -0500 Subject: [PATCH 242/243] nm-tray: init at 0.4.3 --- .../tools/networking/network-manager/tray.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/network-manager/tray.nix diff --git a/pkgs/tools/networking/network-manager/tray.nix b/pkgs/tools/networking/network-manager/tray.nix new file mode 100644 index 00000000000..e8ce8ad342f --- /dev/null +++ b/pkgs/tools/networking/network-manager/tray.nix @@ -0,0 +1,31 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, qtbase, networkmanager-qt, modemmanager-qt }: + +mkDerivation rec { + pname = "nm-tray"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "palinek"; + repo = pname; + rev = version; + sha256 = "08c86kd613wlvw9571q7a3lb7g6skyyasjw6h1g543rbl4jn2c2v"; + }; + + postPatch = '' + sed -i -e '1i#include ' src/nmmodel.cpp + ''; + + nativeBuildInputs = [ cmake qttools ]; + + cmakeFlags = [ "-DWITH_MODEMMANAGER_SUPPORT=ON" ]; + + buildInputs = [ qtbase networkmanager-qt modemmanager-qt ]; + + meta = with lib; { + description = "Simple Network Manager frontend written in Qt"; + homepage = "https://github.com/palinek/nm-tray"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0716e411301..5d48b944989 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5291,6 +5291,8 @@ in networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu { }; + nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { }; + newsboat = callPackage ../applications/networking/feedreaders/newsboat { inherit (darwin.apple_sdk.frameworks) Security; }; From 68558d8c5d1c3c307e58ee215f9affb821a97655 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 18 Feb 2020 09:04:57 -0500 Subject: [PATCH 243/243] vivaldi: 2.11.1811.33-1 -> 2.11.1811.38-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ce3530728aa..d2de889bf7b 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.11.1811.33-1"; + version = "2.11.1811.38-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1z0cscvmhxh1wjs7r0sjdr3f3mcg8i6avpal6spp0ymkxp2rn0h3"; + sha256 = "0nz7yhxp7fxv6pj1i2684di1wgk4k78hw4icfjqzjwmvc3i710jw"; }; unpackPhase = ''