From 5de2e780168844107ab40107d0d91ec3cdde2107 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Wed, 15 Apr 2020 13:50:51 -0700 Subject: [PATCH 001/688] nixos/networkmanager: restart dispatcher when nameservers change Without this, you can change the list of appended or prepended nameservers in your NetworkManager config, and nixos-rebuild doesn't cause those changes to come into effect. --- nixos/modules/services/networking/networkmanager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 6f24141b33cf..59073dae035a 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -451,7 +451,7 @@ in { systemd.services.NetworkManager-dispatcher = { wantedBy = [ "network.target" ]; - restartTriggers = [ configFile ]; + restartTriggers = [ configFile overrideNameserversScript ]; # useful binaries for user-specified hooks path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ]; From 459c60dda2406d2207d2afd90f210ffc87efde54 Mon Sep 17 00:00:00 2001 From: Gaelan Steele Date: Tue, 26 May 2020 03:16:03 -0700 Subject: [PATCH 002/688] gcc: fix building darwin->linux cross compiler This reverts d9feea5 with some slight modifications to work with other changes since then. Fixes #88213. --- pkgs/development/compilers/gcc/4.8/default.nix | 15 +++++++++------ pkgs/development/compilers/gcc/4.9/default.nix | 15 +++++++++------ pkgs/development/compilers/gcc/6/default.nix | 15 +++++++++------ pkgs/development/compilers/gcc/7/default.nix | 15 +++++++++------ pkgs/development/compilers/gcc/8/default.nix | 15 +++++++++------ pkgs/development/compilers/gcc/9/default.nix | 15 +++++++++------ pkgs/development/compilers/gcc/builder.sh | 12 +++++++++++- 7 files changed, 65 insertions(+), 37 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ef697b74bbe3..b96f16aebb29 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -10,7 +10,7 @@ , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null @@ -159,11 +159,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 270d118f97eb..4b30e3d83d4e 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -10,7 +10,7 @@ , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null @@ -171,11 +171,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index b1a981cfdf7f..9772c9aa33a0 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -11,7 +11,7 @@ , texinfo ? null , flex , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null @@ -184,11 +184,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 22d772cff6d6..174d441c67e3 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -9,7 +9,7 @@ , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null @@ -155,11 +155,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 58248093d24d..0187a73d8131 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -9,7 +9,7 @@ , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null @@ -147,11 +147,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index f660a59a790a..bb97c79351af 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -9,7 +9,7 @@ , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null @@ -146,11 +146,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index b153687980a0..d17ad7bf747e 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -240,7 +240,7 @@ postInstall() { # More dependencies with the previous gcc or some libs (gccbug stores the build command line) rm -rf $out/bin/gccbug - if type "patchelf"; then + if [[ buildConfig == *"linux"* ]]; then # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do PREV_RPATH=`patchelf --print-rpath "$i"` @@ -249,6 +249,16 @@ postInstall() { done fi + if [[ targetConfig == *"linux"* ]]; then + # For some reason, when building for linux on darwin, the libs retain + # RPATH to $out. + for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do + PREV_RPATH=`patchelf --print-rpath "$i"` + NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"` + patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK + done + fi + if type "install_name_tool"; then for i in "$lib"/lib/*.*.dylib; do install_name_tool -id "$i" "$i" || true From 5ed0924e7b445df9b684e6e5c63e0a7eeaf2f845 Mon Sep 17 00:00:00 2001 From: Nico Heitmann Date: Sun, 7 Jun 2020 16:07:47 +0200 Subject: [PATCH 003/688] nixos/krb5: refactor indentation generation mkVal is no longer aware of the indentation depth. Indentation is added to each line of the result when it is included in nested entries. --- nixos/modules/config/krb5/default.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix index ff16ffcf9c65..85ecb8633a34 100644 --- a/nixos/modules/config/krb5/default.nix +++ b/nixos/modules/config/krb5/default.nix @@ -41,31 +41,29 @@ let value) else value; - mkIndent = depth: concatStrings (builtins.genList (_: " ") (2 * depth)); + indent = " "; - mkRelation = name: value: "${name} = ${mkVal { inherit value; }}"; + mkRelation = name: value: "${name} = ${mkVal value}"; - mkVal = { value, depth ? 0 }: + mkVal = value: if (value == true) then "true" else if (value == false) then "false" else if (isInt value) then (toString value) else if (isList value) then - concatMapStringsSep " " mkVal { inherit value depth; } + concatMapStringsSep " " mkVal value else if (isAttrs value) then - (concatStringsSep "\n${mkIndent (depth + 1)}" - ([ "{" ] ++ (mapAttrsToList - (attrName: attrValue: let - mappedAttrValue = mkVal { - value = attrValue; - depth = depth + 1; - }; - in "${attrName} = ${mappedAttrValue}") - value))) + "\n${mkIndent depth}}" + let configLines = concatLists + (map (splitString "\n") + (mapAttrsToList mkRelation value)); + in + (concatStringsSep "\n${indent}" + ([ "{" ] ++ configLines)) + + "\n}" else value; mkMappedAttrsOrString = value: concatMapStringsSep "\n" (line: if builtins.stringLength line > 0 - then "${mkIndent 1}${line}" + then "${indent}${line}" else line) (splitString "\n" (if isAttrs value then From 2b694b1e9f69ba8053bb7006337b051154c44e86 Mon Sep 17 00:00:00 2001 From: Nico Heitmann Date: Sun, 7 Jun 2020 16:10:35 +0200 Subject: [PATCH 004/688] nixos/krb5: output lists as multiple config entries Fixes #89626 --- nixos/modules/config/krb5/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix index 85ecb8633a34..58477fafc2d7 100644 --- a/nixos/modules/config/krb5/default.nix +++ b/nixos/modules/config/krb5/default.nix @@ -43,14 +43,15 @@ let indent = " "; - mkRelation = name: value: "${name} = ${mkVal value}"; + mkRelation = name: value: + if (isList value) then + concatMapStringsSep "\n" (mkRelation name) value + else "${name} = ${mkVal value}"; mkVal = value: if (value == true) then "true" else if (value == false) then "false" else if (isInt value) then (toString value) - else if (isList value) then - concatMapStringsSep " " mkVal value else if (isAttrs value) then let configLines = concatLists (map (splitString "\n") From 04fef4c0e97ecebc91ef3a545fac2321b026762c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 25 Jul 2020 06:46:20 +0000 Subject: [PATCH 005/688] libraw: 0.19.5 -> 0.20.0 --- pkgs/development/libraries/libraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 69169c7e9af7..f20810801d97 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libraw"; - version = "0.19.5"; + version = "0.20.0"; src = fetchurl { url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "1x827sh6vl8j3ll2ihkcr234y07f31hi1v7sl08jfw3irkbn58j0"; + sha256 = "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz"; }; outputs = [ "out" "lib" "dev" "doc" ]; From fcef77df2ec604bf32d1bbb0114e0e2dedbc4eda Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 27 Jul 2020 23:30:41 +0200 Subject: [PATCH 006/688] qdirstat: 1.6.1 -> 1.7 --- pkgs/applications/misc/qdirstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index c57153fe0e0d..0df352aaf8c7 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -3,7 +3,7 @@ , makeWrapper, perlPackages, mkDerivation }: let - version = "1.6.1"; + version = "1.7"; in mkDerivation rec { pname = "qdirstat"; inherit version; @@ -12,7 +12,7 @@ in mkDerivation rec { owner = "shundhammer"; repo = "qdirstat"; rev = version; - sha256 = "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczpb"; + sha256 = "163x3fxra0l3vvrzm25mh7jvcwjbmwsqlpppkxx76mkz9a1769fy"; }; nativeBuildInputs = [ qmake makeWrapper ]; From a313e2e43a66e4bbb420e69001aa62782d4e0056 Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 29 Jul 2020 17:54:04 +0200 Subject: [PATCH 007/688] qdirstat: remove unnecessary rec expression --- pkgs/applications/misc/qdirstat/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index 0df352aaf8c7..e9f049159bfa 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -3,17 +3,19 @@ , makeWrapper, perlPackages, mkDerivation }: let - version = "1.7"; -in mkDerivation rec { pname = "qdirstat"; - inherit version; + version = "1.7"; src = fetchFromGitHub { owner = "shundhammer"; - repo = "qdirstat"; + repo = pname; rev = version; sha256 = "163x3fxra0l3vvrzm25mh7jvcwjbmwsqlpppkxx76mkz9a1769fy"; }; +in + +mkDerivation { + inherit pname version src; nativeBuildInputs = [ qmake makeWrapper ]; From 718a82352dc631b0a0ada06920b25317e4c03b3b Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Fri, 31 Jul 2020 22:43:06 -0700 Subject: [PATCH 008/688] maintainers: add sarcasticadmin --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4011b6e17159..6dcebd07b51c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7180,6 +7180,12 @@ githubId = 1153271; name = "Sander van der Burg"; }; + sarcasticadmin = { + email = "rob@sarcasticadmin.com"; + github = "sarcasticadmin"; + githubId = 30531572; + name = "Robert James Hernandez"; + }; sargon = { email = "danielehlers@mindeye.net"; github = "sargon"; From 90557cd80482dd25e969da48da5960ae540f790e Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Mon, 3 Aug 2020 10:49:15 +0200 Subject: [PATCH 009/688] kops_1_18: init at 1.18.0 --- .../applications/networking/cluster/kops/default.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 282890ada5b5..bff0aacb1263 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -3,8 +3,8 @@ let goPackagePath = "k8s.io/kops"; - generic = { version, sha256, ...}@attrs: - let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in + generic = { version, sha256, rev ? version, ...}@attrs: + let attrs' = builtins.removeAttrs attrs ["version" "sha256" "rev"] ; in buildGoPackage { pname = "kops"; inherit version; @@ -12,7 +12,7 @@ let inherit goPackagePath; src = fetchFromGitHub { - rev = version; + rev = rev; owner = "kubernetes"; repo = "kops"; inherit sha256; @@ -65,4 +65,10 @@ in rec { version = "1.17.1"; sha256 = "1km6nwanmhfx8rl1wp445z9ib50jr2f86rd92vilm3q4rs9kig1h"; }; + + kops_1_18 = mkKops rec { + version = "1.18.0"; + sha256 = "16zbjxxv08j31y7lhkqx2bnx0pc3r0vpfrlhdjs26z22p5rc4rrh"; + rev = "v${version}"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6d406907ac6..179cc712edf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26199,8 +26199,9 @@ in kops_1_15 kops_1_16 kops_1_17 + kops_1_18 ; - kops = kops_1_17; + kops = kops_1_18; lguf-brightness = callPackage ../misc/lguf-brightness { }; From 0b4221ec81b3b909bf7f54e73c19071863cf1f0d Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Mon, 3 Aug 2020 10:50:20 +0200 Subject: [PATCH 010/688] kops_1_15: Remove unsupported version --- pkgs/applications/networking/cluster/kops/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index bff0aacb1263..d751c8ca18e8 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -51,11 +51,6 @@ in rec { mkKops = generic; - kops_1_15 = mkKops { - version = "1.15.3"; - sha256 = "0pzgrsl61nw8pm3s032lj020fw13x3fpzlj7lknsnd581f0gg4df"; - }; - kops_1_16 = mkKops { version = "1.16.4"; sha256 = "0qi80hzd5wc8vn3y0wsckd7pq09xcshpzvcr7rl5zd4akxb0wl3f"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 179cc712edf3..d4d68b065a75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26196,7 +26196,6 @@ in # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_15 kops_1_16 kops_1_17 kops_1_18 From 463db72e631e0bd4a835796324eb1981071c6ee4 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 5 May 2019 23:40:20 +0000 Subject: [PATCH 011/688] platform.gcc.arch: support for AMD CPUs --- pkgs/build-support/cc-wrapper/default.nix | 10 ++++++++-- pkgs/development/interpreters/j/default.nix | 2 +- pkgs/development/libraries/dlib/default.nix | 4 ++-- .../libraries/fflas-ffpack/default.nix | 17 +++++++++++++---- pkgs/development/libraries/givaro/default.nix | 9 +++++++++ pkgs/development/libraries/linbox/default.nix | 9 +++++++++ .../libraries/qt-5/modules/qtbase.nix | 9 +++++++++ .../development/python-modules/dlib/default.nix | 4 +++- .../python-modules/tensorflow/1/default.nix | 6 +++--- .../python-modules/tensorflow/2/default.nix | 6 +++--- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 11 files changed, 62 insertions(+), 18 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index c2a06219f1d3..f8e25031c76c 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -63,18 +63,24 @@ let # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu isGccArchSupported = arch: if isGNU then - { skylake = versionAtLeast ccVersion "6.0"; + { # Intel + skylake = versionAtLeast ccVersion "6.0"; skylake-avx512 = versionAtLeast ccVersion "6.0"; cannonlake = versionAtLeast ccVersion "8.0"; icelake-client = versionAtLeast ccVersion "8.0"; icelake-server = versionAtLeast ccVersion "8.0"; knm = versionAtLeast ccVersion "8.0"; + # AMD + znver1 = versionAtLeast ccVersion "6.0"; }.${arch} or true else if isClang then - { cannonlake = versionAtLeast ccVersion "5.0"; + { # Intel + cannonlake = versionAtLeast ccVersion "5.0"; icelake-client = versionAtLeast ccVersion "7.0"; icelake-server = versionAtLeast ccVersion "7.0"; knm = versionAtLeast ccVersion "7.0"; + # AMD + znver1 = versionAtLeast ccVersion "4.0"; }.${arch} or true else false; diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 8e6b434281eb..6df0d64bbeb3 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, readline, libedit, bc -, avxSupport ? false +, avxSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index a7d68d62f2ae..359e8a15f020 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, libX11 # see http://dlib.net/compile.html -, avxSupport ? true +, avxSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] , cudaSupport ? true }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { rm -rf dlib/external ''; - cmakeFlags = [ + cmakeFlags = [ "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index bc84039a9aa2..226d9c5e7445 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -35,13 +35,22 @@ stdenv.mkDerivation rec { # disable SIMD instructions (which are enabled *when available* by default) # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; + # Intel westmere = [ "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; sandybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; ivybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - haswell = [ "--disable-fma4" ]; - broadwell = [ "--disable-fma4" ]; - skylake = [ "--disable-fma4" ]; - skylake-avx512 = [ "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; + # AMD + btver1 = [ "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; + btver2 = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + bdver1 = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" ]; + bdver2 = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" ]; + bdver3 = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" ]; + bdver4 = [ ]; + znver1 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; doCheck = true; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index fdaf518c6114..b88d63c3d7e4 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + # Intel westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; @@ -27,6 +28,14 @@ stdenv.mkDerivation rec { broadwell = [ "--disable-fma4" ]; skylake = [ "--disable-fma4" ]; skylake-avx512 = [ "--disable-fma4" ]; + # AMD + btver1 = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + btver2 = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + bdver1 = [ "--disable-avx2" ]; + bdver2 = [ "--disable-avx2" ]; + bdver3 = [ "--disable-avx2" ]; + bdver4 = [ ]; + znver1 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; # On darwin, tests are linked to dylib in the nix store, so we need to make diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 2217996acdbc..0612a5be4efd 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + # Intel westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; @@ -49,6 +50,14 @@ stdenv.mkDerivation rec { broadwell = [ "--disable-fma4" ]; skylake = [ "--disable-fma4" ]; skylake-avx512 = [ "--disable-fma4" ]; + # AMD + btver1 = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + btver2 = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + bdver1 = [ "--disable-avx2" ]; + bdver2 = [ "--disable-avx2" ]; + bdver3 = [ "--disable-avx2" ]; + bdver4 = [ ]; + znver1 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} ++ stdenv.lib.optionals withSage [ "--enable-sage" diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index a4c12793abb3..33054dd403f9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -259,6 +259,7 @@ stdenv.mkDerivation { then [ "-no-sse2" ] else lib.optionals (compareVersion "5.9.0" >= 0) { default = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; + # Intel westmere = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; sandybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; ivybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; @@ -266,6 +267,14 @@ stdenv.mkDerivation { broadwell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; skylake = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; skylake-avx512 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + # AMD + btver1 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; + btver2 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + bdver1 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + bdver2 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + bdver3 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + bdver4 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + znver1 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} ) ++ [ diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index a57d83075513..33cb72dca408 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage, dlib, python, pytest, more-itertools, avxSupport ? true, lib }: +{ buildPythonPackage, lib, dlib, python, pytest, more-itertools, + avxSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] +}: buildPythonPackage { inherit (dlib) name src nativeBuildInputs buildInputs meta; diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index 4dc5c57070d1..1633a32bee26 100644 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -23,9 +23,9 @@ , xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] -, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"] -, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] -, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] +, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512" "bdver4" "znver1"] +, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512" "bdver2" "bdver3" "bdver4" "znver1"] # Darwin deps , Foundation, Security }: diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix index 4dd378d1410b..8f30ecbcc984 100644 --- a/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -23,9 +23,9 @@ , xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] -, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"] -, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] -, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] +, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512" "bdver4" "znver1"] +, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512" "bdver2" "bdver3" "bdver4" "znver1"] # Darwin deps , Foundation, Security }: diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index b686ea4d04f2..14fcde4367c8 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub , boost, zlib, openssl , upnpSupport ? true, miniupnpc ? null -, aesniSupport ? false -, avxSupport ? false +, aesniSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] +, avxSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] }: assert upnpSupport -> miniupnpc != null; From cf7b63df5b9efdef4e8e1b3261d7040199f7e671 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 5 Aug 2020 02:32:41 +0000 Subject: [PATCH 012/688] gcc.arch: refactor, move tables under lib/ --- lib/systems/architectures.nix | 75 +++++++++++++++++++ lib/systems/default.nix | 2 + nixos/modules/services/misc/nix-daemon.nix | 11 +-- .../science/math/nauty/default.nix | 10 +-- pkgs/build-support/cc-wrapper/default.nix | 2 + pkgs/development/interpreters/j/default.nix | 2 +- pkgs/development/libraries/dlib/default.nix | 2 +- .../libraries/fflas-ffpack/default.nix | 33 ++++---- pkgs/development/libraries/g2o/default.nix | 17 ++--- pkgs/development/libraries/givaro/default.nix | 29 +++---- pkgs/development/libraries/linbox/default.nix | 30 +++----- .../libraries/qt-5/modules/qtbase.nix | 33 +++----- .../python-modules/dlib/default.nix | 4 +- .../python-modules/tensorflow/1/default.nix | 6 +- .../python-modules/tensorflow/2/default.nix | 6 +- pkgs/servers/nosql/arangodb/default.nix | 12 +-- pkgs/tools/misc/cpuminer-multi/default.nix | 4 +- pkgs/tools/networking/i2pd/default.nix | 4 +- 18 files changed, 154 insertions(+), 128 deletions(-) create mode 100644 lib/systems/architectures.nix diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix new file mode 100644 index 000000000000..287f5be03c45 --- /dev/null +++ b/lib/systems/architectures.nix @@ -0,0 +1,75 @@ +{ lib }: + +rec { + # platform.gcc.arch to its features (as in /proc/cpuinfo) + features = { + default = [ ]; + # x86_64 Intel + westmere = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" ]; + sandybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ]; + ivybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ]; + haswell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; + broadwell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; + skylake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; + skylake-avx512 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ]; + # x86_64 AMD + btver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" ]; + btver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ]; + bdver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ]; + bdver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ]; + bdver3 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ]; + bdver4 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" "fma4" ]; + znver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ]; + znver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ]; + # other + armv5te = [ ]; + armv6 = [ ]; + armv7-a = [ ]; + armv8-a = [ ]; + mips32 = [ ]; + loongson2f = [ ]; + }; + + # a superior CPU has all the features of an inferior and is able to build and test code for it + inferiors = { + # x86_64 Intel + default = [ ]; + westmere = [ ]; + sandybridge = [ "westmere" ]; + ivybridge = [ "westmere" "sandybridge" ]; + haswell = [ "westmere" "sandybridge" "ivybridge" ]; + broadwell = [ "westmere" "sandybridge" "ivybridge" "haswell" ]; + skylake = [ "westmere" "sandybridge" "ivybridge" "haswell" "broadwell" ]; + skylake-avx512 = [ "westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" ]; + # x86_64 AMD + btver1 = [ ]; + btver2 = [ ]; + bdver1 = [ ]; + bdver2 = [ ]; + bdver3 = [ ]; + bdver4 = [ ]; + znver1 = [ ]; + znver2 = [ ]; + # other + armv5te = [ ]; + armv6 = [ ]; + armv7-a = [ ]; + armv8-a = [ ]; + mips32 = [ ]; + loongson2f = [ ]; + }; + + predicates = { + sse3Support = x: builtins.elem "sse3" features.${x}; + ssse3Support = x: builtins.elem "ssse3" features.${x}; + sse4_1Support = x: builtins.elem "sse4_1" features.${x}; + sse4_2Support = x: builtins.elem "sse4_2" features.${x}; + sse4_aSupport = x: builtins.elem "sse4a" features.${x}; + avxSupport = x: builtins.elem "avx" features.${x}; + avx2Support = x: builtins.elem "avx2" features.${x}; + avx512Support = x: builtins.elem "avx512" features.${x}; + aesSupport = x: builtins.elem "aes" features.${x}; + fmaSupport = x: builtins.elem "fma" features.${x}; + fma4Support = x: builtins.elem "fma4" features.${x}; + }; +} diff --git a/lib/systems/default.nix b/lib/systems/default.nix index c929781dd8ff..02d58592b325 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -7,6 +7,7 @@ rec { inspect = import ./inspect.nix { inherit lib; }; platforms = import ./platforms.nix { inherit lib; }; examples = import ./examples.nix { inherit lib; }; + architectures = import ./architectures.nix { inherit lib; }; # Elaborate a `localSystem` or `crossSystem` so that it contains everything # necessary. @@ -125,6 +126,7 @@ rec { else throw "Don't know how to run ${final.config} executables."; } // mapAttrs (n: v: v final.parsed) inspect.predicates + // mapAttrs (n: v: v final.platform.gcc.arch or "default") architectures.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; assert lib.foldl diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 924a007efc6d..37596e9c54d7 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -595,15 +595,8 @@ in nix.systemFeatures = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ optionals (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) ( - # a x86_64 builder can run code for `platform.gcc.arch` and minor architectures: - [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ { - sandybridge = [ "gccarch-westmere" ]; - ivybridge = [ "gccarch-westmere" "gccarch-sandybridge" ]; - haswell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ]; - broadwell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ]; - skylake = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ]; - skylake-avx512 = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ]; - }.${pkgs.hostPlatform.platform.gcc.arch} or [] + # a x86_64 builder can run code for `platform.gcc.arch` and inferior architectures: + [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch} ) ); diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index c1d408213b98..d75fc9731cdf 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -10,15 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww"; }; outputs = [ "out" "dev" ]; - configureFlags = { + configureFlags = [ # Prevent nauty from sniffing some cpu features. While those are very # widely available, it can lead to nasty bugs when they are not available: # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA - default = [ "--disable-clz" "--disable-popcnt" ]; - westmere = [ "--disable-clz" ]; - sandybridge = [ "--disable-clz" ]; - ivybridge = [ "--disable-clz" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or []; + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-popcnt" + "--${if stdenv.hostPlatform.sse4_aSupport then "enable" else "disable"}-clz" + ]; installPhase = '' mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty} diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index f8e25031c76c..95826bd1d0f3 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -72,6 +72,7 @@ let knm = versionAtLeast ccVersion "8.0"; # AMD znver1 = versionAtLeast ccVersion "6.0"; + znver2 = versionAtLeast ccVersion "9.0"; }.${arch} or true else if isClang then { # Intel @@ -81,6 +82,7 @@ let knm = versionAtLeast ccVersion "7.0"; # AMD znver1 = versionAtLeast ccVersion "4.0"; + znver2 = versionAtLeast ccVersion "9.0"; }.${arch} or true else false; diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 6df0d64bbeb3..e2bf921f882a 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, readline, libedit, bc -, avxSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] +, avxSupport ? stdenv.hostPlatform.avxSupport }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 359e8a15f020..e584c3e9d9b1 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, libX11 # see http://dlib.net/compile.html -, avxSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] +, avxSupport ? stdenv.hostPlatform.avxSupport , cudaSupport ? true }: diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 226d9c5e7445..23b31fe439fd 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -31,28 +31,21 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lcblas" "--with-lapack-libs=-llapacke" - ] ++ stdenv.lib.optionals stdenv.isx86_64 { + ] ++ stdenv.lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) - default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - # Intel - westmere = [ "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - sandybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - ivybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - haswell = [ "--disable-fma4" ]; - broadwell = [ "--disable-fma4" ]; - skylake = [ "--disable-fma4" ]; - skylake-avx512 = [ "--disable-fma4" ]; - # AMD - btver1 = [ "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - btver2 = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - bdver1 = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" ]; - bdver2 = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" ]; - bdver3 = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" ]; - bdver4 = [ ]; - znver1 = [ "--disable-fma4" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; - + "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" + "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" + "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41" + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42" + "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx" + "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" + "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512f" + "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512dq" + "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512vl" + "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" + "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" + ]; doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 7167112b6bd1..675d994cf0e6 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -27,16 +27,13 @@ mkDerivation rec { # Detection script is broken "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" - ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { - default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; - westmere = [ "-DDISABLE_SSE4_A=ON" ]; - sandybridge = [ "-DDISABLE_SSE4_A=ON" ]; - ivybridge = [ "-DDISABLE_SSE4_A=ON" ]; - haswell = [ "-DDISABLE_SSE4_A=ON" ]; - broadwell = [ "-DDISABLE_SSE4_A=ON" ]; - skylake = [ "-DDISABLE_SSE4_A=ON" ]; - skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); + ] ++ lib.optionals stdenv.isx86_64 [ + "-DDO_SSE_AUTODETECT=OFF" + "-DDISABLE_SSE3=${ if stdenv.hostPlatform.sse3Support then "OFF" else "ON"}" + "-DDISABLE_SSE4_1=${if stdenv.hostPlatform.sse4_1Support then "OFF" else "ON"}" + "-DDISABLE_SSE4_2=${if stdenv.hostPlatform.sse4_2Support then "OFF" else "ON"}" + "-DDISABLE_SSE4_A=${if stdenv.hostPlatform.sse4_aSupport then "OFF" else "ON"}" + ]; meta = with lib; { description = "A General Framework for Graph Optimization"; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index b88d63c3d7e4..78b6b0882707 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -17,26 +17,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-optimization" - ] ++ stdenv.lib.optionals stdenv.isx86_64 { + ] ++ stdenv.lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) - default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - # Intel - westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - haswell = [ "--disable-fma4" ]; - broadwell = [ "--disable-fma4" ]; - skylake = [ "--disable-fma4" ]; - skylake-avx512 = [ "--disable-fma4" ]; - # AMD - btver1 = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - btver2 = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - bdver1 = [ "--disable-avx2" ]; - bdver2 = [ "--disable-avx2" ]; - bdver3 = [ "--disable-avx2" ]; - bdver4 = [ ]; - znver1 = [ "--disable-fma4" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; + "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" + "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" + "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41" + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42" + "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx" + "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" + "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" + "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" + ]; # On darwin, tests are linked to dylib in the nix store, so we need to make # sure tests run after installPhase. diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 0612a5be4efd..09bd7e120911 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -39,27 +39,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lblas" "--disable-optimization" - ] ++ stdenv.lib.optionals stdenv.isx86_64 { + ] ++ stdenv.lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) - default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - # Intel - westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - haswell = [ "--disable-fma4" ]; - broadwell = [ "--disable-fma4" ]; - skylake = [ "--disable-fma4" ]; - skylake-avx512 = [ "--disable-fma4" ]; - # AMD - btver1 = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - btver2 = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - bdver1 = [ "--disable-avx2" ]; - bdver2 = [ "--disable-avx2" ]; - bdver3 = [ "--disable-avx2" ]; - bdver4 = [ ]; - znver1 = [ "--disable-fma4" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"} - ++ stdenv.lib.optionals withSage [ + "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" + "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" + "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41" + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42" + "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx" + "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" + "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" + "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" + ] ++ stdenv.lib.optionals withSage [ "--enable-sage" ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 33054dd403f9..5eaca56684fa 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -255,27 +255,18 @@ stdenv.mkDerivation { "-no-warnings-are-errors" ] ++ ( - if (!stdenv.hostPlatform.isx86_64) - then [ "-no-sse2" ] - else lib.optionals (compareVersion "5.9.0" >= 0) { - default = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; - # Intel - westmere = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; - sandybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - ivybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - haswell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - broadwell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - skylake = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - skylake-avx512 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - # AMD - btver1 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; - btver2 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - bdver1 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - bdver2 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - bdver3 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - bdver4 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - znver1 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"} + if (!stdenv.hostPlatform.isx86_64) then [ + "-no-sse2" + ] else if (compareVersion "5.9.0" >= 0) then [ + "-sse2" + "${if stdenv.hostPlatform.sse3Support then "" else "-no"}-sse3" + "${if stdenv.hostPlatform.ssse3Support then "" else "-no"}-ssse3" + "${if stdenv.hostPlatform.sse4_1Support then "" else "-no"}-sse4.1" + "${if stdenv.hostPlatform.sse4_2Support then "" else "-no"}-sse4.2" + "${if stdenv.hostPlatform.avxSupport then "" else "-no"}-avx" + "${if stdenv.hostPlatform.avx2Support then "" else "-no"}-avx2" + ] else [ + ] ) ++ [ "-no-mips_dsp" diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index 33cb72dca408..027500ff2abf 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -1,5 +1,5 @@ -{ buildPythonPackage, lib, dlib, python, pytest, more-itertools, - avxSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] +{ buildPythonPackage, stdenv, lib, dlib, python, pytest, more-itertools +, avxSupport ? stdenv.hostPlatform.avxSupport }: buildPythonPackage { diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index 1633a32bee26..5f65004b3d68 100644 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -23,9 +23,9 @@ , xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] -, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] -, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512" "bdver4" "znver1"] -, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512" "bdver2" "bdver3" "bdver4" "znver1"] +, sse42Support ? stdenv.hostPlatform.sse4_2Support +, avx2Support ? stdenv.hostPlatform.avx2Support +, fmaSupport ? stdenv.hostPlatform.fmaSupport # Darwin deps , Foundation, Security }: diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix index 8f30ecbcc984..eedd6e6d0dfb 100644 --- a/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -23,9 +23,9 @@ , xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] -, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] -, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512" "bdver4" "znver1"] -, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512" "bdver2" "bdver3" "bdver4" "znver1"] +, sse42Support ? stdenv.hostPlatform.sse4_2Support +, avx2Support ? stdenv.hostPlatform.avx2Support +, fmaSupport ? stdenv.hostPlatform.fmaSupport # Darwin deps , Foundation, Security }: diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 54d5e8484bcb..4d5c24c73046 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -32,15 +32,9 @@ let # do not set GCC's -march=xxx based on builder's /proc/cpuinfo "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF" # also avoid using builder's /proc/cpuinfo - ] ++ - { westmere = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - sandybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - ivybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - haswell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - broadwell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - skylake = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - skylake-avx512 = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ]; + "-DHAVE_SSE42=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" + "-DASM_OPTIMIZATIONS=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" + ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index 65482fabb117..dba42e4bfea8 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, curl, jansson, autoconf, automake -, aesni ? true }: +, aesni ? stdenv.hostPlatform.aesSupport }: let rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; @@ -28,6 +28,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 14fcde4367c8..5f9f3ceef07b 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub , boost, zlib, openssl , upnpSupport ? true, miniupnpc ? null -, aesniSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] -, avxSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] +, aesniSupport ? stdenv.hostPlatform.aesSupport +, avxSupport ? stdenv.hostPlatform.avxSupport }: assert upnpSupport -> miniupnpc != null; From 707e43b9612c58c2dde122586d1089f22c49d164 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 5 Aug 2020 17:02:30 +0000 Subject: [PATCH 013/688] nix-daemon: platform.gcc.arch is not x86 specific --- nixos/modules/services/misc/nix-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 37596e9c54d7..1f7d6e0f17ed 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -594,7 +594,7 @@ in nix.systemFeatures = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) ( + optionals (pkgs.hostPlatform.platform ? gcc.arch) ( # a x86_64 builder can run code for `platform.gcc.arch` and inferior architectures: [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch} ) From 5c384e12682515ec87ff14838d66771dd1f7edf7 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 5 Aug 2020 17:03:45 +0000 Subject: [PATCH 014/688] nix-daemon: platform.gcc.arch is not x86 specific --- nixos/modules/services/misc/nix-daemon.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 1f7d6e0f17ed..7e092e5b8b83 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -595,8 +595,9 @@ in nix.systemFeatures = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ optionals (pkgs.hostPlatform.platform ? gcc.arch) ( - # a x86_64 builder can run code for `platform.gcc.arch` and inferior architectures: - [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch} + # a builder can run code for `platform.gcc.arch` and inferior architectures + [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ + map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch} ) ); From d64d676546c1584e5556da3f2dee9ad89596e62c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 7 Aug 2020 19:20:43 -0400 Subject: [PATCH 015/688] gophernotes: init at 0.7.1 --- .../editors/gophernotes/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/editors/gophernotes/default.nix diff --git a/pkgs/applications/editors/gophernotes/default.nix b/pkgs/applications/editors/gophernotes/default.nix new file mode 100644 index 000000000000..e48ee4dd13c7 --- /dev/null +++ b/pkgs/applications/editors/gophernotes/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gophernotes"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "gopherdata"; + repo = "gophernotes"; + rev = "v${version}"; + sha256 = "0hs92bdrsjqafdkhg2fk3z16h307i32mvbm9f6bb80bgsciysh27"; + }; + + vendorSha256 = "1ylqf1sx0h2kixnq9f3prn3sha43q3ybd5ay57yy5z79qr8zqvxs"; + + meta = with lib; { + description = "Go kernel for Jupyter notebooks"; + homepage = "https://github.com/gopherdata/gophernotes"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33862a401c24..7510e0bec025 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20043,6 +20043,8 @@ in gopher = callPackage ../applications/networking/gopher/gopher { }; + gophernotes = callPackage ../applications/editors/gophernotes { }; + goxel = callPackage ../applications/graphics/goxel { }; gpa = callPackage ../applications/misc/gpa { }; From 480f53bfecef21cd55992f778b6a38ea38e47baf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Aug 2020 03:46:21 +0000 Subject: [PATCH 016/688] certbot: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/certbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 79e5c3288b7f..07ceea731b9b 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1y0m5qm853i6pcpb2mrf8kjkr9wr80mdrx1qmck38ayvr2v2p5lc"; + sha256 = "1fx29gsa3glwh0ik5k2gynwdz6i3ckq9aakf6ip92n3qyh6l08a8"; }; sourceRoot = "source/${pname}"; From 7474d171699c1afc57fa0819578ef854134072f6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 10 Aug 2020 16:36:50 +0200 Subject: [PATCH 017/688] gtk-layer-shell: 0.1.0 -> 0.2.0 License changed --- pkgs/development/libraries/gtk-layer-shell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index c00e8035f18b..892e1392a4bd 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "1fwvlbwp5w1zly6mksvlzbx18ikq4bh7pdj9q0k94qlj6x2zdwg8"; + sha256 = "0kas84z44p3vz92sljbnahh43wfj69knqsy1za729j8phrlwqdmg"; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; - license = licenses.mit; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ eonpatapon ]; platforms = platforms.unix; }; From 6164ca0b39384cf853a451de3644ee623e14ab28 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 10 Aug 2020 16:44:08 +0200 Subject: [PATCH 018/688] gtk-layer-shell: clean up * Use `pkg-config` instead of the alias. * `gobject-introspection` is used during build for GIR generation, move it to `nativeBuildInputs`. * Remove unused `out` meson flag. * Enable docs. * Split to multiple outputs. --- .../libraries/gtk-layer-shell/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 892e1392a4bd..14f822432ee3 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -2,7 +2,10 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 , wayland , gtk3 , gobject-introspection @@ -12,6 +15,8 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; version = "0.2.0"; + outputs = [ "out" "dev" "devdoc" ]; + src = fetchFromGitHub { owner = "wmww"; repo = "gtk-layer-shell"; @@ -20,15 +25,22 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig + meson + ninja + pkg-config + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ - wayland gtk3 gobject-introspection + wayland + gtk3 ]; mesonFlags = [ - "-Dout=${placeholder "out"}" + "-Ddocs=true" ]; meta = with stdenv.lib; { From b1d4731a7108c232bbc2fc3031488d407638455a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 Aug 2020 01:53:51 +0000 Subject: [PATCH 019/688] abcmidi: 2020.07.28 -> 2020.08.09 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index f075f503ae5a..4ab394516a84 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.07.28"; + version = "2020.08.09"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "05nsakvnx1jz2k9bvabpw5v3js28ng9z7n6ch58brd3qxc2p76zv"; + sha256 = "1j7jkv2fdrhyyjavffb5nrs8p9mfp8zqqravcad1ayv1z2wxr8vl"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From b68bddfbda2092c5fde2c4cece2f4bcf0eb214a1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 18:34:09 +0200 Subject: [PATCH 020/688] systemd: remove lib output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit systemd 246 started baking in some strings into $lib/lib/libsystemd.so which points back to $out. It might be desirable to not have these strings in there, but instead have systemd ask the running manager for the really active paths via IPC, or patch in some more mutable paths (like /run/current-system/…) - but as long as it is as it is, we should probably should just stop producing the `lib` output for now. This does increase the runtime closure for installations not pulling in systemd.out, or linking against multiple libsystemd's, but doesn't increase the runtime closure for NixOS itself, as it needs systemd anyways, and doesn't link against multiple variants of it. We can also remove the aarch64-specific $out/lib/systemd/catalog hack, and revive it at a later time if the `lib` output is reintroduced. --- pkgs/os-specific/linux/systemd/default.nix | 31 +--------------------- 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index c0163dcafe6a..07467d5fc031 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation { "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" ''; - outputs = [ "out" "lib" "man" "dev" ]; + outputs = [ "out" "man" "dev" ]; nativeBuildInputs = [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 @@ -107,7 +107,6 @@ in stdenv.mkDerivation { "-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" "-Dpamconfdir=${placeholder "out"}/etc/pam.d" "-Drootprefix=${placeholder "out"}" - "-Drootlibdir=${placeholder "lib"}/lib" "-Dpkgconfiglibdir=${placeholder "dev"}/lib/pkgconfig" "-Dpkgconfigdatadir=${placeholder "dev"}/share/pkgconfig" "-Dloadkeys-path=${kbd}/bin/loadkeys" @@ -276,38 +275,10 @@ in stdenv.mkDerivation { # "kernel-install" shouldn't be used on NixOS. find $out -name "*kernel-install*" -exec rm {} \; - - # Keep only libudev and libsystemd in the lib output. - mkdir -p $out/lib - mv $lib/lib/security $lib/lib/libnss* $out/lib/ ''; # */ enableParallelBuilding = true; - # On aarch64 we "leak" a reference to $out/lib/systemd/catalog in the lib - # output. The result of that is a dependency cycle between $out and $lib. - # Thus nix (rightfully) marks the build as failed. That reference originates - # from an array of strings (catalog_file_dirs) in systemd - # (src/src/journal/catalog.{c,h}). The only consumer (as of v242) of the - # symbol is the main function of journalctl. Still libsystemd.so contains - # the VALUE but not the symbol. Systemd seems to be properly using function - # & data sections together with the linker flags to garbage collect unused - # sections (-Wl,--gc-sections). For unknown reasons those flags do not - # eliminate the unused string constants, in this case on aarch64-linux. The - # hacky way is to just remove the reference after we finished compiling. - # Since it can not be used (there is no symbol to actually refer to it) there - # should not be any harm. It is a bit odd and I really do not like starting - # these kind of hacks but there doesn't seem to be a straight forward way at - # this point in time. - # The reference will be replaced by the same reference the usual nukeRefs - # tooling uses. The standard tooling can not / should not be uesd since it - # is a bit too excessive and could potentially do us some (more) harm. - postFixup = '' - nukedRef=$(echo $out | sed -e "s,$NIX_STORE/[^-]*-\(.*\),$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-\1,") - cat $lib/lib/libsystemd.so | perl -pe "s|$out/lib/systemd/catalog|$nukedRef/lib/systemd/catalog|" > $lib/lib/libsystemd.so.tmp - mv $lib/lib/libsystemd.so.tmp $(readlink -f $lib/lib/libsystemd.so) - ''; - # The interface version prevents NixOS from switching to an # incompatible systemd at runtime. (Switching across reboots is # fine, of course.) It should be increased whenever systemd changes From 2865490dc23d240fad0dc3eeb7102d10bd259e3c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 31 Jul 2020 18:02:33 +0200 Subject: [PATCH 021/688] systemd: 245.7 -> 246 --- ...ts-for-uninitialised-encrypted-devic.patch | 6 +- ...on-t-try-to-unmount-nix-or-nix-store.patch | 6 +- .../systemd/0003-Fix-NixOS-containers.patch | 10 +- ...004-Look-for-fsck-in-the-right-place.patch | 4 +- ...some-NixOS-specific-unit-directories.patch | 107 ++++++++++-------- ...f-a-useless-message-in-user-sessions.patch | 8 +- ...d-timedated-disable-methods-that-cha.patch | 38 +++---- .../linux/systemd/0008-Fix-hwdb-paths.patch | 4 +- ...e-usr-share-zoneinfo-to-etc-zoneinfo.patch | 28 ++--- ...calectl-use-etc-X11-xkb-for-list-x11.patch | 8 +- ...te-statedir-and-don-t-touch-prefixdi.patch | 10 +- ...configuration-into-out-share-factory.patch | 71 ++++++------ ...-environment-when-calling-generators.patch | 8 +- ...4-add-rootprefix-to-lookup-dir-paths.patch | 4 +- ...-execute-scripts-in-etc-systemd-syst.patch | 8 +- ...ecute-scripts-in-etc-systemd-system-.patch | 8 +- ...s.service-Update-ConditionFileNotEmp.patch | 4 +- ...-placeholder-for-DEFAULT_PATH_NORMAL.patch | 4 +- pkgs/os-specific/linux/systemd/default.nix | 6 +- 19 files changed, 180 insertions(+), 162 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index ab04ea91644e..390e7f9f09b3 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,4 +1,4 @@ -From 22f46f55c81d84e83a4614856d84e63c8400165c Mon Sep 17 00:00:00 2001 +From 54fb14592fc41752c3cd26552c974dd1ad4b9e73 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices @@ -13,7 +13,7 @@ unit. (However, this ignores the fsck unit, so it's not perfect...) 1 file changed, 4 deletions(-) diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in -index c34b606216..3ab8c1c3fe 100644 +index 1c60eec587..b2486da130 100644 --- a/rules.d/99-systemd.rules.in +++ b/rules.d/99-systemd.rules.in @@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd" @@ -28,5 +28,5 @@ index c34b606216..3ab8c1c3fe 100644 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index c52a13c9a41c..9bb69092ca4e 100644 --- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From e5b2b1e90d055068936336f6f01639bcde251b96 Mon Sep 17 00:00:00 2001 +From d52880eeae09aaacd308430499f55810157b1a6d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store @@ -12,7 +12,7 @@ https://github.com/NixOS/nixos/issues/126 2 files changed, 4 insertions(+) diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c -index b19127be09..f9adca1100 100644 +index 806dda8475..0220741c91 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c @@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { @@ -38,5 +38,5 @@ index 8a5e80eeaa..fab35ed6f3 100644 || path_equal(path, "/usr") #endif -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index e96593a59387..5ee54f39b741 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,4 +1,4 @@ -From ca7f6286c518d7ef3877458bbdf8e01f5518ab0e Mon Sep 17 00:00:00 2001 +From 794073e466a3b6c8e138f0e6d15c8d6465a1a4a9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Apr 2014 10:59:28 +0200 Subject: [PATCH 03/18] Fix NixOS containers @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 51d0c2a75b..4d3451ff3b 100644 +index 3b9493f232..0117a9939d 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5017,6 +5017,7 @@ static int run(int argc, char *argv[]) { +@@ -5122,6 +5122,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index 51d0c2a75b..4d3451ff3b 100644 const char *p, *q; if (arg_pivot_root_new) -@@ -5031,6 +5032,7 @@ static int run(int argc, char *argv[]) { +@@ -5136,6 +5137,7 @@ static int run(int argc, char *argv[]) { r = -EINVAL; goto finish; } @@ -30,5 +30,5 @@ index 51d0c2a75b..4d3451ff3b 100644 } else { -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index 4b2c059afd59..cdef28ad68ed 100644 --- a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -1,4 +1,4 @@ -From c87cc5b1cf9c37f195e6b362352279e14289554e Mon Sep 17 00:00:00 2001 +From caa8dcfa87cf2e46a7a1cce9c16f929916cf9186 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 May 2014 14:10:10 +0200 Subject: [PATCH 04/18] Look for fsck in the right place @@ -21,5 +21,5 @@ index 80f7107b9d..74e48a385f 100644 cmdline[i++] = "-T"; -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index a8f3f0e21fd9..95dd17531ab2 100644 --- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,4 +1,4 @@ -From 450c133c1815b473136b2a5540f9213fef5506ee Mon Sep 17 00:00:00 2001 +From e5d73359928b79bd846bda29ce61fe276d8c0b76 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Dec 2014 14:46:17 +0100 Subject: [PATCH 05/18] Add some NixOS-specific unit directories @@ -10,51 +10,36 @@ persistent, mutable units (used for Dysnomia). Also, remove /usr and /lib as these don't exist on NixOS. --- - src/core/systemd.pc.in | 4 ++-- - src/shared/path-lookup.c | 18 +++++------------- - 2 files changed, 7 insertions(+), 15 deletions(-) + src/basic/path-lookup.c | 20 +++++--------------- + src/core/systemd.pc.in | 5 +++-- + 2 files changed, 8 insertions(+), 17 deletions(-) -diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index 8331832c7a..bedb97115d 100644 ---- a/src/core/systemd.pc.in -+++ b/src/core/systemd.pc.in -@@ -17,8 +17,8 @@ systemduserunitdir=${prefix}/lib/systemd/user - systemduserpresetdir=${prefix}/lib/systemd/user-preset - systemdsystemconfdir=${sysconfdir}/systemd/system - systemduserconfdir=${sysconfdir}/systemd/user --systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system --systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user -+systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir} -+systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} - systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators - systemdusergeneratordir=${prefix}/lib/systemd/user-generators - systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir} -diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 48e0eec09a..a9d38f16d0 100644 ---- a/src/shared/path-lookup.c -+++ b/src/shared/path-lookup.c -@@ -98,17 +98,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { +diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c +index 52968dee34..bba2eb09b8 100644 +--- a/src/basic/path-lookup.c ++++ b/src/basic/path-lookup.c +@@ -94,17 +94,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { } static const char* const user_data_unit_paths[] = { - "/usr/local/lib/systemd/user", - "/usr/local/share/systemd/user", - USER_DATA_UNIT_PATH, + USER_DATA_UNIT_DIR, - "/usr/lib/systemd/user", - "/usr/share/systemd/user", NULL }; static const char* const user_config_unit_paths[] = { - USER_CONFIG_UNIT_PATH, + USER_CONFIG_UNIT_DIR, "/etc/systemd/user", + "/etc/systemd-mutable/user", NULL }; -@@ -604,15 +601,14 @@ int lookup_paths_init( +@@ -616,15 +613,14 @@ int lookup_paths_init( persistent_config, - SYSTEM_CONFIG_UNIT_PATH, + SYSTEM_CONFIG_UNIT_DIR, "/etc/systemd/system", + "/etc/systemd-mutable/system", + "/nix/var/nix/profiles/default/lib/systemd/system", @@ -70,9 +55,9 @@ index 48e0eec09a..a9d38f16d0 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -628,14 +624,12 @@ int lookup_paths_init( +@@ -640,14 +636,12 @@ int lookup_paths_init( persistent_config, - USER_CONFIG_UNIT_PATH, + USER_CONFIG_UNIT_DIR, "/etc/systemd/user", + "/etc/systemd-mutable/user", + "/nix/var/nix/profiles/default/lib/systemd/user", @@ -82,26 +67,58 @@ index 48e0eec09a..a9d38f16d0 100644 - "/usr/local/share/systemd/user", - "/usr/share/systemd/user", - "/usr/local/lib/systemd/user", - USER_DATA_UNIT_PATH, + USER_DATA_UNIT_DIR, - "/usr/lib/systemd/user", STRV_IFNOTNULL(generator_late)); break; -@@ -824,14 +818,12 @@ char **generator_binary_paths(UnitFileScope scope) { - case UNIT_FILE_SYSTEM: - return strv_new("/run/systemd/system-generators", - "/etc/systemd/system-generators", -- "/usr/local/lib/systemd/system-generators", - SYSTEM_GENERATOR_PATH); +@@ -797,7 +791,6 @@ char **generator_binary_paths(UnitFileScope scope) { + case UNIT_FILE_SYSTEM: + add = strv_new("/run/systemd/system-generators", + "/etc/systemd/system-generators", +- "/usr/local/lib/systemd/system-generators", + SYSTEM_GENERATOR_DIR); + break; - case UNIT_FILE_GLOBAL: - case UNIT_FILE_USER: - return strv_new("/run/systemd/user-generators", - "/etc/systemd/user-generators", -- "/usr/local/lib/systemd/user-generators", - USER_GENERATOR_PATH); +@@ -805,7 +798,6 @@ char **generator_binary_paths(UnitFileScope scope) { + case UNIT_FILE_USER: + add = strv_new("/run/systemd/user-generators", + "/etc/systemd/user-generators", +- "/usr/local/lib/systemd/user-generators", + USER_GENERATOR_DIR); + break; - default: +@@ -844,12 +836,10 @@ char **env_generator_binary_paths(bool is_system) { + if (is_system) + add = strv_new("/run/systemd/system-environment-generators", + "/etc/systemd/system-environment-generators", +- "/usr/local/lib/systemd/system-environment-generators", + SYSTEM_ENV_GENERATOR_DIR); + else + add = strv_new("/run/systemd/user-environment-generators", + "/etc/systemd/user-environment-generators", +- "/usr/local/lib/systemd/user-environment-generators", + USER_ENV_GENERATOR_DIR); + + if (!add) +diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in +index 8424837824..b1c541bc52 100644 +--- a/src/core/systemd.pc.in ++++ b/src/core/systemd.pc.in +@@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir} + systemd_user_conf_dir=${sysconfdir}/systemd/user + systemduserconfdir=${systemd_user_conf_dir} + +-systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemd_system_unit_dir}:/usr/lib/systemd/system:/lib/systemd/system ++systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir} + systemdsystemunitpath=${systemd_system_unit_path} + +-systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user ++systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} ++ + systemduserunitpath=${systemd_user_unit_path} + + systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index ac3d3b0bd6fe..3e519e7fe73d 100644 --- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -1,4 +1,4 @@ -From f88a9bb1e6080b539ed0116caa9781e7f6755f54 Mon Sep 17 00:00:00 2001 +From 1a3de021d9b8da060a77af6e26d2b61bafefda74 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 15:39:38 +0200 Subject: [PATCH 06/18] Get rid of a useless message in user sessions @@ -13,10 +13,10 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c -index c306183555..3db39fa435 100644 +index 2c09def06f..c70540e1a3 100644 --- a/src/core/unit.c +++ b/src/core/unit.c -@@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) { +@@ -2150,7 +2150,8 @@ static void unit_check_binds_to(Unit *u) { } assert(other); @@ -27,5 +27,5 @@ index c306183555..3db39fa435 100644 /* A unit we need to run is gone. Sniff. Let's stop this. */ r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL); -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index cef3280aba81..b63a051ae075 100644 --- a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -1,20 +1,20 @@ -From e2b25ce3606d05ff8a387185c41ab32fb2a36161 Mon Sep 17 00:00:00 2001 +From 6c12e0d2afe80563e692fc1f2f545a487c83418c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 6 Dec 2015 14:26:36 +0100 Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that change system settings. --- - src/hostname/hostnamed.c | 9 +++++++++ + src/hostname/hostnamed.c | 6 ++++++ src/locale/localed.c | 9 +++++++++ src/timedate/timedated.c | 10 ++++++++++ - 3 files changed, 28 insertions(+) + 3 files changed, 25 insertions(+) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index 21f6471495..8c5af7619f 100644 +index 7f6607a527..b5a9388916 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c -@@ -478,6 +481,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ +@@ -626,6 +626,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ if (r < 0) return r; @@ -23,8 +23,8 @@ index 21f6471495..8c5af7619f 100644 + name = empty_to_null(name); - if (streq_ptr(name, c->data[PROP_STATIC_HOSTNAME])) -@@ -535,6 +541,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess + context_read_etc_hostname(c); +@@ -685,6 +688,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (r < 0) return r; @@ -33,12 +33,12 @@ index 21f6471495..8c5af7619f 100644 + name = empty_to_null(name); - if (streq_ptr(name, c->data[prop])) + context_read_machine_info(c); diff --git a/src/locale/localed.c b/src/locale/localed.c -index 09f16d25f4..c1cb87cef1 100644 +index 715ce5cac7..014f7dcf6c 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c -@@ -275,6 +275,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er +@@ -317,6 +317,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er if (r < 0) return r; @@ -46,9 +46,9 @@ index 09f16d25f4..c1cb87cef1 100644 + "Changing system settings via systemd is not supported on NixOS."); + /* If single locale without variable name is provided, then we assume it is LANG=. */ - if (strv_length(l) == 1 && !strchr(*l, '=')) { - if (!locale_is_valid(*l)) -@@ -410,6 +413,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro + if (strv_length(l) == 1 && !strchr(l[0], '=')) { + if (!locale_is_valid(l[0])) +@@ -432,6 +435,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro if (r < 0) return r; @@ -58,7 +58,7 @@ index 09f16d25f4..c1cb87cef1 100644 keymap = empty_to_null(keymap); keymap_toggle = empty_to_null(keymap_toggle); -@@ -586,6 +592,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err +@@ -606,6 +612,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err if (r < 0) return r; @@ -69,10 +69,10 @@ index 09f16d25f4..c1cb87cef1 100644 model = empty_to_null(model); variant = empty_to_null(variant); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 5e2fb50d83..63865f557c 100644 +index c467b85477..3e78b2f575 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -652,6 +652,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * +@@ -646,6 +646,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * if (r < 0) return r; @@ -83,7 +83,7 @@ index 5e2fb50d83..63865f557c 100644 if (!timezone_is_valid(z, LOG_DEBUG)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); -@@ -731,6 +735,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error +@@ -725,6 +729,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error if (r < 0) return r; @@ -93,7 +93,7 @@ index 5e2fb50d83..63865f557c 100644 if (lrtc == c->local_rtc) return sd_bus_reply_method_return(m, NULL); -@@ -923,6 +930,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error +@@ -917,6 +924,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error if (r < 0) return r; @@ -104,5 +104,5 @@ index 5e2fb50d83..63865f557c 100644 if (r < 0) return r; -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch index 36d82e22f8c7..63bd03fcf38e 100644 --- a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch +++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -1,4 +1,4 @@ -From 5a6aad633a7ceffd62b009ce0c4ab6673129f7ff Mon Sep 17 00:00:00 2001 +From 1e40be83eca9a831509ae764081c2252934478c3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 7 Jul 2016 02:47:13 +0300 Subject: [PATCH 08/18] Fix hwdb paths @@ -28,5 +28,5 @@ index b3febdbb31..eba00a5bc7 100644 _public_ int sd_hwdb_new(sd_hwdb **ret) { _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index 8b5c807e4a89..dcdc0cd7ea01 100644 --- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,4 +1,4 @@ -From b509dbd302a7933ae0002f44b99aac6a1fd5775b Mon Sep 17 00:00:00 2001 +From 5e235e1f720f37fc5581b40c9a13d365368e74a8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 11 Oct 2016 13:12:08 +0300 Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo @@ -35,10 +35,10 @@ index 0f1652ee2e..71c4f95c2e 100644 Etc/UTC. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 105584e2e7..5238f69931 100644 +index 15cc1b8851..d0abde5933 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1217,7 +1217,7 @@ int get_timezones(char ***ret) { +@@ -1259,7 +1259,7 @@ int get_timezones(char ***ret) { n_allocated = 2; n_zones = 1; @@ -47,7 +47,7 @@ index 105584e2e7..5238f69931 100644 if (f) { for (;;) { _cleanup_free_ char *line = NULL; -@@ -1312,7 +1312,7 @@ bool timezone_is_valid(const char *name, int log_level) { +@@ -1354,7 +1354,7 @@ bool timezone_is_valid(const char *name, int log_level) { if (p - name >= PATH_MAX) return false; @@ -56,7 +56,7 @@ index 105584e2e7..5238f69931 100644 fd = open(t, O_RDONLY|O_CLOEXEC); if (fd < 0) { -@@ -1410,7 +1410,7 @@ int get_timezone(char **ret) { +@@ -1452,7 +1452,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* returns EINVAL if not a symlink */ @@ -66,10 +66,10 @@ index 105584e2e7..5238f69931 100644 return -EINVAL; diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 901fbf0815..b57bdd8fbe 100644 +index a3f442518e..feff49e280 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -431,7 +431,7 @@ static int process_timezone(void) { +@@ -459,7 +459,7 @@ static int process_timezone(void) { if (isempty(arg_timezone)) return 0; @@ -79,10 +79,10 @@ index 901fbf0815..b57bdd8fbe 100644 (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 4d3451ff3b..1adb91335c 100644 +index 0117a9939d..d86445b40f 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u +@@ -1699,8 +1699,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, @@ -94,10 +94,10 @@ index 4d3451ff3b..1adb91335c 100644 static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 63865f557c..8021a8b753 100644 +index 3e78b2f575..de5477a08f 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -264,7 +264,7 @@ static int context_read_data(Context *c) { +@@ -269,7 +269,7 @@ static int context_read_data(Context *c) { r = get_timezone(&t); if (r == -EINVAL) @@ -106,7 +106,7 @@ index 63865f557c..8021a8b753 100644 else if (r < 0) log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); -@@ -288,7 +288,7 @@ static int context_write_data_timezone(Context *c) { +@@ -293,7 +293,7 @@ static int context_write_data_timezone(Context *c) { if (isempty(c->zone) || streq(c->zone, "UTC")) { @@ -115,7 +115,7 @@ index 63865f557c..8021a8b753 100644 if (unlink("/etc/localtime") < 0 && errno != ENOENT) return -errno; -@@ -296,9 +296,9 @@ static int context_write_data_timezone(Context *c) { +@@ -301,9 +301,9 @@ static int context_write_data_timezone(Context *c) { return 0; } @@ -128,5 +128,5 @@ index 63865f557c..8021a8b753 100644 return -ENOMEM; -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index b18ffb401664..50c2a1174dfb 100644 --- a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -1,4 +1,4 @@ -From b5665ef8b9266c662c3a137df1ef1721cdff346e Mon Sep 17 00:00:00 2001 +From 141d1d7acf5f018df86f0a5f7fbe49a8e928fd73 Mon Sep 17 00:00:00 2001 From: Imuli Date: Wed, 19 Oct 2016 08:46:47 -0400 Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-* @@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index 6f2d37d222..7aa2310d48 100644 +index e0664de826..c521f33a2a 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c -@@ -286,7 +286,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { +@@ -277,7 +277,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { } state = NONE, look_for; int r; @@ -23,5 +23,5 @@ index 6f2d37d222..7aa2310d48 100644 return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index bc9efaed23ee..8ad310984ed7 100644 --- a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -1,4 +1,4 @@ -From be6b5c37779302384079b22b7fd767daad878fa9 Mon Sep 17 00:00:00 2001 +From db3946f465c0066fb1775a92c1fcc6450134904d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Feb 2018 04:37:44 +0100 Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir @@ -8,10 +8,10 @@ Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index c09115e06a..62eba4186c 100644 +index dbbddb68e2..bbeb23223d 100644 --- a/meson.build +++ b/meson.build -@@ -3184,9 +3184,6 @@ install_data('LICENSE.GPL2', +@@ -3369,9 +3369,6 @@ install_data('LICENSE.GPL2', 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', install_dir : docdir) @@ -20,7 +20,7 @@ index c09115e06a..62eba4186c 100644 - ############################################################ - meson_check_help = find_program('tools/meson-check-help.sh') + check_help = find_program('tools/check-help.sh') -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch index 5d67ce0ca31e..0844f85763b3 100644 --- a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch +++ b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch @@ -1,4 +1,4 @@ -From 9262f52b0e30cf8c39d9f7684a8c0e8fd4887cd5 Mon Sep 17 00:00:00 2001 +From 245af064c4d315d868cc12201b3663f61702cce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Feb 2018 14:25:57 +0000 Subject: [PATCH 12/18] Install default configuration into $out/share/factory @@ -31,10 +31,10 @@ store again, while having executables looking up files in /etc. 17 files changed, 29 insertions(+), 26 deletions(-) diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build -index 4df6dabf89..02d8d69095 100644 +index 5c77387a26..6404bc01ba 100644 --- a/hwdb.d/meson.build +++ b/hwdb.d/meson.build -@@ -27,7 +27,7 @@ if conf.get('ENABLE_HWDB') == 1 +@@ -43,7 +43,7 @@ if conf.get('ENABLE_HWDB') == 1 install_dir : udevhwdbdir) meson.add_install_script('sh', '-c', @@ -44,10 +44,10 @@ index 4df6dabf89..02d8d69095 100644 meson.add_install_script('sh', '-c', 'test -n "$DESTDIR" || @0@/systemd-hwdb update' diff --git a/meson.build b/meson.build -index 62eba4186c..b0b2edbb5a 100644 +index bbeb23223d..1a9c56fad2 100644 --- a/meson.build +++ b/meson.build -@@ -154,6 +154,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') +@@ -163,6 +163,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') catalogdir = join_paths(prefixdir, 'lib/systemd/catalog') kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d') factorydir = join_paths(datadir, 'factory') @@ -57,7 +57,7 @@ index 62eba4186c..b0b2edbb5a 100644 bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi') testsdir = join_paths(prefixdir, 'lib/systemd/tests') systemdstatedir = join_paths(localstatedir, 'lib/systemd') -@@ -2511,7 +2514,7 @@ if conf.get('ENABLE_BINFMT') == 1 +@@ -2651,7 +2654,7 @@ if conf.get('ENABLE_BINFMT') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(binfmtdir)) meson.add_install_script('sh', '-c', @@ -66,16 +66,16 @@ index 62eba4186c..b0b2edbb5a 100644 endif if conf.get('ENABLE_REPART') == 1 -@@ -2612,7 +2615,7 @@ executable('systemd-sleep', - install_dir : rootlibexecdir) +@@ -2767,7 +2770,7 @@ executable( + install_dir : rootlibexecdir) install_data('src/sleep/sleep.conf', - install_dir : pkgsysconfdir) + install_dir : factorypkgconfdir) - exe = executable('systemd-sysctl', - 'src/sysctl/sysctl.c', -@@ -2924,7 +2927,7 @@ if conf.get('HAVE_KMOD') == 1 + public_programs += executable( + 'systemd-sysctl', +@@ -3101,7 +3104,7 @@ if conf.get('HAVE_KMOD') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(modulesloaddir)) meson.add_install_script('sh', '-c', @@ -83,8 +83,8 @@ index 62eba4186c..b0b2edbb5a 100644 + mkdir_p.format(join_paths(factoryconfdir, 'modules-load.d'))) endif - exe = executable('systemd-nspawn', -@@ -3167,7 +3170,7 @@ install_subdir('factory/etc', + public_programs += executable( +@@ -3352,7 +3355,7 @@ install_subdir('factory/etc', install_dir : factorydir) install_data('xorg/50-systemd-user.sh', @@ -94,10 +94,10 @@ index 62eba4186c..b0b2edbb5a 100644 install_dir : modprobedir) install_data('LICENSE.GPL2', diff --git a/network/meson.build b/network/meson.build -index 544dcf4387..1828c50863 100644 +index 99a650eac3..8105a4e48d 100644 --- a/network/meson.build +++ b/network/meson.build -@@ -10,7 +10,7 @@ if conf.get('ENABLE_NETWORKD') == 1 +@@ -11,7 +11,7 @@ if conf.get('ENABLE_NETWORKD') == 1 install_dir : networkdir) meson.add_install_script('sh', '-c', @@ -107,10 +107,10 @@ index 544dcf4387..1828c50863 100644 install_data('99-default.link', diff --git a/src/core/meson.build b/src/core/meson.build -index 3586838f59..02ddf1a123 100644 +index fa95108523..60ee0e31c1 100644 --- a/src/core/meson.build +++ b/src/core/meson.build -@@ -179,8 +179,8 @@ libcore = static_library( +@@ -183,8 +183,8 @@ libcore = static_library( systemd_sources = files('main.c') in_files = [['macros.systemd', rpmmacrosdir], @@ -121,7 +121,7 @@ index 3586838f59..02ddf1a123 100644 ['systemd.pc', pkgconfigdatadir], ['triggers.systemd', '']] -@@ -212,6 +212,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) +@@ -216,6 +216,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir)) meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir)) @@ -180,15 +180,16 @@ index 5796f77cac..75d975c260 100644 if get_option('create-log-dirs') meson.add_install_script( diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build -index 261c3aaae4..dbc5e23513 100644 +index 9ae342dfba..65df666337 100644 --- a/src/kernel-install/meson.build +++ b/src/kernel-install/meson.build -@@ -11,4 +11,4 @@ install_data('00-entry-directory.install', - install_dir : kernelinstalldir) +@@ -14,5 +14,5 @@ if want_kernel_install + install_dir : kernelinstalldir) - meson.add_install_script('sh', '-c', -- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d'))) -+ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d'))) + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d'))) + endif diff --git a/src/login/meson.build b/src/login/meson.build index 0a7d3d5440..ff90149c1c 100644 --- a/src/login/meson.build @@ -203,10 +204,10 @@ index 0a7d3d5440..ff90149c1c 100644 install_data('org.freedesktop.login1.conf', install_dir : dbuspolicydir) diff --git a/src/network/meson.build b/src/network/meson.build -index c1c02cfda1..1bfa79a03b 100644 +index b3a88d9910..be56d1e9d7 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -201,7 +201,7 @@ if conf.get('ENABLE_NETWORKD') == 1 +@@ -229,7 +229,7 @@ if conf.get('ENABLE_NETWORKD') == 1 endif install_data('networkd.conf', @@ -227,10 +228,10 @@ index adbac24b54..e9dc88dfa2 100644 + install_dir : factorypkgconfdir) endif diff --git a/src/resolve/meson.build b/src/resolve/meson.build -index c4d8d4e5d9..f550c289a5 100644 +index 92b67b6333..ac5b9a0b0a 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build -@@ -170,7 +170,7 @@ if conf.get('ENABLE_RESOLVE') == 1 +@@ -168,7 +168,7 @@ if conf.get('ENABLE_RESOLVE') == 1 output : 'resolved.conf', configuration : substs) install_data(resolved_conf, @@ -253,10 +254,10 @@ index e5c118c8db..19235df9ca 100644 install_dir : dbuspolicydir) install_data('org.freedesktop.timesync1.service', diff --git a/src/udev/meson.build b/src/udev/meson.build -index 173b10be50..82638cf5a9 100644 +index aa23b07090..ad004d803a 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build -@@ -187,7 +187,7 @@ foreach prog : [['ata_id/ata_id.c'], +@@ -186,7 +186,7 @@ foreach prog : [['ata_id/ata_id.c'], endforeach install_data('udev.conf', @@ -265,7 +266,7 @@ index 173b10be50..82638cf5a9 100644 configure_file( input : 'udev.pc.in', -@@ -196,7 +196,7 @@ configure_file( +@@ -195,7 +195,7 @@ configure_file( install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir) meson.add_install_script('sh', '-c', @@ -285,10 +286,10 @@ index 3f072e3db7..bd9f843eba 100644 - mkdir_p.format(join_paths(sysconfdir, 'sysctl.d'))) + mkdir_p.format(join_paths(factoryconfdir, 'sysctl.d'))) diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build -index e77f46d06b..04d2ef621d 100644 +index 0a9582d8b9..3c56ca7d83 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build -@@ -57,5 +57,5 @@ endforeach +@@ -58,5 +58,5 @@ endforeach if enable_tmpfiles meson.add_install_script( 'sh', '-c', @@ -296,7 +297,7 @@ index e77f46d06b..04d2ef621d 100644 + mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d'))) endif diff --git a/units/meson.build b/units/meson.build -index ea91f0cc9e..8622054ca5 100644 +index aa2ed115ea..12e2925226 100644 --- a/units/meson.build +++ b/units/meson.build @@ -323,7 +323,7 @@ install_data('user-.slice.d/10-defaults.conf', @@ -309,5 +310,5 @@ index ea91f0cc9e..8622054ca5 100644 join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch index 11d2dc26e38d..a15220fd3f93 100644 --- a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch @@ -1,4 +1,4 @@ -From 05c2761f6a981c8576fc47a3dd8beb5a2af3ef09 Mon Sep 17 00:00:00 2001 +From bfaa53731ffe984c93c5321099d1341b5059f029 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 2 Nov 2018 21:15:42 +0100 Subject: [PATCH 13/18] inherit systemd environment when calling generators. @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 4412e7a849..b799eeca95 100644 +index 41e0d73736..d02de06f09 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -3901,9 +3901,14 @@ static int manager_run_generators(Manager *m) { +@@ -4095,9 +4095,14 @@ static int manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) @@ -38,5 +38,5 @@ index 4412e7a849..b799eeca95 100644 finish: -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch index 06b00b82cb96..dca7b5591d29 100644 --- a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch +++ b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch @@ -1,4 +1,4 @@ -From c70029539d0aec5df0c1e4203359335a3841a1e5 Mon Sep 17 00:00:00 2001 +From d8b93ef32f3b95a6ce6548a8ad1504a485ffbe81 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 9 May 2019 11:15:22 +0200 Subject: [PATCH 14/18] add rootprefix to lookup dir paths @@ -34,5 +34,5 @@ index 970654a1ad..bb261040f8 100644 #define CONF_PATHS(n) \ CONF_PATHS_USR(n) \ -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 6431b56ea3e3..1bd9e23d25c2 100644 --- a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -1,4 +1,4 @@ -From 98580b4aa34f3d2e7401f54d6561c5af27ea3437 Mon Sep 17 00:00:00 2001 +From b3bc0aa899c51d19edfb53af2b00dde64123ab06 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:45:55 +0300 Subject: [PATCH 15/18] systemd-shutdown: execute scripts in @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 523040b57c..561d91c94c 100644 +index 06c9710c6e..dadcc3117d 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c -@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) { +@@ -312,7 +312,7 @@ int main(int argc, char *argv[]) { _cleanup_free_ char *cgroup = NULL; char *arguments[3], *watchdog_device; int cmd, r, umount_log_level = LOG_INFO; @@ -23,5 +23,5 @@ index 523040b57c..561d91c94c 100644 /* The log target defaults to console, but the original systemd process will pass its log target in through a * command line argument, which will override this default. Also, ensure we'll never log to the journal or -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index c27d1a10d588..d99c7ecc96c1 100644 --- a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -1,4 +1,4 @@ -From 3821e20966ee20f74986041f33c4934ad20385b2 Mon Sep 17 00:00:00 2001 +From 2679210f4ce804713bf1d244ac0fb8ac7b9b1e5f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:46:58 +0300 Subject: [PATCH 16/18] systemd-sleep: execute scripts in @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index fbfddc0262..d2530b9421 100644 +index 7029352ca5..6d9c636872 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -178,6 +178,7 @@ static int execute(char **modes, char **states) { +@@ -182,6 +182,7 @@ static int execute(char **modes, char **states) { }; static const char* const dirs[] = { SYSTEM_SLEEP_PATH, @@ -22,5 +22,5 @@ index fbfddc0262..d2530b9421 100644 }; -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch index 9fae2d5767cd..f45e4edd8e84 100644 --- a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch +++ b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -1,4 +1,4 @@ -From b07defe819e0f66d08563690b3a5abea5da08620 Mon Sep 17 00:00:00 2001 +From 561b0cc9a1faed5729d6f701304a65c2968394ec Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 7 Mar 2020 22:40:27 +0100 Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty @@ -23,5 +23,5 @@ index 0971edf9ec..87105a87b9 100644 [Service] Type=oneshot -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index 321817dad6ff..a964aeede76b 100644 --- a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -1,4 +1,4 @@ -From 9c1ac48a7d95c09bef5a924bb5db6908596403b4 Mon Sep 17 00:00:00 2001 +From 0d9d7c03054babdbd1fa5f6f266b56e8c96e9ba5 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 8 Mar 2020 01:05:54 +0100 Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL @@ -29,5 +29,5 @@ index 30031fca8e..d97145539a 100644 #if HAVE_SPLIT_USR # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 07467d5fc031..161b74aea763 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -33,7 +33,7 @@ let gnupg-minimal = gnupg.override { }; in stdenv.mkDerivation { - version = "245.7"; + version = "246"; pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -41,8 +41,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "systemd"; repo = "systemd-stable"; - rev = "1e6233ed07f7af08550fffa7a885cac1ac67a2c3"; - sha256 = "1hd5kc3mm7mg4i7hhi82wg4cpg4fpi2k6hzjq9sv07pkn2lw390w"; + rev = "ae366f3acbc1a45504e9875099b17a7e1a221d03"; + sha256 = "0zrkyxrh5rm45f2l1rnjyv229bcyzawfw7c63jqxwix75px60dyw"; }; patches = [ From c81c10624c65927cd8008b71f878ce0b13829dab Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 6 Aug 2020 12:01:45 +0200 Subject: [PATCH 022/688] gnupgMinimal: move to all-packages.nix, use from inside systemd This makes things more consistent with how we pass in utillinuxMinimal. There's already a minimal argument in the gnupg derivation, but this gnupg is even more minimal. Instead of defining a gnupgSuperMinimal, we define it inline inside systemd. --- pkgs/os-specific/linux/systemd/default.nix | 19 ++----------------- pkgs/top-level/all-packages.nix | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 161b74aea763..2609dc14bbc3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -17,22 +17,7 @@ , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: -let gnupg-minimal = gnupg.override { - enableMinimal = true; - guiSupport = false; - pcsclite = null; - sqlite = null; - pinentry = null; - adns = null; - gnutls = null; - libusb1 = null; - openldap = null; - readline = null; - zlib = null; - bzip2 = null; -}; - -in stdenv.mkDerivation { +stdenv.mkDerivation { version = "246"; pname = "systemd"; @@ -214,7 +199,7 @@ in stdenv.mkDerivation { # absolute paths to gpg & tar substituteInPlace src/import/pull-common.c \ - --replace '"gpg"' '"${gnupg-minimal}/bin/gpg"' + --replace '"gpg"' '"${gnupg}/bin/gpg"' for file in src/import/{{export,import,pull}-tar,import-common}.c; do substituteInPlace $file \ --replace '"tar"' '"${gnutar}/bin/tar"' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9db0489c7f0..a9020acc83c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18066,8 +18066,25 @@ in sysstat = callPackage ../os-specific/linux/sysstat { }; systemd = callPackage ../os-specific/linux/systemd { - utillinux = utillinuxMinimal; # break the cyclic dependency + # break some cyclic dependencies + utillinux = utillinuxMinimal; + # provide a super minimal gnupg used for systemd-machined + gnupg = callPackage ../tools/security/gnupg/22.nix { + enableMinimal = true; + guiSupport = false; + pcsclite = null; + sqlite = null; + pinentry = null; + adns = null; + gnutls = null; + libusb1 = null; + openldap = null; + readline = null; + zlib = null; + bzip2 = null; + }; }; + udev = systemd; # TODO: move to aliases.nix systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; From 38044aac5915e9fb0931ae76b27e73695e52a3de Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 6 Aug 2020 12:04:28 +0200 Subject: [PATCH 023/688] systemd: use tags as rev, update comment explaining updating workflow. --- pkgs/os-specific/linux/systemd/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 2609dc14bbc3..54060b156f26 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -17,19 +17,24 @@ , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: -stdenv.mkDerivation { +let version = "246"; +in stdenv.mkDerivation { + inherit version; pname = "systemd"; - # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! - # Also fresh patches should be cherry-picked from that tree to our current one. + # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly + # This has proven to be less error-prone than the previous systemd fork. src = fetchFromGitHub { owner = "systemd"; repo = "systemd-stable"; - rev = "ae366f3acbc1a45504e9875099b17a7e1a221d03"; + rev = "v${version}"; sha256 = "0zrkyxrh5rm45f2l1rnjyv229bcyzawfw7c63jqxwix75px60dyw"; }; + # If these need to be regenerated, `git am path/to/00*.patch` them into a + # systemd worktree, rebase to the more recent systemd version, and export the + # patches again via `git format-patch v${version}`. patches = [ ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch From 2f9d71906197789b75e28e5350ad4d62a4026344 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 6 Aug 2020 12:16:56 +0200 Subject: [PATCH 024/688] nixos/systemd: remove mymachines nss module from passwd: and group: lines From the systemd release notes: nss-mymachines lost support for resolution of users and groups, and now only does resolution of hostnames. This functionality is now provided by nss-systemd. Thus, the 'mymachines' entry should be removed from the 'passwd:' and 'group:' lines in /etc/nsswitch.conf (and 'systemd' added if it is not already there). --- nixos/modules/system/boot/systemd.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 39be069ad0eb..bf65b58b3ea5 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -907,11 +907,9 @@ in ) ]); passwd = (mkMerge [ - [ "mymachines" ] (mkAfter [ "systemd" ]) ]); group = (mkMerge [ - [ "mymachines" ] (mkAfter [ "systemd" ]) ]); }; From 4f7636dafc0e69f36765bd0cd4e62238407a343f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 19:38:14 +0200 Subject: [PATCH 025/688] nixos/systemd: don't try to install systemd-initctl.{service,socket} These are now only installed by systemd if HAVE_SYSV_COMPAT is true, which only is the case if you set sysvinit-path and sysvrcnd-path (which we explicitly unset in the systemd derivation for quite some time) --- nixos/modules/system/boot/systemd.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index bf65b58b3ea5..4d064cf17a84 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -81,10 +81,6 @@ let "systemd-coredump.socket" "systemd-coredump@.service" - # SysV init compatibility. - "systemd-initctl.socket" - "systemd-initctl.service" - # Kernel module loading. "systemd-modules-load.service" "kmod-static-nodes.service" From 7361f6f25266e8bc104f9bafaec860e67ea45c65 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 19:50:37 +0200 Subject: [PATCH 026/688] nixos/boot: handle systemd-udevd being a symlink to udevadm --- nixos/modules/system/boot/stage-1.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 7f13f67e8ef6..cb6673d108b9 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -119,12 +119,13 @@ let copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon # Copy udev. - copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd - copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl copy_bin_and_libs ${udev}/bin/udevadm + copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl for BIN in ${udev}/lib/udev/*_id; do copy_bin_and_libs $BIN done + # systemd-udevd is only a symlink to udevadm these days + ln -sf udevadm $out/bin/systemd-udevd # Copy modprobe. copy_bin_and_libs ${pkgs.kmod}/bin/kmod From 5b49f1fb0faf2f1b214afeadb9c3ecc125cc19a4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:09:23 +0200 Subject: [PATCH 027/688] axoloti: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/audio/axoloti/libusb1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix index 49b788f66537..255cf3f5e3bf 100644 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: +{ stdenv, lib, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: stdenv.mkDerivation rec { name = "libusb-1.0.19"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; preFixup = stdenv.lib.optionalString stdenv.isLinux '' - sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la + sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; meta = with stdenv.lib; { From a88186b4a242efe520b884adcd08333aca09fbe2 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:10:10 +0200 Subject: [PATCH 028/688] brackets: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/editors/brackets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 3e01bcdb0f9d..9d5978e605ae 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf +{ stdenv, lib, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf , cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }: with stdenv.lib; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { rmdir $out/usr ln -sf $out/opt/brackets/brackets $out/bin/brackets - ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 substituteInPlace $out/opt/brackets/brackets.desktop \ --replace "Exec=/opt/brackets/brackets" "Exec=brackets" From 6c8d0d1de710ccabaf4d5eac11670cacc20965e8 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:10:30 +0200 Subject: [PATCH 029/688] lighttable: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/editors/lighttable/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 26c5ee421527..abf55b42c551 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem +{ stdenv, lib, fetchurl, zlib, glib, alsaLib, makeDesktopItem , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify }: @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { mv $out/share/LightTable/light $out/bin/light - ln -sf ${systemd.lib}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0 + ln -sf ${lib.getLib systemd}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0 substituteInPlace $out/bin/light \ - --replace "/usr/lib/x86_64-linux-gnu" "${systemd.lib}/lib" \ + --replace "/usr/lib/x86_64-linux-gnu" "${lib.getLib systemd}/lib" \ --replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \ --replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable" From 766a3b5b554e35fd79478618c1c7ae3ae854ce5b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:10:53 +0200 Subject: [PATCH 030/688] pencil: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/graphics/pencil/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index edd923822ea3..19e8121ac08d 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { $out/opt/pencil/pencil # fix missing libudev - ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1 + ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1 wrapProgram $out/opt/pencil/pencil \ --prefix LD_LIBRARY_PATH : $out/opt/pencil ''; From 6585998a92652dfa3d1f6086ce84c8512d11f02d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:11:02 +0200 Subject: [PATCH 031/688] obinskit : use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/misc/obinskit/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix index bb85c84f7ee2..dc03b9b4f93c 100644 --- a/pkgs/applications/misc/obinskit/default.nix +++ b/pkgs/applications/misc/obinskit/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , libxkbcommon , systemd @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/opt/obinskit/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}" + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}" ''; meta = with stdenv.lib; { From 789749598a3e7678dad4e30f0f8e2d4f319b6c15 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:11:51 +0200 Subject: [PATCH 032/688] vscode: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/editors/vscode/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 38d695bd74ac..57bd73d60192 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -62,7 +62,7 @@ in else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages) ++ [ libsecret libXScrnSaver ]; - runtimeDependencies = lib.optional (stdenv.isLinux) [ systemd.lib fontconfig.lib ]; + runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib ]; nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; From c56e961acdf502073d4695912bc879a853f96443 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:12:16 +0200 Subject: [PATCH 033/688] chromium: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e538fb66bf9d..0bcd7c6d1b73 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar +{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -190,7 +190,7 @@ let sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ From 427a36e78b6f5fe0f69a35e2f6abc79e18109780 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:12:30 +0200 Subject: [PATCH 034/688] opera: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/networking/browsers/opera/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 686ffee91488..230a97680e2d 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -104,7 +104,7 @@ in stdenv.mkDerivation rec { # This is a little tricky. Without it the app starts then crashes. Then it # brings up the crash report, which also crashes. `strace -f` hints at a # missing libudev.so.0. - systemd.lib + (lib.getLib systemd) ]; installPhase = '' From cedd724fbfb1a87e9d84e706ee99477334eb4a54 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:13:02 +0200 Subject: [PATCH 035/688] drawio: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/graphics/drawio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index a8dbff6ca8b5..5d037bba5ba5 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; runtimeDependencies = [ - systemd.lib + (lib.getLib systemd) ]; dontBuild = true; From eea7f93ce9ecefd506427c8d322036aab9483bb4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:13:14 +0200 Subject: [PATCH 036/688] ungoogled-chromium: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- .../networking/browsers/ungoogled-chromium/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index 567a75a31aba..f9a2693f2430 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar +{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -197,7 +197,7 @@ let sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ From ecc80775aa95ac7fb027bdab134d8abb4e148b6f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:13:30 +0200 Subject: [PATCH 037/688] signal-desktop: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- .../networking/instant-messengers/signal-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 90e2b201ebbe..abd187b57c78 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { ]; runtimeDependencies = [ - systemd.lib + (lib.getLib systemd) libnotify ]; From 24126d3cab10411188c21c3c152b7d21305497e1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:13:48 +0200 Subject: [PATCH 038/688] teams: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- .../networking/instant-messengers/teams/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index e3b664e5fc23..d58e27cc62bb 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; runtimeDependencies = [ - systemd.lib + (lib.getLib systemd) pulseaudio ]; From dbb5fbfb1560a049b0ddc94f7176c268494f4bf0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:14:08 +0200 Subject: [PATCH 039/688] thunderbird: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/networking/mailreaders/thunderbird/68.nix | 2 +- .../applications/networking/mailreaders/thunderbird/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index 4b1efef027e0..55c9e6a7f99b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -310,7 +310,7 @@ stdenv.mkDerivation rec { # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? postFixup = '' local xul="$out/lib/thunderbird/libxul.so" - patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul + patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 961806fa9aba..e779aa4ce9db 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -304,7 +304,7 @@ stdenv.mkDerivation rec { # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? postFixup = '' local xul="$out/lib/thunderbird/libxul.so" - patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul + patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul ''; doInstallCheck = true; From a22b1a61a8410aa932518c8df7c0d0fefed0ad8d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:14:44 +0200 Subject: [PATCH 040/688] mullvad-vpn: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- 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 265c8add2785..aa7aaab29ac2 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchurl, dpkg +{ stdenv, lib, makeWrapper, fetchurl, dpkg , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3 , xorg, autoPatchelfHook, systemd, libnotify, libappindicator @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { unpackPhase = "dpkg-deb -x $src ."; - runtimeDependencies = [ systemd.lib libnotify libappindicator ]; + runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator ]; installPhase = '' runHook preInstall From a2998bff524e92fd02669742d8eb47d5fd3d571b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:15:14 +0200 Subject: [PATCH 041/688] citrix-workspace: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- .../applications/networking/remote/citrix-workspace/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 36ae194a165a..c19cb5859524 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { openssl' pango speex - systemd.lib + (lib.getLib systemd) stdenv.cc.cc xorg.libXaw xorg.libXmu From 77a9788b08c194ae74f62dcae5220259eb3e4c3c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:15:30 +0200 Subject: [PATCH 042/688] qt5.qtwebengine: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 512060701e2d..1c16170d47fe 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -61,7 +61,7 @@ qtModule { '' # Patch library paths in Chromium sources + optionalString (!stdenv.isDarwin) '' - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ src/3rdparty/chromium/device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ From 8b5deb080d3481907ec4faee52d50d300a1a5b24 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:16:26 +0200 Subject: [PATCH 043/688] python3.pkgs.pyudev: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/development/python-modules/pyudev/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index c0a401a1b2a2..aabf9cd5de52 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace src/pyudev/_ctypeslib/utils.py \ - --replace "find_library(name)" "'${systemd.lib}/lib/libudev.so'" + --replace "find_library(name)" "'${lib.getLib systemd}/lib/libudev.so'" ''; checkInputs = [ pytest mock hypothesis docutils ]; From d512c0879864060b7cf4e02342e8ed60e5ae7bd9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:16:44 +0200 Subject: [PATCH 044/688] nwjs_0_12: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/development/tools/node-webkit/nw12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 307e123bf77d..ffd2a78f5094 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper +{ stdenv, lib, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify}: @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc - ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc From 9fb8e4a765493be94e8cd9a1f252ef53a44cccab Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:17:35 +0200 Subject: [PATCH 045/688] nwjs: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/development/tools/nwjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index ab16d9511514..4eedc003272c 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper +{ stdenv, lib, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw - ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 libpath="$out/share/nwjs/lib/" for f in "$libpath"/*.so; do From 661314d27be97446ad5e90ce3c9734890039420c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:17:51 +0200 Subject: [PATCH 046/688] sysprof: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/development/tools/profiling/sysprof/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 620bce7a0fff..ce7313098822 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , desktop-file-utils , fetchurl , fetchpatch @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { wrapGAppsHook gnome3.adwaita-icon-theme ]; - buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib libdazzle ]; + buildInputs = [ glib gtk3 pango polkit systemd.dev (lib.getLib systemd) libdazzle ]; mesonFlags = [ "-Dsystemdunitdir=lib/systemd/system" From 8ccbb4747e9ea0e8c05730d512f1ba36a6cd427a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:18:40 +0200 Subject: [PATCH 047/688] filebeat6: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/misc/logging/beats/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index c3bca18a9a44..2d01ea622612 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: +{ stdenv, lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -46,7 +46,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; From 05a61fc30a2046a5c671feb602cfdc33314dcbc3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:18:56 +0200 Subject: [PATCH 048/688] filebeat7: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/misc/logging/beats/7.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 61c89339fe70..465051d3726e 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: +{ stdenv, lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -45,7 +45,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; From 68debbe0cbc74e769247d21faf9c7a624b305500 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:19:12 +0200 Subject: [PATCH 049/688] loki: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/servers/monitoring/loki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 668695aa8df2..cf1d5f23ff31 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: buildGoPackage rec { version = "1.5.0"; @@ -25,7 +25,7 @@ buildGoPackage rec { preFixup = stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/promtail \ - --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" + --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; meta = with stdenv.lib; { From e5a0c1cec1cf4e60ad5938b172a0e006a20b6cb1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:19:25 +0200 Subject: [PATCH 050/688] postfix-exporter: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/servers/monitoring/prometheus/postfix-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 506d334a921b..c66373e92982 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests +{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests , systemd, withSystemdSupport ? true }: with stdenv.lib; @@ -44,7 +44,7 @@ buildGoPackage rec { postInstall = optionalString withSystemdSupport '' wrapProgram $out/bin/postfix_exporter \ - --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" + --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; passthru.tests = { inherit (nixosTests.prometheus-exporters) postfix; }; From 2d41f0f3f01f88925fc51907ee951d69eac21005 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:20:03 +0200 Subject: [PATCH 051/688] nixpart_0_4: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index b05abd72bac7..6ba29cb98d40 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py sed -i -e '/find_library/,/find_library/ { - c libudev = "${systemd.lib}/lib/libudev.so.1" + c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1" }' blivet/pyudev.py ''; diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index ffed57e6345e..36525e6fa3cd 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup - substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id - substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id + substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id + substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", From 1b7725e58d291e7767b11fb60d59afc702ee319f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:20:32 +0200 Subject: [PATCH 052/688] staruml: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/tools/misc/staruml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index a1e6f57ce3d8..90c3c696526d 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ stdenv, lib, fetchurl, makeWrapper , dpkg, patchelf , gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd , libXdamage, expat }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ - ln -s ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 for binary in StarUML Brackets-node; do ${patchelf}/bin/patchelf \ From d6f3b96a5d99b93ed07509c7c50f168348ed6762 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:20:51 +0200 Subject: [PATCH 053/688] datadog-agent: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/tools/networking/dd-agent/datadog-agent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index dc29a95d92b0..acf9dda51514 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -65,7 +65,7 @@ in buildGoPackage rec { wrapProgram "$out/bin/agent" \ --set PYTHONPATH "$out/${python.sitePackages}" \ - --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib + --prefix LD_LIBRARY_PATH : ${lib.getLib systemd}/lib ''; meta = with stdenv.lib; { From 135158c8c6ade75f9414008c0141df9b31b4ed57 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:21:10 +0200 Subject: [PATCH 054/688] encryptr: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/tools/security/encryptr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index b4c2bef2cf40..62311a41da37 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype +{ stdenv, lib, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype , pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes , libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr , expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { cp -v {encryptr-bin,icudtl.dat,nw.pak} $out/bin mv -v $out/bin/encryptr{-bin,} cp -v lib* $out/lib - ln -sv ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0 + ln -sv ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath $out/lib:${rpath} \ From a89a4ae87e02a398af3158c0776acae989010200 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:23:07 +0200 Subject: [PATCH 055/688] wire-desktop: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- .../networking/instant-messengers/wire-desktop/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 532eeb1d0387..48eb1ef202c0 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -5,6 +5,7 @@ , makeDesktopItem , makeWrapper , stdenv +, lib , udev , wrapGAppsHook , cpio @@ -107,7 +108,7 @@ let ''; runtimeDependencies = [ - udev.lib + (lib.getLib udev) ]; postFixup = '' From 40cc04a8b8da01be902b55232c079ad6aa65ee89 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:27:17 +0200 Subject: [PATCH 056/688] simplenote: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/misc/simplenote/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 6c66987ddb51..8839dc38a532 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -4,6 +4,7 @@ , fetchurl , makeDesktopItem , makeWrapper +, lib , stdenv , udev , wrapGAppsHook @@ -82,7 +83,7 @@ let ''; runtimeDependencies = [ - udev.lib + (lib.getLib udev) ]; postFixup = '' From db75a25d81cabdef5deb748ff935f3fbcb3c8b3a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:27:33 +0200 Subject: [PATCH 057/688] bluejeans: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- .../networking/instant-messengers/bluejeans/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 0143e401c194..f8bcdc4bef7c 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , rpmextract , libnotify @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { expat gdk-pixbuf dbus - udev.lib + (lib.getLib udev) freetype nspr glib From ce0c244d8397aa5b4604d059d9e5e4b80ab2f4cb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:27:53 +0200 Subject: [PATCH 058/688] franz: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- .../networking/instant-messengers/franz/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index d1206cdf9b25..3f05e3d7a5d3 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -1,4 +1,5 @@ { stdenv +, lib , makeWrapper , wrapGAppsHook , autoPatchelfHook @@ -64,7 +65,7 @@ stdenv.mkDerivation { expat stdenv.cc.cc ]; - runtimeDependencies = [ udev.lib libnotify ]; + runtimeDependencies = [ (lib.getLib udev) libnotify ]; unpackPhase = "dpkg-deb -x $src ."; From fd4ca1983174fa999804b5d8e140c5738ebe3330 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:28:19 +0200 Subject: [PATCH 059/688] rambox: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- .../networking/instant-messengers/rambox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 6bf3efa53640..e6f80de821f4 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook +{ stdenv, lib, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook , libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify, wrapGAppsHook }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ]; - runtimeDependencies = [ udev.lib libnotify ]; + runtimeDependencies = [ (lib.getLib udev) libnotify ]; unpackPhase = "dpkg-deb -x $src ."; From 5cf44f4edad7f2d13f308181a6288fb91d30fd4d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:28:30 +0200 Subject: [PATCH 060/688] vk-messenger: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- .../networking/instant-messengers/vk-messenger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index bece4e467a35..2910c389daac 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract, autoPatchelfHook +{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook , xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify , wrapGAppsHook }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation { ]) ++ [ gtk3 nss alsaLib ]; - runtimeDependencies = [ udev.lib libnotify ]; + runtimeDependencies = [ (lib.getLib udev) libnotify ]; unpackPhase = '' rpmextract $src From 67ad63c82d43e217764c588e55b0c8f57fd8c301 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:28:45 +0200 Subject: [PATCH 061/688] wavebox: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- .../networking/instant-messengers/wavebox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 1cd2df4c7ac1..bdc8aabf61cf 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation { alsaLib gtk3 nss ]; - runtimeDependencies = [ udev.lib libnotify ]; + runtimeDependencies = [ (getLib udev) libnotify ]; installPhase = '' mkdir -p $out/bin $out/opt/wavebox From f77b81df26bd5732d0c3725185b2071a24732f64 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:29:03 +0200 Subject: [PATCH 062/688] mailspring: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- .../applications/networking/mailreaders/mailspring/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 3bb68d7805cf..6c6bf6f93db3 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , autoPatchelfHook , alsaLib @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ coreutils openssl - udev.lib + (lib.getLib udev) ]; unpackPhase = '' From 05a5afc979da46fc45fd8aedfa32be8590079367 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:29:24 +0200 Subject: [PATCH 063/688] termius: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/networking/termius/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 2019e1c2b818..9ce2f1fcfd16 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -5,6 +5,7 @@ , makeDesktopItem , makeWrapper , stdenv +, lib , udev , wrapGAppsHook }: @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { cp "${desktopItem}/share/applications/"* "$out/share/applications" ''; - runtimeDependencies = [ udev.lib ]; + runtimeDependencies = [ (lib.getLib udev) ]; postFixup = '' makeWrapper $out/opt/Termius/termius-app $out/bin/termius-app \ From 3c2f4cf704226ae82402266e0f9a4e76a5a29ce9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:29:37 +0200 Subject: [PATCH 064/688] cypress: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 036e824393a7..e11a5e18058e 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }: +{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "cypress"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nss gtk2 alsaLib gnome2.GConf gtk3 unzip ]; - runtimeDependencies = [ udev.lib ]; + runtimeDependencies = [ (lib.getLib udev) ]; installPhase = '' mkdir -p $out/bin $out/opt/cypress From 4c86ad770d6a389795d3ff17ed3b43afc195f3f7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:29:52 +0200 Subject: [PATCH 065/688] hakuneko: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/tools/misc/hakuneko/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index 34405ccc7bea..6389d41cdfed 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -6,6 +6,7 @@ , makeWrapper , udev , stdenv +, lib , wrapGAppsHook }: let @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ''; runtimeDependencies = [ - udev.lib + (lib.getLib udev) ]; postFixup = '' From cf55e8762ede4d25ff73fdbfb532aebb0fb30455 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:30:02 +0200 Subject: [PATCH 066/688] bitwarden: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/tools/security/bitwarden/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 4e087ee631eb..d383a00a7f22 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -6,6 +6,7 @@ , makeDesktopItem , makeWrapper , stdenv +, lib , udev , wrapGAppsHook }: @@ -72,7 +73,7 @@ let ''; runtimeDependencies = [ - udev.lib + (lib.getLib udev) ]; postFixup = '' From ee483145d054ff8bd225680bc8fc2d472095839b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:30:12 +0200 Subject: [PATCH 067/688] keybase: use lib.getLib udev instead of udev.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/tools/security/keybase/gui.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index aabe1fcebbd0..20c1bb8f7f16 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, atk, cairo, cups, udev +{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev , dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook , runtimeShell, gsettings-desktop-schemas }: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; runtimeDependencies = [ - udev.lib + (lib.getLib udev) libappindicator-gtk3 ]; From d85d7c7179dca0dedf3a263aa53ec1f6c0bad6d1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 13 Aug 2020 20:49:43 +0200 Subject: [PATCH 068/688] nixosTests.systemd: update output systemd shows minutes as `min`, not `m`. --- nixos/tests/systemd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index 9d21f9158f3c..abd842b51f73 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -145,8 +145,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { output = machine.succeed("systemctl show | grep Watchdog") assert "RuntimeWatchdogUSec=30s" in output - assert "RebootWatchdogUSec=10m" in output - assert "KExecWatchdogUSec=5m" in output + assert "RebootWatchdogUSec=10min" in output + assert "KExecWatchdogUSec=5min" in output # Test systemd cryptsetup support with subtest("systemd successfully reads /etc/crypttab and unlocks volumes"): From 3e1a40df7598cd24d091ef7fb0933b104aa05157 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 15 Aug 2020 23:11:20 +0200 Subject: [PATCH 069/688] mkDerivation: Introduce .inputDerivation for shell.nix build convenience This introduces the .inputDerivation attribute on all derivations created with mkDerivation. This is another derivation that can always build successfully and whose runtime dependencies are the build time dependencies of the original derivation. This allows easy building and distributing of all derivations needed to enter a nix-shell with nix-build shell.nix -A inputDerivation --- pkgs/stdenv/generic/make-derivation.nix | 26 +++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 993ae68e9e81..06d6cc2384a6 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -337,6 +337,32 @@ in rec { validity.handled ({ overrideAttrs = f: mkDerivation (attrs // (f attrs)); + + # A derivation that always builds successfully and whose runtime + # dependencies are the original derivations build time dependencies + # This allows easy building and distributing of all derivations + # needed to enter a nix-shell with + # nix-build shell.nix -A inputDerivation + inputDerivation = derivation (derivationArg // { + # Add a name in case the original drv didn't have one + name = derivationArg.name or "inputDerivation"; + # This always only has one output + outputs = [ "out" ]; + + # Propagate the original builder and arguments, since we override + # them and they might contain references to build inputs + _derivation_original_builder = derivationArg.builder; + _derivation_original_args = derivationArg.args; + + builder = stdenv.shell; + # The bash builtin `export` dumps all current environment variables, + # which is where all build input references end up (e.g. $PATH for + # binaries). By writing this to $out, Nix can find and register + # them as runtime dependencies (since Nix greps for store paths + # through $out to find them) + args = [ "-c" "export > $out" ]; + }); + inherit meta passthru; } // # Pass through extra attributes that are not inputs, but From 074bc78cc8749faa31729096b65f2ef51b10abeb Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 13 Aug 2020 01:10:21 -0400 Subject: [PATCH 070/688] android: update sdk, ndk to 29, 21 --- lib/systems/examples.nix | 4 ++-- pkgs/development/androidndk-pkgs/default.nix | 7 ++++--- .../mobile/androidenv/compose-android-packages.nix | 2 +- pkgs/development/mobile/androidenv/ndk-bundle/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 + 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index ca562d2e4565..40e2b8fcefbc 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -46,7 +46,7 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; - sdkVer = "24"; + sdkVer = "29"; ndkVer = "18b"; platform = platforms.armv7a-android; useAndroidPrebuilt = true; @@ -54,7 +54,7 @@ rec { aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; - sdkVer = "24"; + sdkVer = "29"; ndkVer = "18b"; platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index 7bb779d1d138..ce5a868f4ecd 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -2,9 +2,9 @@ }: { - "18b" = + "21" = let - ndkVersion = "18.1.5063045"; + ndkVersion = "21.0.6113669"; buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { includeNDK = true; @@ -28,6 +28,7 @@ # these two really are the same. buildAndroidndk = buildAndroidComposition.ndk-bundle; androidndk = androidComposition.ndk-bundle; - targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b; + targetAndroidndkPkgs = targetPackages.androidndkPkgs_21; }; + } diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index f98547011bde..1786aebae830 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -14,7 +14,7 @@ , lldbVersions ? [ ] , cmakeVersions ? [ ] , includeNDK ? false -, ndkVersion ? "18.1.5063045" +, ndkVersion ? "21.0.6113669" , useGoogleAPIs ? false , useGoogleTVAddOns ? false , includeExtras ? [] diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index b81fab1ed76f..6bdb71815909 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -7,12 +7,14 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ] ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ]; - patchInstructions = lib.optionalString (os == "linux") '' + patchInstructions = lib.optionalString (os == "linux") ('' patchShebangs . + '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) '' patch -p1 \ --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + '' + '' # TODO: allow this stuff rm -rf docs tests @@ -46,6 +48,6 @@ deployAndroidPackage { do ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i done - ''; + ''); noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 933a7544fb77..df2ca9f9d07f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1155,6 +1155,7 @@ in androidndkPkgs = androidndkPkgs_18b; androidndkPkgs_18b = (callPackage ../development/androidndk-pkgs {})."18b"; + androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21"; androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk; From 0be29459d689b1b8adf79a3d74085ba9006c9cf4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 12 Aug 2020 15:56:04 -0500 Subject: [PATCH 071/688] ghc: set Stage1Only = YES on iOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We want stage1Only here even if system == system, since we can’t run the native arch simulator binaries locally. --- pkgs/development/compilers/ghc/8.10.1.nix | 2 +- pkgs/development/compilers/ghc/8.6.5.nix | 2 +- pkgs/development/compilers/ghc/8.8.2.nix | 2 +- pkgs/development/compilers/ghc/8.8.3.nix | 2 +- pkgs/development/compilers/ghc/8.8.4.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 727fc91451e2..c0bcdaa6bee3 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -63,7 +63,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index 06266556cf33..863fc74c037b 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -60,7 +60,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index 305226b34079..af5c5433f1bc 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -60,7 +60,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index aa4c378f200b..f6b0a8efdf22 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -63,7 +63,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 60c0f2cdd9d1..6efbef45bac2 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -63,7 +63,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 4b9ff94963dc..5d8b250d41df 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -66,7 +66,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO From 4cbca0893af3b4bdac508894fb6d9b10040a5179 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 13 Aug 2020 00:19:41 -0500 Subject: [PATCH 072/688] androidenv: remove duplicate addons.nix entries --- .../mobile/androidenv/generated/addons.nix | 128 ------------------ 1 file changed, 128 deletions(-) diff --git a/pkgs/development/mobile/androidenv/generated/addons.nix b/pkgs/development/mobile/androidenv/generated/addons.nix index 23a55595cce0..231e5b8ea22f 100644 --- a/pkgs/development/mobile/androidenv/generated/addons.nix +++ b/pkgs/development/mobile/androidenv/generated/addons.nix @@ -672,70 +672,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha8"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip"; - sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; @@ -896,70 +832,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha8"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip"; - sha1 = "7912ba03b04831f918f523648f118c4ee4da7604"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; From ff33855bf0a724ea8c2502b176fd90c9d856b378 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 13 Aug 2020 10:54:43 -0500 Subject: [PATCH 073/688] android: readd 18b ndk This is referenced in all-packages.nix, so might as well leave it heref or now. --- pkgs/development/androidndk-pkgs/default.nix | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index ce5a868f4ecd..10819d49ed30 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -2,6 +2,35 @@ }: { + "18b" = + let + ndkVersion = "18.1.5063045"; + + buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + + androidComposition = androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + in + import ./androidndk-pkgs.nix { + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + stdenv + runCommand wrapBintoolsWith wrapCCWith; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, + # but for splicing messing up on infinite recursion for the variants we + # *dont't* use. Using this workaround, but also making a test to ensure + # these two really are the same. + buildAndroidndk = buildAndroidComposition.ndk-bundle; + androidndk = androidComposition.ndk-bundle; + targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b; + }; + "21" = let ndkVersion = "21.0.6113669"; From c5617381bcfe0549c5848f07bcfb64cd40aa0204 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 13 Aug 2020 11:01:27 -0500 Subject: [PATCH 074/688] ghc: document Stage1Only setting --- pkgs/development/compilers/ghc/8.10.1.nix | 9 ++++++++- pkgs/development/compilers/ghc/8.6.5.nix | 9 ++++++++- pkgs/development/compilers/ghc/8.8.2.nix | 9 ++++++++- pkgs/development/compilers/ghc/8.8.3.nix | 9 ++++++++- pkgs/development/compilers/ghc/8.8.4.nix | 9 ++++++++- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index c0bcdaa6bee3..6325e2187c03 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -62,7 +62,14 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index 863fc74c037b..a5d2bb5c88d6 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -59,7 +59,14 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index af5c5433f1bc..bd1f09709dcf 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -59,7 +59,14 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index f6b0a8efdf22..1f1a23ee2c24 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -62,7 +62,14 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 6efbef45bac2..448995f66ba2 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -62,7 +62,14 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO From 31d8669a72667f288591669b803f560a5d5e1756 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 20 Aug 2020 10:29:28 -0500 Subject: [PATCH 075/688] nvidia-x11: add disable32Bit arg to not include 32-bit nvidia MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In some contexts, we don’t want to have to build the whole i686 stdenv just to use the x86_64 nvidia driver. It’s hard to know ahead of time what we want, so it’s best to leave this as an overridable option. --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index d62ade04e630..63091e9875f9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -19,6 +19,9 @@ # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. libsOnly ? false +, # don't include the bundled 32-bit libraries on 64-bit platforms, + # even if it’s in downloaded binary + disable32Bit ? false }: with stdenv.lib; @@ -30,7 +33,7 @@ assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-lin let nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; - i686bundled = versionAtLeast version "391"; + i686bundled = versionAtLeast version "391" && !disable32Bit; libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.libdrm pkgs.xorg.libXext pkgs.xorg.libX11 pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ]; From 8a6bb6073a79eae7f1e3123905e9d07533521523 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 21 Aug 2020 13:15:43 +0800 Subject: [PATCH 076/688] kdeFrameworks: 5.71 -> 5.73 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 664 +++++++++--------- 2 files changed, 337 insertions(+), 329 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 81a755bd3bac..839b2eb466d5 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(https://download.kde.org/stable/frameworks/5.71/) +WGET_ARGS=(https://download.kde.org/stable/frameworks/5.73/) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 8ac9d33c8de0..070b11f6bfb5 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,659 +4,667 @@ { attica = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/attica-5.71.0.tar.xz"; - sha256 = "9e24fd7f58c66879a05e056b781637196eea69d3276ed470643c505f9fd46d3d"; - name = "attica-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/attica-5.73.0.tar.xz"; + sha256 = "011240a6ff59e2b39bcf6d4ba6128e6e60c6318c185e7316a71cfec28e69c69a"; + name = "attica-5.73.0.tar.xz"; }; }; baloo = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/baloo-5.71.0.tar.xz"; - sha256 = "23378213d00ecf1f26eeb417987984f5a63bbd643359403dfd20638cbc1ec84b"; - name = "baloo-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/baloo-5.73.0.tar.xz"; + sha256 = "887077ae3e090d673d2ffe7eb869a0ab6f5d14e9dae2dccd619e4689699a2dfe"; + name = "baloo-5.73.0.tar.xz"; }; }; bluez-qt = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/bluez-qt-5.71.0.tar.xz"; - sha256 = "7014e946f16db62218fe8e9af808999922d447034355f17b9e09b31321e53bad"; - name = "bluez-qt-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/bluez-qt-5.73.0.tar.xz"; + sha256 = "70264edb82b2627c0ec3740374b90b8402e0f432fe4a10650fa3d22191d8cfd4"; + name = "bluez-qt-5.73.0.tar.xz"; }; }; breeze-icons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/breeze-icons-5.71.0.tar.xz"; - sha256 = "72217c46e071b204a80ff8064b1b7319c7a7f9f0b08e69d8add2065e5d301155"; - name = "breeze-icons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/breeze-icons-5.73.0.tar.xz"; + sha256 = "b6caff26f69008a3e0d53ae5fcfcf070b70ad1b17d407daecbbabeb6a606a08b"; + name = "breeze-icons-5.73.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/extra-cmake-modules-5.71.0.tar.xz"; - sha256 = "64f41c0b4b3164c7be8fcab5c0181253d97d1e9d62455fd540cb463afd051878"; - name = "extra-cmake-modules-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/extra-cmake-modules-5.73.0.tar.xz"; + sha256 = "c5e3ef0253f7d5ab3adf9185950e34fd620a3d5baaf3bcc15892f971fc3274c4"; + name = "extra-cmake-modules-5.73.0.tar.xz"; }; }; frameworkintegration = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/frameworkintegration-5.71.0.tar.xz"; - sha256 = "f5ba2d5c363dcb09177424b82d9a59ce0f0a6b2dea372799dcba000452764961"; - name = "frameworkintegration-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/frameworkintegration-5.73.0.tar.xz"; + sha256 = "21ef7f1a6d48f9fb14ccac9bc37e803c92cf83c9e235a5ca8bd7eb08fd0a6fb3"; + name = "frameworkintegration-5.73.0.tar.xz"; }; }; kactivities = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kactivities-5.71.0.tar.xz"; - sha256 = "b4e63fec6532e4bdc41470985cea46b0a88c1b2298b80286cbf0ed2d2139b66f"; - name = "kactivities-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kactivities-5.73.0.tar.xz"; + sha256 = "5098f2535175ac12da91568ca554e3f5d970ae05415da1a8ba17305cb8ac3a1a"; + name = "kactivities-5.73.0.tar.xz"; }; }; kactivities-stats = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kactivities-stats-5.71.0.tar.xz"; - sha256 = "79fe4f674d7bae457ce6af0357104a8691f5822963b0ef1f99cd5a43e3666978"; - name = "kactivities-stats-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kactivities-stats-5.73.0.tar.xz"; + sha256 = "df4b00c52e83608b2dd7345cd220143e07b65cb431cead5e9abb1e4ffd6ecd5a"; + name = "kactivities-stats-5.73.0.tar.xz"; }; }; kapidox = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kapidox-5.71.0.tar.xz"; - sha256 = "da75660fc2808f38441ec0f59d3c58ce29fcfdcea29e251308a11a92546f1ed5"; - name = "kapidox-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kapidox-5.73.0.tar.xz"; + sha256 = "b49ff6673906817ed95a3de56535594de02a9f95bcb2726abe52d0c0e0161be5"; + name = "kapidox-5.73.0.tar.xz"; }; }; karchive = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/karchive-5.71.0.tar.xz"; - sha256 = "cc81e856365dec2bcf3ec78aa01d42347ca390a2311ea12050f309dfbdb09624"; - name = "karchive-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/karchive-5.73.0.tar.xz"; + sha256 = "25481ebbba8f58d9ab45bde804ab0d873c45550b482e27e7856b362cd9aa434f"; + name = "karchive-5.73.0.tar.xz"; }; }; kauth = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kauth-5.71.0.tar.xz"; - sha256 = "a0de83bd662e20253011216ab8cba597f8db7429f8706237e7307580125025b5"; - name = "kauth-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kauth-5.73.0.tar.xz"; + sha256 = "e334705bfc3f81c5e2f66315d40badd26d88426128432788f790ebefce1694d9"; + name = "kauth-5.73.0.tar.xz"; }; }; kbookmarks = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kbookmarks-5.71.0.tar.xz"; - sha256 = "e00db1e62a769863a1bf90bb508f108f2740298aa40173cad34ef34a1c23a01a"; - name = "kbookmarks-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kbookmarks-5.73.0.tar.xz"; + sha256 = "b925ec1b8a1b4a2b7f2526fdbc7761de065b3c9573e41ac274773ed1b576aa51"; + name = "kbookmarks-5.73.0.tar.xz"; }; }; kcalendarcore = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcalendarcore-5.71.0.tar.xz"; - sha256 = "d5138db971f6be606be8ae7d761bad778af3cacada8e85fb2f469190c347cd94"; - name = "kcalendarcore-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcalendarcore-5.73.0.tar.xz"; + sha256 = "e3486b41b833c0ba72f839d8a61bdffaf9b3ece3da20f478c2981b3296e7b713"; + name = "kcalendarcore-5.73.0.tar.xz"; }; }; kcmutils = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcmutils-5.71.0.tar.xz"; - sha256 = "27743a81e9aa48baac12bb844e48d3098250699122ed6040b1e3c50a5e8f276d"; - name = "kcmutils-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcmutils-5.73.0.tar.xz"; + sha256 = "b28bf672bbe21e8d1b4e6ea924c1bb318c81c43dcbb86bebb3f5775e18945ca9"; + name = "kcmutils-5.73.0.tar.xz"; }; }; kcodecs = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcodecs-5.71.0.tar.xz"; - sha256 = "3392c4df652e3a44a2b941ccb419dee9521642e503104de403ec1c6be9f43a28"; - name = "kcodecs-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcodecs-5.73.0.tar.xz"; + sha256 = "3bcb22b4f3b2f164759ab912d117c3b4b50695ae38d524f2cfb79a29488cce67"; + name = "kcodecs-5.73.0.tar.xz"; }; }; kcompletion = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcompletion-5.71.0.tar.xz"; - sha256 = "bf0b6ce1ee133900f169662dbd35da6f766d3e4e02c0c102a9402e20450a22a4"; - name = "kcompletion-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcompletion-5.73.0.tar.xz"; + sha256 = "72b0650e5ae9f30ad4ec30b55e660c826d93edfda0ef4f9436f226cbb8a9705a"; + name = "kcompletion-5.73.0.tar.xz"; }; }; kconfig = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kconfig-5.71.0.tar.xz"; - sha256 = "618ff0d168abf8fb73dc83431b9a76f7859d522bea100ff07c7e1632e129e3f4"; - name = "kconfig-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kconfig-5.73.0.tar.xz"; + sha256 = "6046bbb8da5f3261aac7f868bfa8a8ce1015a3a8257fe0b2d37dce9e2bc3952e"; + name = "kconfig-5.73.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kconfigwidgets-5.71.0.tar.xz"; - sha256 = "5778523c49a5294e9376ce8ee6db1a51ffaa506418a19e8632f73287a596276f"; - name = "kconfigwidgets-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kconfigwidgets-5.73.0.tar.xz"; + sha256 = "ed8a0a8158f895aebd46c4a725f77178d942cd9476a864a615a9df343da51f8e"; + name = "kconfigwidgets-5.73.0.tar.xz"; }; }; kcontacts = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcontacts-5.71.0.tar.xz"; - sha256 = "57f511a624406b27a7de25c83deb4104c95e851f9fda4f6d94450155ab08f4bd"; - name = "kcontacts-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcontacts-5.73.0.tar.xz"; + sha256 = "4351bf80f5a5417ba7e99fe557a851d1c7173fd7511fc1426375c66692e748bb"; + name = "kcontacts-5.73.0.tar.xz"; }; }; kcoreaddons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcoreaddons-5.71.0.tar.xz"; - sha256 = "e95008b032e299cf47f596739d9236701e2f55e507734f33b8ea497882fd130b"; - name = "kcoreaddons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcoreaddons-5.73.0.tar.xz"; + sha256 = "24a7713eaef2f40e648a586e22b030192321f9fecdbae77013b00446fa0d6d51"; + name = "kcoreaddons-5.73.0.tar.xz"; }; }; kcrash = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcrash-5.71.0.tar.xz"; - sha256 = "526242aa9fde7cff11ecaa88bf75d6fbbfc412f46bf19a7a9e185f2adb616005"; - name = "kcrash-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcrash-5.73.0.tar.xz"; + sha256 = "49b6f4d6109ddf3a6b93f833f59483e5a1a748e4b829c4739fdaaaef59c9b583"; + name = "kcrash-5.73.0.tar.xz"; + }; + }; + kdav = { + version = "5.73.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.73/kdav-5.73.0.tar.xz"; + sha256 = "03c8af96e7bb1b1d2d633e54c6362c7c2de078b8aba5654042b7a11d968efa31"; + name = "kdav-5.73.0.tar.xz"; }; }; kdbusaddons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdbusaddons-5.71.0.tar.xz"; - sha256 = "b441f525248d9d675333cebedf97ee0232a3a9b7aa9aff84d825dfcdb3bcd23c"; - name = "kdbusaddons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdbusaddons-5.73.0.tar.xz"; + sha256 = "f7f7e57b4d4650cf90a191b08b1fe874d0005c34163b9177dcc787415841e8ba"; + name = "kdbusaddons-5.73.0.tar.xz"; }; }; kdeclarative = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdeclarative-5.71.0.tar.xz"; - sha256 = "ace0e52f561a9cfba1de4b77144a0a68037a1229530fb39070dc837da80ac8f8"; - name = "kdeclarative-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdeclarative-5.73.0.tar.xz"; + sha256 = "713ae2ea41e1bac8f6d47cffa376d62c7805eb3e4cc41c3168c1f1b2ca70a598"; + name = "kdeclarative-5.73.0.tar.xz"; }; }; kded = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kded-5.71.0.tar.xz"; - sha256 = "404c8caae0f4abe2ef85c2e82b5db2b14ae4b607fa30e4f16d15dad53c269fcc"; - name = "kded-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kded-5.73.0.tar.xz"; + sha256 = "f21647a5f35eebaa9bf12b5d5da25c24611c1971f94f27c510d22a48c79b0895"; + name = "kded-5.73.0.tar.xz"; }; }; kdelibs4support = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kdelibs4support-5.71.0.tar.xz"; - sha256 = "1110ed68a29e38059d195817735d58df45e59b57fa9ac48ef2036c1037a23fb7"; - name = "kdelibs4support-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kdelibs4support-5.73.0.tar.xz"; + sha256 = "ca6f58c97b331d130a555b950c36cd7f625ca923fd185b0f73e20ac5b98c5d9b"; + name = "kdelibs4support-5.73.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kdesignerplugin-5.71.0.tar.xz"; - sha256 = "e77a96c2a6cd518f3040e9366f013f0128200791b6c93c3c5b2310af16fb040b"; - name = "kdesignerplugin-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kdesignerplugin-5.73.0.tar.xz"; + sha256 = "379db9fd0ec135706630dbd54e1b446e51dd3b64189754c281993d761c1d20b2"; + name = "kdesignerplugin-5.73.0.tar.xz"; }; }; kdesu = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdesu-5.71.0.tar.xz"; - sha256 = "b183e67c089b02f984284b5eb3c05f7216d289bef7ae08a9e6c6f991b2a1a23a"; - name = "kdesu-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdesu-5.73.0.tar.xz"; + sha256 = "4dd07697decad6a544025178732bd279ef64766e1929a2135f6de58b1092944d"; + name = "kdesu-5.73.0.tar.xz"; }; }; kdewebkit = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kdewebkit-5.71.0.tar.xz"; - sha256 = "04b8b90734ddf6d5e72ffa69707d473e1d1f8605ba06d4ceca83f4a1d195c65d"; - name = "kdewebkit-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kdewebkit-5.73.0.tar.xz"; + sha256 = "d8208c4f7a98b6749c793649e2e5fbe3939e253289a9f6b74b559f6546b34b0b"; + name = "kdewebkit-5.73.0.tar.xz"; }; }; kdnssd = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdnssd-5.71.0.tar.xz"; - sha256 = "bc269f0a74eee99d6c49550fc608450ced753a599cd03f77ea577af4c2e87958"; - name = "kdnssd-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdnssd-5.73.0.tar.xz"; + sha256 = "bee7f654f704d928b1219b75a289042474c1450e9f8acb02a905a4a177bc5b7d"; + name = "kdnssd-5.73.0.tar.xz"; }; }; kdoctools = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdoctools-5.71.0.tar.xz"; - sha256 = "1e2fcaa97a014e82f68c0c36591ce84568ead7abd59b66e534789103e162cd09"; - name = "kdoctools-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdoctools-5.73.0.tar.xz"; + sha256 = "d8dd74776d47e009d4a204d69a78428603ca99317095d7b7edca49c3d93b1b5d"; + name = "kdoctools-5.73.0.tar.xz"; }; }; kemoticons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kemoticons-5.71.0.tar.xz"; - sha256 = "20bcb111971cc2e8c17b38a0c20aff7cf453174f885c4b4bcc5899141113e2fc"; - name = "kemoticons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kemoticons-5.73.0.tar.xz"; + sha256 = "0c0a26b029a8fd3d8db97bac931feb7834912aa2f7680660e98d91e868d10778"; + name = "kemoticons-5.73.0.tar.xz"; }; }; kfilemetadata = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kfilemetadata-5.71.0.tar.xz"; - sha256 = "2e302958065157c1f9ea4a189bbca40b7dbed019767a3380e34e0b6a633c75fe"; - name = "kfilemetadata-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kfilemetadata-5.73.0.tar.xz"; + sha256 = "1ae217aab920741e445211e20b1b60dfcf80f4a6d1864aa63321dac7c3802894"; + name = "kfilemetadata-5.73.0.tar.xz"; }; }; kglobalaccel = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kglobalaccel-5.71.0.tar.xz"; - sha256 = "218d77aa4f6089d57932d627c4a46a8a4a5e964c2bfcee0d1c54338c25c7a06c"; - name = "kglobalaccel-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kglobalaccel-5.73.0.tar.xz"; + sha256 = "0062db9adde4dab0be6b64430010c0a5653355d0d1680abc9ec8e71988ff871f"; + name = "kglobalaccel-5.73.0.tar.xz"; }; }; kguiaddons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kguiaddons-5.71.0.tar.xz"; - sha256 = "c1f7bf540a689319962275916c0434f47ba5ed8f7d46a78704393163e32eccd2"; - name = "kguiaddons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kguiaddons-5.73.0.tar.xz"; + sha256 = "45b4c5e0195abd79930635bbf20886b15b1b68b13fe4c56068579b91ef147350"; + name = "kguiaddons-5.73.0.tar.xz"; }; }; kholidays = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kholidays-5.71.0.tar.xz"; - sha256 = "5469718d6ede7edb2ab06bbaff8af01567ba77ffe2160c2c2d47c666cfebf417"; - name = "kholidays-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kholidays-5.73.0.tar.xz"; + sha256 = "b0ae4b77aa7c183959bc18baa09a1a4f7208fcad2a238c1590377bf6cf8b68ab"; + name = "kholidays-5.73.0.tar.xz"; }; }; khtml = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/khtml-5.71.0.tar.xz"; - sha256 = "df8d2a4776f98e1490a21e71e31a2ea7694bc7452da35f88623b19214b6e1c10"; - name = "khtml-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/khtml-5.73.0.tar.xz"; + sha256 = "378a5aaa6c796d313a63b4cf1365cdd980f2bc21e9033354f2f1317d1db9c262"; + name = "khtml-5.73.0.tar.xz"; }; }; ki18n = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/ki18n-5.71.0.tar.xz"; - sha256 = "f2fc8c40c10576da8b74070b7dc8e752fdd04204cb2bfe522f37a0458fbaf881"; - name = "ki18n-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/ki18n-5.73.0.tar.xz"; + sha256 = "97eef22d6cdd65c57edfe54fa9760a69005e15b7d8f4270f6185916c33e14689"; + name = "ki18n-5.73.0.tar.xz"; }; }; kiconthemes = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kiconthemes-5.71.0.tar.xz"; - sha256 = "3fa986207e9d967840bd7a3f1af1e4d0105905012a0e4cf56f7ef1b3740b3496"; - name = "kiconthemes-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kiconthemes-5.73.0.tar.xz"; + sha256 = "4490109a0a42675e4cd3497433e10fd4be24ef644a283edf46b308314d130356"; + name = "kiconthemes-5.73.0.tar.xz"; }; }; kidletime = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kidletime-5.71.0.tar.xz"; - sha256 = "1bcacd6c9ec8d65f93434f51d865723a50609ec074f88da2890a8f37ea8d207d"; - name = "kidletime-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kidletime-5.73.0.tar.xz"; + sha256 = "52a8af3f061101c406a592ec277a2c84846e3910af1d3dbfc3e15beb9cfd24a2"; + name = "kidletime-5.73.0.tar.xz"; }; }; kimageformats = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kimageformats-5.71.0.tar.xz"; - sha256 = "0d6d6a8664e4a01df27e9970ec9ec10a92c1d43a00a3e9ef0471d740b4c93d94"; - name = "kimageformats-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kimageformats-5.73.0.tar.xz"; + sha256 = "473d0f67d5357bbf08aa4f4504ceaceabc720b1f5433b456ddc5f8ad0d7e3b8b"; + name = "kimageformats-5.73.0.tar.xz"; }; }; kinit = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kinit-5.71.0.tar.xz"; - sha256 = "6ea625bced2c19b0f3e5bb504775dd6764358f02412364a16cbad731c5c299b6"; - name = "kinit-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kinit-5.73.0.tar.xz"; + sha256 = "0c61e90f3db83b4dc5f2438cf7880a02b600a5739cb05e5ee372aeff98b8b770"; + name = "kinit-5.73.0.tar.xz"; }; }; kio = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kio-5.71.0.tar.xz"; - sha256 = "b972c8dede50be3e89babb5a536054759db2a87003e6df770c598c7c1c94b8d6"; - name = "kio-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kio-5.73.0.tar.xz"; + sha256 = "05da159e6cf5ef9aa4dd7ede86ce28a5581624a1b3f0b4718c5b7e30c4aa2a66"; + name = "kio-5.73.0.tar.xz"; }; }; kirigami2 = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kirigami2-5.71.0.tar.xz"; - sha256 = "f323efb96a809dc9e572a0e68e04c4f485fc27f9ae65ffa3988830e348151356"; - name = "kirigami2-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kirigami2-5.73.0.tar.xz"; + sha256 = "9b2a097071f77804f6f2f2a478e5db602c8b5fee00de34fc44842f31223401bb"; + name = "kirigami2-5.73.0.tar.xz"; }; }; kitemmodels = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kitemmodels-5.71.0.tar.xz"; - sha256 = "68205f09d63a916f236e2b3b729c0055377d852de48f7cf29fa7174ca97b84e7"; - name = "kitemmodels-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kitemmodels-5.73.0.tar.xz"; + sha256 = "6569e289ac9263d87ef6641fe2f3914b9ace6814832ac9c61825b1c6805ae371"; + name = "kitemmodels-5.73.0.tar.xz"; }; }; kitemviews = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kitemviews-5.71.0.tar.xz"; - sha256 = "2843ef166ff5bf69c1132bbc09545b59ad208313c0acad71d0cd951fde1d33de"; - name = "kitemviews-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kitemviews-5.73.0.tar.xz"; + sha256 = "ec29707d789bee58c47ee538319560a168642f69e96cacb78818825e47177727"; + name = "kitemviews-5.73.0.tar.xz"; }; }; kjobwidgets = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kjobwidgets-5.71.0.tar.xz"; - sha256 = "63f3b2fc1c062b1a485ff543e2d5afa68a9f9a918676bf3a6a5dc8f56f5f30e3"; - name = "kjobwidgets-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kjobwidgets-5.73.0.tar.xz"; + sha256 = "61d105c8f17dcfb85ad6c1e3bd2423ebeb430b9c290d193229bc953ac174f2bf"; + name = "kjobwidgets-5.73.0.tar.xz"; }; }; kjs = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kjs-5.71.0.tar.xz"; - sha256 = "702224482139e500da1ea4e0d2b5132bf762f87f426f294587a0f2f47b9a9734"; - name = "kjs-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kjs-5.73.0.tar.xz"; + sha256 = "97b52557212a33d59a4b3a8c34ea8a94cd5f840fb0798e770164d3cb1e755be5"; + name = "kjs-5.73.0.tar.xz"; }; }; kjsembed = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kjsembed-5.71.0.tar.xz"; - sha256 = "9352a31b5f735d71d6db4b09825ca01adb337e37f2b0cfce48c679e932238486"; - name = "kjsembed-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kjsembed-5.73.0.tar.xz"; + sha256 = "cc9896930c01a6bdbfaddada9516380c9a54e5d719836f1788d8e3a74108e1d3"; + name = "kjsembed-5.73.0.tar.xz"; }; }; kmediaplayer = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kmediaplayer-5.71.0.tar.xz"; - sha256 = "72492a6c877dded4f2333f140c025fdc4a271a68695c635c0dbc09b08d832eca"; - name = "kmediaplayer-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kmediaplayer-5.73.0.tar.xz"; + sha256 = "69aa3bbedfc8b9a0dd9f4ac260cded9d7b5894477bf4b5b09065d0aae8e44ab2"; + name = "kmediaplayer-5.73.0.tar.xz"; }; }; knewstuff = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/knewstuff-5.71.0.tar.xz"; - sha256 = "aba867855d69641f73db30405e787fc9ea22e3386a45be9626ba84cbe208f855"; - name = "knewstuff-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/knewstuff-5.73.0.tar.xz"; + sha256 = "7669e62973f7e228975a07f15bb1c7f716edd81ce82d5f578a80b1f501abda1e"; + name = "knewstuff-5.73.0.tar.xz"; }; }; knotifications = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/knotifications-5.71.0.tar.xz"; - sha256 = "b900146340621d54f6113600e85d287b28225d82515affb8690704433e5d0440"; - name = "knotifications-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/knotifications-5.73.0.tar.xz"; + sha256 = "c8e9f36716db33baca93a0386d3bb6426408eee3843eb5854bdd8ad7579f372c"; + name = "knotifications-5.73.0.tar.xz"; }; }; knotifyconfig = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/knotifyconfig-5.71.0.tar.xz"; - sha256 = "226b7f956f7013027621c4018b4376b76129ea4195df67fc7df4435c54baf50e"; - name = "knotifyconfig-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/knotifyconfig-5.73.0.tar.xz"; + sha256 = "641a167a58856e99036d44b3e7472b44cdfbbf68e5d75b9af988d0b71dc10af4"; + name = "knotifyconfig-5.73.0.tar.xz"; }; }; kpackage = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kpackage-5.71.0.tar.xz"; - sha256 = "c4b924e7c506cb75bdaaf68bd881e79a73999bd6436f29157f56c76f32b48cba"; - name = "kpackage-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kpackage-5.73.0.tar.xz"; + sha256 = "480b1e11733fe272d1a5680afea39bcc940f01bd3d1267be0981e3c92e098c4f"; + name = "kpackage-5.73.0.tar.xz"; }; }; kparts = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kparts-5.71.0.tar.xz"; - sha256 = "d038f97dfdccdd85dbac09c0f64cf852191ec2e535fd7928740e03d4ffe63b90"; - name = "kparts-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kparts-5.73.0.tar.xz"; + sha256 = "5546d2a474c80a601ba013642775682b087d086bd26d0b0d025b68d680c98bf2"; + name = "kparts-5.73.0.tar.xz"; }; }; kpeople = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kpeople-5.71.0.tar.xz"; - sha256 = "d63d5f5cbbedc2e4ef85fa8c2ff4adcd5cb9e05d1d1ee0e7b2c2d151193f5403"; - name = "kpeople-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kpeople-5.73.0.tar.xz"; + sha256 = "9e0d3119c168f7843251c808cc149de15c1fd692062f431972023fdaa84d21c4"; + name = "kpeople-5.73.0.tar.xz"; }; }; kplotting = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kplotting-5.71.0.tar.xz"; - sha256 = "84bacfbd86105e454f3d97f4ac4062e2f992556fca66d2c73806d1d12095bec1"; - name = "kplotting-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kplotting-5.73.0.tar.xz"; + sha256 = "b5055ed9a3149c059623d88875816e9fac8d6d25d29fdfd48e0d8a16dfe01b14"; + name = "kplotting-5.73.0.tar.xz"; }; }; kpty = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kpty-5.71.0.tar.xz"; - sha256 = "7629d35ff783aff8fe801db30eb146efe50620f7500c4f7f1bf7d2619568c6b9"; - name = "kpty-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kpty-5.73.0.tar.xz"; + sha256 = "d3bf99062589dbd1dbe302c8ed2528845f245e7f0f17ca865cdd100f7589ce9c"; + name = "kpty-5.73.0.tar.xz"; }; }; kquickcharts = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kquickcharts-5.71.0.tar.xz"; - sha256 = "a1befe13903676a9779030b02b91da9889540e689e1f6a0afd54ff484109642a"; - name = "kquickcharts-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kquickcharts-5.73.0.tar.xz"; + sha256 = "e37e13a5d907d872679eab38ba8e983b2fb98a11e07a3c15d32cfaad09075cfe"; + name = "kquickcharts-5.73.0.tar.xz"; }; }; kross = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kross-5.71.0.tar.xz"; - sha256 = "ac42ed4ec39ddaea0a4668803271f6f5de513fcdd1243d02b296544ab601bb1c"; - name = "kross-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kross-5.73.0.tar.xz"; + sha256 = "aa27b434da981f64c40985a61ee041417667844c6077c9fb52456635be67546e"; + name = "kross-5.73.0.tar.xz"; }; }; krunner = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/krunner-5.71.0.tar.xz"; - sha256 = "fb3ce4c587a1b114550487b5716f0aba53b775018b6eef2ae48b8d6fdda40952"; - name = "krunner-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/krunner-5.73.0.tar.xz"; + sha256 = "b4e8427083b6546327eeb36b05a7e438e58f922d4cc5ae0c24cd8241924e9e09"; + name = "krunner-5.73.0.tar.xz"; }; }; kservice = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kservice-5.71.0.tar.xz"; - sha256 = "6b7f4784cb514ec966f3cb01d26aa2dbdfd2425919efa57a4efa6117fcafc9ce"; - name = "kservice-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kservice-5.73.0.tar.xz"; + sha256 = "a64bf7543870240f0d8f8c2bcf43759d98962ba94a4ed34bd23232df25bb408b"; + name = "kservice-5.73.0.tar.xz"; }; }; ktexteditor = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/ktexteditor-5.71.0.tar.xz"; - sha256 = "6e50b6669b288f8e624cba11bca53b78748faf6cb978628f02664038cfa294da"; - name = "ktexteditor-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/ktexteditor-5.73.0.tar.xz"; + sha256 = "032b3ac31aa099ed67471f78401d13cf318646b0b9b5e20bb94796ac3ed6cf18"; + name = "ktexteditor-5.73.0.tar.xz"; }; }; ktextwidgets = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/ktextwidgets-5.71.0.tar.xz"; - sha256 = "0a7fae03d8b59ec8a4f7c49a228536ea4121bd3d8f19fb1ff9831ada428509f4"; - name = "ktextwidgets-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/ktextwidgets-5.73.0.tar.xz"; + sha256 = "2a8b086fce8136b5b4af4a28b417343fb66148c1961e5d65bf40ccae2d4386e5"; + name = "ktextwidgets-5.73.0.tar.xz"; }; }; kunitconversion = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kunitconversion-5.71.0.tar.xz"; - sha256 = "65bfba8e88e2cf6de40e06ce24fe5f48948cc92f16ce78eb8538de532dcf36cb"; - name = "kunitconversion-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kunitconversion-5.73.0.tar.xz"; + sha256 = "97d008e8bdb2d1f89d2093294a8be0b13b0e0160658fa7d3de6c99a5fd5e2935"; + name = "kunitconversion-5.73.0.tar.xz"; }; }; kwallet = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kwallet-5.71.0.tar.xz"; - sha256 = "d53b5bc4bbe054101b012d63672efc30af6a5aea58f467037cab4735b6ace9b5"; - name = "kwallet-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kwallet-5.73.0.tar.xz"; + sha256 = "4a9c8a538054fc51b30679d5180d09bb6d12a833f595a8d6875b6d4c29074de1"; + name = "kwallet-5.73.0.tar.xz"; }; }; kwayland = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kwayland-5.71.0.tar.xz"; - sha256 = "369ba54b485214687e719bc9216e3bb50849df3af9a3ec0e95cf5d5687c847c2"; - name = "kwayland-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kwayland-5.73.0.tar.xz"; + sha256 = "ee34a490a7bbc5e83eb36a6ac70492a76cb054d3077d0a8db216fd8b07f27bfe"; + name = "kwayland-5.73.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kwidgetsaddons-5.71.0.tar.xz"; - sha256 = "897077995bcf4125d0f90d2964500e718d2a3fd5f117e1b7906177ad13a5082e"; - name = "kwidgetsaddons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kwidgetsaddons-5.73.0.tar.xz"; + sha256 = "0722d853747b85ca7d46f278dc99c28b872185406b97b811523c1aa9b5e75eb6"; + name = "kwidgetsaddons-5.73.0.tar.xz"; }; }; kwindowsystem = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kwindowsystem-5.71.0.tar.xz"; - sha256 = "a3613aea6fa73ebc53f28c011a6bca31ed157e29f85df767e617c44399360cda"; - name = "kwindowsystem-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kwindowsystem-5.73.0.tar.xz"; + sha256 = "0e27ad2cd5e4699efdc02daec181b4ffb0b9e31ec4c96f0f67899804aebbcde8"; + name = "kwindowsystem-5.73.0.tar.xz"; }; }; kxmlgui = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kxmlgui-5.71.0.tar.xz"; - sha256 = "2e4b2563daeedf35a54d38002c05d7c39017a36c0b8a19c236ea87324eebf7cc"; - name = "kxmlgui-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kxmlgui-5.73.0.tar.xz"; + sha256 = "093131f5f51497ec61e99bd3e19de9421643d3f6ddf0099a823a3d624596ebcb"; + name = "kxmlgui-5.73.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kxmlrpcclient-5.71.0.tar.xz"; - sha256 = "5947de8ec9cd57d8ccf6ea8a764066733d2633d93e11f94ecfb47a75e1e7a91f"; - name = "kxmlrpcclient-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kxmlrpcclient-5.73.0.tar.xz"; + sha256 = "c0d089c389f59bb7cb6fba629f3e122e70fda19a69f419ff8bd1d9fcee95a047"; + name = "kxmlrpcclient-5.73.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/modemmanager-qt-5.71.0.tar.xz"; - sha256 = "b2e5e2a8b8fe2e9fb22bb7dc77177a975727991c6c0ee19d5a9b0a2ab513531d"; - name = "modemmanager-qt-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/modemmanager-qt-5.73.0.tar.xz"; + sha256 = "87f3864b2b53b4e309bca1feefa613455f60e4699969a569694f6813447e1fcd"; + name = "modemmanager-qt-5.73.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/networkmanager-qt-5.71.0.tar.xz"; - sha256 = "7fe6a0c9d9b25c434c6a200de19f722d942165252cc9161f1d8fcddf64147034"; - name = "networkmanager-qt-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/networkmanager-qt-5.73.0.tar.xz"; + sha256 = "b909feafc0a9a18b59744e0f1973c5357f67bbd50b59afa82cf55955dae7d41f"; + name = "networkmanager-qt-5.73.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/oxygen-icons5-5.71.0.tar.xz"; - sha256 = "a75a82164e2af5b6f269a386762ff2abba052dbfca18c9aed8d738c9cd958b04"; - name = "oxygen-icons5-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/oxygen-icons5-5.73.0.tar.xz"; + sha256 = "662cd9644e393c69dccb538cdd4280253be812f80704c992ada228c0c32c2bbc"; + name = "oxygen-icons5-5.73.0.tar.xz"; }; }; plasma-framework = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/plasma-framework-5.71.0.tar.xz"; - sha256 = "a54c8603ca261c89609a3009536a9217ce3415a7fd63527ed36f266399613067"; - name = "plasma-framework-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/plasma-framework-5.73.0.tar.xz"; + sha256 = "e5415143f0a08cd75cf758b0692021d2a2febdcb1364e2aa1e5c8fbeee148c93"; + name = "plasma-framework-5.73.0.tar.xz"; }; }; prison = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/prison-5.71.0.tar.xz"; - sha256 = "44762ee7a3993bd7527f0b33ee09bacc1d5a518641b79932e5490a511ac7e87f"; - name = "prison-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/prison-5.73.0.tar.xz"; + sha256 = "a2b135ffdf1af240366f3fb077c02c02094fb1706c6e84fab5186802544a5b87"; + name = "prison-5.73.0.tar.xz"; }; }; purpose = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/purpose-5.71.0.tar.xz"; - sha256 = "de0531a84f671a15fe4a6348220e922a3230178554e26baf392a1f295044e4be"; - name = "purpose-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/purpose-5.73.0.tar.xz"; + sha256 = "6f4d440cb708b636430e3206f879ca5c2e6cdfcf62f92ce173d43e291fbeed32"; + name = "purpose-5.73.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/qqc2-desktop-style-5.71.0.tar.xz"; - sha256 = "b968ce6fc7c1d111aa2c63584dddc0f74e9066a0b4ea26d1194e46e2f7b38700"; - name = "qqc2-desktop-style-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/qqc2-desktop-style-5.73.0.tar.xz"; + sha256 = "290b3637be0c3740e92cdbb1421aef8bf1a8df36218f9d7d120e8422d14c3fdd"; + name = "qqc2-desktop-style-5.73.0.tar.xz"; }; }; solid = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/solid-5.71.0.tar.xz"; - sha256 = "72a7bdd8306ec4cda5f504819e0ff3f8baca6530fa04e33f10b6b89dc010505b"; - name = "solid-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/solid-5.73.0.tar.xz"; + sha256 = "7366b64438a1ca7a42126e67d352e371227b46418ce961321d358f2eb90c0933"; + name = "solid-5.73.0.tar.xz"; }; }; sonnet = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/sonnet-5.71.0.tar.xz"; - sha256 = "cd663b3e1b23aef58d85f72dfdc92aaae33f358b22ad1fc36fde6c66eb7f0e72"; - name = "sonnet-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/sonnet-5.73.0.tar.xz"; + sha256 = "009f76fc4317e407d30c4e162a807d620a95217f5db271a14b1f9fc4339d232c"; + name = "sonnet-5.73.0.tar.xz"; }; }; syndication = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/syndication-5.71.0.tar.xz"; - sha256 = "c515fd48d3736b55c8e7990c72471bfddd55363c4bcb049713be741eaa7b07e0"; - name = "syndication-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/syndication-5.73.0.tar.xz"; + sha256 = "2a65972ef5183edb0bd8b3804dae129ae8f4a4469287711e77fc636e90b8a954"; + name = "syndication-5.73.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/syntax-highlighting-5.71.0.tar.xz"; - sha256 = "845ae0c7b8523c23c3ad704a6c551260a358d96b0094a5c2b062879e58173f84"; - name = "syntax-highlighting-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/syntax-highlighting-5.73.0.tar.xz"; + sha256 = "51ed4a68ba42d0dc88d91a0c11ac55ada199b7e93b0ff74b80b5e9304fe8901b"; + name = "syntax-highlighting-5.73.0.tar.xz"; }; }; threadweaver = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/threadweaver-5.71.0.tar.xz"; - sha256 = "039e73d70f38af38a63235cfb554111ee0d58a6ac168bff0745f0d029c5c528d"; - name = "threadweaver-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/threadweaver-5.73.0.tar.xz"; + sha256 = "7e1152a1cf73f841c3be5d73cb0d5e6e29ec700be859c94275c5c00e49488d38"; + name = "threadweaver-5.73.0.tar.xz"; }; }; } From e475480ce6d836749aee79813314cb6ee1bbd2a5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 21 Aug 2020 13:16:33 +0800 Subject: [PATCH 077/688] plasma-wayland-protocols: init at 1.1.1 --- .../plasma-wayland-protocols/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/plasma-wayland-protocols/default.nix diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix new file mode 100644 index 000000000000..a84c3518c4a8 --- /dev/null +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -0,0 +1,24 @@ +{ mkDerivation, fetchurl, lib +, extra-cmake-modules +, qtbase +}: + +mkDerivation rec { + pname = "plasma-wayland-protocols"; + version = "1.1.1"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-xUkzg9EVFxw0NeqaIbOWaGBjKoRFRP+sj1SJBDalHTg="; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ qtbase ]; + + meta = { + description = "Plasma Wayland Protocols"; + license = lib.licenses.lgpl21Plus; + platforms = qtbase.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b0985e78393..381a63754463 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21771,6 +21771,8 @@ in planner = callPackage ../applications/office/planner { }; + plasma-wayland-protocols = libsForQt5.callPackage ../development/libraries/plasma-wayland-protocols { }; + playonlinux = callPackage ../applications/misc/playonlinux { stdenv = stdenv_32bit; }; From 06db9d9f1456ac74e7b2856ff4f2c8116893d9c4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 21 Aug 2020 13:16:50 +0800 Subject: [PATCH 078/688] kwayland: build fix --- pkgs/development/libraries/kde-frameworks/kwayland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index c19836ed7a72..36e0ddc3f94c 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, propagateBin, extra-cmake-modules, - qtbase, wayland, wayland-protocols + plasma-wayland-protocols, qtbase, wayland, wayland-protocols }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ wayland wayland-protocols ]; + buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; setupHook = propagateBin; # XDG_CONFIG_DIRS } From d44bdb396d8b904a96c6bbd3dcaf23746acee498 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 21 Aug 2020 13:17:07 +0800 Subject: [PATCH 079/688] kdeApplications: 20.04.3 -> 20.08.0 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1744 ++++++++++++++++---------------- 2 files changed, 869 insertions(+), 877 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 3d632271869b..f0ce412cff11 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(http://download.kde.org/stable/release-service/20.04.3/src) +WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.0/src) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 12a84991adb7..78674306e2fa 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1739 +4,1731 @@ { akonadi = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-20.04.3.tar.xz"; - sha256 = "c91cc53afd2f81fbeed55700cd86010ee865de2594948769410167e6992bdb32"; - name = "akonadi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-20.08.0.tar.xz"; + sha256 = "a18ce2d8c9e9fc7f195a7546ee5b7c2541e37ceb7afa0aa25e9ade4f54de2813"; + name = "akonadi-20.08.0.tar.xz"; }; }; akonadi-calendar = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-20.04.3.tar.xz"; - sha256 = "ff8732b0d09b87ce0760b7df02ee390d3c0c064780076ed4c6ed05c52ca634bb"; - name = "akonadi-calendar-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-calendar-20.08.0.tar.xz"; + sha256 = "4664e2dc6bc0762d999662188c64410fa70be2cef1be221569ec3b9270f80fd8"; + name = "akonadi-calendar-20.08.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-tools-20.04.3.tar.xz"; - sha256 = "654fec93158e6623a8a81a371fa85d0a18b9f486f6c29926d97a8105a2d65ed2"; - name = "akonadi-calendar-tools-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-calendar-tools-20.08.0.tar.xz"; + sha256 = "f994db29d374b0fbfd3328fc618df44680b0dfaec1cf9f842a7a9c6ecbb841fa"; + name = "akonadi-calendar-tools-20.08.0.tar.xz"; }; }; akonadiconsole = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadiconsole-20.04.3.tar.xz"; - sha256 = "acd6d63a30af49ec66ff30c3ecdd4e53c4f4a15c4d1e41ffd988366b5106447c"; - name = "akonadiconsole-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadiconsole-20.08.0.tar.xz"; + sha256 = "a43c6b756a69301f7756464deea58c72aaefaa1b47f1136959588e8f41b7b91b"; + name = "akonadiconsole-20.08.0.tar.xz"; }; }; akonadi-contacts = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-contacts-20.04.3.tar.xz"; - sha256 = "5bcd7acc70631e844ed77e127ff895efb573b62ef79062a6065e24b8826af39d"; - name = "akonadi-contacts-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-contacts-20.08.0.tar.xz"; + sha256 = "206f0704768a789201ead784e78d7138aba6b50b8f3880369df8799730fca8b4"; + name = "akonadi-contacts-20.08.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-import-wizard-20.04.3.tar.xz"; - sha256 = "225615f9d64166ce33718817dfda7aadada5876204c939edc1455ae01b7bf1b2"; - name = "akonadi-import-wizard-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-import-wizard-20.08.0.tar.xz"; + sha256 = "d742ced3b498f39edff33f7fc73db1e882bf4b1e17b35d5f734f8732cb1e7bde"; + name = "akonadi-import-wizard-20.08.0.tar.xz"; }; }; akonadi-mime = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-mime-20.04.3.tar.xz"; - sha256 = "92e9bab71f87c0de8e3437dd4779054332826fe2522c36a7c038c789b207f7ac"; - name = "akonadi-mime-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-mime-20.08.0.tar.xz"; + sha256 = "c0a709e25fef86f778ef21adbf78c6beab203f4f4a8d9f5e17a4d3175fe01d33"; + name = "akonadi-mime-20.08.0.tar.xz"; }; }; akonadi-notes = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-notes-20.04.3.tar.xz"; - sha256 = "e1b4b6d2347038774589a9a8a935e4697d248008dfd2b5b496e6555974c96a55"; - name = "akonadi-notes-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-notes-20.08.0.tar.xz"; + sha256 = "aeb348d6af30e8775d60cab0894634c6e5ac95a3baf97f69407602dea5944525"; + name = "akonadi-notes-20.08.0.tar.xz"; }; }; akonadi-search = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-search-20.04.3.tar.xz"; - sha256 = "21ca09d39d6e550ca01e80f1a112557f00387e014763b1f47824d53d41cb5bdf"; - name = "akonadi-search-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-search-20.08.0.tar.xz"; + sha256 = "06974398ddd6cbd42d0cb9dc3cac4b6ad6bdc8062d1f94523a973ed702b40e2f"; + name = "akonadi-search-20.08.0.tar.xz"; }; }; akregator = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akregator-20.04.3.tar.xz"; - sha256 = "e175a1b60270ad76afaf16e8e5630d237cdc068c06d0ae93591494b18ad4584c"; - name = "akregator-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akregator-20.08.0.tar.xz"; + sha256 = "e8dbef1b8e8c165e824f108a33f9d2a6a0ea8668299f808fcc2ce2b4d398dcf5"; + name = "akregator-20.08.0.tar.xz"; }; }; analitza = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/analitza-20.04.3.tar.xz"; - sha256 = "f9d1873c6190dc1eaeb6fad97d4197256342e0b729f7e8199e15bfb495f854b7"; - name = "analitza-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/analitza-20.08.0.tar.xz"; + sha256 = "51bc5ecd31e557fcf5660e57458aa866ee44e386550bb2c37c22fae252405aa1"; + name = "analitza-20.08.0.tar.xz"; }; }; ark = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ark-20.04.3.tar.xz"; - sha256 = "e7251b0b6f12291ffbaa328bf7f8e101ebeef6fd110dabbcf76d8ad7cfd305bc"; - name = "ark-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ark-20.08.0.tar.xz"; + sha256 = "7627ffa17466d31dfdedabaa07b491ce14b46041d04f8b20316a0fa731fab098"; + name = "ark-20.08.0.tar.xz"; }; }; artikulate = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/artikulate-20.04.3.tar.xz"; - sha256 = "394e93df2b370ba1e6621b2bcf871be42efde6fa2189de29d4c8198e387767ea"; - name = "artikulate-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/artikulate-20.08.0.tar.xz"; + sha256 = "30ef4eedabebccfb600eec1ba7bc691e8ad4e0de8d7fdcf56a630714d6b9848b"; + name = "artikulate-20.08.0.tar.xz"; }; }; audiocd-kio = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/audiocd-kio-20.04.3.tar.xz"; - sha256 = "af8782771a5d48fb2e3ba9703f8b8e542f5fddd418ca293d23a6eb83ebe86929"; - name = "audiocd-kio-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/audiocd-kio-20.08.0.tar.xz"; + sha256 = "7a01d5b89f5271ee1eba203e15c46b146879e4651643ec6348e1033c0ffdc8c7"; + name = "audiocd-kio-20.08.0.tar.xz"; }; }; baloo-widgets = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/baloo-widgets-20.04.3.tar.xz"; - sha256 = "29394f9d47407074a5ec0f85ceade5dcc8c03f0d9a83c1e339310f19f7711ae3"; - name = "baloo-widgets-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/baloo-widgets-20.08.0.tar.xz"; + sha256 = "37800c3cde7e2a9cfbab2e11f21dd1ae76b2a31b687802bc45027966a8734985"; + name = "baloo-widgets-20.08.0.tar.xz"; }; }; blinken = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/blinken-20.04.3.tar.xz"; - sha256 = "d6901fe40768ba8319609bfd143b2d1c585b04a148aedcb4b358b041db7f1afb"; - name = "blinken-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/blinken-20.08.0.tar.xz"; + sha256 = "0a08f5fc8e0c100956bb99910265d9630191e462f8f812842e79b64e76055c1c"; + name = "blinken-20.08.0.tar.xz"; }; }; bomber = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/bomber-20.04.3.tar.xz"; - sha256 = "b292c11ebfb4311420ce6b9a4b132a437d061946e8eb08556fec89bb84c23428"; - name = "bomber-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/bomber-20.08.0.tar.xz"; + sha256 = "91b4ff0e0615cd42e36c6755d30ee62b74d6c5ae309512b9f8f347c34786ec47"; + name = "bomber-20.08.0.tar.xz"; }; }; bovo = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/bovo-20.04.3.tar.xz"; - sha256 = "5365c0fd5a57814f224585e4331be129414d1f5d51d2b90bac8421df4ae5f300"; - name = "bovo-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/bovo-20.08.0.tar.xz"; + sha256 = "f66997324d596095b30442b2446a3c581834ad60d1a27fd7f7f394549f2418a8"; + name = "bovo-20.08.0.tar.xz"; }; }; calendarsupport = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/calendarsupport-20.04.3.tar.xz"; - sha256 = "40b069e1561fac49f46dd0504af0ac459010ac98f30748b8f15a50ca1fd35b5b"; - name = "calendarsupport-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/calendarsupport-20.08.0.tar.xz"; + sha256 = "1c1682d46f248b092062a461cdefec9da3733cb0ee1a590b7c48c4977028e977"; + name = "calendarsupport-20.08.0.tar.xz"; }; }; cantor = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/cantor-20.04.3.tar.xz"; - sha256 = "ff589ccb48016fd784de9883fe19ee0c2c450e3993e9cc5f7dc499448db0c6a4"; - name = "cantor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/cantor-20.08.0.tar.xz"; + sha256 = "1d4babf783f53929f0ea42380dacdb7ab989b66383dd3c37ab22787a26715082"; + name = "cantor-20.08.0.tar.xz"; }; }; cervisia = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/cervisia-20.04.3.tar.xz"; - sha256 = "3e2aac0a08c01d9ea5c5814e739f082ec5a510cd8f0f6bce37cfff9130b0f078"; - name = "cervisia-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/cervisia-20.08.0.tar.xz"; + sha256 = "6e10acc196661b7d1873e370eb67486386e25e4d6b7946ade8479b70fba34d66"; + name = "cervisia-20.08.0.tar.xz"; }; }; dolphin = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/dolphin-20.04.3.tar.xz"; - sha256 = "5e493e898e02005780b59474f506904742625b50e4669c113906d4f30daa863e"; - name = "dolphin-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/dolphin-20.08.0.tar.xz"; + sha256 = "fe5a68d9afd0771ba9ffc2d5d79e7bc43da85fd3ee3c2493a9a2d5c359c3cd6f"; + name = "dolphin-20.08.0.tar.xz"; }; }; dolphin-plugins = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/dolphin-plugins-20.04.3.tar.xz"; - sha256 = "f0dad66e7302711e136b0253fb73dbf16bc9facdbb4ad617207fb818fc84130a"; - name = "dolphin-plugins-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/dolphin-plugins-20.08.0.tar.xz"; + sha256 = "a8a0c35f75eb8e63ee90f44ce930babceff86676b8bba213c82b7ffb29e526bb"; + name = "dolphin-plugins-20.08.0.tar.xz"; }; }; dragon = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/dragon-20.04.3.tar.xz"; - sha256 = "2b0d6414f2cea9f2a0b2ebddeffa7e5342db96fac34b2a00439fca5784f6131f"; - name = "dragon-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/dragon-20.08.0.tar.xz"; + sha256 = "0e3a540b3f93118a9a17f2c6f675d0f007b123266c6e71a27b5ddb6b9a7e14a8"; + name = "dragon-20.08.0.tar.xz"; }; }; elisa = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/elisa-20.04.3.tar.xz"; - sha256 = "d99dc2eb80d4219d08c72e612ac07cbb6c91c2eff365b49da69cbc3c1e70885b"; - name = "elisa-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/elisa-20.08.0.tar.xz"; + sha256 = "acbff9f3c3d26c2a2c249974ccd8ff0bdeb22148a8a5b72e1199f1ec2f9d712e"; + name = "elisa-20.08.0.tar.xz"; }; }; eventviews = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/eventviews-20.04.3.tar.xz"; - sha256 = "f10d43f57e62d68b6d0b41e9e3442baee8b68664e085f6e4347ac6adc1af32ff"; - name = "eventviews-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/eventviews-20.08.0.tar.xz"; + sha256 = "205607d89d739f1efa4472303206647d04fba4e9d80610800a4a229676ede732"; + name = "eventviews-20.08.0.tar.xz"; }; }; ffmpegthumbs = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ffmpegthumbs-20.04.3.tar.xz"; - sha256 = "089305a75d32cf8bf1b9279623b524912af78aa538379dcccf998ca1ab165164"; - name = "ffmpegthumbs-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ffmpegthumbs-20.08.0.tar.xz"; + sha256 = "84c3a8f064423d7e51a57b9ed32a9f4fdbca73f7fa7e47a6289d9b516f1ba9ff"; + name = "ffmpegthumbs-20.08.0.tar.xz"; }; }; filelight = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/filelight-20.04.3.tar.xz"; - sha256 = "d0939d0a04424978c06b675ac784c6a1ecbccbb67a31f5af661c6716bf38f0a4"; - name = "filelight-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/filelight-20.08.0.tar.xz"; + sha256 = "29ea650f7b0f1863ea6caeca39362eff652edee755963967eb4653665a2499b4"; + name = "filelight-20.08.0.tar.xz"; }; }; granatier = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/granatier-20.04.3.tar.xz"; - sha256 = "9d06047f613a03b32d603e90bd14ca2873be9da9b4b17b98a65242e9855a7aaf"; - name = "granatier-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/granatier-20.08.0.tar.xz"; + sha256 = "9fd034875c2ac80a089145c47f36b3b97ed69eaa1693aa83bc5bd76561096efd"; + name = "granatier-20.08.0.tar.xz"; }; }; grantlee-editor = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/grantlee-editor-20.04.3.tar.xz"; - sha256 = "1a3e4ece1a37e11735291bbec99314bc0ede0714377db916ed1266ec19325ef5"; - name = "grantlee-editor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/grantlee-editor-20.08.0.tar.xz"; + sha256 = "08aeac1c6bacabdeb4e4273efc5c5f4995454c45bd51069b3ef6105237b84afa"; + name = "grantlee-editor-20.08.0.tar.xz"; }; }; grantleetheme = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/grantleetheme-20.04.3.tar.xz"; - sha256 = "c5b2e4b1d5e14b39d2e66d160ba0b86c16f86e921abf578640bf1576a5f25eb3"; - name = "grantleetheme-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/grantleetheme-20.08.0.tar.xz"; + sha256 = "7e86d2f9f5a725f988211f676da2c4191ed6df55418135f3a54da5d687d63e8e"; + name = "grantleetheme-20.08.0.tar.xz"; }; }; gwenview = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/gwenview-20.04.3.tar.xz"; - sha256 = "d176021d6784e33cb0aaa6fa2517e81f9eac237079d2a06d6b55b8f4b04e8bd9"; - name = "gwenview-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/gwenview-20.08.0.tar.xz"; + sha256 = "e7a6d96801bfc41156292faac915691b929d4da641cf04839c74a68debc95c44"; + name = "gwenview-20.08.0.tar.xz"; }; }; incidenceeditor = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/incidenceeditor-20.04.3.tar.xz"; - sha256 = "b3c70c926acab7a0585bf2bf7575ebe4d04c439fc49af073d0cb599f3b9e57c2"; - name = "incidenceeditor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/incidenceeditor-20.08.0.tar.xz"; + sha256 = "5f23343959cd672570a4a3439be0e8b27c413b9747a17bd04138359c43dac678"; + name = "incidenceeditor-20.08.0.tar.xz"; }; }; juk = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/juk-20.04.3.tar.xz"; - sha256 = "2566257f83db74d69b95e109146a82e1e03966b3592c891b48e81cf2a13d812b"; - name = "juk-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/juk-20.08.0.tar.xz"; + sha256 = "ec00ef054768efc64b5b0da69fba90104689b314a064f52989d1c6dbd73dad1b"; + name = "juk-20.08.0.tar.xz"; }; }; k3b = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/k3b-20.04.3.tar.xz"; - sha256 = "562dc91be0a992ef0f139310bfd941202e4ae273e11b754d02a8cf6f85f20420"; - name = "k3b-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/k3b-20.08.0.tar.xz"; + sha256 = "d10ac6bfa89744ec857ce7c65d5d7eae5f26ce151341d6f393b9a141cc05540a"; + name = "k3b-20.08.0.tar.xz"; }; }; kaccounts-integration = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kaccounts-integration-20.04.3.tar.xz"; - sha256 = "57661418d6fe58f9c3d308ba8804e5bc83312bba0967e13bf144b1a7dba9b36d"; - name = "kaccounts-integration-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kaccounts-integration-20.08.0.tar.xz"; + sha256 = "b1d0912ec7771be6c04f4cf635d9196acee1c63f47fe1814a5da2002196125a0"; + name = "kaccounts-integration-20.08.0.tar.xz"; }; }; kaccounts-providers = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kaccounts-providers-20.04.3.tar.xz"; - sha256 = "ffeeac1283c453a4bbd4249cbe314eb7f9800a9cbedce192fdb1f12f30670e3e"; - name = "kaccounts-providers-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kaccounts-providers-20.08.0.tar.xz"; + sha256 = "5a2293e124839dec3ca5cbe72548ff01ce3c0f7edc5c6dd78ca4d8a27054f574"; + name = "kaccounts-providers-20.08.0.tar.xz"; }; }; kaddressbook = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kaddressbook-20.04.3.tar.xz"; - sha256 = "d1c8f6af88572548a90756963921a8555df239467858432079a37788f4980b58"; - name = "kaddressbook-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kaddressbook-20.08.0.tar.xz"; + sha256 = "e34b4515a5721b9dd1d9d391acb81905bc2b6a0d219347c7dac87ebbb5b7b921"; + name = "kaddressbook-20.08.0.tar.xz"; }; }; kajongg = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kajongg-20.04.3.tar.xz"; - sha256 = "0175fb44b4f092fa318113a576f41e0a29dc1f5d7dfbf0ca7877a5c46a095d00"; - name = "kajongg-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kajongg-20.08.0.tar.xz"; + sha256 = "1813ff2d960f96d63c5680b4a7e7dca6249146876c7a6d203eb0f9768eca244b"; + name = "kajongg-20.08.0.tar.xz"; }; }; kalarm = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kalarm-20.04.3.tar.xz"; - sha256 = "71f94af998495c759b9c2e7bf2092887748301c993f76dbf36f6ac9e4bb2a1f5"; - name = "kalarm-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kalarm-20.08.0.tar.xz"; + sha256 = "02c1a62f603cc6917d0f95eff4aaa23cf808395bed9b1dad21817f6c32256748"; + name = "kalarm-20.08.0.tar.xz"; }; }; kalarmcal = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kalarmcal-20.04.3.tar.xz"; - sha256 = "19c9aab451f95f7689d8b18059e84f189b11cf15bb7f60fe55402b944512692e"; - name = "kalarmcal-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kalarmcal-20.08.0.tar.xz"; + sha256 = "bd4f048a976829ee5768b9d26aebe4efbbfa0a2991486c8f57f250fe4198532c"; + name = "kalarmcal-20.08.0.tar.xz"; }; }; kalgebra = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kalgebra-20.04.3.tar.xz"; - sha256 = "988ae02433e961a84da35498aa6ff88fbcc36f8f12d55457116935740d3f1475"; - name = "kalgebra-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kalgebra-20.08.0.tar.xz"; + sha256 = "658fd3eae218b6b73dbf3ff2edb59c511bfb11d549b7e41a5224c62b4bfedc2c"; + name = "kalgebra-20.08.0.tar.xz"; }; }; kalzium = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kalzium-20.04.3.tar.xz"; - sha256 = "b884fc8c13c3618a73e3ecfd265660e7045245059a951aff32c12ee5981902ca"; - name = "kalzium-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kalzium-20.08.0.tar.xz"; + sha256 = "e9b402ea91ac87a19cef6e686bfb8507f6afac0d19c5dc7de777475d5db1b06f"; + name = "kalzium-20.08.0.tar.xz"; }; }; kamera = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kamera-20.04.3.tar.xz"; - sha256 = "dcac50db634fccb3e602abb575322342d50c56832a61731546cf1fec552d5b3e"; - name = "kamera-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kamera-20.08.0.tar.xz"; + sha256 = "ca4194b99703a1908d4991538419c49fc28f5df8cb32f7c07a20454f4918f12a"; + name = "kamera-20.08.0.tar.xz"; }; }; kamoso = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kamoso-20.04.3.tar.xz"; - sha256 = "9b6410f75bd47901cdd787ea5a7a7bc93da16837f955f27de9e609d9e7b4b896"; - name = "kamoso-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kamoso-20.08.0.tar.xz"; + sha256 = "c27ea592a70d7634740973e860acdf8cda49c0880a13f623c315fbc02cc3d592"; + name = "kamoso-20.08.0.tar.xz"; }; }; kanagram = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kanagram-20.04.3.tar.xz"; - sha256 = "7fe8fde45d54b09118238f4a7a63aa2f6fc24ae14c49739ffe71cffc44bc5a95"; - name = "kanagram-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kanagram-20.08.0.tar.xz"; + sha256 = "d7fc300883bb5420ce1f9bc2ec52324a74b775a8ecea12b904afedc0a6af6ca3"; + name = "kanagram-20.08.0.tar.xz"; }; }; kapman = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kapman-20.04.3.tar.xz"; - sha256 = "e3c34e94a204e6d9a4ebb35c415b8c5707313fba746867f2984fd0e95926d529"; - name = "kapman-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kapman-20.08.0.tar.xz"; + sha256 = "24ad6ae146c0770fe4498983604b25ced25eab98b4a94898311553f7e4a97475"; + name = "kapman-20.08.0.tar.xz"; }; }; kapptemplate = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kapptemplate-20.04.3.tar.xz"; - sha256 = "72ce76b66ae503591a60081f334c2d2a0e9338a125b64de413e1e4ab81c29013"; - name = "kapptemplate-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kapptemplate-20.08.0.tar.xz"; + sha256 = "ef92d56a155f1218d28a63167e67f4fc7bbdf9ba63344bef9512b2e1435f322d"; + name = "kapptemplate-20.08.0.tar.xz"; }; }; kate = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kate-20.04.3.tar.xz"; - sha256 = "38d92f2b95032cd20bd5b78ada2ee25fc9c06593047d063c28419df0839bc334"; - name = "kate-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kate-20.08.0.tar.xz"; + sha256 = "aa0695f40cf9d491a08338f1c9b4331dfbb63cb311cf815ed0499b38940fa0db"; + name = "kate-20.08.0.tar.xz"; }; }; katomic = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/katomic-20.04.3.tar.xz"; - sha256 = "9ced288f46af528aa31931a0ab1a1b2d346d63ce6729e508163bf3370dbd261f"; - name = "katomic-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/katomic-20.08.0.tar.xz"; + sha256 = "006c55f3f688f70b51cf89589843037f09d30e826cf1a30ec441e84724ad27ab"; + name = "katomic-20.08.0.tar.xz"; }; }; kbackup = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kbackup-20.04.3.tar.xz"; - sha256 = "0360f5b5d512a48975e09e5c1d2f035b7c2e1ead00b9b9f76059b76eb4499f92"; - name = "kbackup-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kbackup-20.08.0.tar.xz"; + sha256 = "5d5882df3dfa6a078940ea6e292fd1c1aba7c016426e36d87f0d7f8c149bcd59"; + name = "kbackup-20.08.0.tar.xz"; }; }; kblackbox = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kblackbox-20.04.3.tar.xz"; - sha256 = "8bf24ceaf33fabd3ec3030b42565dcbb2d8b282553a3222d741b0b43d70d3a38"; - name = "kblackbox-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kblackbox-20.08.0.tar.xz"; + sha256 = "0f6d0341e5bbc16d2d0ec9dc14027ebc91fdda2b9eb2ac6061055a60541db358"; + name = "kblackbox-20.08.0.tar.xz"; }; }; kblocks = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kblocks-20.04.3.tar.xz"; - sha256 = "128cbd7751883cc46d3bc0fcf3c2fc40d8d87631ad54c90459727da209237609"; - name = "kblocks-20.04.3.tar.xz"; - }; - }; - kblog = { - version = "20.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kblog-20.04.3.tar.xz"; - sha256 = "5932a8ba3ec33f13aec201252abb6d0712740f52af03747e9eb0f6c0764cb9b4"; - name = "kblog-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kblocks-20.08.0.tar.xz"; + sha256 = "041904451ce1aec7da113ed4fb442abd92083b8d7522b1c91e05933d574fba8e"; + name = "kblocks-20.08.0.tar.xz"; }; }; kbounce = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kbounce-20.04.3.tar.xz"; - sha256 = "21977895752b7a33484463cf3fe47ff6f4d5ad4bb8ee824b92b309c5c0ee3837"; - name = "kbounce-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kbounce-20.08.0.tar.xz"; + sha256 = "7949b9ea43ca93b13378c018d8a532c200233f5f3d2acaba3c74d90f3ed79ccb"; + name = "kbounce-20.08.0.tar.xz"; }; }; kbreakout = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kbreakout-20.04.3.tar.xz"; - sha256 = "4e9bd79060d826d99573e3db364005b32d70643b0fe0d7c5e427fb1c8a34896b"; - name = "kbreakout-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kbreakout-20.08.0.tar.xz"; + sha256 = "0aa63a16d45ca432065777352f69a7fc0993fd0077f14e05cb89b06a1b69ad69"; + name = "kbreakout-20.08.0.tar.xz"; }; }; kbruch = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kbruch-20.04.3.tar.xz"; - sha256 = "7381df5deb97580a0d60881d591b3d18715c8ad5692a580aebe82a836f1bb8df"; - name = "kbruch-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kbruch-20.08.0.tar.xz"; + sha256 = "9e0c51ec0e32a8b46b567c7d275acb3845e09aef446c27324d872fc3a096113e"; + name = "kbruch-20.08.0.tar.xz"; }; }; kcachegrind = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcachegrind-20.04.3.tar.xz"; - sha256 = "ef6e782540c254eada9e75049eb02919afd7adc9940ace79aa20dcad26240770"; - name = "kcachegrind-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kcachegrind-20.08.0.tar.xz"; + sha256 = "94b3963e9eebc0bf67644de1666cf019649f5eaf924ac01c1af6e48619a11f87"; + name = "kcachegrind-20.08.0.tar.xz"; }; }; kcalc = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcalc-20.04.3.tar.xz"; - sha256 = "1ec38e3bf0c17df25a3367d4f3d5f7ef32b9a6fb5f081c20ad0091a968a2cf4a"; - name = "kcalc-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kcalc-20.08.0.tar.xz"; + sha256 = "3b6dee02e43ddb85ae6748cd8aefb422112be411e778c56372e97de0046bfca2"; + name = "kcalc-20.08.0.tar.xz"; }; }; kcalutils = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcalutils-20.04.3.tar.xz"; - sha256 = "6604e0377c8955be7963853691aeaf689c00e2f78caab6b3472ffb4c822e07a3"; - name = "kcalutils-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kcalutils-20.08.0.tar.xz"; + sha256 = "82504223fe3a0f6149204aa5f3b38dc7fb05a25048e4a0159ba6e1923c24c1f8"; + name = "kcalutils-20.08.0.tar.xz"; }; }; kcharselect = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcharselect-20.04.3.tar.xz"; - sha256 = "0da77b66efeab1ba7c17335853f3c3feab9b53b4c37cfa6a9f983327d13080f4"; - name = "kcharselect-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kcharselect-20.08.0.tar.xz"; + sha256 = "91b17c42286c3a715dcde764057364bada6d07ae163f9b5cdc7daec338ee3a72"; + name = "kcharselect-20.08.0.tar.xz"; }; }; kcolorchooser = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcolorchooser-20.04.3.tar.xz"; - sha256 = "276cee46f92eeb5b47ec09366498b117c657fb2e618fc9fe34c797d4384549fd"; - name = "kcolorchooser-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kcolorchooser-20.08.0.tar.xz"; + sha256 = "df1bfd346bfcdea7a585f489f62ab2f76993ce07f83c47cb8202be981b8a3829"; + name = "kcolorchooser-20.08.0.tar.xz"; }; }; kcron = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcron-20.04.3.tar.xz"; - sha256 = "b1d7d36e5b9efe4fd5c5fedf0b9e267fd2aaf6423e6a18bb64112a0c8257e4fa"; - name = "kcron-20.04.3.tar.xz"; - }; - }; - kdav = { - version = "20.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdav-20.04.3.tar.xz"; - sha256 = "b645d5d17c967fd09c3d7abdfc262740a95870dd66bd3e5f4c0382da097d8510"; - name = "kdav-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kcron-20.08.0.tar.xz"; + sha256 = "e45d06ed0665d8f1cad3d44cc43035d50fc533bf9ab6e10fe53ab23f2ed5e708"; + name = "kcron-20.08.0.tar.xz"; }; }; kdebugsettings = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdebugsettings-20.04.3.tar.xz"; - sha256 = "5f42891c0990216780fbe005521e423d922007c7ddeac97a05c3c99b6fe30344"; - name = "kdebugsettings-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdebugsettings-20.08.0.tar.xz"; + sha256 = "21914b67dfc654ed525118afeda74e6a0539af9a0f3be05c490e9edbf13b2328"; + name = "kdebugsettings-20.08.0.tar.xz"; }; }; kdeconnect-kde = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdeconnect-kde-20.04.3.tar.xz"; - sha256 = "412940a35dcd9f1491a54e4f9fd5ffdadc890bb9a45cfe2a0f8cb1ee7dc1ccbb"; - name = "kdeconnect-kde-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdeconnect-kde-20.08.0.tar.xz"; + sha256 = "3de16bf165b68635919e68fa2460a5d14139cd9a63cb27573a7b2b2a5b0044a1"; + name = "kdeconnect-kde-20.08.0.tar.xz"; }; }; kde-dev-scripts = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kde-dev-scripts-20.04.3.tar.xz"; - sha256 = "0b321954ea79e829d81c9be0170babae87e5eab22c8d42b296746d5a0160fbae"; - name = "kde-dev-scripts-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kde-dev-scripts-20.08.0.tar.xz"; + sha256 = "2c3120e63ebcd41e30acfd53063bad659e1982f79b81429e0541b0100bc25ad3"; + name = "kde-dev-scripts-20.08.0.tar.xz"; }; }; kde-dev-utils = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kde-dev-utils-20.04.3.tar.xz"; - sha256 = "8f004e47bbd5ee032d711673b3320e59663087c636c9c51d031dc563b5391c83"; - name = "kde-dev-utils-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kde-dev-utils-20.08.0.tar.xz"; + sha256 = "7998afa4ac1b293eb3ba8f48ea77cd0bc22d2c2eda84e291d8c9cf2a5e719547"; + name = "kde-dev-utils-20.08.0.tar.xz"; }; }; kdeedu-data = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdeedu-data-20.04.3.tar.xz"; - sha256 = "e717f82a1b4729f0a6df65221e9c2b01df17acf3d4eb8c2340cea23b6b65d969"; - name = "kdeedu-data-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdeedu-data-20.08.0.tar.xz"; + sha256 = "c863f72c8dacb47dc8c82f966f4b70d33f75c2b9f6d63c174e9f3a2c73241943"; + name = "kdeedu-data-20.08.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdegraphics-mobipocket-20.04.3.tar.xz"; - sha256 = "24ce0c1565b8bc922ea08c3d6bb625ff4bba2e656545e09e410a0ff3bc84c80f"; - name = "kdegraphics-mobipocket-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdegraphics-mobipocket-20.08.0.tar.xz"; + sha256 = "2c11b6efe2c5f7725341c861dd9ba8e919ba3734866e808225c13bb2f2d90a2d"; + name = "kdegraphics-mobipocket-20.08.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdegraphics-thumbnailers-20.04.3.tar.xz"; - sha256 = "b72bdd67738391a10672cd20667555168382285a764bd9e712e1485e7860441f"; - name = "kdegraphics-thumbnailers-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdegraphics-thumbnailers-20.08.0.tar.xz"; + sha256 = "d466c08b4a5e4ccc36907dd38e82019f9060c2ea1931f336f9fbb2f79036566e"; + name = "kdegraphics-thumbnailers-20.08.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdenetwork-filesharing-20.04.3.tar.xz"; - sha256 = "8cdbe70cd4263e8be6fdc0de987cb9255efae9b747018bc5098c0882a3d69c4d"; - name = "kdenetwork-filesharing-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdenetwork-filesharing-20.08.0.tar.xz"; + sha256 = "8fabf6b5eae8c32bf75db911ae76d35aa9fee66355964cf0ad8150f960b83256"; + name = "kdenetwork-filesharing-20.08.0.tar.xz"; }; }; kdenlive = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdenlive-20.04.3.tar.xz"; - sha256 = "29e5fa37f4680683cc6e244cee4d0b3a0e3e3290f15c0e0b6015ae4784d7315e"; - name = "kdenlive-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdenlive-20.08.0.tar.xz"; + sha256 = "89914ee37f5bbdd16051b0db4a6cfb6f8c3d748f47c9e28e5349920ca133c0bd"; + name = "kdenlive-20.08.0.tar.xz"; }; }; kdepim-addons = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdepim-addons-20.04.3.tar.xz"; - sha256 = "db0c70df94891bd6f90db533287269909e3442bfd0f546fa3f951d71f6268e9d"; - name = "kdepim-addons-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdepim-addons-20.08.0.tar.xz"; + sha256 = "4045f7879cc47829a82a4ada18a35cb3bdf89a489a15cd0bd48441c305b3cb06"; + name = "kdepim-addons-20.08.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdepim-apps-libs-20.04.3.tar.xz"; - sha256 = "7d69ac9cecfe0035e4806f0ff43fd41ac3755d788fffea9fd51427e1bc7027e3"; - name = "kdepim-apps-libs-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdepim-apps-libs-20.08.0.tar.xz"; + sha256 = "bf7ac0af294510e4127808f3f2c1e25368c97b78ff0a5405219abb67173598a0"; + name = "kdepim-apps-libs-20.08.0.tar.xz"; }; }; kdepim-runtime = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdepim-runtime-20.04.3.tar.xz"; - sha256 = "1e4cffed12098baf29d8acfc4e4e12848d36ad8f55bf75d8c089a57e6f906494"; - name = "kdepim-runtime-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdepim-runtime-20.08.0.tar.xz"; + sha256 = "f6e4ff70b9cb85e8590ab8d7432abe1b6a2daa14d09a2974f8902b882b16409d"; + name = "kdepim-runtime-20.08.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdesdk-kioslaves-20.04.3.tar.xz"; - sha256 = "7d55121100d048bdab5f045126261eaad55ed58a2de97b211ad6acf03e22344b"; - name = "kdesdk-kioslaves-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdesdk-kioslaves-20.08.0.tar.xz"; + sha256 = "0ab8188c1746ec5786d94e5988487b766a04a9df1c275b25778ab2948e302776"; + name = "kdesdk-kioslaves-20.08.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdesdk-thumbnailers-20.04.3.tar.xz"; - sha256 = "e526cbad484807e11e03d85e5fc706df118e8f3327846f396e8df024b770c566"; - name = "kdesdk-thumbnailers-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdesdk-thumbnailers-20.08.0.tar.xz"; + sha256 = "8f2adb38ca24b82119eb52ef879f5fd6a5d48b9c012956a518cefefd86fbd6d3"; + name = "kdesdk-thumbnailers-20.08.0.tar.xz"; }; }; kdf = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdf-20.04.3.tar.xz"; - sha256 = "f52e34c36cd924ae6f8fa1291d548abbf5e0bcf0c82d69a583f01dfe128332a8"; - name = "kdf-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdf-20.08.0.tar.xz"; + sha256 = "2f5fddbaf09d3cfdfb3e18b0a9292ecb6bcf14969e4d031a4215f22fecda0892"; + name = "kdf-20.08.0.tar.xz"; }; }; kdialog = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdialog-20.04.3.tar.xz"; - sha256 = "75b8214980f5043d23b0226827f049815147e1206ffd64c1fe9e091e63c27a62"; - name = "kdialog-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdialog-20.08.0.tar.xz"; + sha256 = "669da86bebf2cfac4cda7c873bb57417aac8d293cee8c5950968495520954ed5"; + name = "kdialog-20.08.0.tar.xz"; }; }; kdiamond = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdiamond-20.04.3.tar.xz"; - sha256 = "f1bd1c5471224d4ab2269637bd89e11e5903bf4f15f1b2a3ae01c252adad7096"; - name = "kdiamond-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdiamond-20.08.0.tar.xz"; + sha256 = "56efcb8b2bf81d62324911f404e918f7bcd62f6fa2ee9d4e513df54e37631889"; + name = "kdiamond-20.08.0.tar.xz"; }; }; keditbookmarks = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/keditbookmarks-20.04.3.tar.xz"; - sha256 = "ec25b40d0ab85e3f72eb334ea7d658d6fe19ae08d626d9fbf0ad71d57594ad88"; - name = "keditbookmarks-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/keditbookmarks-20.08.0.tar.xz"; + sha256 = "7fab031ae4d62e3c9d37dce671af4580afe01e6e3411ef199115568e893b7df5"; + name = "keditbookmarks-20.08.0.tar.xz"; }; }; kfind = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kfind-20.04.3.tar.xz"; - sha256 = "ff0d412dcd4b5812eb781618c4bf52d33f4691af2b9def4ba56644b5a668ef6e"; - name = "kfind-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kfind-20.08.0.tar.xz"; + sha256 = "f47f1ee0dc1c75b90d70027eb0ce2b470912aff9db2c18a0380eb65b16e6c842"; + name = "kfind-20.08.0.tar.xz"; }; }; kfloppy = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kfloppy-20.04.3.tar.xz"; - sha256 = "4e0d392471eddd23847129b5538846edd1a834f02119d312aed3698e6bfd9e1c"; - name = "kfloppy-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kfloppy-20.08.0.tar.xz"; + sha256 = "85732b804ee19c1a1db82845d7ab8c1ba1872d8d40737ee5b6beef8798c457f3"; + name = "kfloppy-20.08.0.tar.xz"; }; }; kfourinline = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kfourinline-20.04.3.tar.xz"; - sha256 = "c339009355dea086c28baa454aac1c15d601e15685ba8006100f50475518875f"; - name = "kfourinline-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kfourinline-20.08.0.tar.xz"; + sha256 = "9b1d520d61ddd98ce629a50355a190bded41d6abea100d87f3650e15e0c358b6"; + name = "kfourinline-20.08.0.tar.xz"; }; }; kgeography = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kgeography-20.04.3.tar.xz"; - sha256 = "69b4b06cfb1f6abb5c12bb0bf9334f178af2018288ee507678efe594e0392887"; - name = "kgeography-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kgeography-20.08.0.tar.xz"; + sha256 = "7fd2b7449309d6c42e01038c93ce8dda9c7a8acb806b27b9ff58d4556711ff5e"; + name = "kgeography-20.08.0.tar.xz"; }; }; kget = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kget-20.04.3.tar.xz"; - sha256 = "930b7ed50d19e41bfead8e6d71d8ec4024d688907489c17fb9274a73e4c7c0c2"; - name = "kget-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kget-20.08.0.tar.xz"; + sha256 = "de46cbe0a53c7246d1aeb4f15d24b90633eaf37e236d67882e1454b61fea1a09"; + name = "kget-20.08.0.tar.xz"; }; }; kgoldrunner = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kgoldrunner-20.04.3.tar.xz"; - sha256 = "ab535067a8991a94bd7cd5a990a6120538206d241c8e8149c7b774cbdd1d0941"; - name = "kgoldrunner-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kgoldrunner-20.08.0.tar.xz"; + sha256 = "29caf1637daea69013061d170a749411b18f543af7e2f8a0f295f1eb5cb62586"; + name = "kgoldrunner-20.08.0.tar.xz"; }; }; kgpg = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kgpg-20.04.3.tar.xz"; - sha256 = "bcd3211ab8112f070215e8e6451021859fefc57b813bdad1b421a1f129e17cbb"; - name = "kgpg-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kgpg-20.08.0.tar.xz"; + sha256 = "102cc0d44b7621ebad1d5914bbb44a598689ebb95093e4a76713679996c2af0c"; + name = "kgpg-20.08.0.tar.xz"; }; }; khangman = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/khangman-20.04.3.tar.xz"; - sha256 = "db827d20ce5f0522675d75c18fd4c804047cc2e5a2ca2f7a7421b5fc91952831"; - name = "khangman-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/khangman-20.08.0.tar.xz"; + sha256 = "11f442e24f0a428c0338000f66687bc021f4290bcd8cc0acc3fd882ce3cf4b0b"; + name = "khangman-20.08.0.tar.xz"; }; }; khelpcenter = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/khelpcenter-20.04.3.tar.xz"; - sha256 = "3930c321388f27925a63add5f11fe65eb34b7301fb22d78f16f5f3de8467a9ed"; - name = "khelpcenter-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/khelpcenter-20.08.0.tar.xz"; + sha256 = "2c45fb76c5503441dcf9ab1cae386dd2e10a2ad1af08f60090d362e82364e98c"; + name = "khelpcenter-20.08.0.tar.xz"; }; }; kidentitymanagement = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kidentitymanagement-20.04.3.tar.xz"; - sha256 = "09e63cdb07bb38ba8c82d796212b1bd9d218dbe8adde215bff9c689c93b90917"; - name = "kidentitymanagement-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kidentitymanagement-20.08.0.tar.xz"; + sha256 = "4c7dca3e27f87203b27af219ebe07701e641a56dd7a8c1d7a3fa7cef2fe1c5af"; + name = "kidentitymanagement-20.08.0.tar.xz"; }; }; kig = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kig-20.04.3.tar.xz"; - sha256 = "ccbc8f10e79f420d8a97aa00616fc29ed771721bfe22eb74b160464ac6cc3023"; - name = "kig-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kig-20.08.0.tar.xz"; + sha256 = "fa9754f5a67e35fdfd8b836d423001fc48fe5c41fadbfceece834fb3f5b6cccd"; + name = "kig-20.08.0.tar.xz"; }; }; kigo = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kigo-20.04.3.tar.xz"; - sha256 = "ccc4f9638bfd3e1bf7f25621e10907f08cd0354858f9a174ab8f5c51c77e8a77"; - name = "kigo-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kigo-20.08.0.tar.xz"; + sha256 = "5e787cad2370b479feeae3be81b0972314429e0e896b9943445653731c9c6040"; + name = "kigo-20.08.0.tar.xz"; }; }; killbots = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/killbots-20.04.3.tar.xz"; - sha256 = "66c48ddeb49118ea8139422c0370256f88a4e3104dbe664bc25d2c63edfdf326"; - name = "killbots-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/killbots-20.08.0.tar.xz"; + sha256 = "3b647fd8af007619acdfc7c72d572a3184a8e8c5ecbeb472559c5e40e9d53257"; + name = "killbots-20.08.0.tar.xz"; }; }; kimagemapeditor = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kimagemapeditor-20.04.3.tar.xz"; - sha256 = "d86f8a9e0a1aba71236f7af844076758774ab1c10b4b2fa1d244c9b5d24adf33"; - name = "kimagemapeditor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kimagemapeditor-20.08.0.tar.xz"; + sha256 = "17d3ccfc35aecd802729da6c78a78cb358cf68bd5079bcae6d83af0874e86a00"; + name = "kimagemapeditor-20.08.0.tar.xz"; }; }; kimap = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kimap-20.04.3.tar.xz"; - sha256 = "870d22a4f07080453ade2e1224acb563232211fe48e1beabe8c58d27730b4bfa"; - name = "kimap-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kimap-20.08.0.tar.xz"; + sha256 = "4ebb75312aac29274d8faa68f885c78a77c1173fc0200c08825670ac263cbec6"; + name = "kimap-20.08.0.tar.xz"; }; }; kio-extras = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kio-extras-20.04.3.tar.xz"; - sha256 = "ff0edabe83ee4958ce7559e935f6b7ae3f76aee43ee5774543368ca334b21090"; - name = "kio-extras-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kio-extras-20.08.0.tar.xz"; + sha256 = "6bfbb92dd56755ec0b2dee0cd889d6081ae00df339c05b4cb7a173a463275e2d"; + name = "kio-extras-20.08.0.tar.xz"; + }; + }; + kio-gdrive = { + version = "20.08.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.08.0/src/kio-gdrive-20.08.0.tar.xz"; + sha256 = "c08f809d575a24887aacd1a046b01cf2c3df7b77813fecf89cb6cdbec13ab299"; + name = "kio-gdrive-20.08.0.tar.xz"; }; }; kipi-plugins = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kipi-plugins-20.04.3.tar.xz"; - sha256 = "e128ba8a2194bb0ce6a5eac97d56479003f08c1d740a56a6c8d976df1a71632a"; - name = "kipi-plugins-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kipi-plugins-20.08.0.tar.xz"; + sha256 = "f8f03a9797b4855839693ffca93245460e78fd2f6eeb763d16dd159711f40683"; + name = "kipi-plugins-20.08.0.tar.xz"; }; }; kirigami-gallery = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kirigami-gallery-20.04.3.tar.xz"; - sha256 = "1868c4782c8a9c7a80eb6b465a27cb7fc46dc9a8e47d2530559ba3b2f1131461"; - name = "kirigami-gallery-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kirigami-gallery-20.08.0.tar.xz"; + sha256 = "8cabcee747152b41b558c0a9eb1fd0d55fb155b3b807a57d2176023806a59f2b"; + name = "kirigami-gallery-20.08.0.tar.xz"; }; }; kiriki = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kiriki-20.04.3.tar.xz"; - sha256 = "1df78a7b9e91f20841411fc2561d077dcd897211e5c20f1f526670c9f3b7a97d"; - name = "kiriki-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kiriki-20.08.0.tar.xz"; + sha256 = "56db705674a43c249f2374eb1ce2c20e4b3e22223348959b3f5db67c0f52db4f"; + name = "kiriki-20.08.0.tar.xz"; }; }; kiten = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kiten-20.04.3.tar.xz"; - sha256 = "3b0bdd2b711ee67bbc194b301da3ed99d4ee75bb6ff18ab50c0a1b4c1c4ef162"; - name = "kiten-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kiten-20.08.0.tar.xz"; + sha256 = "17cb8344d679040b5c7be99049f73b88517cf127e3d045d469cdae9602945263"; + name = "kiten-20.08.0.tar.xz"; }; }; kitinerary = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kitinerary-20.04.3.tar.xz"; - sha256 = "8c7dab2e28891af268d22884ecbb9cd7031c4b34352ed3b576dbb6dcb5977c7e"; - name = "kitinerary-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kitinerary-20.08.0.tar.xz"; + sha256 = "a87ce5dd8e978dad8bcac7d92d89c4a5eeaa847e8819c2aa84ebce51dfe95f50"; + name = "kitinerary-20.08.0.tar.xz"; }; }; kjumpingcube = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kjumpingcube-20.04.3.tar.xz"; - sha256 = "1716e1de95e8610dc80d991c4518beedbdf6d4c40a07f71a1dba0971e0a6cb9b"; - name = "kjumpingcube-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kjumpingcube-20.08.0.tar.xz"; + sha256 = "5ea4187326a0ff0a77c0aef774d9ba9c3c20b438def85abe9e4b0822a8350a70"; + name = "kjumpingcube-20.08.0.tar.xz"; }; }; kldap = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kldap-20.04.3.tar.xz"; - sha256 = "ab32ef61da11f1401f9d648f6831a946dd6964ffd4f35f6c84ad9ca19dd422f1"; - name = "kldap-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kldap-20.08.0.tar.xz"; + sha256 = "db358a6ec50f5d3988583096ccc5fe1389999b4dd3a3c787d7797f6e0b32ee53"; + name = "kldap-20.08.0.tar.xz"; }; }; kleopatra = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kleopatra-20.04.3.tar.xz"; - sha256 = "59c6eb6b626b502f6b194ac4bbde8ed95e613d6b6fd54818c0206dd84575a34d"; - name = "kleopatra-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kleopatra-20.08.0.tar.xz"; + sha256 = "776fbb8d06edc83834745a8af05b23297aeba89b8dce3410a2d48f37a91b5a87"; + name = "kleopatra-20.08.0.tar.xz"; }; }; klettres = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/klettres-20.04.3.tar.xz"; - sha256 = "ed943bce624a599f7759487d0ff3b16c340f2beadbad25dab30b6607dbd2695e"; - name = "klettres-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/klettres-20.08.0.tar.xz"; + sha256 = "55748999e29ecec5fb3ce206c74bc44f7e83f4f239edd61c161e4df4e597bca2"; + name = "klettres-20.08.0.tar.xz"; }; }; klickety = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/klickety-20.04.3.tar.xz"; - sha256 = "703158b1c1cafc16368fa09c4c58ea6d10942b90af693a851f9b5ec84add691d"; - name = "klickety-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/klickety-20.08.0.tar.xz"; + sha256 = "0b6d71d54a5521ae8cc66eca1d397289a35733af2fc686b82bc01dd6777fa926"; + name = "klickety-20.08.0.tar.xz"; }; }; klines = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/klines-20.04.3.tar.xz"; - sha256 = "83bebb2dbb7da8e325a378da3903246ff562c56dcf9ea4991dedb5b253c81f7d"; - name = "klines-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/klines-20.08.0.tar.xz"; + sha256 = "778928fc55fe551eb836beba3f74b0f20602a0fae7366c71fa84a95ad6ca803a"; + name = "klines-20.08.0.tar.xz"; }; }; kmag = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmag-20.04.3.tar.xz"; - sha256 = "f006b2e3b685accc343cdfc8b90d915e7c2647d983b66c2d38565d669ed6d464"; - name = "kmag-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmag-20.08.0.tar.xz"; + sha256 = "b1a8fe75a03dbeac8f2080808f580bea588bf39c97534ddfa0cbf7d0de20efb7"; + name = "kmag-20.08.0.tar.xz"; }; }; kmahjongg = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmahjongg-20.04.3.tar.xz"; - sha256 = "1f4fce58163323c23aa37f849e556ee4ed7fe33fb36e21754116e1d0e2c33673"; - name = "kmahjongg-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmahjongg-20.08.0.tar.xz"; + sha256 = "05538c97613d6e3547161136b9d7aec9bb2918c9f4033a084e1576041b83d4e6"; + name = "kmahjongg-20.08.0.tar.xz"; }; }; kmail = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmail-20.04.3.tar.xz"; - sha256 = "5b653c680097a7be4ff53bc902bc3fcda9edac99f699a63a1375a1df81240d03"; - name = "kmail-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmail-20.08.0.tar.xz"; + sha256 = "0432ec1fd68868e9385dd3f6b9e2429feb5b5057317ef3940eb0e67a63e0c0f0"; + name = "kmail-20.08.0.tar.xz"; }; }; kmail-account-wizard = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmail-account-wizard-20.04.3.tar.xz"; - sha256 = "ba789c679664a390480808431510d7d6ee1591a5f7be3dfceb5951347e3cc9b1"; - name = "kmail-account-wizard-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmail-account-wizard-20.08.0.tar.xz"; + sha256 = "9f4eac46049acbc7452bbbf84569031d91f86c2577beecacb3a6200deefcc253"; + name = "kmail-account-wizard-20.08.0.tar.xz"; }; }; kmailtransport = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmailtransport-20.04.3.tar.xz"; - sha256 = "45685bf61f24c9c7070a9f5b982d48005a7bf0ef04f391df2959772b17857cc2"; - name = "kmailtransport-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmailtransport-20.08.0.tar.xz"; + sha256 = "af337017b884519065fea520fd66a8fc2e553d84ca3d8afc35739c18e67b4d73"; + name = "kmailtransport-20.08.0.tar.xz"; }; }; kmbox = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmbox-20.04.3.tar.xz"; - sha256 = "50b2a8ba98cf24117ba66ddb9b51d1db575998b36ad1aa15fec0135446cc7561"; - name = "kmbox-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmbox-20.08.0.tar.xz"; + sha256 = "58a2ecc7222a8ee5697102ca2bc871e7e30c823dcd906ac4160323fd1ba14d85"; + name = "kmbox-20.08.0.tar.xz"; }; }; kmime = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmime-20.04.3.tar.xz"; - sha256 = "a416e16f61a2dd4274b1abc54af71ffe73b01c93137bc1fa462642bb947d150c"; - name = "kmime-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmime-20.08.0.tar.xz"; + sha256 = "55f2160fa78202cf45a4b08b9bb2fec1bc54a3700f6c9aceeec8d7fc3a64a317"; + name = "kmime-20.08.0.tar.xz"; }; }; kmines = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmines-20.04.3.tar.xz"; - sha256 = "8a729ffd6406d7d6173fbd050e40a566b5ce4e7b960f3971fff82fef9c18c4d3"; - name = "kmines-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmines-20.08.0.tar.xz"; + sha256 = "d8d0f1a82fe279ed208a9005e8ffbe1277e25b33e9e0a1301013820e559ba750"; + name = "kmines-20.08.0.tar.xz"; }; }; kmix = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmix-20.04.3.tar.xz"; - sha256 = "1830bc59d836d2155fd7a24c5afe3c7f5682a96217c159a062fd28b851414dc6"; - name = "kmix-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmix-20.08.0.tar.xz"; + sha256 = "4553362d4d14fdaf019b1fc55b98aac16c2db56542996a3c2f87603c41bc2859"; + name = "kmix-20.08.0.tar.xz"; }; }; kmousetool = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmousetool-20.04.3.tar.xz"; - sha256 = "acf710dcdc53e58d3a833345f88214b22dfbd5ab9fd26d9e26c883c18441c715"; - name = "kmousetool-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmousetool-20.08.0.tar.xz"; + sha256 = "285d947548ee863de6274888b097e19aff39ed2bb8cdd33e37707c39c8417863"; + name = "kmousetool-20.08.0.tar.xz"; }; }; kmouth = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmouth-20.04.3.tar.xz"; - sha256 = "edc1aab8edd13f3f10f99b79a27dabaffe22ac7048868dd7b66b33a662cc46b2"; - name = "kmouth-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmouth-20.08.0.tar.xz"; + sha256 = "a783e73e8087d090cf4eba89fabcb9aee8c6b0858a6dea8a137323c1bbc110b1"; + name = "kmouth-20.08.0.tar.xz"; }; }; kmplot = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmplot-20.04.3.tar.xz"; - sha256 = "57389abae04c204d0c2462709b70a919e0050b20867bcb23f3ab72788051e501"; - name = "kmplot-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmplot-20.08.0.tar.xz"; + sha256 = "f2d31d8c9091c74c6d0e65a0cba77bac23eb6f78913b31d049a0e2c9ca4ec8c0"; + name = "kmplot-20.08.0.tar.xz"; }; }; knavalbattle = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/knavalbattle-20.04.3.tar.xz"; - sha256 = "78feb74eb2e52d4738e5aa8969dc4db00307bb758623cbf34d7f245242f07279"; - name = "knavalbattle-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/knavalbattle-20.08.0.tar.xz"; + sha256 = "887d2f4e24d522ab66c2a4e183b9d5359213d67382fa2350f2edff6478666aa8"; + name = "knavalbattle-20.08.0.tar.xz"; }; }; knetwalk = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/knetwalk-20.04.3.tar.xz"; - sha256 = "6bc61fb70eb0cde3f312aa672f848447ed5eb5bbc2d48d65c6a010c12e154054"; - name = "knetwalk-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/knetwalk-20.08.0.tar.xz"; + sha256 = "83fdf150c1c14f7c1807b73ce1d4bacfd10469f565541a379daa828755ddf5c6"; + name = "knetwalk-20.08.0.tar.xz"; }; }; knights = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/knights-20.04.3.tar.xz"; - sha256 = "b695e1f141dc3fd1a5deca6179bddb0f3d4aa9103c5cc539c01a2a789adade4f"; - name = "knights-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/knights-20.08.0.tar.xz"; + sha256 = "b754af5da0ee922834644c578f2133695cc446dfb8ac327fae357e7a6c027bf7"; + name = "knights-20.08.0.tar.xz"; }; }; knotes = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/knotes-20.04.3.tar.xz"; - sha256 = "90c47b902f738492286d9b3e0acb26e6a10504e1c933f921213cd1784309b796"; - name = "knotes-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/knotes-20.08.0.tar.xz"; + sha256 = "35454e609c6ea2f805c8976d2897d2b2b9137a61ad8d396be2b510881bbd7cf3"; + name = "knotes-20.08.0.tar.xz"; }; }; kolf = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kolf-20.04.3.tar.xz"; - sha256 = "dc2fd28fbfaa21d75ad6482513adddb9bd04ac0432d2d72419f85d65140ee186"; - name = "kolf-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kolf-20.08.0.tar.xz"; + sha256 = "dbc0d129e1d1fc8c597979c5ec96d612014aa56b0b0825be653b410995987305"; + name = "kolf-20.08.0.tar.xz"; }; }; kollision = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kollision-20.04.3.tar.xz"; - sha256 = "49365efc2cfc4c9406cbedf84ad8a135df79536cba166cd77402955803a56207"; - name = "kollision-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kollision-20.08.0.tar.xz"; + sha256 = "a7d59d6f4132a669ce4fe74b3b58168ce6f2036a27d37cc6362b471b58a70fe4"; + name = "kollision-20.08.0.tar.xz"; }; }; kolourpaint = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kolourpaint-20.04.3.tar.xz"; - sha256 = "55ec6d42fcf10b15b80b6fdabacdf189d1cda283a19a1c04b6a4a58abb56bee8"; - name = "kolourpaint-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kolourpaint-20.08.0.tar.xz"; + sha256 = "f2b5dee4e8c2b8245b2fd652c5ead015f637f62bc4b799735af255e2c5831629"; + name = "kolourpaint-20.08.0.tar.xz"; }; }; kompare = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kompare-20.04.3.tar.xz"; - sha256 = "6c49547c3adbe96c184bae6eda47963ce42ede2808e5588ec3f8ea924853a941"; - name = "kompare-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kompare-20.08.0.tar.xz"; + sha256 = "712d248edc6eae8dd94d41efccde94ccbc5753ecd01eb69cb3d80757a63805a3"; + name = "kompare-20.08.0.tar.xz"; }; }; konqueror = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/konqueror-20.04.3.tar.xz"; - sha256 = "d2f81f697e88eb4fe962aaa43942ef35e7a03df10f811a46ae6805a27e637e35"; - name = "konqueror-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/konqueror-20.08.0.tar.xz"; + sha256 = "4db172cff4bd3fd06ee1905dcf87013059e02902808e77acfc4bf2734d6ff73f"; + name = "konqueror-20.08.0.tar.xz"; }; }; konquest = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/konquest-20.04.3.tar.xz"; - sha256 = "004b3d8d38acecb0d5e78d037a47d137f0517d74768da461ce51fbd2a549578d"; - name = "konquest-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/konquest-20.08.0.tar.xz"; + sha256 = "e6938230c2fdd94903d13ed34f8d1e8db8221c9ceb571c5737f429291d4cca04"; + name = "konquest-20.08.0.tar.xz"; }; }; konsole = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/konsole-20.04.3.tar.xz"; - sha256 = "7874b6117d31eecd9fc475536c9bfc73c78d66d57b128cffb0bb931881564f15"; - name = "konsole-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/konsole-20.08.0.tar.xz"; + sha256 = "b641bc2f66195887a25ec588b638a78a0d00e6d2d41c126bca9a45f30f70aee9"; + name = "konsole-20.08.0.tar.xz"; }; }; kontact = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kontact-20.04.3.tar.xz"; - sha256 = "c35a68a0a99195d1d9b63f7c8edaadb9e4f1dd6957e3823e2e44c8225ccafde7"; - name = "kontact-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kontact-20.08.0.tar.xz"; + sha256 = "d759b475938079f87d5042d4fc6608c0263800cfc2156e83c874faa77c488646"; + name = "kontact-20.08.0.tar.xz"; }; }; kontactinterface = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kontactinterface-20.04.3.tar.xz"; - sha256 = "9c0587df91b9de55218d7313c445c68d13b22aeb09dc142caf8d8036574e3b09"; - name = "kontactinterface-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kontactinterface-20.08.0.tar.xz"; + sha256 = "6b20e160642063b966f359ecf2e1946db161728d42f4e6b15a77f6a19f151048"; + name = "kontactinterface-20.08.0.tar.xz"; }; }; kopete = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kopete-20.04.3.tar.xz"; - sha256 = "b37a120e3239ee4e53aedf5756c63f62a737c0774021ec27b120b054e57f886b"; - name = "kopete-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kopete-20.08.0.tar.xz"; + sha256 = "44805238ed04620101d3921e3eab0bb89d329c4d216b9cb49589459a3e4ea7e6"; + name = "kopete-20.08.0.tar.xz"; }; }; korganizer = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/korganizer-20.04.3.tar.xz"; - sha256 = "bf2ee5a3e50dca9ab0cde0b5b0d67dc561788527a216d4ef159144da5bf192a3"; - name = "korganizer-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/korganizer-20.08.0.tar.xz"; + sha256 = "c99470c92327e9e6c91276b4141bb36b08e3a9726e40edba6656d1014ee46b82"; + name = "korganizer-20.08.0.tar.xz"; }; }; kpat = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kpat-20.04.3.tar.xz"; - sha256 = "2a207c9efa1a62c99f8b33cf44782c563ee032b706ef63548239a4c303ec9a66"; - name = "kpat-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kpat-20.08.0.tar.xz"; + sha256 = "feaca3a018a8b2a94a183915b29ff671474911b1da3a149bf3ba70fdcd0a6f53"; + name = "kpat-20.08.0.tar.xz"; }; }; kpimtextedit = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kpimtextedit-20.04.3.tar.xz"; - sha256 = "f6cc5cf0ca2e598ba0c98590f16a8fabf87e1592ad62e6832c787cf2c3616cb8"; - name = "kpimtextedit-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kpimtextedit-20.08.0.tar.xz"; + sha256 = "3ae3b9f8a980d10e366351efaf2b186fd911402da5b5ee634f4687d43586ce34"; + name = "kpimtextedit-20.08.0.tar.xz"; }; }; kpkpass = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kpkpass-20.04.3.tar.xz"; - sha256 = "1f8b9bd587c278773fb016bc9fb774b03f82bcdf3c95fdca8bfc070f9a3ff322"; - name = "kpkpass-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kpkpass-20.08.0.tar.xz"; + sha256 = "553b841cf3fdf4809251941997f7dee8e09360a5b7df386e3540c73d176ba055"; + name = "kpkpass-20.08.0.tar.xz"; }; }; kqtquickcharts = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kqtquickcharts-20.04.3.tar.xz"; - sha256 = "69ff44ceb85779f7d4f52e092a8a5d18231ea0704d67d34d15ef94acf0d668c7"; - name = "kqtquickcharts-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kqtquickcharts-20.08.0.tar.xz"; + sha256 = "f17807dfa20de202615c56779ef6e4d355a275b576d6e0969357fdb359b1b235"; + name = "kqtquickcharts-20.08.0.tar.xz"; }; }; krdc = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/krdc-20.04.3.tar.xz"; - sha256 = "4e8f60b4abd05d45e59a773a63cc185529e9fbabb295524a59c835af547d4bc8"; - name = "krdc-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/krdc-20.08.0.tar.xz"; + sha256 = "96f4411dc80e746142796745c3b7fca4663aa37878391a00d1e70f2ba3be652c"; + name = "krdc-20.08.0.tar.xz"; }; }; kreversi = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kreversi-20.04.3.tar.xz"; - sha256 = "b2d9220f5919361ff81473c8b597585cc4c004b16ee459691e26feeb2e0c3114"; - name = "kreversi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kreversi-20.08.0.tar.xz"; + sha256 = "341603d23ffaf94af6c246540bbe7ba86aca3e5afe3135a0511aca22cd6a4d7f"; + name = "kreversi-20.08.0.tar.xz"; }; }; krfb = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/krfb-20.04.3.tar.xz"; - sha256 = "44532435ef824ff09d877d6984dbdfdcc5fd941f9e2abed65829dba89afeee0d"; - name = "krfb-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/krfb-20.08.0.tar.xz"; + sha256 = "f7ca46cc216ecd3790d045a36a642c834a9af4024409075e7a5bf8b498c67e4b"; + name = "krfb-20.08.0.tar.xz"; }; }; kross-interpreters = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kross-interpreters-20.04.3.tar.xz"; - sha256 = "7e5d1f771477831f42dc209c0333977af17a143ec8c7f60acbab9f5390818457"; - name = "kross-interpreters-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kross-interpreters-20.08.0.tar.xz"; + sha256 = "7a27547b150d686524578fc256e1282f64554513d2724994020caf89e7a60b10"; + name = "kross-interpreters-20.08.0.tar.xz"; }; }; kruler = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kruler-20.04.3.tar.xz"; - sha256 = "66a02829d860777184e281747dd696c6bd326d874a96173d9c47759b9e7243fe"; - name = "kruler-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kruler-20.08.0.tar.xz"; + sha256 = "71ca2308b8cee2fdd01faac526d20c813cab3664443b78e751f9d7d024e4e2c0"; + name = "kruler-20.08.0.tar.xz"; }; }; kshisen = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kshisen-20.04.3.tar.xz"; - sha256 = "ee91821b13dc13d54a0cdf64582eff820faf934df3654135c55bd3210b98bd52"; - name = "kshisen-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kshisen-20.08.0.tar.xz"; + sha256 = "5b3cc83d3cd427dcbaa98e2536f58deb36ee4eefe0a35e6d5c9613a64abad0d8"; + name = "kshisen-20.08.0.tar.xz"; }; }; ksirk = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksirk-20.04.3.tar.xz"; - sha256 = "c3c86db84b2603a0cd11e7b0da5e3c66b81c26983ace113b836ec3579dce736a"; - name = "ksirk-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ksirk-20.08.0.tar.xz"; + sha256 = "7e4acd8586a2c8619c3ca08138ca22cee46b4c46d5972a571665b09c6468cd06"; + name = "ksirk-20.08.0.tar.xz"; }; }; ksmtp = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksmtp-20.04.3.tar.xz"; - sha256 = "107d135e9337dfec6f16095c75dd0cf81bdc86cee6eeb6d212954a08a9c2e3ce"; - name = "ksmtp-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ksmtp-20.08.0.tar.xz"; + sha256 = "3fe08534bdb7037a8fd9a8c1a37456abe80252994232cfe31c368dcdc3c328c2"; + name = "ksmtp-20.08.0.tar.xz"; }; }; ksnakeduel = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksnakeduel-20.04.3.tar.xz"; - sha256 = "99a033313a3093489d39e7d537d064287aeebbfea05accfe8a189f0296664bf2"; - name = "ksnakeduel-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ksnakeduel-20.08.0.tar.xz"; + sha256 = "ebc5353ea2e5d16f2d966859b0ea081c81ed7d10c1975054e441545b79f60e5e"; + name = "ksnakeduel-20.08.0.tar.xz"; }; }; kspaceduel = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kspaceduel-20.04.3.tar.xz"; - sha256 = "dda32d2a89645129c7ee83aca7b21bc01d5120e0d58e8f39516c0837be531e38"; - name = "kspaceduel-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kspaceduel-20.08.0.tar.xz"; + sha256 = "6cd633521091ac8a1eed28b234657ba2db287c3b29ee2d071005f3438bbb1b07"; + name = "kspaceduel-20.08.0.tar.xz"; }; }; ksquares = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksquares-20.04.3.tar.xz"; - sha256 = "eb72d929cd59b076d20483ee03548d72df3dc894b631947ce3440aff0ecad730"; - name = "ksquares-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ksquares-20.08.0.tar.xz"; + sha256 = "84b459e6c1058f637b4894a4f97dfd95b0c9bb70954059d24538f80918b45ed3"; + name = "ksquares-20.08.0.tar.xz"; }; }; ksudoku = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksudoku-20.04.3.tar.xz"; - sha256 = "2df6e5cf78eee919624aa71716ef35baa9215e44662cdd7b315cfbc328c6ac19"; - name = "ksudoku-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ksudoku-20.08.0.tar.xz"; + sha256 = "0dbe6e03ca8b7203a307f97dad4a8035c20f3172d3e005b047557c2334c04a92"; + name = "ksudoku-20.08.0.tar.xz"; }; }; ksystemlog = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksystemlog-20.04.3.tar.xz"; - sha256 = "03a6f81d1b4aa8557f7da6777ef909a02fbd811b3a39df81312dc0a70bbb8f77"; - name = "ksystemlog-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ksystemlog-20.08.0.tar.xz"; + sha256 = "359eaa1cc34fa06b2ef3788c249c2b3355d6d39cddbf809df07179c10630e9a4"; + name = "ksystemlog-20.08.0.tar.xz"; }; }; kteatime = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kteatime-20.04.3.tar.xz"; - sha256 = "2ddc0df953a66376e5b0c11544a6a2ec9f173e4481a44a290aada20402c7d686"; - name = "kteatime-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kteatime-20.08.0.tar.xz"; + sha256 = "c7142cd0329cf23fdb79d3c2d508cb00cb70c517db1f832d2a39ba7c4e103fd3"; + name = "kteatime-20.08.0.tar.xz"; }; }; ktimer = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktimer-20.04.3.tar.xz"; - sha256 = "e9881d68ed4fbbff5900d615f81145cd73e70a08092a83b87d71705ee5904395"; - name = "ktimer-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktimer-20.08.0.tar.xz"; + sha256 = "4a3722945f26df087158a5af69cc81ba10054a778f04fecd32ff816732dff0dd"; + name = "ktimer-20.08.0.tar.xz"; }; }; ktnef = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktnef-20.04.3.tar.xz"; - sha256 = "31f5f15ab27112f99ab7b2575a4f90bf612b99a3816544e6919ad4c5a2dc7145"; - name = "ktnef-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktnef-20.08.0.tar.xz"; + sha256 = "69d18a052cc522161821f98fb4103d38e1ff566622915b7138866e7737ffa62f"; + name = "ktnef-20.08.0.tar.xz"; }; }; ktouch = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktouch-20.04.3.tar.xz"; - sha256 = "7f1c456ae758a6e7eb58e83120289fa8eb5c56c3c98cd9c9f974cea5dd156ea8"; - name = "ktouch-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktouch-20.08.0.tar.xz"; + sha256 = "c4b218f672c0cb86930cdadf622d758a42b54732319e8ea86405b7f9b3281802"; + name = "ktouch-20.08.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-accounts-kcm-20.04.3.tar.xz"; - sha256 = "d45588dbd1441ccb0576e7f76489217351bad5fd25d4636ae9da6f81654f5f4b"; - name = "ktp-accounts-kcm-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-accounts-kcm-20.08.0.tar.xz"; + sha256 = "912552aa0df62298323c5eaaf36975b71ef50be56a5b69ceddcd5f00d4acb4f9"; + name = "ktp-accounts-kcm-20.08.0.tar.xz"; }; }; ktp-approver = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-approver-20.04.3.tar.xz"; - sha256 = "9c91d44476151f39ef02e2eeede7dee7f24689643a07d51d44ca8d98577d24a2"; - name = "ktp-approver-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-approver-20.08.0.tar.xz"; + sha256 = "463a9009599b6e18b2e30793b6bce408e4c9a0edb2de458fb588204eb0aa2f3a"; + name = "ktp-approver-20.08.0.tar.xz"; }; }; ktp-auth-handler = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-auth-handler-20.04.3.tar.xz"; - sha256 = "6c73960c44ff42e8c0b6be54b308fc992ab8177f90954ebd960ea6d610e14568"; - name = "ktp-auth-handler-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-auth-handler-20.08.0.tar.xz"; + sha256 = "d2f1dd4c5f4043eebeb178dd20eedc95dea47a4c75f2df13cd1d9cd0288b699a"; + name = "ktp-auth-handler-20.08.0.tar.xz"; }; }; ktp-call-ui = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-call-ui-20.04.3.tar.xz"; - sha256 = "b997c6252c35f7e295f2389ac76c5dc12227e8a6bbfd1b42d72b622d488bcf98"; - name = "ktp-call-ui-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-call-ui-20.08.0.tar.xz"; + sha256 = "2744e739456fd3aba322eb3c47be84511450dd713838e133be4f1957a3b9a0bf"; + name = "ktp-call-ui-20.08.0.tar.xz"; }; }; ktp-common-internals = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-common-internals-20.04.3.tar.xz"; - sha256 = "0e7a1c61869d297831615c719e5c79f2b00a6572479d2c2eaca642de6d376efd"; - name = "ktp-common-internals-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-common-internals-20.08.0.tar.xz"; + sha256 = "9ee962e2afd5db0fc23da69468f008ff239e97ef77d8930f7e5960d732d8a4b2"; + name = "ktp-common-internals-20.08.0.tar.xz"; }; }; ktp-contact-list = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-contact-list-20.04.3.tar.xz"; - sha256 = "c909e21fb168c14c61d1d617b6854ff505eaf4693479d8d0bba746fde0ee11af"; - name = "ktp-contact-list-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-contact-list-20.08.0.tar.xz"; + sha256 = "ec00bf525450c972634e60dfb423f9cd2be7caa4181e84efa7d88fc6f079a995"; + name = "ktp-contact-list-20.08.0.tar.xz"; }; }; ktp-contact-runner = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-contact-runner-20.04.3.tar.xz"; - sha256 = "cb3313ca916a7e3fff78529ccc4a499763766957d22f65dee9663cd950c2b4a6"; - name = "ktp-contact-runner-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-contact-runner-20.08.0.tar.xz"; + sha256 = "1123adbdfdbdb8bb524ba39ab175f39964cef2ecf5eed9a0a1d0129d7ae8ecbc"; + name = "ktp-contact-runner-20.08.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-desktop-applets-20.04.3.tar.xz"; - sha256 = "40f1125d4d91e2586d06d45b59d12ac19ee93aaae8c3d4df75db196f7e91e875"; - name = "ktp-desktop-applets-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-desktop-applets-20.08.0.tar.xz"; + sha256 = "6a6eb5090f6273abb9ff1b70777c32bd4ba5fd0d270dfa0490ac370c31d0cab5"; + name = "ktp-desktop-applets-20.08.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-filetransfer-handler-20.04.3.tar.xz"; - sha256 = "74df7140bac0b87e3ff39e8ab692bb4c65a10612f328c8d60a84433ae865de52"; - name = "ktp-filetransfer-handler-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-filetransfer-handler-20.08.0.tar.xz"; + sha256 = "df16a920a233eaec25c73514e951f5f569a0f0f6d4ba46b60a0c2bc3da4ab6cd"; + name = "ktp-filetransfer-handler-20.08.0.tar.xz"; }; }; ktp-kded-module = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-kded-module-20.04.3.tar.xz"; - sha256 = "972a4a5d7108351a07be670654b4e78dfe9fb7657336c563040e1e831134aad2"; - name = "ktp-kded-module-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-kded-module-20.08.0.tar.xz"; + sha256 = "f321a7db60b0fcd9dd207c38c8097e6cdb3a22aba6730bc03f9ea67bc8d9bb2e"; + name = "ktp-kded-module-20.08.0.tar.xz"; }; }; ktp-send-file = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-send-file-20.04.3.tar.xz"; - sha256 = "fa67edd7ec516ed727d5df0d30ccf6b990cee40f8062a9966a8643d6f26c8344"; - name = "ktp-send-file-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-send-file-20.08.0.tar.xz"; + sha256 = "86d3ca20eb3c3fbfa169a355c0e64d1574433c6985d5188697ef18e521d82104"; + name = "ktp-send-file-20.08.0.tar.xz"; }; }; ktp-text-ui = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-text-ui-20.04.3.tar.xz"; - sha256 = "be6253246134aa6513b0ff36d25a833d469e6850da1f5c8c05666a555bbfd9b2"; - name = "ktp-text-ui-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-text-ui-20.08.0.tar.xz"; + sha256 = "a1f5c4c98761f61abd62b6e788a8ec5c4e2b4020e92f3c0c75770c0f01386676"; + name = "ktp-text-ui-20.08.0.tar.xz"; }; }; ktuberling = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktuberling-20.04.3.tar.xz"; - sha256 = "0fb7ef29c5bf02de56243e608a050fce992df56586d305a157ed3ac70f002a44"; - name = "ktuberling-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktuberling-20.08.0.tar.xz"; + sha256 = "8d56e4330b68d8597d502db311282a9d59f8ad91f8acfa7f029d354ac399b702"; + name = "ktuberling-20.08.0.tar.xz"; }; }; kturtle = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kturtle-20.04.3.tar.xz"; - sha256 = "e04034812c62e22be0ee7eb91d89a9e0e0c73bb5cba8e914373f407c99e8c0cb"; - name = "kturtle-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kturtle-20.08.0.tar.xz"; + sha256 = "9c086a0aec74d9d5aa5792f026e6b44b8fdc613cfdeba060fb4694fb3e9b27f9"; + name = "kturtle-20.08.0.tar.xz"; }; }; kubrick = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kubrick-20.04.3.tar.xz"; - sha256 = "983310938ad0437902d886f433b0693a3a08faaca0f5553a3aa24e89e3215fb9"; - name = "kubrick-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kubrick-20.08.0.tar.xz"; + sha256 = "2cf725a96d52d7be157690fb9ce6fe0dcc2cb853fe6e1f9d56ae6c23c09974cc"; + name = "kubrick-20.08.0.tar.xz"; }; }; kwalletmanager = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kwalletmanager-20.04.3.tar.xz"; - sha256 = "3821d17f5238bd51b9d19ef5974e063aa6426f35afcd0cffa89af109c770151e"; - name = "kwalletmanager-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kwalletmanager-20.08.0.tar.xz"; + sha256 = "4dea2e1b08cc996d6d4961393d9c8f24051b0a7f6373c4cf575ddf8324804b7a"; + name = "kwalletmanager-20.08.0.tar.xz"; }; }; kwave = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kwave-20.04.3.tar.xz"; - sha256 = "111ea78c90371f566500e88d746812b17875e154e431b3694e3d226f3f19e988"; - name = "kwave-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kwave-20.08.0.tar.xz"; + sha256 = "7291122e5112eea9b8026937682f77d78e43153c4dc38005ac31fd7235a18e69"; + name = "kwave-20.08.0.tar.xz"; }; }; kwordquiz = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kwordquiz-20.04.3.tar.xz"; - sha256 = "464684309e098c4e8663d39cd98f53a640a93e1d8ac169a2a0ac3cc98d7f8e12"; - name = "kwordquiz-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kwordquiz-20.08.0.tar.xz"; + sha256 = "c8350fcf5b4ed61a43d3d72aabfef645e7d1908ef753df36c0124601873b4951"; + name = "kwordquiz-20.08.0.tar.xz"; }; }; libgravatar = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libgravatar-20.04.3.tar.xz"; - sha256 = "0a5eadd5c8492eb17225e0ff2d221f69231e72ca9b8a78080301639662a18acf"; - name = "libgravatar-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libgravatar-20.08.0.tar.xz"; + sha256 = "9faf1ab53cebf2f54fb851ec5bcffc65b18a846a50e3d890b66b947ab93d6397"; + name = "libgravatar-20.08.0.tar.xz"; }; }; libkcddb = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkcddb-20.04.3.tar.xz"; - sha256 = "d205d3a458c0d54d7118e36006710fe2d2993de5b417c9d8936762fa710634b4"; - name = "libkcddb-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkcddb-20.08.0.tar.xz"; + sha256 = "516723e29ae37c84865eaf86f82481c4275ea8507e172fc8a0279572705fbc6a"; + name = "libkcddb-20.08.0.tar.xz"; }; }; libkcompactdisc = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkcompactdisc-20.04.3.tar.xz"; - sha256 = "5bc98eba521f66cb52645786cf875037397e4dbd3ec4c9a23687d936d1505d24"; - name = "libkcompactdisc-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkcompactdisc-20.08.0.tar.xz"; + sha256 = "043a0ca6dd5d85b4313495d0ae530fe96448da2f472a8af2a633d646be0c065c"; + name = "libkcompactdisc-20.08.0.tar.xz"; }; }; libkdcraw = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkdcraw-20.04.3.tar.xz"; - sha256 = "e37e9210a250955d1fe63d2d96571d0630572633e567eb047af9f24db2b86cb5"; - name = "libkdcraw-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkdcraw-20.08.0.tar.xz"; + sha256 = "8e2e1577a751eb0c570e5f6ad394d459ef3d127ee8950eee25a4ebf62a2eece7"; + name = "libkdcraw-20.08.0.tar.xz"; }; }; libkdegames = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkdegames-20.04.3.tar.xz"; - sha256 = "fda965e2ff166abe89cf008a5160262f061a6c3aeda4a71a834b5ed66ea6d0be"; - name = "libkdegames-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkdegames-20.08.0.tar.xz"; + sha256 = "d77f5e2d913c68286014fe1438b9909826931aaa944a0ce1753d1a449766d99c"; + name = "libkdegames-20.08.0.tar.xz"; }; }; libkdepim = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkdepim-20.04.3.tar.xz"; - sha256 = "f4ecc6d33aace0a0025afe390a113f79bb052b816c567ea31996aaf08fe873ea"; - name = "libkdepim-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkdepim-20.08.0.tar.xz"; + sha256 = "4f5f0688529d13c10c1c3509f64874a069a5d6cae84f81b258b1d081e86771e0"; + name = "libkdepim-20.08.0.tar.xz"; }; }; libkeduvocdocument = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkeduvocdocument-20.04.3.tar.xz"; - sha256 = "a53e17a84420fca8f9572d8439da2c63d1241a607952454003a4020104a25558"; - name = "libkeduvocdocument-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkeduvocdocument-20.08.0.tar.xz"; + sha256 = "21ee64628a012478eb8c53ce2374a57d587f6160f32f09231c78e9fac7600d5d"; + name = "libkeduvocdocument-20.08.0.tar.xz"; }; }; libkexiv2 = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkexiv2-20.04.3.tar.xz"; - sha256 = "12fa569aca07269e880bd976a6cc37b4f585fe2aac8837d437bc29999d95f6be"; - name = "libkexiv2-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkexiv2-20.08.0.tar.xz"; + sha256 = "d4e3fcdaf160c70165b1217931484d544d56ca7630d5f2c85484caebb2afe399"; + name = "libkexiv2-20.08.0.tar.xz"; }; }; libkgapi = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkgapi-20.04.3.tar.xz"; - sha256 = "9b689d8c4a1df0b792604cf5951b30d8343e984d890f4a3fb946a449723e520d"; - name = "libkgapi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkgapi-20.08.0.tar.xz"; + sha256 = "215d21a89887522bbac09774723098dac1602bfc39e4ca23306d08b11d0cd89d"; + name = "libkgapi-20.08.0.tar.xz"; }; }; libkgeomap = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkgeomap-20.04.3.tar.xz"; - sha256 = "34e41b2505a34355a31a548bb8f94955b3dc4391c71201164574ff45b532818d"; - name = "libkgeomap-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkgeomap-20.08.0.tar.xz"; + sha256 = "bf39da71ec7cc40e536bf071abda61569acec4ae027d896738ae1ace74eaddf7"; + name = "libkgeomap-20.08.0.tar.xz"; }; }; libkipi = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkipi-20.04.3.tar.xz"; - sha256 = "4a72f0d1423a6a6f7017bf0598c99261575feb4d9af73520074f6f0b7f9e4c25"; - name = "libkipi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkipi-20.08.0.tar.xz"; + sha256 = "2a66512b9c840e7e19f943066197a4ef68aea8cd059427732dec9cf5de84294e"; + name = "libkipi-20.08.0.tar.xz"; }; }; libkleo = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkleo-20.04.3.tar.xz"; - sha256 = "ef2a37a1c8793e4c89dcf49bc330044a617b4b04472679b179992b188e412c50"; - name = "libkleo-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkleo-20.08.0.tar.xz"; + sha256 = "44100f7a001ca7eb8cc4b2b9eeab5e8806a5d4eb2a01a69eeaf1843f4e023f85"; + name = "libkleo-20.08.0.tar.xz"; }; }; libkmahjongg = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkmahjongg-20.04.3.tar.xz"; - sha256 = "24fcff9d91c5143c7275c5c97c2be32e85f5c788749df3acc841fd28bee450a0"; - name = "libkmahjongg-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkmahjongg-20.08.0.tar.xz"; + sha256 = "1792a04f59fe188a7707c0f77e9ef598e9dfb6444c7aba574a4a46760aeaf63a"; + name = "libkmahjongg-20.08.0.tar.xz"; }; }; libkomparediff2 = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkomparediff2-20.04.3.tar.xz"; - sha256 = "e27a5fd3dd80a9c7c052ec3c824acc529073464788d1c6950d4d2c407b74c0b0"; - name = "libkomparediff2-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkomparediff2-20.08.0.tar.xz"; + sha256 = "0571d016675496341d6e841d88b2ff8682b2958d91a38a69a6130a0766ff6a1b"; + name = "libkomparediff2-20.08.0.tar.xz"; }; }; libksane = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libksane-20.04.3.tar.xz"; - sha256 = "34827bcc5b9277292dd4434f2bf7610a28d54c86565f0410d4470c61f374c46e"; - name = "libksane-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libksane-20.08.0.tar.xz"; + sha256 = "536e0f914095ddfeee132e227d9d2a840186da512b82d95fc9a7262a3a912ea6"; + name = "libksane-20.08.0.tar.xz"; }; }; libksieve = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libksieve-20.04.3.tar.xz"; - sha256 = "8aacc0c41ac2b7bf48c8479c8fba581a325828b907053eba6b9b5ff4c63d0529"; - name = "libksieve-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libksieve-20.08.0.tar.xz"; + sha256 = "af6b4a1b787efdf20792a8ded6ae4d8f49d4cef129b4b3fd7048441bb879b586"; + name = "libksieve-20.08.0.tar.xz"; }; }; lokalize = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/lokalize-20.04.3.tar.xz"; - sha256 = "fccba64af9faa5cbb5dfdb303009504993fe71282f0dbc9c748c5a28a327c379"; - name = "lokalize-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/lokalize-20.08.0.tar.xz"; + sha256 = "dd05509386b816aeb02797769c28e12cf8b3f38d88f722a699a77db94c9ab71e"; + name = "lokalize-20.08.0.tar.xz"; }; }; lskat = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/lskat-20.04.3.tar.xz"; - sha256 = "b7e33cc8097ee4bf4e5182a2a5db1e142c65b119424079f5e7f179720092815b"; - name = "lskat-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/lskat-20.08.0.tar.xz"; + sha256 = "9a6af851f0fb0b7e6f6d1983bf3c7f12a74022977e879a525424d2867762b471"; + name = "lskat-20.08.0.tar.xz"; }; }; mailcommon = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/mailcommon-20.04.3.tar.xz"; - sha256 = "80b6285c8152a64362f5f406b4a766b0937ff29acf87133b0326b6e7ce66809f"; - name = "mailcommon-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/mailcommon-20.08.0.tar.xz"; + sha256 = "fa110a41d5e4848d203d3c17fe18c584d892bf78f750c36a5e88a80c80dcd04a"; + name = "mailcommon-20.08.0.tar.xz"; }; }; mailimporter = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/mailimporter-20.04.3.tar.xz"; - sha256 = "13a95ee3d89d658222dcdc905311c72b1ba04e6b8aac863dee767a4d72d3d54e"; - name = "mailimporter-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/mailimporter-20.08.0.tar.xz"; + sha256 = "5263fdc50b772458cb584f799f80da765e0ac3c4f2e0fecee15305db829cd851"; + name = "mailimporter-20.08.0.tar.xz"; }; }; marble = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/marble-20.04.3.tar.xz"; - sha256 = "9c0b6fb13d53e1748de081c43e06cc132d5b07d46e594443b207fbaf74e1f95b"; - name = "marble-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/marble-20.08.0.tar.xz"; + sha256 = "0f61c29acc3f88a0eeb0e0923f8c5138188712aad6aa4d9445add186d5962381"; + name = "marble-20.08.0.tar.xz"; }; }; mbox-importer = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/mbox-importer-20.04.3.tar.xz"; - sha256 = "ce208091272052a909521cda31a74b2f4c8e8fabcb2937c24639673d1f43981d"; - name = "mbox-importer-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/mbox-importer-20.08.0.tar.xz"; + sha256 = "075afd543bec9c8c2d056b96704fbfd2fbc4498b289596d4fbb0cd49ff5c720b"; + name = "mbox-importer-20.08.0.tar.xz"; }; }; messagelib = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/messagelib-20.04.3.tar.xz"; - sha256 = "aa2c254f50ed4664b67df5857bba063d1400fe280f3a58658cfa59d3155b2adf"; - name = "messagelib-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/messagelib-20.08.0.tar.xz"; + sha256 = "13aa522b8ff8cf2d7ac7ca6ae4c92e1bd2379d13fc23cabaa36fd6d6bda261cd"; + name = "messagelib-20.08.0.tar.xz"; }; }; minuet = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/minuet-20.04.3.tar.xz"; - sha256 = "9afb598280a9b90013833005299fb0c33c3c7cc02b687f65616e04dc12e21d41"; - name = "minuet-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/minuet-20.08.0.tar.xz"; + sha256 = "f3e57e225ec6a0515d39bf868cdd934a6823071527f6da9910b839abc96c8fdb"; + name = "minuet-20.08.0.tar.xz"; }; }; okular = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/okular-20.04.3.tar.xz"; - sha256 = "60865a5d09f41d30572b72224fb61baf9dde18cf6e246565d852e672e7bc4cfe"; - name = "okular-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/okular-20.08.0.tar.xz"; + sha256 = "8d775292cc6b2cb703e5ff716337a49352cd6d3faa90d6d7ac2f4e9d006a4047"; + name = "okular-20.08.0.tar.xz"; }; }; palapeli = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/palapeli-20.04.3.tar.xz"; - sha256 = "8ae05cce4a1ccb5226c9895195c47825054363a127905dacd5b25fc2a4df3828"; - name = "palapeli-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/palapeli-20.08.0.tar.xz"; + sha256 = "bbbf4d6c0a2048e2bb5e2483acf1970748d9f109e25f3c5cbf6f04709a61aeab"; + name = "palapeli-20.08.0.tar.xz"; }; }; parley = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/parley-20.04.3.tar.xz"; - sha256 = "b5e74fbd458824d26c0ea7cb8ed5510e3f6e849c9dbda4bc7804b9b95a64da03"; - name = "parley-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/parley-20.08.0.tar.xz"; + sha256 = "b1c8d5f39a563ddcc6a00a7e1008608bd58bdcdfc23c11c822b15625f5a48d60"; + name = "parley-20.08.0.tar.xz"; }; }; picmi = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/picmi-20.04.3.tar.xz"; - sha256 = "57406f820d58132602b3e6524bad2d7aba3466f7c1a78a623077e7df5faf6838"; - name = "picmi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/picmi-20.08.0.tar.xz"; + sha256 = "5003bcf33c08eebe24fb689790aef56eb418990a7c6588e2bd1c94ec6f398a5a"; + name = "picmi-20.08.0.tar.xz"; }; }; pimcommon = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/pimcommon-20.04.3.tar.xz"; - sha256 = "a5d295f7174cafeb27bc1aed03a715525b132f9dca734a183dd705a2c7ffa40b"; - name = "pimcommon-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/pimcommon-20.08.0.tar.xz"; + sha256 = "4280d7116d392dff4febbadbca6fa20c38b787da7af537ce4e64af28509bd82e"; + name = "pimcommon-20.08.0.tar.xz"; }; }; pim-data-exporter = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/pim-data-exporter-20.04.3.tar.xz"; - sha256 = "742727f09c984ff86f0406fa756b8ab50e695d6bd8a10abd7d55950c1c2c10de"; - name = "pim-data-exporter-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/pim-data-exporter-20.08.0.tar.xz"; + sha256 = "42f070d3aea3871004bea3fa712f01ef307ba12328495ded06d3115e7e8ed894"; + name = "pim-data-exporter-20.08.0.tar.xz"; }; }; pim-sieve-editor = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/pim-sieve-editor-20.04.3.tar.xz"; - sha256 = "e59c4eee3f7548fc724f7b79cbff2f90c10be92eb0cab7259dd57fd221f2b7dc"; - name = "pim-sieve-editor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/pim-sieve-editor-20.08.0.tar.xz"; + sha256 = "65167f716ce2cc70a4ccbf7f9a5b2a873f36df54984dcc46af1d5694973e709a"; + name = "pim-sieve-editor-20.08.0.tar.xz"; }; }; poxml = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/poxml-20.04.3.tar.xz"; - sha256 = "a070eb5c12e14df691648a9a3e482c021c484f59dfaac413eeacc002cdc1833a"; - name = "poxml-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/poxml-20.08.0.tar.xz"; + sha256 = "07f5e8f0b215d864d48523c9a1b689f7434dfc0a561d5cf253ad69698770e096"; + name = "poxml-20.08.0.tar.xz"; }; }; print-manager = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/print-manager-20.04.3.tar.xz"; - sha256 = "9d877925cafdf7dfa0dcce5694f849b13ca8bb7c4552a800eebd26a3fc42d376"; - name = "print-manager-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/print-manager-20.08.0.tar.xz"; + sha256 = "6fe74bc4555f92b7d372d01878cbf25b4339f3f0047b52bd0c92571a2b835271"; + name = "print-manager-20.08.0.tar.xz"; }; }; rocs = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/rocs-20.04.3.tar.xz"; - sha256 = "1620ff8360568ab4201d526ea4489bd672f6715b6d200251d63ed139dcc58a94"; - name = "rocs-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/rocs-20.08.0.tar.xz"; + sha256 = "447fecd5e87171cae444e70146b5ce99ac94a558db5f7e1ff9053c31953ba48e"; + name = "rocs-20.08.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/signon-kwallet-extension-20.04.3.tar.xz"; - sha256 = "a391ceff9c86f2e3d8a74a26ffb4143d0adffc8669a51a019d39f16a8e207c1c"; - name = "signon-kwallet-extension-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/signon-kwallet-extension-20.08.0.tar.xz"; + sha256 = "ec65a9b05dd014ec541ba87e39b6ae8a7af8bf4017f58c7b566960e452f99493"; + name = "signon-kwallet-extension-20.08.0.tar.xz"; }; }; spectacle = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/spectacle-20.04.3.tar.xz"; - sha256 = "71e852aceaac1dc76cd9aa4aa8284ced1c149d7374d9e06f996f4259a72ccbd6"; - name = "spectacle-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/spectacle-20.08.0.tar.xz"; + sha256 = "8712c8fc19bc2cc39c5e51cf62dedfba423ad53225b629d667d7ffb8d3900692"; + name = "spectacle-20.08.0.tar.xz"; }; }; step = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/step-20.04.3.tar.xz"; - sha256 = "89d7e29b6e5f888886022701cbfd628c322daa3da43dda4c3fd90d1a137aa29d"; - name = "step-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/step-20.08.0.tar.xz"; + sha256 = "8415f807de351b85bc3c4feb9ac45b01300210b9517987c617cd49ba6d472418"; + name = "step-20.08.0.tar.xz"; }; }; svgpart = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/svgpart-20.04.3.tar.xz"; - sha256 = "2ffb67858ac5c01f5bb5d4728526786c5b6b6a8b70d688123c52efa084fae1b4"; - name = "svgpart-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/svgpart-20.08.0.tar.xz"; + sha256 = "3ebb9140ac13c7ece171622ead8c7fd1b1128cccde9635cbc912ca7f8da767a7"; + name = "svgpart-20.08.0.tar.xz"; }; }; sweeper = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/sweeper-20.04.3.tar.xz"; - sha256 = "16b247b9e3f3d3497f31f9dcb91ff06725a07f0f56a934fdf1ecf1af1ab1b426"; - name = "sweeper-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/sweeper-20.08.0.tar.xz"; + sha256 = "b0d7b983a5bb8ceb2454863181c6a2d55c42114f58f66241f46c3365d90a52ec"; + name = "sweeper-20.08.0.tar.xz"; }; }; umbrello = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/umbrello-20.04.3.tar.xz"; - sha256 = "c34a5f6ca945dd409921903abd2e0078b6a056a0d221d59674980ce424cf1e62"; - name = "umbrello-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/umbrello-20.08.0.tar.xz"; + sha256 = "49e9f7e0748b8f103f72bbc3fbe0ab7b3605646b5024512118dd9beafd64a041"; + name = "umbrello-20.08.0.tar.xz"; }; }; yakuake = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/yakuake-20.04.3.tar.xz"; - sha256 = "62466165becc848d05461f7b12b67615a517d2919b6fccd8441dfeed9a0a04fa"; - name = "yakuake-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/yakuake-20.08.0.tar.xz"; + sha256 = "1c13334e0e4c1a6a3f8e11ed6cd05b2cecdd0eb29201c41bd26ca62e22cc084a"; + name = "yakuake-20.08.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/zeroconf-ioslave-20.04.3.tar.xz"; - sha256 = "3b2ac8833499a53a78547ae34be4a29a6cb79d54601a8c638b225f1c2059d9f0"; - name = "zeroconf-ioslave-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/zeroconf-ioslave-20.08.0.tar.xz"; + sha256 = "78bdd0b377132abf30f1ed40c15eae3f0726d7075b311c3b23c71ad59725dc22"; + name = "zeroconf-ioslave-20.08.0.tar.xz"; }; }; } From db5543363823d2b23e1fc2ae37d5791d8c173755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Fri, 21 Aug 2020 11:47:06 +0200 Subject: [PATCH 080/688] orca: 3.36.4 -> 3.36.5 --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 77c1f67ecf0c..ccb7f3e47c86 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.36.4"; + version = "3.36.5"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1s6qrmbn3pywidwwfa24ly21c1cz6fnnsipi9vlp3sxswbdcwiwz"; + sha256 = "0nyb33p4y6nmln41pi70c8hiyjyasaryy10mazi7b2s6fy9pk25x"; }; patches = [ From 772adad3b1bebd6878ef250e50c2dfe65f34b8c3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 21 Aug 2020 22:30:12 +0800 Subject: [PATCH 081/688] krunner: unbreak it --- pkgs/development/libraries/kde-frameworks/krunner.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index 7dd91ffb247d..990c3c4fdf9b 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -9,13 +9,6 @@ let self = mkDerivation { name = "krunner"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = [ - # Un-deprecate virtual method to restore binary compatibility. - (assert !(lib.versionOlder "5.72" self.version); fetchpatch { - url = "https://invent.kde.org/frameworks/krunner/-/commit/8f7ce559b84ee0c21de0256e6591793e4b95f411.diff"; - sha256 = "124xqxpgmc5fdn1mcf8x1564pqc5y81j7lhzcirql2xcs0sbcyby"; - }) - ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons ki18n kio kservice qtdeclarative solid From 381667a4b3ca6a5a3568b64691a279003d35fa6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 6 Apr 2020 23:49:47 +0200 Subject: [PATCH 082/688] plasma5: 5.17.5 -> 5.18.5 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- .../plasma-5/kde-gtk-config/default.nix | 1 - .../patches/follow-symlinks.patch | 49 --- .../kde-gtk-config/patches/gsettings.patch | 21 - .../plasma-5/kde-gtk-config/patches/series | 2 - pkgs/desktops/plasma-5/kscreen-417316.patch | 76 ---- pkgs/desktops/plasma-5/kscreen.nix | 5 +- .../plasma-desktop/hwclock-path.patch | 2 +- .../plasma-workspace/0001-startkde.patch | 39 +- .../0002-absolute-wallpaper-install-dir.patch | 13 +- .../plasma-5/plasma-workspace/default.nix | 1 - pkgs/desktops/plasma-5/srcs.nix | 386 +++++++++--------- .../plasma-5/xdg-desktop-portal-kde.nix | 4 +- 13 files changed, 226 insertions(+), 375 deletions(-) delete mode 100644 pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch delete mode 100644 pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch delete mode 100644 pkgs/desktops/plasma-5/kde-gtk-config/patches/series delete mode 100644 pkgs/desktops/plasma-5/kscreen-417316.patch diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index d871ceb28757..abb5659526f7 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.17.5/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.18.5/ ) diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 8cfc947d30bd..1320028ee8ed 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -13,7 +13,6 @@ mkDerivation { ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes knewstuff gsettings-desktop-schemas ]; - patches = [ ./patches/follow-symlinks.patch ./patches/gsettings.patch ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch b/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch deleted file mode 100644 index f30a0a4588fa..000000000000 --- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 27 Oct 2015 18:07:54 -0500 -Subject: [PATCH] follow symlinks - ---- - src/appearancegtk2.cpp | 2 +- - src/iconthemesmodel.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: kde-gtk-config-5.12.4/src/appearancegtk2.cpp -=================================================================== ---- kde-gtk-config-5.12.4.orig/src/appearancegtk2.cpp -+++ kde-gtk-config-5.12.4/src/appearancegtk2.cpp -@@ -69,7 +69,7 @@ QString AppearanceGTK2::themesGtkrcFile( - QStringList themes=installedThemes(); - themes=themes.filter(QRegExp("/"+themeName+"/?$")); - if(themes.size()==1) { -- QDirIterator it(themes.first(), QDirIterator::Subdirectories); -+ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while(it.hasNext()) { - it.next(); - if(it.fileName()=="gtkrc") { -Index: kde-gtk-config-5.12.4/src/iconthemesmodel.cpp -=================================================================== ---- kde-gtk-config-5.12.4.orig/src/iconthemesmodel.cpp -+++ kde-gtk-config-5.12.4/src/iconthemesmodel.cpp -@@ -47,7 +47,7 @@ QList IconThemesModel::installedTh - - foreach(const QString& dir, dirs) { - QDir userIconsDir(dir); -- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks); -+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs); - while(it.hasNext()) { - QString currentPath = it.next(); - QDir dir(currentPath); -Index: kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp -=================================================================== ---- kde-gtk-config-5.12.4.orig/src/cursorthemesmodel.cpp -+++ kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp -@@ -47,7 +47,7 @@ QList CursorThemesModel::installed - - foreach(const QString& dir, dirs) { - QDir userIconsDir(dir); -- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks); -+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs); - while(it.hasNext()) { - QString currentPath = it.next(); - QDir dir(currentPath); diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch b/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch deleted file mode 100644 index 69f7bc4e56a0..000000000000 --- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp -index 7b82d50..96831d8 100644 ---- a/src/gtkconfigkcmodule.cpp -+++ b/src/gtkconfigkcmodule.cpp -@@ -91,6 +91,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args ) - iconsProxyModel->sort(0); - ui->cb_icon->setModel(iconsProxyModel); - ui->cb_icon_fallback->setModel(iconsProxyModel); -+ -+ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS. -+ // Normally this would be done by wrapGAppsHook, but this plugin -+ // (shared object) cannot be wrapped. -+ QByteArray xdgdata = qgetenv("XDG_DATA_DIRS"); -+ if (!xdgdata.isEmpty()) { -+ xdgdata.push_front(":"); -+ } -+ xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH)); -+ qputenv("XDG_DATA_DIRS", xdgdata); - - m_tempGtk2Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/gtkrc-2.0"; - m_tempGtk3Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/.config/gtk-3.0/settings.ini"; diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/series b/pkgs/desktops/plasma-5/kde-gtk-config/patches/series deleted file mode 100644 index 7aad1acf6ac4..000000000000 --- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -follow-symlinks.patch -gsettings.patch diff --git a/pkgs/desktops/plasma-5/kscreen-417316.patch b/pkgs/desktops/plasma-5/kscreen-417316.patch deleted file mode 100644 index 92b347e2dbfc..000000000000 --- a/pkgs/desktops/plasma-5/kscreen-417316.patch +++ /dev/null @@ -1,76 +0,0 @@ -https://phabricator.kde.org/file/data/dyr2qr4wrhxg4eahkgd3/PHID-FILE-7d4og3zr4mk53u6lzkk2/D27442.diff -https://bugs.kde.org/show_bug.cgi?id=417316 - -diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml kscreen-5.17.5/kcm/package/contents/ui/main.qml ---- kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml 2020-01-07 16:28:39.000000000 +0100 -+++ kscreen-5.17.5/kcm/package/contents/ui/main.qml 2020-04-03 17:54:26.097809557 +0200 -@@ -24,8 +24,8 @@ - KCM.SimpleKCM { - id: root - -- implicitWidth: units.gridUnit * 30 -- implicitHeight: units.gridUnit * 38 -+ implicitWidth: Kirigami.Units.gridUnit * 32 -+ implicitHeight: Kirigami.Units.gridUnit * 38 - - property int selectedOutput: 0 - -@@ -113,7 +113,7 @@ - id: screen - - Layout.alignment: Qt.AlignHCenter -- Layout.preferredWidth: Math.max(root.width * 0.8, units.gridUnit * 26) -+ Layout.preferredWidth: Math.max(root.width * 0.8, Kirigami.Units.gridUnit * 26) - Layout.topMargin: Kirigami.Units.smallSpacing - Layout.bottomMargin: Kirigami.Units.largeSpacing * 2 - -diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml kscreen-5.17.5/kcm/package/contents/ui/Output.qml ---- kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml 2020-01-07 16:28:39.000000000 +0100 -+++ kscreen-5.17.5/kcm/package/contents/ui/Output.qml 2020-04-03 17:53:22.491686708 +0200 -@@ -19,6 +19,7 @@ - import QtQuick.Layouts 1.1 - import QtQuick.Controls 2.3 as Controls - import QtGraphicalEffects 1.0 -+import org.kde.kirigami 2.4 as Kirigami - - Rectangle { - id: output -@@ -77,7 +78,7 @@ - - Controls.Label { - Layout.fillWidth: true -- Layout.margins: units.smallSpacing -+ Layout.margins: Kirigami.Units.smallSpacing - - text: model.display - wrapMode: Text.Wrap -@@ -87,7 +88,7 @@ - - Controls.Label { - Layout.fillWidth: true -- Layout.bottomMargin: units.smallSpacing -+ Layout.bottomMargin: Kirigami.Units.smallSpacing - - text: "(" + model.size.width + "x" + model.size.height + ")" - horizontalAlignment: Text.AlignHCenter -diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml kscreen-5.17.5/kcm/package/contents/ui/Screen.qml ---- kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml 2020-01-07 16:28:39.000000000 +0100 -+++ kscreen-5.17.5/kcm/package/contents/ui/Screen.qml 2020-04-03 17:53:22.491686708 +0200 -@@ -45,7 +45,7 @@ - property int xOffset: (width - totalSize.width / relativeFactor) / 2; - property int yOffset: (height - totalSize.height / relativeFactor) / 2; - -- implicitHeight: Math.max(root.height * 0.4, units.gridUnit * 13) -+ implicitHeight: Math.max(root.height * 0.4, Kirigami.Units.gridUnit * 13) - - Component.onCompleted: background.visible = true; - -@@ -54,7 +54,7 @@ - anchors { - bottom: parent.bottom - horizontalCenter: parent.horizontalCenter -- margins: units.smallSpacing -+ margins: Kirigami.Units.smallSpacing - } - spacing: units.smallSpacing - Controls.Button { diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 2f37c4212da4..11b0f38fed05 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -2,17 +2,16 @@ mkDerivation, extra-cmake-modules, kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, - kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, + kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors, kwindowsystem, kdeclarative, plasma-framework }: mkDerivation { name = "kscreen"; - patches = [ ./kscreen-417316.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n - kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects + kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors kwindowsystem kdeclarative plasma-framework ]; } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch index a46212af10fb..6c04081ae29a 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch +++ b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch @@ -17,7 +17,7 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp void ClockHelper::toHwclock() { -- QString hwclock = KStandardDirs::findExe(QStringLiteral("hwclock"), exePath); +- QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':'))); + QString hwclock = QLatin1String(NIXPKGS_HWCLOCK); if (!hwclock.isEmpty()) { KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc")); diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch index d230e1270bea..120800926296 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch @@ -1,4 +1,4 @@ -From 1796822e4c97062b919a596ce13db68e2c46c7e8 Mon Sep 17 00:00:00 2001 +From 6477e377fcca39c07ef5f91a55084d7d74715d00 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Jan 2020 05:00:53 -0600 Subject: [PATCH 1/2] startkde @@ -6,11 +6,11 @@ Subject: [PATCH 1/2] startkde --- startkde/startplasma-waylandsession.cpp | 2 +- startkde/startplasma-x11.cpp | 2 +- - startkde/startplasma.cpp | 32 ++++++++----------------- - 3 files changed, 12 insertions(+), 24 deletions(-) + startkde/startplasma.cpp | 24 ++++++++++-------------- + 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp -index 87c71c6..5fc5314 100644 +index 87c71c6b3..5fc53140e 100644 --- a/startkde/startplasma-waylandsession.cpp +++ b/startkde/startplasma-waylandsession.cpp @@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/) @@ -23,7 +23,7 @@ index 87c71c6..5fc5314 100644 cleanupX11(); out << "startplasma-waylandsession: Done.\n"; diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp -index 3314b62..14cbe29 100644 +index 3314b6283..14cbe29fa 100644 --- a/startkde/startplasma-x11.cpp +++ b/startkde/startplasma-x11.cpp @@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/) @@ -36,7 +36,7 @@ index 3314b62..14cbe29 100644 cleanupPlasmaEnvironment(); cleanupX11(); diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index e0f7004..8ac41fd 100644 +index 4c9f5cef6..5ea4c2cf1 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -34,7 +34,7 @@ QTextStream out(stderr); @@ -48,22 +48,7 @@ index e0f7004..8ac41fd 100644 } QStringList allServices(const QLatin1String& prefix) -@@ -184,14 +184,6 @@ void runEnvironmentScripts() - } - } - sourceFiles(scripts); -- -- // Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. -- // The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend -- // to set it to a list of paths *not* including the KDE prefix if it's not /usr or -- // /usr/local. -- if (!qEnvironmentVariableIsSet("XDG_DATA_DIRS")) { -- qputenv("XDG_DATA_DIRS", KDE_INSTALL_FULL_DATAROOTDIR ":/usr/share:/usr/local/share"); -- } - } - - -@@ -240,15 +232,15 @@ void setupX11() +@@ -242,15 +242,15 @@ void setupX11() // If the user has overwritten fonts, the cursor font may be different now // so don't move this up. @@ -84,7 +69,7 @@ index e0f7004..8ac41fd 100644 } // TODO: Check if Necessary -@@ -265,11 +257,7 @@ bool syncDBusEnvironment() +@@ -267,11 +267,7 @@ bool syncDBusEnvironment() { int exitCode; // At this point all environment variables are set, let's send it to the DBus session server to update the activation environment @@ -97,7 +82,7 @@ index e0f7004..8ac41fd 100644 return exitCode == 0; } -@@ -285,7 +273,7 @@ void setupFontDpi() +@@ -287,7 +283,7 @@ void setupFontDpi() //TODO port to c++? const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); QProcess p; @@ -106,7 +91,7 @@ index e0f7004..8ac41fd 100644 p.setProcessChannelMode(QProcess::ForwardedChannels); p.write(input); p.closeWriteChannel(); -@@ -307,7 +295,7 @@ QProcess* setupKSplash() +@@ -309,7 +305,7 @@ QProcess* setupKSplash() KConfigGroup ksplashCfg = cfg.group("KSplash"); if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; @@ -115,7 +100,7 @@ index e0f7004..8ac41fd 100644 } } return p; -@@ -329,7 +317,7 @@ bool startKDEInit() +@@ -331,7 +327,7 @@ bool startKDEInit() { // We set LD_BIND_NOW to increase the efficiency of kdeinit. // kdeinit unsets this variable before loading applications. @@ -125,5 +110,5 @@ index e0f7004..8ac41fd 100644 messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation.")); return false; -- -2.23.1 +2.25.1 diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch index 8fa9e1d31cff..366707d27034 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch @@ -1,4 +1,4 @@ -From 7c6f939aea290bc3ec7629f26d02441d1d4bcb8a Mon Sep 17 00:00:00 2001 +From f43f15870f14b8fa17ba0765c0d7e2b225fafc3f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 5 Feb 2020 05:03:11 -0600 Subject: [PATCH 2/2] absolute-wallpaper-install-dir @@ -8,15 +8,16 @@ Subject: [PATCH 2/2] absolute-wallpaper-install-dir 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake -index ea9a943..c8458ba 100644 +index 8494a5c8a..f723c1e1b 100644 --- a/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake -@@ -2,4 +2,4 @@ +@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg type=image color=#1d99f3 fontSize=10 --background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png -+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png +-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg ++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg + needsFullUserModel=false -- -2.23.1 +2.25.1 diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 6aa0e3b57382..99a649a026b9 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -47,7 +47,6 @@ mkDerivation { ./0002-absolute-wallpaper-install-dir.patch ]; - NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' ''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"'' diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index fe78f210c17e..6f9214ccd60c 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -1,374 +1,390 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/ +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5 { fetchurl, mirror }: { bluedevil = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/bluedevil-5.17.5.tar.xz"; - sha256 = "22e9c683dfc56a559e652809ade238f8eb0ffb09d5ab042f5cd4b8216f647c09"; - name = "bluedevil-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/bluedevil-5.18.5.tar.xz"; + sha256 = "5350efbaee01c78fd451e96bb2aceb7986d45ab05500476d1e95c4e79ec89a66"; + name = "bluedevil-5.18.5.tar.xz"; }; }; breeze = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/breeze-5.17.5.tar.xz"; - sha256 = "f89bf857321b18789089efc9271d7bd7b6459a173dd078dd03242775db76c8d7"; - name = "breeze-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/breeze-5.18.5.tar.xz"; + sha256 = "1d08dfd24df4a4fcacad1e3759e559e82f6014ba63dc75dc32a24de6cd133563"; + name = "breeze-5.18.5.tar.xz"; }; }; breeze-grub = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/breeze-grub-5.17.5.tar.xz"; - sha256 = "591a1d7a510c76a1f2729a61a4d14c0f33db4d1e8ea5dbc87b74f2e7e7e2a2ba"; - name = "breeze-grub-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/breeze-grub-5.18.5.tar.xz"; + sha256 = "24c40171601b82d1c7d01eb85d16718a2f46cf23ee792f5524ac89fda3d278b1"; + name = "breeze-grub-5.18.5.tar.xz"; }; }; breeze-gtk = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/breeze-gtk-5.17.5.tar.xz"; - sha256 = "6dbd8e7d936840fbaf7016574d07729c9d0791711ad6d371136585ddb8f76e66"; - name = "breeze-gtk-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/breeze-gtk-5.18.5.tar.xz"; + sha256 = "41c7e83a28c033903d4fcab3da28a4c74ddb72958e66693a2d2e451f716cb7e9"; + name = "breeze-gtk-5.18.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/breeze-plymouth-5.17.5.tar.xz"; - sha256 = "e95f9eaf04e74383f5e1abe74d999787e408be7a34fd07a4f64e253e35150af0"; - name = "breeze-plymouth-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/breeze-plymouth-5.18.5.tar.xz"; + sha256 = "c0d48dc5a02f3236ff657f86ee8cf532cf885a0e8b36bfe79f007e4d5e277281"; + name = "breeze-plymouth-5.18.5.tar.xz"; }; }; discover = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/discover-5.17.5.tar.xz"; - sha256 = "986ef367aef59c5a956d4163f987a60cfd3674a300880376ddedc0222769789f"; - name = "discover-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/discover-5.18.5.tar.xz"; + sha256 = "d5ce4f4668c50ba9be37e04227db4bbe469e00470c87907f1e217fdcad6e76b6"; + name = "discover-5.18.5.tar.xz"; }; }; drkonqi = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/drkonqi-5.17.5.tar.xz"; - sha256 = "756c50f2458a8c564e608ea97244f6b2b3d5fb4a675a8cec29307be1d5ab5457"; - name = "drkonqi-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/drkonqi-5.18.5.tar.xz"; + sha256 = "b1a626c4ed2f9de8f8bc3359d8827e7fa6ac17486b8477674e47627fcf6efad1"; + name = "drkonqi-5.18.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kactivitymanagerd-5.17.5.tar.xz"; - sha256 = "362721c3a9712751fba29cd1f1ef440a1e74561a611f2d171692a4ddc895b3e4"; - name = "kactivitymanagerd-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kactivitymanagerd-5.18.5.tar.xz"; + sha256 = "24f32eb4585d427ee62e08a9fa2f057353085c62644d6bec8fb4b2568e507ac7"; + name = "kactivitymanagerd-5.18.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kde-cli-tools-5.17.5.tar.xz"; - sha256 = "d14299ebeaf89854cb89435cfaaa4da1d84bf23a97df23ff8c7f95dae5bec55f"; - name = "kde-cli-tools-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kde-cli-tools-5.18.5.tar.xz"; + sha256 = "e3981d1a17111f4e284b787a6e841d7ff47f4fdbca0ad17e105c0a047e5aaaa8"; + name = "kde-cli-tools-5.18.5.tar.xz"; }; }; kdecoration = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kdecoration-5.17.5.tar.xz"; - sha256 = "7d8f0128306d436aeba010e47a3dddbcb9fb9fd05ef9308cbad1934914875cd9"; - name = "kdecoration-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kdecoration-5.18.5.tar.xz"; + sha256 = "f09856245f2cb08d9013da4c3128b5438f1e2f58af40031eb547ae765f57a9c8"; + name = "kdecoration-5.18.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kde-gtk-config-5.17.5.tar.xz"; - sha256 = "5feff23c756f1fb0ba9ab88c2aed92c0e7c5521c757f5a0cdd057273538f0010"; - name = "kde-gtk-config-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kde-gtk-config-5.18.5.tar.xz"; + sha256 = "9d7b1fd8b61f9f99c5a5721ea0227c4562588834a4886d66637f4c092f0e53ab"; + name = "kde-gtk-config-5.18.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kdeplasma-addons-5.17.5.tar.xz"; - sha256 = "997d6a3542ab1f1fd7fb17580693dc8281ff29b03c82577dbae3fc1ec4cccdb8"; - name = "kdeplasma-addons-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kdeplasma-addons-5.18.5.tar.xz"; + sha256 = "1d135a32a7442f79dba4cb4e23221cd2ad1aad36b54fb12bfa91918daf3ff53f"; + name = "kdeplasma-addons-5.18.5.tar.xz"; }; }; kgamma5 = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kgamma5-5.17.5.tar.xz"; - sha256 = "3b8fd1539d035d4d39dcde6ca0dd214e6653c98778ac79b9cbf2f7009b155ca9"; - name = "kgamma5-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kgamma5-5.18.5.tar.xz"; + sha256 = "3aa89e361646214fb4910409644b941c83a85505d3d8a1d37984598d3e54269f"; + name = "kgamma5-5.18.5.tar.xz"; }; }; khotkeys = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/khotkeys-5.17.5.tar.xz"; - sha256 = "cf78b5bfb8568fb4eea592b209bdb79aeac92bd08a580c3b6c08d45dd34a2d56"; - name = "khotkeys-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/khotkeys-5.18.5.tar.xz"; + sha256 = "8f02fdf3bbecdc31c305c276fe2b3b2eca6dc10195e65c723ee9148fed81e766"; + name = "khotkeys-5.18.5.tar.xz"; }; }; kinfocenter = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kinfocenter-5.17.5.tar.xz"; - sha256 = "679870f10ee6494136d87a897a57a23c2905054d7a83ff11a4e85c204eb9fd9a"; - name = "kinfocenter-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kinfocenter-5.18.5.tar.xz"; + sha256 = "a9679bce4cd2d64e6f471c89de6da410237263b02512768f3acd0a4932b12ec5"; + name = "kinfocenter-5.18.5.tar.xz"; }; }; kmenuedit = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kmenuedit-5.17.5.tar.xz"; - sha256 = "59beed03298cd9fd6b05d67844794ed6a77be0d1b25b55d5bbcdf72e15e357de"; - name = "kmenuedit-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kmenuedit-5.18.5.tar.xz"; + sha256 = "59d998972121662d2835d43ff5be36eca7bf62e66e39fd67b7005e8ef8afd5f6"; + name = "kmenuedit-5.18.5.tar.xz"; }; }; kscreen = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kscreen-5.17.5.tar.xz"; - sha256 = "de8a00b33d0254245a53a5c097347aa86709d415754b3e3c675eef8fb4fe5bc0"; - name = "kscreen-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kscreen-5.18.5.tar.xz"; + sha256 = "9b6238447a4a38babdff482724ae3d33786b211e8b4224aaadafaad7435f6ba2"; + name = "kscreen-5.18.5.tar.xz"; }; }; kscreenlocker = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kscreenlocker-5.17.5.tar.xz"; - sha256 = "078cfaa9f117a985f5c71152bdf4a9f5cb65ef23c0090cfaaccc9539770f138f"; - name = "kscreenlocker-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kscreenlocker-5.18.5.tar.xz"; + sha256 = "b4269cd027e1fee721760a22ca5d738d3d98622fa222fcf9e57d2da77a4e18d2"; + name = "kscreenlocker-5.18.5.tar.xz"; }; }; ksshaskpass = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/ksshaskpass-5.17.5.tar.xz"; - sha256 = "b09e0d780340fc5a6a65e67a30d08a3f117f31e2dbfbb35579aa4cefb15c3b27"; - name = "ksshaskpass-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/ksshaskpass-5.18.5.tar.xz"; + sha256 = "c483c17d6ce2e3dffd54fc812f97b88c32f5def6e8c5e7a526e23f5e7f208cc5"; + name = "ksshaskpass-5.18.5.tar.xz"; }; }; ksysguard = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/ksysguard-5.17.5.tar.xz"; - sha256 = "69bc12311dcf363b168a259139d30456ed395ec03b948bd35e992300c7e7bd82"; - name = "ksysguard-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/ksysguard-5.18.5.tar.xz"; + sha256 = "4acb352698b612a21a5eccf22042ab46265d50bbf3aa85844bbca762a64c9e2f"; + name = "ksysguard-5.18.5.tar.xz"; }; }; kwallet-pam = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kwallet-pam-5.17.5.tar.xz"; - sha256 = "c829c7a44408e58beb87c71f5c70bccd349d285c3fcefb16df98bf2f29357fe9"; - name = "kwallet-pam-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kwallet-pam-5.18.5.tar.xz"; + sha256 = "bc4fe3dde503645d6233c3932d3cf74a7f5bf7acefb96bd6dbd224c8919d841a"; + name = "kwallet-pam-5.18.5.tar.xz"; }; }; kwayland-integration = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kwayland-integration-5.17.5.tar.xz"; - sha256 = "818b4e14611e26f297ef60427d399edc458a44e113bc092390fa65ecababcedb"; - name = "kwayland-integration-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kwayland-integration-5.18.5.tar.xz"; + sha256 = "82d6943d79a9a2a9bce10623adb2c9af396a2dcf258a723bb349aafbde20e6d5"; + name = "kwayland-integration-5.18.5.tar.xz"; }; }; kwin = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kwin-5.17.5.tar.xz"; - sha256 = "8517adaf8270d783aea7b3886d86b5abed6a5ec2b5c78b632479597d956baadc"; - name = "kwin-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kwin-5.18.5.tar.xz"; + sha256 = "ca39c63fd740432e95490031fd9d5ac003da034582014fa41c2be2b89627ddf8"; + name = "kwin-5.18.5.tar.xz"; }; }; kwrited = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kwrited-5.17.5.tar.xz"; - sha256 = "ca22b1fa3e657fa2e58bf0c9dc1ebff3be8c0e003750223e7a7c5932d5b90823"; - name = "kwrited-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kwrited-5.18.5.tar.xz"; + sha256 = "45ffa31d3d141ce453fb09fd823d7edd8e6c782b353bce22b8c879ad794fd1fe"; + name = "kwrited-5.18.5.tar.xz"; }; }; libkscreen = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/libkscreen-5.17.5.tar.xz"; - sha256 = "aa186e5751287701daec4d036aba776a911e4b84ca7eea44dc5fb531875afd94"; - name = "libkscreen-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/libkscreen-5.18.5.tar.xz"; + sha256 = "a962319000324200ec1abe3c58b1b8ab71ed4cc7c88a3c7e03a1c8eca86c287c"; + name = "libkscreen-5.18.5.tar.xz"; }; }; libksysguard = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/libksysguard-5.17.5.tar.xz"; - sha256 = "f5d237af554d65740a28360e6d8fa39d4912239c5f21288846b1c934897a7e14"; - name = "libksysguard-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/libksysguard-5.18.5.tar.xz"; + sha256 = "d4d7030a2869a546a211844aa158dcef3598386cc035a8655529938ba102440b"; + name = "libksysguard-5.18.5.tar.xz"; }; }; milou = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/milou-5.17.5.tar.xz"; - sha256 = "b89796e34cc8b6d6d4196169e814249f7b75c1c15763e0b4c1da5c97ccc2c8cf"; - name = "milou-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/milou-5.18.5.tar.xz"; + sha256 = "7ec763833c025aa719d1e25f3c5c1c8b6c934a48bf346517e94660e09d8582b2"; + name = "milou-5.18.5.tar.xz"; }; }; oxygen = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/oxygen-5.17.5.tar.xz"; - sha256 = "58954374a4b9067365ee5d50b32b1986b2e7dd31e73cbf79fda8d978949943be"; - name = "oxygen-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/oxygen-5.18.5.tar.xz"; + sha256 = "479bdfa80b3f2216075470ab4be1e3159a17620870acf276144b9639134609f8"; + name = "oxygen-5.18.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-browser-integration-5.17.5.tar.xz"; - sha256 = "07bc4285991ab43830873a12b8c07f60e4faea1ec81121db783c425f18a4f87d"; - name = "plasma-browser-integration-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-browser-integration-5.18.5.tar.xz"; + sha256 = "3a087a836657b5304e2e0ef9ebefb84ce1f896bfbfc5dbf948d4b3eb7b709383"; + name = "plasma-browser-integration-5.18.5.tar.xz"; }; }; plasma-desktop = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-desktop-5.17.5.tar.xz"; - sha256 = "7f741ab026989bdcc68701955fc290d5ead38bf4bc310f18a2f32c64b411ab04"; - name = "plasma-desktop-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-desktop-5.18.5.tar.xz"; + sha256 = "aeb106018fd90da79c8a3c444d880282846a842029b1223e7830db2d4b42df9f"; + name = "plasma-desktop-5.18.5.tar.xz"; }; }; plasma-integration = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-integration-5.17.5.tar.xz"; - sha256 = "169206bebd790d2fee49cec621c46f6f64a8e20ee3e56bf16ee7373f61cad959"; - name = "plasma-integration-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-integration-5.18.5.tar.xz"; + sha256 = "c99b987efb2ab965cc2a55793ef94c7ccb2152ca5d75956a40ec99261ad4b870"; + name = "plasma-integration-5.18.5.tar.xz"; + }; + }; + plasma-nano = { + version = "5.18.5"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.18.5/plasma-nano-5.18.5.tar.xz"; + sha256 = "d2f29b05894573517cb3336088e102d3604b1c2735e9bbe605119f559f0c6341"; + name = "plasma-nano-5.18.5.tar.xz"; }; }; plasma-nm = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-nm-5.17.5.tar.xz"; - sha256 = "2165e47a0654d17735abc97aec287b46b52a2eafccc3591b667ea2755b731255"; - name = "plasma-nm-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-nm-5.18.5.tar.xz"; + sha256 = "1e091d01993708220f89501bb8a289279bf527d0593fd9e4b9223e6e8caf9aaa"; + name = "plasma-nm-5.18.5.tar.xz"; }; }; plasma-pa = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-pa-5.17.5.tar.xz"; - sha256 = "933c6ab1fda52b336a157a48b1ea64b81fd1d84ca08a40a52bfae276cca2bf23"; - name = "plasma-pa-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-pa-5.18.5.tar.xz"; + sha256 = "28765c07f584e7688a85c9761155e606440936de2ebb678917dac2c85f5d0209"; + name = "plasma-pa-5.18.5.tar.xz"; + }; + }; + plasma-phone-components = { + version = "5.18.5"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.18.5/plasma-phone-components-5.18.5.tar.xz"; + sha256 = "d0c091367ae07c71457a0c03d1023ac48d8665385a6a1b0e32f6ae7ad1fa7070"; + name = "plasma-phone-components-5.18.5.tar.xz"; }; }; plasma-sdk = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-sdk-5.17.5.tar.xz"; - sha256 = "ff736029b1ae5773991db06f5827d9dcbd8e7a4e9a430c9014c35ddee2c55314"; - name = "plasma-sdk-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-sdk-5.18.5.tar.xz"; + sha256 = "5f399231d16d62f9880f953891477f74e0b1f7b931448a4b0fbb97f37acd2fe5"; + name = "plasma-sdk-5.18.5.tar.xz"; }; }; plasma-tests = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-tests-5.17.5.tar.xz"; - sha256 = "1b566b7118a5c8d1b25078d331a6bc77f48781010fbd3425d85b137811218982"; - name = "plasma-tests-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-tests-5.18.5.tar.xz"; + sha256 = "3251ea30cb3c62de9bba2deb152370ea9e0e56b7506efd655888f1892c18413a"; + name = "plasma-tests-5.18.5.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-thunderbolt-5.17.5.tar.xz"; - sha256 = "3743f9841d269d51f1b1419e24d5cd1b26a0ba5a90e76b531328a8cc43184382"; - name = "plasma-thunderbolt-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-thunderbolt-5.18.5.tar.xz"; + sha256 = "c61dc7abe350ead15ca4d6111606aaf19773c38a0307ae8a7d8a7c60b82be5d1"; + name = "plasma-thunderbolt-5.18.5.tar.xz"; }; }; plasma-vault = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-vault-5.17.5.tar.xz"; - sha256 = "3e5c6b4dd6c1122b6a221205da506881959ab905e467b74b0536e7f5fe130d71"; - name = "plasma-vault-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-vault-5.18.5.tar.xz"; + sha256 = "cae2713823e8c59c7a2beb96d362a15024fe260cf10419ba037e8a798f3c1b41"; + name = "plasma-vault-5.18.5.tar.xz"; }; }; plasma-workspace = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-5.17.5.tar.xz"; - sha256 = "764488e66d52bc3017efb2c1471f57196aa50fbfa3a80637bf48f24955cfba88"; - name = "plasma-workspace-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-5.18.5.tar.xz"; + sha256 = "14e82033be745f4db46a70d319e2c86012295ea31056092bc974004189b92354"; + name = "plasma-workspace-5.18.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-wallpapers-5.17.5.tar.xz"; - sha256 = "8a28ef67b65c340d40ff8f5bfc333ead68e6d8c9e410769c43af847ced9b4ca9"; - name = "plasma-workspace-wallpapers-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-wallpapers-5.18.5.tar.xz"; + sha256 = "f8da3bd7b97a9944639ed0860303b8a7a008905246313e1983367810a3a84d6d"; + name = "plasma-workspace-wallpapers-5.18.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plymouth-kcm-5.17.5.tar.xz"; - sha256 = "bbd6994f60ed9d63b4e4dd0abe78bf1f9c14b8ecce8ba4355d16cd52a0a86528"; - name = "plymouth-kcm-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plymouth-kcm-5.18.5.tar.xz"; + sha256 = "e8f75dd8c8a45cd706a0a6e62826d1eb4fff9c3912cbaadba8c06e9de915d2e3"; + name = "plymouth-kcm-5.18.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.17.5"; + version = "1-5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/polkit-kde-agent-1-5.17.5.tar.xz"; - sha256 = "a79d76a2f584f6567639228fde6f75b3960484f7a65cfc69b6acb6df1de53f5d"; - name = "polkit-kde-agent-1-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/polkit-kde-agent-1-5.18.5.tar.xz"; + sha256 = "5e1733cb51c826c6215da4fbbc9c9568240275cf86b9922cd7a643d192a75a91"; + name = "polkit-kde-agent-1-5.18.5.tar.xz"; }; }; powerdevil = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/powerdevil-5.17.5.tar.xz"; - sha256 = "27904361e85e1267d933d8f0a0d3be4dc712099ed2eb3cf90959209a4443dd82"; - name = "powerdevil-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/powerdevil-5.18.5.tar.xz"; + sha256 = "e000185ee61bff81fe28896a7d6353746c82c7f4d2626792fd22d34b5f49f548"; + name = "powerdevil-5.18.5.tar.xz"; }; }; sddm-kcm = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/sddm-kcm-5.17.5.tar.xz"; - sha256 = "e85fb9e014439e8c0e73638112139561aff9a9f71f26c3eafedff5a98a07b33b"; - name = "sddm-kcm-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/sddm-kcm-5.18.5.tar.xz"; + sha256 = "cc99c185d701acc7442f33ef17b2396894dcf164f3f583c25105ac3f2528c33b"; + name = "sddm-kcm-5.18.5.tar.xz"; }; }; systemsettings = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/systemsettings-5.17.5.tar.xz"; - sha256 = "50fa4d7866639995a6859446fc6a02a73ae05203e8f2ed31221e232ed3491eaf"; - name = "systemsettings-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/systemsettings-5.18.5.tar.xz"; + sha256 = "cde5b714261aaa54f937887657c3d3e74814c5447448b989159ee6035be4783b"; + name = "systemsettings-5.18.5.tar.xz"; }; }; user-manager = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/user-manager-5.17.5.tar.xz"; - sha256 = "10ed3196063c7dfed3b3f25dd199a48ca39fa86db5d0126ec84a543b1c212f0d"; - name = "user-manager-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/user-manager-5.18.5.tar.xz"; + sha256 = "741d293947fa3fb3966f047bab121597bf1071be010684daff4a91626cf54484"; + name = "user-manager-5.18.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/xdg-desktop-portal-kde-5.17.5.tar.xz"; - sha256 = "a993bd4b86a44c8237a3f4957c2594aa2ca8916204ad866f8af32f7df34740f6"; - name = "xdg-desktop-portal-kde-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/xdg-desktop-portal-kde-5.18.5.tar.xz"; + sha256 = "807452708a0318b8e21b43f9ec7e016d1de51cac5d8714d70c577bb6f3976224"; + name = "xdg-desktop-portal-kde-5.18.5.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 1e04eb1e2b00..8e2fd6ff0b19 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, gettext, kdoctools, python, - kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, + kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, kirigami2, kdeclarative, plasma-framework, cups, pcre, pipewire, kio }: @@ -10,6 +10,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ cups pcre pipewire kio - kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem + kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem kirigami2 kdeclarative plasma-framework ]; } From 6c062bfc6c66a117c0c56e3c8e7d7fff65445d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 27 Apr 2020 10:35:31 +0200 Subject: [PATCH 083/688] deepin.dde-kwin, deepin.startdde: mark as broken These will not compile anymore with the latest version of kwin and upstream development has moved to a private repository. --- pkgs/desktops/deepin/dde-kwin/default.nix | 1 + pkgs/desktops/deepin/startdde/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/desktops/deepin/dde-kwin/default.nix b/pkgs/desktops/deepin/dde-kwin/default.nix index ce1a1a8dda03..6f981885187e 100644 --- a/pkgs/desktops/deepin/dde-kwin/default.nix +++ b/pkgs/desktops/deepin/dde-kwin/default.nix @@ -133,6 +133,7 @@ mkDerivation rec { passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { + broken = versionAtLeast (versions.majorMinor (getVersion kwindowsystem)) "5.18"; description = "KWin configuration for Deepin Desktop Environment"; homepage = "https://github.com/linuxdeepin/dde-kwin"; license = licenses.gpl3; diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix index 75b36e85de3c..83846c6c4d3c 100644 --- a/pkgs/desktops/deepin/startdde/default.nix +++ b/pkgs/desktops/deepin/startdde/default.nix @@ -152,6 +152,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { + broken = true; description = "Starter of deepin desktop environment"; homepage = "https://github.com/linuxdeepin/startdde"; license = licenses.gpl3; From 70fb2bbc1bb5be0fea794f902320f83a7f5eb8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 15 Jun 2020 13:03:34 +0200 Subject: [PATCH 084/688] kdecoration-viewer: remove Fails to build with Plasma >= 5.18 and there have not been any changes in upstream since a long time. According to the maintainer (@gnidorah) it can be removed. --- .../tools/misc/kdecoration-viewer/default.nix | 28 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/tools/misc/kdecoration-viewer/default.nix diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix deleted file mode 100644 index 53b1763ad6a1..000000000000 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, mkDerivation -, cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }: - -mkDerivation { - name = "kdecoration-viewer-2018-07-24"; - - src = fetchFromGitHub { - owner = "KDE"; - repo = "kdecoration-viewer"; - rev = "6e50b39c651bbf92fd7e7116d43bf57288254288"; - sha256 = "01v6i081vx0mydqvnj05xli86m52v6bxxc3z1zlyyap9cfhag7lj"; - }; - - nativeBuildInputs = [ cmake extra-cmake-modules ]; - buildInputs = [ qtquickcontrols kconfigwidgets kdeclarative kdecoration ]; - - meta = with stdenv.lib; { - description = "Allows to preview a KDecoration plugin"; - longDescription = '' - kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under - $QT_PLUGIN_PATH/org.kde.kdecoration2 to preview. - ''; - homepage = "https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/"; - license = licenses.gpl2; - maintainers = [ maintainers.gnidorah ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9f959c8d16e3..c98505d0dcfd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -217,6 +217,7 @@ mapAliases ({ jikes = throw "deprecated in 2019-10-07: jikes was abandoned by upstream"; joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 + kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 keepassx-community = keepassxc; # added 2017-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f6c3c8be02f..ee1af5979500 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21074,8 +21074,6 @@ in kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; - kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer { }; - inherit (kdeFrameworks) kdesu; kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; From 437da6c4c88d8dbe037e158bd06ef605ae6faf0a Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Sat, 22 Aug 2020 13:11:43 +0200 Subject: [PATCH 085/688] bambootracker: 0.4.3 -> 0.4.4 --- .../audio/bambootracker/default.nix | 29 +++---------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index c74c0ca4eff0..a26431a82edf 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -1,8 +1,6 @@ { mkDerivation , stdenv , fetchFromGitHub -, fetchpatch -, installShellFiles , qmake , qtbase , qtmultimedia @@ -21,26 +19,18 @@ let in mkDerivation rec { pname = "bambootracker"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "rerrahkr"; repo = "BambooTracker"; rev = "v${version}"; - sha256 = "0gq40qmsdavsyl2d6a71rwp4mjlwvp1c8bry32srn4hliwfnvqa6"; + sha256 = "0d0f4jqzknsiq725pvfndarfjg183f92rb0lim3wzshnsixr5vdc"; }; - # Fix macOS build until new release - patches = [ - (fetchpatch { - url = "https://github.com/rerrahkr/BambooTracker/commit/45346ed99559d44c2e32a5c6138a0835b212e875.patch"; - sha256 = "1xkiqira1kpcqkacycy0y7qm1brhf89amliv42byijl4palmykh2"; - }) - ]; + sourceRoot = "source/BambooTracker"; - preConfigure = "cd BambooTracker"; - - nativeBuildInputs = [ qmake qttools installShellFiles ]; + nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtbase qtmultimedia ] ++ optional alsaSupport alsaLib @@ -51,17 +41,6 @@ mkDerivation rec { ++ optional pulseSupport "CONFIG+=use_pulse" ++ optionals jackSupport [ "CONFIG+=use_jack" "CONFIG+=jack_has_rename" ]; - postInstall = '' - install -Dm644 ../BambooTracker.desktop $out/share/applications/BambooTracker.desktop - installManPage ../BambooTracker*.1 - - cp -r ../{demos,licenses,skins,LICENSE} $out/share/BambooTracker/ - - for size in 16x16 256x256; do - install -Dm644 res/icon/icon_$size.png $out/share/icons/hicolor/$size/apps/BambooTracker.png - done - ''; - meta = with stdenv.lib; { description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; homepage = "https://github.com/rerrahkr/BambooTracker"; From f66b679f16c3eb89f12d228f3ca976839a029279 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 22 Aug 2020 19:23:59 +0800 Subject: [PATCH 086/688] kdav: now a kf5 tier 3 library --- pkgs/applications/kde/default.nix | 1 - pkgs/development/libraries/kde-frameworks/default.nix | 1 + .../kde => development/libraries/kde-frameworks}/kdav.nix | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{applications/kde => development/libraries/kde-frameworks}/kdav.nix (83%) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 4767ff3c84bf..435bb7e13d0f 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -100,7 +100,6 @@ let kcalutils = callPackage ./kcalutils.nix {}; kcharselect = callPackage ./kcharselect.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; - kdav = callPackage ./kdav.nix {}; kdebugsettings = callPackage ./kdebugsettings.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 9ac3ed11b496..5c7d7718be8d 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -146,6 +146,7 @@ let kbookmarks = callPackage ./kbookmarks.nix {}; kcmutils = callPackage ./kcmutils {}; kconfigwidgets = callPackage ./kconfigwidgets {}; + kdav = callPackage ./kdav.nix {}; kdeclarative = callPackage ./kdeclarative.nix {}; kded = callPackage ./kded.nix {}; kdesignerplugin = callPackage ./kdesignerplugin.nix {}; diff --git a/pkgs/applications/kde/kdav.nix b/pkgs/development/libraries/kde-frameworks/kdav.nix similarity index 83% rename from pkgs/applications/kde/kdav.nix rename to pkgs/development/libraries/kde-frameworks/kdav.nix index 800c92511de2..a03cca3fdf26 100644 --- a/pkgs/applications/kde/kdav.nix +++ b/pkgs/development/libraries/kde-frameworks/kdav.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, extra-cmake-modules, kdoctools, kcoreaddons, kio, qtxmlpatterns, }: @@ -8,7 +8,6 @@ mkDerivation { name = "kdav"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons kio qtxmlpatterns ]; From f964bf5991b2bed5009205c47a1a24e8475a95dd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 22 Aug 2020 19:43:56 +0800 Subject: [PATCH 087/688] kdav: expose it --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 381a63754463..0c29ba66b3ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14703,7 +14703,7 @@ in inherit (kdeFrameworks.override { libsForQt5 = self; }) attica baloo bluez-qt kactivities kactivities-stats karchive kauth kbookmarks kcmutils kcalendarcore kcodecs kcompletion kconfig - kconfigwidgets kcoreaddons kcrash kdbusaddons kdeclarative kdelibs4support + kconfigwidgets kcoreaddons kcrash kdav kdbusaddons kdeclarative kdelibs4support kdesignerplugin kdnssd kemoticons kfilemetadata kglobalaccel kguiaddons khtml ki18n kiconthemes kidletime kimageformats kio kitemmodels kitemviews kjobwidgets kjs kjsembed kmediaplayer knewstuff knotifications From 881fc17243eda5280b0802c0d5c5ff81cb76d71b Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sun, 29 Mar 2020 16:56:05 +0000 Subject: [PATCH 088/688] thin-provisioning-tools: 0.7.6 -> 0.9.0 --- .../misc/thin-provisioning-tools/default.nix | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 0aba67647e0b..8df030eafadb 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,33 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost, binutils }: stdenv.mkDerivation rec { pname = "thin-provisioning-tools"; - version = "0.7.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "jthornber"; repo = "thin-provisioning-tools"; rev = "v${version}"; - sha256 = "175mk3krfdmn43cjw378s32hs62gq8fmq549rjmyc651sz6jnj0g"; + sha256 = "1iwg04rhmdhijmlk5hfl8wvv83115lzb65if6cc1glkkfva8jfjp"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ expat libaio boost ]; - - patches = [ - (fetchpatch { - # a) Fix build if limits.h provides definition for PAGE_SIZE, as musl does w/musl per XSI[1] although it's apparently optional [2]. - # This value is only provided when it's known to be a constant, to avoid the need to discover the value dynamically. - # b) If not using system-provided (kernel headers, or libc headers, or something) use the POSIX approach of querying the value - # dynamically using sysconf(_SC_PAGE_SIZE) instead of hardcoded value that hopefully is correct. - # [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html - # [2] http://www.openwall.com/lists/musl/2015/09/11/8 - url = "https://raw.githubusercontent.com/void-linux/void-packages/a0ece13ad7ab2aae760e09e41e0459bd999a3695/srcpkgs/thin-provisioning-tools/patches/musl.patch"; - sha256 = "1m8r3vhrnsy8drgs0svs3fgpi3mmxzdcqsv6bmvc0j52cvfqvhvy"; - extraPrefix = ""; # empty means add 'a/' and 'b/' - }) - ]; + buildInputs = [ expat libaio boost binutils ]; enableParallelBuilding = true; From 58ba6ca2fe390f1c6ada3cf1d6510e9a93990d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 22 Aug 2020 19:03:28 +0200 Subject: [PATCH 089/688] postgresqlPackages.age: init at 0.2.0 Apache AGE is an extension of PostgreSQL that provides an implementation of the openCypher query language. --- pkgs/servers/sql/postgresql/ext/age.nix | 65 ++++++++++++++++++++++++ pkgs/servers/sql/postgresql/packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/age.nix diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix new file mode 100644 index 000000000000..09021317cd13 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchFromGitHub, bison, flex, postgresql }: + +stdenv.mkDerivation rec { + pname = "age"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "bitnine-oss"; + repo = "AgensGraph-Extension"; + rev = "v${version}"; + sha256 = "0way59lj30727jlz2qz6rnw4fsxcd5028xcwgrwk7jxcaqi5fa17"; + }; + + buildInputs = [ postgresql ]; + + makeFlags = [ + "BISON=${bison}/bin/bison" + "FLEX=${flex}/bin/flex" + ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + passthru.tests = stdenv.mkDerivation { + inherit version src; + + pname = "age-regression"; + + dontConfigure = true; + + buildPhase = let + postgresqlAge = postgresql.withPackages (ps: [ ps.age ]); + in '' + # The regression tests need to be run in the order specified in the Makefile. + echo -e "include Makefile\nfiles:\n\t@echo \$(REGRESS)" > Makefile.regress + REGRESS_TESTS=$(make -f Makefile.regress files) + + ${postgresql}/lib/pgxs/src/test/regress/pg_regress \ + --inputdir=./ \ + --bindir='${postgresqlAge}/bin' \ + --encoding=UTF-8 \ + --load-extension=age \ + --inputdir=./regress --outputdir=./regress --temp-instance=./regress/instance \ + --port=61958 --dbname=contrib_regression \ + $REGRESS_TESTS + ''; + + installPhase = '' + touch $out + ''; + }; + + meta = with stdenv.lib; { + description = "A graph database extension for PostgreSQL"; + homepage = "https://github.com/bitnine-oss/AgensGraph-Extension"; + changelog = "https://github.com/bitnine-oss/AgensGraph-Extension/releases/tag/v${version}"; + maintainers = with maintainers; [ danieldk ]; + platforms = postgresql.meta.platforms; + license = licenses.asl20; + broken = versionOlder postgresql.version "11.0"; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 44e560a5f837..6dbb7a8ed11a 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -1,5 +1,7 @@ self: super: { + age = super.callPackage ./ext/age.nix { }; + periods = super.callPackage ./ext/periods.nix { }; postgis = super.callPackage ./ext/postgis.nix { From 55bc2b54a481f08bd9f7189561f9cf2f65f810c7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 22 Aug 2020 22:55:13 +0000 Subject: [PATCH 090/688] Update architectures.nix --- lib/systems/architectures.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index 287f5be03c45..ce7ac0356bdc 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -35,12 +35,12 @@ rec { # x86_64 Intel default = [ ]; westmere = [ ]; - sandybridge = [ "westmere" ]; - ivybridge = [ "westmere" "sandybridge" ]; - haswell = [ "westmere" "sandybridge" "ivybridge" ]; - broadwell = [ "westmere" "sandybridge" "ivybridge" "haswell" ]; - skylake = [ "westmere" "sandybridge" "ivybridge" "haswell" "broadwell" ]; - skylake-avx512 = [ "westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" ]; + sandybridge = [ "westmere" ] ++ inferiors.westmere; + ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge; + haswell = [ "ivybridge" ] ++ inferiors.ivybridge; + broadwell = [ "haswell" ] ++ inferiors.haswell; + skylake = [ "broadwell" ] ++ inferiors.broadwell; + skylake-avx512 = [ "skylake" ] ++ inferiors.skylake; # x86_64 AMD btver1 = [ ]; btver2 = [ ]; From 8ad48c921e6bc5b1a0a273764ef3337747b34503 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 22 Aug 2020 23:01:38 +0000 Subject: [PATCH 091/688] Update architectures.nix --- lib/systems/architectures.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index ce7ac0356bdc..c9ca27a0651d 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -43,13 +43,13 @@ rec { skylake-avx512 = [ "skylake" ] ++ inferiors.skylake; # x86_64 AMD btver1 = [ ]; - btver2 = [ ]; - bdver1 = [ ]; - bdver2 = [ ]; - bdver3 = [ ]; - bdver4 = [ ]; - znver1 = [ ]; - znver2 = [ ]; + btver2 = [ ]; # TODO: fill this (need testing) + bdver1 = [ ]; # TODO: fill this (need testing) + bdver2 = [ ]; # TODO: fill this (need testing) + bdver3 = [ ]; # TODO: fill this (need testing) + bdver4 = [ ]; # TODO: fill this (need testing) + znver1 = [ ]; # TODO: fill this (need testing) + znver2 = [ ]; # TODO: fill this (need testing) # other armv5te = [ ]; armv6 = [ ]; From 60ce27db2b405c0de1b870b2d04056e71d704133 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 22 Aug 2020 23:04:08 +0000 Subject: [PATCH 092/688] Update architectures.nix --- lib/systems/architectures.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index c9ca27a0651d..acb6e417386b 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -59,17 +59,18 @@ rec { loongson2f = [ ]; }; - predicates = { - sse3Support = x: builtins.elem "sse3" features.${x}; - ssse3Support = x: builtins.elem "ssse3" features.${x}; - sse4_1Support = x: builtins.elem "sse4_1" features.${x}; - sse4_2Support = x: builtins.elem "sse4_2" features.${x}; - sse4_aSupport = x: builtins.elem "sse4a" features.${x}; - avxSupport = x: builtins.elem "avx" features.${x}; - avx2Support = x: builtins.elem "avx2" features.${x}; - avx512Support = x: builtins.elem "avx512" features.${x}; - aesSupport = x: builtins.elem "aes" features.${x}; - fmaSupport = x: builtins.elem "fma" features.${x}; - fma4Support = x: builtins.elem "fma4" features.${x}; + predicates = rec { + featureSupport = feature: x: builtins.elem feature features.${x}; + sse3Support = featureSupport "sse3"; + ssse3Support = featureSupport "ssse3"; + sse4_1Support = featureSupport "sse4_1"; + sse4_2Support = featureSupport "sse4_2"; + sse4_aSupport = featureSupport "sse4a"; + avxSupport = featureSupport "avx"; + avx2Support = featureSupport "avx2"; + avx512Support = featureSupport "avx512"; + aesSupport = featureSupport "aes"; + fmaSupport = featureSupport "fma"; + fma4Support = featureSupport "fma4"; }; } From fbcdb657ca4eb4db525d2897c7e1c68e7738cb0c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 07:09:54 +0800 Subject: [PATCH 093/688] grantleetheme: our patches are now upstream --- .../kde/grantleetheme/default.nix | 1 - .../grantlee-merge-theme-dirs.patch | 155 ------------------ pkgs/applications/kde/grantleetheme/series | 1 - 3 files changed, 157 deletions(-) delete mode 100644 pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch delete mode 100644 pkgs/applications/kde/grantleetheme/series diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index bb8a97e8341e..0e815127fa1d 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -11,7 +11,6 @@ mkDerivation { maintainers = kdepimTeam; }; output = [ "out" "dev" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch deleted file mode 100644 index ebb81248475f..000000000000 --- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp -index 27d5bc8..8d43140 100644 ---- a/src/grantleetheme.cpp -+++ b/src/grantleetheme.cpp -@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePrivate &other) - , description(other.description) - , name(other.name) - , dirName(other.dirName) -- , absolutePath(other.absolutePath) -+ , absolutePaths(other.absolutePaths) - , author(other.author) - , email(other.email) - , loader(other.loader) -@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine() - - void ThemePrivate::setupLoader() - { -- // Get the parent dir with themes, we set the theme directory separately -- QDir dir(absolutePath); -- dir.cdUp(); -+ QStringList templateDirs; -+ for (const QString& path : absolutePaths) { -+ QDir dir(path); -+ dir.cdUp(); -+ templateDirs << dir.absolutePath(); -+ } - - loader = QSharedPointer::create(); -- loader->setTemplateDirs({ dir.absolutePath() }); -+ loader->setTemplateDirs(templateDirs); - loader->setTheme(dirName); - - if (!sEngine) { -@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &de - KConfigGroup group(&config, QStringLiteral("Desktop Entry")); - if (group.isValid()) { - d->dirName = dirName; -- d->absolutePath = themePath; -+ d->absolutePaths = QStringList(themePath); - d->name = group.readEntry("Name", QString()); - d->description = group.readEntry("Description", QString()); - d->themeFileName = group.readEntry("FileName", QString()); -@@ -140,7 +143,7 @@ Theme::~Theme() - - bool Theme::operator==(const Theme &other) const - { -- return isValid() && other.isValid() && d->absolutePath == other.absolutePath(); -+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths(); - } - - Theme &Theme::operator=(const Theme &other) -@@ -184,7 +187,12 @@ QString Theme::dirName() const - - QString Theme::absolutePath() const - { -- return d->absolutePath; -+ return d->absolutePaths.first(); -+} -+ -+QStringList Theme::absolutePaths() const -+{ -+ return d->absolutePaths; - } - - QString Theme::author() const -@@ -223,6 +231,13 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con - return result; - } - -+void Theme::addThemeDir(const QString& path) -+{ -+ QDir dir(path); -+ dir.cdUp(); -+ d->absolutePaths << dir.absolutePath(); -+} -+ - void Theme::addPluginPath(const QString &path) - { - if (!ThemePrivate::sEngine) { -diff --git a/src/grantleetheme.h b/src/grantleetheme.h -index a25c27b..be38299 100644 ---- a/src/grantleetheme.h -+++ b/src/grantleetheme.h -@@ -48,11 +48,14 @@ public: - Q_REQUIRED_RESULT QStringList displayExtraVariables() const; - Q_REQUIRED_RESULT QString dirName() const; - Q_REQUIRED_RESULT QString absolutePath() const; -+ Q_REQUIRED_RESULT QStringList absolutePaths() const; - Q_REQUIRED_RESULT QString author() const; - Q_REQUIRED_RESULT QString authorEmail() const; - - Q_REQUIRED_RESULT QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); - -+ void addThemeDir(const QString&); -+ - static void addPluginPath(const QString &path); - - private: -diff --git a/src/grantleetheme_p.h b/src/grantleetheme_p.h -index eb73dcb..00510e9 100644 ---- a/src/grantleetheme_p.h -+++ b/src/grantleetheme_p.h -@@ -43,7 +43,7 @@ public: - QString description; - QString name; - QString dirName; -- QString absolutePath; -+ QStringList absolutePaths; - QString author; - QString email; - -diff --git a/src/grantleethememanager.cpp b/src/grantleethememanager.cpp -index 606d717..dc99041 100644 ---- a/src/grantleethememanager.cpp -+++ b/src/grantleethememanager.cpp -@@ -125,25 +125,18 @@ public: - - for (const QString &directory : qAsConst(themesDirectories)) { - QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); -- QStringList alreadyLoadedThemeName; - while (dirIt.hasNext()) { - dirIt.next(); - const QString dirName = dirIt.fileName(); - GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - QString themeName = theme.name(); -- if (alreadyLoadedThemeName.contains(themeName)) { -- int i = 2; -- const QString originalName(theme.name()); -- while (alreadyLoadedThemeName.contains(themeName)) { -- themeName = originalName + QStringLiteral(" (%1)").arg(i); -- ++i; -- } -- theme.d->name = themeName; -+ QMap::iterator i = themes.find(dirName); -+ if (i != themes.end()) { -+ i.value().addThemeDir(dirIt.filePath()); -+ } else { -+ themes.insert(dirName, theme); - } -- alreadyLoadedThemeName << themeName; -- themes.insert(dirName, theme); -- //qDebug()<<" theme.name()"<addDir(directory); -@@ -366,7 +359,7 @@ QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QS - GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - if (dirName == themeName) { -- return theme.absolutePath(); -+ return theme.absolutePaths().first(); - } - } - } diff --git a/pkgs/applications/kde/grantleetheme/series b/pkgs/applications/kde/grantleetheme/series deleted file mode 100644 index 9095599ea56b..000000000000 --- a/pkgs/applications/kde/grantleetheme/series +++ /dev/null @@ -1 +0,0 @@ -grantlee-merge-theme-dirs.patch From d0cbae392c730ebd2e9d41b111a955f74fa1dda8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 12:43:32 +0800 Subject: [PATCH 094/688] krename: fix build --- pkgs/applications/misc/krename/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 816b352460ba..578c56a748a7 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -23,6 +23,8 @@ in mkDerivation rec { propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ]; + NIX_LDFLAGS = "-ltag"; + meta = with lib; { description = "A powerful batch renamer for KDE"; homepage = "https://kde.org/applications/utilities/krename/"; From c5af3991c109d6d0b3a1bbd7e085a1254b05c1e7 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 13:02:01 +0800 Subject: [PATCH 095/688] plasma-applet-caffeine-plus: init at 1.4 --- .../plasma-5/addons/caffeine-plus.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/desktops/plasma-5/addons/caffeine-plus.nix diff --git a/pkgs/desktops/plasma-5/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/addons/caffeine-plus.nix new file mode 100644 index 000000000000..66e1255f223a --- /dev/null +++ b/pkgs/desktops/plasma-5/addons/caffeine-plus.nix @@ -0,0 +1,32 @@ +{ lib, mkDerivation, fetchFromGitHub, extra-cmake-modules +, kwindowsystem, plasma-framework }: + +mkDerivation rec { + pname = "plasma-applet-caffeine-plus"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "qunxyz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/Nz0kSDGok7GjqSQtjH/8q/u6blVTFPO6kfjEyt/jEo="; + }; + + buildInputs = [ + kwindowsystem plasma-framework + ]; + + nativeBuildInputs = [ extra-cmake-modules ]; + + cmakeFlags = [ + "-Wno-dev" + ]; + + meta = with lib; { + description = "Disable screensaver and auto suspend"; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + inherit (src.meta) homepage; + inherit (kwindowsystem.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c29ba66b3ff..c4de378f4453 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25199,6 +25199,8 @@ in plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm systemsettings user-manager xdg-desktop-portal-kde; + plasma-applet-caffeine-plus = libsForQt5.callPackage ../desktops/plasma-5/addons/caffeine-plus.nix { }; + kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { }; krohnkite = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/krohnkite.nix { }; From c4bf4f7b3527dd44f2f7e9e66f4a161cc4ededa6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 13:12:16 +0800 Subject: [PATCH 096/688] pimcommon: missing dependencies --- pkgs/applications/kde/pimcommon.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index cd9ff2528fac..2e74f528aeb1 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -1,9 +1,9 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs, + akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs, kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, - kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit, + kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit, kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine }: @@ -15,12 +15,12 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets - kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit + akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets + kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit kpurpose kwallet kwindowsystem libkdepim qtwebengine ]; propagatedBuildInputs = [ - akonadi akonadi-contacts kconfig kcontacts kimap + akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap ]; outputs = [ "out" "dev" ]; } From 4d933589f68842703f486eb01c859547ec3a016b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 14:19:15 +0800 Subject: [PATCH 097/688] kdepim-apps-libs: drop patch now in upstream --- .../kde/kdepim-apps-libs/default.nix | 1 - ...-apps-libs-grantlee-merge-theme-dirs.patch | 62 ------------------- pkgs/applications/kde/kdepim-apps-libs/series | 1 - 3 files changed, 64 deletions(-) delete mode 100644 pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch delete mode 100644 pkgs/applications/kde/kdepim-apps-libs/series diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix index 6189e8706db0..a9b906b7b238 100644 --- a/pkgs/applications/kde/kdepim-apps-libs/default.nix +++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix @@ -11,7 +11,6 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets diff --git a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch deleted file mode 100644 index 02c369cc4ee8..000000000000 --- a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp -=================================================================== ---- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp -+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp -@@ -50,9 +50,9 @@ public: - mTemplateLoader.clear(); - } - -- void changeGrantleePath(const QString &path) -+ void changeGrantleePath(const QStringList &paths) - { -- mTemplateLoader->setTemplateDirs(QStringList() << path); -+ mTemplateLoader->setTemplateDirs(paths); - mEngine->addTemplateLoader(mTemplateLoader); - - mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html")); -@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee - - void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path) - { -- d->changeGrantleePath(path); -+ d->changeGrantleePath(QStringList(path)); - } - - void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme) - { -- d->changeGrantleePath(theme.absolutePath()); -+ d->changeGrantleePath(theme.absolutePaths()); - } - - inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value) -Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp -=================================================================== ---- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp -+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp -@@ -74,9 +74,9 @@ public: - mTemplateLoader.clear(); - } - -- void changeGrantleePath(const QString &path) -+ void changeGrantleePath(const QStringList &paths) - { -- mTemplateLoader->setTemplateDirs(QStringList() << path); -+ mTemplateLoader->setTemplateDirs(paths); - mEngine->addTemplateLoader(mTemplateLoader); - - mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html")); -@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta - - void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path) - { -- d->changeGrantleePath(path); -+ d->changeGrantleePath(QStringList(path)); - } - - void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme) - { -- d->changeGrantleePath(theme.absolutePath()); -+ d->changeGrantleePath(theme.absolutePaths()); - } - - void GrantleeContactFormatter::setForceDisableQRCode(bool b) diff --git a/pkgs/applications/kde/kdepim-apps-libs/series b/pkgs/applications/kde/kdepim-apps-libs/series deleted file mode 100644 index 1e8a52b55e96..000000000000 --- a/pkgs/applications/kde/kdepim-apps-libs/series +++ /dev/null @@ -1 +0,0 @@ -kdepim-apps-libs-grantlee-merge-theme-dirs.patch From d6690a9f6fb986e058292f7f199de15affaea0fc Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 14:19:45 +0800 Subject: [PATCH 098/688] kdeApplications.mailimporter: add missing dependency --- pkgs/applications/kde/mailimporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix index f002ff0f3403..5de58658777a 100644 --- a/pkgs/applications/kde/mailimporter.nix +++ b/pkgs/applications/kde/mailimporter.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n, - kmime, kxmlgui, libkdepim + kmime, kxmlgui, libkdepim, pimcommon }: mkDerivation { @@ -14,6 +14,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime - kxmlgui libkdepim + kxmlgui libkdepim pimcommon ]; } From 118ff6be39fdba4f4e1d3d6cfb43510ef9ef4582 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 14:57:15 +0800 Subject: [PATCH 099/688] qca-qt5: 2.2.1 -> 2.3.1 --- pkgs/development/libraries/qca-qt5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 77f4e1b9053b..06de3f7c5693 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "qca-qt5"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np"; + sha256 = "sha256-wThREJq+/EYjNwmJ+uOnRb9rGss8KhOolYU5gj6XTks="; }; buildInputs = [ openssl qtbase ]; From 7ad2afa78309ae731cbbe065665c07e835642d37 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 14:57:33 +0800 Subject: [PATCH 100/688] kdepim-runtime: add missing dependency --- pkgs/applications/kde/kdepim-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 65719514f96b..95889306cb79 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -5,7 +5,7 @@ akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, - pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns, + pimcommon, qtwebengine, libkgapi, qca-qt5, qtnetworkauth, qtspeech, qtxmlpatterns, }: mkDerivation { @@ -19,6 +19,6 @@ mkDerivation { akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine - pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns + pimcommon libkgapi qca-qt5 qtnetworkauth qtspeech qtxmlpatterns ]; } From c026e28206972073c6f057e67890fe42c64665f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 Aug 2020 06:57:51 +0000 Subject: [PATCH 101/688] minder: 1.9.1 -> 1.9.2 --- pkgs/applications/misc/minder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 52db4d0c6cc6..14b9ebfe4c7d 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "1823nl9hgsa9l04ra1drj3c7r8s5ybx6c06d9ijpwqz191sz2jg2"; + sha256 = "0lhwwx515f0ycpinkhgbjnik7dj2c7fckikbgzwkzzs25xqp9ayj"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; From e4e0c4b8cd2f6d1b58fd3756e732122ebf0b9565 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Fri, 21 Aug 2020 09:05:26 +0100 Subject: [PATCH 102/688] Agda: add release notes --- nixos/doc/manual/release-notes/rl-2009.xml | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 83bc2f82bbfc..a85f771c9844 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -971,6 +971,40 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; the previous behaviour using undervolt.useTimer. + + + Agda has been heavily reworked. + + + + agda.mkDerivation has been heavily changed and + is now located at agdaPackages.mkDerivation. + + + + + New top-level packages agda and + agda.withPackages have been added, the second + of which sets up agda with access to chosen libraries. + + + + + All agda libraries now live under + agdaPackages. + + + + + Many broken libraries have been removed. + + + + See the new + documentation for more information. + + From a70098ebee994dc753f3e2a44e56f84cc1e37a4d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 21:46:33 +0800 Subject: [PATCH 103/688] kdepim-runtime: add missing dependency --- pkgs/applications/kde/kdepim-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 95889306cb79..27ca6ff9aaf4 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -4,7 +4,7 @@ shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, - kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, + kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, pimcommon, qtwebengine, libkgapi, qca-qt5, qtnetworkauth, qtspeech, qtxmlpatterns, }: @@ -18,7 +18,7 @@ mkDerivation { buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap - kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine + kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine pimcommon libkgapi qca-qt5 qtnetworkauth qtspeech qtxmlpatterns ]; } From 1bb17c5ff34ebeb7fb174097986d9b5069511f93 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 22:53:12 +0800 Subject: [PATCH 104/688] calendarsupport: add missing dependency --- pkgs/applications/kde/calendarsupport.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix index 485397ec4aac..1537bd25d55e 100644 --- a/pkgs/applications/kde/calendarsupport.nix +++ b/pkgs/applications/kde/calendarsupport.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs, + akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs, kholidays, kidentitymanagement, kmime, pimcommon, qttools, }: @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools + akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools ]; propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ]; outputs = [ "out" "dev" ]; From 48a84a4883e15190e26ad020eeec224747aeb890 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 22:53:18 +0800 Subject: [PATCH 105/688] kontact: add missing dependency --- pkgs/applications/kde/kontact.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix index 978baa925e5a..eb28458392ce 100644 --- a/pkgs/applications/kde/kontact.nix +++ b/pkgs/applications/kde/kontact.nix @@ -4,7 +4,7 @@ qtwebengine, kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem, akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit, - mailcommon, libkdepim + mailcommon, libkdepim, pimcommon }: mkDerivation { @@ -18,6 +18,6 @@ mkDerivation { qtwebengine kcmutils kcrash kdbusaddons kparts kwindowsystem akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit - mailcommon libkdepim + mailcommon libkdepim pimcommon ]; } From 04eb318ad16c2eaaff65ec487bb7b6beb276d7f2 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 23:13:25 +0800 Subject: [PATCH 106/688] incidenceeditor: add missing dependency --- pkgs/applications/kde/incidenceeditor.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix index 8224b98253b6..30955d1c2743 100644 --- a/pkgs/applications/kde/incidenceeditor.nix +++ b/pkgs/applications/kde/incidenceeditor.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs, - kdiagram, kldap, kmime, qtbase, + kdiagram, kldap, kmime, pimcommon, qtbase }: mkDerivation { @@ -14,7 +14,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram - kldap kmime qtbase + kldap kmime pimcommon qtbase ]; outputs = [ "out" "dev" ]; } From eaec2e831dbc39dc179359f32b602a0ce1fde8ef Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 23:13:48 +0800 Subject: [PATCH 107/688] kmail: drop unneeded patch --- pkgs/applications/kde/kmail.nix | 1 - pkgs/applications/kde/kmail.patch | 24 ------------------------ 2 files changed, 25 deletions(-) delete mode 100644 pkgs/applications/kde/kmail.patch diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index 6b8941e57876..d225eba82234 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -27,5 +27,4 @@ mkDerivation { kdepim-addons ]; propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ]; - patches = [ ./kmail.patch ]; } diff --git a/pkgs/applications/kde/kmail.patch b/pkgs/applications/kde/kmail.patch deleted file mode 100644 index 71a23be2d839..000000000000 --- a/pkgs/applications/kde/kmail.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt -index 48ed076..9c56896 100644 ---- a/agents/archivemailagent/CMakeLists.txt -+++ b/agents/archivemailagent/CMakeLists.txt -@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui ) - add_library(archivemailagent STATIC ${libarchivemailagent_SRCS}) - target_link_libraries(archivemailagent - KF5::MailCommon -+ KF5::Libkdepim - KF5::I18n - KF5::Notifications - KF5::IconThemes -diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt -index a56b730..83604cf 100644 ---- a/agents/followupreminderagent/CMakeLists.txt -+++ b/agents/followupreminderagent/CMakeLists.txt -@@ -23,6 +23,7 @@ target_link_libraries(followupreminderagent - KF5::AkonadiMime - KF5::AkonadiAgentBase - KF5::DBusAddons -+ KF5::FollowupReminder - KF5::XmlGui - KF5::KIOWidgets - KF5::Notifications From ca9b0c2beb9dc5814a706674a2853caffad7ba42 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Aug 2020 23:27:29 +0800 Subject: [PATCH 108/688] soundkonverter: add patch for kf5 5.72+ --- pkgs/applications/audio/soundkonverter/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index df5806b50b9e..3e133a0caa15 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -1,6 +1,6 @@ # currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery { - mkDerivation, fetchFromGitHub, lib, makeWrapper, + mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper, cmake, extra-cmake-modules, pkgconfig, libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui, qtbase, phonon, @@ -53,6 +53,15 @@ mkDerivation rec { rev = "v" + version; sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l"; }; + patches = [ + # already merged into master, so it can go during the next release + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/dfaust/soundkonverter/pull/87.patch"; + sha256 = "sha256-XIpD4ZMTZVcu+F27OtpRy51H+uQgpd5l22IZ6XsD64w="; + name = "soundkonverter_taglib.patch"; + stripLen = 1; + }) + ]; enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; From 346a1b0ec608b1c926b2e8d5a959c60b04656358 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 6 Aug 2020 19:21:53 +0200 Subject: [PATCH 109/688] nixos/hercules-ci-agent: init --- nixos/doc/manual/release-notes/rl-2009.xml | 5 + nixos/modules/module-list.nix | 1 + .../hercules-ci-agent/common.nix | 213 ++++++++++++++++++ .../hercules-ci-agent/default.nix | 86 +++++++ 4 files changed, 305 insertions(+) create mode 100644 nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix create mode 100644 nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 7a06c06fed1e..c0083eab5608 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -175,6 +175,11 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; There is a new module that provides doas, a lighter alternative to sudo with many of the same features. + + + + Hercules CI Agent is a specialized build agent for projects built with Nix. See the options and setup. + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 08ed6e63e724..6f5eccf51212 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -263,6 +263,7 @@ ./services/continuous-integration/buildbot/worker.nix ./services/continuous-integration/buildkite-agents.nix ./services/continuous-integration/hail.nix + ./services/continuous-integration/hercules-ci-agent/default.nix ./services/continuous-integration/hydra/default.nix ./services/continuous-integration/gitlab-runner.nix ./services/continuous-integration/gocd-agent/default.nix diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix new file mode 100644 index 000000000000..4aed493c0fb0 --- /dev/null +++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix @@ -0,0 +1,213 @@ +/* + +This file is for options that NixOS and nix-darwin have in common. + +Platform-specific code is in the respective default.nix files. + + */ + +{ config, lib, options, pkgs, ... }: + +let + inherit (lib) mkOption mkIf types filterAttrs literalExample mkRenamedOptionModule; + + cfg = + config.services.hercules-ci-agent; + + format = pkgs.formats.toml {}; + + settingsModule = { config, ... }: { + freeformType = format.type; + options = { + baseDirectory = mkOption { + type = types.path; + default = "/var/lib/hercules-ci-agent"; + description = '' + State directory (secrets, work directory, etc) for agent + ''; + }; + concurrentTasks = mkOption { + description = '' + Number of tasks to perform simultaneously, such as evaluations, derivations. + + You must have a total capacity across agents of at least 2 concurrent tasks on x86_64-linux + to allow for import from derivation. + ''; + type = types.int; + default = 4; + }; + workDirectory = mkOption { + description = '' + The directory in which temporary subdirectories are created for task state. This includes sources for Nix evaluation. + ''; + type = types.path; + default = config.baseDirectory + "/work"; + defaultText = literalExample ''baseDirectory + "/work"''; + }; + staticSecretsDirectory = mkOption { + description = '' + This is the default directory to look for statically configured secrets like cluster-join-token.key. + ''; + type = types.path; + default = config.baseDirectory + "/secrets"; + defaultText = literalExample ''baseDirectory + "/secrets"''; + }; + clusterJoinTokenPath = mkOption { + description = '' + Location of the cluster-join-token.key file. + ''; + type = types.path; + default = config.staticSecretsDirectory + "/cluster-join-token.key"; + defaultText = literalExample ''staticSecretsDirectory + "/cluster-join-token.key"''; + # internal: It's a bit too detailed to show by default in the docs, + # but useful to define explicitly to allow reuse by other modules. + internal = true; + }; + binaryCachesPath = mkOption { + description = '' + Location of the binary-caches.json file. + ''; + type = types.path; + default = config.staticSecretsDirectory + "/binary-caches.json"; + defaultText = literalExample ''staticSecretsDirectory + "/binary-caches.json"''; + # internal: It's a bit too detailed to show by default in the docs, + # but useful to define explicitly to allow reuse by other modules. + internal = true; + }; + }; + }; + + checkNix = + if !cfg.checkNix + then "" + else if lib.versionAtLeast config.nix.package.version "2.4.0" + then "" + else pkgs.stdenv.mkDerivation { + name = "hercules-ci-check-system-nix-src"; + inherit (config.nix.package) src patches; + configurePhase = ":"; + buildPhase = '' + echo "Checking in-memory pathInfoCache expiry" + if ! grep 'struct PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then + cat 1>&2 <Hercules CI is a + continuous integation service that is centered around Nix. + + Support is available at help@hercules-ci.com. + ''; + }; + patchNix = mkOption { + type = types.bool; + default = false; + description = '' + Fix Nix 2.3 cache path metadata caching behavior. Has the effect of nix.package = patch pkgs.nix; + + This option will be removed when Hercules CI Agent moves to Nix 2.4 (upcoming Nix release). + ''; + }; + checkNix = mkOption { + type = types.bool; + default = true; + description = '' + Whether to make sure that the system's Nix (nix-daemon) is compatible. + + If you set this to false, please keep up with the change log. + ''; + }; + package = mkOption { + description = '' + Package containing the bin/hercules-ci-agent executable. + ''; + type = types.package; + default = pkgs.hercules-ci-agent; + defaultText = literalExample "pkgs.hercules-ci-agent"; + }; + settings = mkOption { + description = '' + These settings are written to the agent.toml file. + + Not all settings are listed as options, can be set nonetheless. + + For the exhaustive list of settings, see . + ''; + type = types.submoduleWith { modules = [ settingsModule ]; }; + }; + + /* + Internal and/or computed values. + + These are written as options instead of let binding to allow sharing with + default.nix on both NixOS and nix-darwin. + */ + tomlFile = mkOption { + type = types.path; + internal = true; + defaultText = "generated hercules-ci-agent.toml"; + description = '' + The fully assembled config file. + ''; + }; + }; + + config = mkIf cfg.enable { + nix.extraOptions = lib.addContextFrom checkNix '' + # A store path that was missing at first may well have finished building, + # even shortly after the previous lookup. This *also* applies to the daemon. + narinfo-cache-negative-ttl = 0 + ''; + nix.package = mkIf cfg.patchNix patchedNix; + services.hercules-ci-agent.tomlFile = + format.generate "hercules-ci-agent.toml" cfg.settings; + }; +} diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix new file mode 100644 index 000000000000..d2e7e8e18f94 --- /dev/null +++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix @@ -0,0 +1,86 @@ +/* + +This file is for NixOS-specific options and configs. + +Code that is shared with nix-darwin goes in common.nix. + + */ + +{ pkgs, config, lib, ... }: + +let + + inherit (lib) mkIf mkDefault; + + cfg = config.services.hercules-ci-agent; + + command = "${cfg.package}/bin/hercules-ci-agent --config ${cfg.tomlFile}"; + testCommand = "${command} --test-configuration"; + +in +{ + imports = [ + ./common.nix + (lib.mkRenamedOptionModule ["services" "hercules-ci-agent" "user"] ["systemd" "services" "hercules-ci-agent" "serviceConfig" "User"]) + ]; + + config = mkIf cfg.enable { + + systemd.services.hercules-ci-agent = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + path = [ config.nix.package ]; + serviceConfig = { + User = "hercules-ci-agent"; + ExecStart = command; + ExecStartPre = testCommand; + Restart = "on-failure"; + RestartSec = 120; + StartLimitBurst = 30 * 1000000; # practically infinite + }; + }; + + # Changes in the secrets do not affect the unit in any way that would cause + # a restart, which is currently necessary to reload the secrets. + systemd.paths.hercules-ci-agent-restart-files = { + wantedBy = [ "hercules-ci-agent.service" ]; + pathConfig = { + Unit = "hercules-ci-agent-restarter.service"; + PathChanged = [ cfg.settings.clusterJoinTokenPath cfg.settings.binaryCachesPath ]; + }; + }; + systemd.services.hercules-ci-agent-restarter = { + serviceConfig.Type = "oneshot"; + script = '' + # Wait a bit, with the effect of bundling up file changes into a single + # run of this script and hopefully a single restart. + sleep 10 + if systemctl is-active --quiet hercules-ci-agent.service; then + if ${testCommand}; then + systemctl restart hercules-ci-agent.service + else + echo 1>&2 "WARNING: Not restarting agent because config is not valid at this time." + fi + else + echo 1>&2 "Not restarting hercules-ci-agent despite config file update, because it is not already active." + fi + ''; + }; + + # Trusted user allows simplified configuration and better performance + # when operating in a cluster. + nix.trustedUsers = [ config.systemd.services.hercules-ci-agent.serviceConfig.User ]; + services.hercules-ci-agent.settings.nixUserIsTrusted = true; + + users.users.hercules-ci-agent = { + home = cfg.settings.baseDirectory; + createHome = true; + group = "hercules-ci-agent"; + description = "Hercules CI Agent system user"; + isSystemUser = true; + }; + + users.groups.hercules-ci-agent = {}; + }; +} From 55a7a01e808654c8f251ce177ba4e5e7c2b0eb78 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 23 Aug 2020 22:42:58 +0200 Subject: [PATCH 110/688] wxGTK28: drop ancient deps The many-years abandoned GStreamer 0.10 branch no longer builds so let's remove it. Hopefully nothing used it these days. GConf has been abandoned for years too and would not work without user running the daemon. --- pkgs/development/libraries/wxwidgets/2.8/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 98cf0d58479b..deb7d19c0de1 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, gstreamer, gst-plugins-base, GConf, libX11, cairo +, libX11, cairo , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; }; - buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf libX11 cairo ] + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ] ++ optional withMesa libGLU; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b0985e78393..fc051bf193da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15563,9 +15563,7 @@ in wxGTK30 = wxGTK30-gtk2; wxGTK31 = wxGTK31-gtk2; - wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { - inherit (gnome2) GConf; - }; + wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { inherit (gnome2) GConf; @@ -24400,7 +24398,6 @@ in fsg = callPackage ../games/fsg { wxGTK = wxGTK28.override { unicode = false; - gst-plugins-base = null; }; }; From 7bb2382432bd301db7d8c50f06a62cadff898924 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 24 Aug 2020 07:49:12 +0800 Subject: [PATCH 111/688] calligra: 3.1.0 -> 3.2.0 --- pkgs/applications/office/calligra/default.nix | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 6915be9b6d64..40c4b77f1b6b 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -7,7 +7,7 @@ knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, sonnet, threadweaver, kcontacts, akonadi, akonadi-calendar, akonadi-contacts, - eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, libgit2, libodfgen, + eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen, librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon, poppler, pstoedit, qca-qt5, vc # TODO: package Spnav, m2mml LibEtonyek, Libqgit2 @@ -15,18 +15,14 @@ mkDerivation rec { pname = "calligra"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638"; + sha256 = "sha256-flViKGZdeeZ8Bi/RFz1mdvCw187v3W4bC8+aeB6nCVE="; }; - patches = [ ./qt5_11.patch ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost qtwebkit qtx11extras shared-mime-info @@ -35,7 +31,7 @@ mkDerivation rec { kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver kcontacts akonadi akonadi-calendar akonadi-contacts - eigen git gsl ilmbase kproperty kreport lcms2 marble libgit2 libodfgen librevenge + eigen git gsl ilmbase kproperty kreport lcms2 marble pcre libgit2 libodfgen librevenge libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc ]; @@ -43,13 +39,10 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - postInstall = '' - for i in $out/bin/*; do - wrapProgram $i \ - --prefix PATH ':' "${pstoedit.out}/bin" \ - --prefix XDG_DATA_DIRS ':' "${breeze-icons}/share" - done - ''; + qtWrapperArgs = [ + "--prefix PATH : ${lib.getBin pstoedit}/bin" + "--prefix XDG_DATA_DIRS : ${breeze-icons}/share" + ]; meta = with lib; { description = "A suite of productivity applications"; @@ -64,7 +57,5 @@ mkDerivation rec { maintainers = with maintainers; [ phreedom ebzzry zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; - hydraPlatforms = []; - broken = true; # fails to start, kde home not found }; } From f061b8b64fdf6a2c6a31233734003bc2466c0049 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Aug 2020 04:53:57 +0000 Subject: [PATCH 112/688] rdma-core: 30.0 -> 31.0 --- pkgs/os-specific/linux/rdma-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index b1770a4d6189..59a7125aad6d 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "30.0"; + version = "31.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1czfh6s0qz2cv2k7ha7nr9qiwcrj5lvwqnvyrvsds463m8ndpg12"; + sha256 = "0qr8a25ylmkwfgyj519zvl74q16bhf4895xjich2r98rl2yg0qdl"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; From 51f9c0c447bad04cf976b0d1ce392f8be6d5a1c5 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Mon, 24 Aug 2020 18:22:51 +1200 Subject: [PATCH 113/688] lego: specify passthru.tests --- pkgs/tools/admin/lego/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 4517077ac46b..4b2d88cdf275 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: buildGoModule rec { pname = "lego"; @@ -27,4 +27,6 @@ buildGoModule rec { homepage = "https://go-acme.github.io/lego/"; maintainers = teams.acme.members; }; + + passthru.tests.lego = nixosTests.acme; } From fb0e3ca40e818badabf52eaa10f0025716e2b962 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Mon, 24 Aug 2020 19:46:50 +1200 Subject: [PATCH 114/688] nixos/acme: fix subjectAltName in test snakeoil certs --- nixos/tests/common/acme/server/mkcerts.nix | 3 +- .../common/acme/server/snakeoil-certs.nix | 305 +++++++++--------- 2 files changed, 155 insertions(+), 153 deletions(-) diff --git a/nixos/tests/common/acme/server/mkcerts.nix b/nixos/tests/common/acme/server/mkcerts.nix index 2474019cbac3..c9616bf9672c 100644 --- a/nixos/tests/common/acme/server/mkcerts.nix +++ b/nixos/tests/common/acme/server/mkcerts.nix @@ -59,7 +59,8 @@ pkgs.runCommand "acme-snakeoil-ca" { openssl genrsa -out snakeoil.key 4096 openssl req -new -key snakeoil.key -out snakeoil.csr openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \ - -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500 + -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500 \ + -extfile "$OPENSSL_CONF" -extensions req_ext addpem snakeoil.key ${lib.escapeShellArg fqdn} key addpem snakeoil.pem ${lib.escapeShellArg fqdn} cert '') domains} diff --git a/nixos/tests/common/acme/server/snakeoil-certs.nix b/nixos/tests/common/acme/server/snakeoil-certs.nix index fd537c3260f1..7325b027c7ef 100644 --- a/nixos/tests/common/acme/server/snakeoil-certs.nix +++ b/nixos/tests/common/acme/server/snakeoil-certs.nix @@ -2,170 +2,171 @@ { ca.key = builtins.toFile "ca.key" '' -----BEGIN PRIVATE KEY----- - MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDCnVZGEn68ezXl - DWE5gjsCPqutR4nxw/wvIbAxB2Vk2WeQ6HGvt2Jdrz5qer2IXd76YtpQeqd+ffet - aLtMeFTr+Xy9yqEpx2AfvmEEcLnuiWbsUGZzsHwW7/4kPgAFBy9TwJn/k892lR6u - QYa0QS39CX85kLMZ/LZXUyClIBa+IxT1OovmGqMOr4nGASRQP6d/nnyn41Knat/d - tpyaa5zgfYwA6YW6UxcywvBSpMOXM0/82BFZGyALt3nQ+ffmrtKcvMjsNLBFaslV - +zYO1PMbLbTCW8SmJTjhzuapXtBHruvoe24133XWlvcP1ylaTx0alwiQWJr1XEOU - WLEFTgOTeRyiVDxDunpz+7oGcwzcdOG8nCgd6w0aYaECz1zvS3FYTQz+MiqmEkx6 - s4bj1U90I0kwUJbeWjjrGO7Y9Qq4i19GafDg7cAMn9eHCiNbNrPj6t/gfaVbCrbk - m3ZVjkvLTQ2mb2lv7+tVii45227iNPuNS6lx2FVlr/DXiRrOVfghPvoOxUfXzogJ - hZLV4Zki+ycbGQa5w8YMDYCv4c08dKA7AatVhNS60c1zgQNjuWF3BvocSySyGUon - VT6h1DYlJ9YAqgqNpedgNR9kpp034SMhB7dj9leB6LRMA+c1fG/T+1lDbkA+vope - pt4+30oDcCTYfEifl1HwqNw/bXDm1wIDAQABAoICABPbd/UYaAQVUk93yQbUKe81 - s9CvbvzTMYUhm9e02Hyszitz/D2gqZHDksvMkFA8u8aylXIGwdZfRglUmV/ZG1kk - kLzQ0xbvN/ilNUL9uYsETBMqtPly9YZloHnUNa5NqF+UVGJGk7GWz5WaLANybx3V - fTzDbfLl3TkVy0vt9UQbUkUfXyzwZNjXwmgIr8rcY9vasP90a3eXqRX3Tw1Wk6A4 - TzO8oB994O0WBO150Fc6Lhwvc72yzddENlLDXq8UAXtqq9mmGqJKnhZ+1mo3AkMw - q7P1JyCIxcAMm26GtRvLVljXV0x5640kxDrCin6jeeW/qWkJEW6dpmuZjR5scmLI - /9n8H+fGzdZH8bOPPotMy12doj3vJqvew3p0eIkmVctYMJKD0j/CWjvKJNE3Yx4O - Ls47X/dEypX6anR1HQUXcpd6JfRWdIJANo2Duaz+HYbyA88bHcJL9shFYcjLs3sX - R/TvnnKHvw/ud7XBgvLGwGAf/cDEuLI2tv+V7tkMGrMUv+gUJNZaJaCpdt+1iUwO - QFq8APyBNn6FFw54TwXWfSjfSNh3geIMLHuErYVu9MIXvB7Yhh+ZvLcfLbmckhAX - wb39RRHnCWvnw5Bm9hnsDhqfDsIoP+2wvUkViyHOmrKi8nSJhSk19C8AuQtSVcJg - 5op+epEmjt70GHt52nuBAoIBAQD2a4Ftp4QxWE2d6oAFI6WPrX7nAwI5/ezCbO/h - yoYAn6ucTVnn5/5ITJ8V4WTWZ4lkoZP3YSJiCyBhs8fN63J+RaJ/bFRblHDns1HA - 2nlMVdNLg6uOfjgUJ8Y6xVM0J2dcFtwIFyK5pfZ7loxMZfvuovg74vDOi2vnO3dO - 16DP3zUx6B/yIt57CYn8NWTq+MO2bzKUnczUQRx0yEzPOfOmVbcqGP8f7WEdDWXm - 7scjjN53OPyKzLOVEhOMsUhIMBMO25I9ZpcVkyj3/nj+fFLf/XjOTM00M/S/KnOj - RwaWffx6mSYS66qNc5JSsojhIiYyiGVEWIznBpNWDU35y/uXAoIBAQDKLj0dyig2 - kj1r3HvdgK4sRULqBQFMqE9ylxDmpJxAj6/A8hJ0RCBR57vnIIZMzK4+6K0l3VBJ - ukzXJHJLPkZ0Uuo2zLuRLkyjBECH6KYznyTkUVRn50Oq6IoP6WTCfd3Eg+7AKYY1 - VFo2iR8sxeSQQ+AylFy6QcQ1xPIW30Jj1/LFjrRdRggapPEekpJec0pEqhasT8rR - UFhRL2NdZnL5b7ZlsJc7gZKEJgNfxgzaCzloqLcjCgGpOhLKx0fFsNOqHcbIGMwG - 6wQCOyNghQJ6AZtRD5TYCJow92FchWjoTIaMJ8RjMKQmxpiwM6wQG4J78Hd3mbhf - q0hiQhPHaNbBAoIBAFeIeMFq8BpXM7sUwcURlI4lIx8Mgo33FVM7PzsFpfQyw9MR - 5w3p6vnjvd8X4aoHvVZxzw3hA0WwjiAmrKMJL/KK6d45rP2bDUBBAplvAgeLtTLt - 4tMLIwCF4HSgA55TIPQlaqO1FDC+M4BTSiMZVxS970/WnZPBEuNgzFDFZ+pvb4X6 - 3t40ZLNwAAQHM4IEPAFiHqWMKGZ9eo5BWIeEHnjHmfjqSDYfLJAVYk1WJIcMUzom - lA76CBC8CxW/I94AtcRhWuFUv/Z5/+OYEYLUxtuqPm+J+JrCmf4OJmWppT1wI2+p - V00BSeRVWXTm1piieM8ahF5y1hp6y3uV3k0NmKECggEBAMC42Ms3s6NpPSE+99eJ - 3P0YPJOkl7uByNGbTKH+kW89SDRsy8iGVCSe9892gm5cwU/4LWyljO3qp2qBNG2i - /DfP/bCk8bqPXsAZwoWK8DrO3bTCDepJWYhlx40pVkHLBwVXGdOVAXh+YswPY2cj - cB9QhDrSj52AKU9z36yLvtY7uBA3Wph6tCjpx2n0H4/m6AmR9LDmEpf5tWYV/OrA - SKKaqUw/y7kOZyKOtbKqr/98qYmpIYFF/ZVZZSZkVXcNeoZzgdOlR37ksVqLEsrj - nxu7wli/uItBj/FTLjyqcvjUUYDyO1KtwBuyPUPgzYhBIN2Rt9+K6WRQelwnToFL - 30ECggEBALzozykZj2sr3z8tQQRZuXLGotUFGsQCB8ikeqoeB8FbNNkC+qgflQGv - zLRB2KWOvnboc94wVgBJH43xG0HBibZnBhUO8/HBI/WlmyEj9KQ/ZskUK4GVZkB6 - r/81ASLwH+P/rqrLEjcp1SIPPevjzCWD9VYR5m/qPHLNxStwGSrPjtPzgaFxhq84 - Jl+YVmNqVlrOKYYfIPh8exPLiTti3wfM61pVYFv56PI2gd5ysMWYnuN+vK0sbmZh - cIWwykcKlODIngI7IzYqt8NuIJI0jrYyHgtUw4jaJzdF4mEOplGONxdz15jAGHtg - JUsBXFNz132nP4iIr3UKrPedQZijSi4= + MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDd1G7OFpXIoHnr + rxdw+hiJVDY6nQDDKFt9FBKwlv7x2hCvX7bnyvHaL7H61c+80McGPISrQn3+MjuR + Zuqwax49DddNXbGt4WqGlx4LAeI37OgNUUz9foNr2rDDV744vwp14/PD1f3nqpWf + Ogzzsh8rxac0mZ5Se9HxOIpI7NRNuHJjj7HWZ4YxeOvi289rmpu0JPcp25njw7h6 + FNfHu8GGp34Uj6wAxubdRyfViV8z9FMfbglLuA9i1OiSy3NQpq8VwBG+u/0iC7PQ + sQjxSragQu25sfATYIrFJQ4ZCvh0nxqKMeyPPBi6dAcMpa2AZAqtqv+CwWdo36Bt + S5XiC7rApgYn+yteKQHSbnCiG2W/boSbfg9lRk3w41dESENCADVajLb3Eovvp0tB + O/BALudvWjzAPbpXleVNr6ngWtGlsZTC7LXDgBqdW2KlzpZGcz+PW3ATlwip/ZFR + t7A15u5dVkWPVoPuQ0w1Tw+g9dxWFTNk3h+2d7K87IxQbcvqxeIDSEVFMrxo0e4C + G2udMcelZwARl6iNTAETa2zJW0XtAdGVM+HY1S/kU6U9J3nubDttAkAMABjPwyjL + G7hfyWqUHf9yPs49GsftAVvIy8XIeu0shD1BG11/VzvwpUCiRc+btuWi2erZ4ZfP + oQ5YoS9gt4S+Ipz7TPGBl+AUk9HO2QIDAQABAoICAGW+aLAXxc2GZUVHQp4r55Md + T94kYtQgL4435bafGwH8vchiQzcfazxiweRFqwl0TMS8fzE5xyYPDilLpfsStoTU + U1sFzVfuWviuWTY9P+/ctjZdgs2F+GtAm/CMzw+h9/9IdWbuQI3APO4SJxyjJw7h + kiZbCzXT2uAjybFXBq07GyQ1JSEszGzmhHLB1OoKuL2wcrj9IyFHhNZhtvLCWCoV + qotttjuI/xyg5VFYt5TRzEpPIu5a1pvDAYVK0XI9cXKtbLYp7RlveqMOgAaD+S2a + ZQTV60JH9n4j18p+sKR00SxvZ4vuyXzDePRBDUolGIy9MIJdiLueTiuzDmTmclnM + 8Yy7oliawW2Bn+1gaWpqmgzEUw9bXRSqIp2zGZ7HaQ+5c/MhS002+/i8WQyssfeg + 9EfI+Vl0D2avTxCECmsfjUxtkhzMYPVNbRPjt0QBEM+s8lDoNsP2zhMO441+TKpe + /5KZHIW+Y0US6GMIUs1o1byKfNz8Nj5HjEKO9CMyK6SBMJnCMroPD4H6opqk3lw9 + 4mk04BdN556EzyJDT0a5/VpXG2DUYwFaNwE1ZPMu3Yx6IBoM1xx8mR80vHQCddmF + NP+BzkpUiHf0Txyy0YQWECZ/anTt0Bo0XqY5tirIM2dkG0ngNl9tGlw6gVAY1ky8 + +cr7qKmhhwMWojaX/L+9AoIBAQD/BZAeF3l9I5RBh6ktWA+opzVyd6ejdLpc2Q1z + fmSmtUKRsEe51sWaIf6Sez408UaCMT2IQuppPgMnV8xfMM1/og75Cs8aPyAohwKo + IbOenXhLfFZiYB4y/Pac3F+FzNKsTT6n+fsE+82UHafY5ZI2FlPb2L0lfyx09zXv + fBYhcXgwSx5ymJLJSl8zFaEGn9qi3UB5ss44SaNM0n8SFGUQUk3PR7SFWSWgNxtl + CP7LWTsjXYoC/qBMe7b8JieK5aFk1EkkG1EkJvdiMnulMcMJzl+kj6LqVPmVDoZS + mMGvgKGJPpFgrbJ5wlA7uOhucGmMpFWP9RCav66DY4GHrLJPAoIBAQDerkZQ03AN + i2iJVjtL97TvDjrE8vtNFS/Auh8JyDIW4GGK3Y/ZoMedQpuu3e6NYM9aMjh+QJoA + kqhaiZ/tMXjEXJByglpc3a43g2ceWtJg5yLgexGgRtegbA57PRCo35Vhc6WycD1l + 6FZNxpTkd2BXX/69KWZ6PpSiLYPvdzxP5ZkYqoWRQIa4ee4orHfz/lUXJm1XwmyG + mx3hN9Z9m8Q/PGMGfwrorcp4DK53lmmhTZyPh+X5T5/KkVmrw/v5HEEB3JsknStR + 3DAqp2XZcRHsGQef9R7H+PINJm9nebjCraataaE4gr76znXKT23P80Ce5Lw6OQUW + XHhoL16gS+pXAoIBADTuz6ofTz01PFmZsfjSdXWZN1PKGEaqPOB2wP7+9h9QMkAR + KeId/Sfv9GotII1Woz70v4Pf983ebEMnSyla9NyQI7F3l+MnxSIEW/3P+PtsTgLF + DR0gPERzEzEd4Mnh6LyQz/eHwJ2ZMmOTADrZ8848Ni3EwAXfbrfcdBqAVAufBMZp + YSmCF72mLTpqO+EnHvd9GxvnjDxMtJOGgY+cIhoQK0xh4stm5JNrvMjs5A4LOGYv + zSyv80/Mwf92X/DJlwVZttDCxsXNPL3qIpX4TTZk2p9KnRMsjh1tRV4xjMpD1cOp + 8/zwMMJrHcI3sC70MERb+9KEmGy2ap+k8MbbhqsCggEAUAqqocDupR+4Kq2BUPQv + 6EHgJA0HAZUc/hSotXZtcsWiqiyr2Vkuhzt7BGcnqU/kGJK2tcL42D3fH/QaNUM0 + Grj+/voWCw1v4uprtYCF4GkUo0X5dvgf570Pk4LGqzz6z/Wm2LX5i9jwtLItsNWs + HpwVz97CxCwcdxMPOpNMbZek6TXaHvTnuAWz8pDT6TNBWLnqUcJECjpVii/s/Gdy + KhzFp38g57QYdABy8e9x9pYUMY9yvaO+VyzZ46DlwIxEXavzZDzOZnVUJvDW7krz + Wz8/+2I7dzvnnYx0POiG3gtXPzwZxFtS1IpD0r2sRjQ0xSiI9BCs4HXKngBw7gN7 + rwKCAQEAloJOFw4bafVXZVXuQVnLDm0/MNTfqxUzFE6V2WkMVkJqcpKt+ndApM8P + MJvojHWw1fmxDzIAwqZ9rXgnwWKydjSZBDYNjhGFUACVywHe5AjC4PPMUdltGptU + lY0BjC7qtwkVugr65goQkEzU61y9JgTqKpYsr3D+qXcoiDvWRuqk5Q0WfYJrUlE0 + APWaqbxmkqUVDRrXXrifiluupk+BCV7cFSnnknSYbd9FZd9DuKaoNBlkp2J9LZE+ + Ux74Cfro8SHINHmvqL+YLFUPVDWNeuXh5Kl6AaJ7yclCLXLxAIix3/rIf6mJeIGc + s9o9Sr49cibZ3CbMjCSNE3AOeVE1/Q== -----END PRIVATE KEY----- ''; ca.cert = builtins.toFile "ca.cert" '' -----BEGIN CERTIFICATE----- - MIIFDzCCAvegAwIBAgIUTRDYSWJvmlhwIR3pzVrIQfnboLEwDQYJKoZIhvcNAQEL - BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwMzIyMjI1NjE3WhgPMjEy - MDAyMjcyMjU2MTdaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG - 9w0BAQEFAAOCAg8AMIICCgKCAgEAwp1WRhJ+vHs15Q1hOYI7Aj6rrUeJ8cP8LyGw - MQdlZNlnkOhxr7diXa8+anq9iF3e+mLaUHqnfn33rWi7THhU6/l8vcqhKcdgH75h - BHC57olm7FBmc7B8Fu/+JD4ABQcvU8CZ/5PPdpUerkGGtEEt/Ql/OZCzGfy2V1Mg - pSAWviMU9TqL5hqjDq+JxgEkUD+nf558p+NSp2rf3bacmmuc4H2MAOmFulMXMsLw - UqTDlzNP/NgRWRsgC7d50Pn35q7SnLzI7DSwRWrJVfs2DtTzGy20wlvEpiU44c7m - qV7QR67r6HtuNd911pb3D9cpWk8dGpcIkFia9VxDlFixBU4Dk3kcolQ8Q7p6c/u6 - BnMM3HThvJwoHesNGmGhAs9c70txWE0M/jIqphJMerOG49VPdCNJMFCW3lo46xju - 2PUKuItfRmnw4O3ADJ/XhwojWzaz4+rf4H2lWwq25Jt2VY5Ly00Npm9pb+/rVYou - Odtu4jT7jUupcdhVZa/w14kazlX4IT76DsVH186ICYWS1eGZIvsnGxkGucPGDA2A - r+HNPHSgOwGrVYTUutHNc4EDY7lhdwb6HEskshlKJ1U+odQ2JSfWAKoKjaXnYDUf - ZKadN+EjIQe3Y/ZXgei0TAPnNXxv0/tZQ25APr6KXqbePt9KA3Ak2HxIn5dR8Kjc - P21w5tcCAwEAAaNTMFEwHQYDVR0OBBYEFCIoeYSYjtMiPrmxfHmcrsZkyTpvMB8G - A1UdIwQYMBaAFCIoeYSYjtMiPrmxfHmcrsZkyTpvMA8GA1UdEwEB/wQFMAMBAf8w - DQYJKoZIhvcNAQELBQADggIBAHPdwOgAxyhIhbqFObNftW8K3sptorB/Fj6jwYCm - mHleFueqQnjTHMWsflOjREvQp1M307FWooGj+KQkjwvAyDc/Hmy7WgJxBg9p3vc+ - /Xf/e7ZfBl8rv7vH8VXW/BC1vVsILdFncrgTrP8/4psV50/cl1F4+nPBiekvvxwZ - k+R7SgeSvcWT7YlOG8tm1M3al4F4mWzSRkYjkrXmwRCKAiya9xcGSt0Bob+LoM/O - mpDGV/PMC1WAoDc1mMuXN2hSc0n68xMcuFs+dj/nQYn8uL5pzOxpX9560ynKyLDv - yOzQlM2VuZ7H2hSIeYOFgrtHJJwhDtzjmUNDQpQdp9Fx+LONQTS1VLCTXND2i/3F - 10X6PkdnLEn09RiPt5qy20pQkICxoEydmlwpFs32musYfJPdBPkZqZWrwINBv2Wb - HfOmEB4xUvXufZ5Ju5icgggBkyNA3PCLo0GZFRrMtvA7i9IXOcXNR+njhKa9246V - QQfeWiz05RmIvgShJYVsnZWtael8ni366d+UXypBYncohimyNlAD1n+Bh3z0PvBB - +FK4JgOSeouM4SuBHdwmlZ/H0mvfUG81Y8Jbrw0yuRHtuCtX5HpN5GKpZPHDE7aQ - fEShVB/GElC3n3DvgK9OJBeVVhYQgUEfJi4rsSxt3cdEI0NrdckUoZbApWVJ3CBc - F8Y7 + MIIFDzCCAvegAwIBAgIUX0P6NfX4gRUpFz+TNV/f26GHokgwDQYJKoZIhvcNAQEL + BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwODI0MDc0MjEyWhgPMjEy + MDA3MzEwNzQyMTJaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG + 9w0BAQEFAAOCAg8AMIICCgKCAgEA3dRuzhaVyKB5668XcPoYiVQ2Op0AwyhbfRQS + sJb+8doQr1+258rx2i+x+tXPvNDHBjyEq0J9/jI7kWbqsGsePQ3XTV2xreFqhpce + CwHiN+zoDVFM/X6Da9qww1e+OL8KdePzw9X956qVnzoM87IfK8WnNJmeUnvR8TiK + SOzUTbhyY4+x1meGMXjr4tvPa5qbtCT3KduZ48O4ehTXx7vBhqd+FI+sAMbm3Ucn + 1YlfM/RTH24JS7gPYtTokstzUKavFcARvrv9Iguz0LEI8Uq2oELtubHwE2CKxSUO + GQr4dJ8aijHsjzwYunQHDKWtgGQKrar/gsFnaN+gbUuV4gu6wKYGJ/srXikB0m5w + ohtlv26Em34PZUZN8ONXREhDQgA1Woy29xKL76dLQTvwQC7nb1o8wD26V5XlTa+p + 4FrRpbGUwuy1w4AanVtipc6WRnM/j1twE5cIqf2RUbewNebuXVZFj1aD7kNMNU8P + oPXcVhUzZN4ftneyvOyMUG3L6sXiA0hFRTK8aNHuAhtrnTHHpWcAEZeojUwBE2ts + yVtF7QHRlTPh2NUv5FOlPSd57mw7bQJADAAYz8Moyxu4X8lqlB3/cj7OPRrH7QFb + yMvFyHrtLIQ9QRtdf1c78KVAokXPm7blotnq2eGXz6EOWKEvYLeEviKc+0zxgZfg + FJPRztkCAwEAAaNTMFEwHQYDVR0OBBYEFNhBZxryvykCjfPO85xB3wof2enAMB8G + A1UdIwQYMBaAFNhBZxryvykCjfPO85xB3wof2enAMA8GA1UdEwEB/wQFMAMBAf8w + DQYJKoZIhvcNAQELBQADggIBAEZwlsQ+3yd1MVxLRy9RjoA8hI7iWBNmvPUyNjlb + l/L9N+dZgdx9G5h/KPRUyzvUc/uk/ZxTWVPIOp13WI65qwsBKrwvYKiXiwzjt+9V + CKDRc1sOghTSXk4FD3L5UcKvTQ2lRcFsqxbkopEwQWhoCuhe4vFyt3Nx8ZGLCBUD + 3I5zMHtO8FtpZWKJPw46Yc1kasv0nlfly/vUbnErYfgjWX1hgWUcRgYdKwO4sOZ7 + KbNma0WUsX5mWhXo4Kk7D15wATHO+j9s+j8m86duBL3A4HzpTo1DhHvBi0dkg0CO + XuSdByIzVLIPh3yhCHN1loRCP2rbzKM8IQeU/X5Q4UJeC/x9ew8Kk+RKXoHc8Y2C + JQO1DxuidyDJRhbb98wZo2YfIsdWQGjYZBe1XQRwBD28JnB+Rb9shml6lORWQn9y + P/STo9uWm5zvOCfqwbnCoetljDweItINx622G9SafBwPZc3o79oL7QSl8DgCtN6g + p0wGIlIBx+25w/96PqZcrYb8B7/uBHJviiKjBXDoIJWNiNRhW5HaFjeJdSKq7KIL + I/PO9KuHafif36ksG69X02Rio2/cTjgjEW1hGHcDRyyJWWaj7bd2eWuouh6FF22b + PA6FGY4vewDPnbLKLaix2ZIKxtedUDOH/qru3Mv58IFXmQ4iyM8oC8aOxYSQLZDn + 1yJD -----END CERTIFICATE----- ''; "acme.test".key = builtins.toFile "acme.test.key" '' -----BEGIN RSA PRIVATE KEY----- - MIIJKAIBAAKCAgEAlgQTZjKfs3aHw0J993k7jFAs+hVRPf//zHMAiUkPKUYPTSl1 - TxS/bPbhWzSoom00j4SLhGGGhbd+lnvTg0uvKbxskgATfw5clbm1ZN+gx4DuxwjL - V3xIxpeSY+PKzs5z8w/k+AJh+zOPyXwH3ut3C+ogp1S/5IhmzV3a/yU/6k0zpGxj - N6ZPRTXFrz93I1pPeCkJz90l7tj+2uFc9xtM20NQX52f0Y2oShcG8fKdNZVzuHHk - ZXkrZIhou55/nRy2jKgFeD3GQQfa9rwPWrVybQ6tKMMkoazB/Unky9xcTI2LJarf - xgHDO9v9yFBvmR4UM8B3kM82NHoENtHaZ2mmiMGZzTEQlf8xwYyHFrqBFIVRWEUr - 7rr/O5Qr9gIN0T4u367HCexVYAKzbO2P9h75czzjMMoGkbXze9SMQ/ikrxEmwAHg - r1Xxh6iQYmgPNk8AR3d9+o2I7WJZMUYZARLnuhVr9BNXv510iqZTqX8lcyL5fEj3 - ST4Ab+H7rfevZt6NU26iJLBYAjrA2mSvH+wvkboxrgSS8xYPkOW8NLNEbbodzofI - pB+SaK53OIk0bj9c1YAgrSNER/TDTgDXrWUNrlfVZ/M7+AEdeU06wi7sVhVif6OB - D3OpgKSNjeE6TuJH80Pi5MWugSFBr792Xb6uhVoPiVOFN+qiGB6UkwBgSKkCAwEA - AQKCAgAmN7OZfZwh5DiCDhZ5TXFWNba/n16rJOTN+R5R20L5iNetGLrCAs8hu2N+ - ENRFTPzu8x14BEB5IF4niDRCZq2hPFeMemh9HfOIUV9c63vSV459NkhXaVpA/axV - tlqchQwVCB+U70Z28JPZCLgYmnQhnOvktTqNxhIqj5aTGbJGxpQ5d0Nvkfbv8tsB - 4nE/mGpWel39jqFzT+Tdbjx414Ok+GkpcsacZDJTbbpfOSfD1uc8PgepskzTt8y2 - v5JTPFVlUAjUsSgouQ+XfCGNQlx8XBjRIaXbal+hX4niRald91FTr0yC7UAHp+vn - dFZ586fB526OfbuZctxP+vZhEhFSseQKxHQ0tB8me81xH44daVNr9PPUM69FDT3j - ygJaUJjNEG3vVzePCDzhmxTmz2/rAClp77WTWziBWDoA6YWDDzhgNPrXWzLIbZIx - ue9ZbGEOh/u5ZzrEXxKCz9FjDe9wQu3TeYUe0M+ejzwWgn7zdWDvjjmtLUUuun2Y - wW7WANpu32qvB/V+qssw4O63tbRiwneRCnb8AF2ixgyWr6xyZwch4kacv1KMiixf - gO/5GTj7ba5GcdGoktJb29cUEgz13yPd106RsHK4vcggFxfMbOVauNRIo6ddLwyS - 8UMxLf2i2cToOLkHZrIb8FgimmzRoBd3yYzwVJBydiVcsrHQAQKCAQEAxlzFYCiQ - hjEtblGnrkOC7Hx6HvqMelViOkGN8Y9VczG4GhwntmSE2nbpaAKhFBGdLfuSI3tJ - Lf24f0IGgAhzPmpo2TjbxPO3YSKFTH71fznVBhtQ1iSxwZ1InXktnuhot6VSDx6A - sbHSy1hMFy3nj+Zj5+fQ89tclzBzG9bCShaauO39KrPMwKi6CYoYdGhXBC3+OpHY - zBNvmDTxG2kW8L42rlf14EH4pAlgKs4eeZbpcbZ6fXURP2hToHJ8swyKw/1p12WA - cc19BKFJXL8nNP4uCf/fI0mVYpytz5KwUzG+z+umDqk+RRCH4mNB28xvEEuEyp/e - /C5Is+WrlDAA6QKCAQEAwZsK4AJ/w4Xf4Q/SsnZJO9bfP1ejJjzKElt8rG28JXeb - +FjykZZ6vw2gt2Boest2n9N4fBwaRkaHVtVS4iAmaDXozTlcvCLs2rVjPSguuQtW - 80CKg6+dux+6gFN8IGzDCiX3pWUnhhiXvCcRYEcvgpH6GA5vuCNrXrjH0JFC0kef - aaDMGMTbzhc2IIRztmWU4v8YJSSy5KOkIQLWO+7u9aGx9IqT5/z3gx3XrItyl0Bk - aQmZEh7JOSyhmGhhf5LdeTLu2YgRw3/tzS+lPMX3+UPw99k9MdTOFn2pww5AdRmg - aBIzV+/LBYG0pPRl0D8/6yzGVBPuUDQpmK9Z3gsxwQKCAQEAnNkMZN2Ocd1+6+V7 - LmtJog9HTSmWXMEZG7FsOJ661Yxx44txx2IyPsCaDNlPXxwSaiKrSo0Yr1oZQd8G - XsTPw4HGiETSWijQTulJ99PH8SLck6iTwdBgEhV5LrN75FQnQVdizHu1DUzrvkiC - Wi29FWb6howiCEDjNNVln5SwKn83NpVQgyyK8ag4+oQMlDdQ3wgzJ0Ld53hS3Eq4 - f5EYR6JQgIki7YGcxrB3L0GujTxMONMuhfdEfRvUTGFawwVe0FyYDW7AIrx2Z2vV - I5YuvVNjOhrt6OwtSD1VnnWCITaLh8LwmlUu3NOWbudHUzKSe5MLXGEPo95BNKad - hl5yyQKCAQBNo0gMJtRnawMpdLfwewDJL1SdSR6S0ePS0r8/Qk4l1D5GrByyB183 - yFY/0zhyra7nTt1NH9PlhJj3WFqBdZURSzUNP0iR5YuH9R9Twg5ihEqdB6/EOSOO - i521okTvl83q/ui9ecAMxUXr3NrZ+hHyUWmyRe/FLub6uCzg1a+vNauWpzXRZPgk - QCijh5oDdd7r3JIpKvtWNs01s7aHmDxZYjtDrmK7sDTtboUzm0QbpWXevUuV+aSF - +gDfZlRa3WFVHfisYSWGeYG6O7YOlfDoE7fJHGOu3QC8Ai6Wmtt8Wgd6VHokdHO8 - xJPVZnCBvyt5up3Zz5hMr25S3VazdVfBAoIBAHVteqTGqWpKFxekGwR0RqE30wmN - iIEwFhgOZ8sQ+6ViZJZUR4Nn2fchn2jVwF8V8J1GrJbTknqzAwdXtO3FbgfmmyF2 - 9VbS/GgomXhA9vJkM4KK3Iwo/y/nE9hRhtzuVE0QPudz2fyfaDgnWjcNM59064tH - 88361LVJm3ixyWSBD41UZ7NgWWJX1y2f073vErsfcPpavF5lhn1oSkQnOlgMJsnl - 24qeuzAgTWu/2rFpIA2EK30Bgvsl3pjJxHwyNDAgklV7C783LIoAHi7VO7tzZ6iF - dmD5XLfcUZc3eaB7XehNQKBXDGLJeI5AFmjsHka5GUoitkU2PFrg/3+nJmg= + MIIJKgIBAAKCAgEA3dJl4ByHHRcqbZzblszHIS5eEW3TcXTvllqC1nedGLGU9dnA + YbdpDUYhvWz/y9AfRZ1d8jYz01jZtt5xWYG0QoQUdkCc9QPPh0Axrl38cGliB6IZ + IY0qftW9zrLSgCOUnXL/45JqSpD57DHMSSiJl3hoOo4keBaMRN/UK6F3DxD/nZEs + h+yBBh2js3qxleExqkX8InmjK9pG8j7qa4Be5Lh4iILBHbGAMaxM7ViNAg4KgWyg + d5+4qB86JFtE/cJ+r3D62ARjVaxU6ePOL0AwS/vx5ls6DFQC7+1CpGCNemgLPzcc + 70s0V0SAnF73xHYqRWjJFtumyvyTkiQWLg0zDQOugWd3B9ADuaIEx2nviPyphAtj + M3ZKrL2zN1aIfqzbxJ/L8TQFa2WPsPU2+iza/m9kMfLXZ4XPF/SJxQ+5yVH+rxx5 + OWrXZ13nCMyeVoaXQofmG7oZvOQbtuT9r5DQZd9WN0P3G3sy0/dNnlNVn8uCBvXJ + TQhRKsy1FESZdgcFNtpJEG7BRG9Gc6i0V39aSRzShZyKJSBQhlc0FMTlX445EYsh + PKjEC/+Suq9wy/LuLjIkkqBbVg4617IlibLz0fDY/yrZqkfSqhCVsWnra21Ty3Mp + vD+wnskTzuGrvCVTe3KcWp+wkeH0xvhr8FXX6nn492YCfvZSITO3FF+qWt8CAwEA + AQKCAgEAk2xV0NCk66yNwjPRrTOD1IWgdyzqrijtYpvdAPSWL+c1/P8vYMIoy22k + 1uQuTSKQ5g9kdKmZYAlZCLRl2Pre9qYZg04GAsD5mAYN/rjwITWotTICSc4sRAeC + EnG+fPMovkvDzVdt1QjtURD3mFeculKH0wLNMhKqPswTkrvJCPZfLDVjxyJjzdC9 + D3enttjnzSaeH7t/upFjPXSbD79NUe1YDkH4XuetL1Y3+jYz4P279bBgJaC9dN7s + IWWXQJ+W2rrXu+GOs03JUXjZe4XJk3ZqmpJezfq3yQWCmQSigovLjcPvMwpkSut4 + HnTvbl6qUV8G5m4tOBMNcL8TDqAvIGY8Q2NAT0iKJN187FbHpjSwQL/Ckgqz/taJ + Q82LfIA1+IjwW372gY2Wge8tM/s3+2vOEn2k91sYfiKtrRFfrHBurehVQSpJb2gL + YPoUhUGu4C1nx44sQw+DgugOBp1BTKA1ZOBIk6NyS/J9sU3jSgMr88n10TyepP6w + OVk9kcNomnm/QIOyTDW4m76uoaxslg7kwOJ4j6wycddS8JtvEO4ZPk/fHZCbvlMv + /dAKsC3gigO2zW6IYYb7mSXI07Ew/rFH1NfSILiGw8GofJHDq3plGHZo9ycB6JC+ + 9C8n9IWjn8ahwbulCoQQhdHwXvf61t+RzNFuFiyAT0PF2FtD/eECggEBAPYBNSEY + DSQc/Wh+UlnwQsevxfzatohgQgQJRU1ZpbHQrl2uxk1ISEwrfqZwFmFotdjjzSYe + e1WQ0uFYtdm1V/QeQK+8W0u7E7/fof4dR6XxrzJ2QmtWEmCnLOBUKCfPc7/4p4IU + 7Q8PDwuwvXgaASZDaEsyTxL9bBrNMLFx9hIScQ9CaygpKvufilCHG79maoKArLwX + s7G16qlT4YeEdiNuLGv0Ce0txJuFYp7cGClWQhruw+jIbr+Sn9pL9cn8GboCiUAq + VgZKsofhEkKIEbP1uFypX2JnyRSE/h0qDDcH1sEXjR9zYYpQjVpk3Jiipgw4PXis + 79uat5/QzUqVc1sCggEBAObVp686K9NpxYNoEliMijIdzFnK5J/TvoX9BBMz0dXc + CgQW40tBcroU5nRl3oCjT1Agn8mxWLXH3czx6cPlSA8fnMTJmev8FaLnEcM15pGI + 8/VCBbTegdezJ8vPRS/T9c4CViXo7d0qDMkjNyn22ojPPFYh8M1KVNhibDTEpXMQ + vJxBJgvHePj+5pMOIKwAvQicqD07fNp6jVPmB/GnprBkjcCQZtshNJzWrW3jk7Fr + xWpQJ8nam8wHdMvfKhpzvD6azahwmfKKaQmh/RwmH4xdtIKdh4j+u+Ax+Bxi0g7V + GQfusIFB1MO48yS6E56WZMmsPy+jhTcIB4prIbfu4c0CggEBALgqqUKwRc4+Ybvj + rfUk+GmT/s3QUwx/u4xYAGjq7y/SgWcjG9PphC559WPWz/p2sITB7ehWs5CYTjdj + +SgWKdVY/KZThamJUTy4yAZ8lxH1gGpvvEOs+S8gmGkMt88t8ILMPWMWFW7LoEDp + PL74ANpLZn29GROnY1IhQQ3mughHhBqfZ6d2QnaDtsGYlD5TBvPSLv7VY7Jr9VR0 + toeEtAjMRzc+SFwmgmTHk9BIB1KTAAQ3sbTIsJh8xW1gpo5jTEND+Mpvp10oeMVe + yxPB2Db4gt/j8MOz3QaelbrxqplcJfsCjaT49RHeQiRlE/y070iApgx8s0idaFCd + ucLXZbcCggEBANkcsdg9RYVWoeCj3UWOAll6736xN/IgDb4mqVOKVN3qVT1dbbGV + wFvHVq66NdoWQH4kAUaKWN65OyQNkQqgt/MJj8EDwZNVCeCrp2hNZS0TfCn9TDK/ + aa7AojivHesLWNHIHtEPUdLIPzhbuAHvXcJ58M0upTfhpwXTJOVI5Dji0BPDrw47 + Msw3rBU6n35IP4Q/HHpjXl58EDuOS4B+aGjWWwF4kFWg2MR/oqWN/JdOv2LsO1A/ + HnR7ut4aa5ZvrunPXooERrf6eSsHQnLcZKX4aNTFZ/pxZbJMLYo9ZEdxJVbxqPAa + RA1HAuJTZiquV+Pb755WFfEZy0Xk19URiS0CggEAPT1e+9sdNC15z79SxvJQ4pmT + xiXat+1pq9pxp5HEOre2sSAd7CF5lu/1VQd6p0gtLZY+Aw4BXOyMtzYWgIap+u9j + ThFl9qrTFppG5KlFKKpQ8dQQ8ofO1akS8cK8nQeSdvrqEC/kGT2rmVdeevhBlfGy + BZi2ikhEQrz5jsLgIdT7sN2aLFYtmzLU9THTvlfm4ckQ7jOTxvVahb+WRe/iMCwP + Exrb83JDo31jHvAoYqUFrZkmPA+DUWFlrqb21pCzmC/0iQSuDcayRRjZkY/s5iAh + gtI6YyAsSL8hKvFVCC+VJf1QvFOpgUfsZjrIZuSc3puBWtN2dirHf7EfyxgEOg== -----END RSA PRIVATE KEY----- ''; "acme.test".cert = builtins.toFile "acme.test.cert" '' -----BEGIN CERTIFICATE----- - MIIEoTCCAokCAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls - IENBMCAXDTIwMDMyMjIyNTYxOFoYDzIxMjAwMjI3MjI1NjE4WjAUMRIwEAYDVQQD - DAlhY21lLnRlc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCWBBNm - Mp+zdofDQn33eTuMUCz6FVE9///McwCJSQ8pRg9NKXVPFL9s9uFbNKiibTSPhIuE - YYaFt36We9ODS68pvGySABN/DlyVubVk36DHgO7HCMtXfEjGl5Jj48rOznPzD+T4 - AmH7M4/JfAfe63cL6iCnVL/kiGbNXdr/JT/qTTOkbGM3pk9FNcWvP3cjWk94KQnP - 3SXu2P7a4Vz3G0zbQ1BfnZ/RjahKFwbx8p01lXO4ceRleStkiGi7nn+dHLaMqAV4 - PcZBB9r2vA9atXJtDq0owyShrMH9SeTL3FxMjYslqt/GAcM72/3IUG+ZHhQzwHeQ - zzY0egQ20dpnaaaIwZnNMRCV/zHBjIcWuoEUhVFYRSvuuv87lCv2Ag3RPi7frscJ - 7FVgArNs7Y/2HvlzPOMwygaRtfN71IxD+KSvESbAAeCvVfGHqJBiaA82TwBHd336 - jYjtYlkxRhkBEue6FWv0E1e/nXSKplOpfyVzIvl8SPdJPgBv4fut969m3o1TbqIk - sFgCOsDaZK8f7C+RujGuBJLzFg+Q5bw0s0Rtuh3Oh8ikH5Jornc4iTRuP1zVgCCt - I0RH9MNOANetZQ2uV9Vn8zv4AR15TTrCLuxWFWJ/o4EPc6mApI2N4TpO4kfzQ+Lk - xa6BIUGvv3Zdvq6FWg+JU4U36qIYHpSTAGBIqQIDAQABMA0GCSqGSIb3DQEBCwUA - A4ICAQBCDs0V4z00Ze6Ask3qDOLAPo4k85QCfItlRZmwl2XbPZq7kbe13MqF2wxx - yiLalm6veK+ehU9MYN104hJZnuce5iEcZurk+8A+Pwn1Ifz+oWKVbUtUP3uV8Sm3 - chktJ2H1bebXtNJE5TwvdHiUkXU9ywQt2FkxiTSl6+eac7JKEQ8lVN/o6uYxF5ds - +oIZplb7bv2XxsRCzq55F2tJX7fIzqXrSa+lQTnfLGmDVMAQX4TRB/lx0Gqd1a9y - qGfFnZ7xVyW97f6PiL8MoxPfd2I2JzrzGyP/igNbFOW0ho1OwfxVmvZeS7fQSc5e - +qu+nwnFfl0S4cHRif3G3zmz8Ryx9LM5TYkH41qePIHxoEO2sV0DgWJvbSjysV2S - EU2a31dJ0aZ+z6YtZVpHlujKMVzxVTrqj74trS4LvU5h/9hv7e1gjYdox1TO0HMK - mtDfgBevB21Tvxpz67Ijf31HvfTmCerKJEOjGnbYmyYpMeMNSONRDcToWk8sUwvi - OWa5jlUFRAxgXNM09vCTPi9aRUhcFqACqfAd6I1NqGVlfplLWrc7SWaSa+PsLfBf - 4EOZfk8iEKBVeYXNjg+CcD8j8yk/oEs816/jpihIk8haCDRWYWGKyyGnwn6OQb8d - MdRO2b7Oi/AAmEF3jMlICqv286GIYK5qTKk2/CKHlOLPnsWEuA== + MIIEwDCCAqigAwIBAgICApowDQYJKoZIhvcNAQELBQAwFjEUMBIGA1UEAwwLU25h + a2VvaWwgQ0EwIBcNMjAwODI0MDc0MjEzWhgPMjEyMDA3MzEwNzQyMTNaMBQxEjAQ + BgNVBAMMCWFjbWUudGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB + AN3SZeAchx0XKm2c25bMxyEuXhFt03F075ZagtZ3nRixlPXZwGG3aQ1GIb1s/8vQ + H0WdXfI2M9NY2bbecVmBtEKEFHZAnPUDz4dAMa5d/HBpYgeiGSGNKn7Vvc6y0oAj + lJ1y/+OSakqQ+ewxzEkoiZd4aDqOJHgWjETf1Cuhdw8Q/52RLIfsgQYdo7N6sZXh + MapF/CJ5oyvaRvI+6muAXuS4eIiCwR2xgDGsTO1YjQIOCoFsoHefuKgfOiRbRP3C + fq9w+tgEY1WsVOnjzi9AMEv78eZbOgxUAu/tQqRgjXpoCz83HO9LNFdEgJxe98R2 + KkVoyRbbpsr8k5IkFi4NMw0DroFndwfQA7miBMdp74j8qYQLYzN2Sqy9szdWiH6s + 28Sfy/E0BWtlj7D1Nvos2v5vZDHy12eFzxf0icUPuclR/q8ceTlq12dd5wjMnlaG + l0KH5hu6GbzkG7bk/a+Q0GXfVjdD9xt7MtP3TZ5TVZ/Lggb1yU0IUSrMtRREmXYH + BTbaSRBuwURvRnOotFd/Wkkc0oWciiUgUIZXNBTE5V+OORGLITyoxAv/krqvcMvy + 7i4yJJKgW1YOOteyJYmy89Hw2P8q2apH0qoQlbFp62ttU8tzKbw/sJ7JE87hq7wl + U3tynFqfsJHh9Mb4a/BV1+p5+PdmAn72UiEztxRfqlrfAgMBAAGjGDAWMBQGA1Ud + EQQNMAuCCWFjbWUudGVzdDANBgkqhkiG9w0BAQsFAAOCAgEAM5WrCpBOmLrZ1QX8 + l6vxVXwoI8pnqyy3cbAm3aLRPbw4gb0Ot90Pv/LoMhP0fkrNOKwH/FGRjSXyti0X + TheKrP7aEf6XL2/Xnb8rK2jYMQo6YJU9T+wBJA6Q+GBrc8SE75KfOi5NWJr8T4Ju + Etb+G05hXClrN19VFzIoz3L4kRV+xNMialcOT3xQfHtXCQUgwAWpPlwcJA/Jf60m + XsfwQwk2Ir16wq+Lc3y+mQ7d/dbG+FVrngFk4qN2B9M/Zyv4N9ZBbqeDUn3mYtJE + FeJrwHgmwH6slf1gBN3gxUKRW7Bvzxk548NdmLOyN+Y4StsqbOaYGtShUJA7f1Ng + qQqdgvxZ9MNwwMv9QVDZEnaaew3/oWOSmQGAai4hrc7gLMLJmIxzgfd5P6Dr06e4 + 2zwsMuI8Qh/IDqu/CfmFYvaua0FEeyAtpoID9Y/KPM7fu9bJuxjZ6kqLVFkEi9nF + /rCMchcSA8N2z/vLPabpNotO7OYH3VD7aQGTfCL82dMlp1vwZ39S3Z1TFLLh3MZ+ + BYcAv8kUvCV6kIdPAXvJRSQOJUlJRV7XiI2mwugdDzMx69wQ0Zc1e4WyGfiSiVYm + ckSJ/EkxuwT/ZYLqCAKSFGMlFhad9g1Zyvd67XgfZq5p0pJTtGxtn5j8QHy6PM6m + NbjvWnP8lDU8j2l3eSG58S14iGs= -----END CERTIFICATE----- ''; } From 375aca6f76ea638c05583656e34ef5d7e5ed4223 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 24 Aug 2020 15:54:17 +0800 Subject: [PATCH 115/688] drawpile: make it build with a recent libmicrohttpd --- .../graphics/drawpile/default.nix | 67 ++++++++++++------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 0ffcb5cdb410..20e295c85e9f 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -1,7 +1,8 @@ -{ lib +{ stdenv +, lib , mkDerivation -, fetchurl -, cmake +, fetchFromGitHub +, fetchpatch , extra-cmake-modules # common deps @@ -9,6 +10,7 @@ # client deps , qtbase +, qtkeychain , qtmultimedia , qtsvg , qttools @@ -23,6 +25,8 @@ # optional server deps , libmicrohttpd , libsodium +, withSystemd ? stdenv.isLinux +, systemd ? null # options , buildClient ? true @@ -35,11 +39,9 @@ with lib; let - commonDeps = [ - karchive - ]; clientDeps = [ qtbase + qtkeychain qtmultimedia qtsvg qttools @@ -49,40 +51,57 @@ let libvpx # WebM video export miniupnpc # automatic port forwarding ]; + serverDeps = [ # optional: libmicrohttpd # HTTP admin api libsodium # ext-auth support - ]; + ] ++ optional withSystemd systemd; + kisDeps = [ qtx11extras ]; + boolToFlag = bool: + if bool then "ON" else "OFF"; + in mkDerivation rec { pname = "drawpile"; version = "2.1.17"; - src = fetchurl { - url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "11lhn1mymhqk9g5sh384xhj3qw8h9lv88pr768y9q6kg3sl7nzzf"; + src = fetchFromGitHub { + owner = "drawpile"; + repo = "drawpile"; + rev = "${version}"; + sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM="; }; - nativeBuildInputs = [ - cmake - extra-cmake-modules + patches = [ + # fix for libmicrohttpd 0.9.71 + (fetchpatch { + url = "https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.diff"; + sha256 = "sha256-54wabH5F3Hf+6vv9rpCwCRdhjSaUFtuF/mE1/U+CpOA="; + name = "mhdfix.patch"; }) ]; - buildInputs = - commonDeps ++ - optionals buildClient clientDeps ++ - optionals buildServer serverDeps ++ - optionals enableKisTablet kisDeps ; - cmakeFlags = - optional (!buildClient ) "-DCLIENT=off" ++ - optional (!buildServer ) "-DSERVER=off" ++ - optional (!buildServerGui ) "-DSERVERGUI=off" ++ - optional ( buildExtraTools) "-DTOOLS=on" ++ - optional ( enableKisTablet) "-DKIS_TABLET=on"; + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ + karchive + ] + ++ optionals buildClient clientDeps + ++ optionals buildServer serverDeps + ++ optionals enableKisTablet kisDeps; + + cmakeFlags = [ + "-Wno-dev" + "-DINITSYS=systemd" + "-DCLIENT=${boolToFlag buildClient}" + "-DSERVER=${boolToFlag buildServer}" + "-DSERVERGUI=${boolToFlag buildServerGui}" + "-DTOOLS=${boolToFlag buildExtraTools}" + "-DKIS_TABLET=${boolToFlag enableKisTablet}" + ]; meta = { description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously"; From 618e273861f7eda1f04fd8909cbe066e75556070 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 24 Aug 2020 12:40:02 +0200 Subject: [PATCH 116/688] nixosTests.systemd: disable RuntimeWatchdogUSec=30s assertion For some reason, this value isn't updated, at least not inside the VM. Uncomment it, so we still test the rest. Needs to be investigated further. --- nixos/tests/systemd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index abd842b51f73..dfa16eecfad2 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -144,7 +144,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { ) output = machine.succeed("systemctl show | grep Watchdog") - assert "RuntimeWatchdogUSec=30s" in output + # assert "RuntimeWatchdogUSec=30s" in output + # for some reason RuntimeWatchdogUSec, doesn't seem to be updated in here. assert "RebootWatchdogUSec=10min" in output assert "KExecWatchdogUSec=5min" in output From 61600ea577abe60573954e33b5d4c5614f203840 Mon Sep 17 00:00:00 2001 From: Dustin Frisch Date: Mon, 24 Aug 2020 13:01:48 +0200 Subject: [PATCH 117/688] maintainers: add fooker --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index efdc0fc7bc73..5a2ecc44304d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2873,6 +2873,12 @@ githubId = 5918766; name = "Franz Thoma"; }; + fooker = { + email = "fooker@lab.sh"; + github = "fooker"; + githubId = 405105; + name = "Dustin Frisch"; + }; forkk = { email = "forkk@forkk.net"; github = "forkk"; From 41c1d10407df3eca1e8671a4feab4a08ffaca827 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 24 Aug 2020 19:45:44 +0800 Subject: [PATCH 118/688] khotkeys: broken on Qt < 5.14 --- pkgs/desktops/plasma-5/khotkeys.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index 77763c5e203e..ad78d602deca 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -1,6 +1,7 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, + qtbase, kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui, plasma-framework, plasma-workspace, qtx11extras }: @@ -13,5 +14,5 @@ mkDerivation { plasma-framework plasma-workspace qtx11extras ]; outputs = [ "bin" "dev" "out" ]; - enableParallelBuilding = false; + meta.broken = lib.versionOlder qtbase.version "5.14"; } From 16bcf02c7d45d76f0068301caa4931c06cda27c0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 24 Aug 2020 19:46:14 +0800 Subject: [PATCH 119/688] kpmcore: broken on Qt < 5.14 --- pkgs/development/libraries/kpmcore/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index 52e6264843bf..1170b1ee4126 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -3,11 +3,8 @@ , libatasmart, parted , utillinux }: -let +stdenv.mkDerivation rec { pname = "kpmcore"; - -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "3.3.0"; src = fetchurl { @@ -24,12 +21,14 @@ in stdenv.mkDerivation rec { utillinux # needs blkid (note that this is not provided by utillinux-compat) ]; + nativeBuildInputs = [ extra-cmake-modules ]; + enableParallelBuilding = true; meta = with stdenv.lib; { maintainers = with lib.maintainers; [ peterhoeg ]; - # The build requires at least Qt 5.12: - broken = lib.versionOlder qtbase.version "5.12.0"; + # The build requires at least Qt 5.14: + broken = lib.versionOlder qtbase.version "5.14"; }; } From 90c3baab1667f4c05fea72412c6aae974ce1d2bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 24 Aug 2020 08:57:41 -0300 Subject: [PATCH 120/688] venta: init at 2020-08-20 --- pkgs/data/themes/venta/default.nix | 47 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/data/themes/venta/default.nix diff --git a/pkgs/data/themes/venta/default.nix b/pkgs/data/themes/venta/default.nix new file mode 100644 index 000000000000..1086aaeb7095 --- /dev/null +++ b/pkgs/data/themes/venta/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "venta"; + version = "2020-08-20"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = "f9b7ea560def5c9d25a14015d265ba559d3501ca"; + sha256 = "13rdavspz1q3zk2h04jpd77hxdcifg42kd71qq13ryg4b5yzqqgb"; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Venta* $out/share/themes + rm $out/share/themes/*/COPYING + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Gtk theme based on windows 10 style"; + homepage = "https://www.pling.com/p/1386774/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e3e84584242..a2165fef94f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19163,6 +19163,8 @@ in vegeta = callPackage ../tools/networking/vegeta { }; + venta = callPackage ../data/themes/venta { }; + victor-mono = callPackage ../data/fonts/victor-mono { }; vimix-gtk-themes = callPackage ../data/themes/vimix {}; From 3829a407936b07318f18660d7a9409539a22ffa8 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 24 Aug 2020 13:55:02 +0200 Subject: [PATCH 121/688] libseccomp: format with nixpkgs-fmt Signed-off-by: Sascha Grunert --- pkgs/development/libraries/libseccomp/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index f3816c2ef0c9..b4352c68da27 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -25,13 +25,15 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High level library for the Linux Kernel seccomp filter"; - homepage = "https://github.com/seccomp/libseccomp"; - license = licenses.lgpl21; - platforms = platforms.linux; + homepage = "https://github.com/seccomp/libseccomp"; + license = licenses.lgpl21; + platforms = platforms.linux; badPlatforms = [ "alpha-linux" - "riscv64-linux" "riscv32-linux" - "sparc-linux" "sparc64-linux" + "riscv64-linux" + "riscv32-linux" + "sparc-linux" + "sparc64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; }; From 33842cacde06b4a1c67137cdbbdc76bd3c16e1f2 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 24 Aug 2020 13:55:31 +0200 Subject: [PATCH 122/688] libseccomp: 2.4.3 -> 2.5.0 Signed-off-by: Sascha Grunert --- pkgs/development/libraries/libseccomp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index b4352c68da27..7d5ced788826 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, getopt, makeWrapper, utillinux }: +{ stdenv, fetchurl, getopt, makeWrapper, utillinux, gperf }: stdenv.mkDerivation rec { pname = "libseccomp"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "07crwxqzvl5k2b90a47ii9wgvi09s9hsy5b5jddw9ylp351d25fg"; + sha256 = "1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz"; }; outputs = [ "out" "lib" "dev" "man" ]; - buildInputs = [ getopt makeWrapper ]; + buildInputs = [ getopt makeWrapper gperf ]; patchPhase = '' patchShebangs . From ae3fe42897039e0f8f2e19055f34e93fbe45db48 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 24 Aug 2020 14:10:53 +0200 Subject: [PATCH 123/688] libseccomp: enable RISC-V architecture Signed-off-by: Sascha Grunert --- pkgs/development/libraries/libseccomp/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 7d5ced788826..c33aa76ea2bf 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; badPlatforms = [ "alpha-linux" - "riscv64-linux" - "riscv32-linux" "sparc-linux" "sparc64-linux" ]; From 7b751e069be46b907b6ef67127cd1fe227df7641 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Aug 2020 20:21:12 +0000 Subject: [PATCH 124/688] visualvm: 2.0.3 -> 2.0.4 --- pkgs/development/tools/java/visualvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index ab90cbea83d5..6cf97277bb5a 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0.3"; + version = "2.0.4"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "1pwgsasja30xbm1ma0kp4nami2nwyy6aizam8nfl6jd7jkz4d7mk"; + sha256 = "1ic6gjsw90j7pr1yyplmk1zc319ld49i6d4zlgs7mlz1m4bn5jv3"; }; desktopItem = makeDesktopItem { From c38e95e697272a69264207899cf771e75a664477 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 25 Aug 2020 06:36:49 +0800 Subject: [PATCH 125/688] kpmcore: name -> pname --- pkgs/development/libraries/kpmcore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index 1170b1ee4126..7903fc746390 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.3.0"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq"; }; From 87ca836937bb7476fa72f6bca93ae3c00676c140 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 Aug 2020 00:53:08 +0000 Subject: [PATCH 126/688] alembic: 1.7.13 -> 1.7.14 --- pkgs/development/libraries/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 1157142e5b82..1bb79a64ba10 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.7.13"; + version = "1.7.14"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "01j4fsq917jckdh16nvmc35xiy11j4g1sc17y6g8qxa00s2sfsa4"; + sha256 = "0yri063v7j5jsvqbmlwr0hf2d1a55dgc1nj85rf10sxqhijwzk55"; }; outputs = [ "bin" "dev" "out" "lib" ]; From fd51d8a3d541295e031d31c17d6bbb340c42fbda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20LOYET?= <822436+fatpat@users.noreply.github.com> Date: Tue, 25 Aug 2020 08:27:50 +0200 Subject: [PATCH 127/688] chirp: 20200430 -> 20200807 --- pkgs/applications/radio/chirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 377619f5088c..8fb719567d55 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20200430"; + version = "20200807"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "060fzplgmpfrk6wkfaasx7phpfk90mmylk6drbwzk4f9r1655vda"; + sha256 = "60b682793698e6427ad485546eae3a044b8290a220f190633158a2fb0e942fa0"; }; propagatedBuildInputs = with python2.pkgs; [ From cc782a80890f39a32721986f4b6dc2f3c20ebb7d Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Tue, 25 Aug 2020 12:26:06 +0000 Subject: [PATCH 128/688] lnd: 0.10.3 -> 0.11.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 b6c7879c3b86..831195f06f0d 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.10.3-beta"; + version = "0.11.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "129vi8z2sk4hagk7axa675nba6sbj9km88zlq8a1g8di7v2k9z6a"; + sha256 = "1r1hwz8ka5mnmrvj9zcd78kn68g8fg3d4bdx9i0xy4sc2hh1dcpj"; }; - vendorSha256 = "0a4bk2qry0isnrvl0adwikqn6imxwzlaq5j3nglb5rmwwq2cdz0r"; + vendorSha256 = "090b9sxvdwh787w0rhrcbky9pbx64qgqx1pvk9ysk3886nxdhf7k"; doCheck = false; From 2e1c30c850bf4f89de53995f51c28b7349e38466 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 Aug 2020 13:43:46 +0000 Subject: [PATCH 129/688] gensio: 2.1.3 -> 2.1.4 --- pkgs/development/libraries/gensio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 169506e66cc0..daca5fc0bdb1 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0sdqv4j1jjjc2nxnd9h7r4w66bdjl5ksvfia4i4cjj7jfl0hhynl"; + sha256 = "0c44qhhrknjl7sp94q34z7nv7bvnlqs8wzm385661liy4mnfn4dc"; }; configureFlags = [ From c9e9856c5215d3bdf46f5a40c9e9c29a0b1a31be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 Aug 2020 11:18:31 +0000 Subject: [PATCH 130/688] enchant: 2.2.8 -> 2.2.9 --- pkgs/development/libraries/enchant/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 65d85eddbe40..51f13de08a8b 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.8"; + version = "2.2.9"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0m9m564qqwbssvvf7y3dlz1yxzqsjiqy1yd2zsmb3l0d7y2y5df7"; + sha256 = "0g1gf86jzxxhnhkn7jvgi0k9agzav2zr8pjnpgdwpvgmfci3v6mj"; }; nativeBuildInputs = [ From 0bee87c40085c396607b431afcc743b253567607 Mon Sep 17 00:00:00 2001 From: Nico Heitmann Date: Tue, 25 Aug 2020 17:18:56 +0200 Subject: [PATCH 131/688] nixos/krb5: add list to example configuration Updated the relevant nixos test to match the example configuration. --- nixos/modules/config/krb5/default.nix | 5 ++++- nixos/tests/krb5/example-config.nix | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix index 58477fafc2d7..c2302451d702 100644 --- a/nixos/modules/config/krb5/default.nix +++ b/nixos/modules/config/krb5/default.nix @@ -113,7 +113,10 @@ in { { "ATHENA.MIT.EDU" = { admin_server = "athena.mit.edu"; - kdc = "athena.mit.edu"; + kdc = [ + "athena01.mit.edu" + "athena02.mit.edu" + ]; }; }; ''; diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix index be195b513935..e2e10a9fda89 100644 --- a/nixos/tests/krb5/example-config.nix +++ b/nixos/tests/krb5/example-config.nix @@ -18,7 +18,10 @@ import ../make-test-python.nix ({ pkgs, ...} : { realms = { "ATHENA.MIT.EDU" = { admin_server = "athena.mit.edu"; - kdc = "athena.mit.edu"; + kdc = [ + "athena01.mit.edu" + "athena02.mit.edu" + ]; }; }; domain_realm = { @@ -65,7 +68,8 @@ import ../make-test-python.nix ({ pkgs, ...} : { [realms] ATHENA.MIT.EDU = { admin_server = athena.mit.edu - kdc = athena.mit.edu + kdc = athena01.mit.edu + kdc = athena02.mit.edu } [domain_realm] From f38d21b025e7a229c55036e20465ea18ce3556c9 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 25 Aug 2020 17:48:37 +0200 Subject: [PATCH 132/688] wasabiwallet: 1.1.11.1 -> 1.1.12 --- pkgs/applications/blockchains/wasabiwallet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index a098f14668e5..3b4ec1c49c4c 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.11.1"; + version = "1.1.12"; src = fetchurl { - url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz"; - sha256 = "04v8f2h67aqvcb5a8vmzbp2sqnq7g4m0v1ng52ccb4ii668ya8hy"; + url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; + sha256 = "0nfd0pwsgrkaxcxfs8wb3i8kslfcqnc91iahw3rmlcxdzb81kjs4"; }; dontBuild = true; From 4d57351aed3a71eb3412e5993f97cdbf6b020c64 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 26 Aug 2020 04:20:00 +0000 Subject: [PATCH 133/688] xonsh: 0.9.19 -> 0.9.20 https://github.com/xonsh/xonsh/releases/tag/0.9.20 --- pkgs/shells/xonsh/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 5d6a8a6065bb..f73ec422e06b 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -4,21 +4,31 @@ , glibcLocales , coreutils , git +, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.19"; + version = "0.9.20"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "1s7nb23zh4may4k3c9yfiizfdflm97hf5q2aww4j6ibykgcydv64"; + sha256 = "05phrwqd1c64531y78zxkxd4w1cli8yj3x2cqch7nkzbyz93608p"; }; LC_ALL = "en_US.UTF-8"; + + patches = [ + # Fix vox tests. Remove with the next release + (fetchpatch { + url = "https://github.com/xonsh/xonsh/commit/00aeb7645af97134495cc6bc5fe2f41922df8676.patch"; + sha256 = "0hx5jk22wxgmjzmqbxr2pjs3mwh7p0jwld0xhslc1s6whbjml25h"; + }) + ]; + postPatch = '' sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py From c72b4359d17342567c4bd66eebbf9a7e17e7d094 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 Aug 2020 05:44:15 +0000 Subject: [PATCH 134/688] klibc: 2.0.7 -> 2.0.8 --- pkgs/os-specific/linux/klibc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index a92970726dca..55faa216a12c 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "08li3aj9bvzabrih98jdxi3m19h85cp53s8cr7cqad42r8vjdvxb"; + sha256 = "0dmlkhnn5q8fc6rkzsisir4chkzmmiq6xkjmvyvf0g7yihwz2j2f"; }; patches = [ ./no-reinstall-kernel-headers.patch ]; From e70fd53f1672af9cc45d9fd84d182a39e6dc7cec Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 24 Aug 2020 16:45:23 +0200 Subject: [PATCH 135/688] nspr: 4.27 -> 4.28 --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 8a16803fd8bf..d9b7ff13d1a1 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -2,7 +2,7 @@ , CoreServices ? null , buildPackages }: -let version = "4.27"; in +let version = "4.28"; in stdenv.mkDerivation { pname = "nspr"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "16z82qc1l4cqn66p59ai0dy9ycllywn4jlxhip1a605bns952jbd"; + sha256 = "0miv8ggil1xdywxw2sxaa05kqw7ahjgaimf7zjc6y2x8367grpk3"; }; patches = [ From 49aa28210808c1147728480685fc0f62f8f03636 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 24 Aug 2020 16:45:35 +0200 Subject: [PATCH 136/688] nss: 3.55 -> 3.56 --- pkgs/development/libraries/nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a504aae6a980..e378cd5554cf 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.55"; + version = "3.56"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0100hm7n1xrp144xy665z46s0wf1jpkqkncc6bk2w22snhyjwsgw"; + sha256 = "174f0ki2f8szkgv02jlsg2ci332sl9dabr2vcwnyjp1vxplf0xgq"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From a3af2bb9acf6a590aac92e4fa6e2bd8f01988824 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 26 Aug 2020 08:35:34 +0200 Subject: [PATCH 137/688] libseccomp: disable RISC-V 32bit architecture Signed-off-by: Sascha Grunert --- pkgs/development/libraries/libseccomp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index c33aa76ea2bf..ebaf43e76814 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; badPlatforms = [ "alpha-linux" + "riscv32-linux" "sparc-linux" "sparc64-linux" ]; From 8c5443be5185e8475d2d4f66c2ca43a37ca7024c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 Aug 2020 06:50:00 +0000 Subject: [PATCH 138/688] klavaro: 3.10 -> 3.11 --- pkgs/games/klavaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 557f75580ca9..a1af213f1bb9 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "klavaro"; - version = "3.10"; + version = "3.11"; src = fetchurl { url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2"; - sha256 = "0jnzdrndiq6m0bwgid977z5ghp4q61clwdlzfpx4fd2ml5x3iq95"; + sha256 = "1rkxaqb62w4mv86fcnmr32lq6y0h4hh92wmsy5ddb9a8jnzx6r7w"; }; nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; From a4ed797948e7082420e00f9c90927e464d7914d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 26 Aug 2020 10:46:22 +0200 Subject: [PATCH 139/688] python3Packages.pytorch: remove oneDNN dependency oneDNN was added as a dependency, but it is not actually used by PyTorch. PyTorch uses oneDNN from the vendored iDeep dependency. Using a system-provided oneDNN is currently not a supported build option. --- pkgs/development/python-modules/pytorch/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 0aea3b38b5a8..a767a913abbb 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -4,7 +4,7 @@ openMPISupport ? false, openmpi ? null, buildDocs ? false, cudaArchList ? null, - numpy, pyyaml, cffi, click, typing, cmake, oneDNN, hypothesis, numactl, psutil, + numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, psutil, linkFarm, symlinkJoin, # virtual pkg that consistently instantiates blas across nixpkgs @@ -159,9 +159,9 @@ in buildPythonPackage rec { USE_MKL = blas.implementation == "mkl"; - # Unlike MKL, MKLDNN is FOSS, so we enable support for it by default. Note - # that this was renamed to dnnl and then renamed again to oneDNN upstream, but - # pytorch still calls it by the old name mkldnn. + # Unlike MKL, oneDNN (née MKLDNN) is FOSS, so we enable support for + # it by default. PyTorch currently uses its own vendored version + # of oneDNN through Intel iDeep. USE_MKLDNN = mklDnnSupport; USE_MKLDNN_CBLAS = mklDnnSupport; @@ -210,7 +210,7 @@ in buildPythonPackage rec { ninja ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; - buildInputs = [ blas blas.provider oneDNN ] + buildInputs = [ blas blas.provider ] ++ lib.optionals cudaSupport [ cudnn magma nccl ] ++ lib.optionals stdenv.isLinux [ numactl ]; From dee97b8b44d549fba19b14d351b1492cb6714152 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 25 Aug 2020 11:27:30 -0400 Subject: [PATCH 140/688] nixos/redmine: replace extraConfig option with settings option --- nixos/modules/services/misc/redmine.nix | 61 ++++++++++++++----------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 0e71cf925692..f1415ea3f8f7 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -1,12 +1,12 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkDefault mkEnableOption mkIf mkOption types; + inherit (lib) mkDefault mkEnableOption mkIf mkOption mkRemovedOptionModule types; inherit (lib) concatStringsSep literalExample mapAttrsToList; - inherit (lib) optional optionalAttrs optionalString singleton versionAtLeast; + inherit (lib) optional optionalAttrs optionalString; cfg = config.services.redmine; - + format = pkgs.formats.yaml {}; bundle = "${cfg.package}/share/redmine/bin/bundle"; databaseYml = pkgs.writeText "database.yml" '' @@ -20,17 +20,7 @@ let ${optionalString (cfg.database.type == "mysql2" && cfg.database.socket != null) "socket: ${cfg.database.socket}"} ''; - configurationYml = pkgs.writeText "configuration.yml" '' - default: - scm_subversion_command: ${pkgs.subversion}/bin/svn - scm_mercurial_command: ${pkgs.mercurial}/bin/hg - scm_git_command: ${pkgs.gitAndTools.git}/bin/git - scm_cvs_command: ${pkgs.cvs}/bin/cvs - scm_bazaar_command: ${pkgs.breezy}/bin/bzr - scm_darcs_command: ${pkgs.darcs}/bin/darcs - - ${cfg.extraConfig} - ''; + configurationYml = format.generate "configuration.yml" cfg.settings; additionalEnvironment = pkgs.writeText "additional_environment.rb" '' config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576) @@ -56,8 +46,12 @@ let pgsqlLocal = cfg.database.createLocally && cfg.database.type == "postgresql"; in - { + imports = [ + (mkRemovedOptionModule [ "services" "redmine" "extraConfig" ] "Use services.redmine.settings instead.") + ]; + + # interface options = { services.redmine = { enable = mkEnableOption "Redmine"; @@ -93,21 +87,24 @@ in description = "The state directory, logs and plugins are stored here."; }; - extraConfig = mkOption { - type = types.lines; - default = ""; + settings = mkOption { + type = format.type; + default = {}; description = '' - Extra configuration in configuration.yml. - - See + Redmine configuration (configuration.yml). Refer to + for details. ''; example = literalExample '' - email_delivery: - delivery_method: smtp - smtp_settings: - address: mail.example.com - port: 25 + { + email_delivery = { + delivery_method = "smtp"; + smtp_settings = { + address = "mail.example.com"; + port = 25; + }; + }; + } ''; }; @@ -226,6 +223,7 @@ in }; }; + # implementation config = mkIf cfg.enable { assertions = [ @@ -243,6 +241,17 @@ in } ]; + services.redmine.settings = { + production = { + scm_subversion_command = "${pkgs.subversion}/bin/svn"; + scm_mercurial_command = "${pkgs.mercurial}/bin/hg"; + scm_git_command = "${pkgs.gitAndTools.git}/bin/git"; + scm_cvs_command = "${pkgs.cvs}/bin/cvs"; + scm_bazaar_command = "${pkgs.breezy}/bin/bzr"; + scm_darcs_command = "${pkgs.darcs}/bin/darcs"; + }; + }; + services.mysql = mkIf mysqlLocal { enable = true; package = mkDefault pkgs.mariadb; From 6cf743e52df90e0ddf520455b927f3138d71d85f Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 25 Aug 2020 11:33:25 -0400 Subject: [PATCH 141/688] nixos/redmine: allow user to override contents of additional_environment.rb --- nixos/modules/services/misc/redmine.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index f1415ea3f8f7..4e005f73da37 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkDefault mkEnableOption mkIf mkOption mkRemovedOptionModule types; + inherit (lib) mkBefore mkDefault mkEnableOption mkIf mkOption mkRemovedOptionModule types; inherit (lib) concatStringsSep literalExample mapAttrsToList; inherit (lib) optional optionalAttrs optionalString; @@ -21,13 +21,7 @@ let ''; configurationYml = format.generate "configuration.yml" cfg.settings; - - additionalEnvironment = pkgs.writeText "additional_environment.rb" '' - config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576) - config.logger.level = Logger::INFO - - ${cfg.extraEnv} - ''; + additionalEnvironment = pkgs.writeText "additional_environment.rb" cfg.extraEnv; unpackTheme = unpack "theme"; unpackPlugin = unpack "plugin"; @@ -252,6 +246,11 @@ in }; }; + services.redmine.extraEnv = mkBefore '' + config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576) + config.logger.level = Logger::INFO + ''; + services.mysql = mkIf mysqlLocal { enable = true; package = mkDefault pkgs.mariadb; From a7c69047dfc86a33d2207a74591ac8ee3fb8b0fc Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 25 Aug 2020 11:55:06 -0400 Subject: [PATCH 142/688] nixos/redmine: remove database.password option --- nixos/modules/services/misc/redmine.nix | 28 ++++--------------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 4e005f73da37..1313bdaccc49 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -43,6 +43,7 @@ in { imports = [ (mkRemovedOptionModule [ "services" "redmine" "extraConfig" ] "Use services.redmine.settings instead.") + (mkRemovedOptionModule [ "services" "redmine" "database" "password" ] "Use services.redmine.database.passwordFile instead.") ]; # interface @@ -177,16 +178,6 @@ in description = "Database user."; }; - password = mkOption { - type = types.str; - default = ""; - description = '' - The password corresponding to . - Warning: this is stored in cleartext in the Nix store! - Use instead. - ''; - }; - passwordFile = mkOption { type = types.nullOr types.path; default = null; @@ -221,8 +212,8 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = cfg.database.passwordFile != null || cfg.database.password != "" || cfg.database.socket != null; - message = "one of services.redmine.database.socket, services.redmine.database.passwordFile, or services.redmine.database.password must be set"; + { assertion = cfg.database.passwordFile != null || cfg.database.socket != null; + message = "one of services.redmine.database.socket or services.redmine.database.passwordFile must be set"; } { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user; message = "services.redmine.database.user must be set to ${cfg.user} if services.redmine.database.createLocally is set true"; @@ -346,7 +337,7 @@ in # handle database.passwordFile & permissions - DBPASS=$(head -n1 ${cfg.database.passwordFile}) + DBPASS=${optionalString (cfg.database.passwordFile != null) "$(head -n1 ${cfg.database.passwordFile})"} cp -f ${databaseYml} "${cfg.stateDir}/config/database.yml" sed -e "s,#dbpass#,$DBPASS,g" -i "${cfg.stateDir}/config/database.yml" chmod 440 "${cfg.stateDir}/config/database.yml" @@ -387,17 +378,6 @@ in redmine.gid = config.ids.gids.redmine; }; - warnings = optional (cfg.database.password != "") - ''config.services.redmine.database.password will be stored as plaintext - in the Nix store. Use database.passwordFile instead.''; - - # Create database passwordFile default when password is configured. - services.redmine.database.passwordFile = - (mkDefault (toString (pkgs.writeTextFile { - name = "redmine-database-password"; - text = cfg.database.password; - }))); - }; } From d9da7edba09f603011db9a1f91769962b1879dc9 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 26 Aug 2020 03:12:52 +0900 Subject: [PATCH 143/688] thunderbird: 78.1.1 -> 78.2.0 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 53d337067d7f..34aac2965239 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -69,13 +69,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.1.1"; + version = "78.2.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1lf15zl3p8y1vxv4s04y088flkspf0r0c6j8gfrlfzla5ckfcsbad3zbygh6y73m35j882g7fbacby5a4hiw891zq2kji5dn3nbahyi"; + "2mcd2ywa8kgz3gcah5acpw7wwc194plwca9f09l18ibml64mxbdk6ilmp8cbq2mgkap99brdz923apslf9y4fdlcw64g2s4m8xdy3mj"; }; nativeBuildInputs = [ From 70c20723cad4a96ae480bf14a823ba6014f58d3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 Aug 2020 16:20:00 +0000 Subject: [PATCH 144/688] msmtp: 1.8.11 -> 1.8.12 --- pkgs/applications/networking/msmtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index e21cd5b3f0fc..ee5ea9d7e030 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.11"; + version = "1.8.12"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0q0fg235qk448l1xjcwyxr7vcpzk6w57jzhjbkb0m7nffyhhypzj"; + sha256 = "0m33m5bc7ajmgy7vivnzj3mhybg37259hx79xypj769kfyafyvx8"; }; patches = [ From deced30f9a8fbf9b39f593209236e7851bed2339 Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Wed, 26 Aug 2020 17:52:51 +0200 Subject: [PATCH 145/688] python3Packages.jinja2: fix dependencies --- pkgs/development/python-modules/jinja2/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 42e45d162bab..45178377026d 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -3,7 +3,9 @@ , isPy3k , fetchPypi , pytest -, markupsafe }: +, markupsafe +, setuptools +}: buildPythonPackage rec { pname = "Jinja2"; @@ -15,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ markupsafe ]; + propagatedBuildInputs = [ markupsafe setuptools ]; # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 From 6d583084cc71b50931b4e2a1e6fc849c26a059ee Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 26 Aug 2020 14:39:08 -0500 Subject: [PATCH 146/688] bazel: use headless for jdk8 too --- pkgs/top-level/all-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f82bce86d74..deb8824f2853 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9135,6 +9135,7 @@ in openjdk_headless = openjdk8_headless; jdk8 = openjdk8; + jdk8_headless = openjdk8_headless; jre8 = openjdk8.jre; jre8_headless = openjdk8_headless.jre; @@ -10408,7 +10409,7 @@ in bazel_0_26 = callPackage ../development/tools/build-managers/bazel/bazel_0_26 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8; + buildJdk = jdk8_headless; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10417,7 +10418,7 @@ in bazel_0_29 = callPackage ../development/tools/build-managers/bazel/bazel_0_29 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8; + buildJdk = jdk8_headless; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10427,7 +10428,7 @@ in bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8; + buildJdk = jdk8_headless; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10437,7 +10438,7 @@ in bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8; + buildJdk = jdk8_headless; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; From 3777a4af76b1bd4b1589385a74c6836ddb4dded2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 26 Aug 2020 15:52:38 -0500 Subject: [PATCH 147/688] bazel: pass -stdlibc=libc++ correctly Fixes #93787 --- .../tools/build-managers/bazel/bazel_0_26/default.nix | 4 ++++ .../tools/build-managers/bazel/bazel_0_29/default.nix | 4 ++++ .../tools/build-managers/bazel/bazel_1/default.nix | 4 ++++ .../tools/build-managers/bazel/bazel_3/default.nix | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix index 6d4ba50a9fbb..c507169cf37a 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix @@ -236,6 +236,8 @@ stdenv.mkDerivation rec { fetch --experimental_distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' @@ -245,6 +247,8 @@ stdenv.mkDerivation rec { # add the same environment vars to compile.sh sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix index 19d33235a340..ad6e9ee44566 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix @@ -417,6 +417,8 @@ stdenv.mkDerivation rec { fetch --distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' @@ -426,6 +428,8 @@ stdenv.mkDerivation rec { # add the same environment vars to compile.sh sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix index eff8aede6c16..8dcdc71415fa 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -417,6 +417,8 @@ stdenv.mkDerivation rec { fetch --distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' @@ -426,6 +428,8 @@ stdenv.mkDerivation rec { # add the same environment vars to compile.sh sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 845469e1c7dd..0bfc9071d7e6 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -429,6 +429,8 @@ stdenv.mkDerivation rec { fetch --distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' @@ -438,6 +440,8 @@ stdenv.mkDerivation rec { # add the same environment vars to compile.sh sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ From 2a4426560813b702a302dadbe53e684d1ab03f47 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 1 Aug 2020 10:02:14 -0400 Subject: [PATCH 148/688] nixos/postgresql: replace extraConfig option with settings option --- .../modules/services/databases/postgresql.nix | 56 ++++++++++++++----- nixos/tests/postgresql-wal-receiver.nix | 24 ++++---- 2 files changed, 54 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index c726a08e34f2..5056d50153f6 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -11,23 +11,23 @@ let then cfg.package else cfg.package.withPackages (_: cfg.extraPlugins); + toStr = value: + if true == value then "yes" + else if false == value then "no" + else if isString value then "'${lib.replaceStrings ["'"] ["''"] value}'" + else toString value; + # The main PostgreSQL configuration file. - configFile = pkgs.writeText "postgresql.conf" - '' - hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}' - ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}' - log_destination = 'stderr' - log_line_prefix = '${cfg.logLinePrefix}' - listen_addresses = '${if cfg.enableTCPIP then "*" else "localhost"}' - port = ${toString cfg.port} - ${cfg.extraConfig} - ''; + configFile = pkgs.writeText "postgresql.conf" (concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${toStr v}") cfg.settings)); groupAccessAvailable = versionAtLeast postgresql.version "11.0"; in { + imports = [ + (mkRemovedOptionModule [ "services" "postgresql" "extraConfig" ] "Use services.postgresql.settings instead.") + ]; ###### interface @@ -212,10 +212,28 @@ in ''; }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = "Additional text to be appended to postgresql.conf."; + settings = mkOption { + type = with types; attrsOf (oneOf [ bool float int str ]); + default = {}; + description = '' + PostgreSQL configuration. Refer to + + for an overview of postgresql.conf. + + + String values will automatically be enclosed in single quotes. Single quotes will be + escaped with two single quotes as described by the upstream documentation linked above. + + ''; + example = literalExample '' + { + log_connections = true; + log_statement = "all"; + logging_collector = true + log_disconnections = true + log_destination = lib.mkForce "syslog"; + } + ''; }; recoveryConfig = mkOption { @@ -245,6 +263,16 @@ in config = mkIf cfg.enable { + services.postgresql.settings = + { + hba_file = "${pkgs.writeText "pg_hba.conf" cfg.authentication}"; + ident_file = "${pkgs.writeText "pg_ident.conf" cfg.identMap}"; + log_destination = "stderr"; + log_line_prefix = cfg.logLinePrefix; + listen_addresses = if cfg.enableTCPIP then "*" else "localhost"; + port = cfg.port; + }; + services.postgresql.package = # Note: when changing the default, make it conditional on # ‘system.stateVersion’ to maintain compatibility with existing diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix index 3be95187fe2c..432b46234f9c 100644 --- a/nixos/tests/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql-wal-receiver.nix @@ -14,13 +14,10 @@ let baseBackupDir = "/tmp/pg_basebackup"; walBackupDir = "/tmp/pg_wal"; atLeast12 = lib.versionAtLeast pkg.version "12.0"; - restoreCommand = '' - restore_command = 'cp ${walBackupDir}/%f %p' - ''; recoveryFile = if atLeast12 then pkgs.writeTextDir "recovery.signal" "" - else pkgs.writeTextDir "recovery.conf" "${restoreCommand}"; + else pkgs.writeTextDir "recovery.conf" "restore_command = 'cp ${walBackupDir}/%f %p'"; in { name = "postgresql-wal-receiver-${postgresqlPackage}"; @@ -30,14 +27,17 @@ let services.postgresql = { package = pkg; enable = true; - extraConfig = '' - wal_level = archive # alias for replica on pg >= 9.6 - max_wal_senders = 10 - max_replication_slots = 10 - '' + lib.optionalString atLeast12 '' - ${restoreCommand} - recovery_end_command = 'touch recovery.done' - ''; + settings = lib.mkMerge [ + { + wal_level = "archive"; # alias for replica on pg >= 9.6 + max_wal_senders = 10; + max_replication_slots = 10; + } + (lib.mkIf atLeast12 { + restore_command = "cp ${walBackupDir}/%f %p"; + recovery_end_command = "touch recovery.done"; + }) + ]; authentication = '' host replication ${replicationUser} all trust ''; From 0b8312660aaa34cc87bdf5e3776bcaf4c5ba3c59 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 26 Aug 2020 16:15:05 -0500 Subject: [PATCH 149/688] gcc10: fix building darwin->linux cross compiler same as 459c60dda2406d2207d2afd90f210ffc87efde54 but for gcc10 --- pkgs/development/compilers/gcc/10/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index ae723a145313..aa34798cc589 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -11,7 +11,7 @@ , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null @@ -151,11 +151,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf From 16ca8725ff0223e60061598d022bf7c7031bab88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 27 Aug 2020 01:27:59 +0000 Subject: [PATCH 150/688] parallel: 20200722 -> 20200822 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d11c41195cee..e99f2aa12d5f 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200722"; + name = "parallel-20200822"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0vqd8nhf4lkvbfy7nnibxjkpzpfandpklqm0hrix5vki5x7x80a8"; + sha256 = "02dy46g6f05p7s2qs8h6yg20p1zl3flxxf77n5jw74l3h1m24m4n"; }; outputs = [ "out" "man" ]; From e941eff18abea342546fcd2973dbb54d6c2c1b37 Mon Sep 17 00:00:00 2001 From: galagora Date: Thu, 27 Aug 2020 02:22:39 +0300 Subject: [PATCH 151/688] modem-manager-gui: 0.0.19.1 -> 0.0.20 Upstream source is on Sourceforge, but that's HTTP-only. --- .../networking/modem-manager-gui/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 38662bf7f699..1709db3bf031 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -1,8 +1,7 @@ { stdenv , pkgconfig , python3 -, fetchhg -, fetchpatch +, fetchFromGitLab , gtk3 , glib , gdbm @@ -18,12 +17,14 @@ stdenv.mkDerivation rec { pname = "modem-manager-gui"; - version = "0.0.19.1"; + version = "0.0.20"; - src = fetchhg { - url = "https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui"; - rev = "version ${version}"; - sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd"; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "modem-manager-gui"; + rev = "upstream%2F${version}"; + sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr"; }; patches = [ From a041da0faa05345d14df220b9153163ed5dc9dbb Mon Sep 17 00:00:00 2001 From: galagora Date: Thu, 27 Aug 2020 03:05:14 +0300 Subject: [PATCH 152/688] modem-manager-gui: remove docs patch Included in current release --- .../applications/networking/modem-manager-gui/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 1709db3bf031..811c89f6c815 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -27,14 +27,6 @@ stdenv.mkDerivation rec { sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr"; }; - patches = [ - # Fix docs build - (fetchpatch { - url = "https://bitbucket.org/linuxonly/modem-manager-gui/commits/68fb09c12413b7de9b7477cbf4241c3527568325/raw"; - sha256 = "033nrlhjlk0zvadv5g9n2id53ajagswf77mda0ixnrskyi7wiig7"; - }) - ]; - nativeBuildInputs = [ pkgconfig python3 From 22e9ad4654a4f8affab077bdc6bc3569f4ab06e4 Mon Sep 17 00:00:00 2001 From: galagora Date: Thu, 27 Aug 2020 04:13:58 +0300 Subject: [PATCH 153/688] modem-manager-gui: replace libappindicator-gtk3 libappindicator-gtk3 is unmaintained, should be replaced with fork (see #96420) --- pkgs/applications/networking/modem-manager-gui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 811c89f6c815..64b1be363f34 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -8,7 +8,7 @@ , gtkspell3 , ofono , itstool -, libappindicator-gtk3 +, libayatana-appindicator-gtk3 , perlPackages , glibcLocales , meson @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gdbm gtkspell3 ofono - libappindicator-gtk3 + libayatana-appindicator-gtk3 ]; postPatch = '' @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://linuxonly.ru/page/modem-manager-gui"; license = licenses.gpl3; - maintainers = with maintainers; [ ahuzik ]; + maintainers = with maintainers; [ ahuzik galagora ]; platforms = platforms.linux; }; } From 396b06022681937192cd376b6ead5f1338292f7b Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 27 Aug 2020 05:06:51 +0200 Subject: [PATCH 154/688] perlPackages.Mojolicious: 8.55 -> 8.58 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2f5fffe5f9c4..c85ca5a3c5ac 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12875,10 +12875,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.55"; + version = "8.58"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.55.tar.gz"; - sha256 = "116f79a8jvdk0zfj34gp3idhxgk4l8qq4ka6pwhdp8pmks969w0x"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.58.tar.gz"; + sha256 = "0543m2g1pjm06b0yr4cffw70ki76762ria65zvrjccc2zk69pwvy"; }; meta = { homepage = "https://mojolicious.org"; From c286d1cb06ab2a93c704a3c8e387967c4d778430 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Thu, 27 Aug 2020 16:49:42 +1200 Subject: [PATCH 155/688] zfsUnstable: 0.8.4 -> 2.0.0-rc1 --- pkgs/os-specific/linux/zfs/default.nix | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 56b36d4f3685..27e26b13a533 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -42,25 +42,27 @@ let inherit rev sha256; }; - patches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ] ++ extraPatches; + patches = extraPatches; postPatch = optionalString buildKernel '' patchShebangs scripts # The arrays must remain the same length, so we repeat a flag that is # already part of the command and therefore has no effect. - substituteInPlace ./module/zfs/zfs_ctldir.c --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \ - --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"' + substituteInPlace ./module/${optionalString isUnstable "os/linux/"}zfs/zfs_ctldir.c \ + --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \ + --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"' '' + optionalString buildUser '' substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" \ --replace "/bin/mount" "${utillinux}/bin/mount" - substituteInPlace ./lib/libshare/nfs.c --replace "/usr/sbin/exportfs" "${ + substituteInPlace ./lib/libshare/${optionalString isUnstable "os/linux/"}nfs.c --replace "/usr/sbin/exportfs" "${ # We don't *need* python support, but we set it like this to minimize closure size: # If it's disabled by default, no need to enable it, even if we have python enabled # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; }) }/bin/exportfs" substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" - substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" + substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ + --replace "/etc/default" "$out/etc/default" substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" @@ -79,6 +81,13 @@ let substituteInPlace ./etc/systemd/system/Makefile.am \ --replace '$(DESTDIR)$(systemdunitdir)' "$out"'$(DESTDIR)$(systemdunitdir)' + ${optionalString isUnstable '' + substituteInPlace ./contrib/initramfs/conf.d/Makefile.am \ + --replace "/usr/share/initramfs-tools/conf.d" "$out/usr/share/initramfs-tools/conf.d" + substituteInPlace ./contrib/initramfs/conf-hooks.d/Makefile.am \ + --replace "/usr/share/initramfs-tools/conf-hooks.d" "$out/usr/share/initramfs-tools/conf-hooks.d" + ''} + substituteInPlace ./etc/systemd/system/zfs-share.service.in \ --replace "/bin/rm " "${coreutils}/bin/rm " @@ -190,6 +199,7 @@ in { version = "0.8.4"; sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; + extraPatches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ]; }; zfsUnstable = common { @@ -197,9 +207,9 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.4"; + version = "2.0.0-rc1"; - sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; + sha256 = "0d1m5zwgqzfwbscvb60zvzkjgl5nkbvas22vjsyci3xygz0qwjsb"; isUnstable = true; }; } From e1322161949140588529f9996e5fde0e50b6fb96 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 Aug 2020 10:52:12 +0000 Subject: [PATCH 156/688] libpipeline: 1.5.1 -> 1.5.3 --- pkgs/development/libraries/libpipeline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix index bf80562a0b19..be3ab953c0a5 100644 --- a/pkgs/development/libraries/libpipeline/default.nix +++ b/pkgs/development/libraries/libpipeline/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libpipeline-1.5.1"; + name = "libpipeline-1.5.3"; src = fetchurl { url = "mirror://savannah/libpipeline/${name}.tar.gz"; - sha256 = "0bwh5xz5f2czwb7f564jz1mp4znm8pldnvf65fs0hpw4gmmp0cyn"; + sha256 = "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; From 4bac8a7a009803a342de423509ab6038dc731ff2 Mon Sep 17 00:00:00 2001 From: Chuck Date: Mon, 24 Aug 2020 13:48:57 -0700 Subject: [PATCH 157/688] qtbase: Move libtiff dependency from qtbase to qtimageformats --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 4 ++-- pkgs/development/libraries/qt-5/modules/qtimageformats.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index a4c12793abb3..4d7507220b56 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -8,7 +8,7 @@ darwin, libiconv, dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite, - libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, + libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, zlib, @@ -48,7 +48,7 @@ stdenv.mkDerivation { harfbuzz icu # Image formats - libjpeg libpng libtiff + libjpeg libpng (if compareVersion "5.9.0" < 0 then pcre16 else pcre2) ] ++ ( diff --git a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix index 1a7726070be3..9c80507b7c70 100644 --- a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix +++ b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix @@ -1,6 +1,7 @@ -{ qtModule, qtbase }: +{ qtModule, qtbase, libtiff }: qtModule { name = "qtimageformats"; qtInputs = [ qtbase ]; + propagatedBuildInputs = [ libtiff ]; } From b730ef35f1e309a94b2261c49080fba3a8fc7e01 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 24 Aug 2020 20:46:03 +0200 Subject: [PATCH 158/688] cmake: 3.18.1 -> 3.18.2 --- .../tools/build-managers/cmake/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index be9645453e35..559a4c191b68 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.18.1"; + version = "3.18.2"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "0215srmc9l7ygwdpfms8yx0wbd96qgz2d58ykmdiarvysf5k7qy0"; + sha256 = "0zhxsnxm5d8wdarz2gs3r41r1dfrnh35ki75fa684gaxfzy40kjx"; }; patches = [ @@ -37,12 +37,6 @@ stdenv.mkDerivation rec { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./libuv-application-services.patch - # TODO: Remove this patch for a regression once CMake 3.18.2 is out: - (fetchpatch { # PCH: Avoid Apple-specific architecture flags on other platforms - url = "https://gitlab.kitware.com/cmake/cmake/-/commit/70ce1ad64a04a244bb1c03753da0752c61fc3a37.patch"; - sha256 = "0jcdgv48j0dd4nlhyy3j0s3h6bcbrq2yg1mdhpgfqrb2y3p91fky"; - }) - ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; @@ -116,8 +110,17 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = with lib; { - homepage = "http://www.cmake.org/"; + homepage = "https://cmake.org/"; + changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/" + + "release/${lib.versions.majorMinor version}.html"; description = "Cross-Platform Makefile Generator"; + longDescription = '' + CMake is an open-source, cross-platform family of tools designed to + build, test and package software. CMake is used to control the software + compilation process using simple platform and compiler independent + configuration files, and generate native makefiles and workspaces that + can be used in the compiler environment of your choice. + ''; platforms = if useQt4 then qt4.meta.platforms else platforms.all; maintainers = with maintainers; [ ttuegel lnl7 ]; license = licenses.bsd3; From 79628a88b842fd9a65b17d1ac6b33ed922d2fffb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 27 Aug 2020 07:28:12 +0000 Subject: [PATCH 159/688] podiff: 1.1 -> 1.2 --- pkgs/tools/text/podiff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix index bee2c7a1a8f8..b76dfd2256a0 100644 --- a/pkgs/tools/text/podiff/default.nix +++ b/pkgs/tools/text/podiff/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "podiff"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.1.tar.gz"; - sha256 = "1zz6bcmka5zvk2rq775qv122lqh54aijkxlghvx7z0r6kh880x59"; + url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.2.tar.gz"; + sha256 = "1l2b4hh53xlx28riigwarzkhxpv1pcz059xj1ka33ccvxc6c20k9"; }; patchPhase = '' From 391c182248264fbf353242e67f60db72c90c14c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 27 Aug 2020 07:33:22 +0000 Subject: [PATCH 160/688] pounce: 1.3p1 -> 1.4p2 --- pkgs/servers/pounce/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix index 4ab3a4ee1677..a418417ce2fe 100644 --- a/pkgs/servers/pounce/default.nix +++ b/pkgs/servers/pounce/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pounce"; - version = "1.3p1"; + version = "1.4p2"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "1ab4pz7gyvlms00hcarcmsljkn0whwqxfck8b343l4riai2rj9xv"; + sha256 = "0fpnj9yvmj4gbbfpya4i0lyin56r782pz19z3pgd8xgs22gd48cc"; }; buildInputs = [ libressl ]; From 90fad2391a5d910c2f2d6862c08fbb77d10612c9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 27 Aug 2020 04:20:00 -0500 Subject: [PATCH 161/688] recursive: 1.059 -> 1.062 https://github.com/arrowtype/recursive/releases/tag/1.060 https://github.com/arrowtype/recursive/releases/tag/1.061 https://github.com/arrowtype/recursive/releases/tag/1.062 --- pkgs/data/fonts/recursive/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 441a51033b60..9fc4b46c9522 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,12 +1,12 @@ { lib, fetchzip }: let - version = "1.059"; + version = "1.062"; in fetchzip { name = "recursive-${version}"; - url = "https://github.com/arrowtype/recursive/releases/download/${version}/Recursive-${version}.zip"; + url = "https://github.com/arrowtype/recursive/releases/download/${version}/ArrowType-Recursive-${version}.zip"; postFetch = '' mkdir -p $out/share/fonts/ @@ -15,7 +15,7 @@ fetchzip { unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "0dlv8nrcqdn5vn3s918in5ph6kx6rg607kgp66p6ibpbg2s8ljy7"; + sha256 = "06qilfa0c897shh7m7rpwia02nay8cjwnizzzba27ylzy5pwd96r"; meta = with lib; { homepage = "https://recursive.design/"; From 54dedd26dcafc2ff43dc29fdc53abdf2a6469cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 27 Aug 2020 11:37:45 +0100 Subject: [PATCH 162/688] linuxPackages.bcc: 0.15.0 -> 0.16.0 --- pkgs/os-specific/linux/bcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 98de3ed1b11f..f8e9a4135a39 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -5,11 +5,11 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "1k00xbhdzdvqp4hfxpgg34bbhnx597jjhpg1x6dz2w80r7xzsj28"; + sha256 = "sha256-ekVRyugpZOU1nr0N9kWCSoJTmtD2qGsn/DmWgK7XZ/c="; }; format = "other"; From 813439071bc28e48ac5c479447831d4e630a75ce Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 27 Aug 2020 19:52:06 +0900 Subject: [PATCH 163/688] thunderbird: 68.11.0 -> 68.12.0 --- pkgs/applications/networking/mailreaders/thunderbird/68.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index 3143c7f62bb3..8f7dbc016886 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -71,13 +71,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.11.0"; + version = "68.12.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1rdxizg1mpagh17fhnrbkilyv1i2zfcr6z62jf3ng31ns94za9kdg9f580srkp63png67jaj3b1kc33v5vb8wavl09n5d38g113x2m9"; + "33350vjgzvsg6sdhdld92z75k1xcf1wmngdcvzsj4f3y3aal73pyw03mlvgg6y36bm0j8fhaxvgbbg5zm7hxhn779z78970m4v9amg7"; }; nativeBuildInputs = [ From 89bf77bf099f610a984aaec2105294d141302d2c Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 27 Aug 2020 19:58:55 +0900 Subject: [PATCH 164/688] thunderbird-bin: 78.1.1 -> 78.2.0 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 1e238bf8843d..140c5bd67c78 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.1.1"; + version = "78.2.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/af/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/af/thunderbird-78.2.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "540aa91a70379c4d6975820649abbe3063515bae031229f01ed7e794cf87395d"; + sha256 = "d64e507c291a93c5f3977e34d991bea4d39d7b2a6e438d2780c4f71dd18b6714"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ar/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ar/thunderbird-78.2.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "18d1b4f33895b5c4b17199ca8412f8060f40660c7e45e024d0dda486ad290044"; + sha256 = "ef340fc26d314511325f830c935b3564bab4367b4f17b734a04d257d8927b86d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ast/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ast/thunderbird-78.2.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "dd87c494ef5f142517aeec3d8890bc553664b323f2cadb46bca597101b275c91"; + sha256 = "39d4d8a671ebdf6584b7cfcc1e0979c1396d30d7952293db8b481b90e4fa4571"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/be/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/be/thunderbird-78.2.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "90e0d5354f41244e2ebaeeeb65959d64fcef52f914a15af7b9808125e6e25639"; + sha256 = "804bbba47279445ae4c5ba82a540b6d0ef2e6a641de47e8dd37cf4e2e13bd86e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/bg/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/bg/thunderbird-78.2.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "4e8f53fc2e1c3b8dddec3d62bfa104a458943c1b0794fcca3a1658b812359b97"; + sha256 = "d1f5e199a0b448ff6b7709dfabdf6f63c42a125e51109b21c0778f77cfbc6f9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/br/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/br/thunderbird-78.2.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "068c48e37b4d921cb33e2df27b32a8e9abfc29698c30779b1771f2ab61697f27"; + sha256 = "f3532117e7e646a74a6b169066e2685b1c372c5bcf3007238762496e1dceccde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ca/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ca/thunderbird-78.2.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1f09e12e53d7bc76551c47995b0fa5ff649db94013a66e4ee445e6901352ead6"; + sha256 = "3403cfab8094a227869bff8f0ef9116ba6fc7d94a0e3312cdc8bb99bcbf185a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cak/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/cak/thunderbird-78.2.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e917249cbc16e1ccaf630a5335577e76d971f422fb7c7d9b7c7f05805de18d78"; + sha256 = "aada755ce418968578884a5b836f6e152d4581c8d010fc8bdaa9ba78c2226e0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cs/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/cs/thunderbird-78.2.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "89926439c396b64a701d688b2520eb1364e5f2a348a645651396e7f91a4b774a"; + sha256 = "c0c9f22000d3dad94eee99832cd086630a0660fbbb1a4caa7a7e4307803d40dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cy/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/cy/thunderbird-78.2.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "65a124a1840efdc33b0426a0a8ab8426423425326f7905844c74f7503c6e60f4"; + sha256 = "d25d743973288fcb492c8431658142f4762da2a1c894be7cb867aa190ea8e3a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/da/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/da/thunderbird-78.2.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a572014192e6ba98994f8693b062400b7909bdcede065dd363a3ab182cf40293"; + sha256 = "bb8ce50143d484fcf2eb7c15e7b0ca5474232a93a2a07ca04f7ef28b98c192bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/de/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/de/thunderbird-78.2.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a0eeef52d89bee326402354eb1de3f531c9c255d31840ed91e93110c9f170aaa"; + sha256 = "97536ef763374e3fdaa2da1289931f876a721be3c95a495ef920b756a9d34706"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/dsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/dsb/thunderbird-78.2.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "35d0295ebd60415457a7defa40c5bdee2dbf40b08dad387aef0557dc511ce489"; + sha256 = "9c88d5d07b39e0294fc5c90b4adc70b3919068d6ff157e3a35110afee9a4027a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/el/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/el/thunderbird-78.2.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "135fe2424a1731e24c9602c40e0ae4f8fc551ed058fcd17516ce8f39a7d88bbe"; + sha256 = "075332016a50493ecb925402a5d09086b4bb39dd83aae449a48189bb35134757"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-CA/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/en-CA/thunderbird-78.2.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b5741a82e8d59300c1f2046b4a4deaa2804d90ad8e8cda7cda9a39b7d6293b87"; + sha256 = "2290544e6075721c62c2e0f6f39c77af8fd3f31862330d852e60a4c81c59ca8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-GB/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/en-GB/thunderbird-78.2.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "61b0e85a24f56b1b7ad03e9d8206313d50cfc6480627cd377a4a4b1bfdd9f13a"; + sha256 = "e9d9337b4dd961c578ca29ef7774732872c32d1d13a75be1abaae810bd0fe8bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-US/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/en-US/thunderbird-78.2.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9f0cc0edd2b23bc67824d3e8ed19b8c0a331e69a307b6d48c20e0e29e756e7e7"; + sha256 = "77b24d9d4185491752d2ddb609aa2a80acbc71829f14e0a8e703f06d77805ee1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/es-AR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/es-AR/thunderbird-78.2.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b0390addfb6133074aab52d1b6b73eccb9fae9031967fc94d57f95be30cce54d"; + sha256 = "176e9b9912ac423546d52ffef7c26eb2631da27efabacc8291ab1e0704a26793"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/es-ES/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/es-ES/thunderbird-78.2.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "4d9f115bba5f9f32247465398e8ccd2f279776fadc3961f79b9fcc923c9cc363"; + sha256 = "040f8e3f21cad483406a826768bb3ab2ba7e9be332b9291510eeea5642ff518c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/et/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/et/thunderbird-78.2.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6db8f8c69d8452e402724bf3fc6fb42242d2839307f6ad387f813a97286f4773"; + sha256 = "a495f15bd7bfde1594b0becc952e7c086d87ee8d8ceaff38ea5945d8cacc972d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/eu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/eu/thunderbird-78.2.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "7c8165bc0a0feffd71431f3dd30ce99092a0816581363c2d317c6f40149234e1"; + sha256 = "5b53597ec6bdbf184d0feb182d6459719c159edd1143c68b95863444162b3484"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fa/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/fa/thunderbird-78.2.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9537892fa5e9ba5b3f79b96fafef1e8e37c4813f0515f965ce05b410bc7c9448"; + sha256 = "cce6970ea1373b8dfa6f4b16a803c55aef6ad6a1752be62dfe73b1ec252d0017"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/fi/thunderbird-78.2.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "31ca37c4d0f13d1a30b2d7541fa9fbe80add66c6d787bbec069cb904d1157e18"; + sha256 = "6e7ce171900883e798bf66a6b48d37f359e45120fa36771b37137ef90a644d63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/fr/thunderbird-78.2.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c7507fd9096e9c47632be197054be68631c9d1812b7242b4de06774dbc9c3b1b"; + sha256 = "07b853c6758e991b1d0f021b6bc48b0e82741edbb107e2e517115675d9bba602"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fy-NL/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/fy-NL/thunderbird-78.2.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0a3d9d62861eb11bf409ac20905e787fdb273dd1d74b754f10790ff7deb7160d"; + sha256 = "d27a72ab1812e7d9d9bd9ac6dbc6982fb22b89982a58ec5b2b07a163bd72bc5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ga-IE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ga-IE/thunderbird-78.2.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4bd0b50313e9a85a83d5b5a032710478feb2df52936bcdfd2621cf30a4d02efb"; + sha256 = "bf5ae7fce3c74421923baabb4a3391c0e5eff4f470029286e1868df631451396"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/gd/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/gd/thunderbird-78.2.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a72ed3ea99e863f4a6150cfeeaa0052adf84f8f5ad52388b8bc30bf15d58a310"; + sha256 = "a433875241721d54f3c48c84a48cf786df5b757bfe4afd2053f2bca6f4a36e9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/gl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/gl/thunderbird-78.2.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5d9bae1205ac9490821b1b6d5b700a540bccbb21a3d41943d7f3ccb8576e2087"; + sha256 = "22a19264f09c2e184e4d0ced2a88b1feb83cf5f47ed71b7fdd88b0b42e17557c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/he/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/he/thunderbird-78.2.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "7cd6417391db27934b6945edcdd9d14b46a69052af7bccd5a62fed588c77894a"; + sha256 = "0e8be83ba353088d3de57e7e075067ab11523678eedb61e5c9b8dbd4a93bae9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/hr/thunderbird-78.2.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b641cb7393e1e655adff946c82c43edf580e9fe3852b5c0cffe8f6d12759d190"; + sha256 = "e9af05d2c0716c63f187022ffccfa413fc4c3ba938be62559f3243b3e3387239"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/hsb/thunderbird-78.2.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "39a27b797117eaed4e939e1c38ade2da13486f9050b5c4d87219cdd46abb67c4"; + sha256 = "04aece2ac7ccabf025798016731ba610d5401361b403a6822b6770543670da51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/hu/thunderbird-78.2.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "5c9795de2316add4e482f9e074c861ef2e05411ea3792d6256d3c43359dc692f"; + sha256 = "83163c8a1cc002d14e8198b6bb6a7fddd66fe8edaaa5abde0447d4c4ad55047a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hy-AM/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/hy-AM/thunderbird-78.2.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "be1ba0a8fecf9a577cd63de519f92f48ddaf7c4b68fd629f94bb2ebff3cf16fb"; + sha256 = "77f4d439957161cb13e8564ce2951a2102b7c1663c675068ed73e3809c04ddf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/id/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/id/thunderbird-78.2.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "15eb3d6acda87645da2874cc92366fb50e821d7ec7885f87951366ddc66db2a0"; + sha256 = "d1530e24d70ca54121270468d699471d92d2cfba538c6a9083980d09c066aa32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/is/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/is/thunderbird-78.2.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "06549f464526e931f23c0925b402eb3da6fbd9bd16595387604fe7edc62c4672"; + sha256 = "e1b25920b7ec9353f1cbb511a635d57aa45e65707f1ba493d9c7af6c50e3a601"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/it/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/it/thunderbird-78.2.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d81344b5dc0e131d1796f63de559a18b59dc70403a957eab737354ab05fd31c4"; + sha256 = "38315dfe412c8b4460805210fcc6aabb859b20ffa41773c7a87634875016079c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ja/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ja/thunderbird-78.2.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "48bd5534bfebd6c6f976ea4230ac7d364544c1467b2912f0db46fd23944d0908"; + sha256 = "ffc20370c6252f80d8f191460d97249cce99667049a0a7610b01b16ad48f3af8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ka/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ka/thunderbird-78.2.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "8f581c4d9f6c2e8f79bf7be92bf06a69d0dfed017346e1c380a31f541c5155fa"; + sha256 = "4dc0ae26e215fccf6a0c3dc3d49544f960564ff9ae5b0f7054d0d7ba60c90d85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/kab/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/kab/thunderbird-78.2.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2cbcf1e64dcb914af8dfa0f8dab462d59d37992b3f4e22159e2edd340cb6e73a"; + sha256 = "e9666986e06d89e202dba5abff6722d11c0fbff3ebbe7a5664ae816c9e305304"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/kk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/kk/thunderbird-78.2.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1fd067e9751c60dc6c6dcf1e5cfee3650758ae6593cb20fa5e6103cd01e6e6b7"; + sha256 = "742be512385a5d9984ac8ccb96abb856cf7a25c0d8517996774726bb24f6c702"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ko/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ko/thunderbird-78.2.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "efdd154ad42d1b8f257d0cf619afc4bdea44d7014882c82847cb5f21d7037469"; + sha256 = "94f8833e2dfb8f905fe7b37da7f3f197620763f6944c565f547554a7d8756cb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/lt/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/lt/thunderbird-78.2.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4256ec374ea5a22553469393e7fde51b46cd2ade5a620e9b0fc442e9d524494f"; + sha256 = "9a9b49068639803973fe30f1a44bc2a17fe7b8583a549cf996b2deb0cd145a10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ms/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ms/thunderbird-78.2.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "40f6fc9fb01a83288a6952b7a6e625bd00659594f7fa21ee883c16501407b8be"; + sha256 = "0fc01d5be421b36ecfc31ff818692edf44f29757c6e80789c64bdd5459f6b500"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nb-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/nb-NO/thunderbird-78.2.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b3f363ccbc5946c6e0e87ca4b75e12e4e4372688ae7a034c9cf37fd401794840"; + sha256 = "88f3b13462488aba548f553d6d9e8025233e13f48c054c51f989de0d0ea3d02e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/nl/thunderbird-78.2.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6963f3f09cf8a3370b06c894aa744c4ddbaa7c11df4e41f540a21427ec391135"; + sha256 = "8b7cb8152c995add11be80152031f5b50e0bc571cca0503536db630b8cbc8127"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nn-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/nn-NO/thunderbird-78.2.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "da647b3c85db5ebbfbc530dd8d8fb1005928430775cd5c8a2999709614f4e35c"; + sha256 = "41c8ccaee5ead407b7ebbd73d12ae04188f5dbc8a97d20c20c21b4d688edc43f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pa-IN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/pa-IN/thunderbird-78.2.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9df18348eedd3b43a13ac991b875fe12678929faa58712b09ee7364a8dedbd2e"; + sha256 = "77b6a9265c07834ed79ad68e44927eeaf52a64724b58c3067dd99aac36abdfcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/pl/thunderbird-78.2.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7f60d5a0a819f6b69cd3f8444c12758f7cee17a681859c03cbea29ec27e1221e"; + sha256 = "2f01c4b5c058fd56c52a32671e486d1ebc462a96aea5a27a2a0393bd3a34ed5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pt-BR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/pt-BR/thunderbird-78.2.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "229073650b742b4566350ce82ea65f93f639a2b502bf706de4038c3c13ead354"; + sha256 = "598dbdfdea842d607d65dde5d674634a03f152d5fcfed1891352356d1d61a80b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pt-PT/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/pt-PT/thunderbird-78.2.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f8596511964a688747ce51cf0ca6bb6da65ea78b9b3ef70ced4f69fae8edbeb0"; + sha256 = "73a3dd9b640d23099561452d5fb5c639bc04b1d8a3b3b1091f922622ebeb559b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/rm/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/rm/thunderbird-78.2.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "fb101dae4058f2cf804aacaf60c1354415cb0287432bb367a83e2ef8109375ce"; + sha256 = "3a762d2f6b049778bf8372435210d27d98c1255fb14300bc297cb691e8524c49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ro/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ro/thunderbird-78.2.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "1cb1fc985122dea685fc1998764c60979a7c357d5e1e0646b8c4f45e856b4f00"; + sha256 = "61cbf80023d54aa030ae309ba4a952afacfaae12baea7494802ec18d3950bed7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ru/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ru/thunderbird-78.2.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d89b9a418c78422e2a715e7e1c5d2bf57e90c2293ad63dc5e9f2645fdc910103"; + sha256 = "195cf37d9999c696976617a1281aa73f28e421513941639c5bed70e42a177a9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/si/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/si/thunderbird-78.2.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "584cd0dca877163073824e9dfbee4d6146e0ef8bd0b23cd2325462a1a72a41a4"; + sha256 = "d6f4637d875be6aa2c2b3ba4a3948f61e39738b5a2d9a0ec1cd6158e0c4aae9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/sk/thunderbird-78.2.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "cbb2b5678d11eef244a175d88207e00fc59584afd0b788a82319987368ff19c2"; + sha256 = "499bdb9c2504a29e3990c0738090410afbaf016722b12169734564abae745aff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/sl/thunderbird-78.2.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e8727e9942c4555d6413a3ebe1d4b2ab2ea39da4f5b3b2ad7baaeb8abf49fd47"; + sha256 = "f8fa3dd94d63566e6e14cbb66b7f92e7e2591796f7c9900117b0a06880b8d0f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sq/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/sq/thunderbird-78.2.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "31141f45121dab9c5ce3f3d6195264df91e61e434ee993c409c3cac164215737"; + sha256 = "1249f85fb8e30e7ff5ea9baf30c56b91d78d965038a7121f25f9e327ca4489c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/sr/thunderbird-78.2.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "dc9a868b1345da0633d090877ae6cddaa3a1b2bb1fc3113bc9de2aac1c30366c"; + sha256 = "6e5b30eb1b2df7dce4e366e246f28dbabb542af3b50e581b71a8cd7fb59656be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sv-SE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/sv-SE/thunderbird-78.2.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "fab7e11f8de1fcd2e8719d20e818d8bd2c39f7539328fb79f2cce56d4f312a78"; + sha256 = "431da982c97b39e60605bc2a0b1d0cdc117c336451c9fae26f17e397e2088da0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/th/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/th/thunderbird-78.2.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "fa3173940d4e7109385d65b479297110545cc7e2e76e8a657f376553e370563a"; + sha256 = "3d1f813e9363887a465e11a7729fb5f2d6204bc1d5fa3690c1301a83bb32b06c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/tr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/tr/thunderbird-78.2.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a8cf6b95a6b890892d034c0b014a62f710bbafa34f3282a80e17828ad9365513"; + sha256 = "3e4edac805121565ae3e0c77e446028759d60402832f259b694df80e7f060172"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/uk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/uk/thunderbird-78.2.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a5086a87a87ccb605154aad5bc2986d6fe995391189b3e452640210e2016b08f"; + sha256 = "632dbf35842b208d65c0d4196ea21d18bad848a43c12d1f29b321bc9095ca3e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/uz/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/uz/thunderbird-78.2.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b5bea650b678808b7fbcca432c1de0121dc19886b2f32e764e4fe1a797d1e8ab"; + sha256 = "93cee199f136c829276eb203312b658414726628a9501a916740e555549e4fd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/vi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/vi/thunderbird-78.2.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8b8b57417b1d6faeb283b1b6037eac92841029bd73769d5cb8bc6c227e87efbf"; + sha256 = "27c73e1ee3fdb19c4be32a5e00da43b627a1d2cf33e8efdf74e1c43b715a400e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/zh-CN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/zh-CN/thunderbird-78.2.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4a0c8629e2a5e5f95799169dba4ee9c10b728bf503e090ed829cdd11fbeb57d1"; + sha256 = "46a3d7e6f370638612c17da492dc5edfb8fc693906efedfa6f19bc754f9879ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/zh-TW/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/zh-TW/thunderbird-78.2.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "11a892d8ec3ec6e2dccbad4b97ce2fe7cb0a0b1dc309bef9819432f0be9d510c"; + sha256 = "501e76ed3fa9f180358f290191c26c65db10fcf7339359058eabc854bb9a88c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/af/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/af/thunderbird-78.2.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a254eecebf45c16f55b7d72cc38da2c4d22f49704cdb5db72d2adfc199a7a78c"; + sha256 = "3c986afcc681713ef2f958e060054ca5e0a91502b3d3b9ce9cb168c84f1d8dc8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ar/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ar/thunderbird-78.2.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "3e735d996bb3bf2674f1c04f035489893169ab632208af1427756bc3c15b1600"; + sha256 = "29970a358b02740709e370e29d22747235b10e74ea0ce9a937487cd486492e44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ast/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ast/thunderbird-78.2.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a8fe0f85c250b0f71b0bac30cd51e10e5d1ded4265775afe93f986ccde4fbc49"; + sha256 = "1c8a013d36f74264d3a72cd28a54ef55be1ae5a964cfa0136bfafcd22bf400e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/be/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/be/thunderbird-78.2.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "279a98d38f6c33945ddd1e86c9263e72f9a52555e7f26c56a2f3062696436bbb"; + sha256 = "1ff4b2213ebe1402acc737baf11dc4b88e0b5f8ab0849f1293ce94c9ffa408cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/bg/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/bg/thunderbird-78.2.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "cb23b56841818af2e3e8dc922cace29c8538d22977ee951dee744bbc490c24a6"; + sha256 = "0874616da3474cb4fde8cf74a088bce88872a714f872ae32afcf6375fde2afac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/br/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/br/thunderbird-78.2.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f729274b064205cb9baf57be3732268a2c56893ac6b17ae6ddc0aed3269fda15"; + sha256 = "f56758fc1622295fb83041f3c36599251bf31f5dc28a5b7eaf9928b801af418a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ca/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ca/thunderbird-78.2.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "eb434c12d8d841eb8426b95663591f742a9e62b630cadb7afebfa79ab1142a38"; + sha256 = "ac7eb3b393c1755fe1614cb5376bece50a64031a5c1383307d0a74deb0814660"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cak/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/cak/thunderbird-78.2.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "daa19634d796f849ab9b3a575bc53e451453902f82ce7384a7ae5ae4f99a2165"; + sha256 = "772627d1142b0f142eccf4ca135898dfb198c21dfd823b737d80ac6d5e5086a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cs/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/cs/thunderbird-78.2.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "181cc3c70985d41a806395b353ccd98475c37ae8151fd5f59adbe25bf2059457"; + sha256 = "c833322e5984a3a161a77c3e7cc893a6dd098681e5533c48b020a6258f69308b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cy/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/cy/thunderbird-78.2.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4cb93a1b38582e6fd4e4fc514c36e469b88bedf0bd36bee4d7a66d9c33c3c8ca"; + sha256 = "04d7089f68d0685aab9a41eda247b48a8024c8deeeb3979a76a5197d8fdb745e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/da/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/da/thunderbird-78.2.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6eb46018b763d22e62739ec9dd98d5f3804f85b5b65ca3092c42d5d9a1a258ee"; + sha256 = "1b5347af18a019a29bc8f9e21161cae8f3b955670325e28f117884fa540b71f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/de/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/de/thunderbird-78.2.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "dff12cffa89c1ad5666b92b66361e17c604f0ca34305fb0e3b06be5fa8fb0f96"; + sha256 = "225f1f703b30f784271f62e5ef25568913e3007448c317969b18b2ef7af5ddc9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/dsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/dsb/thunderbird-78.2.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "efa2f9449703fc0941620650f1ca1332682b2866339413aa03f2438580d18f78"; + sha256 = "90ea05cef5fdd187fe281081d854273529993928d8fd7773a923b1a5feb6b9d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/el/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/el/thunderbird-78.2.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "675cfc628dd02fe874a701e0e16986c797adac263605b304c1c69bb01552037f"; + sha256 = "3d6402bec493ee5663d8ee0b8480cc35769938d22cb81a02f819ce4b4e59839d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-CA/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/en-CA/thunderbird-78.2.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a710c91df20b4b25d9e363b585344e1595ab96b9cc1df35e973e485834942957"; + sha256 = "9a6e7f840ee9f1951d901f2cf3b37717ed5a70fa4e005c16654f48e43fb84060"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-GB/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/en-GB/thunderbird-78.2.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3acd3020cb6116588a0f061aa9ba5d620477e3265eefac3dc22f4705757fe025"; + sha256 = "324c086e7c293b500de45f4e684f37fdad9a7ccd2720439e5feff15a5ac26c9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-US/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/en-US/thunderbird-78.2.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "bf9ebc54aff457654b5ea1fc81437281f70d78de96d5a4d3586ae83fb8135d39"; + sha256 = "bdb2228970ec715690ac94feaa487d11ae1b5fbd8f0f6a0db6feca1440ba7f92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/es-AR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/es-AR/thunderbird-78.2.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "cf1c278a36c9303956ac8dc29a51226a42ea17cf64559c34bef318c79ba6ed74"; + sha256 = "ddf513766398f8affbeda8c16e09521a5f5e141cff332a6e9482798286b8dc19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/es-ES/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/es-ES/thunderbird-78.2.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4a9356476a18f292f763f1647611189ebe89ee368a3f01a7c75ef8dce48d91af"; + sha256 = "34e34962f1a20752eefcbe6befd7a44e1c0dcfd2da387d61296af975dfc8af7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/et/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/et/thunderbird-78.2.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "03d3a43153b714f334a8f5d7d23e9080624488ec54400451b508c6aa50bcd594"; + sha256 = "bd74e5d6d9da18211c90e36de506df6acbe4bf61c0e0a199ae048fc5373bf68b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/eu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/eu/thunderbird-78.2.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a7cca16186f0e2627dc6e06164b3cb2bb691cf798f7c41378ae90349521d9199"; + sha256 = "036c95223452537d7a39dea188f82ebacf1ccb70f4919bf575970eb50ca5b487"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fa/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/fa/thunderbird-78.2.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6a19a79d409acdc25c69b5c8d75a18f2de665a7d18244d578e4ef0f65597daea"; + sha256 = "9e9b402de1799afa3d680ced4622072322a516982c86e3a8dfd1df3b3de9fb24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/fi/thunderbird-78.2.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4b82f0fadfb5f388948e33fd3408e9f6ece6737c8e5e4b53c164a124f017e553"; + sha256 = "c693786d8cd597e1ccd627201418d6e98e8f09c526167dc04e0b54143f99c8e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/fr/thunderbird-78.2.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bc4fb423664576d4d94eb24383e3f4f23c199e52f1c985fd3bfccc947212f82a"; + sha256 = "b1fbfa0deb18015e2fb6594aa1eec58e2a897d7eacc4faf2e4887c434ce47d77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fy-NL/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/fy-NL/thunderbird-78.2.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6eb76c3a4d3b31160dc0d0b807596095354c7c0740f5593f86042af1e1b03d48"; + sha256 = "826b558412a5e9f83c2d5a822a2d3ef2f0bdafc882a2283c5ec4bb14f8c9bf82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ga-IE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ga-IE/thunderbird-78.2.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "5321fff3eb4d341307233976de74624f6002abb8662f40ecbf77e3bdb5757add"; + sha256 = "ad7508e4b44b7188b64427b71cb1e23de5cadd7e438c95ea97f31cb57e96c391"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/gd/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/gd/thunderbird-78.2.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "515207242fffd0513a550017f8bfb53061f0a0e3d795a111adf0154b55363d38"; + sha256 = "3c93322cb883011533bf1187a683e1e5c93977b79165bdb60e248604390335c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/gl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/gl/thunderbird-78.2.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "84c32bd92a783c680343aa5b01dbf58e37eda9ee466b16f817a79a135e37fbe5"; + sha256 = "1e649d0dd20dafc736cab7ced71d93dc0c68b852bc4ac28a1d9572a0bb2d2672"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/he/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/he/thunderbird-78.2.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "96d07263578fb16068e0f48309552ea9237d3dd5a46fc63e3293326778cb7af1"; + sha256 = "b1bc9b85d23bb0150edc29461e9b2999a25ec78001bfdc1fee6f08c98468f138"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/hr/thunderbird-78.2.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9c612aad3a12530052dd609c2f20a3739c458b3c7f3d761e7c00754f9b43db95"; + sha256 = "6de165437b37733a21b4b7eda7abcf7f08fc7ce81962fed25c8758bc33daad3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/hsb/thunderbird-78.2.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "376e4d8eadb9bb8f301053d30260ab0cbeb3dc9f590564583f07547585105fe0"; + sha256 = "bfef9fd1d13362b9007150fa822d59e61a1ccfc035eb85add98562aa6f198400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/hu/thunderbird-78.2.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "4e7e51dbbe359ec542e553f5b0691f1d191343261094828b2572dd5a03ec2c8a"; + sha256 = "3973249fe4a0fdedd82ae4a08faa4f1045a29d1ca6a01036eb6f9ae736f985a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hy-AM/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/hy-AM/thunderbird-78.2.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "735624e30d1986d6c822fcbee4694389cf8a0061eba40926265bd4ac998e2186"; + sha256 = "1c3fedc2c62c089cc375cb6057cd7faabe15a452e5b034ba3a3a695dceb75a59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/id/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/id/thunderbird-78.2.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ce6d668f38d1e74e7c8bbfc7408edc749eed9449908044bdd57b2dcd868cb89f"; + sha256 = "8570e4441e908ec0033535f1f5e2c7ca7c69dd412fd1545b54917ebfa718bc69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/is/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/is/thunderbird-78.2.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "589369ce68b6c78ad7753ddd14412eb68f438dbd7cae449f828288d25ee3f795"; + sha256 = "1a5c74a43095599623b16ca38fbbde6226b3f9771b02d789617075056a14e213"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/it/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/it/thunderbird-78.2.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "fd909d5aaa68a208050a0812f15024ef115b99fbde0edb0afe995c3b766c0d76"; + sha256 = "22d7d45079d68d2d8e890a075ea4319d4e24ddced860b24eb3bfac546a067e36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ja/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ja/thunderbird-78.2.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "160c2a1c36ef34339270abd59fed13b37414f8c37edd60463e0945e6751a0c74"; + sha256 = "753beca4177c59c763f99d97e5f8d0f31ba4ea478dd4e4149b09ebf2804aaffe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ka/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ka/thunderbird-78.2.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "e822a28e62aae6d6e84e6788d5311af45396248f48cc60152b4273d75359dd8f"; + sha256 = "2d0461e64bfcd96c563e10124592aae33f0520adc8a99dcc8ce661c0625cbe48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/kab/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/kab/thunderbird-78.2.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2ea58cc79b80966b5bbc310fa32bd27621f95d4ffbd3646bf9e04f922c36ca6e"; + sha256 = "0ae95c76f24d8771ab80e4365da350a20ef1900580b48cc65bbeeccb702a4765"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/kk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/kk/thunderbird-78.2.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a874bc02f065be73a54b70567b7a04be5fc6a9f766f3b054b12555763361ea2a"; + sha256 = "f7c0da9664a486e917abb52cc4a43ca4d54dc5e35a19f77188ff089bf545ff23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ko/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ko/thunderbird-78.2.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d9678f72569dfde84544fcb9afa7cb8d5a4a35baa52d4e560aa2b082a418ab00"; + sha256 = "349fb6acfff9fc93af3b1e64cf6a7bb1473ac44591a49bca3c4462d91ad69318"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/lt/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/lt/thunderbird-78.2.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "1d7ec489dc52fae0f7597e40f8505bdd6a57a717389c75b66481749e85e2fab6"; + sha256 = "791c878b611325e6d7a8cc6e17e164664580d3d7d6d978d6d3c724ef2649cd92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ms/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ms/thunderbird-78.2.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5d0c7cc00139c39a69dfc9ba1dc5c83b56973f26679860d048952bcf09baa737"; + sha256 = "650ffe45f1076abbadeae915c0ed3fc22f016af32997b477350502c5b10a0467"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nb-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/nb-NO/thunderbird-78.2.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e72a25e7d53e6e0d470632c487d31e08afdb6c27543d50c93ff72ecac3f70bc6"; + sha256 = "71f0d3b2608967ba7eacee0295fd11a9451d256af9e8a7f9c3d267198a516077"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/nl/thunderbird-78.2.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "19efd7323e671fe25b64ee44c85f698f608e6c2b18fdbfc9f0cc95b9cd8cd149"; + sha256 = "1ef722c0694a8fa314406a0747864f06200cbc99ba3c134ac4a72cbb522345f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nn-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/nn-NO/thunderbird-78.2.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b4be21281c6a13de05e5d0b96e43454bab662140a00d3837f609e23f14360c90"; + sha256 = "a994f07a7034440b650748dc1910e291c1fbe3e03ce1df94fc1c0ccbde66ea2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pa-IN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/pa-IN/thunderbird-78.2.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f2795a504616404616f7d22022e105e9e4ea54025d60e262c405b867cb9c7936"; + sha256 = "c31349f21b65039983f22ff25b8b0071d463dab4b7a32422a78c873c8ad7cc2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/pl/thunderbird-78.2.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "52f80b074dc168ec00d0fd78f6376c1dfd357c2b7e7ed78bb1b9cf17536508a6"; + sha256 = "d82f721f67ea6961d5a184f5414663835a5adb533a504e3973847562e3c058e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pt-BR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/pt-BR/thunderbird-78.2.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d02867899a54eebffb2b6e600f7e6260b960d686a8bcd61ce705e9d0bbebe377"; + sha256 = "32f83437183201739acd8a16d9d0409bb50738b73f642738c1dc3a89d3d66ac9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pt-PT/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/pt-PT/thunderbird-78.2.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "659a7ff3a0dcbb4f3fec32eda6b5a2087191c8d49ea310662ad540433d869180"; + sha256 = "731abc38adc2b9a498bc1e3d6111a769fb82aef13831c1e8b85aaf89e8d4b3bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/rm/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/rm/thunderbird-78.2.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d9ee3c5e3cf2d7eedced9d12bf4d499ae931c262be166af6a14bbd4a2538788a"; + sha256 = "65be4d569df37a8207b614316cbcb868fdfdd3bfcefce668d9ec716039ed38b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ro/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ro/thunderbird-78.2.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c3db9965a25d52d25cde0b52bffcc274ae32862fb29be368f27b102774d0971b"; + sha256 = "fb4d2d36ea227558e320ec860c3f0dd4982f2cb548ed579ecc84e05843a2d15b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ru/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ru/thunderbird-78.2.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f0356ef5eadccfcdfc694d0bed9b1e4027e4883095f9c117403a68f1cb2810c8"; + sha256 = "d68c44ef363d443e6ba7861c1a0a3b77563470a87765295147236119e34d2c0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/si/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/si/thunderbird-78.2.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "5b5d17a2b098fbe1c2d8686ab0e1adb7c72efedc38365ca9b39b1e122302c85c"; + sha256 = "e2f1ccc57793fb2c2fdfc829d790a0bed0e96c1d156cac505f99e1fe948a2a7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/sk/thunderbird-78.2.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "b39bd41a38947ea467e1a89c5a173fd07cbce09562c10e6a60adb2150b04c9cf"; + sha256 = "fe17bc1f3c729478029981b247e03efc62707380b3b4efb11736865d4f86c5d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/sl/thunderbird-78.2.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "602e0feffc5b786930005c376ca3e8819b834a0cfc9a649bc46d86c27999144d"; + sha256 = "7003d144e6646f7a9c22aeaed497296f7a6fc512cb1219e145388dfb80d67d7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sq/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/sq/thunderbird-78.2.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "fb265490d00c3a844f73e8f531b7c73f3787cb4e4ddc7cdcde72017fd7f3d612"; + sha256 = "e83efa34c14046ada92cfaf9684680aeb8398182d39c81ef822fb6c90c6d22d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/sr/thunderbird-78.2.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "1574eaee6effc4df2c88fc94597e295f352455a9f68501080385c08cb4ab7e35"; + sha256 = "9f78de776cdbbce197f0e263bb95be815326cc0f6a5b3475f8cb14fd08702742"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sv-SE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/sv-SE/thunderbird-78.2.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "8d55df4937fe28f7b9d0fcaebcde3fb9650de9f0b74f677111f339ae2365b822"; + sha256 = "d92235360937d81da4577521324415227e23588d6447166f4550f2c0788c100e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/th/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/th/thunderbird-78.2.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6a872a6c332c7b3bfc24721bf1114c85475a73ae5c7b16d8637b0eb0045e112d"; + sha256 = "aa6c43197aa08f92889f85537c221c62dec1b7da856db0cdae4bcd21cb9d799d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/tr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/tr/thunderbird-78.2.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "26d2b8493a1508591b45f9ecc43598e244856c0d9bc3c185721a7239679c4e63"; + sha256 = "0b8efd5789e9bd397c98ce6246b22da908b86e4c364a23a9b9c63d9c58d99eac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/uk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/uk/thunderbird-78.2.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ddb4b5fab55ded8f7bc2ae914f41af42b3b69c738727b055efd5e05b253ac872"; + sha256 = "98f6e512224bf597126d443b77a6db319ec2f075ae041afb0de3f27e7b9f2b32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/uz/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/uz/thunderbird-78.2.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "dce93fab320f90ece938ae2b2343c1d27a1143b0183318a9d9e0cbbcfb607982"; + sha256 = "1a8fb208962ff365f5362b1c95b97144456f8231ba0da8b7bbd4a406746ed681"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/vi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/vi/thunderbird-78.2.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "cf1b4f96ef1a510d21b232e748ace6e567d27e382393a7d7f51ab392f026d55c"; + sha256 = "e955597d9d2e3bf721bfee549f61e46b492d62ee678399eef11b33440fe42175"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/zh-CN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/zh-CN/thunderbird-78.2.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "574acd0743a1202b6629883618278eb3ce113c518bc9c39f3d90e2dc12d4f644"; + sha256 = "58bef7ac37b2976b43f0a451dbf144497aa7149cb38fdc276135f97f4a2b709b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/zh-TW/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/zh-TW/thunderbird-78.2.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "51ccc5a4696841b3391a5dd9fb9ff1f55a9f6ccd6fbd86587ffb86c5f664f10f"; + sha256 = "7e27e58297a781872ac6ac113b361e43abeeb5ef2eae24506a920c9214351454"; } ]; } From 812b8e8054f8661490142bb35be0da11858d6f21 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 27 Aug 2020 20:01:11 +0900 Subject: [PATCH 165/688] thunderbird-bin: 68.11.0 -> 68.12.0 --- .../thunderbird-bin/68_sources.nix | 490 +++++++++--------- 1 file changed, 245 insertions(+), 245 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix index e0f75692d26c..c48a6d1c6063 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix @@ -1,615 +1,615 @@ { - version = "68.11.0"; + version = "68.12.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ar/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ar/thunderbird-68.12.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "878336931005573f76fb15c25fcf2593bfabde16356ec6b1f9b8913663b5fcaa"; + sha256 = "70cfb9e6a7a1f285f37a8f13c9a010237e6aabf815b77a12f54ee0deedd36400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ast/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ast/thunderbird-68.12.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5e3f29fb47ccb059d983946d6efec14b8ab00695fdd84a5cc7baa0cc40657cc5"; + sha256 = "5645657f20d37ffdb11f383f164f03c66ed2024244849b09bfa60075d5d07490"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/be/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/be/thunderbird-68.12.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "5cd4c3a3d6ac865b727b58cbb51def60779c0d731a9f6b8f01d4b8cdc90d42b5"; + sha256 = "d38cdcc2ba4534c23a1bb42b93f271623c497f48e1d255a23bf12a368ff339bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/bg/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/bg/thunderbird-68.12.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f359cf1bd12f14bd6636fdb0bd885ed829235559c20c86bd361668f057039f34"; + sha256 = "c8883242683dec57f9db502d96d2036ec46753f474a33c0f1ae31f97f2c3113c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/br/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/br/thunderbird-68.12.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6cfc9608b392b1e604eaefda5a5dcdc346bd88a1bc411532e8864a04631cf6f8"; + sha256 = "cfb669e2378f97689a14f23e2c55ef4987e2508695eb195be3af75ed1d648345"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ca/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ca/thunderbird-68.12.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "9068b49e2d8a6f5e82b70ddda1b0a048d094328c96cf21848eefa431d358e6ca"; + sha256 = "9ae4b43e0d5d9edd83291f0be7d53d07e5c84f1d0ad4348654136543b7b53a54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cak/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cak/thunderbird-68.12.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b3aef7c88302e2b9d0fcff8daa0d8ad4e2893d41e54ec29b746e79d5b03128b2"; + sha256 = "d6d635a15b913679ed943c3501dd03140d099ff36b48c8731a47eacda1b5232b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cs/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cs/thunderbird-68.12.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a2338c8ac38a4cef41d8fab1e7857c290afa30af0b131a31e675368944d69ba9"; + sha256 = "616fbf24e36d63ce3cbc957d69b8972d517524c613a22bedcf5b57534f9a9a41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cy/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cy/thunderbird-68.12.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b02118f945ee76653df0364da6b2b8c597fff2bf52f4e20b64f2b8ac69aaf60a"; + sha256 = "548c51228d2f3003bb94e1bee91cea0d2edb95bd0f86ee4259c8daef90a2dca8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/da/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/da/thunderbird-68.12.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a565beeaf67c01edf83a2478732fa9e245645d6e6b4fb566affe552762b8bc86"; + sha256 = "ad0e4b7a693d881b8875a5b8cc3e607a3883df759278129f0933522b9a6acd24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/de/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/de/thunderbird-68.12.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "00a8f51254b2152ba37d964bfaca77cc06b9d778ef750eb6500e01510e298fb4"; + sha256 = "bf9b70b345ffe5df03365d819c5abc3339ed3af4d8a716cdfe7099134864a9b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/dsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/dsb/thunderbird-68.12.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7cfcafbf7f46a4be23003a59390b0404d04ee344c883c29a18f42accb5fddc4c"; + sha256 = "a2cd7ffb0e8b4c3d1715c18e636d0dcd5efa245200d6d0f14048fc4b399b8121"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/el/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/el/thunderbird-68.12.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b0d0865f8b64de26af8eeff6eb84f159f585e3f9f7590dab413e04167215dcf3"; + sha256 = "07836ce122936848e26cd5a1522967760bee67654582076c53e4ec183cc4c40e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/en-GB/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-GB/thunderbird-68.12.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "eb6731a9baaa1cd99584aec7c6dcce8f819d41106ac6ed4f42f02f747cb2afe4"; + sha256 = "c89fa35af79eca3cc26b492c602a3f8af0dbaf6ce4ee3af93d93f10daf4e9d6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/en-US/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-US/thunderbird-68.12.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6ddd72732957282280a7209f2d5137229ca8af4ad7f02e112187fe333cc79a7f"; + sha256 = "6eeea0de838909f91da7270e42ae1513d2b801f412fc758f2f8c682d260a7c24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/es-AR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-AR/thunderbird-68.12.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0d620d929ed41ffd16cfd8297ec70e8cb9105e726af99d2cd207de50920a1f93"; + sha256 = "e9d84032a91f7feb2db3d22a500c564f273c2b637f97aaab2edf3209b93dda1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/es-ES/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-ES/thunderbird-68.12.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "28bac94492c7444caab029f3cc3995275000496aab854f20368f941514cd7b11"; + sha256 = "a986e8a48b59354421193f2dd01e3c291fb6c98031af43531e723dc217a43d4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/et/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/et/thunderbird-68.12.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "49fe0adb4fc5c5135083ba53369030faa95d3a530e8eb49180f81e359229bf81"; + sha256 = "2f7508e83aba4fd64a817c7eb4b44d4ea9371956339a009ba541bf3a349693cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/eu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/eu/thunderbird-68.12.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a422935f96d5a3033c6c2a7bd39f19e3f84211d99b57d3996b31e404414703e4"; + sha256 = "edbc5ff4ba45106233cdbf5255405c4ee52ba7e6811736958323a616881b943f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fi/thunderbird-68.12.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "649c3908ecccc8466e555aa76aac47bf7153da8b6f45ddf83f36f6ac676cb4c3"; + sha256 = "f4ad740a724efdbfec54445304ca75e9a16e0881bc18789b8ea35632d8857d4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fr/thunderbird-68.12.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8270cf0e0acfb7280b8616462cd87a1d8d929c7c5fd4839f9607cb588a97c025"; + sha256 = "ebf60a227c9fe5237eff22fb81f3c8bc02a593de823d6f0ad9b67f07af129dea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fy-NL/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fy-NL/thunderbird-68.12.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "177a9f337719b2902ae964525803cd437b2cbcc8c7b85c7881e14f7e0d207875"; + sha256 = "b12983077a62c5bf7353f50dd951348a457ce07f5beb2a579f199c4d77ed0906"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ga-IE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ga-IE/thunderbird-68.12.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "80d3625a04d027382ec3fdfdabd45d501fa4b451c82ec5cfdf5c3352a395a6ba"; + sha256 = "aa7c3a4b54fd6fef0f120a6748c45a3f379268f31e087cb3df07d270bf060bad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/gd/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gd/thunderbird-68.12.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0b2fc2582ef518529f204b5096601047b5b3406201b1fc9f7ea88736d1ce1e0a"; + sha256 = "39fadb2bd4c01da0eb188cb9f52ccd726ec9f7eb5ced44e2a30ee0cfac2527bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/gl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gl/thunderbird-68.12.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d1cfc4e646fa6ce03765a56ea4cc2ad3936ec8224f1a7f5e74a34c189be11721"; + sha256 = "b4ee1f89b0326b22fc7a5b980b857c2652d6881d096060a8bc083015b47762d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/he/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/he/thunderbird-68.12.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "588f22ff9dd4dea7c808c4786f2c897842dedbf2a04c0b4d28b3aa162f88773c"; + sha256 = "cefbc742672942e310dc9f4dbcefc8b66cf01d58ac64448ac8c0dc33fdace5ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hr/thunderbird-68.12.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "126ae387a1c97d253c4ca60441a192d6a00f63f0483b2888371624337e4fd2a9"; + sha256 = "9e132811cb6bd98faee86e298b78e845727bfded84c0cdab41608ed1565f1aee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hsb/thunderbird-68.12.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "456c323f61f77c07ae73a260a3ad2641190f165d14c75da1dba33ed1f8d2a3d5"; + sha256 = "2a41d1e188fd5fed93a37a1bedc67cb745367447504a76836f79928194730d3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hu/thunderbird-68.12.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4790f014d95fe3ae00433e27fa291f7e4657b8062538ca52c46dd46ea41a05cb"; + sha256 = "9196df7850b9cff69f52b5db69ec3b64cfa312bba5669380c137b95a8140cf39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hy-AM/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hy-AM/thunderbird-68.12.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "7d81493a67e27eb485c1cb702cb8305788733e133bcb22659026737cc2afe1e9"; + sha256 = "4a08137a9a714677ecf86a24f165047b809e22eff50d196b92c153e59f943c30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/id/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/id/thunderbird-68.12.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "9f558c85ba88c6350da0445ca2d2b63205c8c1e6700388e1d4f7de0978321667"; + sha256 = "39784aab0bc3253af47cdcd95824eccdecae4dac819bacf6a04daa7b5c86d6e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/is/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/is/thunderbird-68.12.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1f1f65bb573fb4fb563e890c043ff8c3283687575892853dd3e076473072b63f"; + sha256 = "a041d1af23e9c64967e4d014b6a84ddc80ad24e852146e448f6b380cdd672e67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/it/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/it/thunderbird-68.12.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "de6c3adf83745370241c8935edccc412a60642ec758bd891d03c098b40b8792f"; + sha256 = "b0e3161c801fbaee2f589b1bc61a4fba9968f5f363a62cf0f8af855d23e4782c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ja/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ja/thunderbird-68.12.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "8b2ce4598af7323f59a31269c24bd05e369d9898266dc6e8cfa360dae7609273"; + sha256 = "ad416d47930d81be9ac2f20b3699f4c74471c36e08b14f9d5c6ee1af97c7c9d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ka/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ka/thunderbird-68.12.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "be74a3edf9a1d931124c4351b51147be2e7a74f453d07482bce4f7721de701ce"; + sha256 = "3b30bc5f0971310d71e1909b4ed891481457ac8baf11c1e505c3400b2a7cfb63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/kab/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kab/thunderbird-68.12.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1be81ab7bb429b44e0c63c81ebf249b66a79d43a3dba39ba0af6242db165d6d3"; + sha256 = "abdc58d5d5ef251e63c0c40a48460f90e299a4420cbe4e290d519fbed4c335b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/kk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kk/thunderbird-68.12.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ee308381b1e0643b7e0683c365c763beb4afcaf21c9b0a1e8c8c2ec3c218c965"; + sha256 = "08018b951de59b1a92717fc82bd98a0c324a019ee0ae14888f09c5351a586284"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ko/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ko/thunderbird-68.12.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "af2d7ee49a6295e41dbfcc7b8e19b8f146890f12baa36ffddbc7dfbfa39a8eb3"; + sha256 = "1178adc42b3a2ddac46dd50ad8436d1be50db409963e8fac3beb22a431f885fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/lt/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/lt/thunderbird-68.12.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8d384844274d048772fbc35da75f91ab6398ca64e26f089c4da116065584acf1"; + sha256 = "18d88a8cbb24d2a78af0de282187a743e707136fdb61912e5f64bf75730e3a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ms/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ms/thunderbird-68.12.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6e447b3ed1903a20001963021598d957270c88980ff04d3da6c819ab106a2210"; + sha256 = "e1754cfbf20e286fd6304b8d75337e3794893c5ebd9b242cf624090e6fc6e9ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nb-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nb-NO/thunderbird-68.12.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "710a982216120cbec822d7a9f74d8ae789b4a234fb3a192797604c9a47a23a62"; + sha256 = "6379f6dca3d8bacb466044f0a7d11b32eb61166d3f14c37431f77843eb884c90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nl/thunderbird-68.12.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "2b02b7e3b5e310e5b7935cb72e59d6a385567100d22e87d196c4b4700851d439"; + sha256 = "66a56e218365bb260980848427609d390674e2ba3c70b9adc4121f73c861d9b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nn-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nn-NO/thunderbird-68.12.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "128807f651cc0b09618bad42703970c391c17f5ff883c3ab11d115d0878fe1aa"; + sha256 = "ccdb135d43f5542151fe2c99a8e13cebfbc032367abb0308213433b753dc8125"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pl/thunderbird-68.12.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "181721ac04e9911f57ec7b4f36a5db82e261da71a310dc502efab75a101bec03"; + sha256 = "5dc2151d1bb956c4b6fbd1b6185d9328f7091e60fdcd51bad5a9ebaa8fcbb7d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pt-BR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-BR/thunderbird-68.12.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e82f40343e28ecd0abafb71f421c6d7df40b7cfca4898503b32fb0500686d7c4"; + sha256 = "5ebf77d47bf45b058aaeca857060c908dbf7036bae2c2c5812ff145aed840203"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pt-PT/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-PT/thunderbird-68.12.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "96bea893919ff89441dd47e027a7d83aa691cc99abf4eaa342c941777ecf319a"; + sha256 = "73baa68f79b4a15795fc426dfc9a8d573a05e4ab8a663d122cfd802f93941825"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/rm/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/rm/thunderbird-68.12.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "544f666af94043737503a30551ad5832f22ae529bc32495bef9d7443c8869072"; + sha256 = "29f8ba57d9000803bae795c2ff977347af9a1f0df123337eaab3bdcc20786734"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ro/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ro/thunderbird-68.12.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4c6e7793c206999e0a9510b390e4b47d82e19dc2da1cae8b4341b8afee440191"; + sha256 = "b8233ad81c6620c26a02457b9235ce0be0c5d93b81f88d9ddc84bc12f869dbad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ru/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ru/thunderbird-68.12.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "66e951339323a3a44326cada8c572d7040d33057a3a487d8078eb27efa791eb8"; + sha256 = "f959f786dbbb7d06cb33eca24efd9e2763c5ca73fc4ba47e9b933b6298d7f026"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/si/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/si/thunderbird-68.12.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3ef89e462359d09d95216a132c462f0529948073a4f0aef6358362d0457e747e"; + sha256 = "dcf59c0c1ea0acdcc894463b04c54339a72dcceb25fe5478608265eb3ead226a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sk/thunderbird-68.12.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "476641e4d45cd114dca94f59ddee15fda5fbd432c50e4f29af09eb3298782854"; + sha256 = "2a06329fd4a9dd6333e2d73a44fca7eaf593032e8ace33736a03dbfffb2920a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sl/thunderbird-68.12.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "5e85ff37554f47f585a155db65ae9e782c8604fa44db8d0dc9c3e2741704909d"; + sha256 = "f7bd3e3a407dbab07836342ff29fc143fe3904e7f878ea719522ade3fc4f6b84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sq/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sq/thunderbird-68.12.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fc4f839973d6986979089c1dcc1e9b219007c34ecd2d587538db706e4b01eccd"; + sha256 = "0edc58751a6794494efab8b0a2ce852374a747ccb73b38455475f0099ea0f238"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sr/thunderbird-68.12.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "85a32f352d2b535366dd10a49116e65de4c8ec87886b37e34ac55082c4c310fd"; + sha256 = "91ac5cc0646c062b00b3b064af53ba03c7e034b75afa13dca7586eb80578d377"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sv-SE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sv-SE/thunderbird-68.12.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "19af3a847c9e28baed2db8f6b025dcfb0e688932b0483bae461c86861bfa67ea"; + sha256 = "5aa21e4b78f4294835197f784a651f17453d83fce98e7140e49c6da117464fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/tr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/tr/thunderbird-68.12.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "deea2513814df3e7a9004316dc50f6fa2bac46e0d9456cf124e33e6e03a9b4c8"; + sha256 = "3ab2639dd126e3ed9b031fc10f4396c7d98ffa7b7ffca6a9b3f2f47590e3b83c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/uk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uk/thunderbird-68.12.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "22b34b43ccc74eb2dc565a0c63bde89ff0d22f710bd26868341be91f51489f94"; + sha256 = "59be2ddc7c65405e0b3854c2a551dab73df9736842ee362b2a20dc9088242a96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/uz/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uz/thunderbird-68.12.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "26bb8336c617dc6fe485339b3c8da814f7aa0b46eb0a821db36309305ea87e58"; + sha256 = "ae196683b283525511fbd2e3ad428339672f2f1339566a323e01f6f649d333c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/vi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/vi/thunderbird-68.12.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "88705691ae084991c198865f1e93d1ed127496245313cb8f28dafac0a64793a5"; + sha256 = "9d66b8e4eefbb6b8c0d9893b056fc684310ae583921d626cb676cd8a7b4b39de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/zh-CN/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-CN/thunderbird-68.12.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5ebf1ad54acb6d6d17985d80bff9a0b39726d1f62eea30ad9ca0f04577f640a1"; + sha256 = "2839f2f076a8a6e283a3ffdd6100986a11d19b9108fce074f8e7f127cb0f375e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/zh-TW/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-TW/thunderbird-68.12.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b795b0127cf922f65a2ad2d8f17ebe64089c6d06fe7a701c289b7af5afe7c371"; + sha256 = "02ef645a7de8abc1c5dd92eb685d64570cf1db971cfe7e248111d6a17b3ddcd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ar/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ar/thunderbird-68.12.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d19d082b55d76862977b9357e9cf245697c24d207a6d6b3aacd81abf1443747b"; + sha256 = "5c4d899245a38626fa18d849bcf01d50125dee60d715d76224ca0bb4623f73be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ast/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ast/thunderbird-68.12.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "6cd6c484888fe96fb08eab2b6b2a4dc8495823efee6a373536c26e9679fc664e"; + sha256 = "f657bdc5b43b75e43578251abccf5c7b9e6d0848fd55c6105060daba33c36721"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/be/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/be/thunderbird-68.12.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "bdd2ac4571d6444ff9a3ffd72c1b55cf5f564c740b5ceafce7a2e2268f482dda"; + sha256 = "669a2cbfe600727b9d9a8ed5046272a1f19b80b6af9a6a6977ce1b89f60fa36e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/bg/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/bg/thunderbird-68.12.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "3354c7e4b505e99a53a10cdbeac5b6425b13182def27a82c839eaee6ba6e2f86"; + sha256 = "e1b33857544c10c0191316f6e3d16b34957196b35a922c884315714fe851389b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/br/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/br/thunderbird-68.12.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "27339c12c5cdabea7a9a057cad70fa02cf4f69860e71b604f81a60f891345268"; + sha256 = "b9e4a530529449446fe5a302277878c4d2192ef7bb48206f8528024087f520ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ca/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ca/thunderbird-68.12.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "b65b6d20d7251795e0a9f0ce88f8133d7742c6361375e4897a0bb2e043dd8c97"; + sha256 = "aa5e4ae20fa9e5dbb8c0ba275ba18d1ba94900094ba3186aac40ffb27396a96f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cak/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cak/thunderbird-68.12.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "173a85565dfb7b9d44b5757245f8b5f8a62fd15a8a15bfee0680a96ef8f84625"; + sha256 = "a812c9150feec48e2ebfb1786f5e30ade33203160fa4102382435641caeaf3b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cs/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cs/thunderbird-68.12.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9cb5def4eca0bb103516a66f90baf91f7b4e962d5ed59b4f09ae9f19e7f95b47"; + sha256 = "75813ad7dd0ae5c073964296dd687e5c1289178491adc98d40e853ed812bdca9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cy/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cy/thunderbird-68.12.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8b51e01daf38091d3b1b32a249f3c6fb220ad8075bbfd16914cb72b24435d8bb"; + sha256 = "b3894f05cf905aa96612860dcef0bdb4bb9564901ef84172e11856a9fa9e0ca4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/da/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/da/thunderbird-68.12.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "1269600ab71c691563482c6d5787a7670fdceeda3a07c61d7cf2477aa16fe075"; + sha256 = "a4f21bd2017043872a962167f98db358b824ae1821fcf03e2df1bef7783e07c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/de/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/de/thunderbird-68.12.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "46c5fcae1b11b7e31fff2e70397a560c502bb3360ed646dd09945fcee81efad7"; + sha256 = "3a079685f75d2ec0320ec9e366b4e037954d67fa3f9e3bda055b8cd7de8fbdd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/dsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/dsb/thunderbird-68.12.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "4dc661243d99edb84d0bafd45300bf18d86d5289ede3db066ff89cc4094afed1"; + sha256 = "295a0f56429b3638dd0dcbf8d97a6376636b67e22d493ce8dfaceeb579466d18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/el/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/el/thunderbird-68.12.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "efd5f7f46d53bf34146a6f39149abb2aed9c47b735339cf767e32e6387ba50bb"; + sha256 = "86e4b98ede80cc07cc1aec043af82068a73b7c76820f70df8314e3b91c108d18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/en-GB/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-GB/thunderbird-68.12.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ce97a84ba103a7e5bedba43ee47a5c603c1b5d9bf3bc1a8cab4c26ec9ace21c7"; + sha256 = "2cb03a17f88e3826181911ec6a7455528d1e4c051b065252c964c6c0794175e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/en-US/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-US/thunderbird-68.12.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "632f078407322995eef93db134f1da753a1b35696a668a5b8be29f908a34c223"; + sha256 = "11fe953ede0d99656534ac676f118e939024744c5301d378acbeac6792e668e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/es-AR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-AR/thunderbird-68.12.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "88b67f07b6069adcb82c04f818493e25bd145b5d874a7503453e88ea14200499"; + sha256 = "596264396a25adb873320222697e7f1a58aaab484de9c0d2e85f99962b6d893d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/es-ES/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-ES/thunderbird-68.12.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a52a6917d77364e5f7ed06f4484abf7e607c53445ff338e65af6b9bad4626e0d"; + sha256 = "a9512af30e2b1613a6bd1ae6f4ce785f676b2cf70b80a37d85a5e1566bb2b35f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/et/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/et/thunderbird-68.12.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a0c15f0000a00984760419e6f737840b4637bf5aa014ee88093aa2a7a3258807"; + sha256 = "b7dcb196881a23e979edb5ae247a7c07b1cf1250cb4c159ce523d1a26be188c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/eu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/eu/thunderbird-68.12.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d69e9af1a381743acc9ee1f800999b015129cba4fc112f312a04884c121535b0"; + sha256 = "4066164b4c9242a9885bc2de802c4f5b6b594c928db36ac72c94faabaad86679"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fi/thunderbird-68.12.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "876673de48a047d75e0ac766dca338629069af1872308a7bc6a7e068da026d3a"; + sha256 = "a7c635cbbbc10725b28052ccc61603fb60b91e06bbf1f240561bdb8f941af55a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fr/thunderbird-68.12.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d83d87dca716d4cd3850df1c5923e88f15e35354abc874202c8c12bf8d1a006f"; + sha256 = "7dba28adb1287e1aa9ae85840fc3aca42aaedd4b2c2aa6cc68d5f793549d19b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fy-NL/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fy-NL/thunderbird-68.12.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "0cce3392aaace190f9ea0247d89699f73d534762278f4776146a1f75bbc09996"; + sha256 = "bd763e264eb684ec3b0b1f2c68ce295d1df86994d15f5c66c487e4742bfef86e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ga-IE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ga-IE/thunderbird-68.12.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "83b7e660e8098718bd4b205ad2de53522bd94e7a602afb960b6381fe4c11a395"; + sha256 = "52f9b5694efbdd8ecc76aef58695423c6a4b547b5b0cfedca313386b7500685e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/gd/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gd/thunderbird-68.12.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "447a887ef76e57b9c12a0991d7eaf903ce29d7621d4f9143edd18b56bdab81d3"; + sha256 = "6c9c1b0f11ad13e0780371d54fedb52d2463713db3bc52adb72c8ea9ff80eb8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/gl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gl/thunderbird-68.12.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "288b865596e2b8b1087cbca98bd9c55f9aff1f1cb8d432953d20854b0b1e9ab8"; + sha256 = "608bf5c0d6148cc3014758829ba06135222b462242456ca0984e7dc12654c2cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/he/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/he/thunderbird-68.12.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9d801a18324849e4a6faf3266c09eb5898c8122e89b020e35ea25a6b3899a4d2"; + sha256 = "f92d569a53f34bfdda4dac185834e5692526f13f20853d1943f165af33b54a37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hr/thunderbird-68.12.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f20210372b36b43cdae8f7f1294927dfb364d1ca4db21ee8af1c059a06f3e45e"; + sha256 = "60d2f184219f8d17c2739ee3cc8463bed474142bd2caad74157b97db2306b27f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hsb/thunderbird-68.12.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "54daf67c97f2e7496fabe6bef2d1d9a60baccfee35d7331444d48fc6fe675c26"; + sha256 = "40ffece26101b2f6a7789511b026d99234bd34ec78e566e7e25065ae3201d693"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hu/thunderbird-68.12.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "0791aa7bec49ff1bfe862f9114ed4b0013361f2f1fa0e4745ad49c8c0e0a9f84"; + sha256 = "e74da0bdb27fe3375dfbd1ab042892de3ded84f33a6f6d46e209fdcaa28183d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hy-AM/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hy-AM/thunderbird-68.12.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e64bacff30d0b2b2a5038aa11d719c9ef3124d64b9923d52a9c5856f6584f9c2"; + sha256 = "fd93972c11842b56453449e72617deb3177d020c8f25cf4d5fb687f4a3ddb5c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/id/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/id/thunderbird-68.12.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ba6108ba9b4f31f49e7c925a6051738276c67545f7f8d2b3cb378e8834dbd0ce"; + sha256 = "546825968ad86e4c5c6effefd0f924cc1d10489fff7968f17401e3f84c4d1ab0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/is/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/is/thunderbird-68.12.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "a3eac36b640a61f2fc6bd62350bd8aaf020636035547c2b9d687df2bd2d7174b"; + sha256 = "1f2e2228c685be2d65d6e0b92eef8ff3e58d7b772f846d0707a9b02e6d0ad306"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/it/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/it/thunderbird-68.12.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "bf3cc19a7d1c1415cad867b72c5765dfced27511616a8cbd230516adf8d3f20a"; + sha256 = "41b27c8195432e1412e3c4645b823b8dd1f673eabf07ddc72f3d792d3f7488da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ja/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ja/thunderbird-68.12.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d4788294f5e91c033c3c3251cfb614e50843631252a2b1fcc6389d099b1fee1e"; + sha256 = "68940d44d933bb7228d6f9a03406ca01903c54fdf57eb5a1e1033b12ef507df6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ka/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ka/thunderbird-68.12.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "8735be035cf0ab5d4b2102aab8b207c1cc686da8843b45f15c1be91931850968"; + sha256 = "ce0aff0fd47b00803ea66278b3514dcf65ecb5547878f8081f7ec6c1f411ce10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/kab/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kab/thunderbird-68.12.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a570fd29e5eacdc08ed484bce7336f90ae74744e80d8f2ac0f05395cb3363e51"; + sha256 = "3936b56eaa1e05a96626f7d10c8fcc3ba9014b1385b21243c049b133b923ddef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/kk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kk/thunderbird-68.12.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "186b7457a96a64da0564c1b411bb04598de1067362a6238f7327abe780cc6aa3"; + sha256 = "7fa0aa64d0f0dcc6f71d6a21647cc4fccef935b783deb5d19b88f5b96b4b4ec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ko/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ko/thunderbird-68.12.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3c9513362c6b7a64bf6e74bbfad6ef586b0085baeb9a8ad8eb2fbc73461e9f67"; + sha256 = "4bddd0ccb747bb12cdc6d88c2c9544354293000c586454bb5932f4d81afbf400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/lt/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/lt/thunderbird-68.12.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e90df1606ec0e875fa02f7bf5a52b14d84f758bdc18ab0f395703c0129a18e57"; + sha256 = "f1a3514188c1b887afd2c662a1b6abf6fe37b558864be0cc79e87ed147188461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ms/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ms/thunderbird-68.12.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ea686adcfb5cf4b1642e7dcb21053090ffb57d344b27269d807cebcf8469934c"; + sha256 = "7ea045d6db78ec7d6ebf164c8e3d28c2540a573238de518e934646573aec71dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nb-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nb-NO/thunderbird-68.12.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6f827fee307917b590b99b5c85b16337865f027059f52bc9ab12da33f80448b9"; + sha256 = "d2c0e2099ea60b9da95ebd9bd79a5d0a6a1ebc84b8b490511a68c81355f97761"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nl/thunderbird-68.12.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "b88843831b982d1317e8bf64df99a8c7a1fa9f67461aa966b2737f12715c9cf3"; + sha256 = "48741be79422d80140ec862d004fa75a407f67490f67a3e440c01e0defe1f85f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nn-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nn-NO/thunderbird-68.12.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ab8383a432f55944d417108b59d891953f2d322ec81d09e971ec63d1883d4b46"; + sha256 = "b40f0d7112cadab322c8b71cacce5d6df87fb80f40cc55ca22c279016c3ea805"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pl/thunderbird-68.12.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0f8c0feb68b090598a3db9295d4b4e09d9ffdedb69a73914228d7ef76b768414"; + sha256 = "e64b10526cb460f437427cc4a7ea90959cc693a75fd6a61b43e9d3fd76ded618"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pt-BR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-BR/thunderbird-68.12.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ca78fad9dce15534754571b14d82ede798b123210599ade352016420faf0db5a"; + sha256 = "bdb558f9430c06871954ec6c7d54267625184a0cba914a87ad199e8f32b03de2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pt-PT/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-PT/thunderbird-68.12.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "cf79430e02259d9117feeaebb5fe02139c3e3d95013e48fe290550814200cf6e"; + sha256 = "4631e8247446653e91f239fdb5ad3c8531f3d007dbdc83818178a4cdc525edf4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/rm/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/rm/thunderbird-68.12.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "cc7d9614130f24969356b3496f4d322a9f73cafa5c7b60302ca8f2e2efe1f6ec"; + sha256 = "13e6aca7139fd89e83e7ae9b71253731f0954b0a83cc3560ecc00500b9bc1df7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ro/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ro/thunderbird-68.12.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a8fcc2c6e0755fe701a56c2fa3bbf2d288d6351179ee74b8aa3da3180f14cdd1"; + sha256 = "023a567c42dad9bdbd465c8b99f12cf5f667ef4691e16971e09496c4a7db0f12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ru/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ru/thunderbird-68.12.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b9f68985e70f8aa47c36cd4a4fc0fb41918d43f089cc760ace8ec879e2561770"; + sha256 = "9ec35bbce5f026a4262a5d708b53a767f47ac8e90314513d36a587d1a49dbb6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/si/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/si/thunderbird-68.12.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "a2563b3c9d0ecb567c366aa41cb6a10bde8d09b8c1065cd3934c8c221afee056"; + sha256 = "c540b94a45deeddf1f7f5a8cca8de7e944ee8ad9f8595a308836c159901ec0b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sk/thunderbird-68.12.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "566906f011283fd27abf55e1e9a1bf7504e4028f7c4a631716ba590c07fe9d91"; + sha256 = "5296241664023773d2c0c4fa55e74eb6470482389c834d1934c252f79e79ebff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sl/thunderbird-68.12.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8b74b751b3ee706be9aeb06726ffd3a989a57a1dc9794112262fa2aac45498ad"; + sha256 = "cd0376137d8018875873332fdfae3bc3c0d6b2a2b881dfa970d7d7999e8b312b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sq/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sq/thunderbird-68.12.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "9f7bcc51d4bb3f7c8d6ae49c61b88c17a7a59f6de8d2f62e0ee3fb3a68d30791"; + sha256 = "6fbf47759ca8c4d7cf30ca3af8a3fd35a01b7738422d29448cfd9eed81eba49b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sr/thunderbird-68.12.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "809c22c379c0c9943acb23de8b7023843ad6ecfedb9cf89006d6889ac1214203"; + sha256 = "636708320247c7c45622fd9179d5689da97472a9308f11810623129cf5a0e8d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sv-SE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sv-SE/thunderbird-68.12.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "9381345ab9229f4b8465c183c936c17ab73680fa6aca27535daff9a2f9a133a3"; + sha256 = "9550c173b047e3ff774f4c3faf2c1f125b3abc34e6feb5801c108fda94e54e4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/tr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/tr/thunderbird-68.12.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "0f08bc1e65a8bccf8765cf26af5c09ebf6b77ff463af2f8f133dd2499c1d935c"; + sha256 = "ffe82a300c7fa7a0e826d11613f5187c003b009efa29f4755f17af0f88d9e73b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/uk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uk/thunderbird-68.12.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "37a1fee3bcf2fca901c542295d01a32545e814217985414419a270ad9576c14c"; + sha256 = "b018769149c0a4ff323b90b5d51465733629e7c527b39381ba9696cb077ad767"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/uz/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uz/thunderbird-68.12.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "50668670b10f3171b9033306d43c51ce24f1a48286c4156eff369530ae6d93d1"; + sha256 = "b0b59ac4d08c9f385f4ed7980065ce99ef24874734390a83af6e8fbd18173d99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/vi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/vi/thunderbird-68.12.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "3588d2ed7c67459f5c091a1881821eaba72c9f3307624f7890549fcd1da120f6"; + sha256 = "901b40a99d84e7c7360fd5be6a14aa04ef6cc04fe1275cac26824b310bbd26e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/zh-CN/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-CN/thunderbird-68.12.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d8f2976535ef60e62c94338fd049365234a7b2a8658b32df231d1faa22529c0e"; + sha256 = "509478710f7c4fb404eec9fed0b6d22f4c5d76fee09ed833dffcefdacc53d55c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/zh-TW/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-TW/thunderbird-68.12.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "aca4a8410429bde9926f6ce6a183439750f490fd68dda229531b2e16bb7068ef"; + sha256 = "a12dd777cc3eaf629cc7a6f4b8d4744cf63c3e778e559d9b3ce332414e509515"; } ]; } From e56f55fe520c215e1589935fca782b948a022a4d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 27 Aug 2020 13:49:53 +0200 Subject: [PATCH 166/688] texstudio: 2.12.22 -> 3.0.0 this release drops qt4 support, but we haven't been using that for >2 years anyways --- pkgs/applications/editors/texstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 94837023ca0d..8f7e18a35c50 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "2.12.22"; + version = "3.0.0"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "037jvsfln8wav17qj9anxz2a7p51v7ky85wmhdj2hgwp40al651g"; + sha256 = "1663lgl30698awa7fjplr8rjnf6capqvf8z80lzlnkfl5m9ph0jb"; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ]; From e8633b1e2b5285c0e3ec4809658ae089927aaef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 27 Aug 2020 10:53:55 -0300 Subject: [PATCH 167/688] marwaita: 7.4.3 -> 7.5 --- pkgs/data/themes/marwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 7a4735675891..6bd6de32f00b 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "7.4.3"; + version = "7.5"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1g8xyv0najy4lpwa9xplx3ylxvn86dyi58j7qanc6r9yddy85ln9"; + sha256 = "13p0sr5gnb8ww9fx83p6nykdn82jd6hx6l94z939g0ghj5aizbbl"; }; buildInputs = [ From aa919664306e000db2085f80cc230f7d44214fc3 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 7 Aug 2020 10:53:59 +0200 Subject: [PATCH 168/688] libreoffice-fresh: 6.4.3.2 -> 7.0.0.3 --- .../office/libreoffice/default.nix | 9 +- .../office/libreoffice/src-fresh/download.nix | 178 ++++++++++-------- .../office/libreoffice/src-fresh/primary.nix | 14 +- .../applications/office/wpsoffice/default.nix | 4 +- pkgs/top-level/all-packages.nix | 1 + 5 files changed, 109 insertions(+), 97 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 7e20c0bb4fee..111e50b7d454 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -61,15 +61,12 @@ in (mkDrv rec { # of rasqal/rasqal.h NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" - ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; + ] ++ lib.optionals stdenv.isx86_64 [ "-mno-fma" "-mno-avx" ] + # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 + ++ [ "-fno-visibility-inlines-hidden" ]; patches = [ ./xdg-open-brief.patch - (fetchpatch { - url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008"; - name = "poppler-0.86.patch"; - sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j"; - }) ]; tarballPath = "external/tarballs"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index f4b14870eb79..16d754a18a14 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -28,11 +28,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_69_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2"; - sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; + name = "boost_1_71_0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; + sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543"; md5 = ""; - md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2"; + md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; } { name = "breakpad.zip"; @@ -63,11 +63,11 @@ md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { - name = "libcdr-0.1.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz"; - sha256 = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48"; + name = "libcdr-0.1.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; + sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861"; md5 = ""; - md5name = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48-libcdr-0.1.5.tar.xz"; + md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -76,6 +76,13 @@ md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } + { + name = "dtoa-20180411.tgz"; + url = "http://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; + sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4"; + md5 = ""; + md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; + } { name = "libcmis-0.5.2.tar.xz"; url = "http://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; @@ -91,11 +98,11 @@ md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { - name = "cppunit-1.14.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; - sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"; + name = "cppunit-1.15.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"; + sha256 = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7"; md5 = ""; - md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz"; + md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; @@ -105,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.65.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz"; - sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd"; + name = "curl-7.71.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz"; + sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772"; md5 = ""; - md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz"; + md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -161,11 +168,11 @@ md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { - name = "fontconfig-2.12.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2"; - sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017"; + name = "fontconfig-2.13.91.tar.gz"; + url = "http://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz"; + sha256 = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5"; md5 = ""; - md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2"; + md5name = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5-fontconfig-2.13.91.tar.gz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -315,11 +322,11 @@ md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { - name = "glm-0.9.4.6-libreoffice.zip"; - url = "http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; - sha256 = "d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a"; - md5 = "bae83fa5dc7f081768daace6e199adc3"; - md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + name = "glm-0.9.9.7.zip"; + url = "http://dev-www.libreoffice.org/src/glm-0.9.9.7.zip"; + sha256 = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95"; + md5 = ""; + md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; } { name = "gpgme-1.9.0.tar.bz2"; @@ -329,11 +336,11 @@ md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { - name = "graphite2-minimal-1.3.13.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"; - sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36"; + name = "graphite2-minimal-1.3.14.tgz"; + url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz"; + sha256 = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc"; md5 = ""; - md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; + md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { name = "harfbuzz-2.6.0.tar.xz"; @@ -364,18 +371,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-65_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-65_1-src.tgz"; - sha256 = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948"; + name = "icu4c-67_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; + sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"; md5 = ""; - md5name = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948-icu4c-65_1-src.tgz"; + md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz"; } { - name = "icu4c-65_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-65_1-data.zip"; - sha256 = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6"; + name = "icu4c-67_1-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; + sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e"; md5 = ""; - md5name = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6-icu4c-65_1-data.zip"; + md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -462,11 +469,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - 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"; + name = "language-subtag-registry-2020-04-01.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2"; + sha256 = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da"; md5 = ""; - md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; + md5name = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da-language-subtag-registry-2020-04-01.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -532,11 +539,11 @@ md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { - name = "libnumbertext-1.0.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz"; - sha256 = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7"; + name = "libnumbertext-1.0.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz"; + sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57"; md5 = ""; - md5name = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7-libnumbertext-1.0.5.tar.xz"; + md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz"; } { name = "ltm-1.0.zip"; @@ -546,11 +553,11 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.28.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"; - sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"; + name = "xmlsec1-1.2.30.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; + sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8"; md5 = ""; - md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; + md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; } { name = "libxml2-2.9.10.tar.gz"; @@ -581,18 +588,18 @@ md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz"; } { - name = "mariadb_client-2.0.0-src.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; - sha256 = "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60"; - md5 = "a233181e03d3c307668b4c722d881661"; - md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + name = "mariadb-connector-c-3.1.8-src.tar.gz"; + url = "http://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz"; + sha256 = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b"; + md5 = ""; + md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-1.5.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.5.0.tar.bz2"; - sha256 = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d"; + name = "mdds-1.6.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; + sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d"; md5 = ""; - md5name = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d-mdds-1.5.0.tar.bz2"; + md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -609,11 +616,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.15.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"; - sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1"; + name = "libmwaw-0.3.16.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; + sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868"; md5 = ""; - md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz"; + md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -644,11 +651,11 @@ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; - sha256 = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504"; + name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + sha256 = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0"; md5 = ""; - md5name = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; + md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; } { name = "officeotron-0.7.4-master.jar"; @@ -672,11 +679,11 @@ md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { - name = "liborcus-0.15.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.15.3.tar.gz"; - sha256 = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2"; + name = "liborcus-0.15.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; + sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61"; md5 = ""; - md5name = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2-liborcus-0.15.3.tar.gz"; + md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -693,11 +700,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3963.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3963.tar.bz2"; - sha256 = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895"; + name = "pdfium-4137.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2"; + sha256 = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6"; md5 = ""; - md5name = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895-pdfium-3963.tar.bz2"; + md5name = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6-pdfium-4137.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -791,11 +798,18 @@ md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz"; - sha256 = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4"; + name = "skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz"; + url = "http://dev-www.libreoffice.org/src/skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz"; + sha256 = "f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0"; md5 = ""; - md5name = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4-libstaroffice-0.0.6.tar.xz"; + md5name = "f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0-skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz"; + } + { + name = "libstaroffice-0.0.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz"; + sha256 = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db"; + md5 = ""; + md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz"; } { name = "swingExSrc.zip"; @@ -840,11 +854,11 @@ md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { - name = "libwps-0.4.10.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz"; - sha256 = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca"; + name = "libwps-0.4.11.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; + sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1"; md5 = ""; - md5name = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca-libwps-0.4.10.tar.xz"; + md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz"; } { name = "xsltml_2.1.2.zip"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 5b62b0df9544..1beb8f1156c4 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -6,10 +6,10 @@ rec { inherit sha256; }; - major = "6"; - minor = "4"; - patch = "3"; - tweak = "2"; + major = "7"; + minor = "0"; + patch = "0"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1cmbrhha7mlflnlbpla8fix07cxcgkdb7krnrgs1bylf31y5855w"; + sha256 = "sha256-sl+vgnLGIWtyw8Y/ovVsxThdOMg2Gby4SRaiaqvZVB0="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "06z9hz4m3kdcljjc6y5s18001axjibj9xiyakdndkl9pmnnhn9h3"; + sha256 = "sha256-i3yfD5cmM6D9BctjablIFRqfibjrwLAaxxPIsQdk0sY="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "0mpgrwg8z1q38j03l6m1sdpcplyjd5nz1nqaa13vfkryj2lflw45"; + sha256 = "sha256-hYBEEPRmh16zgGZBUN20xfTY6qL07aKMC1lC/0ij9/0="; }; } diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index cc8412e1ac5f..e34c548f6010 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -12,7 +12,7 @@ , cups , dbus , expat -, ffmpeg_3 +, ffmpeg , fontconfig , freetype , gdk-pixbuf @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { cairo dbus.lib expat - ffmpeg_3 + ffmpeg fontconfig freetype gdk-pixbuf diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcd653f6871f..d88e688af689 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21389,6 +21389,7 @@ in libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { variant = "fresh"; + jdk = jdk11; }); }); libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice; From 0b3aa3d4447736e4cfe6b922837445ea00ba954c Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 27 Aug 2020 17:37:26 +0300 Subject: [PATCH 169/688] libthreadar: init at 1.3.0 --- .../libraries/libthreadar/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/libthreadar/default.nix diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix new file mode 100644 index 000000000000..ed19fab6d994 --- /dev/null +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "1.3.0"; + pname = "libthreadar"; + + src = fetchurl { + url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; + sha256 = "0g2wxykawlsj6ma9slbbk0bxynqvmkwhaln2fiwc21x7nhjvpn9z"; + }; + + outputs = [ "out" "dev" ]; + + configureFlags = [ + "--disable-build-html" + ]; + + postInstall = '' + # Disable html help + rm -r "$out"/share + ''; + + meta = { + homepage = "http://libthreadar.sourceforge.net/"; + description = '' + Libthreadar is a C++ library providing a small set of C++ classes to manipulate + threads in a very simple and efficient way from your C++ code. + ''; + maintainers = with maintainers; [ izorkin ]; + license = licenses.lgpl3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcd653f6871f..27d0c91b70b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13949,6 +13949,8 @@ in libtheora = callPackage ../development/libraries/libtheora { }; + libthreadar = callPackage ../development/libraries/libthreadar { }; + libtiff = callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; From d725486a67194372fcb09ae3025bd34b6315f459 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 27 Aug 2020 18:12:34 +0300 Subject: [PATCH 170/688] dar: 2.6.9 -> 2.6.10 --- pkgs/tools/backup/dar/default.nix | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index a439bbf41b13..1f379feece49 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme, xz }: +{ stdenv, fetchurl +, attr, e2fsprogs +, curl, librsync, libthreadar +, gpgme, libgcrypt, openssl +, bzip2, lzo, xz, zlib +}: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.9"; + version = "2.6.10"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "1jzqq54w1dix2qdlj4hr9dpq9fnp23h102bk8d2gq6k7n2zgaj6v"; + sha256 = "1ryj4xxar18hshg38j1ljhplypgmfprwqn72k1jwxi28qravg80n"; }; - buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] - ++ optionals stdenv.isLinux [ attr e2fsprogs ]; + outputs = [ "out" "dev" ]; + + buildInputs = [ + curl librsync libthreadar + gpgme libgcrypt openssl + bzip2 lzo xz zlib + ] ++ optionals stdenv.isLinux [ attr e2fsprogs ]; configureFlags = [ "--disable-birthtime" @@ -23,7 +33,8 @@ stdenv.mkDerivation rec { ]; postInstall = '' - rm -r "$out"/share/dar # Disable html help + # Disable html help + rm -r "$out"/share/dar ''; enableParallelBuilding = true; @@ -33,6 +44,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dar.linux.free.fr"; description = "Disk ARchiver, allows backing up files into indexed archives"; + maintainers = with maintainers; [ izorkin ]; license = licenses.gpl2; platforms = platforms.unix; }; From 6de7492703950160447625107428fa1471284f73 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 23 Aug 2020 22:43:21 +0200 Subject: [PATCH 171/688] wxGTK29: drop ancient deps The many-years abandoned GStreamer 0.10 branch no longer builds so let's remove it. Hopefully nothing used it these days. GConf has been abandoned for years too and would not work without user running the daemon. --- pkgs/development/libraries/wxwidgets/2.9/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 3812c81a5197..5db7cfc26ba9 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, gstreamer, gst-plugins-base, GConf, setfile +, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null @@ -32,8 +32,7 @@ stdenv.mkDerivation { ]; buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer - gst-plugins-base GConf ] + [ gtk2 libXinerama libSM libXxf86vm xorgproto ] ++ optional withMesa libGLU ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; @@ -42,7 +41,7 @@ stdenv.mkDerivation { propagatedBuildInputs = optional stdenv.isDarwin AGL; configureFlags = - [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" + [ "--enable-gtk2" "--disable-precomp-headers" (if compat24 then "--enable-compat24" else "--disable-compat24") (if compat26 then "--enable-compat26" else "--disable-compat26") ] ++ optional unicode "--enable-unicode" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc051bf193da..31848f8ceb8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15566,7 +15566,6 @@ in wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; }; From e2d02a84d67fa405db7c9f4e140f2803a5b4bd86 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 23 Aug 2020 22:43:48 +0200 Subject: [PATCH 172/688] wxGTK30-gtk2: drop ancient deps GConf has been abandoned for many years and would not work without user running the daemon. --- pkgs/development/libraries/wxwidgets/3.0/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index f125ac9dca0b..df90342a972e 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig , libXinerama, libSM, libXxf86vm -, gtk2, GConf ? null, gtk3 +, gtk2, gtk3 , xorgproto, gst_all_1, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optionals withGtk2 [ gtk2 GConf ] + ] ++ optionals withGtk2 [ gtk2 ] ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31848f8ceb8c..4b0ef98e51aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15572,7 +15572,6 @@ in wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = true; - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; From 2fd206f78b55e6d67f29b0136a1a1d5e2d6afeed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 23 Aug 2020 22:44:16 +0200 Subject: [PATCH 173/688] wxGTK31-gtk2: drop ancient deps GConf has been abandoned for many years and would not work without user running the daemon. --- pkgs/development/libraries/wxwidgets/3.1/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 0f30deb6c522..44e6fe49b489 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig , libXinerama, libSM, libXxf86vm -, gtk2, GConf ? null, gtk3 +, gtk2, gtk3 , xorgproto, gst_all_1, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported, libGLU ? null, libGL ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optionals withGtk2 [ gtk2 GConf ] + ] ++ optionals withGtk2 [ gtk2 ] ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b0ef98e51aa..50d0673f8375 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15584,7 +15584,6 @@ in wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { withGtk2 = true; - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; From 422ef5ed78ea5ac6ec72ccd31fe2d7e1b3866035 Mon Sep 17 00:00:00 2001 From: jitwit Date: Thu, 27 Aug 2020 15:51:28 -0400 Subject: [PATCH 174/688] j: j901e -> j901f --- pkgs/development/interpreters/j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 8e6b434281eb..0ac66d0ca97a 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "j"; version = "901"; - jtype = "release-e"; + jtype = "release-f"; src = fetchFromGitHub { owner = "jsoftware"; repo = "jsource"; rev = "j${version}-${jtype}"; - sha256 = "13ky37rrl6mc66fckrdnrw64gmvq1qlv6skzd513lab4d0wigshw"; + sha256 = "1776021m0j1aanzwg60by83n53pw7i6afd5wplfzczwk8bywax4p"; name = "jsource"; }; From f45173122a03abccd3bc7b1ec135e9659233c5f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 27 Aug 2020 21:56:37 +0000 Subject: [PATCH 175/688] python27Packages.elasticsearch: 7.8.1 -> 7.9.1 --- pkgs/development/python-modules/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index e060b819a55e..38522b233d4c 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.8.1"; + version = "7.9.1"; src = fetchPypi { inherit pname version; - sha256 = "92b534931865a186906873f75ae0b91808ff5036b0f2b9269eb5f6dc09644b55"; + sha256 = "5e08776fbb30c6e92408c7fa8c37d939210d291475ae2f364f0497975918b6fe"; }; # Check is disabled because running them destroy the content of the local cluster! From 55195119d529d65e264bcae9ce2741827272efb4 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Mon, 24 Aug 2020 21:46:48 -0400 Subject: [PATCH 176/688] Distinguish pkgsStatic from pkgsMusl via stdenv.targetPlatform This change allows derivations to distinguish dynamic musl build and static musl build in cases where upstream build system can't detect it by itself. --- lib/systems/default.nix | 1 + pkgs/top-level/stage.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index c929781dd8ff..09884d406823 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -76,6 +76,7 @@ rec { # uname -r release = null; }; + isStatic = final.isWasm || final.isRedox; kernelArch = if final.isAarch32 then "arm" diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 9e07d2bf0614..58b0300cc79c 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -215,6 +215,7 @@ let crossOverlays = [ (import ./static.nix) ]; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { crossSystem = { + isStatic = true; parsed = stdenv.hostPlatform.parsed // { abi = { gnu = lib.systems.parse.abis.musl; From 8f9cbeeae793a2f3426ace435de7c2eaf5f8c6ed Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 27 Aug 2020 18:35:47 -0500 Subject: [PATCH 177/688] postgresqlPackages.timescaledb: 1.7.2 -> 1.7.3 https://github.com/timescale/timescaledb/releases/tag/1.7.3 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 4e76fc35689f..61564a69232c 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.7.2"; + version = "1.7.3"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0xqyq3a43j2rav5n87lv1d0f66h9kqjnlxq5nq5d54h5g5qbsr3y"; + sha256 = "1y3w1ap1cxmi691wfz078r2h74pcwf38zs8lr985pfmb25w47q0l"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; From 7201fac2e776a336457bfaf5bbb37f817e1524a5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 28 Aug 2020 00:00:00 +0000 Subject: [PATCH 178/688] docker: fix build on darwin The directory change to `./go/src/${goPackagePath}` was only executed on Linux. --- pkgs/applications/virtualization/docker/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 6b76ea24e3da..7c26ada9392a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -136,8 +136,13 @@ rec { extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]); - installPhase = optionalString (stdenv.isLinux) '' + installPhase = '' cd ./go/src/${goPackagePath} + install -Dm755 ./components/cli/docker $out/libexec/docker/docker + + makeWrapper $out/libexec/docker/docker $out/bin/docker \ + --prefix PATH : "$out/libexec/docker:$extraPath" + '' + optionalString (stdenv.isLinux) '' install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ @@ -153,11 +158,6 @@ rec { # systemd install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service '' + '' - install -Dm755 ./components/cli/docker $out/libexec/docker/docker - - makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "$out/libexec/docker:$extraPath" - # completion (cli) installShellCompletion --bash ./components/cli/contrib/completion/bash/docker installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish From af8e52634782786e886594bed57deebc07ac518d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 28 Aug 2020 09:11:28 +0300 Subject: [PATCH 179/688] netdata: 1.23.2 -> 1.24.0 --- pkgs/tools/system/netdata/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index e5316e028dbe..7d4f1669b834 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -14,14 +14,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.23.2"; + version = "1.24.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "1vv92plk9dxk6fl76ik1zralpzc35ymrfyrf1cr6pv8q3agyy5k4"; + sha256 = "19zr2wlsc8rbw6a7vjy4ivgq71l34lh70pcgwa0k5sp1vryj7r3d"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -36,12 +36,6 @@ in stdenv.mkDerivation rec { patches = [ ./no-files-in-etc-and-var.patch - ] ++ stdenv.lib.optionals (!stdenv.cc.isGNU) [ - # fix memcpy typo for non-gnu. Remove with the next release. - (fetchpatch { - url = "https://github.com/netdata/netdata/commit/da7f267196b489e9a75724b68897e8f2e6137d72.patch"; - sha256 = "1j2sa06j6v491nw58bjx5nqqyfi1n2n9z3p3jiy4yh74m3asldlv"; - }) ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; @@ -84,5 +78,4 @@ in stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; }; - } From a0abee58c047aad95297ce5bffb5e791f4953b9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 Aug 2020 06:23:59 +0000 Subject: [PATCH 180/688] python27Packages.phonenumbers: 8.12.7 -> 8.12.8 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index e3e23fa8e881..1aef55e82113 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.7"; + version = "8.12.8"; src = fetchPypi { inherit pname version; - sha256 = "652c418f8e97c8438f227a524ddf8d7d325c4a47e4924ce865b827c24ec3194d"; + sha256 = "3a8b8f7b60ea00b83ca588b5ca57e48d9a3c223aa42f1a3d5fa88566424216c3"; }; meta = { From 875f06c2f598312be0e129e9c05282da8e0a2388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 28 Aug 2020 08:47:08 +0200 Subject: [PATCH 181/688] python3Packages.catalogue: 2.0.0 -> 2.0.1 Changelog: https://github.com/explosion/catalogue/releases/tag/v2.0.1 --- pkgs/development/python-modules/catalogue/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index eb1aec37c634..608d9dc42698 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -2,26 +2,30 @@ , buildPythonPackage , fetchPypi , pythonOlder +, pytestCheckHook , importlib-metadata }: buildPythonPackage rec { pname = "catalogue"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "34f8416ec5e7ed08e55c10414416e67c3f4d66edf83bc67320c3290775293816"; + sha256 = "0d01077dbfca7aa53f3ef4adecccce636bce4f82e5b52237703ab2f56478e56e"; }; propagatedBuildInputs = [ importlib-metadata ]; + checkInputs = [ pytestCheckHook ]; + meta = with stdenv.lib; { description = "Tiny library for adding function or object registries"; homepage = "https://github.com/explosion/catalogue"; + changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; - }; + }; } From 04f858ff5eab0524904a150101a911e552f6cebb Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 28 Aug 2020 09:40:16 +0100 Subject: [PATCH 182/688] qgis: 3.10.7 -> 3.10.9 --- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 72e84620252f..130c0af6ee20 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.7"; + version = "3.10.9"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0z593n5g3zwhlzhs0z7nlpblz6z2rl3y7y3j1wf1rdx76i8p3qgf"; + sha256 = "0d646hvrhhgsw789qc2g3iblmsvr64qh15jck1jkaljzrj3qbml6"; }; passthru = { From 67d6ea03c9bb775039fbc4e8ee02851bfa456628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 28 Aug 2020 09:49:26 +0100 Subject: [PATCH 183/688] netdata: reference nixos tests --- pkgs/tools/system/netdata/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 7d4f1669b834..752721689baa 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,6 +1,7 @@ { stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig , CoreFoundation, IOKit, libossp_uuid , curl, libcap, libuuid, lm_sensors, zlib, fetchpatch +, nixosTests , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy , withIpmi ? (!stdenv.isDarwin), freeipmi @@ -71,6 +72,8 @@ in stdenv.mkDerivation rec { rm -r $out/sbin ''; + passthru.tests.netdata = nixosTests.netdata; + meta = { description = "Real-time performance monitoring tool"; homepage = "https://my-netdata.io/"; From c90e575874af9068da3c1d26f179cded3cbbc547 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 Aug 2020 09:17:31 +0000 Subject: [PATCH 184/688] python27Packages.pyside2: 5.14.2 -> 5.15.0 --- pkgs/development/python-modules/pyside2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index f9d07be5796b..6d8b828fb957 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.14.2"; + version = "5.15.0"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - sha256 = "1cwjpv8qmjksi7cj4naw54h2afphw44chrf1pmfjamyyj8vz6ykw"; + sha256 = "0s3bgddcsf6w297nyxv08xpc2nnr3sli980p24nf4xivvr9yxkgi"; }; patches = [ From f1e667234daebed9c74895bd2b78e59fd8bd825d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 28 Aug 2020 12:28:16 +0200 Subject: [PATCH 185/688] oh-my-zsh: cleanup - use fetchFromGitHub instead of fetchgit - indent the `installPhase` properly - remove unused `pathsToLink` - don't hardcode `phases` to allow patching - don't copy from $src, but . to allow patching --- pkgs/shells/zsh/oh-my-zsh/default.nix | 84 +++++++++++++-------------- 1 file changed, 41 insertions(+), 43 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 2fce32e018e5..ddc0ae1a2adb 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -1,70 +1,68 @@ # This script was inspired by the ArchLinux User Repository package: # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "2020-08-24"; pname = "oh-my-zsh"; - rev = "cfb86cd08d3b24fd4b59d0d35b3af1f589c891fa"; - src = fetchgit { inherit rev; - url = "https://github.com/ohmyzsh/ohmyzsh"; + src = fetchFromGitHub { + owner = "ohmyzsh"; + repo = "ohmyzsh"; + rev = "cfb86cd08d3b24fd4b59d0d35b3af1f589c891fa"; sha256 = "0af37smv0bqw37bng2halzgszf8y3m2sxahdff54m16asm0py2cr"; }; - pathsToLink = [ "/share/oh-my-zsh" ]; - - phases = "installPhase"; installPhase = '' - outdir=$out/share/oh-my-zsh - template=templates/zshrc.zsh-template + outdir=$out/share/oh-my-zsh + template=templates/zshrc.zsh-template - mkdir -p $outdir - cp -r $src/* $outdir - cd $outdir + mkdir -p $outdir + cp -r * $outdir + cd $outdir - rm LICENSE.txt - rm -rf .git* + rm LICENSE.txt + rm -rf .git* - chmod -R +w templates + chmod -R +w templates - # Change the path to oh-my-zsh dir and disable auto-updating. - sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ - -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ - $template + # Change the path to oh-my-zsh dir and disable auto-updating. + sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ + -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ + $template - chmod +w oh-my-zsh.sh + chmod +w oh-my-zsh.sh - # Both functions expect oh-my-zsh to be in ~/.oh-my-zsh and try to - # modify the directory. - cat >> oh-my-zsh.sh <<- EOF + # Both functions expect oh-my-zsh to be in ~/.oh-my-zsh and try to + # modify the directory. + cat >> oh-my-zsh.sh <<- EOF - # Undefine functions that don't work on Nix. - unfunction uninstall_oh_my_zsh - unfunction upgrade_oh_my_zsh - EOF + # Undefine functions that don't work on Nix. + unfunction uninstall_oh_my_zsh + unfunction upgrade_oh_my_zsh + EOF - # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source - # them, if found. - cat >> $template <<- EOF + # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source + # them, if found. + cat >> $template <<- EOF - # Load the variables. - if [ -f ~/.zsh_variables ]; then - . ~/.zsh_variables - fi + # Load the variables. + if [ -f ~/.zsh_variables ]; then + . ~/.zsh_variables + fi - # Load the functions. - if [ -f ~/.zsh_funcs ]; then - . ~/.zsh_funcs - fi + # Load the functions. + if [ -f ~/.zsh_funcs ]; then + . ~/.zsh_funcs + fi - # Load the aliases. - if [ -f ~/.zsh_aliases ]; then - . ~/.zsh_aliases - fi - EOF + # Load the aliases. + if [ -f ~/.zsh_aliases ]; then + . ~/.zsh_aliases + fi + EOF ''; meta = with stdenv.lib; { From d5fe18167deddc850d0aa5cac9fbec32250b3bb2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 23 Aug 2020 19:22:58 +1000 Subject: [PATCH 186/688] .github/workflows: re-add editorconfig --- .github/workflows/editorconfig.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/editorconfig.yml diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml new file mode 100644 index 000000000000..98c7afbab780 --- /dev/null +++ b/.github/workflows/editorconfig.yml @@ -0,0 +1,27 @@ +name: "Checking EditorConfig" + +on: + pull_request: + +jobs: + tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: technote-space/get-diff-action@v3.1.0 + - name: Fetch editorconfig-checker + if: env.GIT_DIFF + env: + ECC_VERSION: "2.1.0" + ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download" + run: | + curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \ + tar xzf ec-linux-amd64.tar.gz && \ + mv ./bin/ec-linux-amd64 ./bin/editorconfig-checker + - name: Checking EditorConfig + if: env.GIT_DIFF + run: | + ./bin/editorconfig-checker -disable-indentation \ + ${{ env.GIT_DIFF }} From eab48f5a1bff12467f196c182f349ce11fc63e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 28 Aug 2020 12:50:22 +0100 Subject: [PATCH 187/688] buildGo{module,package}: also fixup `$out/{libexec,lib}` also suppresses errors if those directories are not present --- pkgs/development/go-modules/generic/default.nix | 2 +- pkgs/development/go-packages/generic/default.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 402c3e781adb..7db4992d1d61 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -235,7 +235,7 @@ let ''; preFixup = (args.preFixup or "") + '' - find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true ''; strictDeps = true; diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 9d3c7c3d5733..de0a35b69343 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -211,8 +211,7 @@ let ''; preFixup = preFixup + '' - find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true - find $out/libexec -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true ''; strictDeps = true; From 7aa189970ab7454b6df32d51813d7b1e1ba738ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 28 Aug 2020 13:03:56 +0100 Subject: [PATCH 188/688] docker: simplify remove-references-to --- pkgs/applications/virtualization/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 6b76ea24e3da..727b56344498 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -180,7 +180,7 @@ rec { ''; preFixup = '' - find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} '{}' + + find $out -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' + '' + optionalString (stdenv.isLinux) '' find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' + ''; From e680fcaa3baee69ff0f7ed547ef9b90ea9f9fe0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 28 Aug 2020 13:03:21 +0100 Subject: [PATCH 189/688] fscrypt: remove unneeded remove-references-to --- pkgs/os-specific/linux/fscrypt/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 1086e5ece046..000400e4cdf9 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -34,10 +34,6 @@ buildGoModule rec { make install ''; - preFixup = '' - remove-references-to -t ${fscrypt-experimental.go} $out/lib/security/pam_fscrypt.so - ''; - meta = with stdenv.lib; { description = "A high-level tool for the management of Linux filesystem encryption"; From dee0f69844223ff47f3211c72272f69357625cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 28 Aug 2020 13:12:18 +0100 Subject: [PATCH 190/688] singularity: remove remove-references-to call --- pkgs/applications/virtualization/singularity/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 7154b8e614c8..bfa0e0e54469 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -67,10 +67,6 @@ buildGoPackage rec { runHook postInstall ''; - postFixup = '' - find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true - ''; - meta = with stdenv.lib; { homepage = "http://www.sylabs.io/"; description = "Application containers for linux"; From 2fe70decbd2e75c8e9c8db56cf882a4aa3937432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 28 Aug 2020 13:21:28 +0100 Subject: [PATCH 191/688] deepin.dde-api: remove remove-references-to --- pkgs/desktops/deepin/dde-api/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index a84fc9c2e021..07239f9d509a 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -108,7 +108,6 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} mv $out/share/gocode $out/share/go - remove-references-to -t ${go} $out/lib/deepin-api/* ''; postFixup = '' From dbab6f2b3d2701fb9ddc542f07c9f2ab3513bc54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 28 Aug 2020 13:21:44 +0100 Subject: [PATCH 192/688] deepin.dde-deamon: remove remove-references-to --- pkgs/desktops/deepin/dde-daemon/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index c4edcef15af3..8a36446491f4 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -134,7 +134,6 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" -C go/src/${goPackagePath} - remove-references-to -t ${go} $out/lib/deepin-daemon/* searchHardCodedPaths $out ''; From 7c486d35fcbd34f58c02a21d992907b7697162de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 28 Aug 2020 13:21:53 +0100 Subject: [PATCH 193/688] deepin.startdde: remove remove-references-to --- pkgs/desktops/deepin/startdde/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix index 75b36e85de3c..ab17f04db68f 100644 --- a/pkgs/desktops/deepin/startdde/default.nix +++ b/pkgs/desktops/deepin/startdde/default.nix @@ -139,7 +139,6 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" -C go/src/${goPackagePath} rm -rf $out/share/lightdm # this is uselesss for NixOS - remove-references-to -t ${go} $out/sbin/* ''; postFixup = '' From 42173099bfe64531c204d758ed4cdcb7c798d1b6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Aug 2020 15:18:44 +0200 Subject: [PATCH 194/688] matrix-synapse: 1.19.0 -> 1.19.1 https://github.com/matrix-org/synapse/releases/tag/v1.19.1 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index a321f609df89..f788057e386f 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.19.0"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "1fl9p0cb442271hx7zjz8vp111xgvdpn4khk8bk3kl8z9hjs2l1p"; + sha256 = "0ddn3g3q0nkxpmw0xpjhnl0m1g3lrlp89abqbal9k6n689h6kfly"; }; patches = [ From e8ee221dd6f04911e046db2808c8356471ce4b82 Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Fri, 28 Aug 2020 16:35:48 +0200 Subject: [PATCH 195/688] nix-prefetch-github: v2.4 -> v3.0 --- .../python-modules/nix-prefetch-github/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 6ee4d937cfb7..67873f929ad4 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -15,17 +15,13 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "2.4"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PVB/cL0NVB5pHxRMjg8TLatvIvHjfCvaRWBanVHYT+E="; + sha256 = "sha256-EN+EbVXUaf+id5UsK4EBm/9k9FYaH79g08kblvW60XA="; }; - # The tests for this package require nix and network access. That's - # why we cannot execute them inside the building process. - doCheck = false; - propagatedBuildInputs = [ attrs click @@ -34,6 +30,9 @@ buildPythonPackage rec { ]; checkInputs = [ pytestCheckHook pytest-black pytestcov pytest-isort git ]; + checkPhase = '' + pytest -m 'not network' + ''; # latest version of isort will cause tests to fail # ignore tests which are impure From 87cb88b71f41f15708a45dedee07e8b2d627d014 Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Thu, 9 Jul 2020 20:50:52 -0400 Subject: [PATCH 196/688] ocamlPackages.async_ssl: init at 0.13 --- pkgs/development/ocaml-modules/janestreet/0.13.nix | 10 ++++++++++ pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.13.nix b/pkgs/development/ocaml-modules/janestreet/0.13.nix index d16ceefd04cc..b92027a65a0d 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.13.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.13.nix @@ -1,5 +1,6 @@ { janePackage , ctypes +, dune-configurator , num , octavius , ppxlib @@ -417,6 +418,15 @@ rec { propagatedBuildInputs = [ async shell ]; }; + async_ssl = janePackage { + pname = "async_ssl"; + useDune2 = true; + hash = "0z5dbiam5k7ipx9ph4r8nqv0a1ldx1ymxw3xjxgrdjda90lmwf2k"; + meta.description = "Async wrappers for SSL"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ async ctypes openssl ]; + }; + core_bench = janePackage { pname = "core_bench"; hash = "1nk0i3z8rqrljbf4bc7ljp71g0a4361nh85s2ang0lgxri74zacm"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a9bea0a60f64..c06ce3eeae23 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -991,7 +991,7 @@ let janeStreet = if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.13.nix { - inherit ctypes janePackage num octavius ppxlib re; + inherit ctypes dune-configurator janePackage num octavius ppxlib re; inherit (pkgs) openssl; } else if lib.versionOlder "4.07" ocaml.version From 97c4b3934c5435c5c2f5ae63c46ef32dbd02c2ad Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Thu, 9 Jul 2020 20:51:22 -0400 Subject: [PATCH 197/688] ocamlPackages.conduit-async: init at 2.2.2 --- .../ocaml-modules/conduit/async.nix | 18 ++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/ocaml-modules/conduit/async.nix diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix new file mode 100644 index 000000000000..1c5834c415a4 --- /dev/null +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -0,0 +1,18 @@ +{ stdenv, buildDunePackage, async, ppx_sexp_conv, conduit }: + +if !stdenv.lib.versionAtLeast conduit.version "1.0" +then conduit +else + +buildDunePackage { + pname = "conduit-async"; + inherit (conduit) version src; + + buildInputs = [ ppx_sexp_conv ]; + + propagatedBuildInputs = [ async conduit ]; + + meta = conduit.meta // { + description = "A network connection establishment library for Async"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c06ce3eeae23..d9937829b93e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -143,6 +143,8 @@ let conduit = callPackage ../development/ocaml-modules/conduit { }; + conduit-async = callPackage ../development/ocaml-modules/conduit/async.nix { }; + conduit-lwt = callPackage ../development/ocaml-modules/conduit/lwt.nix { }; conduit-lwt-unix = callPackage ../development/ocaml-modules/conduit/lwt-unix.nix { }; From 94790b2949b5157b0ec6d5dbc14b253f5fa4dea6 Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Sat, 11 Jul 2020 23:08:08 -0400 Subject: [PATCH 198/688] ocamlPackages.conduit: Update description --- pkgs/development/ocaml-modules/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 7fbeefb39260..27b2a329b26e 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ]; meta = { - description = "Network connection library for TCP and SSL"; + description = "A network connection establishment library"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; homepage = "https://github.com/mirage/ocaml-conduit"; From 48e06000c2b29277edf6c840e613c337990e77f0 Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Thu, 9 Jul 2020 20:51:58 -0400 Subject: [PATCH 199/688] ocamlPackages.cohttp-async: init at 2.5.1 --- .../ocaml-modules/cohttp/async.nix | 21 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/ocaml-modules/cohttp/async.nix diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix new file mode 100644 index 000000000000..23e6f4f10a14 --- /dev/null +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -0,0 +1,21 @@ +{ stdenv, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv +, logs, magic-mime }: + +if !stdenv.lib.versionAtLeast cohttp.version "0.99" then + cohttp +else if !stdenv.lib.versionAtLeast async.version "0.13" then + throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)" +else + + buildDunePackage { + pname = "cohttp-async"; + inherit (cohttp) version src; + + buildInputs = [ ppx_sexp_conv ]; + + propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ]; + + meta = cohttp.meta // { + description = "CoHTTP implementation for the Async concurrency library"; + }; + } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d9937829b93e..ba02c3bb5246 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -137,6 +137,8 @@ let cohttp = callPackage ../development/ocaml-modules/cohttp { }; + cohttp-async = callPackage ../development/ocaml-modules/cohttp/async.nix { }; + cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { }; cohttp-lwt-unix = callPackage ../development/ocaml-modules/cohttp/lwt-unix.nix { }; From 91337f4169454333837ab3f87802326d7e362f78 Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Mon, 25 May 2020 19:23:05 -0400 Subject: [PATCH 200/688] ocamlPackages.conduit-async: Add async_ssl to propagatedBuildInputs --- pkgs/development/ocaml-modules/cohttp/async.nix | 1 + pkgs/development/ocaml-modules/conduit/async.nix | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index 23e6f4f10a14..246397b60810 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -9,6 +9,7 @@ else buildDunePackage { pname = "cohttp-async"; + useDune2 = true; inherit (cohttp) version src; buildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index 1c5834c415a4..f16819ed8aef 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, async, ppx_sexp_conv, conduit }: +{ stdenv, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }: if !stdenv.lib.versionAtLeast conduit.version "1.0" then conduit @@ -6,11 +6,12 @@ else buildDunePackage { pname = "conduit-async"; + useDune2 = true; inherit (conduit) version src; buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ async conduit ]; + propagatedBuildInputs = [ async async_ssl conduit ]; meta = conduit.meta // { description = "A network connection establishment library for Async"; From 65062ad39f5bed204733ffcc23c85d9f19494f26 Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Fri, 28 Aug 2020 13:13:30 -0300 Subject: [PATCH 201/688] flutter: export mkFlutter With that, users can build custom versions of flutter --- pkgs/development/compilers/flutter/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index c58457b71a41..9b9d1f7481d1 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -6,6 +6,7 @@ let let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; in { + mkFlutter = mkFlutter; stable = mkFlutter rec { pname = "flutter"; channel = "stable"; From 12c0b4ac587bc1b4eccd81a66e03196710175d47 Mon Sep 17 00:00:00 2001 From: Michael Reilly Date: Wed, 26 Aug 2020 11:34:30 -0400 Subject: [PATCH 202/688] katago: 1.6.0 -> 1.6.1 --- pkgs/games/katago/default.nix | 51 +++++++++++++++++---------------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index c0fe7d282251..20ad47d3e0a8 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -14,42 +14,43 @@ , ocl-icd ? null , gperftools ? null , eigen ? null -, gpuEnabled ? true -, useAVX2 ? false -, cudaSupport ? false -, useTcmalloc ? true}: +, enableAVX2 ? false +, enableBigBoards ? false +, enableCuda ? false +, enableGPU ? true +, enableTcmalloc ? true}: -assert !gpuEnabled -> ( +assert !enableGPU -> ( eigen != null && - !cudaSupport); + !enableCuda); -assert cudaSupport -> ( +assert enableCuda -> ( libGL_driver != null && cudatoolkit != null && cudnn != null); -assert !cudaSupport -> ( - !gpuEnabled || ( +assert !enableCuda -> ( + !enableGPU || ( opencl-headers != null && ocl-icd != null)); -assert useTcmalloc -> ( +assert enableTcmalloc -> ( gperftools != null); let - env = if cudaSupport + env = if enableCuda then gcc8Stdenv else stdenv; in env.mkDerivation rec { pname = "katago"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "1r84ws2rj7j8085v1cqffy9rg65rzrhk6z8jbxivqxsmsgs2zs48"; + sha256 = "030ff9prnvpadgcb4x4hx6b6ggg10bwqcj8vd8nwrdz9sjq67yf7"; }; nativeBuildInputs = [ @@ -60,42 +61,44 @@ in env.mkDerivation rec { buildInputs = [ libzip boost - ] ++ lib.optionals (!gpuEnabled) [ + ] ++ lib.optionals (!enableGPU) [ eigen - ] ++ lib.optionals (gpuEnabled && cudaSupport) [ + ] ++ lib.optionals (enableGPU && enableCuda) [ cudnn libGL_driver - ] ++ lib.optionals (gpuEnabled && !cudaSupport) [ + ] ++ lib.optionals (enableGPU && !enableCuda) [ opencl-headers ocl-icd - ] ++ lib.optionals useTcmalloc [ + ] ++ lib.optionals enableTcmalloc [ gperftools ]; cmakeFlags = [ "-DNO_GIT_REVISION=ON" - ] ++ lib.optionals (!gpuEnabled) [ + ] ++ lib.optionals (!enableGPU) [ "-DUSE_BACKEND=EIGEN" - ] ++ lib.optionals useAVX2 [ + ] ++ lib.optionals enableAVX2 [ "-DUSE_AVX2=ON" - ] ++ lib.optionals (gpuEnabled && cudaSupport) [ + ] ++ lib.optionals (enableGPU && enableCuda) [ "-DUSE_BACKEND=CUDA" - ] ++ lib.optionals (gpuEnabled && !cudaSupport) [ + ] ++ lib.optionals (enableGPU && !enableCuda) [ "-DUSE_BACKEND=OPENCL" - ] ++ lib.optionals useTcmalloc [ + ] ++ lib.optionals enableTcmalloc [ "-DUSE_TCMALLOC=ON" + ] ++ lib.optionals enableBigBoards [ + "-DUSE_BIGGER_BOARDS_EXPENSIVE=ON" ]; preConfigure = '' cd cpp/ - '' + lib.optionalString cudaSupport '' + '' + lib.optionalString enableCuda '' export CUDA_PATH="${cudatoolkit}" export EXTRA_LDFLAGS="-L/run/opengl-driver/lib" ''; installPhase = '' mkdir -p $out/bin; cp katago $out/bin; - '' + lib.optionalString cudaSupport '' + '' + lib.optionalString enableCuda '' wrapProgram $out/bin/katago \ --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c7911331cbe..778d107dedf6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24642,13 +24642,13 @@ in katago = callPackage ../games/katago { }; katagoWithCuda = katago.override { - cudaSupport = true; + enableCuda = true; cudnn = cudnn_cudatoolkit_10_2; cudatoolkit = cudatoolkit_10_2; }; katagoCPU = katago.override { - gpuEnabled = false; + enableGPU = false; }; klavaro = callPackage ../games/klavaro {}; From 2d39da2084d5286bcefcf3e45c27fb140b350b19 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 28 Aug 2020 20:19:50 +0200 Subject: [PATCH 203/688] emscripten: 1.39.1 -> 2.0.0 --- .../compilers/emscripten/default.nix | 95 ++++++++++--------- .../compilers/emscripten/fastcomp/default.nix | 28 ------ .../fastcomp/emscripten-fastcomp.nix | 53 ----------- pkgs/top-level/all-packages.nix | 14 +-- 4 files changed, 53 insertions(+), 137 deletions(-) delete mode 100644 pkgs/development/compilers/emscripten/fastcomp/default.nix delete mode 100644 pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index cd5142acce88..314ca3f0d92a 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,63 +1,66 @@ -{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler -, jre, binaryen, enableWasm ? true , cmake +{ stdenv, fetchFromGitHub, python3, nodejs, closurecompiler +, jre, binaryen +, llvmPackages_11 +, symlinkJoin, makeWrapper }: -let - rev = emscriptenVersion; - appdir = "share/emscripten"; - binaryenVersioned = binaryen.override { emscriptenRev = rev; }; -in +stdenv.mkDerivation rec { + pname = "emscripten"; + # 2.0.1 requires unreleased binaryen version (as of 2020-08-28) + version = "2.0.0"; -stdenv.mkDerivation { - name = "emscripten-${rev}"; + llvmEnv = symlinkJoin { + name = "emscripten-llvm-${version}"; + paths = with llvmPackages_11; [ clang-unwrapped lld llvm ]; + }; src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "1j3f0hpy05qskaiyv75l7wv4n0nzxhrh9b296zchx3f6f9h2rghq"; - inherit rev; + sha256 = "1ihr1v8dlq5xq97i59n7s1hhz5pkafi6556ppgzjmmhiiraz2mkh"; + rev = version; }; - buildInputs = [ nodejs cmake python ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ nodejs python3 ]; - buildCommand = '' - mkdir -p $out/${appdir} - cp -r $src/* $out/${appdir} - chmod -R +w $out/${appdir} - grep -rl '^#!/usr.*python' $out/${appdir} | xargs sed -i -s 's@^#!/usr.*python.*@#!${python}/bin/python@' - sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/${appdir}/config'," $out/${appdir}/tools/shared.py - sed -i -e 's,^.*did not see a source tree above the LLVM.*$, return True,' $out/${appdir}/tools/shared.py - sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n return,' $out/${appdir}/tools/shared.py + outputs = [ "out" "appdir" ]; + + buildPhase = '' + patchShebangs . # fixes cmake support - sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" $out/${appdir}/emcc.py - mkdir $out/bin - ln -s $out/${appdir}/{em++,em-config,emar,embuilder.py,emcc,emcmake,emconfigure,emlink.py,emmake,emranlib,emrun,emscons} $out/bin + sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py - echo "EMSCRIPTEN_ROOT = '$out/${appdir}'" > $out/${appdir}/config - echo "LLVM_ROOT = '${emscriptenfastcomp}/bin'" >> $out/${appdir}/config - echo "PYTHON = '${python}/bin/python'" >> $out/${appdir}/config - echo "NODE_JS = '${nodejs}/bin/node'" >> $out/${appdir}/config - echo "JS_ENGINES = [NODE_JS]" >> $out/${appdir}/config - echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config - echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> $out/${appdir}/config - echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config + echo "EMSCRIPTEN_ROOT = '$appdir'" > .emscripten + echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten + echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten + echo "JS_ENGINES = [NODE_JS]" >> .emscripten + echo "COMPILER_ENGINE = NODE_JS" >> .emscripten + echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> .emscripten + echo "JAVA = '${jre}/bin/java'" >> .emscripten # to make the test(s) below work - echo "SPIDERMONKEY_ENGINE = []" >> $out/${appdir}/config - '' - + stdenv.lib.optionalString enableWasm '' - echo "BINARYEN_ROOT = '${binaryenVersioned}'" >> $out/share/emscripten/config - '' - + - '' - echo "--------------- running test -----------------" - # quick hack to get the test working - HOME=$TMPDIR - cp $out/${appdir}/config $HOME/.emscripten - export PATH=$PATH:$out/bin + echo "SPIDERMONKEY_ENGINE = []" >> .emscripten + echo "BINARYEN_ROOT = '${binaryen}'" >> .emscripten + ''; - #export EMCC_DEBUG=2 - ${python}/bin/python $src/tests/runner.py test_hello_world - echo "--------------- /running test -----------------" + installPhase = '' + rm -rf cache + cp -r . $appdir + chmod -R +w $appdir + + mkdir -p $out/bin + for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do + makeWrapper $appdir/$b $out/bin/$b \ + --set PYTHON ${python3}/bin/python + done + ''; + + doCheck = true; + checkPhase = '' + #export EMCC_DEBUG=2 + export PYTHON=${python3}/bin/python + export HOME=$TMPDIR + python tests/runner.py test_hello_world ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/emscripten/fastcomp/default.nix b/pkgs/development/compilers/emscripten/fastcomp/default.nix deleted file mode 100644 index 57496d288605..000000000000 --- a/pkgs/development/compilers/emscripten/fastcomp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ newScope, stdenv, binutils, wrapCCWith, symlinkJoin }: -let - callPackage = newScope (self // {inherit stdenv;}); - - self = { - emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {}; - emscriptenfastcomp-wrapped = wrapCCWith { - cc = self.emscriptenfastcomp-unwrapped; - # Never want Apple's cctools for WASM target - bintools = binutils; - libc = stdenv.cc.libc; - extraBuildCommands = '' - # hardening flags break WASM support - cat > $out/nix-support/add-hardening.sh - ''; - }; - emscriptenfastcomp = symlinkJoin { - name = "emscriptenfastcomp-${stdenv.lib.getVersion self.emscriptenfastcomp-unwrapped}"; - paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ]; - preferLocalBuild = false; - allowSubstitutes = true; - postBuild = '' - # replace unwrapped clang-3.9 binary by wrapper - ln -sf $out/bin/clang $out/bin/clang-[0-9]* - ''; - }; - }; -in self diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix deleted file mode 100644 index f8f06e24f8ba..000000000000 --- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ emscriptenVersion, stdenv, fetchFromGitHub, cmake, python, gtest, gccForLibs, ... }: - -let - rev = emscriptenVersion; -in -stdenv.mkDerivation rec { - name = "emscripten-fastcomp-${rev}"; - - src = fetchFromGitHub { - owner = "emscripten-core"; - repo = "emscripten-fastcomp"; - sha256 = "0bd0l5k2fa4k0nax2cpxi003pqffqivx4z4m2j5xdha1a12sid8i"; - inherit rev; - }; - - srcFL = fetchFromGitHub { - owner = "emscripten-core"; - repo = "emscripten-fastcomp-clang"; - sha256 = "1iw2qplhp489qzw0rma73sab7asnm27g4m95sr36c6kq9cq6agri"; - inherit rev; - }; - - nativeBuildInputs = [ cmake python gtest ]; - preConfigure = '' - cp -Lr ${srcFL} tools/clang - chmod +w -R tools/clang - ''; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'" - "-DLLVM_INCLUDE_EXAMPLES=OFF" - "-DLLVM_INCLUDE_TESTS=ON" - #"-DLLVM_CONFIG=${llvm}/bin/llvm-config" - "-DLLVM_BUILD_TESTS=ON" - "-DCLANG_INCLUDE_TESTS=ON" - ] ++ (stdenv.lib.optional stdenv.isLinux - # necessary for clang to find crtend.o - "-DGCC_INSTALL_PREFIX=${gccForLibs}" - ); - enableParallelBuilding = true; - - passthru = { - isClang = true; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/emscripten-core/emscripten-fastcomp"; - description = "Emscripten LLVM"; - platforms = platforms.all; - maintainers = with maintainers; [ qknight matthewbauer ]; - license = stdenv.lib.licenses.ncsa; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02caffbfa830..26f037620366 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3369,14 +3369,8 @@ in cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { }; - emscriptenVersion = "1.39.1"; - emscripten = callPackage ../development/compilers/emscripten { }; - emscriptenfastcompPackages = dontRecurseIntoAttrs (callPackage ../development/compilers/emscripten/fastcomp { }); - - emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp; - emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; }; @@ -4583,7 +4577,7 @@ in isync = callPackage ../tools/networking/isync { }; - itm-tools = callPackage ../development/tools/misc/itm-tools { }; + itm-tools = callPackage ../development/tools/misc/itm-tools { }; ix = callPackage ../tools/misc/ix { }; @@ -4888,7 +4882,7 @@ in asciidoc = asciidoc-full; imagemagick = imagemagick7Big; }; - + kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; @@ -20980,7 +20974,7 @@ in i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; - + wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; wmfs = callPackage ../applications/window-managers/wmfs/default.nix { }; @@ -27533,7 +27527,7 @@ in sequeler = callPackage ../applications/misc/sequeler { }; sequelpro = callPackage ../applications/misc/sequelpro {}; - + snowsql = callPackage ../applications/misc/snowsql {}; sidequest = callPackage ../applications/misc/sidequest {}; From 7c6ef8b5cde5fc6ac6af3ea2728a21a8ab0891f7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 28 Aug 2020 20:46:26 +0200 Subject: [PATCH 204/688] binaryen: simplify build --- .../0001-Get-rid-of-git-dependency.patch | 38 ------------------- .../compilers/binaryen/default.nix | 31 ++------------- 2 files changed, 4 insertions(+), 65 deletions(-) delete mode 100644 pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch diff --git a/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch b/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch deleted file mode 100644 index 79b053592a95..000000000000 --- a/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1c6af6c68ba3f49ae9e942844c739e934339d3b9 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sat, 14 Mar 2020 00:37:31 +0100 -Subject: [PATCH] Get rid of git dependency - ---- - CMakeLists.txt | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4acf703e1..4e9bd60b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,20 +7,7 @@ IF(NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE "Release") - ENDIF() - --FIND_PACKAGE(Git QUIET REQUIRED) --EXECUTE_PROCESS(COMMAND -- "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags -- RESULT_VARIABLE -- GIT_HASH_RESULT -- OUTPUT_VARIABLE -- GIT_HASH -- OUTPUT_STRIP_TRAILING_WHITESPACE) --IF(${GIT_HASH_RESULT}) -- MESSAGE(WARNING "Error running git describe to determine version") -- SET(BINARYEN_VERSION_INFO "(unable to determine version)") --ELSE() -- SET(BINARYEN_VERSION_INFO "${GIT_HASH}") --ENDIF() -+SET(BINARYEN_VERSION_INFO "@emscriptenv@") - CONFIGURE_FILE(config.h.in config.h) - - OPTION(BUILD_STATIC_LIB "Build as a static library" OFF) --- -2.25.0 - diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index e9dc939b5edf..d0e224b7c9b4 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,39 +1,16 @@ -{ stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }: - -let - defaultVersion = "95"; - - # Map from git revs to SHA256 hashes - sha256s = { - version_95 = "1w4js9bm5qv5aws8bzz4f0n3ni2l7h4fidkq9v5bldf0zxncy8m3"; - "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y"; - }; -in +{ stdenv, cmake, python3, fetchFromGitHub }: stdenv.mkDerivation rec { - version = if emscriptenRev == null - then defaultVersion - else "emscripten-${emscriptenRev}"; - rev = if emscriptenRev == null - then "version_${version}" - else emscriptenRev; pname = "binaryen"; + version = "95"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; - sha256 = - if builtins.hasAttr rev sha256s - then builtins.getAttr rev sha256s - else null; - inherit rev; + rev = "version_${version}"; + sha256 = "1w4js9bm5qv5aws8bzz4f0n3ni2l7h4fidkq9v5bldf0zxncy8m3"; }; - patches = stdenv.lib.optional (emscriptenRev != null) (substituteAll { - src = ./0001-Get-rid-of-git-dependency.patch; - emscriptenv = "1.39.1"; - }); - nativeBuildInputs = [ cmake python3 ]; meta = with stdenv.lib; { From ed55513a4fc4f4f9d32007aa36ca75ab91e1be04 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 28 Aug 2020 21:00:19 +0200 Subject: [PATCH 205/688] tree-sitter: fix build --- pkgs/development/tools/parsing/tree-sitter/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 51af3acdacdb..25faf4670503 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -55,6 +55,10 @@ in rustPlatform.buildRustPackage { # needed for the tests rm -rf test/fixtures/grammars ln -s ${grammars} test/fixtures/grammars + + # These functions do not appear in the source code + sed -i /_ts_query_context/d lib/binding_web/exports.json + sed -i /___assert_fail/d lib/binding_web/exports.json ''; # Compile web assembly with emscripten. The --debug flag prevents us from From 92ad78e4352dac87b4ea3f01d8f6826e06bf879f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 28 Aug 2020 12:51:54 -0700 Subject: [PATCH 206/688] python3Packages.jupyterhub-ldapauthenticator: 1.3.1 -> 1.3.2, fix build --- .../python-modules/jupyterhub-ldapauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 38fac27ad43e..cfb89e7f34fd 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupyterhub-ldapauthenticator"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "913cc67a1e8c50e7e301a16f25a4125ffd020a7c5dd22ccfb3f7707af2ee9157"; + sha256 = "12xby5j7wmi6qsbb2fjd5qbckkcg5fmdij8qpc9n7ci8vfxq303m"; }; # No tests implemented From 14d8030618a753bc5ff50d2f40b58ef20dea0182 Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Thu, 27 Aug 2020 08:32:51 +0200 Subject: [PATCH 207/688] tor-browser-bundle-bin: 9.5.3 -> 9.5.4 --- .../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 21a34539b86e..ab528a2c1cb8 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.5.3"; + version = "9.5.4"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "1kqvr0sag94xdkq85k426qq1hz2b52m315yz51w6hvc87d8332b4"; + sha256 = "sha256-XW2B2wTgqMU2w9XhPJNcUjGLrHykQIngMcG/fFTWb04="; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "179g00xw964d6x11wvzs84r7d6rcczx7ganqrxrs499yklscc46b"; + sha256 = "sha256-EyDyAxB5Og1Cn04tuBF9ob8BxqULy2Ur07BuDxZlmqQ="; }; }; in From 27fb2091943966748d02b12bfa07fb6401feaa69 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 28 Aug 2020 15:10:59 -0500 Subject: [PATCH 208/688] build-bazel-package: add dontAddBazelOpts arg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds an option to skip adding --copt and --linkopt to Bazel flags. In some cases, Bazel doesn’t like these flags, like when a custom toolchain is being used (as opposed to the builtin one. The compiler can still get the dependencies since it is invoked through gcc wrapper and picks up the NIX_CFLAGS_COMPILE / NIX_LDFLAGS. --- .../build-bazel-package/default.nix | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index bbcbc4e2e11d..4d22a329e416 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -37,6 +37,12 @@ args@{ # Debian-specific /usr/share/java paths, but doesn't in the configured build). , fetchConfigured ? false +# Don’t add Bazel --copt and --linkopt from NIX_CFLAGS_COMPILE / +# NIX_LDFLAGS. This is necessary when using a custom toolchain which +# Bazel wants all headers / libraries to come from, like when using +# CROSSTOOL. Weirdly, we can still get the flags through the wrapped +# compiler. +, dontAddBazelOpts ? false , ... }: @@ -170,6 +176,8 @@ in stdenv.mkDerivation (fBuildAttrs // { done '' + fBuildAttrs.preConfigure or ""; + inherit dontAddBazelOpts; + buildPhase = fBuildAttrs.buildPhase or '' runHook preBuild @@ -181,20 +189,22 @@ in stdenv.mkDerivation (fBuildAttrs // { # copts=() host_copts=() - for flag in $NIX_CFLAGS_COMPILE; do - copts+=( "--copt=$flag" ) - host_copts+=( "--host_copt=$flag" ) - done - for flag in $NIX_CXXSTDLIB_COMPILE; do - copts+=( "--copt=$flag" ) - host_copts+=( "--host_copt=$flag" ) - done linkopts=() host_linkopts=() - for flag in $NIX_LDFLAGS; do - linkopts+=( "--linkopt=-Wl,$flag" ) - host_linkopts+=( "--host_linkopt=-Wl,$flag" ) - done + if [ -z "''${dontAddBazelOpts:-}" ]; then + for flag in $NIX_CFLAGS_COMPILE; do + copts+=( "--copt=$flag" ) + host_copts+=( "--host_copt=$flag" ) + done + for flag in $NIX_CXXSTDLIB_COMPILE; do + copts+=( "--copt=$flag" ) + host_copts+=( "--host_copt=$flag" ) + done + for flag in $NIX_LDFLAGS; do + linkopts+=( "--linkopt=-Wl,$flag" ) + host_linkopts+=( "--host_linkopt=-Wl,$flag" ) + done + fi BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ USER=homeless-shelter \ From a8bd5c1dc4456817ddf9b4d5df188627e3f1e70d Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 28 Aug 2020 20:13:51 +0000 Subject: [PATCH 209/688] odafileconverter: init at 21.7.0.0 (#95392) --- maintainers/maintainer-list.nix | 6 +++ .../graphics/odafileconverter/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 61 insertions(+) create mode 100644 pkgs/applications/graphics/odafileconverter/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3f8946628a3e..1ffaf92ad86e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9488,6 +9488,12 @@ github = "fzakaria"; githubId = 605070; }; + nagisa = { + name = "Simonas Kazlauskas"; + email = "nixpkgs@kazlauskas.me"; + github = "nagisa"; + githubId = 679122; + }; yevhenshymotiuk = { name = "Yevhen Shymotiuk"; email = "yevhenshymotiuk@gmail.com"; diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/applications/graphics/odafileconverter/default.nix new file mode 100644 index 000000000000..0378c4db13b6 --- /dev/null +++ b/pkgs/applications/graphics/odafileconverter/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, mkDerivation, dpkg, fetchurl, qtbase }: + +let + # To obtain the version you will need to run the following command: + # + # dpkg-deb -I ${odafileconverter.src} | grep Version + version = "21.7.0.0"; + rpath = "$ORIGIN:${lib.makeLibraryPath [ stdenv.cc.cc qtbase ]}"; + +in mkDerivation { + pname = "oda-file-converter"; + inherit version; + nativeBuildInputs = [ dpkg ]; + + src = fetchurl { + # NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time) + url = "https://download.opendesign.com/guestfiles/ODAFileConverter/ODAFileConverter_QT5_lnxX64_7.2dll.deb"; + sha256 = "0sa21nnwzqb6g7gl0z43smqgcd9h3xipj3cq2cl7ybfh3cvcxfi9"; + }; + + unpackPhase = '' + dpkg -x $src oda_unpacked + sourceRoot=$PWD/oda_unpacked + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp -vr $sourceRoot/usr/bin/ODAFileConverter_${version} $out/libexec + cp -vr $sourceRoot/usr/share $out/share + ''; + + dontWrapQtApps = true; + fixupPhase = '' + echo "setting interpreter" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/libexec/ODAFileConverter + patchelf --set-rpath '${rpath}' $out/libexec/ODAFileConverter + wrapQtApp $out/libexec/ODAFileConverter + mv $out/libexec/ODAFileConverter $out/bin + + find $out/libexec -type f -executable | while read file; do + echo "patching $file" + patchelf --set-rpath '${rpath}' $file + done + ''; + + meta = with stdenv.lib; { + description = "For converting between different versions of .dwg and .dxf"; + homepage = "https://www.opendesign.com/guestfiles/oda_file_converter"; + license = licenses.unfree; + maintainers = with maintainers; [ nagisa ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c57a2ed6e0d9..e7f12154c6a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2269,6 +2269,8 @@ in obinskit = callPackage ../applications/misc/obinskit {}; + odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; + pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; }; From ed950bb10438d1e0b5b83cd513fa26db2ac60e2b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 28 Aug 2020 15:12:50 -0500 Subject: [PATCH 210/688] cudnn: skip libcudnn_cnn_infer.so, instead of removing This is needed to build the CUDNN samples, so we should make sure it winds up in $out/lib. The library is too big to support patchelf, so we need to skip it. Most programs will still get the opengl path because it also links to other libraries. --- .../libraries/science/math/cudnn/generic.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 381920682a49..e727218c0555 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -32,19 +32,20 @@ stdenv.mkDerivation { mkdir -p $out cp -a include $out/include cp -a lib64 $out/lib64 - - ${lib.optionalString (lib.versionAtLeast version "8") '' - # patchelf fails on libcudnn_cnn_infer due to it being too big. - # I'm hoping it's not needed for most programs. - # (https://github.com/NixOS/patchelf/issues/222) - rm -f $out/lib64/libcudnn_cnn_infer* - ''} ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addOpenGLRunpath. postFixup = '' - addOpenGLRunpath $out/lib/lib*.so + for lib in $out/lib/lib*.so; do + # patchelf fails on libcudnn_cnn_infer due to it being too big. + # Most programs will still get the RPATH since they link to + # other things. + # (https://github.com/NixOS/patchelf/issues/222) + if [ "$(basename $lib)" != libcudnn_cnn_infer.so ]; then + addOpenGLRunpath $lib + fi + done ''; propagatedBuildInputs = [ From f02ac20f95537ecb7e33426237d159e2f20aa479 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 28 Aug 2020 23:11:27 +0300 Subject: [PATCH 211/688] murmur: support building with grpc --- pkgs/applications/networking/mumble/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 8490c0509a1c..c205f18e3663 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -6,6 +6,7 @@ , speechdSupport ? false, speechd ? null , pulseSupport ? false, libpulseaudio ? null , iceSupport ? false, zeroc-ice ? null +, grpcSupport ? false, grpc ? null, c-ares ? null, abseil-cpp ? null, which ? null , nixosTests }: @@ -13,6 +14,7 @@ assert jackSupport -> libjack2 != null; assert speechdSupport -> speechd != null; assert pulseSupport -> libpulseaudio != null; assert iceSupport -> zeroc-ice != null; +assert grpcSupport -> (grpc != null && c-ares != null && abseil-cpp != null && which != null); with stdenv.lib; let @@ -117,9 +119,12 @@ let configureFlags = [ "CONFIG+=no-client" - ] ++ optional (!iceSupport) "CONFIG+=no-ice"; + ] ++ optional (!iceSupport) "CONFIG+=no-ice" + ++ optional grpcSupport "CONFIG+=grpc"; - buildInputs = [ libcap ] ++ optional iceSupport zeroc-ice; + buildInputs = [ libcap ] + ++ optional iceSupport zeroc-ice + ++ optionals grpcSupport [ grpc c-ares abseil-cpp which ]; installPhase = '' # bin stuff diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c57a2ed6e0d9..55170ed0ee92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21837,6 +21837,7 @@ in avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; + grpcSupport = config.murmur.grpcSupport or true; }).murmur; mumble = (callPackages ../applications/networking/mumble { From c4330a0ca01bec7dc0d0333786a2baf35e7eb450 Mon Sep 17 00:00:00 2001 From: Barry Moore Date: Thu, 27 Aug 2020 10:12:14 -0400 Subject: [PATCH 212/688] pythonPackages.jupyterhub-tmpauthenticator: init at 0.6 --- .../jupyterhub-tmpauthenticator/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix diff --git a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix new file mode 100644 index 000000000000..2aef23fe4a4a --- /dev/null +++ b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, jupyterhub +}: + +buildPythonPackage rec { + pname = "jupyterhub-tmpauthenticator"; + version = "0.6"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "064x1ypxwx1l270ic97p8czbzb7swl9758v40k3w2gaqf9762f0l"; + }; + + propagatedBuildInputs = [ jupyterhub ]; + + # No tests available in the package + doCheck = false; + + pythonImportsCheck = [ "tmpauthenticator" ]; + + meta = with lib; { + description = "Simple Jupyterhub authenticator that allows anyone to log in."; + license = with licenses; [ bsd3 ]; + homepage = "https://github.com/jupyterhub/tmpauthenticator"; + maintainers = with maintainers; [ chiroptical ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7324a36ae00..3e43854afd20 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4544,6 +4544,8 @@ in { jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; + jupyterhub-tmpauthenticator = callPackage ../development/python-modules/jupyterhub-tmpauthenticator { }; + jupyterhub-systemdspawner = callPackage ../development/python-modules/jupyterhub-systemdspawner { inherit (pkgs) bash; }; From 40dc0c0861decdeafab0b97ede77409d18729b48 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Fri, 28 Aug 2020 23:10:49 +0200 Subject: [PATCH 213/688] gocryptfs: 1.7.1 -> 1.8.0 --- pkgs/tools/filesystems/gocryptfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 70a0aff118db..2f0deed7f613 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -8,7 +8,7 @@ let in buildGoPackage rec { pname = "gocryptfs"; - version = "1.7.1"; + version = "1.8.0"; goPackagePath = "github.com/rfjakob/gocryptfs"; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "1zhzhvjhvi6xzib985bsnj9yzp4zsnm91m1679nbab6vm3kanq06"; + sha256 = "1acalwrr5xqhpqca3gypj0s68w6vpckxmg5z5gfgh8wx6nqx4aw9"; }; postPatch = "rm -r tests"; From b07a1dc743837562087406e6d62aa011deb88f06 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 28 Aug 2020 12:29:15 +0200 Subject: [PATCH 214/688] oh-my-zsh: apply patch to remove usages of perl https://github.com/NixOS/nixpkgs/pull/91213 removed `perl` from $PATH. This adds a patch to oh-my-zsh, using `sed` instead of `perl` to do the regexp substitution. --- pkgs/shells/zsh/oh-my-zsh/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index ddc0ae1a2adb..b70d62ffb101 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -1,7 +1,7 @@ # This script was inspired by the ArchLinux User Repository package: # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { version = "2020-08-24"; @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { sha256 = "0af37smv0bqw37bng2halzgszf8y3m2sxahdff54m16asm0py2cr"; }; + patches = [(fetchpatch { + # TODO: remove once https://github.com/ohmyzsh/ohmyzsh/pull/9210 is merged + name = "0001-pygmalion-use-pure-zsh-instead-of-perl.patch"; + url = "https://github.com/flokli/ohmyzsh/commit/299b48ce422957c0f5ca06cd5ccade55e0a08d87.patch"; + sha256 = "1cxj3c9bbcqd8zj9fccn117n2rzhx6krzbl4db059g2vsycadwmi"; + })]; installPhase = '' outdir=$out/share/oh-my-zsh From 0a2fe61c810e855c059ae5100af6325ce6a47b5d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Aug 2020 23:40:24 +0200 Subject: [PATCH 215/688] Revert "python: mautrix: 0.5.8 -> 0.6.1" This breaks `mautrix-telegram` which doesn't support v0.6 on its latest stable release. This reverts commit ad83814375cce31f282e04abb1862b6f5b463860. --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index f40a24afeaeb..50b81cef945d 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.6.1"; + version = "0.5.8"; src = fetchPypi { inherit pname version; - sha256 = "a86c6448fb3c0f5e149f3347fbf0cd776431aec16a137a9b45298b6fe5991e42"; + sha256 = "1hqg32n7pmjhap0ybfcf05zgfcyyirb4fm1m7gf44dwh40da6qz0"; }; propagatedBuildInputs = [ From b0ac24ae4114b89e0accc4f30c49b2b9c73bbf22 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 29 Aug 2020 00:47:17 +0200 Subject: [PATCH 216/688] nixos/test-driver: Use guest time when using sleep With the Perl driver, machine.sleep(N) was doing a sleep on the guest machine instead of the host machine. The new Python test driver however uses time.sleep(), which instead sleeps on the host. While this shouldn't make a difference most of the time, it *does* however make a huge difference if the test machine is loaded and you're sleeping for a minimum duration of eg. an animation. I stumbled on this while porting most of all my tests to the new Python test driver and particularily my video game tests failed on a fairly loaded machine, whereas they don't with the Perl test driver. Switching the sleep() method to sleep on the guest instead of the host fixes this. Signed-off-by: aszlig --- nixos/lib/test-driver/test-driver.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index dc11eaa1982f..612bb02aaa9b 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -773,7 +773,8 @@ class Machine: retry(window_is_visible) def sleep(self, secs: int) -> None: - time.sleep(secs) + # We want to sleep in *guest* time, not *host* time. + self.succeed(f"sleep {secs}") def forward_port(self, host_port: int = 8080, guest_port: int = 80) -> None: """Forward a TCP port on the host to a TCP port on the guest. From faefec521db6c2e2afa1ccc5cf58b3e4d8e92142 Mon Sep 17 00:00:00 2001 From: meutraa Date: Sat, 29 Aug 2020 00:48:54 +0100 Subject: [PATCH 217/688] androidStudioPackages.{dev,canary}: 4.2.0.7 -> 4.2.0.8 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 3a0bef24ab73..14a6853af1c3 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -19,9 +19,9 @@ let sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290"; }; latestVersion = { # canary & dev - version = "4.2.0.7"; # "Android Studio 4.2 Canary 7" - build = "201.6720134"; - sha256Hash = "1c9s6rd0z596qr7hbil5rl3fqby7c8h7ma52d1qj5rxra73k77nz"; + version = "4.2.0.8"; # "Android Studio 4.2 Canary 8" + build = "202.6787931"; + sha256Hash = "0y5fzr22dknzxay1bhd1ymhdnmdrpccdw8dswy2z9bxjsvq65n62"; }; in { # Attributes are named by their corresponding release channels From ba57562afe7759ceb86175c722e8e6eeda823e67 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Fri, 31 Jul 2020 23:00:02 -0700 Subject: [PATCH 218/688] sd-mux-ctrl: init at 2020-02-17 --- pkgs/tools/misc/sd-mux-ctrl/default.nix | 28 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/sd-mux-ctrl/default.nix diff --git a/pkgs/tools/misc/sd-mux-ctrl/default.nix b/pkgs/tools/misc/sd-mux-ctrl/default.nix new file mode 100644 index 000000000000..b87a83fcdf94 --- /dev/null +++ b/pkgs/tools/misc/sd-mux-ctrl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, cmake, pkgconfig, libftdi1, popt}: + +stdenv.mkDerivation rec { + pname = "sd-mux-ctrl-unstable"; + version = "2020-02-17"; + + src = fetchgit { + url = "https://git.tizen.org/cgit/tools/testlab/sd-mux"; + rev = "9dd189d973da64e033a0c5c2adb3d94b23153d94"; + sha256 = "0fxl8m1zkkyxkc2zi8930m0njfgnd04a22acny6vljnzag2shjvg"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ libftdi1 popt ]; + + postInstall = '' + install -D -m 644 ../doc/man/sd-mux-ctrl.1 $out/share/man/man1/sd-mux-ctrl.1 + ''; + + meta = with stdenv.lib; { + description = "Tool for controlling multiple sd-mux devices"; + homepage = "https://wiki.tizen.org/SD_MUX"; + license = licenses.asl20; + maintainers = with maintainers; [ sarcasticadmin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6506525f063..947bee28b0c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6646,6 +6646,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + sd-mux-ctrl = callPackage ../tools/misc/sd-mux-ctrl { }; + sd-switch = callPackage ../os-specific/linux/sd-switch { }; sdate = callPackage ../tools/misc/sdate { }; From 8bdcaa713d17ef0b5af6781196cd9bfe091b4849 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Wed, 22 Jul 2020 01:57:37 -0700 Subject: [PATCH 219/688] k2pdfopt: 2.51a -> 2.53 --- .../misc/k2pdfopt/0001-Fix-CMakeLists.patch | 49 + pkgs/applications/misc/k2pdfopt/default.nix | 142 ++- .../misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch | 151 --- .../applications/misc/k2pdfopt/k2pdfopt.patch | 99 -- .../misc/k2pdfopt/leptonica.patch | 254 ---- pkgs/applications/misc/k2pdfopt/mupdf.patch | 1060 ----------------- .../misc/k2pdfopt/tesseract.patch | 675 ----------- 7 files changed, 164 insertions(+), 2266 deletions(-) create mode 100644 pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch delete mode 100644 pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch delete mode 100644 pkgs/applications/misc/k2pdfopt/k2pdfopt.patch delete mode 100644 pkgs/applications/misc/k2pdfopt/leptonica.patch delete mode 100644 pkgs/applications/misc/k2pdfopt/mupdf.patch delete mode 100644 pkgs/applications/misc/k2pdfopt/tesseract.patch diff --git a/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch b/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch new file mode 100644 index 000000000000..8f9271ac996b --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch @@ -0,0 +1,49 @@ +From 2629af4ed00d7ca65359178203d80fb146901cdb Mon Sep 17 00:00:00 2001 +From: Daniel Fullmer +Date: Fri, 3 Jul 2020 21:00:45 -0700 +Subject: [PATCH 1/2] Fix CMakeLists + +--- + CMakeLists.txt | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e218279..4341de9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,6 +57,7 @@ endif(JPEG_FOUND) + include(FindJasper) + if(JASPER_FOUND) + set(HAVE_JASPER_LIB 1) ++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY}) + endif(JASPER_FOUND) + + # paths from willuslib/wgs.c +@@ -71,9 +72,12 @@ else() + message(STATUS "Could NOT find ghostscript executable") + endif(GHOSTSCRIPT_EXECUTABLE) + +-# willus.h +-# HAVE_GSL_LIB +- ++pkg_check_modules(GSL gsl) ++if(GSL_FOUND) ++ set(HAVE_GSL_LIB 1) ++ include_directories(SYSTEM ${GSL_INCLUDEDIR}) ++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS}) ++endif(GSL_FOUND) + + # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0) + # MUPDF_STATIC_LDFLAGS misses mupdf-js-none, and doubles libs ... +@@ -85,7 +89,7 @@ if(MUPDF_FOUND) + include_directories(SYSTEM ${MUPDF_INCLUDEDIR}) + message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}") + set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} +- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype ++ + ) + endif(MUPDF_FOUND) + +-- +2.27.0 + diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 8899654cc4c8..31accf811bc2 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig -, zlib, libpng +{ stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub +, cmake, pkgconfig, zlib, libpng , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript , enableMuPDF ? true, mupdf @@ -11,44 +11,132 @@ with stdenv.lib; -stdenv.mkDerivation rec { - pname = "k2pdfopt"; - version = "2.51a"; +# k2pdfopt is a pain to package. It requires modified versions of mupdf, +# leptonica, and tesseract. Instead of shipping patches for these upstream +# packages, k2pdfopt includes just the modified source files for these +# packages. The individual files from the {mupdf,leptonica,tesseract}_mod/ +# directories are intended to replace the corresponding source files in the +# upstream packages, for a particular version of that upstream package. +# +# There are a few ways we could approach packaging these modified versions of +# mupdf, leptonica, and mupdf: +# 1) Override the upstream source with a new derivation that involves copying +# the modified source files from k2pdfopt and replacing the corresponding +# source files in the upstream packages. Since the files are intended for a +# particular version of the upstream package, this would not allow us to easily +# use updates to those packages in nixpkgs. +# 2) Manually produce patches which can be applied against the upstream +# project, and have the same effect as replacing those files. This is what I +# believe k2pdfopt should do this for us anyway. The benefit of creating and +# applying patches in this way is that minor updates (esp. security fixes) to +# upstream packages might still allow these patches to apply successfully. +# 3) Automatically produce these patches inside a nix derivation. This is the +# approach taken here, using the "mkPatch" provided below. This has the +# benefit of easier review and should hopefully be simpler to update in the +# future. - src = (fetchzip { - url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51_src.zip"; - sha256 = "133l7xkvi67s6sfk8cfh7rmavbsf7ib5fyksk1ci6b6sch3z2sw9"; - }); +let + # Create a patch against src based on changes applied in patchCommands + mkPatch = { name, src, patchCommands }: runCommand "${name}-k2pdfopt.patch" { inherit src; } '' + source $stdenv/setup + unpackPhase - # Note: the v2.51a zip contains only files to be replaced in the v2.50 zip. - v251a_src = (fetchzip { - url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51a_src.zip"; - sha256 = "0vvwblii7kgdwfxw8dzk6jbmz4dv94d7rkv18i60y8wkayj6yhl6"; - }); + orig=$sourceRoot + new=$sourceRoot-modded + cp -r $orig/. $new/ - postUnpack = '' - cp -r ${v251a_src}/* $sourceRoot + pushd $new >/dev/null + ${patchCommands} + popd >/dev/null + + diff -Naur $orig $new > $out || true ''; - patches = [ ./k2pdfopt.patch ./k2pdfopt-mupdf-1.16.1.patch ]; + pname = "k2pdfopt"; + version = "2.53"; + k2pdfopt_src = fetchzip { + url = "http://www.willus.com/${pname}/src/${pname}_v${version}_src.zip"; + sha256 = "1fna8bg3pascjfc3hmc6xn0xi2yh7f1qp0d344mw9hqanbnykyy8"; + }; +in stdenv.mkDerivation rec { + inherit pname version; + src = k2pdfopt_src; + + patches = [ + ./0001-Fix-CMakeLists.patch + ]; + + postPatch = '' + substituteInPlace willuslib/bmpdjvu.c \ + --replace "" "" + ''; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = let - # The patches below were constructed by taking the files from k2pdfopt in - # the {mupdf,leptonica,tesseract}_mod/ directories, replacing the - # corresponding files in the respective source trees, resolving any errors - # with more recent versions of these depencencies, and running diff. - mupdf_modded = mupdf.overrideAttrs (attrs: { - patches = attrs.patches ++ [ ./mupdf.patch ]; # Last verified with mupdf 1.16.1 + # We use specific versions of these sources below to match the versions + # used in the k2pdfopt source. Note that this does _not_ need to match the + # version used elsewhere in nixpkgs, since it is only used to create the + # patch that can then be applied to the version in nixpkgs. + mupdf_patch = mkPatch { + name = "mupdf"; + src = fetchurl { + url = "https://mupdf.com/downloads/archive/mupdf-1.17.0-source.tar.gz"; + sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; + }; + patchCommands = '' + cp ${k2pdfopt_src}/mupdf_mod/{filter-basic,font,stext-device,string}.c ./source/fitz/ + cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/ + ''; + }; + mupdf_modded = mupdf.overrideAttrs ({ patches ? [], ... }: { + patches = patches ++ [ mupdf_patch ]; + # This function is missing in font.c, see font-win32.c + postPatch = '' + echo "void pdf_install_load_system_font_funcs(fz_context *ctx) {}" >> source/fitz/font.c + ''; }); - leptonica_modded = leptonica.overrideAttrs (attrs: { - patches = [ ./leptonica.patch ]; # Last verified with leptonica 1.78.0 + + leptonica_patch = mkPatch { + name = "leptonica"; + src = fetchurl { + url = "http://www.leptonica.org/source/leptonica-1.79.0.tar.gz"; + sha256 = "1n004gv1dj3pq1fcnfdclvvx5nang80336aa67nvs3nnqp4ncn84"; + }; + patchCommands = "cp -r ${k2pdfopt_src}/leptonica_mod/. ./src/"; + }; + leptonica_modded = leptonica.overrideAttrs ({ patches ? [], ... }: { + patches = patches ++ [ leptonica_patch ]; }); + + tesseract_patch = mkPatch { + name = "tesseract"; + src = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tesseract"; + rev = "4.1.1"; + sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn"; + }; + patchCommands = '' + cp ${k2pdfopt_src}/tesseract_mod/{baseapi,tesscapi,tesseract}.* src/api/ + cp ${k2pdfopt_src}/tesseract_mod/{tesscapi,tessedit,tesseract}.* src/ccmain/ + cp ${k2pdfopt_src}/tesseract_mod/dotproduct{avx,fma,sse}.* src/arch/ + cp ${k2pdfopt_src}/tesseract_mod/{intsimdmatrixsse,simddetect}.* src/arch/ + cp ${k2pdfopt_src}/tesseract_mod/{errcode,genericvector,mainblk,params,serialis,tessdatamanager,tess_version,tprintf,unicharset}.* src/ccutil/ + cp ${k2pdfopt_src}/tesseract_mod/{input,lstmrecognizer}.* src/lstm/ + cp ${k2pdfopt_src}/tesseract_mod/openclwrapper.* src/opencl/ + ''; + }; tesseract_modded = tesseract4.override { - tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: { - patches = [ ./tesseract.patch ]; # Last verified with tesseract 1.4 + tesseractBase = tesseract4.tesseractBase.overrideAttrs ({ patches ? [], ... }: { + patches = patches ++ [ tesseract_patch ]; + # Additional compilation fixes + postPatch = '' + echo libtesseract_api_la_SOURCES += tesscapi.cpp >> src/api/Makefile.am + substituteInPlace src/api/tesseract.h \ + --replace "#include " "//#include " + ''; }); }; in diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch deleted file mode 100644 index 3a9eca30e751..000000000000 --- a/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff --git a/willuslib/wmupdf.c b/willuslib/wmupdf.c -index 81627ef..f14a96c 100644 ---- a/willuslib/wmupdf.c -+++ b/willuslib/wmupdf.c -@@ -189,8 +189,6 @@ int wmupdf_remake_pdf(char *infile,char *outfile,WPDFPAGEINFO *pageinfo,int use_ - pdf_write_opts.do_compress=1; - pdf_write_opts.do_linear=0; - pdf_write_opts.do_garbage=1; /* 2 and 3 don't work for this. */ -- pdf_write_opts.continue_on_error=0; -- pdf_write_opts.errors=NULL; - write_failed=0; - wpdfpageinfo_sort(pageinfo); - xref=NULL; -@@ -1687,8 +1685,8 @@ WPDFOUTLINE *wpdfoutline_read_from_pdf_file(char *filename) - /* Sumatra version of MuPDF v1.4 -- use locally installed fonts */ - pdf_install_load_system_font_funcs(ctx); - fz_try(ctx) { doc=fz_open_document(ctx,filename); } -- fz_catch(ctx) -- { -+ fz_catch(ctx) -+ { - fz_drop_context(ctx); - return(NULL); - } -@@ -1890,5 +1888,5 @@ static pdf_obj *pdf_new_string_utf8(fz_context *ctx,char *string) - willus_mem_free((double **)&utfbuf,funcname); - return(pdfobj); - } -- -+ - #endif /* HAVE_MUPDF_LIB */ -diff --git a/willuslib/wmupdfinfo.c b/willuslib/wmupdfinfo.c -index 5c7f38c..9b9e6fd 100644 ---- a/willuslib/wmupdfinfo.c -+++ b/willuslib/wmupdfinfo.c -@@ -237,23 +237,22 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename) - pdf_obj *robj; - - robj=pdf_resolve_indirect(ctx,obj); -- n=pdf_sprint_obj(ctx,NULL,0,robj,1); -- buf=malloc(n+2); -+ buf=pdf_sprint_obj(ctx,NULL,0,&n,robj,1,0); - if (buf==NULL) - { - fz_write_printf(ctx,out,"Info object (%d %d R):\n",pdf_to_num(ctx,obj),pdf_to_gen(ctx,obj)); -- pdf_print_obj(ctx,out,robj,1); -+ pdf_print_obj(ctx,out,robj,1,0); - } - else - { -- pdf_sprint_obj(ctx,buf,n+2,robj,1); -+ pdf_sprint_obj(ctx,buf,n+2,&n,robj,1,0); - display_pdf_field(ctx,out,buf,"Title","TITLE"); - display_pdf_field(ctx,out,buf,"CreationDate","CREATED"); - display_pdf_field(ctx,out,buf,"ModDate","LAST MODIFIED"); - display_pdf_field(ctx,out,buf,"Producer","PDF PRODUCER"); - display_pdf_field(ctx,out,buf,"Creator","CREATOR"); - display_file_size(ctx,out,filename); -- free(buf); -+ fz_free(ctx,buf); - } - } - if (glo->dims==1) -@@ -275,7 +274,7 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename) - if (obj) - { - fz_write_printf(ctx,out, "\nEncryption object (%d %d R):\n", pdf_to_num(ctx,obj), pdf_to_gen(ctx,obj)); -- pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1); -+ pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1, 0); - } - } - -@@ -396,7 +395,7 @@ gatherdimensions(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ - if (j < glo->dims) - return; - -- glo->dim = fz_resize_array(ctx, glo->dim, glo->dims+1, sizeof(struct info)); -+ glo->dim = fz_realloc_array(ctx, glo->dim, glo->dims+1, struct info); - glo->dims++; - - glo->dim[glo->dims - 1].page = page; -@@ -441,7 +440,7 @@ gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj * - if (k < glo->fonts) - continue; - -- glo->font = fz_resize_array(ctx, glo->font, glo->fonts+1, sizeof(struct info)); -+ glo->font = fz_realloc_array(ctx, glo->font, glo->fonts+1, struct info); - glo->fonts++; - - glo->font[glo->fonts - 1].page = page; -@@ -510,7 +509,7 @@ gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj - if (k < glo->images) - continue; - -- glo->image = fz_resize_array(ctx, glo->image, glo->images+1, sizeof(struct info)); -+ glo->image = fz_realloc_array(ctx, glo->image, glo->images+1, struct info); - glo->images++; - - glo->image[glo->images - 1].page = page; -@@ -568,7 +567,7 @@ gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj * - if (k < glo->forms) - continue; - -- glo->form = fz_resize_array(ctx, glo->form, glo->forms+1, sizeof(struct info)); -+ glo->form = fz_realloc_array(ctx, glo->form, glo->forms+1, struct info); - glo->forms++; - - glo->form[glo->forms - 1].page = page; -@@ -613,7 +612,7 @@ gatherpsobjs(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj - if (k < glo->psobjs) - continue; - -- glo->psobj = fz_resize_array(ctx, glo->psobj, glo->psobjs+1, sizeof(struct info)); -+ glo->psobj = fz_realloc_array(ctx, glo->psobj, glo->psobjs+1, struct info); - glo->psobjs++; - - glo->psobj[glo->psobjs - 1].page = page; -@@ -656,7 +655,7 @@ gathershadings(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob - if (k < glo->shadings) - continue; - -- glo->shading = fz_resize_array(ctx, glo->shading, glo->shadings+1, sizeof(struct info)); -+ glo->shading = fz_realloc_array(ctx, glo->shading, glo->shadings+1, struct info); - glo->shadings++; - - glo->shading[glo->shadings - 1].page = page; -@@ -724,7 +723,7 @@ gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob - if (k < glo->patterns) - continue; - -- glo->pattern = fz_resize_array(ctx, glo->pattern, glo->patterns+1, sizeof(struct info)); -+ glo->pattern = fz_realloc_array(ctx, glo->pattern, glo->patterns+1, struct info); - glo->patterns++; - - glo->pattern[glo->patterns - 1].page = page; -@@ -1216,7 +1215,7 @@ void wmupdfinfo_get(char *filename,int *pagelist,char **buf) - if (fout==NULL) - return; - */ -- -+ - ctx = fz_new_context(NULL, NULL, FZ_STORE_UNLIMITED); - if (!ctx) - { -@@ -1307,5 +1306,5 @@ static void date_convert(char *dst,char *src) - else if (src[i]!='\0') - sprintf(&dst[strlen(dst)]," %s",&src[i]); - } -- -+ - #endif /* HAVE_MUPDF_LIB */ diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch deleted file mode 100644 index cf7e4896b803..000000000000 --- a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4a2378b..502c477 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,6 +52,7 @@ endif(JPEG_FOUND) - include(FindJasper) - if(JASPER_FOUND) - set(HAVE_JASPER_LIB 1) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY}) - endif(JASPER_FOUND) - - # paths from willuslib/wgs.c -@@ -66,8 +67,12 @@ else() - message(STATUS "Could NOT find ghostscript executable") - endif(GHOSTSCRIPT_EXECUTABLE) - --# willus.h --# HAVE_GSL_LIB -+pkg_check_modules(GSL gsl) -+if(GSL_FOUND) -+ set(HAVE_GSL_LIB 1) -+ include_directories(SYSTEM ${GSL_INCLUDEDIR}) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS}) -+endif(GSL_FOUND) - - - # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0) -@@ -80,7 +85,7 @@ if(MUPDF_FOUND) - include_directories(SYSTEM ${MUPDF_INCLUDEDIR}) - message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}") - set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} -- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype -+ - ) - endif(MUPDF_FOUND) - -@@ -91,9 +96,25 @@ if(DJVU_FOUND) - set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${DJVU_LDFLAGS}) - endif(DJVU_FOUND) - --# HAVE_GOCR_LIB --# HAVE_LEPTONICA_LIB --# HAVE_TESSERACT_LIB -+find_library(GOCR_LIB NAMES Pgm2asc) -+if(GOCR_LIB) -+ set(HAVE_GOCR_LIB 1) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GOCR_LIB}) -+endif(GOCR_LIB) -+ -+pkg_check_modules(LEPTONICA lept) -+if(LEPTONICA_FOUND) -+ set(HAVE_LEPTONICA_LIB 1) -+ include_directories(SYSTEM ${LEPTONICA_INCLUDEDIR}) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${LEPTONICA_LDFLAGS}) -+endif(LEPTONICA_FOUND) -+ -+pkg_check_modules(TESSERACT tesseract) -+if(TESSERACT_FOUND) -+ set(HAVE_TESSERACT_LIB 1) -+ include_directories(SYSTEM ${TESSERACT_INCLUDEDIR}) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${TESSERACT_LDFLAGS}) -+endif(TESSERACT_FOUND) - - # ---- Describe project - -diff --git a/willuslib/CMakeLists.txt b/willuslib/CMakeLists.txt -index 463bbc9..8043db5 100644 ---- a/willuslib/CMakeLists.txt -+++ b/willuslib/CMakeLists.txt -@@ -6,7 +6,7 @@ include_directories(..) - set(WILLUSLIB_SRC - ansi.c array.c bmp.c bmpdjvu.c bmpmupdf.c dtcompress.c filelist.c - fontdata.c fontrender.c gslpolyfit.c linux.c math.c mem.c ocr.c -- ocrjocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c -+ ocrgocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c - token.c wfile.c wgs.c wgui.c willusversion.c win.c winbmp.c - wincomdlg.c winmbox.c winshell.c wmupdf.c wmupdfinfo.c wpdf.c wsys.c - wzfile.c wleptonica.c -diff --git a/willuslib/ocrgocr.c b/willuslib/ocrgocr.c -index 6027e9a..fbe10f0 100644 ---- a/willuslib/ocrgocr.c -+++ b/willuslib/ocrgocr.c -@@ -29,6 +29,8 @@ - #ifdef HAVE_GOCR_LIB - #include - -+job_t *OCR_JOB; -+ - /* - ** bmp8 must be grayscale - ** (x1,y1) and (x2,y2) from top left of bitmap -@@ -63,6 +65,7 @@ void gocr_single_word_from_bmp8(char *text,int maxlen,WILLUSBITMAP *bmp8, - h=y2-y1+1; - dh=h+bw*2; - job=&_job; -+ OCR_JOB=job; - job_init(job); - job_init_image(job); - // willus_mem_alloc_warn((void **)&job->src.p.p,w*h,funcname,10); diff --git a/pkgs/applications/misc/k2pdfopt/leptonica.patch b/pkgs/applications/misc/k2pdfopt/leptonica.patch deleted file mode 100644 index dfab99fd0130..000000000000 --- a/pkgs/applications/misc/k2pdfopt/leptonica.patch +++ /dev/null @@ -1,254 +0,0 @@ -From 8c11a20925686855023df90ed477957c7d7fe91e Mon Sep 17 00:00:00 2001 -From: Daniel Fullmer -Date: Fri, 13 Sep 2019 15:54:21 -0400 -Subject: [PATCH] Willus mod for k2pdfopt - ---- - src/allheaders.h | 4 ++ - src/dewarp2.c | 106 ++++++++++++++++++++++++++++++++++++++++++----- - src/leptwin.c | 6 ++- - 3 files changed, 104 insertions(+), 12 deletions(-) - -diff --git a/src/allheaders.h b/src/allheaders.h -index e68eff1..b3cc729 100644 ---- a/src/allheaders.h -+++ b/src/allheaders.h -@@ -669,6 +669,10 @@ LEPT_DLL extern L_DEWARPA * dewarpaReadMem ( const l_uint8 *data, size_t size ); - LEPT_DLL extern l_ok dewarpaWrite ( const char *filename, L_DEWARPA *dewa ); - LEPT_DLL extern l_ok dewarpaWriteStream ( FILE *fp, L_DEWARPA *dewa ); - LEPT_DLL extern l_ok dewarpaWriteMem ( l_uint8 **pdata, size_t *psize, L_DEWARPA *dewa ); -+/* WILLUS MOD */ -+ LEPT_DLL extern l_int32 dewarpBuildPageModel_ex ( L_DEWARP *dew, const char *debugfile,l_int32 fit_order ); -+ LEPT_DLL extern l_int32 dewarpFindVertDisparity_ex ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag,l_int32 fit_order ); -+ LEPT_DLL extern l_int32 dewarpBuildLineModel_ex ( L_DEWARP *dew, l_int32 opensize, const char *debugfile,l_int32 fit_order ); - LEPT_DLL extern l_ok dewarpBuildPageModel ( L_DEWARP *dew, const char *debugfile ); - LEPT_DLL extern l_ok dewarpFindVertDisparity ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag ); - LEPT_DLL extern l_ok dewarpFindHorizDisparity ( L_DEWARP *dew, PTAA *ptaa ); -diff --git a/src/dewarp2.c b/src/dewarp2.c -index 220eec1..2e29500 100644 ---- a/src/dewarp2.c -+++ b/src/dewarp2.c -@@ -144,9 +144,17 @@ static const l_float32 L_ALLOWED_W_FRACT = 0.05; /* no bigger */ - * longest textlines. - * - */ -+/* WILLUS MOD */ - l_ok --dewarpBuildPageModel(L_DEWARP *dew, -- const char *debugfile) -+dewarpBuildPageModel(L_DEWARP *dew,const char *debugfile) -+{ -+return(dewarpBuildPageModel_ex(dew,debugfile,2)); -+} -+ -+l_ok -+dewarpBuildPageModel_ex(L_DEWARP *dew, -+ const char *debugfile, -+ l_int32 fit_order) - { - l_int32 linecount, topline, botline, ret; - PIX *pixs, *pix1, *pix2, *pix3; -@@ -225,7 +233,7 @@ PTAA *ptaa1, *ptaa2; - /* Get the sampled vertical disparity from the textline centers. - * The disparity array will push pixels vertically so that each - * textline is flat and centered at the y-position of the mid-point. */ -- if (dewarpFindVertDisparity(dew, ptaa2, 0) != 0) { -+ if (dewarpFindVertDisparity_ex(dew, ptaa2, 0, fit_order) != 0) { - L_WARNING("vertical disparity not built\n", procName); - ptaaDestroy(&ptaa2); - return 1; -@@ -290,13 +298,24 @@ PTAA *ptaa1, *ptaa2; - * a pdf. Non-pix debug output goes to /tmp. - * - */ -+/* WILLUS MOD */ - l_ok - dewarpFindVertDisparity(L_DEWARP *dew, - PTAA *ptaa, - l_int32 rotflag) - { -+return(dewarpFindVertDisparity_ex(dew,ptaa,rotflag,2)); -+} -+/* WILLUS MOD -- add cubic and quartic fits and ..._ex functions */ -+l_int32 -+dewarpFindVertDisparity_ex(L_DEWARP *dew, -+ PTAA *ptaa, -+ l_int32 rotflag, -+ l_int32 fit_order) -+{ - l_int32 i, j, nlines, npts, nx, ny, sampling; --l_float32 c0, c1, c2, x, y, midy, val, medval, meddev, minval, maxval; -+/* WILLUS MOD */ -+l_float32 c0, c1, c2, c3, c4, x, y, midy, val, medval, meddev, minval, maxval; - l_float32 *famidys; - NUMA *nax, *nafit, *nacurve0, *nacurve1, *nacurves; - NUMA *namidy, *namidys, *namidysi; -@@ -304,11 +323,22 @@ PIX *pix1, *pix2, *pixcirc, *pixdb; - PTA *pta, *ptad, *ptacirc; - PTAA *ptaa0, *ptaa1, *ptaa2, *ptaa3, *ptaa4, *ptaa5, *ptaat; - FPIX *fpix; -+/* WILLUS MOD */ -+l_int32 fit_order1,fit_order2; - - PROCNAME("dewarpFindVertDisparity"); - - if (!dew) - return ERROR_INT("dew not defined", procName, 1); -+/* WILLUS MOD */ -+ if (fit_order < 10) -+ fit_order1 = fit_order2 = fit_order; -+ else -+ { -+ fit_order1=fit_order % 10; -+ fit_order2=fit_order / 10; -+ fit_order2=fit_order2 % 10; -+ } - dew->vsuccess = 0; - if (!ptaa) - return ERROR_INT("ptaa not defined", procName, 1); -@@ -331,12 +361,32 @@ FPIX *fpix; - pixdb = (rotflag) ? pixRotateOrth(dew->pixs, 1) : pixClone(dew->pixs); - for (i = 0; i < nlines; i++) { /* for each line */ - pta = ptaaGetPta(ptaa, i, L_CLONE); -- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); -- numaAddNumber(nacurve0, c2); -+/* WILLUS MOD */ -+if (fit_order1>3) -+ { -+ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL); -+ numaAddNumber(nacurve0, c4); -+ } -+else if (fit_order1==3) -+ { -+ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL); -+ numaAddNumber(nacurve0, c3); -+ } -+else -+ { -+ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); -+ numaAddNumber(nacurve0, c2); -+ } - ptad = ptaCreate(nx); - for (j = 0; j < nx; j++) { /* uniformly sampled in x */ - x = j * sampling; -- applyQuadraticFit(c2, c1, c0, x, &y); -+/* WILLUS MOD */ -+if (fit_order1>3) -+ applyQuarticFit(c4, c3, c2, c1, c0, x, &y); -+else if (fit_order1==3) -+ applyCubicFit(c3, c2, c1, c0, x, &y); -+else -+ applyQuadraticFit(c2, c1, c0, x, &y); - ptaAddPt(ptad, x, y); - } - ptaaAddPta(ptaa0, ptad, L_INSERT); -@@ -350,7 +400,13 @@ FPIX *fpix; - for (i = 0; i < nlines; i++) { - pta = ptaaGetPta(ptaa, i, L_CLONE); - ptaGetArrays(pta, &nax, NULL); -- ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit); -+/* WILLUS MOD */ -+if (fit_order1>3) -+ptaGetQuarticLSF(pta, NULL, NULL, NULL, NULL, NULL, &nafit); -+else if (fit_order1==3) -+ptaGetCubicLSF(pta, NULL, NULL, NULL, NULL, &nafit); -+else -+ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit); - ptad = ptaCreateFromNuma(nax, nafit); - ptaaAddPta(ptaat, ptad, L_INSERT); - ptaDestroy(&pta); -@@ -494,11 +550,24 @@ FPIX *fpix; - ptaa5 = ptaaCreate(nx); /* uniformly sampled across full height of image */ - for (j = 0; j < nx; j++) { /* for each column */ - pta = ptaaGetPta(ptaa4, j, L_CLONE); -- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); -+/* WILLUS MOD */ -+/* Order higher than 2 can cause a little craziness here. */ -+if (fit_order2>3) -+ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL); -+else if (fit_order2==3) -+ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL); -+else -+ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); - ptad = ptaCreate(ny); - for (i = 0; i < ny; i++) { /* uniformly sampled in y */ - y = i * sampling; -- applyQuadraticFit(c2, c1, c0, y, &val); -+/* WILLUS MOD */ -+if (fit_order2>3) -+ applyQuarticFit(c4, c3, c2, c1, c0, y, &val); -+else if (fit_order2==3) -+ applyCubicFit(c3, c2, c1, c0, y, &val); -+else -+ applyQuadraticFit(c2, c1, c0, y, &val); - ptaAddPt(ptad, y, val); - } - ptaaAddPta(ptaa5, ptad, L_INSERT); -@@ -1602,11 +1671,21 @@ FPIX *fpix; - * See notes there. - * - */ -+/* WILLUS MOD */ - l_ok - dewarpBuildLineModel(L_DEWARP *dew, - l_int32 opensize, - const char *debugfile) - { -+return(dewarpBuildLineModel_ex(dew,opensize,debugfile,2)); -+} -+ -+l_int32 -+dewarpBuildLineModel_ex(L_DEWARP *dew, -+ l_int32 opensize, -+ const char *debugfile, -+ l_int32 fit_order) -+{ - char buf[64]; - l_int32 i, j, bx, by, ret, nlines; - BOXA *boxa; -@@ -1695,6 +1774,8 @@ PTAA *ptaa1, *ptaa2; - - /* Remove all lines that are not at least 0.75 times the length - * of the longest line. */ -+/* WILLUS MOD */ -+/* - ptaa2 = dewarpRemoveShortLines(pix, ptaa1, 0.75, DEBUG_SHORT_LINES); - if (debugfile) { - pix1 = pixConvertTo32(pix); -@@ -1704,6 +1785,8 @@ PTAA *ptaa1, *ptaa2; - pixDestroy(&pix1); - pixDestroy(&pix2); - } -+*/ -+ptaa2=ptaa1; - ptaaDestroy(&ptaa1); - nlines = ptaaGetCount(ptaa2); - if (nlines < dew->minlines) { -@@ -1717,7 +1800,8 @@ PTAA *ptaa1, *ptaa2; - * centers. The disparity array will push pixels vertically - * so that each line is flat and centered at the y-position - * of the mid-point. */ -- ret = dewarpFindVertDisparity(dew, ptaa2, 1 - i); -+/* WILLUS MOD */ -+ ret = dewarpFindVertDisparity_ex(dew, ptaa2, 1 - i, fit_order); - - /* If i == 0, move the result to the horizontal disparity, - * rotating it back by -90 degrees. */ -diff --git a/src/leptwin.c b/src/leptwin.c -index 72643a0..573d33e 100644 ---- a/src/leptwin.c -+++ b/src/leptwin.c -@@ -364,5 +364,9 @@ PIXCMAP *cmap; - - return hBitmap; - } -- -+#else -+/* willus mod: Avoid weird issue with OS/X library archiver when there are no symbols */ -+int leptwin_my_empty_func(void); -+int leptwin_my_empty_func(void) -+{return(0);} - #endif /* _WIN32 */ --- -2.22.0 - diff --git a/pkgs/applications/misc/k2pdfopt/mupdf.patch b/pkgs/applications/misc/k2pdfopt/mupdf.patch deleted file mode 100644 index 0c59a1d20163..000000000000 --- a/pkgs/applications/misc/k2pdfopt/mupdf.patch +++ /dev/null @@ -1,1060 +0,0 @@ -From d8927c969e3387ca2669a616c0ba53bce918a031 Mon Sep 17 00:00:00 2001 -From: Daniel Fullmer -Date: Fri, 13 Sep 2019 15:11:45 -0400 -Subject: [PATCH] Willus mod for k2pdfopt - ---- - source/fitz/filter-basic.c | 3 + - source/fitz/font-win32.c | 866 +++++++++++++++++++++++++++++++++++++ - source/fitz/font.c | 3 + - source/fitz/stext-device.c | 5 + - source/fitz/string.c | 5 + - source/pdf/pdf-annot.c | 14 +- - source/pdf/pdf-link.c | 3 + - source/pdf/pdf-parse.c | 5 + - source/pdf/pdf-xref.c | 9 + - 9 files changed, 912 insertions(+), 1 deletion(-) - create mode 100644 source/fitz/font-win32.c - -diff --git a/source/fitz/filter-basic.c b/source/fitz/filter-basic.c -index 0713a62e7..b8ef4d292 100644 ---- a/source/fitz/filter-basic.c -+++ b/source/fitz/filter-basic.c -@@ -259,7 +259,10 @@ look_for_endstream: - if (!state->warned) - { - state->warned = 1; -+/* willus mod -- no warning */ -+/* - fz_warn(ctx, "PDF stream Length incorrect"); -+*/ - } - return *stm->rp++; - } -diff --git a/source/fitz/font-win32.c b/source/fitz/font-win32.c -new file mode 100644 -index 000000000..45de8cfd3 ---- /dev/null -+++ b/source/fitz/font-win32.c -@@ -0,0 +1,866 @@ -+/* -+** Routines to access MS Windows system fonts. -+** From sumatra PDF distro. -+** Modified for MuPDF v1.9a by willus.com -+*/ -+#include "mupdf/pdf.h" -+ -+/* -+ Which fonts are embedded is based on a few preprocessor definitions. -+ -+ The base 14 fonts are always embedded. -+ For CJK font substitution we embed DroidSansFallback. -+ -+ Set NOCJK to skip all CJK support (this also omits embedding the CJK CMaps) -+ Set NOCJKFONT to skip the embedded CJK font. -+ Set NOCJKFULL to embed a smaller CJK font without CJK Extension A support. -+*/ -+ -+#ifdef NOCJK -+#define NOCJKFONT -+#endif -+ -+/* SumatraPDF: also load fonts included with Windows */ -+#ifdef _WIN32 -+ -+#ifndef UNICODE -+#define UNICODE -+#endif -+#ifndef _UNICODE -+#define _UNICODE -+#endif -+ -+#include -+ -+// TODO: Use more of FreeType for TTF parsing (for performance reasons, -+// the fonts can't be parsed completely, though) -+#include -+#include FT_TRUETYPE_IDS_H -+#include FT_TRUETYPE_TAGS_H -+ -+#define TTC_VERSION1 0x00010000 -+#define TTC_VERSION2 0x00020000 -+ -+#define MAX_FACENAME 128 -+ -+// Note: the font face must be the first field so that the structure -+// can be treated like a simple string for searching -+typedef struct pdf_fontmapMS_s -+{ -+ char fontface[MAX_FACENAME]; -+ char fontpath[MAX_PATH]; -+ int index; -+} pdf_fontmapMS; -+ -+typedef struct pdf_fontlistMS_s -+{ -+ pdf_fontmapMS *fontmap; -+ int len; -+ int cap; -+} pdf_fontlistMS; -+ -+typedef struct _tagTT_OFFSET_TABLE -+{ -+ ULONG uVersion; -+ USHORT uNumOfTables; -+ USHORT uSearchRange; -+ USHORT uEntrySelector; -+ USHORT uRangeShift; -+} TT_OFFSET_TABLE; -+ -+typedef struct _tagTT_TABLE_DIRECTORY -+{ -+ ULONG uTag; //table name -+ ULONG uCheckSum; //Check sum -+ ULONG uOffset; //Offset from beginning of file -+ ULONG uLength; //length of the table in bytes -+} TT_TABLE_DIRECTORY; -+ -+typedef struct _tagTT_NAME_TABLE_HEADER -+{ -+ USHORT uFSelector; //format selector. Always 0 -+ USHORT uNRCount; //Name Records count -+ USHORT uStorageOffset; //Offset for strings storage, from start of the table -+} TT_NAME_TABLE_HEADER; -+ -+typedef struct _tagTT_NAME_RECORD -+{ -+ USHORT uPlatformID; -+ USHORT uEncodingID; -+ USHORT uLanguageID; -+ USHORT uNameID; -+ USHORT uStringLength; -+ USHORT uStringOffset; //from start of storage area -+} TT_NAME_RECORD; -+ -+typedef struct _tagFONT_COLLECTION -+{ -+ ULONG Tag; -+ ULONG Version; -+ ULONG NumFonts; -+} FONT_COLLECTION; -+ -+static struct { -+ char *name; -+ char *pattern; -+} baseSubstitutes[] = { -+ { "Courier", "CourierNewPSMT" }, -+ { "Courier-Bold", "CourierNewPS-BoldMT" }, -+ { "Courier-Oblique", "CourierNewPS-ItalicMT" }, -+ { "Courier-BoldOblique", "CourierNewPS-BoldItalicMT" }, -+ { "Helvetica", "ArialMT" }, -+ { "Helvetica-Bold", "Arial-BoldMT" }, -+ { "Helvetica-Oblique", "Arial-ItalicMT" }, -+ { "Helvetica-BoldOblique", "Arial-BoldItalicMT" }, -+ { "Times-Roman", "TimesNewRomanPSMT" }, -+ { "Times-Bold", "TimesNewRomanPS-BoldMT" }, -+ { "Times-Italic", "TimesNewRomanPS-ItalicMT" }, -+ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT" }, -+ { "Symbol", "SymbolMT" }, -+}; -+static const char *base_font_names[][10] = -+{ -+ { "Courier", "CourierNew", "CourierNewPSMT", NULL }, -+ { "Courier-Bold", "CourierNew,Bold", "Courier,Bold", -+ "CourierNewPS-BoldMT", "CourierNew-Bold", NULL }, -+ { "Courier-Oblique", "CourierNew,Italic", "Courier,Italic", -+ "CourierNewPS-ItalicMT", "CourierNew-Italic", NULL }, -+ { "Courier-BoldOblique", "CourierNew,BoldItalic", "Courier,BoldItalic", -+ "CourierNewPS-BoldItalicMT", "CourierNew-BoldItalic", NULL }, -+ { "Helvetica", "ArialMT", "Arial", NULL }, -+ { "Helvetica-Bold", "Arial-BoldMT", "Arial,Bold", "Arial-Bold", -+ "Helvetica,Bold", NULL }, -+ { "Helvetica-Oblique", "Arial-ItalicMT", "Arial,Italic", "Arial-Italic", -+ "Helvetica,Italic", "Helvetica-Italic", NULL }, -+ { "Helvetica-BoldOblique", "Arial-BoldItalicMT", -+ "Arial,BoldItalic", "Arial-BoldItalic", -+ "Helvetica,BoldItalic", "Helvetica-BoldItalic", NULL }, -+ { "Times-Roman", "TimesNewRomanPSMT", "TimesNewRoman", -+ "TimesNewRomanPS", NULL }, -+ { "Times-Bold", "TimesNewRomanPS-BoldMT", "TimesNewRoman,Bold", -+ "TimesNewRomanPS-Bold", "TimesNewRoman-Bold", NULL }, -+ { "Times-Italic", "TimesNewRomanPS-ItalicMT", "TimesNewRoman,Italic", -+ "TimesNewRomanPS-Italic", "TimesNewRoman-Italic", NULL }, -+ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT", -+ "TimesNewRoman,BoldItalic", "TimesNewRomanPS-BoldItalic", -+ "TimesNewRoman-BoldItalic", NULL }, -+ { "Symbol", "Symbol,Italic", "Symbol,Bold", "Symbol,BoldItalic", -+ "SymbolMT", "SymbolMT,Italic", "SymbolMT,Bold", "SymbolMT,BoldItalic", NULL }, -+ { "ZapfDingbats", NULL } -+}; -+ -+static pdf_fontlistMS fontlistMS = -+{ -+ NULL, -+ 0, -+ 0, -+}; -+static int strcmp_ignore_space(const char *a, const char *b); -+static const char *clean_font_name(const char *fontname); -+static const char *pdf_clean_base14_name(const char *fontname); -+ -+static inline USHORT BEtoHs(USHORT x) -+{ -+ BYTE *data = (BYTE *)&x; -+ return (data[0] << 8) | data[1]; -+} -+ -+static inline ULONG BEtoHl(ULONG x) -+{ -+ BYTE *data = (BYTE *)&x; -+ return (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3]; -+} -+ -+static int strcmp_ignore_space(const char *a, const char *b) -+{ -+ while (1) -+ { -+ while (*a == ' ') -+ a++; -+ while (*b == ' ') -+ b++; -+ if (*a != *b) -+ return 1; -+ if (*a == 0) -+ return *a != *b; -+ if (*b == 0) -+ return *a != *b; -+ a++; -+ b++; -+ } -+} -+ -+/* A little bit more sophisticated name matching so that e.g. "EurostileExtended" -+ matches "EurostileExtended-Roman" or "Tahoma-Bold,Bold" matches "Tahoma-Bold" */ -+static int -+lookup_compare(const void *elem1, const void *elem2) -+{ -+ const char *val1 = elem1; -+ const char *val2 = elem2; -+ int len1 = strlen(val1); -+ int len2 = strlen(val2); -+ -+ if (len1 != len2) -+ { -+ const char *rest = len1 > len2 ? val1 + len2 : val2 + len1; -+ if (',' == *rest || !_stricmp(rest, "-roman")) -+ return _strnicmp(val1, val2, fz_mini(len1, len2)); -+ } -+ -+ return _stricmp(val1, val2); -+} -+ -+static void -+remove_spaces(char *srcDest) -+{ -+ char *dest; -+ -+ for (dest = srcDest; *srcDest; srcDest++) -+ if (*srcDest != ' ') -+ *dest++ = *srcDest; -+ *dest = '\0'; -+} -+ -+static int -+str_ends_with(const char *str, const char *end) -+{ -+ size_t len1 = strlen(str); -+ size_t len2 = strlen(end); -+ -+ return len1 >= len2 && !strcmp(str + len1 - len2, end); -+} -+ -+static pdf_fontmapMS * -+pdf_find_windows_font_path(const char *fontname) -+{ -+ return bsearch(fontname, fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), lookup_compare); -+} -+ -+/* source and dest can be same */ -+static void -+decode_unicode_BE(fz_context *ctx, char *source, int sourcelen, char *dest, int destlen) -+{ -+ WCHAR *tmp; -+ int converted, i; -+ -+ if (sourcelen % 2 != 0) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string"); -+ -+ tmp = fz_malloc_array(ctx, sourcelen / 2 + 1, sizeof(WCHAR)); -+ for (i = 0; i < sourcelen / 2; i++) -+ tmp[i] = BEtoHs(((WCHAR *)source)[i]); -+ tmp[sourcelen / 2] = '\0'; -+ -+ converted = WideCharToMultiByte(CP_UTF8, 0, tmp, -1, dest, destlen, NULL, NULL); -+ fz_free(ctx, tmp); -+ if (!converted) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string"); -+} -+ -+static void -+decode_platform_string(fz_context *ctx, int platform, int enctype, char *source, int sourcelen, char *dest, int destlen) -+{ -+ switch (platform) -+ { -+ case TT_PLATFORM_APPLE_UNICODE: -+ switch (enctype) -+ { -+ case TT_APPLE_ID_DEFAULT: -+ case TT_APPLE_ID_UNICODE_2_0: -+ decode_unicode_BE(ctx, source, sourcelen, dest, destlen); -+ return; -+ } -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); -+ case TT_PLATFORM_MACINTOSH: -+ switch (enctype) -+ { -+ case TT_MAC_ID_ROMAN: -+ if (sourcelen + 1 > destlen) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : overlong fontname: %s", source); -+ // TODO: Convert to UTF-8 from what encoding? -+ memcpy(dest, source, sourcelen); -+ dest[sourcelen] = 0; -+ return; -+ } -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); -+ case TT_PLATFORM_MICROSOFT: -+ switch (enctype) -+ { -+ case TT_MS_ID_SYMBOL_CS: -+ case TT_MS_ID_UNICODE_CS: -+ case TT_MS_ID_UCS_4: -+ decode_unicode_BE(ctx, source, sourcelen, dest, destlen); -+ return; -+ } -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); -+ default: -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); -+ } -+} -+ -+static void -+grow_system_font_list(fz_context *ctx, pdf_fontlistMS *fl) -+{ -+ int newcap; -+ pdf_fontmapMS *newitems; -+ -+ if (fl->cap == 0) -+ newcap = 1024; -+ else -+ newcap = fl->cap * 2; -+ -+ // use realloc/free for the fontmap, since the list can -+ // remain in memory even with all fz_contexts destroyed -+ newitems = realloc(fl->fontmap, newcap * sizeof(pdf_fontmapMS)); -+ if (!newitems) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "OOM in grow_system_font_list"); -+ memset(newitems + fl->cap, 0, sizeof(pdf_fontmapMS) * (newcap - fl->cap)); -+ -+ fl->fontmap = newitems; -+ fl->cap = newcap; -+} -+ -+static void -+append_mapping(fz_context *ctx, pdf_fontlistMS *fl, const char *facename, const char *path, int index) -+{ -+ if (fl->len == fl->cap) -+ grow_system_font_list(ctx, fl); -+ -+ if (fl->len >= fl->cap) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : fontlist overflow"); -+ -+ fz_strlcpy(fl->fontmap[fl->len].fontface, facename, sizeof(fl->fontmap[0].fontface)); -+ fz_strlcpy(fl->fontmap[fl->len].fontpath, path, sizeof(fl->fontmap[0].fontpath)); -+ fl->fontmap[fl->len].index = index; -+ -+ ++fl->len; -+} -+ -+static void -+safe_read(fz_context *ctx, fz_stream *file, int offset, char *buf, int size) -+{ -+ int n; -+ fz_seek(ctx, file, offset, 0); -+ n = fz_read(ctx, file, (unsigned char *)buf, size); -+ if (n != size) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "safe_read: read %d, expected %d", n, size); -+} -+ -+static void -+read_ttf_string(fz_context *ctx, fz_stream *file, int offset, TT_NAME_RECORD *ttRecordBE, char *buf, int size) -+{ -+ char szTemp[MAX_FACENAME * 2]; -+ // ignore empty and overlong strings -+ int stringLength = BEtoHs(ttRecordBE->uStringLength); -+ if (stringLength == 0 || stringLength >= sizeof(szTemp)) -+ return; -+ -+ safe_read(ctx, file, offset + BEtoHs(ttRecordBE->uStringOffset), szTemp, stringLength); -+ decode_platform_string(ctx, BEtoHs(ttRecordBE->uPlatformID), -+ BEtoHs(ttRecordBE->uEncodingID), szTemp, stringLength, buf, size); -+} -+ -+static void -+makeFakePSName(char szName[MAX_FACENAME], const char *szStyle) -+{ -+ // append the font's subfamily, unless it's a Regular font -+ if (*szStyle && _stricmp(szStyle, "Regular") != 0) -+ { -+ fz_strlcat(szName, "-", MAX_FACENAME); -+ fz_strlcat(szName, szStyle, MAX_FACENAME); -+ } -+ remove_spaces(szName); -+} -+ -+static void -+parseTTF(fz_context *ctx, fz_stream *file, int offset, int index, const char *path) -+{ -+ TT_OFFSET_TABLE ttOffsetTableBE; -+ TT_TABLE_DIRECTORY tblDirBE; -+ TT_NAME_TABLE_HEADER ttNTHeaderBE; -+ TT_NAME_RECORD ttRecordBE; -+ -+ char szPSName[MAX_FACENAME] = { 0 }; -+ char szTTName[MAX_FACENAME] = { 0 }; -+ char szStyle[MAX_FACENAME] = { 0 }; -+ char szCJKName[MAX_FACENAME] = { 0 }; -+ int i, count, tblOffset; -+ -+ safe_read(ctx, file, offset, (char *)&ttOffsetTableBE, sizeof(TT_OFFSET_TABLE)); -+ -+ // check if this is a TrueType font of version 1.0 or an OpenType font -+ if (BEtoHl(ttOffsetTableBE.uVersion) != TTC_VERSION1 && -+ BEtoHl(ttOffsetTableBE.uVersion) != TTAG_OTTO) -+ { -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid font version %x", (unsigned int)BEtoHl(ttOffsetTableBE.uVersion)); -+ } -+ -+ // determine the name table's offset by iterating through the offset table -+ count = BEtoHs(ttOffsetTableBE.uNumOfTables); -+ for (i = 0; i < count; i++) -+ { -+ int entryOffset = offset + sizeof(TT_OFFSET_TABLE) + i * sizeof(TT_TABLE_DIRECTORY); -+ safe_read(ctx, file, entryOffset, (char *)&tblDirBE, sizeof(TT_TABLE_DIRECTORY)); -+ if (!BEtoHl(tblDirBE.uTag) || BEtoHl(tblDirBE.uTag) == TTAG_name) -+ break; -+ } -+ if (count == i || !BEtoHl(tblDirBE.uTag)) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : nameless font"); -+ tblOffset = BEtoHl(tblDirBE.uOffset); -+ -+ // read the 'name' table for record count and offsets -+ safe_read(ctx, file, tblOffset, (char *)&ttNTHeaderBE, sizeof(TT_NAME_TABLE_HEADER)); -+ offset = tblOffset + sizeof(TT_NAME_TABLE_HEADER); -+ tblOffset += BEtoHs(ttNTHeaderBE.uStorageOffset); -+ -+ // read through the strings for PostScript name and font family -+ count = BEtoHs(ttNTHeaderBE.uNRCount); -+ for (i = 0; i < count; i++) -+ { -+ short langId, nameId; -+ BOOL isCJKName; -+ -+ safe_read(ctx, file, offset + i * sizeof(TT_NAME_RECORD), (char *)&ttRecordBE, sizeof(TT_NAME_RECORD)); -+ -+ langId = BEtoHs(ttRecordBE.uLanguageID); -+ nameId = BEtoHs(ttRecordBE.uNameID); -+ isCJKName = TT_NAME_ID_FONT_FAMILY == nameId && LANG_CHINESE == PRIMARYLANGID(langId); -+ -+ // ignore non-English strings (except for Chinese font names) -+ if (langId && langId != TT_MS_LANGID_ENGLISH_UNITED_STATES && !isCJKName) -+ continue; -+ // ignore names other than font (sub)family and PostScript name -+ fz_try(ctx) -+ { -+ if (isCJKName) -+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szCJKName, sizeof(szCJKName)); -+ else if (TT_NAME_ID_FONT_FAMILY == nameId) -+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szTTName, sizeof(szTTName)); -+ else if (TT_NAME_ID_FONT_SUBFAMILY == nameId) -+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szStyle, sizeof(szStyle)); -+ else if (TT_NAME_ID_PS_NAME == nameId) -+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szPSName, sizeof(szPSName)); -+ } -+ fz_catch(ctx) -+ { -+ fz_warn(ctx, "ignoring face name decoding fonterror"); -+ } -+ } -+ -+ // try to prevent non-Arial fonts from accidentally substituting Arial -+ if (!strcmp(szPSName, "ArialMT")) -+ { -+ // cf. https://code.google.com/p/sumatrapdf/issues/detail?id=2471 -+ if (strcmp(szTTName, "Arial") != 0) -+ szPSName[0] = '\0'; -+ // TODO: is there a better way to distinguish Arial Caps from Arial proper? -+ // cf. http://code.google.com/p/sumatrapdf/issues/detail?id=1290 -+ else if (strstr(path, "caps") || strstr(path, "Caps")) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "ignore %s, as it can't be distinguished from Arial,Regular", path); -+ } -+ -+ if (szPSName[0]) -+ append_mapping(ctx, &fontlistMS, szPSName, path, index); -+ if (szTTName[0]) -+ { -+ // derive a PostScript-like name and add it, if it's different from the font's -+ // included PostScript name; cf. http://code.google.com/p/sumatrapdf/issues/detail?id=376 -+ makeFakePSName(szTTName, szStyle); -+ // compare the two names before adding this one -+ if (lookup_compare(szTTName, szPSName)) -+ append_mapping(ctx, &fontlistMS, szTTName, path, index); -+ } -+ if (szCJKName[0]) -+ { -+ makeFakePSName(szCJKName, szStyle); -+ if (lookup_compare(szCJKName, szPSName) && lookup_compare(szCJKName, szTTName)) -+ append_mapping(ctx, &fontlistMS, szCJKName, path, index); -+ } -+} -+ -+static void -+parseTTFs(fz_context *ctx, const char *path) -+{ -+ fz_stream *file = fz_open_file(ctx, path); -+ /* "fonterror : %s not found", path */ -+ fz_try(ctx) -+ { -+ parseTTF(ctx, file, 0, 0, path); -+ } -+ fz_always(ctx) -+ { -+ fz_drop_stream(ctx,file); -+ } -+ fz_catch(ctx) -+ { -+ fz_rethrow(ctx); -+ } -+} -+ -+static void -+parseTTCs(fz_context *ctx, const char *path) -+{ -+ FONT_COLLECTION fontcollectionBE; -+ ULONG i, numFonts, *offsettableBE = NULL; -+ -+ fz_stream *file = fz_open_file(ctx, path); -+ /* "fonterror : %s not found", path */ -+ -+ fz_var(offsettableBE); -+ -+ fz_try(ctx) -+ { -+ safe_read(ctx, file, 0, (char *)&fontcollectionBE, sizeof(FONT_COLLECTION)); -+ if (BEtoHl(fontcollectionBE.Tag) != TTAG_ttcf) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : wrong format %x", (unsigned int)BEtoHl(fontcollectionBE.Tag)); -+ if (BEtoHl(fontcollectionBE.Version) != TTC_VERSION1 && -+ BEtoHl(fontcollectionBE.Version) != TTC_VERSION2) -+ { -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid version %x", (unsigned int)BEtoHl(fontcollectionBE.Version)); -+ } -+ -+ numFonts = BEtoHl(fontcollectionBE.NumFonts); -+ offsettableBE = fz_malloc_array(ctx, numFonts, sizeof(ULONG)); -+ -+ safe_read(ctx, file, sizeof(FONT_COLLECTION), (char *)offsettableBE, numFonts * sizeof(ULONG)); -+ for (i = 0; i < numFonts; i++) -+ parseTTF(ctx, file, BEtoHl(offsettableBE[i]), i, path); -+ } -+ fz_always(ctx) -+ { -+ fz_free(ctx, offsettableBE); -+ fz_drop_stream(ctx,file); -+ } -+ fz_catch(ctx) -+ { -+ fz_rethrow(ctx); -+ } -+} -+ -+static void -+extend_system_font_list(fz_context *ctx, const WCHAR *path) -+{ -+ WCHAR szPath[MAX_PATH], *lpFileName; -+ WIN32_FIND_DATA FileData; -+ HANDLE hList; -+ -+ GetFullPathName(path, nelem(szPath), szPath, &lpFileName); -+ -+ hList = FindFirstFile(szPath, &FileData); -+ if (hList == INVALID_HANDLE_VALUE) -+ { -+ // Don't complain about missing directories -+ if (GetLastError() == ERROR_FILE_NOT_FOUND) -+ return; -+ fz_throw(ctx, FZ_ERROR_GENERIC, "extend_system_font_list: unknown error %d", (int)GetLastError()); -+ } -+ do -+ { -+ if (!(FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) -+ { -+ char szPathUtf8[MAX_PATH], *fileExt; -+ int res; -+ lstrcpyn(lpFileName, FileData.cFileName, szPath + MAX_PATH - lpFileName); -+ res = WideCharToMultiByte(CP_UTF8, 0, szPath, -1, szPathUtf8, sizeof(szPathUtf8), NULL, NULL); -+ if (!res) -+ { -+ fz_warn(ctx, "WideCharToMultiByte failed for %S", szPath); -+ continue; -+ } -+ fileExt = szPathUtf8 + strlen(szPathUtf8) - 4; -+ fz_try(ctx) -+ { -+ if (!_stricmp(fileExt, ".ttc")) -+ parseTTCs(ctx, szPathUtf8); -+ else if (!_stricmp(fileExt, ".ttf") || !_stricmp(fileExt, ".otf")) -+ parseTTFs(ctx, szPathUtf8); -+ } -+ fz_catch(ctx) -+ { -+ // ignore errors occurring while parsing a given font file -+ } -+ } -+ } while (FindNextFile(hList, &FileData)); -+ FindClose(hList); -+} -+ -+static void -+destroy_system_font_list(void) -+{ -+ free(fontlistMS.fontmap); -+ memset(&fontlistMS, 0, sizeof(fontlistMS)); -+} -+ -+static void -+create_system_font_list(fz_context *ctx) -+{ -+ WCHAR szFontDir[MAX_PATH]; -+ UINT cch; -+ -+ cch = GetWindowsDirectory(szFontDir, nelem(szFontDir) - 12); -+ if (0 < cch && cch < nelem(szFontDir) - 12) -+ { -+ /* willus.com edit--Win XP default MSVCRT.DLL doesn't have wcscat_s */ -+#ifdef _WIN64 -+ wcscat_s(szFontDir, MAX_PATH, L"\\Fonts\\*.?t?"); -+#else -+ wcscat(szFontDir,L"\\Fonts\\*.?t?"); -+#endif -+ extend_system_font_list(ctx, szFontDir); -+ } -+ -+ if (fontlistMS.len == 0) -+ fz_warn(ctx, "couldn't find any usable system fonts"); -+ -+#ifdef NOCJKFONT -+ { -+ // If no CJK fallback font is builtin but one has been shipped separately (in the same -+ // directory as the main executable), add it to the list of loadable system fonts -+ WCHAR szFile[MAX_PATH], *lpFileName; -+ GetModuleFileName(0, szFontDir, MAX_PATH); -+ GetFullPathName(szFontDir, MAX_PATH, szFile, &lpFileName); -+ lstrcpyn(lpFileName, L"DroidSansFallback.ttf", szFile + MAX_PATH - lpFileName); -+ extend_system_font_list(ctx, szFile); -+ } -+#endif -+ -+ // sort the font list, so that it can be searched binarily -+ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp); -+ -+#ifdef DEBUG -+ // allow to overwrite system fonts for debugging purposes -+ // (either pass a full path or a search pattern such as "fonts\*.ttf") -+ cch = GetEnvironmentVariable(L"MUPDF_FONTS_PATTERN", szFontDir, nelem(szFontDir)); -+ if (0 < cch && cch < nelem(szFontDir)) -+ { -+ int i, prev_len = fontlistMS.len; -+ extend_system_font_list(ctx, szFontDir); -+ for (i = prev_len; i < fontlistMS.len; i++) -+ { -+ pdf_fontmapMS *entry = bsearch(fontlistMS.fontmap[i].fontface, fontlistMS.fontmap, prev_len, sizeof(pdf_fontmapMS), lookup_compare); -+ if (entry) -+ *entry = fontlistMS.fontmap[i]; -+ } -+ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp); -+ } -+#endif -+ -+ // make sure to clean up after ourselves -+ atexit(destroy_system_font_list); -+} -+ -+static fz_font * -+pdf_load_windows_font_by_name(fz_context *ctx, const char *orig_name) -+{ -+ pdf_fontmapMS *found = NULL; -+ char *comma, *fontname; -+ fz_font *font; -+ -+ /* WILLUS MOD--not multi-threaded for k2pdfopt */ -+ /* fz_synchronize_begin(); */ -+ if (fontlistMS.len == 0) -+ { -+ fz_try(ctx) -+ { -+ create_system_font_list(ctx); -+ } -+ fz_catch(ctx) { } -+ } -+ /* WILLUS MOD--not multi-threaded for k2pdfopt */ -+ /* fz_synchronize_end(); */ -+ if (fontlistMS.len == 0) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror: couldn't find any fonts"); -+ -+ // work on a normalized copy of the font name -+ fontname = fz_strdup(ctx, orig_name); -+ remove_spaces(fontname); -+ -+ // first, try to find the exact font name (including appended style information) -+ comma = strchr(fontname, ','); -+ if (comma) -+ { -+ *comma = '-'; -+ found = pdf_find_windows_font_path(fontname); -+ *comma = ','; -+ } -+ // second, substitute the font name with a known PostScript name -+ else -+ { -+ int i; -+ for (i = 0; i < nelem(baseSubstitutes) && !found; i++) -+ if (!strcmp(fontname, baseSubstitutes[i].name)) -+ found = pdf_find_windows_font_path(baseSubstitutes[i].pattern); -+ } -+ // third, search for the font name without additional style information -+ if (!found) -+ found = pdf_find_windows_font_path(fontname); -+ // fourth, try to separate style from basename for prestyled fonts (e.g. "ArialBold") -+ if (!found && !comma && (str_ends_with(fontname, "Bold") || str_ends_with(fontname, "Italic"))) -+ { -+ int styleLen = str_ends_with(fontname, "Bold") ? 4 : str_ends_with(fontname, "BoldItalic") ? 10 : 6; -+ fontname = fz_resize_array(ctx, fontname, strlen(fontname) + 2, sizeof(char)); -+ comma = fontname + strlen(fontname) - styleLen; -+ memmove(comma + 1, comma, styleLen + 1); -+ *comma = '-'; -+ found = pdf_find_windows_font_path(fontname); -+ *comma = ','; -+ if (!found) -+ found = pdf_find_windows_font_path(fontname); -+ } -+ // fifth, try to convert the font name from the common Chinese codepage 936 -+ if (!found && fontname[0] < 0) -+ { -+ WCHAR cjkNameW[MAX_FACENAME]; -+ char cjkName[MAX_FACENAME]; -+ if (MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, fontname, -1, cjkNameW, nelem(cjkNameW)) && -+ WideCharToMultiByte(CP_UTF8, 0, cjkNameW, -1, cjkName, nelem(cjkName), NULL, NULL)) -+ { -+ comma = strchr(cjkName, ','); -+ if (comma) -+ { -+ *comma = '-'; -+ found = pdf_find_windows_font_path(cjkName); -+ *comma = ','; -+ } -+ if (!found) -+ found = pdf_find_windows_font_path(cjkName); -+ } -+ } -+ -+ fz_free(ctx, fontname); -+ if (!found) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "couldn't find system font '%s'", orig_name); -+ -+ /* -+ fz_warn(ctx, "loading non-embedded font '%s' from '%s'", orig_name, found->fontpath); -+ */ -+ -+ font = fz_new_font_from_file(ctx, orig_name, found->fontpath, found->index, -+ strcmp(found->fontface, "DroidSansFallback") != 0); -+ /* willus mod for MuPDF v1.10, 10-21-2016 */ -+ { -+ fz_font_flags_t *flags; -+ flags=fz_font_flags(font); -+ if (flags!=NULL) -+ flags->ft_substitute = 1; -+ } -+ return font; -+} -+ -+static fz_font * -+pdf_load_windows_font(fz_context *ctx, const char *fontname, int bold, int italic, int needs_exact_metrics) -+{ -+ if (needs_exact_metrics) -+ { -+ const char *clean_name; -+ /* WILLUS: Declare pdf_clean_base14_name() */ -+ extern const char *pdf_clean_base14_name(const char *fontname); -+ -+ /* TODO: the metrics for Times-Roman and Courier don't match -+ those of Windows' Times New Roman and Courier New; for -+ some reason, Poppler doesn't seem to have this problem */ -+ int len; -+ if (fz_lookup_builtin_font(ctx,fontname, bold, italic, &len)) -+ return NULL; -+ -+ /* cf. http://code.google.com/p/sumatrapdf/issues/detail?id=2173 */ -+ clean_name = pdf_clean_base14_name(fontname); -+ if (clean_name != fontname && !strncmp(clean_name, "Times-", 6)) -+ return NULL; -+ } -+ -+ // TODO: unset font->ft_substitute for base14/needs_exact_metrics? -+ return pdf_load_windows_font_by_name(ctx, fontname); -+} -+ -+static const char *clean_font_name(const char *fontname) -+{ -+ int i, k; -+ for (i = 0; i < nelem(base_font_names); i++) -+ for (k = 0; base_font_names[i][k]; k++) -+ if (!strcmp_ignore_space(base_font_names[i][k], fontname)) -+ return base_font_names[i][0]; -+ return fontname; -+} -+ -+ -+/* SumatraPDF: expose clean_font_name */ -+static const char * pdf_clean_base14_name(const char *fontname) -+{ -+ return clean_font_name(fontname); -+} -+ -+static fz_font * -+pdf_load_windows_cjk_font(fz_context *ctx, const char *fontname, int ros, int serif) -+{ -+ fz_font *font; -+ -+ font=NULL; /* WILLUS: Avoid compiler warning */ -+ /* try to find a matching system font before falling back to an approximate one */ -+ fz_try(ctx) -+ { -+ font = pdf_load_windows_font_by_name(ctx, fontname); -+ } -+ fz_catch(ctx) -+ { -+ font = NULL; -+ } -+ if (font) -+ return font; -+ -+ /* try to fall back to a reasonable system font */ -+ fz_try(ctx) -+ { -+ if (serif) -+ { -+ switch (ros) -+ { -+ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "MingLiU"); break; -+ case FZ_ADOBE_GB: font = pdf_load_windows_font_by_name(ctx, "SimSun"); break; -+ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Mincho"); break; -+ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Batang"); break; -+ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid serif ros"); -+ } -+ } -+ else -+ { -+ switch (ros) -+ { -+ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "DFKaiShu-SB-Estd-BF"); break; -+ case FZ_ADOBE_GB: -+ fz_try(ctx) -+ { -+ font = pdf_load_windows_font_by_name(ctx, "KaiTi"); -+ } -+ fz_catch(ctx) -+ { -+ font = pdf_load_windows_font_by_name(ctx, "KaiTi_GB2312"); -+ } -+ break; -+ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Gothic"); break; -+ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Gulim"); break; -+ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid sans-serif ros"); -+ } -+ } -+ } -+ fz_catch(ctx) -+ { -+#ifdef NOCJKFONT -+ /* If no CJK fallback font is builtin, maybe one has been shipped separately */ -+ font = pdf_load_windows_font_by_name(ctx, "DroidSansFallback"); -+#else -+ fz_rethrow(ctx); -+#endif -+ } -+ -+ return font; -+} -+ -+#endif -+ -+void pdf_install_load_system_font_funcs(fz_context *ctx) -+{ -+#ifdef _WIN32 -+ fz_install_load_system_font_funcs(ctx, pdf_load_windows_font, pdf_load_windows_cjk_font, NULL); -+#endif -+} -diff --git a/source/fitz/font.c b/source/fitz/font.c -index 00c6e8f99..1448b4a56 100644 ---- a/source/fitz/font.c -+++ b/source/fitz/font.c -@@ -4,8 +4,11 @@ - #include "draw-imp.h" - - #include -+/* willus mod -- remove hb includes */ -+/* - #include "hb.h" - #include "hb-ft.h" -+*/ - - #include - -diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c -index 2df90305e..b1f99e056 100644 ---- a/source/fitz/stext-device.c -+++ b/source/fitz/stext-device.c -@@ -825,6 +825,11 @@ fz_new_stext_device(fz_context *ctx, fz_stext_page *page, const fz_stext_options - dev->lastchar = ' '; - dev->curdir = 1; - dev->lasttext = NULL; -+ /* willus mod -- seems like this should be here, but not sure. */ -+ if (opts) -+ dev->flags = opts->flags; -+ else -+ dev->flags = 0; - - return (fz_device*)dev; - } -diff --git a/source/fitz/string.c b/source/fitz/string.c -index f8eedb682..7a767983d 100644 ---- a/source/fitz/string.c -+++ b/source/fitz/string.c -@@ -560,6 +560,10 @@ fz_utflen(const char *s) - */ - float fz_atof(const char *s) - { -+/* willus mod: atof(s), #if-#else-#endif */ -+#if (!defined(__SSE__)) -+ return(atof(s)); -+#else - float result; - - if (s == NULL) -@@ -572,6 +576,7 @@ float fz_atof(const char *s) - return 1; - result = fz_clamp(result, -FLT_MAX, FLT_MAX); - return result; -+#endif - } - - /* -diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c -index 4dfdf36fe..acff7d12a 100644 ---- a/source/pdf/pdf-annot.c -+++ b/source/pdf/pdf-annot.c -@@ -5,8 +5,20 @@ - #include - #include - -+/* willus mod--don't use _mkgmtime--not available in Win XP */ - #ifdef _WIN32 --#define timegm _mkgmtime -+static time_t timegm(struct tm *date); -+static time_t timegm(struct tm *date) -+ -+ { -+ time_t t,z; -+ struct tm gmz; -+ -+ z=(time_t)0; -+ gmz=(*gmtime(&z)); -+ t=mktime(date)-mktime(&gmz); -+ return(t); -+ } - #endif - - #define isdigit(c) (c >= '0' && c <= '9') -diff --git a/source/pdf/pdf-link.c b/source/pdf/pdf-link.c -index 37444b471..613cc05b9 100644 ---- a/source/pdf/pdf-link.c -+++ b/source/pdf/pdf-link.c -@@ -345,6 +345,9 @@ pdf_resolve_link(fz_context *ctx, pdf_document *doc, const char *uri, float *xp, - } - return page; - } -+/* willus mod -- be quiet */ -+/* - fz_warn(ctx, "unknown link uri '%s'", uri); -+*/ - return -1; - } -diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c -index 04a772204..9dd0cd898 100644 ---- a/source/pdf/pdf-parse.c -+++ b/source/pdf/pdf-parse.c -@@ -663,9 +663,14 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc, - if (c == '\r') - { - c = fz_peek_byte(ctx, file); -+/* willus mod -- no warning */ -+/* - if (c != '\n') - fz_warn(ctx, "line feed missing after stream begin marker (%d %d R)", num, gen); - else -+*/ -+if (c=='\n') -+/* willus mod -- end */ - fz_read_byte(ctx, file); - } - stm_ofs = fz_tell(ctx, file); -diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c -index 8f888059b..08de7bfba 100644 ---- a/source/pdf/pdf-xref.c -+++ b/source/pdf/pdf-xref.c -@@ -710,8 +710,11 @@ pdf_xref_size_from_old_trailer(fz_context *ctx, pdf_document *doc, pdf_lexbuf *b - if (!s) - fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length missing"); - len = fz_atoi(fz_strsep(&s, " ")); -+/* willus mod -- no warning */ -+/* - if (len < 0) - fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length must be positive"); -+*/ - - /* broken pdfs where the section is not on a separate line */ - if (s && *s != '\0') -@@ -1378,7 +1381,10 @@ pdf_init_document(fz_context *ctx, pdf_document *doc) - { - pdf_drop_xref_sections(ctx, doc); - fz_rethrow_if(ctx, FZ_ERROR_TRYLATER); -+/* willus mod -- be quiet */ -+/* - fz_warn(ctx, "trying to repair broken xref"); -+*/ - repaired = 1; - } - -@@ -1506,7 +1512,10 @@ pdf_drop_document_imp(fz_context *ctx, pdf_document *doc) - /* Swallow error, but continue dropping */ - } - -+/* willu smod -- no pdf_drop_js */ -+/* - pdf_drop_js(ctx, doc->js); -+*/ - - pdf_drop_xref_sections(ctx, doc); - fz_free(ctx, doc->xref_index); --- -2.22.0 - diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch deleted file mode 100644 index adfee9ae282f..000000000000 --- a/pkgs/applications/misc/k2pdfopt/tesseract.patch +++ /dev/null @@ -1,675 +0,0 @@ -From 39aa8502eee7bb669a29d1a9b3bfe5c9595ad960 Mon Sep 17 00:00:00 2001 -From: Daniel Fullmer -Date: Fri, 13 Sep 2019 13:45:05 -0400 -Subject: [PATCH] Willus mod changes from k2pdfopt - ---- - src/api/Makefile.am | 1 + - src/api/baseapi.cpp | 87 +++++++++++ - src/api/baseapi.h | 3 + - src/api/tesscapi.cpp | 311 +++++++++++++++++++++++++++++++++++++ - src/api/tesseract.h | 29 ++++ - src/ccmain/tessedit.cpp | 5 +- - src/ccutil/ccutil.h | 7 + - src/ccutil/genericvector.h | 21 ++- - src/ccutil/mainblk.cpp | 17 +- - src/ccutil/params.cpp | 3 +- - src/ccutil/serialis.cpp | 3 + - src/ccutil/serialis.h | 2 + - src/lstm/input.cpp | 3 + - 13 files changed, 488 insertions(+), 4 deletions(-) - create mode 100644 src/api/tesscapi.cpp - create mode 100644 src/api/tesseract.h - -diff --git a/src/api/Makefile.am b/src/api/Makefile.am -index d9b76eb6..cd2dc30f 100644 ---- a/src/api/Makefile.am -+++ b/src/api/Makefile.am -@@ -39,6 +39,7 @@ libtesseract_api_la_SOURCES += lstmboxrenderer.cpp - libtesseract_api_la_SOURCES += pdfrenderer.cpp - libtesseract_api_la_SOURCES += wordstrboxrenderer.cpp - libtesseract_api_la_SOURCES += renderer.cpp -+libtesseract_api_la_SOURCES += tesscapi.cpp - - lib_LTLIBRARIES += libtesseract.la - libtesseract_la_LDFLAGS = $(LEPTONICA_LIBS) $(OPENCL_LDFLAGS) $(libarchive_LIBS) -diff --git a/src/api/baseapi.cpp b/src/api/baseapi.cpp -index 9245d07c..ea964ee6 100644 ---- a/src/api/baseapi.cpp -+++ b/src/api/baseapi.cpp -@@ -215,6 +215,14 @@ TessBaseAPI::TessBaseAPI() - // Use the current locale if building debug code. - std::locale::global(std::locale("")); - #endif -+ const char *locale; -+ locale = std::setlocale(LC_ALL, nullptr); -+/* willus mod Remove assertions--taken care of in tesscapi.cpp */ -+// ASSERT_HOST(!strcmp(locale, "C")); -+ locale = std::setlocale(LC_CTYPE, nullptr); -+// ASSERT_HOST(!strcmp(locale, "C")); -+ locale = std::setlocale(LC_NUMERIC, nullptr); -+// ASSERT_HOST(!strcmp(locale, "C")); - } - - TessBaseAPI::~TessBaseAPI() { -@@ -1333,6 +1341,85 @@ static void AddBoxToTSV(const PageIterator* it, PageIteratorLevel level, - text->add_str_int("\t", bottom - top); - } - -+/* willus mod */ -+int TessBaseAPI::GetOCRWords(int **x00,int **y00,int **x11,int **y11,int **ybaseline0, -+ char **utf8words) -+ -+ { -+ int iword,nwords,totlen,it8; -+ int *x0,*y0,*x1,*y1,*ybaseline; -+ char *tutf8; -+ -+ ResultIterator *res_it = GetIterator(); -+ /* Count words */ -+ iword=0; -+ totlen=0; -+ while (!res_it->Empty(RIL_BLOCK)) -+ { -+ if (res_it->Empty(RIL_WORD)) -+ { -+ res_it->Next(RIL_WORD); -+ continue; -+ } -+ iword++; -+ STRING textstr=std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get(); -+ totlen+=strlen(textstr.string())+1; -+ res_it->Next(RIL_WORD); -+ } -+ nwords=iword; -+/* -+printf("\nnwords=%d, totlen=%d\n",nwords,totlen); -+*/ -+ x0=(*x00)=(int *)malloc(sizeof(int)*5*nwords); -+ y0=(*y00)=&x0[nwords]; -+ x1=(*x11)=&y0[nwords]; -+ y1=(*y11)=&x1[nwords]; -+ ybaseline=(*ybaseline0)=&y1[nwords]; -+ tutf8=(*utf8words)=(char *)malloc(totlen); -+ iword=0; -+ it8=0; -+ res_it->Begin(); -+ while (!res_it->Empty(RIL_BLOCK)) -+ { -+ if (res_it->Empty(RIL_WORD)) -+ { -+ res_it->Next(RIL_WORD); -+ continue; -+ } -+ STRING textstr=std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get(); -+ strcpy(&tutf8[it8],textstr.string()); -+ it8 += strlen(&tutf8[it8])+1; -+ /* -+ STRING textstr(""); -+ textstr += std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get(); -+ */ -+/* -+printf("Word %d: '%s'\n",iword,textstr.string()); -+*/ -+ int left, top, right, bottom; -+ int u1,v1,u2,v2; -+ res_it->BoundingBox(RIL_WORD, &left, &top, &right, &bottom); -+ res_it->Baseline(RIL_WORD, &u1, &v1, &u2, &v2); -+ x0[iword]=left; -+ x1[iword]=right; -+ y0[iword]=top; -+ y1[iword]=bottom; -+ ybaseline[iword]=(v1+v2)/2; -+ iword++; -+/* -+printf("BB: (%d,%d)-(%d,%d) BL: (%d,%d)-(%d,%d)\n",left,bottom,right,top,x1,y1,x2,y2); -+*/ -+ res_it->Next(RIL_WORD); -+ } -+/* -+printf("iword=%d\n",iword); -+*/ -+ return(iword); -+ } -+ -+/* willus mod */ -+int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words); -+ - /** - * Make a TSV-formatted string from the internal data structures. - * page_number is 0-based but will appear in the output as 1-based. -diff --git a/src/api/baseapi.h b/src/api/baseapi.h -index 3724dd92..23be5920 100644 ---- a/src/api/baseapi.h -+++ b/src/api/baseapi.h -@@ -575,6 +575,9 @@ class TESS_API TessBaseAPI { - */ - char* GetHOCRText(ETEXT_DESC* monitor, int page_number); - -+/* willus mod */ -+int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words); -+ - /** - * Make a HTML-formatted string with hOCR markup from the internal - * data structures. -diff --git a/src/api/tesscapi.cpp b/src/api/tesscapi.cpp -new file mode 100644 -index 00000000..1752fafe ---- /dev/null -+++ b/src/api/tesscapi.cpp -@@ -0,0 +1,311 @@ -+/* -+** tesscapi.cpp willus.com attempt at C wrapper for tesseract. -+** (Butchered from tesseractmain.cpp) -+** Last udpated 9-1-12 -+** -+** Copyright (C) 2012 http://willus.com -+** -+** This program is free software: you can redistribute it and/or modify -+** it under the terms of the GNU Affero General Public License as -+** published by the Free Software Foundation, either version 3 of the -+** License, or (at your option) any later version. -+** -+** This program is distributed in the hope that it will be useful, -+** but WITHOUT ANY WARRANTY; without even the implied warranty of -+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+** GNU Affero General Public License for more details. -+** -+** You should have received a copy of the GNU Affero General Public License -+** along with this program. If not, see . -+** -+*/ -+ -+/* -+#include "mfcpch.h" -+*/ -+// #define USE_VLD //Uncomment for Visual Leak Detector. -+#if (defined _MSC_VER && defined USE_VLD) -+#include -+#endif -+ -+// Include automatically generated configuration file if running autoconf -+#ifdef HAVE_CONFIG_H -+#include "config_auto.h" -+#endif -+#include -+#ifdef USING_GETTEXT -+#include -+#define _(x) gettext(x) -+#else -+#define _(x) (x) -+#endif -+ -+#include "allheaders.h" -+#include "baseapi.h" -+#include "strngs.h" -+#include "params.h" -+#include "blobs.h" -+#include "simddetect.h" -+#include "tesseractclass.h" -+/* -+#include "notdll.h" -+*/ -+ -+/* C Wrappers */ -+#include "tesseract.h" -+ -+// static tesseract::TessBaseAPI api[4]; -+ -+/* -+** ocr_type=0: OEM_DEFAULT -+** ocr_type=1: OEM_TESSERACT_ONLY -+** ocr_type=2: OEM_LSTM_ONLY -+** ocr_type=3: OEM_TESSERACT_LSTM_COMBINED -+*/ -+void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out, -+ char *initstr,int maxlen,int *status) -+ -+ { -+ char original_locale[256]; -+ tesseract::TessBaseAPI *api = new tesseract::TessBaseAPI; -+/* -+printf("@tess_capi_init\n"); -+printf(" datapath='%s'\n",datapath); -+printf(" language='%s'\n",language); -+printf(" ocr_type=%d\n",ocr_type); -+*/ -+#ifdef USE_NLS -+ setlocale (LC_ALL, ""); -+ bindtextdomain (PACKAGE, LOCALEDIR); -+ textdomain (PACKAGE); -+#endif -+ /* willus mod, 11-24-16 */ -+ /* Tesseract needs "C" locale to correctly parse all data .traineddata files. */ -+/* -+printf("locale='%s'\n",setlocale(LC_ALL,NULL)); -+printf("ctype='%s'\n",setlocale(LC_CTYPE,NULL)); -+printf("numeric='%s'\n",setlocale(LC_NUMERIC,NULL)); -+*/ -+ strncpy(original_locale,setlocale(LC_ALL,NULL),255); -+ original_locale[255]='\0'; -+/* -+printf("original_locale='%s'\n",original_locale); -+*/ -+ setlocale(LC_ALL,"C"); -+/* -+printf("new locale='%s'\n",setlocale(LC_ALL,NULL)); -+printf("new ctype='%s'\n",setlocale(LC_CTYPE,NULL)); -+printf("new numeric='%s'\n",setlocale(LC_NUMERIC,NULL)); -+*/ -+ // fprintf(stderr, "tesseract %s\n", tesseract::TessBaseAPI::Version()); -+ // Make the order of args a bit more forgiving than it used to be. -+ const char* lang = "eng"; -+ tesseract::PageSegMode pagesegmode = tesseract::PSM_SINGLE_BLOCK; -+ if (language!=NULL && language[0]!='\0') -+ lang = language; -+ /* -+ if (output == NULL) -+ { -+ fprintf(stderr, _("Usage:%s imagename outputbase [-l lang] " -+ "[-psm pagesegmode] [configfile...]\n"), argv[0]); -+ fprintf(stderr, -+ _("pagesegmode values are:\n" -+ "0 = Orientation and script detection (OSD) only.\n" -+ "1 = Automatic page segmentation with OSD.\n" -+ "2 = Automatic page segmentation, but no OSD, or OCR\n" -+ "3 = Fully automatic page segmentation, but no OSD. (Default)\n" -+ "4 = Assume a single column of text of variable sizes.\n" -+ "5 = Assume a single uniform block of vertically aligned text.\n" -+ "6 = Assume a single uniform block of text.\n" -+ "7 = Treat the image as a single text line.\n" -+ "8 = Treat the image as a single word.\n" -+ "9 = Treat the image as a single word in a circle.\n" -+ "10 = Treat the image as a single character.\n")); -+ fprintf(stderr, _("-l lang and/or -psm pagesegmode must occur before any" -+ "configfile.\n")); -+ exit(1); -+ } -+ */ -+/* -+printf("SSE = %s\n",SIMDDetect::IsSSEAvailable() ? "AVAILABLE" : "NOT AVAILABLE"); -+printf("AVX = %s\n",SIMDDetect::IsAVXAvailable() ? "AVAILABLE" : "NOT AVAILABLE"); -+*/ -+/* -+v4.00 loads either TESSERACT enginer, LSTM engine, or both. No CUBE. -+*/ -+ ocr_type=0; /* Ignore specified and use default */ -+ api->SetOutputName(NULL); -+ (*status)=api->Init(datapath,lang, -+ ocr_type==0 ? tesseract::OEM_DEFAULT : -+ (ocr_type==1 ? tesseract::OEM_TESSERACT_ONLY : -+ (ocr_type==2 ? tesseract::OEM_LSTM_ONLY : -+ (tesseract::OEM_TESSERACT_LSTM_COMBINED)))); -+ if ((*status)!=0) -+ { -+ /* willus mod, 11-24-16 */ -+ setlocale(LC_ALL,original_locale); -+ api->End(); -+ delete api; -+ return(NULL); -+ } -+ /* -+ api.Init("tesscapi",lang,tesseract::OEM_DEFAULT, -+ &(argv[arg]), argc - arg, NULL, NULL, false); -+ */ -+ // We have 2 possible sources of pagesegmode: a config file and -+ // the command line. For backwards compatability reasons, the -+ // default in tesseract is tesseract::PSM_SINGLE_BLOCK, but the -+ // default for this program is tesseract::PSM_AUTO. We will let -+ // the config file take priority, so the command-line default -+ // can take priority over the tesseract default, so we use the -+ // value from the command line only if the retrieved mode -+ // is still tesseract::PSM_SINGLE_BLOCK, indicating no change -+ // in any config file. Therefore the only way to force -+ // tesseract::PSM_SINGLE_BLOCK is from the command line. -+ // It would be simpler if we could set the value before Init, -+ // but that doesn't work. -+ if (api->GetPageSegMode() == tesseract::PSM_SINGLE_BLOCK) -+ api->SetPageSegMode(pagesegmode); -+ -+ /* -+ ** Initialization message -+ */ -+ { -+ char istr[1024]; -+ int sse,avx; -+ -+// printf("tessedit_ocr_engine_mode = %d\n",tessedit_ocr_engine_mode); -+ sprintf(istr,"%s",api->Version()); -+ sse=tesseract::SIMDDetect::IsSSEAvailable(); -+ avx=tesseract::SIMDDetect::IsAVXAvailable(); -+ if (sse || avx) -+ sprintf(&istr[strlen(istr)]," [%s]",sse&&avx?"SSE+AVX":(sse?"SSE":"AVX")); -+ sprintf(&istr[strlen(istr)],"\n Tesseract data folder = '%s'",datapath==NULL?getenv("TESSDATA_PREFIX"):datapath); -+ strcat(istr,"\n Tesseract languages: "); -+ GenericVector languages; -+ api->GetLoadedLanguagesAsVector(&languages); -+/* -+printf("OEM=%d\n",api->oem()); -+printf("Langs='%s'\n",api->GetInitLanguagesAsString()); -+printf("AnyTessLang()=%d\n",(int)api->tesseract()->AnyTessLang()); -+printf("AnyLSTMLang()=%d\n",(int)api->tesseract()->AnyLSTMLang()); -+printf("num_sub_langs()=%d\n",api->tesseract()->num_sub_langs()); -+printf("languages.size()=%d\n",(int)languages.size()); -+*/ -+ -+ for (int i=0;i<=api->tesseract()->num_sub_langs();i++) -+ { -+ tesseract::Tesseract *lang1; -+ int eng; -+ lang1 = i==0 ? api->tesseract() : api->tesseract()->get_sub_lang(i-1); -+ eng=(int)lang1->tessedit_ocr_engine_mode; -+ sprintf(&istr[strlen(istr)],"%s%s [%s]",i==0?"":", ",lang1->lang.string(), -+ eng==2?"LSTM+Tess":(eng==1?"LSTM":"Tess")); -+ } -+/* -+printf("%d. '%s'\n",i+1,languages[i].string()); -+printf(" sublang[%d].oem_engine = %d\n",i+1,(int)api->tesseract()->get_sub_lang(i)->tessedit_ocr_engine_mode); -+*/ -+ -+ /* -+ if (ocr_type==0 || ocr_type==3) -+ sprintf(&istr[strlen(istr)],"[LSTM+] (lang="); -+ else if (ocr_type==2) -+ sprintf(&istr[strlen(istr)],"[LSTM] (lang="); -+ strncpy(&istr[strlen(istr)],language,253-strlen(istr)); -+ istr[253]='\0'; -+ strcat(istr,")"); -+ */ -+ if (out!=NULL) -+ fprintf(out,"%s\n",istr); -+ if (initstr!=NULL) -+ { -+ strncpy(initstr,istr,maxlen-1); -+ initstr[maxlen-1]='\0'; -+ } -+ } -+ -+ -+ /* Turn off LSTM debugging output */ -+ api->SetVariable("lstm_debug_level","0"); -+#if (WILLUSDEBUG & 1) -+ api->SetVariable("lstm_debug_level","9"); -+ api->SetVariable("paragraph_debug_level","9"); -+ api->SetVariable("tessdata_manager_debug_level","9"); -+ api->SetVariable("tosp_debug_level","9"); -+ api->SetVariable("wordrec_debug_level","9"); -+ api->SetVariable("segsearch_debug_level","9"); -+#endif -+ /* willus mod, 11-24-16 */ -+ setlocale(LC_ALL,original_locale); -+ return((void *)api); -+ } -+ -+ -+int tess_capi_get_ocr(void *vapi,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out) -+ -+ { -+ tesseract::TessBaseAPI *api; -+ static int old_segmode=-1; -+ -+ api=(tesseract::TessBaseAPI *)vapi; -+ if (old_segmode != segmode) -+ { -+ old_segmode=segmode; -+ api->SetPageSegMode((tesseract::PageSegMode)segmode); -+ } -+ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL)) -+ { -+ /* pixDestroy(&pix); */ -+ if (out!=NULL) -+ fprintf(out,"tesscapi: Error during bitmap processing.\n"); -+ api->Clear(); -+ return(-1); -+ } -+ strncpy(outstr,api->GetUTF8Text(),maxlen-1); -+ outstr[maxlen-1]='\0'; -+ api->Clear(); -+ return(0); -+ } -+ -+ -+int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode, -+ int **left,int **top,int **right,int **bottom, -+ int **ybase,char **text,int *nw, -+ FILE *out) -+ -+ { -+ tesseract::TessBaseAPI *api; -+ static int old_segmode=-1; -+ -+ api=(tesseract::TessBaseAPI *)vapi; -+ if (old_segmode != segmode) -+ { -+ old_segmode=segmode; -+ api->SetPageSegMode((tesseract::PageSegMode)segmode); -+ } -+ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL)) -+ { -+ if (out!=NULL) -+ fprintf(out,"tesscapi: Error during bitmap processing.\n"); -+ api->Clear(); -+ (*nw)=0; -+ return(-1); -+ } -+ (*nw)=api->GetOCRWords(left,top,right,bottom,ybase,text); -+ api->Clear(); -+ return(0); -+ } -+ -+ -+void tess_capi_end(void *vapi) -+ -+ { -+ tesseract::TessBaseAPI *api; -+ -+ if (vapi==NULL) -+ return; -+ api=(tesseract::TessBaseAPI *)vapi; -+ api->End(); -+ delete api; -+ } -diff --git a/src/api/tesseract.h b/src/api/tesseract.h -new file mode 100644 -index 00000000..575948cc ---- /dev/null -+++ b/src/api/tesseract.h -@@ -0,0 +1,29 @@ -+/* -+** Willus.com's Tesseract C Wrappers -+** -+** 6-8-12 -+** -+*/ -+ -+#ifndef _TESSERACT_H_ -+#define _TESSERACT_H_ -+ -+//#include -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out, -+ char *initstr,int maxlen,int *status); -+int tess_capi_get_ocr(void *api,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out); -+int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode, -+ int **left,int **top,int **right,int **bottom, -+ int **ybase,char **text,int *nw, -+ FILE *out); -+void tess_capi_end(void *api); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff --git a/src/ccmain/tessedit.cpp b/src/ccmain/tessedit.cpp -index 17f0951b..7af94ee2 100644 ---- a/src/ccmain/tessedit.cpp -+++ b/src/ccmain/tessedit.cpp -@@ -101,6 +101,10 @@ bool Tesseract::init_tesseract_lang_data( - " to your \"tessdata\" directory.\n"); - return false; - } -+ /* willus mod */ -+ TFile fp; -+ strncpy(fp.tfile_filename,tessdata_path.string(),511); -+ fp.tfile_filename[511]='\0'; - #ifndef DISABLED_LEGACY_ENGINE - if (oem == OEM_DEFAULT) { - // Set the engine mode from availability, which can then be overridden by -@@ -116,7 +120,6 @@ bool Tesseract::init_tesseract_lang_data( - #endif // ndef DISABLED_LEGACY_ENGINE - - // If a language specific config file (lang.config) exists, load it in. -- TFile fp; - if (mgr->GetComponent(TESSDATA_LANG_CONFIG, &fp)) { - ParamUtils::ReadParamsFromFp(SET_PARAM_CONSTRAINT_NONE, &fp, - this->params()); -diff --git a/src/ccutil/ccutil.h b/src/ccutil/ccutil.h -index 71e89c60..bdeccc14 100644 ---- a/src/ccutil/ccutil.h -+++ b/src/ccutil/ccutil.h -@@ -80,6 +80,13 @@ class CCUtil { - // Member parameters. - // These have to be declared and initialized after params_ member, since - // params_ should be initialized before parameters are added to it. -+/* willus mod */ -+/* -+ #ifdef _WIN32 -+ STRING_VAR_H(tessedit_module_name, WINDLLNAME, -+ "Module colocated with tessdata dir"); -+ #endif -+*/ - INT_VAR_H(ambigs_debug_level, 0, "Debug level for unichar ambiguities"); - BOOL_VAR_H(use_definite_ambigs_for_classifier, false, - "Use definite ambiguities when running character classifier"); -diff --git a/src/ccutil/genericvector.h b/src/ccutil/genericvector.h -index 3556d153..3a5e8662 100644 ---- a/src/ccutil/genericvector.h -+++ b/src/ccutil/genericvector.h -@@ -382,7 +382,26 @@ inline bool LoadDataFromFile(const char* filename, GenericVector* data) { - // reserve an extra byte in case caller wants to append a '\0' character - data->reserve(size + 1); - data->resize_no_init(size); -- result = static_cast(fread(&(*data)[0], 1, size, fp)) == size; -+ /* willus mod Dec 2018--weird issue with Win XP and MinGW gcc 7.3.0 */ -+ /* Can't read entire file at once -- need to break up into smaller blocksize reads */ -+ { -+ int frs,n; -+ int blocksize; -+ blocksize=1024*1024; -+ for (n=0;1;) -+ { -+ int bs; -+ bs= size-n > blocksize ? blocksize : size-n; -+ frs=(int)fread(&(*data)[n],1,bs,fp); -+ n+=frs; -+ if (frs=size) -+ break; -+ } -+ result = static_cast((long)n==size); -+ } -+ /* -+ result = static_cast(fread(&(*data)[0], 1, size, fp)) == size; -+ */ - } - fclose(fp); - } -diff --git a/src/ccutil/mainblk.cpp b/src/ccutil/mainblk.cpp -index 52b04b04..80b26044 100644 ---- a/src/ccutil/mainblk.cpp -+++ b/src/ccutil/mainblk.cpp -@@ -55,8 +55,22 @@ void CCUtil::main_setup(const char *argv0, const char *basename) { - #if defined(_WIN32) - } else if (datadir == nullptr || _access(datadir.string(), 0) != 0) { - /* Look for tessdata in directory of executable. */ -+ /* -+ char drive[_MAX_DRIVE]; -+ char dir[_MAX_DIR]; -+ */ - char path[_MAX_PATH]; -- DWORD length = GetModuleFileName(nullptr, path, sizeof(path)); -+ int i; -+ /* DWORD length = */ GetModuleFileName(nullptr, path, sizeof(path)); -+ /* willus mod--avoid _splitpath_s -- not in XP */ -+ for (i=strlen(path)-1;i>=0 && path[i]!='/' && path[i]!='\\';i--); -+ if (i>=0) -+ { -+ path[i]='\0'; -+ datadir=path; -+ datadir += "/tessdata"; -+ } -+ /* - if (length > 0 && length < sizeof(path)) { - char* separator = std::strrchr(path, '\\'); - if (separator != nullptr) { -@@ -65,6 +79,7 @@ void CCUtil::main_setup(const char *argv0, const char *basename) { - datadir += "/tessdata"; - } - } -+ */ - #endif /* _WIN32 */ - #if defined(TESSDATA_PREFIX) - } else { -diff --git a/src/ccutil/params.cpp b/src/ccutil/params.cpp -index 00bf2563..486c5ce0 100644 ---- a/src/ccutil/params.cpp -+++ b/src/ccutil/params.cpp -@@ -82,7 +82,8 @@ bool ParamUtils::ReadParamsFromFp(SetParamConstraint constraint, TFile *fp, - - if (!foundit) { - anyerr = true; // had an error -- tprintf("Warning: Parameter not found: %s\n", line); -+ /* willus mod */ -+ tprintf("Tesseract warning: Parameter %s not found in file %s.\n",line,fp->tfile_filename); - } - } - } -diff --git a/src/ccutil/serialis.cpp b/src/ccutil/serialis.cpp -index 7def011f..6107a494 100644 ---- a/src/ccutil/serialis.cpp -+++ b/src/ccutil/serialis.cpp -@@ -201,6 +201,9 @@ bool TFile::Open(const STRING& filename, FileReader reader) { - offset_ = 0; - is_writing_ = false; - swap_ = false; -+ /* willus mod */ -+ strncpy(tfile_filename,filename.string(),511); -+ tfile_filename[511]='\0'; - if (reader == nullptr) - return LoadDataFromFile(filename, data_); - else -diff --git a/src/ccutil/serialis.h b/src/ccutil/serialis.h -index 095b9227..4cc8251e 100644 ---- a/src/ccutil/serialis.h -+++ b/src/ccutil/serialis.h -@@ -77,6 +77,8 @@ class TFile { - public: - TFile(); - ~TFile(); -+ /* willus mod */ -+ char tfile_filename[512]; - - // All the Open methods load the whole file into memory for reading. - // Opens a file with a supplied reader, or nullptr to use the default. -diff --git a/src/lstm/input.cpp b/src/lstm/input.cpp -index 73b584b3..0b0b54c3 100644 ---- a/src/lstm/input.cpp -+++ b/src/lstm/input.cpp -@@ -93,8 +93,11 @@ Pix* Input::PrepareLSTMInputs(const ImageData& image_data, - return nullptr; - } - if (width < min_width || height < min_width) { -+ /* willus mod -- no warning */ -+ /* - tprintf("Image too small to scale!! (%dx%d vs min width of %d)\n", width, - height, min_width); -+ */ - pixDestroy(&pix); - return nullptr; - } --- -2.22.0 - From 00c692e18415f706cd3ebb967dbcec8d9ac673e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 03:14:38 +0000 Subject: [PATCH 220/688] python27Packages.trimesh: 3.7.14 -> 3.8.4 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 7d749ea4a9b3..f9a2dfa6af38 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.7.14"; + version = "3.8.4"; src = fetchPypi { inherit pname version; - sha256 = "bd3d88fc179d6dfd6d47f63dec4bb8da204c070e78cb2b483f86b33886bf627b"; + sha256 = "50d2e74f2047a50d097a394fb11b12443f764dfc7145140d5029f7019dea6d4d"; }; propagatedBuildInputs = [ numpy ]; From bea26371b5ac54cdf4e7610591e11ccbf3681ed0 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Fri, 28 Aug 2020 20:40:12 -0700 Subject: [PATCH 221/688] emacsPackages.orgit-forge: override build inputs to include Git --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f228d34a654e..c48e342977e3 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -531,6 +531,12 @@ let (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; })); + orgit-forge = super.orgit-forge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + # tries to write to $HOME php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { HOME = "/tmp"; From 9f3c0b29c721aea3a31e0a3c44d7e5f9d16001cb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 29 Aug 2020 04:20:00 +0000 Subject: [PATCH 222/688] lsd: 0.17.0 -> 0.18.0 --- pkgs/tools/misc/lsd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 73dcbd3bc3cb..415c55fb611c 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "1vyww54fl4yfvszr0dh8ym2jd9gilrccmwkvl7rbx70sfqzsgaai"; + sha256 = "006fy87jrb77cpa6bywchcvq1p74vlpy151q1j4nsj8npbr02krj"; }; - cargoSha256 = "13g0p6zh2b1z005lszll098d4lv62dzsxwhl76bianzrydif61lr"; + cargoSha256 = "0mrvcca9y0vylcrbfxxba45v05qxd8z91vb4in88px60xah0dy3q"; nativeBuildInputs = [ installShellFiles ]; postInstall = '' From f7eb2883b52c09841d03e94ee3344fdd717ae2a5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 29 Aug 2020 04:20:00 +0000 Subject: [PATCH 223/688] lean: 3.18.4 -> 3.19.0 --- pkgs/applications/science/logic/lean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 224795f2a666..32a75cabc13f 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.18.4"; + version = "3.19.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "1pmc2wi1pa346w89ayrrjv9xk6v6myg2zmx1wj4pd9qxv7ivrbsn"; + sha256 = "1dybq6104vc62x620izgblfd8dqc4ynaiw8ml07km78lq38anm6v"; }; nativeBuildInputs = [ cmake ]; From 5e6eeb795c45e67f8c68daa3d51b6ef4e9adaeea Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 26 Aug 2020 10:09:56 +0200 Subject: [PATCH 224/688] =?UTF-8?q?alt-ergo:=202.3.2=20=E2=86=92=202.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/alt-ergo/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index e396f1c4a91a..519b1f98138e 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,29 +2,27 @@ let pname = "alt-ergo"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-${version}/alt-ergo-${version}.tar.gz"; - sha256 = "130hisjzkaslygipdaaqib92spzx9rapsd45dbh5ssczjn5qnhb9"; + sha256 = "124k2a4ikk4wdpmvgjpgl97x9skvr9qznk8m68dzsynzpv6yksaj"; }; - preConfigure = "patchShebangs ./configure"; - nativeBuildInputs = [ which ]; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src preConfigure nativeBuildInputs; + inherit version src nativeBuildInputs; configureFlags = pname; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src preConfigure nativeBuildInputs; + inherit version src nativeBuildInputs; configureFlags = pname; buildInputs = with ocamlPackages; [ menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); @@ -32,7 +30,7 @@ let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage { - inherit pname version src preConfigure nativeBuildInputs; + inherit pname version src nativeBuildInputs; configureFlags = pname; From 544423e91c716436f8a335ffcbd4cfde5cced292 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 22 Aug 2020 13:59:26 +0200 Subject: [PATCH 225/688] =?UTF-8?q?ocamlPackages.eliom:=206.12.0=20?= =?UTF-8?q?=E2=86=92=206.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/eliom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 4ce502af19f1..4734d83d55f7 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -14,11 +14,11 @@ else stdenv.mkDerivation rec { pname = "eliom"; - version = "6.12.0"; + version = "6.12.1"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "015jh72v6ch9h9czd8sn5kjz3pv6lsnvvnhdjgrplwj443dn1xp8"; + sha256 = "04c1sz113015gyhj3w7flw7l4bv0v50q6n04kk8dybcravzy2xgx"; }; buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline From e3725932ff10bcfee29a0101b843845add5ed822 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 05:36:00 +0000 Subject: [PATCH 226/688] readosm: 1.1.0 -> 1.1.0a --- pkgs/development/libraries/readosm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 8bf3200e295b..6aed49d65e35 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, geos, libspatialite }: stdenv.mkDerivation rec { - name = "readosm-1.1.0"; + name = "readosm-1.1.0a"; src = fetchurl { url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; - sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265"; + sha256 = "0igif2bxf4dr82glxz9gyx5mmni0r2dsnx9p9k6pxv3c4lfhaz6v"; }; buildInputs = [ expat zlib geos libspatialite ]; From 6edcca4f49416d785b8c49c1b7ba4135d29f48c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 06:15:19 +0000 Subject: [PATCH 227/688] renoise: 3.2.1 -> 3.2.2 --- pkgs/applications/audio/renoise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 1cbd5b3afa28..0ae65cb8c373 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.2.1"; + version = "3.2.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" ]; - sha256 = "0dhcidgnjzd4abw0xw1waj9mazp03nbvjcr2xx09l8gnfrkvny46"; + sha256 = "1v249kmyidx55kppk3sry7yg6hl1a91ixhnwz36h4y134fs7bkrl"; } else releasePath From 741b7f7b3645080043e981c1b2cf81db841df528 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 06:44:34 +0000 Subject: [PATCH 228/688] rofi-calc: 1.7 -> 1.8 --- pkgs/applications/science/math/rofi-calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index 84adb2358d24..40b2711ff65a 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "046x2zpvza7n0m81s75qkvmnpkvsvvyqqqjxcqzj7by0llpqs7wa"; + sha256 = "0vwb9c3xvd2cms6cw8j8parg7w4bsxvvrd1wgggr8sz2p8rrvy5p"; }; nativeBuildInputs = [ From c3708aea65b23a50bc0f4a75dddc8bdf995ae4ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 07:15:06 +0000 Subject: [PATCH 229/688] ser2net: 4.2.0 -> 4.2.1 --- pkgs/servers/ser2net/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index 9f82a76c323e..ef592420b118 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "154sc7aa74c2vwfwan41qwqxckp36lw9wf3qydamsyvd9ampjf5x"; + sha256 = "01w82nrgffsfz2c80p4cyppg3bz56d90jm6i6356j0nva3784haw"; }; buildInputs = [ pkgconfig autoreconfHook gensio libyaml ]; From be193a20572a72a15ffb569aba8eb56fe881c842 Mon Sep 17 00:00:00 2001 From: V Date: Sat, 29 Aug 2020 09:54:02 +0200 Subject: [PATCH 230/688] nixos-rebuild: make 'edit' work with directories $NIXOS_CONFIG can be set to a directory, in which case the file used is $NIXOS_CONFIG/default.nix. This updates 'nixos-rebuild edit' to handle that case correctly. --- nixos/modules/installer/tools/nixos-rebuild.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 437199bae1d1..e79cc5e24fb5 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -288,6 +288,9 @@ fi if [ "$action" = edit ]; then if [[ -z $flake ]]; then NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)} + if [[ -d $NIXOS_CONFIG ]]; then + NIXOS_CONFIG=$NIXOS_CONFIG/default.nix + fi exec "${EDITOR:-nano}" "$NIXOS_CONFIG" else exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr" From e08bcdbec3265f701c175ae5ac9d813e10cad292 Mon Sep 17 00:00:00 2001 From: V Date: Sat, 29 Aug 2020 09:54:14 +0200 Subject: [PATCH 231/688] nixos-rebuild: don't quote $EDITOR $EDITOR is allowed to contain flags, so it is important to allow the shell to split this normally. For example, Sublime Text needs to be passed --wait, since otherwise it will daemonise. --- nixos/modules/installer/tools/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index e79cc5e24fb5..ed9c2509b6b6 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -291,7 +291,7 @@ if [ "$action" = edit ]; then if [[ -d $NIXOS_CONFIG ]]; then NIXOS_CONFIG=$NIXOS_CONFIG/default.nix fi - exec "${EDITOR:-nano}" "$NIXOS_CONFIG" + exec ${EDITOR:-nano} "$NIXOS_CONFIG" else exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr" fi From 72f4080d7ee1e10e494deb3220f67b3910ec2bc9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 08:12:07 +0000 Subject: [PATCH 232/688] scaleft: 1.45.3 -> 1.45.4 --- pkgs/applications/networking/scaleft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 864f10553eeb..b1a754193ebf 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "scaleft"; - version = "1.45.3"; + version = "1.45.4"; src = fetchurl { url = "http://pkg.scaleft.com/rpm/scaleft-client-tools-${version}-1.x86_64.rpm"; - sha256 = "02hsn64kg22pgga5ldjwhnqc6jq8w03mwf40dfanln1qz38x9nx1"; + sha256 = "1yskybjba9ljy1wazddgrm7a4cc72i1xbk7sxnjpcq4hdy3b50l0"; }; nativeBuildInputs = [ patchelf rpmextract ]; From 48dc384a3cc28fdd8ef133df9b11ca1bd814e62e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 11:04:30 +0200 Subject: [PATCH 233/688] emscripten: add node dependencies for acorn-optimizer --- .../compilers/emscripten/default.nix | 10 + .../compilers/emscripten/package.json | 13 + .../compilers/emscripten/yarn.lock | 346 ++++++++++++++ .../development/compilers/emscripten/yarn.nix | 437 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 5 files changed, 807 insertions(+) create mode 100644 pkgs/development/compilers/emscripten/package.json create mode 100644 pkgs/development/compilers/emscripten/yarn.lock create mode 100644 pkgs/development/compilers/emscripten/yarn.nix diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 314ca3f0d92a..010bddeb934b 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -2,6 +2,7 @@ , jre, binaryen , llvmPackages_11 , symlinkJoin, makeWrapper +, mkYarnModules }: stdenv.mkDerivation rec { @@ -14,6 +15,14 @@ stdenv.mkDerivation rec { paths = with llvmPackages_11; [ clang-unwrapped lld llvm ]; }; + nodeModules = mkYarnModules { + name = "emscripten-node-modules-${version}"; + inherit pname version; + packageJSON = ./package.json; + yarnLock = ./yarn.lock; + yarnNix = ./yarn.nix; + }; + src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; @@ -51,6 +60,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do makeWrapper $appdir/$b $out/bin/$b \ + --set NODE_PATH ${nodeModules}/node_modules \ --set PYTHON ${python3}/bin/python done ''; diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json new file mode 100644 index 000000000000..fa0feeace0c9 --- /dev/null +++ b/pkgs/development/compilers/emscripten/package.json @@ -0,0 +1,13 @@ +{ + "private": true, + "devDependencies": { + "ws": "~0.4.28" + }, + "dependencies": { + "google-closure-compiler": "20200224.0.0", + "html-minifier-terser": "5.0.2", + "source-map": "0.5.6", + "wasm2c": "1.0.0", + "acorn": "7.3.1" + } +} diff --git a/pkgs/development/compilers/emscripten/yarn.lock b/pkgs/development/compilers/emscripten/yarn.lock new file mode 100644 index 000000000000..079b254a4728 --- /dev/null +++ b/pkgs/development/compilers/emscripten/yarn.lock @@ -0,0 +1,346 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +acorn@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" + integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +camel-case@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" + integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M= + dependencies: + no-case "^2.2.0" + upper-case "^1.1.1" + +chalk@2.x: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +clean-css@^4.2.1: + version "4.2.3" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" + integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== + dependencies: + source-map "~0.6.0" + +clone-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" + integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg= + +clone-stats@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" + integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA= + +clone@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= + +cloneable-readable@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec" + integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ== + dependencies: + inherits "^2.0.1" + process-nextick-args "^2.0.0" + readable-stream "^2.3.5" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commander@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" + integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== + +commander@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781" + integrity sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= + +core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +google-closure-compiler-java@^20200224.0.0: + version "20200224.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz#03d71aefd0a07010fd8a7057d09c76f6729767bc" + integrity sha512-palFcDoScauZjWIsGDzMK6h+IctcRb55I3wJX8Ko/DTSz72xwadRdKm0lGt8OoYL7SKEO+IjgD7s8XrAGpLnlQ== + +google-closure-compiler-js@^20200224.0.0: + version "20200224.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz#cf4b598abf7be686c683e530529756805b8af500" + integrity sha512-70VKN0kbnTRtu2dqxDjWZQGfEQIHj7b7oUUCsYPO5oEXCDfgxNc13oYUJXvrTONLRWlHCNl/I8FNrVOwZ3gY/g== + +google-closure-compiler-linux@^20200224.0.0: + version "20200224.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz#d9608b224b4d8f38d4d34e99a24da54bca6b1902" + integrity sha512-/BaE889EPrXWOKJVolA9++e99xBDMzeFBf7zF7nBB8PUmU5DlvtsoLL82xnT6nbZC1ktHaETlVx+vYGju8zKBQ== + +google-closure-compiler-osx@^20200224.0.0: + version "20200224.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz#aee62d8b878a662fc73b92419603168c0c3a35ed" + integrity sha512-WXVNW9nPUqjvCe38mUIlBGEPVPCTKLtdaXC+q+kQdonkJFHNrpdyYWa746Y8cNP/byQyDNpPsqcKseZTLh17sQ== + +google-closure-compiler-windows@^20200224.0.0: + version "20200224.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz#cae323b898625ca57b0e87aaddde021a414dda58" + integrity sha512-l6w2D8r9+GC9CQTAYEMAuNI996Zb6YV5qG7+FR0gCoL6h6S3Mc7mi87bafgwaicsVcmmHE/9kCBuW4ZyTMs5Fg== + +google-closure-compiler@20200224.0.0: + version "20200224.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz#ec0e708d9716a48e12fff43fe37fa5cec732a283" + integrity sha512-V81dRYygdHbZtOtU16VX26xAdJBB1UZyfSg3OTzdNl3l/xEIx1D/L7TYUqjeTXsxcy+JruJ/UfUlIJAOaMRTog== + dependencies: + chalk "2.x" + google-closure-compiler-java "^20200224.0.0" + google-closure-compiler-js "^20200224.0.0" + minimist "1.x" + vinyl "2.x" + vinyl-sourcemaps-apply "^0.2.0" + optionalDependencies: + google-closure-compiler-linux "^20200224.0.0" + google-closure-compiler-osx "^20200224.0.0" + google-closure-compiler-windows "^20200224.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +he@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + +html-minifier-terser@5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz#0e67a0b062ae1dd0719fc73199479298f807ae16" + integrity sha512-VAaitmbBuHaPKv9bj47XKypRhgDxT/cDLvsPiiF7w+omrN3K0eQhpigV9Z1ilrmHa9e0rOYcD6R/+LCDADGcnQ== + dependencies: + camel-case "^3.0.0" + clean-css "^4.2.1" + commander "^4.0.0" + he "^1.2.0" + param-case "^2.1.1" + relateurl "^0.2.7" + terser "^4.3.9" + +inherits@^2.0.1, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +lower-case@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" + integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= + +minimist@1.x: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +nan@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38" + integrity sha1-riT4hQgY1mL8q1rPfzuVv6oszzg= + +no-case@^2.2.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" + integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== + dependencies: + lower-case "^1.1.1" + +options@>=0.0.5: + version "0.0.6" + resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" + integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8= + +param-case@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" + integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc= + dependencies: + no-case "^2.2.0" + +process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +readable-stream@^2.3.5: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +relateurl@^0.2.7: + version "0.2.7" + resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" + integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + +replace-ext@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" + integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +source-map-support@~0.5.12: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@0.5.6: + version "0.5.6" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" + integrity sha1-dc449SvwczxafwwRjYEzSiu19BI= + +source-map@^0.5.1: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +source-map@^0.6.0, source-map@~0.6.0, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +terser@^4.3.9: + version "4.8.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" + integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + +tinycolor@0.x: + version "0.0.1" + resolved "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz#320b5a52d83abb5978d81a3e887d4aefb15a6164" + integrity sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ= + +upper-case@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" + integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +vinyl-sourcemaps-apply@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705" + integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU= + dependencies: + source-map "^0.5.1" + +vinyl@2.x: + version "2.2.0" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86" + integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg== + dependencies: + clone "^2.1.1" + clone-buffer "^1.0.0" + clone-stats "^1.0.0" + cloneable-readable "^1.0.0" + remove-trailing-separator "^1.0.1" + replace-ext "^1.0.0" + +wasm2c@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0" + integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA== + +ws@~0.4.28: + version "0.4.32" + resolved "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz#787a6154414f3c99ed83c5772153b20feb0cec32" + integrity sha1-eHphVEFPPJntg8V3IVOyD+sM7DI= + dependencies: + commander "~2.1.0" + nan "~1.0.0" + options ">=0.0.5" + tinycolor "0.x" diff --git a/pkgs/development/compilers/emscripten/yarn.nix b/pkgs/development/compilers/emscripten/yarn.nix new file mode 100644 index 000000000000..af01d9c6869b --- /dev/null +++ b/pkgs/development/compilers/emscripten/yarn.nix @@ -0,0 +1,437 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "acorn___acorn_7.3.1.tgz"; + path = fetchurl { + name = "acorn___acorn_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz"; + sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + }; + } + { + name = "camel_case___camel_case_3.0.0.tgz"; + path = fetchurl { + name = "camel_case___camel_case_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz"; + sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "clean_css___clean_css_4.2.3.tgz"; + path = fetchurl { + name = "clean_css___clean_css_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; + sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; + }; + } + { + name = "clone_buffer___clone_buffer_1.0.0.tgz"; + path = fetchurl { + name = "clone_buffer___clone_buffer_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz"; + sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58"; + }; + } + { + name = "clone_stats___clone_stats_1.0.0.tgz"; + path = fetchurl { + name = "clone_stats___clone_stats_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz"; + sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; + }; + } + { + name = "clone___clone_2.1.2.tgz"; + path = fetchurl { + name = "clone___clone_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz"; + sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; + }; + } + { + name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; + path = fetchurl { + name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz"; + sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "commander___commander_4.1.1.tgz"; + path = fetchurl { + name = "commander___commander_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz"; + sha1 = "9fd602bd936294e9e9ef46a3f4d6964044b18068"; + }; + } + { + name = "commander___commander_2.1.0.tgz"; + path = fetchurl { + name = "commander___commander_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz"; + sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz"; + sha1 = "03d71aefd0a07010fd8a7057d09c76f6729767bc"; + }; + } + { + name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz"; + sha1 = "cf4b598abf7be686c683e530529756805b8af500"; + }; + } + { + name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz"; + sha1 = "d9608b224b4d8f38d4d34e99a24da54bca6b1902"; + }; + } + { + name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz"; + sha1 = "aee62d8b878a662fc73b92419603168c0c3a35ed"; + }; + } + { + name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz"; + sha1 = "cae323b898625ca57b0e87aaddde021a414dda58"; + }; + } + { + name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz"; + sha1 = "ec0e708d9716a48e12fff43fe37fa5cec732a283"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "he___he_1.2.0.tgz"; + path = fetchurl { + name = "he___he_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz"; + sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f"; + }; + } + { + name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz"; + path = fetchurl { + name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz"; + sha1 = "0e67a0b062ae1dd0719fc73199479298f807ae16"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "lower_case___lower_case_1.1.4.tgz"; + path = fetchurl { + name = "lower_case___lower_case_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz"; + sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "nan___nan_1.0.0.tgz"; + path = fetchurl { + name = "nan___nan_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz"; + sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; + }; + } + { + name = "no_case___no_case_2.3.2.tgz"; + path = fetchurl { + name = "no_case___no_case_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz"; + sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac"; + }; + } + { + name = "options___options_0.0.6.tgz"; + path = fetchurl { + name = "options___options_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + } + { + name = "param_case___param_case_2.1.1.tgz"; + path = fetchurl { + name = "param_case___param_case_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz"; + sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "relateurl___relateurl_0.2.7.tgz"; + path = fetchurl { + name = "relateurl___relateurl_0.2.7.tgz"; + url = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz"; + sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; + }; + } + { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + path = fetchurl { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + } + { + name = "replace_ext___replace_ext_1.0.1.tgz"; + path = fetchurl { + name = "replace_ext___replace_ext_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz"; + sha1 = "2d6d996d04a15855d967443631dd5f77825b016a"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "source_map_support___source_map_support_0.5.19.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + }; + } + { + name = "source_map___source_map_0.5.6.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz"; + sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "terser___terser_4.8.0.tgz"; + path = fetchurl { + name = "terser___terser_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz"; + sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; + }; + } + { + name = "tinycolor___tinycolor_0.0.1.tgz"; + path = fetchurl { + name = "tinycolor___tinycolor_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz"; + sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + }; + } + { + name = "upper_case___upper_case_1.1.3.tgz"; + path = fetchurl { + name = "upper_case___upper_case_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz"; + sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz"; + path = fetchurl { + name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"; + sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705"; + }; + } + { + name = "vinyl___vinyl_2.2.0.tgz"; + path = fetchurl { + name = "vinyl___vinyl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz"; + sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86"; + }; + } + { + name = "wasm2c___wasm2c_1.0.0.tgz"; + path = fetchurl { + name = "wasm2c___wasm2c_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz"; + sha1 = "761671e141c46b8a7c6c54429db1e6bfa3cd0ec0"; + }; + } + { + name = "ws___ws_0.4.32.tgz"; + path = fetchurl { + name = "ws___ws_0.4.32.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz"; + sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; + }; + } + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26f037620366..6811d85056a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8112,6 +8112,7 @@ in inherit (yarn2nix-moretea) yarn2nix mkYarnPackage + mkYarnModules fixup_yarn_lock; yasr = callPackage ../applications/audio/yasr { }; From b8acd0bc7333086e5719799244cf7e04b1e426ca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 09:49:33 +0200 Subject: [PATCH 234/688] python3.pkgs.flit: use current pytest --- pkgs/development/python-modules/flit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 88a4028aa6d2..c0944f4ff17b 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -7,7 +7,7 @@ , requests_download , zipfile36 , pythonOlder -, pytest_4 +, pytest , testpath , responses , pytoml @@ -39,7 +39,7 @@ buildPythonPackage rec { zipfile36 ]; - checkInputs = [ pytest_4 testpath responses ]; + checkInputs = [ pytest testpath responses ]; # Disable test that needs some ini file. # Disable test that wants hg From 93fda1f69d21e6120337d226e1e8e45764d73fa1 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 11:27:35 +0200 Subject: [PATCH 235/688] binaryen: 95 -> 96 --- .../development/compilers/binaryen/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index d0e224b7c9b4..6de4e0fb3047 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,16 +1,24 @@ -{ stdenv, cmake, python3, fetchFromGitHub }: +{ stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }: stdenv.mkDerivation rec { pname = "binaryen"; - version = "95"; + version = "96"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "1w4js9bm5qv5aws8bzz4f0n3ni2l7h4fidkq9v5bldf0zxncy8m3"; + sha256 = "1mqpb6yy87aifpbcy0lczi3bp6kddrwi6d0g6lrhjrdxx2kvbdag"; }; + patches = [ + # Adds --minimize-wasm-changes option required by emscripten 2.0.1 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/WebAssembly/binaryen/pull/3044.patch"; + sha256 = "1hdbc9h9zhh2d3bl4sqv6v9psfmny715612bwpjdln0ibdvc129s"; + }) + ]; + nativeBuildInputs = [ cmake python3 ]; meta = with stdenv.lib; { @@ -20,4 +28,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ asppsa ]; license = licenses.asl20; }; + + passthru.tests = { + inherit emscripten; + }; } From beb0339ce5dd74800fe8d57323afbb4b9dd017a0 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 11:27:42 +0200 Subject: [PATCH 236/688] emscripten: 2.0.0 -> 2.0.1 --- pkgs/development/compilers/emscripten/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 010bddeb934b..0214177a5bcc 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -7,8 +7,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - # 2.0.1 requires unreleased binaryen version (as of 2020-08-28) - version = "2.0.0"; + version = "2.0.1"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "1ihr1v8dlq5xq97i59n7s1hhz5pkafi6556ppgzjmmhiiraz2mkh"; + sha256 = "06dsd819qjv4n2ihrz1mpn5aigmbv0gpkm7iw06wrqx30nzphnpk"; rev = version; }; From 3f30e70d294b95acd20090b50534e7568d6b3527 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 11:35:11 +0200 Subject: [PATCH 237/688] emscripten: fix node modules --- pkgs/development/compilers/emscripten/default.nix | 1 + pkgs/development/compilers/emscripten/package.json | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 0214177a5bcc..dacf09371544 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { nodeModules = mkYarnModules { name = "emscripten-node-modules-${version}"; inherit pname version; + # it is vitally important the the package.json has name and version fields packageJSON = ./package.json; yarnLock = ./yarn.lock; yarnNix = ./yarn.nix; diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json index fa0feeace0c9..039d215efcd7 100644 --- a/pkgs/development/compilers/emscripten/package.json +++ b/pkgs/development/compilers/emscripten/package.json @@ -1,4 +1,6 @@ { + "name": "emscripten", + "version": "2.0.1", "private": true, "devDependencies": { "ws": "~0.4.28" From e7552a281d2af1bee2ce9e9abfd195893e5c4cb5 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 27 Aug 2020 03:13:41 +0300 Subject: [PATCH 238/688] tegola: 0.11.2 -> 0.12.0 --- pkgs/servers/tegola/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index 24e25f0c1377..ecb7fdd48887 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tegola"; - version = "0.11.2"; + version = "0.12.0"; goPackagePath = "github.com/go-spatial/tegola"; @@ -10,9 +10,11 @@ buildGoPackage rec { owner = "go-spatial"; repo = pname; rev = "v${version}"; - sha256 = "0xrjs0py08q9i31rl0cxi6idncrrgqwcspqks3c5vd9i65yqc6fv"; + sha256 = "1bm791cis6bqgvhkk6n03kdxh0y9fdkhsx4rgmv7pm3zzdd7b17r"; }; + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ]; + meta = with stdenv.lib; { homepage = "https://www.tegola.io/"; description = "Mapbox Vector Tile server"; From 9233ae96924c7a6dee2d272f067e554b5a4b1acb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 29 Aug 2020 12:25:41 +0200 Subject: [PATCH 239/688] pinnwand: 1.2.1 -> 1.2.2 Some longer standing bugs get squatted in pragmatic ways. - Ensure minimum body width to prevent button falling off (supakeen/pinnwand#79) - Select initial lexer for additional files (supakeen/pinnwand#97) --- pkgs/servers/pinnwand/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 360e39ab685d..a2f417d88fae 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -14,14 +14,14 @@ let }; in with python.pkgs; buildPythonApplication rec { pname = "pinnwand"; - version = "1.2.1"; + version = "1.2.2"; format = "pyproject"; src = fetchFromGitHub { owner = "supakeen"; repo = pname; rev = "v${version}"; - sha256 = "1rk7rpyb4vmqxqqv8k9jpjmgakr3mn1iaqxyj34r74p1n5vfzimq"; + sha256 = "0cxdpc3lxgzakzgvdyyrn234380dm05svnwr8av5nrjp4nm9s8z4"; }; nativeBuildInputs = [ From 43612e8e1abc4ea473b5e10efc10500c865d99e3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 29 Aug 2020 12:29:48 +0200 Subject: [PATCH 240/688] eva: fix build Since b52808f1ad485da9e6202ed840140e434ede3c00 `cargo` respects the `$NIX_BUILD_CORES` variable by utilizing `--test-threads`. However, the `eva` package also parsed the arguments during the test-phase which caused a failure since `--test-threads` isn't expected by eva's argparser[1]. Ths fix is in a pending PR[2] that can be applied on top to fix the build. [1] https://hydra.nixos.org/build/126069084 [2] https://github.com/NerdyPepper/eva/pull/37 --- pkgs/tools/misc/eva/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index 06b7b0a5200f..e59c2387a3ce 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -21,6 +21,12 @@ rustPlatform.buildRustPackage rec { url = "https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch"; sha256 = "11q7dkz2x1888f3awnlr1nbbxzzfjrr46kd0kk6sgjdkyfh50cvv"; }) + + # to fix `cargo test -- --test-threads $NIX_BUILD_CORES` + (fetchpatch { + url = "https://github.com/NerdyPepper/eva/commit/ccfb3d327567dbaf03b2283c7e684477e2e84590.patch"; + sha256 = "003yxqlyi8jna0rf05q2a006r2pkz6pcwwfl3dv8zb6p83kk1kgj"; + }) ]; meta = with stdenv.lib; { From ca644f966dd8f841d26eee26c18b97ec1198fb0a Mon Sep 17 00:00:00 2001 From: Dustin Frisch Date: Mon, 24 Aug 2020 13:07:21 +0200 Subject: [PATCH 241/688] cargo-embed: init at 0.8.0 --- .../tools/rust/cargo-embed/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-embed/default.nix diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix new file mode 100644 index 000000000000..dafcd1ded2fd --- /dev/null +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib +, rustPlatform, fetchFromGitHub +, libusb1, pkg-config, rustfmt }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-embed"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "probe-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "0klkgl7c42vhqxj6svw26lcr7rccq89bl17jn3p751x6281zvr35"; + }; + + cargoSha256 = "0w21q2fpr077m8jr24ld3qjimwk1m4fy9dh14fq9nv5xd4f5s8n8"; + + nativeBuildInputs = [ pkg-config rustfmt ]; + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "A cargo extension for working with microcontrollers."; + homepage = "http://probe.rs/"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ fooker ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 796961c1a579..1b63e7bd6349 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9525,6 +9525,7 @@ in cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-embed = callPackage ../development/tools/rust/cargo-embed { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; From 61c25dfb1ba2d3d3ba492c795d10e61fb48e27a3 Mon Sep 17 00:00:00 2001 From: Dustin Frisch Date: Mon, 24 Aug 2020 13:07:33 +0200 Subject: [PATCH 242/688] cargo-flash: init at 0.8.0 --- .../tools/rust/cargo-flash/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-flash/default.nix diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix new file mode 100644 index 000000000000..d4844de21a07 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib +, rustPlatform, fetchFromGitHub +, libusb1, pkg-config, rustfmt }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-flash"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "probe-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "1bcpv1r4pdpp22w7za7kdy7jl487x3nlwxiz6sqq3iq6wq3j9zj0"; + }; + + cargoSha256 = "1pf117fgw9x9diksqv58cw7i0kzmp25yj73y5ll69sk46b6z4j90"; + + nativeBuildInputs = [ pkg-config rustfmt ]; + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "A cargo extension for working with microcontrollers."; + homepage = "http://probe.rs/"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ fooker ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b63e7bd6349..f670b9800b8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9527,6 +9527,7 @@ in }; cargo-embed = callPackage ../development/tools/rust/cargo-embed { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; + cargo-flash = callPackage ../development/tools/rust/cargo-flash { }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; }; From bc9760b842abdb4aac17543a3ae8decae5e6530e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 12:51:38 +0200 Subject: [PATCH 243/688] emscripten: precompile libc, etc. --- .../compilers/emscripten/default.nix | 30 +++++++++++++------ .../tools/parsing/tree-sitter/default.nix | 1 - 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index dacf09371544..ca355ce4fe65 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -37,18 +37,25 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs . + # fixes cmake support sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py + # disables cache in user home, use installation directory instead + sed -i '/^def/!s/root_is_writable()/True/' tools/shared.py + sed -i "/^def check_sanity/a\\ return" tools/shared.py + + # required for wasm2c + ln -s ${nodeModules}/node_modules . + echo "EMSCRIPTEN_ROOT = '$appdir'" > .emscripten echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten echo "JS_ENGINES = [NODE_JS]" >> .emscripten - echo "COMPILER_ENGINE = NODE_JS" >> .emscripten - echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> .emscripten + echo "CLOSURE_COMPILER = ['${closurecompiler}/bin/closure-compiler']" >> .emscripten echo "JAVA = '${jre}/bin/java'" >> .emscripten # to make the test(s) below work - echo "SPIDERMONKEY_ENGINE = []" >> .emscripten + # echo "SPIDERMONKEY_ENGINE = []" >> .emscripten echo "BINARYEN_ROOT = '${binaryen}'" >> .emscripten ''; @@ -61,16 +68,21 @@ stdenv.mkDerivation rec { for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do makeWrapper $appdir/$b $out/bin/$b \ --set NODE_PATH ${nodeModules}/node_modules \ + --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ --set PYTHON ${python3}/bin/python done - ''; - doCheck = true; - checkPhase = '' - #export EMCC_DEBUG=2 + # precompile libc in all four variants: + # wasm, wasm-pic, wasm-lto, wasm-lto-pic export PYTHON=${python3}/bin/python - export HOME=$TMPDIR - python tests/runner.py test_hello_world + export NODE_PATH=${nodeModules}/node_modules + pushd $appdir + for lto in wasm2 wasmlto2; do + for pic in test_hello_world test_relocatable_void_function; do + python tests/runner.py $lto.$pic + done + done + popd ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 25faf4670503..b91acdca688e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -65,7 +65,6 @@ in rustPlatform.buildRustPackage { # minifying the JavaScript; passing it allows us to side-step more Node # JS dependencies for installation. preBuild = '' - HOME=/tmp bash ./script/build-wasm --debug ''; From 80dfc6dc3cc5991ca82668f20028b1f823f43ea7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 29 Aug 2020 13:09:38 +0200 Subject: [PATCH 244/688] python2.pkgs.ujson: use compatible version --- pkgs/development/python-modules/ujson/2.nix | 28 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/ujson/2.nix diff --git a/pkgs/development/python-modules/ujson/2.nix b/pkgs/development/python-modules/ujson/2.nix new file mode 100644 index 000000000000..e1d1185f6f5e --- /dev/null +++ b/pkgs/development/python-modules/ujson/2.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ujson"; + version = "2.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with stdenv.lib; { + homepage = "https://pypi.python.org/pypi/ujson"; + description = "Ultra fast JSON encoder and decoder for Python"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e43854afd20..e3148fbaaa4f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6993,7 +6993,9 @@ in { carbon = callPackage ../development/python-modules/carbon { }; - ujson = callPackage ../development/python-modules/ujson { }; + ujson = if isPy27 + then callPackage ../development/python-modules/ujson/2.nix { } + else callPackage ../development/python-modules/ujson { }; unidecode = callPackage ../development/python-modules/unidecode {}; @@ -7853,7 +7855,7 @@ in { rxv = callPackage ../development/python-modules/rxv { }; userpath = callPackage ../development/python-modules/userpath { }; - + pooch = callPackage ../development/python-modules/pooch {}; }); From fc0f11e3d533fadbb7d2330b3d3b50bd4eae298e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 13:28:02 +0200 Subject: [PATCH 245/688] emscripten: make emconfigure use wrapped binaries --- pkgs/development/compilers/emscripten/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index ca355ce4fe65..0b43017aa120 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ nodejs python3 ]; - outputs = [ "out" "appdir" ]; - buildPhase = '' patchShebangs . @@ -57,10 +55,17 @@ stdenv.mkDerivation rec { # to make the test(s) below work # echo "SPIDERMONKEY_ENGINE = []" >> .emscripten echo "BINARYEN_ROOT = '${binaryen}'" >> .emscripten + + # make emconfigure/emcmake use the correct (wrapped) binaries + sed -i "s|^EMCC =.*|EMCC='$out/bin/emcc'|" tools/shared.py + sed -i "s|^EMXX =.*|EMXX='$out/bin/em++'|" tools/shared.py + sed -i "s|^EMAR =.*|EMAR='$out/bin/emar'|" tools/shared.py + sed -i "s|^EMRANLIB =.*|EMRANLIB='$out/bin/emranlib'|" tools/shared.py ''; installPhase = '' - rm -rf cache + appdir=$out/share/emscripten + mkdir -p $appdir cp -r . $appdir chmod -R +w $appdir From 0fcebc338d0de2aecaaed28acb47abf6d696cb8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 29 Aug 2020 13:35:30 +0200 Subject: [PATCH 246/688] maintainers: add SuperSandro2000 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1da72ed7de5d..4fa676eb90b5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7995,6 +7995,12 @@ githubId = 65870; name = "Сухарик"; }; + SuperSandro2000 = { + email = "sandro.jaeckel@gmail.com"; + github = "SuperSandro2000"; + githubId = 7258858; + name = "Sandro Jäckel"; + }; SuprDewd = { email = "suprdewd@gmail.com"; github = "SuprDewd"; From ad330434031519fd5dd7e52f32d7d8a30f36a4db Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 14:14:20 +0200 Subject: [PATCH 247/688] emscripten: precompile libraries for wasm2c --- .../compilers/emscripten/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 0b43017aa120..ac13f9559305 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -61,6 +61,10 @@ stdenv.mkDerivation rec { sed -i "s|^EMXX =.*|EMXX='$out/bin/em++'|" tools/shared.py sed -i "s|^EMAR =.*|EMAR='$out/bin/emar'|" tools/shared.py sed -i "s|^EMRANLIB =.*|EMRANLIB='$out/bin/emranlib'|" tools/shared.py + + # The tests use the C compiler to compile generated C code, + # use the wrapped compiler + sed -i 's/shared.CLANG_CC/"cc"/' tests/runner.py ''; installPhase = '' @@ -77,16 +81,23 @@ stdenv.mkDerivation rec { --set PYTHON ${python3}/bin/python done - # precompile libc in all four variants: - # wasm, wasm-pic, wasm-lto, wasm-lto-pic + # precompile libc (etc.) in all variants: + pushd $TMPDIR + echo 'int main() { return 42; }' >test.c + for LTO in -flto ""; do + # wasm2c doesn't work with PIC + $out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c + + for RELOCATABLE in "" "-s RELOCATABLE"; do + $out/bin/emcc $RELOCATABLE $LTO test.c + done + done + popd + export PYTHON=${python3}/bin/python export NODE_PATH=${nodeModules}/node_modules pushd $appdir - for lto in wasm2 wasmlto2; do - for pic in test_hello_world test_relocatable_void_function; do - python tests/runner.py $lto.$pic - done - done + python tests/runner.py test_hello_world popd ''; From c23c59594e00fd7e4e4f3eabf48695efa28dfd0a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:04:05 +0200 Subject: [PATCH 248/688] salt: use latest tornado --- pkgs/tools/admin/salt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 35d65b5e6574..83b69b12fea1 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pyyaml pyzmq requests - tornado_4 + tornado ] ++ extraInputs; patches = [ ./fix-libcrypto-loading.patch ]; From 792c220f480e615403507d2822f7c9f9597fb7e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:13:53 +0200 Subject: [PATCH 249/688] python3.pkgs.ludios_wpull: fix constraint --- pkgs/development/python-modules/ludios_wpull/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix index 7bea2b04bbd4..e87146f6fbc3 100644 --- a/pkgs/development/python-modules/ludios_wpull/default.nix +++ b/pkgs/development/python-modules/ludios_wpull/default.nix @@ -8,15 +8,16 @@ , lxml , namedlist , sqlalchemy -, tornado_4 +, tornado , Yapsy +, pythonAtLeast }: buildPythonPackage rec { pname = "ludios_wpull"; version = "3.0.7"; - disabled = !isPy3k; + disabled = (!isPy3k) || (pythonAtLeast "3.8"); src = fetchFromGitHub { rev = version; @@ -25,7 +26,7 @@ buildPythonPackage rec { sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf"; }; - propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado_4 Yapsy ]; + propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ]; # Test suite has tests that fail on all platforms doCheck = false; @@ -35,5 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/ludios/wpull"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ivan ]; + broken = lib.versions.major tornado.version != "4"; }; } From 9cae7113888541bcea78be21c6a57ed564cb7d6e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:21:08 +0200 Subject: [PATCH 250/688] grab-site: override Python package set with desired tornado version --- pkgs/tools/backup/grab-site/default.nix | 14 +++++++++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 81e16ad005b2..e69823ab45d6 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,6 +1,14 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ stdenv, python37, fetchFromGitHub }: -python3Packages.buildPythonApplication rec { +let + python = python37.override { + self = python; + packageOverrides = self: super: { + tornado = super.tornado_4; + }; + }; + +in with python.pkgs; buildPythonApplication rec { version = "2.1.19"; name = "grab-site-${version}"; @@ -11,7 +19,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1v1hnhv5knzdl0kj3574ccwlh171vcb7faddp095ycdmiiybalk4"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ click ludios_wpull manhole lmdb autobahn fb-re2 websockets cchardet ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f290d376407a..cc3d9f8fa6f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12529,9 +12529,7 @@ in gperftools = callPackage ../development/libraries/gperftools { }; - grab-site = callPackage ../tools/backup/grab-site { - python3Packages = python37Packages; - }; + grab-site = callPackage ../tools/backup/grab-site { }; grib-api = callPackage ../development/libraries/grib-api { }; From 7ff98bd03d54db59ff799fc8c12f8f78adb07e31 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:23:40 +0200 Subject: [PATCH 251/688] mopidy: use latest tornado --- pkgs/applications/audio/mopidy/mopidy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index ae65d9b2f6ed..28216020b78a 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado_4 requests setuptools + gst-python pygobject3 pykka tornado requests setuptools ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; # There are no tests From 31643e45ec33a9d931889918e9e6cf485f8212fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:23:55 +0200 Subject: [PATCH 252/688] mopidy-iris: use latest tornado --- pkgs/applications/audio/mopidy/iris.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 796812a9bd0e..467ba6fe3f70 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ configobj requests - tornado_4 + tornado ]); # no tests implemented From 5b907a4d55bcc9984a87f7bdcc245252d989bc35 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:26:55 +0200 Subject: [PATCH 253/688] circus: override python package set to use tornado_4 --- pkgs/tools/networking/circus/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index 82c9db90432e..83395fc254d7 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -1,7 +1,14 @@ -{ stdenv, python3Packages }: +{ stdenv, python3 }: let - inherit (python3Packages) buildPythonApplication fetchPypi iowait psutil pyzmq tornado_4 mock; + python = python3.override { + self = python; + packageOverrides = self: super: { + tornado = tornado_4; + }; + }; + + inherit (python.pkgs) buildPythonApplication fetchPypi iowait psutil pyzmq tornado_4 mock six; in buildPythonApplication rec { @@ -23,7 +30,7 @@ buildPythonApplication rec { doCheck = false; # weird error - propagatedBuildInputs = [ iowait psutil pyzmq tornado_4 ]; + propagatedBuildInputs = [ iowait psutil pyzmq tornado six ]; meta = with stdenv.lib; { description = "A process and socket manager"; From 58fd044ad05ca57df3e7cbd0708fb20d829bdb97 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:31:35 +0200 Subject: [PATCH 254/688] pepper: use latest tornado, mark as broken Missing dependency. --- pkgs/tools/admin/salt/pepper/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index e2cfa806f95b..0c6e9dc0ab23 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -1,19 +1,19 @@ { lib -, pythonPackages +, python3Packages , salt }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "salt-pepper"; version = "0.7.5"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; sha256 = "1wh6yidwdk8jvjpr5g3azhqgsk24c5rlzmw6l86dmi0mpvmxm94w"; }; - buildInputs = with pythonPackages; [ setuptools setuptools_scm salt ]; - checkInputs = with pythonPackages; [ - pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado_4 + buildInputs = with python3Packages; [ setuptools setuptools_scm salt ]; + checkInputs = with python3Packages; [ + pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado ]; meta = with lib; { @@ -21,5 +21,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/saltstack/pepper"; maintainers = [ maintainers.pierrer ]; license = licenses.asl20; + broken = true; # ModuleNotFoundError: No module named 'pytestsalt' }; } From 42fa7a9108842f18d51dbbf0abcd0f17415fe19a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:31:57 +0200 Subject: [PATCH 255/688] pythonPackages: introduce top-level tornado_5 --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3148fbaaa4f..caf8f0f03586 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6939,8 +6939,12 @@ in { else callPackage ../development/python-modules/tornado/5.nix { }; + # Used by circus and grab-site, 2020-08-29 tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; + # Used by luigi, 2020-08-29 + tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; + tokenlib = callPackage ../development/python-modules/tokenlib { }; tunigo = callPackage ../development/python-modules/tunigo { }; From bf9cc225e9ac5d12a65edaefc30a862d4a443fbe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:33:34 +0200 Subject: [PATCH 256/688] luigi: use tornado_5 --- .../networking/cluster/luigi/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index f69082bff3a7..98b71cfe112e 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -1,15 +1,22 @@ -{ lib, python3Packages }: +{ lib, python3 }: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + self = python; + packageOverrides = self: super: { + tornado = super.tornado_5; + }; + }; +in with python.pkgs; buildPythonApplication rec { pname = "luigi"; version = "3.0.1"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "02c480f5pjgqsvqnkaw7f6n4nhdspmhq5w7lw8sgg2v3jghg8n7i"; }; - propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ]; + propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ]; # Requires tox, hadoop, and google cloud doCheck = false; From 54568a1bea064634759e89e46b54c15854188015 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:46:45 +0200 Subject: [PATCH 257/688] pythonPackages.django_1_11: no longer supported --- .../python-modules/django/1_11.nix | 34 ------------------- pkgs/top-level/python-packages.nix | 8 +---- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 pkgs/development/python-modules/django/1_11.nix diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix deleted file mode 100644 index b38962f4efaf..000000000000 --- a/pkgs/development/python-modules/django/1_11.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildPythonPackage, fetchurl, substituteAll, - geos, gdal, pytz, - withGdal ? false -}: - -buildPythonPackage rec { - pname = "Django"; - version = "1.11.28"; - - src = fetchurl { - url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k"; - }; - - patches = stdenv.lib.optionals withGdal [ - (substituteAll { - src = ./1.10-gis-libs.template.patch; - geos = geos; - gdal = gdal; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - }) - ]; - - propagatedBuildInputs = [ pytz ]; - - # too complicated to setup - doCheck = false; - - meta = with stdenv.lib; { - description = "A high-level Python Web framework"; - homepage = "https://www.djangoproject.com/"; - license = licenses.bsd3; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index caf8f0f03586..3a2ac3d52d15 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2894,9 +2894,7 @@ in { # Alias that we should deprecate dateutil = self.python-dateutil; - debugpy = callPackage ../development/python-modules/debugpy { - django = if isPy27 then self.django_1_11 else self.django; - }; + debugpy = callPackage ../development/python-modules/debugpy { }; decorator = callPackage ../development/python-modules/decorator { }; @@ -3756,10 +3754,6 @@ in { django_lts = self.django_2_2; - django_1_11 = callPackage ../development/python-modules/django/1_11.nix { - gdal = self.gdal; - }; - django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; From c4eb5ed6b0e1d0a2e4752f52f928e42f974297d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:47:43 +0200 Subject: [PATCH 258/688] circus: fix eval --- pkgs/tools/networking/circus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index 83395fc254d7..ea03f8878b20 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -4,11 +4,11 @@ let python = python3.override { self = python; packageOverrides = self: super: { - tornado = tornado_4; + tornado = super.tornado_4; }; }; - inherit (python.pkgs) buildPythonApplication fetchPypi iowait psutil pyzmq tornado_4 mock six; + inherit (python.pkgs) buildPythonApplication fetchPypi iowait psutil pyzmq tornado mock six; in buildPythonApplication rec { From 19023de862ded12fc50cfd2abd54fdc04391b553 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sat, 29 Aug 2020 14:34:46 +0200 Subject: [PATCH 259/688] htop: 2.2.0 -> 3.0.0 --- pkgs/tools/system/htop/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index c9adf5377e23..e95dece2c965 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,24 +1,22 @@ -{ lib, fetchurl, stdenv, ncurses, +{ lib, fetchFromGitHub, stdenv, autoreconfHook, ncurses, IOKit, python3 }: stdenv.mkDerivation rec { pname = "htop"; - version = "2.2.0"; + version = "3.0.0"; - src = fetchurl { - url = "https://hisham.hm/htop/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; + src = fetchFromGitHub { + owner = "htop-dev"; + repo = pname; + rev = version; + sha256 = "096gdnpaszs5rfp7qj8npi2jkvdqpp8mznn89f97ykrg6pgagwq4"; }; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ autoreconfHook python3 ]; buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; - prePatch = '' - patchShebangs scripts/MakeHeader.py - ''; - meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; homepage = "https://hisham.hm/htop/"; From 73da67e5c1a232a70680fca51e47c613431a84c6 Mon Sep 17 00:00:00 2001 From: Massimo Redaelli Date: Fri, 28 Aug 2020 13:58:09 +0200 Subject: [PATCH 260/688] dot-http: init at 0.2.0 --- pkgs/development/tools/dot-http/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/dot-http/default.nix diff --git a/pkgs/development/tools/dot-http/default.nix b/pkgs/development/tools/dot-http/default.nix new file mode 100644 index 000000000000..1c81a4145d29 --- /dev/null +++ b/pkgs/development/tools/dot-http/default.nix @@ -0,0 +1,28 @@ +{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "dot-http"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "bayne"; + repo = pname; + rev = "v${version}"; + sha256 = "1s2q4kdldhb5gd14g2h6vzrbjgbbbs9zp2dgmna0rhk1h4qv0mml"; + }; + + cargoSha256 = "0an3hskq1k2j4gdn8wvhfb9pqsc34ibs5bv7sjznkp5jma6fdr9w"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv Security + ]; + + meta = with stdenv.lib; { + description = "Text-based scriptable HTTP client"; + homepage = "https://github.com/bayne/dot-http"; + license = licenses.asl20; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41e9af14a375..748e3e659853 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -985,6 +985,10 @@ in dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; + dot-http = callPackage ../development/tools/dot-http { + inherit (darwin.apple_sdk.frameworks) Security; + }; + doona = callPackage ../tools/security/doona { }; ecdsautils = callPackage ../tools/security/ecdsautils { }; From 0d1b4120fdd30dc5b2e0a4364f7fa5abd7257190 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 29 Aug 2020 09:02:51 -0400 Subject: [PATCH 261/688] zabbix: 4.0.20 -> 4.0.24 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index f867c819d07f..9fe0b496b263 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -5,8 +5,8 @@ generic: { }; v40 = generic { - version = "4.0.20"; - sha256 = "0h6qx4imrf5inmmczxir81a9xhra8a1dxxv538mqhxhbpqn1yh3w"; + version = "4.0.24"; + sha256 = "01nm0pqsb168qawm1j7b3lixbwkz6hi8hd2052q6dlzqm7s2mi2s"; }; v30 = generic { From e5fb3a98d8554a9922a70b756411eede70dfb531 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 29 Aug 2020 09:05:14 -0400 Subject: [PATCH 262/688] zabbix: 5.0.2 -> 5.0.3 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 9fe0b496b263..2552964fe880 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v50 = generic { - version = "5.0.2"; - sha256 = "1cnns7ixqi7ank3cbvcs7d8rb5zh9qiqbmgivazr83jnz81qg46w"; + version = "5.0.3"; + sha256 = "1dc3fb9pa2cr6mfwgfyy1hpx26pbrws7989wj2kiiilmvimvrz1l"; }; v40 = generic { From 7c379ea8c9298f7281a8017ec5f6d2ab5ae6ad75 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 15:48:13 +0200 Subject: [PATCH 263/688] faust2: reenable emscripten --- pkgs/applications/audio/faust/faust2.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 9bf4d3a5704d..515f8a6f9af2 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -5,8 +5,7 @@ , pkgconfig , cmake , llvm -# TODO: put back when it builds again -# , emscripten +, emscripten , openssl , libsndfile , libmicrohttpd @@ -47,7 +46,7 @@ let inherit src; nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ]; - buildInputs = [ llvm /*emscripten*/ openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; + buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; passthru = { From 67a280c90b1fe6fc799d90435a3824a45e088dbc Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 15:45:53 +0200 Subject: [PATCH 264/688] mathlibtools: init at 0.0.10 --- .../python-modules/mathlibtools/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/mathlibtools/default.nix diff --git a/pkgs/development/python-modules/mathlibtools/default.nix b/pkgs/development/python-modules/mathlibtools/default.nix new file mode 100644 index 000000000000..f9c1cf6839f0 --- /dev/null +++ b/pkgs/development/python-modules/mathlibtools/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, PyGithub, GitPython, toml, click, tqdm, + paramiko, networkx, pydot, pyyaml }: + +buildPythonPackage rec { + pname = "mathlibtools"; + version = "0.0.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "0d708bgsxjhhchqc56afi1h7k87vbfn7v40f4y1zlv7hsjc69s36"; + }; + + propagatedBuildInputs = [ + PyGithub GitPython toml click tqdm paramiko networkx pydot pyyaml + ]; + + # requires internet access + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/leanprover-community/mathlib-tools"; + description = "leanproject is a supporting tool for Lean's mathlib"; + license = licenses.asl20; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a8d0d94a105..1812b761427a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25981,6 +25981,7 @@ in lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; elan = callPackage ../applications/science/logic/elan {}; + mathlibtools = with python3Packages; toPythonApplication mathlibtools; leo2 = callPackage ../applications/science/logic/leo2 { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a2ac3d52d15..72c96fd933e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -992,6 +992,8 @@ in { matchpy = callPackage ../development/python-modules/matchpy { }; + mathlibtools = callPackage ../development/python-modules/mathlibtools {}; + maxminddb = callPackage ../development/python-modules/maxminddb { }; mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py; From 0be4c800018875dbf939dcc0310b0a98c319f06b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 20:56:25 +0000 Subject: [PATCH 265/688] closurecompiler: 20200614 -> 20200719 --- pkgs/development/compilers/closure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 2ee1223a53b3..7c0d42f1864e 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200614"; + version = "20200719"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0a54y2d9nfg60knfv34kf6sdsh065dzam86l3wprf8gvqffxxcli"; + sha256 = "18095i98mk5kc1vpaf6gvmvhiyl2x4zrcwd7ix5l98jydldiz7wx"; }; sourceRoot = "."; From e435c543166b51d6b392c12afbb31f3a4a470165 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sat, 29 Aug 2020 16:11:09 +0700 Subject: [PATCH 266/688] pythonPackages.tldextract: add missing setuptools_scm dependency --- pkgs/development/python-modules/tldextract/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 8be197e5ca58..b7df857533a0 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage, setuptools_scm , requests, requests-file, idna, pytest , responses }: @@ -14,6 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests requests-file idna ]; checkInputs = [ pytest responses ]; + nativeBuildInputs = [ setuptools_scm ]; meta = { homepage = "https://github.com/john-kurkowski/tldextract"; From 1d9f62e14b3cbc88a7e9d3057afe50f922e86eae Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 16:18:23 +0200 Subject: [PATCH 267/688] python3Packages.rq: 1.5.0 -> 1.5.1 --- pkgs/development/python-modules/rq/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index b0d06b014c7c..66ca024b2bb5 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy27, click, redis }: +{ stdenv, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }: buildPythonPackage rec { pname = "rq"; - version = "1.5.0"; + version = "1.5.1"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "370fc800903c226b898a10174e069a23077b74b22297b4b20e925ca82fcd9471"; + src = fetchFromGitHub { + owner = "rq"; + repo = "rq"; + rev = "v${version}"; + sha256 = "0i7yyw828wdvl7ap4gb7jhm4p94502is3xxrgrdgwwp0l1rac004"; }; # test require a running redis rerver, which is something we can't do yet From 2aabbf90a77d9c3cd3da57461f57badf7fcf9a27 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 16:24:06 +0200 Subject: [PATCH 268/688] Revert "python: kombu: 4.6.11 -> 5.0.0" This reverts commit a34aba72c9ff1b80a888b6762008191595a7ca58. --- pkgs/development/python-modules/kombu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 73c8485ae7a4..560cd4383b1e 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.0.0"; + version = "4.6.11"; src = fetchPypi { inherit pname version; - sha256 = "7c949fe33573a971f06c8836ca025390088f3747533b78438f9a57344a142b59"; + sha256 = "ca1b45faac8c0b18493d02a8571792f3c40291cf2bcf1f55afed3d8f3aa7ba74"; }; postPatch = '' From a97efc7442bf25e808046b14a3daf125ab40ccdc Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sat, 29 Aug 2020 10:34:43 -0400 Subject: [PATCH 269/688] noaa-apt: init at 1.2.0 --- pkgs/applications/radio/noaa-apt/default.nix | 64 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/radio/noaa-apt/default.nix diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/applications/radio/noaa-apt/default.nix new file mode 100644 index 000000000000..55703ea44d6d --- /dev/null +++ b/pkgs/applications/radio/noaa-apt/default.nix @@ -0,0 +1,64 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, atk +, cairo +, gdk-pixbuf +, glib +, gtk3 +, openssl +, pango +}: + +rustPlatform.buildRustPackage rec { + pname = "noaa-apt"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "martinber"; + repo = "noaa-apt"; + rev = "v${version}"; + sha256 = "0fqki4a9c54rixdz5bpswvn433f9saw6yazgw4av3xdd7g2fdvvj"; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk3 + openssl + pango + ]; + + cargoSha256 = "1pzcq31inazmc9cz31fspzqkp0lpkjid8ai3g17sin1pfzby5jlh"; + + preBuild = '' + # Used by macro pointing to resource location at compile time. + export NOAA_APT_RES_DIR=$out/share/noaa-apt + ''; + + postInstall = '' + # Resources. + mkdir -p $out/share/noaa-apt + cp -R $src/res/* $out/share/noaa-apt/ + + # Desktop icon. + install -Dm644 -t $out/share/applications $src/debian/ar.com.mbernardi.noaa-apt.desktop + install -Dm644 -t $out/share/icons/hicolor/48x48/apps $src/debian/noaa-apt.png + install -Dm644 -t $out/share/icons/hicolor/scalable/apps $src/debian/noaa-apt.svg + ''; + + meta = with lib; { + description = "NOAA APT image decoder."; + homepage = "http://noaa-apt.mbernardi.com.ar/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ trepetti ]; + changelog = "https://github.com/martinber/noaa-apt/releases/tag/v${version}"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c7911331cbe..94c03735e640 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21848,6 +21848,8 @@ in nixos-shell = callPackage ../tools/virtualization/nixos-shell {}; + noaa-apt = callPackage ../applications/radio/noaa-apt { }; + node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; ninjas2 = callPackage ../applications/audio/ninjas2 {}; From 1680f2f77a4c81b1efbe765deff384e7eacb606e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 14:36:16 +0000 Subject: [PATCH 270/688] sagittarius-scheme: 0.9.6 -> 0.9.7 --- pkgs/development/compilers/sagittarius-scheme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix index 4b1358b72472..dcc3457fe112 100644 --- a/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" in stdenv.mkDerivation rec { pname = "sagittarius-scheme"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; - sha256 = "03nvvvfd4gdlvq244zpnikxxajp6w8jj3ymw4bcq83x7zilb2imr"; + sha256 = "18pjj6f5qvixv5hbl1k4d3jqfcmi9qyx0gz0cjwrzpxa8brpwld8"; }; preBuild = '' # since we lack rpath during build, need to explicitly add build path From c9bc95d613f39e48d5cb2d6942d3c2d679b96285 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 16:40:31 +0200 Subject: [PATCH 271/688] python3Packages.pure-eval: init at 0.1.0 --- .../python-modules/pure-eval/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/pure-eval/default.nix diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix new file mode 100644 index 000000000000..d7e92f09784b --- /dev/null +++ b/pkgs/development/python-modules/pure-eval/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, setuptools_scm, toml, pytest }: + +buildPythonPackage rec { + pname = "pure_eval"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "alexmojaki"; + repo = pname; + rev = "v${version}"; + sha256 = "1d3gpc9mrmwdk6l87x7ll23vwv6l8l2iqvi63r86j7bj5s8m2ci8"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ toml ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "Safely evaluate AST nodes without side effects"; + homepage = "http://github.com/alexmojaki/pure_eval"; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a2ac3d52d15..d0c1fdf8fd89 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1164,6 +1164,8 @@ in { pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; + pure-eval = callPackage ../development/python-modules/pure-eval {}; + purl = callPackage ../development/python-modules/purl { }; pyclipper = callPackage ../development/python-modules/pyclipper { }; From 55e8fa4db71ec655a81b9a155c3c4bfa455ab4f1 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 16:40:44 +0200 Subject: [PATCH 272/688] python3Packages.sentry-sdk: fix build --- pkgs/development/python-modules/sentry-sdk/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index f99527d070ac..8aa61748af86 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -19,6 +19,9 @@ , urllib3 , trytond , werkzeug +, executing +, pure-eval +, asttokens }: buildPythonPackage rec { @@ -30,7 +33,8 @@ buildPythonPackage rec { sha256 = "e12eb1c2c01cd9e9cfe70608dbda4ef451f37ef0b7cbb92e5d43f87c341d6334"; }; - checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug trytond ] + checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug trytond + executing pure-eval asttokens ] ++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ]; propagatedBuildInputs = [ urllib3 certifi ]; From 50f728ece35ad0731311dd35fd92915eaf49f9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 28 Aug 2020 21:04:10 +0200 Subject: [PATCH 273/688] rustscan: init at 1.8.0 --- pkgs/tools/security/rustscan/default.nix | 37 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/security/rustscan/default.nix diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix new file mode 100644 index 000000000000..2a2e8c7ec6c5 --- /dev/null +++ b/pkgs/tools/security/rustscan/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, nmap +}: + +rustPlatform.buildRustPackage rec { + pname = "rustscan"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "RustScan"; + repo = pname; + rev = "${version}"; + sha256 = "0rkqsh4i58cf18ad97yr4f68s5jg6z0ybz4bw8607lz7cjkfvjay"; + }; + + cargoSha256 = "0mj214f2md7kjknmcayc5dcfmlk2b8mqkn7kxzdis8qv9a5xcbk8"; + + postPatch = '' + substituteInPlace src/main.rs \ + --replace 'Command::new("nmap")' 'Command::new("${nmap}/bin/nmap")' + ''; + + checkFlags = [ + "--skip=infer_ulimit_lowering_no_panic" + "--skip=google_dns_runs" + "--skip=parse_correct_ips_or_hosts" + ]; + + meta = with lib; { + description = "Faster Nmap Scanning with Rust"; + homepage = "https://github.com/RustScan/RustScan"; + license = licenses.gpl3Only; + maintainers = [ maintainers.SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2f14c416154..7f5ad84cc15f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6712,6 +6712,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + rustscan = callPackage ../tools/security/rustscan { }; + rw = callPackage ../tools/misc/rw { }; rxp = callPackage ../tools/text/xml/rxp { }; From 88f881c9c724a6c764181faeb1d82ff25d25ab11 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 15:35:04 +0000 Subject: [PATCH 274/688] siege: 4.0.6 -> 4.0.7 --- pkgs/tools/networking/siege/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 21b6bd346fd1..7e85973cbdb6 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "siege-4.0.6"; + name = "siege-4.0.7"; src = fetchurl { url = "http://download.joedog.org/siege/${name}.tar.gz"; - sha256 = "03w0iska74nb6r8wnljn7inasbq7qflf55vjmxnb9jrc4pi7mpnw"; + sha256 = "1y3dnl1ziw0c0d4nw30aj0sdmjvarn4xfxgfkswffwnkm8z5p9xz"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; From afccde82655d330dbfdd36e9085bd455e446b8b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 15:42:38 +0000 Subject: [PATCH 275/688] speechd: 0.9.1 -> 0.10.1 --- pkgs/development/libraries/speechd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index eab6c1d446cd..fbf399cb246e 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -39,11 +39,11 @@ let throw "You need to enable at least one output module."; in stdenv.mkDerivation rec { pname = "speech-dispatcher"; - version = "0.9.1"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "16bg52hnkrsrs7kgbzanb34b9zb6fqxwj0a9bmsxmj1skkil1h1p"; + sha256 = "0j2lfzkmbsxrrgjw6arzvnfd4jn5pxab28xsk2djssr2ydb9x309"; }; patches = [ From 66cb0b52a1619fbab1ee73b580dcd8ef730b556e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 29 Aug 2020 10:13:26 -0700 Subject: [PATCH 276/688] nixpkgs-review: 2.3.1 -> 2.4.0 --- pkgs/tools/package-management/nixpkgs-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 922546009fca..935f6553f9cd 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "1v988jsxx2r82q6mf3503130cny088hin2as00yi26jzxjkrjcli"; + sha256 = "0kca4442mla8j9980gi8kgp0vgm0f15hcjd0w0wdj8rlmkx9yf2l"; }; makeWrapperArgs = [ From c408178cabe18922957c4196532edb44a782dedd Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 27 Aug 2020 12:17:59 +0200 Subject: [PATCH 277/688] firefox: 79.0 -> 80.0 --- pkgs/applications/networking/browsers/firefox/common.nix | 8 ++++++++ .../applications/networking/browsers/firefox/packages.nix | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2fc15a42a8bf..1f1831d3c918 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -141,6 +141,14 @@ stdenv.mkDerivation ({ postPatch = '' rm -rf obj-x86_64-pc-linux-gnu + '' + lib.optionalString (lib.versionAtLeast ffversion "80") '' + substituteInPlace dom/system/IOUtils.h \ + --replace '#include "nspr/prio.h"' '#include "prio.h"' + + substituteInPlace dom/system/IOUtils.cpp \ + --replace '#include "nspr/prio.h"' '#include "prio.h"' \ + --replace '#include "nspr/private/pprio.h"' '#include "private/pprio.h"' \ + --replace '#include "nspr/prtypes.h"' '#include "prtypes.h"' ''; nativeBuildInputs = diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 62181321cac9..a4f423fd8abb 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "79.0"; + ffversion = "80.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0zgf7wdcz992a4dy1rj0ax0k65an7h9p9iihka3jy4jd7w4g2d0x4mxz5iqn2y26hmgnkvjb921zh28biikahgygqja3z2pcx26ic0r"; + sha512 = "3rw30gs1wvd6m2sgsp1wm29rrbkxyf3jsdy8i0azfz9w7hqcfwnv76j3cdf18xghh954hpn3q6w1hr7pgab3z9zjxzyfcnh2mbabyvc"; }; patches = [ From ba671f6906fa184ebdf2a6d6a13d0ac49c5f3ed0 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 27 Aug 2020 12:30:47 +0200 Subject: [PATCH 278/688] firefox-esr-78: 78.1.0esr -> 78.2.0esr --- 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 a4f423fd8abb..e378efa475e3 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -35,10 +35,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.1.0esr"; + ffversion = "78.2.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "223v796vjsvgs3yw442c8qbsbh43l1aniial05rl70hx44rh9sg108ripj8q83p5l9m0sp67x6ixd2xvifizv6461a1zra1rvbb1caa"; + sha512 = "1dnvr9nyvnv5dkpnjnadff38lf9r7g37gk401c1i22d661ib5xj0gm2rnz1rjyrkvzrnr6p9f7liy3i41varja00g0x1racccj1my9q"; }; patches = [ From 057b30b698a5fbf961973f7d7b8f25ab92864077 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 27 Aug 2020 12:33:38 +0200 Subject: [PATCH 279/688] firefox-esr-68: 68.11.0esr -> 68.12.0esr --- 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 e378efa475e3..ce9365f72fe5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -63,10 +63,10 @@ rec { firefox-esr-68 = (common rec { pname = "firefox-esr"; - ffversion = "68.11.0esr"; + ffversion = "68.12.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0zg41jnbnpsa07xaizwfsmfav0cgxdqnh8i4yanxy49a45gigk895zqrx2if7pfsmdnj9zpwj9prj8cpnpsfhv6p62f3g2596aa9kvx"; + sha512 = "169y4prlb4mi31jciz89kp35rpb1p2gxrk93qkwfzdk4imi9hk8mi2yvxknpr0rni3bn2x0zgrrc6ccr8swv5895sqvv1sc5r1056w3"; }; patches = [ From 7e14da6138f433bc6606a24f7e1dbc7f0aca3ace Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Aug 2020 17:06:12 +0200 Subject: [PATCH 280/688] python3.pkgs.lml: init at 0.9.0 --- .../python-modules/lml/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/lml/default.nix diff --git a/pkgs/development/python-modules/lml/default.nix b/pkgs/development/python-modules/lml/default.nix new file mode 100644 index 000000000000..c1320eef04ce --- /dev/null +++ b/pkgs/development/python-modules/lml/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, mock +}: + +buildPythonPackage rec { + pname = "lml"; + version = "0.0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "6luoF7Styen1whclzSR1+RKTO34t/fB5Ku2AB3FU9j8="; + }; + + checkInputs = [ + nose + mock + ]; + + checkPhase = "nosetests"; + + meta = { + description = "Load me later. A lazy plugin management system for Python"; + homepage = "http://lml.readthedocs.io/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 286ac476fb4b..52d3430f5653 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4693,6 +4693,8 @@ in { inherit (pkgs) fuse pkgconfig; # use "real" fuse and pkgconfig, not the python modules }; + lml = callPackage ../development/python-modules/lml { }; + locustio = callPackage ../development/python-modules/locustio { }; llvmlite = callPackage ../development/python-modules/llvmlite { From 4bfca7c7515f1cbb20377f495f392426e08fc6ba Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Aug 2020 17:12:15 +0200 Subject: [PATCH 281/688] python3.pkgs.pyexcel-io: init at 0.5.20 --- .../python-modules/pyexcel-io/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/pyexcel-io/default.nix diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix new file mode 100644 index 000000000000..8a788402b491 --- /dev/null +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lml +}: + +buildPythonPackage rec { + pname = "pyexcel-io"; + version = "0.5.20"; + + src = fetchPypi { + inherit pname version; + sha256 = "CN/jlVO5ljWbFD3j2exD4ZbxE41HyrtzrwShaCG4TXk="; + }; + + propagatedBuildInputs = [ + lml + ]; + + # Tests depend on stuff that depends on this. + doCheck = false; + + pythonImportsCheck = [ "pyexcel_io" ]; + + meta = { + description = "One interface to read and write the data in various excel formats, import the data into and export the data from databases"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52d3430f5653..4a2b77b69a18 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5576,6 +5576,8 @@ in { pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; }; + pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; + pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; pyext = callPackage ../development/python-modules/pyext { }; From cadb4676c6458d298fbf5eba21471ee374204521 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Aug 2020 17:24:27 +0200 Subject: [PATCH 282/688] python3.pkgs.pyexcel: init at 0.6.4 --- .../python-modules/pyexcel/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/pyexcel/default.nix diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix new file mode 100644 index 000000000000..71219c32ae5c --- /dev/null +++ b/pkgs/development/python-modules/pyexcel/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, lml +, pyexcel-io +, texttable +, nose +}: + +buildPythonPackage rec { + pname = "pyexcel"; + version = "0.6.4"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "pPNYnimHhW7SL6X6OLwagZoadTD7IdUSbO7vAqQPQu8="; + }; + + propagatedBuildInputs = [ + lml + pyexcel-io + texttable + ]; + + checkInputs = [ + nose + ]; + + # Tests depend on pyexcel-xls & co. causing circular dependency. + # https://github.com/pyexcel/pyexcel/blob/dev/tests/requirements.txt + doCheck = false; + + pythonImportsCheck = [ "pyexcel" ]; + + checkPhase = "nosetests"; + + meta = { + description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a2b77b69a18..07fae4f32c5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5576,6 +5576,8 @@ in { pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; }; + pyexcel = callPackage ../development/python-modules/pyexcel { }; + pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; From 9357dfc2990cb2f5e3403b6dcedeb45d1b000044 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Aug 2020 17:33:58 +0200 Subject: [PATCH 283/688] python3.pkgs.pyexcel-xsl: init at 0.5.8 --- .../python-modules/pyexcel-xls/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pyexcel-xls/default.nix diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix new file mode 100644 index 000000000000..40d90deacc5b --- /dev/null +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyexcel-io +, xlrd +, xlwt +, nose +}: + +buildPythonPackage rec { + pname = "pyexcel-xls"; + version = "0.5.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "LTPrS9ja37jHO1zMaiONZbORTomnVTsfObk5exfL5AI="; + }; + + propagatedBuildInputs = [ + pyexcel-io + xlrd + xlwt + ]; + + # Tests are not included in the archive. + # https://github.com/pyexcel/pyexcel-xls/issues/35 + doCheck = false; + + pythonImportsCheck = [ "pyexcel_xls" ]; + + meta = { + description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07fae4f32c5d..ea5c51e9248e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5580,6 +5580,8 @@ in { pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; + pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; + pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; pyext = callPackage ../development/python-modules/pyext { }; From 48413581b140ef5522574dda1553aec83b8eced9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Aug 2020 17:37:29 +0200 Subject: [PATCH 284/688] python3.pkgs.pyexcel-ods: init at 0.5.6 --- .../python-modules/pyexcel-ods/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pyexcel-ods/default.nix diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix new file mode 100644 index 000000000000..9e5b32ea8671 --- /dev/null +++ b/pkgs/development/python-modules/pyexcel-ods/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyexcel-io +, odfpy +, nose +, pyexcel +, pyexcel-xls +, psutil +}: + +buildPythonPackage rec { + pname = "pyexcel-ods"; + version = "0.5.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "O+Uv2KrdvYvJKG9+sUj0VT1MlyUtaVw6nse5XmZmoiM="; + }; + + propagatedBuildInputs = [ + pyexcel-io + odfpy + ]; + + checkInputs = [ + nose + pyexcel + pyexcel-xls + psutil + ]; + + checkPhase = "nosetests"; + + meta = { + description = "Plug-in to pyexcel providing the capbility to read, manipulate and write data in ods formats using odfpy"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea5c51e9248e..c31ab2a49ed2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5582,6 +5582,8 @@ in { pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; + pyexcel-ods = callPackage ../development/python-modules/pyexcel-ods { }; + pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; pyext = callPackage ../development/python-modules/pyext { }; From 24d309bedf226c80c30364ab48e8425805ce884b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 03:09:35 +0000 Subject: [PATCH 285/688] python27Packages.splinter: 0.13.0 -> 0.14.0 --- pkgs/development/python-modules/splinter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index 1ff38f0a6dfb..fde5733a864a 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "9e92535f273622507ac157612c3bb0e9cee7b5ccd2aa097d47b408e34c2ca356"; + sha256 = "459e39e7a9f7572db6f1cdb5fdc5ccfc6404f021dccb969ee6287be2386a40db"; }; propagatedBuildInputs = [ selenium ]; From 1beb19e39d79ff0419a3aaed9791e0e5bf910986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 28 Aug 2020 18:23:27 +0200 Subject: [PATCH 286/688] python3Packages.mmh3: init at 2.5.1 --- .../python-modules/mmh3/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/mmh3/default.nix diff --git a/pkgs/development/python-modules/mmh3/default.nix b/pkgs/development/python-modules/mmh3/default.nix new file mode 100644 index 000000000000..8ac241880039 --- /dev/null +++ b/pkgs/development/python-modules/mmh3/default.nix @@ -0,0 +1,23 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "mmh3"; + version = "2.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0265pvfbcsijf51szsh14qk3l3zgs0rb5rbrw11zwan52yi0jlhq"; + }; + + pythonImportsCheck = [ "mmh3" ]; + + meta = with lib; { + description = "Python wrapper for MurmurHash3, a set of fast and robust hash functions"; + homepage = "https://pypi.org/project/mmh3/"; + license = licenses.cc0; + maintainers = [ maintainers.danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c31ab2a49ed2..cd655a8402a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7629,6 +7629,8 @@ in { ftfy = callPackage ../development/python-modules/ftfy { }; + mmh3 = callPackage ../development/python-modules/mmh3 { }; + murmurhash = callPackage ../development/python-modules/murmurhash { }; pkuseg = callPackage ../development/python-modules/pkuseg { }; From ef3dc7be2387228f9a5c894118318a5a0c82c80e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 28 Aug 2020 18:23:54 +0200 Subject: [PATCH 287/688] python3Packages.deepdiff: fix by adding mmh3 dependency --- pkgs/development/python-modules/deepdiff/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 920fc68e1bbb..e8d2731eb559 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -3,6 +3,7 @@ , fetchPypi , mock , jsonpickle +, mmh3 , ordered-set , numpy , pytestCheckHook @@ -24,14 +25,9 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # skipped tests require murmur module - "test_prep_str_murmur3_64bit" - "test_prep_str_murmur3_128bit" - ]; - propagatedBuildInputs = [ jsonpickle + mmh3 ordered-set ]; From b12ca077c011122a0303a856944ea746f719df1d Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 29 Aug 2020 21:17:20 +0200 Subject: [PATCH 288/688] firefox-bin: 79.0 -> 80.0 (#96279) --- .../browsers/firefox-bin/release_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 618a6fc519db..e8e5109351e4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "79.0"; + version = "80.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ach/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ach/firefox-80.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "25571c5d9aa4294f84d3e8aceb501efcadcc7d80dae799ee7246391782079885"; + sha256 = "4679b0ce4913b2c240f873fe5898234362d0b2cd6777e73ce272f37950edfd02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/af/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/af/firefox-80.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "400edad1b17de72f33237d5c0fbe20dee9a2032aac41745339d62eaafd36b157"; + sha256 = "ae2f6e7d46344f56599ef1e7ba3f3321636ee378e8e1a4c0b8e652c5e71b932b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/an/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/an/firefox-80.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "13971db840762cbe9b54c917c1cae459259df1bfc8783d0659accf539dc0bf05"; + sha256 = "8ae2ea7f6184f5f0cd5bc937924cfc5d813bb8bb0ea3e4e0770352b15291c043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ar/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ar/firefox-80.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7c8f5692e483667ccc173d9205ab5b5b77b4e4d50a5643f4ac531b1809a97d80"; + sha256 = "54926c7b61e4d99f1d49f709fad198604c5e5af165d60a96c6f5cb1a94f73884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ast/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ast/firefox-80.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "50cc5928b1877be40e29f30b51cfd183d9196bf73f68234866eff9e0e50c2e36"; + sha256 = "589262534a8665387cbbb3c13f5003738bca4c5673884bda831a4858aa73de54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/az/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/az/firefox-80.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "6f8f0b486652ac7bb4e3808a02b123acbd4babd6b272c503c6fc14159278d492"; + sha256 = "60bfac6b93deff04f63c67dc9944d3df8efb314054ed6ee8f93d3b09db8608b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/be/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/be/firefox-80.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "f2dd77674d83b888e2016177eb80c7855a7fa26318ec052fbb919fd2abab6561"; + sha256 = "48cdbcb785f190dce708db6ca1fc711d5d2411da0f544b3a5d03aba6665efa1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bg/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bg/firefox-80.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "08514f73d202ed1f53f0ef23de3093ac7eb08049fedf3bb09b69c98148efb99b"; + sha256 = "a48fbe5f88ec729c1becbf7c63957ee48cd7692d153dcf709dd038ce1a218317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bn/firefox-80.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "7f5114a60d966e2dedb95c1b65696bd3b04d25eb057b9a109d8bb0dc43b46f40"; + sha256 = "38245ddeeaa699941f54ba3d3d0fc3e804b57d4e8a6a0d1c58cf25d7c271a23c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/br/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/br/firefox-80.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "816dbbdd0f86874aad38733a30b54e683c7b18557c34d977ced6cd17ddf8b125"; + sha256 = "6766542a98977e6f2329b76345ab8f59d545479f1564261a47c0cb7b7db1e3d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bs/firefox-80.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "6c975f990120e9c70121eea464e9c375df40f6aa78275922d005096135044067"; + sha256 = "9bcd21931680502a9a5459f82a6d103d8b367b09cfa9048f54d87ca654e39e34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca-valencia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca-valencia/firefox-80.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e993527db5fac86e5a503cb7615c073363d73c733837f7acc66b30d17b7a369d"; + sha256 = "a666b19726a6d10863cf351059dc45f610cd0356e2220a8d9e2a5bf2df0fde3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca/firefox-80.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "8ac5bfa08c2f082816c4f7bc45a0ebdadd04a078efcd172049899890ddcc3ffc"; + sha256 = "458e791ac8025a56a7a9444aeb8aa1138f5108c5a5cd1d87a31bbe71c6ed51ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cak/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cak/firefox-80.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "76680375d4f2ffb8f70414e2f934fe442e30d50c1921f7eb596f1325ee01a155"; + sha256 = "890f462890cdc825e138d174e396b78e10f74111d01da47514a8e449ee470676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cs/firefox-80.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "99f83abcdc15839e879b7cced936fc3bb628d8b42f5381dad980d444d4fcfe1f"; + sha256 = "98e1bec6f176bc83da232b76b33e6dfe09db91c4be1424cf0c7b4e18e26b8d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cy/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cy/firefox-80.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d81fee7d2b5b8177f1b28f4e4d05f4b266b876adcf5ed62a7d458465ca50bf42"; + sha256 = "06b649bc87eea5c81fa37873582a963d972cbc3d0a65fa9fcc12c67c107ccfbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/da/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/da/firefox-80.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "40fdbaa88e3ac77d4cc846bf01b00ba1cdb5d3241f7af8a47efc92c929c862e1"; + sha256 = "98328f0f7ec2b807717fd4ae6aaeb7daaae8a962eb929b760598f225f6d9e784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/de/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/de/firefox-80.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6635eb71b5f4dc01ceed02771cc4e7bf7b3ba340c75f471fb7ecfde8170f838b"; + sha256 = "401877f41fd2bda02d0cbb7737f029f648e1d2b3c9642b093ef8bd4342f13712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/dsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/dsb/firefox-80.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "afe56bea25e44fbd3cd1fff7411cc20473ed0212500304ed865a985c2565594c"; + sha256 = "408ae85999139ba5c027bbf9ca20157b991e741349aae77176c012b862a7b4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/el/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/el/firefox-80.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b83801b722069d476bdb3325051f6e0bf2c34b6081320b82824aaf218d0f968a"; + sha256 = "430c1062e9edc9bc4a0a47268782cb7928214df074aec17e2e3a283b7bfa69d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-CA/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-CA/firefox-80.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e5a1a6e755cf35287f455a36c2019157fc7a0de6296c0af5949f7d33c55c871b"; + sha256 = "7f8d97a5643c959eb09119264c8829c7b7227c01f8e035b17f3c21eee3d1e0c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-GB/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-GB/firefox-80.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "709d89f99e96d76a77b0a1a40d7f2ef49d6709b41336973c114fc25fee2f1d49"; + sha256 = "d2361c90c46dc43eae25ff53440157322351645d6a20ed077e2496fbc3b955bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-US/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-US/firefox-80.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d57ce2ec9d39d4f0e1100a2faf7cfdc827eeb45db672511d5a6aea7229430f85"; + sha256 = "84191f06dd927cd16b8c0900e6c330f68cc8012bc48e9277891282a2d6f7bce7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eo/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eo/firefox-80.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "facef477b06aab7d67580c6931d97a26c5a7a9ae9555d92c7f31227d0e944dcd"; + sha256 = "8a9f5359cbb0d8a0d173d3302181ab41f463d8cf6b17f9c06e33432a95d79b0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-AR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-AR/firefox-80.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "43449d930cfd29ff06a1f38b3a36cf7b2bb7aa4feef1a4509f60f1370f08539e"; + sha256 = "0f5e7d4a23daab7c96cf706fe1c5a62d9a244d39bf6be97325cfcc1d699936c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-CL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-CL/firefox-80.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "fd821e8cf3c2f67f0993d08dc43026b1f5454a91102dc44706587d5744a63d1c"; + sha256 = "fd914b5892f2aa297054e79c6d6d863f1b4d88ab1a2bfae3d40192848c9efd64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-ES/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-ES/firefox-80.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b1db4d75e75bd4329cc8ff4e637f920ebab47384442fae56584f170421a18657"; + sha256 = "b87aa07e99d0c8d3a17c76bc7e281f8309cda97565bbfa4dff653326fb2bbcb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-MX/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-MX/firefox-80.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b08ce5a33ada7d551b341693545ec7d9c30afc4529a3e33f55836a4e2bec1a41"; + sha256 = "ffb619b95658d5001a036e0906689f12520cc25d541c4b5b154e44e4b176da33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/et/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/et/firefox-80.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5fea2b490a7323cf9cec5e02fd148aab16c18a4bc107b1f267ca2b442eb2d53e"; + sha256 = "2558280c2fa85aa3a2fdfc59994de6a593ccbb6a7141e76c21e5318152b6e992"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eu/firefox-80.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "98f89c8e3efcdc3585c6cd0cd6de6b5ab7ab7a55266328a2fd6198e1b739fd7f"; + sha256 = "0ad66a2dd10d1e5b0d44e6db28982d82430acb7cef6e465ad0c88fd7958606ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fa/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fa/firefox-80.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "874beed2e6b23f7edc7b51465a758243468e99e835951bb908336f16dc7baf0c"; + sha256 = "39b1bc086dd14ced01668961dac12a5408f5cc261188b2c32b6114dc70c67e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ff/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ff/firefox-80.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "f84e37769376d2a05fd1d76903ff75c79e3631c2c7c5ceccdadde59de991aead"; + sha256 = "1511c50bd3ced8f570fe409ef609a6c9dc626d061156e5091e667b9314a5c4a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fi/firefox-80.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "8898a7ba0aefe3e26c4239c8b4d3768f716004b18da5ce5799ac5fb159b699b0"; + sha256 = "4d9e7fe4eaa94e4a2195589cdaf9f58c4b55339751001e87bd42a6326ee26787"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fr/firefox-80.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "3f6e7cd8ffa7bf343d28cd289ea14f88e4e0ccf7229ff122c118627ba909a400"; + sha256 = "99f293639744dd8e2615bc4d6290d2f5baeb9d646bc796d3bfac5de8a1c001f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fy-NL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fy-NL/firefox-80.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "de4d6f8aa0564ff23eed16f2bb41486a62ed4fad935625eb1d26829aa281d71c"; + sha256 = "a8628d16e51d7355198415f086186c9874f37f9250e64512457aa725c8ba9f04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ga-IE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ga-IE/firefox-80.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "48a595094b959f74455f568d872b3426bb6ad9be60df256d5cc1d5ac7cc688a2"; + sha256 = "df63d7991979e8fdf8f6911f8df2122d9995c50c089596bc0f7c0e7179326051"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gd/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gd/firefox-80.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "8c64d89f708238affb2bc356a5f86b491d368f6b838371c62ed647291925e72a"; + sha256 = "616906a45df46004e081cba3cdadd2782c3d402619193f5d19142977b7ff0fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gl/firefox-80.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2d391f67f0f911112332a155436e5013ebb505620e5070d03b794949df2a4f36"; + sha256 = "bbff8f63ba3c029c97e5d40d3ecb41d757b5fccd59018dc81d7484f12c830686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gn/firefox-80.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "732951a35fc0ab79327a225ee02494eff4a17a8b5b348764f980610fcb1de6ef"; + sha256 = "62d7fbf8afb95d221df768fc190381a859e142a253b8df6b63ee276c4111077e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gu-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gu-IN/firefox-80.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "0c3f65ab3736b43832feea9459a6fc336d0611c3221eba091c6194494eaf252c"; + sha256 = "3e451729a93e315c9ae767d21c5fe25c505e327ab435c5a9c4f606e04ca61051"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/he/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/he/firefox-80.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c62d4e52a2f308061fc6348531b708cfb26c0aee71a5f08f33b265af1789ea54"; + sha256 = "a48159e9c2798308ca4765f02ac90a0a2b05029ae0505ad59688d281fc06344f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hi-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hi-IN/firefox-80.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e83f4fa9cd50d2389697b78eb6591b7d1c1a6b4a61ae91b429909cb3cdbe1a99"; + sha256 = "39341543e9e8e2d5a377ead92287413df77d2f1c00a7362eb42d8e640b8f75ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hr/firefox-80.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "10ccf56a6f388a49ab6b5aa24ab3d82cf3ee685af5fd9592fec35055c1195d48"; + sha256 = "0067b77ff388004e0c60855868f1a45a282282b8c7360847b65ad2b53a558010"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hsb/firefox-80.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "771b5bba633c08861acc056cf0cbd73752f6109f601b8d59685dcad23804e3db"; + sha256 = "5c3a47a28a8e67f6a5be72540d9ae85474e093b1a67254949794918a8294ded6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hu/firefox-80.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0f8631c95cc683d0c9faa5153cd3b499fa89374f6d8c2d0ef161074b03355d2b"; + sha256 = "2c6e390d9348d2d9c1f2adc30b73c451aa6fdd281dfc040fa79dc7365a5414f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hy-AM/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hy-AM/firefox-80.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e3f6989cf2716b455d5d962c88307a74cd57d57c8585f31a4007579534b168a3"; + sha256 = "ba3d7371aae296aa6417e3c5d2b4647c0d0d0cb4f20441be525f2dd2ad594125"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ia/firefox-80.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "aa769627a633e32b8bab9dc1e0cb3e4030a9d6af36c66a6fd365520eb978a7a3"; + sha256 = "799ba99b5e5c9568d94c7ee7a3bc482eb6d827830ecdc8aef9a2e4d9b157634a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/id/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/id/firefox-80.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "179529666d1dce606758f7a7ee700e1823a7c4f5840195ed57a5eb48f2ce21ac"; + sha256 = "97f9f9194178918d8af8453b165aaede0a236e75b973a8ab0374a36ea4a8f8cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/is/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/is/firefox-80.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "53f5231e74ee28eef4ecf954ac850f1e6070fb7be51e7c8a0aa8477e0c9325e3"; + sha256 = "f63efcd86ece79d4a996c23e22a1876e3db25bfc09e5132e1832c309711d9012"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/it/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/it/firefox-80.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "410c0c6f119b70006a947ea34ed1462247f4cfda996cf9797423784c8833776f"; + sha256 = "c1d5fcbe8a3fba613e5da888f5252043663b7a1fb801da5cf54934af11ea5782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ja/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ja/firefox-80.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "38f1f110e1490626908dad0e8f638453e70adc2afe66da5ae834a889e0ed13b4"; + sha256 = "75c5d37fdf2a488b0dbfb09c6bd020db90d699713350ca3c091d5e8096d41d18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ka/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ka/firefox-80.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "bd38f5fe5707a0ca0aee0de7d1ec8afcc92fa0faa8661b724b876c0faf5bccf7"; + sha256 = "364b16782a4948e986268aca5e07dd92367120e97aa1d3bcfd5b78e58f58025c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kab/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kab/firefox-80.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d7c748eeeb4d26433147b02d08b57f41be742b86480220d4fa7ae08823ae7984"; + sha256 = "20a5bfaf08f75040d1c627f79ff8cb133d0574c83cb13f8902367e88a3742bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kk/firefox-80.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "8e3f43b8551b9844aeccfb21390ae1ce59eb7acde612efa4d9eeb4bcfc81bf60"; + sha256 = "f61bce593069f598b8b8fc035b09607f423d5600df7cb620360fb1aaf4cce68a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/km/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/km/firefox-80.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "44819213495492477fc7401b816f45b2a7d3d4e6b5b04b2b5dbb73380fc60ef0"; + sha256 = "7056f40cc5fc9d59145f4e08a4b19aad8e2b473beb4d8a7b09d636559bcd8457"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kn/firefox-80.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "89b97b079894174c2826e6106806d6bf9a46a3499e0e458a8219ba9f5ce6722e"; + sha256 = "c18b07bc5ee941f001e3ba9336d677f51b60dc08c2bf516b68882f647475b5b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ko/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ko/firefox-80.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "731f9a98b4edfcf249fd08f94e8849a8f1c396ed577c0a1ed921b2d58863d029"; + sha256 = "7b58b30aa461119ef842ee886d06676fb5b00d05547e959bbaae4ab597cdcda6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lij/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lij/firefox-80.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "a3325d7298d0cffc04757e3d4617725145ab5dcb11d359b029f92e70cfa47905"; + sha256 = "8107773361daf1257a1a77d853ae5baa1e9ff393d16118fb1987723f2a7af33b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lt/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lt/firefox-80.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2071fa08893ca0b55181478c677669577c9011e8f4d39b499aaec939046e45e4"; + sha256 = "356a337cdb3ea658e6723897da2f8d99179ebfac01d071f641c661eea1da52c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lv/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lv/firefox-80.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b6639a338afa0fe86e0324d844740caa9260b26e3f06d075348999253f0a0bc7"; + sha256 = "10a9272101d4b37ac5949f2606317da5f41d205cfdc0967cacd9c72aba550cbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mk/firefox-80.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e06db923b89559735663c93b551f31e48cd12b86f5fc7fdf78e8db88fba48d59"; + sha256 = "45618096f39f0c6e28a900e2a5985fc1ce5c9fbcd6abeeb2d21fb4b5bc095876"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mr/firefox-80.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "dcd161187ddb20eaad0353c7ba0bf7d5d0149c8bc324151d41d013e5756a7e35"; + sha256 = "63d774fdd4f825780c7f667365a560b72dd1f31449d408553f8c51dfb6583dc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ms/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ms/firefox-80.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d309a899fe69b3b17a33c43093ce78e1942b497e3e3db252a46968884bb9d737"; + sha256 = "fa67faa072b03b64132320a19691eadc719f8598167aa39f21d097b1e8fe42ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/my/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/my/firefox-80.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "9f74bf01425741e1c08d5a637e20b3df7e5aefc0421da14eb3ecc8199a03a0d9"; + sha256 = "e40c7c534108dc7e9f978d3e6ea025e41b0e6120b9dd701a7935f90a7c4b834a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nb-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nb-NO/firefox-80.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "638a017eb9d5f7402565dd293c44b236460be99d718fa43cfa705a55eca949e3"; + sha256 = "99b52d2ecd2ce0154378630f80f3bb9371d0cb7c59d780e8abcbd47f7008a7c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ne-NP/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ne-NP/firefox-80.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d7d0b87b0f3aa4c8cfe1d6a44b011c167b48e19384031a302d0e0eb5bf422951"; + sha256 = "49e9e67f879ecc519001ba500d136285c89a0fef3f7b8b1a693e8efd2af152cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nl/firefox-80.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "88a6ed36cf8116634010f5a1ab27fb22f2519974ba10dd48deb2a6fbb2ac659e"; + sha256 = "ada875468cd865efa4023bfecc0cde06469fa3bf655944a2dfb945603d3ad483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nn-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nn-NO/firefox-80.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "aa6475e941d6e2f724447a94c2000f9f8983d872a317d4ccb1df421128687564"; + sha256 = "b04996dccdb1a34ae41066a58090eb1be8fef2d458cf1aeb0297650123ffbce8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/oc/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/oc/firefox-80.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2535537159fd34b6680cb676d607e3810f78d2db2130e35c1086210c8fc40c0e"; + sha256 = "c6db46006f3bdaacd7a4ede17166e2bbcb4ef672d432363e86a819858327d867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pa-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pa-IN/firefox-80.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ddf3f2da7c31bf2b52e9dc4ad9f3d2b25c42e4c621594bb48a9213d2a18ea91a"; + sha256 = "a52fde04d6f25f6ff0641ade83dbb88f4d15aff689a041cad36352705fcb43ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pl/firefox-80.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "efb57f54e1cdf5a99b84856fa12d8591cc970d5850bab7595a5e804458b1f430"; + sha256 = "6918dd7bbde254eef27b740147d64550a1b4203979fedec6f9064006300e4638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-BR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-BR/firefox-80.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "704d84a395b6d24b33723121785cc17d36ffb95eec1c550895f61277add01cba"; + sha256 = "21bd4c8b68c7154889f4d06cec9eb3696dde94e2ec2b946f25a627ade2b16a7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-PT/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-PT/firefox-80.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c8f67765c2bd151c68a973135ad67c46287aa11bd8055b1ee084e7c18bdc7a38"; + sha256 = "b30ab69cacd27d7a60a0387caea18712cfd4f4e2dd45f7bb51e3074e46dc3f05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/rm/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/rm/firefox-80.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5fe367fc5338a867cf16322fd4cfb55899275825a6aababbcc95be1f2df54a79"; + sha256 = "9fdba8959e1276684bdd53c2c3d02e80768f3e9a289bccacf5a719f5ce51efbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ro/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ro/firefox-80.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "f22ce12f453e7c08a1fa1277f80a24038a2906d556c5d96fd6c331b185f38bcb"; + sha256 = "e31d0a914b107736fb83e686c5c011b912b7a5b04fb394b7e769c40ab249b504"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ru/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ru/firefox-80.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "057a5c87914e98c056a2213c348bbe72be46cad8566d7cdb0f68370b19f4b313"; + sha256 = "3b26ecd7fd38e224625def5087fe5e6ff1aa408e3a04a06e160e688402026113"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/si/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/si/firefox-80.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "9b97d6588b9f304e090dd5c0258f0209fc7229ccf7ce21d6fb0d6da1f829dd38"; + sha256 = "bb37483590bfe23951063e15626724a665cb03de6ce2916992ebad88759f2691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sk/firefox-80.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "621fb92cccbf325edf25ea274e90fe9533a0ce5fdb1e0bd9f266b4a1f3a47ffa"; + sha256 = "60be0fae9156d425708360e233a39e8b1d2be45216d8a155d06f020fb5808cd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sl/firefox-80.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f840e911bebf98a7917f15421fcd8feaeb72097659bd3fb0f3d1fcd2e348ec75"; + sha256 = "d1261f9dc8091df947df5e64b5123d8d4b39bf15ba6dbe5fc4844bce9f3be220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/son/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/son/firefox-80.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "9b834f1895db63a263d3f2ce2567095b8000ad39d0753020f69a704dac7d12f7"; + sha256 = "76ae5c6f4890d5c29ee33ffd81923696f755e6fe0fa8081c75e72ed1599e5070"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sq/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sq/firefox-80.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "7136196b26f6e9b963d86e1cd9a088f9d2a7751e08193a59dd27c00b08da4d4f"; + sha256 = "5aa679e980bd0808b0c924e4ad11bb6b3256afd031cb04f16f862eb9bfd4644d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sr/firefox-80.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "6cd5ce0c122a3b9cb6c066ab8df57277bec7d78e4fab9f15ef88c7ca16a6a3e1"; + sha256 = "a4941d40721de72abf22b97846cc16de49670d7f096829aa0d1775089734d36e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sv-SE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sv-SE/firefox-80.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "ed0104efacbe6c4054b5d6a2c4397c13db38d245bd557dfe8ed876334bb232a1"; + sha256 = "c50a2d0bb15cc95982e3d2997719a65eba6e0099ffb13b066e66e5aa951375fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ta/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ta/firefox-80.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "4589d31f7ba58e6f149ddf64f6020b262cfa9a7b8c228ddbad5ac9032013bb74"; + sha256 = "53651d5b0ea3d36c6600c57f02c27202f2f5b938aef34de4164f325ef46d8666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/te/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/te/firefox-80.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3bae0a5ae9735ba623b8f3b4f333169f4f99fc37c43ee29e65221aae21060d9e"; + sha256 = "5225d57d4a5c83843ecc83735be2fbb4004d4411da5ea72340cd6306078fc426"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/th/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/th/firefox-80.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "eac036a449108ee78cf3d527a85abcb87b0c116d78e71d7a0274f326ebcf1218"; + sha256 = "b38092aef16253b180dfe0d297ee1bb8417dbb4851466625b80858a18b2d3801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tl/firefox-80.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "f8c9053e62b80b7ad1f20e622c25d01b8926c89b8780f1ae642d922d293d5018"; + sha256 = "5ac9aa87ad90d60a852f7cbfc611c05eeef09b2aba46da80a2ddb093ce5f1730"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tr/firefox-80.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "8c6d089c9b0a1acdddbaf01d44b274da4a7d01751239dd017add9c7a0867dd38"; + sha256 = "b2a6aa22523f9d3396675c60ca7590e9c379a15c445727f01c3ada090a0557fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/trs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/trs/firefox-80.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "086b1b43a42f3c1487ead061b822b94274dd58b927df5b481f8079b960b52dc3"; + sha256 = "0e3e21f8c76bba90e730959e3f176c5b4406196a4b9f00aa4d85088495eeb337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uk/firefox-80.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e3ee4bf352916f57bece093a079ef58f68a1d3c60d39e02ac7ba9587b98b6cf9"; + sha256 = "626f9af6252a003cf869067de439197d8b0dd0b73e654310f439579959036f5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ur/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ur/firefox-80.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "7e485392f74814c874c2efd153add419a110c790514f4fef4bad0a4c5043751f"; + sha256 = "67e1108697c033ba3c6bcce7e36e5ab269f66a75674795e931aeeefadd7e949f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uz/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uz/firefox-80.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7a9f0e8e1a776d1155c609bce03380ecad60c2259a05248ddabb65a6c2f8080f"; + sha256 = "90e6d82c75ee24925cc6fdb48674e7ace3e58fd2cf27441d8ba9b24002b03a03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/vi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/vi/firefox-80.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a50f5c651093bb205f5cf7d1c44c12994d0aa73cf3a3cf1dea22e3754c6943e0"; + sha256 = "dff1e18e968d514b91d4f3c419da0570478e1667485761be703349b5c6019124"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/xh/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/xh/firefox-80.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a94a46b428a87a3cd543dfcdbef46708931e18b377c548b11ca565067c953ebb"; + sha256 = "1d524f5c5e6003c4cb1e00676ab5c369752c80c763684d7550224c7bdc66ca68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-CN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-CN/firefox-80.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "911e0b9591dea07aab26e4e35e84645d79c132fcfcabe504ff242ac87d853834"; + sha256 = "8893528da90e46d8eb287ab857ee6e18d89355d7901e221c7820d7f1bdfc155f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-TW/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-TW/firefox-80.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "58afd8192b08eb343da9385344b87ad0e72046cdda26495a5534a75f12d40d38"; + sha256 = "8b01036a6c807e22f66ccd93fa335e3fe71476e7a9993965172b85d2eada27ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ach/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ach/firefox-80.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "055e0f66d0e5e3c9f3bc7ae94f6bd46a8ab0bb87dcefc2cace02f4ebbbabbf33"; + sha256 = "1bb95b52770a8cad2b339874ac4576e190790935dfbfccf22cfa8be41e3b7e5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/af/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/af/firefox-80.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "0705f3f63655b6b55604d9b2b801ea07bacf2f0060ce6a2ca6c1d6021c35a594"; + sha256 = "919522f2c9d8f0b3c7f7c7d4311735e68eee173883c80f4d168625b690d0f29c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/an/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/an/firefox-80.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "f1735cdcb500df69cf66886f194d101393f8e5880b790fc135348e6515fc7ba5"; + sha256 = "878eba95507de8dc1788e01facd9710e39cb62d75229d6204601c58ea0df4cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ar/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ar/firefox-80.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "97dc4e314f361d7afc3e77d13d712f45306af21e4ef2e5737409b9932b341f92"; + sha256 = "4bfc935eb7a94eb6cb957b118c4811cbc0d1265a9fbcd4b4ecd3aea593658af1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ast/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ast/firefox-80.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "2cb19f22bc6372d4b3406d87b19acc4ec61cf60317869392145b7405a820b7ea"; + sha256 = "c64157e1ef1c361cf1dff89ed443f9b7fceab088c3bdac4058e262a1c068c97d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/az/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/az/firefox-80.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "83fe4b78ca684c9a58702451e4f8bbc9ee4a67aeb066d74699f7e3d471e0a16c"; + sha256 = "6045ef88f6cda1ac9b87854c7ac0dbfe789f9a4b4f7d35f9612beff57d832b60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/be/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/be/firefox-80.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "f08a685b2b99d3f508487215e426af802097599752ab82dfbd801c063588194a"; + sha256 = "6c0e25a6610a0da75f086a829a142f1b7f419e1357d7c97efaba4f1a9c95b5d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bg/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bg/firefox-80.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a5d3c78d91e813358e7b1c33c10854f43112398ee88310c078aa0b5db00b7518"; + sha256 = "1c8579439940499262e8e2096f16bd6767441b72a00774a35d76db9463fdaf34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bn/firefox-80.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "eab386c0bc37dbe0ab2c8b51a470bc9f65a8f59ad17223d95fe631507da8fefa"; + sha256 = "06eaec1ac31a6c2dc21eaa871aa2dd4f45a299458d5cc950c2d52454366ba1b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/br/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/br/firefox-80.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "125e5bfe77bac8d9155b07d057e3e8e8de3c3b4bb3aa3de192f2ae55ab9f4e33"; + sha256 = "3f8a1a9204ba24d2367f6ad995343eccdb48c981d726ed72e6f96b3579bb504f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bs/firefox-80.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "6d9fafc803b098e8fe93911e9d07baa28765dff6b072aa911f74b2076cef54f3"; + sha256 = "61da2d6bb7dc90615949b10ab45ac56d38ccd4007ab6f0ff730454994d303f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca-valencia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca-valencia/firefox-80.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "91d71b2538e059c9aed1d7a564125c25bca6f6c8213eb247aea7357b1f27b9a3"; + sha256 = "15ea7d6e7eee13f2100111b8c9fd10cba728acdc27575ad0160b5baa5c5ba0f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca/firefox-80.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "5088cc39fd0b18926e6821348373f834a8b5d093ccaf9152cfc8da3157522734"; + sha256 = "140c3b74f0edd7ad47c07dfd5cff6fd224048560ccc691467a00d3c67cc1505e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cak/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cak/firefox-80.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "31c9be88e0263e0968fa2ebba0673234532d6a99d5cf97ab7b863b814d9d140e"; + sha256 = "614876abaaddbca2dd2c56eae7b865828fa446c07bc5401f7bfca7637edb2728"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cs/firefox-80.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a606452009ca9e9e7d5f44fc9b42a222e3f557ac4d338c90ab9335dbd96e6683"; + sha256 = "2dafa0635a3192a9049d7804f97beaccf6e62a8613e96ba241dff1728aef840f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cy/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cy/firefox-80.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a8254adacb701007945e4cbb48d861358cfefd4f590e509264ecdd4e0e858235"; + sha256 = "1993cd996e6027b4dbc0e306ab8c09772e0013bdbdd2dc9c774a702555b2f21e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/da/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/da/firefox-80.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "350ce9d092799302a8c3830fc756c7ddacc752f9b42e70bd73dc1d61a1d1d07b"; + sha256 = "8fb1663ba5f646cf65593fe6eb57a63f750b555f6c75fad7f4a9d3592bb46421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/de/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/de/firefox-80.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "576c95fc5aadbaeba43991b2fb28e13cd3f18f2e81e6584a0208328a4f9c5ca6"; + sha256 = "9536de23132d6267f3535e08194679ec16afbcf1c3cf6beaec64cff7de38d701"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/dsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/dsb/firefox-80.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "024054a027af7a4e8f68a299ae24a47eaa2ab2e69a847cfaa053295cd454b947"; + sha256 = "277cd59ab97d33a89e621ca3819fea2cc58042cc373891fd4599cdbddbf483ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/el/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/el/firefox-80.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "63ff8a79ec70c7ce44d8375e5ee377754e329f32ad751b87de214707984eba7f"; + sha256 = "609c2e25ab34f793a85e60ff9fec4d4281bdd228026ef698fda1b25e956142ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-CA/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-CA/firefox-80.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "eb8597936d2a3a2747827227082743a5b267ee12b45f16e901ab87ad897ae780"; + sha256 = "ca54e8fd35633530605149ca7aba49099098f96e880dd0629885e6c867c3d632"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-GB/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-GB/firefox-80.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8a1b4c0320439cd3ac22b46fc111564b7ed68ba9f04c7b20a276ac550ebd84e6"; + sha256 = "6a6e6b1b34fbaa578a035e430d10fd2911bf64e1917b170cd47ab565ddf9bdbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-US/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-US/firefox-80.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d56bc3d81f7e1807852b326d3f0b00f9e745fe4f8b97c0ffc64aee979db4fa15"; + sha256 = "d87d71827f0161f7d3230217fc4f7c7bdca804ccc5f49b4d107151fbcdd7622b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eo/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eo/firefox-80.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "cd979e28dbf2032ed8f1e5c7c84eda3ddefdef4223749b6fd61ef2f727401a4e"; + sha256 = "50f158c96b8de9b789dbc138004646ae583b900fb067b59108ee4ad97e0cd2e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-AR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-AR/firefox-80.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4875b4139be6ddcf1e7bff57c3045f29e7730a7bd0e38fffa0443bd0f3aa45a4"; + sha256 = "e5589a3a92ce6ee1b5756beb4cd6903e1526d74d457bf3fffd8b9072ded3c5a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-CL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-CL/firefox-80.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "68bf54d52e45e0b8e0cfd27ec39e3ff97307e91bcede2f2d2561ac5139d179b8"; + sha256 = "3188fad7ee67a0c98b370ac32a50136c41f69154f99fda13804d16356679a87f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-ES/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-ES/firefox-80.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e324772591d019b5b27a00716c30ed0f8803dee83276b19b43f5808f584d5000"; + sha256 = "c9f37fa0ab8e4d3c16cbc20ae9ce0f0a568a9cc2c48fbcfa114b1ab2b9b462a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-MX/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-MX/firefox-80.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "bf40f1eec6d42c5706a2ae0f840ec00778801d98476dd6055a7170e8ebe8033a"; + sha256 = "f07ee3d9317157e5205187bffddb0339fb810ff06aeb192d12e367acdfe89592"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/et/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/et/firefox-80.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "d0f45fa9c2e9559efe0376a53d1bfc7fed04a408d563419e283a0e1a4b4f0840"; + sha256 = "01aa2da0ec5504f601e774fb9a35e0b8bcaf59fee1cf8fe33a5d29c05fa75d68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eu/firefox-80.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "def48b817fcd432a3573a1d17bbc4dc8616e8b94366836406cf6341d610ba3aa"; + sha256 = "6d3f10b801660064e8f51fa45bc17bf1fec641cbb526e1da925b8eb71b863112"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fa/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fa/firefox-80.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "08e4e0c50bb80aba30c2f3666cf568c39bd031938a1e2a6b9fd092da688e3b4f"; + sha256 = "0f519bd6d2e8d1e01ef3f6af13937a84fe4c551b56a6c438d01f2b7818c0c440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ff/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ff/firefox-80.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "3e9e75e5501d2a5d1d1d11e628d6b9acbd613f3a0f7aed005752f4d07f15686d"; + sha256 = "f72bf80190d3bf1a4b81aa06f6f0a7ea25267302747ead42a505461d4cd63e35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fi/firefox-80.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "61e0d7ee1d4b0d8dfbea3869766497d88dcbf0c467d41d07ea45309d03839a49"; + sha256 = "44aef7c10ed8815634d62bb60b7d5412901dd016ef7439b28a84219546b702b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fr/firefox-80.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "9c502d317ae781e82a69a80c864958ea23eeed18b215b9f08a7ecc024bcc6249"; + sha256 = "a347e36231516c410e756e55fa8e03c660635a70c8315ec14e9b2c68deae9db8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fy-NL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fy-NL/firefox-80.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "05ed05024ebdb58eb2c178c30da5d0f013299ffbf42c26b7e28c0bd1053106f5"; + sha256 = "d53d4fad373b633e287db03675f89279e44b80c28ab50c238a05b286abb916b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ga-IE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ga-IE/firefox-80.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "101f512b07c22c24d55fab970b1d5140f6f7a54d470652511e8d053d5d3ba265"; + sha256 = "279f93b6e57dbaa443df2221217e4ef60be015c0a4e6fad8806e97f46f074f9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gd/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gd/firefox-80.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2a7998045852b8f3bcc86aecf40b5582724da71eb14d1fa612184dacdc751fcc"; + sha256 = "b3c89bb8b8e4f9bae3686e601de8ad7c065940f8852d63a8e503095b0674e931"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gl/firefox-80.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0aa2c2ca4cdffedc5d17e4223c2cc6e96ce89bc69989ae10be683bcd61f4a143"; + sha256 = "cc9687f4d35a62ba0be5c362bf0d55ed1acdc4d1b4e0284cc4db04553c36786b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gn/firefox-80.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "4e9f93db434ef45712c11ef5e3e812dba5927183d73da81db3b9698f35c51585"; + sha256 = "c3d4cec222d099bd2a9f66c543c97d1c18c0abfa087c19fac3da08579c60d103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gu-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gu-IN/firefox-80.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f2c3cbef250bfdac654ec2eaf438f51c059521b6a0d1694427013b949a323cdd"; + sha256 = "7af5a56a90bd0eadf93ffeb2b61f08232996b560588fa52d55ffe3023e08b3e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/he/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/he/firefox-80.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3b4d9dc608998b2d76db3ab2f21826983a12284bffa22e76ec60a275c5a54f97"; + sha256 = "65222595c4df12375837f0994f9fe23a3a8f96fde8ec0d7be980ab16ea19bc71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hi-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hi-IN/firefox-80.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "840ff442beb5c0599f7c67a00adf840a8f4306f2bc6ac8f2397af0b876304741"; + sha256 = "ee52e1eaca1e61c5ee1cfd5e86fc0afed242f9162f36027f57052162b88b2500"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hr/firefox-80.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e0098a3069cb9b86becd2f77a671731bd849a568d2fffb6064528f802e5cd6c6"; + sha256 = "ae9936bd5b55e92250d73859b1d78505fcc3d3312d0772591720012ea820c367"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hsb/firefox-80.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "8322028ef47168ecc2928284e0a96d36c9208dfa2a7f3eae6f7449fb77753e62"; + sha256 = "55e837eb12417899dbcab8d15f3c8e3604f7a071339b1f2ee608801ad7fe7912"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hu/firefox-80.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "801b62419499f9ae9fa48848aafdad7258cc95f7b04b1ade6d3cbf6663a6b3dc"; + sha256 = "710a5e73c34cdc1b7a77e8465724b0e99c4084effb015c3dd71e3fc2f678149c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hy-AM/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hy-AM/firefox-80.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7b4af441958fbffbf43b7e1ff8e97d62dfd3aef2076bcdf1fb1eda8006093721"; + sha256 = "7e40874e151c69145db6a812d7050de5ea65b8939a394cbc468c3492abd189fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ia/firefox-80.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "ee2bf28f2cb18a5cdeb51420042d624c40bbaea73e4c567eb801273f0c4c8095"; + sha256 = "5c6083dd765489f378b6855713e601d50ff84acf95674b8d3b873b29981dda99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/id/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/id/firefox-80.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "1083dbcab9b2b297869ef7a4a65ee04b63e851805e7fe7f7977fbe6d2f69828c"; + sha256 = "b8cf9a69b6b52f816e355399e2bf6c1742f56d7d631dbee78a687a1cde9312dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/is/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/is/firefox-80.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c2c475e280f3f52a134182ac6dc679273c29198605d9214f4ceeb09e57f2cdf5"; + sha256 = "532793a2e2d761ba36a3bdaa0a257e8828b5516193c4cf1f1ec1735efa510e6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/it/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/it/firefox-80.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "d7de926e398e6291e031f737da63fe223c7e4c70c01994bf74c8461e04af0840"; + sha256 = "a5309e5f3c387990ba1aa255684ec73f2e38dca0aa873f998effb7dd7b13e0a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ja/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ja/firefox-80.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a5f1c6bd8bd5aba351511838c04a35f26aa107ca43d87489ae24bac3831df165"; + sha256 = "f9dc927612114a5c8d9a4e0ee311356a0e5e819729f4ebd08ee5f03dcda52afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ka/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ka/firefox-80.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "513c9c885f741162301a980daf84eff5aa42f45aaf766a9b3e1376fea83bb78a"; + sha256 = "37b82df19bd4897bc2c29eb3f5f94d107b6b97eeb5a1b3ff5ddcaf641dd0fb19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kab/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kab/firefox-80.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "15fd46b89f7ea425121d02aef931bbaf624391e7039d81e646d6551303598579"; + sha256 = "1ef2b402c518da26838c2c3e0d5c47fa8f3c5d74cb2f9a95999814476d3bc629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kk/firefox-80.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "82a29718fdff57e6d02f8cc6ae76bb604d0e14374e7881c120ff6e38c4b21995"; + sha256 = "d152f45918a163fccc9eec97f5543d8c206a3e9ac130de58260943e6aebb19a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/km/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/km/firefox-80.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "406c361b49d9e5cb6eb952e5be0eea3a8b9ff535a3edb6dc1c60ec6171d5ae49"; + sha256 = "2d9639684b0115f9db6eb73379e1d7b24670db83afd2e7d2bed2a7c62188f54c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kn/firefox-80.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "0839a7af990a70523355047e5cfd24e73d0c8816cd12f2a21aa8cc244d9ef90c"; + sha256 = "224e41e1c33e60f1de88fe8243742675e0813b7041f1bac3a9a29528c618df3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ko/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ko/firefox-80.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2ed856441ea51d642027b800911f134c27207dd8a53ee5a27b9674eb11417b05"; + sha256 = "16372732d44159e017875ee9d3bdbc5443bfb1eb577d62e8b28a05560caa2650"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lij/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lij/firefox-80.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "653c7c4be39dfc49f89e5e6c591ebc953ef0bff5a9d827d348dad26e3f06bcd8"; + sha256 = "a796e32ed17c08499fc2e459a1bf753c7578f5555e0a7eb62757b4c5d4f6b735"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lt/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lt/firefox-80.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b61fe55f65029ab661d0b589cc5301c6131b778d55524de6b13779dd2d0d6c35"; + sha256 = "6687e81d9be17a992e34fbbc9f44edb86be75e1329292122e7978211d4c0b43a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lv/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lv/firefox-80.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "2f9a99d7a344984736cb422ccc106db8d175f31c1b1a108852494b7201ff67cc"; + sha256 = "7c4beca6385caaf9e05eb6f6cf508f51d559094cff3eb60e28d562ec7404d804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mk/firefox-80.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "0cdde250523fbdbb8b651660fccbe1afe65068c263e03fe7ce26d9758fba7bba"; + sha256 = "d8da49d2b43467ef4b29f55a15f71125ceb8388a55ded93ccd90e7d484d84feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mr/firefox-80.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0df4e48be06d800d1fa308841a1890f7b1c87e63b34901cdd1481a63a7080d24"; + sha256 = "304c8f8caf6ebdd5d928135f7fb94d490658e0fb6b7b73e2f1618b7b07234de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ms/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ms/firefox-80.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "3fc1dcbe6c72acbee7a68ebf6a8b08b9961a5a04eb05f0cac86ac8fc56953917"; + sha256 = "a4cea6625395d522ab3d4000f6774ba5898a1f740c9b70b23f71f52e1231404d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/my/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/my/firefox-80.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "aba83f9c9f41dc5660a480b6821dff2c405900d9370c3d1414a892ad0e44161a"; + sha256 = "1bbb703f65bc5d41174800ec789066d99ca10430605dfb2975b6d788b41c1220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nb-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nb-NO/firefox-80.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "34e9cfa0bd9a065b58edeffffff690abb6240e90f1d788146ac3976d9e7d9cc7"; + sha256 = "95592600fbb71a6346fa42f8647460fed047af96f38754a3322eef9bec7a22aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ne-NP/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ne-NP/firefox-80.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8031d15b84eb3baa73064ba592434d4d36ae94c6bb3b7c9fa359f93486be3ea8"; + sha256 = "f902008b0c6390265e11209e573555b0854b0d0c879eb5c2637f18ce981223fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nl/firefox-80.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "33f19d81143a26b7472b70558c2187a4ed39f67ba95e28332c7e8a8699aa33e9"; + sha256 = "9ef3bbe6b6975b50013a951559f6beaa34ddd5b183ccb33500c585e3c094fc05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nn-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nn-NO/firefox-80.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ca27dd578f8054df63b77c314d3504a2277139cc2d54d43f8c202771ad12e76c"; + sha256 = "783427d27ef6be2bac3a219f72d61a6cc8b6105ec01c94476b06187d83fada90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/oc/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/oc/firefox-80.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "336cfde595de21f8ee355ec4e6a240da8a8946f357a100629ab0d0d883bee335"; + sha256 = "f5a6af6e4d2bee9ea6c8e27edfe593640f0410766eec4a029c7b6641731cca58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pa-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pa-IN/firefox-80.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "bb51ced0f4993862a7d025b1b504e29fb96e6341336c3fc61ffc6d3ffc18d884"; + sha256 = "8d45fd730fcbf898062231356d11892eda44a2dc124444fc0623de363a807a73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pl/firefox-80.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c44b50bc19b0ba7cb198d144f05b10d5f453c110463dd945534ccd180b71c7d1"; + sha256 = "9c89d3be668a295ef53d1dba84d1b9db230956d5700de6a86a6c8b0dffce5781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-BR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-BR/firefox-80.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6cda521f9c8a02c948dd1461fafff84e7e1b793815b6f25697a78751264dc689"; + sha256 = "8c591df0daa36ce3fd8380d34609cd1e1d26c8116db5bbe22828820c1f7f84aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-PT/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-PT/firefox-80.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "56e5ced26db5466aebcd7108dc3f499b243631bf61505a1fffb92b2eeb2cb5cc"; + sha256 = "e3ea46565734355a779e5b4b083c14e2f13d14f78f7347c36306fce57f4beb16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/rm/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/rm/firefox-80.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "47913299e22f8b955bd5307241d368cb3c29d6a0bb0d90d5ed7667b85b6aa0e3"; + sha256 = "c2355ccb07cd804aae65b31270e51d2d0a1ea438db44ab75c22aa57cb1bec71a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ro/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ro/firefox-80.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "528c36c4361f42a3d90f076800b0b73c8c1d630ae97ba33ff59e72d30d203cab"; + sha256 = "e7b729a18283dabd9f295a436e97c3bd42eb6666e77c42ef1b967598d6e0ae37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ru/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ru/firefox-80.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "ff1a33da0bd8bb7c2d7f460724c292b7433087ba5596258cc4bbbac2087d81b7"; + sha256 = "d9b2a3449ca0ed738db8bbd3f316a4973fa318c4abdb63aced9832419b579229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/si/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/si/firefox-80.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "675d6238f6bcf07751ec5356f3f4824d681ef28ac26255e1bae84cdab23ac0a7"; + sha256 = "8a43a0b25befbb5f0a9477086ae85d58b1d4c448e06630d1c0ece950d24bb6a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sk/firefox-80.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "141416a2320bf355cf9f3ca33ec3983b5089c5b2c9172cf03e00d21577b570c9"; + sha256 = "40a4e4b307ebea63a13e8073536c1d039ee400b4eff109a4ed086c5f073c12bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sl/firefox-80.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "6d062305ad9e40add4f8c84d051647df8c6b3e083011e00d9380f3e2eb6f128b"; + sha256 = "19b163d77a8480099cc356f84c00d51c62cf97095ed2a3f2a16a654abcc0d413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/son/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/son/firefox-80.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "2e2adcfe7f26adac4aa820acbe894fa567f53faf2854eca3febf2d7fb66c97ee"; + sha256 = "0c9b0546846cde59fc550f2a94abb8e909f1955ff5790aacd3bfdf63a668a1d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sq/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sq/firefox-80.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "eeddc2cb86011cbec49ace8c954ae9724ebb9a800cacd4354cfbee782ce7e481"; + sha256 = "b153afd0d8efcb4563bf46df1f8d20408e179ecd94a4e294683eb5caa0141228"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sr/firefox-80.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "88081a8c78e039aca0774b1ad61eb3508b9d4bf088cfd27e6b420431dcc6b95a"; + sha256 = "36a3dbe8a9fec700ab91134344db6d70dfe96d53bfcf366ac83b29ba7f405a35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sv-SE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sv-SE/firefox-80.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "51096fc91f7bd36b6bf66c57eb870cfbc62c42880ef2b7d3ae8032c49b5dc07d"; + sha256 = "708b43a83fc88ddec15a87a0f753690048dcb7500aee2a52c59c28912de5f401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ta/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ta/firefox-80.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "06f1af1fff1eff74d3aee7a7bffc7485911d350daf216bc8a3f6462b85ab28e7"; + sha256 = "e552b1ff45f4b904a7b76af41f44e9e349cf08f20981f44b95d7e89f727d3c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/te/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/te/firefox-80.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "5921702973c5c808f396fad81e736ffe7b9948996997cde5f721e55a6b0c172b"; + sha256 = "5ea5d027d0b6aacec730a865d8c70e8929c858b26a3ca0f798bb3a405e438aa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/th/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/th/firefox-80.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "5e8ff4f8b3204ed67545c4c68cc225ef7e28ce9c63108efdfb1ced7c77e2ce6e"; + sha256 = "32e0e810308c3fdb52b247d086193f0dbf1184ee2f6ac42c2a25766f158ed79c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tl/firefox-80.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "72b9a9cef7a4d166e9d33e0a89d00a1c270d1e6b4e5039356f6145bab0d8f6a0"; + sha256 = "d64ff747faf81f626ff91c18f72f786669f48ca84f55df58a25ffeadc1683325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tr/firefox-80.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "38cc4e45e3222633b7f85c59eb1fc8a993f4b77ffe9b50478ae894fb68f67304"; + sha256 = "22cfc8b33829476e0a058900f5a606020b249225e15c3a78a5baa314ea39a5eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/trs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/trs/firefox-80.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "f82d215f8a1a9b5b07ab71cadf75ef007e57b987d025c14fa671305dc5087182"; + sha256 = "a7db4c7fc442156414d658b04cb531fe5b4f4ac7b46e3a62229bb7528b40a43d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uk/firefox-80.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "014d024f4d14f465393f096147b661919dc1793289e68c4d13b6b01dba42d4d7"; + sha256 = "072b4d82b5a8c14764f3664ea5fd436aa616984e044e078002ef6c4ab3f5a804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ur/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ur/firefox-80.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "c2b7382f1e511dd7c79b3d5854059c403f633ec4423ec31dd9395d6dca4d31ee"; + sha256 = "c52f5cb761b5d8f7c6c3646c3fc2a5c4580d5dcaa0d8757f3f37b990a1b61191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uz/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uz/firefox-80.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "66e35eb3fe6aef2a3d4986a585072f96b55877b0a15ce81c41096e1f1c001f2a"; + sha256 = "4bc2ca5751a9d0cd69661799ab5ca6725bdc12055d07c975a6a7f90f44d93182"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/vi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/vi/firefox-80.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d1cdb32bfb6f6d8e41d3f32de0c86654660d5d7ca4bfe0e763eeb799c0ead10f"; + sha256 = "1ce68d3b630754f961264558c424c0c9771d77f01858570ef0d15ed2098e99c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/xh/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xh/firefox-80.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "508d17ec13f5b3e1d18641451374efb72331fe68b254f8a71bef4807c318bb9e"; + sha256 = "b7e4d8f55c8ff78491cf2e65510397f09b3b5995f7f7fd506c7e20027d330ee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-CN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-CN/firefox-80.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "cf2f5617c652209daef0e6e5176181f2659e188f9007d7accb4041c030c54fad"; + sha256 = "3ab8f24ea6809b9a2b1cbecef55caa39dbf4ecd33b287b8ef77e5a76bb617337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-TW/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-TW/firefox-80.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ec99c9201151f134d72450513c518816f244fec0af6de2bb4ee08d3286b709f1"; + sha256 = "4c306d3227ca8dc322780c0eeb8532a62db101c6cde8317acfa824bdddea4d12"; } ]; } From 4b3f8bd2140970accd55cb6543f3803632695ebc Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 29 Aug 2020 20:53:51 +0100 Subject: [PATCH 289/688] pythonPackages.blis: add missing dependency numpy blis' numpy dependency seems to have been falsely satisfied by its inclusion in checkInputs, whereas this seems to actually be an install dependency. this can be demonstrated by attempting to build this package with doCheck = false and watching it fail. also removed cython from checkInputs as it's already in nativeBuildInputs --- pkgs/development/python-modules/blis/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 596579f81489..5d4b9bcb5e21 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -20,11 +20,13 @@ buildPythonPackage rec { cython ]; + propagatedBuildInputs = [ + numpy + ]; + checkInputs = [ - cython hypothesis - numpy pytest ]; From d416facd395254666e0333f609520d86e64059a7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 29 Aug 2020 22:45:27 +0200 Subject: [PATCH 290/688] nixos/tests/systemd-networkd: fix eval In `systemd-243` the option `FwMark` in the `[WireGuard]` section of a `.netdev`-unit has been renamed to `FirewallMark`[1]. Due to the removal of deprecated options in our `networkd` module[2] the evaluation of this test doesn't work. Renaming the option to its new name fixes the issue. [1] https://github.com/systemd/systemd/commit/1c30b174edc001537350036245ea632cb4e91cbb [2] e9d13d37515cde47ec24410ca19866e68e5a7bd5 --- nixos/tests/systemd-networkd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix index 319e5e94eceb..162970e67537 100644 --- a/nixos/tests/systemd-networkd.nix +++ b/nixos/tests/systemd-networkd.nix @@ -18,7 +18,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { wireguardConfig = { PrivateKeyFile = "/run/wg_priv"; ListenPort = 51820; - FwMark = 42; + FirewallMark = 42; }; wireguardPeers = [ {wireguardPeerConfig={ Endpoint = "192.168.1.${peerId}:51820"; From 1ce368f975ebe633b8ec5bf4789bb354509b96e4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 29 Aug 2020 22:49:00 +0200 Subject: [PATCH 291/688] wireguard-tools: 1.0.20200820 -> 1.0.20200827 https://lists.zx2c4.com/pipermail/wireguard/2020-August/005790.html --- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index c3e4c6371095..a9f0d7e77d62 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200820"; + version = "1.0.20200827"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "138pf23x39xm68pa4ks3g76axphl8pz5jw4fyi54wi7rvxclybc7"; + sha256 = "1d8rs1g6zy3kz327cc3hzkk5a44278x9p32gxasz6i94bq0b2bs3"; }; outputs = [ "out" "man" ]; From 19c3507ab1a54bc0136d427b915f7fee40c8d5e6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 29 Aug 2020 22:49:29 +0200 Subject: [PATCH 292/688] cargo-make: 0.32.3 -> 0.32.4 https://github.com/sagiegurari/cargo-make/releases/tag/0.32.4 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index dbe64fc7ec17..a1e9f7971f4d 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -4,11 +4,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.3"; + version = "0.32.4"; src = fetchCrate { inherit pname version; - sha256 = "0qcwhmba83rrwqnlkcmvnmbj9jb2bwm0mka8rcp26y4yxmjm431n"; + sha256 = "04x363wz82f0sr4128f1nk1wxnnszxsmaxjs92mbvmpbvry82ivq"; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "1dmcdzdm7kzmrq2xsiaikns2xzjpdmh9w8pw653nlqfjjr2h6pxp"; + cargoSha256 = "1fgcxgm800sr0y6ab7c42l335b6c00cx0f2r5rgayi645a47a1zf"; # Some tests fail because they need network access. # However, Travis ensures a proper build. From e1ef300ad141d04207ad13cc1a275c80d8312df5 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 29 Aug 2020 19:45:36 +0200 Subject: [PATCH 293/688] electrum: use dnspython 1.x --- pkgs/applications/misc/electrum/default.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 4d078f392242..ac296c1224ac 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , wrapQtAppsHook , python3 -, python3Packages , zbar , secp256k1 , enableQt ? true @@ -22,6 +21,20 @@ let version = "4.0.2"; + # electrum is not compatible with dnspython 2.0.0 yet + # use the latest 1.x release instead + py = python3.override { + packageOverrides = self: super: { + dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec { + version = "1.16.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; + }; + }); + }; + }; + libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" else if stdenv.isDarwin then "libsecp256k1.0.dylib" @@ -45,7 +58,7 @@ let }; in -python3Packages.buildPythonApplication { +py.pkgs.buildPythonApplication { pname = "electrum"; inherit version; @@ -61,7 +74,7 @@ python3Packages.buildPythonApplication { nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with py.pkgs; [ aiohttp aiohttp-socks aiorpcx @@ -116,7 +129,7 @@ python3Packages.buildPythonApplication { wrapQtApp $out/bin/electrum ''; - checkInputs = with python3Packages; [ pytest ]; + checkInputs = with py.pkgs; [ pytest ]; checkPhase = '' py.test electrum/tests From 2102fbfc3a0dfc576d8a02919c464303acaa1604 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 29 Aug 2020 23:30:07 +0200 Subject: [PATCH 294/688] feh: 3.4.1 -> 3.5 https://feh.finalrewind.org/archive/3.5/ --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 4782d9201480..82128f81353f 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.4.1"; + version = "3.5"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "0yvvj1s7ayn0lwils582smwkmckdk0gij5c58g45n4xh981n693q"; + sha256 = "07jklibpi4ig9pbdrwhllsfffxn2h8xf4ma36qii00w4hb69v3rq"; }; outputs = [ "out" "man" "doc" ]; From 7b0cebf7c8b14044ace3e5ed3222b829c880b0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 26 Aug 2020 18:24:40 +0200 Subject: [PATCH 295/688] somafm-cli: init at 0.3.1 --- pkgs/tools/misc/somafm-cli/default.nix | 33 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/somafm-cli/default.nix diff --git a/pkgs/tools/misc/somafm-cli/default.nix b/pkgs/tools/misc/somafm-cli/default.nix new file mode 100644 index 000000000000..312b402ae66d --- /dev/null +++ b/pkgs/tools/misc/somafm-cli/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchFromGitHub +, makeWrapper +, curl +, jq +, mpv +}: + +stdenv.mkDerivation rec { + pname = "somafm-cli"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "rockymadden"; + repo = "somafm-cli"; + rev = "v${version}"; + sha256 = "1h5p9qsczgfr450sklh2vkllcpzb7nicbs8ciyvkavh3d7hds0yy"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -m0755 -D src/somafm $out/bin/somafm + wrapProgram $out/bin/somafm --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl jq mpv ]}"; + ''; + + meta = with stdenv.lib; { + description = "Listen to SomaFM in your terminal via pure bash"; + homepage = "https://github.com/rockymadden/somafm-cli"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27183fd173a8..ebb11820e024 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25648,6 +25648,8 @@ in snpeff = callPackage ../applications/science/biology/snpeff { }; + somafm-cli = callPackage ../tools/misc/somafm-cli/default.nix { }; + somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; sortmerna = callPackage ../applications/science/biology/sortmerna { }; From cc8c10de3084c7c98cbd609f30c1b190ed3822a5 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 29 Aug 2020 00:15:20 +0200 Subject: [PATCH 296/688] gonic: init at 0.11.0 Gonic is an implementation of the subsonic server and protocol. --- pkgs/servers/gonic/default.nix | 59 +++ pkgs/servers/gonic/deps.nix | 795 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 856 insertions(+) create mode 100644 pkgs/servers/gonic/default.nix create mode 100644 pkgs/servers/gonic/deps.nix diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix new file mode 100644 index 000000000000..343b3d2b19d1 --- /dev/null +++ b/pkgs/servers/gonic/default.nix @@ -0,0 +1,59 @@ +{ lib, buildGoPackage, fetchFromGitHub +, pkg-config, taglib, alsaLib + +# Disable on-the-fly transcoding, +# removing the dependency on ffmpeg. +# The server will (as of 0.11.0) gracefully fall back +# to the original file, but if transcoding is configured +# that takes a while. So best to disable all transcoding +# in the configuration if you disable transcodingSupport. +, transcodingSupport ? true, ffmpeg + +# udpater +, writers, vgo2nix }: + +assert transcodingSupport -> ffmpeg != null; + +let + # update these, then run `updateScript` to update dependencies + version = "0.11.0"; + rev = "056fb54a703ef5b5194ce112cbbdd8fb53dbb1ea"; + sha256 = "0hd794wrz29nh89lfnq67w1rc23sg085rqf1agwlgpqycns2djl9"; + + src = fetchFromGitHub { + owner = "sentriz"; + repo = "gonic"; + inherit rev sha256; + }; + +in +buildGoPackage { + pname = "gonic-${version}"; + inherit version src; + goPackagePath = "go.senan.xyz/gonic"; + goDeps = ./deps.nix; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ taglib alsaLib ]; + + postPatch = lib.optionalString transcodingSupport '' + substituteInPlace \ + server/encode/encode.go \ + --replace \ + 'ffmpegPath = "/usr/bin/ffmpeg"' \ + 'ffmpegPath = "${ffmpeg}/bin/ffmpeg"' \ + ''; + + passthru.updateScript = writers.writeDash "update-gonic" '' + ${vgo2nix}/bin/vgo2nix \ + -dir ${src} \ + -outfile ${lib.escapeShellArg (toString ./deps.nix)} + ''; + + meta = { + homepage = "https://github.com/sentriz/gonic"; + description = "Music streaming server / subsonic server API implementation"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ Profpatsch ]; + }; +} diff --git a/pkgs/servers/gonic/deps.nix b/pkgs/servers/gonic/deps.nix new file mode 100644 index 000000000000..71b2f83a0e01 --- /dev/null +++ b/pkgs/servers/gonic/deps.nix @@ -0,0 +1,795 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "v0.33.1"; + sha256 = "1xs487sqajpvnhlwp130sfaajyinhxxq2yvmv2533mwf0zhcpz6v"; + }; + } + { + goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; + fetch = { + type = "git"; + url = "https://dmitri.shuralyov.com/gpu/mtl"; + rev = "666a987793e9"; + sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/BurntSushi/xgb"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/xgb"; + rev = "27f122750802"; + sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; + }; + } + { + goPackagePath = "github.com/Masterminds/goutils"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/goutils"; + rev = "v1.1.0"; + sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; + }; + } + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "v1.5.0"; + sha256 = "1i169xscsxsh8lsw8bz2apnsqixld37xdnfh36i30xy5wnf0iwfx"; + }; + } + { + goPackagePath = "github.com/Masterminds/sprig"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "v2.22.0"; + sha256 = "09dzwhj4zh3p6f1jhyic16n4qdnvpamz7hyk9fycpm4b1jfq63gd"; + }; + } + { + goPackagePath = "github.com/OneOfOne/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/OneOfOne/xxhash"; + rev = "v1.2.2"; + sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; + }; + } + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v1.1.0"; + sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; + }; + } + { + goPackagePath = "github.com/d4l3k/messagediff"; + fetch = { + type = "git"; + url = "https://github.com/d4l3k/messagediff"; + rev = "7e0a312ae40b"; + sha256 = "1ab2gm7ys33rs84fjzqcb7b4jy2rr1a0w5a9kakfaf80wd0rjrah"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/denisenkom/go-mssqldb"; + fetch = { + type = "git"; + url = "https://github.com/denisenkom/go-mssqldb"; + rev = "732737034ffd"; + sha256 = "0k1inn33lbfj97d5ir3k5gffjcpb39kairq91jfrz6pnbq0w3zlf"; + }; + } + { + goPackagePath = "github.com/disintegration/imaging"; + fetch = { + type = "git"; + url = "https://github.com/disintegration/imaging"; + rev = "v1.6.2"; + sha256 = "1sl201nmk601h0aii4234sycn4v2b0rjxf8yhrnik4yjzd68q9x5"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/erikstmartin/go-testdb"; + fetch = { + type = "git"; + url = "https://github.com/erikstmartin/go-testdb"; + rev = "8d10e4a1bae5"; + sha256 = "1fhrqcpv8x74qwxx9gpnhgqbz5wkp2bnsq92w418l1fnrgh4ppmq"; + }; + } + { + goPackagePath = "github.com/faiface/beep"; + fetch = { + type = "git"; + url = "https://github.com/faiface/beep"; + rev = "v1.0.2"; + sha256 = "07j0k0ynw1q8f7fzsan4kvfmdlda11583sck66hxfsk9zbp8vpxv"; + }; + } + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "v1.0.0"; + sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "v1.1.1"; + sha256 = "0il2nnxp2cqiy73m49215dnf9in3vd25ji8qxbmq87c5qy7i1q9d"; + }; + } + { + goPackagePath = "github.com/go-audio/audio"; + fetch = { + type = "git"; + url = "https://github.com/go-audio/audio"; + rev = "v1.0.0"; + sha256 = "05ai13yc8wwk2zlk9br62lh4z9hs1q685l7ij618bknf449vjsf3"; + }; + } + { + goPackagePath = "github.com/go-audio/riff"; + fetch = { + type = "git"; + url = "https://github.com/go-audio/riff"; + rev = "v1.0.0"; + sha256 = "0wg3p3gsad1rql7bzx7pwwsyd00a5gdb8f1h7zfr7hlqja5skwb4"; + }; + } + { + goPackagePath = "github.com/go-audio/wav"; + fetch = { + type = "git"; + url = "https://github.com/go-audio/wav"; + rev = "v1.0.0"; + sha256 = "058mgc5ahjibnsqayk3k75l04gg9mv27bpmj79jyrya3kaczpamk"; + }; + } + { + goPackagePath = "github.com/go-gl/glfw"; + fetch = { + type = "git"; + url = "https://github.com/go-gl/glfw"; + rev = "6f7a984d4dc4"; + sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "v1.5.0"; + sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; + }; + } + { + goPackagePath = "github.com/gofrs/uuid"; + fetch = { + type = "git"; + url = "https://github.com/gofrs/uuid"; + rev = "v3.2.0"; + sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; + }; + } + { + goPackagePath = "github.com/golang-sql/civil"; + fetch = { + type = "git"; + url = "https://github.com/golang-sql/civil"; + rev = "cb61b32ac6fe"; + sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "0210a2f0f73c"; + sha256 = "1n80xjfc1dkxs8h8mkpw83n89wi5n7hzc3rxhwjs76rkxpq3rc9j"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherwasm"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherwasm"; + rev = "v1.0.0"; + sha256 = "0q20il68gqnrc0s8jndc8mw1ynln60a4xy1lrqakzmp8whyilwri"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "v1.1.1"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "v1.7.4"; + sha256 = "1d0sy1paa055ic84sp3766s9pa24q008hf77dc842vrgvn8p3wmh"; + }; + } + { + goPackagePath = "github.com/gorilla/securecookie"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/securecookie"; + rev = "v1.1.1"; + sha256 = "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"; + }; + } + { + goPackagePath = "github.com/gorilla/sessions"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/sessions"; + rev = "v1.2.0"; + sha256 = "1kz6ydgp7vamhl2ak02hvzp2yv1dbfbwzsdxn6271lyzzdvz4pp1"; + }; + } + { + goPackagePath = "github.com/hajimehoshi/go-mp3"; + fetch = { + type = "git"; + url = "https://github.com/hajimehoshi/go-mp3"; + rev = "v0.2.1"; + sha256 = "0dxqpyj4xbq570if25g5wqbbp6frhq733h2ny3b2z3z8hw4q7vgg"; + }; + } + { + goPackagePath = "github.com/hajimehoshi/oto"; + fetch = { + type = "git"; + url = "https://github.com/hajimehoshi/oto"; + rev = "v0.6.1"; + sha256 = "1k3c0y8gdxn2c8fqc8rbjrn7nbbbhii3krma267jg01qq2zpsm8h"; + }; + } + { + goPackagePath = "github.com/huandu/xstrings"; + fetch = { + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "v1.3.1"; + sha256 = "0j5vsyjxclk7g7vfr3mfybbimywf3khr8yx07dsdcm1zjwb092iy"; + }; + } + { + goPackagePath = "github.com/icza/bitio"; + fetch = { + type = "git"; + url = "https://github.com/icza/bitio"; + rev = "v1.0.0"; + sha256 = "1c4ps4a9khx2bqp6v0p7b7l0s0gly3vj8rkh816vznj4mdlgk76w"; + }; + } + { + goPackagePath = "github.com/icza/mighty"; + fetch = { + type = "git"; + url = "https://github.com/icza/mighty"; + rev = "cfd07d671de6"; + sha256 = "09prb460wqg72s753g3a9rm0ph60hp83najj0lx9ifp1lixnfb3d"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.9"; + sha256 = "042v7bzx575isa4pr868hrlv085qxpg8qi4m04jnkh5vbq4hvs90"; + }; + } + { + goPackagePath = "github.com/jfreymuth/oggvorbis"; + fetch = { + type = "git"; + url = "https://github.com/jfreymuth/oggvorbis"; + rev = "v1.0.0"; + sha256 = "0c0r63sp4q8bl8vvgayr98m0fsscl1f65cd2h7i4cr1awg6r6l6a"; + }; + } + { + goPackagePath = "github.com/jfreymuth/vorbis"; + fetch = { + type = "git"; + url = "https://github.com/jfreymuth/vorbis"; + rev = "v1.0.0"; + sha256 = "16gl1lwagiqw6ib48zsl4zpv1dmykz7fzhxc65vpcdipx2byhi7a"; + }; + } + { + goPackagePath = "github.com/jinzhu/gorm"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/gorm"; + rev = "v1.9.12"; + sha256 = "06d25jvrqvp1bd4k7mh9gsk414d2vhpr049qvj46yx21hyv9d6v3"; + }; + } + { + goPackagePath = "github.com/jinzhu/inflection"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/inflection"; + rev = "v1.0.0"; + sha256 = "165i20d11s03771gi43skl66salxj36212r25fbs0cgr4qgfj7fy"; + }; + } + { + goPackagePath = "github.com/jinzhu/now"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/now"; + rev = "v1.0.1"; + sha256 = "1b4gyw01b3rq3js43n0wqb1k2iymb2mnpdv7vapjs0lsbm4g5q1p"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; + }; + } + { + goPackagePath = "github.com/josephburnett/jd"; + fetch = { + type = "git"; + url = "https://github.com/josephburnett/jd"; + rev = "aa1a7c66b42f"; + sha256 = "0yjdnifwxhdgzcw4jkal3f69sgcjrdiscd5wg45d83zfrsqbb34c"; + }; + } + { + goPackagePath = "github.com/karrick/godirwalk"; + fetch = { + type = "git"; + url = "https://github.com/karrick/godirwalk"; + rev = "v1.15.6"; + sha256 = "0i8202kcihz2hvqp7zzbla5p9x2ljpbjg5zy5dy3x0capz0ina3c"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.3.0"; + sha256 = "0bfravwqyj7z6v4lhsibbmgp7lajdydy4ij6c81g8hv0067x2mqw"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "12d3b2882a08"; + sha256 = "1w95axfn1a6rz31xrks77ingr9mdkqyr7mh0glv664kz1wg2h0gw"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v2.0.3"; + sha256 = "0gn4dgvwmbf8gmhn5nzpwixc39g8mkp3n8lhyjgvhvsl72llcdzv"; + }; + } + { + goPackagePath = "github.com/mewkiz/flac"; + fetch = { + type = "git"; + url = "https://github.com/mewkiz/flac"; + rev = "v1.0.6"; + sha256 = "19083pfc6wxkb45s61di9a542jslcgkzif5z3qjymy085w4aizzx"; + }; + } + { + goPackagePath = "github.com/mewkiz/pkg"; + fetch = { + type = "git"; + url = "https://github.com/mewkiz/pkg"; + rev = "f6b5e26764c3"; + sha256 = "0djxw953sp2cwqybjxsfrsfma5yjn8n1l19g8yrd629cb6r1ghq2"; + }; + } + { + goPackagePath = "github.com/mitchellh/copystructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/copystructure"; + rev = "v1.0.0"; + sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "v1.0.0"; + sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; + }; + } + { + goPackagePath = "github.com/mitchellh/reflectwalk"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/reflectwalk"; + rev = "v1.0.1"; + sha256 = "0pa6a3nhzwv5s5yqcmsmsfhdp5ggxsg2wa86f3akawxrhrkjarnx"; + }; + } + { + goPackagePath = "github.com/nicksellen/audiotags"; + fetch = { + type = "git"; + url = "https://github.com/nicksellen/audiotags"; + rev = "94015fa599bd"; + sha256 = "1817vw2j1lnk4y3925cszmkvwzsdcmgccrcdqyq39jqpwawl2c0j"; + }; + } + { + goPackagePath = "github.com/oklog/run"; + fetch = { + type = "git"; + url = "https://github.com/oklog/run"; + rev = "v1.1.0"; + sha256 = "0r55p3kgdkgw55i33lqvvvl60mjp92mhd1170m980sw98z9150jk"; + }; + } + { + goPackagePath = "github.com/oxtoacart/bpool"; + fetch = { + type = "git"; + url = "https://github.com/oxtoacart/bpool"; + rev = "03653db5a59c"; + sha256 = "1crdgm5w6kvcnvdglrrnrfkh5h60ldafwvrv00q97lz3790kgb15"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.6.0"; + sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq"; + }; + } + { + goPackagePath = "github.com/peterbourgon/ff"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/ff"; + rev = "v1.7.0"; + sha256 = "17msscfi4pfdih1w3sq0wsw6246a30fckga9kvjpzwva6jni0466"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/rainycape/unidecode"; + fetch = { + type = "git"; + url = "https://github.com/rainycape/unidecode"; + rev = "cb7f23ec59be"; + sha256 = "1wvzdijd640blwkgmw6h09frkfa04kcpdq87n2zh2ymj1dzla5v5"; + }; + } + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "f09979ecbc72"; + sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "github.com/wader/gormstore"; + fetch = { + type = "git"; + url = "https://github.com/wader/gormstore"; + rev = "65a111a20c23"; + sha256 = "0dnylv4gdqsizll7b07nivv6chanqm0014yhqg6gcjccns6bl9bm"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "06a226fb4e37"; + sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5"; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "00229845015e"; + sha256 = "0b0f05vbxzbgaaawxqns2m9qbvkfam1ylq8c8yhv7h6jnk2afaff"; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "33d19683fad8"; + sha256 = "16qw6s9qlv84x98s9dib90y97x8bli3msaqw8kz498dbnbyx59zk"; + }; + } + { + goPackagePath = "golang.org/x/mobile"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mobile"; + rev = "4c31acba0007"; + sha256 = "0k42pn6fq886k9hn85wbgg4h4y1myj7niw0746sn50zfbrmy3s2c"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "331c550502dd"; + sha256 = "0942gzs6mlsjal4drjmm8gr54pj1cdhsl9mnj3ygm200mf3fj6pi"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "3b0461eec859"; + sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "fe76b779f299"; + sha256 = "0g6j3n9fdv1a2lp2i8wbaaya85yrbfx3ns6iq1s7l2ayhxxmgh6b"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "b753a1ba74fa"; + sha256 = "1xyzswbz9cx0bns2n75fw9pbm82dk9dj2il9iknmryyxvci9n5zv"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "1b5146add898"; + sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.4.0"; + sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; + }; + } + { + goPackagePath = "gopkg.in/DATA-DOG/go-sqlmock.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/DATA-DOG/go-sqlmock.v1"; + rev = "v1.3.0"; + sha256 = "1684d6ima6638xwvr743kd7j5mpqq0vspcw9ai67bnb7m722qqqv"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/gormigrate.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/gormigrate.v1"; + rev = "v1.6.0"; + sha256 = "03304vh58i5gxchrxy2v91bjdfgp7849jarmlanz3gaa2r574fmf"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.4"; + sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebb11820e024..c840736728c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20742,6 +20742,8 @@ in gollum = callPackage ../applications/misc/gollum { }; + gonic = callPackage ../servers/gonic { }; + googleearth = callPackage ../applications/misc/googleearth { }; google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; From 5cfd8275a64da9fd38d061441dbce74ccb5c1ddd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 30 Aug 2020 01:13:18 +0200 Subject: [PATCH 297/688] =?UTF-8?q?pyexcel-xls:=200.5.8=20=E2=86=92=200.5.?= =?UTF-8?q?9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/pyexcel-xls/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix index 40d90deacc5b..2dd4533c2a9f 100644 --- a/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -5,15 +5,17 @@ , xlrd , xlwt , nose +, pyexcel +, mock }: buildPythonPackage rec { pname = "pyexcel-xls"; - version = "0.5.8"; + version = "0.5.9"; src = fetchPypi { inherit pname version; - sha256 = "LTPrS9ja37jHO1zMaiONZbORTomnVTsfObk5exfL5AI="; + sha256 = "1Wyt6gpmBoRFaXbZgFJVTTu+KnivxfmpHIaR9iZghVU="; }; propagatedBuildInputs = [ @@ -22,11 +24,13 @@ buildPythonPackage rec { xlwt ]; - # Tests are not included in the archive. - # https://github.com/pyexcel/pyexcel-xls/issues/35 - doCheck = false; + checkInputs = [ + nose + pyexcel + mock + ]; - pythonImportsCheck = [ "pyexcel_xls" ]; + checkPhase = "nosetests"; meta = { description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt"; From cfa06fbbcab9184e76c1fb330141c526d759bd7d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 30 Aug 2020 07:49:32 +0800 Subject: [PATCH 298/688] puddletag: 1.2.0 -> 2.0.1 --- pkgs/applications/audio/puddletag/default.nix | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index a0813fa0c801..47ea078c4b2d 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchFromGitHub, python2Packages, chromaprint }: +{ stdenv, fetchFromGitHub, python3Packages, chromaprint }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "puddletag"; - version = "1.2.0"; + version = "2.0.1"; src = fetchFromGitHub { - owner = "keithgg"; - repo = "puddletag"; - rev = "v${version}"; - sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; + owner = "keithgg"; + repo = "puddletag"; + rev = version; + sha256 = "sha256-9l8Pc77MX5zFkOqU00HFS8//3Bzd2OMnVV1brmWsNAQ="; }; - setSourceRoot = '' - sourceRoot=$(echo */source) - ''; + sourceRoot = "source/source"; - disabled = python2Packages.isPy3k; # work to support python 3 has not begun - - propagatedBuildInputs = [ chromaprint ] ++ (with python2Packages; [ + propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [ configobj mutagen pyparsing - pyqt4 + pyqt5 ]); doCheck = false; # there are no tests + dontStrip = true; # we are not generating any binaries meta = with stdenv.lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; - homepage = "https://docs.puddletag.net"; - license = licenses.gpl3; + homepage = "https://docs.puddletag.net"; + license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From b10edc136e4a174f8e19f5d5802299dd40cfaca4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 30 Aug 2020 08:04:44 +0800 Subject: [PATCH 299/688] dogpile.cache: add missing dep --- pkgs/development/python-modules/dogpile.cache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index aff7eb0a00c9..de0354f786cb 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, Mako, decorator +, pytest, pytestcov, mock, Mako, decorator, stevedore }: buildPythonPackage rec { @@ -26,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov mock Mako ]; - propagatedBuildInputs = [ decorator ]; + propagatedBuildInputs = [ decorator stevedore ]; meta = with stdenv.lib; { description = "A caching front-end based on the Dogpile lock"; From 67b7baa58081d2497347ab8c46e1909aa407910f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 28 Aug 2020 23:53:03 +0200 Subject: [PATCH 300/688] homeassistant: 0.114.3 -> 0.114.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 922755db1fb8..1bf4c3bd9509 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.114.3"; + version = "0.114.4"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3301db1756f8..8f4d65066d06 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -75,7 +75,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.114.3"; + hassVersion = "0.114.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -94,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1fn93vac9vi1wcbq8z9pc2cdvfdkkxpam2qhv5ni14wrmnjc4305"; + sha256 = "0k9px4ny0b72d9ysr3x72idprgfgjab1z91ildr87629826bb4n7"; }; postPatch = '' From cc4fd57df93da02574fdcd79915135428f843898 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 29 Aug 2020 00:05:23 +0200 Subject: [PATCH 301/688] home-assistant: find packages that use extra_require --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/parse-requirements.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1bf4c3bd9509..a392c30b21cf 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -683,7 +683,7 @@ "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend "saj" = ps: with ps; [ ]; # missing inputs: pysaj "salt" = ps: with ps; [ ]; # missing inputs: saltbox - "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] samsungtvws[websocket] + "samsungtv" = ps: with ps; [ samsungctl samsungtvws]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 3c6d0c4bcabc..502ea7d6c1e3 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -113,6 +113,10 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional # instead of python-3.6-python-mpd2 inside Nixpkgs if req.startswith("python-") or req.startswith("python_"): names.append(req[len("python-") :]) + # Add name variant without extra_require, e.g. samsungctl + # instead of samsungctl[websocket] + if req.endswith("]"): + names.append(req[:req.find("[")]) for name in names: # treat "-" and "_" equally name = re.sub("[-_]", "[-_]", name) From 60cb1123b2799a7ae854752331c31fc9093f5051 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 28 Aug 2020 23:39:15 +0200 Subject: [PATCH 302/688] pythonPackages.samsungctl: init at 0.7.1 --- .../python-modules/samsungctl/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/samsungctl/default.nix diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix new file mode 100644 index 000000000000..d29e89db8462 --- /dev/null +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi +, websocket_client +}: + +buildPythonPackage rec { + pname = "samsungctl"; + version = "0.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g"; + }; + + propagatedBuildInputs = [ + websocket_client + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "samsungctl" ]; + + meta = with lib; { + description = "Remote control Samsung televisions via a TCP/IP connection"; + homepage = "https://github.com/Ape/samsungctl"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cd655a8402a1..20b65c751b1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3704,6 +3704,8 @@ in { samplerate = callPackage ../development/python-modules/samplerate { }; + samsungctl = callPackage ../development/python-modules/samsungctl { }; + screeninfo = callPackage ../development/python-modules/screeninfo { }; ssdeep = callPackage ../development/python-modules/ssdeep { }; From f31f620200be23a1910e57c81c1abd32ddd2b17c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 29 Aug 2020 00:19:05 +0200 Subject: [PATCH 303/688] python3Packages.samsungtvws: init at 1.5.3 --- .../python-modules/samsungtvws/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/samsungtvws/default.nix diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix new file mode 100644 index 000000000000..b41935c58256 --- /dev/null +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, requests +, websocket_client +}: + +buildPythonPackage rec { + pname = "samsungtvws"; + version = "1.5.3"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "054rr8hiacdjfxqssnxnd3xp9hh8350zjzzjvh1199bpps4l1l6n"; + }; + + patchPhase = '' + substituteInPlace setup.py --replace "websocket-client==" "websocket-client>=" + ''; + + propagatedBuildInputs = [ + websocket_client + requests + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "samsungtvws" ]; + + meta = with lib; { + description = "Samsung Smart TV WS API wrapper"; + homepage = "https://github.com/xchwarze/samsung-tv-ws-api"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20b65c751b1e..b23bdd75db15 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3706,6 +3706,8 @@ in { samsungctl = callPackage ../development/python-modules/samsungctl { }; + samsungtvws = callPackage ../development/python-modules/samsungtvws { }; + screeninfo = callPackage ../development/python-modules/screeninfo { }; ssdeep = callPackage ../development/python-modules/ssdeep { }; From ed5c35626a3e0fddbdbf26363785b2a6f1689de2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 29 Aug 2020 00:40:16 +0200 Subject: [PATCH 304/688] python3Packages.pyipp: 0.10.1 -> 0.11.0 Loosens dependency requirements and thus fixes build with bumped yarl version. --- pkgs/development/python-modules/pyipp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index cf6b67c548b6..98bb6360ce54 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "pyipp"; - version = "0.10.1"; + version = "0.11.0"; disabled = isPy27; src = fetchFromGitHub { owner = "ctalkington"; repo = "python-ipp"; rev = version; - sha256 = "0y9mkrx66f4m77jzfgdgmvlqismvimb6hm61j2va7zapm8dyabvr"; + sha256 = "0ar3mkyfa9qi3av3885bvacpwlxh420if9ymdj8i4x06ymzc213d"; }; propagatedBuildInputs = [ From e06e699c84a18b121935cbd2410d3c3725236faf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 29 Aug 2020 00:59:50 +0200 Subject: [PATCH 305/688] home-assistant: fix list spacing in component packages --- .../home-assistant/component-packages.nix | 544 +++++++++--------- .../home-assistant/parse-requirements.py | 7 +- 2 files changed, 276 insertions(+), 275 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a392c30b21cf..4a6989989aeb 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -6,7 +6,7 @@ components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather - "acer_projector" = ps: with ps; [ pyserial]; + "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ ]; # missing inputs: aiopulse "actiontec" = ps: with ps; [ ]; "adguard" = ps: with ps; [ ]; # missing inputs: adguardhome @@ -15,39 +15,39 @@ "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ ]; # missing inputs: airly - "airvisual" = ps: with ps; [ pyairvisual]; + "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ ]; # missing inputs: adext "alert" = ps: with ps; [ ]; - "alexa" = ps: with ps; [ aiohttp-cors]; - "almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond + "alexa" = ps: with ps; [ aiohttp-cors ]; + "almond" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyalmond "alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage - "amazon_polly" = ps: with ps; [ boto3]; - "ambiclimate" = ps: with ps; [ aiohttp-cors]; # missing inputs: ambiclimate + "amazon_polly" = ps: with ps; [ boto3 ]; + "ambiclimate" = ps: with ps; [ aiohttp-cors ]; # missing inputs: ambiclimate "ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient - "amcrest" = ps: with ps; [ ha-ffmpeg]; # missing inputs: amcrest + "amcrest" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: amcrest "ampio" = ps: with ps; [ ]; # missing inputs: asmog "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam "androidtv" = ps: with ps; [ ]; # missing inputs: adb-shell[async] androidtv[async] pure-python-adb "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav - "apache_kafka" = ps: with ps; [ aiokafka]; + "apache_kafka" = ps: with ps; [ aiokafka ]; "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess - "api" = ps: with ps; [ aiohttp-cors]; + "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; # missing inputs: apns2 - "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf]; - "apprise" = ps: with ps; [ apprise]; + "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ]; + "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj "arduino" = ps: with ps; [ ]; # missing inputs: PyMata "arest" = ps: with ps; [ ]; - "arlo" = ps: with ps; [ ha-ffmpeg]; # missing inputs: pyarlo + "arlo" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: pyarlo "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg - "aruba" = ps: with ps; [ pexpect]; - "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "aruba" = ps: with ps; [ pexpect ]; + "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt @@ -57,17 +57,17 @@ "august" = ps: with ps; [ ]; # missing inputs: py-august "aurora" = ps: with ps; [ ]; "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy - "auth" = ps: with ps; [ aiohttp-cors]; - "automation" = ps: with ps; [ aiohttp-cors]; + "auth" = ps: with ps; [ aiohttp-cors ]; + "automation" = ps: with ps; [ aiohttp-cors ]; "avea" = ps: with ps; [ ]; # missing inputs: avea "avion" = ps: with ps; [ ]; # missing inputs: avion - "avri" = ps: with ps; [ pycountry]; # missing inputs: avri-api + "avri" = ps: with ps; [ pycountry ]; # missing inputs: avri-api "awair" = ps: with ps; [ ]; # missing inputs: python_awair "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore - "axis" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: axis + "axis" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: axis "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub - "azure_service_bus" = ps: with ps; [ azure-servicebus]; + "azure_service_bus" = ps: with ps; [ azure-servicebus ]; "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip "bayesian" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO @@ -80,22 +80,22 @@ "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi "blink" = ps: with ps; [ ]; # missing inputs: blinkpy - "blinksticklight" = ps: with ps; [ BlinkStick]; + "blinksticklight" = ps: with ps; [ BlinkStick ]; "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ ]; - "bluesound" = ps: with ps; [ xmltodict]; + "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] - "bluetooth_tracker" = ps: with ps; [ bt_proximity]; # missing inputs: pybluez + "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez "bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop "bond" = ps: with ps; [ ]; # missing inputs: bond-api - "braviatv" = ps: with ps; [ bravia-tv]; - "broadlink" = ps: with ps; [ broadlink]; - "brother" = ps: with ps; [ brother]; + "braviatv" = ps: with ps; [ bravia-tv ]; + "broadlink" = ps: with ps; [ broadlink ]; + "brother" = ps: with ps; [ brother ]; "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ ]; # missing inputs: brunt @@ -103,15 +103,15 @@ "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist "buienradar" = ps: with ps; [ ]; # missing inputs: buienradar - "caldav" = ps: with ps; [ caldav]; - "calendar" = ps: with ps; [ aiohttp-cors]; - "camera" = ps: with ps; [ aiohttp-cors]; - "canary" = ps: with ps; [ ha-ffmpeg]; # missing inputs: py-canary - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast zeroconf]; + "caldav" = ps: with ps; [ caldav ]; + "calendar" = ps: with ps; [ aiohttp-cors ]; + "camera" = ps: with ps; [ aiohttp-cors ]; + "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary + "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ ]; # missing inputs: pychannels "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook - "cisco_ios" = ps: with ps; [ pexpect]; + "cisco_ios" = ps: with ps; [ pexpect ]; "cisco_mobility_express" = ps: with ps; [ ]; # missing inputs: ciscomobilityexpress "cisco_webex_teams" = ps: with ps; [ ]; # missing inputs: webexteamssdk "citybikes" = ps: with ps; [ ]; @@ -120,44 +120,44 @@ "clicksend" = ps: with ps; [ ]; "clicksend_tts" = ps: with ps; [ ]; "climate" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa]; + "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; "cloudflare" = ps: with ps; [ ]; # missing inputs: pycfdns "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase - "coinmarketcap" = ps: with ps; [ coinmarketcap]; + "coinmarketcap" = ps: with ps; [ coinmarketcap ]; "comed_hourly_pricing" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect "command_line" = ps: with ps; [ ]; "concord232" = ps: with ps; [ ]; # missing inputs: concord232 - "config" = ps: with ps; [ aiohttp-cors]; + "config" = ps: with ps; [ aiohttp-cors ]; "configurator" = ps: with ps; [ ]; "control4" = ps: with ps; [ ]; # missing inputs: pyControl4 - "conversation" = ps: with ps; [ aiohttp-cors]; + "conversation" = ps: with ps; [ aiohttp-cors ]; "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet "coronavirus" = ps: with ps; [ ]; # missing inputs: coronavirus "counter" = ps: with ps; [ ]; "cover" = ps: with ps; [ ]; "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy - "cpuspeed" = ps: with ps; [ py-cpuinfo]; + "cpuspeed" = ps: with ps; [ py-cpuinfo ]; "crimereports" = ps: with ps; [ ]; # missing inputs: crimereports - "cups" = ps: with ps; [ pycups]; + "cups" = ps: with ps; [ pycups ]; "currencylayer" = ps: with ps; [ ]; "daikin" = ps: with ps; [ ]; # missing inputs: pydaikin "danfoss_air" = ps: with ps; [ ]; # missing inputs: pydanfossair - "darksky" = ps: with ps; [ python-forecastio]; - "datadog" = ps: with ps; [ datadog]; + "darksky" = ps: with ps; [ python-forecastio ]; + "datadog" = ps: with ps; [ datadog ]; "ddwrt" = ps: with ps; [ ]; - "debugpy" = ps: with ps; [ debugpy]; + "debugpy" = ps: with ps; [ debugpy ]; "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz - "decora" = ps: with ps; [ bluepy]; # missing inputs: decora + "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend + "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco sqlalchemy zeroconf ]; # missing inputs: home-assistant-frontend "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn - "deluge" = ps: with ps; [ deluge-client]; - "demo" = ps: with ps; [ aiohttp-cors]; + "deluge" = ps: with ps; [ deluge-client ]; + "demo" = ps: with ps; [ aiohttp-cors ]; "denon" = ps: with ps; [ ]; - "denonavr" = ps: with ps; [ denonavr getmac]; + "denonavr" = ps: with ps; [ denonavr getmac ]; "derivative" = ps: with ps; [ ]; "deutsche_bahn" = ps: with ps; [ ]; # missing inputs: schiene "device_automation" = ps: with ps; [ ]; @@ -166,40 +166,40 @@ "devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api "dexcom" = ps: with ps; [ ]; # missing inputs: pydexcom "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT - "dialogflow" = ps: with ps; [ aiohttp-cors]; - "digital_ocean" = ps: with ps; [ digital-ocean]; + "dialogflow" = ps: with ps; [ aiohttp-cors ]; + "digital_ocean" = ps: with ps; [ digital-ocean ]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "directv" = ps: with ps; [ ]; # missing inputs: directv - "discogs" = ps: with ps; [ discogs_client]; - "discord" = ps: with ps; [ discordpy]; - "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; - "dlib_face_detect" = ps: with ps; [ face_recognition]; - "dlib_face_identify" = ps: with ps; [ face_recognition]; + "discogs" = ps: with ps; [ discogs_client ]; + "discord" = ps: with ps; [ discordpy ]; + "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; + "dlib_face_detect" = ps: with ps; [ face_recognition ]; + "dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 - "dlna_dmr" = ps: with ps; [ async-upnp-client]; - "dnsip" = ps: with ps; [ aiodns]; - "dominos" = ps: with ps; [ aiohttp-cors]; # missing inputs: pizzapi - "doods" = ps: with ps; [ pillow]; # missing inputs: pydoods - "doorbird" = ps: with ps; [ aiohttp-cors]; # missing inputs: doorbirdpy + "dlna_dmr" = ps: with ps; [ async-upnp-client ]; + "dnsip" = ps: with ps; [ aiodns ]; + "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi + "doods" = ps: with ps; [ pillow ]; # missing inputs: pydoods + "doorbird" = ps: with ps; [ aiohttp-cors ]; # missing inputs: doorbirdpy "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ ]; "dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser - "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "dte_energy_bridge" = ps: with ps; [ ]; "dublin_bus_transport" = ps: with ps; [ ]; "duckdns" = ps: with ps; [ ]; "dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd - "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict]; + "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict ]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices - "dyson" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: libpurecool + "dyson" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: libpurecool "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface "ecobee" = ps: with ps; [ ]; # missing inputs: python-ecobee-api "econet" = ps: with ps; [ ]; # missing inputs: pyeconet "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks - "eddystone_temperature" = ps: with ps; [ construct]; # missing inputs: beacontools[scan] + "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] "edimax" = ps: with ps; [ ]; # missing inputs: pyedimax "edl21" = ps: with ps; [ ]; # missing inputs: pysml "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox @@ -213,9 +213,9 @@ "emby" = ps: with ps; [ ]; # missing inputs: pyemby "emoncms" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; - "emulated_hue" = ps: with ps; [ aiohttp-cors]; + "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku - "enigma2" = ps: with ps; [ openwebifpy]; + "enigma2" = ps: with ps; [ openwebifpy ]; "enocean" = ps: with ps; [ ]; # missing inputs: enocean "enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient @@ -225,8 +225,8 @@ "ephember" = ps: with ps; [ ]; # missing inputs: pyephember "epson" = ps: with ps; [ ]; # missing inputs: epson-projector "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter - "eq3btsmart" = ps: with ps; [ construct]; # missing inputs: python-eq3bt - "esphome" = ps: with ps; [ aioesphomeapi]; + "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt + "esphome" = ps: with ps; [ aioesphomeapi ]; "essent" = ps: with ps; [ ]; # missing inputs: PyEssent "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api "eufy" = ps: with ps; [ ]; # missing inputs: lakeside @@ -240,17 +240,17 @@ "fan" = ps: with ps; [ ]; "fastdotcom" = ps: with ps; [ ]; # missing inputs: fastdotcom "feedreader" = ps: with ps; [ ]; # missing inputs: feedparser-homeassistant - "ffmpeg" = ps: with ps; [ ha-ffmpeg]; - "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg]; - "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg]; + "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; + "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; + "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; "fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3 "fido" = ps: with ps; [ ]; # missing inputs: pyfido "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; - "filter" = ps: with ps; [ aiohttp-cors sqlalchemy]; - "fints" = ps: with ps; [ fints]; + "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "fints" = ps: with ps; [ fints ]; "firmata" = ps: with ps; [ ]; # missing inputs: pymata-express - "fitbit" = ps: with ps; [ aiohttp-cors fitbit]; + "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ ]; # missing inputs: fixerio "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ ]; # missing inputs: pyflexit pymodbus @@ -260,23 +260,23 @@ "flume" = ps: with ps; [ ]; # missing inputs: pyflume "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou "flux" = ps: with ps; [ ]; - "flux_led" = ps: with ps; [ flux-led]; + "flux_led" = ps: with ps; [ flux-led ]; "folder" = ps: with ps; [ ]; - "folder_watcher" = ps: with ps; [ watchdog]; + "folder_watcher" = ps: with ps; [ watchdog ]; "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam - "foursquare" = ps: with ps; [ aiohttp-cors]; + "foursquare" = ps: with ps; [ aiohttp-cors ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms - "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: aiofreepybox + "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: aiofreepybox "freedns" = ps: with ps; [ ]; - "fritz" = ps: with ps; [ fritzconnection]; - "fritzbox" = ps: with ps; [ pyfritzhome]; - "fritzbox_callmonitor" = ps: with ps; [ fritzconnection]; - "fritzbox_netmonitor" = ps: with ps; [ fritzconnection]; + "fritz" = ps: with ps; [ fritzconnection ]; + "fritzbox" = ps: with ps; [ pyfritzhome ]; + "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; + "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius - "frontend" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "frontend" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi "futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip "garadget" = ps: with ps; [ ]; @@ -290,29 +290,29 @@ "geo_json_events" = ps: with ps; [ ]; # missing inputs: geojson_client "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client - "geofency" = ps: with ps; [ aiohttp-cors]; + "geofency" = ps: with ps; [ aiohttp-cors ]; "geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes "geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano "gios" = ps: with ps; [ ]; # missing inputs: gios - "github" = ps: with ps; [ PyGithub]; - "gitlab_ci" = ps: with ps; [ python-gitlab]; + "github" = ps: with ps; [ PyGithub ]; + "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy "glances" = ps: with ps; [ ]; # missing inputs: glances_api "gntp" = ps: with ps; [ ]; # missing inputs: gntp "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api - "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client]; - "google_assistant" = ps: with ps; [ aiohttp-cors]; - "google_cloud" = ps: with ps; [ google_cloud_texttospeech]; + "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; + "google_assistant" = ps: with ps; [ aiohttp-cors ]; + "google_cloud" = ps: with ps; [ google_cloud_texttospeech ]; "google_domains" = ps: with ps; [ ]; "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib - "google_pubsub" = ps: with ps; [ google_cloud_pubsub]; - "google_translate" = ps: with ps; [ gtts-token]; + "google_pubsub" = ps: with ps; [ google_cloud_pubsub ]; + "google_translate" = ps: with ps; [ gtts-token ]; "google_travel_time" = ps: with ps; [ ]; # missing inputs: googlemaps "google_wifi" = ps: with ps; [ ]; - "gpmdp" = ps: with ps; [ websocket_client]; + "gpmdp" = ps: with ps; [ websocket_client ]; "gpsd" = ps: with ps; [ ]; # missing inputs: gps3 - "gpslogger" = ps: with ps; [ aiohttp-cors]; + "gpslogger" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality @@ -325,8 +325,8 @@ "habitica" = ps: with ps; [ ]; # missing inputs: habitipy "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr - "harmony" = ps: with ps; [ aioharmony]; - "hassio" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "harmony" = ps: with ps; [ aioharmony ]; + "hassio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC @@ -336,27 +336,27 @@ "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision "hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1 - "history" = ps: with ps; [ aiohttp-cors sqlalchemy]; - "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy]; + "history" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "hitron_coda" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 - "home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect + "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf]; # missing inputs: PyTurboJPEG base36 fnvhash - "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: aiohomekit[IP] - "homematic" = ps: with ps; [ pyhomematic]; + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG base36 fnvhash + "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: aiohomekit[IP] + "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks "honeywell" = ps: with ps; [ ]; # missing inputs: somecomfort "horizon" = ps: with ps; [ ]; # missing inputs: horimote "hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo - "html5" = ps: with ps; [ aiohttp-cors pywebpush]; - "http" = ps: with ps; [ aiohttp-cors]; + "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; + "http" = ps: with ps; [ aiohttp-cors ]; "htu21d" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi - "huawei_lte" = ps: with ps; [ getmac stringcase]; # missing inputs: huawei-lte-api url-normalize + "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize "huawei_router" = ps: with ps; [ ]; - "hue" = ps: with ps; [ aiohue]; + "hue" = ps: with ps; [ aiohue ]; "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti @@ -365,17 +365,17 @@ "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink - "icloud" = ps: with ps; [ pyicloud]; + "icloud" = ps: with ps; [ pyicloud ]; "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py - "ifttt" = ps: with ps; [ aiohttp-cors pyfttt]; + "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; "iglo" = ps: with ps; [ ]; # missing inputs: iglo "ign_sismologia" = ps: with ps; [ ]; # missing inputs: georss_ign_sismologia_client - "ihc" = ps: with ps; [ defusedxml]; # missing inputs: ihcsdk - "image_processing" = ps: with ps; [ aiohttp-cors]; + "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk + "image_processing" = ps: with ps; [ aiohttp-cors ]; "imap" = ps: with ps; [ ]; # missing inputs: aioimaplib "imap_email_content" = ps: with ps; [ ]; "incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client - "influxdb" = ps: with ps; [ influxdb-client influxdb]; + "influxdb" = ps: with ps; [ influxdb-client influxdb ]; "input_boolean" = ps: with ps; [ ]; "input_datetime" = ps: with ps; [ ]; "input_number" = ps: with ps; [ ]; @@ -383,15 +383,15 @@ "input_text" = ps: with ps; [ ]; "insteon" = ps: with ps; [ ]; # missing inputs: pyinsteon "integration" = ps: with ps; [ ]; - "intent" = ps: with ps; [ aiohttp-cors]; + "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; "intesishome" = ps: with ps; [ ]; # missing inputs: pyintesishome - "ios" = ps: with ps; [ aiohttp-cors zeroconf]; + "ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "iota" = ps: with ps; [ ]; # missing inputs: pyota "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ ]; # missing inputs: pyipma - "ipp" = ps: with ps; [ pyipp]; - "iqvia" = ps: with ps; [ numpy]; # missing inputs: pyiqvia + "ipp" = ps: with ps; [ pyipp ]; + "iqvia" = ps: with ps; [ numpy ]; # missing inputs: pyiqvia "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator "iss" = ps: with ps; [ ]; # missing inputs: pyiss @@ -406,92 +406,92 @@ "kankun" = ps: with ps; [ ]; "keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact "keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client - "kef" = ps: with ps; [ getmac]; # missing inputs: aiokef + "kef" = ps: with ps; [ getmac ]; # missing inputs: aiokef "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput - "keyboard_remote" = ps: with ps; [ evdev]; # missing inputs: aionotify + "keyboard_remote" = ps: with ps; [ evdev ]; # missing inputs: aionotify "kira" = ps: with ps; [ ]; # missing inputs: pykira "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client "knx" = ps: with ps; [ ]; # missing inputs: xknx - "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket]; - "konnected" = ps: with ps; [ aiohttp-cors]; # missing inputs: konnected + "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; + "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ ]; # missing inputs: pylacrosse "lametric" = ps: with ps; [ ]; # missing inputs: lmnotify "lannouncer" = ps: with ps; [ ]; - "lastfm" = ps: with ps; [ pylast]; + "lastfm" = ps: with ps; [ pylast ]; "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches "lcn" = ps: with ps; [ ]; # missing inputs: pypck "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast-homeassistant "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal "life360" = ps: with ps; [ ]; # missing inputs: life360 - "lifx" = ps: with ps; [ aiolifx aiolifx-effects]; + "lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; "lifx_cloud" = ps: with ps; [ ]; "lifx_legacy" = ps: with ps; [ ]; # missing inputs: liffylights "light" = ps: with ps; [ ]; "lightwave" = ps: with ps; [ ]; # missing inputs: lightwave - "limitlessled" = ps: with ps; [ limitlessled]; + "limitlessled" = ps: with ps; [ limitlessled ]; "linksys_smart" = ps: with ps; [ ]; - "linode" = ps: with ps; [ linode-api]; - "linux_battery" = ps: with ps; [ batinfo]; + "linode" = ps: with ps; [ linode-api ]; + "linux_battery" = ps: with ps; [ batinfo ]; "lirc" = ps: with ps; [ ]; # missing inputs: python-lirc "litejet" = ps: with ps; [ ]; # missing inputs: pylitejet "llamalab_automate" = ps: with ps; [ ]; "local_file" = ps: with ps; [ ]; "local_ip" = ps: with ps; [ ]; - "locative" = ps: with ps; [ aiohttp-cors]; + "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; # missing inputs: home-assistant-frontend "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; - "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg]; # missing inputs: logi_circle + "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle "london_air" = ps: with ps; [ ]; "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status "loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy "lovelace" = ps: with ps; [ ]; - "luci" = ps: with ps; [ openwrt-luci-rpc]; - "luftdaten" = ps: with ps; [ luftdaten]; + "luci" = ps: with ps; [ openwrt-luci-rpc ]; + "luftdaten" = ps: with ps; [ luftdaten ]; "lupusec" = ps: with ps; [ ]; # missing inputs: lupupy "lutron" = ps: with ps; [ ]; # missing inputs: pylutron "lutron_caseta" = ps: with ps; [ ]; # missing inputs: pylutron-caseta "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed - "mailbox" = ps: with ps; [ aiohttp-cors]; - "mailgun" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymailgunner + "mailbox" = ps: with ps; [ aiohttp-cors ]; + "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner "manual" = ps: with ps; [ ]; - "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "map" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "map" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py - "matrix" = ps: with ps; [ matrix-client]; + "matrix" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ ]; # missing inputs: maxcube-api "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-blinka adafruit-circuitpython-mcp230xx - "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light]; - "media_player" = ps: with ps; [ aiohttp-cors]; + "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; + "media_player" = ps: with ps; [ aiohttp-cors ]; "mediaroom" = ps: with ps; [ ]; # missing inputs: pymediaroom "melcloud" = ps: with ps; [ ]; # missing inputs: pymelcloud "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate - "meraki" = ps: with ps; [ aiohttp-cors]; + "meraki" = ps: with ps; [ aiohttp-cors ]; "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird - "met" = ps: with ps; [ pymetno]; + "met" = ps: with ps; [ pymetno ]; "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint "mfi" = ps: with ps; [ ]; # missing inputs: mficlient "mhz19" = ps: with ps; [ ]; # missing inputs: pmsensor "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts - "microsoft_face" = ps: with ps; [ aiohttp-cors]; - "microsoft_face_detect" = ps: with ps; [ aiohttp-cors]; - "microsoft_face_identify" = ps: with ps; [ aiohttp-cors]; - "miflora" = ps: with ps; [ bluepy]; # missing inputs: miflora + "microsoft_face" = ps: with ps; [ aiohttp-cors ]; + "microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; + "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; + "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros "mill" = ps: with ps; [ ]; # missing inputs: millheater "min_max" = ps: with ps; [ ]; - "minecraft_server" = ps: with ps; [ aiodns getmac]; # missing inputs: mcstatus - "minio" = ps: with ps; [ minio]; + "minecraft_server" = ps: with ps; [ aiodns getmac ]; # missing inputs: mcstatus + "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa]; + "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ ]; # missing inputs: pymodbus "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem @@ -499,34 +499,34 @@ "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; "mpchc" = ps: with ps; [ ]; - "mpd" = ps: with ps; [ mpd2]; - "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "mpd" = ps: with ps; [ mpd2 ]; + "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "msteams" = ps: with ps; [ ]; # missing inputs: pymsteams - "mvglive" = ps: with ps; [ PyMVGLive]; + "mvglive" = ps: with ps; [ PyMVGLive ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ ]; # missing inputs: pymyq - "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: pymysensors - "mystrom" = ps: with ps; [ aiohttp-cors]; # missing inputs: python-mystrom + "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: pymysensors + "mystrom" = ps: with ps; [ aiohttp-cors ]; # missing inputs: python-mystrom "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns "n26" = ps: with ps; [ ]; # missing inputs: n26 "nad" = ps: with ps; [ ]; # missing inputs: nad_receiver - "namecheapdns" = ps: with ps; [ defusedxml]; - "nanoleaf" = ps: with ps; [ pynanoleaf]; - "neato" = ps: with ps; [ pybotvac]; + "namecheapdns" = ps: with ps; [ defusedxml ]; + "nanoleaf" = ps: with ps; [ pynanoleaf ]; + "neato" = ps: with ps; [ pybotvac ]; "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi "nello" = ps: with ps; [ ]; # missing inputs: pynello "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient "nest" = ps: with ps; [ ]; # missing inputs: python-nest - "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo]; + "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ ]; # missing inputs: netdata "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt - "netio" = ps: with ps; [ aiohttp-cors]; # missing inputs: pynetio + "netio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pynetio "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio "nexia" = ps: with ps; [ ]; # missing inputs: nexia "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext @@ -535,11 +535,11 @@ "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control "nilu" = ps: with ps; [ ]; # missing inputs: niluclient "nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2 - "nmap_tracker" = ps: with ps; [ getmac]; # missing inputs: python-nmap + "nmap_tracker" = ps: with ps; [ getmac ]; # missing inputs: python-nmap "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail "no_ip" = ps: with ps; [ ]; "noaa_tides" = ps: with ps; [ ]; # missing inputs: py_noaa - "norway_air" = ps: with ps; [ pymetno]; + "norway_air" = ps: with ps; [ pymetno ]; "notify" = ps: with ps; [ ]; "notify_events" = ps: with ps; [ ]; # missing inputs: notify-events "notion" = ps: with ps; [ ]; # missing inputs: aionotion @@ -555,17 +555,17 @@ "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics "obihai" = ps: with ps; [ ]; # missing inputs: pyobihai - "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; + "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat - "ohmconnect" = ps: with ps; [ defusedxml]; + "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi - "onboarding" = ps: with ps; [ aiohttp-cors]; + "onboarding" = ps: with ps; [ aiohttp-cors ]; "onewire" = ps: with ps; [ ]; # missing inputs: pyownet - "onkyo" = ps: with ps; [ onkyo-eiscp]; - "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: WSDiscovery onvif-zeep-async + "onkyo" = ps: with ps; [ onkyo-eiscp ]; + "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; - "opencv" = ps: with ps; [ numpy]; # missing inputs: opencv-python-headless + "opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless "openerz" = ps: with ps; [ ]; # missing inputs: openerz-api "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi "openexchangerates" = ps: with ps; [ ]; @@ -576,22 +576,22 @@ "opensky" = ps: with ps; [ ]; "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv - "openweathermap" = ps: with ps; [ pyowm]; + "openweathermap" = ps: with ps; [ pyowm ]; "opnsense" = ps: with ps; [ ]; # missing inputs: pyopnsense "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio "orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO "oru" = ps: with ps; [ ]; # missing inputs: oru "orvibo" = ps: with ps; [ ]; # missing inputs: orvibo "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify - "otp" = ps: with ps; [ pyotp]; + "otp" = ps: with ps; [ pyotp ]; "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy - "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt]; - "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: python-openzwave-mqtt + "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; + "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: python-openzwave-mqtt "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera - "pandora" = ps: with ps; [ pexpect]; - "panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend - "panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "pandora" = ps: with ps; [ pexpect ]; + "panel_custom" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend + "panel_iframe" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; @@ -605,41 +605,41 @@ "ping" = ps: with ps; [ ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 - "plaato" = ps: with ps; [ aiohttp-cors]; - "plant" = ps: with ps; [ sqlalchemy]; - "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos]; + "plaato" = ps: with ps; [ aiohttp-cors ]; + "plant" = ps: with ps; [ sqlalchemy ]; + "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; "plugwise" = ps: with ps; [ ]; # missing inputs: Plugwise_Smile "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts - "point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint + "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix - "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client]; + "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; "prowl" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; "proxmoxve" = ps: with ps; [ ]; # missing inputs: proxmoxer - "proxy" = ps: with ps; [ pillow]; + "proxy" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "ptvsd" = ps: with ps; [ ]; # missing inputs: ptvsd - "pulseaudio_loopback" = ps: with ps; [ pulsectl]; - "push" = ps: with ps; [ aiohttp-cors]; - "pushbullet" = ps: with ps; [ pushbullet]; - "pushover" = ps: with ps; [ pushover-complete]; + "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; + "push" = ps: with ps; [ aiohttp-cors ]; + "pushbullet" = ps: with ps; [ pushbullet ]; + "pushover" = ps: with ps; [ pushover-complete ]; "pushsafer" = ps: with ps; [ ]; - "pvoutput" = ps: with ps; [ jsonpath xmltodict]; + "pvoutput" = ps: with ps; [ jsonpath xmltodict ]; "pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc "pyload" = ps: with ps; [ ]; - "python_script" = ps: with ps; [ restrictedpython]; + "python_script" = ps: with ps; [ restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent "qld_bushfire" = ps: with ps; [ ]; # missing inputs: georss_qld_bushfire_alert_client "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats - "qrcode" = ps: with ps; [ pillow]; # missing inputs: pyzbar + "qrcode" = ps: with ps; [ pillow ]; # missing inputs: pyzbar "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch - "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: rachiopy + "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: rachiopy "radarr" = ps: with ps; [ ]; "radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird @@ -650,66 +650,66 @@ "raspihats" = ps: with ps; [ ]; # missing inputs: raspihats smbus-cffi "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client "recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste - "recorder" = ps: with ps; [ sqlalchemy]; + "recorder" = ps: with ps; [ sqlalchemy ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch - "reddit" = ps: with ps; [ praw]; + "reddit" = ps: with ps; [ praw ]; "rejseplanen" = ps: with ps; [ ]; # missing inputs: rjpl - "remember_the_milk" = ps: with ps; [ httplib2]; # missing inputs: RtmAPI + "remember_the_milk" = ps: with ps; [ httplib2 ]; # missing inputs: RtmAPI "remote" = ps: with ps; [ ]; "remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier - "rest" = ps: with ps; [ jsonpath xmltodict]; + "rest" = ps: with ps; [ jsonpath xmltodict ]; "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ]; # missing inputs: rflink "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx - "ring" = ps: with ps; [ ha-ffmpeg]; # missing inputs: ring_doorbell + "ring" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: ring_doorbell "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api - "rmvtransport" = ps: with ps; [ PyRMVtransport]; + "rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roomba" = ps: with ps; [ ]; # missing inputs: roombapy - "route53" = ps: with ps; [ boto3]; + "route53" = ps: with ps; [ boto3 ]; "rova" = ps: with ps; [ ]; # missing inputs: rova "rpi_camera" = ps: with ps; [ ]; "rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO "rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled "rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio "rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf - "rss_feed_template" = ps: with ps; [ aiohttp-cors]; + "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound - "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend + "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd + "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: home-assistant-frontend "saj" = ps: with ps; [ ]; # missing inputs: pysaj "salt" = ps: with ps; [ ]; # missing inputs: saltbox - "samsungtv" = ps: with ps; [ samsungctl samsungtvws]; + "samsungtv" = ps: with ps; [ samsungctl samsungtvws ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter - "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict]; + "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict ]; "script" = ps: with ps; [ ]; "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate - "search" = ps: with ps; [ aiohttp-cors]; - "season" = ps: with ps; [ ephem]; + "search" = ps: with ps; [ aiohttp-cors ]; + "season" = ps: with ps; [ ephem ]; "sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid "sense" = ps: with ps; [ ]; # missing inputs: sense_energy "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo "sensor" = ps: with ps; [ ]; - "sentry" = ps: with ps; [ sentry-sdk]; - "serial" = ps: with ps; [ pyserial-asyncio]; + "sentry" = ps: with ps; [ sentry-sdk ]; + "serial" = ps: with ps; [ pyserial-asyncio ]; "serial_pm" = ps: with ps; [ ]; # missing inputs: pmsensor "sesame" = ps: with ps; [ ]; # missing inputs: pysesame2 - "seven_segments" = ps: with ps; [ pillow]; + "seven_segments" = ps: with ps; [ pillow ]; "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track "shell_command" = ps: with ps; [ ]; - "shiftr" = ps: with ps; [ paho-mqtt]; - "shodan" = ps: with ps; [ shodan]; - "shopping_list" = ps: with ps; [ aiohttp-cors]; + "shiftr" = ps: with ps; [ paho-mqtt ]; + "shodan" = ps: with ps; [ shodan ]; + "shopping_list" = ps: with ps; [ aiohttp-cors ]; "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 "sigfox" = ps: with ps; [ ]; - "sighthound" = ps: with ps; [ pillow]; # missing inputs: simplehound + "sighthound" = ps: with ps; [ pillow ]; # missing inputs: simplehound "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python @@ -723,51 +723,51 @@ "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ ]; # missing inputs: pysma - "smappee" = ps: with ps; [ aiohttp-cors]; # missing inputs: pysmappee + "smappee" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pysmappee "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab - "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: pysmartapp pysmartthings + "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg "sms" = ps: with ps; [ ]; # missing inputs: python-gammu "smtp" = ps: with ps; [ ]; - "snapcast" = ps: with ps; [ snapcast]; - "snips" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "snmp" = ps: with ps; [ pysnmp]; + "snapcast" = ps: with ps; [ snapcast ]; + "snips" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "snmp" = ps: with ps; [ pysnmp ]; "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api "socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient - "solaredge" = ps: with ps; [ stringcase]; # missing inputs: solaredge + "solaredge" = ps: with ps; [ stringcase ]; # missing inputs: solaredge "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher "solax" = ps: with ps; [ ]; # missing inputs: solax "soma" = ps: with ps; [ ]; # missing inputs: pysoma - "somfy" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymfy + "somfy" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymfy "somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy "sonarr" = ps: with ps; [ ]; # missing inputs: sonarr "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal - "sonos" = ps: with ps; [ pysonos]; + "sonos" = ps: with ps; [ pysonos ]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp - "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf]; - "spaceapi" = ps: with ps; [ aiohttp-cors]; + "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf ]; + "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw - "speedtestdotnet" = ps: with ps; [ speedtest-cli]; + "speedtestdotnet" = ps: with ps; [ speedtest-cli ]; "spider" = ps: with ps; [ ]; # missing inputs: spiderpy "splunk" = ps: with ps; [ ]; "spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime - "spotify" = ps: with ps; [ aiohttp-cors spotipy]; - "sql" = ps: with ps; [ sqlalchemy]; + "spotify" = ps: with ps; [ aiohttp-cors spotipy ]; + "sql" = ps: with ps; [ sqlalchemy ]; "squeezebox" = ps: with ps; [ ]; # missing inputs: pysqueezebox - "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf]; + "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf ]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank - "startca" = ps: with ps; [ xmltodict]; - "statistics" = ps: with ps; [ sqlalchemy]; - "statsd" = ps: with ps; [ statsd]; + "startca" = ps: with ps; [ xmltodict ]; + "statistics" = ps: with ps; [ sqlalchemy ]; + "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd "stiebel_eltron" = ps: with ps; [ ]; # missing inputs: pymodbus pystiebeleltron "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert - "stream" = ps: with ps; [ aiohttp-cors av]; + "stream" = ps: with ps; [ aiohttp-cors av ]; "streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater - "stt" = ps: with ps; [ aiohttp-cors]; + "stt" = ps: with ps; [ aiohttp-cors ]; "suez_water" = ps: with ps; [ ]; # missing inputs: pysuez "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ ]; @@ -786,9 +786,9 @@ "synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm "syslog" = ps: with ps; [ ]; - "system_health" = ps: with ps; [ aiohttp-cors]; - "system_log" = ps: with ps; [ aiohttp-cors]; - "systemmonitor" = ps: with ps; [ psutil]; + "system_health" = ps: with ps; [ aiohttp-cors ]; + "system_log" = ps: with ps; [ aiohttp-cors ]; + "systemmonitor" = ps: with ps; [ psutil ]; "tado" = ps: with ps; [ ]; # missing inputs: python-tado "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility @@ -796,19 +796,19 @@ "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli "tcp" = ps: with ps; [ ]; - "ted5000" = ps: with ps; [ xmltodict]; + "ted5000" = ps: with ps; [ xmltodict ]; "teksavvy" = ps: with ps; [ ]; - "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot]; - "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot]; + "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; + "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; "tellduslive" = ps: with ps; [ ]; # missing inputs: tellduslive "tellstick" = ps: with ps; [ ]; # missing inputs: tellcore-net tellcore-py "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow protobuf]; # missing inputs: pycocotools tensorflow tf-models-official tf-slim + "tensorflow" = ps: with ps; [ numpy pillow protobuf ]; # missing inputs: pycocotools tensorflow tf-models-official tf-slim "tesla" = ps: with ps; [ ]; # missing inputs: teslajsonpy "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac - "thermoworks_smoke" = ps: with ps; [ stringcase]; # missing inputs: thermoworks_smoke + "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke "thethingsnetwork" = ps: with ps; [ ]; "thingspeak" = ps: with ps; [ ]; # missing inputs: thingspeak "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner @@ -821,51 +821,51 @@ "timer" = ps: with ps; [ ]; "tmb" = ps: with ps; [ ]; # missing inputs: tmb "tod" = ps: with ps; [ ]; - "todoist" = ps: with ps; [ todoist]; + "todoist" = ps: with ps; [ todoist ]; "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 "tomato" = ps: with ps; [ ]; - "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: toonapi - "torque" = ps: with ps; [ aiohttp-cors]; + "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: toonapi + "torque" = ps: with ps; [ aiohttp-cors ]; "totalconnect" = ps: with ps; [ ]; # missing inputs: total_connect_client "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline - "tplink" = ps: with ps; [ pyhs100]; + "tplink" = ps: with ps; [ pyhs100 ]; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected - "traccar" = ps: with ps; [ aiohttp-cors stringcase]; # missing inputs: pytraccar + "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr "tradfri" = ps: with ps; [ ]; # missing inputs: pytradfri[async] "trafikverket_train" = ps: with ps; [ ]; # missing inputs: pytrafikverket "trafikverket_weatherstation" = ps: with ps; [ ]; # missing inputs: pytrafikverket - "transmission" = ps: with ps; [ transmissionrpc]; + "transmission" = ps: with ps; [ transmissionrpc ]; "transport_nsw" = ps: with ps; [ ]; # missing inputs: PyTransportNSW "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy - "trend" = ps: with ps; [ numpy]; - "tts" = ps: with ps; [ aiohttp-cors mutagen]; + "trend" = ps: with ps; [ numpy ]; + "tts" = ps: with ps; [ aiohttp-cors mutagen ]; "tuya" = ps: with ps; [ ]; # missing inputs: tuyaha "twentemilieu" = ps: with ps; [ ]; # missing inputs: twentemilieu - "twilio" = ps: with ps; [ aiohttp-cors twilio]; - "twilio_call" = ps: with ps; [ aiohttp-cors twilio]; - "twilio_sms" = ps: with ps; [ aiohttp-cors twilio]; + "twilio" = ps: with ps; [ aiohttp-cors twilio ]; + "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; + "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "twitch" = ps: with ps; [ ]; # missing inputs: python-twitch-client "twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI "ubee" = ps: with ps; [ ]; # missing inputs: pyubee "ubus" = ps: with ps; [ ]; "ue_smart_radio" = ps: with ps; [ ]; "uk_transport" = ps: with ps; [ ]; - "unifi" = ps: with ps; [ aiounifi]; - "unifi_direct" = ps: with ps; [ pexpect]; + "unifi" = ps: with ps; [ aiounifi ]; + "unifi_direct" = ps: with ps; [ pexpect ]; "unifiled" = ps: with ps; [ ]; # missing inputs: unifiled "universal" = ps: with ps; [ ]; "upb" = ps: with ps; [ ]; # missing inputs: upb_lib "upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api - "updater" = ps: with ps; [ distro]; - "upnp" = ps: with ps; [ async-upnp-client]; + "updater" = ps: with ps; [ distro ]; + "upnp" = ps: with ps; [ async-upnp-client ]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ ]; # missing inputs: geojson_client "utility_meter" = ps: with ps; [ ]; - "uvc" = ps: with ps; [ uvcclient]; + "uvc" = ps: with ps; [ uvcclient ]; "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp @@ -873,43 +873,43 @@ "velux" = ps: with ps; [ ]; # missing inputs: pyvlx "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch "vera" = ps: with ps; [ ]; # missing inputs: pyvera - "verisure" = ps: with ps; [ jsonpath]; # missing inputs: vsure + "verisure" = ps: with ps; [ jsonpath ]; # missing inputs: vsure "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense - "version" = ps: with ps; [ pyhaversion]; + "version" = ps: with ps; [ pyhaversion ]; "vesync" = ps: with ps; [ ]; # missing inputs: pyvesync "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ ]; # missing inputs: PyViCare "vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek "vizio" = ps: with ps; [ ]; # missing inputs: pyvizio - "vlc" = ps: with ps; [ python-vlc]; + "vlc" = ps: with ps; [ python-vlc ]; "vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ ]; # missing inputs: volkszaehler "volumio" = ps: with ps; [ ]; # missing inputs: pyvolumio "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall - "vultr" = ps: with ps; [ vultr]; + "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 - "wake_on_lan" = ps: with ps; [ wakeonlan]; + "wake_on_lan" = ps: with ps; [ wakeonlan ]; "waqi" = ps: with ps; [ ]; # missing inputs: waqiasync "water_heater" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ ]; # missing inputs: waterfurnace "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf "watson_tts" = ps: with ps; [ ]; # missing inputs: ibm-watson - "waze_travel_time" = ps: with ps; [ WazeRouteCalculator]; + "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; "weather" = ps: with ps; [ ]; - "webhook" = ps: with ps; [ aiohttp-cors]; + "webhook" = ps: with ps; [ aiohttp-cors ]; "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv - "websocket_api" = ps: with ps; [ aiohttp-cors]; + "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ ]; # missing inputs: python-whois "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi - "wink" = ps: with ps; [ aiohttp-cors]; # missing inputs: pubnubsub-handler python-wink + "wink" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pubnubsub-handler python-wink "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy - "withings" = ps: with ps; [ aiohttp-cors]; # missing inputs: withings-api + "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api "wled" = ps: with ps; [ ]; # missing inputs: wled "wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset - "workday" = ps: with ps; [ holidays]; + "workday" = ps: with ps; [ holidays ]; "worldclock" = ps: with ps; [ ]; "worldtidesinfo" = ps: with ps; [ ]; "worxlandroid" = ps: with ps; [ ]; @@ -920,33 +920,33 @@ "xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi "xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway - "xiaomi" = ps: with ps; [ ha-ffmpeg]; - "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: PyXiaomiGateway - "xiaomi_miio" = ps: with ps; [ construct python-miio]; + "xiaomi" = ps: with ps; [ ha-ffmpeg ]; + "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: PyXiaomiGateway + "xiaomi_miio" = ps: with ps; [ construct python-miio ]; "xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv - "xmpp" = ps: with ps; [ slixmpp]; + "xmpp" = ps: with ps; [ slixmpp ]; "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client "yale_smart_alarm" = ps: with ps; [ ]; # missing inputs: yalesmartalarmclient - "yamaha" = ps: with ps; [ rxv]; + "yamaha" = ps: with ps; [ rxv ]; "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast "yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps "yandextts" = ps: with ps; [ ]; - "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: yeelight + "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: yeelight "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS - "yi" = ps: with ps; [ aioftp ha-ffmpeg]; - "yr" = ps: with ps; [ xmltodict]; + "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; + "yr" = ps: with ps; [ xmltodict ]; "zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge - "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf]; + "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc - "zestimate" = ps: with ps; [ xmltodict]; - "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy]; + "zestimate" = ps: with ps; [ xmltodict ]; + "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zone" = ps: with ps; [ ]; - "zoneminder" = ps: with ps; [ zm-py]; - "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher]; + "zoneminder" = ps: with ps; [ zm-py ]; + "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; }; } diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 502ea7d6c1e3..4fa4b8a48ee4 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -177,9 +177,10 @@ def main() -> None: f.write(" components = {\n") for component, deps in build_inputs.items(): available, missing = deps - f.write(f' "{component}" = ps: with ps; [ ') - f.write(" ".join(available)) - f.write("];") + f.write(f' "{component}" = ps: with ps; [') + if available: + f.write(" " + " ".join(available)) + f.write(" ];") if len(missing) > 0: f.write(f" # missing inputs: {' '.join(missing)}") f.write("\n") From 5f29d7e9a55a1ab99f6c0adffba5d9761fbda869 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 28 Aug 2020 20:17:13 -0700 Subject: [PATCH 306/688] k2pdfopt: set env var to find OCR language files --- pkgs/applications/misc/k2pdfopt/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 31accf811bc2..431426e55fbd 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,5 +1,5 @@ { stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub -, cmake, pkgconfig, zlib, libpng +, cmake, pkgconfig, zlib, libpng, makeWrapper , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript , enableMuPDF ? true, mupdf @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { --replace "" "" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = let @@ -159,6 +159,10 @@ in stdenv.mkDerivation rec { install -D -m 755 k2pdfopt $out/bin/k2pdfopt ''; + preFixup = optionalString enableTesseract '' + wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract4}/share/tessdata + ''; + meta = with stdenv.lib; { description = "Optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones"; homepage = "http://www.willus.com/k2pdfopt"; From fc726e34948e35c47053514dab437b644fe9e047 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 29 Aug 2020 22:38:25 -0500 Subject: [PATCH 307/688] Revert "nixos/nix-daemon.nix: assert distributedBuilds and buildMachines!=[]" This reverts commit 67b6e5639126ab6e8ec5d2b303aa9736a626b609. This reverts commit 250885d0caed9ab910e801d7a3c21d6f83d4cdae. Causes issues for some configs, see https://github.com/NixOS/nixpkgs/commit/67b6e5639126ab6e8ec5d2b303aa9736a626b609 --- nixos/modules/services/misc/nix-daemon.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 924a007efc6d..0fbc9cecb4df 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -500,13 +500,6 @@ in config = { - assertions = [ - { - assertion = config.nix.distributedBuilds || config.nix.buildMachines == []; - message = "You must set `nix.distributedBuilds = true` to use nix.buildMachines"; - } - ]; - nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; nix.binaryCaches = [ "https://cache.nixos.org/" ]; From bf03e96426ea3b39a02afb7a65623d0f603bd58b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 30 Aug 2020 11:45:31 +0800 Subject: [PATCH 308/688] gemrb: 0.8.6 -> 0.8.7 --- pkgs/games/gemrb/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 4f7d1cb37503..91b841f6c51b 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -4,24 +4,27 @@ stdenv.mkDerivation rec { pname = "gemrb"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { - owner = "gemrb"; - repo = "gemrb"; - rev = "v${version}"; - sha256 = "0vsr3fsqmv9b7s5l0cwhpq2pf7ah2wvgmcn9y8asj6w8hprp17d4"; + owner = "gemrb"; + repo = "gemrb"; + rev = "v${version}"; + sha256 = "14j9mhrbi4gnrbv25nlsvcxzkylijzrnwbqqnrg7pr452lb3srpb"; }; - # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional + # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl + # reqs) optional buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - + # TODO: add proper OpenGL support. We are currently (0.8.7) getting a shader + # error on execution when enabled. cmakeFlags = [ "-DLAYOUT=opt" + # "-DOPENGL_BACKEND=GLES" + # "-DOpenGL_GL_PREFERENCE=GLVND" ]; meta = with stdenv.lib; { From b3beb74d7c1d2d1ca65d6e4beb55524d9c454a2e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 23 Aug 2020 08:13:45 +0200 Subject: [PATCH 309/688] =?UTF-8?q?coqPackages.gappalib:=201.4.3=20?= =?UTF-8?q?=E2=86=92=201.4.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/gappalib/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index eb431b9faf25..f6109398da8e 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, which, coq, flocq }: stdenv.mkDerivation { - name = "coq${coq.coq-version}-gappalib-1.4.3"; + name = "coq${coq.coq-version}-gappalib-1.4.4"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38302/gappalib-coq-1.4.3.tar.gz"; - sha256 = "108k9dks04wbcqz38pf0zz11hz5imbzimpnkgjrk5gp1hifih370"; + url = "https://gforge.inria.fr/frs/download.php/file/38338/gappalib-coq-1.4.4.tar.gz"; + sha256 = "1ds9qp3ml07w5ali0rsczlwgdx4xcgasgbcnpi2lssgj1xpxgfpn"; }; nativeBuildInputs = [ which ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" ]; + compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } From 9d937af9dba77268808269d15499629522c4f89f Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Sat, 30 May 2020 15:54:45 -0400 Subject: [PATCH 310/688] ocamlPackages.webbrowser: init at 0.6.1 --- .../ocaml-modules/webbrowser/default.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/webbrowser/default.nix diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix new file mode 100644 index 000000000000..463bfbc79f9d --- /dev/null +++ b/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +, astring, bos, cmdliner, rresult +}: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-webbrowser-${version}"; + version = "0.6.1"; + src = fetchurl { + url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz"; + sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3"; + }; + + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = []; + propagatedBuildInputs = [ astring bos cmdliner rresult ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Open and reload URIs in browsers from OCaml"; + homepage = "https://erratique.ch/software/webbrowser"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ba02c3bb5246..2ebfc3fff9f4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -955,6 +955,8 @@ let wasm = callPackage ../development/ocaml-modules/wasm { }; + webbrowser = callPackage ../development/ocaml-modules/webbrowser { }; + webmachine = callPackage ../development/ocaml-modules/webmachine { }; wtf8 = callPackage ../development/ocaml-modules/wtf8 { }; From ddd234cc6fe671846992c1619466927d805c2fd2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 30 Aug 2020 08:10:27 +0200 Subject: [PATCH 311/688] =?UTF-8?q?gcolor3:=202.3.1=20=E2=86=92=202.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/gcolor3/-/blob/v2.4.0/data/nl.hjdskes.gcolor3.appdata.xml.in#L48-61 --- .../applications/graphics/gcolor3/default.nix | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index 1c1c6ba08ee2..2962825e49b1 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -1,31 +1,40 @@ -{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook -, fetchpatch }: +{ stdenv +, fetchFromGitLab +, meson +, ninja +, gettext +, pkg-config +, libxml2 +, gtk3 +, libportal +, wrapGAppsHook +}: -let - version = "2.3.1"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gcolor3"; - inherit version; + version = "2.4.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gcolor3"; rev = "v${version}"; - sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7"; + sha256 = "rHIAjk2m3Lkz11obgNZaapa1Zr2GDH7XzgzuAJmq+MU="; }; - patches = [ - # Remove useage of deprecrated G_PARAM_PRIVATE - (fetchpatch { - url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch"; - sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9"; - }) + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + libxml2 # xml-stripblanks preprocessing of GResource + wrapGAppsHook ]; - nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ]; - - buildInputs = [ gtk3 hicolor-icon-theme ]; + buildInputs = [ + gtk3 + libportal + ]; postPatch = '' chmod +x meson_install.sh # patchShebangs requires executable file @@ -34,7 +43,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple color chooser written in GTK3"; - homepage = "https://www.hjdskes.nl/projects/gcolor3/"; + homepage = "https://gitlab.gnome.org/World/gcolor3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; From 215ff411344a4556e203f5dc24e46dd6eed62c2e Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 30 Aug 2020 03:06:31 -0400 Subject: [PATCH 312/688] luaPackages.lua-resty-openidc: init at 1.7.2-1 --- maintainers/scripts/luarocks-packages.csv | 4 ++ .../lua-modules/generated-packages.nix | 68 +++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 4ccb8483430f..fb90e62769f8 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -35,6 +35,10 @@ lua-cmsgpack,,,,, lua-iconv,,,,, lua-lsp,,http://luarocks.org/dev,,, lua-messagepack,,,,, +lua-resty-http,,,,, +lua-resty-jwt,,,,, +lua-resty-openidc,,,,, +lua-resty-session,,,,, lua-term,,,,, lua-toml,,,,, lua-zlib,,,,,koral diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index bb14f562d706..f9c91c3a8a6a 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -691,6 +691,74 @@ lua-messagepack = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; +lua-resty-http = buildLuarocksPackage { + pname = "lua-resty-http"; + version = "0.15-0"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-http-0.15-0.src.rock; + sha256 = "1121abcz9y8kis2wdg7i1m75y8lplk3k49v02y804bywbl2km4fz"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ledgetech/lua-resty-http"; + description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua."; + license.fullName = "2-clause BSD"; + }; +}; +lua-resty-jwt = buildLuarocksPackage { + pname = "lua-resty-jwt"; + version = "0.2.2-0"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-jwt-0.2.2-0.src.rock; + sha256 = "1a4wwiwcjwgr59g2940a2h0i6n1c7xjy2px5bls3x5br4shwhswa"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/cdbattags/lua-resty-jwt"; + description = "JWT for ngx_lua and LuaJIT."; + license.fullName = "Apache License Version 2"; + }; +}; +lua-resty-openidc = buildLuarocksPackage { + pname = "lua-resty-openidc"; + version = "1.7.2-1"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-openidc-1.7.2-1.src.rock; + sha256 = "01mya69r4fncfrpqh5pn2acg18q3slds8zm976qgkjby0pzwzzw7"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/zmartzone/lua-resty-openidc"; + description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality"; + license.fullName = "Apache 2.0"; + }; +}; +lua-resty-session = buildLuarocksPackage { + pname = "lua-resty-session"; + version = "3.6-1"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-session-3.6-1.src.rock; + sha256 = "1r5626x247d1vi5bzqfk11bl4d5c39h1iqj6mgndnwpnz43cag5i"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/bungle/lua-resty-session"; + description = "Session Library for OpenResty – Flexible and Secure"; + license.fullName = "BSD"; + }; +}; lua-term = buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; From a03bc7cf61dfe6357924649de163d1745182e250 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 30 Aug 2020 16:27:23 +0900 Subject: [PATCH 313/688] thunderbird: 78.2.0 -> 78.2.1 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 34aac2965239..b7d00890fb7b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -69,13 +69,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.2.0"; + version = "78.2.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "2mcd2ywa8kgz3gcah5acpw7wwc194plwca9f09l18ibml64mxbdk6ilmp8cbq2mgkap99brdz923apslf9y4fdlcw64g2s4m8xdy3mj"; + "2iya9a5qaini524wrdrnxx6wsrgb8fa2b1m42mlypskxjjgb7n66vpxlbpi9x9mqzc63ca2ag36fjpbpsvbv5ppxvpfwk2j1zbfvb5w"; }; nativeBuildInputs = [ From a6ae28e4bc689f170107fd63899a84ee4693dae7 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 30 Aug 2020 16:27:33 +0900 Subject: [PATCH 314/688] thunderbird-bin: 78.2.0 -> 78.2.1 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 140c5bd67c78..86dbf80a6e1e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.2.0"; + version = "78.2.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/af/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/af/thunderbird-78.2.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "d64e507c291a93c5f3977e34d991bea4d39d7b2a6e438d2780c4f71dd18b6714"; + sha256 = "de73b113e488e76caca47b90abb4fa3f1c4d6ce04885d036f2e6aed81fe34038"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ar/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ar/thunderbird-78.2.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "ef340fc26d314511325f830c935b3564bab4367b4f17b734a04d257d8927b86d"; + sha256 = "d6eeb95b1bd8e53663bd48570a0c2a03f570f906ca715ddf1d9f2cb8de37f3b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ast/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ast/thunderbird-78.2.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "39d4d8a671ebdf6584b7cfcc1e0979c1396d30d7952293db8b481b90e4fa4571"; + sha256 = "f244c41515a2382d15697a47b88781120c649e319d86a1c6350fd20cade25809"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/be/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/be/thunderbird-78.2.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "804bbba47279445ae4c5ba82a540b6d0ef2e6a641de47e8dd37cf4e2e13bd86e"; + sha256 = "188c8850324bbc04535d4a1dfe1ef1f2e52de8cc2e1df7432623f6afcf8dbf1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/bg/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/bg/thunderbird-78.2.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "d1f5e199a0b448ff6b7709dfabdf6f63c42a125e51109b21c0778f77cfbc6f9f"; + sha256 = "3e7ab29fc795b577aa3bd2ac3df872c31a7ed22960e987d9bca6f348becb69a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/br/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/br/thunderbird-78.2.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f3532117e7e646a74a6b169066e2685b1c372c5bcf3007238762496e1dceccde"; + sha256 = "c1138c59275149aaa6071cf128e7b480b7f74fa0d8f237552a5c54ce1ae573e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ca/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ca/thunderbird-78.2.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "3403cfab8094a227869bff8f0ef9116ba6fc7d94a0e3312cdc8bb99bcbf185a4"; + sha256 = "4d18b0b11710ab3427bf917ebe17cdf5e98508f517cf5cc4c97822d42a019dd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/cak/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cak/thunderbird-78.2.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "aada755ce418968578884a5b836f6e152d4581c8d010fc8bdaa9ba78c2226e0e"; + sha256 = "5231c3b6c9b57ab528905184b740dd23de470f8bc4814a13000c8fc1fe4877cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/cs/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cs/thunderbird-78.2.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "c0c9f22000d3dad94eee99832cd086630a0660fbbb1a4caa7a7e4307803d40dd"; + sha256 = "04d1614000f1854b5d82e0d1740beb43ed9bef440b43f7bedce32cccec48fd59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/cy/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cy/thunderbird-78.2.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d25d743973288fcb492c8431658142f4762da2a1c894be7cb867aa190ea8e3a7"; + sha256 = "0ef895fdc1878b77650846d2ea4624a50d06838a3c51a91523019bb4d00a1322"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/da/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/da/thunderbird-78.2.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "bb8ce50143d484fcf2eb7c15e7b0ca5474232a93a2a07ca04f7ef28b98c192bf"; + sha256 = "e909f7ba1890cebcac435c2cfaab7db1791785e6b5b1e8b205ee3b9962624c8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/de/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/de/thunderbird-78.2.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "97536ef763374e3fdaa2da1289931f876a721be3c95a495ef920b756a9d34706"; + sha256 = "cce1e0acc3c61a66e5eaa065e81e01edb298b6dbf07a2376bf5a96ad2c1e784d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/dsb/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/dsb/thunderbird-78.2.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9c88d5d07b39e0294fc5c90b4adc70b3919068d6ff157e3a35110afee9a4027a"; + sha256 = "a5acad173a15e77e21057e7450d997387f88a608dd602df7509fa13743758445"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/el/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/el/thunderbird-78.2.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "075332016a50493ecb925402a5d09086b4bb39dd83aae449a48189bb35134757"; + sha256 = "7cb4dd233037415d9de96e0c292bd0a288ea62bc875b79a138aaf9639a8f8896"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/en-CA/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-CA/thunderbird-78.2.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "2290544e6075721c62c2e0f6f39c77af8fd3f31862330d852e60a4c81c59ca8c"; + sha256 = "158547432a7f38ab87ac5334b891921ef54f199896fe459cf65c81344d900edc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/en-GB/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-GB/thunderbird-78.2.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e9d9337b4dd961c578ca29ef7774732872c32d1d13a75be1abaae810bd0fe8bd"; + sha256 = "1f434d2aa74143eb8695fe54f031fdc7270b1dfe7365896b08f9a55c9dcc8197"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/en-US/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-US/thunderbird-78.2.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "77b24d9d4185491752d2ddb609aa2a80acbc71829f14e0a8e703f06d77805ee1"; + sha256 = "f5004ba1ac64911aec7dec3ec60a415500adfb0bfd566197f0f4fb139c71ff2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/es-AR/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/es-AR/thunderbird-78.2.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "176e9b9912ac423546d52ffef7c26eb2631da27efabacc8291ab1e0704a26793"; + sha256 = "49063e6e19b9c4ee1cd63826fda1c969d9739759a57ffabba5e2f93fc11de06a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/es-ES/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/es-ES/thunderbird-78.2.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "040f8e3f21cad483406a826768bb3ab2ba7e9be332b9291510eeea5642ff518c"; + sha256 = "216fe2514dc21190532b19af814b825d8a39c7dfe91a120848491f98c49f8ec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/et/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/et/thunderbird-78.2.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a495f15bd7bfde1594b0becc952e7c086d87ee8d8ceaff38ea5945d8cacc972d"; + sha256 = "5a89262ffbdc536abf9d780d5d30ce7d0c626a4cf75bfe957689640f94323a34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/eu/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/eu/thunderbird-78.2.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "5b53597ec6bdbf184d0feb182d6459719c159edd1143c68b95863444162b3484"; + sha256 = "f59c050361c617e4b2ca92f8e7081a135e976bb99ea4b650b80064aedef2c698"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/fa/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fa/thunderbird-78.2.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "cce6970ea1373b8dfa6f4b16a803c55aef6ad6a1752be62dfe73b1ec252d0017"; + sha256 = "b9764595b4cb08584ccce801c08fa19dbbced21c3f89045800d83d531b0c825a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/fi/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fi/thunderbird-78.2.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "6e7ce171900883e798bf66a6b48d37f359e45120fa36771b37137ef90a644d63"; + sha256 = "98169b3018a61ae6c2303300c1942c7d1d14a5318147a08a883b5a7b7042eba6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/fr/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fr/thunderbird-78.2.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "07b853c6758e991b1d0f021b6bc48b0e82741edbb107e2e517115675d9bba602"; + sha256 = "49563e87d9543c52d33b7168c78adaab0483f14ceef22759541e927c13620657"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/fy-NL/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fy-NL/thunderbird-78.2.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "d27a72ab1812e7d9d9bd9ac6dbc6982fb22b89982a58ec5b2b07a163bd72bc5e"; + sha256 = "1f3444faf91c24f8608ec59a4f705b42c7520079e4ad6756e693e92cdc8b142d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ga-IE/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ga-IE/thunderbird-78.2.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "bf5ae7fce3c74421923baabb4a3391c0e5eff4f470029286e1868df631451396"; + sha256 = "28b27f73016f0a4d53a6c47248c26458ca2bdceb46ae231f16086b8cabed5210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/gd/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/gd/thunderbird-78.2.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a433875241721d54f3c48c84a48cf786df5b757bfe4afd2053f2bca6f4a36e9d"; + sha256 = "b81b247ebecd1727d27b64f96ba08b08cf59921e9b2e8ae732407b27e233c971"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/gl/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/gl/thunderbird-78.2.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "22a19264f09c2e184e4d0ced2a88b1feb83cf5f47ed71b7fdd88b0b42e17557c"; + sha256 = "ea019d11fed7d87173b218d86fcee0dea7d4e20200bc73171fa8c1bc8f7288fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/he/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/he/thunderbird-78.2.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "0e8be83ba353088d3de57e7e075067ab11523678eedb61e5c9b8dbd4a93bae9c"; + sha256 = "6308a7e4e2cc35e48bbd67a1a7b8ab37112f47ab228c703a6db681ac7af79cb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/hr/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hr/thunderbird-78.2.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e9af05d2c0716c63f187022ffccfa413fc4c3ba938be62559f3243b3e3387239"; + sha256 = "3fb27f1e001817260981567fdb9949ad2f34818e9c919bd16fa0e939cf993cb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/hsb/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hsb/thunderbird-78.2.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "04aece2ac7ccabf025798016731ba610d5401361b403a6822b6770543670da51"; + sha256 = "2240e34fd713b39b410b584a8a6d06525f6abe0db2ee7b76b740a7252ec85e36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/hu/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hu/thunderbird-78.2.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "83163c8a1cc002d14e8198b6bb6a7fddd66fe8edaaa5abde0447d4c4ad55047a"; + sha256 = "f303a1f1219c7b23d71471a00174e6084cee3773af72e855faa63a5384b08aee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/hy-AM/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hy-AM/thunderbird-78.2.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "77f4d439957161cb13e8564ce2951a2102b7c1663c675068ed73e3809c04ddf0"; + sha256 = "3e74775e459ebdca2661e2e2f55307429dcc4d4a6623bbb8447946a75c94dd20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/id/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/id/thunderbird-78.2.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "d1530e24d70ca54121270468d699471d92d2cfba538c6a9083980d09c066aa32"; + sha256 = "0c9baf8cff28193f774e13c3a49cfd0ebcf27d8ef73ade151d2371ea69cbafac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/is/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/is/thunderbird-78.2.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "e1b25920b7ec9353f1cbb511a635d57aa45e65707f1ba493d9c7af6c50e3a601"; + sha256 = "5c505948333d9259d87aa5f2b53f33ade1bbbfd29b9d5438c2688d34891e29bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/it/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/it/thunderbird-78.2.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "38315dfe412c8b4460805210fcc6aabb859b20ffa41773c7a87634875016079c"; + sha256 = "a99896e8ccf8d01099834ee502601cb9de993fd7101e426cb87c240a744f2f88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ja/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ja/thunderbird-78.2.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ffc20370c6252f80d8f191460d97249cce99667049a0a7610b01b16ad48f3af8"; + sha256 = "83be10be5e946b785ac61e9a51c7054357c69af0a8e7bca524e27961dea4eef8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ka/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ka/thunderbird-78.2.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "4dc0ae26e215fccf6a0c3dc3d49544f960564ff9ae5b0f7054d0d7ba60c90d85"; + sha256 = "585a1d805663225b1c154e27b54aa1aa5d8a1b96576c0f8ea36bde7844921474"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/kab/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/kab/thunderbird-78.2.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "e9666986e06d89e202dba5abff6722d11c0fbff3ebbe7a5664ae816c9e305304"; + sha256 = "85128be7e4c28a526d0a395e38e86e5e85dc6c154be6b16fb2df6675effe3d0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/kk/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/kk/thunderbird-78.2.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "742be512385a5d9984ac8ccb96abb856cf7a25c0d8517996774726bb24f6c702"; + sha256 = "09538c022bbcfcb2a77a7ab11b5569eb56b483817d199cfd0ede68ad556601d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ko/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ko/thunderbird-78.2.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "94f8833e2dfb8f905fe7b37da7f3f197620763f6944c565f547554a7d8756cb0"; + sha256 = "3e6f472e69d40d46f388096e1d13bc6735860021fc655e3efd4e5b93b1a83240"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/lt/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/lt/thunderbird-78.2.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9a9b49068639803973fe30f1a44bc2a17fe7b8583a549cf996b2deb0cd145a10"; + sha256 = "8b85c0874306afd3a39d8cf851d378f5f1bfce74129b16b02230c516001adc92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ms/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ms/thunderbird-78.2.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0fc01d5be421b36ecfc31ff818692edf44f29757c6e80789c64bdd5459f6b500"; + sha256 = "b14e7baa06a2d4f98313a7f363b0d998f902164abad13a992878812cc5a0b6c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/nb-NO/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nb-NO/thunderbird-78.2.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "88f3b13462488aba548f553d6d9e8025233e13f48c054c51f989de0d0ea3d02e"; + sha256 = "c3718581db153ad8b171b3c454e9d156e3d55ff0969217ac36435d13ac0c7c3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/nl/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nl/thunderbird-78.2.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "8b7cb8152c995add11be80152031f5b50e0bc571cca0503536db630b8cbc8127"; + sha256 = "802417acdc722e34c21936f840cd347ae86cf5ac8ad2ae05bd1e1ae078c4518c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/nn-NO/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nn-NO/thunderbird-78.2.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "41c8ccaee5ead407b7ebbd73d12ae04188f5dbc8a97d20c20c21b4d688edc43f"; + sha256 = "5034f1fe526cab8de8091d5f20851a678e742ed37fa80e8491f3891ed89c43a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/pa-IN/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pa-IN/thunderbird-78.2.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "77b6a9265c07834ed79ad68e44927eeaf52a64724b58c3067dd99aac36abdfcf"; + sha256 = "01ae1e84d990433b7cbb12dc637deec37b32998803cb60f5834d386e080505f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/pl/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pl/thunderbird-78.2.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "2f01c4b5c058fd56c52a32671e486d1ebc462a96aea5a27a2a0393bd3a34ed5b"; + sha256 = "84b877dba77c8be4400f4fc76128a85878781c4d8ff7845d265225211092674e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/pt-BR/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pt-BR/thunderbird-78.2.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "598dbdfdea842d607d65dde5d674634a03f152d5fcfed1891352356d1d61a80b"; + sha256 = "4daabc0cad02b878d8e17af4402b6b52fdd7783f89192909a43bed09f8aae196"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/pt-PT/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pt-PT/thunderbird-78.2.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "73a3dd9b640d23099561452d5fb5c639bc04b1d8a3b3b1091f922622ebeb559b"; + sha256 = "6ce92a7a1ea62398d22ee4e4fbdc383daa5d35d38c83cf1852953757563d17ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/rm/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/rm/thunderbird-78.2.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "3a762d2f6b049778bf8372435210d27d98c1255fb14300bc297cb691e8524c49"; + sha256 = "d876eb51534d8a5796b486f22f9602bcb9c4cd9c99042583f95c4464f7ee99f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ro/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ro/thunderbird-78.2.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "61cbf80023d54aa030ae309ba4a952afacfaae12baea7494802ec18d3950bed7"; + sha256 = "ab4bfaea0914401188d486554963c9ab3014237e7116afdf274dce6e55725cae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/ru/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ru/thunderbird-78.2.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "195cf37d9999c696976617a1281aa73f28e421513941639c5bed70e42a177a9d"; + sha256 = "e722a13113896bde97dd72d0c7182c26734d7d546d8fe210bbce900854ac925c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/si/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/si/thunderbird-78.2.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "d6f4637d875be6aa2c2b3ba4a3948f61e39738b5a2d9a0ec1cd6158e0c4aae9b"; + sha256 = "595588d25de16c3781c85a9ed5e3c767d4df85f0820d4503770468b1669e9411"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/sk/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sk/thunderbird-78.2.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "499bdb9c2504a29e3990c0738090410afbaf016722b12169734564abae745aff"; + sha256 = "f30929cad216539754842c0d938b4d5b8ec5f4e813b3ff0d5108d9c4a0fc6df2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/sl/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sl/thunderbird-78.2.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f8fa3dd94d63566e6e14cbb66b7f92e7e2591796f7c9900117b0a06880b8d0f4"; + sha256 = "65d716b3fb5cad93d17704b62fd035a86ef6838cfff6ad95e571cedbb9e0974d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/sq/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sq/thunderbird-78.2.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "1249f85fb8e30e7ff5ea9baf30c56b91d78d965038a7121f25f9e327ca4489c1"; + sha256 = "38c652f6aae768ab7a8b0c1e975c676a3724ae22f5f7e3ffc6224ee032a9dc47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/sr/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sr/thunderbird-78.2.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "6e5b30eb1b2df7dce4e366e246f28dbabb542af3b50e581b71a8cd7fb59656be"; + sha256 = "7f73bcc8efb4452fedb0f9707c5e2b1d0db936fda4c6b9582207043aeddf8747"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/sv-SE/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sv-SE/thunderbird-78.2.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "431da982c97b39e60605bc2a0b1d0cdc117c336451c9fae26f17e397e2088da0"; + sha256 = "221974d62563b49f6c030b7a1f6307a71e60ce2a0e107b551363621320bba485"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/th/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/th/thunderbird-78.2.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3d1f813e9363887a465e11a7729fb5f2d6204bc1d5fa3690c1301a83bb32b06c"; + sha256 = "a8641ee0dc5bcd40ec84a4d4640e74e44710b5ac10d629ea0dd42ad2370e8d3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/tr/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/tr/thunderbird-78.2.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3e4edac805121565ae3e0c77e446028759d60402832f259b694df80e7f060172"; + sha256 = "1d80d967b5ef98f0e642390c55618d454f2d82acec36bfd56db21e872490ff66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/uk/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/uk/thunderbird-78.2.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "632dbf35842b208d65c0d4196ea21d18bad848a43c12d1f29b321bc9095ca3e2"; + sha256 = "fcc24a9885db5511c0b2859e6472d436769da2670573177f7bf332fb363a3ee3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/uz/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/uz/thunderbird-78.2.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "93cee199f136c829276eb203312b658414726628a9501a916740e555549e4fd3"; + sha256 = "b0f62e8fc5c6da398ad2e1a3488ddb37f0075c90ad54e6028293be7cfcd2f6f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/vi/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/vi/thunderbird-78.2.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "27c73e1ee3fdb19c4be32a5e00da43b627a1d2cf33e8efdf74e1c43b715a400e"; + sha256 = "0e38a1b645894ff81a481250ed434157fa2b70792b423c31dab61288612a82f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/zh-CN/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/zh-CN/thunderbird-78.2.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "46a3d7e6f370638612c17da492dc5edfb8fc693906efedfa6f19bc754f9879ce"; + sha256 = "04f37793bd17df88573d9d3f8c8412c26cfb3332395689a06f5fca6efb02b2ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-x86_64/zh-TW/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/zh-TW/thunderbird-78.2.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "501e76ed3fa9f180358f290191c26c65db10fcf7339359058eabc854bb9a88c6"; + sha256 = "6c1e5b71bb2a9e005971050c9643c52090828e1ecb3910d66d2d0dbaa107011c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/af/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/af/thunderbird-78.2.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "3c986afcc681713ef2f958e060054ca5e0a91502b3d3b9ce9cb168c84f1d8dc8"; + sha256 = "2601d98ad27a2ed7277f673876c2a7d206fe1cfd8c7c8febdead85884031a416"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ar/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ar/thunderbird-78.2.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "29970a358b02740709e370e29d22747235b10e74ea0ce9a937487cd486492e44"; + sha256 = "5d126b1152b42b6bd6c29ac602b59ab88f3491b0b6f2a69aa1e6ae3d9ded04d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ast/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ast/thunderbird-78.2.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1c8a013d36f74264d3a72cd28a54ef55be1ae5a964cfa0136bfafcd22bf400e6"; + sha256 = "7b22fbd980df00d6b1a2c0f14d68a3a7daf06dcb6a13033ca2619371b098445c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/be/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/be/thunderbird-78.2.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "1ff4b2213ebe1402acc737baf11dc4b88e0b5f8ab0849f1293ce94c9ffa408cd"; + sha256 = "bd59d2a9e70944a736e8e5db100b2cbe937fb8021577fdd912087e2cbe38723f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/bg/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/bg/thunderbird-78.2.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "0874616da3474cb4fde8cf74a088bce88872a714f872ae32afcf6375fde2afac"; + sha256 = "ce3906cafce8ce00c4b69f2b1b584f7e4148d2d40ac12916f1108f78d7d3cdae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/br/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/br/thunderbird-78.2.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f56758fc1622295fb83041f3c36599251bf31f5dc28a5b7eaf9928b801af418a"; + sha256 = "2f41237e0dd3dff4e0e4b196f8d02b988d7e5db3ac1984ea5577ce5052d43514"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ca/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ca/thunderbird-78.2.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ac7eb3b393c1755fe1614cb5376bece50a64031a5c1383307d0a74deb0814660"; + sha256 = "0ec94acd77cca38d37dd23fb240c3c9e3840defccb491704d01072c1cab1f543"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/cak/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cak/thunderbird-78.2.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "772627d1142b0f142eccf4ca135898dfb198c21dfd823b737d80ac6d5e5086a3"; + sha256 = "1c77ebb51a83c57c7d81ef278f9fceae07f98330a8ccf8f863c2f0b613141e23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/cs/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cs/thunderbird-78.2.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "c833322e5984a3a161a77c3e7cc893a6dd098681e5533c48b020a6258f69308b"; + sha256 = "adf8c11ff60e697fc5087698088c42c95a15766ccebf24d77141a53dc255c366"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/cy/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cy/thunderbird-78.2.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "04d7089f68d0685aab9a41eda247b48a8024c8deeeb3979a76a5197d8fdb745e"; + sha256 = "9b7c51652714c116c9bb22fab4f0fc6dcbce6ad2133cc860067898841d01b5b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/da/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/da/thunderbird-78.2.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "1b5347af18a019a29bc8f9e21161cae8f3b955670325e28f117884fa540b71f9"; + sha256 = "e7245ea0909efccaa9b94701061410437f16273c935484dd3638f5f4fa65aad9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/de/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/de/thunderbird-78.2.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "225f1f703b30f784271f62e5ef25568913e3007448c317969b18b2ef7af5ddc9"; + sha256 = "302394d24f919b0a24dc574001458b265bfc90024bf21b3d98a43b31ae50adf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/dsb/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/dsb/thunderbird-78.2.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "90ea05cef5fdd187fe281081d854273529993928d8fd7773a923b1a5feb6b9d7"; + sha256 = "18ea8d27387581d49dd156957a089f1dbbe05f2772811aeddb1ebe81d26961e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/el/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/el/thunderbird-78.2.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "3d6402bec493ee5663d8ee0b8480cc35769938d22cb81a02f819ce4b4e59839d"; + sha256 = "bcec06d4b01268ca90d99a98a45c2ef5927ae4152b6b2d356332f3690de08f62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/en-CA/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-CA/thunderbird-78.2.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9a6e7f840ee9f1951d901f2cf3b37717ed5a70fa4e005c16654f48e43fb84060"; + sha256 = "475a1393917665c17bc5e787ef29dd886f1480d544f55d1caacb2a89503da685"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/en-GB/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-GB/thunderbird-78.2.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "324c086e7c293b500de45f4e684f37fdad9a7ccd2720439e5feff15a5ac26c9d"; + sha256 = "dda5664fd8d843f3f29b85b855d54e00d15188c57e80c01d79a8be0a2eaa0be1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/en-US/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-US/thunderbird-78.2.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "bdb2228970ec715690ac94feaa487d11ae1b5fbd8f0f6a0db6feca1440ba7f92"; + sha256 = "b299267b8a113dcd325bc6a928c561fe872535e1e876518e3075b85043aa7b23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/es-AR/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/es-AR/thunderbird-78.2.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ddf513766398f8affbeda8c16e09521a5f5e141cff332a6e9482798286b8dc19"; + sha256 = "e3e7cb829b07b7db95cad09c8887b9c91123665cd4601b685e3c7a7b0036992d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/es-ES/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/es-ES/thunderbird-78.2.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "34e34962f1a20752eefcbe6befd7a44e1c0dcfd2da387d61296af975dfc8af7b"; + sha256 = "be8428e1cce22aff5000bdc11f632adfc4c1096060a7456d36230ebd6040d12d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/et/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/et/thunderbird-78.2.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "bd74e5d6d9da18211c90e36de506df6acbe4bf61c0e0a199ae048fc5373bf68b"; + sha256 = "deb81a63704b12ad2a945f5f0dcec878c3b7ec46f551f2d0122c03c52c031f73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/eu/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/eu/thunderbird-78.2.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "036c95223452537d7a39dea188f82ebacf1ccb70f4919bf575970eb50ca5b487"; + sha256 = "8a2935dd5f83854b4d98bdab67e7b376a7e1d19a2ff790234516ba8211ed7345"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/fa/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fa/thunderbird-78.2.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "9e9b402de1799afa3d680ced4622072322a516982c86e3a8dfd1df3b3de9fb24"; + sha256 = "c39189bc1f740a1e5a372eaf3c6e99090f04ed8b1e86016c54ed25612d16f341"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/fi/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fi/thunderbird-78.2.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "c693786d8cd597e1ccd627201418d6e98e8f09c526167dc04e0b54143f99c8e7"; + sha256 = "4f23c9941975e67e6e40d7a504a24e4058a27786c5989dd3e25cfc4fab4c4c0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/fr/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fr/thunderbird-78.2.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "b1fbfa0deb18015e2fb6594aa1eec58e2a897d7eacc4faf2e4887c434ce47d77"; + sha256 = "4de9885664bf4828355d09ceae11fc7cfb603d4514255b4de464c0653ddd45b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/fy-NL/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fy-NL/thunderbird-78.2.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "826b558412a5e9f83c2d5a822a2d3ef2f0bdafc882a2283c5ec4bb14f8c9bf82"; + sha256 = "82ae68d970a02ad57aa9c3dfb6c1ef7783c25211e9228c0bad515c3fef385f88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ga-IE/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ga-IE/thunderbird-78.2.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ad7508e4b44b7188b64427b71cb1e23de5cadd7e438c95ea97f31cb57e96c391"; + sha256 = "e6035d81bfa5c58ab79e71b9895638f23e47e8ab2990794786c5e9f590bb70e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/gd/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/gd/thunderbird-78.2.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "3c93322cb883011533bf1187a683e1e5c93977b79165bdb60e248604390335c2"; + sha256 = "2c628c5ed8ad0c00c42b384f8b925887e624f6a6dee69c86800a9b5137f04886"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/gl/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/gl/thunderbird-78.2.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "1e649d0dd20dafc736cab7ced71d93dc0c68b852bc4ac28a1d9572a0bb2d2672"; + sha256 = "49b8e22610f8e602a3870f541209251b61da8cb81df7f0a762d01002fef568e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/he/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/he/thunderbird-78.2.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b1bc9b85d23bb0150edc29461e9b2999a25ec78001bfdc1fee6f08c98468f138"; + sha256 = "5bb7193eb498d1edd713e18bbac630ba881b0a9b7fca9b05c9b8e4dd1ea1edbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/hr/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hr/thunderbird-78.2.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "6de165437b37733a21b4b7eda7abcf7f08fc7ce81962fed25c8758bc33daad3b"; + sha256 = "c31022ae9a1665cc0b22ab0e911730ccf5cd0dd24614fbd8d3bd51624760baa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/hsb/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hsb/thunderbird-78.2.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "bfef9fd1d13362b9007150fa822d59e61a1ccfc035eb85add98562aa6f198400"; + sha256 = "3e286b3ccf66300ead4d6b98a88a370fa1bac96244b143005c4974f075ceca92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/hu/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hu/thunderbird-78.2.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "3973249fe4a0fdedd82ae4a08faa4f1045a29d1ca6a01036eb6f9ae736f985a7"; + sha256 = "6d0c88c46d0f4ffb296638e4e8217041d8fdaec3abaa6bda7b7cf97c4bcabc2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/hy-AM/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hy-AM/thunderbird-78.2.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "1c3fedc2c62c089cc375cb6057cd7faabe15a452e5b034ba3a3a695dceb75a59"; + sha256 = "aac23dfa8c299623bca2e3b0501a636c630fbf3f5b08689911569a568b3ad060"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/id/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/id/thunderbird-78.2.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "8570e4441e908ec0033535f1f5e2c7ca7c69dd412fd1545b54917ebfa718bc69"; + sha256 = "5bd5597cb6e91613a39c288d694f3af4f5686dcab1573e3b58c04dce3d1de865"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/is/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/is/thunderbird-78.2.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "1a5c74a43095599623b16ca38fbbde6226b3f9771b02d789617075056a14e213"; + sha256 = "bcd926c704177945aa7b917fe12940e058d12e6cf8a3eedbf1ab205fb9c41b80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/it/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/it/thunderbird-78.2.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "22d7d45079d68d2d8e890a075ea4319d4e24ddced860b24eb3bfac546a067e36"; + sha256 = "04ca02a4fed6e8d904173d9ce52c16e47d7e9b3d16f5483d986f8188ec79d65c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ja/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ja/thunderbird-78.2.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "753beca4177c59c763f99d97e5f8d0f31ba4ea478dd4e4149b09ebf2804aaffe"; + sha256 = "1dbdc30ec3a06f2e7e7d38d9036fb90a2fdaad42356e9386ecc710d9a51f94b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ka/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ka/thunderbird-78.2.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "2d0461e64bfcd96c563e10124592aae33f0520adc8a99dcc8ce661c0625cbe48"; + sha256 = "2db1fa86ac87e0b8001b99c0eea30589db515c58e10548565533014481b1be9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/kab/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/kab/thunderbird-78.2.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "0ae95c76f24d8771ab80e4365da350a20ef1900580b48cc65bbeeccb702a4765"; + sha256 = "8499d0d8a0372617800b039c9198cc372783b8ff4ce385fc692e39b1dca22576"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/kk/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/kk/thunderbird-78.2.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f7c0da9664a486e917abb52cc4a43ca4d54dc5e35a19f77188ff089bf545ff23"; + sha256 = "29b228042a7f06c22300b123cc0fcdf7a86005d0d4c3c282c97635ebc25ce826"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ko/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ko/thunderbird-78.2.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "349fb6acfff9fc93af3b1e64cf6a7bb1473ac44591a49bca3c4462d91ad69318"; + sha256 = "a7af79975107cb32b408c7dd26827793c3c11f998705bc711c60f3dd6b7a1173"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/lt/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/lt/thunderbird-78.2.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "791c878b611325e6d7a8cc6e17e164664580d3d7d6d978d6d3c724ef2649cd92"; + sha256 = "7a5010761d0af24a6852f32b1ebd6b543b1e1011888ded3f4a4297fc35f455b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ms/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ms/thunderbird-78.2.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "650ffe45f1076abbadeae915c0ed3fc22f016af32997b477350502c5b10a0467"; + sha256 = "8573dc35bd69ff20d05aa06484a2243f5a35ec78c1c31dbccc067f0cb9e6617a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/nb-NO/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nb-NO/thunderbird-78.2.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "71f0d3b2608967ba7eacee0295fd11a9451d256af9e8a7f9c3d267198a516077"; + sha256 = "722c0a4ce2a0d774f8971707ff553d9f2e62af10267ef491e670b020a2d8a49c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/nl/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nl/thunderbird-78.2.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "1ef722c0694a8fa314406a0747864f06200cbc99ba3c134ac4a72cbb522345f3"; + sha256 = "63a08123e795ab8e51a2c98f33b0b6424c1f5f2c09a5d1683585f9762813afaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/nn-NO/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nn-NO/thunderbird-78.2.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a994f07a7034440b650748dc1910e291c1fbe3e03ce1df94fc1c0ccbde66ea2f"; + sha256 = "8968de35faf9fe304631ece4e08a9944342a08dc518ac1eec0ba2d5c1ff268ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/pa-IN/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pa-IN/thunderbird-78.2.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c31349f21b65039983f22ff25b8b0071d463dab4b7a32422a78c873c8ad7cc2e"; + sha256 = "57685a05321195019ef4d3c489dbb14ac0f1bd5ce51fda1f7573392de215e4e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/pl/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pl/thunderbird-78.2.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "d82f721f67ea6961d5a184f5414663835a5adb533a504e3973847562e3c058e8"; + sha256 = "d98967c9d54f9314faae53472b9d1506576761cd3de09747d3b407e1f26931e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/pt-BR/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pt-BR/thunderbird-78.2.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "32f83437183201739acd8a16d9d0409bb50738b73f642738c1dc3a89d3d66ac9"; + sha256 = "14fa89b2d8f659a90e19068130ce1a2da83137b7fb9a5a009d2363ccc2415009"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/pt-PT/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pt-PT/thunderbird-78.2.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "731abc38adc2b9a498bc1e3d6111a769fb82aef13831c1e8b85aaf89e8d4b3bf"; + sha256 = "279f325e75157e0cedffe6a455e731373b077078f70b89bba76e12e2439350d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/rm/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/rm/thunderbird-78.2.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "65be4d569df37a8207b614316cbcb868fdfdd3bfcefce668d9ec716039ed38b0"; + sha256 = "7432093e7516625957c3dcb90e8668fab1e22c0edba0411e3e2106d49e052fdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ro/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ro/thunderbird-78.2.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "fb4d2d36ea227558e320ec860c3f0dd4982f2cb548ed579ecc84e05843a2d15b"; + sha256 = "f5d5f564cf56c66d1f2f9717df7c7f021532dc1912384c9921ca286030f7d82c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/ru/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ru/thunderbird-78.2.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "d68c44ef363d443e6ba7861c1a0a3b77563470a87765295147236119e34d2c0e"; + sha256 = "4c4e31e74c4d10d88044fc49c24b3ae3ffb0b18e4a23295b60ac2d38d723753a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/si/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/si/thunderbird-78.2.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "e2f1ccc57793fb2c2fdfc829d790a0bed0e96c1d156cac505f99e1fe948a2a7c"; + sha256 = "689be324633f6a872a09d6498d8772562dceca9bca96f7029830c965ad2e4138"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/sk/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sk/thunderbird-78.2.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "fe17bc1f3c729478029981b247e03efc62707380b3b4efb11736865d4f86c5d4"; + sha256 = "194ff5a23a3a40ba98fb1968965c79f99246c6d93b81254d11df5d22530f1d86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/sl/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sl/thunderbird-78.2.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7003d144e6646f7a9c22aeaed497296f7a6fc512cb1219e145388dfb80d67d7c"; + sha256 = "9746db435fe3dbf5ab51603780d52862a6afda0e40c1ebc915b309ac93e75e25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/sq/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sq/thunderbird-78.2.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "e83efa34c14046ada92cfaf9684680aeb8398182d39c81ef822fb6c90c6d22d6"; + sha256 = "86f675921cdf0de41855d5e2c3d2d56c163d915ac8a0f8cc9678d1a55f87e069"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/sr/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sr/thunderbird-78.2.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9f78de776cdbbce197f0e263bb95be815326cc0f6a5b3475f8cb14fd08702742"; + sha256 = "587e4c867dd43621c8e5e04461c4a2dcf2b0f256476b5b72d8fc6722e573e347"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/sv-SE/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sv-SE/thunderbird-78.2.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d92235360937d81da4577521324415227e23588d6447166f4550f2c0788c100e"; + sha256 = "a46294d3dafc8bfaaa7f5376c2db2402f31f24664e73045c653ea8660079b879"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/th/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/th/thunderbird-78.2.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "aa6c43197aa08f92889f85537c221c62dec1b7da856db0cdae4bcd21cb9d799d"; + sha256 = "6105278c11c3e586240d50c9612730e75caecd08765b5b5cfe010f37d71c971d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/tr/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/tr/thunderbird-78.2.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "0b8efd5789e9bd397c98ce6246b22da908b86e4c364a23a9b9c63d9c58d99eac"; + sha256 = "4bdd2c91e8f361d1b2ade88cec06accb244adf3d7f1d714feea3e4004ed31968"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/uk/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/uk/thunderbird-78.2.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "98f6e512224bf597126d443b77a6db319ec2f075ae041afb0de3f27e7b9f2b32"; + sha256 = "40e2012a5b5dc05cb887a6c4cbb0c8f7bbc25cebd2de1247e5e8dc355cad78fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/uz/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/uz/thunderbird-78.2.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "1a8fb208962ff365f5362b1c95b97144456f8231ba0da8b7bbd4a406746ed681"; + sha256 = "15f4aafba6b2bcb102683d9a665d208ab21c5767cf6d59c45d996fa26ef1e12a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/vi/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/vi/thunderbird-78.2.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "e955597d9d2e3bf721bfee549f61e46b492d62ee678399eef11b33440fe42175"; + sha256 = "32640a1c8e42cc79774a3b75539010dfb65e32c703992001eb03916d4fb46e91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/zh-CN/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/zh-CN/thunderbird-78.2.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "58bef7ac37b2976b43f0a451dbf144497aa7149cb38fdc276135f97f4a2b709b"; + sha256 = "09b52b6ebf0033738444bacfb53b84b1c98f7d3e10b32c001356083afbe4e89e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.0/linux-i686/zh-TW/thunderbird-78.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/zh-TW/thunderbird-78.2.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7e27e58297a781872ac6ac113b361e43abeeb5ef2eae24506a920c9214351454"; + sha256 = "606e416a158023f674eda141bf67f9b3956e3e231ba85605173d73cad0d22a59"; } ]; } From 3bce24295b4537b996ac2e823e7152fe0f8f6c5d Mon Sep 17 00:00:00 2001 From: Massimo Redaelli Date: Fri, 28 Aug 2020 14:56:32 +0200 Subject: [PATCH 315/688] so: init at 0.4.2 --- pkgs/development/tools/so/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/so/default.nix diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix new file mode 100644 index 000000000000..0ee2359c8413 --- /dev/null +++ b/pkgs/development/tools/so/default.nix @@ -0,0 +1,27 @@ +{ stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "so"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "samtay"; + repo = pname; + rev = "v${version}"; + sha256 = "09zswxxli9f5ayjwmvqhkp1yv2s4f435dcfp4cyia1zddbrh2zck"; + }; + + cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv Security + ]; + + meta = with stdenv.lib; { + description = "A TUI interface to the StackExchange network"; + homepage = "https://github.com/samtay/so"; + license = licenses.mit; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27183fd173a8..5bfec92fb12e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6992,6 +6992,10 @@ in snort = callPackage ../applications/networking/ids/snort { }; + so = callPackage ../development/tools/so { + inherit (darwin.apple_sdk.frameworks) Security; + }; + soapui = callPackage ../applications/networking/soapui { }; sshguard = callPackage ../tools/security/sshguard {}; From 22f30f85532e4efa78ffb5363955c4844887a6ad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 Aug 2020 16:53:59 +0000 Subject: [PATCH 316/688] ostree: 2020.4 -> 2020.5 --- pkgs/tools/misc/ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 568afb50403a..fd1bfc7f8c79 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -39,13 +39,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2020.4"; + version = "2020.5"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "0s13cjrpx5r1dc9j9c9924zak45wl9nlbg9hiwgpsal80l92c39n"; + sha256 = "1k92177hjalbdpmg45ymwwrni68vh9rs5x9zvy5fzl9lng12fgpb"; }; patches = [ From 555cb2491c713dfee628d8e7cbc6d153a708a5cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 Aug 2020 14:46:17 +0000 Subject: [PATCH 317/688] librepo: 1.12.0 -> 1.12.1 --- pkgs/tools/package-management/librepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 39b34bf153d2..0e2cec685206 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.12.0"; + version = "1.12.1"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "070zgay0cbw6jrkcfp4qql9f9ydd41ilwk39xdrp939b23gp112d"; + sha256 = "0793j35fcv6bbz2pkd5rcsmx37hb1f0y48r4758cbfnl9rbp9y4z"; }; nativeBuildInputs = [ From 91116f2c937768585ee4ef5c3bc9aa16f1efbbcb Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Aug 2020 11:08:48 +0200 Subject: [PATCH 318/688] mutt: 1.14.6 -> 1.14.7 Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index ec4778cd4ab8..0b18a579e3bc 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.6"; + version = "1.14.7"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0i0q6vwhnb1grimsrpmz8maw255rh9k0laijzxkry6xqa80jm5s7"; + sha256 = "0r58xnjgkw0kmnnzhb32mk5gkkani5kbi5krybpbag156fqhgxg4"; }; patches = optional smimeSupport (fetchpatch { From fed86ab2a157caa0ccc06da10e4fbc78affc4dd7 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 30 Aug 2020 12:03:01 +0300 Subject: [PATCH 319/688] htop: disable use glyphs for checkmarks --- pkgs/tools/system/htop/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index e95dece2c965..2d86894808c4 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,5 +1,7 @@ -{ lib, fetchFromGitHub, stdenv, autoreconfHook, ncurses, -IOKit, python3 }: +{ lib, fetchFromGitHub, stdenv, autoreconfHook +, ncurses, IOKit, python3 +, fetchpatch +}: stdenv.mkDerivation rec { pname = "htop"; @@ -12,10 +14,19 @@ stdenv.mkDerivation rec { sha256 = "096gdnpaszs5rfp7qj8npi2jkvdqpp8mznn89f97ykrg6pgagwq4"; }; + patches = [ + # Never use glyphs for checkmarks. Issue - https://github.com/htop-dev/htop/issues/29 + # Remove with the next release. + (fetchpatch { + url = "https://github.com/htop-dev/htop/commit/96074058278829facb86f6f4de099d56a00a0c0e.patch"; + sha256 = "1rnfvjfsvfgr1s7kzr1hk6nwik6shcq4mg6dlbgdq0f2fz0cnazk"; + }) + ]; + nativeBuildInputs = [ autoreconfHook python3 ]; - buildInputs = - [ ncurses ] ++ - lib.optionals stdenv.isDarwin [ IOKit ]; + + buildInputs = [ ncurses + ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; From a7263289d4e29876ac75969b006e2f383d02cc75 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 30 Aug 2020 04:20:00 -0500 Subject: [PATCH 320/688] vault-bin: 1.5.2 -> 1.5.3 --- pkgs/tools/security/vault/vault-bin.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 315cd5ab077a..b8a70eb82f94 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,30 +1,30 @@ { stdenv, fetchurl, unzip }: let - version = "1.5.2"; + version = "1.5.3"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1m9svs1ncgdwwh16xavwikq4ji9rzkb2wlr59sx61rlz0l18mknd"; + sha256 = "1chhi7piq04j8rgk15rcszqqp37xd9cjj67plr5pgvdps3s1zihy"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "0hd6gsrmjfly3075kq0rsxhgy927g1462qih0iiwphrhik7l0pwr"; + sha256 = "0jbnvypapang025wfyj6i70jdz3g29ggg7rzmg8xh6gfyhwk3vmb"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "092xqjm69ljn70hn9f93qkc0ila0hgj2l14plhsza52d924qnq3l"; + sha256 = "1m54258lfdr79p2j8janbkhp0a8bs8xbrcr51lqx2s620n7sfbya"; }; i686-darwin = fetchurl { url = "${base}/vault_${version}_darwin_386.zip"; - sha256 = "161j15n6kfd3m5hakc0qn824kp0nwdghcm81j9vqzpq900sbg6ak"; + sha256 = "038qkkhlwj86fz9vpcycvv5nb41y8mqypqvhfp0ia11birp8xlsr"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1f6ckfqqj9gsaizwxa7xrjgkkj3nd6m1md7smz0xnxgnc4f7g4z0"; + sha256 = "1vivkwcy9j9zs7w65k7y8chix8jnii5pz8zck6rlpwgz5vs0h04k"; }; }; From d34954e4424ed349e39ae7e9c5d1447e8abed4b6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 30 Aug 2020 04:20:00 -0500 Subject: [PATCH 321/688] vault: 1.5.2 -> 1.5.3 --- pkgs/tools/security/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index a9d72f33161f..eb999b5cedcb 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0a16slrg0kx7i1xwixc920lkgbbywvb6wpmkbqjvz1xx72nq9ap4"; + sha256 = "149if5s4rdpxgzakh8s79j1fcfcqk1w7gvgchc044xlicl1r49ic"; }; goPackagePath = "github.com/hashicorp/vault"; From d4799959c36472d57ea1883273c8272500e16bdc Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 29 Aug 2020 18:57:25 +0200 Subject: [PATCH 322/688] sonata: fix gsettings schemas --- pkgs/applications/audio/sonata/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 68eefadf4110..73e47038a262 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook +{ stdenv, fetchFromGitHub, wrapGAppsHook, gettext , python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }: let @@ -16,13 +16,16 @@ in buildPythonApplication rec { disabled = !isPy3k; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ wrapGAppsHook gettext ]; buildInputs = [ - intltool wrapGAppsHook gnome3.adwaita-icon-theme gsettings-desktop-schemas ]; + # Otherwise the setup hook for gsettings-desktop-schemas is not run: + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + postPatch = '' # Remove "Local MPD" tab which is not suitable for NixOS. sed -i '/localmpd/d' sonata/consts.py From 5d8dd5c2598a74761411bc9bef7c9111d43d2429 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 30 Aug 2020 12:59:12 +0200 Subject: [PATCH 323/688] python.tests: don't mix the two types of tests The integration tests code was included in the environment tests. After this commit it is hopefully clearer what belongs together. --- .../development/interpreters/python/tests.nix | 145 +++++++++--------- .../{ => test_environments}/test_python.py | 0 2 files changed, 75 insertions(+), 70 deletions(-) rename pkgs/development/interpreters/python/tests/{ => test_environments}/test_python.py (100%) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 03a3b9537090..dcfa41cc308e 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -6,67 +6,81 @@ }: let - envs = let - inherit python; - pythonEnv = python.withPackages(ps: with ps; [ ]); - pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]); - in { - # Plain Python interpreter - plain = rec { - env = python; - interpreter = env.interpreter; - is_venv = "False"; - is_nixenv = "False"; - is_virtualenv = "False"; - }; - } // lib.optionalAttrs (!python.isPyPy) { - # Use virtualenv from a Nix env. - nixenv-virtualenv = rec { - env = runCommand "${python.name}-virtualenv" {} '' - ${pythonVirtualEnv.interpreter} -m virtualenv $out - ''; - interpreter = "${env}/bin/${python.executable}"; - is_venv = "False"; - is_nixenv = "True"; - is_virtualenv = "True"; - }; - } // lib.optionalAttrs (python.implementation != "graal") { - # Python Nix environment (python.buildEnv) - nixenv = rec { - env = pythonEnv; - interpreter = env.interpreter; - is_venv = "False"; - is_nixenv = "True"; - is_virtualenv = "False"; - }; - } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { - # Venv built using plain Python - # Python 2 does not support venv - # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. - plain-venv = rec { - env = runCommand "${python.name}-venv" {} '' - ${python.interpreter} -m venv $out - ''; - interpreter = "${env}/bin/${python.executable}"; - is_venv = "True"; - is_nixenv = "False"; - is_virtualenv = "False"; + environmentTests = let + envs = let + inherit python; + pythonEnv = python.withPackages(ps: with ps; [ ]); + pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]); + in { + # Plain Python interpreter + plain = rec { + env = python; + interpreter = env.interpreter; + is_venv = "False"; + is_nixenv = "False"; + is_virtualenv = "False"; + }; + } // lib.optionalAttrs (!python.isPyPy) { + # Use virtualenv from a Nix env. + nixenv-virtualenv = rec { + env = runCommand "${python.name}-virtualenv" {} '' + ${pythonVirtualEnv.interpreter} -m virtualenv $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "False"; + is_nixenv = "True"; + is_virtualenv = "True"; + }; + } // lib.optionalAttrs (python.implementation != "graal") { + # Python Nix environment (python.buildEnv) + nixenv = rec { + env = pythonEnv; + interpreter = env.interpreter; + is_venv = "False"; + is_nixenv = "True"; + is_virtualenv = "False"; + }; + } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + # Venv built using plain Python + # Python 2 does not support venv + # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. + plain-venv = rec { + env = runCommand "${python.name}-venv" {} '' + ${python.interpreter} -m venv $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "True"; + is_nixenv = "False"; + is_virtualenv = "False"; + }; + + } // lib.optionalAttrs (python.pythonAtLeast "3.8") { + # Venv built using Python Nix environment (python.buildEnv) + # TODO: Cannot create venv from a nix env + # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. + nixenv-venv = rec { + env = runCommand "${python.name}-venv" {} '' + ${pythonEnv.interpreter} -m venv $out + ''; + interpreter = "${env}/bin/${pythonEnv.executable}"; + is_venv = "True"; + is_nixenv = "True"; + is_virtualenv = "False"; + }; }; - } // lib.optionalAttrs (python.pythonAtLeast "3.8") { - # Venv built using Python Nix environment (python.buildEnv) - # TODO: Cannot create venv from a nix env - # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. - nixenv-venv = rec { - env = runCommand "${python.name}-venv" {} '' - ${pythonEnv.interpreter} -m venv $out - ''; - interpreter = "${env}/bin/${pythonEnv.executable}"; - is_venv = "True"; - is_nixenv = "True"; - is_virtualenv = "False"; - }; - }; + testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({ + inherit (python) pythonVersion; + } // attrs) '' + cp -r ${./tests/test_environments} tests + chmod -R +w tests + substituteAllInPlace tests/test_python.py + ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py + mkdir $out + touch $out/success + ''; + + in lib.mapAttrs testfun envs; # All PyPy package builds are broken at the moment integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec { @@ -76,15 +90,6 @@ let }; }; - testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({ - inherit (python) pythonVersion; - } // attrs) '' - cp -r ${./tests} tests - chmod -R +w tests - substituteAllInPlace tests/test_python.py - ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py - mkdir $out - touch $out/success - ''; -in lib.mapAttrs testfun envs // integrationTests + +in environmentTests // integrationTests diff --git a/pkgs/development/interpreters/python/tests/test_python.py b/pkgs/development/interpreters/python/tests/test_environments/test_python.py similarity index 100% rename from pkgs/development/interpreters/python/tests/test_python.py rename to pkgs/development/interpreters/python/tests/test_environments/test_python.py From 35e19d22c1a122981d64d76686ebd2cb58bc9bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 27 Aug 2020 18:42:38 +0200 Subject: [PATCH 324/688] libtorch-bin: init at 1.6.0 --- .../libraries/science/math/libtorch/bin.nix | 111 ++++++++++++++++++ .../science/math/libtorch/binary-hashes.nix | 14 +++ .../science/math/libtorch/test/CMakeLists.txt | 4 + .../science/math/libtorch/test/default.nix | 26 ++++ .../science/math/libtorch/test/test.cpp | 7 ++ pkgs/top-level/all-packages.nix | 5 + 6 files changed, 167 insertions(+) create mode 100644 pkgs/development/libraries/science/math/libtorch/bin.nix create mode 100644 pkgs/development/libraries/science/math/libtorch/binary-hashes.nix create mode 100644 pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt create mode 100644 pkgs/development/libraries/science/math/libtorch/test/default.nix create mode 100644 pkgs/development/libraries/science/math/libtorch/test/test.cpp diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix new file mode 100644 index 000000000000..3ae462705868 --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -0,0 +1,111 @@ +{ callPackage +, stdenv +, fetchzip +, lib + +, addOpenGLRunpath +, patchelf +, fixDarwinDylibNames + +, cudaSupport +, nvidia_x11 +}: + +let + version = "1.6.0"; + device = if cudaSupport then "cuda" else "cpu"; + srcs = import ./binary-hashes.nix; + unavailable = throw "libtorch is not available for this platform"; +in stdenv.mkDerivation { + inherit version; + pname = "libtorch"; + + src = fetchzip srcs."${stdenv.targetPlatform.system}-${device}" or unavailable; + + nativeBuildInputs = + if stdenv.isDarwin then [ fixDarwinDylibNames ] + else [ addOpenGLRunpath patchelf ] + ++ stdenv.lib.optionals cudaSupport [ addOpenGLRunpath ]; + + buildInputs = [ + stdenv.cc.cc + ] ++ lib.optionals cudaSupport [ nvidia_x11 ]; + + dontBuild = true; + dontConfigure = true; + dontStrip = true; + + installPhase = '' + # Copy headers and CMake files. + install -Dm755 -t $dev/lib lib/*.a + cp -r include $dev + cp -r share $dev + + install -Dm755 -t $out/lib lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* + + # We do not care about Java support... + rm -f $out/lib/lib*jni* 2> /dev/null || true + ''; + + postFixup = let + libPaths = [ stdenv.cc.cc.lib ] + ++ stdenv.lib.optionals cudaSupport [ nvidia_x11 ]; + rpath = stdenv.lib.makeLibraryPath libPaths; + in stdenv.lib.optionalString stdenv.isLinux '' + find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + echo "setting rpath for $lib..." + patchelf --set-rpath "${rpath}:$out/lib" "$lib" + ${lib.optionalString cudaSupport '' + addOpenGLRunpath "$lib" + ''} + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libtorch_python.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_python.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_cpu.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_cpu.dylib + install_name_tool -change @rpath/libtensorpipe.dylib $out/lib/libtensorpipe.dylib $out/lib/libtorch_cpu.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_observers.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_observers.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_observers.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_observers.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_module_test_dynamic.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_module_test_dynamic.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_module_test_dynamic.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_module_test_dynamic.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_detectron_ops.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_detectron_ops.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_detectron_ops.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_detectron_ops.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libshm.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libshm.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libshm.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libshm.dylib + + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_global_deps.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_global_deps.dylib + ''; + + outputs = [ "out" "dev" ]; + + passthru.tests = callPackage ./test { }; + + meta = with stdenv.lib; { + description = "C++ API of the PyTorch machine learning framework"; + homepage = "https://pytorch.org/"; + license = licenses.unfree; # Includes CUDA and Intel MKL. + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix new file mode 100644 index 000000000000..92a2e05e0ba3 --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -0,0 +1,14 @@ +{ + x86_64-darwin-cpu = { + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.6.0.zip"; + sha256 = "0d4n7la31qzl4s9pwvm07la7q6lhcwiww0yjpfz3kw6nvx84p22r"; + }; + x86_64-linux-cpu = { + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.6.0%2Bcpu.zip"; + sha256 = "1975b4zvyihzh89vnwspw0vf9qr05sxj8939vcrlmv3gzvdspcxz"; + }; + x86_64-linux-cuda = { + url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.6.0.zip"; + sha256 = "127qnfyi1faqbm40sbnsyqxjhrqj82bzwqyz7c1hs2bm0zgrrpya"; + }; +} diff --git a/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt b/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt new file mode 100644 index 000000000000..b302449ef772 --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt @@ -0,0 +1,4 @@ +find_package(Torch REQUIRED) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}") +add_executable(test test.cpp) +target_link_libraries(test "${TORCH_LIBRARIES}") diff --git a/pkgs/development/libraries/science/math/libtorch/test/default.nix b/pkgs/development/libraries/science/math/libtorch/test/default.nix new file mode 100644 index 000000000000..d661ec28db98 --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -0,0 +1,26 @@ +{ stdenv, cmake, libtorch-bin, symlinkJoin }: + +stdenv.mkDerivation { + pname = "libtorch-test"; + version = libtorch-bin.version; + + src = ./.; + + postPatch = '' + cat CMakeLists.txt + ''; + + makeFlags = [ "VERBOSE=1" ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libtorch-bin ]; + + installPhase = '' + touch $out + ''; + + checkPhase = '' + ./test + ''; +} diff --git a/pkgs/development/libraries/science/math/libtorch/test/test.cpp b/pkgs/development/libraries/science/math/libtorch/test/test.cpp new file mode 100644 index 000000000000..5537724ce5f6 --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/test/test.cpp @@ -0,0 +1,7 @@ +#include +#include + +int main() { + torch::Tensor tensor = torch::eye(3); + std::cout << tensor << std::endl; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcd653f6871f..11e692b5d8ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1367,6 +1367,11 @@ in then python.pkgs.tensorflow.libtensorflow else libtensorflow-bin; + libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { + inherit (linuxPackages) nvidia_x11; + cudaSupport = pkgs.config.cudaSupport or false; + }; + behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; bless = callPackage ../applications/editors/bless { }; From 4b00ca047bc6c6eca2c6fea4a66f1b92ae7bf78e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 Aug 2020 21:49:03 +1000 Subject: [PATCH 325/688] .editorconfig: add node-composition --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 75c343741309..31dd207e4e09 100644 --- a/.editorconfig +++ b/.editorconfig @@ -60,7 +60,7 @@ insert_final_newline = unset [gemset.nix] insert_final_newline = unset -[node-packages.nix] +[node-{composition,packages}.nix] insert_final_newline = unset [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] From 809860af578f9969e63efca71835b90dabf4e3f9 Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Sun, 30 Aug 2020 21:22:36 +0800 Subject: [PATCH 326/688] plex: 1.19 -> 1.20 --- 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 bc429e395016..48f786c13729 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.19.5.3112-b23ab3896"; + version = "1.20.1.3252-a78fef9a9"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0lh0yqpp1xyhb3bkc8wqg1afdyvaqhv3bmbyjqalpj2ikkk5lxwk"; + sha256 = "0z50c6kgsxz1pj8d65ibliqd4xbkwjlmim76j8rjid3amhj50jmx"; }; outputs = [ "out" "basedb" ]; From 4243ebb07e387c9b98320bba2e32e201911bca14 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Tue, 18 Aug 2020 13:10:46 +0300 Subject: [PATCH 327/688] nixUnstable: pre20200721_ff314f1 -> pre20200829_f156513 --- pkgs/tools/package-management/nix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 050367703165..2acf5d194e09 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -195,14 +195,14 @@ in rec { }); nixUnstable = lib.lowPrio (callPackage common rec { - name = "nix-2.4${suffix}"; - suffix = "pre20200721_ff314f1"; + name = "nix-3.0${suffix}"; + suffix = "pre20200829_f156513"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "ff314f186e3f91d87af6ad96c0ae3b472494b940"; - hash = "sha256-QibpLo4/gf2xYGoeQcgjZzH/qy5TBRVH+QCHgqOwur0="; + rev = "f15651303f8596bf34c67fc8d536b1e9e7843a87"; + hash = "sha256-HqM3Z4DLdMrf+0PPZL9ysctGg+K+i3S/IHA1GsJj0Ro="; }; inherit storeDir stateDir confDir boehmgc; From 51cdf4fdea70543d22bf484ac5bb0cb63924beb4 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sun, 30 Aug 2020 23:04:50 +1200 Subject: [PATCH 328/688] kdesu: update patch to use qCWarning --- .../kdesu/kdesu-search-for-wrapped-daemon-first.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch index ffc7edadfabd..f82bf828e8e9 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch +++ b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch @@ -21,14 +21,14 @@ index 44fbacd..6b5abf5 100644 - if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH - daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); - if (daemon.isEmpty()) { -- qWarning() << "kdesud daemon not found."; +- qCWarning(KSU_LOG) << "kdesud daemon not found."; + QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); + if (!QFile::exists(daemon)) { // if not in wrappers + daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); + if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH + daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); + if (daemon.isEmpty()) { -+ qWarning() << "kdesud daemon not found."; ++ qCWarning(KSU_LOG) << "kdesud daemon not found."; + } } } From be534380c4637c4673308c722daceb42ef16ff70 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 18:22:03 +0200 Subject: [PATCH 329/688] bzip2_1_1: init at 2020-08-11 bzip2 has been unmaintained for a long time. For a while now, there has been maintainership, resulting in the release of 1.0.8. At the same time, there is now a master branch (version 1.1.x) which supports meson and cmake as build systems. This commit adds the current HEAD of the master branch (1.1.x). In the future we may want to use this one instead of the older and patched 1.0.6 we currently have. Related: - https://github.com/NixOS/nixpkgs/pull/65029 - https://github.com/NixOS/nixpkgs/pull/94969 --- pkgs/tools/compression/bzip2/1_1.nix | 45 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/compression/bzip2/1_1.nix diff --git a/pkgs/tools/compression/bzip2/1_1.nix b/pkgs/tools/compression/bzip2/1_1.nix new file mode 100644 index 000000000000..3f6105ca507b --- /dev/null +++ b/pkgs/tools/compression/bzip2/1_1.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitLab +, meson +, python3 +, ninja +}: + +stdenv.mkDerivation rec { + pname = "bzip2-unstable"; + version = "2020-08-11"; + + src = fetchFromGitLab { + owner = "federicomenaquintero"; + repo = "bzip2"; + rev = "15255b553e7c095fb7a26d4dc5819a11352ebba1"; + sha256 = "sha256-BAyz35D62LWi47B/gNcCSKpdaECHBGSpt21vtnk3fKs="; + }; + + postPatch = '' + patchShebangs install_links.py + ''; + + nativeBuildInputs = [ + meson + python3 + ninja + ]; + + outputs = [ "bin" "dev" "out" "man" ]; + + mesonFlags = [ + "-Ddocs=disabled" + ]; + + strictDeps = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "High-quality data compression program"; + license = licenses.bsdOriginal; + platforms = platforms.all; + maintainers = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a545b124a86..88a846a3f184 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2577,6 +2577,8 @@ in bzip2 = callPackage ../tools/compression/bzip2 { }; + bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { }; + cabextract = callPackage ../tools/archivers/cabextract { }; cadaver = callPackage ../tools/networking/cadaver { From beb63457b1264f4f259db9e69f2946a168ae1776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 29 Aug 2020 17:37:11 +0200 Subject: [PATCH 330/688] pulseaudio-dlna: avoid using an alias attribute --- pkgs/applications/audio/pulseaudio-dlna/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index 75990d593dfe..c0986880c094 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -4,7 +4,7 @@ , faacSupport ? false, faac ? null , flacSupport ? true, flac ? null , soxSupport ? true, sox ? null -, vorbisSupport ? true, vorbisTools ? null +, vorbisSupport ? true, vorbis-tools ? null }: assert mp3Support -> lame != null; @@ -12,7 +12,7 @@ assert opusSupport -> opusTools != null; assert faacSupport -> faac != null; assert flacSupport -> flac != null; assert soxSupport -> sox != null; -assert vorbisSupport -> vorbisTools != null; +assert vorbisSupport -> vorbis-tools != null; let zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; @@ -37,7 +37,7 @@ pythonPackages.buildPythonApplication { ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional flacSupport flac ++ stdenv.lib.optional soxSupport sox - ++ stdenv.lib.optional vorbisSupport vorbisTools; + ++ stdenv.lib.optional vorbisSupport vorbis-tools; # upstream has no tests checkPhase = '' From 5f40ba47d55230719a91574eb67d3fac24f52bbf Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 29 Aug 2020 12:55:49 +0100 Subject: [PATCH 331/688] pythonPackages.pint: add missing dependencies importlib-metadata and packaging appear to have been falsely satisfied by the inclusion of pytestCheckHook in checkInputs. this can be demonstrated by attempting to build this package with doCheck = false. also removed the isPy27 clause as package no longer seems to support <3.6 anyway now. --- pkgs/development/python-modules/pint/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 939eeafd9b9f..bb2a20cf62f3 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 , pythonOlder -, funcsigs , setuptools_scm +, importlib-metadata +, packaging # Check Inputs , pytestCheckHook , numpy @@ -24,9 +24,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ - setuptools_scm - ] ++ lib.optional isPy27 funcsigs; + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ packaging ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # Test suite explicitly requires pytest checkInputs = [ From b56b0b82385281e0257e219832e8a307ac890ad0 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 30 Aug 2020 18:30:26 +0200 Subject: [PATCH 332/688] robustirc-bridge: init at 1.8 --- pkgs/servers/irc/robustirc-bridge/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/servers/irc/robustirc-bridge/default.nix diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix new file mode 100644 index 000000000000..430cbc3ccd18 --- /dev/null +++ b/pkgs/servers/irc/robustirc-bridge/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "robustirc-bridge"; + version = "1.8"; + + src = fetchFromGitHub { + owner = "robustirc"; + repo = "bridge"; + rev = "v${version}"; + sha256 = "12jzil97147f978shdgm6whz7699db0shh0c1fzgrjh512dw502c"; + }; + + vendorSha256 = "0lm8j2iz0yysgi0bbh78ca629kb6sxvyy9al3aj2587hpvy79q85"; + + postInstall = '' + install -D robustirc-bridge.1 $out/share/man/man1/robustirc-bridge.1 + ''; + + meta = with stdenv.lib; { + description = "Bridge to robustirc.net-IRC-Network"; + homepage = "https://robustirc.net/"; + license = licenses.bsd3; + maintainers = [ maintainers.hax404 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a846a3f184..e2824bb1e770 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22990,6 +22990,8 @@ in prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; + robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; + sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; From 9376dd8516490f525f1ca0c188e40ba64f5c6b64 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 30 Aug 2020 18:31:15 +0200 Subject: [PATCH 333/688] nixos/modules/robustirc-bridge: init --- nixos/modules/module-list.nix | 1 + .../services/networking/robustirc-bridge.nix | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 nixos/modules/services/networking/robustirc-bridge.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c837976286b4..aec8dd5e29a7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -719,6 +719,7 @@ ./services/networking/rdnssd.nix ./services/networking/redsocks.nix ./services/networking/resilio.nix + ./services/networking/robustirc-bridge.nix ./services/networking/rpcbind.nix ./services/networking/rxe.nix ./services/networking/sabnzbd.nix diff --git a/nixos/modules/services/networking/robustirc-bridge.nix b/nixos/modules/services/networking/robustirc-bridge.nix new file mode 100644 index 000000000000..255af79ec04b --- /dev/null +++ b/nixos/modules/services/networking/robustirc-bridge.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.robustirc-bridge; +in +{ + options = { + services.robustirc-bridge = { + enable = mkEnableOption "RobustIRC bridge"; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = ''Extra flags passed to the robustirc-bridge command. See RobustIRC Documentation or robustirc-bridge(1) for details.''; + example = [ + "-network robustirc.net" + ]; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.robustirc-bridge = { + description = "RobustIRC bridge"; + documentation = [ + "man:robustirc-bridge(1)" + "https://robustirc.net/" + ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${pkgs.robustirc-bridge}/bin/robustirc-bridge ${concatStringsSep " " cfg.extraFlags}"; + Restart = "on-failure"; + + # Hardening + PrivateDevices = true; + ProtectSystem = true; + ProtectHome = true; + PrivateTmp = true; + }; + }; + }; +} From 4aa5466cbc741097218a1c494a7b832a17d1967d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 Aug 2020 07:30:11 +0000 Subject: [PATCH 334/688] python27Packages.qtconsole: 4.7.5 -> 4.7.6 --- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index ca6a19220d5f..a1bf4d53018d 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.7.5"; + version = "4.7.6"; src = fetchPypi { inherit pname version; - sha256 = "f5cb275d30fc8085e2d1d18bc363e5ba0ce6e559bf37d7d6727b773134298754"; + sha256 = "6c24397c19a49a5cf69582c931db4b0f6b00a78530a2bfd122936f2ebfae2fef"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; From 1795859debe103ebd035f7da0a454c5a9e6468b3 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 30 Aug 2020 18:02:07 +0200 Subject: [PATCH 335/688] geonkick: 2.3.3 -> 2.3.7 --- pkgs/applications/audio/geonkick/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index c2dc39fe610f..dcfb54260343 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -2,20 +2,21 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.3.3"; + version = "2.3.7"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "0h1abb6q2bmi01a3v37adkc4zc03j47jpvffz8p2lpp33xhljghs"; + sha256 = "1wdcbwiyy6i5agq5lffkyilyc8mv1cc4mp9h0nybn240vb2flqc2"; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ]; - cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" ]; + # https://github.com/iurie-sw/geonkick/issues/120 + cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = { homepage = "https://gitlab.com/iurie-sw/geonkick"; From f9a1a02349a75ba097bb03b20b40695252773525 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 29 Aug 2020 20:10:41 +0200 Subject: [PATCH 336/688] redkite: 1.0.1 -> 1.0.3 --- pkgs/development/libraries/redkite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/redkite/default.nix b/pkgs/development/libraries/redkite/default.nix index 63e5eea25a45..be6bf0d7fa0a 100644 --- a/pkgs/development/libraries/redkite/default.nix +++ b/pkgs/development/libraries/redkite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "redkite"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "1qd4r7ps0fg2m1vx3j48chfdh2c5909j4f9wip4af59inrid4w6a"; + sha256 = "1m2db7c791fi33snkjwnvlxapmf879g5r8azlkx7sr6vp2s0jq2k"; }; nativeBuildInputs = [ cmake ]; From 7a541cf382e875bc5733c44802e9a7fc3be91311 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 29 Aug 2020 20:00:54 +0200 Subject: [PATCH 337/688] dragonfly-reverb: 3.1.1 -> 3.2.1 --- pkgs/applications/audio/dragonfly-reverb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index b42929ff2040..e5cbcd4a2e20 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "188cm45hr0i33m4h2irql1wrsmsfis65s706wjiid0z59q47rf9p"; + sha256 = "0vfm2510shah67k87mdyar4wr4vqwii59y9lqfhwm6blxparkrqa"; fetchSubmodules = true; }; From 168ff64d8d19b778ab89bb10feff983d9d15ce63 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 29 Aug 2020 04:17:08 +0200 Subject: [PATCH 338/688] bchoppr: 1.6.4 -> 1.8.0 --- pkgs/applications/audio/bchoppr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index 1b642e1ed692..7d4d53408d28 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.6.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "16b0sg7q2b8l4y4bp5s3yzsj9j6jayjy2mlvqkby6l7hcgjcj493"; + sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j"; }; nativeBuildInputs = [ pkg-config ]; From b1fa496da961e8aab15e9c7c4ac2aa9d55382404 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 29 Aug 2020 03:40:03 +0200 Subject: [PATCH 339/688] bjumblr: 1.4.0 -> 1.4.2 --- pkgs/applications/audio/bjumblr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix index 458fe20937a6..e1a5bee64b30 100644 --- a/pkgs/applications/audio/bjumblr/default.nix +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BJumblr"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "03x1gvri9yk000fvvc8zvvywf38cc41vkyhhp9xby71b23n5wbn0"; + sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v"; }; nativeBuildInputs = [ pkgconfig ]; From f1cfc5060d13dde86ab01235b677cbd9460b6439 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 29 Aug 2020 03:35:42 +0200 Subject: [PATCH 340/688] bschaffl: 0.3 -> 1.2.0 --- pkgs/applications/audio/bschaffl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix index de8e55a95453..c0d11e1fe5ac 100644 --- a/pkgs/applications/audio/bschaffl/default.nix +++ b/pkgs/applications/audio/bschaffl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bschaffl"; - version = "0.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "1pcch7j1wgsb77mjy58hl3z43p83dv0vcmyh129m9k216b09gy29"; + sha256 = "1c09acqrbd387ba41f8ch1qykdap5h6cg9if5pgd16i4dmjnpghj"; }; nativeBuildInputs = [ pkg-config ]; From 9388762bf72bcd660ae90766ad8283fdddf43289 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 24 Aug 2020 11:37:55 +0200 Subject: [PATCH 341/688] pythonPackages.pytest-randomly: init at 3.4.1 --- .../pytest-randomly/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-randomly/default.nix diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix new file mode 100644 index 000000000000..c4523ac728c6 --- /dev/null +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, factory_boy, faker, numpy +, pytest, pytest_xdist +}: + +buildPythonPackage rec { + pname = "pytest-randomly"; + version = "3.4.1"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0s9cx692cdchfrjqx7fgf9wnm3fdac211a4hjq1cx9qqnbpdpl2z"; + }; + + propagatedBuildInputs = [ numpy factory_boy faker ]; + + checkInputs = [ pytest pytest_xdist ]; + + # test warnings are fixed on an unreleased version: + # https://github.com/pytest-dev/pytest-randomly/pull/281 + checkPhase = "pytest -p no:randomly"; + + meta = with lib; { + description = "Pytest plugin to randomly order tests and control random.seed"; + homepage = "https://github.com/pytest-dev/pytest-randomly"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b23bdd75db15..2ac4f92122a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2750,6 +2750,8 @@ in { pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; + pytest-randomly = callPackage ../development/python-modules/pytest-randomly { }; + pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; pytest-repeat = callPackage ../development/python-modules/pytest-repeat { }; From c83ebad684fbca9ce318c675483df4c45adb8415 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 24 Aug 2020 12:07:18 +0200 Subject: [PATCH 342/688] pythonPackages.zopfli: init at 0.1.6 --- .../python-modules/zopfli/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/zopfli/default.nix diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix new file mode 100644 index 000000000000..58b7d43f3d22 --- /dev/null +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "zopfli"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0smaxh7iihjr9mwxw1ifc9vnlh3ra8l060dd1gbvp1963k0r68pd"; + extension = "zip"; + }; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "cPython bindings for zopfli"; + homepage = "https://github.com/obp/py-zopfli"; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ac4f92122a9..037b00d495a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6942,6 +6942,8 @@ in { zope_interface = callPackage ../development/python-modules/zope_interface { }; + zopfli = callPackage ../development/python-modules/zopfli { }; + hgsvn = callPackage ../development/python-modules/hgsvn { }; cliapp = callPackage ../development/python-modules/cliapp { }; From 5c000c1a03fd15ffb03cf82cc64ab141b00b897d Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 24 Aug 2020 12:14:29 +0200 Subject: [PATCH 343/688] pythonPackages.unicodedata2: init at 13.0.0-2 --- .../python-modules/unicodedata2/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/unicodedata2/default.nix diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix new file mode 100644 index 000000000000..e36f0f7b03cb --- /dev/null +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: + +buildPythonPackage rec { + pname = "unicodedata2"; + version = "13.0.0-2"; + + src = fetchFromGitHub { + owner = "mikekap"; + repo = pname; + rev = version; + sha256 = "0p9brbiwyg98q52y0gfyps52xv57fwqfpq0mn18p1xc1imip3h2b"; + }; + + checkInputs = [ pytest ]; + checkPhase = "pytest tests"; + + meta = with lib; { + description = ""; + homepage = "http://github.com/mikekap/unicodedata2"; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 037b00d495a5..d131ef8ab1b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6825,6 +6825,8 @@ in { unicodecsv = callPackage ../development/python-modules/unicodecsv { }; + unicodedata2 = callPackage ../development/python-modules/unicodedata2 { }; + unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; unidiff = callPackage ../development/python-modules/unidiff { }; From 3f531341088c118d90b25025b28a4da0f7384ec7 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 16:45:29 +0200 Subject: [PATCH 344/688] =?UTF-8?q?pythonPackages.fonttools:=204.13.0=20?= =?UTF-8?q?=E2=86=92=204.14.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/fonttools/default.nix | 62 ++++++++++++++----- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 9fe285a8e697..a1433d08bd04 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -1,38 +1,70 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 -, numpy +, fetchFromGitHub +, pythonOlder +, brotlipy +, zopfli +, fs +, lxml +, scipy +, munkres +, unicodedata2 +, sympy +, matplotlib +, reportlab , pytest -, pytestrunner +, pytest-randomly , glibcLocales }: buildPythonPackage rec { pname = "fonttools"; - version = "4.13.0"; - disabled = isPy27; + version = "4.14.0"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "63987cd374c39a75146748f8be8637634221e53fef15cdf76f17777676d8545a"; - extension = "zip"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0aiaxjg2v2391gxnhp4nvmgfb3ygm6x7n080s5mnkfjq2bq319in"; }; - buildInputs = [ - numpy - ]; - + # all dependencies are optional, but + # we run the checks with them checkInputs = [ pytest - pytestrunner + pytest-randomly glibcLocales + # etree extra + lxml + # ufo extra + fs + # woff extra + brotlipy + zopfli + # unicode extra + unicodedata2 + # interpolatable extra + scipy + munkres + # symfont + sympy + # varLib + matplotlib + # pens + reportlab ]; preCheck = '' export LC_ALL="en_US.UTF-8" ''; + # avoid timing issues with timestamps in subset_test.py and ttx_test.py + checkPhase = '' + pytest Tests fontTools \ + -k 'not ttcompile_timestamp_calcs and not recalc_timestamp' + ''; + meta = { homepage = "https://github.com/fonttools/fonttools"; description = "A library to manipulate font files from Python"; From 47addc60d5ba79166232e13c6a6510396a1038fd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 17:25:25 +0200 Subject: [PATCH 345/688] pythonPackages.fontpens: init at 0.2.4 --- .../python-modules/fontpens/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/fontpens/default.nix diff --git a/pkgs/development/python-modules/fontpens/default.nix b/pkgs/development/python-modules/fontpens/default.nix new file mode 100644 index 000000000000..02adb3b06426 --- /dev/null +++ b/pkgs/development/python-modules/fontpens/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchPypi, fonttools }: + +buildPythonPackage rec { + pname = "fontPens"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1za15dzsnymq6d9x7xdfqwgw4a3003wj75fn2crhyidkfd2s3nd6"; + extension = "zip"; + }; + + propagatedBuildInputs = [ fonttools ]; + + # can't run normal tests due to circular dependency with fontParts + doCheck = false; + pythonImportsCheck = [ "fontPens" ] ++ (builtins.map (s: "fontPens." + s) [ + "angledMarginPen" + "digestPointPen" + "flattenPen" + "guessSmoothPointPen" + "marginPen" + "penTools" + "printPen" + "printPointPen" + "recordingPointPen" + "thresholdPen" + "thresholdPointPen" + "transformPointPen" + ]); + + meta = with lib; { + description = "A collection of classes implementing the pen protocol for manipulating glyphs"; + homepage = "https://github.com/robotools/fontPens"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d131ef8ab1b8..12266422e7d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4140,6 +4140,8 @@ in { inherit python; })); + fontpens = callPackage ../development/python-modules/fontpens { }; + fonttools = callPackage ../development/python-modules/fonttools { }; foolscap = callPackage ../development/python-modules/foolscap { }; From 61b57f0781e79150c3c7807030aa2d41c9ffa5ae Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 17:26:26 +0200 Subject: [PATCH 346/688] pythonPackages.fontmath: init at 0.6.0 --- .../python-modules/fontmath/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/fontmath/default.nix diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix new file mode 100644 index 000000000000..7a23abdd0374 --- /dev/null +++ b/pkgs/development/python-modules/fontmath/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, fonttools +, pytest, pytestrunner +}: + +buildPythonPackage rec { + pname = "fontMath"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "09xdqdjyjlx5k9ymi36d7hkgvn55zzjzd65l2yqidkfazlmh14ss"; + extension = "zip"; + }; + + propagatedBuildInputs = [ fonttools ]; + checkInputs = [ pytest pytestrunner ]; + + meta = with lib; { + description = "A collection of objects that implement fast font, glyph, etc. math"; + homepage = "https://github.com/robotools/fontMath/"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12266422e7d0..cc7fac2154ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4142,6 +4142,8 @@ in { fontpens = callPackage ../development/python-modules/fontpens { }; + fontmath = callPackage ../development/python-modules/fontmath { }; + fonttools = callPackage ../development/python-modules/fonttools { }; foolscap = callPackage ../development/python-modules/foolscap { }; From fb67ae709f6ed46058a55ec0c756ec84cbdf288f Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 17:27:22 +0200 Subject: [PATCH 347/688] pythonPackages.defcon: init at 0.7.2 --- .../python-modules/defcon/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/defcon/default.nix diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix new file mode 100644 index 000000000000..25c590299922 --- /dev/null +++ b/pkgs/development/python-modules/defcon/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, fonttools +, pytest, pytestrunner, lxml, fs, unicodedata2, fontpens +}: + +buildPythonPackage rec { + pname = "defcon"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lfqsvxmq1j0nvp26gidnqkj1dyxv7jalc6i7fz1r3nc7niflrqr"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + fonttools + ]; + + checkInputs = [ + pytest + pytestrunner + lxml + fs + unicodedata2 + fontpens + ]; + + meta = with lib; { + description = "A set of UFO based objects for use in font editing applications"; + homepage = "https://github.com/robotools/defcon"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc7fac2154ac..5ec5a0275e16 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2210,6 +2210,8 @@ in { debian = callPackage ../development/python-modules/debian {}; + defcon = callPackage ../development/python-modules/defcon { }; + defusedxml = callPackage ../development/python-modules/defusedxml {}; dodgy = callPackage ../development/python-modules/dodgy { }; From e591c63a4f638efb2b823b06eef358c7d8dc4b03 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 17:26:52 +0200 Subject: [PATCH 348/688] pythonPackages.booleanoperations: init at 0.9.0 --- .../booleanoperations/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/booleanoperations/default.nix diff --git a/pkgs/development/python-modules/booleanoperations/default.nix b/pkgs/development/python-modules/booleanoperations/default.nix new file mode 100644 index 000000000000..c747df90f5a5 --- /dev/null +++ b/pkgs/development/python-modules/booleanoperations/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchPypi +, fonttools, fs, pyclipper, defcon, fontpens +, setuptools_scm, pytest +}: + +buildPythonPackage rec { + pname = "booleanOperations"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f41lb19m8azchl1aqz6j5ycbspb8jsf1cnn42hlydxd68f85ylc"; + extension = "zip"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + fonttools + fs + pyclipper + defcon + fontpens + ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "Boolean operations on paths"; + homepage = "https://github.com/typemytype/booleanOperations"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ec5a0275e16..272ede019f45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2091,6 +2091,8 @@ in { boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; + booleanoperations = callPackage ../development/python-modules/booleanoperations { }; + boolean-py = callPackage ../development/python-modules/boolean-py { }; bumps = callPackage ../development/python-modules/bumps {}; From 5db55e51062c50354ce4e1848cc7c777038ef8ea Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 17:27:42 +0200 Subject: [PATCH 349/688] pythonPackages.fontparts: init at 0.9.2 --- .../python-modules/fontparts/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/fontparts/default.nix diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix new file mode 100644 index 000000000000..dd341fef8b3c --- /dev/null +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchPypi, python +, fonttools, lxml, fs, unicodedata2 +, defcon, fontpens, fontmath, booleanoperations +, pytest +}: + +buildPythonPackage rec { + pname = "fontParts"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hwzdppmrrw1xz49x36h6mcsrwya1f3zpqrc206y73j4pbn7fh0k"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + booleanoperations + fonttools + unicodedata2 # fonttools[unicode] extra + lxml # fonttools[lxml] extra + fs # fonttools[ufo] extra + defcon + fontpens # defcon[pens] extra + fontmath + ]; + + checkPhase = '' + ${python.interpreter} Lib/fontParts/fontshell/test.py + ''; + checkInputs = [ pytest ]; + + meta = with lib; { + description = "An API for interacting with the parts of fonts during the font development process."; + homepage = "https://github.com/robotools/fontParts"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 272ede019f45..505ce5a1fc6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4148,6 +4148,8 @@ in { fontmath = callPackage ../development/python-modules/fontmath { }; + fontparts = callPackage ../development/python-modules/fontparts { }; + fonttools = callPackage ../development/python-modules/fonttools { }; foolscap = callPackage ../development/python-modules/foolscap { }; From 03ac35ddf71c327fc7bf03e2b7280101aca2ccb9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 20:09:26 +0200 Subject: [PATCH 350/688] pythonPackages.ufonormalizer: init at 0.4.1 --- .../python-modules/ufonormalizer/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/ufonormalizer/default.nix diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix new file mode 100644 index 000000000000..70c9061d3666 --- /dev/null +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ufonormalizer"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nv80x7l7sya5wzyfk9ss93r6bjzjljpkw4k8gibxp1rqrzkdms4"; + extension = "zip"; + }; + + meta = with lib; { + description = "Script to normalize the XML and other data inside of a UFO"; + homepage = "https://github.com/unified-font-object/ufoNormalizer"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 505ce5a1fc6b..ae83947249c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1723,6 +1723,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; }; + ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; + unifi = callPackage ../development/python-modules/unifi { }; uvcclient = callPackage ../development/python-modules/uvcclient { }; From 34f05cf02f56f73e737ad6b67c6806f631b6edc2 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 20:10:42 +0200 Subject: [PATCH 351/688] pythonPackages.mutatormath: init at 3.0.1 --- .../python-modules/mutatormath/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/mutatormath/default.nix diff --git a/pkgs/development/python-modules/mutatormath/default.nix b/pkgs/development/python-modules/mutatormath/default.nix new file mode 100644 index 000000000000..9336dbf354af --- /dev/null +++ b/pkgs/development/python-modules/mutatormath/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, defcon, fontmath +, unicodedata2, fs +}: + +buildPythonPackage rec { + pname = "MutatorMath"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0r1qq45np49x14zz1zwkaayqrn7m8dn2jlipjldg2ihnmpzw29w1"; + extension = "zip"; + }; + + propagatedBuildInputs = [ fontmath unicodedata2 defcon ]; + checkInputs = [ unicodedata2 fs ]; + + meta = with lib; { + description = "Piecewise linear interpolation in multiple dimensions with multiple, arbitrarily placed, masters"; + homepage = "https://github.com/LettError/MutatorMath"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae83947249c2..df79cbbee7d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4952,6 +4952,8 @@ in { else callPackage ../development/python-modules/mutagen { }; + mutatormath = callPackage ../development/python-modules/mutatormath { }; + muttils = callPackage ../development/python-modules/muttils { }; mygpoclient = callPackage ../development/python-modules/mygpoclient { }; From 40c0cde72ef5fb3e78349dd2b26fb37eebc60ea5 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 20:12:23 +0200 Subject: [PATCH 352/688] pythonPackages.ufoprocessor: init at 1.9.0 --- .../python-modules/ufoprocessor/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/ufoprocessor/default.nix diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix new file mode 100644 index 000000000000..db5b1400fe45 --- /dev/null +++ b/pkgs/development/python-modules/ufoprocessor/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi +, defcon, fonttools, lxml, fs +, mutatormath, fontmath, fontparts +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "ufoProcessor"; + version = "1.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ns11aamgavgsfj8qf5kq7dvzmgl0mhr1cbych2f075ipfdvva5s"; + extension = "zip"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + defcon + lxml + fonttools + fs + fontmath + fontparts + mutatormath + ]; + + meta = with lib; { + description = "Read, write and generate UFOs with designspace data"; + homepage = "https://github.com/LettError/ufoProcessor"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df79cbbee7d2..deb669b18b08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1725,6 +1725,8 @@ in { ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; + ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; + unifi = callPackage ../development/python-modules/unifi { }; uvcclient = callPackage ../development/python-modules/uvcclient { }; From e871d7ad35b5f1c3161931af9dd1a4f3728dce5c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 20:14:19 +0200 Subject: [PATCH 353/688] pythonPackages.psautohint: init at 2.1.0 --- .../python-modules/psautohint/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/psautohint/default.nix diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix new file mode 100644 index 000000000000..0f89069c7d8f --- /dev/null +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, fonttools, lxml, fs +, setuptools_scm +, pytest, pytestcov, pytest_xdist, pytest-randomly +}: + +buildPythonPackage rec { + pname = "psautohint"; + version = "2.1.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "adobe-type-tools"; + repo = pname; + sha256 = "1k1rx1adqxdxj5v3788lwnvygylp73sps1p0q44hws2vmsag2s8r"; + rev = "v${version}"; + fetchSubmodules = true; # data dir for tests + }; + + postPatch = '' + echo '#define PSAUTOHINT_VERSION "${version}"' > libpsautohint/src/version.h + sed -i '/use_scm_version/,+3d' setup.py + sed -i '/setup(/a \ version="${version}",' setup.py + ''; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ fonttools lxml fs ]; + + checkInputs = [ pytest pytestcov pytest_xdist pytest-randomly ]; + checkPhase = "pytest tests"; + + meta = with lib; { + description = "Script to normalize the XML and other data inside of a UFO"; + homepage = "https://github.com/adobe-type-tools/psautohint"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index deb669b18b08..c558eda2371d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5500,6 +5500,8 @@ in { protobuf = pkgs.protobuf; }; + psautohint = callPackage ../development/python-modules/psautohint { }; + psd-tools = callPackage ../development/python-modules/psd-tools { }; psutil = callPackage ../development/python-modules/psutil { }; From 65130398eb627d8ddacaa0819bdc11fc67b75b19 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 20:31:28 +0200 Subject: [PATCH 354/688] pythonPackages.afdko: init at 3.5.0 --- .../python-modules/afdko/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/afdko/default.nix diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix new file mode 100644 index 000000000000..5d960b5e92e8 --- /dev/null +++ b/pkgs/development/python-modules/afdko/default.nix @@ -0,0 +1,55 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python +, fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens +, brotli, fontmath, mutatormath, booleanoperations +, ufoprocessor, ufonormalizer, psautohint +, setuptools_scm +, pytest +}: + +buildPythonPackage rec { + pname = "afdko"; + version = "3.5.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wid4l70bxm297xgayyrgw5glhp6n92gh4sz1nd4rncgf1ziz8ck"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + booleanoperations + fonttools + lxml # fonttools[lxml], defcon[lxml] extra + fs # fonttools[ufo] extra + unicodedata2 # fonttools[unicode] extra + brotlipy # fonttools[woff] extra + zopfli # fonttools[woff] extra + fontpens + brotli + defcon + fontmath + mutatormath + ufoprocessor + ufonormalizer + psautohint + ]; + + # tests are broken on non x86_64 + # https://github.com/adobe-type-tools/afdko/issues/1163 + # https://github.com/adobe-type-tools/afdko/issues/1216 + doCheck = stdenv.isx86_64; + checkInputs = [ pytest ]; + checkPhase = '' + PATH="$PATH:$out/bin" py.test + ''; + + meta = with stdenv.lib; { + description = "Adobe Font Development Kit for OpenType"; + homepage = "https://adobe-type-tools.github.io/afdko/"; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c558eda2371d..cfed029af890 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -158,6 +158,8 @@ in { aenum = callPackage ../development/python-modules/aenum { }; + afdko = callPackage ../development/python-modules/afdko { }; + affinity = callPackage ../development/python-modules/affinity { }; agate = callPackage ../development/python-modules/agate { }; From a22e9ae45d384259c5ddfff9cb693c6a996db64a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 22:05:45 +0200 Subject: [PATCH 355/688] =?UTF-8?q?pythonPackages.nototools:=20unstable-20?= =?UTF-8?q?19-10-21=20=E2=86=92=200.2.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/noto-fonts/tools.nix | 62 +++++++++++++++++++++------- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index 3cc1570161e6..6ea26f7c79d8 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,32 +1,62 @@ -{ fetchFromGitHub, lib, fetchpatch, buildPythonPackage, isPy3k, fonttools, numpy, pillow, six, bash }: +{ fetchFromGitHub, lib, buildPythonPackage, pythonOlder +, afdko, appdirs, attrs, black, booleanoperations, brotlipy, click +, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml +, mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour +, toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli +, pillow, six, bash, setuptools_scm }: buildPythonPackage rec { pname = "nototools"; - version = "unstable-2019-10-21"; + version = "0.2.12"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "googlefonts"; repo = "nototools"; - rev = "cae92ce958bee37748bf0602f5d7d97bb6db98ca"; - sha256 = "1jqr0dz23rjqiyxw1w69l6ry16dwdcf3c6cysiy793g2v7pir2yi"; + rev = "v${version}"; + sha256 = "0drmx1asni3g6616fa4gjn5n43qkcf7icvxq9y2krpjxq78wcmc5"; }; - propagatedBuildInputs = [ fonttools numpy ]; - - patches = lib.optionals isPy3k [ - # Additional Python 3 compat https://github.com/googlefonts/nototools/pull/497 - (fetchpatch { - url = "https://github.com/googlefonts/nototools/commit/ded1f311b3260f015b5c5b80f05f7185392c4eff.patch"; - sha256 = "0bn0rlbddxicw0h1dnl0cibgj6xjalja2qcm563y7kk3z5cdwhgq"; - }) - ]; - postPatch = '' - sed -ie "s^join(_DATA_DIR_PATH,^join(\"$out/third_party/ucd\",^" nototools/unicode_data.py + sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py ''; + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + afdko + appdirs + attrs + black + booleanoperations + brotlipy + click + defcon + fontmath + fontparts + fontpens + fonttools + lxml + mutatormath + pathspec + psautohint + pyclipper + pytz + regex + scour + toml + typed-ast + ufonormalizer + ufoprocessor + unicodedata2 + zopfli + ]; + checkInputs = [ - pillow six bash + pillow + six + bash ]; checkPhase = '' From 079b8e1c5d5ea37c8eca58110cd5d457fc7b7793 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 22:07:00 +0200 Subject: [PATCH 356/688] =?UTF-8?q?noto-fonts-emoji:=20unstable-2019-10-22?= =?UTF-8?q?=20=E2=86=92=20unstable-2020-08-20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now supports Unicode 13.0. --- pkgs/data/fonts/noto-fonts/default.nix | 34 +++++++++++++++++--------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index e077fc303445..afeb967c751d 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -6,11 +6,12 @@ , fetchzip , optipng , cairo -, python3Packages +, python3 , pkgconfig , pngquant , which , imagemagick +, zopfli }: let @@ -110,25 +111,36 @@ in }; noto-fonts-emoji = let - version = "unstable-2019-10-22"; + version = "unstable-2020-08-20"; + emojiPythonEnv = + python3.withPackages (p: with p; [ fonttools nototools ]); in stdenv.mkDerivation { pname = "noto-fonts-emoji"; inherit version; src = fetchFromGitHub { - owner = "googlei18n"; + owner = "googlefonts"; repo = "noto-emoji"; - rev = "018aa149d622a4fea11f01c61a7207079da301bc"; - sha256 = "0qmnnjpp5lza6g5m3ki6hj46p891h9vl42k3acd0qw8i0jj5yn2c"; + rev = "1bc491419fa2925d018f27bfe702792031be0e68"; + sha256 = "1vak4s1p4wlwzpnqfb1c2sg62q82gnjpnmqrfz8xl6bd0z55imzy"; }; - buildInputs = [ cairo ]; - nativeBuildInputs = [ pngquant optipng which cairo pkgconfig imagemagick ] - ++ (with python3Packages; [ python fonttools nototools ]); + nativeBuildInputs = [ + cairo + imagemagick + zopfli + pngquant + which + pkgconfig + emojiPythonEnv + ]; postPatch = '' - sed -i 's,^PNGQUANT :=.*,PNGQUANT := ${pngquant}/bin/pngquant,' Makefile - patchShebangs flag_glyph_name.py + patchShebangs *.py + patchShebangs third_party/color_emoji/*.py + # remove check for virtualenv, since we handle + # python requirements using python.withPackages + sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile ''; enableParallelBuilding = true; @@ -141,7 +153,7 @@ in meta = with lib; { inherit version; description = "Color and Black-and-White emoji fonts"; - homepage = "https://github.com/googlei18n/noto-emoji"; + homepage = "https://github.com/googlefonts/noto-emoji"; license = with licenses; [ ofl asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ mathnerd314 ]; From 0cfc9f47ceb48cd41427377cd3c1bb4942373253 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 Aug 2020 23:55:50 +0200 Subject: [PATCH 357/688] noto-fonts-emoji-blob-bin: remove url syntax in homepage --- pkgs/data/fonts/noto-fonts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index afeb967c751d..40a6c8874393 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -177,7 +177,7 @@ in meta = with stdenv.lib; { description = "Noto Emoji with extended Blob support"; - homepage = https://github.com/C1710/blobmoji; + homepage = "https://github.com/C1710/blobmoji"; license = with licenses; [ ofl asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ rileyinman ]; From fe3d667a0f0088303b4cacfbfddd487f5bf4ecfb Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 26 Aug 2020 13:20:01 +0200 Subject: [PATCH 358/688] =?UTF-8?q?twitter-color-emoji:=2012.1.5=20?= =?UTF-8?q?=E2=86=92=2013.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fonts/twitter-color-emoji/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index ac3930853cf9..8435957fe201 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -3,9 +3,8 @@ { stdenv , fetchFromGitHub -, fetchpatch , cairo -, graphicsmagick +, imagemagick , pkg-config , pngquant , python3 @@ -15,7 +14,7 @@ }: let - version = "12.1.5"; + version = "13.0.1"; twemojiSrc = fetchFromGitHub { name = "twemoji"; @@ -25,6 +24,9 @@ let sha256 = "0acinlv2l3s1jga2i9wh16mvgkxw4ipzgvjx8c80zd104lpdpgd9"; }; + pythonEnv = + python3.withPackages (p: [ p.fonttools p.nototools ]); + in stdenv.mkDerivation rec { pname = "twitter-color-emoji"; @@ -44,23 +46,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cairo - graphicsmagick + imagemagick pkg-config pngquant - python3 - python3.pkgs.nototools + pythonEnv which zopfli ]; - patches = [ - # ImageMagick -> GraphicsMagick - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/07778605d50696f6aa929020e82611a01d254c90/f/noto-emoji-use-gm.patch"; - sha256 = "06vg16z79s5adyjy8r3mr8fd391b1hi4xkqvbzkmnjwaai7p08lk"; - }) - ]; - postPatch = let templateSubstitutions = stdenv.lib.concatStringsSep "; " [ ''s#Noto Color Emoji#Twitter Color Emoji#'' @@ -74,7 +67,7 @@ stdenv.mkDerivation rec { ''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#'' ]; in '' - patchShebangs ./flag_glyph_name.py + ${noto-fonts-emoji.postPatch} sed '${templateSubstitutions}' NotoColorEmoji.tmpl.ttx.tmpl > TwitterColorEmoji.tmpl.ttx.tmpl pushd ${twemojiSrc.name}/assets/72x72/ @@ -88,6 +81,8 @@ stdenv.mkDerivation rec { "EMOJI=TwitterColorEmoji" "EMOJI_SRC_DIR=${twemojiSrc.name}/assets/72x72" "BODY_DIMENSIONS=76x72" + # twemoji contains some codepoints noto doesn't like + "BYPASS_SEQUENCE_CHECK=True" ]; enableParallelBuilding = true; From b37741f8409eca68464e10107bdb920c18bf390f Mon Sep 17 00:00:00 2001 From: Robert Pearce Date: Sun, 30 Aug 2020 10:39:10 -0400 Subject: [PATCH 359/688] bashcards: 0.1.2 -> 0.1.3 Provides fixes for a number of shellcheck warnings/errors. --- pkgs/tools/misc/bashcards/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bashcards/default.nix b/pkgs/tools/misc/bashcards/default.nix index ecaabb43c143..3e91b9741c63 100644 --- a/pkgs/tools/misc/bashcards/default.nix +++ b/pkgs/tools/misc/bashcards/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bashcards"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "rpearce"; repo = pname; rev = "v${version}"; - sha256 = "1zbijbcm9lrqwiax37li0jjqcaxf469wh5d423frain56z1qknxl"; + sha256 = "1rpqrh0022sbrjvd55a0jvpdqhhka5msf8dsz6adbbmxy3xzgdid"; }; dontBuild = true; From d214fce42c3b09541067a8703a0d82dbf89570d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 30 Aug 2020 09:00:39 -0300 Subject: [PATCH 360/688] marwaita: 7.5 -> 7.5.1 --- pkgs/data/themes/marwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 6bd6de32f00b..5f09927e15c6 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "7.5"; + version = "7.5.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "13p0sr5gnb8ww9fx83p6nykdn82jd6hx6l94z939g0ghj5aizbbl"; + sha256 = "0ig5wc6dkbly6yrvd13h4lyr8x0y7k3d9iv4rhg0pnjgcpna83mw"; }; buildInputs = [ From 33b21aec60575e499244b9f34c6055b107e7e39d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 30 Aug 2020 11:34:32 +0200 Subject: [PATCH 361/688] pytorch-bin: init at 1.6.0 --- .../python-modules/pytorch/bin.nix | 68 +++++++++++++++++++ .../python-modules/pytorch/binary-hashes.nix | 10 +++ .../python-modules/pytorch/default.nix | 4 +- pkgs/top-level/python-packages.nix | 4 ++ 4 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pytorch/bin.nix create mode 100644 pkgs/development/python-modules/pytorch/binary-hashes.nix diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix new file mode 100644 index 000000000000..b1b662e95b3e --- /dev/null +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -0,0 +1,68 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, isPy37 +, isPy38 +, python +, nvidia_x11 +, addOpenGLRunpath +, future +, numpy +, patchelf +, pyyaml +, requests +}: + +let + pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; + platform = if stdenv.isDarwin then "darwin" else "linux"; + srcs = import ./binary-hashes.nix; + unsupported = throw "Unsupported system"; +in buildPythonPackage { + pname = "pytorch"; + # Don't forget to update pytorch to the same version. + version = "1.6.0"; + + format = "wheel"; + + disabled = !(isPy37 || isPy38); + + src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; + + nativeBuildInputs = [ + addOpenGLRunpath + patchelf + ]; + + propagatedBuildInputs = [ + future + numpy + pyyaml + requests + ]; + + postInstall = '' + # ONNX conversion + rm -rf $out/bin + ''; + + postFixup = let + rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ]; + in '' + find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + echo "setting rpath for $lib..." + patchelf --set-rpath "${rpath}:$out/${python.sitePackages}/torch/lib" "$lib" + addOpenGLRunpath "$lib" + done + ''; + + pythonImportsCheck = [ "torch" ]; + + meta = with stdenv.lib; { + description = "Open source, prototype-to-production deep learning platform"; + homepage = "https://pytorch.org/"; + license = licenses.unfree; # Includes CUDA and Intel MKL. + platforms = platforms.linux; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix new file mode 100644 index 000000000000..481dc6825c7d --- /dev/null +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -0,0 +1,10 @@ +{ + x86_64-linux-37 = { + url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp37-cp37m-linux_x86_64.whl"; + sha256 = "0xhwv68j8gvahfzcp43bqp2x71iwv6zjhkw2f1hb82xps40mrml7"; + }; + x86_64-linux-38 = { + url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp38-cp38-linux_x86_64.whl"; + sha256 = "05m2l04wqzw5xvjam6zwvlmc3979cksl3hrdqc2aikrv4hz8fmsk"; + }; +} diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index a767a913abbb..9bdead706d7b 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -104,8 +104,10 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.6.0"; pname = "pytorch"; + # Don't forget to update pytorch-bin to the same version. + version = "1.6.0"; + disabled = !isPy3k; outputs = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cfed029af890..72fd49c64f78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4100,6 +4100,10 @@ in { cudaSupport = pkgs.config.cudaSupport or false; }; + pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { + inherit (pkgs.linuxPackages) nvidia_x11; + }; + pyro-ppl = callPackage ../development/python-modules/pyro-ppl {}; opt-einsum = if isPy27 then From 34bbe4b0ddca113ebade41928f0a13869d199922 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 29 Aug 2020 04:20:00 +0000 Subject: [PATCH 362/688] lxd: 4.4 -> 4.5 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 2e8ff96d41a8..2a71556961e9 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.4"; + version = "4.5"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0fk42spz57nfmwy6xn02nnlkq01111x03psjq003k2785ah4xk1h"; + sha256 = "1nszzcyn8kvpnxppjbxky5x9a8n0jfmhy20j6nrwm3196gd6hirr"; }; postPatch = '' From f6d71ecb8a07a075bfba7d97edf22b16d0983842 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 29 Aug 2020 04:20:00 -0500 Subject: [PATCH 363/688] kbs2: 0.1.3 -> 0.1.4 --- pkgs/tools/security/kbs2/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index 14f2059cf5c8..191b4f351509 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "1zp4gpbqhivmp7lpm10xb6ahx1z7nsijz7pi5i0bndv0y9mr609p"; + sha256 = "1hjcx651nqj1plxw4i2nv72zc0igd8pl31dy2zwm5yyky6dl7qla"; }; - cargoSha256 = "1inqz4whqw9mb3m22kv44f255m3cjr66pc5ncdw2rgpy3zjh4p3z"; + cargoSha256 = "11fw097r4mim3rgb0db7naqlf3ws0bavqdd4z84mpdg6714dga0n"; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; @@ -27,6 +27,8 @@ rustPlatform.buildRustPackage rec { checkFlagsArray = [ "--skip=kbs2::config::tests::test_find_config_dir" ]; postInstall = '' + mkdir -p $out/share/kbs2 + cp -r contrib/ $out/share/kbs2 for shell in bash fish zsh; do $out/bin/kbs2 --completions $shell > kbs2.$shell installShellCompletion kbs2.$shell From 85bf59e44a7af5ccaa615e6bf3cc2ada0d98072c Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 29 Aug 2020 16:25:39 +0000 Subject: [PATCH 364/688] deno: 1.3.1 -> 1.3.2 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/deps.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 3a0583628f03..9430ebd2ef11 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "1j5ajasng380p5a7nkk9ag5zp9ybwfz7b2z42lyk1wfg0pcd6j0r"; + sha256 = "0vdz3irhc2pxn5zh0c6frbz7pb8vr06kldxa204xwyl7fl770w3g"; fetchSubmodules = true; }; - cargoSha256 = "0ba7afk4n7k170cqwy0gjc53vz6bjc176s9w1wln6yfhh55fyw6x"; + cargoSha256 = "1ch7vxnhs69paykrglim0ixaw73lzlmrglqhjp8f4xafvdk7n2ks"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix index 2fd88235a8e1..f6baca6fb016 100644 --- a/pkgs/development/web/deno/deps.nix +++ b/pkgs/development/web/deno/deps.nix @@ -2,11 +2,11 @@ {}: rec { rustyV8Lib = { - version = "0.8.1"; + version = "0.9.1"; sha256s = { - x86_64-linux = "0nwssdbwscwkh2w9zhlvaj562z19g5icg2yi00fyw8glws69cd6p"; - aarch64-linux = "0mwd4ix511dzxpah1p2c47a1qhvff0d3kyilc3yra99fa1s0gyxy"; - x86_64-darwin = "04s4x0n85rxnncy4jsl1ak3rdgb4a3lhqg8h53mvvjmsazsj1q70"; + x86_64-linux = "07zph4x3k659ywld27b60as7j06bdbab2ws1pf67iwg7w6h7iash"; + aarch64-linux = "0w9mbsdpkrla3ayaswpdjhiqs74h23qi2sv9355h138pw431ymnx"; + x86_64-darwin = "091kzdg431lvkvcy0401di3if53pii0isk5ipfpsvic82kr7vaqk"; }; }; } From 6956ce821d128ac48d09fed9fb3c3e5ec644dd8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 30 Aug 2020 10:34:21 +0200 Subject: [PATCH 365/688] gitlab: 13.0.12 -> 13.0.14 --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/gitaly/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index fe211d1b87f1..9389934ffc68 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.0.12", - "repo_hash": "0m9pn1alxdib9ppf878wf186bvn0llik7vcpqijzcdzc18q9cldq", + "version": "13.0.14", + "repo_hash": "15is18x631ifsj4iwmrs1s9lc3i99hwsxxf5v42qldbmsys31l1k", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.0.12-ee", + "rev": "v13.0.14-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.0.12", + "GITALY_SERVER_VERSION": "13.0.14", "GITLAB_PAGES_VERSION": "1.18.0", "GITLAB_SHELL_VERSION": "13.2.0", "GITLAB_WORKHORSE_VERSION": "8.31.2" } -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 5f3fa345d855..84cf1e500a22 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -19,14 +19,14 @@ let }; }; in buildGoPackage rec { - version = "13.0.12"; + version = "13.0.14"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "00jzrib8f51b3wkl0zy9a9cr5j9kp6cmm49vxm27zgxpyz8k1axw"; + sha256 = "16ynkwiv0faa60msashj5w1bc4rdh7yv2qjmpcbf7dwq54gqmlbv"; }; # Fix a check which assumes that hook files are writeable by their From b768afb2e9ac67b3956084a5c78a4cfe8cba371e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 29 Aug 2020 11:05:00 -0300 Subject: [PATCH 366/688] deepin: remove from nixpkgs The Deepin Desktop Environment (DDE) is not yet fully packaged in nixpkgs and it has shown a very difficult task to complete, as discussed in https://github.com/NixOS/nixpkgs/issues/94870. The conclusion is that it is better to completely remove it. --- nixos/modules/module-list.nix | 1 - .../services/desktops/deepin/deepin.nix | 123 ------- .../audio/netease-cloud-music/default.nix | 81 ----- pkgs/desktops/deepin/dde-api/default.nix | 127 ------- pkgs/desktops/deepin/dde-api/deps.nix | 102 ------ pkgs/desktops/deepin/dde-calendar/default.nix | 57 ---- .../deepin/dde-control-center/default.nix | 150 -------- .../deepin/dde-control-center/fix-paths.patch | 65 ---- pkgs/desktops/deepin/dde-daemon/default.nix | 158 --------- pkgs/desktops/deepin/dde-daemon/deps.nix | 111 ------ .../dde-dock/dde-dock.plugins-dir.patch | 39 --- pkgs/desktops/deepin/dde-dock/default.nix | 116 ------- pkgs/desktops/deepin/dde-dock/wrapper.nix | 25 -- ...de-file-manager.fix-mime-cache-paths.patch | 323 ------------------ .../dde-file-manager.fix-paths.patch | 89 ----- .../dde-file-manager.pixmaps-paths.patch | 38 --- .../deepin/dde-file-manager/default.nix | 298 ---------------- ...0001-dde-kwin.pc-make-paths-relative.patch | 56 --- pkgs/desktops/deepin/dde-kwin/default.nix | 142 -------- pkgs/desktops/deepin/dde-kwin/fix-paths.patch | 16 - pkgs/desktops/deepin/dde-launcher/default.nix | 101 ------ .../deepin/dde-network-utils/default.nix | 63 ---- .../deepin/dde-network-utils/fix-paths.patch | 23 -- .../dde-polkit-agent.plugins-dir.patch | 42 --- .../deepin/dde-polkit-agent/default.nix | 60 ---- .../deepin/dde-qt-dbus-factory/default.nix | 43 --- .../deepin/dde-session-ui/default.nix | 157 --------- .../deepin/deepin-anything/default.nix | 82 ----- .../deepin/deepin-calculator/default.nix | 57 ---- .../deepin/deepin-desktop-base/default.nix | 68 ---- .../deepin/deepin-desktop-schemas/default.nix | 79 ----- .../desktops/deepin/deepin-editor/default.nix | 72 ---- .../deepin/deepin-gettext-tools/default.nix | 55 --- .../deepin/deepin-gtk-theme/default.nix | 35 -- .../deepin/deepin-icon-theme/default.nix | 67 ---- .../deepin/deepin-image-viewer/default.nix | 66 ---- pkgs/desktops/deepin/deepin-menu/default.nix | 54 --- .../deepin/deepin-movie-reborn/default.nix | 85 ----- .../deepin/deepin-shortcut-viewer/default.nix | 45 --- .../deepin/deepin-sound-theme/default.nix | 30 -- .../deepin/deepin-terminal/default.nix | 117 ------- pkgs/desktops/deepin/deepin-turbo/default.nix | 50 --- .../deepin/deepin-wallpapers/default.nix | 52 --- pkgs/desktops/deepin/default.nix | 62 ---- pkgs/desktops/deepin/disomaster/default.nix | 50 --- .../deepin/dpa-ext-gnomekeyring/default.nix | 49 --- pkgs/desktops/deepin/dtkcore/default.nix | 63 ---- pkgs/desktops/deepin/dtkwidget/default.nix | 65 ---- pkgs/desktops/deepin/dtkwm/default.nix | 58 ---- .../deepin/go-dbus-factory/default.nix | 34 -- .../deepin/go-gir-generator/default.nix | 59 ---- pkgs/desktops/deepin/go-lib/default.nix | 46 --- pkgs/desktops/deepin/qcef/default.nix | 127 ------- .../deepin/qt5integration/default.nix | 65 ---- .../deepin/qt5platform-plugins/default.nix | 63 ---- pkgs/desktops/deepin/setup-hook.sh | 64 ---- pkgs/desktops/deepin/startdde/default.nix | 160 --------- pkgs/desktops/deepin/startdde/deps.nix | 30 -- pkgs/desktops/deepin/udisks2-qt5/default.nix | 50 --- .../linux/deepin-anything/default.nix | 22 -- pkgs/tools/networking/zssh/default.nix | 4 +- pkgs/top-level/all-packages.nix | 9 - 62 files changed, 2 insertions(+), 4698 deletions(-) delete mode 100644 nixos/modules/services/desktops/deepin/deepin.nix delete mode 100644 pkgs/applications/audio/netease-cloud-music/default.nix delete mode 100644 pkgs/desktops/deepin/dde-api/default.nix delete mode 100644 pkgs/desktops/deepin/dde-api/deps.nix delete mode 100644 pkgs/desktops/deepin/dde-calendar/default.nix delete mode 100644 pkgs/desktops/deepin/dde-control-center/default.nix delete mode 100644 pkgs/desktops/deepin/dde-control-center/fix-paths.patch delete mode 100644 pkgs/desktops/deepin/dde-daemon/default.nix delete mode 100644 pkgs/desktops/deepin/dde-daemon/deps.nix delete mode 100644 pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch delete mode 100644 pkgs/desktops/deepin/dde-dock/default.nix delete mode 100644 pkgs/desktops/deepin/dde-dock/wrapper.nix delete mode 100644 pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch delete mode 100644 pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch delete mode 100644 pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch delete mode 100644 pkgs/desktops/deepin/dde-file-manager/default.nix delete mode 100644 pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch delete mode 100644 pkgs/desktops/deepin/dde-kwin/default.nix delete mode 100644 pkgs/desktops/deepin/dde-kwin/fix-paths.patch delete mode 100644 pkgs/desktops/deepin/dde-launcher/default.nix delete mode 100644 pkgs/desktops/deepin/dde-network-utils/default.nix delete mode 100644 pkgs/desktops/deepin/dde-network-utils/fix-paths.patch delete mode 100644 pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch delete mode 100644 pkgs/desktops/deepin/dde-polkit-agent/default.nix delete mode 100644 pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix delete mode 100644 pkgs/desktops/deepin/dde-session-ui/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-anything/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-calculator/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-desktop-base/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-desktop-schemas/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-editor/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-gettext-tools/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-gtk-theme/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-icon-theme/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-image-viewer/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-menu/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-movie-reborn/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-sound-theme/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-terminal/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-turbo/default.nix delete mode 100644 pkgs/desktops/deepin/deepin-wallpapers/default.nix delete mode 100644 pkgs/desktops/deepin/default.nix delete mode 100644 pkgs/desktops/deepin/disomaster/default.nix delete mode 100644 pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix delete mode 100644 pkgs/desktops/deepin/dtkcore/default.nix delete mode 100644 pkgs/desktops/deepin/dtkwidget/default.nix delete mode 100644 pkgs/desktops/deepin/dtkwm/default.nix delete mode 100644 pkgs/desktops/deepin/go-dbus-factory/default.nix delete mode 100644 pkgs/desktops/deepin/go-gir-generator/default.nix delete mode 100644 pkgs/desktops/deepin/go-lib/default.nix delete mode 100644 pkgs/desktops/deepin/qcef/default.nix delete mode 100644 pkgs/desktops/deepin/qt5integration/default.nix delete mode 100644 pkgs/desktops/deepin/qt5platform-plugins/default.nix delete mode 100755 pkgs/desktops/deepin/setup-hook.sh delete mode 100644 pkgs/desktops/deepin/startdde/default.nix delete mode 100644 pkgs/desktops/deepin/startdde/deps.nix delete mode 100644 pkgs/desktops/deepin/udisks2-qt5/default.nix delete mode 100644 pkgs/os-specific/linux/deepin-anything/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c837976286b4..68095bca7fdd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -297,7 +297,6 @@ ./services/desktops/accountsservice.nix ./services/desktops/bamf.nix ./services/desktops/blueman.nix - ./services/desktops/deepin/deepin.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix ./services/desktops/pantheon/files.nix diff --git a/nixos/modules/services/desktops/deepin/deepin.nix b/nixos/modules/services/desktops/deepin/deepin.nix deleted file mode 100644 index f8fb73701af6..000000000000 --- a/nixos/modules/services/desktops/deepin/deepin.nix +++ /dev/null @@ -1,123 +0,0 @@ -# deepin - -{ config, pkgs, lib, ... }: - -{ - - ###### interface - - options = { - - services.deepin.core.enable = lib.mkEnableOption " - Basic dbus and systemd services, groups and users needed by the - Deepin Desktop Environment. - "; - - services.deepin.deepin-menu.enable = lib.mkEnableOption " - DBus service for unified menus in Deepin Desktop Environment. - "; - - services.deepin.deepin-turbo.enable = lib.mkEnableOption " - Turbo service for the Deepin Desktop Environment. It is a daemon - that helps to launch applications faster. - "; - - }; - - - ###### implementation - - config = lib.mkMerge [ - - (lib.mkIf config.services.deepin.core.enable { - environment.systemPackages = [ - pkgs.deepin.dde-api - pkgs.deepin.dde-calendar - pkgs.deepin.dde-control-center - pkgs.deepin.dde-daemon - pkgs.deepin.dde-dock - pkgs.deepin.dde-launcher - pkgs.deepin.dde-file-manager - pkgs.deepin.dde-session-ui - pkgs.deepin.deepin-anything - pkgs.deepin.deepin-image-viewer - ]; - - services.dbus.packages = [ - pkgs.deepin.dde-api - pkgs.deepin.dde-calendar - pkgs.deepin.dde-control-center - pkgs.deepin.dde-daemon - pkgs.deepin.dde-dock - pkgs.deepin.dde-launcher - pkgs.deepin.dde-file-manager - pkgs.deepin.dde-session-ui - pkgs.deepin.deepin-anything - pkgs.deepin.deepin-image-viewer - ]; - - systemd.packages = [ - pkgs.deepin.dde-api - pkgs.deepin.dde-daemon - pkgs.deepin.dde-file-manager - pkgs.deepin.deepin-anything - ]; - - boot.extraModulePackages = [ config.boot.kernelPackages.deepin-anything ]; - - boot.kernelModules = [ "vfs_monitor" ]; - - users.groups.deepin-sound-player = { }; - - users.users.deepin-sound-player = { - description = "Deepin sound player"; - group = "deepin-sound-player"; - isSystemUser = true; - }; - - users.groups.deepin-daemon = { }; - - users.users.deepin-daemon = { - description = "Deepin daemon user"; - group = "deepin-daemon"; - isSystemUser = true; - }; - - users.groups.deepin_anything_server = { }; - - users.users.deepin_anything_server = { - description = "Deepin Anything Server"; - group = "deepin_anything_server"; - isSystemUser = true; - }; - - security.pam.services.deepin-auth-keyboard.text = '' - # original at ${pkgs.deepin.dde-daemon}/etc/pam.d/deepin-auth-keyboard - auth [success=2 default=ignore] pam_lsass.so - auth [success=1 default=ignore] pam_unix.so nullok_secure try_first_pass - auth requisite pam_deny.so - auth required pam_permit.so - ''; - - environment.etc = { - "polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla".source = "${pkgs.deepin.dde-api}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla"; - "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla"; - "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla"; - }; - - services.deepin.deepin-menu.enable = true; - services.deepin.deepin-turbo.enable = true; - }) - - (lib.mkIf config.services.deepin.deepin-menu.enable { - services.dbus.packages = [ pkgs.deepin.deepin-menu ]; - }) - - (lib.mkIf config.services.deepin.deepin-turbo.enable { - environment.systemPackages = [ pkgs.deepin.deepin-turbo ]; - systemd.packages = [ pkgs.deepin.deepin-turbo ]; - }) - - ]; - -} diff --git a/pkgs/applications/audio/netease-cloud-music/default.nix b/pkgs/applications/audio/netease-cloud-music/default.nix deleted file mode 100644 index c4cc291d026c..000000000000 --- a/pkgs/applications/audio/netease-cloud-music/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, lib, fontconfig, zlib, libGL, glib, pango -, gdk-pixbuf, freetype, atk, cairo, libsForQt5, xorg -, sqlite, taglib, nss, nspr, cups, dbus, alsaLib -, libpulseaudio, deepin, qt5, harfbuzz, p11-kit -, libgpgerror, libudev0-shim, makeWrapper, dpkg, fetchurl }: -let - rpath = lib.makeLibraryPath [ - fontconfig.lib - zlib - stdenv.cc.cc.lib - libGL - glib - pango - gdk-pixbuf - freetype - atk - cairo - libsForQt5.vlc - sqlite - taglib - nss - nspr - cups.lib - dbus.lib - alsaLib - libpulseaudio - xorg.libX11 - xorg.libXext - xorg.libXtst - xorg.libXdamage - xorg.libXScrnSaver - xorg.libxcb - xorg.libXi - deepin.qcef - qt5.qtwebchannel - qt5.qtbase - qt5.qtx11extras - qt5.qtdeclarative - harfbuzz - p11-kit - libgpgerror - ]; - - runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; - -in stdenv.mkDerivation rec { - pname = "netease-cloud-music"; - version = "1.2.0"; - src = fetchurl { - url = "http://d1.music.126.net/dmusic/netease-cloud-music_1.2.0_amd64_deepin_stable_20190424.deb"; - sha256 = "0hg8jqim77vd0fmk8gfbz2fmlj99byxcm9jn70xf7vk1sy7wp6h1"; - curlOpts = "-A 'Mozilla/5.0'"; - }; - unpackCmd = "${dpkg}/bin/dpkg -x $src ."; - sourceRoot = "."; - - nativeBuildInputs = [ qt5.wrapQtAppsHook makeWrapper ]; - - installPhase = '' - mkdir -p $out - cp -r usr/* $out - ''; - - preFixup = '' - local exefile="$out/bin/netease-cloud-music" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exefile" - patchelf --set-rpath "$out/libs:$(patchelf --print-rpath "$exefile"):${rpath}" "$exefile" - - wrapProgram $out/bin/netease-cloud-music \ - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --set QCEF_INSTALL_PATH "${deepin.qcef}/lib/qcef" - ''; - - meta = { - description = "Client for Netease Cloud Music service"; - homepage = "https://music.163.com"; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.mlatus ]; - license = stdenv.lib.licenses.unfreeRedistributable; - }; -} diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix deleted file mode 100644 index 07239f9d509a..000000000000 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ stdenv -, buildGoPackage -, fetchFromGitHub -, pkgconfig -, alsaLib -, bc -, blur-effect -, coreutils -, deepin -, deepin-gettext-tools -, fontconfig -, go -, go-dbus-factory -, go-gir-generator -, go-lib -, grub2 -, gtk3 -, libcanberra -, libgudev -, librsvg -, poppler -, pulseaudio -, utillinux -, xcur2png -}: - -buildGoPackage rec { - pname = "dde-api"; - version = "5.0.0"; - - goPackagePath = "pkg.deepin.io/dde/api"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0iv4krj6dqdknwvmax7aj40k1h96259kqcfnljadrwpl7cvsvp5p"; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ - pkgconfig - deepin-gettext-tools # build - deepin.setupHook - - # TODO: using $PATH to find run time executable does not work with cross compiling - bc # run (to adjust grub theme?) - blur-effect # run (is it really needed?) - coreutils # run (is it really needed?) - fontconfig # run (is it really needed?) - utillinux # run - xcur2png # run - grub2 # run (is it really needed?) - ]; - - buildInputs = [ - go-dbus-factory # needed - go-gir-generator # needed - go-lib # build - - alsaLib # needed - #glib # ? arch - gtk3 # build run - libcanberra # build run - libgudev # needed - librsvg # build run - poppler # build run - pulseaudio # needed - #locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?) - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - fixPath $out /usr/lib/deepin-api \ - lunar-calendar/main.go \ - misc/services/com.deepin.api.CursorHelper.service \ - misc/services/com.deepin.api.Graphic.service \ - misc/services/com.deepin.api.LunarCalendar.service \ - misc/services/com.deepin.api.Pinyin.service \ - misc/system-services/com.deepin.api.Device.service \ - misc/system-services/com.deepin.api.LocaleHelper.service \ - misc/system-services/com.deepin.api.SoundThemePlayer.service \ - misc/systemd/system/deepin-shutdown-sound.service \ - theme_thumb/gtk/gtk.go \ - thumbnails/gtk/gtk.go - fixPath $out /boot/grub Makefile # TODO: confirm where to install grub themes - fixPath $out /var Makefile - - # This package wants to install polkit local authority files into - # /var/lib. Nix does not allow a package to install files into /var/lib - # because it is outside of the Nix store and should contain applications - # state information (persistent data modified by programs as they - # run). Polkit looks for them in both /etc/polkit-1 and - # /var/lib/polkit-1 (with /etc having priority over /var/lib). An - # work around is to install them to $out/etc and simlnk them to - # /etc in the deepin module. - - sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile - ''; - - buildPhase = '' - export GOCACHE="$TMPDIR/go-cache"; - make -C go/src/${goPackagePath} - ''; - - installPhase = '' - make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} - mv $out/share/gocode $out/share/go - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Go-lang bindings for dde-daemon"; - homepage = "https://github.com/linuxdeepin/dde-api"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - broken = true; # 2020-08-22 https://hydra.nixos.org/build/125354866/nixlog/2 - }; -} diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix deleted file mode 100644 index 5ebe1f6af952..000000000000 --- a/pkgs/desktops/deepin/dde-api/deps.nix +++ /dev/null @@ -1,102 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b"; - sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; - }; - } - { - goPackagePath = "github.com/cryptix/wav"; - fetch = { - type = "git"; - url = "https://github.com/cryptix/wav"; - rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; - sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; - }; - } - { - goPackagePath = "github.com/disintegration/imaging"; - fetch = { - type = "git"; - url = "https://github.com/disintegration/imaging"; - rev = "9aab30e6aa535fe3337b489b76759ef97dfaf362"; - sha256 = "015amm3x989hl3r4gxnixj602fl9j8z53n0lrq804cbfbk7a31fw"; - }; - } - { - goPackagePath = "github.com/fogleman/gg"; - fetch = { - type = "git"; - url = "https://github.com/fogleman/gg"; - rev = "4dc34561c649343936bb2d29e23959bd6d98ab12"; - sha256 = "1x1finzdrr80dd3r7wvf7zb184yjf4dawz7s581p2dr64dcialww"; - }; - } - { - goPackagePath = "github.com/golang/freetype"; - fetch = { - type = "git"; - url = "https://github.com/golang/freetype"; - rev = "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4"; - sha256 = "194w3djc6fv1rgcjqds085b9fq074panc5vw582bcb8dbfzsrqxc"; - }; - } - { - goPackagePath = "github.com/linuxdeepin/go-x11-client"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a"; - sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs"; - }; - } - { - goPackagePath = "github.com/nfnt/resize"; - fetch = { - type = "git"; - url = "https://github.com/nfnt/resize"; - rev = "83c6a9932646f83e3267f353373d47347b6036b2"; - sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "e7c1f5e7dbb87d8921928a6d9fc52fb31ce73b24"; - sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "daa7c04131f568e31c51927b359a2d197a357058"; - sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix deleted file mode 100644 index 094f3447c6b7..000000000000 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, qttools -, deepin-gettext-tools -, dtkcore -, dtkwidget -, deepin -}: - -mkDerivation rec { - pname = "dde-calendar"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1zzr3crkz4l5l135y0m53vqhv7fkrbvbspk8295swz9gsm3f7ah9"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - deepin-gettext-tools - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - patchShebangs translate_desktop.sh - - fixPath $out /usr com.deepin.Calendar.service - - sed -i translate_desktop.sh \ - -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Calendar for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-calendar"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix deleted file mode 100644 index 850e39b93676..000000000000 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, deepin -, qttools -, qtdeclarative -, networkmanager -, qtsvg -, qtx11extras -, dtkcore -, dtkwidget -, geoip -, gsettings-qt -, dde-network-utils -, networkmanager-qt -, xorg -, mtdev -, fontconfig -, freetype -, dde-api -, dde-daemon -, qt5integration -, deepin-desktop-base -, deepin-desktop-schemas -, dbus -, systemd -, dde-qt-dbus-factory -, qtmultimedia -, qtbase -, glib -, gnome3 -, which -, substituteAll -, tzdata -, wrapGAppsHook -}: - -mkDerivation rec { - pname = "dde-control-center"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "10bx8bpvi3ib32a3l4nyb1j0iq3bch8jm9wfm6d5v0ym1zb92x3b"; - }; - - nativeBuildInputs = [ - cmake - deepin.setupHook - pkgconfig - wrapGAppsHook - ]; - - buildInputs = [ - dde-api - dde-daemon - dde-network-utils - dde-qt-dbus-factory - deepin-desktop-base - deepin-desktop-schemas - dtkcore - dtkwidget - fontconfig - freetype - geoip - glib - gnome3.networkmanager-l2tp - gnome3.networkmanager-openconnect - gnome3.networkmanager-openvpn - gnome3.networkmanager-vpnc - gsettings-qt - mtdev - networkmanager-qt - qt5integration - qtbase - qtdeclarative - qtmultimedia - qtsvg - qttools - qtx11extras - xorg.libX11 - xorg.libXext - xorg.libXrandr - xorg.libxcb - ]; - - cmakeFlags = [ - "-DDISABLE_SYS_UPDATE=YES" - "-DDCC_DISABLE_GRUB=YES" - ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - nmcli = "${networkmanager}/bin/nmcli"; - which = "${which}/bin/which"; - # not packaged - # dman = "${deepin-manual}/bin/dman"; - inherit tzdata; - # exclusive to deepin linux? - # allows to synchronize configuration files to cloud networks - # deepin_sync = "${deepin-sync}"; - }) - ]; - - postPatch = '' - searchHardCodedPaths - - patchShebangs translate_ts2desktop.sh - patchShebangs translate_generation.sh - patchShebangs translate_desktop2ts.sh - - fixPath $out /usr dde-control-center-autostart.desktop \ - com.deepin.dde.ControlCenter.service \ - src/frame/widgets/utils.h - - substituteInPlace dde-control-center.desktop \ - --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace com.deepin.controlcenter.addomain.policy \ - --replace "/bin/systemctl" "/run/current-system/sw/bin/systemctl" - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # debuging - searchForUnresolvedDLL $out - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Control panel of Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-control-center"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo worldofpeace ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-control-center/fix-paths.patch b/pkgs/desktops/deepin/dde-control-center/fix-paths.patch deleted file mode 100644 index 2c6e204d3437..000000000000 --- a/pkgs/desktops/deepin/dde-control-center/fix-paths.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/src/frame/frame.cpp b/src/frame/frame.cpp -index 90d06f8..7cdad04 100644 ---- a/src/frame/frame.cpp -+++ b/src/frame/frame.cpp -@@ -375,7 +375,7 @@ void Frame::keyPressEvent(QKeyEvent *e) - #ifdef QT_DEBUG - case Qt::Key_Escape: qApp->quit(); break; - #endif -- case Qt::Key_F1: QProcess::startDetached("dman", QStringList("dde")); break; -+ case Qt::Key_F1: QProcess::startDetached("@dman@", QStringList("dde")); break; - default:; - } - } -diff --git a/src/frame/modules/datetime/timezone_dialog/timezone.cpp b/src/frame/modules/datetime/timezone_dialog/timezone.cpp -index 3dd4aad..5f1b363 100644 ---- a/src/frame/modules/datetime/timezone_dialog/timezone.cpp -+++ b/src/frame/modules/datetime/timezone_dialog/timezone.cpp -@@ -46,7 +46,7 @@ namespace installer { - namespace { - - // Absolute path to zone.tab file. --const char kZoneTabFile[] = "/usr/share/zoneinfo/zone.tab"; -+const char kZoneTabFile[] = "@tzdata@/share/zoneinfo/zone.tab"; - - // Absolute path to backward timezone file. - const char kTimezoneAliasFile[] = "/timezone_alias"; -diff --git a/src/frame/modules/network/connectionvpneditpage.cpp b/src/frame/modules/network/connectionvpneditpage.cpp -index e292865..95c5a2b 100644 ---- a/src/frame/modules/network/connectionvpneditpage.cpp -+++ b/src/frame/modules/network/connectionvpneditpage.cpp -@@ -215,7 +215,7 @@ void ConnectionVpnEditPage::exportConnConfig() - qDebug() << Q_FUNC_INFO << args; - - QProcess p; -- p.start("nmcli", args); -+ p.start("@nmcli@", args); - p.waitForFinished(); - qDebug() << p.readAllStandardOutput(); - qDebug() << p.readAllStandardError(); -diff --git a/src/frame/modules/network/vpnpage.cpp b/src/frame/modules/network/vpnpage.cpp -index 521a603..450d1a6 100644 ---- a/src/frame/modules/network/vpnpage.cpp -+++ b/src/frame/modules/network/vpnpage.cpp -@@ -224,7 +224,7 @@ void VpnPage::importVPN() - qDebug() << args; - - QProcess p; -- p.start("nmcli", args); -+ p.start("@nmcli@", args); - p.waitForFinished(); - const auto stat = p.exitCode(); - const QString output = p.readAllStandardOutput(); -diff --git a/src/frame/modules/sync/syncworker.cpp b/src/frame/modules/sync/syncworker.cpp -index 3f929bf..6f240d9 100644 ---- a/src/frame/modules/sync/syncworker.cpp -+++ b/src/frame/modules/sync/syncworker.cpp -@@ -24,7 +24,7 @@ SyncWorker::SyncWorker(SyncModel *model, QObject *parent) - - m_model->setSyncIsValid( - QProcess::execute( -- "which", QStringList() << "/usr/lib/deepin-sync-daemon/deepin-sync-daemon") == -+ "@which@", QStringList() << "@deepin_sync@/lib/deepin-sync-daemon/deepin-sync-daemon") == - 0 && - valueByQSettings(DCC_CONFIG_FILES, "CloudSync", "AllowCloudSync", false)); - } diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix deleted file mode 100644 index 8a36446491f4..000000000000 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ /dev/null @@ -1,158 +0,0 @@ -{ stdenv -, buildGoPackage -, fetchFromGitHub -, fetchpatch -, pkgconfig -, go-dbus-factory -, go-gir-generator -, go-lib -, deepin-gettext-tools -, gettext -, dde-api -, deepin-desktop-schemas -, deepin-wallpapers -, deepin-desktop-base -, alsaLib -, glib -, gtk3 -, libgudev -, libinput -, libnl -, librsvg -, linux-pam -, networkmanager -, pulseaudio -, python3 -, hicolor-icon-theme -, glibc -, tzdata -, go -, deepin -, makeWrapper -, xkeyboard_config -, wrapGAppsHook -}: - -buildGoPackage rec { - pname = "dde-daemon"; - version = "5.0.0"; - - goPackagePath = "pkg.deepin.io/dde/daemon"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "08jri31bvzbaxaq78rpp46ndv0li2dij63hakvd9b9gs786srql1"; - }; - - patches = [ - # https://github.com/linuxdeepin/dde-daemon/issues/51 - (fetchpatch { - url = "https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch"; - sha256 = "1ampdsp9zlg263flswdw9gj10n7gxh7zi6w6z9jgh29xlai05pvh"; - }) - ]; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ - pkgconfig - deepin-gettext-tools - gettext - networkmanager - networkmanager.dev - python3 - makeWrapper - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - go-dbus-factory - go-gir-generator - go-lib - linux-pam - - alsaLib - dde-api - deepin-desktop-base - deepin-desktop-schemas - deepin-wallpapers - glib - libgudev - gtk3 - hicolor-icon-theme - libinput - libnl - librsvg - pulseaudio - tzdata - xkeyboard_config - ]; - - postPatch = '' - searchHardCodedPaths # debugging - patchShebangs network/nm_generator/gen_nm_consts.py - - fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go - fixPath $out /usr/share/dde-daemon launcher/manager.go gesture/config.go - fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile - fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go - fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go - fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go - fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go - fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go - fixPath ${xkeyboard_config} /usr/share/X11/xkb inputdevices/layout_list.go - - # TODO: deepin-system-monitor comes from dde-extra - - sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile - sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile - sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile - - find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} + - - # This package wants to install polkit local authority files into - # /var/lib. Nix does not allow a package to install files into /var/lib - # because it is outside of the Nix store and should contain applications - # state information (persistent data modified by programs as they - # run). Polkit looks for them in both /etc/polkit-1 and - # /var/lib/polkit-1 (with /etc having priority over /var/lib). An - # work around is to install them to $out/etc and simlnk them to - # /etc in the deepin module. - - sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile - ''; - - buildPhase = '' - export PAM_MODULE_DIR="$out/lib/security" - # compilation of the nm module is failing - #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code - make -C go/src/${goPackagePath} - ''; - - installPhase = '' - make install PREFIX="$out" -C go/src/${goPackagePath} - searchHardCodedPaths $out - ''; - - postFixup = '' - # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec - for binary in $out/lib/deepin-daemon/*; do - wrapGApp "$binary" - done - - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Daemon for handling Deepin Desktop Environment session settings"; - homepage = "https://github.com/linuxdeepin/dde-daemon"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix deleted file mode 100644 index bcc5ab81808f..000000000000 --- a/pkgs/desktops/deepin/dde-daemon/deps.nix +++ /dev/null @@ -1,111 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b"; - sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; - }; - } - { - goPackagePath = "github.com/axgle/mahonia"; - fetch = { - type = "git"; - url = "https://github.com/axgle/mahonia"; - rev = "3358181d7394e26beccfae0ffde05193ef3be33a"; - sha256 = "0b8wsrxmv8a0cqbnsg55lpf29pxy2zw8azvgh3ck664lqpcfybhq"; - }; - } - { - goPackagePath = "github.com/cryptix/wav"; - fetch = { - type = "git"; - url = "https://github.com/cryptix/wav"; - rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; - sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; - }; - } - { - goPackagePath = "github.com/gosexy/gettext"; - fetch = { - type = "git"; - url = "https://github.com/gosexy/gettext"; - rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"; - sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi"; - }; - } - { - goPackagePath = "github.com/linuxdeepin/go-x11-client"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a"; - sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs"; - }; - } - { - goPackagePath = "github.com/msteinert/pam"; - fetch = { - type = "git"; - url = "https://github.com/msteinert/pam"; - rev = "f29b9f28d6f9a1f6c4e6fd5db731999eb946574b"; - sha256 = "1v5z51mgyz2glm7v0mg60xs1as88wx6cqhys2khc5d3khkr8q0qp"; - }; - } - { - goPackagePath = "github.com/nfnt/resize"; - fetch = { - type = "git"; - url = "https://github.com/nfnt/resize"; - rev = "83c6a9932646f83e3267f353373d47347b6036b2"; - sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "e7c1f5e7dbb87d8921928a6d9fc52fb31ce73b24"; - sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "daa7c04131f568e31c51927b359a2d197a357058"; - sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "4b67af870c6ffd08258ef1202f371aebccaf7b68"; - sha256 = "01mhy1xs2dh18kp6wdk1xnb34lbzv2qkvdwj7w5ha2qgm5rrm4ik"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch b/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch deleted file mode 100644 index 87b76045b43d..000000000000 --- a/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c48867b73485b34b95f14e9b9bbb54507fc77648 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Fri, 19 Apr 2019 18:21:49 -0300 -Subject: [PATCH] Use an environment variable for the plugins directory - ---- - frame/controller/dockpluginscontroller.cpp | 2 +- - plugins/tray/system-trays/systemtrayscontroller.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/frame/controller/dockpluginscontroller.cpp b/frame/controller/dockpluginscontroller.cpp -index 32a5885..efd53c8 100644 ---- a/frame/controller/dockpluginscontroller.cpp -+++ b/frame/controller/dockpluginscontroller.cpp -@@ -126,7 +126,7 @@ void DockPluginsController::startLoader() - { - QString pluginsDir("../plugins"); - if (!QDir(pluginsDir).exists()) { -- pluginsDir = "/usr/lib/dde-dock/plugins"; -+ pluginsDir = QProcessEnvironment::systemEnvironment().value("DDE_DOCK_PLUGINS_DIR", "@out@/lib/dde-dock/plugins"); - } - qDebug() << "using dock plugins dir:" << pluginsDir; - -diff --git a/plugins/tray/system-trays/systemtrayscontroller.cpp b/plugins/tray/system-trays/systemtrayscontroller.cpp -index 0c8ca88..7c47d25 100644 ---- a/plugins/tray/system-trays/systemtrayscontroller.cpp -+++ b/plugins/tray/system-trays/systemtrayscontroller.cpp -@@ -159,7 +159,7 @@ void SystemTraysController::startLoader() - { - QString pluginsDir("../plugins/system-trays"); - if (!QDir(pluginsDir).exists()) { -- pluginsDir = "/usr/lib/dde-dock/plugins/system-trays"; -+ pluginsDir = QProcessEnvironment::systemEnvironment().value("DDE_DOCK_PLUGINS_DIR", "@out@/lib/dde-dock/plugins") + "/system-trays"; - } - qDebug() << "using system tray plugins dir:" << pluginsDir; - --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix deleted file mode 100644 index 68f2caa63191..000000000000 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, cmake -, pkgconfig -, qttools -, qtx11extras -, qtsvg -, polkit -, gsettings-qt -, dtkcore -, dtkwidget -, dde-qt-dbus-factory -, dde-network-utils -, dde-daemon -, deepin-desktop-schemas -, xorg -, glib -, wrapGAppsHook -, deepin -, plugins ? [ ] -, symlinkJoin -, makeWrapper -, libdbusmenu -}: - -let - unwrapped = mkDerivation rec { - pname = "dde-dock"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "12dshsqhzajnxm7r53qg0c84b6xlj313qnssnx2m25z4jdp5i7pr"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dde-daemon - dde-network-utils - dde-qt-dbus-factory - deepin-desktop-schemas - dtkcore - dtkwidget - glib - gsettings-qt - libdbusmenu - polkit - qtsvg - qtx11extras - xorg.libXdmcp - xorg.libXtst - xorg.libpthreadstubs - ]; - - patches = [ - ./dde-dock.plugins-dir.patch - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - fixPath $out /etc/dde-dock plugins/keyboard-layout/CMakeLists.txt - fixPath $out /usr cmake/DdeDock/DdeDockConfig.cmake - fixPath $out /usr dde-dock.pc - fixPath $out /usr/bin/dde-dock frame/com.deepin.dde.Dock.service - fixPath $out /usr/share/dbus-1 CMakeLists.txt - fixPath ${dde-daemon} /usr/lib/deepin-daemon frame/item/showdesktopitem.cpp - fixPath ${dde-network-utils} /usr/share/dde-network-utils frame/main.cpp - fixPath ${polkit} /usr/bin/pkexec plugins/overlay-warning/overlay-warning-plugin.cpp - - substituteInPlace frame/controller/dockpluginscontroller.cpp --subst-var-by out $out - substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp --subst-var-by out $out - ''; - - cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ]; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Dock for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-dock"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; - }; - -in -if plugins == [ ] -then unwrapped -else import ./wrapper.nix { - inherit makeWrapper symlinkJoin plugins; - dde-dock = unwrapped; -} diff --git a/pkgs/desktops/deepin/dde-dock/wrapper.nix b/pkgs/desktops/deepin/dde-dock/wrapper.nix deleted file mode 100644 index 1690230a99e5..000000000000 --- a/pkgs/desktops/deepin/dde-dock/wrapper.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ makeWrapper -, symlinkJoin -, dde-dock -, plugins -}: - -symlinkJoin { - name = "dde-dock-with-plugins-${dde-dock.version}"; - - paths = [ dde-dock ] ++ plugins; - - buildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/dde-dock \ - --set DDE_DOCK_PLUGINS_DIR "$out/lib/dde-dock/plugins" - - rm $out/share/dbus-1/services/com.deepin.dde.Dock.service - - substitute ${dde-dock}/share/dbus-1/services/com.deepin.dde.Dock.service $out/share/dbus-1/services/com.deepin.dde.Dock.service \ - --replace ${dde-dock} $out - ''; - - inherit (dde-dock) meta; -} diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch deleted file mode 100644 index 253a67b04ec7..000000000000 --- a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch +++ /dev/null @@ -1,323 +0,0 @@ -From 29f4ad88e2294ae70b10180e7361d135c4e5c896 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Mon, 13 May 2019 00:09:42 -0300 -Subject: [PATCH 2/2] Use XDG to look for mime cache - ---- - .../shutil/mimesappsmanager.cpp | 230 ++++++++++-------- - .../shutil/mimesappsmanager.h | 6 +- - 2 files changed, 125 insertions(+), 111 deletions(-) - -diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.cpp b/dde-file-manager-lib/shutil/mimesappsmanager.cpp -index c9e53630..7a21df51 100644 ---- a/dde-file-manager-lib/shutil/mimesappsmanager.cpp -+++ b/dde-file-manager-lib/shutil/mimesappsmanager.cpp -@@ -552,14 +552,20 @@ QString MimesAppsManager::getMimeAppsCacheFile() - return QString("%1/%2").arg(DFMStandardPaths::location(DFMStandardPaths::CachePath), "MimeApps.json"); - } - --QString MimesAppsManager::getMimeInfoCacheFilePath() -+QStringList MimesAppsManager::getMimeInfoCacheFilePath() - { -- return "/usr/share/applications/mimeinfo.cache"; -+ QStringList paths; -+ for (const QString dir : getMimeInfoCacheFileRootPath() ) -+ paths.append(dir + QDir::separator() + "mimeinfo.cache"); -+ qDebug() << "getMimeInfoCacheFilePath: " << paths; -+ return paths; - } - --QString MimesAppsManager::getMimeInfoCacheFileRootPath() -+QStringList MimesAppsManager::getMimeInfoCacheFileRootPath() - { -- return "/usr/share/applications"; -+ QStringList paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); -+ qDebug() << "getMimeInfoCacheFileRootPath: " << paths; -+ return paths; - } - - QString MimesAppsManager::getDesktopFilesCacheFile() -@@ -574,23 +580,27 @@ QString MimesAppsManager::getDesktopIconsCacheFile() - - QStringList MimesAppsManager::getDesktopFiles() - { -- QStringList desktopFiles; -+ QStringList desktopFiles; - -- foreach (QString desktopFolder, getApplicationsFolders()) { -- QDirIterator it(desktopFolder, QStringList("*.desktop"), -- QDir::Files | QDir::NoDotAndDotDot, -- QDirIterator::Subdirectories); -- while (it.hasNext()) { -- it.next(); -- desktopFiles.append(it.filePath()); -- } -- } -- return desktopFiles; -+ foreach (QString desktopFolder, getApplicationsFolders()) { -+ QDirIterator it(desktopFolder, QStringList("*.desktop"), -+ QDir::Files | QDir::NoDotAndDotDot, -+ QDirIterator::Subdirectories); -+ while (it.hasNext()) { -+ it.next(); -+ desktopFiles.append(it.filePath()); -+ } -+ } -+ return desktopFiles; - } - --QString MimesAppsManager::getDDEMimeTypeFile() -+QStringList MimesAppsManager::getDDEMimeTypeFile() - { -- return QString("%1/%2/%3").arg(getMimeInfoCacheFileRootPath(), "deepin", "dde-mimetype.list"); -+ QStringList paths; -+ for (const QString path : getMimeInfoCacheFileRootPath()) -+ paths.append(QString("%1/%2/%3").arg(path, "deepin", "dde-mimetype.list")); -+ qDebug() << "getDDEMimeTypeFile: " << paths; -+ return paths; - } - - QMap MimesAppsManager::getDesktopObjs() -@@ -663,124 +673,128 @@ void MimesAppsManager::initMimeTypeApps() - MimeApps.insert(key, orderApps); - } - -- //check mime apps from cache -- QFile f(getMimeInfoCacheFilePath()); -- if(!f.open(QIODevice::ReadOnly)){ -- qDebug () << "failed to read mime info cache file:" << f.errorString(); -- return; -- } -- - QStringList audioDesktopList; - QStringList imageDeksopList; - QStringList textDekstopList; - QStringList videoDesktopList; - -- while (!f.atEnd()) { -- QString data = f.readLine(); -- QString _desktops = data.split("=").last(); -- QString mimeType = data.split("=").first(); -- QStringList desktops = _desktops.split(";"); -- -- foreach (const QString desktop, desktops) { -- if(desktop.isEmpty() || audioDesktopList.contains(desktop)) -- continue; -+ //check mime apps from cache -+ for (const QString path : getMimeInfoCacheFilePath()) { -+ QFile f(path); -+ if(!f.open(QIODevice::ReadOnly)){ -+ qDebug () << "failed to read mime info cache file:" << f.errorString(); -+ return; -+ } - -- if(mimeType.startsWith("audio")){ -- if(!audioDesktopList.contains(desktop)) -- audioDesktopList << desktop; -- } else if(mimeType.startsWith("image")){ -- if(!imageDeksopList.contains(desktop)) -- imageDeksopList << desktop; -- } else if(mimeType.startsWith("text")){ -- if(!textDekstopList.contains(desktop)) -- textDekstopList << desktop; -- } else if(mimeType.startsWith("video")){ -- if(!videoDesktopList.contains(desktop)) -- videoDesktopList << desktop; -+ while (!f.atEnd()) { -+ QString data = f.readLine(); -+ QString _desktops = data.split("=").last(); -+ QString mimeType = data.split("=").first(); -+ QStringList desktops = _desktops.split(";"); -+ -+ foreach (const QString desktop, desktops) { -+ if(desktop.isEmpty() || audioDesktopList.contains(desktop)) -+ continue; -+ -+ if(mimeType.startsWith("audio")){ -+ if(!audioDesktopList.contains(desktop)) -+ audioDesktopList << desktop; -+ } else if(mimeType.startsWith("image")){ -+ if(!imageDeksopList.contains(desktop)) -+ imageDeksopList << desktop; -+ } else if(mimeType.startsWith("text")){ -+ if(!textDekstopList.contains(desktop)) -+ textDekstopList << desktop; -+ } else if(mimeType.startsWith("video")){ -+ if(!videoDesktopList.contains(desktop)) -+ videoDesktopList << desktop; -+ } - } - } -+ f.close(); - } -- f.close(); - -- const QString mimeInfoCacheRootPath = getMimeInfoCacheFileRootPath(); -- foreach (QString desktop, audioDesktopList) { -- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -- if(!QFile::exists(path)) -- continue; -- DesktopFile df(path); -- AudioMimeApps.insert(path, df); -- } -+ for (const QString mimeInfoCacheRootPath : getMimeInfoCacheFileRootPath()) { -+ foreach (QString desktop, audioDesktopList) { -+ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -+ if(!QFile::exists(path)) -+ continue; -+ DesktopFile df(path); -+ AudioMimeApps.insert(path, df); -+ } - -- foreach (QString desktop, imageDeksopList) { -- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -- if(!QFile::exists(path)) -- continue; -- DesktopFile df(path); -- ImageMimeApps.insert(path, df); -- } -+ foreach (QString desktop, imageDeksopList) { -+ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -+ if(!QFile::exists(path)) -+ continue; -+ DesktopFile df(path); -+ ImageMimeApps.insert(path, df); -+ } - -- foreach (QString desktop, textDekstopList) { -- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -- if(!QFile::exists(path)) -- continue; -- DesktopFile df(path); -- TextMimeApps.insert(path, df); -- } -+ foreach (QString desktop, textDekstopList) { -+ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -+ if(!QFile::exists(path)) -+ continue; -+ DesktopFile df(path); -+ TextMimeApps.insert(path, df); -+ } - -- foreach (QString desktop, videoDesktopList) { -- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -- if(!QFile::exists(path)) -- continue; -- DesktopFile df(path); -- VideoMimeApps.insert(path, df); -+ foreach (QString desktop, videoDesktopList) { -+ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -+ if(!QFile::exists(path)) -+ continue; -+ DesktopFile df(path); -+ VideoMimeApps.insert(path, df); -+ } - } -- - return; - } - - void MimesAppsManager::loadDDEMimeTypes() - { -- QSettings settings(getDDEMimeTypeFile(), QSettings::IniFormat); -- qDebug() << settings.childGroups(); -+ for (const QString path : getDDEMimeTypeFile()) { -+ QSettings settings(path, QSettings::IniFormat); -+ qDebug() << settings.childGroups(); - -- QFile file(getDDEMimeTypeFile()); -- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { -- return; -- } -+ QFile file(path); -+ if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { -+ continue; -+ } -+ -+ // Read propeties -+ QTextStream in(&file); -+ QString desktopKey; -+ while (!in.atEnd()) { - -- // Read propeties -- QTextStream in(&file); -- QString desktopKey; -- while (!in.atEnd()) { -+ // Read new line -+ QString line = in.readLine(); - -- // Read new line -- QString line = in.readLine(); -+ // Skip empty line or line with invalid format -+ if (line.trimmed().isEmpty()) { -+ continue; -+ } - -- // Skip empty line or line with invalid format -- if (line.trimmed().isEmpty()) { -- continue; -- } -+ // Read group -+ // NOTE: symbols '[' and ']' can be found not only in group names, but -+ // only group can start with '[' - -- // Read group -- // NOTE: symbols '[' and ']' can be found not only in group names, but -- // only group can start with '[' -+ if (line.trimmed().startsWith("[") && line.trimmed().endsWith("]")) { -+ QString tmp = line.trimmed().replace("[", "").replace("]", ""); -+ desktopKey = tmp; -+ continue; -+ } - -- if (line.trimmed().startsWith("[") && line.trimmed().endsWith("]")) { -- QString tmp = line.trimmed().replace("[", "").replace("]", ""); -- desktopKey = tmp; -- continue; -- } -- -- // If we are in correct group and line contains assignment then read data -- int first_equal = line.indexOf('='); -- if (!desktopKey.isEmpty() && first_equal >= 0) { -- QString value = line.mid(first_equal + 1); -- QStringList mimetypes = value.split(";"); -- DDE_MimeTypes.insert(desktopKey, mimetypes); -- desktopKey.clear(); -+ // If we are in correct group and line contains assignment then read data -+ int first_equal = line.indexOf('='); -+ if (!desktopKey.isEmpty() && first_equal >= 0) { -+ QString value = line.mid(first_equal + 1); -+ QStringList mimetypes = value.split(";"); -+ DDE_MimeTypes.insert(desktopKey, mimetypes); -+ desktopKey.clear(); -+ } - } -+ file.close(); - } -- file.close(); - } - - bool MimesAppsManager::lessByDateTime(const QFileInfo &f1, const QFileInfo &f2) -diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.h b/dde-file-manager-lib/shutil/mimesappsmanager.h -index 223c80aa..00a61302 100644 ---- a/dde-file-manager-lib/shutil/mimesappsmanager.h -+++ b/dde-file-manager-lib/shutil/mimesappsmanager.h -@@ -101,12 +101,12 @@ public: - - static QStringList getApplicationsFolders(); - static QString getMimeAppsCacheFile(); -- static QString getMimeInfoCacheFilePath(); -- static QString getMimeInfoCacheFileRootPath(); -+ static QStringList getMimeInfoCacheFilePath(); -+ static QStringList getMimeInfoCacheFileRootPath(); - static QString getDesktopFilesCacheFile(); - static QString getDesktopIconsCacheFile(); - static QStringList getDesktopFiles(); -- static QString getDDEMimeTypeFile(); -+ static QStringList getDDEMimeTypeFile(); - static QMap getDesktopObjs(); - static void initMimeTypeApps(); - static void loadDDEMimeTypes(); --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch deleted file mode 100644 index 3ced15e7e5a4..000000000000 --- a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch +++ /dev/null @@ -1,89 +0,0 @@ -From e68d983a6befd223087916cb3fe31baee77decc4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Sun, 12 May 2019 08:50:07 -0300 -Subject: [PATCH 1/2] Use qt library to determine where to look for application - files - ---- - dde-file-manager-lib/shutil/fileutils.cpp | 34 ++++++++++++------- - .../shutil/mimesappsmanager.cpp | 11 ++---- - 2 files changed, 25 insertions(+), 20 deletions(-) - -diff --git a/dde-file-manager-lib/shutil/fileutils.cpp b/dde-file-manager-lib/shutil/fileutils.cpp -index ae8120d3..d6a0573a 100644 ---- a/dde-file-manager-lib/shutil/fileutils.cpp -+++ b/dde-file-manager-lib/shutil/fileutils.cpp -@@ -242,13 +242,19 @@ bool FileUtils::isArchive(const QString &path) - */ - QStringList FileUtils::getApplicationNames() { - QStringList appNames; -- QDirIterator it("/usr/share/applications", QStringList("*.desktop"), -- QDir::Files | QDir::NoDotAndDotDot, -- QDirIterator::Subdirectories); -- while (it.hasNext()) { -- it.next(); -- appNames.append(it.fileName()); -+ -+ const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); -+ qDebug() << "dde-file-manager getApplicationNames desktopDirs:" << desktopDirs; -+ for (const QString &dir : desktopDirs) { -+ QDirIterator it(dir, QStringList("*.desktop"), -+ QDir::Files | QDir::NoDotAndDotDot, -+ QDirIterator::Subdirectories); -+ while (it.hasNext()) { -+ it.next(); -+ appNames.append(it.fileName()); -+ } - } -+ - return appNames; - } - //--------------------------------------------------------------------------- -@@ -259,12 +265,16 @@ QStringList FileUtils::getApplicationNames() { - */ - QList FileUtils::getApplications() { - QList apps; -- QDirIterator it("/usr/share/applications", QStringList("*.desktop"), -- QDir::Files | QDir::NoDotAndDotDot, -- QDirIterator::Subdirectories); -- while (it.hasNext()) { -- it.next(); -- apps.append(DesktopFile(it.filePath())); -+ const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); -+ qDebug() << "dde-file-manager getApplications desktopDirs:" << desktopDirs; -+ for (const QString &dir : desktopDirs) { -+ QDirIterator it(dir, QStringList("*.desktop"), -+ QDir::Files | QDir::NoDotAndDotDot, -+ QDirIterator::Subdirectories); -+ while (it.hasNext()) { -+ it.next(); -+ apps.append(DesktopFile(it.filePath())); -+ } - } - return apps; - } -diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.cpp b/dde-file-manager-lib/shutil/mimesappsmanager.cpp -index c6149702..c9e53630 100644 ---- a/dde-file-manager-lib/shutil/mimesappsmanager.cpp -+++ b/dde-file-manager-lib/shutil/mimesappsmanager.cpp -@@ -542,14 +542,9 @@ QStringList MimesAppsManager::getrecommendedAppsFromMimeWhiteList(const DUrl &ur - - QStringList MimesAppsManager::getApplicationsFolders() - { -- QStringList desktopFolders; -- desktopFolders << QString("/usr/share/applications/") -- << QString("/usr/local/share/applications/") -- << QString("/usr/share/gnome/applications/") -- << QString("/var/lib/flatpak/exports/share/applications") -- << QDir::homePath() + QString("/.local/share/flatpak/exports/share/applications") -- << QDir::homePath() + QString( "/.local/share/applications" ); -- return desktopFolders; -+ QStringList paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); -+ qDebug() << "dde-file-manager getApplicationsFolders:" << paths; -+ return paths; - } - - QString MimesAppsManager::getMimeAppsCacheFile() --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch deleted file mode 100644 index 582760e6db2a..000000000000 --- a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 084c3cfcf4995c109ca2e96f042fe341f925b0b4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Thu, 16 May 2019 19:00:52 -0300 -Subject: [PATCH 4/4] Use xdg to look for pixmap icons - ---- - dde-file-manager-lib/shutil/fileutils.cpp | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/dde-file-manager-lib/shutil/fileutils.cpp b/dde-file-manager-lib/shutil/fileutils.cpp -index d6a0573a..e912e7c2 100644 ---- a/dde-file-manager-lib/shutil/fileutils.cpp -+++ b/dde-file-manager-lib/shutil/fileutils.cpp -@@ -362,11 +362,16 @@ QIcon FileUtils::searchAppIcon(const DesktopFile &app, - } - - // Last chance -- QDir appIcons("/usr/share/pixmaps","", 0, QDir::Files | QDir::NoDotAndDotDot); -- QStringList iconFiles = appIcons.entryList(); -- QStringList searchIcons = iconFiles.filter(name); -- if (searchIcons.count() > 0) { -- return QIcon("/usr/share/pixmaps/" + searchIcons.at(0)); -+ const QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); -+ qDebug() << "searchAppIcon: last chance: look for pixmaps at: " << dirs; -+ for (const QString &dir : dirs) { -+ const QString path = dir + QDir::separator() + "pixmaps"; -+ QDir appIcons(path,"", 0, QDir::Files | QDir::NoDotAndDotDot); -+ QStringList iconFiles = appIcons.entryList(); -+ QStringList searchIcons = iconFiles.filter(name); -+ if (searchIcons.count() > 0) { -+ return QIcon(path + QDir::separator() + searchIcons.at(0)); -+ } - } - - // Default icon --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix deleted file mode 100644 index 4258e2aa859e..000000000000 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ /dev/null @@ -1,298 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, avfs -, dde-daemon -, dde-dock -, dde-polkit-agent -, dde-qt-dbus-factory -, deepin -, deepin-anything -, deepin-desktop-schemas -, deepin-gettext-tools -, deepin-movie-reborn -, deepin-shortcut-viewer -, deepin-terminal -, disomaster -, dtkcore -, dtkwidget -, ffmpegthumbnailer -, file -, glib -, gnugrep -, gsettings-qt -, gvfs -, jemalloc -, kcodecs -, libX11 -, libsecret -, polkit -, polkit-qt -, poppler -, procps -, qmake -, qt5integration -, qtmultimedia -, qtsvg -, qttools -, qtx11extras -, runtimeShell -, samba -, shadow -, taglib -, udisks2-qt5 -, xdg-user-dirs -, xorg -, zlib -, wrapGAppsHook -}: - -mkDerivation rec { - pname = "dde-file-manager"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0n2nl09anqdq0n5yn688n385rn81lcpybs0sa8m311k3k9ndkkyr"; - }; - - nativeBuildInputs = [ - deepin.setupHook - qmake - qttools - pkgconfig - deepin-gettext-tools - wrapGAppsHook - ]; - - buildInputs = [ - avfs - dde-daemon - dde-dock - dde-polkit-agent - dde-qt-dbus-factory - deepin-anything - deepin-desktop-schemas - deepin-movie-reborn.dev - deepin-shortcut-viewer - deepin-terminal - disomaster - dtkcore - dtkwidget - ffmpegthumbnailer - file - glib - gnugrep - gsettings-qt - gvfs - jemalloc - kcodecs - libsecret - polkit - polkit-qt - poppler - procps - qt5integration - qtmultimedia - qtsvg - qtx11extras - samba - taglib - udisks2-qt5 - xdg-user-dirs - xorg.libX11 - xorg.libxcb - xorg.xcbutil - xorg.xcbutilwm - xorg.xorgproto - zlib - ]; - - patches = [ - ./dde-file-manager.fix-paths.patch - ./dde-file-manager.fix-mime-cache-paths.patch - ./dde-file-manager.pixmaps-paths.patch - ]; - - postPatch = '' - searchHardCodedPaths - - patchShebangs dde-desktop/translate_generation.sh - patchShebangs dde-desktop/translate_ts2desktop.sh - patchShebangs dde-file-manager-lib/generate_translations.sh - patchShebangs dde-file-manager/generate_translations.sh - patchShebangs dde-file-manager/translate_ts2desktop.sh - patchShebangs usb-device-formatter/generate_translations.sh - patchShebangs usb-device-formatter/translate_ts2desktop.sh - - # x-terminal-emulator is a virtual package in Debian systems. The - # terminal emulator is configured by Debian's alternative system. - # It is not available on NixOS. Use deepin-terminal instead - sed -i -e "s,x-terminal-emulator,deepin-terminal," \ - dde-file-manager-lib/shutil/fileutils.cpp - - sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \ - dde-file-manager-lib/dde-file-manager-lib.pro \ - dde-file-thumbnail-tool/common.pri \ - common/common.pri - - sed -i '/^QMAKE_PKGCONFIG_DESTDIR/i QMAKE_PKGCONFIG_PREFIX = $$PREFIX' \ - dde-file-manager-lib/dde-file-manager-lib.pro - - fixPath ${dde-dock} /usr/include/dde-dock \ - dde-dock-plugins/disk-mount/disk-mount.pro - - # treefrog is not available in NixOS, and I am not sure if it is really needed - #fixPath $ {treefrog-framework} /usr/include/treefrog \ - # dde-sharefiles/appbase.pri - - fixPath ${deepin-anything} /usr/share/dbus-1/interfaces \ - dde-file-manager-lib/dbusinterface/dbusinterface.pri - - sed -i -e "s,\$\$system(\$\$PKG_CONFIG --variable libdir deepin-anything-server-lib),$out/lib," \ - deepin-anything-server-plugins/dde-anythingmonitor/dde-anythingmonitor.pro - - fixPath ${dde-daemon} /usr/lib/deepin-daemon/desktop-toggle \ - dde-zone/mainwindow.h - - fixPath ${deepin-gettext-tools} /usr/bin/deepin-desktop-ts-convert \ - dde-desktop/translate_desktop2ts.sh \ - dde-desktop/translate_ts2desktop.sh \ - dde-file-manager/translate_desktop2ts.sh \ - dde-file-manager/translate_ts2desktop.sh \ - usb-device-formatter/translate_desktop2ts.sh \ - usb-device-formatter/translate_ts2desktop.sh - - fixPath ${avfs} /usr/bin/mountavfs dde-file-manager-lib/shutil/fileutils.cpp - fixPath ${avfs} /usr/bin/umountavfs dde-file-manager-lib/shutil/fileutils.cpp - - fixPath ${deepin-terminal} /usr/bin/deepin-terminal \ - dde-file-manager-lib/shutil/fileutils.cpp - - fixPath $out /usr/share/dde-file-manager \ - dde-sharefiles/appbase.pri \ - dde-sharefiles/dde-sharefiles.pro - - fixPath $out /usr/share/usb-device-formatter \ - usb-device-formatter/main.cpp - - fixPath $out /usr/share/applications \ - dde-file-manager/mips/dde-file-manager-autostart.desktop \ - dde-desktop/development.pri - - fixPath $out /usr/bin \ - dbusservices/com.deepin.dde.desktop.service \ - dde-desktop/data/com.deepin.dde.desktop.service \ - dde-desktop/dbus/filedialog/com.deepin.filemanager.filedialog.service \ - dde-desktop/dbus/filemanager1/org.freedesktop.FileManager.service \ - dde-file-manager-daemon/dbusservice/com.deepin.filemanager.daemon.service \ - dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service \ - dde-file-manager-daemon/dde-file-manager-daemon.pro \ - dde-file-manager-lib/dde-file-manager-lib.pro \ - dde-file-manager-lib/pkexec/com.deepin.pkexec.dde-file-manager.policy \ - dde-file-manager/dde-file-manager-xdg-autostart.desktop \ - dde-file-manager/dde-file-manager.desktop \ - dde-file-manager/dde-file-manager.pro \ - dde-file-manager/mips/dde-file-manager-autostart.desktop \ - dde-file-manager/mips/dde-file-manager.desktop \ - dde-file-manager/pkexec/com.deepin.pkexec.dde-file-manager.policy \ - usb-device-formatter/pkexec/com.deepin.pkexec.usb-device-formatter.policy \ - usb-device-formatter/usb-device-formatter.desktop \ - usb-device-formatter/usb-device-formatter.pro - fixPath $out /etc \ - dde-file-manager/dde-file-manager.pro \ - dde-file-manager-daemon/dde-file-manager-daemon.pro - - fixPath $out /usr \ - common/common.pri \ - dde-desktop/dbus/filedialog/filedialog.pri \ - dde-desktop/dbus/filemanager1/filemanager1.pri \ - dde-desktop/development.pri \ - dde-dock-plugins/disk-mount/disk-mount.pro \ - dde-file-manager-daemon/dde-file-manager-daemon.pro \ - usb-device-formatter/usb-device-formatter.pro - - sed -i -e "s,xdg-user-dir,${xdg-user-dirs}/bin/xdg-user-dir," \ - dde-file-manager/dde-xdg-user-dirs-update - - sed -i -e "s,Exec=dde-file-manager,Exec=$out/bin/dde-file-manager," \ - dde-file-manager/dde-file-manager.desktop - - sed -i -e "s,Exec=gio,Exec=${glib.bin}/bin/gio," \ - dde-desktop/data/applications/dde-trash.desktop \ - dde-desktop/data/applications/dde-computer.desktop - - sed -i -e "s,/usr/lib/gvfs/gvfsd,${gvfs}/libexec/gvfsd," \ - dde-file-manager-lib/gvfs/networkmanager.cpp - - sed -i -e "s,/usr/sbin/smbd,${samba}/bin/smbd," \ - -e "s,/usr/sbin/groupadd,${shadow}/bin/groupadd," \ - -e "s,/usr/sbin/adduser,${shadow}/bin/adduser," \ - dde-file-manager-daemon/usershare/usersharemanager.cpp - - sed -i -e 's,startDetached("deepin-shortcut-viewer",startDetached("${deepin-shortcut-viewer}/bin/deepin-shortcut-viewer",' \ - dde-file-manager-lib/controllers/appcontroller.cpp - - sed -i -e 's,/bin/bash,${runtimeShell},' \ - -e 's,\,${procps}/bin/ps,' \ - -e 's,\,${gnugrep}/bin/grep,' \ - utils/utils.cpp \ - dde-file-manager-lib/controllers/fileeventprocessor.cpp - - # The hard coded path in `QString("/etc/xdg/%1/%2")` in - # dde-file-manager-lib/interfaces/dfmsettings.cpp - # does not needed a fix because all the standard locations - # are tried before faling back to /etc/xdg. - - # I do not know yet how to deal with: - # dde-file-manager-lib/sw_label/llsdeepinlabellibrary.h: return "/usr/lib/sw_64-linux-gnu/dde-file-manager/libllsdeeplabel.so"; - # dde-file-manager-lib/sw_label/filemanagerlibrary.h: return "/usr/lib/sw_64-linux-gnu/dde-file-manager/libfilemanager.so"; - # dde-file-manager-lib/sw_label/libinstall.sh:mkdir /usr/lib/sw_64-linux-gnu/dde-file-manager - # dde-file-manager-lib/sw_label/libinstall.sh:cp libfilemanager.so libllsdeeplabel.so /usr/lib/sw_64-linux-gnu/dde-file-manager - # They are not present on my installations of Deepin Linux, Arch Linux and Ubuntu. Can they be ignored? - - # Notes: - # - As file-roller is looked in the path using QStandardPaths::findExecutable, it is not been added as a dependency. - # - deepin-qt5config is a dependency exclusive to the Deepin Linux distribution. No other distribution has it, according to repology. - ''; - - qmakeFlags = [ - "QMAKE_CFLAGS_ISYSTEM=" - - # Disable ffmpeg - "CONFIG+=DISABLE_FFMPEG" - ]; - - preBuild = '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${zlib}/lib"; - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${libX11}/lib"; - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # debuging - unset LD_LIBRARY_PATH - searchForUnresolvedDLL $out - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "File manager and desktop module for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-file-manager"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch b/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch deleted file mode 100644 index 707eb2074095..000000000000 --- a/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c4edb65554f90a5abfc2ecbf63587b8c6ef2653d Mon Sep 17 00:00:00 2001 -From: worldofpeace -Date: Tue, 22 Oct 2019 17:20:24 -0400 -Subject: [PATCH] dde-kwin.pc: make paths relative - -Values like libdir should be relative to the literal ${prefix}. -We also use @ONLY so we don't substitute values like ${prefix} -with CMake resulting in an unintentional replacement. ---- - plugins/kwin-xcb/lib/CMakeLists.txt | 2 +- - plugins/kwin-xcb/lib/dde-kwin.pc.in | 18 +++++++++--------- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/plugins/kwin-xcb/lib/CMakeLists.txt b/plugins/kwin-xcb/lib/CMakeLists.txt -index 0189b74..62e5553 100644 ---- a/plugins/kwin-xcb/lib/CMakeLists.txt -+++ b/plugins/kwin-xcb/lib/CMakeLists.txt -@@ -61,7 +61,7 @@ install_files( - kwinutils.h - ) - --configure_file(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc) -+configure_file(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) - if (CMAKE_INSTALL_LIBDIR) - install_files("/${CMAKE_INSTALL_LIBDIR}/pkgconfig" FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc) - elseif (CMAKE_LIBRARY_OUTPUT_DIRECTORY) -diff --git a/plugins/kwin-xcb/lib/dde-kwin.pc.in b/plugins/kwin-xcb/lib/dde-kwin.pc.in -index 9b1d813..1179761 100644 ---- a/plugins/kwin-xcb/lib/dde-kwin.pc.in -+++ b/plugins/kwin-xcb/lib/dde-kwin.pc.in -@@ -1,13 +1,13 @@ --prefix=${CMAKE_INSTALL_PREFIX} --exec_prefix=${CMAKE_INSTALL_PREFIX} --libdir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} --includedir=${INCLUDE_OUTPUT_PATH} -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+includedir=@INCLUDE_OUTPUT_PATH@ - - --Name: ${PROJECT_NAME} -+Name: @PROJECT_NAME@ - Description: DDE KWin plugin library --Version: ${PROJECT_VERSION} --Libs: -l${PROJECT_NAME} --Libs.private: -L/usr/X11R6/lib64 -lQt5X11Extras -lKF5WindowSystem -lQt5Widgets -lQt5Gui -lKF5ConfigCore -lKF5CoreAddons -lQt5Core -lGL -lpthread --Cflags: -I${INCLUDE_OUTPUT_PATH} -+Version: @PROJECT_VERSION@ -+Libs: -l$@PROJECT_NAME@ -+Libs.private: -L/usr/X11R6/lib64 -lQt5X11Extras -lKF5WindowSystem -lQt5Widgets -lQt5Gui -lKF5ConfigCore -lKF5CoreAddons -lQt5Core -lGL -lpthread -+Cflags: -I@INCLUDE_OUTPUT_PATH@ - --- -2.23.0 - diff --git a/pkgs/desktops/deepin/dde-kwin/default.nix b/pkgs/desktops/deepin/dde-kwin/default.nix deleted file mode 100644 index ce1a1a8dda03..000000000000 --- a/pkgs/desktops/deepin/dde-kwin/default.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ stdenv -, mkDerivation -, pkgconfig -, fetchFromGitHub -, deepin -, cmake -, extra-cmake-modules -, qtbase -, libxcb -, kglobalaccel -, kwindowsystem -, kcoreaddons -, kwin -, dtkcore -, gsettings-qt -, fontconfig -, deepin-desktop-schemas -, glib -, libXrender -, mtdev -, qttools -, deepin-gettext-tools -, kwayland -, qtx11extras -, qtquickcontrols2 -, epoxy -, qt5integration -, dde-session-ui -, dbus -, wrapGAppsHook -}: - -mkDerivation rec { - pname = "dde-kwin"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0bvkx9h5ygj46a0j76kfyq3gvk6zn4fx6clhrmcr40hbi2k33cbl"; - }; - - nativeBuildInputs = [ - cmake - deepin-gettext-tools - deepin.setupHook - extra-cmake-modules - pkgconfig - wrapGAppsHook - ]; - - buildInputs = [ - deepin-desktop-schemas - dtkcore - epoxy - fontconfig - glib - gsettings-qt - kcoreaddons - kglobalaccel - kwayland - kwin - kwindowsystem - libXrender - libxcb - mtdev - qtbase - qtquickcontrols2 - qttools - qtx11extras - qt5integration - ]; - - # Need to add kwayland around: - # * https://github.com/linuxdeepin/dde-kwin/blob/5226bb984c844129f9fa589da56e77decb7b39a1/plugins/kwineffects/blur/CMakeLists.txt#L14 - NIX_CFLAGS_COMPILE = [ - "-I${kwayland.dev}/include/KF5" - ]; - - cmakeFlags = [ - "-DKWIN_VERSION=${(builtins.parseDrvName kwin.name).version}" - ]; - - patches = [ - ./0001-dde-kwin.pc-make-paths-relative.patch - ./fix-paths.patch - ]; - - postPatch = '' - searchHardCodedPaths - - patchShebangs translate_ts2desktop.sh \ - translate_generation.sh \ - translate_desktop2ts.sh \ - plugins/kwin-xcb/plugin/translate_generation.sh - - fixPath ${deepin-gettext-tools} /usr/bin/deepin-desktop-ts-convert translate_desktop2ts.sh translate_ts2desktop.sh - - fixPath $out /etc/xdg configures/CMakeLists.txt deepin-wm-dbus/deepinwmfaker.cpp - - # TODO: Need environmental patch - fixPath /run/current-system/sw /usr/lib plugins/kwin-xcb/plugin/main.cpp - - substituteInPlace configures/kwin-wm-multitaskingview.desktop \ - --replace "dbus-send" "${dbus}/bin/dbus-send" - - fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-warning-dialog deepin-wm-dbus/deepinwmfaker.cpp - - # Correct qt plugin installation path to be within dde-kwin prefix. - substituteInPlace CMakeLists.txt \ - --subst-var-by plugin_path "$out/$qtPluginPrefix" - ''; - - postInstall = '' - # Correct invalid path in .pc - substituteInPlace $out/lib/pkgconfig/dde-kwin.pc \ - --replace "-L/usr/X11R6/lib64" "" - - chmod +x $out/bin/kwin_no_scale - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "KWin configuration for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-kwin"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo worldofpeace ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-kwin/fix-paths.patch b/pkgs/desktops/deepin/dde-kwin/fix-paths.patch deleted file mode 100644 index 1bf576e5c1a5..000000000000 --- a/pkgs/desktops/deepin/dde-kwin/fix-paths.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index feef49d..ecb7ed2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,9 +26,9 @@ macro(query_qmake args output) - endif() - endmacro() - --query_qmake("QT_INSTALL_PLUGINS" QT_INSTALL_PLUGINS) -+set(QT_INSTALL_PLUGINS @plugin_path@) - --set(PLUGIN_INSTALL_PATH ${QT_INSTALL_PLUGINS}/platforms) -+set(PLUGIN_INSTALL_PATH @plugin_path@/platforms) - # Find includes in corresponding build directories - set(CMAKE_INCLUDE_CURRENT_DIR ON) - # Instruct CMake to run moc automatically when needed diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix deleted file mode 100644 index 0a50f7177bae..000000000000 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, dde-qt-dbus-factory -, dde-session-ui -, deepin -, deepin-desktop-schemas -, deepin-wallpapers -, dtkcore -, dtkwidget -, gsettings-qt -, qtsvg -, qttools -, qtx11extras -, which -, xdg_utils -, wrapGAppsHook -, glib -}: - -mkDerivation rec { - pname = "dde-launcher"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0zh6bb0r3pgjrnw9rba46ghdzza1ka1mv7r1znf8gw24wsjgjcpn"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dde-qt-dbus-factory - dde-session-ui - deepin-desktop-schemas - deepin-wallpapers - dtkcore - dtkwidget - glib - gsettings-qt - qtsvg - qtx11extras - which - xdg_utils - ]; - - postPatch = '' - # debugging - searchHardCodedPaths - - substituteInPlace CMakeLists.txt --replace "/usr/share" "$out/share" - - substituteInPlace src/dbusservices/com.deepin.dde.Launcher.service --replace "/usr" "$out" - - substituteInPlace src/historywidget.cpp --replace "xdg-open" "${xdg_utils}/bin/xdg-open" - substituteInPlace src/widgets/miniframebottombar.cpp --replace "dde-shutdown" "${dde-session-ui}/bin/dde-shutdown" - substituteInPlace src/widgets/miniframerightbar.cpp --replace "which" "${which}/bin/which" - - # Uncomment (and remove space after $) after packaging deepin-manual - #substituteInPlace src/sharedeventfilter.cpp --replace "dman" "$ {deepin-manual}/bin/dman" - - for f in src/boxframe/*.cpp; do - substituteInPlace $f --replace "/usr/share/backgrounds/default_background.jpg" "${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg" - done - - # note: `dbus-send` path does not need to be hard coded because it is not used for dtkcore >= 2.0.8.0 - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # debugging - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin Desktop Environment launcher module"; - homepage = "https://github.com/linuxdeepin/dde-launcher"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix deleted file mode 100644 index d54558acf080..000000000000 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, substituteAll -, qmake -, pkgconfig -, qttools -, dde-qt-dbus-factory -, proxychains -, which -, deepin -}: - -mkDerivation rec { - pname = "dde-network-utils"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0670kfnkplf7skkd1ql6y9x15kmrcbdv1005qwkg4vn8hic6s0z3"; - }; - - nativeBuildInputs = [ - qmake - pkgconfig - qttools - deepin.setupHook - ]; - - buildInputs = [ - dde-qt-dbus-factory - proxychains - which - ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit which proxychains; - }) - ]; - - postPatch = '' - searchHardCodedPaths # for debugging - patchShebangs translate_generation.sh - ''; - - postFixup = '' - searchHardCodedPaths $out # for debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin network utils"; - homepage = "https://github.com/linuxdeepin/dde-network-utils"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch b/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch deleted file mode 100644 index 9f7ecd423c56..000000000000 --- a/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur dde-network-utils-master.orig/dde-network-utils.pro dde-network-utils-master/dde-network-utils.pro ---- dde-network-utils-master.orig/dde-network-utils.pro 2019-04-04 03:37:46.000000000 -0300 -+++ dde-network-utils-master/dde-network-utils.pro 2019-04-07 05:56:28.283195087 -0300 -@@ -52,6 +52,7 @@ - - QMAKE_PKGCONFIG_NAME = libddenetworkutils - QMAKE_PKGCONFIG_DESCRIPTION = libddenetworkutils -+QMAKE_PKGCONFIG_PREFIX = $$PREFIX - QMAKE_PKGCONFIG_INCDIR = $$includes.path - QMAKE_PKGCONFIG_LIBDIR = $$target.path - QMAKE_PKGCONFIG_DESTDIR = pkgconfig -diff -ur dde-network-utils-master.orig/networkworker.cpp dde-network-utils-master/networkworker.cpp ---- dde-network-utils-master.orig/networkworker.cpp 2019-04-04 03:37:46.000000000 -0300 -+++ dde-network-utils-master/networkworker.cpp 2019-04-07 05:54:28.656479216 -0300 -@@ -80,7 +80,7 @@ - } - } - -- const bool isAppProxyVaild = QProcess::execute("which", QStringList() << "/usr/bin/proxychains4") == 0; -+ const bool isAppProxyVaild = QProcess::execute("@which@/bin/which", QStringList() << "@proxychains@/bin/proxychains4") == 0; - m_networkModel->onAppProxyExistChanged(isAppProxyVaild); - } - diff --git a/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch b/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch deleted file mode 100644 index a6941e975eb4..000000000000 --- a/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4f457d38e9e75bc97ee7dba633bf0cdd61b8cd5b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Fri, 19 Apr 2019 22:01:16 -0300 -Subject: [PATCH] Use an environment variable to find plugins - ---- - pluginmanager.cpp | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/pluginmanager.cpp b/pluginmanager.cpp -index 0c03237..79bdf86 100644 ---- a/pluginmanager.cpp -+++ b/pluginmanager.cpp -@@ -34,13 +34,19 @@ QList PluginManager::reduceGetOptions(const QString &actionID) - void PluginManager::load() - { - -- QDir dir("/usr/lib/polkit-1-dde/plugins/"); -- QFileInfoList pluginFiles = dir.entryInfoList((QStringList("*.so"))); -+ QStringList pluginsDirs = QProcessEnvironment::systemEnvironment().value("DDE_POLKIT_PLUGINS_DIRS").split(QDir::listSeparator(), QString::SkipEmptyParts); -+ pluginsDirs.append("/usr/lib/polkit-1-dde/plugins/"); - -- for (const QFileInfo &pluginFile : pluginFiles) { -- AgentExtension *plugin = loadFile(pluginFile.absoluteFilePath()); -- if (plugin) -- m_plugins << plugin; -+ for (const QString &dirName : pluginsDirs) { -+ QDir dir(dirName); -+ -+ QFileInfoList pluginFiles = dir.entryInfoList((QStringList("*.so"))); -+ -+ for (const QFileInfo &pluginFile : pluginFiles) { -+ AgentExtension *plugin = loadFile(pluginFile.absoluteFilePath()); -+ if (plugin) -+ m_plugins << plugin; -+ } - } - } - --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix deleted file mode 100644 index 1ca9a80abaf1..000000000000 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, polkit-qt -, dtkcore -, dtkwidget -, dde-qt-dbus-factory -, deepin -}: - -mkDerivation rec { - pname = "dde-polkit-agent"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "00p8syx6rfwhq7wdsk37hm9mvwd0kwj9h0s39hii892h1psd84q9"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - deepin.setupHook - ]; - - buildInputs = [ - dde-qt-dbus-factory - dtkcore - dtkwidget - polkit-qt - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - - fixPath $out /usr dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop - fixPath /run/current-system/sw /usr/lib/polkit-1-dde/plugins pluginmanager.cpp - ''; - - postFixup = '' - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "PolicyKit agent for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-polkit-agent"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix deleted file mode 100644 index c7efb0f4b044..000000000000 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, fetchFromGitHub -, qmake -, python3 -, deepin -}: - -stdenv.mkDerivation rec { - pname = "dde-qt-dbus-factory"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1wbh4jgvy3c09ivy0vvfk0azkg4d2sv37y23c9rq49jb3sakcjgm"; - }; - - nativeBuildInputs = [ - qmake - python3 - deepin.setupHook - ]; - - postPatch = '' - searchHardCodedPaths - fixPath $out /usr \ - libdframeworkdbus/DFrameworkdbusConfig.in \ - libdframeworkdbus/libdframeworkdbus.pro - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Qt DBus interface library for Deepin software"; - homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory"; - license = with licenses; [ gpl3Plus lgpl2Plus ]; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix deleted file mode 100644 index ff785f16c81d..000000000000 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ /dev/null @@ -1,157 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, dbus -, dde-daemon -, dde-qt-dbus-factory -, deepin -, deepin-desktop-schemas -, deepin-gettext-tools -, deepin-icon-theme -, deepin-wallpapers -, dtkcore -, dtkwidget -, gnugrep -, gsettings-qt -, lightdm_qt -, onboard -, qtsvg -, qttools -, qtx11extras -, setxkbmap -, utillinux -, which -, xkeyboard_config -, xorg -, xrandr -, wrapGAppsHook -}: - -mkDerivation rec { - pname = "dde-session-ui"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1gy9nlpkr9ayrs1z2dvd7h0dqlw6fq2m66d9cs48qyfkr6c8l9jj"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - deepin-gettext-tools - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dbus - dde-daemon - dde-qt-dbus-factory - deepin-desktop-schemas - deepin-icon-theme - deepin-wallpapers - dtkcore - dtkwidget - gnugrep - gsettings-qt - lightdm_qt - onboard - qtsvg - qtx11extras - setxkbmap - utillinux - which - xkeyboard_config - xorg.libXcursor - xorg.libXrandr - xorg.libXtst - xrandr - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - patchShebangs translate_generation.sh translate_desktop.sh - - substituteInPlace translate_desktop.sh --replace "/usr/bin/deepin-desktop-ts-convert" "deepin-desktop-ts-convert" - - find -type f -exec sed -i -e "s,path = /etc,path = $out/etc," {} + - find -type f -exec sed -i -e "s,path = /usr,path = $out," {} + - find -type f -exec sed -i -e "s,/usr/share/dde-session-ui,$out/share/dde-session-ui," {} + - - substituteInPlace dde-osd/dde-osd_autostart.desktop --replace "Exec=/usr/lib/deepin-daemon/dde-osd" "Exec=$out/lib/deepin-daemon/dde-osd" - substituteInPlace dde-osd/com.deepin.dde.osd.service --replace "Exec=/usr/lib/deepin-daemon/dde-osd" "Exec=$out/lib/deepin-daemon/dde-osd" - substituteInPlace dde-lock/com.deepin.dde.lockFront.service --replace "Exec=/usr/bin/dde-lock" "Exec=$out/bin/dde-lock" - substituteInPlace dmemory-warning-dialog/com.deepin.dde.MemoryWarningDialog.service --replace "Exec=/usr/bin/dmemory-warning-dialog" "Exec=$out/bin/dmemory-warning-dialog" - substituteInPlace dde-warning-dialog/com.deepin.dde.WarningDialog.service --replace "Exec=/usr/lib/deepin-daemon/dde-warning-dialog" "Exec=$out/lib/deepin-daemon/dde-warning-dialog" - substituteInPlace dde-shutdown/com.deepin.dde.shutdownFront.service --replace "Exec=/usr/bin/dde-shutdown" "Exec=$out/bin/dde-shutdown" - substituteInPlace dde-welcome/com.deepin.dde.welcome.service --replace "Exec=/usr/lib/deepin-daemon/dde-welcome" "Exec=$out/lib/deepin-daemon/dde-welcome" - substituteInPlace session-ui-guardien/session-ui-guardien.desktop --replace "Exec=/usr/bin/session-ui-guardien" "Exec=$out/bin/session-ui-guardien" - substituteInPlace lightdm-deepin-greeter/lightdm-deepin-greeter.desktop --replace "Exec=/usr/bin/deepin-greeter" "Exec=$out/bin/deepin-greeter" - substituteInPlace misc/applications/deepin-toggle-desktop.desktop.in --replace "Exec=/usr/lib/deepin-daemon/desktop-toggle" "Exec=${dde-daemon}/lib/deepin-daemon/desktop-toggle" - - # Uncomment (and remove space after $) after packaging deepin-system-monitor - #substituteInPlace dde-shutdown/view/contentwidget.cpp --replace "/usr/bin/deepin-system-monitor" "$ {deepin-system-monitor}/bin/deepin-system-monitor" - - substituteInPlace dde-offline-upgrader/main.cpp --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace dde-osd/kblayoutindicator.cpp --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace dde-shutdown/view/contentwidget.cpp --replace "/usr/share/backgrounds/deepin" "${deepin-wallpapers}/share/backgrounds/deepin" - substituteInPlace dde-welcome/mainwidget.cpp --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace dmemory-warning-dialog/src/buttondelegate.cpp --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace dmemory-warning-dialog/src/buttondelegate.cpp --replace "kill" "${utillinux}/bin/dbus-send" - substituteInPlace global_util/xkbparser.h --replace "/usr/share/X11/xkb/rules/base.xml" "${xkeyboard_config}/share/X11/xkb/rules/base.xml" - substituteInPlace lightdm-deepin-greeter/deepin-greeter --replace "/etc/deepin/greeters.d" "$out/etc/deepin/greeters.d" - substituteInPlace lightdm-deepin-greeter/main.cpp --replace "/usr/share/icons/deepin" "${deepin-icon-theme}/share/icons/deepin" - substituteInPlace lightdm-deepin-greeter/scripts/00-xrandr --replace "egrep" "${gnugrep}/bin/egrep" - substituteInPlace lightdm-deepin-greeter/scripts/00-xrandr --replace "xrandr" "${xrandr}/bin/xrandr" - substituteInPlace lightdm-deepin-greeter/scripts/lightdm-deepin-greeter --replace "/usr/bin/lightdm-deepin-greeter" "$out/bin/lightdm-deepin-greeter" - substituteInPlace session-ui-guardien/guardien.cpp --replace "dde-lock" "$out/bin/dde-lock" - substituteInPlace session-ui-guardien/guardien.cpp --replace "dde-shutdown" "$out/bin/dde-shutdown" - substituteInPlace dde-lock/lockworker.cpp --replace "dde-switchtogreeter" "$out/bin/dde-switchtogreeter" - substituteInPlace dde-lock/lockworker.cpp --replace "which" "${which}/bin/which" - substituteInPlace session-widgets/userinfo.cpp --replace "/usr/share/wallpapers/deepin" "${deepin-wallpapers}/share/wallpapers/deepin" - substituteInPlace widgets/fullscreenbackground.cpp --replace "/usr/share/wallpapers/deepin" "${deepin-wallpapers}/share/wallpapers/deepin" - substituteInPlace widgets/kblayoutwidget.cpp --replace "setxkbmap" "${setxkbmap}/bin/setxkbmap" - substituteInPlace widgets/virtualkbinstance.cpp --replace "onboard" "${onboard}/bin/onboard" - - # fix default background url - substituteInPlace widgets/fullscreenbackground.cpp --replace "/usr/share/backgrounds/default_background.jpg" "${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg" - - # NOTES - # - on deepin linux /usr/share/icons/default/index.theme is controlled by alternatives, without an equivalent mechanism in NixOS - # - do not wrap dde-dman-portal related files: it appears it has been removed: https://github.com/linuxdeepin/dde-session-ui/commit/3bd028cf135ad22c784c0146e447ef34a69af768 - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # wrapGAppsHook or wrapQtAppsHook does not work with binaries outside of $out/bin or $out/libexec - for binary in $out/lib/deepin-daemon/*; do - wrapProgram $binary "''${gappsWrapperArgs[@]}" - done - - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin desktop-environment - Session UI module"; - homepage = "https://github.com/linuxdeepin/dde-session-ui"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix deleted file mode 100644 index 5fa6c93951d0..000000000000 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, fetchpatch -, pkgconfig -, qtbase -, udisks2-qt5 -, utillinux -, dtkcore -, deepin -}: - -mkDerivation rec { - pname = "deepin-anything"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1kvyffrii4b012f6ld1ih14qrn7gg5cxbdpbkac0wxb22hnz0azm"; - }; - - patches = [ - # fix compilation error and add support to kernel 5.6 - # https://github.com/linuxdeepin/deepin-anything/pull/27 - (fetchpatch { - name = "linux-5.6.patch"; - url = "https://github.com/linuxdeepin/deepin-anything/commit/764b820c2bcd7248993349b32f91043fc58ee958.patch"; - sha256 = "1ww4xllxc2s04px6fy8wp5cyw54xaz155ry30sqz21vl8awfr36h"; - }) - ]; - - outputs = [ "out" "modsrc" ]; - - nativeBuildInputs = [ - pkgconfig - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - qtbase - udisks2-qt5 - utillinux - ]; - - enableParallelBuilding = true; - - makeFlags = [ - "DEB_HOST_MULTIARCH=" - "PREFIX=${placeholder "out"}" - ]; - - postPatch = '' - searchHardCodedPaths # for debugging - fixPath $modsrc /usr/src Makefile - fixPath $out /usr Makefile - fixPath $out /usr server/tool/tool.pro - fixPath $out /etc server/tool/tool.pro - fixPath $out /usr/bin \ - server/tool/deepin-anything-tool.service \ - server/tool/com.deepin.anything.service \ - server/monitor/deepin-anything-monitor.service - sed -e 's,/lib/systemd,$$PREFIX/lib/systemd,' -i server/monitor/src/src.pro server/tool/tool.pro - ''; - - postFixup = '' - searchHardCodedPaths $out # for debugging - searchHardCodedPaths $modsrc # for debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin file search tool"; - homepage = "https://github.com/linuxdeepin/deepin-anything"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix deleted file mode 100644 index 67ead7d314aa..000000000000 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, qtsvg -, dtkcore -, dtkwidget -, deepin -}: - -mkDerivation rec { - pname = "deepin-calculator"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0f26y7b3giybybhvlzbnwcw8kidzvhq66h0c15n9ww81gnlqf7v5"; - }; - - nativeBuildInputs = [ - qmake - pkgconfig - qttools - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - qtsvg - ]; - - postPatch = '' - searchHardCodedPaths # debugging - patchShebangs translate_generation.sh - fixPath $out /usr deepin-calculator.pro - substituteInPlace deepin-calculator.desktop --replace "Exec=deepin-calculator" "Exec=$out/bin/deepin-calculator" - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Easy to use calculator for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-calculator"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix deleted file mode 100644 index 74fa53b715d0..000000000000 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv -, fetchFromGitHub -, deepin-wallpapers -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-desktop-base"; - version = "2019.07.10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0rs7bjy35k5gc5nbba1cijhdz16zny30lgmcf2ckx1pkdszk2vra"; - }; - - nativeBuildInputs = [ - deepin.setupHook - ]; - - buildInputs = [ - deepin-wallpapers - ]; - - # TODO: Fedora recommended dependencies: - # deepin-wallpapers - # plymouth-theme-deepin - - postPatch = '' - searchHardCodedPaths - - fixPath $out /etc Makefile - fixPath $out /usr Makefile - - # Remove Deepin distro's lsb-release - # Don't override systemd timeouts - # Remove apt-specific templates - echo ---------------------------------------------------------------- - echo grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile - grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile - echo ---------------------------------------------------------------- - sed -i -E '/lsb-release|systemd|python-apt|backgrounds/d' Makefile - ''; - - postInstall = '' - # Make a symlink for deepin-version - ln -s ../lib/deepin/desktop-version $out/etc/deepin-version - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Base assets and definitions for Deepin Desktop Environment"; - # TODO: revise - longDescription = '' - This package provides some components for Deepin desktop environment. - - deepin logo - - deepin desktop version - - login screen background image - - language information - ''; - homepage = "https://github.com/linuxdeepin/deepin-desktop-base"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix deleted file mode 100644 index 15f9498cf0db..000000000000 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv -, fetchFromGitHub -, python3 -, dconf -, glib -, deepin-gtk-theme -, deepin-icon-theme -, deepin-sound-theme -, deepin-wallpapers -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-desktop-schemas"; - version = "3.13.9"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1c69j6s7561zb1hrd1j3ihji1nvpgfzfgnp6svsv8jd8dg8vs8l1"; - }; - - nativeBuildInputs = [ - python3 - glib.dev - deepin.setupHook - ]; - - buildInputs = [ - dconf - deepin-gtk-theme - deepin-icon-theme - deepin-sound-theme - deepin-wallpapers - ]; - - postPatch = '' - searchHardCodedPaths - - # fix default background url - sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \ - overrides/common/com.deepin.wrap.gnome.desktop.override - - fixPath ${deepin-wallpapers} /usr/share/backgrounds \ - overrides/common/com.deepin.wrap.gnome.desktop.override - - fixPath ${deepin-wallpapers} /usr/share/wallpapers/deepin \ - schemas/com.deepin.dde.appearance.gschema.xml - - # still hardcoded paths: - # /etc/gnome-settings-daemon/xrandr/monitors.xml ? gnome3.gnome-settings-daemon - # /usr/share/backgrounds/gnome/adwaita-lock.jpg ? gnome3.gnome-backgrounds - # /usr/share/backgrounds/gnome/adwaita-timed.xml gnome3.gnome-backgrounds - # /usr/share/desktop-directories - ''; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - doCheck = true; - checkTarget = "test"; - - postInstall = '' - glib-compile-schemas --strict $out/share/glib-2.0/schemas - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "GSettings deepin desktop-wide schemas"; - homepage = "https://github.com/linuxdeepin/deepin-desktop-schemas"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-editor/default.nix b/pkgs/desktops/deepin/deepin-editor/default.nix deleted file mode 100644 index 0124ca8cc9e2..000000000000 --- a/pkgs/desktops/deepin/deepin-editor/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, deepin -, dtkcore -, dtkwidget -, kcodecs -, qttools -, syntax-highlighting -, wrapQtAppsHook -}: - -stdenv.mkDerivation rec { - pname = "deepin-editor"; - version = "1.2.9.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0g7c3adqwn8i4ndxdrzibahr75dddz1fiqnsh3bjj1jjr86rv4ks"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - wrapQtAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - kcodecs - syntax-highlighting - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - patchShebangs translate_generation.sh - - fixPath $out /usr \ - CMakeLists.txt \ - dedit/main.cpp \ - src/resources/settings.json \ - src/thememodule/themelistmodel.cpp - - substituteInPlace deepin-editor.desktop \ - --replace "Exec=deepin-editor" "Exec=$out/bin/deepin-editor" - - substituteInPlace src/editwrapper.cpp \ - --replace "appExec = \"deepin-editor\"" "appExec = \"$out/bin/deepin-editor\"" - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Simple editor for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-editor"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo worldofpeace ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix deleted file mode 100644 index 432add458deb..000000000000 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv -, fetchFromGitHub -, gettext -, python3Packages -, perlPackages -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-gettext-tools"; - version = "1.0.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "03cwa82dd14a31v44jd3z0kpiri6g21ar4f48s8ph78nvjy55880"; - }; - - nativeBuildInputs = [ - python3Packages.wrapPython - ]; - - buildInputs = [ - gettext - perlPackages.perl - perlPackages.XMLLibXML - perlPackages.ConfigTiny - python3Packages.python - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - postPatch = '' - sed -e 's/sudo cp/cp/' -i src/generate_mo.py - ''; - - postFixup = '' - wrapPythonPrograms - wrapPythonProgramsIn "$out/lib/${pname}" - wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin Internationalization utilities"; - homepage = "https://github.com/linuxdeepin/deepin-gettext-tools"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix deleted file mode 100644 index eee074705852..000000000000 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, fetchFromGitHub -, gtk-engine-murrine -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-gtk-theme"; - version = "17.10.11"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-gtk-theme"; - rev = version; - sha256 = "0zs6mq70yd1k3d9zm3q6zxnw1md56r4imad5imdxwx58yxdx47fw"; - }; - - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin GTK Theme"; - homepage = "https://github.com/linuxdeepin/deepin-gtk-theme"; - license = licenses.lgpl3; - platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix deleted file mode 100644 index b56b219faffa..000000000000 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv -, fetchFromGitHub -, gtk3 -, xcursorgen -, papirus-icon-theme -, hicolor-icon-theme -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-icon-theme"; - version = "2020.05.21"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0b1s6kf0q804zbbghly981wzacy1spi8168shf3x8w95rqj6463p"; - }; - - nativeBuildInputs = [ - gtk3 - xcursorgen - ]; - - propagatedBuildInputs = [ - papirus-icon-theme - hicolor-icon-theme - ]; - - dontDropIconThemeCache = true; - - buildTargets = "all hicolor-links"; - - postPatch = '' - # fix: hicolor links should follow the deepin -> bloom naming change - # https://github.com/linuxdeepin/deepin-icon-theme/pull/24 - substituteInPlace tools/hicolor.links --replace deepin bloom - - substituteInPlace Sea/index.theme --replace Inherits=deepin Inherits=bloom - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/icons - cp -vai bloom* Sea $out/share/icons - - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - - cp -vai usr/share/icons/hicolor $out/share/icons - - runHook postInstall - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Icons for the Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-icon-theme"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix deleted file mode 100644 index 43c18c85abcb..000000000000 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, qtsvg -, qtx11extras -, dtkcore -, dtkwidget -, qt5integration -, freeimage -, libraw -, libexif -, deepin -}: - -mkDerivation rec { - pname = "deepin-image-viewer"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "01524hfdy3wvdf07n9b3qb8jdpxzg2hwjpl4gxvr68qws5nbnb3c"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - deepin.setupHook - ]; - - buildInputs = [ - qtsvg - qtx11extras - dtkcore - dtkwidget - qt5integration - freeimage - libraw - libexif - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs viewer/generate_translations.sh - fixPath $out /usr viewer/com.deepin.ImageViewer.service - sed -i qimage-plugins/freeimage/freeimage.pro \ - qimage-plugins/libraw/libraw.pro \ - -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Image Viewer for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-image-viewer"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; # See https://github.com/NixOS/nixpkgs/pull/46463#issuecomment-420274189 - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix deleted file mode 100644 index 983fe4e1c4d5..000000000000 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, dtkcore -, dtkwidget -, qt5integration -, deepin -}: - -mkDerivation rec { - pname = "deepin-menu"; - version = "3.4.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "09i0ybllymlj7s46pxma5py6x8nknfja4gxn5gj9kpf2c37qsqjc"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - qt5integration - ]; - - postPatch = '' - searchHardCodedPaths - fixPath $out /usr \ - data/com.deepin.menu.service \ - deepin-menu.desktop \ - deepin-menu.pro - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin menu service"; - homepage = "https://github.com/linuxdeepin/deepin-menu"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix deleted file mode 100644 index 68daffb0d157..000000000000 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, fetchpatch -, cmake -, pkgconfig -, qttools -, qtx11extras -, dtkcore -, dtkwidget -, ffmpeg_3 -, ffmpegthumbnailer -, mpv -, pulseaudio -, libdvdnav -, libdvdread -, xorg -, deepin -}: - -mkDerivation rec { - pname = "deepin-movie-reborn"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0cly8q0514a58s3h3wsvx9yxar7flz6i2q8xkrkfjias22b3z7b0"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - ffmpeg_3 - ffmpegthumbnailer - libdvdnav - libdvdread - mpv - pulseaudio - qtx11extras - xorg.libXdmcp - xorg.libXtst - xorg.libpthreadstubs - xorg.xcbproto - ]; - - patches = [ - # fix: build failed if cannot find dtk-settings tool - (fetchpatch { - url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/fbb307b.patch"; - sha256 = "0915za0khki0729rvcfpxkh6vxhqwc47cgcmjc90kfq1004221vx"; - }) - ]; - - NIX_LDFLAGS = "-ldvdnav"; - - postPatch = '' - searchHardCodedPaths # debugging - - sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,' - - substituteInPlace src/deepin-movie.desktop \ - --replace "Exec=deepin-movie" "Exec=$out/bin/deepin-movie" - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin movie player"; - homepage = "https://github.com/linuxdeepin/deepin-movie-reborn"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix deleted file mode 100644 index 76d8847b73fc..000000000000 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, dtkcore -, dtkwidget -, qt5integration -, deepin -}: - -mkDerivation rec { - pname = "deepin-shortcut-viewer"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "13vz8kjdqkrhgpvdgrvwn62vwzbyqp88hjm5m4rcqg3bh56709ma"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - ]; - - buildInputs = [ - dtkcore - dtkwidget - qt5integration - ]; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Pop-up shortcut viewer for Deepin applications"; - homepage = "https://github.com/linuxdeepin/deepin-shortcut-viewer"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix deleted file mode 100644 index e71c0cb77c5b..000000000000 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv -, fetchFromGitHub -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-sound-theme"; - version = "15.10.3"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-sound-theme"; - rev = version; - sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; - }; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin sound theme"; - homepage = "https://github.com/linuxdeepin/deepin-sound-theme"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix deleted file mode 100644 index ae3121379427..000000000000 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ stdenv -, fetchFromGitHub -, pkgconfig -, cmake -, ninja -, vala_0_40 -, fetchpatch -, gettext -, at-spi2-core -, dbus -, epoxy -, expect -, gtk3 -, json-glib -, libXdmcp -, libgee -, libpthreadstubs -, librsvg -, libsecret -, libtasn1 -, libxcb -, libxkbcommon -, p11-kit -, pcre -, vte -, wnck -, libselinux -, gnutls -, pcre2 -, libsepol -, utillinux -, deepin-menu -, deepin-shortcut-viewer -, deepin -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "deepin-terminal"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-terminal"; - rev = version; - sha256 = "1929saj828b438d07caw3cjhqq60v6gni7mi3fqrg9wdjz81xwv7"; - }; - - patches = [ - # Fix build with VTE 0.60 - (fetchpatch { - url = "https://github.com/linuxdeepin/deepin-terminal/commit/542d1035b609698ee81aa7971d20ca8e5930743d.patch"; - sha256 = "1pihiy70yc25fm5fx7i7v9gmi65v4mhldvi7xwv8rgr2z6hbfj41"; - }) - ]; - - nativeBuildInputs = [ - pkgconfig - cmake - ninja - vala_0_40 # xcb.vapi:411.3-411.48: error: missing return statement at end of subroutine body - gettext - libselinux libsepol utillinux # required by gio - deepin.setupHook - wrapGAppsHook - ]; - - buildInputs = [ - at-spi2-core - dbus - deepin-menu - deepin-shortcut-viewer - epoxy - expect - gtk3 - json-glib - libXdmcp - libgee - libpthreadstubs - librsvg - libsecret - libtasn1 - libxcb - libxkbcommon - p11-kit - pcre - vte - wnck - gnutls - pcre2 - ]; - - postPatch = '' - searchHardCodedPaths - ''; - - cmakeFlags = [ - "-DTEST_BUILD=OFF" - "-DUSE_VENDOR_LIB=OFF" - "-DVERSION=${version}" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Default terminal emulator for Deepin"; - longDescription = '' - Deepin terminal, it sharpens your focus in the world of command line! - It is an advanced terminal emulator with workspace, multiple - windows, remote management, quake mode and other features. - ''; - homepage = "https://github.com/linuxdeepin/deepin-terminal"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix deleted file mode 100644 index 6bba51ac674b..000000000000 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, cmake -, pkgconfig -, qtbase -, deepin -}: - -mkDerivation rec { - pname = "deepin-turbo"; - version = "0.0.3"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "15l0pgszmbirlaxj04ishj43kyvigsl1yaf58kxlbdb3lkmcp5f3"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - deepin.setupHook - ]; - - buildInputs = [ - qtbase - ]; - - postPatch = '' - searchHardCodedPaths # for debugging - fixPath $out /usr/lib/systemd src/booster-dtkwidget/CMakeLists.txt - fixPath $out /usr/lib/deepin-turbo src/booster-dtkwidget/deepin-turbo-booster-dtkwidget.service - ''; - - postFixup = '' - searchHardCodedPaths $out # for debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "A daemon that helps to launch applications faster"; - homepage = "https://github.com/linuxdeepin/deepin-turbo"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix deleted file mode 100644 index 4fa3d6043d5c..000000000000 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv -, fetchFromGitHub -, dde-api -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-wallpapers"; - version = "1.7.7"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-wallpapers"; - rev = version; - sha256 = "09cfnxbpms98ibqbi4xd51181q3az5n8rmndcdr9w12kyzniz7xv"; - }; - - nativeBuildInputs = [ - dde-api - deepin.setupHook - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - sed -i -e "s:/usr/lib/deepin-api:${dde-api}/lib/deepin-api:" Makefile - sed -i -e "s:/usr/share/wallpapers:$out/share/wallpapers:" Makefile - ''; - - installPhase = '' - mkdir -p $out/share/wallpapers/deepin - cp -a deepin/* deepin-community/* deepin-private/* $out/share/wallpapers/deepin - mkdir -p $out/var/cache - cp -a image-blur $out/var/cache - - # Suggested by upstream - mkdir -p $out/share/backgrounds/deepin - ln -s ../../wallpapers/deepin/Hummingbird_by_Shu_Le.jpg $out/share/backgrounds/deepin/desktop.jpg - ln -s $(echo -n $out/share/wallpapers/deepin/Hummingbird_by_Shu_Le.jpg | md5sum | cut -d " " -f 1).jpg \ - $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Wallpapers for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-wallpapers"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix deleted file mode 100644 index b177b2ccf356..000000000000 --- a/pkgs/desktops/deepin/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ pkgs, makeScope, libsForQt5 }: -let - packages = self: with self; { - setupHook = ./setup-hook.sh; - - # Update script tailored to deepin packages from git repository - updateScript = { pname, version, src }: - pkgs.genericUpdater { - inherit pname version; - attrPath = "deepin.${pname}"; - versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; - ignoredVersions = "^2014(\\.|rc)|^v[0-9]+"; - }; - - dde-api = callPackage ./dde-api { }; - dde-calendar = callPackage ./dde-calendar { }; - dde-control-center = callPackage ./dde-control-center { }; - dde-daemon = callPackage ./dde-daemon { }; - dde-dock = callPackage ./dde-dock { }; - dde-file-manager = callPackage ./dde-file-manager { }; - dde-kwin = callPackage ./dde-kwin { }; - dde-launcher = callPackage ./dde-launcher { }; - dde-network-utils = callPackage ./dde-network-utils { }; - dde-polkit-agent = callPackage ./dde-polkit-agent { }; - dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; - dde-session-ui = callPackage ./dde-session-ui { }; - deepin-anything = callPackage ./deepin-anything { }; - deepin-calculator = callPackage ./deepin-calculator { }; - deepin-desktop-base = callPackage ./deepin-desktop-base { }; - deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { }; - deepin-editor = callPackage ./deepin-editor { }; - deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; - deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; - deepin-icon-theme = callPackage ./deepin-icon-theme { }; - deepin-image-viewer = callPackage ./deepin-image-viewer { }; - deepin-menu = callPackage ./deepin-menu { }; - deepin-movie-reborn = callPackage ./deepin-movie-reborn { }; - deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; - deepin-sound-theme = callPackage ./deepin-sound-theme { }; - deepin-terminal = callPackage ./deepin-terminal { - wnck = pkgs.libwnck3; - }; - deepin-turbo = callPackage ./deepin-turbo { }; - deepin-wallpapers = callPackage ./deepin-wallpapers { }; - disomaster = callPackage ./disomaster { }; - dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { }; - dtkcore = callPackage ./dtkcore { }; - dtkwidget = callPackage ./dtkwidget { }; - dtkwm = callPackage ./dtkwm { }; - go-dbus-factory = callPackage ./go-dbus-factory { }; - go-gir-generator = callPackage ./go-gir-generator { }; - go-lib = callPackage ./go-lib { }; - qcef = callPackage ./qcef { }; - qt5integration = callPackage ./qt5integration { }; - qt5platform-plugins = callPackage ./qt5platform-plugins { }; - startdde = callPackage ./startdde { }; - udisks2-qt5 = callPackage ./udisks2-qt5 { }; - - }; - -in -makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/pkgs/desktops/deepin/disomaster/default.nix deleted file mode 100644 index 89cbe34ceaa2..000000000000 --- a/pkgs/desktops/deepin/disomaster/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qtbase -, libisoburn -, deepin -}: - -mkDerivation rec { - pname = "disomaster"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1kmhlnw37pdmlf7k9zry657xlhz40m9nzg361kiyisn186pfqpws"; - }; - - nativeBuildInputs = [ - deepin.setupHook - pkgconfig - qmake - ]; - - buildInputs = [ - libisoburn - qtbase - ]; - - postPatch = '' - searchHardCodedPaths # debugging - ''; - - qmakeFlags = [ - "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "A libisoburn wrapper for Qt"; - homepage = "https://github.com/linuxdeepin/disomaster"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo worldofpeace ]; - }; -} diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix deleted file mode 100644 index 2caef7ce9166..000000000000 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, gnome3 -, dde-polkit-agent -, deepin -}: - -stdenv.mkDerivation rec { - pname = "dpa-ext-gnomekeyring"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "168j42nwyw7vcgwc0fha2pjpwwlgir70fq1hns4ia1dkdqa1nhzw"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - deepin.setupHook - ]; - - buildInputs = [ - dde-polkit-agent - gnome3.libgnome-keyring - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "GNOME keyring extension for dde-polkit-agent"; - homepage = "https://github.com/linuxdeepin/dpa-ext-gnomekeyring"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix deleted file mode 100644 index 570b0cc2c11e..000000000000 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, gsettings-qt -, pythonPackages -, deepin -}: - -mkDerivation rec { - pname = "dtkcore"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0xdh6mmrv8yr6mjmlwj0fv037parkkwfwlaibcbrskwxqp9iri1y"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - pythonPackages.wrapPython - deepin.setupHook - ]; - - buildInputs = [ - gsettings-qt - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - # Fix shebang - sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env," - ''; - - qmakeFlags = [ - "DTK_VERSION=${version}" - "LIB_INSTALL_DIR=${placeholder "out"}/lib" - "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs" - ]; - - postFixup = '' - chmod +x $out/lib/libdtk-${version}/DCore/bin/*.py - wrapPythonProgramsIn "$out/lib/libdtk-${version}/DCore/bin" "$out $pythonPath" - searchHardCodedPaths $out # debugging - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin tool kit core library"; - homepage = "https://github.com/linuxdeepin/dtkcore"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix deleted file mode 100644 index 9be222830db4..000000000000 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, qtmultimedia -, qtsvg -, qtx11extras -, librsvg -, libstartup_notification -, gsettings-qt -, dde-qt-dbus-factory -, dtkcore -, deepin -}: - -mkDerivation rec { - pname = "dtkwidget"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0yqrm1p0k1843ldvcd79dxl26ybyl5kljl6vwhzc58sx7pw4qmvh"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - ]; - - buildInputs = [ - qtmultimedia - qtsvg - qtx11extras - librsvg - libstartup_notification - gsettings-qt - dde-qt-dbus-factory - dtkcore - ]; - - outRef = placeholder "out"; - - qmakeFlags = [ - "INCLUDE_INSTALL_DIR=${outRef}/include" - "LIB_INSTALL_DIR=${outRef}/lib" - "QT_HOST_DATA=${outRef}" - ]; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin graphical user interface library"; - homepage = "https://github.com/linuxdeepin/dtkwidget"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix deleted file mode 100644 index 56031f11492a..000000000000 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, fetchpatch -, pkgconfig -, qmake -, qtx11extras -, dtkcore -, deepin -}: - -mkDerivation rec { - pname = "dtkwm"; - version = "2.0.12"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0rdzzqsggqarldwb4yp5s4sf5czicgxbdmibjn0pw32129r2d1g3"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - ]; - - buildInputs = [ - dtkcore - qtx11extras - ]; - - patches = [ - # Set DTK_MODULE_NAME - (fetchpatch { - url = "https://github.com/linuxdeepin/dtkwm/commit/2490891a.patch"; - sha256 = "0krydxjpnaihkgs1n49b6mcf3rd3lkispcnkb1j5vpfs9hp9f48j"; - }) - ]; - - outRef = placeholder "out"; - - qmakeFlags = [ - "QT_HOST_DATA=${outRef}" - "INCLUDE_INSTALL_DIR=${outRef}/include" - "LIB_INSTALL_DIR=${outRef}/lib" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin graphical user interface library"; - homepage = "https://github.com/linuxdeepin/dtkwm"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix deleted file mode 100644 index 1c1afd9d099c..000000000000 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv -, fetchFromGitHub -, deepin -}: - -stdenv.mkDerivation rec { - pname = "go-dbus-factory"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f"; - }; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - postPatch = '' - sed -i -e 's:/share/gocode:/share/go:' Makefile - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "GoLang DBus factory for the Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/go-dbus-factory"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix deleted file mode 100644 index 7768f9afc85e..000000000000 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv -, fetchpatch -, fetchFromGitHub -, pkgconfig -, go -, gobject-introspection -, libgudev -, deepin -}: - -stdenv.mkDerivation rec { - pname = "go-gir-generator"; - version = "2.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1ydzll8zlk897iqcihvv6p046p0rzr4qqz2drmz2nx95njp8n03a"; - }; - - patches = [ - # Fix compatibility with glib 2.63+ - # https://github.com/linuxdeepin/go-gir-generator/pull/11 - (fetchpatch { - url = "https://github.com/linuxdeepin/go-gir-generator/commit/7dea15a1a491f28d2ac8c411068ccefeba01aae3.patch"; - sha256 = "182d30qkj1rx9ynpj9zfxh53nykvfq9wxk4502zc42gfvadgzfgd"; - }) - ]; - - nativeBuildInputs = [ - pkgconfig - go - ]; - - buildInputs = [ - gobject-introspection - libgudev - ]; - - postPatch = '' - sed -i -e 's:/share/gocode:/share/go:' Makefile - ''; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "GOCACHE=$(TMPDIR)/go-cache" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Generate static golang bindings for GObject"; - homepage = "https://github.com/linuxdeepin/go-gir-generator"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix deleted file mode 100644 index 7129d912e30d..000000000000 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv -, fetchFromGitHub -, glib -, xorg -, gdk-pixbuf -, pulseaudio -, mobile-broadband-provider-info -, deepin -}: - -stdenv.mkDerivation rec { - pname = "go-lib"; - version = "5.4.5"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "021sq7nzvfwsa5ccsb3vdjk53m7cf693xm4wkdkrkf8pja6vz94q"; - }; - - buildInputs = [ - glib - xorg.libX11 - gdk-pixbuf - pulseaudio - mobile-broadband-provider-info - ]; - - installPhase = '' - mkdir -p $out/share/go/src/pkg.deepin.io/lib - cp -a * $out/share/go/src/pkg.deepin.io/lib - - rm -r $out/share/go/src/pkg.deepin.io/lib/debian - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Go bindings for Deepin Desktop Environment development"; - homepage = "https://github.com/linuxdeepin/go-lib"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix deleted file mode 100644 index c37915377d88..000000000000 --- a/pkgs/desktops/deepin/qcef/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, qtbase -, qttools -, qtwebchannel -, qtx11extras -, gnome2 -, nss -, nspr -, alsaLib -, atk -, cairo -, cups -, dbus -, expat -, fontconfig -, gdk-pixbuf -, glib -, gtk2 -, libxcb -, pango -, pulseaudio -, xorg -, deepin -}: - -let - rpahtLibraries = [ - stdenv.cc.cc.lib # libstdc++.so.6 - alsaLib - atk - cairo - cups - dbus - expat - fontconfig - gdk-pixbuf - glib - gnome2.GConf - gtk2 - libxcb - nspr - nss - pango - pulseaudio - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - ]; - - libPath = stdenv.lib.makeLibraryPath rpahtLibraries; - -in -mkDerivation rec { - pname = "qcef"; - version = "1.1.8"; - - srcs = [ - (fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "14a33af1h3wj3yph080c1ri3m27bqj1v1k0jdqc63x7c3smnpwfk"; - name = pname; - }) - (fetchFromGitHub { - owner = "linuxdeepin"; - repo = "cef-binary"; - rev = "fecf00339545d2819224333cc506d5aa22ae8008"; - sha256 = "06i1zc7ciy7d0qhndiwpjrsii0x5i5hg9j6ddi4w5yf1nzgsrj4n"; - name = "cef-binary"; - }) - ]; - - sourceRoot = pname; - - nativeBuildInputs = [ - pkgconfig - cmake - qttools - deepin.setupHook - ]; - - buildInputs = [ - qtbase - qtwebchannel - qtx11extras - ] ++ rpahtLibraries; - - postUnpack = '' - rmdir ${pname}/cef - ln -s ../cef-binary ${pname}/cef - ''; - - postPatch = '' - searchHardCodedPaths - fixPath $out /usr src/core/qcef_global_settings.{h,cpp} - sed '/COMMAND rm -rf Release Resources/a COMMAND ldd qcef/libcef.so' -i src/CMakeLists.txt - sed '/COMMAND rm -rf Release Resources/a COMMAND patchelf --set-rpath ${libPath} qcef/libcef.so' -i src/CMakeLists.txt - ''; - - postFixup = '' - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; - - meta = with stdenv.lib; { - description = "Qt5 binding of Chromium Embedded Framework"; - homepage = "https://github.com/linuxdeepin/qcef"; - license = licenses.lgpl3; - platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix deleted file mode 100644 index e3bbaba068bd..000000000000 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, mtdev -, lxqt -, qtx11extras -, qtmultimedia -, qtsvg -, qt5platform-plugins -, qtstyleplugins -, dtkcore -, dtkwidget -, deepin -}: - -mkDerivation rec { - pname = "qt5integration"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "140wb3vcm2ji8jhqdxv8f4shiknia1zk8fssqlp09kzc1cmb4ncy"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - ]; - - buildInputs = [ - dtkcore - dtkwidget - qt5platform-plugins - mtdev - lxqt.libqtxdg - qtstyleplugins - qtx11extras - qtmultimedia - qtsvg - ]; - - postPatch = '' - sed -i dstyleplugin/dstyleplugin.pro \ - platformthemeplugin/qt5deepintheme-plugin.pro \ - iconengineplugins/svgiconengine/svgiconengine.pro \ - imageformatplugins/svg/svg.pro \ - -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Qt platform theme integration plugins for DDE"; - homepage = "https://github.com/linuxdeepin/qt5integration"; - license = with licenses; [ gpl3 lgpl2Plus bsd2 ]; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/qt5platform-plugins/default.nix deleted file mode 100644 index 33e4863c0d94..000000000000 --- a/pkgs/desktops/deepin/qt5platform-plugins/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qtx11extras -, libSM -, mtdev -, cairo -, deepin -, qtbase -}: - -mkDerivation rec { - pname = "qt5platform-plugins"; - version = "5.0.11"; - - srcs = [ - (fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "14xkr3p49716jc9v7ksj6jgcmfa65qicqrmablizfi71srg3z2pr"; - }) - qtbase.src - ]; - - sourceRoot = "source"; - - nativeBuildInputs = [ - pkgconfig - qmake - ]; - - buildInputs = [ - qtx11extras - libSM - mtdev - cairo - qtbase - ]; - - postPatch = '' - # The Qt5 platforms plugin is vendored in the package, however what's there is not always up-to-date with what's in nixpkgs. - # We simply copy the headers from qtbase's source tarball. - mkdir -p platformplugin/libqt5xcbqpa-dev/${qtbase.version} - cp -r ../qtbase-everywhere-src-${qtbase.version}/src/plugins/platforms/xcb/*.h platformplugin/libqt5xcbqpa-dev/${qtbase.version}/ - ''; - - qmakeFlags = [ - "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; - - meta = with stdenv.lib; { - description = "Qt platform theme integration plugin for DDE"; - homepage = "https://github.com/linuxdeepin/qt5platform-plugins"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/setup-hook.sh b/pkgs/desktops/deepin/setup-hook.sh deleted file mode 100755 index ce1d7330a222..000000000000 --- a/pkgs/desktops/deepin/setup-hook.sh +++ /dev/null @@ -1,64 +0,0 @@ -# Helper functions for deepin packaging - -searchHardCodedPaths() { - # Usage: - # - # searchHardCodedPaths [-a] [] - # - # Looks for ocurrences of FHS hard coded paths and command - # invocations in the given path (default: current directory) for - # the purpose of debugging a derivation. The option -a enables - # processing binary files as if they were text. - - local binary - if [ "$1" = "-a" ]; then - binary="-a" - shift - fi - - local path=$1 - - echo ----------- looking for command invocations in $path - grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $path || true - - echo ----------- looking for hard coded paths in $path - grep --color=always $binary -r -E '/(usr|bin|sbin|etc|var|opt)\>' $path || true - - echo ----------- done -} - -fixPath() { - # Usage: - # - # fixPath - # - # replaces occurences of by in - # removing /usr from the start of if present - - local parentdir=$1 - local path=$2 - local newpath=$parentdir$(echo $path | sed "s,^/usr,,") - local files=("${@:3}") - echo ======= grep --color=always "${path}" "${files[@]}" - grep --color=always "${path}" "${files[@]}" - echo +++++++ sed -i -e "s,$path,$newpath,g" "${files[@]}" - sed -i -e "s,$path,$newpath,g" "${files[@]}" -} - -searchForUnresolvedDLL() { - # Usage: - # - # searchForUnresolvedDLL - # - # looks in for executables with unresolved dynamic library paths - - local dir="$1" - echo ======= Looking for executables with unresolved dynamic library dependencies - echo $dir - for f in $(find -L "$dir" -type f -executable); do - if (ldd $f | grep -q "not found"); then - echo $f - ldd $f | grep --color=always "not found" - fi - done -} diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix deleted file mode 100644 index ab17f04db68f..000000000000 --- a/pkgs/desktops/deepin/startdde/default.nix +++ /dev/null @@ -1,160 +0,0 @@ -{ stdenv -, buildGoPackage -, fetchFromGitHub -, pkgconfig -, alsaLib -, coreutils -, dde-api -, dde-daemon -, dde-dock -, dde-file-manager -, dde-polkit-agent -, dde-session-ui -, deepin -, deepin-desktop-base -, deepin-desktop-schemas -, deepin-turbo -, dde-kwin -, glib -, gnome3 -, go -, go-dbus-factory -, go-gir-generator -, go-lib -, gtk3 -, jq -, kmod -, libX11 -, libXi -, libcgroup -, pciutils -, psmisc -, pulseaudio -, systemd -, xorg -, wrapGAppsHook -}: - -buildGoPackage rec { - pname = "startdde"; - version = "5.0.1"; - - goPackagePath = "pkg.deepin.io/dde/startdde"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1xydmglydksy7hjlavf5pbfy0s0lndgavh8x3kg2mg7d36mbra43"; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ - pkgconfig - jq - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dde-api - go-dbus-factory - go-gir-generator - go-lib - alsaLib - dde-daemon - dde-dock - dde-file-manager - dde-kwin - dde-polkit-agent - dde-session-ui - deepin-desktop-schemas - deepin-turbo - glib - gnome3.dconf - gnome3.gnome-keyring - gnome3.libgnome-keyring - gtk3 - kmod - libX11 - libXi - libcgroup - pciutils - psmisc - pulseaudio - systemd - xorg.xdriinfo - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - # Commented lines below indicates a doubt about how to fix the hard coded path - - fixPath $out /etc/X11 Makefile - #fixPath ? /etc/xdg/autostop autostop/autostop.go - fixPath ${coreutils} /bin/ls copyfile_test.go - fixPath $out /usr/share/startdde/auto_launch.json launch_group.go - #fixPath ? /usr/bin/kwin_no_scale main.go # not found on deepin linux and archlinux - fixPath $out /usr/share/startdde/memchecker.json memchecker/config.go - fixPath $out /usr/bin/startdde misc/00deepin-dde-env - fixPath ${dde-file-manager} /usr/bin/dde-file-manager misc/auto_launch/chinese.json - fixPath ${deepin-turbo} /usr/lib/deepin-turbo/booster-dtkwidget misc/auto_launch/chinese.json - fixPath ${dde-daemon} /usr/lib/deepin-daemon/dde-session-daemon misc/auto_launch/chinese.json misc/auto_launch/default.json - fixPath ${dde-dock} /usr/bin/dde-dock misc/auto_launch/chinese.json misc/auto_launch/default.json - fixPath ${dde-file-manager} /usr/bin/dde-desktop misc/auto_launch/chinese.json misc/auto_launch/default.json - fixPath $out /usr/bin/startdde misc/deepin-session - #fixPath ? /usr/lib/lightdm/config-error-dialog.sh misc/deepin-session # provided by lightdm on deepin linux - #fixPath ? /usr/sbin/lightdm-session misc/deepin-session # provided by lightdm on deepin linux - fixPath ${dde-session-ui} /usr/bin/dde-lock session.go - fixPath ${dde-session-ui} /usr/bin/dde-shutdown session.go - fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-osd session.go - fixPath ${deepin-desktop-base} /etc/deepin-version session.go - fixPath ${gnome3.gnome-keyring} /usr/bin/gnome-keyring-daemon session.go - fixPath ${pulseaudio} /usr/bin/pulseaudio sound_effect.go - #fixPath ? /usr/lib/UIAppSched.hooks startmanager.go # not found anything about this - fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-welcome utils.go - fixPath ${dde-polkit-agent} /usr/lib/polkit-1-dde/dde-polkit-agent watchdog/dde_polkit_agent.go - #fixPath ? /var/log/Xorg.0.log wm/driver.go - #fixPath ? /etc/deepin-wm-switcher/config.json wm/switcher_config.go # not present on nixos, deepin linux and archlinux - - substituteInPlace wm/driver.go --replace '/sbin/lsmod' "${kmod}/bin/lsmod" - - substituteInPlace session.go --replace 'LookPath("cgexec"' 'LookPath("${libcgroup}/bin/cgexec"' - substituteInPlace vm.go --replace 'Command("dde-wm-chooser"' 'Command("${dde-session-ui}/bin/dde-wm-chooser"' - substituteInPlace vm.go --replace 'Command("systemd-detect-virt"' 'Command("${systemd}/bin/systemd-detect-virt"' - substituteInPlace wm/card_info.go --replace 'Command("lspci"' 'Command("${pciutils}/bin/lspci"' - substituteInPlace wm/driver.go --replace 'Command("lspci"' 'Command("${pciutils}/bin/lspci"' - substituteInPlace wm/driver.go --replace 'Command("xdriinfo"' 'Command("${xorg.xdriinfo}/bin/xdriinfo"' - substituteInPlace wm/platform.go --replace 'Command("gsettings"' 'Command("${glib}/bin/gsettings"' - substituteInPlace wm/platform.go --replace 'Command("uname"' 'Command("${coreutils}/bin/uname"' - substituteInPlace wm/switcher.go --replace 'Command("killall"' 'Command("${psmisc}/bin/killall"' - ''; - - buildPhase = '' - make -C go/src/${goPackagePath} - ''; - - installPhase = '' - make install PREFIX="$out" -C go/src/${goPackagePath} - rm -rf $out/share/lightdm # this is uselesss for NixOS - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru = { - updateScript = deepin.updateScript { inherit pname version src; }; - providedSessions = [ "deepin" ]; - }; - - meta = with stdenv.lib; { - description = "Starter of deepin desktop environment"; - homepage = "https://github.com/linuxdeepin/startdde"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/startdde/deps.nix b/pkgs/desktops/deepin/startdde/deps.nix deleted file mode 100644 index 8898b8c50fb7..000000000000 --- a/pkgs/desktops/deepin/startdde/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/cryptix/wav"; - fetch = { - type = "git"; - url = "https://github.com/cryptix/wav"; - rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; - sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; - }; - } - { - goPackagePath = "github.com/linuxdeepin/go-x11-client"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a"; - sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "daa7c04131f568e31c51927b359a2d197a357058"; - sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h"; - }; - } -] diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix deleted file mode 100644 index 0fcc2e9f9f71..000000000000 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, qmake -, qtbase -, deepin -}: - -mkDerivation rec { - pname = "udisks2-qt5"; - version = "5.0.3"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0c87ks9glwhk4m2s7kf7mb43q011yi6l3qjq2ammmfqwl8xal69a"; - }; - - nativeBuildInputs = [ - deepin.setupHook - qmake - ]; - - buildInputs = [ - qtbase - ]; - - postPatch = '' - searchHardCodedPaths # debugging - ''; - - qmakeFlags = [ - "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" - ]; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "UDisks2 D-Bus interfaces binding for Qt5"; - homepage = "https://github.com/linuxdeepin/udisks2-qt5"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/os-specific/linux/deepin-anything/default.nix b/pkgs/os-specific/linux/deepin-anything/default.nix deleted file mode 100644 index 4139cc153cdd..000000000000 --- a/pkgs/os-specific/linux/deepin-anything/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, deepin, kernel }: - -stdenv.mkDerivation { - pname = "deepin-anything-module"; - version = "${deepin.deepin-anything.version}-${kernel.version}"; - src = deepin.deepin-anything.modsrc; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - buildPhase = '' - make -C src/deepin-anything-0.0 kdir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build - ''; - - installPhase = '' - install -m 644 -D -t $out/lib/modules/${kernel.modDirVersion}/extra src/deepin-anything-0.0/*.ko - ''; - - meta = deepin.deepin-anything.meta // { - description = deepin.deepin-anything.meta.description + " (kernel modules)"; - badPlatforms = [ "aarch64-linux" ]; # the kernel module is not building - }; -} diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index 720c43ccc2d7..945c96ae8511 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, deepin }: +{ stdenv, fetchurl, readline }: let version = "1.5c"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { description = "SSH and Telnet client with ZMODEM file transfer capability"; homepage = "http://zssh.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; - maintainers = deepin.deepin-terminal.meta.maintainers; # required by deepin-terminal + maintainers = [ ]; # required by deepin-terminal platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a846a3f184..ce2af8c2e42f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17660,8 +17660,6 @@ in ddcci-driver = callPackage ../os-specific/linux/ddcci { }; - deepin-anything = callPackage ../os-specific/linux/deepin-anything { }; - digimend = callPackage ../os-specific/linux/digimend { }; dpdk = callPackage ../os-specific/linux/dpdk { }; @@ -21911,8 +21909,6 @@ in neocomp = callPackage ../applications/window-managers/neocomp { }; - netease-cloud-music = callPackage ../applications/audio/netease-cloud-music {}; - newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { @@ -25325,11 +25321,6 @@ in cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); - deepin = recurseIntoAttrs (import ../desktops/deepin { - inherit pkgs libsForQt5; - inherit (lib) makeScope; - }); - enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { callPackage = newScope pkgs.enlightenment; }); From 168a9c8d3810a274e7c56c5eb3704766a5ced47e Mon Sep 17 00:00:00 2001 From: "Andrew R. M" Date: Sun, 30 Aug 2020 13:15:43 -0400 Subject: [PATCH 367/688] Add option to tor service for package --- nixos/modules/services/security/tor.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index b33e905c67de..b4bc2f694e4d 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -34,8 +34,8 @@ let User tor DataDirectory ${torDirectory} ${optionalString cfg.enableGeoIP '' - GeoIPFile ${pkgs.tor.geoip}/share/tor/geoip - GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6 + GeoIPFile ${cfg.package.geoip}/share/tor/geoip + GeoIPv6File ${cfg.package.geoip}/share/tor/geoip6 ''} ${optint "ControlPort" cfg.controlPort} @@ -123,6 +123,16 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.tor; + defaultText = "pkgs.tor"; + example = literalExample "pkgs.tor"; + description = '' + Tor package to use + ''; + }; + enableGeoIP = mkOption { type = types.bool; default = true; @@ -749,8 +759,8 @@ in serviceConfig = { Type = "simple"; # Translated from the upstream contrib/dist/tor.service.in - ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config"; - ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile}"; + ExecStartPre = "${cfg.package}/bin/tor -f ${torRcFile} --verify-config"; + ExecStart = "${cfg.package}/bin/tor -f ${torRcFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; KillSignal = "SIGINT"; TimeoutSec = 30; @@ -773,7 +783,7 @@ in }; }; - environment.systemPackages = [ pkgs.tor ]; + environment.systemPackages = [ cfg.package ]; services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) { enable = true; From 8dc54c1d3e8b4af39a54ab0e76bf7efa2174aff8 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 29 Aug 2020 14:06:34 +0000 Subject: [PATCH 368/688] objconv: 2.51 -> 2.52 --- pkgs/development/tools/misc/objconv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index 9fdaca52ca8a..52cc1b2d5c58 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "objconv"; - version = "2.51"; + version = "2.52"; src = fetchurl { # Versioned archive of objconv sources maintained by orivej. url = "https://archive.org/download/objconv/${pname}-${version}.zip"; - sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs"; + sha256 = "0r117r7yvqvvdgwgwxpkyzi6p5nm0xb6p67wvkmvggm9fdyl3z8v"; }; nativeBuildInputs = [ unzip ]; From f63c842f1ef7b58eaae49b1f9e7d57e450769741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Sun, 30 Aug 2020 20:37:39 +0200 Subject: [PATCH 369/688] nixosTests.systemd-networkd: fix test flakiness The original idea for this test was, on top of providing a networkd test, to provide newcomers with a sample configuration they could use to get started with networkd. That's precisely why we were doing this systemd tmpfile dance in the first place. It was a convenient way to create a runtime file with a specific mode and owner. Sadly, this tmpfile rule made the test flaky. There's a race condition between the wireguard interface configured by systemd-networkd and systemd-tmpfiles-setup. Sometimes, networkd is going to try loading the wireguard private key file *before* the said file gets created by systemd-tmpfiles. A perfect solution here would be to create a "After" dependency between wg0.netdev and systemd-tmpfiles-setup.service. Sadly, it is currently impossible to create such a dependency between a networkd-specific unit and a service. We're removing this tmp file in favor of pointing networkd directly to the Nix store. This is clearly something that shouldn't be done in the real world for a private file: the store is world-readable. However, this is the only way I found to fix this test flakiness for now. --- nixos/tests/systemd-networkd.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix index 162970e67537..d5fb2431dbad 100644 --- a/nixos/tests/systemd-networkd.nix +++ b/nixos/tests/systemd-networkd.nix @@ -7,16 +7,17 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { virtualisation.vlans = [ 1 ]; environment.systemPackages = with pkgs; [ wireguard-tools ]; boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ]; - systemd.tmpfiles.rules = [ - "f /run/wg_priv 0640 root systemd-network - ${privk}" - ]; systemd.network = { enable = true; netdevs = { "90-wg0" = { netdevConfig = { Kind = "wireguard"; Name = "wg0"; }; wireguardConfig = { - PrivateKeyFile = "/run/wg_priv"; + # NOTE: we're storing the wireguard private key in the + # store for this test. Do not do this in the real + # world. Keep in mind the nix store is + # world-readable. + PrivateKeyFile = pkgs.writeText "wg0-priv" privk; ListenPort = 51820; FirewallMark = 42; }; From 804d228311baa61fbb126305a711c4096338eb95 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 30 Aug 2020 15:17:56 -0400 Subject: [PATCH 370/688] webkitgtk: don't use clang stdenv Ughhhh this was terrible but it seems to now be fixed by [0]. Though it doesn't seem the issue is entirely resolved https://github.com/NixOS/nixpkgs/issues/36947. [0]: https://github.com/NixOS/nixpkgs/pull/91293 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a846a3f184..eb88324f5219 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15677,7 +15677,6 @@ in webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; - stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947 }; websocketpp = callPackage ../development/libraries/websocket++ { }; From 6de4b96228e97082803ec385af140ed8a859e48c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 30 Aug 2020 15:57:11 -0400 Subject: [PATCH 371/688] sonata: fixup dependencies --- pkgs/applications/audio/sonata/default.nix | 37 ++++++++++++++-------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 73e47038a262..cf3f173a096e 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, wrapGAppsHook, gettext -, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }: +, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; @@ -16,13 +16,30 @@ in buildPythonApplication rec { disabled = !isPy3k; - nativeBuildInputs = [ wrapGAppsHook gettext ]; - buildInputs = [ - gnome3.adwaita-icon-theme - gsettings-desktop-schemas + nativeBuildInputs = [ + gettext + gobject-introspection + wrapGAppsHook ]; - # Otherwise the setup hook for gsettings-desktop-schemas is not run: + buildInputs = [ + glib + gnome3.adwaita-icon-theme + gsettings-desktop-schemas + gtk3 + gdk-pixbuf + ]; + + # The optional tagpy dependency (for editing metadata) is not yet + # included because it's difficult to build. + pythonPath = [ + dbus-python + mpd2 + pygobject3 + setuptools + ]; + + # Otherwise the setup hook for gobject-introspection is not run: # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; @@ -31,14 +48,6 @@ in buildPythonApplication rec { sed -i '/localmpd/d' sonata/consts.py ''; - propagatedBuildInputs = [ - gobject-introspection gtk3 pygobject3 setuptools - ]; - - # The optional tagpy dependency (for editing metadata) is not yet - # included because it's difficult to build. - pythonPath = [ dbus-python pygobject3 mpd2 ]; - meta = { description = "An elegant client for the Music Player Daemon"; longDescription = '' From 51632d53100a4c77078932fb9ab46e7831b65da8 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 30 Aug 2020 13:52:55 -0700 Subject: [PATCH 372/688] fwupd: Add upstream patch to fix build with systemd 246 Fixes #96663. Signed-off-by: Anders Kaseorg --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 0783fb792969..66edb34d2444 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -167,6 +167,11 @@ let # Needs a different set of modules than po/make-images. inherit installedTestsPython; }) + + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/3e82beeddac31292c50229e59e2404865edee5ad.patch"; + sha256 = "17p9r8qddqkrnhy9bvp9207afh5fcl1whn79nqcp57b4q4c17zgk"; + }) ]; postPatch = '' From 30c8d096d96584653707709dc2d02b6eee5e631d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 31 Aug 2020 00:18:03 +0200 Subject: [PATCH 373/688] packer: fix hash mismatch hash mismatch in fixed-output derivation '/nix/store/1x9w8wf4qfgf2xnmafjmqd2mshzk47hr-source': wanted: sha256:104jw2jcshzds74d7m4yqn6mbk7lgps6qnqmp6h395b1mdyjhink got: sha256:0kr9whv3s0f8866yjmwg311j3kcj29bp5xwpnv43ama4m1mq3bm7 --- pkgs/development/tools/packer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index dfcc2f1a747d..909e821a6d1d 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "104jw2jcshzds74d7m4yqn6mbk7lgps6qnqmp6h395b1mdyjhink"; + sha256 = "0kr9whv3s0f8866yjmwg311j3kcj29bp5xwpnv43ama4m1mq3bm7"; }; meta = with stdenv.lib; { From a0a421bf5e8beaebc83e8df98694d3a92e42efa8 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 30 Aug 2020 15:41:41 -0700 Subject: [PATCH 374/688] Revert "Merge pull request #96152 from JJJollyjim/colour-test-machines-staging" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1bff6fe17cbf3e81fbd4122af41d77ea378f45d7, reversing changes made to 2995fa48cb4878756b9d64b27535737278d96f07. There’s presumably nothing wrong with this PR, except that it conflicts with reverting #96254 which broke several tests (#96699). Signed-off-by: Anders Kaseorg --- nixos/lib/test-driver/test-driver.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 612bb02aaa9b..65a44be64687 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -3,7 +3,6 @@ import argparse import atexit import base64 import io -import itertools import logging import os import pathlib @@ -93,17 +92,10 @@ logging.basicConfig(format="%(message)s") logger = logging.getLogger("test-driver") logger.setLevel(logging.INFO) -machine_colours_iter = ( - "\x1b[{}m".format(x) for x in itertools.cycle(reversed(range(31, 37))) -) - class MachineLogAdapter(logging.LoggerAdapter): def process(self, msg: str, kwargs: Any) -> Tuple[str, Any]: - return ( - f"{self.extra['colour_code']}{self.extra['machine']}\x1b[39m: {msg}", - kwargs, - ) + return f"{self.extra['machine']}: {msg}", kwargs def make_command(args: list) -> str: @@ -180,10 +172,7 @@ class Machine: self.socket = None self.monitor: Optional[socket.socket] = None self.allow_reboot = args.get("allowReboot", False) - self.logger = MachineLogAdapter( - logger, - extra=dict(machine=self.name, colour_code=next(machine_colours_iter)), - ) + self.logger = MachineLogAdapter(logger, extra=dict(machine=self.name)) @staticmethod def create_startcommand(args: Dict[str, str]) -> str: From 59b6664f15c4fefad044ac7e7b1b7d52198adae6 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 30 Aug 2020 15:42:06 -0700 Subject: [PATCH 375/688] Revert "Merge pull request #96254 from Mic92/logging" This reverts commit 4fc708567f6d9cf28f9ba426702069aa5a0b89c2, reversing changes made to 0e54f3a6d8393c31cfae43316904375dcfc77a46. Fixes #96699. Signed-off-by: Anders Kaseorg --- nixos/lib/test-driver/test-driver.py | 365 ++++++++++++++++----------- nixos/lib/testing-python.nix | 2 +- 2 files changed, 222 insertions(+), 145 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 65a44be64687..93f94587c0a5 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -1,13 +1,19 @@ #! /somewhere/python3 +from contextlib import contextmanager, _GeneratorContextManager +from queue import Queue, Empty +from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List +from xml.sax.saxutils import XMLGenerator +import queue +import io +import _thread import argparse import atexit import base64 -import io -import logging +import codecs import os import pathlib +import ptpython.repl import pty -import queue import re import shlex import shutil @@ -15,12 +21,9 @@ import socket import subprocess import sys import tempfile -import _thread import time -from contextlib import contextmanager -from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple - -import ptpython.repl +import traceback +import unicodedata CHAR_TO_KEY = { "A": "shift-a", @@ -85,17 +88,13 @@ CHAR_TO_KEY = { ")": "shift-0x0B", } -# Forward reference +# Forward references +log: "Logger" machines: "List[Machine]" -logging.basicConfig(format="%(message)s") -logger = logging.getLogger("test-driver") -logger.setLevel(logging.INFO) - -class MachineLogAdapter(logging.LoggerAdapter): - def process(self, msg: str, kwargs: Any) -> Tuple[str, Any]: - return f"{self.extra['machine']}: {msg}", kwargs +def eprint(*args: object, **kwargs: Any) -> None: + print(*args, file=sys.stderr, **kwargs) def make_command(args: list) -> str: @@ -103,7 +102,8 @@ def make_command(args: list) -> str: def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]: - logger.info(f"starting VDE switch for network {vlan_nr}") + global log + log.log("starting VDE switch for network {}".format(vlan_nr)) vde_socket = tempfile.mkdtemp( prefix="nixos-test-vde-", suffix="-vde{}.ctl".format(vlan_nr) ) @@ -142,6 +142,70 @@ def retry(fn: Callable) -> None: raise Exception("action timed out") +class Logger: + def __init__(self) -> None: + self.logfile = os.environ.get("LOGFILE", "/dev/null") + self.logfile_handle = codecs.open(self.logfile, "wb") + self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8") + self.queue: "Queue[Dict[str, str]]" = Queue() + + self.xml.startDocument() + self.xml.startElement("logfile", attrs={}) + + def close(self) -> None: + self.xml.endElement("logfile") + self.xml.endDocument() + self.logfile_handle.close() + + def sanitise(self, message: str) -> str: + return "".join(ch for ch in message if unicodedata.category(ch)[0] != "C") + + def maybe_prefix(self, message: str, attributes: Dict[str, str]) -> str: + if "machine" in attributes: + return "{}: {}".format(attributes["machine"], message) + return message + + def log_line(self, message: str, attributes: Dict[str, str]) -> None: + self.xml.startElement("line", attributes) + self.xml.characters(message) + self.xml.endElement("line") + + def log(self, message: str, attributes: Dict[str, str] = {}) -> None: + eprint(self.maybe_prefix(message, attributes)) + self.drain_log_queue() + self.log_line(message, attributes) + + def enqueue(self, message: Dict[str, str]) -> None: + self.queue.put(message) + + def drain_log_queue(self) -> None: + try: + while True: + item = self.queue.get_nowait() + attributes = {"machine": item["machine"], "type": "serial"} + self.log_line(self.sanitise(item["msg"]), attributes) + except Empty: + pass + + @contextmanager + def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: + eprint(self.maybe_prefix(message, attributes)) + + self.xml.startElement("nest", attrs={}) + self.xml.startElement("head", attributes) + self.xml.characters(message) + self.xml.endElement("head") + + tic = time.time() + self.drain_log_queue() + yield + self.drain_log_queue() + toc = time.time() + self.log("({:.2f} seconds)".format(toc - tic)) + + self.xml.endElement("nest") + + class Machine: def __init__(self, args: Dict[str, Any]) -> None: if "name" in args: @@ -171,8 +235,8 @@ class Machine: self.pid: Optional[int] = None self.socket = None self.monitor: Optional[socket.socket] = None + self.logger: Logger = args["log"] self.allow_reboot = args.get("allowReboot", False) - self.logger = MachineLogAdapter(logger, extra=dict(machine=self.name)) @staticmethod def create_startcommand(args: Dict[str, str]) -> str: @@ -228,6 +292,14 @@ class Machine: def is_up(self) -> bool: return self.booted and self.connected + def log(self, msg: str) -> None: + self.logger.log(msg, {"machine": self.name}) + + def nested(self, msg: str, attrs: Dict[str, str] = {}) -> _GeneratorContextManager: + my_attrs = {"machine": self.name} + my_attrs.update(attrs) + return self.logger.nested(msg, my_attrs) + def wait_for_monitor_prompt(self) -> str: assert self.monitor is not None answer = "" @@ -242,7 +314,7 @@ class Machine: def send_monitor_command(self, command: str) -> str: message = ("{}\n".format(command)).encode() - self.logger.info(f"sending monitor command: {command}") + self.log("sending monitor command: {}".format(command)) assert self.monitor is not None self.monitor.send(message) return self.wait_for_monitor_prompt() @@ -309,19 +381,16 @@ class Machine: return self.execute("systemctl {}".format(q)) def require_unit_state(self, unit: str, require_state: str = "active") -> None: - self.logger.info( - f"checking if unit ‘{unit}’ has reached state '{require_state}'" - ) - info = self.get_unit_info(unit) - state = info["ActiveState"] - if state != require_state: - raise Exception( - "Expected unit ‘{}’ to to be in state ".format(unit) - + "'{}' but it is in state ‘{}’".format(require_state, state) - ) - - def log(self, message: str) -> None: - self.logger.info(message) + with self.nested( + "checking if unit ‘{}’ has reached state '{}'".format(unit, require_state) + ): + info = self.get_unit_info(unit) + state = info["ActiveState"] + if state != require_state: + raise Exception( + "Expected unit ‘{}’ to to be in state ".format(unit) + + "'{}' but it is in state ‘{}’".format(require_state, state) + ) def execute(self, command: str) -> Tuple[int, str]: self.connect() @@ -345,25 +414,27 @@ class Machine: """Execute each command and check that it succeeds.""" output = "" for command in commands: - self.logger.info(f"must succeed: {command}") - (status, out) = self.execute(command) - if status != 0: - self.logger.info(f"output: {out}") - raise Exception( - "command `{}` failed (exit code {})".format(command, status) - ) - output += out + with self.nested("must succeed: {}".format(command)): + (status, out) = self.execute(command) + if status != 0: + self.log("output: {}".format(out)) + raise Exception( + "command `{}` failed (exit code {})".format(command, status) + ) + output += out return output def fail(self, *commands: str) -> str: """Execute each command and check that it fails.""" output = "" for command in commands: - self.logger.info(f"must fail: {command}") - (status, out) = self.execute(command) - if status == 0: - raise Exception("command `{}` unexpectedly succeeded".format(command)) - output += out + with self.nested("must fail: {}".format(command)): + (status, out) = self.execute(command) + if status == 0: + raise Exception( + "command `{}` unexpectedly succeeded".format(command) + ) + output += out return output def wait_until_succeeds(self, command: str) -> str: @@ -377,9 +448,9 @@ class Machine: status, output = self.execute(command) return status == 0 - self.logger.info(f"waiting for success: {command}") - retry(check_success) - return output + with self.nested("waiting for success: {}".format(command)): + retry(check_success) + return output def wait_until_fails(self, command: str) -> str: """Wait until a command returns failure. @@ -392,21 +463,21 @@ class Machine: status, output = self.execute(command) return status != 0 - self.logger.info(f"waiting for failure: {command}") - retry(check_failure) - return output + with self.nested("waiting for failure: {}".format(command)): + retry(check_failure) + return output def wait_for_shutdown(self) -> None: if not self.booted: return - self.logger.info("waiting for the VM to power off") - sys.stdout.flush() - self.process.wait() + with self.nested("waiting for the VM to power off"): + sys.stdout.flush() + self.process.wait() - self.pid = None - self.booted = False - self.connected = False + self.pid = None + self.booted = False + self.connected = False def get_tty_text(self, tty: str) -> str: status, output = self.execute( @@ -424,19 +495,19 @@ class Machine: def tty_matches(last: bool) -> bool: text = self.get_tty_text(tty) if last: - self.logger.info( + self.log( f"Last chance to match /{regexp}/ on TTY{tty}, " f"which currently contains: {text}" ) return len(matcher.findall(text)) > 0 - self.logger.info(f"waiting for {regexp} to appear on tty {tty}") - retry(tty_matches) + with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)): + retry(tty_matches) def send_chars(self, chars: List[str]) -> None: - self.logger.info(f"sending keys ‘{chars}‘") - for char in chars: - self.send_key(char) + with self.nested("sending keys ‘{}‘".format(chars)): + for char in chars: + self.send_key(char) def wait_for_file(self, filename: str) -> None: """Waits until the file exists in machine's file system.""" @@ -445,16 +516,16 @@ class Machine: status, _ = self.execute("test -e {}".format(filename)) return status == 0 - self.logger.info(f"waiting for file ‘{filename}‘") - retry(check_file) + with self.nested("waiting for file ‘{}‘".format(filename)): + retry(check_file) def wait_for_open_port(self, port: int) -> None: def port_is_open(_: Any) -> bool: status, _ = self.execute("nc -z localhost {}".format(port)) return status == 0 - self.logger.info(f"waiting for TCP port {port}") - retry(port_is_open) + with self.nested("waiting for TCP port {}".format(port)): + retry(port_is_open) def wait_for_closed_port(self, port: int) -> None: def port_is_closed(_: Any) -> bool: @@ -476,17 +547,17 @@ class Machine: if self.connected: return - self.logger.info("waiting for the VM to finish booting") - self.start() + with self.nested("waiting for the VM to finish booting"): + self.start() - tic = time.time() - self.shell.recv(1024) - # TODO: Timeout - toc = time.time() + tic = time.time() + self.shell.recv(1024) + # TODO: Timeout + toc = time.time() - self.logger.info("connected to guest root shell") - self.logger.info(f"(connecting took {toc - tic:.2f} seconds)") - self.connected = True + self.log("connected to guest root shell") + self.log("(connecting took {:.2f} seconds)".format(toc - tic)) + self.connected = True def screenshot(self, filename: str) -> None: out_dir = os.environ.get("out", os.getcwd()) @@ -495,12 +566,15 @@ class Machine: filename = os.path.join(out_dir, "{}.png".format(filename)) tmp = "{}.ppm".format(filename) - self.logger.info(f"making screenshot {filename}") - self.send_monitor_command("screendump {}".format(tmp)) - ret = subprocess.run("pnmtopng {} > {}".format(tmp, filename), shell=True) - os.unlink(tmp) - if ret.returncode != 0: - raise Exception("Cannot convert screenshot") + with self.nested( + "making screenshot {}".format(filename), + {"image": os.path.basename(filename)}, + ): + self.send_monitor_command("screendump {}".format(tmp)) + ret = subprocess.run("pnmtopng {} > {}".format(tmp, filename), shell=True) + os.unlink(tmp) + if ret.returncode != 0: + raise Exception("Cannot convert screenshot") def copy_from_host_via_shell(self, source: str, target: str) -> None: """Copy a file from the host into the guest by piping it over the @@ -576,18 +650,20 @@ class Machine: tess_args = "-c debug_file=/dev/null --psm 11 --oem 2" - self.logger.info("performing optical character recognition") - with tempfile.NamedTemporaryFile() as tmpin: - self.send_monitor_command("screendump {}".format(tmpin.name)) + with self.nested("performing optical character recognition"): + with tempfile.NamedTemporaryFile() as tmpin: + self.send_monitor_command("screendump {}".format(tmpin.name)) - cmd = "convert {} {} tiff:- | tesseract - - {}".format( - magick_args, tmpin.name, tess_args - ) - ret = subprocess.run(cmd, shell=True, capture_output=True) - if ret.returncode != 0: - raise Exception("OCR failed with exit code {}".format(ret.returncode)) + cmd = "convert {} {} tiff:- | tesseract - - {}".format( + magick_args, tmpin.name, tess_args + ) + ret = subprocess.run(cmd, shell=True, capture_output=True) + if ret.returncode != 0: + raise Exception( + "OCR failed with exit code {}".format(ret.returncode) + ) - return ret.stdout.decode("utf-8") + return ret.stdout.decode("utf-8") def wait_for_text(self, regex: str) -> None: def screen_matches(last: bool) -> bool: @@ -595,15 +671,15 @@ class Machine: matches = re.search(regex, text) is not None if last and not matches: - self.logger.info(f"Last OCR attempt failed. Text was: {text}") + self.log("Last OCR attempt failed. Text was: {}".format(text)) return matches - self.logger.info(f"waiting for {regex} to appear on screen") - retry(screen_matches) + with self.nested("waiting for {} to appear on screen".format(regex)): + retry(screen_matches) def wait_for_console_text(self, regex: str) -> None: - self.logger.info(f"waiting for {regex} to appear on console") + self.log("waiting for {} to appear on console".format(regex)) # Buffer the console output, this is needed # to match multiline regexes. console = io.StringIO() @@ -626,7 +702,7 @@ class Machine: if self.booted: return - self.logger.info("starting vm") + self.log("starting vm") def create_socket(path: str) -> socket.socket: if os.path.exists(path): @@ -683,7 +759,7 @@ class Machine: # Store last serial console lines for use # of wait_for_console_text - self.last_lines: queue.Queue = queue.Queue() + self.last_lines: Queue = Queue() def process_serial_output() -> None: assert self.process.stdout is not None @@ -691,7 +767,8 @@ class Machine: # Ignore undecodable bytes that may occur in boot menus line = _line.decode(errors="ignore").replace("\r", "").rstrip() self.last_lines.put(line) - self.logger.info(line) + eprint("{} # {}".format(self.name, line)) + self.logger.enqueue({"msg": line, "machine": self.name}) _thread.start_new_thread(process_serial_output, ()) @@ -700,10 +777,10 @@ class Machine: self.pid = self.process.pid self.booted = True - self.logger.info(f"QEMU running (pid {self.pid})") + self.log("QEMU running (pid {})".format(self.pid)) def cleanup_statedir(self) -> None: - self.logger.info("delete the VM state directory") + self.log("delete the VM state directory") if os.path.isfile(self.state_dir): shutil.rmtree(self.state_dir) @@ -718,7 +795,7 @@ class Machine: if not self.booted: return - self.logger.info("forced crash") + self.log("forced crash") self.send_monitor_command("quit") self.wait_for_shutdown() @@ -738,8 +815,8 @@ class Machine: status, _ = self.execute("[ -e /tmp/.X11-unix/X0 ]") return status == 0 - self.logger.info("waiting for the X11 server") - retry(check_x) + with self.nested("waiting for the X11 server"): + retry(check_x) def get_window_names(self) -> List[str]: return self.succeed( @@ -752,14 +829,15 @@ class Machine: def window_is_visible(last_try: bool) -> bool: names = self.get_window_names() if last_try: - self.logger.info( - f"Last chance to match {regexp} on the window list, " - + f"which currently contains: {', '.join(names)}" + self.log( + "Last chance to match {} on the window list,".format(regexp) + + " which currently contains: " + + ", ".join(names) ) return any(pattern.search(name) for name in names) - self.logger.info("Waiting for a window to appear") - retry(window_is_visible) + with self.nested("Waiting for a window to appear"): + retry(window_is_visible) def sleep(self, secs: int) -> None: # We want to sleep in *guest* time, not *host* time. @@ -788,22 +866,23 @@ class Machine: def create_machine(args: Dict[str, Any]) -> Machine: global log + args["log"] = log args["redirectSerial"] = os.environ.get("USE_SERIAL", "0") == "1" return Machine(args) def start_all() -> None: global machines - logger.info("starting all VMs") - for machine in machines: - machine.start() + with log.nested("starting all VMs"): + for machine in machines: + machine.start() def join_all() -> None: global machines - logger.info("waiting for all VMs to finish") - for machine in machines: - machine.wait_for_shutdown() + with log.nested("waiting for all VMs to finish"): + for machine in machines: + machine.wait_for_shutdown() def test_script() -> None: @@ -814,12 +893,13 @@ def run_tests() -> None: global machines tests = os.environ.get("tests", None) if tests is not None: - logger.info("running the VM test script") - try: - exec(tests, globals()) - except Exception: - logging.exception("error:") - sys.exit(1) + with log.nested("running the VM test script"): + try: + exec(tests, globals()) + except Exception as e: + eprint("error: ") + traceback.print_exc() + sys.exit(1) else: ptpython.repl.embed(locals(), globals()) @@ -832,19 +912,18 @@ def run_tests() -> None: @contextmanager def subtest(name: str) -> Iterator[None]: - logger.info(name) - try: - yield - return True - except Exception as e: - logger.info(f'Test "{name}" failed with error: "{e}"') - raise e + with log.nested(name): + try: + yield + return True + except Exception as e: + log.log(f'Test "{name}" failed with error: "{e}"') + raise e return False -def main() -> None: - global machines +if __name__ == "__main__": arg_parser = argparse.ArgumentParser() arg_parser.add_argument( "-K", @@ -854,6 +933,8 @@ def main() -> None: ) (cli_args, vm_scripts) = arg_parser.parse_known_args() + log = Logger() + vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split())) vde_sockets = [create_vlan(v) for v in vlan_nrs] for nr, vde_socket, _, _ in vde_sockets: @@ -864,27 +945,23 @@ def main() -> None: if not cli_args.keep_vm_state: machine.cleanup_statedir() machine_eval = [ - "global {0}; {0} = machines[{1}]".format(m.name, idx) - for idx, m in enumerate(machines) + "{0} = machines[{1}]".format(m.name, idx) for idx, m in enumerate(machines) ] exec("\n".join(machine_eval)) @atexit.register def clean_up() -> None: - logger.info("cleaning up") - for machine in machines: - if machine.pid is None: - continue - logger.info(f"killing {machine.name} (pid {machine.pid})") - machine.process.kill() - for _, _, process, _ in vde_sockets: - process.terminate() + with log.nested("cleaning up"): + for machine in machines: + if machine.pid is None: + continue + log.log("killing {} (pid {})".format(machine.name, machine.pid)) + machine.process.kill() + for _, _, process, _ in vde_sockets: + process.terminate() + log.close() tic = time.time() run_tests() toc = time.time() print("test script finished in {:.2f}s".format(toc - tic)) - - -if __name__ == "__main__": - main() diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 4812567b8c62..c6939c7d6989 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -62,7 +62,7 @@ rec { '' mkdir -p $out - tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver + LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver for i in */xchg/coverage-data; do mkdir -p $out/coverage-data From 322f0bd565a747e9127798773605766ad3678b40 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 09:17:48 +1000 Subject: [PATCH 376/688] vscode-extensions: editorconfig fixes --- .../misc/vscode-extensions/updateSettings.nix | 6 ++--- pkgs/misc/vscode-extensions/vscodeEnv.nix | 14 +++++----- pkgs/misc/vscode-extensions/vscodeEnvTest.nix | 3 +-- .../misc/vscode-extensions/vscodeExts2nix.nix | 12 ++++----- .../vscodeWithConfiguration.nix | 26 +++++++++---------- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/pkgs/misc/vscode-extensions/updateSettings.nix b/pkgs/misc/vscode-extensions/updateSettings.nix index a033229c5898..c7fecf080720 100644 --- a/pkgs/misc/vscode-extensions/updateSettings.nix +++ b/pkgs/misc/vscode-extensions/updateSettings.nix @@ -16,7 +16,7 @@ let updateVSCodeSettingsCmd = '' ( - echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' + echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' oldSettings=$(cat ${vscodeSettingsFile}) echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFile} )''; @@ -25,10 +25,10 @@ let fileName = builtins.baseNameOf vscodeSettingsFile; symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting '' && mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" ''; -in +in writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (fileName)}'' - (lib.optionalString (settings != {}) + (lib.optionalString (settings != {}) (if createIfDoesNotExists then '' [ ! -f "${vscodeSettingsFile}" ] && ${createEmptySettingsCmd} ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} diff --git a/pkgs/misc/vscode-extensions/vscodeEnv.nix b/pkgs/misc/vscode-extensions/vscodeEnv.nix index 6e4bb7b3ea88..7c58a4bdfb34 100644 --- a/pkgs/misc/vscode-extensions/vscodeEnv.nix +++ b/pkgs/misc/vscode-extensions/vscodeEnv.nix @@ -21,13 +21,13 @@ , user-data-dir ? ''"''${TMP}''${name}"/vscode-data-dir'' # if file exists will use it and import the extensions in it into this dervation else will use empty extensions list # this file will be created/updated by vscodeExts2nix when vscode exists -, mutableExtensionsFile +, mutableExtensionsFile }: -let +let mutableExtensionsFilePath = toString mutableExtensionsFile; - mutableExtensions = if builtins.pathExists mutableExtensionsFile + mutableExtensions = if builtins.pathExists mutableExtensionsFile then import mutableExtensionsFilePath else []; - vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { + vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; vscodeDefault = vscode; } @@ -63,19 +63,19 @@ let symlinkFromUserSetting = (user-data-dir != ""); }; - vscodeExts2nix = import ./vscodeExts2nix.nix { + vscodeExts2nix = import ./vscodeExts2nix.nix { inherit lib writeShellScriptBin; vscodeDefault = vscodeWithConfiguration; } { extensionsToIgnore = nixExtensions; - extensions = mutableExtensions; + extensions = mutableExtensions; }; code = writeShellScriptBin "code" '' ${updateSettingsCmd}/bin/vscodeNixUpdate-settings ${updateLaunchCmd}/bin/vscodeNixUpdate-launch ${updateKeybindingsCmd}/bin/vscodeNixUpdate-keybindings - ${vscodeWithConfiguration}/bin/code --wait "$@" + ${vscodeWithConfiguration}/bin/code --wait "$@" echo 'running vscodeExts2nix to update ${mutableExtensionsFilePath}...' ${vscodeExts2nix}/bin/vscodeExts2nix > ${mutableExtensionsFilePath} ''; diff --git a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix b/pkgs/misc/vscode-extensions/vscodeEnvTest.nix index d7e586cab6ec..19a9edbf1afe 100644 --- a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix +++ b/pkgs/misc/vscode-extensions/vscodeEnvTest.nix @@ -1,5 +1,5 @@ with import {}; -callPackage (import ./vscodeEnv.nix) { +callPackage (import ./vscodeEnv.nix) { extensionsFromVscodeMarketplace = vscode-utils.extensionsFromVscodeMarketplace; vscodeDefault = vscode; } { @@ -9,4 +9,3 @@ callPackage (import ./vscodeEnv.nix) { t = "test"; }; } - diff --git a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix index afd176b4c5e4..58ad5866c935 100644 --- a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix +++ b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix @@ -1,24 +1,24 @@ -# based on the passed vscode will stdout a nix expression with the installed vscode extensions +# based on the passed vscode will stdout a nix expression with the installed vscode extensions { lib , vscodeDefault , writeShellScriptBin }: ##User input -{ vscode ? vscodeDefault +{ vscode ? vscodeDefault , extensionsToIgnore ? [] # will use those extensions to get sha256 if still exists when executed. -, extensions ? [] +, extensions ? [] }: -let +let mktplcExtRefToFetchArgs = import ./mktplcExtRefToFetchArgs.nix; in writeShellScriptBin "vscodeExts2nix" '' - echo '[' + echo '[' for line in $(${vscode}/bin/code --list-extensions --show-versions \ ${lib.optionalString (extensionsToIgnore != []) '' - | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)' + | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)' ''} ) ; do [[ $line =~ ([^.]*)\.([^@]*)@(.*) ]] diff --git a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix index f15d14c74418..e20c631f8c03 100644 --- a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix +++ b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix @@ -1,22 +1,22 @@ # wrapper over vscode to control extensions per project (extensions folder will be created in execution path) -{ lib -, writeShellScriptBin -, extensionsFromVscodeMarketplace +{ lib +, writeShellScriptBin +, extensionsFromVscodeMarketplace , vscodeDefault }: ## User input -{ vscode ? vscodeDefault +{ vscode ? vscodeDefault # extensions to be symlinked into the project's extensions folder -, nixExtensions ? [] +, nixExtensions ? [] # extensions to be copied into the project's extensions folder -, mutableExtensions ? [] -, vscodeExtsFolderName ? ".vscode-exts" +, mutableExtensions ? [] +, vscodeExtsFolderName ? ".vscode-exts" , user-data-dir ? ''"''${TMP}vscodeWithConfiguration/vscode-data-dir"'' }: -let +let nixExtsDrvs = extensionsFromVscodeMarketplace nixExtensions; mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions; - mutableExtsPaths = lib.forEach mutExtsDrvs ( e: + mutableExtsPaths = lib.forEach mutExtsDrvs ( e: { origin = ''${e}/share/vscode/extensions/${e.vscodeExtUniqueId}''; target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: ''${ext.publisher}.${ext.name}'' == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}''; @@ -39,16 +39,16 @@ let cp -a ${ePath.origin} ${ePath.target} chmod -R u+rwx ${ePath.target} fi - '') mutableExtsPaths} + '') mutableExtsPaths} ''; in writeShellScriptBin "code" '' - if ! [[ "$@" =~ "--list-extension" ]]; then - mkdir -p "${vscodeExtsFolderName}" + if ! [[ "$@" =~ "--list-extension" ]]; then + mkdir -p "${vscodeExtsFolderName}" ${rmExtensions} ${cpExtensions} fi - ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ + ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ lib.optionalString (user-data-dir != "") ''--user-data-dir ${user-data-dir }'' } "$@" '' From 563b73d8803d81c8cbe4999680155b4330b6edb5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 00:35:41 +0000 Subject: [PATCH 377/688] solr: 8.5.2 -> 8.6.1 --- pkgs/servers/search/solr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 88a84dd61912..b5390d1537d2 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.5.2"; + version = "8.6.1"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "1kvd0vfic9h3glhz8dz5c1n8mmb9yv339pz1878wlh9j4k3xcmy4"; + sha256 = "0ds6zjsnwgpcmivzi7d6yqdmyn2mhf3k8g7xp26yfpm7f12gpq4g"; }; nativeBuildInputs = [ makeWrapper ]; From a05b9042b87fe253206d66f475ebd11d02a5c8a5 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 30 Aug 2020 17:43:34 -0700 Subject: [PATCH 378/688] nixosTests: Disable networking.networkd.macvlan This test is failing nondeterministically. Fixes #96709. Signed-off-by: Anders Kaseorg --- nixos/release-combined.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 7223d95774e4..945ba90e3454 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -121,7 +121,8 @@ in rec { (onFullSupported "nixos.tests.networking.networkd.dhcpSimple") (onFullSupported "nixos.tests.networking.networkd.link") (onFullSupported "nixos.tests.networking.networkd.loopback") - (onFullSupported "nixos.tests.networking.networkd.macvlan") + # Fails nondeterministically (https://github.com/NixOS/nixpkgs/issues/96709) + #(onFullSupported "nixos.tests.networking.networkd.macvlan") (onFullSupported "nixos.tests.networking.networkd.privacy") (onFullSupported "nixos.tests.networking.networkd.routes") (onFullSupported "nixos.tests.networking.networkd.sit") From da6f02596bed96e67504de6f34417d599eb79701 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 30 Aug 2020 17:47:31 -0700 Subject: [PATCH 379/688] nix-template: init at 0.1.0 --- .../nix-template/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/package-management/nix-template/default.nix diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix new file mode 100644 index 000000000000..0ef3602c5975 --- /dev/null +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "nix-template"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "jonringer"; + repo = pname; + rev = "v${version}"; + sha256 = "1h6xdvhzg7nb0s82b3r5bsh8bfdb1l5sm7fa24lfwd396xp9yyig"; + }; + + cargoSha256 = "13y3b60xnry71999kygvkr29gkyjss3ga3rzb43ajah4qp90rsqs"; + + meta = with lib; { + description = "Make creating nix expressions easy"; + homepage = "https://github.com/jonringer/nix-template/"; + changelog = "https://github.com/jonringer/nix-template/releases/tag/v${version}"; + license = licenses.cc0; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a846a3f184..224051e9546b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2241,6 +2241,8 @@ in nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nix-template = callPackage ../tools/package-management/nix-template { }; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; From b7a8f9a057eb7286177e99559822d592bf2b4d08 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 00:52:07 +0000 Subject: [PATCH 380/688] shotwell: 0.31.1 -> 0.31.2 --- pkgs/applications/graphics/shotwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 3549a16e2705..c041d2dde8cc 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.1"; + version = "0.31.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mbgrad4d4snffw2z3rkhwqq1bkxdgy52pblx99vjadvpgspb034"; + sha256 = "0ywzr6vgcz8yy60v0jp55na9lgqi4dbh2vakfphkcml1gpah0r2l"; }; nativeBuildInputs = [ From 1990bcad07ce5a0cdbd121bfa1b377746138e928 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sun, 30 Aug 2020 20:52:59 -0400 Subject: [PATCH 381/688] libgnomeui: Update patch URL. The GitHub repo has been removed but the commit is available on the GNOME GitLab. --- pkgs/desktops/gnome-2/platform/libgnomeui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index d248ad37d02c..20cc3877efb7 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "0001-gnome-scores.h-Convert-to-UTF-8.patch"; - url = "https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff"; + url = "https://gitlab.gnome.org/Archive/libgnomeui/-/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff"; sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk"; }) ]; From 9ce6e9f018002f0f97cc8f495bb5a5dd7da1a681 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 11:16:45 +1000 Subject: [PATCH 382/688] .editorconfig: add eggs.nix --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index 31dd207e4e09..19eb19a5116a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -57,6 +57,9 @@ indent_size = unset [deps.nix] insert_final_newline = unset +[eggs.nix] +trim_trailing_whitespace = unset + [gemset.nix] insert_final_newline = unset From 30e1f5c470d1170fd42713c3c28f70ec985a4ec7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 02:00:20 +0000 Subject: [PATCH 383/688] saml2aws: 2.26.2 -> 2.27.0 --- pkgs/tools/security/saml2aws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 940e67013eec..fc52662e536f 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.26.2"; + version = "2.27.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "0y5gvdrdr6i9spdwsxvzs1bxs32icxpkqxnglp1bf4gglc580d87"; + sha256 = "15ddzab93iqwbvxnaw5wp4dzwlxjqxvyy1c4w37jm69zkczylrmc"; }; runVend = true; - vendorSha256 = "1kzihyx44sx6php4z58fzy6c3g0y713939yzxpgk3n03snn2x8sf"; + vendorSha256 = "1w7vnpv36lhxpaljdhslbckkr7p81nzc91a0503wk8nrrc4ljsyy"; doCheck = false; From 71f860dc713b2a29b41d12870c4b8f6affe30d2b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 02:47:41 +0000 Subject: [PATCH 384/688] tailscale: 1.0.3 -> 1.0.5 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 863dc505032e..32c0c84dd087 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "1m3cfq4qyg2l0hpk8s7nr8cw2j7akiga7x8bwyhdjifnkwsyz6x7"; + sha256 = "0ib2s694kf5iz5hvrlzfs80z0931dhva7yir80crq0pji9y4rp7b"; }; nativeBuildInputs = [ makeWrapper ]; From 19688e1df8cbf527582cb603d0184890f57a3aad Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 31 Aug 2020 02:55:58 +0000 Subject: [PATCH 385/688] sonic-visualiser: 4.0.1 -> 4.2 --- .../audio/sonic-visualiser/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index e8b6a4d4313b..2593bf38d194 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,8 +1,8 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo -, libmad, libogg, lrdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland +, libmad, lrdf, librdf_raptor, librdf_rasqal, libsamplerate +, libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland , rubberband, serd, sord, vamp-plugin-sdk, fftwFloat , capnproto, liboggz, libfishsound, libid3tag, opusfile , wrapQtAppsHook @@ -10,13 +10,14 @@ stdenv.mkDerivation rec { pname = "sonic-visualiser"; - version = "4.0.1"; + version = "4.2"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz"; - sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2755/${pname}-${version}.tar.gz"; + sha256 = "1wsvranhvdl21ksbinbgb55qvs3g2d4i57ssj1vx2aln6m01ms9q"; }; + nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; buildInputs = [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland @@ -27,7 +28,6 @@ stdenv.mkDerivation rec { # portaudio libpulseaudio libmad - libogg # ? libfishsound liblo libX11 @@ -37,15 +37,13 @@ stdenv.mkDerivation rec { opusfile ]; - nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; - - enableParallelBuilding = true; - # comment out the tests preConfigure = '' sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "View and analyse contents of music audio files"; homepage = "https://www.sonicvisualiser.org/"; From 98d12d176fae3255c01a2df0fb84ca107e4318dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 03:08:13 +0000 Subject: [PATCH 386/688] todo-txt-cli: 2.11.0 -> 2.12.0 --- pkgs/applications/office/todo.txt-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index d711440fc340..489b759f48c4 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: let - version = "2.11.0"; + version = "2.12.0"; in stdenv.mkDerivation { pname = "todo.txt-cli"; inherit version; src = fetchurl { url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz"; - sha256 = "0majx8lcvhh8ji54qi0sxr833wchdss95fjc92byd8g3lfz27rsz"; + sha256 = "0gni8nj3wwdf7nl98d1bpx064bz5xari65hb998qqr92h0n9pnp6"; }; installPhase = '' From c77bf12434c2423cde9519a9e404df8e7265d44c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 13:08:48 +1000 Subject: [PATCH 387/688] .editorconfig: add emscripten-packages.nix --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index 19eb19a5116a..43970edebe5c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -105,5 +105,8 @@ insert_final_newline = unset indent_size = unset trim_trailing_whitespace = unset +[pkgs/top-level/emscripten-packages.nix] +trim_trailing_whitespace = unset + [pkgs/top-level/perl-packages.nix] indent_size = unset From b1df60642875fcdd14cb4a743919e144fe490e5b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 03:39:12 +0000 Subject: [PATCH 388/688] stress-ng: 0.11.14 -> 0.11.19 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index d9953b7cdb54..9939f9ea1542 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.11.14"; + version = "0.11.19"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0sqka2ns9xqma9wa67in4vrd15q0rz62gblmzniq5i4xppykc55j"; + sha256 = "0s08qahjc68h5qhnahmb9z19l51p5sw2pmzrlknq1j5900zpa2x5"; }; postPatch = '' From 69e6d780e9a8f23496facdd08f8539d05f1d17cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 03:43:58 +0000 Subject: [PATCH 389/688] sxhkd: 0.6.1 -> 0.6.2 --- pkgs/applications/window-managers/sxhkd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index 2404129b165d..ac28abc31d3f 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "sxhkd"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "baskerville"; repo = "sxhkd"; rev = version; - sha256 = "0j7bl2l06r0arrjzpz7al9j6cwzc730knbsijp7ixzz96pq7xa2h"; + sha256 = "1winwzdy9yxvxnrv8gqpigl9y0c2px27mnms62bdilp4x6llrs9r"; }; buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; From 2134a791205b340134b9520c605a56e0361915a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 03:49:42 +0000 Subject: [PATCH 390/688] spring-boot-cli: 2.3.1 -> 2.3.2 --- pkgs/development/tools/spring-boot-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 15d6553bbb1b..38573e075146 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "spring-boot-cli"; - version = "2.3.1"; + version = "2.3.2"; src = fetchzip { url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; - sha256 = "0ddmwcifrmw197vc49b0x8vfampj3n947r4vv4nni5vjclqqfds5"; + sha256 = "1zqfnxz57234227rp303iwis0mjkkjkpcqnj9jgw78gykjnqdmmq"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 8ef6f4bd567306518724d025560f66e20b71d69a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Mon, 31 Aug 2020 06:40:39 +0200 Subject: [PATCH 391/688] x265: dont build high bit-depths for 32bit systems (#96260) --- pkgs/development/libraries/x265/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index ae3392aeb12a..48ed6cf46802 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -84,9 +84,11 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=ON" "-DHIGH_BIT_DEPTH=OFF" "-DENABLE_HDR10_PLUS=OFF" + ] ++ stdenv.lib.optionals is64bit [ "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" "-DLINKED_10BIT=ON" "-DLINKED_12BIT=ON" + ] ++ [ (mkFlag cliSupport "ENABLE_CLI") ] ++ cmakeFlagsAll; From ce358290066f8d63dd779a2b7951a5d58a9686fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 04:47:35 +0000 Subject: [PATCH 392/688] sshguard: 2.4.0 -> 2.4.1 --- pkgs/tools/security/sshguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index bad1c9fd16d5..6c2298f6729f 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoreconfHook, yacc, flex}: stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.1"; pname = "sshguard"; src = fetchurl { url = "mirror://sourceforge/sshguard/${pname}-${version}.tar.gz"; - sha256 = "1h6n2xyh58bshplbdqlr9rbnf3lz7nydnq5m2hkq15is3c4s8p06"; + sha256 = "0rrwmx91ifvc61wkld8gjkmfsq0ixxmf7m8fg4addkkxwvk04pc7"; }; doCheck = true; From b1f2a30191f489fb8afc881f861e3511b7f04f0b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 24 Aug 2020 07:47:48 +0200 Subject: [PATCH 393/688] ocamlPackages.posix-base: init at 2.0.0 --- pkgs/development/ocaml-modules/posix/base.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/posix/base.nix diff --git a/pkgs/development/ocaml-modules/posix/base.nix b/pkgs/development/ocaml-modules/posix/base.nix new file mode 100644 index 000000000000..a6fe690ebcc7 --- /dev/null +++ b/pkgs/development/ocaml-modules/posix/base.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchFromGitHub +, ctypes, integers +}: + +buildDunePackage rec { + pname = "posix-base"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-posix"; + rev = "v${version}"; + sha256 = "18px8hfqcfy2lk8105ki3hrxxigs44gs046ba0fqda6wzd0hr82b"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ ctypes integers ]; + + meta = { + homepage = "https://www.liquidsoap.info/ocaml-posix/"; + description = "Base module for the posix bindings"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2ebfc3fff9f4..4878266ac831 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -754,6 +754,8 @@ let piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; + posix-base = callPackage ../development/ocaml-modules/posix/base.nix { }; + ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; From 83122f9657610974f6ce9ea3a48056c61ed17abd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 24 Aug 2020 07:48:11 +0200 Subject: [PATCH 394/688] ocamlPackages.posix-socket: init at 2.0.0 --- pkgs/development/ocaml-modules/posix/socket.nix | 16 ++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/ocaml-modules/posix/socket.nix diff --git a/pkgs/development/ocaml-modules/posix/socket.nix b/pkgs/development/ocaml-modules/posix/socket.nix new file mode 100644 index 000000000000..69a469bbeced --- /dev/null +++ b/pkgs/development/ocaml-modules/posix/socket.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, posix-base }: + +buildDunePackage { + pname = "posix-socket"; + + inherit (posix-base) version src useDune2; + + propagatedBuildInputs = [ posix-base ]; + + doCheck = true; + + meta = posix-base.meta // { + description = "Bindings for posix sockets"; + }; + +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4878266ac831..f510e67ab895 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -756,6 +756,8 @@ let posix-base = callPackage ../development/ocaml-modules/posix/base.nix { }; + posix-socket = callPackage ../development/ocaml-modules/posix/socket.nix { }; + ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; From 6a01a4e69a9ac65606d08adb14aa60f82eaf0aa0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 24 Aug 2020 07:48:16 +0200 Subject: [PATCH 395/688] ocamlPackages.posix-types: init at 2.0.0 --- pkgs/development/ocaml-modules/posix/types.nix | 15 +++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/ocaml-modules/posix/types.nix diff --git a/pkgs/development/ocaml-modules/posix/types.nix b/pkgs/development/ocaml-modules/posix/types.nix new file mode 100644 index 000000000000..2512fe892c13 --- /dev/null +++ b/pkgs/development/ocaml-modules/posix/types.nix @@ -0,0 +1,15 @@ +{ lib, buildDunePackage, posix-base }: + +buildDunePackage { + pname = "posix-types"; + + inherit (posix-base) version src useDune2; + + minimumOCamlVersion = "4.03"; + + propagatedBuildInputs = [ posix-base ]; + + meta = posix-base.meta // { + description = "Bindings for the types defined in "; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f510e67ab895..32bb7d337860 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -758,6 +758,8 @@ let posix-socket = callPackage ../development/ocaml-modules/posix/socket.nix { }; + posix-types = callPackage ../development/ocaml-modules/posix/types.nix { }; + ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; From 89af2431893c9d88a194f3632cd78530f3478083 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 05:22:17 +0000 Subject: [PATCH 396/688] squid: 4.12 -> 4.13 --- pkgs/servers/squid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index d14252da999f..ad7d534103cf 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "4.12"; + version = "4.13"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; - sha256 = "05z34ysy2zn7as11vd365xxhh36bm1ysiwcbr0i0f0nwng406apl"; + sha256 = "1q1ywpic6s7dfjj3cwzcfgscc4zq0aih462gyas7j1z683ss14b8"; }; nativeBuildInputs = [ pkgconfig ]; From 04f951684571944c4ccef204262a74924afd1b1f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 04:05:04 +0000 Subject: [PATCH 397/688] typora: 0.9.89 -> 0.9.93 --- pkgs/applications/editors/typora/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 049ba45f7af3..3c55cffdcf12 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , makeWrapper -, electron_8 +, electron_9 , dpkg , gtk3 , glib @@ -13,15 +13,15 @@ }: let - electron = electron_8; + electron = electron_9; in stdenv.mkDerivation rec { pname = "typora"; - version = "0.9.89"; + version = "0.9.95"; src = fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "0gk8j13z1ymad34zzcy4vqwyjgd5khgyw5xjj9rbzm5v537kqmx6"; + sha256 = "0kgzk7z707vlbjrvykrnw2h6wscmc3h5hxycyz1z1j2cz26fns4p"; }; nativeBuildInputs = [ From 15e64e1b6490d6df4194adc25e2f1bb320196497 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 05:40:31 +0000 Subject: [PATCH 398/688] sslh: 1.21 -> 1.21c --- pkgs/servers/sslh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 5be4805909da..578d280afd9a 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sslh"; - version = "1.21"; + version = "1.21c"; src = fetchurl { url = "https://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; - sha256 = "1am63nslvv9xkbn9xavpf1zl6f7g1snz8cvnzlya7dq4la4y97d7"; + sha256 = "01p7w74ppszxgz6n41lqd6xqvc7bjk2dsc769dd1yb7q4qvpiziv"; }; postPatch = "patchShebangs *.sh"; From 1249f6c90a1c0729ea08da2425f27c8dab210d00 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 06:05:47 +0000 Subject: [PATCH 399/688] worker: 4.4.0 -> 4.5.0 --- pkgs/applications/misc/worker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 9e3022457a0e..b19b1b86cf57 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "1k2svpzq01n1h9365nhi7r2k7dmsviczxi9m6fb80ccccdz7i530"; + sha256 = "02xrdg1v784p4gfqjm1mlxqwi40qlbzhp68p5ksj96cjv6av5b5s"; }; buildInputs = [ libX11 ]; From 8def3fc6fe20b867413f33cf2a9d52a473d5b80a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 06:22:06 +0000 Subject: [PATCH 400/688] wcslib: 7.3 -> 7.3.1 --- pkgs/development/libraries/wcslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index d13cdaff8c62..2b3414df1a4b 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "7.3"; + version = "7.3.1"; pname = "wcslib"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 ="0q99k61l2zh6irzkd5195aama37mlm0nivamz6j6r8l2ad1cy0ab"; + sha256 ="0p0bp3jll9v2094a8908vk82m7j7qkjqzkngm1r9qj1v6l6j5z6c"; }; prePatch = '' From 57ebf6a0c00cbba6dd568c4841382b9c53ff4cac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 06:42:17 +0000 Subject: [PATCH 401/688] wgetpaste: 2.29 -> 2.30 --- pkgs/tools/text/wgetpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 9180573541d2..852175c4f216 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, wget, bash }: stdenv.mkDerivation rec { - version = "2.29"; + version = "2.30"; pname = "wgetpaste"; src = fetchurl { url = "http://wgetpaste.zlin.dk/${pname}-${version}.tar.bz2"; - sha256 = "1rp0wxr3zy7y2xp3azaadfghrx7g0m138f9qg6icjxkkz4vj9r22"; + sha256 = "14k5i6j6f34hcf9gdb9cnvfwscn0ys2dgd73ci421wj9zzqkbv73"; }; # currently zsh-autocompletion support is not installed From 29b5f40c45ab7fe9a8293bcc6595f62077008fb9 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 31 Aug 2020 08:51:48 +0200 Subject: [PATCH 402/688] dbeaver: 7.1.5 -> 7.2.0 --- 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 70ac55ed5adf..e8a04aa2e14f 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 = "7.1.5"; + version = "7.2.0"; 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 = "14pdkg9xxnldr7qwpb61hp2dgsd5h9scjn59ajqsqn4f4sgcpba0"; + sha256 = "0zpxsdzhn5fsrlq04v5kvkrgf4dsj5zmpypj9awsd2mjcbp6yxd7"; }; installPhase = '' From f88a1a6a1afecc70fea77a40ed52f2a5a040a042 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 07:09:15 +0000 Subject: [PATCH 403/688] vultr: 2.0.1 -> 2.0.2 --- pkgs/development/tools/vultr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 9b53c28c60ed..7c396f69f259 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "vultr"; - version = "2.0.1"; + version = "2.0.2"; goPackagePath = "github.com/JamesClonk/vultr"; src = fetchFromGitHub { owner = "JamesClonk"; repo = "vultr"; rev = "v${version}"; - sha256 = "16wlncf0wax5jhpbfif5k16knigxy89vcby0b821klv6hlm6cc58"; + sha256 = "0br8nxi9syraarp4hzav9a3p4zxhyi45cq5dsclzxi3fga2l6mqg"; }; meta = { From 9a94b93acf2bc9a3050374207a2bb9b0b94fd5a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 07:32:15 +0000 Subject: [PATCH 404/688] xfractint: 20.04p15 -> 20.04p16 --- pkgs/applications/graphics/xfractint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix index 5c7b4c22a38b..08ef0cd7b584 100644 --- a/pkgs/applications/graphics/xfractint/default.nix +++ b/pkgs/applications/graphics/xfractint/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libX11, libXft}: stdenv.mkDerivation rec { pname = "xfractint"; - version = "20.04p15"; + version = "20.04p16"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://www.fractint.net/ftp/current/linux/xfractint-${version}.tar.gz"; - sha256 = "1wv2hgyjvrjxzqxb55vz65ra80p24j8sd34llykk2qlx73x8f3nk"; + sha256 = "1ba77jifxv8jql044mdydh4p4ms4w5vw3qrqmcfzlvqfxk7h2m2f"; }; buildInputs = [libX11 libXft]; From 05e0e47baba917a6fa5e47c74c2e34b38a6fa807 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 07:52:37 +0000 Subject: [PATCH 405/688] xapian: 1.4.16 -> 1.4.17 --- pkgs/development/libraries/xapian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 33a4fb93cbab..195aea5c2f18 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -38,5 +38,5 @@ let }; }; in { - xapian_1_4 = generic "1.4.16" "4937f2f49ff27e39a42150e928c8b45877b0bf456510f0785f50159a5cb6bf70"; + xapian_1_4 = generic "1.4.17" "0bjpaavdckl4viznr8gbq476fvg648sj4rks2vacmc51vrb8bsxm"; } From ddec19042dee0d661ebd105f70bf76d4656189ad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 08:39:29 +0000 Subject: [PATCH 406/688] wolfssl: 4.4.0 -> 4.5.0 --- pkgs/development/libraries/wolfssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 2815520f5179..30fc90ec8c09 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "1bgkxqgxwa5dvi7fkna64wpcs552f3yxvs6fh6d32v7vg88vpfx9"; + sha256 = "138ppnwkqkfi7nnqpd0b93dqaph72ma65m9286bz2qzlis1x8r0v"; }; configureFlags = [ "--enable-all" ]; From cc2769b744f1fe63fbbbf1eac16a1c56d1bff388 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 31 Aug 2020 10:55:20 +0200 Subject: [PATCH 407/688] nqp: 2020.08.1 -> 2020.08.2 --- pkgs/development/interpreters/rakudo/nqp.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 93b42d2b8e1d..3f5f7afcfed4 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.08.1"; + version = "2020.08.2"; src = fetchurl { - url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0pxmg22dx6rhfgrxq4gbwqf6d2nahw6iprjvrg8brkbcbyj3ryhd"; + url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; + sha256 = "14zr1swprxl284k0h1w72pcypj24sga15170ylaqjb8wxy8h1mqw"; }; buildInputs = [ perl ]; From 4ec71d7f5d86b562e86e4a21c44d16807d643ab1 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 31 Aug 2020 10:55:50 +0200 Subject: [PATCH 408/688] rakudo: 2020.08.1 -> 2020.08.2 --- pkgs/development/interpreters/rakudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index fb33743dc9ac..0c708cd3171e 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.08.1"; + version = "2020.08.2"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "1jwlqppm2g6ivzpipkcyihsxzsii3qyx1f35n7wj5dsf99b3hkfm"; + sha256 = "16qsq6alvk2x44x39j2fzxigvm5cvmz85i0nkjcw0wz29yyf8lch"; }; buildInputs = [ icu zlib gmp perl ]; From 1dbe47ced51bff93d2994b79b1a0e0380c7843c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 31 Aug 2020 11:51:52 +0200 Subject: [PATCH 409/688] knot-dns: 2.9.5 -> 2.9.6 This is mostly a bug fix version with some small improvements. https://gitlab.nic.cz/knot/knot-dns/-/tags/v2.9.6 --- pkgs/servers/dns/knot-dns/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 6a602883b35c..d546b07148b2 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -5,14 +5,13 @@ let inherit (stdenv.lib) optional optionals; in -# Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { pname = "knot-dns"; - version = "2.9.5"; + version = "2.9.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "1109a8ba212ff8ddfdbaf44a6f8fc13a2b880a98a9e54c19112ba72a1aacbf76"; + sha256 = "bf742883c6825b54f19f2dadca2c94fec1ff8bdcf0a52388e2e167937594b2e7"; }; outputs = [ "bin" "out" "dev" ]; From 6f2d868624c713096aeb3fefdf09652b85ebd59c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 10:00:23 +0000 Subject: [PATCH 410/688] victoriametrics: 1.37.4 -> 1.40.0 --- pkgs/servers/nosql/victoriametrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index c470dcf1fd09..b41861768d86 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "VictoriaMetrics"; - version = "1.37.4"; + version = "1.40.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "02jr0qz130jz7ncfch1jry0prd00669j53mlmpb6ky0xiz5y2zq1"; + sha256 = "0dnzc7yrd91g67wkx0g1b0gi7918pi1hqv4mjlxi2ccs8phxkk7l"; }; goPackagePath = "github.com/VictoriaMetrics/VictoriaMetrics"; From ada252961c56f7f3931c079434a06c98686147f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 10:17:52 +0000 Subject: [PATCH 411/688] zotero: 5.0.88 -> 5.0.89 --- pkgs/applications/office/zotero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index c0690415d677..567508c36753 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.88"; + version = "5.0.89"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "19r9jmakr04raqripfnqm2b9gwpi52lklrrqgqyb1x35a4xvnj62"; + sha256 = "18p4qnnfx9f2frk7f2nk1d7jr4cjzg9z7lfzrk7vq11qgbjdpqbl"; }; nativeBuildInputs = [ wrapGAppsHook ]; From 9ea3bdfe15af5ab7b43e6805d8d12f4c3bc9da92 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 10:22:26 +0000 Subject: [PATCH 412/688] yadm: 2.4.0 -> 2.5.0 --- pkgs/applications/version-management/yadm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index fab89d663fa7..37fd8055662d 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, git, gnupg }: -let version = "2.4.0"; in +let version = "2.5.0"; in stdenv.mkDerivation { pname = "yadm"; inherit version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "0kpahznrkxkyj92vrhwjvldg2affi1askgwvpgbs4mg40f92szlp"; + sha256 = "128qlx8mp7h5ifapqqgsj3fwghn3q6x6ya0y33h5r7gnassd3njr"; }; dontConfigure = true; From ce8c43c53869711f8247601160f4f6f2a312f213 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Mon, 31 Aug 2020 12:25:00 +0200 Subject: [PATCH 413/688] microcodeAmd: update homepage URL --- pkgs/os-specific/linux/microcode/amd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index a1a37db9dd6f..135187c9a108 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "AMD Processor microcode patch"; - homepage = "http://www.amd64.org/support/microcode.html"; + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; }; From 053910590dfb34d231837e9862600e40628ad630 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Mon, 31 Aug 2020 12:27:36 +0200 Subject: [PATCH 414/688] audacity: update homepage URL --- pkgs/applications/audio/audacity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 18f2b4f67cdb..20526c8c6c56 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sound editor with graphical UI"; - homepage = "http://audacityteam.org/"; + homepage = "https://www.audacityteam.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lheckemann ]; platforms = intersectLists platforms.linux platforms.x86; # fails on ARM From 56a003c0e0fd64635b46ad3c8950dc3024165735 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 11:12:27 +0000 Subject: [PATCH 415/688] xlockmore: 5.64 -> 5.65 --- pkgs/misc/screensavers/xlockmore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 01ee818f256f..b59ed85f6bc2 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,11 +2,11 @@ , libXdmcp, libXt }: stdenv.mkDerivation rec { - name = "xlockmore-5.64"; + name = "xlockmore-5.65"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "0fbh6avdzsm1prafglr2xdd8c4ibkddi6xxywvqgvzp0zb2kqimr"; + sha256 = "0d4l8ibbvc62whlq8rrbvqr3011a7h21l9na93r579g0dfwdbh6d"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; From 599089ed1ddf1ec5cf784a28026798b446fa4d5a Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Mon, 31 Aug 2020 07:19:40 -0400 Subject: [PATCH 416/688] neovim-qt: Add homepage --- pkgs/applications/editors/neovim/qt.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 8fe93d37c7e8..b04c575dded7 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -38,6 +38,7 @@ let meta = with stdenv.lib; { description = "Neovim client library and GUI, in Qt5"; + homepage = "https://github.com/equalsraf/neovim-qt"; license = licenses.isc; maintainers = with maintainers; [ peterhoeg ]; inherit (neovim.meta) platforms; From 425d945250bddc4ca782f1a784b7c585f350b6fb Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 31 Aug 2020 11:39:55 +0200 Subject: [PATCH 417/688] toss: init at 1.1 --- pkgs/tools/networking/toss/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/networking/toss/default.nix diff --git a/pkgs/tools/networking/toss/default.nix b/pkgs/tools/networking/toss/default.nix new file mode 100644 index 000000000000..9752dcc4f64b --- /dev/null +++ b/pkgs/tools/networking/toss/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "toss"; + version = "1.1"; + src = fetchFromGitHub { + owner = "zerotier"; + repo = pname; + rev = version; + sha256 = "05ql0d8wbdhnmh3dw8ch5bi6clfb9h8v21lq2a74iy02slya2y0r"; + }; + preInstall = "export DESTDIR=$out/bin"; + meta = with stdenv.lib; + src.meta // { + description = "Dead simple LAN file transfers from the command line"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ehmry ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44e294af2f1f..363d2aa84b01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7396,6 +7396,8 @@ in torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + toss = callPackage ../tools/networking/toss { }; + tox-node = callPackage ../tools/networking/tox-node { }; toxvpn = callPackage ../tools/networking/toxvpn { }; From 22dbd2cbcaf29828fd5b5758b831b5591eb449bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 11:21:29 +0000 Subject: [PATCH 418/688] yubikey-manager-qt: 1.1.4 -> 1.1.5 --- pkgs/tools/misc/yubikey-manager-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 8ebbe75d686a..01454b48254c 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -20,11 +20,11 @@ let inherit (stdenv) lib; in stdenv.mkDerivation rec { pname = "yubikey-manager-qt"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "0rbr72741q7fqkr9qmvgj2mi6192ayz7bl935q2bsnqils4wsa3f"; + sha256 = "1yimlaqvhq34gw6wkqgil0qq8x9zbfzh4psqihjr2d9jaa2wygwy"; }; nativeBuildInputs = [ wrapQtAppsHook python3.pkgs.wrapPython qmake ]; From 4a737a18ac3076fc0bfd40c88556f966f9042162 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 31 Aug 2020 12:10:28 +0200 Subject: [PATCH 419/688] =?UTF-8?q?ocamlPackages.mirage-crypto*:=200.8.4?= =?UTF-8?q?=20=E2=86=92=200.8.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mirage-crypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 71c044a8cc12..e178e066a384 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "1w09wllls4rp1abq0awffxf69dn0xciy6hsqz413ing5r151wjxr"; + sha256 = "0l6q0z5ghhy0djfscb2i2xg4dpmxs4xkwh16kc473cmb4hsxsmyk"; }; useDune2 = true; From 6ba3207643fd27ffa25a172911e3d6825814d155 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 31 Aug 2020 00:20:23 +0200 Subject: [PATCH 420/688] =?UTF-8?q?lowdown:=200.7.3=20=E2=86=92=200.7.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/typesetting/lowdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index aa7a8598d667..017066a2c22b 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.3"; + version = "0.7.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "14mx22aqr9cmin4cyhrclhm0hly1i21j2dmsikfp1c87wl2kpn9xgxnix5r0iqh5dwjxdh591rfh21xjp0l11m0nl5wkpnn7wmq7g6b"; + sha512 = "2iw5x3lf5knnscp0ifgk50yj48p54cbd34h94qrxa9vdybg2nnipklrqmmqblf6l7qph98h7jvlyr99m5qlrki9lvjr1jcgbgp31pn0"; }; nativeBuildInputs = [ which ]; From b6ea4f406508ccd146aeee2ae87f55578382043a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 31 Aug 2020 12:16:09 +0200 Subject: [PATCH 421/688] =?UTF-8?q?ocamlPackages.mirage-stack:=202.0.1=20?= =?UTF-8?q?=E2=86=92=202.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mirage-stack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-stack/default.nix b/pkgs/development/ocaml-modules/mirage-stack/default.nix index 64168716399d..528ea68d9851 100644 --- a/pkgs/development/ocaml-modules/mirage-stack/default.nix +++ b/pkgs/development/ocaml-modules/mirage-stack/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "mirage-stack"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz"; - sha256 = "1xdy59bxnki1r0jwm3s8fwarhhbxr0lsqqiag5b1j41hciiqp9jq"; + sha256 = "1y110i4kjr03b0ji3q5h0bi3n3q8mdkfflb3fyq5rvpi5l45vvdb"; }; propagatedBuildInputs = [ mirage-protocols ]; From d881be747d4ba38133b0f6dd5a041fe53e8eb6cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 12:15:05 +0000 Subject: [PATCH 422/688] ydiff: 1.1 -> 1.2 --- pkgs/development/tools/ydiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix index f3ecbb451f65..510808fc4127 100644 --- a/pkgs/development/tools/ydiff/default.nix +++ b/pkgs/development/tools/ydiff/default.nix @@ -5,11 +5,11 @@ with pythonPackages; buildPythonApplication rec { pname = "ydiff"; - version = "1.1"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf"; + sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; }; patchPhase = '' From 4684bb931179e6a1cf398491cc2df97c03aa963f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Aug 2020 08:28:23 -0400 Subject: [PATCH 423/688] linux: 5.7.18 -> 5.7.19 --- pkgs/os-specific/linux/kernel/linux-5.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix index 187bb0dd6bba..4f721d8b0e4d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.18"; + version = "5.7.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0p54icpxacrx8k09qam2hx22azh9xz9fzyif2z73qagk3syz5pd4"; + sha256 = "1rwzp51ddlkdzanj6i8jqj5yh0njpzn7ly4r8nnzwkdfp5465721"; }; } // (args.argsOverride or {})) From 019338373a5c2477023470c0248772fad303830e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Aug 2020 08:28:41 -0400 Subject: [PATCH 424/688] linux: 5.8.4 -> 5.8.5 --- pkgs/os-specific/linux/kernel/linux-5.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index 5d545f184f32..59acda122aac 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.4"; + version = "5.8.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "15hyz92wsk6fxqr1rq0k77qw76jka2igpc9xviwa0j4a5qrr43fv"; + sha256 = "0zwl0nk3x6fxwsbnmpx1drh7v0116yhgamisb1pghd472mmw6klx"; }; } // (args.argsOverride or {})) From 5ef4bad431341b3aa360609eac885938802f5a99 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Aug 2020 08:29:01 -0400 Subject: [PATCH 425/688] linux/hardened/patches/4.14: 4.14.194.a -> 4.14.195.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 824eb1a69668..2ecf4a3c317e 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,8 +1,8 @@ { "4.14": { - "name": "linux-hardened-4.14.194.a.patch", - "sha256": "07z3lr3mbm6c95d7fra2qp071n1c45f9241cl19zs63g00avi11p", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.194.a/linux-hardened-4.14.194.a.patch" + "name": "linux-hardened-4.14.195.a.patch", + "sha256": "1a1g9q750gbnkcycqnzafb22f7250ck8dvzx6jqkz669wdg2pd7z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.195.a/linux-hardened-4.14.195.a.patch" }, "4.19": { "name": "linux-hardened-4.19.141.a.patch", From 3b39d531ad22ecae26d72767168e97d92a3bda26 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Aug 2020 08:29:03 -0400 Subject: [PATCH 426/688] linux/hardened/patches/4.19: 4.19.141.a -> 4.19.142.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 2ecf4a3c317e..a2ecaa8e3979 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.195.a/linux-hardened-4.14.195.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.141.a.patch", - "sha256": "0yiqkkp17pf9r6nakpnqhvmf8awpzp5n27cmh15ril7vn1y71sxw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.141.a/linux-hardened-4.19.141.a.patch" + "name": "linux-hardened-4.19.142.a.patch", + "sha256": "1gwvacr23lp8qryfhnqn89pn9ly9d8c42rirvkz5psfmvnm7vxbn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.142.a/linux-hardened-4.19.142.a.patch" }, "5.4": { "name": "linux-hardened-5.4.60.a.patch", From 69274cf2d04543b8f17859abdc06b85e33cbe2f0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Aug 2020 08:29:05 -0400 Subject: [PATCH 427/688] linux/hardened/patches/5.4: 5.4.60.a -> 5.4.61.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a2ecaa8e3979..9741cec1e118 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.142.a/linux-hardened-4.19.142.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.60.a.patch", - "sha256": "138kms73rlj5zmsb2ivjzz1jr5aa8y8pmwzx02c7j1qk08v82823", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.60.a/linux-hardened-5.4.60.a.patch" + "name": "linux-hardened-5.4.61.a.patch", + "sha256": "1sgysrkycca860m2h7vrnfkplbsari6blcrkbsn285s5d0fsicnc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.61.a/linux-hardened-5.4.61.a.patch" }, "5.7": { "name": "linux-hardened-5.7.17.a.patch", From 5fa49dc8b0eb3e8a2548a2ae414d56350a64fac7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Aug 2020 08:29:07 -0400 Subject: [PATCH 428/688] linux/hardened/patches/5.7: 5.7.17.a -> 5.7.19.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 9741cec1e118..060d747e763d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -15,8 +15,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.61.a/linux-hardened-5.4.61.a.patch" }, "5.7": { - "name": "linux-hardened-5.7.17.a.patch", - "sha256": "181b473y0hkw076hsndw6nfynr2yhcaypj48iqnk25hzcj40nnaz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.17.a/linux-hardened-5.7.17.a.patch" + "name": "linux-hardened-5.7.19.a.patch", + "sha256": "1lydlh499aj3ck5cnv8q2271y4klvp17zm7j7qni16am14bld936", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" } } From 1b0186928d298dfe7711ff99b0c1b02d040dd163 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Aug 2020 08:30:45 -0400 Subject: [PATCH 429/688] oh-my-zsh: 2020-08-24 -> 2020-08-28 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 2fce32e018e5..8cc9f27494ff 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-08-24"; + version = "2020-08-28"; pname = "oh-my-zsh"; - rev = "cfb86cd08d3b24fd4b59d0d35b3af1f589c891fa"; + rev = "4ed6fd2b8b6a0efb2f84f00a64503282aca260e7"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0af37smv0bqw37bng2halzgszf8y3m2sxahdff54m16asm0py2cr"; + sha256 = "0f2f1k6s28lgxpjdgl4s7jisw6dgva9mcsqlsq0wg6041p246nai"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From c23a404cb6ee3a490583c1d08ef67c22b494880c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Aug 2020 09:08:49 -0400 Subject: [PATCH 430/688] Remove fetchpatch --- pkgs/shells/zsh/oh-my-zsh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index fc87a3a2b312..2a98f43fb331 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -1,7 +1,7 @@ # This script was inspired by the ArchLinux User Repository package: # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git -{ stdenv, fetchFromGitHub, fetchpatch }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "2020-08-28"; From 416987cfff48e2e8b30f5f64a2ba6ced58c51039 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Aug 2020 09:15:47 -0400 Subject: [PATCH 431/688] oh-my-zsh: Fix update script --- pkgs/shells/zsh/oh-my-zsh/default.nix | 3 ++- pkgs/shells/zsh/oh-my-zsh/update.sh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 2a98f43fb331..33a32b48c30b 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -6,11 +6,12 @@ stdenv.mkDerivation rec { version = "2020-08-28"; pname = "oh-my-zsh"; + rev = "4ed6fd2b8b6a0efb2f84f00a64503282aca260e7"; src = fetchFromGitHub { + inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "4ed6fd2b8b6a0efb2f84f00a64503282aca260e7"; sha256 = "0f2f1k6s28lgxpjdgl4s7jisw6dgva9mcsqlsq0wg6041p246nai"; }; diff --git a/pkgs/shells/zsh/oh-my-zsh/update.sh b/pkgs/shells/zsh/oh-my-zsh/update.sh index 0146cac8496c..738c0810737a 100755 --- a/pkgs/shells/zsh/oh-my-zsh/update.sh +++ b/pkgs/shells/zsh/oh-my-zsh/update.sh @@ -5,7 +5,6 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion oh-my-zsh" | tr -d '"')" latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')" -url="$(nix-instantiate --eval -E "with import ./. {}; oh-my-zsh.src.url" | tr -d '"')" if [ ! "null" = "${latestSha}" ]; then latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/${latestSha} | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')" From 2bd6f0744fe78ef7150c493045bd3142df628a2a Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 30 Aug 2020 18:31:54 +0200 Subject: [PATCH 432/688] nixos/tests/robustirc-bridge: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/robustirc-bridge.nix | 29 +++++++++++++++++++ pkgs/servers/irc/robustirc-bridge/default.nix | 4 ++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/robustirc-bridge.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index fabd525dd90a..60ef5a027637 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -298,6 +298,7 @@ in redis = handleTest ./redis.nix {}; redmine = handleTest ./redmine.nix {}; restic = handleTest ./restic.nix {}; + robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; rspamd = handleTest ./rspamd.nix {}; rss2email = handleTest ./rss2email.nix {}; diff --git a/nixos/tests/robustirc-bridge.nix b/nixos/tests/robustirc-bridge.nix new file mode 100644 index 000000000000..a5c22d73a34f --- /dev/null +++ b/nixos/tests/robustirc-bridge.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "robustirc-bridge"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ hax404 ]; + }; + + nodes = + { bridge = + { services.robustirc-bridge = { + enable = true; + extraFlags = [ + "-listen localhost:6667" + "-network example.com" + ]; + }; + }; + }; + + testScript = + '' + start_all() + + bridge.wait_for_unit("robustirc-bridge.service") + bridge.wait_for_open_port(1080) + bridge.wait_for_open_port(6667) + ''; +}) diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix index 430cbc3ccd18..84b80203f57c 100644 --- a/pkgs/servers/irc/robustirc-bridge/default.nix +++ b/pkgs/servers/irc/robustirc-bridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "robustirc-bridge"; @@ -17,6 +17,8 @@ buildGoModule rec { install -D robustirc-bridge.1 $out/share/man/man1/robustirc-bridge.1 ''; + passthru.tests.robustirc-bridge = nixosTests.robustirc-bridge; + meta = with stdenv.lib; { description = "Bridge to robustirc.net-IRC-Network"; homepage = "https://robustirc.net/"; From 14ccd5aa2912f052c6e49a3bc823445384e1fdb9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 14:17:59 +0000 Subject: [PATCH 433/688] act: 0.2.10 -> 0.2.13 --- pkgs/development/tools/misc/act/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index c1c915cb8e46..3864337badf2 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.10"; + version = "0.2.13"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0xmrb8wbxkb52l2c7fxxy5wa9lsl591fl65zicv0nrbil36q4wfd"; + sha256 = "112vmq9wg31alw9lw1jmsdvkd7kz1d9ak4p9dli7vgr9rhdf0hnb"; }; - vendorSha256 = "0qf26g0a2j1mbzlc7xjackww22w9bl1x0iw3q1x6kq7fp8xiwhdn"; + vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; doCheck = false; From 0e58393738890de9679aff9c60e211dab990a7e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 31 Aug 2020 16:27:00 +0200 Subject: [PATCH 434/688] luajit*: update to address CVE-2020-24372 /cc roundup issues: #96821, #96828. The diff upstream is fairly small, so let me trust Mike Pall on this. Both versions get a pair of commits that seem to address the CVE https://github.com/LuaJIT/LuaJIT/issues/603 and 2.1 additionally gets one other small commit. --- pkgs/development/interpreters/luajit/2.0.nix | 6 +++--- pkgs/development/interpreters/luajit/2.1.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index e96a7c604c70..afb5dd9c5b64 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,10 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5-2020-08-05"; - rev = "2211f6f"; + version = "2.0.5-2020-08-09"; + rev = "e296f56"; isStable = true; - sha256 = "01adxmknq2xyb3w9sn8ilnar8181h7ksd9i80yrsbwzix5lwkn6m"; + sha256 = "0g4wvpmmrxj8ir6yi86gg93khy8ri7x4w091jihpxsmn670da21f"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: p != "aarch64-linux") (platforms.linux ++ platforms.darwin); diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index f08bbd0e9724..cb0320c7c7cf 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-2020-08-05"; - rev = "10ddae7"; + version = "2.1.0-2020-08-27"; + rev = "ff1e72a"; isStable = false; - sha256 = "1lmjs0gz9vgbhh5f45jvvibpj7f3sz81r8cz4maln9yhc67f2zmk"; + sha256 = "0rlh5y48jbxnamr3a5i3szzh7y9ycvq052rw6m82gdhrb1jlamdz"; } From 47dec21cac16a4bcfe2429c51602fd59339da59e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Aug 2020 02:06:27 +0000 Subject: [PATCH 435/688] qsynth: 0.6.2 -> 0.6.3 --- pkgs/applications/audio/qsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 5da8f4cd4626..af59bb56eb9a 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "qsynth"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - sha256 = "0cp6vrqrj37rv3a7qfvqrg64j7zwpfj60y5b83mlkzvmg1sgjnlv"; + sha256 = "0xiqmpzpxjvh32vivfj6h33w0ahmyfjzjb41b6fnf92bbg9k6mqv"; }; nativeBuildInputs = [ autoconf pkgconfig ]; From 293d913f273866f28072734e7c6613a18301eecf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Aug 2020 07:03:34 +0000 Subject: [PATCH 436/688] ethash: 0.4.4 -> 0.5.2 --- pkgs/development/libraries/ethash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index 3522ff231ab1..749005e09a98 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "ethash"; - version = "0.4.4"; + version = "0.5.2"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "1gfs8s4nv2ikkn3rhzifr0dx5m0c1kpnhmzf8x6zlwhw3qwlc98w"; + sha256 = "0shr3m33raxy9j2mpm3q9mdbchs3nhgfaywidyxgmwqaiw1xpyif"; }; nativeBuildInputs = [ From 78b3da115bbc61ac9e4baced4902cf06bf214a0b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 20:41:00 +0000 Subject: [PATCH 437/688] aspellDicts.pt_PT: 20070510-0 -> 20190329-1-0 --- pkgs/development/libraries/aspell/dictionaries.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index fac55b60651e..aa7afef2274e 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -702,10 +702,10 @@ in rec { pt_PT = buildOfficialDict { language = "pt_PT"; - version = "20070510-0"; + version = "20190329-1-0"; fullName = "Portuguese"; filename = "aspell6"; - sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; + sha256 = "0ld0d0ily4jqifjfsxfv4shbicz6ymm2gk56fq9gbzra1j4qnw75"; }; qu = buildOfficialDict { From 6efcb72ac1d9dd66dc40aebe0118ac1ec33ff828 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 17:56:19 +0000 Subject: [PATCH 438/688] aspellDicts.pt_BR: 20090702-0 -> 20131030-12-0 --- pkgs/development/libraries/aspell/dictionaries.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index aa7afef2274e..32405d6a5251 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -694,10 +694,10 @@ in rec { pt_BR = buildOfficialDict { language = "pt_BR"; - version = "20090702-0"; + version = "20131030-12-0"; fullName = "Brazilian Portuguese"; filename = "aspell6"; - sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; + sha256 = "1xqlpk21s93c6blkdnpk7l62q9fxjvzdv2x86chl8p2x1gdrj3gb"; }; pt_PT = buildOfficialDict { From 2102dedc0d60e73fddc4869a92dddd6e8994903e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 19:43:52 +0000 Subject: [PATCH 439/688] ckbcomp: 1.195 -> 1.196 --- pkgs/tools/X11/ckbcomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 74a6777d9491..91e067e7be71 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.195"; + version = "1.196"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0d0xagigs5k3appzz5lzxdjncvnkgz4amz6ks7imiq8kkjixvmfy"; + sha256 = "0c79rycgpna8910as6blw3z3sajzzakz4qlvr6js2yr8zq2d0ylg"; }; buildInputs = [ perl ]; From 1f79f655214a86e10179b2781db36537971c5222 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Jul 2020 06:22:50 +0000 Subject: [PATCH 440/688] vassal: 3.2.17 -> 3.3.2 --- pkgs/games/vassal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 55848d91fab5..413d98d26ace 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "VASSAL-3.2.17"; + name = "VASSAL-3.3.2"; src = fetchurl { url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2"; - sha256 = "0nxskr46janxnb31c03zv61kr46vy98l7cwxha3vll81l4ij1sjb"; + sha256 = "1abhlkl27gyfa1lghvv76xa6ks5hiwv2s9wb9ddadm0m07f87n1w"; }; buildInputs = [ makeWrapper ]; From 604ba0848325e1534a6eecb0b9ea967cbd3d0e2e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Jul 2020 16:37:13 +0000 Subject: [PATCH 441/688] fmit: 1.2.13 -> 1.2.14 --- pkgs/applications/audio/fmit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 114cf5e192ff..f173d2fe02b9 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -11,13 +11,13 @@ with stdenv.lib; mkDerivation rec { pname = "fmit"; - version = "1.2.13"; + version = "1.2.14"; src = fetchFromGitHub { owner = "gillesdegottex"; repo = "fmit"; rev = "v${version}"; - sha256 = "1qyskam053pvlap1av80rgp12pzhr92rs88vqs6s0ia3ypnixcc6"; + sha256 = "1q062pfwz2vr9hbfn29fv54ip3jqfd9r99nhpr8w7mn1csy38azx"; }; nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; From 049aeb738bc0d2f7eb9d4da6f4289bda47c22d3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 25 Jul 2020 04:46:20 +0000 Subject: [PATCH 442/688] libaacs: 0.10.0 -> 0.11.0 --- pkgs/development/libraries/libaacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 2b3ef8c99c81..d6c90ee172b6 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libaacs"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1zhjdcph8sqx7ak35s22kc736icwq135jlypggkp6vqyyygb3xlk"; + sha256 = "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d"; }; buildInputs = [ libgcrypt libgpgerror ]; From c2dd047bfba0dfd6118b7da0eaae5bb6fdb9ab8b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Jul 2020 04:53:14 +0000 Subject: [PATCH 443/688] fldigi: 4.1.13 -> 4.1.14 --- pkgs/applications/radio/fldigi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index b4815803ccde..af93b7ee65d6 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.13"; + version = "4.1.14"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0mlq4z5k3h466plij8hg9xn5xbjxk557g4pw13cplpf32fhng224"; + sha256 = "0hr6xbv01xf7z4r2jxxhn8xjdmca2198q4m9glh4877dllvfq6xj"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio From 18146948e0a873767d55368b76386df9272b0dee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Jul 2020 02:49:29 +0000 Subject: [PATCH 444/688] tixati: 2.73 -> 2.74 --- pkgs/applications/networking/p2p/tixati/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 2e14bd0eb0f2..f8a70d322f03 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.73"; + version = "2.74"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "1ncrfc4wgf02la2h3zpdcz07b980n9232lg5f62q7ab79fjrcrfr"; + sha256 = "1slsrqv97hnj1vxx3hw32dhqckbr05w622samjbrimh4dv8yrd29"; }; installPhase = '' From 06517f3d10035cb0f75789aab625f7e17376c934 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Jul 2020 20:06:56 +0000 Subject: [PATCH 445/688] lombok: 1.18.10 -> 1.18.12 --- pkgs/development/libraries/java/lombok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index f48c4821d923..5928d99b6c24 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lombok-1.18.10"; + name = "lombok-1.18.12"; src = fetchurl { url = "https://projectlombok.org/downloads/${name}.jar"; - sha256 = "1ymjwxg01dq8qq89hx23yvk5h46hwfb8ihbqbvabmz1vh9afjdi8"; + sha256 = "01jl6i5wzjxyk36fcq6ji90x9h143gvnwhv86cbkqaxhxh41af29"; }; buildCommand = '' From d5bcf3c985d4d09f38900ebfd3a6adf491a30080 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 21:48:08 +0000 Subject: [PATCH 446/688] vcstool: 0.2.7 -> 0.2.9 --- pkgs/development/tools/vcstool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index c4a1cf739870..9657543e0c70 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; - version = "0.2.7"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "1mq8lmb1wh55cqdj7javq7qia4217h6vf5ljc99gsjyibi7g7d3k"; + sha256 = "1lb0j120sj76swi702ah6ryn770m1y7gh69237zxpyh897pn5paa"; }; propagatedBuildInputs = [ pyyaml setuptools ]; From 1889287e2c2ffdf9767857e7089405074f39a335 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 8 Jul 2020 13:48:11 +0000 Subject: [PATCH 447/688] rdkafka: 1.4.2 -> 1.4.4 --- pkgs/development/libraries/rdkafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 7539d45627f1..308fadbdfd8e 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.4.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "05mgrdzacn9kdpr68r5j0cvsvl54s52glnsc1ww9rcxx6p7hq1ly"; + sha256 = "0y4m29wyvhhxb7fap9z07zwgcqlr4ifwynf8a7yp5ldjpzfzxpix"; }; nativeBuildInputs = [ pkgconfig ]; From 45782da7afd94e79a2f18b003155f21b25833bbc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 17:54:34 +0000 Subject: [PATCH 448/688] synthv1: 0.9.14 -> 0.9.15 --- pkgs/applications/audio/synthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index c7e936d28e50..74f68283fd60 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "synthv1"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz"; - sha256 = "08n83krkak20924flb9azhm9hn40lyfvn29m63zs3lw3wajf0b40"; + sha256 = "047y2l7ipzv00ly54f074v6p043xjml7vz0svc7z81bhx74vs0ix"; }; buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; From 714297d5193cf43c75346c733d20ef366ea21c73 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 08:16:22 +0000 Subject: [PATCH 449/688] reiser4progs: 2.0.0 -> 2.0.1 --- pkgs/tools/filesystems/reiser4progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 896d472b8329..158097d38129 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, libaal}: -let version = "2.0.0"; in +let version = "2.0.1"; in stdenv.mkDerivation rec { pname = "reiser4progs"; inherit version; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; - sha256 = "00kx9prz3d5plp1hn4xdkkd99cw42sanlsjnjhj0fsrlmi9yfs8n"; + sha256 = "1r7m95mnp6xmp1j5k99jhmz6g9y2qq7cghlmdxsfbr3xviqfs45d"; }; buildInputs = [libaal]; From 73cff3d2c27c61804498bc697fe43cdbb4678b0c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 01:35:41 +0000 Subject: [PATCH 450/688] R: 4.0.0 -> 4.0.2 --- pkgs/applications/science/math/R/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 52da3b4a1ac9..717b240c1cce 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -12,11 +12,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { - name = "R-4.0.0"; + name = "R-4.0.2"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; - sha256 = "0h1995smlyiyhx7gpg9paxsfqrcn6g9bbp5h9r47i6an3clv1gh6"; + sha256 = "0xdy3dy2bzdiba8z94hjykyra8si8a5q15s0bri7c26scjrymg6k"; }; dontUseImakeConfigure = true; From 8401a6262e3c3fd244dfba793db595587da0b6b3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 31 Aug 2020 21:12:45 +0800 Subject: [PATCH 451/688] qvim: drop it Upstream has moved development to neovim instead where this frontend is now based on Qt5. --- pkgs/applications/editors/vim/qvim.nix | 113 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 -- 3 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 pkgs/applications/editors/vim/qvim.nix diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix deleted file mode 100644 index 0e3a4a150526..000000000000 --- a/pkgs/applications/editors/vim/qvim.nix +++ /dev/null @@ -1,113 +0,0 @@ -args@{ fetchgit, stdenv, ncurses, pkgconfig, gettext -, lib, config, python, perl, tcl, ruby, qt4 -, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu -, libICE -, lua -, features -, luaSupport ? config.vim.lua or true -, perlSupport ? config.vim.perl or false # Perl interpreter -, pythonSupport ? config.vim.python or true -, rubySupport ? config.vim.ruby or true -, nlsSupport ? config.vim.nls or false -, tclSupport ? config.vim.tcl or false -, multibyteSupport ? config.vim.multibyte or false -, cscopeSupport ? config.vim.cscope or false -, netbeansSupport ? config.netbeans or true # eg envim is using it - -# by default, compile with darwin support if we're compiling on darwin, but -# allow this to be disabled by setting config.vim.darwin to false -, darwinSupport ? stdenv.isDarwin && (config.vim.darwin or true) - -# add .nix filetype detection and minimal syntax highlighting support -, ftNixSupport ? config.vim.ftNix or true - -, ... }: with args; - -let tag = "20140827"; - sha256 = "0ncgbcm23z25naicxqkblz0mcl1zar2qwgi37y5ar8q8884w9ml2"; -in { - - name = "qvim-7.4." + tag; - - enableParallelBuilding = true; # test this - - src = fetchgit { - url = "https://bitbucket.org/equalsraf/vim-qt.git"; - rev = "refs/tags/package-" + tag; - inherit sha256; - }; - - # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux - # to meta.platforms.unix - preConfigure = assert (! stdenv.isDarwin); ""; - - configureFlags = [ - "--with-vim-name=qvim" - "--enable-gui=qt" - "--with-features=${features}" - "--disable-xsmp" - "--disable-xsmp_interact" - "--disable-workshop" # Sun Visual Workshop support - "--disable-sniff" # Sniff interface - "--disable-hangulinput" # Hangul input support - "--disable-fontset" # X fontset output support - "--disable-acl" # ACL support - "--disable-gpm" # GPM (Linux mouse daemon) - "--disable-mzscheme" - ] - ++ stdenv.lib.optionals luaSupport [ - "--with-lua-prefix=${lua}" - "--enable-luainterp" - ] - ++ stdenv.lib.optional pythonSupport "--enable-pythoninterp" - ++ stdenv.lib.optional (pythonSupport && stdenv.isDarwin) "--with-python-config-dir=${python}/lib" - ++ stdenv.lib.optional nlsSupport "--enable-nls" - ++ stdenv.lib.optional perlSupport "--enable-perlinterp" - ++ stdenv.lib.optional rubySupport "--enable-rubyinterp" - ++ stdenv.lib.optional tclSupport "--enable-tcl" - ++ stdenv.lib.optional multibyteSupport "--enable-multibyte" - ++ stdenv.lib.optional darwinSupport "--enable-darwin" - ++ stdenv.lib.optional cscopeSupport "--enable-cscope"; - - nativeBuildInputs = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw - libXau libXmu libICE qt4 - ] - ++ stdenv.lib.optional nlsSupport gettext - ++ stdenv.lib.optional perlSupport perl - ++ stdenv.lib.optional pythonSupport python - ++ stdenv.lib.optional tclSupport tcl - ++ stdenv.lib.optional rubySupport ruby - ++ stdenv.lib.optional luaSupport lua - ; - - postPatch = '' - '' + stdenv.lib.optionalString ftNixSupport '' - # because we cd to src in the main patch phase, we can't just add this - # patch to the list, we have to apply it manually - cd runtime - patch -p2 < ${./ft-nix-support.patch} - cd .. - ''; - - postInstall = stdenv.lib.optionalString stdenv.isLinux '' - rpath=`patchelf --print-rpath $out/bin/qvim`; - for i in $nativeBuildInputs; do - echo adding $i/lib - rpath=$rpath:$i/lib - done - echo $nativeBuildInputs - echo $rpath - patchelf --set-rpath $rpath $out/bin/qvim - ''; - - dontStrip = 1; - - meta = with stdenv.lib; { - description = "The most popular clone of the VI editor (Qt GUI fork)"; - homepage = "https://bitbucket.org/equalsraf/vim-qt/wiki/Home"; - license = licenses.vim; - maintainers = with maintainers; [ smironov ttuegel ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b020d6fac559..da3d3bdfc6d1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -456,6 +456,7 @@ mapAliases ({ phonon = throw "Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 quake3game = ioquake3; # added 2016-01-14 + qvim = throw "qvim has been removed."; # added 2020-08-31 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44e294af2f1f..ff8618434c63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23481,12 +23481,6 @@ in inherit (xorg) libxcb; }; - qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix { - features = "huge"; # one of tiny, small, normal, big or huge - lua = pkgs.lua5; - flags = [ "python" "X11" ]; # only flag "X11" by now - }); - vimpc = callPackage ../applications/audio/vimpc { }; wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; From 81b770fc8c274b55012a316eca9fcb8a77a14b82 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 31 Aug 2020 10:07:54 -0500 Subject: [PATCH 452/688] kde-gtk-config: add xsettingsd input --- pkgs/desktops/plasma-5/kde-gtk-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 1320028ee8ed..a631efcc9533 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, wrapGAppsHook, glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff, gsettings-desktop-schemas + knewstuff, gsettings-desktop-schemas, xsettingsd }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { dontWrapGApps = true; # There is nothing to wrap buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff gsettings-desktop-schemas + knewstuff gsettings-desktop-schemas xsettingsd ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" From 43114a17517f3ad1110ef80d9104f3d34d82b606 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 19:22:28 +0000 Subject: [PATCH 453/688] wxmaxima: 20.04.0 -> 20.06.6 --- pkgs/applications/science/math/wxmaxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index a6afc95ac093..7a81a0d679a3 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "20.04.0"; + version = "20.06.6"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "0vrjxzfgmjdzm1rgl0crz4b4badl14jwh032y3xkcdvjl5j67lp3"; + sha256 = "054f7n5kx75ng5j20rd5q27n9xxk03mrd7sbxyym1lsswzimqh4w"; }; buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; From c5a2f3a514e25679b1a67b6ea0d73f2aae322a14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 05:26:12 +0000 Subject: [PATCH 454/688] qastools: 0.22.0 -> 0.23.0 --- pkgs/tools/audio/qastools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index 86ef7f050b23..55dbba007f87 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "qastools"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitLab { owner = "sebholt"; repo = pname; rev = "v${version}"; - sha256 = "0px4fcn8dagivq5fyi5gy84yj86f6x0lk805mc4ry58d0wsbn68v"; + sha256 = "19hn64hnvryfmrkdg6rqyzahdbqf1s5y3dcca389jj6sdx93b3ip"; }; nativeBuildInputs = [ cmake ]; From 23e7cb92d0364fc7ce3f31fe2922e237fabc06ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 10:34:25 +0000 Subject: [PATCH 455/688] seafile-shared: 7.0.7 -> 7.0.8 --- pkgs/misc/seafile-shared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 7546c7626ed8..21a89e5f5f2e 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "7.0.7"; + version = "7.0.8"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "0vgzb923x2q2w1zgbc56d50a5qj9xm77lg7czfzg3va7vd921gy8"; + sha256 = "0q0zylv8hkhnfw0084bj1wmqwqvpflmdy1njxvvkjsbnflh8kc2y"; }; nativeBuildInputs = [ From 2fd3e018e46e10c93b629c3c7afd8f5ed6916b68 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 14:46:26 +0000 Subject: [PATCH 456/688] hsqldb: 2.5.0 -> 2.5.1 --- pkgs/development/libraries/java/hsqldb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index d9139ec1d823..88f32866b0d0 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.5.0"; + version = "2.5.1"; underscoreMajMin = stdenv.lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "0s64w7qq5vayrzcmdhrdfmd6iqqv6x6fpiq9lpy2gva3dckv3q6j"; + sha256 = "0yd9px85y036bp3q1assj3fgaykxrwnhnc7cbjgic39cykfy5hrg"; }; nativeBuildInputs = [ unzip makeWrapper ]; From 6c47cb6797f6eedb83df87c6c2ca548b48da2307 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 17:28:54 +0000 Subject: [PATCH 457/688] swig4: 4.0.1 -> 4.0.2 --- pkgs/development/tools/misc/swig/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix index a35a9a35281d..4096b7353fa4 100644 --- a/pkgs/development/tools/misc/swig/4.nix +++ b/pkgs/development/tools/misc/swig/4.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "swig"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "swig"; repo = "swig"; rev = "rel-${version}"; - sha256 = "1i1gl5gd6b5i1hiazq7m4nvlq86zd0fhk052xhwlnb596pjhgyhf"; + sha256 = "12vlps766xvwck8q0i280s8yx21qm2dxl34710ybpmz3c1cfdjsc"; }; PCRE_CONFIG = "${pcre.dev}/bin/pcre-config"; From 889e72b852a98e020454f611b54abd783352b871 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 15:26:11 +0000 Subject: [PATCH 458/688] cloudflared: 2020.5.1 -> 2020.6.1 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 252a6f5b48b6..96767f63653e 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.5.1"; + version = "2020.6.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "0r1n3a8h8gyww4p2amb24jmp8zkyxy1ava3nbqgwlfjr3zagga00"; + sha256 = "09jdgpglm4v7pivx8016zzdvj0xkdhaa8xl71p2akc2jn8i8i6gb"; }; vendorSha256 = null; From 8778d362bcafdf4caa772b31c8bcc14e6893c362 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 22:52:44 +0000 Subject: [PATCH 459/688] owncloud-client: 2.5.4.11654 -> 2.6.3.14058 --- pkgs/applications/networking/owncloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index a487da6f5ad7..d990dfb39d2b 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.5.4.11654"; + version = "2.6.3.14058"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "0gsnry0786crbnpgg3f1vcqw6mwbz6svhm6mw3767qi4lb33jm31"; + sha256 = "1xcklhvbyg34clm9as2rjnjfwxpwq77lmdxj6qc0w7q43viqvlz3"; }; nativeBuildInputs = [ pkgconfig cmake ]; From 6ab387699a9f23201cf76091d0f7d4ff09fa510e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 31 Aug 2020 17:18:27 +0200 Subject: [PATCH 460/688] python3Packages.credstash: fix build --- pkgs/development/python-modules/credstash/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 07547b280f5b..1abd3f4ed203 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose }: +{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose +, fetchpatch +}: buildPythonPackage rec { pname = "credstash"; @@ -9,6 +11,12 @@ buildPythonPackage rec { sha256 = "6c04e8734ef556ab459018da142dd0b244093ef176b3be5583e582e9a797a120"; }; + patches = [ + (fetchpatch { + url = "https://github.com/fugue/credstash/commit/9c02ee43ed6e37596cafbca2fe80c532ec19d2d8.patch"; + sha256 = "dlybrpfLK+PqwWWhH9iXgXHYysZGmcZAFGWNOwsG0xA="; + }) + ]; # The install phase puts an executable and a copy of the library it imports in # bin/credstash and bin/credstash.py, despite the fact that the library is also # installed to lib/python/site-packages/credstash.py. From 9be67b2eeb4c49058ec7c6a2ed4434994dba4117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Mon, 31 Aug 2020 17:34:31 +0200 Subject: [PATCH 461/688] rss2email: 3.12.1 -> 3.12.2 --- .../applications/networking/feedreaders/rss2email/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index b852eb02feca..977b71ebc50d 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -4,14 +4,14 @@ with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.12.1"; + version = "3.12.2"; propagatedBuildInputs = [ feedparser html2text ]; checkInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "0zqpibh31rl6xlfw9y66d9hfhwrnzy5cjzbksczyw3lh4dfzsql0"; + sha256 = "12w6x80wsw6xm17fxyymnl45aavsagg932zw621wcjz154vjghjr"; }; outputs = [ "out" "man" "doc" ]; From 0be3a3a53b96f78d58718c1fc86317275af4171c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 15:50:15 +0000 Subject: [PATCH 462/688] amass: 3.8.2 -> 3.10.1 --- pkgs/tools/networking/amass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index b690b63ef4bd..d3aa432a45e1 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.8.2"; + version = "3.10.1"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "0hm5h8glva0d9mj870j56bc721w4br7dzwhns096rgzyv93m7rx0"; + sha256 = "1djkryx8bz2rg0iqqb30jb122ydiyli2i9xsvcdmd42c47hxg46y"; }; - vendorSha256 = "1g3jbdx7m5m56ifcc1p6hgz2wzmb287cyyaiz03ffdvwd3k73k4j"; + vendorSha256 = "0c3hyvy8s470zvrv49fx0iil59z0xq10dw4vnr55qgbm2k2pay6w"; doCheck = false; From 2b1ce6154862ad7f2bac1c90628fc44f9a66b209 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Mon, 31 Aug 2020 10:45:53 +0200 Subject: [PATCH 463/688] mbuffer: Use objdump from environment when cross-building The mbuffer configure scripts fails to recognize the correct objdump binary during cross-building for foreign platforms. The correct objdump is exposed via the environment variable $OBJDUMP, which should be used in such cases. --- pkgs/tools/misc/mbuffer/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 8b1cb938fb74..d86f824b87fa 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ openssl ]; + + # The mbuffer configure scripts fails to recognize the correct + # objdump binary during cross-building for foreign platforms. + # The correct objdump is exposed via the environment variable + # $OBJDUMP, which should be used in such cases. + preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + substituteInPlace configure --replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}' + ''; doCheck = true; meta = { From 69ec9ed4e6a5e254fe5651a3342b1e2b9951e0dd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 31 Aug 2020 10:59:35 -0500 Subject: [PATCH 464/688] kde-gtk-config: set GSettings schemas path --- .../0001-gsettings-schemas-path.patch | 21 +++++++++++++++++++ .../plasma-5/kde-gtk-config/default.nix | 3 +++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch b/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch new file mode 100644 index 000000000000..2fe4672f6757 --- /dev/null +++ b/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch @@ -0,0 +1,21 @@ +diff --git a/kded/gtkconfig.cpp b/kded/gtkconfig.cpp +index 5303636..199c4d5 100644 +--- a/kded/gtkconfig.cpp ++++ b/kded/gtkconfig.cpp +@@ -41,6 +41,16 @@ GtkConfig::GtkConfig(QObject *parent, const QVariantList&) : + kdeglobalsConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kdeglobals")))), + kwinConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kwinrc")))) + { ++ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS. ++ // Normally this would be done by wrapGAppsHook, but this plugin ++ // (shared object) cannot be wrapped. ++ QByteArray xdgdata = qgetenv("XDG_DATA_DIRS"); ++ if (!xdgdata.isEmpty()) { ++ xdgdata.push_front(":"); ++ } ++ xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH)); ++ qputenv("XDG_DATA_DIRS", xdgdata); ++ + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerService(QStringLiteral("org.kde.GtkConfig")); + dbus.registerObject(QStringLiteral("/GtkConfig"), this, QDBusConnection::ExportScriptableSlots); diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index a631efcc9533..c1ed6dbd6c6e 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -18,6 +18,9 @@ mkDerivation { "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; + # The gtkconfig KDED module will crash the daemon if the GSettings schemas + # aren't found. + patches = [ ./0001-gsettings-schemas-path.patch ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\"" ''; From 8cbf8074f62a63ce1d5e3f0b813c543b580397d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 17:04:02 +0000 Subject: [PATCH 465/688] ameba: 0.13.1 -> 0.13.2 --- pkgs/development/tools/ameba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 0ac36c4c2002..9b7cf3f1de8d 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "0myy11g62pa1yh9szj03v2lhc5s9xwzr76v4x6hznidpq1b67jn8"; + sha256 = "0wyfx9nwda0s3arpdalz5zgh83v6wfz1a3l2k5v0jglpczq3m04m"; }; meta = with stdenv.lib; { From 6f457404b7d4e1994773776bbb8b8ad81a3d0e91 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 31 Aug 2020 17:15:24 +0000 Subject: [PATCH 466/688] ubootPinebookPro: init at 2020.07 --- pkgs/misc/uboot/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 85df90a9fe11..66f419626663 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -271,6 +271,13 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootPinebookPro = buildUBoot { + defconfig = "pinebook-pro-rk3399_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareRK3399}/bl31.elf"; + filesToInstall = [ "u-boot.itb" "idbloader.img"]; + }; + ubootQemuAarch64 = buildUBoot { defconfig = "qemu_arm64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d0302e64a7e..58e64599e4fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18354,6 +18354,7 @@ in ubootPine64 ubootPine64LTS ubootPinebook + ubootPinebookPro ubootQemuAarch64 ubootQemuArm ubootRaspberryPi From 6b23dc8f965652ad7d246ae01d95c1d77eac904d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 31 Aug 2020 10:10:25 -0700 Subject: [PATCH 467/688] python-packages.nix: sort --- pkgs/top-level/python-packages.nix | 11010 +++++++++++++-------------- 1 file changed, 5375 insertions(+), 5635 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 72fd49c64f78..54bbb192cce8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -142,120 +142,317 @@ in { else callPackage ../development/python-modules/setuptools { }; - vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; - - acoustics = callPackage ../development/python-modules/acoustics { }; - - py3to2 = callPackage ../development/python-modules/3to2 { }; - - pynamodb = callPackage ../development/python-modules/pynamodb { }; - aadict = callPackage ../development/python-modules/aadict { }; + aafigure = callPackage ../development/python-modules/aafigure { }; + absl-py = callPackage ../development/python-modules/absl-py { }; + accupy = callPackage ../development/python-modules/accupy { }; + + acme = callPackage ../development/python-modules/acme { }; + + acme-tiny = callPackage ../development/python-modules/acme-tiny { }; + + acoustics = callPackage ../development/python-modules/acoustics { }; + + actdiag = callPackage ../development/python-modules/actdiag { }; + + adal = callPackage ../development/python-modules/adal { }; + adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; + addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; + aenum = callPackage ../development/python-modules/aenum { }; afdko = callPackage ../development/python-modules/afdko { }; + affine = callPackage ../development/python-modules/affine { }; + affinity = callPackage ../development/python-modules/affinity { }; agate = callPackage ../development/python-modules/agate { }; agate-dbf = callPackage ../development/python-modules/agate-dbf { }; - alerta = callPackage ../development/python-modules/alerta { }; - - alerta-server = callPackage ../development/python-modules/alerta-server { }; - - androguard = callPackage ../development/python-modules/androguard { }; - - phonenumbers = callPackage ../development/python-modules/phonenumbers { }; - agate-excel = callPackage ../development/python-modules/agate-excel { }; agate-sql = callPackage ../development/python-modules/agate-sql { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; + + aioconsole = callPackage ../development/python-modules/aioconsole { }; + + aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; + + aiodns = callPackage ../development/python-modules/aiodns { }; + + aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; + + aioeventlet = callPackage ../development/python-modules/aioeventlet { }; + + aiofiles = callPackage ../development/python-modules/aiofiles { }; + + aioftp = callPackage ../development/python-modules/aioftp { }; + + aioh2 = callPackage ../development/python-modules/aioh2 { }; + + aioharmony = callPackage ../development/python-modules/aioharmony { }; + + aiohttp = callPackage ../development/python-modules/aiohttp { }; + + aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; + + aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; + + aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; + + aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; + + aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; + + aiohue = callPackage ../development/python-modules/aiohue { }; + aioimaplib = callPackage ../development/python-modules/aioimaplib { }; + aiojobs = callPackage ../development/python-modules/aiojobs { }; + + aiokafka = callPackage ../development/python-modules/aiokafka { }; + aiolifx = callPackage ../development/python-modules/aiolifx { }; aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; - aioamqp = callPackage ../development/python-modules/aioamqp { }; + aiomysql = callPackage ../development/python-modules/aiomysql { }; - aiojobs = callPackage ../development/python-modules/aiojobs { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aioredis = callPackage ../development/python-modules/aioredis { }; + aioresponses = callPackage ../development/python-modules/aioresponses { }; + + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; + aiorun = callPackage ../development/python-modules/aiorun { }; - ansicolor = callPackage ../development/python-modules/ansicolor { }; + aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; - ansiwrap = callPackage ../development/python-modules/ansiwrap { }; + aiosqlite = callPackage ../development/python-modules/aiosqlite { }; + + aiounifi = callPackage ../development/python-modules/aiounifi { }; + + aiounittest = callPackage ../development/python-modules/aiounittest { }; + + aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; + + ajpy = callPackage ../development/python-modules/ajpy { }; + + alabaster = callPackage ../development/python-modules/alabaster { }; + + alarmdecoder = callPackage ../development/python-modules/alarmdecoder { }; + + alembic = callPackage ../development/python-modules/alembic { }; + + alerta = callPackage ../development/python-modules/alerta { }; + + alerta-server = callPackage ../development/python-modules/alerta-server { }; + + algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; + + allpairspy = callPackage ../development/python-modules/allpairspy { }; + + alot = callPackage ../development/python-modules/alot { }; + + altair = callPackage ../development/python-modules/altair { }; + + amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; + + amqp = callPackage ../development/python-modules/amqp { }; + + amqplib = callPackage ../development/python-modules/amqplib { }; + + androguard = callPackage ../development/python-modules/androguard { }; + + aniso8601 = callPackage ../development/python-modules/aniso8601 { }; + + annexremote = callPackage ../development/python-modules/annexremote { }; + + annoy = callPackage ../development/python-modules/annoy { }; + + anonip = callPackage ../development/python-modules/anonip { }; ansi2html = callPackage ../development/python-modules/ansi2html { }; - anytree = callPackage ../development/python-modules/anytree { - inherit (pkgs) graphviz; - }; + ansible = callPackage ../development/python-modules/ansible { }; + + ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; + + ansible-lint = callPackage ../development/python-modules/ansible-lint { }; + + ansible-runner = callPackage ../development/python-modules/ansible-runner { }; + + ansi = callPackage ../development/python-modules/ansi { }; + + ansicolor = callPackage ../development/python-modules/ansicolor { }; + + ansicolors = callPackage ../development/python-modules/ansicolors { }; + + ansiconv = callPackage ../development/python-modules/ansiconv { }; + + ansiwrap = callPackage ../development/python-modules/ansiwrap { }; + + antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { antlr4 = pkgs.antlr4; }; + + antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; + + anyjson = callPackage ../development/python-modules/anyjson { }; + + anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; + + apache-airflow = callPackage ../development/python-modules/apache-airflow { }; + + apipkg = callPackage ../development/python-modules/apipkg { }; + + apispec = callPackage ../development/python-modules/apispec { }; aplpy = callPackage ../development/python-modules/aplpy { }; + appdirs = callPackage ../development/python-modules/appdirs { }; + + appleseed = disabledIf isPy3k (toPythonModule (pkgs.appleseed.override { inherit (self) python; })); + + application = callPackage ../development/python-modules/application { }; + + applicationinsights = callPackage ../development/python-modules/applicationinsights { }; + + appnope = callPackage ../development/python-modules/appnope { }; + apprise = callPackage ../development/python-modules/apprise { }; - arrayqueues = callPackage ../development/python-modules/arrayqueues { }; + approvaltests = callPackage ../development/python-modules/approvaltests { }; + + apptools = callPackage ../development/python-modules/apptools { }; + + APScheduler = callPackage ../development/python-modules/APScheduler { }; + + apsw = callPackage ../development/python-modules/apsw { }; + + area = callPackage ../development/python-modules/area { }; + + arelle = callPackage ../development/python-modules/arelle { gui = true; }; + + arelle-headless = callPackage ../development/python-modules/arelle { gui = false; }; aresponses = callPackage ../development/python-modules/aresponses { }; + argcomplete = callPackage ../development/python-modules/argcomplete { }; + + argh = callPackage ../development/python-modules/argh { }; + argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; + args = callPackage ../development/python-modules/args { }; + aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2; }; + arrayqueues = callPackage ../development/python-modules/arrayqueues { }; + + arrow = callPackage ../development/python-modules/arrow { }; + arviz = callPackage ../development/python-modules/arviz { }; - asana = callPackage ../development/python-modules/asana { }; + arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; - asdf = callPackage ../development/python-modules/asdf { }; + asana = callPackage ../development/python-modules/asana { }; asciimatics = callPackage ../development/python-modules/asciimatics { }; asciitree = callPackage ../development/python-modules/asciitree { }; + asdf = callPackage ../development/python-modules/asdf { }; + ase = if isPy27 then - callPackage ../development/python-modules/ase/3.17.nix { } - else - callPackage ../development/python-modules/ase { }; + callPackage ../development/python-modules/ase/3.17.nix { } + else + callPackage ../development/python-modules/ase { }; + + asgiref = callPackage ../development/python-modules/asgiref { }; + + asn1ate = callPackage ../development/python-modules/asn1ate { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; aspy-yaml = callPackage ../development/python-modules/aspy.yaml { }; + astor = callPackage ../development/python-modules/astor { }; + astral = callPackage ../development/python-modules/astral { }; + astroid = if isPy3k then + callPackage ../development/python-modules/astroid { } + else + callPackage ../development/python-modules/astroid/1.6.nix { }; + astropy = callPackage ../development/python-modules/astropy { }; - astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; - astropy-healpix = callPackage ../development/python-modules/astropy-healpix { }; + astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; + astroquery = callPackage ../development/python-modules/astroquery { }; asttokens = callPackage ../development/python-modules/asttokens { }; + astunparse = callPackage ../development/python-modules/astunparse { }; + + async_generator = callPackage ../development/python-modules/async_generator { }; + + asyncpg = callPackage ../development/python-modules/asyncpg { }; + + asyncssh = callPackage ../development/python-modules/asyncssh { }; + + asynctest = callPackage ../development/python-modules/asynctest { }; + + async-timeout = callPackage ../development/python-modules/async_timeout { }; + + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; + + atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; + atom = callPackage ../development/python-modules/atom { }; - augeas = callPackage ../development/python-modules/augeas { - inherit (pkgs) augeas; - }; + atomiclong = callPackage ../development/python-modules/atomiclong { }; + + atomicwrites = callPackage ../development/python-modules/atomicwrites { }; + + atomman = callPackage ../development/python-modules/atomman { }; + + atpublic = callPackage ../development/python-modules/atpublic { }; + + atsim_potentials = callPackage ../development/python-modules/atsim_potentials { }; + + attrdict = callPackage ../development/python-modules/attrdict { }; + + attrs = callPackage ../development/python-modules/attrs { }; + + audio-metadata = callPackage ../development/python-modules/audio-metadata { }; + + audioread = callPackage ../development/python-modules/audioread { }; + + audiotools = callPackage ../development/python-modules/audiotools { }; + + augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; }; + + auth0-python = callPackage ../development/python-modules/auth0-python { }; authheaders = callPackage ../development/python-modules/authheaders { }; + authlib = callPackage ../development/python-modules/authlib { }; + authres = callPackage ../development/python-modules/authres { }; - auth0-python = callPackage ../development/python-modules/auth0-python { }; + autobahn = callPackage ../development/python-modules/autobahn { }; autograd = callPackage ../development/python-modules/autograd { }; @@ -263,42 +460,44 @@ in { automat = callPackage ../development/python-modules/automat { }; - awkward = callPackage ../development/python-modules/awkward { }; - awkward1 = callPackage ../development/python-modules/awkward1 { }; - - aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; - - aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; - - aws-adfs = callPackage ../development/python-modules/aws-adfs { }; - - atomman = callPackage ../development/python-modules/atomman { }; - - authlib = callPackage ../development/python-modules/authlib { }; - - # packages defined elsewhere - - amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; - - ansiconv = callPackage ../development/python-modules/ansiconv { }; + autopep8 = callPackage ../development/python-modules/autopep8 { }; avahi = toPythonModule (pkgs.avahi.override { inherit python; withPython = true; }); - azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; + av = callPackage ../development/python-modules/av { inherit (pkgs) pkgconfig; }; - azure-common = callPackage ../development/python-modules/azure-common { }; + avro3k = callPackage ../development/python-modules/avro3k { }; - azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; + avro = callPackage ../development/python-modules/avro { }; + + avro-python3 = callPackage ../development/python-modules/avro-python3 { }; + + awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; + + awkward = callPackage ../development/python-modules/awkward { }; + awkward1 = callPackage ../development/python-modules/awkward1 { }; + + aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + + aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; + + aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; + + aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; azure-applicationinsights = callPackage ../development/python-modules/azure-applicationinsights { }; azure-batch = callPackage ../development/python-modules/azure-batch { }; + azure-common = callPackage ../development/python-modules/azure-common { }; + azure-core = callPackage ../development/python-modules/azure-core { }; + azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; + azure-cosmosdb-nspkg = callPackage ../development/python-modules/azure-cosmosdb-nspkg { }; azure-cosmosdb-table = callPackage ../development/python-modules/azure-cosmosdb-table { }; @@ -325,30 +524,6 @@ in { azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { }; - azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; - - azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { }; - - azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; - - azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { }; - - azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; - - azure-storage = callPackage ../development/python-modules/azure-storage { }; - - azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; - - azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; - - azure-storage-file-share = callPackage ../development/python-modules/azure-storage-file-share { }; - - azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; - - azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; - - azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; - azure-mgmt-advisor = callPackage ../development/python-modules/azure-mgmt-advisor { }; azure-mgmt-apimanagement = callPackage ../development/python-modules/azure-mgmt-apimanagement { }; @@ -359,10 +534,10 @@ in { azure-mgmt-authorization = callPackage ../development/python-modules/azure-mgmt-authorization { }; - azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { }; - azure-mgmt-batchai = callPackage ../development/python-modules/azure-mgmt-batchai { }; + azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { }; + azure-mgmt-billing = callPackage ../development/python-modules/azure-mgmt-billing { }; azure-mgmt-botservice = callPackage ../development/python-modules/azure-mgmt-botservice { }; @@ -373,6 +548,8 @@ in { azure-mgmt-commerce = callPackage ../development/python-modules/azure-mgmt-commerce { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; + azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; azure-mgmt-consumption = callPackage ../development/python-modules/azure-mgmt-consumption { }; @@ -397,12 +574,12 @@ in { azure-mgmt-datamigration = callPackage ../development/python-modules/azure-mgmt-datamigration { }; + azure-mgmt-deploymentmanager = callPackage ../development/python-modules/azure-mgmt-deploymentmanager { }; + azure-mgmt-devspaces = callPackage ../development/python-modules/azure-mgmt-devspaces { }; azure-mgmt-devtestlabs = callPackage ../development/python-modules/azure-mgmt-devtestlabs { }; - azure-mgmt-deploymentmanager = callPackage ../development/python-modules/azure-mgmt-deploymentmanager { }; - azure-mgmt-dns = callPackage ../development/python-modules/azure-mgmt-dns { }; azure-mgmt-eventgrid = callPackage ../development/python-modules/azure-mgmt-eventgrid { }; @@ -419,7 +596,8 @@ in { azure-mgmt-iothub = callPackage ../development/python-modules/azure-mgmt-iothub { }; - azure-mgmt-iothubprovisioningservices = callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; + azure-mgmt-iothubprovisioningservices = + callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; azure-mgmt-keyvault = callPackage ../development/python-modules/azure-mgmt-keyvault { }; @@ -453,6 +631,8 @@ in { azure-mgmt-notificationhubs = callPackage ../development/python-modules/azure-mgmt-notificationhubs { }; + azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; + azure-mgmt-policyinsights = callPackage ../development/python-modules/azure-mgmt-policyinsights { }; azure-mgmt-powerbiembedded = callPackage ../development/python-modules/azure-mgmt-powerbiembedded { }; @@ -461,10 +641,10 @@ in { azure-mgmt-rdbms = callPackage ../development/python-modules/azure-mgmt-rdbms { }; - azure-mgmt-recoveryservices = callPackage ../development/python-modules/azure-mgmt-recoveryservices { }; - azure-mgmt-recoveryservicesbackup = callPackage ../development/python-modules/azure-mgmt-recoveryservicesbackup { }; + azure-mgmt-recoveryservices = callPackage ../development/python-modules/azure-mgmt-recoveryservices { }; + azure-mgmt-redhatopenshift = callPackage ../development/python-modules/azure-mgmt-redhatopenshift { }; azure-mgmt-redis = callPackage ../development/python-modules/azure-mgmt-redis { }; @@ -501,1511 +681,33 @@ in { azure-multiapi-storage = callPackage ../development/python-modules/azure-multiapi-storage { }; - backports_csv = callPackage ../development/python-modules/backports_csv {}; + azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; - backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; + azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; - bacpypes = callPackage ../development/python-modules/bacpypes {}; + azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { }; - bap = callPackage ../development/python-modules/bap { - bap = pkgs.ocaml-ng.ocamlPackages_4_06.bap; - }; + azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; - baselines = callPackage ../development/python-modules/baselines { }; + azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; - bash_kernel = callPackage ../development/python-modules/bash_kernel { - inherit (pkgs) bash; - }; + azure-storage = callPackage ../development/python-modules/azure-storage { }; - bashlex = callPackage ../development/python-modules/bashlex { }; + azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; - bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { }; + azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; - bayespy = callPackage ../development/python-modules/bayespy { }; + azure-storage-file-share = callPackage ../development/python-modules/azure-storage-file-share { }; - beanstalkc = callPackage ../development/python-modules/beanstalkc { }; + azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { }; - beancount_docverif = callPackage ../development/python-modules/beancount_docverif { }; + azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; - biplist = callPackage ../development/python-modules/biplist { }; + Babel = callPackage ../development/python-modules/Babel { }; - bip_utils = callPackage ../development/python-modules/bip_utils { }; + babelfish = callPackage ../development/python-modules/babelfish { }; - bitarray = callPackage ../development/python-modules/bitarray { }; - - bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; - - bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; - - blivet = callPackage ../development/python-modules/blivet { }; - - bluepy = callPackage ../development/python-modules/bluepy { }; - - boltons = callPackage ../development/python-modules/boltons { }; - - bravia-tv = callPackage ../development/python-modules/bravia-tv { }; - - braintree = callPackage ../development/python-modules/braintree { }; - - breezy = callPackage ../development/python-modules/breezy { }; - - brother = callPackage ../development/python-modules/brother { }; - - build = callPackage ../development/python-modules/build { }; - - bytecode = callPackage ../development/python-modules/bytecode { }; - - ciso8601 = callPackage ../development/python-modules/ciso8601 { }; - - deepdiff = callPackage ../development/python-modules/deepdiff { }; - - deepmerge = callPackage ../development/python-modules/deepmerge { }; - - django-sesame = callPackage ../development/python-modules/django-sesame { }; - - bravado-core = callPackage ../development/python-modules/bravado-core { }; - - breathe = callPackage ../development/python-modules/breathe { }; - - brotli = callPackage ../development/python-modules/brotli { }; - - broadlink = callPackage ../development/python-modules/broadlink { }; - - browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; - - browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {}); - - btrfs = callPackage ../development/python-modules/btrfs { }; - - bt_proximity = callPackage ../development/python-modules/bt-proximity { }; - - bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 - - bugsnag = callPackage ../development/python-modules/bugsnag { }; - - cachecontrol = callPackage ../development/python-modules/cachecontrol { }; - - cachelib = callPackage ../development/python-modules/cachelib { }; - - cachy = callPackage ../development/python-modules/cachy { }; - - cadquery = callPackage ../development/python-modules/cadquery { }; - - catalogue = callPackage ../development/python-modules/catalogue { }; - - cbeams = callPackage ../misc/cbeams { }; - - cdecimal = callPackage ../development/python-modules/cdecimal { }; - - certbot = callPackage ../development/python-modules/certbot { }; - - certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; - - certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; - - certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { }; - - cfn-flip = callPackage ../development/python-modules/cfn-flip { }; - - chalice = callPackage ../development/python-modules/chalice { }; - - channels-redis = callPackage ../development/python-modules/channels-redis { }; - - cleo = callPackage ../development/python-modules/cleo { }; - - clikit = callPackage ../development/python-modules/clikit { }; - - cliff = callPackage ../development/python-modules/cliff { }; - - clifford = callPackage ../development/python-modules/clifford { }; - - clickclick = callPackage ../development/python-modules/clickclick { }; - - clustershell = callPackage ../development/python-modules/clustershell { }; - - cnvkit = callPackage ../development/python-modules/cnvkit { }; - - cocotb = callPackage ../development/python-modules/cocotb { }; - - compiledb = callPackage ../development/python-modules/compiledb { }; - - connexion = callPackage ../development/python-modules/connexion { }; - - coordinates = callPackage ../development/python-modules/coordinates { }; - - cozy = callPackage ../development/python-modules/cozy { }; - - codespell = callPackage ../development/python-modules/codespell { }; - - convertdate = callPackage ../development/python-modules/convertdate { }; - - cot = callPackage ../development/python-modules/cot { }; - - crc32c = callPackage ../development/python-modules/crc32c { }; - - curio = callPackage ../development/python-modules/curio { }; - - dendropy = callPackage ../development/python-modules/dendropy { }; - - denonavr = callPackage ../development/python-modules/denonavr { }; - - dependency-injector = callPackage ../development/python-modules/dependency-injector { }; - - btchip = callPackage ../development/python-modules/btchip { }; - - databricks-cli = callPackage ../development/python-modules/databricks-cli { }; - - datatable = callPackage ../development/python-modules/datatable { - inherit (pkgs.llvmPackages) openmp libcxx libcxxabi; - }; - - databases = callPackage ../development/python-modules/databases { }; - - datamodeldict = callPackage ../development/python-modules/datamodeldict { }; - - datasette = callPackage ../development/python-modules/datasette { }; - - datashader = callPackage ../development/python-modules/datashader { }; - - dbf = callPackage ../development/python-modules/dbf { }; - - dbfread = callPackage ../development/python-modules/dbfread { }; - - deap = callPackage ../development/python-modules/deap { }; - - deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; - - dkimpy = callPackage ../development/python-modules/dkimpy { }; - - diceware = callPackage ../development/python-modules/diceware { }; - - dictionaries = callPackage ../development/python-modules/dictionaries { }; - - diff_cover = callPackage ../development/python-modules/diff_cover { }; - - diofant = callPackage ../development/python-modules/diofant { }; - - dipy = callPackage ../development/python-modules/dipy { }; - - docrep = callPackage ../development/python-modules/docrep { }; - - dominate = callPackage ../development/python-modules/dominate { }; - - dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { - inherit (pkgs) substituteAll dotnet-sdk; - }; - - emcee = callPackage ../development/python-modules/emcee { }; - - emailthreads = callPackage ../development/python-modules/emailthreads { }; - - email_validator = callPackage ../development/python-modules/email-validator { }; - - ewmh = callPackage ../development/python-modules/ewmh { }; - - exchangelib = callPackage ../development/python-modules/exchangelib { }; - - dcmstack = callPackage ../development/python-modules/dcmstack { }; - - dbus-python = callPackage ../development/python-modules/dbus { - inherit (pkgs) dbus pkgconfig; - }; - - debts = callPackage ../development/python-modules/debts { }; - - dftfit = callPackage ../development/python-modules/dftfit { }; - - dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; - - discid = callPackage ../development/python-modules/discid { }; - - discordpy = callPackage ../development/python-modules/discordpy { }; - - parver = callPackage ../development/python-modules/parver { }; - arpeggio = callPackage ../development/python-modules/arpeggio { }; - - influxdb-client = callPackage ../development/python-modules/influxdb-client { }; - - invoke = callPackage ../development/python-modules/invoke { }; - - distorm3 = callPackage ../development/python-modules/distorm3 { }; - - distlib = callPackage ../development/python-modules/distlib { }; - - distributed = callPackage ../development/python-modules/distributed { }; - - docutils = callPackage ../development/python-modules/docutils { }; - - dogtail = callPackage ../development/python-modules/dogtail { }; - - diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; - - eliot = callPackage ../development/python-modules/eliot {}; - - entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; - - entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; - - eradicate = callPackage ../development/python-modules/eradicate { }; - - face = callPackage ../development/python-modules/face { }; - - fastparquet = callPackage ../development/python-modules/fastparquet { }; - - fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; - - fasttext = callPackage ../development/python-modules/fasttext { }; - - facedancer = callPackage ../development/python-modules/facedancer { }; - - favicon = callPackage ../development/python-modules/favicon { }; - - fdint = callPackage ../development/python-modules/fdint { }; - - fido2 = callPackage ../development/python-modules/fido2 { }; - - filterpy = callPackage ../development/python-modules/filterpy { }; - - filemagic = callPackage ../development/python-modules/filemagic { }; - - finalfusion = callPackage ../development/python-modules/finalfusion { }; - - fints = callPackage ../development/python-modules/fints { }; - - fire = callPackage ../development/python-modules/fire { }; - - firetv = callPackage ../development/python-modules/firetv { }; - - flower = callPackage ../development/python-modules/flower { }; - - flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; - - flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; - - flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; - - foxdot = callPackage ../development/python-modules/foxdot { }; - - freetype-py = callPackage ../development/python-modules/freetype-py { }; - - fsspec = callPackage ../development/python-modules/fsspec { }; - - furl = callPackage ../development/python-modules/furl { }; - - fuse = callPackage ../development/python-modules/fuse-python { - inherit (pkgs) fuse pkgconfig; - }; - - fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; - - genanki = callPackage ../development/python-modules/genanki { }; - - geoip2 = callPackage ../development/python-modules/geoip2 { }; - - getmac = callPackage ../development/python-modules/getmac { }; - - gidgethub = callPackage ../development/python-modules/gidgethub { }; - - gin-config = callPackage ../development/python-modules/gin-config { }; - - globus-sdk = callPackage ../development/python-modules/globus-sdk { }; - - glymur = callPackage ../development/python-modules/glymur { }; - - glob2 = callPackage ../development/python-modules/glob2 { }; - - globre = callPackage ../development/python-modules/globre { }; - - glom = callPackage ../development/python-modules/glom { }; - - gdcm = disabledIf isPy27 (toPythonModule (pkgs.gdcm.override { - inherit (self) python; - enablePython = true; - })); - - goocalendar = callPackage ../development/python-modules/goocalendar { }; - - grandalf = callPackage ../development/python-modules/grandalf { }; - - gprof2dot = callPackage ../development/python-modules/gprof2dot { - inherit (pkgs) graphviz; - }; - - gsd = if isPy27 then - callPackage ../development/python-modules/gsd/1.7.nix { } - else - callPackage ../development/python-modules/gsd { }; - - gssapi = callPackage ../development/python-modules/gssapi { - inherit (pkgs) darwin krb5Full; - }; - - guestfs = callPackage ../development/python-modules/guestfs { }; - - gumath = callPackage ../development/python-modules/gumath { }; - - h3 = callPackage ../development/python-modules/h3 { inherit (pkgs) h3; }; - - h5py = callPackage ../development/python-modules/h5py { - hdf5 = pkgs.hdf5; - }; - - h5py-mpi = self.h5py.override { - hdf5 = pkgs.hdf5-mpi; - }; - - h5netcdf = callPackage ../development/python-modules/h5netcdf { }; - - ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; - - habanero = callPackage ../development/python-modules/habanero { }; - - handout = callPackage ../development/python-modules/handout { }; - - HAP-python = callPackage ../development/python-modules/HAP-python { }; - - helper = callPackage ../development/python-modules/helper { }; - - hdmedians = callPackage ../development/python-modules/hdmedians { }; - - hdlparse = callPackage ../development/python-modules/hdlparse { }; - - hiyapyco = callPackage ../development/python-modules/hiyapyco { }; - - hocr-tools = callPackage ../development/python-modules/hocr-tools { }; - - holidays = callPackage ../development/python-modules/holidays { }; - - holoviews = callPackage ../development/python-modules/holoviews { }; - - hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { - inherit python; - }); - - hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; - - http-ece = callPackage ../development/python-modules/http-ece { }; - - httpsig = callPackage ../development/python-modules/httpsig { }; - - httptools = callPackage ../development/python-modules/httptools { }; - - hwi = callPackage ../development/python-modules/hwi { }; - - i3ipc = callPackage ../development/python-modules/i3ipc { }; - - ignite = callPackage ../development/python-modules/ignite { }; - - ihatemoney = callPackage ../development/python-modules/ihatemoney { }; - - imutils = callPackage ../development/python-modules/imutils { }; - - inotify-simple = callPackage ../development/python-modules/inotify-simple { }; - - intake = callPackage ../development/python-modules/intake { }; - - intelhex = callPackage ../development/python-modules/intelhex { }; - - inquirer = callPackage ../development/python-modules/inquirer { }; - - ipympl = callPackage ../development/python-modules/ipympl { }; - - itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; - - itemadapter = callPackage ../development/python-modules/itemadapter { }; - - itemloaders = callPackage ../development/python-modules/itemloaders { }; - - iterm2 = callPackage ../development/python-modules/iterm2 { }; - - janus = callPackage ../development/python-modules/janus { }; - - jc = callPackage ../development/python-modules/jc { }; - - jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { }; - - jira = callPackage ../development/python-modules/jira { }; - - jsonpath = callPackage ../development/python-modules/jsonpath { }; - - junit-xml = callPackage ../development/python-modules/junit-xml { }; - - junitparser = callPackage ../development/python-modules/junitparser { }; - - jwcrypto = callPackage ../development/python-modules/jwcrypto { }; - - kconfiglib = callPackage ../development/python-modules/kconfiglib { }; - - kinparse = callPackage ../development/python-modules/kinparse { }; - - labelbox = callPackage ../development/python-modules/labelbox { }; - - lammps-cython = callPackage ../development/python-modules/lammps-cython { - mpi = pkgs.openmpi; - }; - - langdetect = callPackage ../development/python-modules/langdetect { }; - - launchpadlib = callPackage ../development/python-modules/launchpadlib { }; - - lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; - - lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; - - lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; - - lazr-uri = callPackage ../development/python-modules/lazr-uri { }; - - libmr = callPackage ../development/python-modules/libmr { }; - - limitlessled = callPackage ../development/python-modules/limitlessled { }; - - livelossplot = callPackage ../development/python-modules/livelossplot { }; - - lmtpd = callPackage ../development/python-modules/lmtpd { }; - - logster = callPackage ../development/python-modules/logster { }; - - loguru = callPackage ../development/python-modules/loguru { }; - - logzero = callPackage ../development/python-modules/logzero { }; - - mac_alias = callPackage ../development/python-modules/mac_alias { }; - - macropy = callPackage ../development/python-modules/macropy { }; - - mail-parser = callPackage ../development/python-modules/mail-parser { }; - - mailman = callPackage ../servers/mail/mailman { }; - - mailman-web = callPackage ../servers/mail/mailman/web.nix { }; - - mailmanclient = callPackage ../development/python-modules/mailmanclient { }; - - mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; - - manhole = callPackage ../development/python-modules/manhole { }; - - mapbox = callPackage ../development/python-modules/mapbox { }; - - markerlib = callPackage ../development/python-modules/markerlib { }; - - mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; - - matchpy = callPackage ../development/python-modules/matchpy { }; - - mathlibtools = callPackage ../development/python-modules/mathlibtools {}; - - maxminddb = callPackage ../development/python-modules/maxminddb { }; - - mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py; - - mkl-service = callPackage ../development/python-modules/mkl-service { }; - - mnist = callPackage ../development/python-modules/mnist { }; - - monkeyhex = callPackage ../development/python-modules/monkeyhex { }; - - monty = callPackage ../development/python-modules/monty { }; - - mpi4py = callPackage ../development/python-modules/mpi4py { - mpi = pkgs.openmpi; - }; - - pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { }; - - python-baseconv = callPackage ../development/python-modules/python-baseconv { }; - - pycognito = callPackage ../development/python-modules/pycognito { }; - - python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; - - mortgage = callPackage ../development/python-modules/mortgage { }; - - msal = callPackage ../development/python-modules/msal { }; - - msal-extensions = callPackage ../development/python-modules/msal-extensions { }; - - msrest = callPackage ../development/python-modules/msrest { }; - - msrestazure = callPackage ../development/python-modules/msrestazure { }; - - multiset = callPackage ../development/python-modules/multiset { }; - - mwclient = callPackage ../development/python-modules/mwclient { }; - - mwoauth = callPackage ../development/python-modules/mwoauth { }; - - nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; - - nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; - - nassl = callPackage ../development/python-modules/nassl { }; - - nbsmoke = callPackage ../development/python-modules/nbsmoke { }; - - nbsphinx = callPackage ../development/python-modules/nbsphinx { }; - - nbval = callPackage ../development/python-modules/nbval { }; - - ndtypes = callPackage ../development/python-modules/ndtypes { }; - - neo = callPackage ../development/python-modules/neo { }; - - nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; - - neuron = pkgs.neuron.override { - inherit python; - }; - - neuron-mpi = pkgs.neuron-mpi.override { - inherit python; - }; - - nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { }; - - nixpart = callPackage ../tools/filesystems/nixpart { }; - - # This is used for NixOps to make sure we won't break it with the next major - # version of nixpart. - nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; - - nltk = callPackage ../development/python-modules/nltk { }; - - ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; - - nvchecker = callPackage ../development/python-modules/nvchecker { }; - - numericalunits = callPackage ../development/python-modules/numericalunits { }; - - nunavut = callPackage ../development/python-modules/nunavut { }; - - oath = callPackage ../development/python-modules/oath { }; - - oauthenticator = callPackage ../development/python-modules/oauthenticator { }; - - onnx = callPackage ../development/python-modules/onnx { }; - - ordered-set = callPackage ../development/python-modules/ordered-set { }; - - orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; - - ortools = (toPythonModule (pkgs.or-tools.override { - inherit (self) python; - })).python; - - osmnx = callPackage ../development/python-modules/osmnx { }; - - osmpythontools = callPackage ../development/python-modules/osmpythontools { }; - - outcome = callPackage ../development/python-modules/outcome {}; - - ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { - pythonPackages = self; - }); - - palettable = callPackage ../development/python-modules/palettable { }; - - papermill = callPackage ../development/python-modules/papermill { }; - - parsley = callPackage ../development/python-modules/parsley { }; - - pastel = callPackage ../development/python-modules/pastel { }; - - pathlib = callPackage ../development/python-modules/pathlib { }; - - pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); - - pcpp = callPackage ../development/python-modules/pcpp { }; - - pdf2image = callPackage ../development/python-modules/pdf2image { }; - - pdfminer = callPackage ../development/python-modules/pdfminer_six { }; - - pdfposter = callPackage ../development/python-modules/pdfposter { }; - - pdftotext = callPackage ../development/python-modules/pdftotext { }; - - pdfx = callPackage ../development/python-modules/pdfx { }; - - pushover-complete = callPackage ../development/python-modules/pushover-complete { }; - - pyicloud = callPackage ../development/python-modules/pyicloud { }; - - pyperf = callPackage ../development/python-modules/pyperf { }; - - pyphotonfile = callPackage ../development/python-modules/pyphotonfile { }; - - pefile = callPackage ../development/python-modules/pefile { }; - - perfplot = callPackage ../development/python-modules/perfplot { }; - - phonopy = callPackage ../development/python-modules/phonopy { }; - - phik = callPackage ../development/python-modules/phik {}; - - piccata = callPackage ../development/python-modules/piccata {}; - - pims = callPackage ../development/python-modules/pims { }; - - poetry = callPackage ../development/python-modules/poetry { }; - - poetry-core = callPackage ../development/python-modules/poetry-core { }; - - polyline = callPackage ../development/python-modules/polyline { }; - - postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { }); - - pplpy = callPackage ../development/python-modules/pplpy { }; - - pprintpp = callPackage ../development/python-modules/pprintpp { }; - - progress = callPackage ../development/python-modules/progress { }; - - proglog = callPackage ../development/python-modules/proglog { }; - - pulsectl = callPackage ../development/python-modules/pulsectl { }; - - pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; - - pure-eval = callPackage ../development/python-modules/pure-eval {}; - - purl = callPackage ../development/python-modules/purl { }; - - pyclipper = callPackage ../development/python-modules/pyclipper { }; - - pymystem3 = callPackage ../development/python-modules/pymystem3 { }; - - pymysql = callPackage ../development/python-modules/pymysql { }; - - pymupdf = callPackage ../development/python-modules/pymupdf { }; - - pynamecheap = callPackage ../development/python-modules/pynamecheap { }; - - Pmw = callPackage ../development/python-modules/Pmw { }; - - py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; - - pyaes = callPackage ../development/python-modules/pyaes { }; - - pyairvisual = callPackage ../development/python-modules/pyairvisual { }; - - pyamf = callPackage ../development/python-modules/pyamf { }; - - pyarrow = callPackage ../development/python-modules/pyarrow { - inherit (pkgs) arrow-cpp cmake pkgconfig; - }; - - pyannotate = callPackage ../development/python-modules/pyannotate { }; - - pyatspi = callPackage ../development/python-modules/pyatspi { - inherit (pkgs) pkgconfig; - }; - - pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; - - pybids = callPackage ../development/python-modules/pybids { }; - - pybind11 = callPackage ../development/python-modules/pybind11 { }; - - py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); - - pybullet = callPackage ../development/python-modules/pybullet { }; - - pycairo = callPackage ../development/python-modules/pycairo { - inherit (pkgs) meson pkgconfig; - }; - - pycategories = callPackage ../development/python-modules/pycategories { }; - - pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { - inherit (pkgs) pkgconfig; - }); - - pycrc = callPackage ../development/python-modules/pycrc { }; - - pycrypto = callPackage ../development/python-modules/pycrypto { }; - - pycryptodome = callPackage ../development/python-modules/pycryptodome { }; - - pycryptodomex = callPackage ../development/python-modules/pycryptodomex { }; - - PyChromecast = callPackage ../development/python-modules/pychromecast { }; - - pycm = callPackage ../development/python-modules/pycm { }; - - py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; - - py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; - - py-multibase = callPackage ../development/python-modules/py-multibase { }; - - py-multihash = callPackage ../development/python-modules/py-multihash { }; - - py-radix = callPackage ../development/python-modules/py-radix { }; - - pydbus = callPackage ../development/python-modules/pydbus { }; - - pydicom = callPackage ../development/python-modules/pydicom { }; - - pydocstyle = - if isPy27 then - callPackage ../development/python-modules/pydocstyle/2.nix { } - else - callPackage ../development/python-modules/pydocstyle { }; - - pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; - - pydrive = callPackage ../development/python-modules/pydrive { }; - - pydy = callPackage ../development/python-modules/pydy { }; - - pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 {})); - - py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; - - pyfakefs = callPackage ../development/python-modules/pyfakefs {}; - - pyfaidx = callPackage ../development/python-modules/pyfaidx { }; - - pyfcm = callPackage ../development/python-modules/pyfcm { }; - - pyfttt = callPackage ../development/python-modules/pyfttt { }; - - pyftdi = callPackage ../development/python-modules/pyftdi { }; - - pygame = callPackage ../development/python-modules/pygame { }; - - pygbm = callPackage ../development/python-modules/pygbm { }; - - pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; - - pygdbmi = callPackage ../development/python-modules/pygdbmi { }; - - pygmo = callPackage ../development/python-modules/pygmo { }; - - pygobject2 = callPackage ../development/python-modules/pygobject { - inherit (pkgs) pkgconfig; - }; - - pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { - inherit (pkgs) meson pkgconfig; - }; - - pygtail = callPackage ../development/python-modules/pygtail { }; - - pygtk = callPackage ../development/python-modules/pygtk { - inherit (pkgs) pkgconfig; - libglade = null; - }; - - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { - inherit (pkgs) pkgconfig; - }; - - pyGtkGlade = self.pygtk.override { - libglade = pkgs.gnome2.libglade; - }; - - pyjwkest = callPackage ../development/python-modules/pyjwkest { }; - - pykdtree = callPackage ../development/python-modules/pykdtree { - inherit (pkgs.llvmPackages) openmp; - }; - - pykerberos = callPackage ../development/python-modules/pykerberos { }; - - pykeepass = callPackage ../development/python-modules/pykeepass { }; - - pylev = callPackage ../development/python-modules/pylev { }; - - pylibftdi = callPackage ../development/python-modules/pylibftdi { - inherit (pkgs) libusb1; - }; - - pymatgen = callPackage ../development/python-modules/pymatgen { }; - - pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; - - pymavlink = callPackage ../development/python-modules/pymavlink { }; - - pymeeus = callPackage ../development/python-modules/pymeeus { }; - - pymsgbox = callPackage ../development/python-modules/pymsgbox { }; - - pynanoleaf = callPackage ../development/python-modules/pynanoleaf { }; - - pynisher = callPackage ../development/python-modules/pynisher { }; - - pynput = callPackage ../development/python-modules/pynput { }; - - pyparser = callPackage ../development/python-modules/pyparser { }; - - pyres = callPackage ../development/python-modules/pyres { }; - - PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; - - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { - inherit (pkgs) pkgconfig; - }; - - pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { - pythonPackages = self; - }; - - /* - `pyqt5_with_qtwebkit` should not be used by python libraries in - pkgs/development/python-modules/*. Putting this attribute in - `propagatedBuildInputs` may cause collisions. - */ - pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; - - pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; - - pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { - pythonPackages = self; - }; - - pysc2 = callPackage ../development/python-modules/pysc2 { }; - - pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; - - pyschedule = callPackage ../development/python-modules/pyschedule { }; - - pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; - - pydsdl = callPackage ../development/python-modules/pydsdl { }; - - pyside = callPackage ../development/python-modules/pyside { - inherit (pkgs) mesa; - }; - - pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { - inherit (pkgs) libxml2 libxslt; # Do not need the Python bindings. - }; - - pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; - - pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { - inherit (pkgs) cmake qt5 ninja; - }); - - shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 { - inherit (pkgs) cmake qt5 llvmPackages; - }); - - simplefix = callPackage ../development/python-modules/simplefix { }; - - pyscrypt = callPackage ../development/python-modules/pyscrypt { }; - - pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools { - inherit (pkgs) cmake qt5; - }); - - pyslurm = callPackage ../development/python-modules/pyslurm { - slurm = pkgs.slurm; - }; - - pysmb = callPackage ../development/python-modules/pysmb { }; - - pysmf = callPackage ../development/python-modules/pysmf { }; - - pyspinel = callPackage ../development/python-modules/pyspinel {}; - - pyssim = callPackage ../development/python-modules/pyssim { }; - - pystache = callPackage ../development/python-modules/pystache { }; - - pystray = callPackage ../development/python-modules/pystray { }; - - pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; - - pytesseract = callPackage ../development/python-modules/pytesseract { }; - - pytest-bdd = callPackage ../development/python-modules/pytest-bdd { }; - - pytest-black = callPackage ../development/python-modules/pytest-black { }; - - pytest-click = callPackage ../development/python-modules/pytest-click { }; - - pytest-check = callPackage ../development/python-modules/pytest-check { }; - - pytest-env = callPackage ../development/python-modules/pytest-env { }; - - pytest-factoryboy = callPackage ../development/python-modules/pytest-factoryboy { }; - - pytest-flask = callPackage ../development/python-modules/pytest-flask { }; - - pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; - - pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; - - pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; - - pytest-qt = callPackage ../development/python-modules/pytest-qt { }; - - pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; - - pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; - - pytest-tornasync = callPackage ../development/python-modules/pytest-tornasync { }; - - pytest-trio = callPackage ../development/python-modules/pytest-trio { }; - - pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; - - pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; - - pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; - - pytmx = callPackage ../development/python-modules/pytmx { }; - - pythonmagick = callPackage ../development/python-modules/pythonmagick { }; - - python-binance = callPackage ../development/python-modules/python-binance { }; - - python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; - - python-dotenv = callPackage ../development/python-modules/python-dotenv { }; - - python-engineio = callPackage ../development/python-modules/python-engineio { }; - - python-hosts = callPackage ../development/python-modules/python-hosts { }; - - python-lz4 = callPackage ../development/python-modules/python-lz4 { }; - lz4 = self.python-lz4; # alias 2018-12-05 - - python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; - - python-mnist = callPackage ../development/python-modules/python-mnist { }; - - pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { - inherit (pkgs.xorg) libX11; - }); - - python-igraph = callPackage ../development/python-modules/python-igraph { - pkgconfig = pkgs.pkgconfig; - igraph = pkgs.igraph; - }; - - python-olm = callPackage ../development/python-modules/python-olm { }; - - python3-openid = callPackage ../development/python-modules/python3-openid { }; - - python-packer = callPackage ../development/python-modules/python-packer { }; - - python-periphery = callPackage ../development/python-modules/python-periphery { }; - - python-prctl = callPackage ../development/python-modules/python-prctl { }; - - python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; - - python-redis-lock = callPackage ../development/python-modules/python-redis-lock { }; - - python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; - - python-sql = callPackage ../development/python-modules/python-sql { }; - - python-snappy = callPackage ../development/python-modules/python-snappy { - inherit (pkgs) snappy; - }; - - python-stdnum = callPackage ../development/python-modules/python-stdnum { }; - - python-socketio = callPackage ../development/python-modules/python-socketio { }; - - python-utils = callPackage ../development/python-modules/python-utils { }; - - python-vipaccess = callPackage ../development/python-modules/python-vipaccess { }; - - pytimeparse = callPackage ../development/python-modules/pytimeparse { }; - - pytricia = callPackage ../development/python-modules/pytricia { }; - - pytrends = callPackage ../development/python-modules/pytrends { }; - - py-vapid = callPackage ../development/python-modules/py-vapid { }; - - PyWebDAV = callPackage ../development/python-modules/pywebdav { }; - - pywebpush = callPackage ../development/python-modules/pywebpush { }; - - pywebview = callPackage ../development/python-modules/pywebview { }; - - pywick = callPackage ../development/python-modules/pywick { }; - - pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ }); - - pyvcd = callPackage ../development/python-modules/pyvcd { }; - - pyvcf = callPackage ../development/python-modules/pyvcf { }; - - pyvoro = callPackage ../development/python-modules/pyvoro { }; - - radish-bdd = callPackage ../development/python-modules/radish-bdd { }; - - relatorio = callPackage ../development/python-modules/relatorio { }; - - reproject = callPackage ../development/python-modules/reproject { }; - - remotecv = callPackage ../development/python-modules/remotecv { }; - - pyzufall = callPackage ../development/python-modules/pyzufall { }; - - rig = callPackage ../development/python-modules/rig { }; - - rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {}); - - rlp = callPackage ../development/python-modules/rlp { }; - - rq = callPackage ../development/python-modules/rq { }; - - rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; - - rx = callPackage ../development/python-modules/rx { }; - - sabyenc = callPackage ../development/python-modules/sabyenc { }; - - sabyenc3 = callPackage ../development/python-modules/sabyenc3 { }; - - salmon-mail = callPackage ../development/python-modules/salmon-mail { }; - - sanic-auth = callPackage ../development/python-modules/sanic-auth { }; - - sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; - - seekpath = callPackage ../development/python-modules/seekpath { }; - - selectors2 = callPackage ../development/python-modules/selectors2 { }; - - sacremoses = callPackage ../development/python-modules/sacremoses { }; - - sentencepiece = callPackage ../development/python-modules/sentencepiece { - inherit (pkgs) sentencepiece pkgconfig; - }; - - tokenizers = disabledIf (!isPy3k) - (toPythonModule (callPackage ../development/python-modules/tokenizers { })); - - towncrier = callPackage ../development/python-modules/towncrier { - inherit (pkgs) git; - }; - - transformers = callPackage ../development/python-modules/transformers { }; - - transforms3d = callPackage ../development/python-modules/transforms3d { }; - - trimesh = callPackage ../development/python-modules/trimesh {}; - - sentinel = callPackage ../development/python-modules/sentinel { }; - - sentry-sdk = callPackage ../development/python-modules/sentry-sdk {}; - - sepaxml = callPackage ../development/python-modules/sepaxml { }; - - serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; - - shellingham = callPackage ../development/python-modules/shellingham {}; - - simpleaudio = callPackage ../development/python-modules/simpleaudio { }; - - simpleeval = callPackage ../development/python-modules/simpleeval { }; - - simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; - - singledispatch = callPackage ../development/python-modules/singledispatch { }; - - sip = callPackage ../development/python-modules/sip { }; - - sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; - - sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; - - skorch = callPackage ../development/python-modules/skorch { }; - - slackclient = callPackage ../development/python-modules/slackclient { }; - - slicedimage = callPackage ../development/python-modules/slicedimage { }; - - slicerator = callPackage ../development/python-modules/slicerator { }; - - slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; - - sly = callPackage ../development/python-modules/sly { }; - - snapcast = callPackage ../development/python-modules/snapcast { }; - - soapysdr = toPythonModule (pkgs.soapysdr.override { - python = self.python; - usePython = true; - }); - - soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override { - python = self.python; - usePython = true; - }); - - softlayer = callPackage ../development/python-modules/softlayer { }; - - sparse = callPackage ../development/python-modules/sparse { }; - - spglib = callPackage ../development/python-modules/spglib { }; - - spidev = callPackage ../development/python-modules/spidev { }; - - srvlookup = callPackage ../development/python-modules/srvlookup { }; - - sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; - - sshtunnel = callPackage ../development/python-modules/sshtunnel { }; - - sslib = callPackage ../development/python-modules/sslib { }; - - sslyze = callPackage ../development/python-modules/sslyze { }; - - statistics = callPackage ../development/python-modules/statistics { }; - - stm32loader = callPackage ../development/python-modules/stm32loader { }; - - stumpy = callPackage ../development/python-modules/stumpy { }; - - stups-cli-support = callPackage ../development/python-modules/stups-cli-support { }; - - stups-fullstop = callPackage ../development/python-modules/stups-fullstop { }; - - stups-pierone = callPackage ../development/python-modules/stups-pierone { }; - - stups-tokens = callPackage ../development/python-modules/stups-tokens { }; - - stups-zign = callPackage ../development/python-modules/stups-zign { }; - - sumo = callPackage ../development/python-modules/sumo { }; - - supervise_api = callPackage ../development/python-modules/supervise_api { }; - - tables = if isPy3k then callPackage ../development/python-modules/tables { - hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; - } else callPackage ../development/python-modules/tables/3.5.nix { - hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; - }; - - tag-expressions = callPackage ../development/python-modules/tag-expressions { }; - - tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; - - tesserocr = callPackage ../development/python-modules/tesserocr { }; - - tls-parser = callPackage ../development/python-modules/tls-parser { }; - - trueskill = callPackage ../development/python-modules/trueskill { }; - - trustme = callPackage ../development/python-modules/trustme {}; - - trio = callPackage ../development/python-modules/trio {}; - - sniffio = callPackage ../development/python-modules/sniffio { }; - - spyder-kernels = callPackage ../development/python-modules/spyder-kernels {}; - spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix {}; - - spyder = callPackage ../development/python-modules/spyder {}; - spyder_3 = callPackage ../development/python-modules/spyder/3.nix { }; - - tenacity = callPackage ../development/python-modules/tenacity { }; - - tokenserver = callPackage ../development/python-modules/tokenserver {}; - - toml = callPackage ../development/python-modules/toml { }; - - tomlkit = callPackage ../development/python-modules/tomlkit { }; - - toggl-cli = callPackage ../development/python-modules/toggl-cli { }; - - uamqp = callPackage ../development/python-modules/uamqp { - inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; - }; - - ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; - - ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; - - unifi = callPackage ../development/python-modules/unifi { }; - - uvcclient = callPackage ../development/python-modules/uvcclient { }; - - uvloop = callPackage ../development/python-modules/uvloop { - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - }; - - pyuavcan = callPackage ../development/python-modules/pyuavcan { - # this version pinpoint to anold version is necessary due to a regression - nunavut = self.nunavut.overridePythonAttrs ( old: rec { - version = "0.2.3"; - src = old.src.override { - inherit version; - sha256 = "0x8a9h4mc2r2yz49s9arsbs4bn3h25mvmg4zbgksm9hcyi9536x5"; - }; - }); - }; - - pyunifi = callPackage ../development/python-modules/pyunifi { }; - - vdf = callPackage ../development/python-modules/vdf { }; - - vdirsyncer = callPackage ../development/python-modules/vdirsyncer { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; - inherit (pkgs) pkg-config openssl rustPlatform; - }; - - vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; - - vidstab = callPackage ../development/python-modules/vidstab { }; - - webapp2 = callPackage ../development/python-modules/webapp2 { }; - - webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; - - wordcloud = callPackage ../development/python-modules/wordcloud { }; - - wrf-python = callPackage ../development/python-modules/wrf-python { }; - - pyunbound = callPackage ../tools/networking/unbound/python.nix { }; - - WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; - - yarg = callPackage ../development/python-modules/yarg { }; - - yt = callPackage ../development/python-modules/yt { }; - - # packages defined here - - aafigure = callPackage ../development/python-modules/aafigure { }; - - addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; - - algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; - - altair = callPackage ../development/python-modules/altair { }; - - vega = callPackage ../development/python-modules/vega { }; - - accupy = callPackage ../development/python-modules/accupy { }; - - acme = callPackage ../development/python-modules/acme { }; - - acme-tiny = callPackage ../development/python-modules/acme-tiny { }; - - actdiag = callPackage ../development/python-modules/actdiag { }; - - adal = callPackage ../development/python-modules/adal { }; - - affine = callPackage ../development/python-modules/affine { }; - - aioconsole = callPackage ../development/python-modules/aioconsole { }; - - aiodns = callPackage ../development/python-modules/aiodns { }; - - aiofiles = callPackage ../development/python-modules/aiofiles { }; - - aioh2 = callPackage ../development/python-modules/aioh2 { }; - - aioftp = callPackage ../development/python-modules/aioftp { }; - - aioharmony = callPackage ../development/python-modules/aioharmony { }; - - aiohttp = callPackage ../development/python-modules/aiohttp { }; - - aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; - - aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; - - aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; - - aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; - - aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; - - aiomysql = callPackage ../development/python-modules/aiomysql { }; - - aioprocessing = callPackage ../development/python-modules/aioprocessing { }; - - aioresponses = callPackage ../development/python-modules/aioresponses { }; - - aiosqlite = callPackage ../development/python-modules/aiosqlite { }; - - aiorpcx = callPackage ../development/python-modules/aiorpcx { }; - - aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; - - aiounifi = callPackage ../development/python-modules/aiounifi { }; - - aiounittest = callPackage ../development/python-modules/aiounittest { }; - - aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; - - ajpy = callPackage ../development/python-modules/ajpy { }; - - alabaster = callPackage ../development/python-modules/alabaster {}; - - alarmdecoder = callPackage ../development/python-modules/alarmdecoder {}; - - alembic = callPackage ../development/python-modules/alembic {}; - - allpairspy = callPackage ../development/python-modules/allpairspy { }; - - annexremote = callPackage ../development/python-modules/annexremote { }; - - ansible = callPackage ../development/python-modules/ansible { }; - - ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; - - ansible-lint = callPackage ../development/python-modules/ansible-lint { }; - - ansible-runner = callPackage ../development/python-modules/ansible-runner { }; - - ansicolors = callPackage ../development/python-modules/ansicolors {}; - - aniso8601 = callPackage ../development/python-modules/aniso8601 {}; - - anonip = callPackage ../development/python-modules/anonip { }; - - asgiref = callPackage ../development/python-modules/asgiref { }; - - python-editor = callPackage ../development/python-modules/python-editor { }; - - python-gnupg = callPackage ../development/python-modules/python-gnupg {}; - - python-uinput = callPackage ../development/python-modules/python-uinput {}; - - python-sybase = callPackage ../development/python-modules/sybase {}; - - alot = callPackage ../development/python-modules/alot {}; - - anyjson = callPackage ../development/python-modules/anyjson {}; - - amqp = callPackage ../development/python-modules/amqp {}; - - amqplib = callPackage ../development/python-modules/amqplib {}; - - antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { antlr4 = pkgs.antlr4; }; - - antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; - - apache-airflow = callPackage ../development/python-modules/apache-airflow { }; - - apipkg = callPackage ../development/python-modules/apipkg {}; - - apispec = callPackage ../development/python-modules/apispec {}; - - appdirs = callPackage ../development/python-modules/appdirs { }; - - appleseed = disabledIf isPy3k - (toPythonModule (pkgs.appleseed.override { - inherit (self) python; - })); - - application = callPackage ../development/python-modules/application { }; - - applicationinsights = callPackage ../development/python-modules/applicationinsights { }; - - appnope = callPackage ../development/python-modules/appnope { }; - - approvaltests = callPackage ../development/python-modules/approvaltests { }; - - apptools = callPackage ../development/python-modules/apptools {}; - - apsw = callPackage ../development/python-modules/apsw {}; - - astor = callPackage ../development/python-modules/astor {}; - - asyncpg = callPackage ../development/python-modules/asyncpg { }; - - asyncssh = callPackage ../development/python-modules/asyncssh { }; - - atpublic = callPackage ../development/python-modules/atpublic { }; - - python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; - - funcsigs = callPackage ../development/python-modules/funcsigs { }; - - APScheduler = callPackage ../development/python-modules/APScheduler { }; - - args = callPackage ../development/python-modules/args { }; - - argcomplete = callPackage ../development/python-modules/argcomplete { }; - - area = callPackage ../development/python-modules/area { }; - - arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; - - chai = callPackage ../development/python-modules/chai { }; - - chainmap = callPackage ../development/python-modules/chainmap { }; - - arelle = callPackage ../development/python-modules/arelle { - gui = true; - }; - - arelle-headless = callPackage ../development/python-modules/arelle { - gui = false; - }; - - delegator-py = callPackage ../development/python-modules/delegator-py { }; - - deluge-client = callPackage ../development/python-modules/deluge-client { }; - - arrow = callPackage ../development/python-modules/arrow { }; - - asynctest = callPackage ../development/python-modules/asynctest { }; - - async-timeout = callPackage ../development/python-modules/async_timeout { }; - - async_generator = callPackage ../development/python-modules/async_generator { }; - - async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; - - asn1ate = callPackage ../development/python-modules/asn1ate { }; - - atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; - - atomiclong = callPackage ../development/python-modules/atomiclong { }; - - atomicwrites = callPackage ../development/python-modules/atomicwrites { }; - - astroid = if isPy3k then callPackage ../development/python-modules/astroid { } - else callPackage ../development/python-modules/astroid/1.6.nix { }; - - attrdict = callPackage ../development/python-modules/attrdict { }; - - attrs = callPackage ../development/python-modules/attrs { }; - - atsim_potentials = callPackage ../development/python-modules/atsim_potentials { }; - - audio-metadata = callPackage ../development/python-modules/audio-metadata { }; - - audioread = callPackage ../development/python-modules/audioread { }; - - audiotools = callPackage ../development/python-modules/audiotools { }; - - autopep8 = callPackage ../development/python-modules/autopep8 { }; - - av = callPackage ../development/python-modules/av { - inherit (pkgs) pkgconfig; - }; - - avro = callPackage ../development/python-modules/avro {}; - - avro3k = callPackage ../development/python-modules/avro3k {}; - - avro-python3 = callPackage ../development/python-modules/avro-python3 {}; - - aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; - - python-slugify = callPackage ../development/python-modules/python-slugify { }; - - awesome-slugify = callPackage ../development/python-modules/awesome-slugify {}; - - noise = callPackage ../development/python-modules/noise {}; + babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; backcall = callPackage ../development/python-modules/backcall { }; @@ -2013,46 +715,78 @@ in { backports_abc = callPackage ../development/python-modules/backports_abc { }; + backports_csv = callPackage ../development/python-modules/backports_csv { }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; + backports_lzma = callPackage ../development/python-modules/backports_lzma { }; + backports_os = callPackage ../development/python-modules/backports_os { }; backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; - backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else - callPackage ../development/python-modules/backports_ssl_match_hostname { }; + backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; - backports_lzma = callPackage ../development/python-modules/backports_lzma { }; + backports_ssl_match_hostname = + if !(pythonOlder "3.5") then null else callPackage ../development/python-modules/backports_ssl_match_hostname { }; backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; - backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {}; + backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock { }; - babelfish = callPackage ../development/python-modules/babelfish {}; + backports_weakref = callPackage ../development/python-modules/backports_weakref { }; - bandit = callPackage ../development/python-modules/bandit {}; + bacpypes = callPackage ../development/python-modules/bacpypes { }; - basiciw = callPackage ../development/python-modules/basiciw { - inherit (pkgs) gcc wirelesstools; - }; + bandit = callPackage ../development/python-modules/bandit { }; - base58 = callPackage ../development/python-modules/base58 {}; + bap = callPackage ../development/python-modules/bap { bap = pkgs.ocaml-ng.ocamlPackages_4_06.bap; }; + + base58 = callPackage ../development/python-modules/base58 { }; + + baselines = callPackage ../development/python-modules/baselines { }; + + basemap = callPackage ../development/python-modules/basemap { }; + + bash_kernel = callPackage ../development/python-modules/bash_kernel { inherit (pkgs) bash; }; + + bashlex = callPackage ../development/python-modules/bashlex { }; + + basiciw = callPackage ../development/python-modules/basiciw { inherit (pkgs) gcc wirelesstools; }; batchgenerators = callPackage ../development/python-modules/batchgenerators { }; - batinfo = callPackage ../development/python-modules/batinfo {}; + batchspawner = callPackage ../development/python-modules/batchspawner { }; - bcdoc = callPackage ../development/python-modules/bcdoc {}; + batinfo = callPackage ../development/python-modules/batinfo { }; - beancount = callPackage ../development/python-modules/beancount { }; + bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { }; - beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; + bayespy = callPackage ../development/python-modules/bayespy { }; + + bcdoc = callPackage ../development/python-modules/bcdoc { }; + + bcrypt = callPackage ../development/python-modules/bcrypt { }; beaker = callPackage ../development/python-modules/beaker { }; + beancount = callPackage ../development/python-modules/beancount { }; + + beancount_docverif = callPackage ../development/python-modules/beancount_docverif { }; + + beanstalkc = callPackage ../development/python-modules/beanstalkc { }; + + beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; + + bedup = callPackage ../development/python-modules/bedup { }; + + behave = callPackage ../development/python-modules/behave { }; + + bellows = callPackage ../development/python-modules/bellows { }; + bespon = callPackage ../development/python-modules/bespon { }; - betamax = callPackage ../development/python-modules/betamax {}; + betamax = callPackage ../development/python-modules/betamax { }; betamax-matchers = callPackage ../development/python-modules/betamax-matchers { }; @@ -2064,6 +798,10 @@ in { bids-validator = callPackage ../development/python-modules/bids-validator { }; + billiard = callPackage ../development/python-modules/billiard { }; + + binaryornot = callPackage ../development/python-modules/binaryornot { }; + binwalk = callPackage ../development/python-modules/binwalk { pyqtgraph = null; matplotlib = null; @@ -2074,26 +812,63 @@ in { matplotlib = self.matplotlib; }); + biopython = callPackage ../development/python-modules/biopython { }; + + biplist = callPackage ../development/python-modules/biplist { }; + + bip_utils = callPackage ../development/python-modules/bip_utils { }; + + bitarray = callPackage ../development/python-modules/bitarray { }; + + bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; + + bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; + + bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; + + bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; + bitmath = callPackage ../development/python-modules/bitmath { }; + bitstring = callPackage ../development/python-modules/bitstring { }; + bitstruct = callPackage ../development/python-modules/bitstruct { }; - caldav = callPackage ../development/python-modules/caldav { }; + bjoern = callPackage ../development/python-modules/bjoern { }; - biopython = callPackage ../development/python-modules/biopython { }; + bkcharts = callPackage ../development/python-modules/bkcharts { }; - bedup = callPackage ../development/python-modules/bedup { }; + black = callPackage ../development/python-modules/black { }; - blessed = callPackage ../development/python-modules/blessed {}; + bleach = callPackage ../development/python-modules/bleach { }; - block-io = callPackage ../development/python-modules/block-io {}; + bleak = callPackage ../development/python-modules/bleak { }; - # Build boost for this specific Python version - # TODO: use separate output for libboost_python.so - boost = toPythonModule (pkgs.boost.override { - inherit (self) python numpy; - enablePython = true; - }); + blessed = callPackage ../development/python-modules/blessed { }; + + blessings = callPackage ../development/python-modules/blessings { }; + + blinker = callPackage ../development/python-modules/blinker { }; + + BlinkStick = callPackage ../development/python-modules/blinkstick { }; + + blis = callPackage ../development/python-modules/blis { }; + + blist = callPackage ../development/python-modules/blist { }; + + blivet = callPackage ../development/python-modules/blivet { }; + + blockdiag = callPackage ../development/python-modules/blockdiag { }; + + blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { }; + + block-io = callPackage ../development/python-modules/block-io { }; + + bluepy = callPackage ../development/python-modules/bluepy { }; + + bokeh = callPackage ../development/python-modules/bokeh { }; + + boltons = callPackage ../development/python-modules/boltons { }; boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; @@ -2101,89 +876,461 @@ in { boolean-py = callPackage ../development/python-modules/boolean-py { }; - bumps = callPackage ../development/python-modules/bumps {}; + boto3 = callPackage ../development/python-modules/boto3 { }; - bx-python = callPackage ../development/python-modules/bx-python { - inherit (pkgs) zlib; - }; + boto = callPackage ../development/python-modules/boto { }; + + botocore = callPackage ../development/python-modules/botocore { }; + + bottle = callPackage ../development/python-modules/bottle { }; + + bottleneck = callPackage ../development/python-modules/bottleneck { }; + + box2d = callPackage ../development/python-modules/box2d { }; + + bpython = callPackage ../development/python-modules/bpython { }; + + braintree = callPackage ../development/python-modules/braintree { }; + + branca = callPackage ../development/python-modules/branca { }; + + bravado-core = callPackage ../development/python-modules/bravado-core { }; + + bravia-tv = callPackage ../development/python-modules/bravia-tv { }; + + breathe = callPackage ../development/python-modules/breathe { }; + + breezy = callPackage ../development/python-modules/breezy { }; + + broadlink = callPackage ../development/python-modules/broadlink { }; + + brother = callPackage ../development/python-modules/brother { }; + + brotli = callPackage ../development/python-modules/brotli { }; + + brotlipy = callPackage ../development/python-modules/brotlipy { }; + + browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; + + browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy { }); + + bsddb3 = callPackage ../development/python-modules/bsddb3 { }; + + bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; + + btchip = callPackage ../development/python-modules/btchip { }; + + bt_proximity = callPackage ../development/python-modules/bt-proximity { }; + + BTrees = callPackage ../development/python-modules/btrees { }; + + btrfs = callPackage ../development/python-modules/btrfs { }; + + bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + + bugsnag = callPackage ../development/python-modules/bugsnag { }; + + bugwarrior = callPackage ../development/python-modules/bugwarrior { }; + + bugz = callPackage ../development/python-modules/bugz { }; + + bugzilla = callPackage ../development/python-modules/bugzilla { }; + + buildbot = callPackage ../development/python-modules/buildbot { }; + + buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); + + buildbot-full = self.buildbot.withPlugins + (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); + + buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; + + buildbot-plugins = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/buildbot/plugins.nix { }); + + buildbot-worker = callPackage ../development/python-modules/buildbot/worker.nix { }; + + build = callPackage ../development/python-modules/build { }; + + bumps = callPackage ../development/python-modules/bumps { }; + + bunch = callPackage ../development/python-modules/bunch { }; + + bx-python = callPackage ../development/python-modules/bx-python { inherit (pkgs) zlib; }; + + bytecode = callPackage ../development/python-modules/bytecode { }; + + bz2file = callPackage ../development/python-modules/bz2file { }; + + cachecontrol = callPackage ../development/python-modules/cachecontrol { }; cached-property = callPackage ../development/python-modules/cached-property { }; + cachelib = callPackage ../development/python-modules/cachelib { }; + + cachetools = let + cachetools' = callPackage ../development/python-modules/cachetools { }; + cachetools_2 = cachetools'.overridePythonAttrs (oldAttrs: rec { + version = "3.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; + }; + }); + in if isPy3k then cachetools' else cachetools_2; + + cachy = callPackage ../development/python-modules/cachy { }; + + cadquery = callPackage ../development/python-modules/cadquery { }; + caffe = toPythonModule (pkgs.caffe.override { pythonSupport = true; inherit (self) python numpy boost; }); + cairocffi = if isPy3k then + callPackage ../development/python-modules/cairocffi { } + else + callPackage ../development/python-modules/cairocffi/0_9.nix { }; + + cairosvg = if isPy3k then + callPackage ../development/python-modules/cairosvg { } + else + callPackage ../development/python-modules/cairosvg/1_x.nix { }; + + caldav = callPackage ../development/python-modules/caldav { }; + + can = callPackage ../development/python-modules/can { }; + + canmatrix = callPackage ../development/python-modules/canmatrix { }; + + canonicaljson = callPackage ../development/python-modules/canonicaljson { }; + + canopen = callPackage ../development/python-modules/canopen { }; + capstone = callPackage ../development/python-modules/capstone { inherit (pkgs) capstone; }; capturer = callPackage ../development/python-modules/capturer { }; - cement = callPackage ../development/python-modules/cement {}; + carbon = callPackage ../development/python-modules/carbon { }; + + carrot = callPackage ../development/python-modules/carrot { }; + + cartopy = callPackage ../development/python-modules/cartopy { }; + + casbin = callPackage ../development/python-modules/casbin { }; + + case = callPackage ../development/python-modules/case { }; + + cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; + + casttube = callPackage ../development/python-modules/casttube { }; + + catalogue = callPackage ../development/python-modules/catalogue { }; + + cbeams = callPackage ../misc/cbeams { }; + + cbor2 = callPackage ../development/python-modules/cbor2 { }; + + cbor = callPackage ../development/python-modules/cbor { }; + + cccolutils = callPackage ../development/python-modules/cccolutils { }; + + cchardet = callPackage ../development/python-modules/cchardet { }; + + CDDB = callPackage ../development/python-modules/cddb { }; + + cdecimal = callPackage ../development/python-modules/cdecimal { }; + + celery = callPackage ../development/python-modules/celery { }; + + cement = callPackage ../development/python-modules/cement { }; + + cerberus = callPackage ../development/python-modules/cerberus { }; + + certbot = callPackage ../development/python-modules/certbot { }; + + certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; + + certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; + + certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { }; + + certifi = callPackage ../development/python-modules/certifi { }; + + certipy = callPackage ../development/python-modules/certipy { }; + + cffi = callPackage ../development/python-modules/cffi { }; + + cfgv = callPackage ../development/python-modules/cfgv { }; + + cfn-flip = callPackage ../development/python-modules/cfn-flip { }; + + cfn-lint = callPackage ../development/python-modules/cfn-lint { }; + + cftime = callPackage ../development/python-modules/cftime { }; cgen = callPackage ../development/python-modules/cgen { }; - cgroup-utils = callPackage ../development/python-modules/cgroup-utils {}; + cgroup-utils = callPackage ../development/python-modules/cgroup-utils { }; - chainer = callPackage ../development/python-modules/chainer { - cudaSupport = pkgs.config.cudaSupport or false; - }; + chai = callPackage ../development/python-modules/chai { }; - channels = callPackage ../development/python-modules/channels {}; + chainer = callPackage ../development/python-modules/chainer { cudaSupport = pkgs.config.cudaSupport or false; }; - cheroot = callPackage ../development/python-modules/cheroot {}; + chainmap = callPackage ../development/python-modules/chainmap { }; - chevron = callPackage ../development/python-modules/chevron {}; + chalice = callPackage ../development/python-modules/chalice { }; + + chameleon = callPackage ../development/python-modules/chameleon { }; + + channels = callPackage ../development/python-modules/channels { }; + + channels-redis = callPackage ../development/python-modules/channels-redis { }; + + characteristic = callPackage ../development/python-modules/characteristic { }; + + chardet = callPackage ../development/python-modules/chardet { }; + + chart-studio = callPackage ../development/python-modules/chart-studio { }; + + check-manifest = callPackage ../development/python-modules/check-manifest { }; + + cheetah3 = callPackage ../development/python-modules/cheetah3 { }; + + cheetah = callPackage ../development/python-modules/cheetah { }; + + cheroot = callPackage ../development/python-modules/cheroot { }; + + cherrypy = if isPy3k then + callPackage ../development/python-modules/cherrypy { } + else + callPackage ../development/python-modules/cherrypy/17.nix { }; + + chevron = callPackage ../development/python-modules/chevron { }; ci-info = callPackage ../development/python-modules/ci-info { }; ci-py = callPackage ../development/python-modules/ci-py { }; - cli-helpers = callPackage ../development/python-modules/cli-helpers {}; - - cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; - cirq = callPackage ../development/python-modules/cirq { }; + ciso8601 = callPackage ../development/python-modules/ciso8601 { }; + citeproc-py = callPackage ../development/python-modules/citeproc-py { }; + cjson = callPackage ../development/python-modules/cjson { }; + + ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + + cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; + + cleo = callPackage ../development/python-modules/cleo { }; + + clf = callPackage ../development/python-modules/clf { }; + + cliapp = callPackage ../development/python-modules/cliapp { }; + + click = callPackage ../development/python-modules/click { }; + + clickclick = callPackage ../development/python-modules/clickclick { }; + + click-completion = callPackage ../development/python-modules/click-completion { }; + + click-datetime = callPackage ../development/python-modules/click-datetime { }; + + click-default-group = callPackage ../development/python-modules/click-default-group { }; + + click-didyoumean = callPackage ../development/python-modules/click-didyoumean { }; + + click-log = callPackage ../development/python-modules/click-log { }; + + click-plugins = callPackage ../development/python-modules/click-plugins { }; + + click-repl = callPackage ../development/python-modules/click-repl { }; + + click-threading = callPackage ../development/python-modules/click-threading { }; + + cliff = callPackage ../development/python-modules/cliff { }; + + clifford = callPackage ../development/python-modules/clifford { }; + + cligj = callPackage ../development/python-modules/cligj { }; + + cli-helpers = callPackage ../development/python-modules/cli-helpers { }; + + clikit = callPackage ../development/python-modules/clikit { }; + + clint = callPackage ../development/python-modules/clint { }; + + clize = callPackage ../development/python-modules/clize { }; + + closure-linter = callPackage ../development/python-modules/closure-linter { }; + + cloudflare = callPackage ../development/python-modules/cloudflare { }; + + cloudpickle = callPackage ../development/python-modules/cloudpickle { }; + + clustershell = callPackage ../development/python-modules/clustershell { }; + + cma = callPackage ../development/python-modules/cma { }; + + cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; + + cmd2 = callPackage ../development/python-modules/cmd2 { }; + + cmdline = callPackage ../development/python-modules/cmdline { }; + + cmdtest = callPackage ../development/python-modules/cmdtest { }; + + cntk = callPackage ../development/python-modules/cntk { }; + + cnvkit = callPackage ../development/python-modules/cnvkit { }; + + cocotb = callPackage ../development/python-modules/cocotb { }; + + codecov = callPackage ../development/python-modules/codecov { }; + + codespell = callPackage ../development/python-modules/codespell { }; + + cogapp = callPackage ../development/python-modules/cogapp { }; + + coilmq = callPackage ../development/python-modules/coilmq { }; + + coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; + + ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; + + colander = callPackage ../development/python-modules/colander { }; + + colorama = callPackage ../development/python-modules/colorama { }; + colorcet = callPackage ../development/python-modules/colorcet { }; + colorclass = callPackage ../development/python-modules/colorclass { }; + + colored = callPackage ../development/python-modules/colored { }; + coloredlogs = callPackage ../development/python-modules/coloredlogs { }; - colorclass = callPackage ../development/python-modules/colorclass {}; - - colorful = callPackage ../development/python-modules/colorful {}; + colorful = callPackage ../development/python-modules/colorful { }; colorlog = callPackage ../development/python-modules/colorlog { }; + colorlover = callPackage ../development/python-modules/colorlover { }; + + colormath = callPackage ../development/python-modules/colormath { }; + colorspacious = callPackage ../development/python-modules/colorspacious { }; - colour = callPackage ../development/python-modules/colour {}; + colour = callPackage ../development/python-modules/colour { }; - colormath = callPackage ../development/python-modules/colormath {}; + CommonMark = callPackage ../development/python-modules/commonmark { }; + + compiledb = callPackage ../development/python-modules/compiledb { }; + + conda = callPackage ../development/python-modules/conda { }; + + ConfigArgParse = callPackage ../development/python-modules/configargparse { }; + + configobj = callPackage ../development/python-modules/configobj { }; + + configparser = if pythonOlder "3.6" then + callPackage ../development/python-modules/configparser/4.nix { } + else + callPackage ../development/python-modules/configparser { }; configshell = callPackage ../development/python-modules/configshell { }; + confluent-kafka = callPackage ../development/python-modules/confluent-kafka { }; + + connexion = callPackage ../development/python-modules/connexion { }; + consonance = callPackage ../development/python-modules/consonance { }; constantly = callPackage ../development/python-modules/constantly { }; + construct = callPackage ../development/python-modules/construct { }; + + consul = callPackage ../development/python-modules/consul { }; + + contexter = callPackage ../development/python-modules/contexter { }; + + contextlib2 = callPackage ../development/python-modules/contextlib2 { }; + + contextvars = callPackage ../development/python-modules/contextvars { }; + + convertdate = callPackage ../development/python-modules/convertdate { }; + + cookiecutter = callPackage ../development/python-modules/cookiecutter { }; + + cookies = callPackage ../development/python-modules/cookies { }; + + coordinates = callPackage ../development/python-modules/coordinates { }; + + coreapi = callPackage ../development/python-modules/coreapi { }; + + coreschema = callPackage ../development/python-modules/coreschema { }; + cornice = callPackage ../development/python-modules/cornice { }; - crashtest = callPackage ../development/python-modules/crashtest { }; + cot = callPackage ../development/python-modules/cot { }; + + covCore = callPackage ../development/python-modules/cov-core { }; + + coverage = callPackage ../development/python-modules/coverage { }; + + coveralls = callPackage ../development/python-modules/coveralls { }; + + cozy = callPackage ../development/python-modules/cozy { }; + + cppy = callPackage ../development/python-modules/cppy { }; cram = callPackage ../development/python-modules/cram { }; + crashtest = callPackage ../development/python-modules/crashtest { }; + + crayons = callPackage ../development/python-modules/crayons { }; + crc16 = callPackage ../development/python-modules/crc16 { }; + crc32c = callPackage ../development/python-modules/crc32c { }; + crccheck = callPackage ../development/python-modules/crccheck { }; + crcmod = callPackage ../development/python-modules/crcmod { }; + + credstash = callPackage ../development/python-modules/credstash { }; + croniter = callPackage ../development/python-modules/croniter { }; - csscompressor = callPackage ../development/python-modules/csscompressor {}; + cryptacular = callPackage ../development/python-modules/cryptacular { }; + + cryptography = if isPy27 then + callPackage ../development/python-modules/cryptography/2.9.nix { } + else + callPackage ../development/python-modules/cryptography { }; + + cryptography_vectors = if isPy27 then + callPackage ../development/python-modules/cryptography/vectors-2.9.nix { } + else + callPackage ../development/python-modules/cryptography/vectors.nix { }; + + csscompressor = callPackage ../development/python-modules/csscompressor { }; + + cssmin = callPackage ../development/python-modules/cssmin { }; + + css-parser = callPackage ../development/python-modules/css-parser { }; + + cssselect2 = callPackage ../development/python-modules/cssselect2 { }; + + cssselect = callPackage ../development/python-modules/cssselect { }; + + cssutils = callPackage ../development/python-modules/cssutils { }; csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { }; + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; + cufflinks = callPackage ../development/python-modules/cufflinks { }; cupy = callPackage ../development/python-modules/cupy { @@ -2192,631 +1339,55 @@ in { nccl = pkgs.nccl_cudatoolkit_10; }; - cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; + curio = callPackage ../development/python-modules/curio { }; - cx_oracle = callPackage ../development/python-modules/cx_oracle {}; + curtsies = callPackage ../development/python-modules/curtsies { }; + + curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; cvxopt = callPackage ../development/python-modules/cvxopt { }; cvxpy = callPackage ../development/python-modules/cvxpy { }; + cx_Freeze = callPackage ../development/python-modules/cx_freeze { }; + + cx_oracle = callPackage ../development/python-modules/cx_oracle { }; + cycler = callPackage ../development/python-modules/cycler { }; - cysignals = callPackage ../development/python-modules/cysignals { }; + cymem = callPackage ../development/python-modules/cymem { }; cypari2 = callPackage ../development/python-modules/cypari2 { }; - dlib = callPackage ../development/python-modules/dlib { - inherit (pkgs) dlib; - }; - - datadog = callPackage ../development/python-modules/datadog {}; - - dataclasses = callPackage ../development/python-modules/dataclasses { }; - - dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; - - debian = callPackage ../development/python-modules/debian {}; - - defcon = callPackage ../development/python-modules/defcon { }; - - defusedxml = callPackage ../development/python-modules/defusedxml {}; - - dodgy = callPackage ../development/python-modules/dodgy { }; - - duecredit = callPackage ../development/python-modules/duecredit { }; - - dugong = callPackage ../development/python-modules/dugong {}; - - easysnmp = callPackage ../development/python-modules/easysnmp { - openssl = pkgs.openssl; - net-snmp = pkgs.net-snmp; - }; - - iowait = callPackage ../development/python-modules/iowait {}; - - responses = callPackage ../development/python-modules/responses {}; - - rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; - - proboscis = callPackage ../development/python-modules/proboscis {}; - - poster3 = callPackage ../development/python-modules/poster3 { }; - - py4j = callPackage ../development/python-modules/py4j { }; - - pyechonest = callPackage ../development/python-modules/pyechonest { }; - - pyepsg = callPackage ../development/python-modules/pyepsg { }; - - billiard = callPackage ../development/python-modules/billiard { }; - - binaryornot = callPackage ../development/python-modules/binaryornot { }; - - bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; - - bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; - - bitstring = callPackage ../development/python-modules/bitstring { }; - - html5-parser = callPackage ../development/python-modules/html5-parser { - inherit (pkgs) pkgconfig; - }; - - HTSeq = callPackage ../development/python-modules/HTSeq { }; - - httpserver = callPackage ../development/python-modules/httpserver {}; - - bleach = callPackage ../development/python-modules/bleach { }; - - bleak = callPackage ../development/python-modules/bleak { }; - - blinker = callPackage ../development/python-modules/blinker { }; - - blockdiag = callPackage ../development/python-modules/blockdiag { }; - - blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { }; - - bpython = callPackage ../development/python-modules/bpython {}; - - bsddb3 = callPackage ../development/python-modules/bsddb3 { }; - - bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; - - bkcharts = callPackage ../development/python-modules/bkcharts { }; - - bokeh = callPackage ../development/python-modules/bokeh { }; - - boto = callPackage ../development/python-modules/boto { }; - - boto3 = callPackage ../development/python-modules/boto3 { }; - - botocore = callPackage ../development/python-modules/botocore { }; - - bottle = callPackage ../development/python-modules/bottle { }; - - box2d = callPackage ../development/python-modules/box2d { }; - - branca = callPackage ../development/python-modules/branca { }; - - bugwarrior = callPackage ../development/python-modules/bugwarrior { }; - - bugz = callPackage ../development/python-modules/bugz { }; - - bugzilla = callPackage ../development/python-modules/bugzilla { }; - - buildbot = callPackage ../development/python-modules/buildbot { }; - buildbot-plugins = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/buildbot/plugins.nix { }); - buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); - buildbot-worker = callPackage ../development/python-modules/buildbot/worker.nix { }; - buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; - - check-manifest = callPackage ../development/python-modules/check-manifest { }; - - devpi-common = callPackage ../development/python-modules/devpi-common { }; - # A patched version of buildout, useful for buildout based development on Nix - zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; - - zc_buildout = self.zc_buildout221; - - zc_buildout221 = callPackage ../development/python-modules/buildout { }; - - z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; - - bunch = callPackage ../development/python-modules/bunch { }; - - can = callPackage ../development/python-modules/can {}; - - canopen = callPackage ../development/python-modules/canopen {}; - - canmatrix = callPackage ../development/python-modules/canmatrix {}; - - - cairocffi = if isPy3k then - callPackage ../development/python-modules/cairocffi {} - else - callPackage ../development/python-modules/cairocffi/0_9.nix {}; - - cairosvg = if isPy3k then - callPackage ../development/python-modules/cairosvg {} - else - callPackage ../development/python-modules/cairosvg/1_x.nix {}; - - carrot = callPackage ../development/python-modules/carrot {}; - - cartopy = callPackage ../development/python-modules/cartopy {}; - - casbin = callPackage ../development/python-modules/casbin { }; - - case = callPackage ../development/python-modules/case {}; - - cbor = callPackage ../development/python-modules/cbor {}; - - cbor2 = callPackage ../development/python-modules/cbor2 {}; - - cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; - - cccolutils = callPackage ../development/python-modules/cccolutils {}; - - cchardet = callPackage ../development/python-modules/cchardet { }; - - CDDB = callPackage ../development/python-modules/cddb { }; - - cntk = callPackage ../development/python-modules/cntk { }; - - celery = callPackage ../development/python-modules/celery { }; - - cerberus = callPackage ../development/python-modules/cerberus { }; - - certifi = callPackage ../development/python-modules/certifi { }; - - certipy = callPackage ../development/python-modules/certipy {}; - - characteristic = callPackage ../development/python-modules/characteristic { }; - - chart-studio = callPackage ../development/python-modules/chart-studio { }; - - cheetah = callPackage ../development/python-modules/cheetah { }; - - cheetah3 = callPackage ../development/python-modules/cheetah3 { }; - - cherrypy = if isPy3k then - callPackage ../development/python-modules/cherrypy { } - else - callPackage ../development/python-modules/cherrypy/17.nix { }; - - cfgv = callPackage ../development/python-modules/cfgv { }; - - cfn-lint = callPackage ../development/python-modules/cfn-lint { }; - - cftime = callPackage ../development/python-modules/cftime {}; - - cjson = callPackage ../development/python-modules/cjson { }; - - cld2-cffi = callPackage ../development/python-modules/cld2-cffi {}; - - clf = callPackage ../development/python-modules/clf {}; - - click = callPackage ../development/python-modules/click {}; - - click-completion = callPackage ../development/python-modules/click-completion {}; - - click-datetime = callPackage ../development/python-modules/click-datetime { }; - - click-default-group = callPackage ../development/python-modules/click-default-group { }; - - click-didyoumean = callPackage ../development/python-modules/click-didyoumean {}; - - click-log = callPackage ../development/python-modules/click-log {}; - - click-plugins = callPackage ../development/python-modules/click-plugins {}; - - click-repl = callPackage ../development/python-modules/click-repl { }; - - click-threading = callPackage ../development/python-modules/click-threading {}; - - cligj = callPackage ../development/python-modules/cligj { }; - - closure-linter = callPackage ../development/python-modules/closure-linter { }; - - cloudflare = callPackage ../development/python-modules/cloudflare { }; - - cloudpickle = callPackage ../development/python-modules/cloudpickle { }; - - cmdline = callPackage ../development/python-modules/cmdline { }; - - codecov = callPackage ../development/python-modules/codecov {}; - - cogapp = callPackage ../development/python-modules/cogapp {}; - - colorama = callPackage ../development/python-modules/colorama { }; - - colorlover = callPackage ../development/python-modules/colorlover { }; - - CommonMark = callPackage ../development/python-modules/commonmark { }; - - coilmq = callPackage ../development/python-modules/coilmq { }; - - colander = callPackage ../development/python-modules/colander { }; - - # Backported version of the ConfigParser library of Python 3.3 - configparser = if pythonOlder "3.6" then - callPackage ../development/python-modules/configparser/4.nix { } - else - callPackage ../development/python-modules/configparser { }; - - ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; - - conda = callPackage ../development/python-modules/conda { }; - - configobj = callPackage ../development/python-modules/configobj { }; - - confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; - - kafka-python = callPackage ../development/python-modules/kafka-python {}; - - construct = callPackage ../development/python-modules/construct {}; - - consul = callPackage ../development/python-modules/consul { }; - - contexter = callPackage ../development/python-modules/contexter { }; - - contextvars = callPackage ../development/python-modules/contextvars {}; - - contextlib2 = callPackage ../development/python-modules/contextlib2 { }; - - cookiecutter = callPackage ../development/python-modules/cookiecutter { }; - - cookies = callPackage ../development/python-modules/cookies { }; - - coreapi = callPackage ../development/python-modules/coreapi { }; - - coreschema = callPackage ../development/python-modules/coreschema { }; - - coveralls = callPackage ../development/python-modules/coveralls { }; - - coverage = callPackage ../development/python-modules/coverage { }; - - covCore = callPackage ../development/python-modules/cov-core { }; - - crcmod = callPackage ../development/python-modules/crcmod { }; - - credstash = callPackage ../development/python-modules/credstash { }; + cysignals = callPackage ../development/python-modules/cysignals { }; cython = callPackage ../development/python-modules/Cython { }; cytoolz = callPackage ../development/python-modules/cytoolz { }; - cppy = callPackage ../development/python-modules/cppy { }; + d2to1 = callPackage ../development/python-modules/d2to1 { }; - cryptacular = callPackage ../development/python-modules/cryptacular { }; + daemonize = callPackage ../development/python-modules/daemonize { }; - cryptography = if isPy27 then - callPackage ../development/python-modules/cryptography/2.9.nix { } - else - callPackage ../development/python-modules/cryptography { }; - - cryptography_vectors = if isPy27 then - callPackage ../development/python-modules/cryptography/vectors-2.9.nix { } - else - callPackage ../development/python-modules/cryptography/vectors.nix { }; - - curtsies = callPackage ../development/python-modules/curtsies { }; - - envs = callPackage ../development/python-modules/envs { }; - - enaml = callPackage ../development/python-modules/enaml { }; - - enamlx = callPackage ../development/python-modules/enamlx { }; - - etelemetry = callPackage ../development/python-modules/etelemetry { }; - - eth-hash = callPackage ../development/python-modules/eth-hash { }; - - eth-typing = callPackage ../development/python-modules/eth-typing { }; - - eth-utils = callPackage ../development/python-modules/eth-utils { }; - - gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { - pythonSupport = true; - pythonPackages = self; - })); - - impacket = callPackage ../development/python-modules/impacket { }; - - img2pdf = callPackage ../development/python-modules/img2pdf { }; - - jsonlines = callPackage ../development/python-modules/jsonlines { }; - - json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; - - jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; - - jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; - - jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; - - hepmc3 = toPythonModule (pkgs.hepmc3.override { - inherit python; - }); - - onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; - - tablib = callPackage ../development/python-modules/tablib { }; - - wakeonlan = callPackage ../development/python-modules/wakeonlan { }; - - openant = callPackage ../development/python-modules/openant { }; - - opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { - enablePython = true; - pythonPackages = self; - })); - - opencv3 = toPythonModule (pkgs.opencv3.override { - enablePython = true; - pythonPackages = self; - }); - - opencv4 = toPythonModule (pkgs.opencv4.override { - enablePython = true; - pythonPackages = self; - }); - - opentracing = callPackage ../development/python-modules/opentracing { }; - - openidc-client = callPackage ../development/python-modules/openidc-client {}; - - openwebifpy = callPackage ../development/python-modules/openwebifpy {}; - - optuna = callPackage ../development/python-modules/optuna { }; - - idna = callPackage ../development/python-modules/idna { }; - - mahotas = callPackage ../development/python-modules/mahotas { }; - - MDP = callPackage ../development/python-modules/mdp {}; - - minidb = callPackage ../development/python-modules/minidb { }; - - miniupnpc = callPackage ../development/python-modules/miniupnpc {}; - - mixpanel = callPackage ../development/python-modules/mixpanel { }; - - mpyq = callPackage ../development/python-modules/mpyq { }; - - mxnet = callPackage ../development/python-modules/mxnet { }; - - nplusone = callPackage ../development/python-modules/nplusone { }; - - parsy = callPackage ../development/python-modules/parsy { }; - - portalocker = callPackage ../development/python-modules/portalocker { }; - - portpicker = callPackage ../development/python-modules/portpicker { }; - - pkginfo = callPackage ../development/python-modules/pkginfo { }; - - pre-commit = callPackage ../development/python-modules/pre-commit { }; - - pretend = callPackage ../development/python-modules/pretend { }; - - detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 - - pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; - - bcrypt = callPackage ../development/python-modules/bcrypt { }; - - cffi = callPackage ../development/python-modules/cffi { }; - - pyavm = callPackage ../development/python-modules/pyavm { }; - - pycollada = callPackage ../development/python-modules/pycollada { }; - - pycontracts = callPackage ../development/python-modules/pycontracts { }; - - pycparser = callPackage ../development/python-modules/pycparser { }; - - pydub = callPackage ../development/python-modules/pydub {}; - - pyjade = callPackage ../development/python-modules/pyjade {}; - - pyjet = callPackage ../development/python-modules/pyjet {}; - - pyjks = callPackage ../development/python-modules/pyjks {}; - - PyLD = callPackage ../development/python-modules/PyLD { }; - - pysingleton = callPackage ../development/python-modules/pysingleton { }; - - python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; - - python-jose = callPackage ../development/python-modules/python-jose {}; - - python-json-logger = callPackage ../development/python-modules/python-json-logger { }; - - python-ly = callPackage ../development/python-modules/python-ly {}; - - pyhcl = callPackage ../development/python-modules/pyhcl { }; - - pyhs100 = callPackage ../development/python-modules/pyhs100 { }; - - pyrealsense2 = toPythonModule (pkgs.librealsense.override { - enablePython = true; - pythonPackages = self; - }); - - pyrealsense2WithCuda = toPythonModule (pkgs.librealsenseWithCuda.override { - enablePython = true; - pythonPackages = self; - }); - - pyrealsense2WithoutCuda = toPythonModule (pkgs.librealsenseWithoutCuda.override { - enablePython = true; - pythonPackages = self; - }); - - # pytest>=6 is too new for most packages - pytest = if isPy3k then self.pytest_5 else self.pytest_4; - - pytest_6 = callPackage ../development/python-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; - - pytest_5 = callPackage ../development/python-modules/pytest/5.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; - - pytest_4 = callPackage ../development/python-modules/pytest/4.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; - - pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; - - pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; - - pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; - - pytest-annotate = callPackage ../development/python-modules/pytest-annotate { }; - - pytest-ansible = callPackage ../development/python-modules/pytest-ansible { }; - - pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; - - pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { }; - - pytest-astropy = callPackage ../development/python-modules/pytest-astropy { }; - - pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { }; - - pytest-filter-subpackage = callPackage ../development/python-modules/pytest-filter-subpackage { }; - - pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; - - pytestcache = callPackage ../development/python-modules/pytestcache { }; - - pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; - - pytest-cram = callPackage ../development/python-modules/pytest-cram { }; - - pytest-datadir = callPackage ../development/python-modules/pytest-datadir { }; - - pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { }; - - pytest-dependency = callPackage ../development/python-modules/pytest-dependency { }; - - pytest-django = callPackage ../development/python-modules/pytest-django { }; - - pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; - - pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; - - pytest-forked = callPackage ../development/python-modules/pytest-forked { }; - - pytest-html = callPackage ../development/python-modules/pytest-html { }; - - pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; - - pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; - - pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; - - pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; - - pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; - - pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; - - pytest-flakes = callPackage ../development/python-modules/pytest-flakes { }; - - pytest-isort = callPackage ../development/python-modules/pytest-isort { }; - - pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; - - pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; - - pytest-mock = if isPy3k then - callPackage ../development/python-modules/pytest-mock { } - else - callPackage ../development/python-modules/pytest-mock/2.nix { }; - - pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; - - pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; - - pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; - - pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - - pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; - - pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; - - pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; - - pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; - - pytest-randomly = callPackage ../development/python-modules/pytest-randomly { }; - - pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; - - pytest-repeat = callPackage ../development/python-modules/pytest-repeat { }; - - pytestrunner = callPackage ../development/python-modules/pytestrunner { }; - - pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; - - pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; - - pytest-services = callPackage ../development/python-modules/pytest-services { }; - - pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; - - pytest-socket = callPackage ../development/python-modules/pytest-socket { }; - - pytestcov = callPackage ../development/python-modules/pytest-cov { }; - - pytest-expect = callPackage ../development/python-modules/pytest-expect { }; - - pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; - - pytest_xdist = self.pytest_xdist_1; - - pytest_xdist_1 = callPackage ../development/python-modules/pytest-xdist { }; - - pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { }; - - pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; - - pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; - - pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; - - tinycss = callPackage ../development/python-modules/tinycss { }; - - tinycss2 = callPackage ../development/python-modules/tinycss2 { }; - - cssselect = callPackage ../development/python-modules/cssselect { }; - - cssselect2 = callPackage ../development/python-modules/cssselect2 { }; - - cssutils = callPackage ../development/python-modules/cssutils { }; - - css-parser = callPackage ../development/python-modules/css-parser { }; + daphne = callPackage ../development/python-modules/daphne { }; darcsver = callPackage ../development/python-modules/darcsver { }; + dash = callPackage ../development/python-modules/dash { }; + + dash-core-components = callPackage ../development/python-modules/dash-core-components { }; + + dash-html-components = callPackage ../development/python-modules/dash-html-components { }; + + dash-renderer = callPackage ../development/python-modules/dash-renderer { }; + + dash-table = callPackage ../development/python-modules/dash-table { }; + dask = callPackage ../development/python-modules/dask { }; dask-gateway = callPackage ../development/python-modules/dask-gateway { }; - dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { - inherit (pkgs) go; - }; + dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { inherit (pkgs) go; }; dask-glm = callPackage ../development/python-modules/dask-glm { }; @@ -2830,971 +1401,160 @@ in { dask-xgboost = callPackage ../development/python-modules/dask-xgboost { }; - datrie = callPackage ../development/python-modules/datrie { }; + databases = callPackage ../development/python-modules/databases { }; - heapdict = callPackage ../development/python-modules/heapdict { }; + databricks-cli = callPackage ../development/python-modules/databricks-cli { }; - zict = callPackage ../development/python-modules/zict { }; + dataclasses = callPackage ../development/python-modules/dataclasses { }; - zigpy = callPackage ../development/python-modules/zigpy { }; + dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; - zigpy-cc = callPackage ../development/python-modules/zigpy-cc { }; + datadiff = callPackage ../development/python-modules/datadiff { }; - zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; + datadog = callPackage ../development/python-modules/datadog { }; - zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + datamodeldict = callPackage ../development/python-modules/datamodeldict { }; - zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; + datasette = callPackage ../development/python-modules/datasette { }; - digital-ocean = callPackage ../development/python-modules/digitalocean { }; - - digi-xbee = callPackage ../development/python-modules/digi-xbee { }; - - leather = callPackage ../development/python-modules/leather { }; - - libais = callPackage ../development/python-modules/libais { }; - - libevdev = callPackage ../development/python-modules/libevdev { }; - - libfdt = toPythonModule (pkgs.dtc.override { - inherit python; - pythonSupport = true; - }); - - libtmux = callPackage ../development/python-modules/libtmux { }; - - libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; - - linuxfd = callPackage ../development/python-modules/linuxfd { }; - - locket = callPackage ../development/python-modules/locket { }; - - loo-py = callPackage ../development/python-modules/loo-py { }; - - tblib = callPackage ../development/python-modules/tblib { }; - - s3fs = callPackage ../development/python-modules/s3fs { }; + datashader = callPackage ../development/python-modules/datashader { }; datashape = callPackage ../development/python-modules/datashape { }; - requests-cache = callPackage ../development/python-modules/requests-cache { }; - - requests-file = callPackage ../development/python-modules/requests-file { }; - - requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; - - requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; - - requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; - - howdoi = callPackage ../development/python-modules/howdoi {}; - - jdatetime = callPackage ../development/python-modules/jdatetime {}; - - daphne = callPackage ../development/python-modules/daphne { }; - - dash = callPackage ../development/python-modules/dash { }; - - dash-core-components = callPackage ../development/python-modules/dash-core-components { }; - - dash-html-components = callPackage ../development/python-modules/dash-html-components { }; - - dash-renderer = callPackage ../development/python-modules/dash-renderer { }; - - dash-table = callPackage ../development/python-modules/dash-table { }; + datatable = + callPackage ../development/python-modules/datatable { inherit (pkgs.llvmPackages) openmp libcxx libcxxabi; }; dateparser = callPackage ../development/python-modules/dateparser { }; - # Actual name of package - python-dateutil = callPackage ../development/python-modules/dateutil { }; - # Alias that we should deprecate - dateutil = self.python-dateutil; + datrie = callPackage ../development/python-modules/datrie { }; + + dbf = callPackage ../development/python-modules/dbf { }; + + dbfread = callPackage ../development/python-modules/dbfread { }; + + dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; + + dcmstack = callPackage ../development/python-modules/dcmstack { }; + + ddt = callPackage ../development/python-modules/ddt { }; + + deap = callPackage ../development/python-modules/deap { }; + + debian = callPackage ../development/python-modules/debian { }; + + debts = callPackage ../development/python-modules/debts { }; debugpy = callPackage ../development/python-modules/debugpy { }; decorator = callPackage ../development/python-modules/decorator { }; + deepdiff = callPackage ../development/python-modules/deepdiff { }; + + deepmerge = callPackage ../development/python-modules/deepmerge { }; + + deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; + + defcon = callPackage ../development/python-modules/defcon { }; + deform = callPackage ../development/python-modules/deform { }; + defusedxml = callPackage ../development/python-modules/defusedxml { }; + + delegator-py = callPackage ../development/python-modules/delegator-py { }; + + deluge-client = callPackage ../development/python-modules/deluge-client { }; + demjson = callPackage ../development/python-modules/demjson { }; + dendropy = callPackage ../development/python-modules/dendropy { }; + + denonavr = callPackage ../development/python-modules/denonavr { }; + + dependency-injector = callPackage ../development/python-modules/dependency-injector { }; + deprecated = callPackage ../development/python-modules/deprecated { }; deprecation = callPackage ../development/python-modules/deprecation { }; derpconf = callPackage ../development/python-modules/derpconf { }; + descartes = callPackage ../development/python-modules/descartes { }; + deskcon = callPackage ../development/python-modules/deskcon { }; + detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 + + devpi-common = callPackage ../development/python-modules/devpi-common { }; + + dftfit = callPackage ../development/python-modules/dftfit { }; + + diceware = callPackage ../development/python-modules/diceware { }; + + dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; + + dict2xml = callPackage ../development/python-modules/dict2xml { }; + + dictionaries = callPackage ../development/python-modules/dictionaries { }; + + dicttoxml = callPackage ../development/python-modules/dicttoxml { }; + + diff_cover = callPackage ../development/python-modules/diff_cover { }; + + diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + + digital-ocean = callPackage ../development/python-modules/digitalocean { }; + + digi-xbee = callPackage ../development/python-modules/digi-xbee { }; + dill = callPackage ../development/python-modules/dill { }; + diofant = callPackage ../development/python-modules/diofant { }; + + dipy = callPackage ../development/python-modules/dipy { }; + + discid = callPackage ../development/python-modules/discid { }; + discogs_client = callPackage ../development/python-modules/discogs_client { }; - dlx = callPackage ../development/python-modules/dlx { }; + discordpy = callPackage ../development/python-modules/discordpy { }; - dmenu-python = callPackage ../development/python-modules/dmenu { }; + diskcache = callPackage ../development/python-modules/diskcache { }; - dnslib = callPackage ../development/python-modules/dnslib { }; + dissononce = callPackage ../development/python-modules/dissononce { }; - dnspython = callPackage ../development/python-modules/dnspython { }; - dns = self.dnspython; # Alias for compatibility, 2017-12-10 + distlib = callPackage ../development/python-modules/distlib { }; - docker = callPackage ../development/python-modules/docker {}; + distorm3 = callPackage ../development/python-modules/distorm3 { }; - dockerfile-parse = callPackage ../development/python-modules/dockerfile-parse {}; + distributed = callPackage ../development/python-modules/distributed { }; - docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py {}); - - dockerpty = callPackage ../development/python-modules/dockerpty {}; - - dockerspawner = callPackage ../development/python-modules/dockerspawner {}; - - docker_pycreds = callPackage ../development/python-modules/docker-pycreds {}; - - docloud = callPackage ../development/python-modules/docloud { }; - - docplex = callPackage ../development/python-modules/docplex { }; - - docopt = callPackage ../development/python-modules/docopt { }; - - doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; - - dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; - - dogpile_core = callPackage ../development/python-modules/dogpile.core { }; - - dopy = callPackage ../development/python-modules/dopy { }; - - dpath = callPackage ../development/python-modules/dpath { }; - - dparse = callPackage ../development/python-modules/dparse { }; - - dpkt = callPackage ../development/python-modules/dpkt {}; - - urllib3 = callPackage ../development/python-modules/urllib3 {}; - - varint = callPackage ../development/python-modules/varint {}; - - drf-yasg = callPackage ../development/python-modules/drf-yasg { }; - - dropbox = callPackage ../development/python-modules/dropbox {}; - - drms = callPackage ../development/python-modules/drms { }; - - ds4drv = callPackage ../development/python-modules/ds4drv { - inherit (pkgs) fetchFromGitHub bluez; - }; - - dyn = callPackage ../development/python-modules/dyn { }; - - easydict = callPackage ../development/python-modules/easydict { }; - - easygui = callPackage ../development/python-modules/easygui { }; - - EasyProcess = callPackage ../development/python-modules/easyprocess { }; - - easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; - - eccodes = toPythonModule (pkgs.eccodes.override { - enablePython = true; - pythonPackages = self; - }); - - edward = callPackage ../development/python-modules/edward { }; - - elasticsearch = callPackage ../development/python-modules/elasticsearch { }; - - elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { }; - # alias - elasticsearchdsl = self.elasticsearch-dsl; - - elementpath = callPackage ../development/python-modules/elementpath { }; - - entrypoints = callPackage ../development/python-modules/entrypoints { }; - - envisage = callPackage ../development/python-modules/envisage { }; - - enzyme = callPackage ../development/python-modules/enzyme {}; - - escapism = callPackage ../development/python-modules/escapism { }; - - etcd = callPackage ../development/python-modules/etcd { }; - - evdev = callPackage ../development/python-modules/evdev {}; - - eve = callPackage ../development/python-modules/eve {}; - - eventlib = callPackage ../development/python-modules/eventlib { }; - - events = callPackage ../development/python-modules/events { }; - - eyeD3 = callPackage ../development/python-modules/eyed3 { }; - - execnet = callPackage ../development/python-modules/execnet { }; - - executor = callPackage ../development/python-modules/executor { }; - - ezdxf = callPackage ../development/python-modules/ezdxf {}; - - facebook-sdk = callPackage ../development/python-modules/facebook-sdk { }; - - face_recognition = callPackage ../development/python-modules/face_recognition { }; - - face_recognition_models = callPackage ../development/python-modules/face_recognition_models { }; - - faker = callPackage ../development/python-modules/faker { }; - - fake_factory = callPackage ../development/python-modules/fake_factory { }; - - fake-useragent = callPackage ../development/python-modules/fake-useragent { }; - - factory_boy = callPackage ../development/python-modules/factory_boy { }; - - Fabric = callPackage ../development/python-modules/Fabric { }; - - fastdtw = callPackage ../development/python-modules/fastdtw { }; - - fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; - - faulthandler = if ! isPy3k - then callPackage ../development/python-modules/faulthandler {} - else throw "faulthandler is built into ${python.executable}"; - - fb-re2 = callPackage ../development/python-modules/fb-re2 { }; - - ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; - - fenics = callPackage ../development/libraries/science/math/fenics { - inherit (pkgs) pkg-config; - mpi = pkgs.openmpi; - pytest = self.pytest_4; - }; - - filetype = callPackage ../development/python-modules/filetype { }; - - flammkuchen = callPackage ../development/python-modules/flammkuchen { }; - - flexmock = callPackage ../development/python-modules/flexmock { }; - - flit = callPackage ../development/python-modules/flit { }; - - flit-core = callPackage ../development/python-modules/flit-core { }; - - flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; - - fluent-logger = callPackage ../development/python-modules/fluent-logger {}; - - flux-led = callPackage ../development/python-modules/flux-led { }; - - python-forecastio = callPackage ../development/python-modules/python-forecastio { }; - - fpdf = callPackage ../development/python-modules/fpdf { }; - - fpylll = callPackage ../development/python-modules/fpylll { }; - - fritzconnection = callPackage ../development/python-modules/fritzconnection { }; - - frozendict = callPackage ../development/python-modules/frozendict { }; - - ftputil = callPackage ../development/python-modules/ftputil { }; - - fudge = callPackage ../development/python-modules/fudge { }; - - funcparserlib = callPackage ../development/python-modules/funcparserlib { }; - - fastcache = callPackage ../development/python-modules/fastcache { }; - - fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; - - functools32 = callPackage ../development/python-modules/functools32 { }; - - future-fstrings = callPackage ../development/python-modules/future-fstrings { }; - - fx2 = callPackage ../development/python-modules/fx2 { }; - - # gaia isn't supported with python3 and it's not available from pypi - gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { - pythonPackages = self; - pythonSupport = true; - })); - - gateone = callPackage ../development/python-modules/gateone { }; - - GeoIP = callPackage ../development/python-modules/GeoIP { }; - - glasgow = callPackage ../development/python-modules/glasgow { }; - - gmpy = callPackage ../development/python-modules/gmpy { }; - - gmpy2 = callPackage ../development/python-modules/gmpy2 { }; - - gmusicapi = callPackage ../development/python-modules/gmusicapi { }; - - gnureadline = callPackage ../development/python-modules/gnureadline { }; - - gnutls = callPackage ../development/python-modules/gnutls { }; - - gpy = callPackage ../development/python-modules/gpy { }; - - gpyopt = callPackage ../development/python-modules/gpyopt { }; - - gitdb = callPackage ../development/python-modules/gitdb { }; - - gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 - - GitPython = callPackage ../development/python-modules/GitPython { }; - - git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { - inherit (pkgs.gitAndTools) git-annex; - }; - - python-gitlab = callPackage ../development/python-modules/python-gitlab { }; - - google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; - - google-music = callPackage ../development/python-modules/google-music { }; - - google-music-proto = callPackage ../development/python-modules/google-music-proto { }; - - google-music-utils = callPackage ../development/python-modules/google-music-utils { }; - - google-pasta = callPackage ../development/python-modules/google-pasta { }; - - googletrans = callPackage ../development/python-modules/googletrans { }; - - gdown = callPackage ../development/python-modules/gdown { }; - - gpapi = callPackage ../development/python-modules/gpapi { }; - gplaycli = callPackage ../development/python-modules/gplaycli { }; - - gpsoauth = callPackage ../development/python-modules/gpsoauth { }; - - gpxpy = callPackage ../development/python-modules/gpxpy { }; - - grip = callPackage ../development/python-modules/grip { }; - - gst-python = callPackage ../development/python-modules/gst-python { - inherit (pkgs) meson pkgconfig; - gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; - }; - - gtimelog = callPackage ../development/python-modules/gtimelog { }; - - gtts = callPackage ../development/python-modules/gtts { }; - - gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" - then callPackage ../development/python-modules/gurobipy/darwin.nix { - inherit (pkgs.darwin) cctools insert_dylib; - } - else if stdenv.hostPlatform.system == "x86_64-linux" - then callPackage ../development/python-modules/gurobipy/linux.nix {} - else throw "gurobipy not yet supported on ${stdenv.hostPlatform.system}"; - - hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; - - hbmqtt = callPackage ../development/python-modules/hbmqtt { }; - - helpdev = callPackage ../development/python-modules/helpdev { }; - - heudiconv = callPackage ../development/python-modules/heudiconv { }; - - hickle = callPackage ../development/python-modules/hickle { }; - - hiro = callPackage ../development/python-modules/hiro {}; - - hglib = callPackage ../development/python-modules/hglib {}; - - huey = callPackage ../development/python-modules/huey { }; - - humanize = callPackage ../development/python-modules/humanize { }; - - humanfriendly = callPackage ../development/python-modules/humanfriendly { }; - - hupper = callPackage ../development/python-modules/hupper {}; - - hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; - - hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; - - hstspreload = callPackage ../development/python-modules/hstspreload { }; - - htmlmin = callPackage ../development/python-modules/htmlmin {}; - - httpauth = callPackage ../development/python-modules/httpauth { }; - - httpx = callPackage ../development/python-modules/httpx { }; - - idna-ssl = callPackage ../development/python-modules/idna-ssl { }; - - identify = callPackage ../development/python-modules/identify { }; - - ijson = callPackage ../development/python-modules/ijson {}; - - imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { }); - - imagesize = callPackage ../development/python-modules/imagesize { }; - - image-match = callPackage ../development/python-modules/image-match { }; - - imbalanced-learn = - if isPy27 then - callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } - else - callPackage ../development/python-modules/imbalanced-learn { }; - - immutables = callPackage ../development/python-modules/immutables {}; - - imread = callPackage ../development/python-modules/imread { - inherit (pkgs) pkgconfig libjpeg libpng libtiff libwebp; - }; - - imaplib2 = callPackage ../development/python-modules/imaplib2 { }; - - ipfsapi = callPackage ../development/python-modules/ipfsapi { }; - - isbnlib = callPackage ../development/python-modules/isbnlib { }; - - islpy = callPackage ../development/python-modules/islpy { }; - - itsdangerous = callPackage ../development/python-modules/itsdangerous { }; - - itypes = callPackage ../development/python-modules/itypes { }; - - iniconfig = callPackage ../development/python-modules/iniconfig { }; - - iniparse = callPackage ../development/python-modules/iniparse { }; - - intreehooks = callPackage ../development/python-modules/intreehooks { }; - - i3-py = callPackage ../development/python-modules/i3-py { }; - - JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi {}; - - jdcal = callPackage ../development/python-modules/jdcal { }; - - jieba = callPackage ../development/python-modules/jieba { }; - - internetarchive = callPackage ../development/python-modules/internetarchive {}; - - JPype1 = callPackage ../development/python-modules/JPype1 {}; - - jpylyzer = callPackage ../development/python-modules/jpylyzer {}; - - josepy = callPackage ../development/python-modules/josepy {}; - - jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; - - jug = callPackage ../development/python-modules/jug {}; - - jsmin = callPackage ../development/python-modules/jsmin { }; - - jsonmerge = callPackage ../development/python-modules/jsonmerge { }; - - jsonpatch = callPackage ../development/python-modules/jsonpatch { }; - - jsonpickle = callPackage ../development/python-modules/jsonpickle { }; - - jsonpointer = callPackage ../development/python-modules/jsonpointer { }; - - jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; - - jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix {}; - - jsonwatch = callPackage ../development/python-modules/jsonwatch { }; - - kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { - python3 = python; - }).src); - - latexcodec = callPackage ../development/python-modules/latexcodec {}; - - lazy = callPackage ../development/python-modules/lazy { }; - - libmodulemd = pipe pkgs.libmodulemd [ - toPythonModule - - (p: p.overrideAttrs (super: { - meta = super.meta // { - outputsToInstall = [ "py" ]; - # The package always builds python3 bindings - broken = (super.meta.broken or false) || !isPy3k; - }; - })) - - (p: p.override { - python3 = python; - }) - - (p: p.py) - ]; - - libselinux = pipe pkgs.libselinux [ - toPythonModule - - (p: p.overrideAttrs (super: { - meta = super.meta // { - outputsToInstall = [ "py" ]; - broken = (super.meta.broken or false) || pythonAtLeast "3.8"; - }; - })) - - (p: p.override { - enablePython = true; - inherit python; - }) - - (p: p.py) - ]; - - libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; - - libthumbor = callPackage ../development/python-modules/libthumbor { }; - - license-expression = callPackage ../development/python-modules/license-expression { }; - - lightblue = callPackage ../development/python-modules/lightblue { }; - - lightgbm = callPackage ../development/python-modules/lightgbm { }; - - lightning = callPackage ../development/python-modules/lightning { }; - - lightparam = callPackage ../development/python-modules/lightparam { }; - - jupyter = callPackage ../development/python-modules/jupyter { }; - - jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { }; - - jupyter_console = if pythonOlder "3.5" then - callPackage ../development/python-modules/jupyter_console/5.nix { } - else - callPackage ../development/python-modules/jupyter_console { }; - - jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; - - jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; - - jupyterlab = callPackage ../development/python-modules/jupyterlab {}; - - jupyterlab-git = callPackage ../development/python-modules/jupyterlab-git {}; - - jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { }; - - jupytext = callPackage ../development/python-modules/jupytext { }; - - PyLTI = callPackage ../development/python-modules/pylti { }; - - lmdb = callPackage ../development/python-modules/lmdb { }; - - logilab_astng = callPackage ../development/python-modules/logilab_astng { }; - - lpod = callPackage ../development/python-modules/lpod { }; - - ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; - - luftdaten = callPackage ../development/python-modules/luftdaten { }; - - m2r = callPackage ../development/python-modules/m2r { }; - - mailchimp = callPackage ../development/python-modules/mailchimp { }; - - python-mapnik = callPackage ../development/python-modules/python-mapnik { }; - - measurement = callPackage ../development/python-modules/measurement {}; - - mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { - python3Packages = self; - })); - - midiutil = callPackage ../development/python-modules/midiutil {}; - - mido = callPackage ../development/python-modules/mido { }; - - misaka = callPackage ../development/python-modules/misaka {}; - - mlrose = callPackage ../development/python-modules/mlrose { }; - - mlflow = callPackage ../development/python-modules/mlflow { }; - - mt-940 = callPackage ../development/python-modules/mt-940 { }; - - mwlib = callPackage ../development/python-modules/mwlib { }; - - mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; - - mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; - - myfitnesspal = callPackage ../development/python-modules/myfitnesspal { }; - - natsort = callPackage ../development/python-modules/natsort { }; - - naturalsort = callPackage ../development/python-modules/naturalsort { }; - - ncclient = callPackage ../development/python-modules/ncclient {}; - - logfury = callPackage ../development/python-modules/logfury { }; - - ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; - - netcdf4 = callPackage ../development/python-modules/netcdf4 { }; - - netdisco = callPackage ../development/python-modules/netdisco { }; - - Nikola = callPackage ../development/python-modules/Nikola { }; - - nmigen = callPackage ../development/python-modules/nmigen { }; - - nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; - - nmigen-soc = callPackage ../development/python-modules/nmigen-soc { }; - - nxt-python = callPackage ../development/python-modules/nxt-python { }; - - odfpy = callPackage ../development/python-modules/odfpy { }; - - openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; - openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; - - oset = callPackage ../development/python-modules/oset { }; - - oscrypto = callPackage ../development/python-modules/oscrypto { }; - - osqp = callPackage ../development/python-modules/osqp { }; - - oyaml = callPackage ../development/python-modules/oyaml { }; - - pam = callPackage ../development/python-modules/pam { - inherit (pkgs) pam; - }; - - pamela = callPackage ../development/python-modules/pamela { }; - - paperspace = callPackage ../development/python-modules/paperspace { }; - - paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; - - papis = callPackage ../development/python-modules/papis { }; - - papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; - - pathspec = callPackage ../development/python-modules/pathspec { }; - - pathtools = callPackage ../development/python-modules/pathtools { }; - - paver = callPackage ../development/python-modules/paver { }; - - passlib = callPackage ../development/python-modules/passlib { }; - - path-and-address = callPackage ../development/python-modules/path-and-address { }; - - peppercorn = callPackage ../development/python-modules/peppercorn { }; - - pex = callPackage ../development/python-modules/pex { }; - - phe = callPackage ../development/python-modules/phe { }; - - phpserialize = callPackage ../development/python-modules/phpserialize { }; - - plaid-python = callPackage ../development/python-modules/plaid-python { }; - - plaster = callPackage ../development/python-modules/plaster {}; - - plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {}; - - playsound = callPackage ../development/python-modules/playsound { }; - - plexapi = callPackage ../development/python-modules/plexapi { }; - - plexauth = callPackage ../development/python-modules/plexauth { }; - - plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; - - plotly = callPackage ../development/python-modules/plotly { }; - - plyfile = callPackage ../development/python-modules/plyfile { }; - - podcastparser = callPackage ../development/python-modules/podcastparser { }; - - podcats = callPackage ../development/python-modules/podcats { }; - - pomegranate = callPackage ../development/python-modules/pomegranate { }; - - poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { - inherit (pkgs.qt5) qtbase; - inherit (pkgs.libsForQt5) poppler; - inherit (pkgs) pkgconfig; - }; - - poyo = callPackage ../development/python-modules/poyo { }; - - priority = callPackage ../development/python-modules/priority { }; - - privacyidea = callPackage ../development/python-modules/privacyidea { }; - privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; - - prov = callPackage ../development/python-modules/prov { }; - - pudb = callPackage ../development/python-modules/pudb { }; - - pybtex = callPackage ../development/python-modules/pybtex {}; - - pybtex-docutils = callPackage ../development/python-modules/pybtex-docutils {}; - - pycallgraph = callPackage ../development/python-modules/pycallgraph { }; - - pycassa = callPackage ../development/python-modules/pycassa { }; - - lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { - python3 = python; - })); - - pyblake2 = callPackage ../development/python-modules/pyblake2 { }; - - pybluez = callPackage ../development/python-modules/pybluez { }; - - pycares = callPackage ../development/python-modules/pycares { }; - - pycuda = callPackage ../development/python-modules/pycuda { - cudatoolkit = pkgs.cudatoolkit; - inherit (pkgs.stdenv) mkDerivation; - }; - - pydotplus = callPackage ../development/python-modules/pydotplus { }; - - pyfxa = callPackage ../development/python-modules/pyfxa { }; - - pygls = callPackage ../development/python-modules/pygls {}; - - pyhomematic = callPackage ../development/python-modules/pyhomematic { }; - - pylama = callPackage ../development/python-modules/pylama { }; - - pylatexenc = callPackage ../development/python-modules/pylatexenc { }; - - pymbolic = callPackage ../development/python-modules/pymbolic { }; - - pymediainfo = callPackage ../development/python-modules/pymediainfo { }; - - pyphen = callPackage ../development/python-modules/pyphen {}; - - pypoppler = callPackage ../development/python-modules/pypoppler { }; - - pypillowfight = callPackage ../development/python-modules/pypillowfight { }; - - pyprind = callPackage ../development/python-modules/pyprind { }; - - python-axolotl = callPackage ../development/python-modules/python-axolotl { }; - - python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; - - python-pam = callPackage ../development/python-modules/python-pam { }; - - pythonix = callPackage ../development/python-modules/pythonix { - inherit (pkgs) meson pkgconfig; - }; - - python-lzf = callPackage ../development/python-modules/python-lzf { }; - - pyramid = callPackage ../development/python-modules/pyramid { }; - - pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; - - pyramid_chameleon = callPackage ../development/python-modules/pyramid_chameleon { }; - - pyramid_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { }; - - pyramid_mako = callPackage ../development/python-modules/pyramid_mako { }; - - peewee = callPackage ../development/python-modules/peewee { }; - - pyroma = callPackage ../development/python-modules/pyroma { }; - - pyroute2 = callPackage ../development/python-modules/pyroute2 { }; - - pyspf = callPackage ../development/python-modules/pyspf { }; - - pysptk = callPackage ../development/python-modules/pysptk { }; - - pysrim = callPackage ../development/python-modules/pysrim { }; - - pysrt = callPackage ../development/python-modules/pysrt { }; - - pytools = callPackage ../development/python-modules/pytools { }; - - python-constraint = callPackage ../development/python-modules/python-constraint { }; - - python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; - - python-lzo = callPackage ../development/python-modules/python-lzo { - inherit (pkgs) lzo; - }; - - pxml = callPackage ../development/python-modules/pxml { }; - - junos-eznc = callPackage ../development/python-modules/junos-eznc {}; - - raven = callPackage ../development/python-modules/raven { }; - - rawkit = callPackage ../development/python-modules/rawkit { }; - - joblib = callPackage ../development/python-modules/joblib { }; - - sarge = callPackage ../development/python-modules/sarge { }; - - subliminal = callPackage ../development/python-modules/subliminal {}; - - sunpy = callPackage ../development/python-modules/sunpy { }; - - hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { }; - - robot-detection = callPackage ../development/python-modules/robot-detection {}; - - cssmin = callPackage ../development/python-modules/cssmin {}; - - django-paintstore = callPackage ../development/python-modules/django-paintstore {}; - - django-q = callPackage ../development/python-modules/django-q {}; - - hyperlink = callPackage ../development/python-modules/hyperlink {}; - - zope_copy = callPackage ../development/python-modules/zope_copy {}; - - s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { }; - - py3status = callPackage ../development/python-modules/py3status {}; - - pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { }; - - scandir = callPackage ../development/python-modules/scandir { }; - - schema = callPackage ../development/python-modules/schema {}; - - simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server {}; - - stem = callPackage ../development/python-modules/stem { }; - - svg-path = callPackage ../development/python-modules/svg-path { }; - - r2pipe = callPackage ../development/python-modules/r2pipe { }; - - regex = callPackage ../development/python-modules/regex { }; - - pygrok = callPackage ../development/python-modules/pygrok { }; - - regional = callPackage ../development/python-modules/regional { }; - - ratelimiter = callPackage ../development/python-modules/ratelimiter { }; - - pywatchman = callPackage ../development/python-modules/pywatchman { }; - - pywavelets = callPackage ../development/python-modules/pywavelets { }; - - vcrpy = callPackage ../development/python-modules/vcrpy { }; - - descartes = callPackage ../development/python-modules/descartes { }; - - chardet = callPackage ../development/python-modules/chardet { }; - - pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; - - pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; - - pyramid_hawkauth = callPackage ../development/python-modules/pyramid_hawkauth { }; - - pytun = callPackage ../development/python-modules/pytun { }; - - rethinkdb = callPackage ../development/python-modules/rethinkdb { }; - - roku = callPackage ../development/python-modules/roku { }; - - roman = callPackage ../development/python-modules/roman { }; - - rotate-backups = callPackage ../tools/backup/rotate-backups { }; - - liblarch = callPackage ../development/python-modules/liblarch { }; - - librosa = callPackage ../development/python-modules/librosa { }; - - samplerate = callPackage ../development/python-modules/samplerate { }; - - samsungctl = callPackage ../development/python-modules/samsungctl { }; - - samsungtvws = callPackage ../development/python-modules/samsungtvws { }; - - screeninfo = callPackage ../development/python-modules/screeninfo { }; - - ssdeep = callPackage ../development/python-modules/ssdeep { }; - - ssdp = callPackage ../development/python-modules/ssdp { }; - - statsd = callPackage ../development/python-modules/statsd { }; - - starfish = callPackage ../development/python-modules/starfish { }; - - swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; - - multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; - - random2 = callPackage ../development/python-modules/random2 { }; - - schedule = callPackage ../development/python-modules/schedule { }; - - repoze_lru = callPackage ../development/python-modules/repoze_lru { }; - - repoze_sphinx_autointerface = callPackage ../development/python-modules/repoze_sphinx_autointerface { }; - - setuptools-git = callPackage ../development/python-modules/setuptools-git { }; - - setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; - - sievelib = callPackage ../development/python-modules/sievelib { }; - - watchdog = callPackage ../development/python-modules/watchdog { }; - - zope_deprecation = callPackage ../development/python-modules/zope_deprecation { }; - - validators = callPackage ../development/python-modules/validators { }; - - validictory = callPackage ../development/python-modules/validictory { }; - - validate-email = callPackage ../development/python-modules/validate-email { }; - - venusian = callPackage ../development/python-modules/venusian { }; - - chameleon = callPackage ../development/python-modules/chameleon { }; - - ddt = callPackage ../development/python-modules/ddt { }; + distro = callPackage ../development/python-modules/distro { }; distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - pyxdg = callPackage ../development/python-modules/pyxdg { }; - - crayons = callPackage ../development/python-modules/crayons{ }; - - django = self.django_lts; - - django_lts = self.django_2_2; - django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; - django-anymail = callPackage ../development/python-modules/django-anymail {}; + django-anymail = callPackage ../development/python-modules/django-anymail { }; django_appconf = callPackage ../development/python-modules/django_appconf { }; django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; - django_colorful = callPackage ../development/python-modules/django_colorful { }; - django-cache-url = callPackage ../development/python-modules/django-cache-url { }; + django_classytags = callPackage ../development/python-modules/django_classytags { }; + django-cleanup = callPackage ../development/python-modules/django-cleanup { }; - django-configurations = callPackage ../development/python-modules/django-configurations { }; + django_colorful = callPackage ../development/python-modules/django_colorful { }; + + django_compat = callPackage ../development/python-modules/django-compat { }; django_compressor = callPackage ../development/python-modules/django_compressor { }; - django_compat = callPackage ../development/python-modules/django-compat { }; + django-configurations = callPackage ../development/python-modules/django-configurations { }; django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; @@ -3818,30 +1578,71 @@ in { django_guardian = callPackage ../development/python-modules/django_guardian { }; + django-haystack = callPackage ../development/python-modules/django-haystack { }; + + django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; + + django_hijack = callPackage ../development/python-modules/django-hijack + { }; # This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set. + django-ipware = callPackage ../development/python-modules/django-ipware { }; django-jinja = callPackage ../development/python-modules/django-jinja2 { }; django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; + django_lts = self.django_2_2; + django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; + django_modelcluster = callPackage ../development/python-modules/django_modelcluster { }; + + django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; + + django_nose = callPackage ../development/python-modules/django_nose { }; + django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; + django-paintstore = callPackage ../development/python-modules/django-paintstore { }; + django-pglocks = callPackage ../development/python-modules/django-pglocks { }; django-picklefield = callPackage ../development/python-modules/django-picklefield { }; + django_pipeline = callPackage ../development/python-modules/django-pipeline { }; + django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { }; + django-q = callPackage ../development/python-modules/django-q { }; + + djangoql = callPackage ../development/python-modules/djangoql { }; + django-ranged-response = callPackage ../development/python-modules/django-ranged-response { }; + django-raster = callPackage ../development/python-modules/django-raster { }; + + django_redis = callPackage ../development/python-modules/django_redis { }; + django-rest-auth = callPackage ../development/python-modules/django-rest-auth { }; + djangorestframework = callPackage ../development/python-modules/djangorestframework { }; + + djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { }; + + djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; + + django_reversion = callPackage ../development/python-modules/django_reversion { }; + django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { }; + django = self.django_lts; + + django-sesame = callPackage ../development/python-modules/django-sesame { }; + + django_silk = callPackage ../development/python-modules/django_silk { }; + django-simple-captcha = callPackage ../development/python-modules/django-simple-captcha { }; django-sites = callPackage ../development/python-modules/django-sites { }; @@ -3850,144 +1651,351 @@ in { django-storages = callPackage ../development/python-modules/django-storages { }; - django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; - - django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; - - django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { }; - django_tagging = callPackage ../development/python-modules/django_tagging { }; - django_classytags = callPackage ../development/python-modules/django_classytags { }; - - # This package may need an older version of Django. - # Override the package set and set e.g. `django = super.django_1_9`. - # See the Nixpkgs manual for examples on how to override the package set. - django_hijack = callPackage ../development/python-modules/django-hijack { }; - - django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; - - django_nose = callPackage ../development/python-modules/django_nose { }; - - django_modelcluster = callPackage ../development/python-modules/django_modelcluster { }; - - djangorestframework = callPackage ../development/python-modules/djangorestframework { }; - - djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { }; - - djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; - - django-raster = callPackage ../development/python-modules/django-raster { }; - - django_redis = callPackage ../development/python-modules/django_redis { }; - - django_reversion = callPackage ../development/python-modules/django_reversion { }; - - django_silk = callPackage ../development/python-modules/django_silk { }; - django_taggit = callPackage ../development/python-modules/django_taggit { }; django_treebeard = callPackage ../development/python-modules/django_treebeard { }; - django_pipeline = callPackage ../development/python-modules/django-pipeline { }; + django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; - djangoql = callPackage ../development/python-modules/djangoql { }; + django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; + + django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { }; dj-database-url = callPackage ../development/python-modules/dj-database-url { }; dj-email-url = callPackage ../development/python-modules/dj-email-url { }; - dj-search-url = callPackage ../development/python-modules/dj-search-url { }; - djmail = callPackage ../development/python-modules/djmail { }; - pillowfight = callPackage ../development/python-modules/pillowfight { }; + dj-search-url = callPackage ../development/python-modules/dj-search-url { }; - kaptan = callPackage ../development/python-modules/kaptan { }; + dkimpy = callPackage ../development/python-modules/dkimpy { }; - keepalive = callPackage ../development/python-modules/keepalive { }; + dlib = callPackage ../development/python-modules/dlib { inherit (pkgs) dlib; }; - keyrings-alt = callPackage ../development/python-modules/keyrings-alt {}; + dlx = callPackage ../development/python-modules/dlx { }; - SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { }; + dmenu-python = callPackage ../development/python-modules/dmenu { }; - duckdb = callPackage ../development/python-modules/duckdb { - duckdb = pkgs.duckdb; - }; + dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; + + dnslib = callPackage ../development/python-modules/dnslib { }; + + dnspython = callPackage ../development/python-modules/dnspython { }; + dns = self.dnspython; # Alias for compatibility, 2017-12-10 + + doc8 = callPackage ../development/python-modules/doc8 { }; + + docker = callPackage ../development/python-modules/docker { }; + + dockerfile-parse = callPackage ../development/python-modules/dockerfile-parse { }; + + dockerpty = callPackage ../development/python-modules/dockerpty { }; + + docker_pycreds = callPackage ../development/python-modules/docker-pycreds { }; + + docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py { }); + + dockerspawner = callPackage ../development/python-modules/dockerspawner { }; + + docloud = callPackage ../development/python-modules/docloud { }; + + docopt = callPackage ../development/python-modules/docopt { }; + + docplex = callPackage ../development/python-modules/docplex { }; + + docrep = callPackage ../development/python-modules/docrep { }; + + doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; + + docutils = callPackage ../development/python-modules/docutils { }; + + dodgy = callPackage ../development/python-modules/dodgy { }; + + dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; + + dogpile_core = callPackage ../development/python-modules/dogpile.core { }; + + dogtail = callPackage ../development/python-modules/dogtail { }; + + dominate = callPackage ../development/python-modules/dominate { }; + + dopy = callPackage ../development/python-modules/dopy { }; + + dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; }; + + dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { inherit (pkgs) substituteAll dotnet-sdk; }; + + dparse = callPackage ../development/python-modules/dparse { }; + + dpath = callPackage ../development/python-modules/dpath { }; + + dpkt = callPackage ../development/python-modules/dpkt { }; + + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; + + drms = callPackage ../development/python-modules/drms { }; + + dropbox = callPackage ../development/python-modules/dropbox { }; + + ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; }; + + dtopt = callPackage ../development/python-modules/dtopt { }; + + duckdb = callPackage ../development/python-modules/duckdb { duckdb = pkgs.duckdb; }; + + duecredit = callPackage ../development/python-modules/duecredit { }; + + dugong = callPackage ../development/python-modules/dugong { }; dulwich = if isPy3k then callPackage ../development/python-modules/dulwich { } else callPackage ../development/python-modules/dulwich/0_19.nix { }; - hg-git = callPackage ../development/python-modules/hg-git { }; + dyn = callPackage ../development/python-modules/dyn { }; - hg-evolve = callPackage ../development/python-modules/hg-evolve { }; + dynd = callPackage ../development/python-modules/dynd { }; - dtopt = callPackage ../development/python-modules/dtopt { }; + easydict = callPackage ../development/python-modules/easydict { }; + + easygui = callPackage ../development/python-modules/easygui { }; + + EasyProcess = callPackage ../development/python-modules/easyprocess { }; + + easysnmp = callPackage ../development/python-modules/easysnmp { + openssl = pkgs.openssl; + net-snmp = pkgs.net-snmp; + }; + + easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; easywatch = callPackage ../development/python-modules/easywatch { }; + eccodes = toPythonModule (pkgs.eccodes.override { + enablePython = true; + pythonPackages = self; + }); + ecdsa = callPackage ../development/python-modules/ecdsa { }; ecos = callPackage ../development/python-modules/ecos { }; - effect = callPackage ../development/python-modules/effect {}; + ecpy = callPackage ../development/python-modules/ecpy { }; + + ed25519 = callPackage ../development/python-modules/ed25519 { }; + + editorconfig = callPackage ../development/python-modules/editorconfig { }; + + edward = callPackage ../development/python-modules/edward { }; + + effect = callPackage ../development/python-modules/effect { }; + + eggdeps = callPackage ../development/python-modules/eggdeps { }; + + elasticsearch = callPackage ../development/python-modules/elasticsearch { }; + + elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { }; + + elasticsearchdsl = self.elasticsearch-dsl; # alias + + elementpath = callPackage ../development/python-modules/elementpath { }; + + eliot = callPackage ../development/python-modules/eliot { }; + + emailthreads = callPackage ../development/python-modules/emailthreads { }; + + email_validator = callPackage ../development/python-modules/email-validator { }; + + emcee = callPackage ../development/python-modules/emcee { }; + + emoji = callPackage ../development/python-modules/emoji { }; + + enaml = callPackage ../development/python-modules/enaml { }; + + enamlx = callPackage ../development/python-modules/enamlx { }; + + entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; + + entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; + + entrypoints = callPackage ../development/python-modules/entrypoints { }; + + enum34 = callPackage ../development/python-modules/enum34 { }; enum = callPackage ../development/python-modules/enum { }; enum-compat = callPackage ../development/python-modules/enum-compat { }; - enum34 = callPackage ../development/python-modules/enum34 { }; + envisage = callPackage ../development/python-modules/envisage { }; + + envs = callPackage ../development/python-modules/envs { }; + + enzyme = callPackage ../development/python-modules/enzyme { }; epc = callPackage ../development/python-modules/epc { }; - et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; + ephem = callPackage ../development/python-modules/ephem { }; + + eradicate = callPackage ../development/python-modules/eradicate { }; + + escapism = callPackage ../development/python-modules/escapism { }; + + etcd = callPackage ../development/python-modules/etcd { }; + + etelemetry = callPackage ../development/python-modules/etelemetry { }; etesync = callPackage ../development/python-modules/etesync { }; + eth-hash = callPackage ../development/python-modules/eth-hash { }; + + eth-typing = callPackage ../development/python-modules/eth-typing { }; + + eth-utils = callPackage ../development/python-modules/eth-utils { }; + + et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; + + evdev = callPackage ../development/python-modules/evdev { }; + + eve = callPackage ../development/python-modules/eve { }; + eventlet = callPackage ../development/python-modules/eventlet { }; + eventlib = callPackage ../development/python-modules/eventlib { }; + + events = callPackage ../development/python-modules/events { }; + + evernote = callPackage ../development/python-modules/evernote { }; + + ewmh = callPackage ../development/python-modules/ewmh { }; + + exchangelib = callPackage ../development/python-modules/exchangelib { }; + + execnet = callPackage ../development/python-modules/execnet { }; + executing = callPackage ../development/python-modules/executing { }; + executor = callPackage ../development/python-modules/executor { }; + exifread = callPackage ../development/python-modules/exifread { }; + extension-helpers = callPackage ../development/python-modules/extension-helpers { }; + + extras = callPackage ../development/python-modules/extras { }; + + eyeD3 = callPackage ../development/python-modules/eyed3 { }; + + ezdxf = callPackage ../development/python-modules/ezdxf { }; + + Fabric = callPackage ../development/python-modules/Fabric { }; + + facebook-sdk = callPackage ../development/python-modules/facebook-sdk { }; + + face = callPackage ../development/python-modules/face { }; + + facedancer = callPackage ../development/python-modules/facedancer { }; + + face_recognition = callPackage ../development/python-modules/face_recognition { }; + + face_recognition_models = callPackage ../development/python-modules/face_recognition_models { }; + + factory_boy = callPackage ../development/python-modules/factory_boy { }; + + fake_factory = callPackage ../development/python-modules/fake_factory { }; + + faker = callPackage ../development/python-modules/faker { }; + + fake-useragent = callPackage ../development/python-modules/fake-useragent { }; + + falcon = callPackage ../development/python-modules/falcon { }; + + fastapi = callPackage ../development/python-modules/fastapi { }; + + fastcache = callPackage ../development/python-modules/fastcache { }; + + fastdtw = callPackage ../development/python-modules/fastdtw { }; + + fasteners = callPackage ../development/python-modules/fasteners { }; + + fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; + fastimport = callPackage ../development/python-modules/fastimport { }; + fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; + fastpair = callPackage ../development/python-modules/fastpair { }; - fastrlock = callPackage ../development/python-modules/fastrlock {}; + fastparquet = callPackage ../development/python-modules/fastparquet { }; + + fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; + + fastrlock = callPackage ../development/python-modules/fastrlock { }; + + fasttext = callPackage ../development/python-modules/fasttext { }; + + faulthandler = if !isPy3k then + callPackage ../development/python-modules/faulthandler { } + else + throw "faulthandler is built into ${python.executable}"; + + favicon = callPackage ../development/python-modules/favicon { }; + + fb-re2 = callPackage ../development/python-modules/fb-re2 { }; + + fdint = callPackage ../development/python-modules/fdint { }; feedgen = callPackage ../development/python-modules/feedgen { }; - feedgenerator = callPackage ../development/python-modules/feedgenerator { - inherit (pkgs) glibcLocales; - }; + feedgenerator = callPackage ../development/python-modules/feedgenerator { inherit (pkgs) glibcLocales; }; feedparser = callPackage ../development/python-modules/feedparser { }; - pyfribidi = callPackage ../development/python-modules/pyfribidi { }; + fenics = callPackage ../development/libraries/science/math/fenics { + inherit (pkgs) pkg-config; + mpi = pkgs.openmpi; + pytest = self.pytest_4; + }; - pyfritzhome = callPackage ../development/python-modules/pyfritzhome { }; + ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; - pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; + fido2 = callPackage ../development/python-modules/fido2 { }; filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { }; - pycodestyle = callPackage ../development/python-modules/pycodestyle { }; - filebytes = callPackage ../development/python-modules/filebytes { }; - filelock = callPackage ../development/python-modules/filelock {}; + filelock = callPackage ../development/python-modules/filelock { }; + + filemagic = callPackage ../development/python-modules/filemagic { }; + + filetype = callPackage ../development/python-modules/filetype { }; + + filterpy = callPackage ../development/python-modules/filterpy { }; + + finalfusion = callPackage ../development/python-modules/finalfusion { }; + + fints = callPackage ../development/python-modules/fints { }; fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; }; + fipy = callPackage ../development/python-modules/fipy { }; + + fire = callPackage ../development/python-modules/fire { }; + + firetv = callPackage ../development/python-modules/firetv { }; + + first = callPackage ../development/python-modules/first { }; + fitbit = callPackage ../development/python-modules/fitbit { }; - flake8 = callPackage ../development/python-modules/flake8 { }; + fixtures = callPackage ../development/python-modules/fixtures { }; flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; + flake8 = callPackage ../development/python-modules/flake8 { }; + flake8-debugger = callPackage ../development/python-modules/flake8-debugger { }; flake8-future-import = callPackage ../development/python-modules/flake8-future-import { }; @@ -3998,20 +2006,22 @@ in { flaky = callPackage ../development/python-modules/flaky { }; - flask = callPackage ../development/python-modules/flask { }; + flammkuchen = callPackage ../development/python-modules/flammkuchen { }; flask-admin = callPackage ../development/python-modules/flask-admin { }; - flask-appbuilder = callPackage ../development/python-modules/flask-appbuilder { }; - flask-api = callPackage ../development/python-modules/flask-api { }; + flask-appbuilder = callPackage ../development/python-modules/flask-appbuilder { }; + flask_assets = callPackage ../development/python-modules/flask-assets { }; flask-autoindex = callPackage ../development/python-modules/flask-autoindex { }; flask-babel = callPackage ../development/python-modules/flask-babel { }; + flaskbabel = callPackage ../development/python-modules/flaskbabel { }; + flask-babelex = callPackage ../development/python-modules/flask-babelex { }; flask-bcrypt = callPackage ../development/python-modules/flask-bcrypt { }; @@ -4020,6 +2030,8 @@ in { flask-caching = callPackage ../development/python-modules/flask-caching { }; + flask = callPackage ../development/python-modules/flask { }; + flask-common = callPackage ../development/python-modules/flask-common { }; flask-compress = callPackage ../development/python-modules/flask-compress { }; @@ -4032,12 +2044,12 @@ in { flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { }; + flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; + flask-limiter = callPackage ../development/python-modules/flask-limiter { }; flask_login = callPackage ../development/python-modules/flask-login { }; - flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; - flask_mail = callPackage ../development/python-modules/flask-mail { }; flask_marshmallow = callPackage ../development/python-modules/flask-marshmallow { }; @@ -4082,69 +2094,30 @@ in { flask_wtf = callPackage ../development/python-modules/flask-wtf { }; - wtforms = callPackage ../development/python-modules/wtforms { }; + flexmock = callPackage ../development/python-modules/flexmock { }; - wtf-peewee = callPackage ../development/python-modules/wtf-peewee { }; + flickrapi = callPackage ../development/python-modules/flickrapi { }; - graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { - inherit (pkgs) pkg-config; - }; + flit = callPackage ../development/python-modules/flit { }; - grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; + flit-core = callPackage ../development/python-modules/flit-core { }; - greatfet = callPackage ../development/python-modules/greatfet { }; + flower = callPackage ../development/python-modules/flower { }; - pygreat = callPackage ../development/python-modules/pygreat { }; + flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; - pytorch = callPackage ../development/python-modules/pytorch { - cudaSupport = pkgs.config.cudaSupport or false; - }; + fluent-logger = callPackage ../development/python-modules/fluent-logger { }; - pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { - inherit (pkgs.linuxPackages) nvidia_x11; - }; + flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; - pyro-ppl = callPackage ../development/python-modules/pyro-ppl {}; + flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; - opt-einsum = if isPy27 then - callPackage ../development/python-modules/opt-einsum/2.nix {} - else - callPackage ../development/python-modules/opt-einsum {}; - - pytorchWithCuda = self.pytorch.override { - cudaSupport = true; - }; - - pytorchWithoutCuda = self.pytorch.override { - cudaSupport = false; - }; - - pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; - - pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; - - pythondialog = callPackage ../development/python-modules/pythondialog { }; - - python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; - - pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; - - rfc3987 = callPackage ../development/python-modules/rfc3987 { }; - - ConfigArgParse = callPackage ../development/python-modules/configargparse { }; - - jsonschema = callPackage ../development/python-modules/jsonschema { }; - - vcver = callPackage ../development/python-modules/vcver { }; - - vcversioner = callPackage ../development/python-modules/vcversioner { }; - - falcon = callPackage ../development/python-modules/falcon { }; - - hug = callPackage ../development/python-modules/hug { }; + flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; flup = callPackage ../development/python-modules/flup { }; + flux-led = callPackage ../development/python-modules/flux-led { }; + fn = callPackage ../development/python-modules/fn { }; folium = callPackage ../development/python-modules/folium { }; @@ -4154,34 +2127,101 @@ in { inherit python; })); - fontpens = callPackage ../development/python-modules/fontpens { }; - fontmath = callPackage ../development/python-modules/fontmath { }; fontparts = callPackage ../development/python-modules/fontparts { }; + fontpens = callPackage ../development/python-modules/fontpens { }; + fonttools = callPackage ../development/python-modules/fonttools { }; foolscap = callPackage ../development/python-modules/foolscap { }; forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { }; + FormEncode = callPackage ../development/python-modules/FormEncode { }; + + foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; + foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; }; + foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; }; + foundationdb61 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb61; }; + + foxdot = callPackage ../development/python-modules/foxdot { }; + + fpdf = callPackage ../development/python-modules/fpdf { }; + + fpylll = callPackage ../development/python-modules/fpylll { }; + + freetype-py = callPackage ../development/python-modules/freetype-py { }; + + freezegun = callPackage ../development/python-modules/freezegun { }; + + fritzconnection = callPackage ../development/python-modules/fritzconnection { }; + + frozendict = callPackage ../development/python-modules/frozendict { }; + + fs = callPackage ../development/python-modules/fs { }; + + fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; + + fsspec = callPackage ../development/python-modules/fsspec { }; + + ftfy = callPackage ../development/python-modules/ftfy { }; + + ftputil = callPackage ../development/python-modules/ftputil { }; + + fudge = callPackage ../development/python-modules/fudge { }; + + funcparserlib = callPackage ../development/python-modules/funcparserlib { }; + + funcsigs = callPackage ../development/python-modules/funcsigs { }; + + functools32 = callPackage ../development/python-modules/functools32 { }; + + funcy = callPackage ../development/python-modules/funcy { }; + + furl = callPackage ../development/python-modules/furl { }; + + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; }; + fusepy = callPackage ../development/python-modules/fusepy { }; future = callPackage ../development/python-modules/future { }; + future-fstrings = callPackage ../development/python-modules/future-fstrings { }; + futures = callPackage ../development/python-modules/futures { }; + fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; + + fx2 = callPackage ../development/python-modules/fx2 { }; + + gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { + pythonPackages = self; + pythonSupport = true; + })); # gaia isn't supported with python3 and it's not available from pypi + galario = toPythonModule (pkgs.galario.override { enablePython = true; pythonPackages = self; }); + gast = callPackage ../development/python-modules/gast { }; + + gateone = callPackage ../development/python-modules/gateone { }; + gcovr = callPackage ../development/python-modules/gcovr { }; - gdal = toPythonModule (pkgs.gdal.override { - pythonPackages = self; - }); + gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; }); + + gdata = callPackage ../development/python-modules/gdata { }; + + gdcm = disabledIf isPy27 (toPythonModule (pkgs.gdcm.override { + inherit (self) python; + enablePython = true; + })); + + gdown = callPackage ../development/python-modules/gdown { }; gdrivefs = callPackage ../development/python-modules/gdrivefs { }; @@ -4190,72 +2230,131 @@ in { python3 = python; })); + geeknote = callPackage ../development/python-modules/geeknote { }; + + genanki = callPackage ../development/python-modules/genanki { }; + + genpy = callPackage ../development/python-modules/genpy { }; + genshi = callPackage ../development/python-modules/genshi { }; + gensim = callPackage ../development/python-modules/gensim { }; + gentools = callPackage ../development/python-modules/gentools { }; + genzshcomp = callPackage ../development/python-modules/genzshcomp { }; + + geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { }; + + geographiclib = callPackage ../development/python-modules/geographiclib { }; + + geoip2 = callPackage ../development/python-modules/geoip2 { }; + + GeoIP = callPackage ../development/python-modules/GeoIP { }; + + geojson = callPackage ../development/python-modules/geojson { }; + + geopandas = callPackage ../development/python-modules/geopandas { }; + + geopy = if isPy3k then + callPackage ../development/python-modules/geopy { } + else + callPackage ../development/python-modules/geopy/2.nix { }; + + getmac = callPackage ../development/python-modules/getmac { }; + gevent = callPackage ../development/python-modules/gevent { }; geventhttpclient = callPackage ../development/python-modules/geventhttpclient { }; gevent-socketio = callPackage ../development/python-modules/gevent-socketio { }; - geopandas = callPackage ../development/python-modules/geopandas { }; - - geojson = callPackage ../development/python-modules/geojson { }; - gevent-websocket = callPackage ../development/python-modules/gevent-websocket { }; - genzshcomp = callPackage ../development/python-modules/genzshcomp { }; - gflags = callPackage ../development/python-modules/gflags { }; ghdiff = callPackage ../development/python-modules/ghdiff { }; + gidgethub = callPackage ../development/python-modules/gidgethub { }; + + gin-config = callPackage ../development/python-modules/gin-config { }; + gipc = callPackage ../development/python-modules/gipc { }; + git-annex-adapter = + callPackage ../development/python-modules/git-annex-adapter { inherit (pkgs.gitAndTools) git-annex; }; + + gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 + + gitdb = callPackage ../development/python-modules/gitdb { }; + + github3_py = callPackage ../development/python-modules/github3_py { }; + + github-webhook = callPackage ../development/python-modules/github-webhook { }; + + GitPython = callPackage ../development/python-modules/GitPython { }; + git-revise = callPackage ../development/python-modules/git-revise { }; git-sweep = callPackage ../development/python-modules/git-sweep { }; glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 - github3_py = callPackage ../development/python-modules/github3_py { }; + glasgow = callPackage ../development/python-modules/glasgow { }; - github-webhook = callPackage ../development/python-modules/github-webhook { }; + glob2 = callPackage ../development/python-modules/glob2 { }; + + globre = callPackage ../development/python-modules/globre { }; + + globus-sdk = callPackage ../development/python-modules/globus-sdk { }; + + glom = callPackage ../development/python-modules/glom { }; + + glymur = callPackage ../development/python-modules/glymur { }; + + gmpy2 = callPackage ../development/python-modules/gmpy2 { }; + + gmpy = callPackage ../development/python-modules/gmpy { }; + + gmusicapi = callPackage ../development/python-modules/gmusicapi { }; + + gnureadline = callPackage ../development/python-modules/gnureadline { }; + + gnutls = callPackage ../development/python-modules/gnutls { }; goobook = callPackage ../development/python-modules/goobook { }; - googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; - - google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; - - google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { }; + goocalendar = callPackage ../development/python-modules/goocalendar { }; google_api_core = callPackage ../development/python-modules/google_api_core { }; - google_api_python_client = let - google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; - in if isPy3k then google_api_python_client else - # Python 2.7 support was deprecated but is still needed by weboob and duplicity - google_api_python_client.overridePythonAttrs (old: rec { - version = "1.7.6"; - src = old.src.override { - inherit version; - sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; - }; - }); + google_api_python_client = + let google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; + in if isPy3k then + google_api_python_client + else # Python 2.7 support was deprecated but is still needed by weboob and duplicity + google_api_python_client.overridePythonAttrs (old: rec { + version = "1.7.6"; + src = old.src.override { + inherit version; + sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; + }; + }); + + googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; google_apputils = callPackage ../development/python-modules/google_apputils { }; google_auth = callPackage ../development/python-modules/google_auth { }; + google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; + + google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { }; + google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { }; google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { }; - google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; - google_cloud_bigquery = callPackage ../development/python-modules/google_cloud_bigquery { }; google_cloud_bigquery_datatransfer = callPackage ../development/python-modules/google_cloud_bigquery_datatransfer { }; @@ -4264,6 +2363,8 @@ in { google_cloud_container = callPackage ../development/python-modules/google_cloud_container { }; + google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; + google_cloud_dataproc = callPackage ../development/python-modules/google_cloud_dataproc { }; google_cloud_datastore = callPackage ../development/python-modules/google_cloud_datastore { }; @@ -4300,10 +2401,10 @@ in { google_cloud_spanner = callPackage ../development/python-modules/google_cloud_spanner { }; - google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { }; - google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; + google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { }; + google_cloud_tasks = callPackage ../development/python-modules/google_cloud_tasks { }; google_cloud_testutils = callPackage ../development/python-modules/google_cloud_testutils { }; @@ -4320,182 +2421,426 @@ in { google_cloud_websecurityscanner = callPackage ../development/python-modules/google_cloud_websecurityscanner { }; + google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; + google-music = callPackage ../development/python-modules/google-music { }; + + google-music-proto = callPackage ../development/python-modules/google-music-proto { }; + + google-music-utils = callPackage ../development/python-modules/google-music-utils { }; + + google-pasta = callPackage ../development/python-modules/google-pasta { }; + google_resumable_media = callPackage ../development/python-modules/google_resumable_media { }; + googletrans = callPackage ../development/python-modules/googletrans { }; + gorilla = callPackage ../development/python-modules/gorilla { }; + gpapi = callPackage ../development/python-modules/gpapi { }; + gplaycli = callPackage ../development/python-modules/gplaycli { }; + gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport = true; inherit python; }); - gphoto2 = callPackage ../development/python-modules/gphoto2 { - inherit (pkgs) pkgconfig; - }; + gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig; }; + + gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; + + gpsoauth = callPackage ../development/python-modules/gpsoauth { }; + + gpxpy = callPackage ../development/python-modules/gpxpy { }; + + gpy = callPackage ../development/python-modules/gpy { }; + + gpyopt = callPackage ../development/python-modules/gpyopt { }; + + grammalecte = callPackage ../development/python-modules/grammalecte { }; + + grandalf = callPackage ../development/python-modules/grandalf { }; + + graphite_api = callPackage ../development/python-modules/graphite-api { }; + + graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; + + graphite-web = callPackage ../development/python-modules/graphite-web { }; + + graph_nets = callPackage ../development/python-modules/graph_nets { }; graphql-core = callPackage ../development/python-modules/graphql-core { }; graphql-server-core = callPackage ../development/python-modules/graphql-server-core { }; - grammalecte = callPackage ../development/python-modules/grammalecte { }; + graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; }; + + graphviz = callPackage ../development/python-modules/graphviz { inherit (pkgs) graphviz; }; + + grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; + + graspy = callPackage ../development/python-modules/graspy { }; + + greatfet = callPackage ../development/python-modules/greatfet { }; + + green = callPackage ../development/python-modules/green { }; greenlet = callPackage ../development/python-modules/greenlet { }; - grib-api = disabledIf (!isPy27) (toPythonModule - (pkgs.grib-api.override { - enablePython = true; - pythonPackages = self; - })); + grequests = callPackage ../development/python-modules/grequests { }; - grpcio = callPackage ../development/python-modules/grpcio { }; + grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { + enablePython = true; + pythonPackages = self; + })); - grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; - - grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { }; + grip = callPackage ../development/python-modules/grip { }; grpc_google_iam_v1 = callPackage ../development/python-modules/grpc_google_iam_v1 { }; + grpcio = callPackage ../development/python-modules/grpcio { }; + + grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { }; + + grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; + + gsd = if isPy27 then + callPackage ../development/python-modules/gsd/1.7.nix { } + else + callPackage ../development/python-modules/gsd { }; + gspread = callPackage ../development/python-modules/gspread { }; + gssapi = callPackage ../development/python-modules/gssapi { inherit (pkgs) darwin krb5Full; }; + + gst-python = callPackage ../development/python-modules/gst-python { + inherit (pkgs) meson pkgconfig; + gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; + }; + + gtimelog = callPackage ../development/python-modules/gtimelog { }; + + gtts = callPackage ../development/python-modules/gtts { }; + gtts-token = callPackage ../development/python-modules/gtts-token { }; + guessit = callPackage ../development/python-modules/guessit { }; + + guestfs = callPackage ../development/python-modules/guestfs { }; + + gumath = callPackage ../development/python-modules/gumath { }; + + gunicorn = if isPy27 then + callPackage ../development/python-modules/gunicorn/19.nix { } + else + callPackage ../development/python-modules/gunicorn { }; + + gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" then + callPackage ../development/python-modules/gurobipy/darwin.nix { inherit (pkgs.darwin) cctools insert_dylib; } + else if stdenv.hostPlatform.system == "x86_64-linux" then + callPackage ../development/python-modules/gurobipy/linux.nix { } + else + throw "gurobipy not yet supported on ${stdenv.hostPlatform.system}"; + + guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; + + gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { + pythonSupport = true; + pythonPackages = self; + })); + gym = callPackage ../development/python-modules/gym { }; gyp = callPackage ../development/python-modules/gyp { }; - guessit = callPackage ../development/python-modules/guessit { }; + h11 = callPackage ../development/python-modules/h11 { }; - rebulk = callPackage ../development/python-modules/rebulk { }; + h2 = callPackage ../development/python-modules/h2 { }; - gunicorn = if isPy27 then - callPackage ../development/python-modules/gunicorn/19.nix { } - else - callPackage ../development/python-modules/gunicorn { }; + h3 = callPackage ../development/python-modules/h3 { inherit (pkgs) h3; }; + + h5netcdf = callPackage ../development/python-modules/h5netcdf { }; + + h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; + + h5py-mpi = self.h5py.override { hdf5 = pkgs.hdf5-mpi; }; + + habanero = callPackage ../development/python-modules/habanero { }; + + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; + + handout = callPackage ../development/python-modules/handout { }; + + HAP-python = callPackage ../development/python-modules/HAP-python { }; + + hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; - hdbscan = callPackage ../development/python-modules/hdbscan { }; + hbmqtt = callPackage ../development/python-modules/hbmqtt { }; - hmmlearn = callPackage ../development/python-modules/hmmlearn { }; + hcloud = callPackage ../development/python-modules/hcloud { }; hcs_utils = callPackage ../development/python-modules/hcs_utils { }; + hdbscan = callPackage ../development/python-modules/hdbscan { }; + + hdlparse = callPackage ../development/python-modules/hdlparse { }; + + hdmedians = callPackage ../development/python-modules/hdmedians { }; + + heapdict = callPackage ../development/python-modules/heapdict { }; + + helpdev = callPackage ../development/python-modules/helpdev { }; + + helper = callPackage ../development/python-modules/helper { }; + + hepmc3 = toPythonModule (pkgs.hepmc3.override { inherit python; }); + hetzner = callPackage ../development/python-modules/hetzner { }; + heudiconv = callPackage ../development/python-modules/heudiconv { }; + + hg-evolve = callPackage ../development/python-modules/hg-evolve { }; + + hg-git = callPackage ../development/python-modules/hg-git { }; + + hglib = callPackage ../development/python-modules/hglib { }; + + hgsvn = callPackage ../development/python-modules/hgsvn { }; + + hickle = callPackage ../development/python-modules/hickle { }; + + hidapi = callPackage ../development/python-modules/hidapi { inherit (pkgs) udev libusb1; }; + + hieroglyph = callPackage ../development/python-modules/hieroglyph { }; + hiredis = callPackage ../development/python-modules/hiredis { }; + hiro = callPackage ../development/python-modules/hiro { }; + + hiyapyco = callPackage ../development/python-modules/hiyapyco { }; + + hkdf = callPackage ../development/python-modules/hkdf { }; + + hmmlearn = callPackage ../development/python-modules/hmmlearn { }; + + hocr-tools = callPackage ../development/python-modules/hocr-tools { }; + + holidays = callPackage ../development/python-modules/holidays { }; + + holoviews = callPackage ../development/python-modules/holoviews { }; + homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; - htmllaundry = callPackage ../development/python-modules/htmllaundry { }; + hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { inherit python; }); - html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; + + howdoi = callPackage ../development/python-modules/howdoi { }; + + hpack = callPackage ../development/python-modules/hpack { }; + + hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; + + hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; + + hstspreload = callPackage ../development/python-modules/hstspreload { }; + + html2text = if isPy3k then + callPackage ../development/python-modules/html2text { } + else + callPackage ../development/python-modules/html2text/2018.nix { }; html5lib = callPackage ../development/python-modules/html5lib { }; + html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkgconfig; }; + + htmllaundry = callPackage ../development/python-modules/htmllaundry { }; + + htmlmin = callPackage ../development/python-modules/htmlmin { }; + + html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + + htmltreediff = callPackage ../development/python-modules/htmltreediff { }; + + HTSeq = callPackage ../development/python-modules/HTSeq { }; + httmock = callPackage ../development/python-modules/httmock { }; - http_signature = callPackage ../development/python-modules/http_signature { }; + httpauth = callPackage ../development/python-modules/httpauth { }; httpbin = callPackage ../development/python-modules/httpbin { }; + http-ece = callPackage ../development/python-modules/http-ece { }; + httplib2 = callPackage ../development/python-modules/httplib2 { }; - hvac = callPackage ../development/python-modules/hvac { }; - - hydra = callPackage ../development/python-modules/hydra { }; - - # File name is called 2.nix because this one will need to remain for Python 2. - hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix { }; - - hypothesis = if isPy3k then - callPackage ../development/python-modules/hypothesis { } - else - self.hypothesis_4; - - hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { }; - - hydra-check = callPackage ../development/python-modules/hydra-check { }; - - colored = callPackage ../development/python-modules/colored { }; - - xdg = callPackage ../development/python-modules/xdg { }; - - xdis = callPackage ../development/python-modules/xdis { }; - - xnd = callPackage ../development/python-modules/xnd { }; - - uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; - - unrpa = callPackage ../development/python-modules/unrpa { }; - - lsi = callPackage ../development/python-modules/lsi { }; - - hkdf = callPackage ../development/python-modules/hkdf { }; - httpretty = if isPy3k then callPackage ../development/python-modules/httpretty { } else callPackage ../development/python-modules/httpretty/0.nix { }; + httpserver = callPackage ../development/python-modules/httpserver { }; + + httpsig = callPackage ../development/python-modules/httpsig { }; + + http_signature = callPackage ../development/python-modules/http_signature { }; + + httptools = callPackage ../development/python-modules/httptools { }; + + httpx = callPackage ../development/python-modules/httpx { }; + + huey = callPackage ../development/python-modules/huey { }; + + hug = callPackage ../development/python-modules/hug { }; + + humanfriendly = callPackage ../development/python-modules/humanfriendly { }; + + humanize = callPackage ../development/python-modules/humanize { }; + + hupper = callPackage ../development/python-modules/hupper { }; + + hvac = callPackage ../development/python-modules/hvac { }; + + hvplot = callPackage ../development/python-modules/hvplot { }; + + hwi = callPackage ../development/python-modules/hwi { }; + + hydra = callPackage ../development/python-modules/hydra { }; + + hydra-check = callPackage ../development/python-modules/hydra-check { }; + + hypchat = callPackage ../development/python-modules/hypchat { }; + + hyperframe = callPackage ../development/python-modules/hyperframe { }; + + hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { }; + + hyperlink = callPackage ../development/python-modules/hyperlink { }; + + hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix + { }; # File name is called 2.nix because this one will need to remain for Python 2. + + hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { }; + + hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4; + + i3ipc = callPackage ../development/python-modules/i3ipc { }; + + i3-py = callPackage ../development/python-modules/i3-py { }; + iapws = callPackage ../development/python-modules/iapws { }; + ibis = callPackage ../development/python-modules/ibis { }; + + ibis-framework = callPackage ../development/python-modules/ibis-framework { }; + icalendar = callPackage ../development/python-modules/icalendar { }; icecream = callPackage ../development/python-modules/icecream { }; ics = callPackage ../development/python-modules/ics { }; + identify = callPackage ../development/python-modules/identify { }; + + idna = callPackage ../development/python-modules/idna { }; + + idna-ssl = callPackage ../development/python-modules/idna-ssl { }; + ifaddr = callPackage ../development/python-modules/ifaddr { }; ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { }; + ignite = callPackage ../development/python-modules/ignite { }; + + ihatemoney = callPackage ../development/python-modules/ihatemoney { }; + + ijson = callPackage ../development/python-modules/ijson { }; + + imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { }); + imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; imageio = callPackage ../development/python-modules/imageio { }; imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; + image-match = callPackage ../development/python-modules/image-match { }; + + imagesize = callPackage ../development/python-modules/imagesize { }; + + IMAPClient = callPackage ../development/python-modules/imapclient { }; + + imaplib2 = callPackage ../development/python-modules/imaplib2 { }; + + imbalanced-learn = if isPy27 then + callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } + else + callPackage ../development/python-modules/imbalanced-learn { }; + + img2pdf = callPackage ../development/python-modules/img2pdf { }; + imgaug = callPackage ../development/python-modules/imgaug { }; + immutables = callPackage ../development/python-modules/immutables { }; + + impacket = callPackage ../development/python-modules/impacket { }; + + importlib-metadata = callPackage ../development/python-modules/importlib-metadata { }; + + importlib-resources = callPackage ../development/python-modules/importlib-resources { }; + + importmagic = callPackage ../development/python-modules/importmagic { }; + + imread = + callPackage ../development/python-modules/imread { inherit (pkgs) pkgconfig libjpeg libpng libtiff libwebp; }; + + imutils = callPackage ../development/python-modules/imutils { }; + + incremental = callPackage ../development/python-modules/incremental { }; + + inflect = callPackage ../development/python-modules/inflect { }; + inflection = callPackage ../development/python-modules/inflection { }; influxdb = callPackage ../development/python-modules/influxdb { }; + influxdb-client = callPackage ../development/python-modules/influxdb-client { }; + + influxgraph = callPackage ../development/python-modules/influxgraph { }; + infoqscraper = callPackage ../development/python-modules/infoqscraper { }; + iniconfig = callPackage ../development/python-modules/iniconfig { }; + inifile = callPackage ../development/python-modules/inifile { }; - interruptingcow = callPackage ../development/python-modules/interruptingcow {}; + iniparse = callPackage ../development/python-modules/iniparse { }; + + inotify-simple = callPackage ../development/python-modules/inotify-simple { }; + + inquirer = callPackage ../development/python-modules/inquirer { }; + + intake = callPackage ../development/python-modules/intake { }; + + intelhex = callPackage ../development/python-modules/intelhex { }; + + internetarchive = callPackage ../development/python-modules/internetarchive { }; + + interruptingcow = callPackage ../development/python-modules/interruptingcow { }; + + intervaltree = callPackage ../development/python-modules/intervaltree { }; + + intreehooks = callPackage ../development/python-modules/intreehooks { }; + + invoke = callPackage ../development/python-modules/invoke { }; iocapture = callPackage ../development/python-modules/iocapture { }; - iptools = callPackage ../development/python-modules/iptools { }; - - ipy = callPackage ../development/python-modules/IPy { }; - - ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; - - ipykernel = if pythonOlder "3.4" then - callPackage ../development/python-modules/ipykernel/4.nix { } - else - callPackage ../development/python-modules/ipykernel { }; - - ipyparallel = callPackage ../development/python-modules/ipyparallel { }; - - ipython = if isPy27 then - callPackage ../development/python-modules/ipython/5.nix { } - else - callPackage ../development/python-modules/ipython { }; - - ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; - - ipyvue = callPackage ../development/python-modules/ipyvue { }; - - ipyvuetify = callPackage ../development/python-modules/ipyvuetify { }; - - ipywidgets = callPackage ../development/python-modules/ipywidgets { }; + iowait = callPackage ../development/python-modules/iowait { }; ipaddr = callPackage ../development/python-modules/ipaddr { }; @@ -4505,156 +2850,389 @@ in { ipdbplugin = callPackage ../development/python-modules/ipdbplugin { }; - pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; + ipfsapi = callPackage ../development/python-modules/ipfsapi { }; - iso-639 = callPackage ../development/python-modules/iso-639 {}; + iptools = callPackage ../development/python-modules/iptools { }; - iso3166 = callPackage ../development/python-modules/iso3166 {}; + ipy = callPackage ../development/python-modules/IPy { }; + + ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; + + ipykernel = if pythonOlder "3.4" then + callPackage ../development/python-modules/ipykernel/4.nix { } + else + callPackage ../development/python-modules/ipykernel { }; + + ipympl = callPackage ../development/python-modules/ipympl { }; + + ipyparallel = callPackage ../development/python-modules/ipyparallel { }; + + ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; + + ipython = if isPy27 then + callPackage ../development/python-modules/ipython/5.nix { } + else + callPackage ../development/python-modules/ipython { }; + + ipyvue = callPackage ../development/python-modules/ipyvue { }; + + ipyvuetify = callPackage ../development/python-modules/ipyvuetify { }; + + ipywidgets = callPackage ../development/python-modules/ipywidgets { }; + + irc = callPackage ../development/python-modules/irc { }; + + isbnlib = callPackage ../development/python-modules/isbnlib { }; + + islpy = callPackage ../development/python-modules/islpy { }; + + iso3166 = callPackage ../development/python-modules/iso3166 { }; + + iso-639 = callPackage ../development/python-modules/iso-639 { }; iso8601 = callPackage ../development/python-modules/iso8601 { }; - isort = callPackage ../development/python-modules/isort {}; + isodate = callPackage ../development/python-modules/isodate { }; - isoweek = callPackage ../development/python-modules/isoweek {}; + isort = callPackage ../development/python-modules/isort { }; - jabberbot = callPackage ../development/python-modules/jabberbot {}; + isoweek = callPackage ../development/python-modules/isoweek { }; - jedi = callPackage ../development/python-modules/jedi { }; + itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; - jellyfish = callPackage ../development/python-modules/jellyfish { }; + itemadapter = callPackage ../development/python-modules/itemadapter { }; - jeepney = callPackage ../development/python-modules/jeepney { }; + itemloaders = callPackage ../development/python-modules/itemloaders { }; + + iterm2 = callPackage ../development/python-modules/iterm2 { }; + + itsdangerous = callPackage ../development/python-modules/itsdangerous { }; + + itypes = callPackage ../development/python-modules/itypes { }; j2cli = callPackage ../development/python-modules/j2cli { }; - jinja2 = callPackage ../development/python-modules/jinja2 { }; + jabberbot = callPackage ../development/python-modules/jabberbot { }; - jinja2_time = callPackage ../development/python-modules/jinja2_time { }; + janus = callPackage ../development/python-modules/janus { }; + + jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; + + jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + + jaraco_functools = if pythonOlder "3.6" then + callPackage ../development/python-modules/jaraco_functools/2.nix { } + else + callPackage ../development/python-modules/jaraco_functools { }; + + jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; + + jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; + + jaraco_stream = if pythonOlder "3.6" then + callPackage ../development/python-modules/jaraco_stream/2.nix { } + else + callPackage ../development/python-modules/jaraco_stream { }; + + jaraco_text = callPackage ../development/python-modules/jaraco_text { }; + + javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; + + javaproperties = callPackage ../development/python-modules/javaproperties { }; + + JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; + + jc = callPackage ../development/python-modules/jc { }; + + jdatetime = callPackage ../development/python-modules/jdatetime { }; + + jdcal = callPackage ../development/python-modules/jdcal { }; + + jedi = callPackage ../development/python-modules/jedi { }; + + jeepney = callPackage ../development/python-modules/jeepney { }; + + jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { }; + + jellyfish = callPackage ../development/python-modules/jellyfish { }; + + jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; + + jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; + + jieba = callPackage ../development/python-modules/jieba { }; + + jinja2 = callPackage ../development/python-modules/jinja2 { }; jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; + jinja2_time = callPackage ../development/python-modules/jinja2_time { }; + + jira = callPackage ../development/python-modules/jira { }; + jmespath = callPackage ../development/python-modules/jmespath { }; - journalwatch = callPackage ../tools/system/journalwatch { - inherit (self) systemd pytest; - }; + joblib = callPackage ../development/python-modules/joblib { }; - jq = callPackage ../development/python-modules/jq { - inherit (pkgs) jq; - }; + josepy = callPackage ../development/python-modules/josepy { }; + + journalwatch = callPackage ../tools/system/journalwatch { inherit (self) systemd pytest; }; + + jpylyzer = callPackage ../development/python-modules/jpylyzer { }; + + JPype1 = callPackage ../development/python-modules/JPype1 { }; + + jq = callPackage ../development/python-modules/jq { inherit (pkgs) jq; }; + + jsbeautifier = callPackage ../development/python-modules/jsbeautifier { }; + + jsmin = callPackage ../development/python-modules/jsmin { }; jsondate = callPackage ../development/python-modules/jsondate { }; jsondiff = callPackage ../development/python-modules/jsondiff { }; - jsonnet = buildPythonPackage { - inherit (pkgs.jsonnet) name src; - }; + jsonlines = callPackage ../development/python-modules/jsonlines { }; + + jsonmerge = callPackage ../development/python-modules/jsonmerge { }; + + json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; + + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; }; + + jsonpatch = callPackage ../development/python-modules/jsonpatch { }; + + jsonpath = callPackage ../development/python-modules/jsonpath { }; + + jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { }; + + jsonpickle = callPackage ../development/python-modules/jsonpickle { }; + + jsonpointer = callPackage ../development/python-modules/jsonpointer { }; + + jsonref = callPackage ../development/python-modules/jsonref { }; + + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; + + jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; + + jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; + + jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix { }; + + jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; + + jsonschema = callPackage ../development/python-modules/jsonschema { }; + + jsonwatch = callPackage ../development/python-modules/jsonwatch { }; + + jug = callPackage ../development/python-modules/jug { }; + + junitparser = callPackage ../development/python-modules/junitparser { }; + + junit-xml = callPackage ../development/python-modules/junit-xml { }; + + junos-eznc = callPackage ../development/python-modules/junos-eznc { }; + + jupyter = callPackage ../development/python-modules/jupyter { }; + + jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { }; jupyter_client = if isPy3k then callPackage ../development/python-modules/jupyter_client { } else callPackage ../development/python-modules/jupyter_client/5.nix { }; + jupyter_console = if pythonOlder "3.5" then + callPackage ../development/python-modules/jupyter_console/5.nix { } + else + callPackage ../development/python-modules/jupyter_console { }; + jupyter_core = callPackage ../development/python-modules/jupyter_core { }; - jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { - pkgs-docker = pkgs.docker; - }; - - jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { }; - jupyterhub = callPackage ../development/python-modules/jupyterhub { }; jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; + jupyterhub-systemdspawner = + callPackage ../development/python-modules/jupyterhub-systemdspawner { inherit (pkgs) bash; }; + jupyterhub-tmpauthenticator = callPackage ../development/python-modules/jupyterhub-tmpauthenticator { }; - jupyterhub-systemdspawner = callPackage ../development/python-modules/jupyterhub-systemdspawner { - inherit (pkgs) bash; - }; + jupyterlab = callPackage ../development/python-modules/jupyterlab { }; + + jupyterlab-git = callPackage ../development/python-modules/jupyterlab-git { }; + + jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; + + jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; + + jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; }; + + jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { }; + + jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { }; + + jupytext = callPackage ../development/python-modules/jupytext { }; + + jwcrypto = callPackage ../development/python-modules/jwcrypto { }; + + k5test = callPackage ../development/python-modules/k5test { inherit (pkgs) krb5Full findutils which; }; + + kaa-base = callPackage ../development/python-modules/kaa-base { }; + + kaa-metadata = callPackage ../development/python-modules/kaa-metadata { }; + + kafka-python = callPackage ../development/python-modules/kafka-python { }; kaggle = callPackage ../development/python-modules/kaggle { }; + kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; + + Kajiki = callPackage ../development/python-modules/kajiki { }; + + kaptan = callPackage ../development/python-modules/kaptan { }; + + kazoo = callPackage ../development/python-modules/kazoo { }; + + kconfiglib = callPackage ../development/python-modules/kconfiglib { }; + + keepalive = callPackage ../development/python-modules/keepalive { }; + + keepkey_agent = callPackage ../development/python-modules/keepkey_agent { }; + + keepkey = callPackage ../development/python-modules/keepkey { }; + + keras-applications = callPackage ../development/python-modules/keras-applications { }; + + Keras = callPackage ../development/python-modules/keras { }; + + keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; + + kerberos = callPackage ../development/python-modules/kerberos { inherit (pkgs) kerberos; }; + keyring = if isPy3k then callPackage ../development/python-modules/keyring { } else callPackage ../development/python-modules/keyring/2.nix { }; + keyrings-alt = callPackage ../development/python-modules/keyrings-alt { }; + keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; + kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { python3 = python; }).src); + + kinparse = callPackage ../development/python-modules/kinparse { }; + + kitchen = callPackage ../development/python-modules/kitchen { }; + kiwisolver = if isPy3k then callPackage ../development/python-modules/kiwisolver { } else callPackage ../development/python-modules/kiwisolver/1_1.nix { }; - klaus = callPackage ../development/python-modules/klaus {}; + klaus = callPackage ../development/python-modules/klaus { }; klein = callPackage ../development/python-modules/klein { }; + kmapper = callPackage ../development/python-modules/kmapper { }; + + kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { + inherit (pkgs.kmsxx) stdenv; + inherit (pkgs) pkgconfig; + withPython = true; + }).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; })); + + knack = callPackage ../development/python-modules/knack { }; + koji = callPackage ../development/python-modules/koji { }; kombu = callPackage ../development/python-modules/kombu { }; konfig = callPackage ../development/python-modules/konfig { }; - kitchen = callPackage ../development/python-modules/kitchen { }; - - knack = callPackage ../development/python-modules/knack { }; - kubernetes = callPackage ../development/python-modules/kubernetes { }; - k5test = callPackage ../development/python-modules/k5test { - inherit (pkgs) krb5Full findutils which; - }; + labelbox = callPackage ../development/python-modules/labelbox { }; - pylast = callPackage ../development/python-modules/pylast { }; + lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.openmpi; }; - pylru = callPackage ../development/python-modules/pylru { }; + langcodes = callPackage ../development/python-modules/langcodes { }; - libnl-python = disabledIf isPy3k - (toPythonModule (pkgs.libnl.override{pythonSupport=true; inherit python; })).py; + langdetect = callPackage ../development/python-modules/langdetect { }; + + larch = callPackage ../development/python-modules/larch { }; lark-parser = callPackage ../development/python-modules/lark-parser { }; - jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { }; + Lasagne = callPackage ../development/python-modules/lasagne { }; - kerberos = callPackage ../development/python-modules/kerberos { - inherit (pkgs) kerberos; - }; + latexcodec = callPackage ../development/python-modules/latexcodec { }; + + launchpadlib = callPackage ../development/python-modules/launchpadlib { }; + + lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; + + lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; + + lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; + + lazr-uri = callPackage ../development/python-modules/lazr-uri { }; + + lazy = callPackage ../development/python-modules/lazy { }; lazy_import = callPackage ../development/python-modules/lazy_import { }; lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; + ldap3 = callPackage ../development/python-modules/ldap3 { }; + + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; + + ldappool = callPackage ../development/python-modules/ldappool { }; + ldaptor = callPackage ../development/python-modules/ldaptor { }; + leather = callPackage ../development/python-modules/leather { }; + le = callPackage ../development/python-modules/le { }; + ledger_agent = callPackage ../development/python-modules/ledger_agent { }; + + ledgerblue = callPackage ../development/python-modules/ledgerblue { }; + lektor = callPackage ../development/python-modules/lektor { }; leveldb = callPackage ../development/python-modules/leveldb { }; - python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; + libagent = callPackage ../development/python-modules/libagent { }; - python_openzwave = callPackage ../development/python-modules/python_openzwave { - inherit (pkgs) pkgconfig; - }; + libais = callPackage ../development/python-modules/libais { }; - python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; + libarchive-c = callPackage ../development/python-modules/libarchive-c { inherit (pkgs) libarchive; }; - python-unshare = callPackage ../development/python-modules/python-unshare { }; - - fs = callPackage ../development/python-modules/fs { }; - - fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; + libarchive = self.python-libarchive; # The latter is the name upstream uses libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; + libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkgconfig; }; + libcloud = if isPy27 then - callPackage ../development/python-modules/libcloud/2.nix { } - else - callPackage ../development/python-modules/libcloud { }; + callPackage ../development/python-modules/libcloud/2.nix { } + else + callPackage ../development/python-modules/libcloud { }; + + libevdev = callPackage ../development/python-modules/libevdev { }; + + libfdt = toPythonModule (pkgs.dtc.override { + inherit python; + pythonSupport = true; + }); + + libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override { + enablePython = true; + python3 = python; + })); libgpuarray = callPackage ../development/python-modules/libgpuarray { clblas = pkgs.clblas.override { boost = self.boost; }; @@ -4662,13 +3240,39 @@ in { inherit (pkgs.linuxPackages) nvidia_x11; }; - libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override { - enablePython = true; - python3 = python; - })); + libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python; libkeepass = callPackage ../development/python-modules/libkeepass { }; + liblarch = callPackage ../development/python-modules/liblarch { }; + + libmodulemd = pipe pkgs.libmodulemd [ + toPythonModule + (p: + p.overrideAttrs (super: { + meta = super.meta // { + outputsToInstall = [ "py" ]; # The package always builds python3 bindings + broken = (super.meta.broken or false) || !isPy3k; + }; + })) + (p: p.override { python3 = python; }) + (p: p.py) + ]; + + libmr = callPackage ../development/python-modules/libmr { }; + + libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; }; + + libnl-python = disabledIf isPy3k (toPythonModule (pkgs.libnl.override { + pythonSupport = true; + inherit python; + })).py; + + libplist = disabledIf isPy3k (toPythonModule (pkgs.libplist.override { + enablePython = true; + inherit python; + })).py; + libredwg = toPythonModule (pkgs.libredwg.override { enablePython = true; inherit (self) python libxml2; @@ -4676,111 +3280,238 @@ in { librepo = pipe pkgs.librepo [ toPythonModule - - (p: p.overrideAttrs (super: { - meta = super.meta // { - outputsToInstall = [ "py" ]; - }; - })) - - (p: p.override { - inherit python; - }) - + (p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; })) + (p: p.override { inherit python; }) (p: p.py) ]; - libnacl = callPackage ../development/python-modules/libnacl { - inherit (pkgs) libsodium; - }; + librosa = callPackage ../development/python-modules/librosa { }; libsavitar = callPackage ../development/python-modules/libsavitar { }; - libplist = disabledIf isPy3k - (toPythonModule (pkgs.libplist.override { enablePython = true; inherit python; })).py; + libselinux = pipe pkgs.libselinux [ + toPythonModule + (p: + p.overrideAttrs (super: { + meta = super.meta // { + outputsToInstall = [ "py" ]; + broken = (super.meta.broken or false) || pythonAtLeast "3.8"; + }; + })) + (p: + p.override { + enablePython = true; + inherit python; + }) + (p: p.py) + ]; - libxml2 = (toPythonModule (pkgs.libxml2.override{pythonSupport=true; inherit python;})).py; + libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; - libxslt = (toPythonModule (pkgs.libxslt.override{pythonSupport=true; inherit python; inherit (self) libxml2;})).py; + libthumbor = callPackage ../development/python-modules/libthumbor { }; + + libtmux = callPackage ../development/python-modules/libtmux { }; + + libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python; + + libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; + + libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion pkgconfig; }; + + libvirt = if isPy3k then + (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkgconfig; }) + else + (callPackage ../development/python-modules/libvirt/5.9.0.nix { + inherit (pkgs) pkgconfig; + libvirt = pkgs.libvirt_5_9_0; + }); + + libxml2 = (toPythonModule (pkgs.libxml2.override { + pythonSupport = true; + inherit python; + })).py; + + libxslt = (toPythonModule (pkgs.libxslt.override { + pythonSupport = true; + inherit python; + inherit (self) libxml2; + })).py; + + license-expression = callPackage ../development/python-modules/license-expression { }; + + lightblue = callPackage ../development/python-modules/lightblue { }; + + lightgbm = callPackage ../development/python-modules/lightgbm { }; + + lightning = callPackage ../development/python-modules/lightning { }; + + lightparam = callPackage ../development/python-modules/lightparam { }; + + limitlessled = callPackage ../development/python-modules/limitlessled { }; limits = callPackage ../development/python-modules/limits { }; limnoria = callPackage ../development/python-modules/limnoria { }; - line_profiler = callPackage ../development/python-modules/line_profiler { }; + linecache2 = callPackage ../development/python-modules/linecache2 { }; - linode = callPackage ../development/python-modules/linode { }; + line_profiler = callPackage ../development/python-modules/line_profiler { }; linode-api = callPackage ../development/python-modules/linode-api { }; + linode = callPackage ../development/python-modules/linode { }; + + linuxfd = callPackage ../development/python-modules/linuxfd { }; + + lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; })); + + livelossplot = callPackage ../development/python-modules/livelossplot { }; + livereload = callPackage ../development/python-modules/livereload { }; + livestreamer = callPackage ../development/python-modules/livestreamer { }; + + livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; + llfuse = callPackage ../development/python-modules/llfuse { - inherit (pkgs) fuse pkgconfig; # use "real" fuse and pkgconfig, not the python modules - }; + inherit (pkgs) fuse pkgconfig; + }; # use "real" fuse and pkgconfig, not the python modules + + llvmlite = callPackage ../development/python-modules/llvmlite { + llvm = pkgs.llvm_9; + }; # llvmlite always requires a specific version of llvm. + + lmdb = callPackage ../development/python-modules/lmdb { }; lml = callPackage ../development/python-modules/lml { }; - locustio = callPackage ../development/python-modules/locustio { }; + lmtpd = callPackage ../development/python-modules/lmtpd { }; - llvmlite = callPackage ../development/python-modules/llvmlite { - llvm = pkgs.llvm_9; # llvmlite always requires a specific version of llvm. - }; + localzone = callPackage ../development/python-modules/localzone { }; + + locket = callPackage ../development/python-modules/locket { }; lockfile = callPackage ../development/python-modules/lockfile { }; - logilab_common = callPackage ../development/python-modules/logilab/common.nix {}; + locustio = callPackage ../development/python-modules/locustio { }; - logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {}; + Logbook = callPackage ../development/python-modules/Logbook { }; - lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt zlib;}; + logfury = callPackage ../development/python-modules/logfury { }; + + logilab_astng = callPackage ../development/python-modules/logilab_astng { }; + + logilab_common = callPackage ../development/python-modules/logilab/common.nix { }; + + logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix { }; + + logster = callPackage ../development/python-modules/logster { }; + + loguru = callPackage ../development/python-modules/loguru { }; + + logutils = callPackage ../development/python-modules/logutils { }; + + logzero = callPackage ../development/python-modules/logzero { }; + + loo-py = callPackage ../development/python-modules/loo-py { }; + + lpod = callPackage ../development/python-modules/lpod { }; + + lsi = callPackage ../development/python-modules/lsi { }; + + ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; + + luftdaten = callPackage ../development/python-modules/luftdaten { }; lxc = callPackage ../development/python-modules/lxc { }; - py_scrypt = callPackage ../development/python-modules/py_scrypt { }; + lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; }; - python_magic = callPackage ../development/python-modules/python-magic { }; + lz4 = self.python-lz4; # alias 2018-12-05 - m3u8 = callPackage ../development/python-modules/m3u8 { }; - - magic = callPackage ../development/python-modules/magic { }; + lzstring = callPackage ../development/python-modules/lzstring { }; m2crypto = callPackage ../development/python-modules/m2crypto { }; - Mako = callPackage ../development/python-modules/Mako { }; + m2r = callPackage ../development/python-modules/m2r { }; + + m3u8 = callPackage ../development/python-modules/m3u8 { }; + + mac_alias = callPackage ../development/python-modules/mac_alias { }; macfsevents = callPackage ../development/python-modules/macfsevents { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; }; + macropy = callPackage ../development/python-modules/macropy { }; + maestral = callPackage ../development/python-modules/maestral { }; - manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {}; - marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {}; - mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix {}; - mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix {}; - mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix {}; - mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix {}; - mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix {}; - mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix {}; - moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix {}; - mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix {}; - mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix {}; - mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix {}; - moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix {}; - mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix {}; - marionette-harness = callPackage ../development/python-modules/marionette-harness {}; + magic = callPackage ../development/python-modules/magic { }; - marisa = callPackage ../development/python-modules/marisa { - marisa = pkgs.marisa; - }; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; + + magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; + + magic-wormhole-transit-relay = callPackage ../development/python-modules/magic-wormhole-transit-relay { }; + + mahotas = callPackage ../development/python-modules/mahotas { }; + + mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; + + mailchimp = callPackage ../development/python-modules/mailchimp { }; + + maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; + + mailman = callPackage ../servers/mail/mailman { }; + + mailmanclient = callPackage ../development/python-modules/mailmanclient { }; + + mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; + + mailman-web = callPackage ../servers/mail/mailman/web.nix { }; + + mail-parser = callPackage ../development/python-modules/mail-parser { }; + + Mako = callPackage ../development/python-modules/Mako { }; + + managesieve = callPackage ../development/python-modules/managesieve { }; + + manhole = callPackage ../development/python-modules/manhole { }; + + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix { }; + + manuel = callPackage ../development/python-modules/manuel { }; + + mapbox = callPackage ../development/python-modules/mapbox { }; + + mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; + + marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix { }; + + marionette-harness = callPackage ../development/python-modules/marionette-harness { }; + + marisa = callPackage ../development/python-modules/marisa { marisa = pkgs.marisa; }; marisa-trie = callPackage ../development/python-modules/marisa-trie { }; - Markups = callPackage ../development/python-modules/Markups { }; + markdown2 = callPackage ../development/python-modules/markdown2 { }; + + markdown = if isPy3k then + callPackage ../development/python-modules/markdown { } + else + callPackage ../development/python-modules/markdown/3_1.nix { }; + + markdown-macros = callPackage ../development/python-modules/markdown-macros { }; + + markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript { }; + + markerlib = callPackage ../development/python-modules/markerlib { }; markupsafe = callPackage ../development/python-modules/markupsafe { }; + Markups = callPackage ../development/python-modules/Markups { }; + marshmallow = callPackage ../development/python-modules/marshmallow { }; marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { }; @@ -4789,21 +3520,16 @@ in { marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { }; - manuel = callPackage ../development/python-modules/manuel { }; + mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; - mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; + matchpy = callPackage ../development/python-modules/matchpy { }; - markdown = if isPy3k then - callPackage ../development/python-modules/markdown { } - else - callPackage ../development/python-modules/markdown/3_1.nix { }; - - markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; - - markdown-macros = callPackage ../development/python-modules/markdown-macros { }; + mathlibtools = callPackage ../development/python-modules/mathlibtools { }; matplotlib = let - path = if isPy3k then ../development/python-modules/matplotlib/default.nix else + path = if isPy3k then + ../development/python-modules/matplotlib/default.nix + else ../development/python-modules/matplotlib/2.nix; in callPackage path { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; @@ -4816,8 +3542,11 @@ in { matrix-nio = callPackage ../development/python-modules/matrix-nio { }; mautrix = callPackage ../development/python-modules/mautrix { }; + mautrix-appservice = self.mautrix; # alias 2019-12-28 + maxminddb = callPackage ../development/python-modules/maxminddb { }; + maya = callPackage ../development/python-modules/maya { }; mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { @@ -4827,87 +3556,94 @@ in { mccabe = callPackage ../development/python-modules/mccabe { }; - mechanize = callPackage ../development/python-modules/mechanize { }; + MDP = callPackage ../development/python-modules/mdp { }; + + measurement = callPackage ../development/python-modules/measurement { }; + + mecab-python3 = callPackage ../development/python-modules/mecab-python3 { }; MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup { }; - meld3 = callPackage ../development/python-modules/meld3 { }; - - meliae = callPackage ../development/python-modules/meliae {}; + mechanize = callPackage ../development/python-modules/mechanize { }; meinheld = callPackage ../development/python-modules/meinheld { }; + meld3 = callPackage ../development/python-modules/meld3 { }; + + meliae = callPackage ../development/python-modules/meliae { }; + memcached = callPackage ../development/python-modules/memcached { }; memory_profiler = callPackage ../development/python-modules/memory_profiler { }; + mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { python3Packages = self; })); + + merkletools = callPackage ../development/python-modules/merkletools { }; + mesa = callPackage ../development/python-modules/mesa { }; - meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { - python3 = python; - }).overrideAttrs(oldAttrs: { - # We do not want the setup hook in Python packages - # because the build is performed differently. - setupHook = null; - }))); + meshlabxml = callPackage ../development/python-modules/meshlabxml { }; + + meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs + (oldAttrs: { # We do not want the setup hook in Python packages because the build is performed differently. + setupHook = null; + }))); mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; - meshlabxml = callPackage ../development/python-modules/meshlabxml { }; - metaphone = callPackage ../development/python-modules/metaphone { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; micawber = callPackage ../development/python-modules/micawber { }; + midiutil = callPackage ../development/python-modules/midiutil { }; + + mido = callPackage ../development/python-modules/mido { }; + milksnake = callPackage ../development/python-modules/milksnake { }; + minidb = callPackage ../development/python-modules/minidb { }; + minimock = callPackage ../development/python-modules/minimock { }; + mininet-python = (toPythonModule (pkgs.mininet.override { inherit python; })).py; + minio = callPackage ../development/python-modules/minio { }; - moviepy = callPackage ../development/python-modules/moviepy { }; + miniupnpc = callPackage ../development/python-modules/miniupnpc { }; - mozterm = callPackage ../development/python-modules/mozterm { }; - - mplleaflet = callPackage ../development/python-modules/mplleaflet { }; - - multidict = callPackage ../development/python-modules/multidict { }; - - munch = callPackage ../development/python-modules/munch { }; - - nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; - - rainbowstream = callPackage ../development/python-modules/rainbowstream { }; - - pendulum = callPackage ../development/python-modules/pendulum { }; - - pocket = callPackage ../development/python-modules/pocket { }; + misaka = callPackage ../development/python-modules/misaka { }; mistune = callPackage ../development/python-modules/mistune { }; - brotlipy = callPackage ../development/python-modules/brotlipy { }; + mixpanel = callPackage ../development/python-modules/mixpanel { }; - sortedcollections = callPackage ../development/python-modules/sortedcollections { }; + mkl-service = callPackage ../development/python-modules/mkl-service { }; - hyperframe = callPackage ../development/python-modules/hyperframe { }; + mlflow = callPackage ../development/python-modules/mlflow { }; - h2 = callPackage ../development/python-modules/h2 { }; + mlrose = callPackage ../development/python-modules/mlrose { }; - editorconfig = callPackage ../development/python-modules/editorconfig { }; + mmh3 = callPackage ../development/python-modules/mmh3 { }; + + mmpython = callPackage ../development/python-modules/mmpython { }; + + mnemonic = callPackage ../development/python-modules/mnemonic { }; + + mnist = callPackage ../development/python-modules/mnist { }; + + mocket = callPackage ../development/python-modules/mocket { }; mock = if pythonOlder "3.6" then callPackage ../development/python-modules/mock/2.nix { } else callPackage ../development/python-modules/mock { }; - mocket = callPackage ../development/python-modules/mocket { }; + mockito = callPackage ../development/python-modules/mockito { }; mock-open = callPackage ../development/python-modules/mock-open { }; - mockito = callPackage ../development/python-modules/mockito { }; - modeled = callPackage ../development/python-modules/modeled { }; moderngl = callPackage ../development/python-modules/moderngl { }; @@ -4916,57 +3652,151 @@ in { modestmaps = callPackage ../development/python-modules/modestmaps { }; - # Needed here because moinmoin is loaded as a Python library. - moinmoin = callPackage ../development/python-modules/moinmoin { }; + moinmoin = callPackage ../development/python-modules/moinmoin + { }; # Needed here because moinmoin is loaded as a Python library. + + mongodict = callPackage ../development/python-modules/mongodict { }; + + mongoengine = callPackage ../development/python-modules/mongoengine { }; + + monkeyhex = callPackage ../development/python-modules/monkeyhex { }; + + monosat = disabledIf (!isPy3k) (pkgs.monosat.python { + inherit buildPythonPackage; + inherit (self) cython; + }); + + monotonic = callPackage ../development/python-modules/monotonic { }; + + monty = callPackage ../development/python-modules/monty { }; + + more-itertools = if isPy27 then + callPackage ../development/python-modules/more-itertools/2.7.nix { } + else + callPackage ../development/python-modules/more-itertools { }; moretools = callPackage ../development/python-modules/moretools { }; - moto = callPackage ../development/python-modules/moto {}; + morphys = callPackage ../development/python-modules/morphys { }; + + mortgage = callPackage ../development/python-modules/mortgage { }; + + moto = callPackage ../development/python-modules/moto { }; + + moviepy = callPackage ../development/python-modules/moviepy { }; + + mox3 = callPackage ../development/python-modules/mox3 { }; mox = callPackage ../development/python-modules/mox { }; + mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix { }; + + mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix { }; + + mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix { }; + + mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix { }; + + mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix { }; + + mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix { }; + + moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix { }; + + mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix { }; + + mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix { }; + + mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix { }; + mozsvc = callPackage ../development/python-modules/mozsvc { }; - mpmath = callPackage ../development/python-modules/mpmath { }; + mozterm = callPackage ../development/python-modules/mozterm { }; - mpd = callPackage ../development/python-modules/mpd { }; + moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix { }; + + mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix { }; mpd2 = callPackage ../development/python-modules/mpd2 { }; + mpd = callPackage ../development/python-modules/mpd { }; + + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; + + mplleaflet = callPackage ../development/python-modules/mplleaflet { }; + + mpmath = callPackage ../development/python-modules/mpmath { }; + mpv = callPackage ../development/python-modules/mpv { mpv = pkgs.mpv; }; - mrbob = callPackage ../development/python-modules/mrbob {}; + mpyq = callPackage ../development/python-modules/mpyq { }; - msgpack = callPackage ../development/python-modules/msgpack {}; + mrbob = callPackage ../development/python-modules/mrbob { }; - msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy {}; + msal = callPackage ../development/python-modules/msal { }; + + msal-extensions = callPackage ../development/python-modules/msal-extensions { }; + + msgpack = callPackage ../development/python-modules/msgpack { }; + + msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy { }; + + msrestazure = callPackage ../development/python-modules/msrestazure { }; + + msrest = callPackage ../development/python-modules/msrest { }; msrplib = callPackage ../development/python-modules/msrplib { }; + mt-940 = callPackage ../development/python-modules/mt-940 { }; + + multidict = callPackage ../development/python-modules/multidict { }; + + multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; + multipledispatch = callPackage ../development/python-modules/multipledispatch { }; multiprocess = callPackage ../development/python-modules/multiprocess { }; + multiset = callPackage ../development/python-modules/multiset { }; + multitasking = callPackage ../development/python-modules/multitasking { }; + munch = callPackage ../development/python-modules/munch { }; + munkres = callPackage ../development/python-modules/munkres { }; + murmurhash = callPackage ../development/python-modules/murmurhash { }; + musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { }; mutag = callPackage ../development/python-modules/mutag { }; mutagen = if isPy27 then - callPackage ../development/python-modules/mutagen/1.43.nix { } - else - callPackage ../development/python-modules/mutagen { }; + callPackage ../development/python-modules/mutagen/1.43.nix { } + else + callPackage ../development/python-modules/mutagen { }; mutatormath = callPackage ../development/python-modules/mutatormath { }; muttils = callPackage ../development/python-modules/muttils { }; - mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + mwclient = callPackage ../development/python-modules/mwclient { }; - mysqlclient = callPackage ../development/python-modules/mysqlclient { }; + mwlib = callPackage ../development/python-modules/mwlib { }; + + mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; + + mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; + + mwoauth = callPackage ../development/python-modules/mwoauth { }; + + mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; + + mxnet = callPackage ../development/python-modules/mxnet { }; + + myfitnesspal = callPackage ../development/python-modules/myfitnesspal { }; + + mygpoclient = callPackage ../development/python-modules/mygpoclient { }; mypy = callPackage ../development/python-modules/mypy { }; @@ -4974,44 +3804,12 @@ in { mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; - neuronpy = callPackage ../development/python-modules/neuronpy { }; - - persisting-theory = callPackage ../development/python-modules/persisting-theory { }; - - pint = callPackage ../development/python-modules/pint { }; - - pkutils = callPackage ../development/python-modules/pkutils { }; - - pygal = callPackage ../development/python-modules/pygal { }; - - pygogo = callPackage ../development/python-modules/pygogo { }; - - pytaglib = callPackage ../development/python-modules/pytaglib { }; - - pyte = callPackage ../development/python-modules/pyte { }; - - graphviz = callPackage ../development/python-modules/graphviz { - inherit (pkgs) graphviz; - }; - - pygraphviz = callPackage ../development/python-modules/pygraphviz { - inherit (pkgs) graphviz pkgconfig; # not the python package - }; - - pymc3 = callPackage ../development/python-modules/pymc3 { }; - - pympler = callPackage ../development/python-modules/pympler { }; - - pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; - - merkletools = callPackage ../development/python-modules/merkletools { }; - - monosat = disabledIf (!isPy3k) (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; }); - - monotonic = callPackage ../development/python-modules/monotonic { }; + mysqlclient = callPackage ../development/python-modules/mysqlclient { }; mysql-connector = callPackage ../development/python-modules/mysql-connector { }; + nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; + namebench = callPackage ../development/python-modules/namebench { }; namedlist = callPackage ../development/python-modules/namedlist { }; @@ -5020,33 +3818,69 @@ in { names = callPackage ../development/python-modules/names { }; + nanoleaf = callPackage ../development/python-modules/nanoleaf { }; + + nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + + nanotime = callPackage ../development/python-modules/nanotime { }; + + nassl = callPackage ../development/python-modules/nassl { }; + + natsort = callPackage ../development/python-modules/natsort { }; + + naturalsort = callPackage ../development/python-modules/naturalsort { }; + nbclient = callPackage ../development/python-modules/nbclient { }; nbconflux = callPackage ../development/python-modules/nbconflux { }; nbconvert = callPackage ../development/python-modules/nbconvert { }; + nbdime = callPackage ../development/python-modules/nbdime { }; + nbformat = if isPy3k then callPackage ../development/python-modules/nbformat { } - else callPackage ../development/python-modules/nbformat/2.nix { }; + else + callPackage ../development/python-modules/nbformat/2.nix { }; nbmerge = callPackage ../development/python-modules/nbmerge { }; - nbdime = callPackage ../development/python-modules/nbdime { }; + nbsmoke = callPackage ../development/python-modules/nbsmoke { }; + + nbsphinx = callPackage ../development/python-modules/nbsphinx { }; + + nbval = callPackage ../development/python-modules/nbval { }; nbxmpp = callPackage ../development/python-modules/nbxmpp { }; - sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; + ncclient = callPackage ../development/python-modules/ncclient { }; - slixmpp = callPackage ../development/python-modules/slixmpp { - inherit (pkgs) gnupg; - }; + ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; + + ndtypes = callPackage ../development/python-modules/ndtypes { }; + + neo = callPackage ../development/python-modules/neo { }; + + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; netaddr = callPackage ../development/python-modules/netaddr { }; + netcdf4 = callPackage ../development/python-modules/netcdf4 { }; + + netdisco = callPackage ../development/python-modules/netdisco { }; + netifaces = callPackage ../development/python-modules/netifaces { }; - hpack = callPackage ../development/python-modules/hpack { }; + networkx = if isPy3k then + callPackage ../development/python-modules/networkx { } + else + callPackage ../development/python-modules/networkx/2.2.nix { }; + + neuron-mpi = pkgs.neuron-mpi.override { inherit python; }; + + neuron = pkgs.neuron.override { inherit python; }; + + neuronpy = callPackage ../development/python-modules/neuronpy { }; nevow = callPackage ../development/python-modules/nevow { }; @@ -5056,573 +3890,945 @@ in { enablePython = true; })).python; - nibabel = callPackage ../development/python-modules/nibabel {}; + nibabel = callPackage ../development/python-modules/nibabel { }; nidaqmx = callPackage ../development/python-modules/nidaqmx { }; - nilearn = callPackage ../development/python-modules/nilearn {}; + Nikola = callPackage ../development/python-modules/Nikola { }; - nimfa = callPackage ../development/python-modules/nimfa {}; + nilearn = callPackage ../development/python-modules/nilearn { }; + + nimfa = callPackage ../development/python-modules/nimfa { }; + + nine = callPackage ../development/python-modules/nine { }; nipy = callPackage ../development/python-modules/nipy { }; - nipype = callPackage ../development/python-modules/nipype { - inherit (pkgs) which; - }; + nipype = callPackage ../development/python-modules/nipype { inherit (pkgs) which; }; nitime = callPackage ../development/python-modules/nitime { }; - nix-kernel = callPackage ../development/python-modules/nix-kernel { - inherit (pkgs) nix; - }; + nitpick = callPackage ../applications/version-management/nitpick { }; + + nix-kernel = callPackage ../development/python-modules/nix-kernel { inherit (pkgs) nix; }; + + nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 + { }; # This is used for NixOps to make sure we won't break it with the next major version of nixpart. + + nixpart = callPackage ../tools/filesystems/nixpart { }; nixpkgs = callPackage ../development/python-modules/nixpkgs { }; nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { }; + nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { }; + + nltk = callPackage ../development/python-modules/nltk { }; + + nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; + + nmigen = callPackage ../development/python-modules/nmigen { }; + + nmigen-soc = callPackage ../development/python-modules/nmigen-soc { }; + nodeenv = callPackage ../development/python-modules/nodeenv { }; + node-semver = callPackage ../development/python-modules/node-semver { }; + + noise = callPackage ../development/python-modules/noise { }; + + nose2 = callPackage ../development/python-modules/nose2 { }; + nose = callPackage ../development/python-modules/nose { }; nose-cov = callPackage ../development/python-modules/nose-cov { }; + nose-cover3 = callPackage ../development/python-modules/nose-cover3 { }; + + nose-cprof = callPackage ../development/python-modules/nose-cprof { }; + nose-exclude = callPackage ../development/python-modules/nose-exclude { }; nose-focus = callPackage ../development/python-modules/nose-focus { }; - nose-randomly = callPackage ../development/python-modules/nose-randomly { }; - - nose2 = callPackage ../development/python-modules/nose2 { }; - - nose-cover3 = callPackage ../development/python-modules/nose-cover3 { }; - - nosexcover = callPackage ../development/python-modules/nosexcover { }; - nosejs = callPackage ../development/python-modules/nosejs { }; - nose-cprof = callPackage ../development/python-modules/nose-cprof { }; - nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { }; nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { }; + nose_progressive = callPackage ../development/python-modules/nose_progressive { }; + + nose-randomly = callPackage ../development/python-modules/nose-randomly { }; + nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { }; - notebook = if isPy3k then callPackage ../development/python-modules/notebook { } - else callPackage ../development/python-modules/notebook/2.nix { }; + nosexcover = callPackage ../development/python-modules/nosexcover { }; + + notebook = if isPy3k then + callPackage ../development/python-modules/notebook { } + else + callPackage ../development/python-modules/notebook/2.nix { }; notedown = callPackage ../development/python-modules/notedown { }; + notify2 = callPackage ../development/python-modules/notify2 { }; + notify = callPackage ../development/python-modules/notify { }; - notify2 = callPackage ../development/python-modules/notify2 {}; + notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; }; - notmuch = callPackage ../development/python-modules/notmuch { - inherit (pkgs) notmuch; - }; + nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; - emoji = callPackage ../development/python-modules/emoji { }; + nplusone = callPackage ../development/python-modules/nplusone { }; + + ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; ntplib = callPackage ../development/python-modules/ntplib { }; + Nuitka = callPackage ../development/python-modules/nuitka { }; + num2words = callPackage ../development/python-modules/num2words { }; numba = callPackage ../development/python-modules/numba { }; - numcodecs = callPackage ../development/python-modules/numcodecs { - inherit (pkgs) gcc8; - }; + numcodecs = callPackage ../development/python-modules/numcodecs { inherit (pkgs) gcc8; }; + + numericalunits = callPackage ../development/python-modules/numericalunits { }; numexpr = callPackage ../development/python-modules/numexpr { }; - Nuitka = callPackage ../development/python-modules/nuitka { }; - - numpy = - if pythonOlder "3.5" then - callPackage ../development/python-modules/numpy/1.16.nix { } - else - callPackage ../development/python-modules/numpy { }; - numpydoc = callPackage ../development/python-modules/numpydoc { }; + numpy = if pythonOlder "3.5" then + callPackage ../development/python-modules/numpy/1.16.nix { } + else + callPackage ../development/python-modules/numpy { }; + numpy-stl = callPackage ../development/python-modules/numpy-stl { }; numtraits = callPackage ../development/python-modules/numtraits { }; + nunavut = callPackage ../development/python-modules/nunavut { }; + + nvchecker = callPackage ../development/python-modules/nvchecker { }; + nwdiag = callPackage ../development/python-modules/nwdiag { }; - dynd = callPackage ../development/python-modules/dynd { }; + nxt-python = callPackage ../development/python-modules/nxt-python { }; - langcodes = callPackage ../development/python-modules/langcodes { }; - - livestreamer = callPackage ../development/python-modules/livestreamer { }; - - livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; - - oauth = callPackage ../development/python-modules/oauth { }; + oath = callPackage ../development/python-modules/oath { }; oauth2 = callPackage ../development/python-modules/oauth2 { }; oauth2client = callPackage ../development/python-modules/oauth2client { }; + oauth = callPackage ../development/python-modules/oauth { }; + + oauthenticator = callPackage ../development/python-modules/oauthenticator { }; + oauthlib = if isPy27 then - callPackage ../development/python-modules/oauthlib/3.1.nix { } - else - callPackage ../development/python-modules/oauthlib { }; + callPackage ../development/python-modules/oauthlib/3.1.nix { } + else + callPackage ../development/python-modules/oauthlib { }; obfsproxy = callPackage ../development/python-modules/obfsproxy { }; - objgraph = callPackage ../development/python-modules/objgraph { - graphvizPkg = pkgs.graphviz; - }; + objgraph = callPackage ../development/python-modules/objgraph { graphvizPkg = pkgs.graphviz; }; + + od = callPackage ../development/python-modules/od { }; + + odfpy = callPackage ../development/python-modules/odfpy { }; offtrac = callPackage ../development/python-modules/offtrac { }; + ofxclient = callPackage ../development/python-modules/ofxclient { }; + + ofxhome = callPackage ../development/python-modules/ofxhome { }; + + ofxparse = callPackage ../development/python-modules/ofxparse { }; + + ofxtools = callPackage ../development/python-modules/ofxtools { }; + + olefile = callPackage ../development/python-modules/olefile { }; + + omegaconf = callPackage ../development/python-modules/omegaconf { }; + + onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; + + onnx = callPackage ../development/python-modules/onnx { }; + + openant = callPackage ../development/python-modules/openant { }; + + openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; + + opencv3 = toPythonModule (pkgs.opencv3.override { + enablePython = true; + pythonPackages = self; + }); + + opencv4 = toPythonModule (pkgs.opencv4.override { + enablePython = true; + pythonPackages = self; + }); + + opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { + enablePython = true; + pythonPackages = self; + })); + + openidc-client = callPackage ../development/python-modules/openidc-client { }; + openpyxl = if pythonAtLeast "3.6" then callPackage ../development/python-modules/openpyxl { } else callPackage ../development/python-modules/openpyxl/2.nix { }; + openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; + + openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; - ordereddict = callPackage ../development/python-modules/ordereddict { }; + opentracing = callPackage ../development/python-modules/opentracing { }; - od = callPackage ../development/python-modules/od { }; + openwebifpy = callPackage ../development/python-modules/openwebifpy { }; - omegaconf = callPackage ../development/python-modules/omegaconf { }; + openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); + + opt-einsum = if isPy27 then + callPackage ../development/python-modules/opt-einsum/2.nix { } + else + callPackage ../development/python-modules/opt-einsum { }; + + optuna = callPackage ../development/python-modules/optuna { }; opuslib = callPackage ../development/python-modules/opuslib { }; + ordereddict = callPackage ../development/python-modules/ordereddict { }; + + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; + + ordered-set = callPackage ../development/python-modules/ordered-set { }; + orderedset = callPackage ../development/python-modules/orderedset { }; - python-multipart = callPackage ../development/python-modules/python-multipart { }; + orm = callPackage ../development/python-modules/orm { }; - python-otr = callPackage ../development/python-modules/python-otr { }; - - plone-testing = callPackage ../development/python-modules/plone-testing { }; - - ply = callPackage ../development/python-modules/ply { }; - - plyplus = callPackage ../development/python-modules/plyplus { }; - - plyvel = callPackage ../development/python-modules/plyvel { }; + ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; })).python; osc = callPackage ../development/python-modules/osc { }; - rfc3986 = callPackage ../development/python-modules/rfc3986 { }; + oscrypto = callPackage ../development/python-modules/oscrypto { }; - cachetools = let - cachetools' = callPackage ../development/python-modules/cachetools {}; - cachetools_2 = cachetools'.overridePythonAttrs(oldAttrs: rec { - version = "3.1.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; - }; + oset = callPackage ../development/python-modules/oset { }; - }); - in if isPy3k then cachetools' else cachetools_2; + osmnx = callPackage ../development/python-modules/osmnx { }; - cma = callPackage ../development/python-modules/cma { }; + osmpythontools = callPackage ../development/python-modules/osmpythontools { }; - cmd2 = callPackage ../development/python-modules/cmd2 {}; + osqp = callPackage ../development/python-modules/osqp { }; - warlock = callPackage ../development/python-modules/warlock { }; + outcome = callPackage ../development/python-modules/outcome { }; - pecan = callPackage ../development/python-modules/pecan { }; + ovh = callPackage ../development/python-modules/ovh { }; - kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; + ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); - Kajiki = callPackage ../development/python-modules/kajiki { }; + owslib = callPackage ../development/python-modules/owslib { }; - WSME = callPackage ../development/python-modules/WSME { }; + oyaml = callPackage ../development/python-modules/oyaml { }; - zake = callPackage ../development/python-modules/zake { }; + packaging = callPackage ../development/python-modules/packaging { }; - zarr = callPackage ../development/python-modules/zarr { }; + packet-python = callPackage ../development/python-modules/packet-python { }; - kazoo = callPackage ../development/python-modules/kazoo { }; + pafy = callPackage ../development/python-modules/pafy { }; - FormEncode = callPackage ../development/python-modules/FormEncode { }; - - pycountry = callPackage ../development/python-modules/pycountry { }; - - nine = callPackage ../development/python-modules/nine { }; - - logutils = callPackage ../development/python-modules/logutils { }; - - ldappool = callPackage ../development/python-modules/ldappool { }; - - retrying = callPackage ../development/python-modules/retrying { }; - - fasteners = callPackage ../development/python-modules/fasteners { }; - - aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; - - aioeventlet = callPackage ../development/python-modules/aioeventlet { }; - - aiokafka = callPackage ../development/python-modules/aiokafka { }; - - olefile = callPackage ../development/python-modules/olefile { }; - - requests-mock = callPackage ../development/python-modules/requests-mock { }; - - mecab-python3 = callPackage ../development/python-modules/mecab-python3 { }; - - mox3 = callPackage ../development/python-modules/mox3 { }; - - doc8 = callPackage ../development/python-modules/doc8 { }; - - wrapt = callPackage ../development/python-modules/wrapt { }; + pagelabels = callPackage ../development/python-modules/pagelabels { }; pagerduty = callPackage ../development/python-modules/pagerduty { }; + paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; + + palettable = callPackage ../development/python-modules/palettable { }; + + pam = callPackage ../development/python-modules/pam { inherit (pkgs) pam; }; + + pamela = callPackage ../development/python-modules/pamela { }; + + pamqp = callPackage ../development/python-modules/pamqp { }; + pandas = if isPy3k then callPackage ../development/python-modules/pandas { } else callPackage ../development/python-modules/pandas/2.nix { }; + pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; + + pandocfilters = callPackage ../development/python-modules/pandocfilters { }; + panel = callPackage ../development/python-modules/panel { }; - xlrd = callPackage ../development/python-modules/xlrd { }; + papermill = callPackage ../development/python-modules/papermill { }; - bottleneck = callPackage ../development/python-modules/bottleneck { }; + paperspace = callPackage ../development/python-modules/paperspace { }; - paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; + paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; - pagelabels = callPackage ../development/python-modules/pagelabels { }; + papis = callPackage ../development/python-modules/papis { }; - pamqp = callPackage ../development/python-modules/pamqp { }; - - parsedatetime = callPackage ../development/python-modules/parsedatetime { }; + papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; param = callPackage ../development/python-modules/param { }; - paramiko = callPackage ../development/python-modules/paramiko { }; - parameterized = callPackage ../development/python-modules/parameterized { }; + paramiko = callPackage ../development/python-modules/paramiko { }; + paramz = callPackage ../development/python-modules/paramz { }; parfive = callPackage ../development/python-modules/parfive { }; + parse = callPackage ../development/python-modules/parse { }; + + parsedatetime = callPackage ../development/python-modules/parsedatetime { }; + parsel = callPackage ../development/python-modules/parsel { }; + parse-type = callPackage ../development/python-modules/parse-type { }; + + parsimonious = callPackage ../development/python-modules/parsimonious { }; + + parsley = callPackage ../development/python-modules/parsley { }; + parso = callPackage ../development/python-modules/parso { }; + parsy = callPackage ../development/python-modules/parsy { }; + partd = callPackage ../development/python-modules/partd { }; - patch = callPackage ../development/python-modules/patch { }; + parver = callPackage ../development/python-modules/parver { }; + arpeggio = callPackage ../development/python-modules/arpeggio { }; - patch-ng = callPackage ../development/python-modules/patch-ng { }; - - pathos = callPackage ../development/python-modules/pathos { }; - - patsy = callPackage ../development/python-modules/patsy { }; + passlib = callPackage ../development/python-modules/passlib { }; paste = callPackage ../development/python-modules/paste { }; PasteDeploy = callPackage ../development/python-modules/pastedeploy { }; + pastel = callPackage ../development/python-modules/pastel { }; + pasteScript = callPackage ../development/python-modules/pastescript { }; patator = callPackage ../development/python-modules/patator { }; + patch = callPackage ../development/python-modules/patch { }; + + patch-ng = callPackage ../development/python-modules/patch-ng { }; + + path-and-address = callPackage ../development/python-modules/path-and-address { }; + pathlib2 = callPackage ../development/python-modules/pathlib2 { }; + pathlib = callPackage ../development/python-modules/pathlib { }; + + pathos = callPackage ../development/python-modules/pathos { }; + pathpy = if isPy3k then callPackage ../development/python-modules/path.py { } else callPackage ../development/python-modules/path.py/2.nix { }; + pathspec = callPackage ../development/python-modules/pathspec { }; + + pathtools = callPackage ../development/python-modules/pathtools { }; + + patsy = callPackage ../development/python-modules/patsy { }; + + paver = callPackage ../development/python-modules/paver { }; + paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { }; + pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; + pbr = callPackage ../development/python-modules/pbr { }; - fixtures = callPackage ../development/python-modules/fixtures { }; + pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); - fipy = callPackage ../development/python-modules/fipy { }; + pcpp = callPackage ../development/python-modules/pcpp { }; - sfepy = callPackage ../development/python-modules/sfepy { }; + pdf2image = callPackage ../development/python-modules/pdf2image { }; - pelican = callPackage ../development/python-modules/pelican { - inherit (pkgs) glibcLocales git; - }; + pdfkit = callPackage ../development/python-modules/pdfkit { }; - pep8 = callPackage ../development/python-modules/pep8 { }; + pdfminer = callPackage ../development/python-modules/pdfminer_six { }; - pep8-naming = callPackage ../development/python-modules/pep8-naming { }; + pdfposter = callPackage ../development/python-modules/pdfposter { }; + + pdfrw = callPackage ../development/python-modules/pdfrw { }; + + pdftotext = callPackage ../development/python-modules/pdftotext { }; + + pdfx = callPackage ../development/python-modules/pdfx { }; + + pecan = callPackage ../development/python-modules/pecan { }; + + peewee = callPackage ../development/python-modules/peewee { }; + + pefile = callPackage ../development/python-modules/pefile { }; + + pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; }; + + pendulum = callPackage ../development/python-modules/pendulum { }; pep257 = callPackage ../development/python-modules/pep257 { }; pep517 = callPackage ../development/python-modules/pep517 { }; + pep8 = callPackage ../development/python-modules/pep8 { }; + + pep8-naming = callPackage ../development/python-modules/pep8-naming { }; + + peppercorn = callPackage ../development/python-modules/peppercorn { }; + percol = callPackage ../development/python-modules/percol { }; + perfplot = callPackage ../development/python-modules/perfplot { }; + + periodictable = callPackage ../development/python-modules/periodictable { }; + + persim = callPackage ../development/python-modules/persim { }; + + persistent = callPackage ../development/python-modules/persistent { }; + + persisting-theory = callPackage ../development/python-modules/persisting-theory { }; + + pex = callPackage ../development/python-modules/pex { }; + pexif = callPackage ../development/python-modules/pexif { }; pexpect = callPackage ../development/python-modules/pexpect { }; - pdfkit = callPackage ../development/python-modules/pdfkit { }; - - pdfrw = callPackage ../development/python-modules/pdfrw { }; - - periodictable = callPackage ../development/python-modules/periodictable { }; - - pgcli = callPackage ../development/tools/database/pgcli {}; - pg8000 = callPackage ../development/python-modules/pg8000 { }; pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { }; + pgcli = callPackage ../development/tools/database/pgcli { }; + pglast = callPackage ../development/python-modules/pglast { }; + pgpdump = callPackage ../development/python-modules/pgpdump { }; + + pgpy = callPackage ../development/python-modules/pgpy { }; + pgsanity = callPackage ../development/python-modules/pgsanity { }; pgspecial = callPackage ../development/python-modules/pgspecial { }; - pgpy = callPackage ../development/python-modules/pgpy { }; + phe = callPackage ../development/python-modules/phe { }; + + phik = callPackage ../development/python-modules/phik { }; + + phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + + phonopy = callPackage ../development/python-modules/phonopy { }; + + phpserialize = callPackage ../development/python-modules/phpserialize { }; + + piccata = callPackage ../development/python-modules/piccata { }; pickleshare = callPackage ../development/python-modules/pickleshare { }; picos = callPackage ../development/python-modules/picos { }; + pid = callPackage ../development/python-modules/pid { }; + piep = callPackage ../development/python-modules/piep { }; piexif = callPackage ../development/python-modules/piexif { }; - pip = callPackage ../development/python-modules/pip { }; - - pipx = callPackage ../development/python-modules/pipx { }; - - pip-tools = callPackage ../development/python-modules/pip-tools { - git = pkgs.gitMinimal; - glibcLocales = pkgs.glibcLocales; - }; - - pipdate = callPackage ../development/python-modules/pipdate { }; - pika = callPackage ../development/python-modules/pika { }; pika-pool = callPackage ../development/python-modules/pika-pool { }; pikepdf = callPackage ../development/python-modules/pikepdf { }; - kmapper = callPackage ../development/python-modules/kmapper { }; + pilkit = callPackage ../development/python-modules/pilkit { }; - kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { - inherit (pkgs.kmsxx) stdenv; - inherit (pkgs) pkgconfig; - withPython = true; - }).overrideAttrs (oldAttrs: { - name = "${python.libPrefix}-${pkgs.kmsxx.name}"; - })); - - precis-i18n = callPackage ../development/python-modules/precis-i18n { }; - - promise = callPackage ../development/python-modules/promise { }; - - prox-tv = callPackage ../development/python-modules/prox-tv { }; - - pvlib = callPackage ../development/python-modules/pvlib { }; - - pybase64 = callPackage ../development/python-modules/pybase64 { }; - - pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; - - pylibmc = callPackage ../development/python-modules/pylibmc {}; - - pymetar = callPackage ../development/python-modules/pymetar { }; - - pypubsub = callPackage ../development/python-modules/pypubsub { }; - - pysftp = callPackage ../development/python-modules/pysftp { }; - - soundfile = callPackage ../development/python-modules/soundfile { }; - - pysoundfile = self.soundfile; # Alias added 23-06-2019 - - python-jenkins = callPackage ../development/python-modules/python-jenkins { }; - - pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - - pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + pillowfight = callPackage ../development/python-modules/pillowfight { }; pillow = if isPy27 then callPackage ../development/python-modules/pillow/6.nix { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; - } else + } + else callPackage ../development/python-modules/pillow { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; + }; + + pims = callPackage ../development/python-modules/pims { }; + + pint = callPackage ../development/python-modules/pint { }; + + pip2nix = callPackage ../development/python-modules/pip2nix { }; + + pip = callPackage ../development/python-modules/pip { }; + + pipdate = callPackage ../development/python-modules/pipdate { }; + + pip-tools = callPackage ../development/python-modules/pip-tools { + git = pkgs.gitMinimal; + glibcLocales = pkgs.glibcLocales; }; - pkgconfig = callPackage ../development/python-modules/pkgconfig { - inherit (pkgs) pkgconfig; - }; + pipx = callPackage ../development/python-modules/pipx { }; + + pivy = callPackage ../development/python-modules/pivy { }; + + pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; + + pkginfo = callPackage ../development/python-modules/pkginfo { }; + + pkuseg = callPackage ../development/python-modules/pkuseg { }; + + pkutils = callPackage ../development/python-modules/pkutils { }; + + plac = callPackage ../development/python-modules/plac { }; + + plaid-python = callPackage ../development/python-modules/plaid-python { }; + + plaster = callPackage ../development/python-modules/plaster { }; + + plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy { }; + + playsound = callPackage ../development/python-modules/playsound { }; + + plexapi = callPackage ../development/python-modules/plexapi { }; + + plexauth = callPackage ../development/python-modules/plexauth { }; + + plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; + + plone-testing = callPackage ../development/python-modules/plone-testing { }; + + plotly = callPackage ../development/python-modules/plotly { }; + + pluggy = callPackage ../development/python-modules/pluggy { }; + + pluginbase = callPackage ../development/python-modules/pluginbase { }; plumbum = callPackage ../development/python-modules/plumbum { }; - polib = callPackage ../development/python-modules/polib {}; + ply = callPackage ../development/python-modules/ply { }; + + plyfile = callPackage ../development/python-modules/plyfile { }; + + plyplus = callPackage ../development/python-modules/plyplus { }; + + plyvel = callPackage ../development/python-modules/plyvel { }; + + Pmw = callPackage ../development/python-modules/Pmw { }; + + pocket = callPackage ../development/python-modules/pocket { }; + + podcastparser = callPackage ../development/python-modules/podcastparser { }; + + podcats = callPackage ../development/python-modules/podcats { }; + + poetry = callPackage ../development/python-modules/poetry { }; + + poetry-core = callPackage ../development/python-modules/poetry-core { }; + + poezio = callPackage ../applications/networking/instant-messengers/poezio { inherit (pkgs) pkgconfig; }; + + polib = callPackage ../development/python-modules/polib { }; + + polyline = callPackage ../development/python-modules/polyline { }; + + pomegranate = callPackage ../development/python-modules/pomegranate { }; + + pony = callPackage ../development/python-modules/pony { }; ponywhoosh = callPackage ../development/python-modules/ponywhoosh { }; - posix_ipc = callPackage ../development/python-modules/posix_ipc { }; + pooch = callPackage ../development/python-modules/pooch { }; + + poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { + inherit (pkgs.qt5) qtbase; + inherit (pkgs.libsForQt5) poppler; + inherit (pkgs) pkgconfig; + }; + + portalocker = callPackage ../development/python-modules/portalocker { }; portend = callPackage ../development/python-modules/portend { }; + portpicker = callPackage ../development/python-modules/portpicker { }; + + posix_ipc = callPackage ../development/python-modules/posix_ipc { }; + + poster3 = callPackage ../development/python-modules/poster3 { }; + + postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { }); + + potr = callPackage ../development/python-modules/potr { }; + + power = callPackage ../development/python-modules/power { }; + powerline = callPackage ../development/python-modules/powerline { }; pox = callPackage ../development/python-modules/pox { }; + poyo = callPackage ../development/python-modules/poyo { }; + ppft = callPackage ../development/python-modules/ppft { }; + pplpy = callPackage ../development/python-modules/pplpy { }; + + pprintpp = callPackage ../development/python-modules/pprintpp { }; + pproxy = callPackage ../development/python-modules/pproxy { }; pq = callPackage ../development/python-modules/pq { }; - praw = if isPy3k then callPackage ../development/python-modules/praw { } - else callPackage ../development/python-modules/praw/6.3.nix { }; - prance = callPackage ../development/python-modules/prance { }; prawcore = callPackage ../development/python-modules/prawcore { }; + praw = if isPy3k then + callPackage ../development/python-modules/praw { } + else + callPackage ../development/python-modules/praw/6.3.nix { }; + + precis-i18n = callPackage ../development/python-modules/precis-i18n { }; + + pre-commit = callPackage ../development/python-modules/pre-commit { }; + + preggy = callPackage ../development/python-modules/preggy { }; + premailer = callPackage ../development/python-modules/premailer { }; + preshed = callPackage ../development/python-modules/preshed { }; + + pretend = callPackage ../development/python-modules/pretend { }; + prettytable = callPackage ../development/python-modules/prettytable { }; - property-manager = callPackage ../development/python-modules/property-manager { }; + priority = callPackage ../development/python-modules/priority { }; + + prison = callPackage ../development/python-modules/prison { }; + + privacyidea = callPackage ../development/python-modules/privacyidea { }; + privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; + + proboscis = callPackage ../development/python-modules/proboscis { }; + + process-tests = callPackage ../development/python-modules/process-tests { }; + + proglog = callPackage ../development/python-modules/proglog { }; + + progressbar231 = callPackage ../development/python-modules/progressbar231 { }; + + progressbar2 = callPackage ../development/python-modules/progressbar2 { }; + + progressbar33 = callPackage ../development/python-modules/progressbar33 { }; + + progressbar = callPackage ../development/python-modules/progressbar { }; + + progress = callPackage ../development/python-modules/progress { }; + + prometheus_client = callPackage ../development/python-modules/prometheus_client { }; + + promise = callPackage ../development/python-modules/promise { }; prompt_toolkit = let - filename = if isPy3k then ../development/python-modules/prompt_toolkit else ../development/python-modules/prompt_toolkit/1.nix; + filename = if isPy3k then + ../development/python-modules/prompt_toolkit + else + ../development/python-modules/prompt_toolkit/1.nix; in callPackage filename { }; + property-manager = callPackage ../development/python-modules/property-manager { }; + + protego = callPackage ../development/python-modules/protego { }; + protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; - doCheck = !isPy3k; - # If a protobuf upgrade causes many Python packages to fail, please pin it - # here to the previous version. + doCheck = + !isPy3k; # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. protobuf = pkgs.protobuf; }; + prov = callPackage ../development/python-modules/prov { }; + + prox-tv = callPackage ../development/python-modules/prox-tv { }; + psautohint = callPackage ../development/python-modules/psautohint { }; psd-tools = callPackage ../development/python-modules/psd-tools { }; psutil = callPackage ../development/python-modules/psutil { }; - psycopg2 = callPackage ../development/python-modules/psycopg2 {}; - - ptpython = callPackage ../development/python-modules/ptpython { - prompt_toolkit = self.prompt_toolkit; - }; + psycopg2 = callPackage ../development/python-modules/psycopg2 { }; ptable = callPackage ../development/python-modules/ptable { }; - publicsuffix = callPackage ../development/python-modules/publicsuffix {}; + ptest = callPackage ../development/python-modules/ptest { }; - publicsuffix2 = callPackage ../development/python-modules/publicsuffix2 {}; + ptpython = callPackage ../development/python-modules/ptpython { prompt_toolkit = self.prompt_toolkit; }; - py = callPackage ../development/python-modules/py { }; + ptyprocess = callPackage ../development/python-modules/ptyprocess { }; + + publicsuffix2 = callPackage ../development/python-modules/publicsuffix2 { }; + + publicsuffix = callPackage ../development/python-modules/publicsuffix { }; + + pudb = callPackage ../development/python-modules/pudb { }; + + pulp = callPackage ../development/python-modules/pulp { }; + + pulsectl = callPackage ../development/python-modules/pulsectl { }; + + pure-eval = callPackage ../development/python-modules/pure-eval { }; + + pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; + + purepng = callPackage ../development/python-modules/purepng { }; + + pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; + + purl = callPackage ../development/python-modules/purl { }; + + pushbullet = callPackage ../development/python-modules/pushbullet { }; + + pushover-complete = callPackage ../development/python-modules/pushover-complete { }; + + pvlib = callPackage ../development/python-modules/pvlib { }; + + Pweave = callPackage ../development/python-modules/pweave { }; + + pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; }; + + pxml = callPackage ../development/python-modules/pxml { }; + + py2bit = callPackage ../development/python-modules/py2bit { }; + + py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); + + py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; + + py3status = callPackage ../development/python-modules/py3status { }; + + py3to2 = callPackage ../development/python-modules/3to2 { }; + + py4j = callPackage ../development/python-modules/py4j { }; pyacoustid = callPackage ../development/python-modules/pyacoustid { }; + pyaes = callPackage ../development/python-modules/pyaes { }; + + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; + pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; + pyamf = callPackage ../development/python-modules/pyamf { }; + + pyamg = callPackage ../development/python-modules/pyamg { }; + + pyaml = callPackage ../development/python-modules/pyaml { }; + + pyannotate = callPackage ../development/python-modules/pyannotate { }; + + pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkgconfig; }; + pyasn1 = callPackage ../development/python-modules/pyasn1 { }; pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { }; pyatmo = callPackage ../development/python-modules/pyatmo { }; + pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs) pkgconfig; }; + + pyatv = callPackage ../development/python-modules/pyatv { }; + pyaudio = callPackage ../development/python-modules/pyaudio { }; - pycoin = callPackage ../development/python-modules/pycoin { }; + pyavm = callPackage ../development/python-modules/pyavm { }; - pysam = callPackage ../development/python-modules/pysam { }; + pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; - pysaml2 = callPackage ../development/python-modules/pysaml2 { - inherit (pkgs) xmlsec; - }; + pybase64 = callPackage ../development/python-modules/pybase64 { }; - python-pushover = callPackage ../development/python-modules/pushover {}; - - pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; }; - - mongodict = callPackage ../development/python-modules/mongodict { }; - - mongoengine = callPackage ../development/python-modules/mongoengine { }; - - repoze_who = callPackage ../development/python-modules/repoze_who { }; - - vobject = callPackage ../development/python-modules/vobject { }; - - pycarddav = callPackage ../development/python-modules/pycarddav { }; - - pygit2 = callPackage ../development/python-modules/pygit2 { }; - - Babel = callPackage ../development/python-modules/Babel { }; - - babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; - - batchspawner = callPackage ../development/python-modules/batchspawner { }; + pybids = callPackage ../development/python-modules/pybids { }; pybigwig = callPackage ../development/python-modules/pybigwig { }; - py2bit = callPackage ../development/python-modules/py2bit { }; + pybind11 = callPackage ../development/python-modules/pybind11 { }; + + pybindgen = callPackage ../development/python-modules/pybindgen { }; + + pyblake2 = callPackage ../development/python-modules/pyblake2 { }; pyblock = callPackage ../development/python-modules/pyblock { }; pyblosxom = callPackage ../development/python-modules/pyblosxom { }; + pybluez = callPackage ../development/python-modules/pybluez { }; + + pybotvac = callPackage ../development/python-modules/pybotvac { }; + + pybrowserid = callPackage ../development/python-modules/pybrowserid { }; + + pybtex = callPackage ../development/python-modules/pybtex { }; + + pybtex-docutils = callPackage ../development/python-modules/pybtex-docutils { }; + + pybullet = callPackage ../development/python-modules/pybullet { }; + + pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkgconfig; }; + + pycallgraph = callPackage ../development/python-modules/pycallgraph { }; + + py = callPackage ../development/python-modules/py { }; + + pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkgconfig; }); + pycapnp = callPackage ../development/python-modules/pycapnp { }; pycaption = callPackage ../development/python-modules/pycaption { }; + pycarddav = callPackage ../development/python-modules/pycarddav { }; + + pycares = callPackage ../development/python-modules/pycares { }; + + pycassa = callPackage ../development/python-modules/pycassa { }; + + pycategories = callPackage ../development/python-modules/pycategories { }; + pycdio = callPackage ../development/python-modules/pycdio { }; + pychart = callPackage ../development/python-modules/pychart { }; + + pychef = callPackage ../development/python-modules/pychef { }; + + PyChromecast = callPackage ../development/python-modules/pychromecast { }; + + pyclipper = callPackage ../development/python-modules/pyclipper { }; + + pycm = callPackage ../development/python-modules/pycm { }; + + pycodestyle = callPackage ../development/python-modules/pycodestyle { }; + + pycognito = callPackage ../development/python-modules/pycognito { }; + + pycoin = callPackage ../development/python-modules/pycoin { }; + + pycollada = callPackage ../development/python-modules/pycollada { }; + + pycontracts = callPackage ../development/python-modules/pycontracts { }; + pycosat = callPackage ../development/python-modules/pycosat { }; + pycountry = callPackage ../development/python-modules/pycountry { }; + + pycparser = callPackage ../development/python-modules/pycparser { }; + + py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; + + pycrc = callPackage ../development/python-modules/pycrc { }; + + pycrypto = callPackage ../development/python-modules/pycrypto { }; + + pycryptodome = callPackage ../development/python-modules/pycryptodome { }; + + pycryptodomex = callPackage ../development/python-modules/pycryptodomex { }; + pycryptopp = callPackage ../development/python-modules/pycryptopp { }; pyct = callPackage ../development/python-modules/pyct { }; - pycups = callPackage ../development/python-modules/pycups { }; + pycuda = callPackage ../development/python-modules/pycuda { + cudatoolkit = pkgs.cudatoolkit; + inherit (pkgs.stdenv) mkDerivation; + }; - pycurl = callPackage ../development/python-modules/pycurl { }; + pycups = callPackage ../development/python-modules/pycups { }; pycurl2 = callPackage ../development/python-modules/pycurl2 { }; + pycurl = callPackage ../development/python-modules/pycurl { }; + + pydantic = callPackage ../development/python-modules/pydantic { }; + + pydbus = callPackage ../development/python-modules/pydbus { }; + + pydenticon = callPackage ../development/python-modules/pydenticon { }; + + pydicom = callPackage ../development/python-modules/pydicom { }; + pydispatcher = callPackage ../development/python-modules/pydispatcher { }; - pydot = callPackage ../development/python-modules/pydot { - inherit (pkgs) graphviz; - }; + pydns = let + py3 = callPackage ../development/python-modules/py3dns { }; + py2 = callPackage ../development/python-modules/pydns { }; + in if isPy3k then py3 else py2; + + pydocstyle = if isPy27 then + callPackage ../development/python-modules/pydocstyle/2.nix { } + else + callPackage ../development/python-modules/pydocstyle { }; + + pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; + + pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; }; pydot_ng = callPackage ../development/python-modules/pydot_ng { graphviz = pkgs.graphviz; }; + pydotplus = callPackage ../development/python-modules/pydotplus { }; + + pydrive = callPackage ../development/python-modules/pydrive { }; + + pydsdl = callPackage ../development/python-modules/pydsdl { }; + + pydub = callPackage ../development/python-modules/pydub { }; + + pydy = callPackage ../development/python-modules/pydy { }; + + pyechonest = callPackage ../development/python-modules/pyechonest { }; + pyelftools = callPackage ../development/python-modules/pyelftools { }; + pyemd = callPackage ../development/python-modules/pyemd { }; + pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; }; + pyepsg = callPackage ../development/python-modules/pyepsg { }; + pyexcel = callPackage ../development/python-modules/pyexcel { }; + pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; + pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; - pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; - pyexcel-ods = callPackage ../development/python-modules/pyexcel-ods { }; - pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; + pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; + + pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 { })); pyext = callPackage ../development/python-modules/pyext { }; pyface = callPackage ../development/python-modules/pyface { }; + pyfaidx = callPackage ../development/python-modules/pyfaidx { }; + + pyfakefs = callPackage ../development/python-modules/pyfakefs { }; + pyfantom = callPackage ../development/python-modules/pyfantom { }; - pyfma = callPackage ../development/python-modules/pyfma { }; + pyfcm = callPackage ../development/python-modules/pyfcm { }; pyfftw = callPackage ../development/python-modules/pyfftw { }; @@ -5630,25 +4836,152 @@ in { pyflakes = callPackage ../development/python-modules/pyflakes { }; + pyfma = callPackage ../development/python-modules/pyfma { }; + + pyfribidi = callPackage ../development/python-modules/pyfribidi { }; + + pyfritzhome = callPackage ../development/python-modules/pyfritzhome { }; + + pyftdi = callPackage ../development/python-modules/pyftdi { }; + pyftgl = callPackage ../development/python-modules/pyftgl { }; - pygeoip = callPackage ../development/python-modules/pygeoip {}; + pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; - PyGithub = callPackage ../development/python-modules/pyGithub {}; + pyfttt = callPackage ../development/python-modules/pyfttt { }; - pyglet = callPackage ../development/python-modules/pyglet {}; + pyfxa = callPackage ../development/python-modules/pyfxa { }; + + pygal = callPackage ../development/python-modules/pygal { }; + + pygame = callPackage ../development/python-modules/pygame { }; + + pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; + + pygbm = callPackage ../development/python-modules/pygbm { }; + + pygccxml = callPackage ../development/python-modules/pygccxml { }; + + pygdbmi = callPackage ../development/python-modules/pygdbmi { }; + + pygeoip = callPackage ../development/python-modules/pygeoip { }; + + pygit2 = callPackage ../development/python-modules/pygit2 { }; + + PyGithub = callPackage ../development/python-modules/pyGithub { }; + + pyglet = callPackage ../development/python-modules/pyglet { }; + + pygls = callPackage ../development/python-modules/pygls { }; + + pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; pygments = if isPy3k then callPackage ../development/python-modules/Pygments { } else callPackage ../development/python-modules/Pygments/2_5.nix { }; + pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; + + pygmo = callPackage ../development/python-modules/pygmo { }; + + pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; }; + + pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; }; + + pygogo = callPackage ../development/python-modules/pygogo { }; + pygpgme = callPackage ../development/python-modules/pygpgme { }; - pyment = callPackage ../development/python-modules/pyment { }; + pygraphviz = callPackage ../development/python-modules/pygraphviz { + inherit (pkgs) graphviz pkgconfig; + }; # not the python package - pylint = if isPy3k then callPackage ../development/python-modules/pylint { } - else callPackage ../development/python-modules/pylint/1.9.nix { }; + pygreat = callPackage ../development/python-modules/pygreat { }; + + pygrok = callPackage ../development/python-modules/pygrok { }; + + pygtail = callPackage ../development/python-modules/pygtail { }; + + pygtk = callPackage ../development/python-modules/pygtk { + inherit (pkgs) pkgconfig; + libglade = null; + }; + + pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome2.libglade; }; + + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkgconfig; }; + + pyhamcrest = if isPy3k then + callPackage ../development/python-modules/pyhamcrest { } + else + callPackage ../development/python-modules/pyhamcrest/1.nix { }; + + pyhaversion = callPackage ../development/python-modules/pyhaversion { }; + + pyhcl = callPackage ../development/python-modules/pyhcl { }; + + pyhocon = callPackage ../development/python-modules/pyhocon { }; + + pyhomematic = callPackage ../development/python-modules/pyhomematic { }; + + pyhs100 = callPackage ../development/python-modules/pyhs100 { }; + + pyicloud = callPackage ../development/python-modules/pyicloud { }; + + PyICU = callPackage ../development/python-modules/pyicu { }; + + pyinotify = callPackage ../development/python-modules/pyinotify { }; + + pyinputevent = callPackage ../development/python-modules/pyinputevent { }; + + pyipp = callPackage ../development/python-modules/pyipp { }; + + pyjade = callPackage ../development/python-modules/pyjade { }; + + pyjet = callPackage ../development/python-modules/pyjet { }; + + pyjks = callPackage ../development/python-modules/pyjks { }; + + pyjson5 = callPackage ../development/python-modules/pyjson5 { }; + + pyjwkest = callPackage ../development/python-modules/pyjwkest { }; + + pyjwt = callPackage ../development/python-modules/pyjwt { }; + + pykdtree = callPackage ../development/python-modules/pykdtree { inherit (pkgs.llvmPackages) openmp; }; + + pykeepass = callPackage ../development/python-modules/pykeepass { }; + + pykerberos = callPackage ../development/python-modules/pykerberos { }; + + pykickstart = callPackage ../development/python-modules/pykickstart { }; + + pykka = callPackage ../development/python-modules/pykka { }; + + pykwalify = callPackage ../development/python-modules/pykwalify { }; + + pylama = callPackage ../development/python-modules/pylama { }; + + pylast = callPackage ../development/python-modules/pylast { }; + + pylatexenc = callPackage ../development/python-modules/pylatexenc { }; + + PyLD = callPackage ../development/python-modules/PyLD { }; + + pylev = callPackage ../development/python-modules/pylev { }; + + pylibacl = callPackage ../development/python-modules/pylibacl { }; + + pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; + + pylibftdi = callPackage ../development/python-modules/pylibftdi { inherit (pkgs) libusb1; }; + + pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 + + pyliblo = callPackage ../development/python-modules/pyliblo { }; + + pylibmc = callPackage ../development/python-modules/pylibmc { }; pylint-celery = callPackage ../development/python-modules/pylint-celery { }; @@ -5656,237 +4989,831 @@ in { pylint-flask = callPackage ../development/python-modules/pylint-flask { }; + pylint = if isPy3k then + callPackage ../development/python-modules/pylint { } + else + callPackage ../development/python-modules/pylint/1.9.nix { }; + pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { }; - pymumble = callPackage ../development/python-modules/pymumble { }; + py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; - pyomo = callPackage ../development/python-modules/pyomo { }; + pylru = callPackage ../development/python-modules/pylru { }; - pyopencl = callPackage ../development/python-modules/pyopencl { }; + pyls-black = callPackage ../development/python-modules/pyls-black { }; - pyosmium = callPackage ../development/python-modules/pyosmium { }; + pyls-isort = callPackage ../development/python-modules/pyls-isort { }; - pyotp = callPackage ../development/python-modules/pyotp { }; + pyls-mypy = callPackage ../development/python-modules/pyls-mypy { }; - pyproj = callPackage ../development/python-modules/pyproj { }; + PyLTI = callPackage ../development/python-modules/pylti { }; - pyqrcode = callPackage ../development/python-modules/pyqrcode { }; - - pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; - - pyrad = callPackage ../development/python-modules/pyrad { }; - - pyrr = callPackage ../development/python-modules/pyrr { }; - - pysha3 = callPackage ../development/python-modules/pysha3 { }; - - pyshp = callPackage ../development/python-modules/pyshp { }; - - pysnow = callPackage ../development/python-modules/pysnow { }; - - pysmbc = callPackage ../development/python-modules/pysmbc { - inherit (pkgs) pkgconfig; - }; - - pyspread = callPackage ../development/python-modules/pyspread { }; - - pysparse = callPackage ../development/python-modules/pysparse { }; - - pyupdate = callPackage ../development/python-modules/pyupdate {}; - - pyvmomi = callPackage ../development/python-modules/pyvmomi { }; - - pyx = callPackage ../development/python-modules/pyx { }; - - mmpython = callPackage ../development/python-modules/mmpython { }; - - kaa-base = callPackage ../development/python-modules/kaa-base { }; - - kaa-metadata = callPackage ../development/python-modules/kaa-metadata { }; - - PyICU = callPackage ../development/python-modules/pyicu { }; - - pyinputevent = callPackage ../development/python-modules/pyinputevent { }; - - pyinotify = callPackage ../development/python-modules/pyinotify { }; - - pyipp = callPackage ../development/python-modules/pyipp { }; - - pyjwt = callPackage ../development/python-modules/pyjwt { }; - - pykickstart = callPackage ../development/python-modules/pykickstart { }; - - pymemoize = callPackage ../development/python-modules/pymemoize { }; - - pyobjc = if stdenv.isDarwin - then callPackage ../development/python-modules/pyobjc {} - else throw "pyobjc can only be built on Mac OS"; - - pyodbc = callPackage ../development/python-modules/pyodbc { }; - - pyocr = callPackage ../development/python-modules/pyocr { }; - - pyparsing = callPackage ../development/python-modules/pyparsing { }; - - pyparted = callPackage ../development/python-modules/pyparted { }; - - pyptlib = callPackage ../development/python-modules/pyptlib { }; - - pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - - PyStemmer = callPackage ../development/python-modules/pystemmer {}; - - # Missing expression? - # Pyro = callPackage ../development/python-modules/pyro { }; - - pyrsistent = callPackage ../development/python-modules/pyrsistent { }; - - PyRSS2Gen = callPackage ../development/python-modules/pyrss2gen { }; - - pysmi = callPackage ../development/python-modules/pysmi { }; - - pysnmp = callPackage ../development/python-modules/pysnmp { }; - - pysocks = callPackage ../development/python-modules/pysocks { }; - - python_fedora = callPackage ../development/python-modules/python_fedora {}; - - python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {}; - python_simple_hipchat = self.python-simple-hipchat; - - scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; - - python_keyczar = callPackage ../development/python-modules/python_keyczar { }; - - python-language-server = callPackage ../development/python-modules/python-language-server {}; - - python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server {}; - - pyls-black = callPackage ../development/python-modules/pyls-black {}; - - pyls-isort = callPackage ../development/python-modules/pyls-isort {}; - - pyls-mypy = callPackage ../development/python-modules/pyls-mypy {}; - - pyu2f = callPackage ../development/python-modules/pyu2f { }; - - pyudev = callPackage ../development/python-modules/pyudev { - inherit (pkgs) systemd; - }; - - pynmea2 = callPackage ../development/python-modules/pynmea2 {}; - - pynrrd = callPackage ../development/python-modules/pynrrd { }; - - pynvml = callPackage ../development/python-modules/pynvml { }; - - pynzb = callPackage ../development/python-modules/pynzb { }; - - process-tests = callPackage ../development/python-modules/process-tests { }; - - progressbar = callPackage ../development/python-modules/progressbar {}; - - progressbar2 = callPackage ../development/python-modules/progressbar2 { }; - - progressbar231 = callPackage ../development/python-modules/progressbar231 { }; - - progressbar33 = callPackage ../development/python-modules/progressbar33 { }; - - protego = callPackage ../development/python-modules/protego {}; - - ldap = callPackage ../development/python-modules/ldap { - inherit (pkgs) openldap cyrus_sasl; - }; - - ldap3 = callPackage ../development/python-modules/ldap3 {}; - - ptest = callPackage ../development/python-modules/ptest { }; - - ptyprocess = callPackage ../development/python-modules/ptyprocess { }; - - pylibacl = callPackage ../development/python-modules/pylibacl { }; - - pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 - - pyliblo = callPackage ../development/python-modules/pyliblo { }; - - pypcap = callPackage ../development/python-modules/pypcap {}; - - pyplatec = callPackage ../development/python-modules/pyplatec { }; - - purepng = callPackage ../development/python-modules/purepng { }; - - pyhocon = callPackage ../development/python-modules/pyhocon { }; - - pyjson5 = callPackage ../development/python-modules/pyjson5 {}; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pymaging = callPackage ../development/python-modules/pymaging { }; pymaging_png = callPackage ../development/python-modules/pymaging_png { }; - pyPdf = callPackage ../development/python-modules/pypdf { }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; - pypdf2 = callPackage ../development/python-modules/pypdf2 { }; + pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; + + pymavlink = callPackage ../development/python-modules/pymavlink { }; + + pymbolic = callPackage ../development/python-modules/pymbolic { }; + + pymc3 = callPackage ../development/python-modules/pymc3 { }; + + pymediainfo = callPackage ../development/python-modules/pymediainfo { }; + + pymeeus = callPackage ../development/python-modules/pymeeus { }; + + pymemoize = callPackage ../development/python-modules/pymemoize { }; + + pyment = callPackage ../development/python-modules/pyment { }; + + pymetar = callPackage ../development/python-modules/pymetar { }; + + pymetno = callPackage ../development/python-modules/pymetno { }; + + pymongo = callPackage ../development/python-modules/pymongo { }; + + pympler = callPackage ../development/python-modules/pympler { }; + + pymsgbox = callPackage ../development/python-modules/pymsgbox { }; + + pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + + py-multibase = callPackage ../development/python-modules/py-multibase { }; + + py-multihash = callPackage ../development/python-modules/py-multihash { }; + + pymumble = callPackage ../development/python-modules/pymumble { }; + + pymupdf = callPackage ../development/python-modules/pymupdf { }; + + PyMVGLive = callPackage ../development/python-modules/pymvglive { }; + + pymysql = callPackage ../development/python-modules/pymysql { }; + + pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; + + pymystem3 = callPackage ../development/python-modules/pymystem3 { }; + + pynac = callPackage ../development/python-modules/pynac { }; + + pynacl = callPackage ../development/python-modules/pynacl { }; + + pynamecheap = callPackage ../development/python-modules/pynamecheap { }; + + pynamodb = callPackage ../development/python-modules/pynamodb { }; + + pynanoleaf = callPackage ../development/python-modules/pynanoleaf { }; + + pync = callPackage ../development/python-modules/pync { }; + + pynisher = callPackage ../development/python-modules/pynisher { }; + + pynmea2 = callPackage ../development/python-modules/pynmea2 { }; + + pynput = callPackage ../development/python-modules/pynput { }; + + pynrrd = callPackage ../development/python-modules/pynrrd { }; + + pynvim = callPackage ../development/python-modules/pynvim { }; + + pynvml = callPackage ../development/python-modules/pynvml { }; + + pynzb = callPackage ../development/python-modules/pynzb { }; + + pyobjc = if stdenv.isDarwin then + callPackage ../development/python-modules/pyobjc { } + else + throw "pyobjc can only be built on Mac OS"; + + pyocr = callPackage ../development/python-modules/pyocr { }; + + pyodbc = callPackage ../development/python-modules/pyodbc { }; + + pyogg = callPackage ../development/python-modules/pyogg { }; + + pyomo = callPackage ../development/python-modules/pyomo { }; + + pyopencl = callPackage ../development/python-modules/pyopencl { }; pyopengl = callPackage ../development/python-modules/pyopengl { }; pyopenssl = callPackage ../development/python-modules/pyopenssl { }; - pyquery = callPackage ../development/python-modules/pyquery { }; + pyosmium = callPackage ../development/python-modules/pyosmium { }; - pyreport = callPackage ../development/python-modules/pyreport { }; + pyotp = callPackage ../development/python-modules/pyotp { }; - pyreadability = callPackage ../development/python-modules/pyreadability { }; + pyowm = callPackage ../development/python-modules/pyowm { }; - pyscss = callPackage ../development/python-modules/pyscss { }; + pypamtest = pkgs.libpam-wrapper.override { + enablePython = true; + inherit python; + }; - pyserial = callPackage ../development/python-modules/pyserial {}; + pypandoc = callPackage ../development/python-modules/pypandoc { }; - pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { }; + pyparser = callPackage ../development/python-modules/pyparser { }; - pysonos = callPackage ../development/python-modules/pysonos {}; + pyparsing = callPackage ../development/python-modules/pyparsing { }; - pymongo = callPackage ../development/python-modules/pymongo {}; + pyparted = callPackage ../development/python-modules/pyparted { }; + + pypcap = callPackage ../development/python-modules/pypcap { }; + + pypdf2 = callPackage ../development/python-modules/pypdf2 { }; + + pyPdf = callPackage ../development/python-modules/pypdf { }; + + pypeg2 = callPackage ../development/python-modules/pypeg2 { }; pyperclip = callPackage ../development/python-modules/pyperclip { }; + pyperf = callPackage ../development/python-modules/pyperf { }; + + pyphen = callPackage ../development/python-modules/pyphen { }; + + pyphotonfile = callPackage ../development/python-modules/pyphotonfile { }; + + pypillowfight = callPackage ../development/python-modules/pypillowfight { }; + + pyplatec = callPackage ../development/python-modules/pyplatec { }; + + pypoppler = callPackage ../development/python-modules/pypoppler { }; + + pyprind = callPackage ../development/python-modules/pyprind { }; + + pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; + + pyproj = callPackage ../development/python-modules/pyproj { }; + + pyptlib = callPackage ../development/python-modules/pyptlib { }; + + pypubsub = callPackage ../development/python-modules/pypubsub { }; + + pyqrcode = callPackage ../development/python-modules/pyqrcode { }; + + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; + + pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + + pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; + + pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; + + pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + + pyquery = callPackage ../development/python-modules/pyquery { }; + + pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; + + pyrad = callPackage ../development/python-modules/pyrad { }; + + py-radix = callPackage ../development/python-modules/py-radix { }; + + pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; + + pyramid = callPackage ../development/python-modules/pyramid { }; + + pyramid_chameleon = callPackage ../development/python-modules/pyramid_chameleon { }; + + pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; + + pyramid_hawkauth = callPackage ../development/python-modules/pyramid_hawkauth { }; + + pyramid_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { }; + + pyramid_mako = callPackage ../development/python-modules/pyramid_mako { }; + + pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; + + pyreadability = callPackage ../development/python-modules/pyreadability { }; + + pyrealsense2 = toPythonModule (pkgs.librealsense.override { + enablePython = true; + pythonPackages = self; + }); + + pyrealsense2WithCuda = toPythonModule (pkgs.librealsenseWithCuda.override { + enablePython = true; + pythonPackages = self; + }); + + pyrealsense2WithoutCuda = toPythonModule (pkgs.librealsenseWithoutCuda.override { + enablePython = true; + pythonPackages = self; + }); + + pyregion = callPackage ../development/python-modules/pyregion { }; + + pyreport = callPackage ../development/python-modules/pyreport { }; + + pyres = callPackage ../development/python-modules/pyres { }; + + pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; + + PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; + + Pyro4 = callPackage ../development/python-modules/pyro4 { }; + + Pyro5 = callPackage ../development/python-modules/pyro5 { }; + + pyroma = callPackage ../development/python-modules/pyroma { }; + + pyro-ppl = callPackage ../development/python-modules/pyro-ppl { }; + + pyroute2 = callPackage ../development/python-modules/pyroute2 { }; + + pyrr = callPackage ../development/python-modules/pyrr { }; + + pyrsistent = callPackage ../development/python-modules/pyrsistent { }; + + PyRSS2Gen = callPackage ../development/python-modules/pyrss2gen { }; + + pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { }; + + pysam = callPackage ../development/python-modules/pysam { }; + + pysaml2 = callPackage ../development/python-modules/pysaml2 { inherit (pkgs) xmlsec; }; + + pysc2 = callPackage ../development/python-modules/pysc2 { }; + + pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; + + pyschedule = callPackage ../development/python-modules/pyschedule { }; + + pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; + + py_scrypt = callPackage ../development/python-modules/py_scrypt { }; + + pyscrypt = callPackage ../development/python-modules/pyscrypt { }; + + pyscss = callPackage ../development/python-modules/pyscss { }; + + pysdl2 = callPackage ../development/python-modules/pysdl2 { }; + + pysendfile = callPackage ../development/python-modules/pysendfile { }; + + pysensors = callPackage ../development/python-modules/pysensors { }; + + pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { }; + + pyserial = callPackage ../development/python-modules/pyserial { }; + + pysftp = callPackage ../development/python-modules/pysftp { }; + + pysha3 = callPackage ../development/python-modules/pysha3 { }; + + pyshp = callPackage ../development/python-modules/pyshp { }; + + pyside2-tools = + toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); + + pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake qt5 ninja; }); + + pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; + + pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { inherit (pkgs) libxml2 libxslt; }; + + pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + + pysigset = callPackage ../development/python-modules/pysigset { }; + + pysingleton = callPackage ../development/python-modules/pysingleton { }; + + pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; }; + + pysmb = callPackage ../development/python-modules/pysmb { }; + + pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkgconfig; }; + + pysmf = callPackage ../development/python-modules/pysmf { }; + + pysmi = callPackage ../development/python-modules/pysmi { }; + + pysnmp = callPackage ../development/python-modules/pysnmp { }; + + pysnooper = callPackage ../development/python-modules/pysnooper { }; + + pysnow = callPackage ../development/python-modules/pysnow { }; + + pysocks = callPackage ../development/python-modules/pysocks { }; + + pysolr = callPackage ../development/python-modules/pysolr { }; + + pysonos = callPackage ../development/python-modules/pysonos { }; + + pysoundfile = self.soundfile; # Alias added 23-06-2019 + + pyspark = callPackage ../development/python-modules/pyspark { }; + + pysparse = callPackage ../development/python-modules/pysparse { }; + + pyspf = callPackage ../development/python-modules/pyspf { }; + + pyspinel = callPackage ../development/python-modules/pyspinel { }; + + pyspotify = callPackage ../development/python-modules/pyspotify { }; + + pyspread = callPackage ../development/python-modules/pyspread { }; + + pysptk = callPackage ../development/python-modules/pysptk { }; + pysqlite = callPackage ../development/python-modules/pysqlite { }; + pysrim = callPackage ../development/python-modules/pysrim { }; + + pysrt = callPackage ../development/python-modules/pysrt { }; + + pyssim = callPackage ../development/python-modules/pyssim { }; + + pystache = callPackage ../development/python-modules/pystache { }; + + pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; }; + + PyStemmer = callPackage ../development/python-modules/pystemmer { }; + + pystray = callPackage ../development/python-modules/pystray { }; + + py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; + + pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; + pysvn = callPackage ../development/python-modules/pysvn { }; + pytado = callPackage ../development/python-modules/pytado { }; + + pytaglib = callPackage ../development/python-modules/pytaglib { }; + + pyte = callPackage ../development/python-modules/pyte { }; + + pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; + + pytesseract = callPackage ../development/python-modules/pytesseract { }; + + # pytest>=6 is too new for most packages + pytest = if isPy3k then self.pytest_5 else self.pytest_4; + + pytest_4 = callPackage + ../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; + + pytest_5 = callPackage + ../development/python-modules/pytest/5.nix { # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; + + pytest_6 = + callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; + + pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; + + pytest-annotate = callPackage ../development/python-modules/pytest-annotate { }; + + pytest-ansible = callPackage ../development/python-modules/pytest-ansible { }; + + pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { }; + + pytest-astropy = callPackage ../development/python-modules/pytest-astropy { }; + + pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { }; + + pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; + + pytest-bdd = callPackage ../development/python-modules/pytest-bdd { }; + + pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; + + pytest-black = callPackage ../development/python-modules/pytest-black { }; + + pytestcache = callPackage ../development/python-modules/pytestcache { }; + + pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; + + pytest-check = callPackage ../development/python-modules/pytest-check { }; + + pytest-click = callPackage ../development/python-modules/pytest-click { }; + + pytestcov = callPackage ../development/python-modules/pytest-cov { }; + + pytest-cram = callPackage ../development/python-modules/pytest-cram { }; + + pytest-datadir = callPackage ../development/python-modules/pytest-datadir { }; + + pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { }; + + pytest-dependency = callPackage ../development/python-modules/pytest-dependency { }; + + pytest-django = callPackage ../development/python-modules/pytest-django { }; + + pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; + + pytest-env = callPackage ../development/python-modules/pytest-env { }; + + pytest-expect = callPackage ../development/python-modules/pytest-expect { }; + + pytest-factoryboy = callPackage ../development/python-modules/pytest-factoryboy { }; + + pytest-filter-subpackage = callPackage ../development/python-modules/pytest-filter-subpackage { }; + + pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; + + pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; + + pytest-flakes = callPackage ../development/python-modules/pytest-flakes { }; + + pytest-flask = callPackage ../development/python-modules/pytest-flask { }; + + pytest-forked = callPackage ../development/python-modules/pytest-forked { }; + + pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { }; + + pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; + + pytest-html = callPackage ../development/python-modules/pytest-html { }; + + pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; + + pytest-isort = callPackage ../development/python-modules/pytest-isort { }; + + pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; + + pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; + + pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; + + pytest-mock = if isPy3k then + callPackage ../development/python-modules/pytest-mock { } + else + callPackage ../development/python-modules/pytest-mock/2.nix { }; + + pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; + + pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; + + pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; + + pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; + + pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; + + pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; + + pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; + + pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; + + pytest-qt = callPackage ../development/python-modules/pytest-qt { }; + + pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; + + pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; + + pytest-randomly = callPackage ../development/python-modules/pytest-randomly { }; + + pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; + + pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; + + pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; + + pytest-repeat = callPackage ../development/python-modules/pytest-repeat { }; + + pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; + + pytestrunner = callPackage ../development/python-modules/pytestrunner { }; + + pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; + + pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; + + pytest-services = callPackage ../development/python-modules/pytest-services { }; + + pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; + + pytest-socket = callPackage ../development/python-modules/pytest-socket { }; + + pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; + + pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; + + pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; + + pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; + + pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; + + pytest-tornasync = callPackage ../development/python-modules/pytest-tornasync { }; + + pytest-trio = callPackage ../development/python-modules/pytest-trio { }; + + pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; + + pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; + + pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; + + pytest-watch = callPackage ../development/python-modules/pytest-watch { }; + + pytest_xdist_1 = callPackage ../development/python-modules/pytest-xdist { }; + + pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { }; + + pytest_xdist = self.pytest_xdist_1; + + pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; + + pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; + + python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; + + python3-openid = callPackage ../development/python-modules/python3-openid { }; + + python-axolotl = callPackage ../development/python-modules/python-axolotl { }; + + python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; + + python-baseconv = callPackage ../development/python-modules/python-baseconv { }; + + python-binance = callPackage ../development/python-modules/python-binance { }; + + python-constraint = callPackage ../development/python-modules/python-constraint { }; + + python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; + + python-daemon = callPackage ../development/python-modules/python-daemon { }; + + python-dateutil = callPackage ../development/python-modules/dateutil { }; + # Alias that we should deprecate + dateutil = self.python-dateutil; + + python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; + + pythondialog = callPackage ../development/python-modules/pythondialog { }; + + python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; + + python-docx = callPackage ../development/python-modules/python-docx { }; + + python-doi = callPackage ../development/python-modules/python-doi { }; + + python-dotenv = callPackage ../development/python-modules/python-dotenv { }; + + python-editor = callPackage ../development/python-modules/python-editor { }; + + pythonefl = callPackage ../development/python-modules/python-efl { inherit (pkgs) pkgconfig; }; + + python-engineio = callPackage ../development/python-modules/python-engineio { }; + + python-etcd = callPackage ../development/python-modules/python-etcd { }; + + python_fedora = callPackage ../development/python-modules/python_fedora { }; + + python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; + + python-forecastio = callPackage ../development/python-modules/python-forecastio { }; + + python-gitlab = callPackage ../development/python-modules/python-gitlab { }; + + python-gnupg = callPackage ../development/python-modules/python-gnupg { }; + + python-hosts = callPackage ../development/python-modules/python-hosts { }; + + python-igraph = callPackage ../development/python-modules/python-igraph { + pkgconfig = pkgs.pkgconfig; + igraph = pkgs.igraph; + }; + + pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; + + pythonix = callPackage ../development/python-modules/pythonix { inherit (pkgs) meson pkgconfig; }; + + python-jenkins = callPackage ../development/python-modules/python-jenkins { }; + + python-jose = callPackage ../development/python-modules/python-jose { }; + + python-json-logger = callPackage ../development/python-modules/python-json-logger { }; + + python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server { }; + + python_keyczar = callPackage ../development/python-modules/python_keyczar { }; + + python-language-server = callPackage ../development/python-modules/python-language-server { }; + + python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; + + python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; + + python-libarchive = callPackage ../development/python-modules/python-libarchive { }; + + python-logstash = callPackage ../development/python-modules/python-logstash { }; + + python-ly = callPackage ../development/python-modules/python-ly { }; + + python-lz4 = callPackage ../development/python-modules/python-lz4 { }; + + python-lzf = callPackage ../development/python-modules/python-lzf { }; + + python-lzo = callPackage ../development/python-modules/python-lzo { inherit (pkgs) lzo; }; + + python_magic = callPackage ../development/python-modules/python-magic { }; + + pythonmagick = callPackage ../development/python-modules/pythonmagick { }; + + python-mapnik = callPackage ../development/python-modules/python-mapnik { }; + python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; python-miio = callPackage ../development/python-modules/python-miio { }; + python_mimeparse = callPackage ../development/python-modules/python_mimeparse { }; + + python-mnist = callPackage ../development/python-modules/python-mnist { }; + + python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; + + python-multipart = callPackage ../development/python-modules/python-multipart { }; + + pythonnet = callPackage + ../development/python-modules/pythonnet { # `mono >= 4.6` required to prevent crashes encountered with earlier versions. + mono = pkgs.mono4; + inherit (pkgs) pkgconfig; + }; + + python-nomad = callPackage ../development/python-modules/python-nomad { }; + + python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; + + pythonocc-core = + toPythonModule (callPackage ../development/python-modules/pythonocc-core { inherit (pkgs.xorg) libX11; }); + + python-olm = callPackage ../development/python-modules/python-olm { }; + + python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkgconfig; }; + + python-otr = callPackage ../development/python-modules/python-otr { }; + + python-packer = callPackage ../development/python-modules/python-packer { }; + + python-pam = callPackage ../development/python-modules/python-pam { }; + + python-periphery = callPackage ../development/python-modules/python-periphery { }; + python-pipedrive = callPackage ../development/python-modules/python-pipedrive { }; + python-prctl = callPackage ../development/python-modules/python-prctl { }; + python-ptrace = callPackage ../development/python-modules/python-ptrace { }; + python-pushover = callPackage ../development/python-modules/pushover { }; + + python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; + + python-redis-lock = callPackage ../development/python-modules/python-redis-lock { }; + + python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; + + python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat { }; + python_simple_hipchat = self.python-simple-hipchat; + + python-slugify = callPackage ../development/python-modules/python-slugify { }; + + python-snappy = callPackage ../development/python-modules/python-snappy { inherit (pkgs) snappy; }; + + python-socketio = callPackage ../development/python-modules/python-socketio { }; + + python-sql = callPackage ../development/python-modules/python-sql { }; + + python_statsd = callPackage ../development/python-modules/python_statsd { }; + + python-stdnum = callPackage ../development/python-modules/python-stdnum { }; + + python-sybase = callPackage ../development/python-modules/sybase { }; + + python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; + + python-toolbox = callPackage ../development/python-modules/python-toolbox { }; + + python-twitter = callPackage ../development/python-modules/python-twitter { }; + + python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; + + python-uinput = callPackage ../development/python-modules/python-uinput { }; + + python-unshare = callPackage ../development/python-modules/python-unshare { }; + + python-utils = callPackage ../development/python-modules/python-utils { }; + + python-vagrant = callPackage ../development/python-modules/python-vagrant { }; + + python-vipaccess = callPackage ../development/python-modules/python-vipaccess { }; + + python-vlc = callPackage ../development/python-modules/python-vlc { }; + python-wifi = callPackage ../development/python-modules/python-wifi { }; - python-etcd = callPackage ../development/python-modules/python-etcd { }; + python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; - pythonnet = callPackage ../development/python-modules/pythonnet { - # `mono >= 4.6` required to prevent crashes encountered with earlier versions. - mono = pkgs.mono4; - inherit (pkgs) pkgconfig; + pytimeparse = callPackage ../development/python-modules/pytimeparse { }; + + pytmx = callPackage ../development/python-modules/pytmx { }; + + pytoml = callPackage ../development/python-modules/pytoml { }; + + pytools = callPackage ../development/python-modules/pytools { }; + + pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; }; + + pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { + inherit (pkgs.linuxPackages) nvidia_x11; }; + pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; + + pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; + + pytorchWithCuda = self.pytorch.override { cudaSupport = true; }; + + pytorchWithoutCuda = self.pytorch.override { cudaSupport = false; }; + + pytrends = callPackage ../development/python-modules/pytrends { }; + + pytricia = callPackage ../development/python-modules/pytricia { }; + + pytun = callPackage ../development/python-modules/pytun { }; + pytz = callPackage ../development/python-modules/pytz { }; pytzdata = callPackage ../development/python-modules/pytzdata { }; + pyu2f = callPackage ../development/python-modules/pyu2f { }; + + pyuavcan = callPackage + ../development/python-modules/pyuavcan { # this version pinpoint to anold version is necessary due to a regression + nunavut = self.nunavut.overridePythonAttrs (old: rec { + version = "0.2.3"; + src = old.src.override { + inherit version; + sha256 = "0x8a9h4mc2r2yz49s9arsbs4bn3h25mvmg4zbgksm9hcyi9536x5"; + }; + }); + }; + + pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) systemd; }; + + pyunbound = callPackage ../tools/networking/unbound/python.nix { }; + + pyunifi = callPackage ../development/python-modules/pyunifi { }; + + pyupdate = callPackage ../development/python-modules/pyupdate { }; + + pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; }; + pyutil = callPackage ../development/python-modules/pyutil { }; pyutilib = callPackage ../development/python-modules/pyutilib { }; + pyuv = callPackage ../development/python-modules/pyuv { }; + + py-vapid = callPackage ../development/python-modules/py-vapid { }; + + pyvcd = callPackage ../development/python-modules/pyvcd { }; + + pyvcf = callPackage ../development/python-modules/pyvcf { }; + + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + + pyvmomi = callPackage ../development/python-modules/pyvmomi { }; + + pyvoro = callPackage ../development/python-modules/pyvoro { }; + pywal = callPackage ../development/python-modules/pywal { }; + pywatchman = callPackage ../development/python-modules/pywatchman { }; + + pywavelets = callPackage ../development/python-modules/pywavelets { }; + + PyWebDAV = callPackage ../development/python-modules/pywebdav { }; + + pywebpush = callPackage ../development/python-modules/pywebpush { }; + + pywebview = callPackage ../development/python-modules/pywebview { }; + + pywick = callPackage ../development/python-modules/pywick { }; + pywinrm = callPackage ../development/python-modules/pywinrm { }; pyxattr = let pyxattr' = callPackage ../development/python-modules/pyxattr { }; - pyxattr_2 = pyxattr'.overridePythonAttrs(oldAttrs: rec { + pyxattr_2 = pyxattr'.overridePythonAttrs (oldAttrs: rec { version = "0.6.1"; src = oldAttrs.src.override { inherit version; @@ -5895,48 +5822,21 @@ in { }); in if isPy3k then pyxattr' else pyxattr_2; - pyamg = callPackage ../development/python-modules/pyamg { }; + pyx = callPackage ../development/python-modules/pyx { }; - pyaml = callPackage ../development/python-modules/pyaml { }; + pyxdg = callPackage ../development/python-modules/pyxdg { }; + + pyxl3 = callPackage ../development/python-modules/pyxl3 { }; + + pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); pyyaml = callPackage ../development/python-modules/pyyaml { }; - rabbitpy = callPackage ../development/python-modules/rabbitpy { }; + pyzmq = callPackage ../development/python-modules/pyzmq { }; - rasterio = callPackage ../development/python-modules/rasterio { - gdal = pkgs.gdal_2; # gdal 3.0 not supported yet - }; + pyzufall = callPackage ../development/python-modules/pyzufall { }; - radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {}; - - recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; - - rbtools = callPackage ../development/python-modules/rbtools { }; - - rencode = callPackage ../development/python-modules/rencode { }; - - reportlab = callPackage ../development/python-modules/reportlab { }; - - requests = callPackage ../development/python-modules/requests { }; - - requests_download = callPackage ../development/python-modules/requests_download { }; - - requestsexceptions = callPackage ../development/python-modules/requestsexceptions {}; - - requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; - - requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { }; - - requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; - requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 - - retry_decorator = callPackage ../development/python-modules/retry_decorator { }; - - roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package - }; - - rfc6555 = callPackage ../development/python-modules/rfc6555 { }; + qasm2image = callPackage ../development/python-modules/qasm2image { }; qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; @@ -5944,19 +5844,27 @@ in { qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; - quamash = callPackage ../development/python-modules/quamash { }; + qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; - quandl = callPackage ../development/python-modules/quandl { }; - # alias for an older package which did not support Python 3 - Quandl = callPackage ../development/python-modules/quandl { }; + qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; - querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + qiskit = callPackage ../development/python-modules/qiskit { }; + + qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; + + qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { }; + + qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; + + qpid-python = callPackage ../development/python-modules/qpid-python { }; + + qrcode = callPackage ../development/python-modules/qrcode { }; + + qreactor = callPackage ../development/python-modules/qreactor { }; qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; - qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { - pythonPackages = self; - }; + qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; qscintilla = self.qscintilla-qt4; @@ -5968,81 +5876,181 @@ in { qtpy = callPackage ../development/python-modules/qtpy { }; - qreactor = callPackage ../development/python-modules/qreactor { }; + quamash = callPackage ../development/python-modules/quamash { }; + + quandl = callPackage ../development/python-modules/quandl { }; + + Quandl = + callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3 quantities = callPackage ../development/python-modules/quantities { }; + querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + + queuelib = callPackage ../development/python-modules/queuelib { }; + qutip = callPackage ../development/python-modules/qutip { }; + r2pipe = callPackage ../development/python-modules/r2pipe { }; + + rabbitpy = callPackage ../development/python-modules/rabbitpy { }; + + radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { }; + + radio_beam = callPackage ../development/python-modules/radio_beam { }; + + radish-bdd = callPackage ../development/python-modules/radish-bdd { }; + + rainbowstream = callPackage ../development/python-modules/rainbowstream { }; + + ramlfications = callPackage ../development/python-modules/ramlfications { }; + + random2 = callPackage ../development/python-modules/random2 { }; + + rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; + + rasterio = callPackage ../development/python-modules/rasterio { gdal = pkgs.gdal_2; }; # gdal 3.0 not supported yet + + ratelimiter = callPackage ../development/python-modules/ratelimiter { }; + + raven = callPackage ../development/python-modules/raven { }; + + rawkit = callPackage ../development/python-modules/rawkit { }; + + rbtools = callPackage ../development/python-modules/rbtools { }; + rcssmin = callPackage ../development/python-modules/rcssmin { }; + rdflib = callPackage ../development/python-modules/rdflib { }; + + rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; + + readchar = callPackage ../development/python-modules/readchar { }; + + readme = callPackage ../development/python-modules/readme { }; + + readme_renderer = callPackage ../development/python-modules/readme_renderer { }; + + readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; + + rebulk = callPackage ../development/python-modules/rebulk { }; + + recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; + recommonmark = callPackage ../development/python-modules/recommonmark { }; redis = callPackage ../development/python-modules/redis { }; rednose = callPackage ../development/python-modules/rednose { }; + regex = callPackage ../development/python-modules/regex { }; + + regional = callPackage ../development/python-modules/regional { }; + reikna = callPackage ../development/python-modules/reikna { }; + relatorio = callPackage ../development/python-modules/relatorio { }; + + remotecv = callPackage ../development/python-modules/remotecv { }; + + rencode = callPackage ../development/python-modules/rencode { }; + + repeated_test = callPackage ../development/python-modules/repeated_test { }; + repocheck = callPackage ../development/python-modules/repocheck { }; - restrictedpython = callPackage ../development/python-modules/restrictedpython { }; + reportlab = callPackage ../development/python-modules/reportlab { }; - restview = callPackage ../development/python-modules/restview { }; + repoze_lru = callPackage ../development/python-modules/repoze_lru { }; - readme = callPackage ../development/python-modules/readme { }; + repoze_sphinx_autointerface = callPackage ../development/python-modules/repoze_sphinx_autointerface { }; - readme_renderer = callPackage ../development/python-modules/readme_renderer { }; + repoze_who = callPackage ../development/python-modules/repoze_who { }; - readchar = callPackage ../development/python-modules/readchar { }; + reproject = callPackage ../development/python-modules/reproject { }; - retworkx = disabledIf (pythonOlder "3.5") - (toPythonModule (callPackage ../development/python-modules/retworkx { } )); + requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; - rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { - python3 = python; - })); + requests-cache = callPackage ../development/python-modules/requests-cache { }; - ripser = callPackage ../development/python-modules/ripser { }; + requests = callPackage ../development/python-modules/requests { }; - rjsmin = callPackage ../development/python-modules/rjsmin { }; + requests_download = callPackage ../development/python-modules/requests_download { }; - pysolr = callPackage ../development/python-modules/pysolr { }; + requestsexceptions = callPackage ../development/python-modules/requestsexceptions { }; - geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { }; - - geographiclib = callPackage ../development/python-modules/geographiclib { }; - - geopy = if isPy3k - then callPackage ../development/python-modules/geopy { } - else callPackage ../development/python-modules/geopy/2.nix { }; - - django-haystack = callPackage ../development/python-modules/django-haystack { }; - - django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; - - rdflib = callPackage ../development/python-modules/rdflib { }; - - rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; - - isodate = callPackage ../development/python-modules/isodate { }; - - owslib = callPackage ../development/python-modules/owslib { }; - - readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; + requests-file = callPackage ../development/python-modules/requests-file { }; requests-http-signature = callPackage ../development/python-modules/requests-http-signature { }; + requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; + + requests-mock = callPackage ../development/python-modules/requests-mock { }; + + requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; + + requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { }; + + requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; + + requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 + + requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { }; + requirements-detector = callPackage ../development/python-modules/requirements-detector { }; resampy = callPackage ../development/python-modules/resampy { }; + responses = callPackage ../development/python-modules/responses { }; + + restrictedpython = callPackage ../development/python-modules/restrictedpython { }; + restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; + restview = callPackage ../development/python-modules/restview { }; + + rethinkdb = callPackage ../development/python-modules/rethinkdb { }; + retry = callPackage ../development/python-modules/retry { }; + retry_decorator = callPackage ../development/python-modules/retry_decorator { }; + + retrying = callPackage ../development/python-modules/retrying { }; + + retworkx = disabledIf (pythonOlder "3.5") (toPythonModule (callPackage ../development/python-modules/retworkx { })); + + rfc3986 = callPackage ../development/python-modules/rfc3986 { }; + + rfc3987 = callPackage ../development/python-modules/rfc3987 { }; + + rfc6555 = callPackage ../development/python-modules/rfc6555 { }; + + rfc7464 = callPackage ../development/python-modules/rfc7464 { }; + + rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl { }); + + rig = callPackage ../development/python-modules/rig { }; + + ripser = callPackage ../development/python-modules/ripser { }; + + rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { python3 = python; })); + + rjsmin = callPackage ../development/python-modules/rjsmin { }; + + rl-coach = callPackage ../development/python-modules/rl-coach { }; + + rlp = callPackage ../development/python-modules/rlp { }; + + rnc2rng = callPackage ../development/python-modules/rnc2rng { }; + robomachine = callPackage ../development/python-modules/robomachine { }; + roboschool = callPackage ../development/python-modules/roboschool { + inherit (pkgs) pkgconfig; + }; # use normal pkgconfig, not the python package + + robot-detection = callPackage ../development/python-modules/robot-detection { }; + robotframework = callPackage ../development/python-modules/robotframework { }; robotframework-databaselibrary = callPackage ../development/python-modules/robotframework-databaselibrary { }; @@ -6051,10 +6059,10 @@ in { robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; - robotframework-seleniumlibrary = callPackage ../development/python-modules/robotframework-seleniumlibrary { }; - robotframework-selenium2library = callPackage ../development/python-modules/robotframework-selenium2library { }; + robotframework-seleniumlibrary = callPackage ../development/python-modules/robotframework-seleniumlibrary { }; + robotframework-sshlibrary = callPackage ../development/python-modules/robotframework-sshlibrary { }; robotframework-tools = callPackage ../development/python-modules/robotframework-tools { }; @@ -6063,512 +6071,51 @@ in { robotsuite = callPackage ../development/python-modules/robotsuite { }; - serpent = callPackage ../development/python-modules/serpent { }; + rocket-errbot = callPackage ../development/python-modules/rocket-errbot { }; - selectors34 = callPackage ../development/python-modules/selectors34 { }; + roku = callPackage ../development/python-modules/roku { }; - Pyro4 = callPackage ../development/python-modules/pyro4 { }; - - Pyro5 = callPackage ../development/python-modules/pyro5 { }; - - rnc2rng = callPackage ../development/python-modules/rnc2rng { }; + roman = callPackage ../development/python-modules/roman { }; rope = callPackage ../development/python-modules/rope { }; + ROPGadget = callPackage ../development/python-modules/ROPGadget { }; + ropper = callPackage ../development/python-modules/ropper { }; - rpkg = callPackage ../development/python-modules/rpkg {}; - - rply = callPackage ../development/python-modules/rply {}; - - rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override{ inherit python; })); - - rpmfluff = callPackage ../development/python-modules/rpmfluff {}; - - rpy2 = if isPy3k - then callPackage ../development/python-modules/rpy2 { } - else callPackage ../development/python-modules/rpy2/2.nix { }; - - rtslib = callPackage ../development/python-modules/rtslib {}; - - Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; - - typing = callPackage ../development/python-modules/typing { }; - - typing-extensions = callPackage ../development/python-modules/typing-extensions { }; - - typing-inspect = callPackage ../development/python-modules/typing-inspect { }; - - typeguard = callPackage ../development/python-modules/typeguard { }; - - typesentry = callPackage ../development/python-modules/typesentry { }; - - typesystem = callPackage ../development/python-modules/typesystem { }; - - s3transfer = callPackage ../development/python-modules/s3transfer { }; - - seqdiag = callPackage ../development/python-modules/seqdiag { }; - - sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { - pythonPackages = self; - pythonSupport = true; - })); - - safe = callPackage ../development/python-modules/safe { }; - - safety = callPackage ../development/python-modules/safety { }; - - sampledata = callPackage ../development/python-modules/sampledata { }; - - sasmodels = callPackage ../development/python-modules/sasmodels { }; - - scapy = callPackage ../development/python-modules/scapy { }; - - scipy = let - scipy_ = callPackage ../development/python-modules/scipy { }; - scipy_1_2 = scipy_.overridePythonAttrs(oldAttrs: rec { - version = "1.2.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; - }; - }); - in if pythonOlder "3.5" then scipy_1_2 else scipy_; - - scipy_1_3 = self.scipy.overridePythonAttrs(oldAttrs: rec { - version = "1.3.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "02iqb7ws7fw5fd1a83hx705pzrw1imj7z0bphjsl4bfvw254xgv4"; - }; - doCheck = false; - disabled = !isPy3k; - }); - - scikitimage = callPackage ../development/python-modules/scikit-image { }; - - scikitlearn = let - args = { inherit (pkgs) gfortran glibcLocales; }; - in - if isPy3k then callPackage ../development/python-modules/scikitlearn args - else callPackage ../development/python-modules/scikitlearn/0.20.nix args; - - scikit-bio = callPackage ../development/python-modules/scikit-bio { }; - - scikit-build = callPackage ../development/python-modules/scikit-build { }; - - scikits-odes = callPackage ../development/python-modules/scikits-odes { }; - - scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; - - scikit-tda = callPackage ../development/python-modules/scikit-tda { }; - - scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; - - scp = callPackage ../development/python-modules/scp {}; - - seaborn = if isPy3k then - callPackage ../development/python-modules/seaborn { } - else - callPackage ../development/python-modules/seaborn/0.9.1.nix { }; - - seabreeze = callPackage ../development/python-modules/seabreeze { }; - - selenium = callPackage ../development/python-modules/selenium { }; - - serpy = callPackage ../development/python-modules/serpy { }; - - setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; - - setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; - - serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; - - shippai = callPackage ../development/python-modules/shippai {}; - - shutilwhich = callPackage ../development/python-modules/shutilwhich { }; - - simanneal = callPackage ../development/python-modules/simanneal { }; - - simplegeneric = callPackage ../development/python-modules/simplegeneric { }; - - shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; - - shodan = callPackage ../development/python-modules/shodan { }; - - should-dsl = callPackage ../development/python-modules/should-dsl { }; - - showit = callPackage ../development/python-modules/showit { }; - - simplejson = callPackage ../development/python-modules/simplejson { }; - - simplekml = callPackage ../development/python-modules/simplekml { }; - - slimit = callPackage ../development/python-modules/slimit { }; - - snowflake-connector-python = callPackage ../development/python-modules/snowflake-connector-python { }; - - snowflake-sqlalchemy = callPackage ../development/python-modules/snowflake-sqlalchemy { }; - - snowballstemmer = callPackage ../development/python-modules/snowballstemmer { }; - - snitun = callPackage ../development/python-modules/snitun { }; - - snscrape = callPackage ../development/python-modules/snscrape { }; - - snug = callPackage ../development/python-modules/snug { }; - - snuggs = callPackage ../development/python-modules/snuggs { }; - - spake2 = callPackage ../development/python-modules/spake2 { }; - - sphfile = callPackage ../development/python-modules/sphfile { }; - - supervisor = callPackage ../development/python-modules/supervisor {}; - - subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - - spark_parser = callPackage ../development/python-modules/spark_parser { }; - - sphinx = if isPy3k then - callPackage ../development/python-modules/sphinx { } - else - callPackage ../development/python-modules/sphinx/2.nix { }; - - # Only exists for a Haskell package. - sphinx_1_7_9 = (callPackage ../development/python-modules/sphinx/2.nix { }) - .overridePythonAttrs (oldAttrs: rec { - version = "1.7.9"; - src = oldAttrs.src.override { - inherit version; - sha256 = "217a7705adcb573da5bbe1e0f5cab4fa0bd89fd9342c9159121746f593c2d5a4"; - }; - }); - - sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; - - sphinxcontrib-websupport = if isPy3k then - callPackage ../development/python-modules/sphinxcontrib-websupport { } - else - callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; - - hieroglyph = callPackage ../development/python-modules/hieroglyph { }; - - hvplot = callPackage ../development/python-modules/hvplot { }; - - guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; - - sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; - - sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp {}; - - sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp {}; - - sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { }; - - sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp {}; - - sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath {}; - - sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { }; - - sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp {}; - - sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml {}; - - sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex {}; - - sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree {}; - - sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; - - splinter = callPackage ../development/python-modules/splinter { }; - - spotipy = callPackage ../development/python-modules/spotipy { }; - - sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; - - sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { }; - - sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { }; - - sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { }; - - sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; - - sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; - - sqlsoup = callPackage ../development/python-modules/sqlsoup { }; - - staticjinja = callPackage ../development/python-modules/staticjinja { }; - - statsmodels = callPackage ../development/python-modules/statsmodels { }; - - strategies = callPackage ../development/python-modules/strategies { }; - - stravalib = callPackage ../development/python-modules/stravalib { }; - - streamz = callPackage ../development/python-modules/streamz { }; - - structlog = callPackage ../development/python-modules/structlog { }; - - stytra = callPackage ../development/python-modules/stytra { }; - - sybil = callPackage ../development/python-modules/sybil { }; - - # legacy alias - syncthing-gtk = pkgs.syncthing-gtk; - - systemd = callPackage ../development/python-modules/systemd { - inherit (pkgs) pkgconfig systemd; - }; - - sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; - - tabulate = callPackage ../development/python-modules/tabulate { }; - - tadasets = callPackage ../development/python-modules/tadasets { }; - - tasklib = callPackage ../development/python-modules/tasklib { }; - - tatsu = callPackage ../development/python-modules/tatsu { }; - - tbm-utils = callPackage ../development/python-modules/tbm-utils { }; - - tempita = callPackage ../development/python-modules/tempita { }; - - terminado = callPackage ../development/python-modules/terminado { }; - - tess = callPackage ../development/python-modules/tess { }; - - testresources = callPackage ../development/python-modules/testresources { }; - - testtools = callPackage ../development/python-modules/testtools { }; - - traitlets = callPackage ../development/python-modules/traitlets { }; - - traittypes = callPackage ../development/python-modules/traittypes { }; - - transitions = callPackage ../development/python-modules/transitions { }; - - extras = callPackage ../development/python-modules/extras { }; - - extension-helpers = callPackage ../development/python-modules/extension-helpers { }; - - texttable = callPackage ../development/python-modules/texttable { }; - - textwrap3 = callPackage ../development/python-modules/textwrap3 { }; - - tiledb = callPackage ../development/python-modules/tiledb { - inherit (pkgs) tiledb; - }; - - timezonefinder = callPackage ../development/python-modules/timezonefinder { }; - - tiros = callPackage ../development/python-modules/tiros { }; - - tinydb = callPackage ../development/python-modules/tinydb { }; - - tifffile = callPackage ../development/python-modules/tifffile { }; - - tmdb3 = callPackage ../development/python-modules/tmdb3 { }; - - toolz = callPackage ../development/python-modules/toolz { }; - - tox = callPackage ../development/python-modules/tox { }; - - tqdm = callPackage ../development/python-modules/tqdm { }; - - trytond = callPackage ../development/python-modules/trytond { }; - - smmap = callPackage ../development/python-modules/smmap { }; - - smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 - - transaction = callPackage ../development/python-modules/transaction { }; - - TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; - - tweepy = callPackage ../development/python-modules/tweepy { }; - - twill = callPackage ../development/python-modules/twill { }; - - twine = callPackage ../development/python-modules/twine { }; - - twisted = callPackage ../development/python-modules/twisted { }; - - txtorcon = callPackage ../development/python-modules/txtorcon { }; - - txdbus = callPackage ../development/python-modules/txdbus { }; - - tzlocal = callPackage ../development/python-modules/tzlocal { }; - - u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; - - ua-parser = callPackage ../development/python-modules/ua-parser { }; - - uarray = callPackage ../development/python-modules/uarray { }; - - ueberzug = callPackage ../development/python-modules/ueberzug { - inherit (pkgs.xorg) libX11 libXext; - }; - - ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; - - umap-learn = callPackage ../development/python-modules/umap-learn { }; - - umemcache = callPackage ../development/python-modules/umemcache {}; - - uritools = callPackage ../development/python-modules/uritools { }; - - update_checker = callPackage ../development/python-modules/update_checker {}; - - update-copyright = callPackage ../development/python-modules/update-copyright {}; - - update-dotdee = callPackage ../development/python-modules/update-dotdee { }; - - uritemplate = callPackage ../development/python-modules/uritemplate { }; - - uproot = callPackage ../development/python-modules/uproot {}; - - uproot-methods = callPackage ../development/python-modules/uproot-methods { }; - - urlgrabber = callPackage ../development/python-modules/urlgrabber {}; - - urwid = callPackage ../development/python-modules/urwid {}; - - user-agents = callPackage ../development/python-modules/user-agents { }; - - variants = callPackage ../development/python-modules/variants { }; - - verboselogs = callPackage ../development/python-modules/verboselogs { }; - - 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; - }; - - virtual-display = callPackage ../development/python-modules/virtual-display { }; - - virtualenv = callPackage ../development/python-modules/virtualenv { }; - - vispy = callPackage ../development/python-modules/vispy { }; - - vsts = callPackage ../development/python-modules/vsts { }; - - vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { }; - - python-vlc = callPackage ../development/python-modules/python-vlc { }; - - weasyprint = callPackage ../development/python-modules/weasyprint { }; - - webassets = callPackage ../development/python-modules/webassets { }; - - webcolors = callPackage ../development/python-modules/webcolors { }; - - webencodings = callPackage ../development/python-modules/webencodings { }; - - websockets = callPackage ../development/python-modules/websockets { }; - - Wand = callPackage ../development/python-modules/Wand { }; - - wcwidth = callPackage ../development/python-modules/wcwidth { }; - - werkzeug = callPackage ../development/python-modules/werkzeug { }; - - wheel = callPackage ../development/python-modules/wheel { }; - - widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; - - wordfreq = callPackage ../development/python-modules/wordfreq { }; - - magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; - - magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; - - magic-wormhole-transit-relay = callPackage ../development/python-modules/magic-wormhole-transit-relay { }; - - wxPython = self.wxPython30; - - wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { - wxGTK = pkgs.wxGTK30; - inherit (pkgs) pkgconfig; - }; - - wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { - inherit (pkgs) pkgconfig; - wxGTK = pkgs.wxGTK30.override { withGtk2 = false; withWebKit = true; }; - }; - - xml2rfc = callPackage ../development/python-modules/xml2rfc { }; - - xmlschema = callPackage ../development/python-modules/xmlschema { }; - - xmltodict = callPackage ../development/python-modules/xmltodict { }; - - xarray = callPackage ../development/python-modules/xarray { }; - - xapian = callPackage ../development/python-modules/xapian { xapian = pkgs.xapian; }; - - xapp = callPackage ../development/python-modules/xapp { - inherit (pkgs) gtk3 gobject-introspection polkit; - inherit (pkgs.cinnamon) xapps; - }; - - xlwt = callPackage ../development/python-modules/xlwt { }; - - xxhash = callPackage ../development/python-modules/xxhash { }; - - ydiff = callPackage ../development/python-modules/ydiff { }; - - yoda = toPythonModule (pkgs.yoda.override { - inherit python; - }); - - youtube-dl = callPackage ../tools/misc/youtube-dl {}; - - youtube-dl-light = callPackage ../tools/misc/youtube-dl { - ffmpegSupport = false; - phantomjsSupport = false; - }; - - zconfig = callPackage ../development/python-modules/zconfig { }; - - zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; - - zerorpc = callPackage ../development/python-modules/zerorpc { }; - - zimports = callPackage ../development/python-modules/zimports { }; - - zipstream = callPackage ../development/python-modules/zipstream { }; - - zodb = callPackage ../development/python-modules/zodb {}; - - zodbpickle = callPackage ../development/python-modules/zodbpickle {}; - - BTrees = callPackage ../development/python-modules/btrees {}; - - persistent = callPackage ../development/python-modules/persistent {}; - - persim = callPackage ../development/python-modules/persim { }; - - xdot = callPackage ../development/python-modules/xdot { }; - - zetup = callPackage ../development/python-modules/zetup { }; + rotate-backups = callPackage ../tools/backup/rotate-backups { }; routes = callPackage ../development/python-modules/routes { }; + rpdb = callPackage ../development/python-modules/rpdb { }; + + rpkg = callPackage ../development/python-modules/rpkg { }; + + rply = callPackage ../development/python-modules/rply { }; + + rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override { inherit python; })); + + rpmfluff = callPackage ../development/python-modules/rpmfluff { }; + + rpy2 = if isPy3k then + callPackage ../development/python-modules/rpy2 { } + else + callPackage ../development/python-modules/rpy2/2.nix { }; + rpyc = callPackage ../development/python-modules/rpyc { }; + rq = callPackage ../development/python-modules/rq { }; + rsa = if isPy3k then callPackage ../development/python-modules/rsa { } else callPackage ../development/python-modules/rsa/4_0.nix { }; - squaremap = callPackage ../development/python-modules/squaremap { }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; + + Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; + + rtslib = callPackage ../development/python-modules/rtslib { }; ruamel_base = callPackage ../development/python-modules/ruamel_base { }; @@ -6578,182 +6125,426 @@ in { ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { }; + rubymarshal = callPackage ../development/python-modules/rubymarshal { }; + ruffus = callPackage ../development/python-modules/ruffus { }; runsnakerun = callPackage ../development/python-modules/runsnakerun { }; - pysendfile = callPackage ../development/python-modules/pysendfile { }; + runway-python = callPackage ../development/python-modules/runway-python { }; - pyxl3 = callPackage ../development/python-modules/pyxl3 { }; + rx = callPackage ../development/python-modules/rx { }; - qpid-python = callPackage ../development/python-modules/qpid-python { }; + rxv = callPackage ../development/python-modules/rxv { }; - xattr = callPackage ../development/python-modules/xattr { }; + s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { }; + + s3fs = callPackage ../development/python-modules/s3fs { }; + + s3transfer = callPackage ../development/python-modules/s3transfer { }; + + sabyenc3 = callPackage ../development/python-modules/sabyenc3 { }; + + sabyenc = callPackage ../development/python-modules/sabyenc { }; + + sacremoses = callPackage ../development/python-modules/sacremoses { }; + + safe = callPackage ../development/python-modules/safe { }; + + safety = callPackage ../development/python-modules/safety { }; + + salmon-mail = callPackage ../development/python-modules/salmon-mail { }; + + sampledata = callPackage ../development/python-modules/sampledata { }; + + samplerate = callPackage ../development/python-modules/samplerate { }; + + samsungctl = callPackage ../development/python-modules/samsungctl { }; + + samsungtvws = callPackage ../development/python-modules/samsungtvws { }; + + sandboxlib = callPackage ../development/python-modules/sandboxlib { }; + + sanic-auth = callPackage ../development/python-modules/sanic-auth { }; + + sanic = callPackage ../development/python-modules/sanic { }; + + sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; + + sarge = callPackage ../development/python-modules/sarge { }; + + sasmodels = callPackage ../development/python-modules/sasmodels { }; + + scales = callPackage ../development/python-modules/scales { }; + + scandir = callPackage ../development/python-modules/scandir { }; + + scapy = callPackage ../development/python-modules/scapy { }; + + schedule = callPackage ../development/python-modules/schedule { }; + + schema = callPackage ../development/python-modules/schema { }; + + scikit-bio = callPackage ../development/python-modules/scikit-bio { }; + + scikit-build = callPackage ../development/python-modules/scikit-build { }; + + scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; + + scikitimage = callPackage ../development/python-modules/scikit-image { }; + + scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; }; + in if isPy3k then + callPackage ../development/python-modules/scikitlearn args + else + callPackage ../development/python-modules/scikitlearn/0.20.nix args; + + scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; + + scikits-odes = callPackage ../development/python-modules/scikits-odes { }; + + scikit-tda = callPackage ../development/python-modules/scikit-tda { }; + + scipy_1_3 = self.scipy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "02iqb7ws7fw5fd1a83hx705pzrw1imj7z0bphjsl4bfvw254xgv4"; + }; + doCheck = false; + disabled = !isPy3k; + }); + + scipy = let + scipy_ = callPackage ../development/python-modules/scipy { }; + scipy_1_2 = scipy_.overridePythonAttrs (oldAttrs: rec { + version = "1.2.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; + }; + }); + in if pythonOlder "3.5" then scipy_1_2 else scipy_; + + scour = callPackage ../development/python-modules/scour { }; + + scp = callPackage ../development/python-modules/scp { }; + + scrapy = callPackage ../development/python-modules/scrapy { }; + + scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { }; + + scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { }; + + scrapy-splash = callPackage ../development/python-modules/scrapy-splash { }; + + screeninfo = callPackage ../development/python-modules/screeninfo { }; scripttest = callPackage ../development/python-modules/scripttest { }; + scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; + + sdnotify = callPackage ../development/python-modules/sdnotify { }; + + seaborn = if isPy3k then + callPackage ../development/python-modules/seaborn { } + else + callPackage ../development/python-modules/seaborn/0.9.1.nix { }; + + seabreeze = callPackage ../development/python-modules/seabreeze { }; + + secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig; }; + + secretstorage = if isPy3k then + callPackage ../development/python-modules/secretstorage { } + else + callPackage ../development/python-modules/secretstorage/2.nix { }; + + secure = callPackage ../development/python-modules/secure { }; + + seekpath = callPackage ../development/python-modules/seekpath { }; + + selectors2 = callPackage ../development/python-modules/selectors2 { }; + + selectors34 = callPackage ../development/python-modules/selectors34 { }; + + selenium = callPackage ../development/python-modules/selenium { }; + + semantic = callPackage ../development/python-modules/semantic { }; + + semantic-version = callPackage ../development/python-modules/semantic-version { }; + + semver = callPackage ../development/python-modules/semver { }; + + send2trash = callPackage ../development/python-modules/send2trash { }; + + sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkgconfig; }; + + sentinel = callPackage ../development/python-modules/sentinel { }; + + sentry-sdk = callPackage ../development/python-modules/sentry-sdk { }; + + sepaxml = callPackage ../development/python-modules/sepaxml { }; + + seqdiag = callPackage ../development/python-modules/seqdiag { }; + + sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { + pythonPackages = self; + pythonSupport = true; + })); + + serpent = callPackage ../development/python-modules/serpent { }; + + serpy = callPackage ../development/python-modules/serpy { }; + + serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; + + serversyncstorage = callPackage ../development/python-modules/serversyncstorage { }; + + service-identity = callPackage ../development/python-modules/service_identity { }; + + setproctitle = callPackage ../development/python-modules/setproctitle { }; + setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; + setuptools-git = callPackage ../development/python-modules/setuptools-git { }; + + setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; + + setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; + + setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; + setuptoolsTrial = callPackage ../development/python-modules/setuptoolstrial { }; - simplebayes = callPackage ../development/python-modules/simplebayes { }; + sexpdata = callPackage ../development/python-modules/sexpdata { }; - shortuuid = callPackage ../development/python-modules/shortuuid { }; + sfepy = callPackage ../development/python-modules/sfepy { }; - shouldbe = callPackage ../development/python-modules/shouldbe { }; - - simpleparse = callPackage ../development/python-modules/simpleparse { }; - - slob = callPackage ../development/python-modules/slob { }; - - slowaes = callPackage ../development/python-modules/slowaes { }; - - sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; - - sqlitedict = callPackage ../development/python-modules/sqlitedict { }; - - sqlobject = callPackage ../development/python-modules/sqlobject { }; - - sqlmap = callPackage ../development/python-modules/sqlmap { }; - - pgpdump = callPackage ../development/python-modules/pgpdump { }; - - spambayes = callPackage ../development/python-modules/spambayes { }; + shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; shapely = callPackage ../development/python-modules/shapely { }; sharedmem = callPackage ../development/python-modules/sharedmem { }; - soco = callPackage ../development/python-modules/soco { }; - - sopel = callPackage ../development/python-modules/sopel { }; - - sounddevice = callPackage ../development/python-modules/sounddevice { }; - - stevedore = callPackage ../development/python-modules/stevedore {}; - - svglib = callPackage ../development/python-modules/svglib { }; - - text-unidecode = callPackage ../development/python-modules/text-unidecode { }; - - Theano = callPackage ../development/python-modules/Theano rec { - cudaSupport = pkgs.config.cudaSupport or false; - cudnnSupport = cudaSupport; - inherit (pkgs.linuxPackages) nvidia_x11; - }; - - TheanoWithoutCuda = self.Theano.override { - cudaSupport = false; - cudnnSupport = false; - }; - - TheanoWithCuda = self.Theano.override { - cudaSupport = true; - cudnnSupport = true; - }; - - thespian = callPackage ../development/python-modules/thespian { }; - - tidylib = callPackage ../development/python-modules/pytidylib { }; - - tilestache = callPackage ../development/python-modules/tilestache { }; - - timelib = callPackage ../development/python-modules/timelib { }; - - timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; - - pid = callPackage ../development/python-modules/pid { }; - - pip2nix = callPackage ../development/python-modules/pip2nix { }; - - pychef = callPackage ../development/python-modules/pychef { }; - - pydns = - let - py3 = callPackage ../development/python-modules/py3dns { }; - - py2 = callPackage ../development/python-modules/pydns { }; - in if isPy3k then py3 else py2; - - python-daemon = callPackage ../development/python-modules/python-daemon { }; - - python-vagrant = callPackage ../development/python-modules/python-vagrant { }; - - symengine = callPackage ../development/python-modules/symengine { - symengine = pkgs.symengine; - }; - - sympy = if isPy3k then - callPackage ../development/python-modules/sympy { } - else - callPackage ../development/python-modules/sympy/1_5.nix { }; - - pilkit = callPackage ../development/python-modules/pilkit { }; - - clint = callPackage ../development/python-modules/clint { }; - - argh = callPackage ../development/python-modules/argh { }; - - nose_progressive = callPackage ../development/python-modules/nose_progressive { }; - - blessings = callPackage ../development/python-modules/blessings { }; - - secretstorage = if isPy3k - then callPackage ../development/python-modules/secretstorage { } - else callPackage ../development/python-modules/secretstorage/2.nix { }; - - secure = callPackage ../development/python-modules/secure { }; - - semantic = callPackage ../development/python-modules/semantic { }; - - sandboxlib = callPackage ../development/python-modules/sandboxlib { }; - - sanic = callPackage ../development/python-modules/sanic { }; - - scales = callPackage ../development/python-modules/scales { }; - - secp256k1 = callPackage ../development/python-modules/secp256k1 { - inherit (pkgs) secp256k1 pkgconfig; - }; - - semantic-version = callPackage ../development/python-modules/semantic-version { }; - - sexpdata = callPackage ../development/python-modules/sexpdata { }; - sh = callPackage ../development/python-modules/sh { }; + shellingham = callPackage ../development/python-modules/shellingham { }; + + shiboken2 = + toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake qt5 llvmPackages; }); + + shippai = callPackage ../development/python-modules/shippai { }; + + shodan = callPackage ../development/python-modules/shodan { }; + + shortuuid = callPackage ../development/python-modules/shortuuid { }; + + shouldbe = callPackage ../development/python-modules/shouldbe { }; + + should-dsl = callPackage ../development/python-modules/should-dsl { }; + + showit = callPackage ../development/python-modules/showit { }; + + shutilwhich = callPackage ../development/python-modules/shutilwhich { }; + + sievelib = callPackage ../development/python-modules/sievelib { }; + + signedjson = callPackage ../development/python-modules/signedjson { }; + + sigtools = callPackage ../development/python-modules/sigtools { }; + + simanneal = callPackage ../development/python-modules/simanneal { }; + + simpleai = callPackage ../development/python-modules/simpleai { }; + + simpleaudio = callPackage ../development/python-modules/simpleaudio { }; + + simplebayes = callPackage ../development/python-modules/simplebayes { }; + + simpleeval = callPackage ../development/python-modules/simpleeval { }; + + simplefix = callPackage ../development/python-modules/simplefix { }; + + simplegeneric = callPackage ../development/python-modules/simplegeneric { }; + + simplejson = callPackage ../development/python-modules/simplejson { }; + + simplekml = callPackage ../development/python-modules/simplekml { }; + + simpleparse = callPackage ../development/python-modules/simpleparse { }; + + simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; + + simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { }; + + simpy = callPackage ../development/python-modules/simpy { }; + + singledispatch = callPackage ../development/python-modules/singledispatch { }; + + sip = callPackage ../development/python-modules/sip { }; + sipsimple = callPackage ../development/python-modules/sipsimple { }; six = callPackage ../development/python-modules/six { }; + skein = callPackage ../development/python-modules/skein { }; + + sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; + + skorch = callPackage ../development/python-modules/skorch { }; + + slackclient = callPackage ../development/python-modules/slackclient { }; + + sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; + + slicedimage = callPackage ../development/python-modules/slicedimage { }; + + slicerator = callPackage ../development/python-modules/slicerator { }; + + slimit = callPackage ../development/python-modules/slimit { }; + + slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; + + slixmpp = callPackage ../development/python-modules/slixmpp { inherit (pkgs) gnupg; }; + + slob = callPackage ../development/python-modules/slob { }; + + slowaes = callPackage ../development/python-modules/slowaes { }; + + sly = callPackage ../development/python-modules/sly { }; + smartdc = callPackage ../development/python-modules/smartdc { }; + smart_open = callPackage ../development/python-modules/smart_open { }; + + smartypants = callPackage ../development/python-modules/smartypants { }; + + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 + + smmap = callPackage ../development/python-modules/smmap { }; + smpplib = callPackage ../development/python-modules/smpplib { }; - socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; + smugline = callPackage ../development/python-modules/smugline { }; + + smugpy = callPackage ../development/python-modules/smugpy { }; + + snakebite = callPackage ../development/python-modules/snakebite { }; + + snakeviz = callPackage ../development/python-modules/snakeviz { }; + + snapcast = callPackage ../development/python-modules/snapcast { }; + + snapperGUI = callPackage ../development/python-modules/snappergui { }; + + sniffio = callPackage ../development/python-modules/sniffio { }; + + snitun = callPackage ../development/python-modules/snitun { }; + + snowballstemmer = callPackage ../development/python-modules/snowballstemmer { }; + + snowflake-connector-python = callPackage ../development/python-modules/snowflake-connector-python { }; + + snowflake-sqlalchemy = callPackage ../development/python-modules/snowflake-sqlalchemy { }; + + snscrape = callPackage ../development/python-modules/snscrape { }; + + snug = callPackage ../development/python-modules/snug { }; + + snuggs = callPackage ../development/python-modules/snuggs { }; + + soapysdr = toPythonModule (pkgs.soapysdr.override { + python = self.python; + usePython = true; + }); + + soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override { + python = self.python; + usePython = true; + }); sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; + socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; + + soco = callPackage ../development/python-modules/soco { }; + + softlayer = callPackage ../development/python-modules/softlayer { }; + + solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); + + somajo = callPackage ../development/python-modules/somajo { }; + + sopel = callPackage ../development/python-modules/sopel { }; + sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { }; + sortedcollections = callPackage ../development/python-modules/sortedcollections { }; + + sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; + + sounddevice = callPackage ../development/python-modules/sounddevice { }; + + soundfile = callPackage ../development/python-modules/soundfile { }; + soupsieve = if isPy3k then callPackage ../development/python-modules/soupsieve { } else callPackage ../development/python-modules/soupsieve/1.nix { }; - sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; + spacy = callPackage ../development/python-modules/spacy { }; + + spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; + + spake2 = callPackage ../development/python-modules/spake2 { }; + + spambayes = callPackage ../development/python-modules/spambayes { }; + + spark_parser = callPackage ../development/python-modules/spark_parser { }; + + SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { }; + + sparse = callPackage ../development/python-modules/sparse { }; + + speaklater = callPackage ../development/python-modules/speaklater { }; + + spectral-cube = callPackage ../development/python-modules/spectral-cube { }; + + speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; + + spglib = callPackage ../development/python-modules/spglib { }; + + sphfile = callPackage ../development/python-modules/sphfile { }; + + sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; + + sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex { }; sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { }; - sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; + sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp { }; + + sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { }; + + sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp { }; sphinxcontrib_httpdomain = callPackage ../development/python-modules/sphinxcontrib_httpdomain { }; + sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath { }; + + sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { }; + sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; - sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { - inherit (pkgs) plantuml; - }; + sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; + + sphinxcontrib_plantuml = + callPackage ../development/python-modules/sphinxcontrib_plantuml { inherit (pkgs) plantuml; }; + + sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { }; + + sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { }; sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { }; @@ -6761,637 +6552,227 @@ in { texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; }; }; + sphinxcontrib-websupport = if isPy3k then + callPackage ../development/python-modules/sphinxcontrib-websupport { } + else + callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; + + sphinx = if isPy3k then + callPackage ../development/python-modules/sphinx { } + else + callPackage ../development/python-modules/sphinx/2.nix { }; + + sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; + + sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { }; + sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { }; - Pweave = callPackage ../development/python-modules/pweave { }; + sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; + + sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; + + spidev = callPackage ../development/python-modules/spidev { }; + + splinter = callPackage ../development/python-modules/splinter { }; + + spotipy = callPackage ../development/python-modules/spotipy { }; + + spyder = callPackage ../development/python-modules/spyder { }; + spyder_3 = callPackage ../development/python-modules/spyder/3.nix { }; + + spyder-kernels = callPackage ../development/python-modules/spyder-kernels { }; + spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix { }; + + sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; + + sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { }; + + sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { }; + + sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { }; SQLAlchemy-ImageAttach = callPackage ../development/python-modules/sqlalchemy-imageattach { }; + sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; + + sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; + + sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; + + sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + + sqlmap = callPackage ../development/python-modules/sqlmap { }; + + sqlobject = callPackage ../development/python-modules/sqlobject { }; + sqlparse = callPackage ../development/python-modules/sqlparse { }; - python_statsd = callPackage ../development/python-modules/python_statsd { }; + sqlsoup = callPackage ../development/python-modules/sqlsoup { }; - skein = callPackage ../development/python-modules/skein { }; + squaremap = callPackage ../development/python-modules/squaremap { }; + + srp = callPackage ../development/python-modules/srp { }; + + srptools = callPackage ../development/python-modules/srptools { }; + + srsly = callPackage ../development/python-modules/srsly { }; + + srvlookup = callPackage ../development/python-modules/srvlookup { }; + + ssdeep = callPackage ../development/python-modules/ssdeep { }; + + ssdp = callPackage ../development/python-modules/ssdp { }; + + sseclient = callPackage ../development/python-modules/sseclient { }; + + sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; + + sshtunnel = callPackage ../development/python-modules/sshtunnel { }; + + sslib = callPackage ../development/python-modules/sslib { }; + + sslyze = callPackage ../development/python-modules/sslyze { }; + + starfish = callPackage ../development/python-modules/starfish { }; + + starlette = callPackage ../development/python-modules/starlette { }; + + staticjinja = callPackage ../development/python-modules/staticjinja { }; + + statistics = callPackage ../development/python-modules/statistics { }; + + statsd = callPackage ../development/python-modules/statsd { }; + + statsmodels = callPackage ../development/python-modules/statsmodels { }; + + stem = callPackage ../development/python-modules/stem { }; + + stevedore = callPackage ../development/python-modules/stevedore { }; + + stm32loader = callPackage ../development/python-modules/stm32loader { }; stompclient = callPackage ../development/python-modules/stompclient { }; + strategies = callPackage ../development/python-modules/strategies { }; + + stravalib = callPackage ../development/python-modules/stravalib { }; + + streamz = callPackage ../development/python-modules/streamz { }; + + strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; + + strictyaml = callPackage ../development/python-modules/strictyaml { }; + + stringcase = callPackage ../development/python-modules/stringcase { }; + + stripe = callPackage ../development/python-modules/stripe { }; + + structlog = callPackage ../development/python-modules/structlog { }; + + stumpy = callPackage ../development/python-modules/stumpy { }; + + stups-cli-support = callPackage ../development/python-modules/stups-cli-support { }; + + stups-fullstop = callPackage ../development/python-modules/stups-fullstop { }; + + stups-pierone = callPackage ../development/python-modules/stups-pierone { }; + + stups-tokens = callPackage ../development/python-modules/stups-tokens { }; + + stups-zign = callPackage ../development/python-modules/stups-zign { }; + + stytra = callPackage ../development/python-modules/stytra { }; + subdownloader = callPackage ../development/python-modules/subdownloader { }; - subunit = callPackage ../development/python-modules/subunit { - inherit (pkgs) subunit pkg-config cppunit check; - }; + subliminal = callPackage ../development/python-modules/subliminal { }; - sure = callPackage ../development/python-modules/sure { }; + subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - svgwrite = callPackage ../development/python-modules/svgwrite { }; - - swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { }; - - openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; - - freezegun = callPackage ../development/python-modules/freezegun { }; - - taskw = callPackage ../development/python-modules/taskw { }; - - telethon = callPackage ../development/python-modules/telethon { }; - - telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; - - terminaltables = callPackage ../development/python-modules/terminaltables { }; - - test-tube = callPackage ../development/python-modules/test-tube { }; - - testpath = callPackage ../development/python-modules/testpath { }; - - testrepository = callPackage ../development/python-modules/testrepository { }; - - testscenarios = callPackage ../development/python-modules/testscenarios { }; - - python_mimeparse = callPackage ../development/python-modules/python_mimeparse { }; - - # Tkinter/tkinter is part of the Python standard library. - # The Python interpreters in Nixpkgs come without tkinter by default. - # To make the module available, we make it available as any other - # Python package. - tkinter = let - py = python.override{x11Support=true;}; - in callPackage ../development/python-modules/tkinter { py = py; }; - - tlslite-ng = callPackage ../development/python-modules/tlslite-ng { }; - - qrcode = callPackage ../development/python-modules/qrcode { }; - - traits = callPackage ../development/python-modules/traits { }; - - transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; - - eggdeps = callPackage ../development/python-modules/eggdeps { }; - - twiggy = callPackage ../development/python-modules/twiggy { }; - - twitter = callPackage ../development/python-modules/twitter { }; - - twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; - - twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; - - twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; - - twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; - - twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; - - twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; - - python-twitter = callPackage ../development/python-modules/python-twitter { }; - - umalqurra = callPackage ../development/python-modules/umalqurra { }; - - unicodecsv = callPackage ../development/python-modules/unicodecsv { }; - - unicodedata2 = callPackage ../development/python-modules/unicodedata2 { }; - - unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; - - unidiff = callPackage ../development/python-modules/unidiff { }; - - units = callPackage ../development/python-modules/units { }; - - unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; - - unittest2 = callPackage ../development/python-modules/unittest2 { }; - - 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 { }; - - linecache2 = callPackage ../development/python-modules/linecache2 { }; - - upass = callPackage ../development/python-modules/upass { }; - - uptime = callPackage ../development/python-modules/uptime { }; - - urwidtrees = callPackage ../development/python-modules/urwidtrees { }; - - pyuv = callPackage ../development/python-modules/pyuv { }; - - virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { }; - - virtualenvwrapper = callPackage ../development/python-modules/virtualenvwrapper { }; - - vmprof = callPackage ../development/python-modules/vmprof { }; - - vultr = callPackage ../development/python-modules/vultr { }; - - vulture = callPackage ../development/python-modules/vulture { }; - - wadllib = callPackage ../development/python-modules/wadllib { }; - - waitress = callPackage ../development/python-modules/waitress { }; - - waitress-django = callPackage ../development/python-modules/waitress-django { }; - - web = callPackage ../development/python-modules/web { }; - - webob = callPackage ../development/python-modules/webob { }; - - websockify = callPackage ../development/python-modules/websockify { }; - - webtest = callPackage ../development/python-modules/webtest { }; - - wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; - - wsgitools = callPackage ../development/python-modules/wsgitools { }; - - wurlitzer = callPackage ../development/python-modules/wurlitzer { }; - - xcaplib = callPackage ../development/python-modules/xcaplib { }; - - xlib = callPackage ../development/python-modules/xlib { }; - - yappi = callPackage ../development/python-modules/yappi { }; - - zbase32 = callPackage ../development/python-modules/zbase32 { }; - - zdaemon = callPackage ../development/python-modules/zdaemon { }; - - zfec = callPackage ../development/python-modules/zfec { }; - - zha-quirks = callPackage ../development/python-modules/zha-quirks { }; - - zipp = if pythonOlder "3.6" then - callPackage ../development/python-modules/zipp/1.nix { } - else - callPackage ../development/python-modules/zipp { }; - - zope_broken = callPackage ../development/python-modules/zope_broken { }; - - zope_component = callPackage ../development/python-modules/zope_component { }; - - zope_configuration = callPackage ../development/python-modules/zope_configuration { }; - - zope_contenttype = callPackage ../development/python-modules/zope_contenttype { }; - - zope-deferredimport = callPackage ../development/python-modules/zope-deferredimport { }; - - zope_dottedname = callPackage ../development/python-modules/zope_dottedname { }; - - zope_event = callPackage ../development/python-modules/zope_event { }; - - zope_exceptions = callPackage ../development/python-modules/zope_exceptions { }; - - zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { }; - - zope-hookable = callPackage ../development/python-modules/zope-hookable { }; - - zope_i18n = callPackage ../development/python-modules/zope_i18n { }; - - zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; - - zope_lifecycleevent = callPackage ../development/python-modules/zope_lifecycleevent { }; - - zope_location = callPackage ../development/python-modules/zope_location { }; - - zope_proxy = callPackage ../development/python-modules/zope_proxy { }; - - zope_schema = callPackage ../development/python-modules/zope_schema { }; - - zope_size = callPackage ../development/python-modules/zope_size { }; - - zope_testing = callPackage ../development/python-modules/zope_testing { }; - - zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; - - zope_interface = callPackage ../development/python-modules/zope_interface { }; - - zopfli = callPackage ../development/python-modules/zopfli { }; - - hgsvn = callPackage ../development/python-modules/hgsvn { }; - - cliapp = callPackage ../development/python-modules/cliapp { }; - - cmdtest = callPackage ../development/python-modules/cmdtest { }; - - tornado = if isPy3k then - callPackage ../development/python-modules/tornado { } - else - callPackage ../development/python-modules/tornado/5.nix { }; - - # Used by circus and grab-site, 2020-08-29 - tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; - - # Used by luigi, 2020-08-29 - tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; - - tokenlib = callPackage ../development/python-modules/tokenlib { }; - - tunigo = callPackage ../development/python-modules/tunigo { }; - - tarman = callPackage ../development/python-modules/tarman { }; - - libarchive = self.python-libarchive; # The latter is the name upstream uses - - python-libarchive = callPackage ../development/python-modules/python-libarchive { }; - - python-logstash = callPackage ../development/python-modules/python-logstash { }; - - libarchive-c = callPackage ../development/python-modules/libarchive-c { - inherit (pkgs) libarchive; - }; - - libasyncns = callPackage ../development/python-modules/libasyncns { - inherit (pkgs) libasyncns pkgconfig; - }; - - pybrowserid = callPackage ../development/python-modules/pybrowserid { }; - - pyzmq = callPackage ../development/python-modules/pyzmq { }; - - testfixtures = callPackage ../development/python-modules/testfixtures {}; - - tissue = callPackage ../development/python-modules/tissue { }; - - titlecase = callPackage ../development/python-modules/titlecase { }; - - tracing = callPackage ../development/python-modules/tracing { }; - - traitsui = callPackage ../development/python-modules/traitsui { }; - - translationstring = callPackage ../development/python-modules/translationstring { }; - - ttystatus = callPackage ../development/python-modules/ttystatus { }; - - larch = callPackage ../development/python-modules/larch { }; - - websocket_client = callPackage ../development/python-modules/websocket_client { }; - - webhelpers = callPackage ../development/python-modules/webhelpers { }; - - whichcraft = callPackage ../development/python-modules/whichcraft { }; - - whisper = callPackage ../development/python-modules/whisper { }; - - worldengine = callPackage ../development/python-modules/worldengine { }; - - carbon = callPackage ../development/python-modules/carbon { }; - - ujson = if isPy27 - then callPackage ../development/python-modules/ujson/2.nix { } - else callPackage ../development/python-modules/ujson { }; - - unidecode = callPackage ../development/python-modules/unidecode {}; - - pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; }; - - BlinkStick = callPackage ../development/python-modules/blinkstick { }; - - usbtmc = callPackage ../development/python-modules/usbtmc {}; - - txgithub = callPackage ../development/python-modules/txgithub { }; - - txrequests = callPackage ../development/python-modules/txrequests { }; - - txamqp = callPackage ../development/python-modules/txamqp { }; - - versiontools = callPackage ../development/python-modules/versiontools { }; - - veryprettytable = callPackage ../development/python-modules/veryprettytable { }; - - graphite-web = callPackage ../development/python-modules/graphite-web { }; - - graphite_api = callPackage ../development/python-modules/graphite-api { }; - - graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; - - graph_nets = callPackage ../development/python-modules/graph_nets { }; - - graspy = callPackage ../development/python-modules/graspy { }; - - influxgraph = callPackage ../development/python-modules/influxgraph { }; - - pyspotify = callPackage ../development/python-modules/pyspotify { }; - - pykka = callPackage ../development/python-modules/pykka { }; - - ws4py = callPackage ../development/python-modules/ws4py {}; - - gdata = callPackage ../development/python-modules/gdata { }; - - IMAPClient = callPackage ../development/python-modules/imapclient { }; - - Logbook = callPackage ../development/python-modules/Logbook { }; - - libversion = callPackage ../development/python-modules/libversion { - inherit (pkgs) libversion pkgconfig; - }; - - libvirt = if isPy3k then (callPackage ../development/python-modules/libvirt { - inherit (pkgs) libvirt pkgconfig; - }) else (callPackage ../development/python-modules/libvirt/5.9.0.nix { - inherit (pkgs) pkgconfig; - libvirt = pkgs.libvirt_5_9_0; - }); - - rpdb = callPackage ../development/python-modules/rpdb { }; - - grequests = callPackage ../development/python-modules/grequests { }; - - first = callPackage ../development/python-modules/first {}; - - flaskbabel = callPackage ../development/python-modules/flaskbabel { }; - - speaklater = callPackage ../development/python-modules/speaklater { }; - - speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; - - pushbullet = callPackage ../development/python-modules/pushbullet { }; - - power = callPackage ../development/python-modules/power { }; - - pythonefl = callPackage ../development/python-modules/python-efl { - inherit (pkgs) pkgconfig; - }; - - tlsh = callPackage ../development/python-modules/tlsh { }; - - toposort = callPackage ../development/python-modules/toposort { }; - - snakebite = callPackage ../development/python-modules/snakebite { }; - - snapperGUI = callPackage ../development/python-modules/snappergui { }; - - dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; - - uncertainties = callPackage ../development/python-modules/uncertainties { }; - - funcy = callPackage ../development/python-modules/funcy { }; - - vxi11 = callPackage ../development/python-modules/vxi11 { }; - - svg2tikz = callPackage ../development/python-modules/svg2tikz { }; - - WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; - - blist = callPackage ../development/python-modules/blist { }; - - canonicaljson = callPackage ../development/python-modules/canonicaljson { }; - - daemonize = callPackage ../development/python-modules/daemonize { }; - - pydenticon = callPackage ../development/python-modules/pydenticon { }; - - pynac = callPackage ../development/python-modules/pynac { }; - - pybindgen = callPackage ../development/python-modules/pybindgen {}; - - pygccxml = callPackage ../development/python-modules/pygccxml {}; - - pymacaroons = callPackage ../development/python-modules/pymacaroons { }; - - pynacl = callPackage ../development/python-modules/pynacl { }; - - service-identity = callPackage ../development/python-modules/service_identity { }; - - signedjson = callPackage ../development/python-modules/signedjson { }; - - unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; - - thumbor = callPackage ../development/python-modules/thumbor { }; - - thumborPexif = callPackage ../development/python-modules/thumborpexif { }; - - pync = callPackage ../development/python-modules/pync { }; - - weboob = callPackage ../development/python-modules/weboob { }; - - datadiff = callPackage ../development/python-modules/datadiff { }; - - termcolor = callPackage ../development/python-modules/termcolor { }; - - html2text = if isPy3k then callPackage ../development/python-modules/html2text { } - else callPackage ../development/python-modules/html2text/2018.nix { }; - - pychart = callPackage ../development/python-modules/pychart {}; - - parsimonious = callPackage ../development/python-modules/parsimonious { }; - - networkx = if isPy3k then callPackage ../development/python-modules/networkx { } - else - callPackage ../development/python-modules/networkx/2.2.nix { }; - - ofxclient = callPackage ../development/python-modules/ofxclient {}; - - ofxhome = callPackage ../development/python-modules/ofxhome { }; - - ofxparse = callPackage ../development/python-modules/ofxparse { }; - - ofxtools = callPackage ../development/python-modules/ofxtools { }; - - orm = callPackage ../development/python-modules/orm { }; - - basemap = callPackage ../development/python-modules/basemap { }; - - dict2xml = callPackage ../development/python-modules/dict2xml { }; - - dicttoxml = callPackage ../development/python-modules/dicttoxml { }; - - markdown2 = callPackage ../development/python-modules/markdown2 { }; - - evernote = callPackage ../development/python-modules/evernote { }; - - setproctitle = callPackage ../development/python-modules/setproctitle { }; - - thrift = callPackage ../development/python-modules/thrift { }; - - geeknote = callPackage ../development/python-modules/geeknote { }; - - trollius = callPackage ../development/python-modules/trollius {}; - - pynvim = callPackage ../development/python-modules/pynvim {}; - - typogrify = callPackage ../development/python-modules/typogrify { }; - - smartypants = callPackage ../development/python-modules/smartypants { }; - - pypeg2 = callPackage ../development/python-modules/pypeg2 { }; - - torchvision = callPackage ../development/python-modules/torchvision { }; - - torchgpipe = callPackage ../development/python-modules/torchgpipe { }; - - jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; - - jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; - - dot2tex = callPackage ../development/python-modules/dot2tex { - inherit (pkgs) graphviz; - }; - - poezio = callPackage ../applications/networking/instant-messengers/poezio { - inherit (pkgs) pkgconfig; - }; - - potr = callPackage ../development/python-modules/potr {}; - - pyregion = callPackage ../development/python-modules/pyregion {}; - - python-nomad = callPackage ../development/python-modules/python-nomad { }; - - python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; - - python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; - - pluggy = callPackage ../development/python-modules/pluggy {}; - - xcffib = callPackage ../development/python-modules/xcffib {}; - - xpybutil = callPackage ../development/python-modules/xpybutil {}; - - pafy = callPackage ../development/python-modules/pafy { }; + subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit pkg-config cppunit check; }; suds = callPackage ../development/python-modules/suds { }; suds-jurko = callPackage ../development/python-modules/suds-jurko { }; - mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; + sumo = callPackage ../development/python-modules/sumo { }; - maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; + sunpy = callPackage ../development/python-modules/sunpy { }; - d2to1 = callPackage ../development/python-modules/d2to1 { }; + supervise_api = callPackage ../development/python-modules/supervise_api { }; - ovh = callPackage ../development/python-modules/ovh { }; + supervisor = callPackage ../development/python-modules/supervisor { }; - willow = callPackage ../development/python-modules/willow { }; + sure = callPackage ../development/python-modules/sure { }; - importmagic = callPackage ../development/python-modules/importmagic { }; + suseapi = callPackage ../development/python-modules/suseapi { }; - xgboost = callPackage ../development/python-modules/xgboost { - xgboost = pkgs.xgboost; - }; + svg2tikz = callPackage ../development/python-modules/svg2tikz { }; - xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; + svglib = callPackage ../development/python-modules/svglib { }; - xkcdpass = callPackage ../development/python-modules/xkcdpass { }; + svg-path = callPackage ../development/python-modules/svg-path { }; - xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; + svgwrite = callPackage ../development/python-modules/svgwrite { }; - xmodem = callPackage ../development/python-modules/xmodem {}; + swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { }; - xmpppy = callPackage ../development/python-modules/xmpppy {}; + swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; - xstatic = callPackage ../development/python-modules/xstatic {}; + sybil = callPackage ../development/python-modules/sybil { }; - xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox {}; + symengine = callPackage ../development/python-modules/symengine { symengine = pkgs.symengine; }; - xstatic-bootstrap = callPackage ../development/python-modules/xstatic-bootstrap {}; + sympy = if isPy3k then + callPackage ../development/python-modules/sympy { } + else + callPackage ../development/python-modules/sympy/1_5.nix { }; - xstatic-jquery = callPackage ../development/python-modules/xstatic-jquery {}; + systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkgconfig systemd; }; - xstatic-jquery-file-upload = callPackage ../development/python-modules/xstatic-jquery-file-upload {}; + sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; - xstatic-jquery-ui = callPackage ../development/python-modules/xstatic-jquery-ui {}; + tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; - xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments {}; + tables = if isPy3k then + callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; } + else + callPackage ../development/python-modules/tables/3.5.nix { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; - xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { - inherit (pkgs.xorg) xorgserver; - }; + tablib = callPackage ../development/python-modules/tablib { }; - hidapi = callPackage ../development/python-modules/hidapi { - inherit (pkgs) udev libusb1; - }; + tabulate = callPackage ../development/python-modules/tabulate { }; - ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + tadasets = callPackage ../development/python-modules/tadasets { }; - mnemonic = callPackage ../development/python-modules/mnemonic { }; + tag-expressions = callPackage ../development/python-modules/tag-expressions { }; - keepkey = callPackage ../development/python-modules/keepkey { }; + tarman = callPackage ../development/python-modules/tarman { }; - keepkey_agent = callPackage ../development/python-modules/keepkey_agent { }; + tasklib = callPackage ../development/python-modules/tasklib { }; - libagent = callPackage ../development/python-modules/libagent { }; + taskw = callPackage ../development/python-modules/taskw { }; - ledger_agent = callPackage ../development/python-modules/ledger_agent { }; + tatsu = callPackage ../development/python-modules/tatsu { }; - ledgerblue = callPackage ../development/python-modules/ledgerblue { }; + tblib = callPackage ../development/python-modules/tblib { }; - ecpy = callPackage ../development/python-modules/ecpy { }; + tbm-utils = callPackage ../development/python-modules/tbm-utils { }; - semver = callPackage ../development/python-modules/semver { }; + telegram = callPackage ../development/python-modules/telegram { }; - ed25519 = callPackage ../development/python-modules/ed25519 { }; + telethon = callPackage ../development/python-modules/telethon { }; - trezor = callPackage ../development/python-modules/trezor { }; + telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; - trezor_agent = callPackage ../development/python-modules/trezor_agent { }; + tempita = callPackage ../development/python-modules/tempita { }; - x11_hash = callPackage ../development/python-modules/x11_hash { }; + tempora = callPackage ../development/python-modules/tempora { }; - termstyle = callPackage ../development/python-modules/termstyle { }; + tenacity = callPackage ../development/python-modules/tenacity { }; - green = callPackage ../development/python-modules/green { }; - - topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 - - w3lib = callPackage ../development/python-modules/w3lib { }; - - queuelib = callPackage ../development/python-modules/queuelib { }; - - scrapy = callPackage ../development/python-modules/scrapy { }; - - scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { }; - - scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { }; - - scrapy-splash = callPackage ../development/python-modules/scrapy-splash { }; - - pandocfilters = callPackage ../development/python-modules/pandocfilters { }; - - pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; - - htmltreediff = callPackage ../development/python-modules/htmltreediff { }; - - repeated_test = callPackage ../development/python-modules/repeated_test { }; - - Keras = callPackage ../development/python-modules/keras { }; - - keras-applications = callPackage ../development/python-modules/keras-applications { }; - - keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; - - Lasagne = callPackage ../development/python-modules/lasagne { }; - - send2trash = callPackage ../development/python-modules/send2trash { }; - - sigtools = callPackage ../development/python-modules/sigtools { }; - - annoy = callPackage ../development/python-modules/annoy { }; - - clize = callPackage ../development/python-modules/clize { }; - - rl-coach = callPackage ../development/python-modules/rl-coach { }; - - zerobin = callPackage ../development/python-modules/zerobin { }; - - tensorflow-estimator = self.tensorflow-estimator_1; - - tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { }; - - tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { }; - - tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; - - tensorflow-tensorboard = self.tensorflow-tensorboard_1; - - tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { }; - - tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { }; - - tensorflow-bin = self.tensorflow-bin_1; + tensorboardx = callPackage ../development/python-modules/tensorboardx { }; tensorflow-bin_1 = callPackage ../development/python-modules/tensorflow/1/bin.nix { cudaSupport = pkgs.config.cudaSupport or false; @@ -7407,7 +6788,7 @@ in { cudnn = pkgs.cudnn_cudatoolkit_10; }; - tensorflow-build = self.tensorflow-build_1; + tensorflow-bin = self.tensorflow-bin_1; tensorflow-build_1 = callPackage ../development/python-modules/tensorflow/1 { cudaSupport = pkgs.config.cudaSupport or false; @@ -7429,460 +6810,536 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; }; + tensorflow-build = self.tensorflow-build_1; + + tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { }; + + tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { }; + + tensorflow-estimator = self.tensorflow-estimator_1; + + tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; + tensorflow = self.tensorflow_1; tensorflow_1 = self.tensorflow-build_1; tensorflow_2 = self.tensorflow-build_2; - tensorflowWithoutCuda = self.tensorflow.override { - cudaSupport = false; - }; + tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { }; - tensorflowWithCuda = self.tensorflow.override { - cudaSupport = true; - }; + tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { }; + + tensorflow-tensorboard = self.tensorflow-tensorboard_1; + + tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; }; + + tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; }; tensorly = callPackage ../development/python-modules/tensorly { }; + termcolor = callPackage ../development/python-modules/termcolor { }; + + terminado = callPackage ../development/python-modules/terminado { }; + + terminaltables = callPackage ../development/python-modules/terminaltables { }; + + termstyle = callPackage ../development/python-modules/termstyle { }; + + tess = callPackage ../development/python-modules/tess { }; + + tesserocr = callPackage ../development/python-modules/tesserocr { }; + + testfixtures = callPackage ../development/python-modules/testfixtures { }; + + testpath = callPackage ../development/python-modules/testpath { }; + + testrepository = callPackage ../development/python-modules/testrepository { }; + + testresources = callPackage ../development/python-modules/testresources { }; + + testscenarios = callPackage ../development/python-modules/testscenarios { }; + + testtools = callPackage ../development/python-modules/testtools { }; + + test-tube = callPackage ../development/python-modules/test-tube { }; + + textacy = callPackage ../development/python-modules/textacy { }; + + texttable = callPackage ../development/python-modules/texttable { }; + + text-unidecode = callPackage ../development/python-modules/text-unidecode { }; + + textwrap3 = callPackage ../development/python-modules/textwrap3 { }; + tflearn = callPackage ../development/python-modules/tflearn { }; - simpleai = callPackage ../development/python-modules/simpleai { }; + Theano = callPackage ../development/python-modules/Theano rec { + cudaSupport = pkgs.config.cudaSupport or false; + cudnnSupport = cudaSupport; + inherit (pkgs.linuxPackages) nvidia_x11; + }; - word2vec = callPackage ../development/python-modules/word2vec { }; + TheanoWithCuda = self.Theano.override { + cudaSupport = true; + cudnnSupport = true; + }; - tvdb_api = callPackage ../development/python-modules/tvdb_api { }; + TheanoWithoutCuda = self.Theano.override { + cudaSupport = false; + cudnnSupport = false; + }; - sdnotify = callPackage ../development/python-modules/sdnotify { }; + thespian = callPackage ../development/python-modules/thespian { }; - tvnamer = callPackage ../development/python-modules/tvnamer { }; + thinc = callPackage ../development/python-modules/thinc { }; threadpool = callPackage ../development/python-modules/threadpool { }; threadpoolctl = callPackage ../development/python-modules/threadpoolctl { }; - rocket-errbot = callPackage ../development/python-modules/rocket-errbot { }; + thrift = callPackage ../development/python-modules/thrift { }; - Yapsy = callPackage ../development/python-modules/yapsy { }; + thumbor = callPackage ../development/python-modules/thumbor { }; - ansi = callPackage ../development/python-modules/ansi { }; + thumborPexif = callPackage ../development/python-modules/thumborpexif { }; - pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; + tkinter = let + py = python.override{x11Support=true;}; + in callPackage ../development/python-modules/tkinter { py = py; }; - pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; + tidylib = callPackage ../development/python-modules/pytidylib { }; - telegram = callPackage ../development/python-modules/telegram { }; + tifffile = callPackage ../development/python-modules/tifffile { }; - python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; + tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; }; - irc = callPackage ../development/python-modules/irc { }; + tilestache = callPackage ../development/python-modules/tilestache { }; - jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; + timelib = callPackage ../development/python-modules/timelib { }; - jaraco_text = callPackage ../development/python-modules/jaraco_text { }; + timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; - jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + timezonefinder = callPackage ../development/python-modules/timezonefinder { }; - jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; + tinycss2 = callPackage ../development/python-modules/tinycss2 { }; - inflect = callPackage ../development/python-modules/inflect { }; + tinycss = callPackage ../development/python-modules/tinycss { }; - more-itertools = if isPy27 then - callPackage ../development/python-modules/more-itertools/2.7.nix { } - else callPackage ../development/python-modules/more-itertools { }; + tinydb = callPackage ../development/python-modules/tinydb { }; - morphys = callPackage ../development/python-modules/morphys { }; + tiros = callPackage ../development/python-modules/tiros { }; - jaraco_functools = if pythonOlder "3.6" then - callPackage ../development/python-modules/jaraco_functools/2.nix { } + tissue = callPackage ../development/python-modules/tissue { }; + + titlecase = callPackage ../development/python-modules/titlecase { }; + + tld = callPackage ../development/python-modules/tld { }; + + tldextract = callPackage ../development/python-modules/tldextract { }; + + tlsh = callPackage ../development/python-modules/tlsh { }; + + tlslite-ng = callPackage ../development/python-modules/tlslite-ng { }; + + tls-parser = callPackage ../development/python-modules/tls-parser { }; + + tmdb3 = callPackage ../development/python-modules/tmdb3 { }; + + todoist = callPackage ../development/python-modules/todoist { }; + + toggl-cli = callPackage ../development/python-modules/toggl-cli { }; + + tokenizers = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenizers { })); + + tokenlib = callPackage ../development/python-modules/tokenlib { }; + + tokenserver = callPackage ../development/python-modules/tokenserver { }; + + toml = callPackage ../development/python-modules/toml { }; + + tomlkit = callPackage ../development/python-modules/tomlkit { }; + + toolz = callPackage ../development/python-modules/toolz { }; + + toposort = callPackage ../development/python-modules/toposort { }; + + topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 + + torchgpipe = callPackage ../development/python-modules/torchgpipe { }; + + torchvision = callPackage ../development/python-modules/torchvision { }; + + tornado = if isPy3k then + callPackage ../development/python-modules/tornado { } else - callPackage ../development/python-modules/jaraco_functools { }; + callPackage ../development/python-modules/tornado/5.nix { }; - jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; + towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; }; - jaraco_stream = if pythonOlder "3.6" - then callPackage ../development/python-modules/jaraco_stream/2.nix { } - else - callPackage ../development/python-modules/jaraco_stream { }; + tox = callPackage ../development/python-modules/tox { }; - javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; + tqdm = callPackage ../development/python-modules/tqdm { }; - javaproperties = callPackage ../development/python-modules/javaproperties { }; + traceback2 = callPackage ../development/python-modules/traceback2 { }; - tempora= callPackage ../development/python-modules/tempora { }; + tracing = callPackage ../development/python-modules/tracing { }; - hypchat = callPackage ../development/python-modules/hypchat { }; + trackpy = callPackage ../development/python-modules/trackpy { }; - pivy = callPackage ../development/python-modules/pivy { }; + traitlets = callPackage ../development/python-modules/traitlets { }; - smugpy = callPackage ../development/python-modules/smugpy { }; + traits = callPackage ../development/python-modules/traits { }; - smugline = callPackage ../development/python-modules/smugline { }; + traitsui = callPackage ../development/python-modules/traitsui { }; - txaio = callPackage ../development/python-modules/txaio { }; + traittypes = callPackage ../development/python-modules/traittypes { }; - ramlfications = callPackage ../development/python-modules/ramlfications { }; + transaction = callPackage ../development/python-modules/transaction { }; - yapf = callPackage ../development/python-modules/yapf { }; + transformers = callPackage ../development/python-modules/transformers { }; - black = callPackage ../development/python-modules/black { }; + transforms3d = callPackage ../development/python-modules/transforms3d { }; - bjoern = callPackage ../development/python-modules/bjoern { }; + transip = callPackage ../development/python-modules/transip { }; - autobahn = callPackage ../development/python-modules/autobahn { }; + transitions = callPackage ../development/python-modules/transitions { }; - jsonref = callPackage ../development/python-modules/jsonref { }; + translationstring = callPackage ../development/python-modules/translationstring { }; - whoosh = callPackage ../development/python-modules/whoosh { }; + transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; - packet-python = callPackage ../development/python-modules/packet-python { }; + treq = callPackage ../development/python-modules/treq { }; - pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; }; + trezor_agent = callPackage ../development/python-modules/trezor_agent { }; - ROPGadget = callPackage ../development/python-modules/ROPGadget { }; + trezor = callPackage ../development/python-modules/trezor { }; - # We need "normal" libxml2 and not the python package by the same name. - pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; + trimesh = callPackage ../development/python-modules/trimesh { }; - unicorn = callPackage ../development/python-modules/unicorn { }; + trio = callPackage ../development/python-modules/trio { }; - intervaltree = callPackage ../development/python-modules/intervaltree { }; + trollius = callPackage ../development/python-modules/trollius { }; - packaging = callPackage ../development/python-modules/packaging { }; + trueskill = callPackage ../development/python-modules/trueskill { }; - preggy = callPackage ../development/python-modules/preggy { }; + trustme = callPackage ../development/python-modules/trustme { }; - prison = callPackage ../development/python-modules/prison { }; + trytond = callPackage ../development/python-modules/trytond { }; - pytoml = callPackage ../development/python-modules/pytoml { }; + ttystatus = callPackage ../development/python-modules/ttystatus { }; - pypamtest = pkgs.libpam-wrapper.override { - enablePython = true; - inherit python; - }; + tunigo = callPackage ../development/python-modules/tunigo { }; - pypandoc = callPackage ../development/python-modules/pypandoc { }; + TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; - yamllint = callPackage ../development/python-modules/yamllint { }; + tvdb_api = callPackage ../development/python-modules/tvdb_api { }; - yanc = callPackage ../development/python-modules/yanc { }; + tvnamer = callPackage ../development/python-modules/tvnamer { }; - yarl = callPackage ../development/python-modules/yarl { }; + tweepy = callPackage ../development/python-modules/tweepy { }; - solo-python = disabledIf (! pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); - - suseapi = callPackage ../development/python-modules/suseapi { }; - - tensorboardx = callPackage ../development/python-modules/tensorboardx { }; - - typed-ast = callPackage ../development/python-modules/typed-ast { }; - - stripe = callPackage ../development/python-modules/stripe { }; - - strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; - - strictyaml = callPackage ../development/python-modules/strictyaml { }; + twiggy = callPackage ../development/python-modules/twiggy { }; twilio = callPackage ../development/python-modules/twilio { }; + twill = callPackage ../development/python-modules/twill { }; + + twine = callPackage ../development/python-modules/twine { }; + + twisted = callPackage ../development/python-modules/twisted { }; + + twitter = callPackage ../development/python-modules/twitter { }; + + twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; + + twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; + + twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; + + twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; + + twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; + + twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; + twofish = callPackage ../development/python-modules/twofish { }; + txaio = callPackage ../development/python-modules/txaio { }; + + txamqp = callPackage ../development/python-modules/txamqp { }; + + txdbus = callPackage ../development/python-modules/txdbus { }; + + txgithub = callPackage ../development/python-modules/txgithub { }; + + txrequests = callPackage ../development/python-modules/txrequests { }; + + txtorcon = callPackage ../development/python-modules/txtorcon { }; + + typed-ast = callPackage ../development/python-modules/typed-ast { }; + + typeguard = callPackage ../development/python-modules/typeguard { }; + + typesentry = callPackage ../development/python-modules/typesentry { }; + + typesystem = callPackage ../development/python-modules/typesystem { }; + + typing = callPackage ../development/python-modules/typing { }; + + typing-extensions = callPackage ../development/python-modules/typing-extensions { }; + + typing-inspect = callPackage ../development/python-modules/typing-inspect { }; + + typogrify = callPackage ../development/python-modules/typogrify { }; + + tzlocal = callPackage ../development/python-modules/tzlocal { }; + + uamqp = + callPackage ../development/python-modules/uamqp { inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; }; + + ua-parser = callPackage ../development/python-modules/ua-parser { }; + + uarray = callPackage ../development/python-modules/uarray { }; + + ueberzug = callPackage ../development/python-modules/ueberzug { inherit (pkgs.xorg) libX11 libXext; }; + + ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; + + ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; + + ujson = if isPy27 then + callPackage ../development/python-modules/ujson/2.nix { } + else + callPackage ../development/python-modules/ujson { }; + + ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; + + umalqurra = callPackage ../development/python-modules/umalqurra { }; + + umap-learn = callPackage ../development/python-modules/umap-learn { }; + + umemcache = callPackage ../development/python-modules/umemcache { }; + + u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; + + uncertainties = callPackage ../development/python-modules/uncertainties { }; + + uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; + + unicodecsv = callPackage ../development/python-modules/unicodecsv { }; + + unicodedata2 = callPackage ../development/python-modules/unicodedata2 { }; + + unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; + + unicorn = callPackage ../development/python-modules/unicorn { }; + + unidecode = callPackage ../development/python-modules/unidecode { }; + + unidiff = callPackage ../development/python-modules/unidiff { }; + + unifi = callPackage ../development/python-modules/unifi { }; + + units = callPackage ../development/python-modules/units { }; + + unittest2 = callPackage ../development/python-modules/unittest2 { }; + + unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; + + unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; + + unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; + + unrpa = callPackage ../development/python-modules/unrpa { }; + + untangle = callPackage ../development/python-modules/untangle { }; + + upass = callPackage ../development/python-modules/upass { }; + + update_checker = callPackage ../development/python-modules/update_checker { }; + + update-copyright = callPackage ../development/python-modules/update-copyright { }; + + update-dotdee = callPackage ../development/python-modules/update-dotdee { }; + + uproot = callPackage ../development/python-modules/uproot { }; + + uproot-methods = callPackage ../development/python-modules/uproot-methods { }; + + uptime = callPackage ../development/python-modules/uptime { }; + uranium = callPackage ../development/python-modules/uranium { }; + uritemplate = callPackage ../development/python-modules/uritemplate { }; + + uritools = callPackage ../development/python-modules/uritools { }; + + urlgrabber = callPackage ../development/python-modules/urlgrabber { }; + + urllib3 = callPackage ../development/python-modules/urllib3 { }; + + urwid = callPackage ../development/python-modules/urwid { }; + + urwidtrees = callPackage ../development/python-modules/urwidtrees { }; + + usbtmc = callPackage ../development/python-modules/usbtmc { }; + + us = callPackage ../development/python-modules/us { }; + + user-agents = callPackage ../development/python-modules/user-agents { }; + + userpath = callPackage ../development/python-modules/userpath { }; + uuid = callPackage ../development/python-modules/uuid { }; + uvcclient = callPackage ../development/python-modules/uvcclient { }; + + uvicorn = callPackage ../development/python-modules/uvicorn { }; + + uvloop = callPackage ../development/python-modules/uvloop { + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; + }; + + validate-email = callPackage ../development/python-modules/validate-email { }; + + validators = callPackage ../development/python-modules/validators { }; + + validictory = callPackage ../development/python-modules/validictory { }; + + variants = callPackage ../development/python-modules/variants { }; + + varint = callPackage ../development/python-modules/varint { }; + + vcrpy = callPackage ../development/python-modules/vcrpy { }; + + vcver = callPackage ../development/python-modules/vcver { }; + + vcversioner = callPackage ../development/python-modules/vcversioner { }; + + vdf = callPackage ../development/python-modules/vdf { }; + + vdirsyncer = callPackage ../development/python-modules/vdirsyncer { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; + inherit (pkgs) pkg-config openssl rustPlatform; + }; + + vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; + + vega = callPackage ../development/python-modules/vega { }; + + vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + + venusian = callPackage ../development/python-modules/venusian { }; + + verboselogs = callPackage ../development/python-modules/verboselogs { }; + versioneer = callPackage ../development/python-modules/versioneer { }; + versiontools = callPackage ../development/python-modules/versiontools { }; + + vertica-python = callPackage ../development/python-modules/vertica-python { }; + + veryprettytable = callPackage ../development/python-modules/veryprettytable { }; + + vidstab = callPackage ../development/python-modules/vidstab { }; + viewstate = callPackage ../development/python-modules/viewstate { }; vine = callPackage ../development/python-modules/vine { }; + virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkgconfig; }; + + virtual-display = callPackage ../development/python-modules/virtual-display { }; + + virtualenv = callPackage ../development/python-modules/virtualenv { }; + + virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { }; + + virtualenvwrapper = callPackage ../development/python-modules/virtualenvwrapper { }; + visitor = callPackage ../development/python-modules/visitor { }; + vispy = callPackage ../development/python-modules/vispy { }; + + vmprof = callPackage ../development/python-modules/vmprof { }; + + vobject = callPackage ../development/python-modules/vobject { }; + + voluptuous = callPackage ../development/python-modules/voluptuous { }; + + voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; + + vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; + + vsts = callPackage ../development/python-modules/vsts { }; + + vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { }; + vtk = toPythonModule (pkgs.vtk_7.override { inherit (self) python; enablePython = true; }); - whitenoise = callPackage ../development/python-modules/whitenoise { }; + vultr = callPackage ../development/python-modules/vultr { }; - XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; + vulture = callPackage ../development/python-modules/vulture { }; - yowsup = callPackage ../development/python-modules/yowsup { }; + vxi11 = callPackage ../development/python-modules/vxi11 { }; - yubico-client = callPackage ../development/python-modules/yubico-client { }; + w3lib = callPackage ../development/python-modules/w3lib { }; - wptserve = callPackage ../development/python-modules/wptserve { }; + wadllib = callPackage ../development/python-modules/wadllib { }; - yenc = callPackage ../development/python-modules/yenc { }; + waitress = callPackage ../development/python-modules/waitress { }; - zeep = callPackage ../development/python-modules/zeep { }; + waitress-django = callPackage ../development/python-modules/waitress-django { }; - zeitgeist = disabledIf isPy3k - (toPythonModule (pkgs.zeitgeist.override{python2Packages=self;})).py; + wakeonlan = callPackage ../development/python-modules/wakeonlan { }; - zeroconf = callPackage ../development/python-modules/zeroconf { }; + Wand = callPackage ../development/python-modules/Wand { }; - zipfile36 = callPackage ../development/python-modules/zipfile36 { }; - - todoist = callPackage ../development/python-modules/todoist { }; - - zstd = callPackage ../development/python-modules/zstd { - inherit (pkgs) zstd pkgconfig; - }; - - zstandard = callPackage ../development/python-modules/zstandard { }; - - zxcvbn = callPackage ../development/python-modules/zxcvbn { }; - - incremental = callPackage ../development/python-modules/incremental { }; - - treq = callPackage ../development/python-modules/treq { }; - - snakeviz = callPackage ../development/python-modules/snakeviz { }; - - nitpick = callPackage ../applications/version-management/nitpick { }; - - pluginbase = callPackage ../development/python-modules/pluginbase { }; - - node-semver = callPackage ../development/python-modules/node-semver { }; - - diskcache = callPackage ../development/python-modules/diskcache { }; - - dissononce = callPackage ../development/python-modules/dissononce { }; - - distro = callPackage ../development/python-modules/distro { }; - - bz2file = callPackage ../development/python-modules/bz2file { }; - - smart_open = callPackage ../development/python-modules/smart_open { }; - - gensim = callPackage ../development/python-modules/gensim { }; - - genpy = callPackage ../development/python-modules/genpy { }; - - cymem = callPackage ../development/python-modules/cymem { }; - - ftfy = callPackage ../development/python-modules/ftfy { }; - - mmh3 = callPackage ../development/python-modules/mmh3 { }; - - murmurhash = callPackage ../development/python-modules/murmurhash { }; - - pkuseg = callPackage ../development/python-modules/pkuseg { }; - - plac = callPackage ../development/python-modules/plac { }; - - preshed = callPackage ../development/python-modules/preshed { }; - - backports_weakref = callPackage ../development/python-modules/backports_weakref { }; - - blis = callPackage ../development/python-modules/blis { }; - - srsly = callPackage ../development/python-modules/srsly { }; - - thinc = callPackage ../development/python-modules/thinc { }; - - wasabi = callPackage ../development/python-modules/wasabi { }; - - yahooweather = callPackage ../development/python-modules/yahooweather { }; - - somajo = callPackage ../development/python-modules/somajo { }; - - spacy = callPackage ../development/python-modules/spacy { }; - - spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; - - pyspark = callPackage ../development/python-modules/pyspark { }; - - pysensors = callPackage ../development/python-modules/pysensors { }; - - python-toolbox = callPackage ../development/python-modules/python-toolbox { }; - - pysnooper = callPackage ../development/python-modules/pysnooper { }; - - sseclient = callPackage ../development/python-modules/sseclient { }; + warlock = callPackage ../development/python-modules/warlock { }; warrant = callPackage ../development/python-modules/warrant { }; - textacy = callPackage ../development/python-modules/textacy { }; + wasabi = callPackage ../development/python-modules/wasabi { }; - tld = callPackage ../development/python-modules/tld { }; + watchdog = callPackage ../development/python-modules/watchdog { }; - tldextract = callPackage ../development/python-modules/tldextract { }; + WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; - transip = callPackage ../development/python-modules/transip { }; + wcwidth = callPackage ../development/python-modules/wcwidth { }; - pyemd = callPackage ../development/python-modules/pyemd { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; - openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); + webapp2 = callPackage ../development/python-modules/webapp2 { }; - pulp = callPackage ../development/python-modules/pulp { }; + webassets = callPackage ../development/python-modules/webassets { }; - pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; + web = callPackage ../development/python-modules/web { }; - cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; + webcolors = callPackage ../development/python-modules/webcolors { }; - behave = callPackage ../development/python-modules/behave { }; + webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; - bellows = callPackage ../development/python-modules/bellows { }; + webencodings = callPackage ../development/python-modules/webencodings { }; - pyhamcrest = if isPy3k then - callPackage ../development/python-modules/pyhamcrest { } - else - callPackage ../development/python-modules/pyhamcrest/1.nix { }; + webhelpers = callPackage ../development/python-modules/webhelpers { }; - pyhaversion = callPackage ../development/python-modules/pyhaversion { }; + webob = callPackage ../development/python-modules/webob { }; - parse = callPackage ../development/python-modules/parse { }; - - parse-type = callPackage ../development/python-modules/parse-type { }; - - ephem = callPackage ../development/python-modules/ephem { }; - - voluptuous = callPackage ../development/python-modules/voluptuous { }; - - voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; - - pysigset = callPackage ../development/python-modules/pysigset { }; - - us = callPackage ../development/python-modules/us { }; - - wsproto = if (pythonAtLeast "3.6") then - callPackage ../development/python-modules/wsproto { } - else - callPackage ../development/python-modules/wsproto/0.14.nix { }; - - h11 = callPackage ../development/python-modules/h11 { }; - - python-docx = callPackage ../development/python-modules/python-docx { }; - - python-doi = callPackage ../development/python-modules/python-doi { }; - - aiohue = callPackage ../development/python-modules/aiohue { }; - - PyMVGLive = callPackage ../development/python-modules/pymvglive { }; - - coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; - - pyowm = callPackage ../development/python-modules/pyowm { }; - - prometheus_client = callPackage ../development/python-modules/prometheus_client { }; - - pysdl2 = callPackage ../development/python-modules/pysdl2 { }; - - pyogg = callPackage ../development/python-modules/pyogg { }; - - rubymarshal = callPackage ../development/python-modules/rubymarshal { }; - - radio_beam = callPackage ../development/python-modules/radio_beam { }; - - spectral-cube = callPackage ../development/python-modules/spectral-cube { }; - - astunparse = callPackage ../development/python-modules/astunparse { }; - - gast = callPackage ../development/python-modules/gast { }; - - ibis = callPackage ../development/python-modules/ibis { }; - - ibis-framework = callPackage ../development/python-modules/ibis-framework { }; - - qiskit = callPackage ../development/python-modules/qiskit { }; - - qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; - - qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; - - qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; - - qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { }; - - qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; - - qasm2image = callPackage ../development/python-modules/qasm2image { }; - - simpy = callPackage ../development/python-modules/simpy { }; - - x256 = callPackage ../development/python-modules/x256 { }; - - yattag = callPackage ../development/python-modules/yattag { }; - - yfinance = callPackage ../development/python-modules/yfinance { }; - - xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); - - z3 = (toPythonModule (pkgs.z3.override { - inherit python; - })).python; - - zeroc-ice = callPackage ../development/python-modules/zeroc-ice { }; - - zm-py = callPackage ../development/python-modules/zm-py { }; - - rfc7464 = callPackage ../development/python-modules/rfc7464 { }; - - foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; - foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; }; - foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; }; - foundationdb61 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb61; }; - - libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { - inherit python; - })).python; - - libiio = (toPythonModule (pkgs.libiio.override { - inherit python; - })).python; - - localzone = callPackage ../development/python-modules/localzone { }; - - scour = callPackage ../development/python-modules/scour { }; - - pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 - - nanoleaf = callPackage ../development/python-modules/nanoleaf { }; - - nanotime = callPackage ../development/python-modules/nanotime { }; - - importlib-metadata = callPackage ../development/python-modules/importlib-metadata {}; - - importlib-resources = callPackage ../development/python-modules/importlib-resources {}; - - srptools = callPackage ../development/python-modules/srptools { }; - - srp = callPackage ../development/python-modules/srp { }; - - curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; - - pyatv = callPackage ../development/python-modules/pyatv { }; - - pybotvac = callPackage ../development/python-modules/pybotvac { }; - - pymetno = callPackage ../development/python-modules/pymetno { }; - - pytado = callPackage ../development/python-modules/pytado { }; - - casttube = callPackage ../development/python-modules/casttube { }; - - lzstring = callPackage ../development/python-modules/lzstring { }; - - flickrapi = callPackage ../development/python-modules/flickrapi { }; - - aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; - - mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; - - starlette = callPackage ../development/python-modules/starlette { }; - - uvicorn = callPackage ../development/python-modules/uvicorn { }; - - pydantic = callPackage ../development/python-modules/pydantic { }; - - fastapi = callPackage ../development/python-modules/fastapi { }; - - stringcase = callPackage ../development/python-modules/stringcase { }; + weboob = callPackage ../development/python-modules/weboob { }; webrtcvad = callPackage ../development/python-modules/webrtcvad { }; - pykwalify = callPackage ../development/python-modules/pykwalify { }; + websocket_client = callPackage ../development/python-modules/websocket_client { }; + + websockets = callPackage ../development/python-modules/websockets { }; + + websockify = callPackage ../development/python-modules/websockify { }; + + webtest = callPackage ../development/python-modules/webtest { }; + + werkzeug = callPackage ../development/python-modules/werkzeug { }; west = callPackage ../development/python-modules/west { }; @@ -7890,21 +7347,304 @@ in { wget = callPackage ../development/python-modules/wget { }; - runway-python = callPackage ../development/python-modules/runway-python { }; + wheel = callPackage ../development/python-modules/wheel { }; - pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; + whichcraft = callPackage ../development/python-modules/whichcraft { }; - hcloud = callPackage ../development/python-modules/hcloud { }; + whisper = callPackage ../development/python-modules/whisper { }; - managesieve = callPackage ../development/python-modules/managesieve { }; + whitenoise = callPackage ../development/python-modules/whitenoise { }; - pony = callPackage ../development/python-modules/pony { }; + whoosh = callPackage ../development/python-modules/whoosh { }; - rxv = callPackage ../development/python-modules/rxv { }; + widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; - userpath = callPackage ../development/python-modules/userpath { }; + willow = callPackage ../development/python-modules/willow { }; - pooch = callPackage ../development/python-modules/pooch {}; + word2vec = callPackage ../development/python-modules/word2vec { }; + + wordcloud = callPackage ../development/python-modules/wordcloud { }; + + wordfreq = callPackage ../development/python-modules/wordfreq { }; + + worldengine = callPackage ../development/python-modules/worldengine { }; + + wptserve = callPackage ../development/python-modules/wptserve { }; + + wrapt = callPackage ../development/python-modules/wrapt { }; + + wrf-python = callPackage ../development/python-modules/wrf-python { }; + + ws4py = callPackage ../development/python-modules/ws4py { }; + + wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; + + WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; + + wsgitools = callPackage ../development/python-modules/wsgitools { }; + + WSME = callPackage ../development/python-modules/WSME { }; + + wsproto = if (pythonAtLeast "3.6") then + callPackage ../development/python-modules/wsproto { } + else + callPackage ../development/python-modules/wsproto/0.14.nix { }; + + wtforms = callPackage ../development/python-modules/wtforms { }; + + wtf-peewee = callPackage ../development/python-modules/wtf-peewee { }; + + wurlitzer = callPackage ../development/python-modules/wurlitzer { }; + + wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { + wxGTK = pkgs.wxGTK30; + inherit (pkgs) pkgconfig; + }; + + wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { + inherit (pkgs) pkgconfig; + wxGTK = pkgs.wxGTK30.override { + withGtk2 = false; + withWebKit = true; + }; + }; + + wxPython = self.wxPython30; + + x11_hash = callPackage ../development/python-modules/x11_hash { }; + + x256 = callPackage ../development/python-modules/x256 { }; + + xapian = callPackage ../development/python-modules/xapian { xapian = pkgs.xapian; }; + + xapp = callPackage ../development/python-modules/xapp { + inherit (pkgs) gtk3 gobject-introspection polkit; + inherit (pkgs.cinnamon) xapps; + }; + + xarray = callPackage ../development/python-modules/xarray { }; + + xattr = callPackage ../development/python-modules/xattr { }; + + xcaplib = callPackage ../development/python-modules/xcaplib { }; + + xcffib = callPackage ../development/python-modules/xcffib { }; + + xdg = callPackage ../development/python-modules/xdg { }; + + xdis = callPackage ../development/python-modules/xdis { }; + + xdot = callPackage ../development/python-modules/xdot { }; + + xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); + + xgboost = callPackage ../development/python-modules/xgboost { xgboost = pkgs.xgboost; }; + + xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; + + xkcdpass = callPackage ../development/python-modules/xkcdpass { }; + + xlib = callPackage ../development/python-modules/xlib { }; + + xlrd = callPackage ../development/python-modules/xlrd { }; + + xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; + + XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; + + xlwt = callPackage ../development/python-modules/xlwt { }; + + xml2rfc = callPackage ../development/python-modules/xml2rfc { }; + + xmlschema = callPackage ../development/python-modules/xmlschema { }; + + xmltodict = callPackage ../development/python-modules/xmltodict { }; + + xmodem = callPackage ../development/python-modules/xmodem { }; + + xmpppy = callPackage ../development/python-modules/xmpppy { }; + + xnd = callPackage ../development/python-modules/xnd { }; + + xpybutil = callPackage ../development/python-modules/xpybutil { }; + + xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox { }; + + xstatic-bootstrap = callPackage ../development/python-modules/xstatic-bootstrap { }; + + xstatic = callPackage ../development/python-modules/xstatic { }; + + xstatic-jquery = callPackage ../development/python-modules/xstatic-jquery { }; + + xstatic-jquery-file-upload = callPackage ../development/python-modules/xstatic-jquery-file-upload { }; + + xstatic-jquery-ui = callPackage ../development/python-modules/xstatic-jquery-ui { }; + + xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments { }; + + xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { inherit (pkgs.xorg) xorgserver; }; + + xxhash = callPackage ../development/python-modules/xxhash { }; + + yahooweather = callPackage ../development/python-modules/yahooweather { }; + + yamllint = callPackage ../development/python-modules/yamllint { }; + + yanc = callPackage ../development/python-modules/yanc { }; + + yapf = callPackage ../development/python-modules/yapf { }; + + yappi = callPackage ../development/python-modules/yappi { }; + + Yapsy = callPackage ../development/python-modules/yapsy { }; + + yarg = callPackage ../development/python-modules/yarg { }; + + yarl = callPackage ../development/python-modules/yarl { }; + + yattag = callPackage ../development/python-modules/yattag { }; + + ydiff = callPackage ../development/python-modules/ydiff { }; + + yenc = callPackage ../development/python-modules/yenc { }; + + yfinance = callPackage ../development/python-modules/yfinance { }; + + yoda = toPythonModule (pkgs.yoda.override { inherit python; }); + + youtube-dl = callPackage ../tools/misc/youtube-dl { }; + + youtube-dl-light = callPackage ../tools/misc/youtube-dl { + ffmpegSupport = false; + phantomjsSupport = false; + }; + + yowsup = callPackage ../development/python-modules/yowsup { }; + + yt = callPackage ../development/python-modules/yt { }; + + yubico-client = callPackage ../development/python-modules/yubico-client { }; + + z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; + + z3 = (toPythonModule (pkgs.z3.override { inherit python; })).python; + + zake = callPackage ../development/python-modules/zake { }; + + zarr = callPackage ../development/python-modules/zarr { }; + + zbase32 = callPackage ../development/python-modules/zbase32 { }; + + zc_buildout221 = callPackage ../development/python-modules/buildout { }; + + zc_buildout = self.zc_buildout221; # A patched version of buildout, useful for buildout based development on Nix + + zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; + + zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; + + zconfig = callPackage ../development/python-modules/zconfig { }; + + zdaemon = callPackage ../development/python-modules/zdaemon { }; + + zeep = callPackage ../development/python-modules/zeep { }; + + zeitgeist = disabledIf isPy3k (toPythonModule (pkgs.zeitgeist.override { python2Packages = self; })).py; + + zerobin = callPackage ../development/python-modules/zerobin { }; + + zeroc-ice = callPackage ../development/python-modules/zeroc-ice { }; + + zeroconf = callPackage ../development/python-modules/zeroconf { }; + + zerorpc = callPackage ../development/python-modules/zerorpc { }; + + zetup = callPackage ../development/python-modules/zetup { }; + + zfec = callPackage ../development/python-modules/zfec { }; + + zha-quirks = callPackage ../development/python-modules/zha-quirks { }; + + zict = callPackage ../development/python-modules/zict { }; + + zigpy = callPackage ../development/python-modules/zigpy { }; + + zigpy-cc = callPackage ../development/python-modules/zigpy-cc { }; + + zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; + + zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + + zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; + + zimports = callPackage ../development/python-modules/zimports { }; + + zipfile36 = callPackage ../development/python-modules/zipfile36 { }; + + zipp = if pythonOlder "3.6" then + callPackage ../development/python-modules/zipp/1.nix { } + else + callPackage ../development/python-modules/zipp { }; + + zipstream = callPackage ../development/python-modules/zipstream { }; + + zm-py = callPackage ../development/python-modules/zm-py { }; + + zodb = callPackage ../development/python-modules/zodb { }; + + zodbpickle = callPackage ../development/python-modules/zodbpickle { }; + + zope_broken = callPackage ../development/python-modules/zope_broken { }; + + zope_component = callPackage ../development/python-modules/zope_component { }; + + zope_configuration = callPackage ../development/python-modules/zope_configuration { }; + + zope_contenttype = callPackage ../development/python-modules/zope_contenttype { }; + + zope_copy = callPackage ../development/python-modules/zope_copy { }; + + zope-deferredimport = callPackage ../development/python-modules/zope-deferredimport { }; + + zope_deprecation = callPackage ../development/python-modules/zope_deprecation { }; + + zope_dottedname = callPackage ../development/python-modules/zope_dottedname { }; + + zope_event = callPackage ../development/python-modules/zope_event { }; + + zope_exceptions = callPackage ../development/python-modules/zope_exceptions { }; + + zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { }; + + zope-hookable = callPackage ../development/python-modules/zope-hookable { }; + + zope_i18n = callPackage ../development/python-modules/zope_i18n { }; + + zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; + + zope_interface = callPackage ../development/python-modules/zope_interface { }; + + zope_lifecycleevent = callPackage ../development/python-modules/zope_lifecycleevent { }; + + zope_location = callPackage ../development/python-modules/zope_location { }; + + zope_proxy = callPackage ../development/python-modules/zope_proxy { }; + + zope_schema = callPackage ../development/python-modules/zope_schema { }; + + zope_size = callPackage ../development/python-modules/zope_size { }; + + zope_testing = callPackage ../development/python-modules/zope_testing { }; + + zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; + + zopfli = callPackage ../development/python-modules/zopfli { }; + + zstandard = callPackage ../development/python-modules/zstandard { }; + + zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkgconfig; }; + + zxcvbn = callPackage ../development/python-modules/zxcvbn { }; }); From d33f721ffaa4cd48c8bd2a23243fdf116daffee3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 31 Aug 2020 10:30:10 -0700 Subject: [PATCH 468/688] pythonPackages.boost: restore --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 54bbb192cce8..d0dab3dcfdf2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -876,6 +876,13 @@ in { boolean-py = callPackage ../development/python-modules/boolean-py { }; + # Build boost for this specific Python version + # TODO: use separate output for libboost_python.so + boost = toPythonModule (pkgs.boost.override { + inherit (self) python numpy; + enablePython = true; + }); + boto3 = callPackage ../development/python-modules/boto3 { }; boto = callPackage ../development/python-modules/boto { }; From 3dcbac45ef6b6d780920104bf2144652b2a6668f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 31 Aug 2020 10:38:29 -0700 Subject: [PATCH 469/688] python3Packages.pyqt5_with_qtwebkit: restore --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0dab3dcfdf2..611717b60f5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5171,6 +5171,13 @@ in { pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; + /* + `pyqt5_with_qtwebkit` should not be used by python libraries in + pkgs/development/python-modules/*. Putting this attribute in + `propagatedBuildInputs` may cause collisions. + */ + pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; + pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; From 32a9e0eea7c3a1ae529332bea049f00bbefcfda6 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 31 Aug 2020 13:50:12 -0400 Subject: [PATCH 470/688] nasc: 0.5.4 -> 0.7.5 * updates to meson build system * adapt to complications around libqalculate * update metadata * add update script --- .../science/math/nasc/default.nix | 61 ++++++++++++------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 002acbf3875f..265c0f259bd0 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -1,7 +1,9 @@ { stdenv , fetchFromGitHub -, fetchpatch , pkgconfig +, python3 +, meson +, ninja , vala , gtk3 , glib @@ -9,52 +11,67 @@ , libsoup , gtksourceview , libgee -, cmake +, nix-update-script +, webkitgtk , libqalculate -, cln +, intltool +, gnuplot , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "nasc"; - version = "0.5.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "parnold-x"; repo = pname; rev = version; - sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn"; + sha256 = "kSRc5RLkI6SBJirUYw6swZi8IJhaL3y74b2Zw8kh2XA="; + fetchSubmodules = true; }; - patches = [ - # fix build with gcc9 - (fetchpatch { - url = "https://github.com/parnold-x/nasc/commit/46b9b80e228b6b86001bded45d85e073a9411549.patch"; - sha256 = "1sm2aw0xhw2chk036r231nmp2f2ypxcmzggwljkn7wfzgg3h1mx3"; - }) - ]; - nativeBuildInputs = [ - cmake - vala + glib # post_install.py + gtk3 # post_install.py + intltool # for libqalculate + meson + ninja pkgconfig + python3 + vala wrapGAppsHook ]; buildInputs = [ - cln - libsoup - gtk3 glib + gtk3 gtksourceview libgee - libqalculate pantheon.elementary-icon-theme pantheon.granite - ]; + webkitgtk + # We add libqalculate's runtime dependencies because nasc has it as a modified subproject. + ] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + + # patch subproject. same code in libqalculate expression + substituteInPlace subprojects/libqalculate/libqalculate/Calculator-plot.cc \ + --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \ + --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - ' + ''; + + passthru = { + pdateScript = nix-update-script { + attrPath = pname; + }; + }; meta = with stdenv.lib; { - description = "Do maths like a normal person"; + description = "Do maths like a normal person, designed for elementary OS"; longDescription = '' It’s an app where you do maths like a normal person. It lets you type whatever you want and smartly figures out what is math and @@ -63,7 +80,7 @@ stdenv.mkDerivation rec { the equations it’s used in. ''; homepage = "https://github.com/parnold-x/nasc"; - maintainers = with maintainers; [ samdroid-apps ]; + maintainers = pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3Plus; }; From 20252b3cb63d63da5a0dbc9d18550fdcaa32cdc2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 31 Aug 2020 13:53:25 -0400 Subject: [PATCH 471/688] nasc: typo --- pkgs/applications/science/math/nasc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 265c0f259bd0..9d14df5a7988 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; passthru = { - pdateScript = nix-update-script { + updateScript = nix-update-script { attrPath = pname; }; }; From 2c0f6e554c60da6c2d2ef17f7e3be3f3754e774c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 31 Aug 2020 10:50:22 -0700 Subject: [PATCH 472/688] python3Packages.pywbem: restore --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 611717b60f5c..6e5fef139612 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5815,6 +5815,9 @@ in { pywavelets = callPackage ../development/python-modules/pywavelets { }; + # We need "normal" libxml2 and not the python package by the same name. + pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; + PyWebDAV = callPackage ../development/python-modules/pywebdav { }; pywebpush = callPackage ../development/python-modules/pywebpush { }; From 5af6febf48b6ad26fff848bb421f6b4652dd3c7b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 31 Aug 2020 10:51:12 -0700 Subject: [PATCH 473/688] python3Packages.tornado_: restore pinned versions --- pkgs/top-level/python-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e5fef139612..db0ef635e9a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6990,6 +6990,12 @@ in { else callPackage ../development/python-modules/tornado/5.nix { }; + # Used by circus and grab-site, 2020-08-29 + tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; + + # Used by luigi, 2020-08-29 + tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; + towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; }; tox = callPackage ../development/python-modules/tox { }; From 784e32ec1af8093664ebf8f9428e59a88a7ec8e8 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 31 Aug 2020 00:46:22 +0200 Subject: [PATCH 474/688] droopy: use python 3.7 for macpath droopy uses the macpath module which got removed in python 3.8. Pinning the python version to 3.7 fixes the ensuing runtime failure (for now). --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1140be1057d..e570f24741a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19980,9 +19980,7 @@ in buildServerGui = false; }; - droopy = callPackage ../applications/networking/droopy { - inherit (python3Packages) wrapPython; - }; + droopy = python37Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; From 6bdad12b56cf406d6f8653036a50da2639a838ff Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 31 Aug 2020 15:03:14 +0100 Subject: [PATCH 475/688] pythonPackages.keep: init at 2.9 --- .../python-modules/keep/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/keep/default.nix diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix new file mode 100644 index 000000000000..6108ea506892 --- /dev/null +++ b/pkgs/development/python-modules/keep/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, PyGithub +, terminaltables +, click +, requests +}: + +buildPythonPackage rec { + pname = "keep"; + version = "2.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0902kcvhbmy5q5n0ai1df29ybf87qaljz306c5ssl8j9xdjipcq2"; + }; + + propagatedBuildInputs = [ + click + requests + terminaltables + PyGithub + ]; + + # no tests + pythonImportsCheck = [ "keep" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/orkohunter/keep"; + description = "A Meta CLI toolkit: Personal shell command keeper and snippets manager"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db0ef635e9a5..8654a230391f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3104,6 +3104,8 @@ in { kconfiglib = callPackage ../development/python-modules/kconfiglib { }; + keep = callPackage ../development/python-modules/keep { }; + keepalive = callPackage ../development/python-modules/keepalive { }; keepkey_agent = callPackage ../development/python-modules/keepkey_agent { }; From f2e3b79750033fa2e87e3925d10a46f2ff091302 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 31 Aug 2020 15:05:07 +0100 Subject: [PATCH 476/688] pythonPackages.howdoi: 2.0.3 -> 2.0.4, fix build had to disable the tests (hopefully temporarily) because of missing page_cache directory in release tarball. removed no-longer-needed requests-cache dependency --- .../python-modules/howdoi/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 93db5f48e40b..83f340fc8d81 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -2,27 +2,37 @@ , buildPythonPackage , fetchPypi , six -, requests-cache , pygments , pyquery , cachelib , appdirs +, keep }: buildPythonPackage rec { pname = "howdoi"; - version = "2.0.3"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "ed8acb75779f598a831224f33fa991c51764872574a128e9b2f11b83fcace010"; + sha256 = "0hq5biy0mpycbji2mikfbflw4r39prylr47iqhlz234kvwdy0jsg"; }; - propagatedBuildInputs = [ six requests-cache pygments pyquery cachelib appdirs ]; + postPatch = '' + substituteInPlace setup.py --replace 'cachelib==0.1' 'cachelib' + ''; + propagatedBuildInputs = [ six pygments pyquery cachelib appdirs keep ]; + + # author hasn't included page_cache directory (which allows tests to run without + # external requests) in pypi tarball. github repo doesn't have release revisions + # clearly tagged. re-enable tests when either is sorted. + doCheck = false; preCheck = '' + mv howdoi _howdoi export HOME=$(mktemp -d) ''; + pythonImportsCheck = [ "howdoi" ]; meta = with lib; { description = "Instant coding answers via the command line"; From 94e0b94a1d4bf1f661d1c0209dc022cb3b917514 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 31 Aug 2020 21:17:10 +0200 Subject: [PATCH 477/688] zigbee2mqtt: 1.14.2 -> 1.14.3 --- pkgs/servers/zigbee2mqtt/default.nix | 4 +- pkgs/servers/zigbee2mqtt/node-packages.nix | 1472 ++++++++++---------- 2 files changed, 709 insertions(+), 767 deletions(-) diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index ad351c89a668..7680bfe2e417 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -3,7 +3,7 @@ let package = (import ./node.nix { inherit pkgs system; }).package; in package.override rec { - version = "1.14.2"; + version = "1.14.3"; reconstructLock = true; postInstall = '' @@ -20,7 +20,7 @@ package.override rec { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "0yv51rds28az5pqzgkprhrzwmky29l1mvqb73l7dbs8qlx8x1x52"; + sha256 = "164ddb8i4r6rjahjic09sd24xbms4d6b6bnwx0d9fh8sn3ib4v06"; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index df818634036a..62cc54c86364 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@babel/cli-7.10.4" = { + "@babel/cli-7.10.5" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.10.4.tgz"; - sha512 = "xX99K4V1BzGJdQANK5cwK+EpF1vP9gvqhn+iWvG+TubCjecplW7RSQimJ2jcCvu6fnK5pY6mZMdu6EWTj32QVA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.10.5.tgz"; + sha512 = "j9H9qSf3kLdM0Ao3aGPbGZ73mEA9XazuupcS6cDGWuiyAcANoguhP0r2Lx32H5JGw4sSSoHG3x/mxVnHgvOoyA=="; }; }; "@babel/code-frame-7.10.4" = { @@ -22,49 +22,31 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/compat-data-7.10.4" = { + "@babel/compat-data-7.11.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.4.tgz"; - sha512 = "t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz"; + sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; }; }; - "@babel/core-7.10.4" = { + "@babel/core-7.11.1" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.10.4"; + version = "7.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.10.4.tgz"; - sha512 = "3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz"; + sha512 = "XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ=="; }; }; - "@babel/core-7.10.5" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.10.5.tgz"; - sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; - }; - }; - "@babel/generator-7.10.4" = { + "@babel/generator-7.11.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz"; - sha512 = "toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng=="; - }; - }; - "@babel/generator-7.10.5" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz"; - sha512 = "3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz"; + sha512 = "fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -94,13 +76,13 @@ let sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.10.4" = { + "@babel/helper-create-class-features-plugin-7.10.5" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.4.tgz"; - sha512 = "9raUiOsXPxzzLjCXeosApJItoMnX3uyT4QdM2UldffuGApNrF8e938MwNpDCK9CPoyxrEoCgT+hObJc3mZa6lQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"; + sha512 = "0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A=="; }; }; "@babel/helper-create-regexp-features-plugin-7.10.4" = { @@ -112,13 +94,13 @@ let sha512 = "2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g=="; }; }; - "@babel/helper-define-map-7.10.4" = { + "@babel/helper-define-map-7.10.5" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz"; - sha512 = "nIij0oKErfCnLUCWaCaHW0Bmtl2RO9cN7+u2QT8yqTywgALKlyUVOvHDElh+b5DwVC6YB1FOYFOTWcN/+41EDA=="; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; + sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; }; }; "@babel/helper-explode-assignable-expression-7.10.4" = { @@ -157,22 +139,13 @@ let sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; }; }; - "@babel/helper-member-expression-to-functions-7.10.4" = { + "@babel/helper-member-expression-to-functions-7.11.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz"; - sha512 = "m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A=="; - }; - }; - "@babel/helper-member-expression-to-functions-7.10.5" = { - name = "_at_babel_slash_helper-member-expression-to-functions"; - packageName = "@babel/helper-member-expression-to-functions"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz"; - sha512 = "HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; + sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q=="; }; }; "@babel/helper-module-imports-7.10.4" = { @@ -184,22 +157,13 @@ let sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; }; }; - "@babel/helper-module-transforms-7.10.4" = { + "@babel/helper-module-transforms-7.11.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.4.tgz"; - sha512 = "Er2FQX0oa3nV7eM1o0tNCTx7izmQtwAQsIiaLRWtavAAEcskb0XJ5OjJbVrYXWOTr8om921Scabn4/tzlx7j1Q=="; - }; - }; - "@babel/helper-module-transforms-7.10.5" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz"; - sha512 = "4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; + sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg=="; }; }; "@babel/helper-optimise-call-expression-7.10.4" = { @@ -220,13 +184,13 @@ let sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; }; }; - "@babel/helper-regex-7.10.4" = { + "@babel/helper-regex-7.10.5" = { name = "_at_babel_slash_helper-regex"; packageName = "@babel/helper-regex"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.4.tgz"; - sha512 = "inWpnHGgtg5NOF0eyHlC0/74/VkdRITY9dtTpB2PrxKKn+AkVMRiZz/Adrx+Ssg+MLDesi2zohBW6MVq6b4pOQ=="; + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz"; + sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg=="; }; }; "@babel/helper-remap-async-to-generator-7.10.4" = { @@ -256,13 +220,22 @@ let sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="; }; }; - "@babel/helper-split-export-declaration-7.10.4" = { + "@babel/helper-skip-transparent-expression-wrappers-7.11.0" = { + name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; + packageName = "@babel/helper-skip-transparent-expression-wrappers"; + version = "7.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; + sha512 = "0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q=="; + }; + }; + "@babel/helper-split-export-declaration-7.11.0" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; - sha512 = "pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; + sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg=="; }; }; "@babel/helper-validator-identifier-7.10.4" = { @@ -301,31 +274,22 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.10.4" = { + "@babel/parser-7.11.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.10.4"; + version = "7.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz"; - sha512 = "8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz"; + sha512 = "REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA=="; }; }; - "@babel/parser-7.10.5" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz"; - sha512 = "wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ=="; - }; - }; - "@babel/plugin-proposal-async-generator-functions-7.10.4" = { + "@babel/plugin-proposal-async-generator-functions-7.10.5" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz"; - sha512 = "MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz"; + sha512 = "cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg=="; }; }; "@babel/plugin-proposal-class-properties-7.10.4" = { @@ -346,6 +310,15 @@ let sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ=="; }; }; + "@babel/plugin-proposal-export-namespace-from-7.10.4" = { + name = "_at_babel_slash_plugin-proposal-export-namespace-from"; + packageName = "@babel/plugin-proposal-export-namespace-from"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; + sha512 = "aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg=="; + }; + }; "@babel/plugin-proposal-json-strings-7.10.4" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; @@ -355,6 +328,15 @@ let sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw=="; }; }; + "@babel/plugin-proposal-logical-assignment-operators-7.11.0" = { + name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; + packageName = "@babel/plugin-proposal-logical-assignment-operators"; + version = "7.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; + sha512 = "/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q=="; + }; + }; "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; @@ -373,13 +355,13 @@ let sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.10.4" = { + "@babel/plugin-proposal-object-rest-spread-7.11.0" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz"; - sha512 = "6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"; + sha512 = "wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.10.4" = { @@ -391,13 +373,13 @@ let sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.10.4" = { + "@babel/plugin-proposal-optional-chaining-7.11.0" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz"; - sha512 = "ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; + sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA=="; }; }; "@babel/plugin-proposal-private-methods-7.10.4" = { @@ -454,6 +436,15 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; + "@babel/plugin-syntax-export-namespace-from-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-export-namespace-from"; + packageName = "@babel/plugin-syntax-export-namespace-from"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; + }; + }; "@babel/plugin-syntax-import-meta-7.10.4" = { name = "_at_babel_slash_plugin-syntax-import-meta"; packageName = "@babel/plugin-syntax-import-meta"; @@ -571,13 +562,13 @@ let sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA=="; }; }; - "@babel/plugin-transform-block-scoping-7.10.4" = { + "@babel/plugin-transform-block-scoping-7.11.1" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.10.4"; + version = "7.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz"; - sha512 = "J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; + sha512 = "00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew=="; }; }; "@babel/plugin-transform-classes-7.10.4" = { @@ -670,13 +661,13 @@ let sha512 = "0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw=="; }; }; - "@babel/plugin-transform-modules-amd-7.10.4" = { + "@babel/plugin-transform-modules-amd-7.10.5" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.4.tgz"; - sha512 = "3Fw+H3WLUrTlzi3zMiZWp3AR4xadAEMv6XRCYnd5jAlLM61Rn+CRJaZMaNvIpcJpQ3vs1kyifYvEVPFfoSkKOA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz"; + sha512 = "elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw=="; }; }; "@babel/plugin-transform-modules-commonjs-7.10.4" = { @@ -688,13 +679,13 @@ let sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.10.4" = { + "@babel/plugin-transform-modules-systemjs-7.10.5" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz"; - sha512 = "Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz"; + sha512 = "f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw=="; }; }; "@babel/plugin-transform-modules-umd-7.10.4" = { @@ -733,13 +724,13 @@ let sha512 = "5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ=="; }; }; - "@babel/plugin-transform-parameters-7.10.4" = { + "@babel/plugin-transform-parameters-7.10.5" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz"; - sha512 = "RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz"; + sha512 = "xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw=="; }; }; "@babel/plugin-transform-property-literals-7.10.4" = { @@ -778,13 +769,13 @@ let sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q=="; }; }; - "@babel/plugin-transform-spread-7.10.4" = { + "@babel/plugin-transform-spread-7.11.0" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz"; - sha512 = "1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; + sha512 = "UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw=="; }; }; "@babel/plugin-transform-sticky-regex-7.10.4" = { @@ -796,13 +787,13 @@ let sha512 = "Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ=="; }; }; - "@babel/plugin-transform-template-literals-7.10.4" = { + "@babel/plugin-transform-template-literals-7.10.5" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz"; - sha512 = "4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz"; + sha512 = "V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw=="; }; }; "@babel/plugin-transform-typeof-symbol-7.10.4" = { @@ -814,13 +805,13 @@ let sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA=="; }; }; - "@babel/plugin-transform-typescript-7.10.4" = { + "@babel/plugin-transform-typescript-7.11.0" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.4.tgz"; - sha512 = "3WpXIKDJl/MHoAN0fNkSr7iHdUMHZoppXjf2HJ9/ed5Xht5wNIsXllJXdityKOxeA3Z8heYRb1D3p2H5rfCdPw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz"; + sha512 = "edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w=="; }; }; "@babel/plugin-transform-unicode-escapes-7.10.4" = { @@ -841,13 +832,13 @@ let sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; }; }; - "@babel/preset-env-7.10.4" = { + "@babel/preset-env-7.11.0" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.4.tgz"; - sha512 = "tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz"; + sha512 = "2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg=="; }; }; "@babel/preset-modules-0.1.3" = { @@ -868,13 +859,13 @@ let sha512 = "SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ=="; }; }; - "@babel/runtime-7.10.4" = { + "@babel/runtime-7.11.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.10.4"; + version = "7.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.4.tgz"; - sha512 = "UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz"; + sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; }; }; "@babel/template-7.10.4" = { @@ -886,40 +877,22 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.10.4" = { + "@babel/traverse-7.11.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz"; - sha512 = "aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz"; + sha512 = "ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg=="; }; }; - "@babel/traverse-7.10.5" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz"; - sha512 = "yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ=="; - }; - }; - "@babel/types-7.10.4" = { + "@babel/types-7.11.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz"; - sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; - }; - }; - "@babel/types-7.10.5" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz"; - sha512 = "ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz"; + sha512 = "O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -967,58 +940,58 @@ let sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; }; - "@jest/console-26.1.0" = { + "@jest/console-26.2.0" = { name = "_at_jest_slash_console"; packageName = "@jest/console"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-26.1.0.tgz"; - sha512 = "+0lpTHMd/8pJp+Nd4lyip+/Iyf2dZJvcCqrlkeZQoQid+JlThA4M9vxHtheyrQ99jJTMQam+es4BcvZ5W5cC3A=="; + url = "https://registry.npmjs.org/@jest/console/-/console-26.2.0.tgz"; + sha512 = "mXQfx3nSLwiHm1i7jbu+uvi+vvpVjNGzIQYLCfsat9rapC+MJkS4zBseNrgJE0vU921b3P67bQzhduphjY3Tig=="; }; }; - "@jest/core-26.1.0" = { + "@jest/core-26.2.2" = { name = "_at_jest_slash_core"; packageName = "@jest/core"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-26.1.0.tgz"; - sha512 = "zyizYmDJOOVke4OO/De//aiv8b07OwZzL2cfsvWF3q9YssfpcKfcnZAwDY8f+A76xXSMMYe8i/f/LPocLlByfw=="; + url = "https://registry.npmjs.org/@jest/core/-/core-26.2.2.tgz"; + sha512 = "UwA8gNI8aeV4FHGfGAUfO/DHjrFVvlBravF1Tm9Kt6qFE+6YHR47kFhgdepOFpADEKstyO+MVdPvkV6/dyt9sA=="; }; }; - "@jest/environment-26.1.0" = { + "@jest/environment-26.2.0" = { name = "_at_jest_slash_environment"; packageName = "@jest/environment"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-26.1.0.tgz"; - sha512 = "86+DNcGongbX7ai/KE/S3/NcUVZfrwvFzOOWX/W+OOTvTds7j07LtC+MgGydH5c8Ri3uIrvdmVgd1xFD5zt/xA=="; + url = "https://registry.npmjs.org/@jest/environment/-/environment-26.2.0.tgz"; + sha512 = "oCgp9NmEiJ5rbq9VI/v/yYLDpladAAVvFxZgNsnJxOETuzPZ0ZcKKHYjKYwCtPOP1WCrM5nmyuOhMStXFGHn+g=="; }; }; - "@jest/fake-timers-26.1.0" = { + "@jest/fake-timers-26.2.0" = { name = "_at_jest_slash_fake-timers"; packageName = "@jest/fake-timers"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.1.0.tgz"; - sha512 = "Y5F3kBVWxhau3TJ825iuWy++BAuQzK/xEa+wD9vDH3RytW9f2DbMVodfUQC54rZDX3POqdxCgcKdgcOL0rYUpA=="; + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.2.0.tgz"; + sha512 = "45Gfe7YzYTKqTayBrEdAF0qYyAsNRBzfkV0IyVUm3cx7AsCWlnjilBM4T40w7IXT5VspOgMPikQlV0M6gHwy/g=="; }; }; - "@jest/globals-26.1.0" = { + "@jest/globals-26.2.0" = { name = "_at_jest_slash_globals"; packageName = "@jest/globals"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/globals/-/globals-26.1.0.tgz"; - sha512 = "MKiHPNaT+ZoG85oMaYUmGHEqu98y3WO2yeIDJrs2sJqHhYOy3Z6F7F/luzFomRQ8SQ1wEkmahFAz2291Iv8EAw=="; + url = "https://registry.npmjs.org/@jest/globals/-/globals-26.2.0.tgz"; + sha512 = "Hoc6ScEIPaym7RNytIL2ILSUWIGKlwEv+JNFof9dGYOdvPjb2evEURSslvCMkNuNg1ECEClTE8PH7ULlMJntYA=="; }; }; - "@jest/reporters-26.1.0" = { + "@jest/reporters-26.2.2" = { name = "_at_jest_slash_reporters"; packageName = "@jest/reporters"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.1.0.tgz"; - sha512 = "SVAysur9FOIojJbF4wLP0TybmqwDkdnFxHSPzHMMIYyBtldCW9gG+Q5xWjpMFyErDiwlRuPyMSJSU64A67Pazg=="; + url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.2.2.tgz"; + sha512 = "7854GPbdFTAorWVh+RNHyPO9waRIN6TcvCezKVxI1khvFq9YjINTW7J3WU+tbR038Ynn6WjYred6vtT0YmIWVQ=="; }; }; "@jest/source-map-26.1.0" = { @@ -1030,31 +1003,31 @@ let sha512 = "XYRPYx4eEVX15cMT9mstnO7hkHP3krNtKfxUYd8L7gbtia8JvZZ6bMzSwa6IQJENbudTwKMw5R1BePRD+bkEmA=="; }; }; - "@jest/test-result-26.1.0" = { + "@jest/test-result-26.2.0" = { name = "_at_jest_slash_test-result"; packageName = "@jest/test-result"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.1.0.tgz"; - sha512 = "Xz44mhXph93EYMA8aYDz+75mFbarTV/d/x0yMdI3tfSRs/vh4CqSxgzVmCps1fPkHDCtn0tU8IH9iCKgGeGpfw=="; + url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.2.0.tgz"; + sha512 = "kgPlmcVafpmfyQEu36HClK+CWI6wIaAWDHNxfQtGuKsgoa2uQAYdlxjMDBEa3CvI40+2U3v36gQF6oZBkoKatw=="; }; }; - "@jest/test-sequencer-26.1.0" = { + "@jest/test-sequencer-26.2.2" = { name = "_at_jest_slash_test-sequencer"; packageName = "@jest/test-sequencer"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.1.0.tgz"; - sha512 = "Z/hcK+rTq56E6sBwMoQhSRDVjqrGtj1y14e2bIgcowARaIE1SgOanwx6gvY4Q9gTKMoZQXbXvptji+q5GYxa6Q=="; + url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.2.2.tgz"; + sha512 = "SliZWon5LNqV/lVXkeowSU6L8++FGOu3f43T01L1Gv6wnFDP00ER0utV9jyK9dVNdXqfMNCN66sfcyar/o7BNw=="; }; }; - "@jest/transform-26.1.0" = { + "@jest/transform-26.2.2" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-26.1.0.tgz"; - sha512 = "ICPm6sUXmZJieq45ix28k0s+d/z2E8CHDsq+WwtWI6kW8m7I8kPqarSEcUN86entHQ570ZBRci5OWaKL0wlAWw=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-26.2.2.tgz"; + sha512 = "c1snhvi5wRVre1XyoO3Eef5SEWpuBCH/cEbntBUd9tI5sNYiBDmO0My/lc5IuuGYKp/HFIHV1eZpSx5yjdkhKw=="; }; }; "@jest/types-25.5.0" = { @@ -1066,112 +1039,103 @@ let sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; - "@jest/types-26.1.0" = { + "@jest/types-26.2.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz"; - sha512 = "GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ=="; + url = "https://registry.npmjs.org/@jest/types/-/types-26.2.0.tgz"; + sha512 = "lvm3rJvctxd7+wxKSxxbzpDbr4FXDLaC57WEKdUIZ2cjTYuxYSc0zlyD7Z4Uqr5VdKxRUrtwIkiqBuvgf8uKJA=="; }; }; - "@serialport/binding-abstract-9.0.0" = { + "@serialport/binding-abstract-9.0.1" = { name = "_at_serialport_slash_binding-abstract"; packageName = "@serialport/binding-abstract"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.0.0.tgz"; - sha512 = "ZU+6ZypP33Rzda1cDnpN0+CNfnODwbRU66GBawNtj2+xE+OMI7a0hbuZAYvQ+BThyDfdX/vn55P1YYeVWI8qpQ=="; + url = "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.0.1.tgz"; + sha512 = "ncUFSRyVdpyCRuah2dzrs99UfEWWMAhV31ae2FT6j4f8TypQ8OgAF8KkcHiD4M3wORDh3UKCCTS7n8aJWge1RA=="; }; }; - "@serialport/binding-mock-9.0.0" = { + "@serialport/binding-mock-9.0.1" = { name = "_at_serialport_slash_binding-mock"; packageName = "@serialport/binding-mock"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.0.tgz"; - sha512 = "E65ZbykGwZSoHpQvjuJkTbwEM0uZku+SROtO+VMs/mShMalBnOSoRDU2IedkFKvz6IqowZZOVyaBUbnKYoAUuQ=="; + url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.1.tgz"; + sha512 = "C01T6iX+nNKB7S6BhQEy5nfk4lUk/CkdFEfen9DDPYhtFtIsm5GCGvRB3Fjnp+8oDrGWJOrZfxFf3kWOOx665A=="; }; }; - "@serialport/bindings-9.0.0" = { + "@serialport/bindings-9.0.1" = { name = "_at_serialport_slash_bindings"; packageName = "@serialport/bindings"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.0.tgz"; - sha512 = "2LoYX80h5U8uIgpPaBXpIhs9uXIPhn6k+9u0FH3mFPHHeJ/tyVliwbj7uxdQ6xAUe5Zf3T2cH9JC/LnxewWyuw=="; + url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.1.tgz"; + sha512 = "O5QuwCdnHuZygBKw7tVq2wHysfOnCbOyKtR/k9T9zHqptd89Tzy6xJQNtnrcbV/2D22noKX6yWj+1wqvNe6NRA=="; }; }; - "@serialport/parser-byte-length-9.0.0" = { + "@serialport/parser-byte-length-9.0.1" = { name = "_at_serialport_slash_parser-byte-length"; packageName = "@serialport/parser-byte-length"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-9.0.0.tgz"; - sha512 = "MaXWTqxz9SeWaN488uFhDMA3cy2sQFoGHDQqDpy6q9wBGlPBe+UpRAznzOoNPkAehqyPo1Vc7gxYsBfgjZtWaw=="; + url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-9.0.1.tgz"; + sha512 = "1Ikv4lgCNw8OMf35yCpgzjHwkpgBEkhBuXFXIdWZk+ixaHFLlAtp03QxGPZBmzHMK58WDmEQoBHC1V5BkkAKSQ=="; }; }; - "@serialport/parser-cctalk-9.0.0" = { + "@serialport/parser-cctalk-9.0.1" = { name = "_at_serialport_slash_parser-cctalk"; packageName = "@serialport/parser-cctalk"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-9.0.0.tgz"; - sha512 = "tFJRF+uceEMYQeOLi92CYr1SScnI+2QLkawNHaVwwcmLV0ezwmsm1hvwBCWHkWDsY6U1SiElNJ5HpF89kS28zQ=="; + url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-9.0.1.tgz"; + sha512 = "GtMda2DeJ+23bNqOc79JYV06dax2n3FLLFM3zA7nfReCOi98QbuDj4TUbFESMOnp4DB0oMO0GYHCR9gHOedTkg=="; }; }; - "@serialport/parser-delimiter-9.0.0" = { + "@serialport/parser-delimiter-9.0.1" = { name = "_at_serialport_slash_parser-delimiter"; packageName = "@serialport/parser-delimiter"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.0.0.tgz"; - sha512 = "OesbvlJf1BjFC1zde6cnW1RttxZ8BoXGCOiNvM9mLKdvJ06l9o/4HyVCg2bymj6ziy/gz4407pwyPfvVYApE3A=="; + url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.0.1.tgz"; + sha512 = "+oaSl5zEu47OlrRiF5p5tn2qgGqYuhVcE+NI+Pv4E1xsNB/A0fFxxMv/8XUw466CRLEJ5IESIB9qbFvKE6ltaQ=="; }; }; - "@serialport/parser-readline-9.0.0" = { + "@serialport/parser-readline-9.0.1" = { name = "_at_serialport_slash_parser-readline"; packageName = "@serialport/parser-readline"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.0.0.tgz"; - sha512 = "JMCqfn6A+BzcCc/4upYeLB48zijBJmOO/YGcyilXgCW0Mfedqsewgtatmk2tqFhQoJfjyOu3dRE3Lz9xHlRGZQ=="; + url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.0.1.tgz"; + sha512 = "38058gxvyfgdeLpg3aUyD98NuWkVB9yyTLpcSdeQ3GYiupivwH6Tdy/SKPmxlHIw3Ml2qil5MR2mtW2fLPB5CQ=="; }; }; - "@serialport/parser-ready-9.0.0" = { + "@serialport/parser-ready-9.0.1" = { name = "_at_serialport_slash_parser-ready"; packageName = "@serialport/parser-ready"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-9.0.0.tgz"; - sha512 = "oSQR7773Jdc6SjXMA1mWgfFlyBLcIRlZtt1BJMfO07k3ynBmanJ4VysVDTDvxtsREHLgcjoLRKQC/6wl2wvXOQ=="; + url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-9.0.1.tgz"; + sha512 = "lgzGkVJaaV1rJVx26WwI2UKyPxc0vu1rsOeldzA3VVbF+ABrblUQA06+cRPpT6k96GY+X4+1fB1rWuPpt8HbgQ=="; }; }; - "@serialport/parser-regex-9.0.0" = { + "@serialport/parser-regex-9.0.1" = { name = "_at_serialport_slash_parser-regex"; packageName = "@serialport/parser-regex"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-9.0.0.tgz"; - sha512 = "Q4LDXbWnun5r1ML6ZLS5Wb2BurnkJjtP1geHtZbshLUmpfms++Q28li8OPzv/KQ6praC1HDRG37D0AY6xoObSw=="; + url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-9.0.1.tgz"; + sha512 = "BHTV+Lkl+J8hSecFtDRENaR4fgA6tw44J+dmA1vEKEyum0iDN4bihbu8yvztYyo4PhBGUKDfm/PnD5EkJm0dPA=="; }; }; - "@serialport/stream-9.0.0" = { + "@serialport/stream-9.0.1" = { name = "_at_serialport_slash_stream"; packageName = "@serialport/stream"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.0.tgz"; - sha512 = "JK952xKP+7PX3tXj9DgKafQaAru0sdbkTIY1OpjUNGp0xYWTVUbZRnLK//MLkH6FpoDTJc9ghN2ILK0YRtpLLA=="; - }; - }; - "@sinonjs/commons-1.8.0" = { - name = "_at_sinonjs_slash_commons"; - packageName = "@sinonjs/commons"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz"; - sha512 = "wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q=="; + url = "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.1.tgz"; + sha512 = "S1xaf99vygbrMDNS/9GHYZYskWJHXJy6dCksW+ME2dzNXEXpz64vF0iug1tC1EIAhME9oD/s3ky2C9CUAd/GUg=="; }; }; "@sinonjs/commons-1.8.1" = { @@ -1291,13 +1255,13 @@ let sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; }; }; - "@types/jest-26.0.4" = { + "@types/jest-26.0.9" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "26.0.4"; + version = "26.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.4.tgz"; - sha512 = "4fQNItvelbNA9+sFgU+fhJo8ZFF+AS4Egk3GWwCW2jFtViukXbnztccafAdLhzE/0EiCogljtQQXP8aQ9J7sFg=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.9.tgz"; + sha512 = "k4qFfJ5AUKrWok5KYXp2EPm89b0P/KZpl7Vg4XuOTVVQEhLDBDBU3iBFrjjdgd8fLw96aAtmnwhXHl63bWeBQQ=="; }; }; "@types/json-schema-7.0.5" = { @@ -1318,22 +1282,13 @@ let sha512 = "M0ISm1qsNvkdXNZml1r/1bEVqt5SJHF/LFcCtH5dHfsSIG0LEj5FhwK0f4fZy9WPCsXjmrKfpzgEW/bdQuKqmQ=="; }; }; - "@types/node-14.0.22" = { + "@types/node-14.0.27" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.22"; + version = "14.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.22.tgz"; - sha512 = "emeGcJvdiZ4Z3ohbmw93E/64jRzUHAItSHt8nF7M4TGgQTiWqFVGB8KNpLGFmUHmHLvjvBgFwVlqNcq+VuGv9g=="; - }; - }; - "@types/node-14.0.23" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.0.23"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.23.tgz"; - sha512 = "Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz"; + sha512 = "kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g=="; }; }; "@types/normalize-package-data-2.4.0" = { @@ -1390,13 +1345,13 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; - "@typescript-eslint/eslint-plugin-3.6.0" = { + "@typescript-eslint/eslint-plugin-3.8.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.6.0.tgz"; - sha512 = "ubHlHVt1lsPQB/CZdEov9XuOFhNG9YRC//kuiS1cMQI6Bs1SsqKrEmZnpgRwthGR09/kEDtr9MywlqXyyYd8GA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.8.0.tgz"; + sha512 = "lFb4VCDleFSR+eo4Ew+HvrJ37ZH1Y9ZyE+qyP7EiwBpcCVxwmUc5PAqhShCQ8N8U5vqYydm74nss+a0wrrCErw=="; }; }; "@typescript-eslint/experimental-utils-2.34.0" = { @@ -1408,31 +1363,31 @@ let sha512 = "eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA=="; }; }; - "@typescript-eslint/experimental-utils-3.6.0" = { + "@typescript-eslint/experimental-utils-3.8.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.6.0.tgz"; - sha512 = "4Vdf2hvYMUnTdkCNZu+yYlFtL2v+N2R7JOynIOkFbPjf9o9wQvRwRkzUdWlFd2YiiUwJLbuuLnl5civNg5ykOQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.8.0.tgz"; + sha512 = "o8T1blo1lAJE0QDsW7nSyvZHbiDzQDjINJKyB44Z3sSL39qBy5L10ScI/XwDtaiunoyKGLiY9bzRk4YjsUZl8w=="; }; }; - "@typescript-eslint/parser-3.6.0" = { + "@typescript-eslint/parser-3.8.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.6.0.tgz"; - sha512 = "taghDxuLhbDAD1U5Fk8vF+MnR0yiFE9Z3v2/bYScFb0N1I9SK8eKHkdJl1DAD48OGFDMFTeOTX0z7g0W6SYUXw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.8.0.tgz"; + sha512 = "u5vjOBaCsnMVQOvkKCXAmmOhyyMmFFf5dbkM3TIbg3MZ2pyv5peE4gj81UAbTHwTOXEwf7eCQTUMKrDl/+qGnA=="; }; }; - "@typescript-eslint/types-3.6.0" = { + "@typescript-eslint/types-3.8.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.6.0.tgz"; - sha512 = "JwVj74ohUSt0ZPG+LZ7hb95fW8DFOqBuR6gE7qzq55KDI3BepqsCtHfBIoa0+Xi1AI7fq5nCu2VQL8z4eYftqg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.8.0.tgz"; + sha512 = "8kROmEQkv6ss9kdQ44vCN1dTrgu4Qxrd2kXr10kz2NP5T8/7JnEfYNxCpPkArbLIhhkGLZV3aVMplH1RXQRF7Q=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -1444,40 +1399,40 @@ let sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; }; }; - "@typescript-eslint/typescript-estree-3.6.0" = { + "@typescript-eslint/typescript-estree-3.8.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.6.0.tgz"; - sha512 = "G57NDSABHjvob7zVV09ehWyD1K6/YUKjz5+AufObFyjNO4DVmKejj47MHjVHHlZZKgmpJD2yyH9lfCXHrPITFg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.8.0.tgz"; + sha512 = "MTv9nPDhlKfclwnplRNDL44mP2SY96YmPGxmMbMy6x12I+pERcxpIUht7DXZaj4mOKKtet53wYYXU0ABaiXrLw=="; }; }; - "@typescript-eslint/visitor-keys-3.6.0" = { + "@typescript-eslint/visitor-keys-3.8.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.6.0.tgz"; - sha512 = "p1izllL2Ubwunite0ITjubuMQRBGgjdVYwyG7lXPX8GbrA6qF0uwSRz9MnXZaHMxID4948gX0Ez8v9tUDi/KfQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.8.0.tgz"; + sha512 = "gfqQWyVPpT9NpLREXNR820AYwgz+Kr1GuF3nf1wxpHD6hdxI62tq03ToomFnDxY0m3pUB39IF7sil7D5TQexLA=="; }; }; - "abab-2.0.3" = { + "abab-2.0.4" = { name = "abab"; packageName = "abab"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz"; - sha512 = "tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="; + url = "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz"; + sha512 = "Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ=="; }; }; - "acorn-7.3.1" = { + "acorn-7.4.0" = { name = "acorn"; packageName = "acorn"; - version = "7.3.1"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz"; - sha512 = "tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz"; + sha512 = "+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w=="; }; }; "acorn-globals-6.0.0" = { @@ -1786,13 +1741,13 @@ let sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; }; }; - "babel-jest-26.1.0" = { + "babel-jest-26.2.2" = { name = "babel-jest"; packageName = "babel-jest"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.1.0.tgz"; - sha512 = "Nkqgtfe7j6PxLO6TnCQQlkMm8wdTdnIF8xrdpooHCuD5hXRzVEPbPneTJKknH5Dsv3L8ip9unHDAp48YQ54Dkg=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.2.2.tgz"; + sha512 = "JmLuePHgA+DSOdOL8lPxCgD2LhPPm+rdw1vnxR73PpIrnmKCS2/aBhtkAcxQWuUcW2hBrH8MJ3LKXE7aWpNZyA=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -1813,13 +1768,13 @@ let sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-26.1.0" = { + "babel-plugin-jest-hoist-26.2.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.1.0.tgz"; - sha512 = "qhqLVkkSlqmC83bdMhM8WW4Z9tB+JkjqAqlbbohS9sJLT5Ha2vfzuKqg5yenXrAjOPG2YC0WiXdH3a9PvB+YYw=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz"; + sha512 = "B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA=="; }; }; "babel-preset-current-node-syntax-0.1.3" = { @@ -1831,13 +1786,13 @@ let sha512 = "uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ=="; }; }; - "babel-preset-jest-26.1.0" = { + "babel-preset-jest-26.2.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.1.0.tgz"; - sha512 = "na9qCqFksknlEj5iSdw1ehMVR06LCCTkZLGKeEtxDDdhg8xpUF09m29Kvh1pRbZ07h7AQ5ttLYUwpXL4tO6w7w=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.2.0.tgz"; + sha512 = "R1k8kdP3R9phYQugXeNnK/nvCGlBzG4m3EoIIukC80GXb6wCv2XiwPhK6K9MAkQcMszWBYvl2Wm+yigyXFQqXg=="; }; }; "balanced-match-1.0.0" = { @@ -1948,13 +1903,13 @@ let sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; }; }; - "browserslist-4.13.0" = { + "browserslist-4.14.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz"; - sha512 = "MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz"; + sha512 = "pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ=="; }; }; "bser-2.1.1" = { @@ -2029,13 +1984,13 @@ let sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w=="; }; }; - "caniuse-lite-1.0.30001099" = { + "caniuse-lite-1.0.30001112" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001099"; + version = "1.0.30001112"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001099.tgz"; - sha512 = "sdS9A+sQTk7wKoeuZBN/YMAHVztUfVnjDi4/UV3sDE8xoh7YR12hKW+pIdB3oqKGwr9XaFL2ovfzt9w8eUI5CA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001112.tgz"; + sha512 = "J05RTQlqsatidif/38aN3PGULCLrg8OYQOlJUKbeYVzC2mGZkZLIztwRlB3MtrfLmawUmjFlNJvy/uhwniIe1Q=="; }; }; "capture-exit-2.0.0" = { @@ -2641,13 +2596,22 @@ let sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "electron-to-chromium-1.3.496" = { + "electron-to-chromium-1.3.526" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.496"; + version = "1.3.526"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.496.tgz"; - sha512 = "TXY4mwoyowwi4Lsrq9vcTUYBThyc1b2hXaTZI13p8/FRhY2CTaq5lK+DVjhYkKiTLsKt569Xes+0J5JsVXFurQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.526.tgz"; + sha512 = "HiroW5ZbGwgT8kCnoEO8qnGjoTPzJxduvV/Vv/wH63eo2N6Zj3xT5fmmaSPAPUM05iN9/5fIEkIg3owTtV6QZg=="; + }; + }; + "emittery-0.7.1" = { + name = "emittery"; + packageName = "emittery"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz"; + sha512 = "d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ=="; }; }; "emoji-regex-7.0.3" = { @@ -2758,13 +2722,13 @@ let sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; }; }; - "escalade-3.0.1" = { + "escalade-3.0.2" = { name = "escalade"; packageName = "escalade"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz"; - sha512 = "DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz"; + sha512 = "gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ=="; }; }; "escape-string-regexp-1.0.5" = { @@ -2794,22 +2758,13 @@ let sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; }; }; - "eslint-7.4.0" = { + "eslint-7.6.0" = { name = "eslint"; packageName = "eslint"; - version = "7.4.0"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.4.0.tgz"; - sha512 = "gU+lxhlPHu45H3JkEGgYhWhkR9wLHHEXC9FbWFnTlEkbKyZKWgWRLgf61E8zWmBuI6g5xKBph9ltg3NtZMVF8g=="; - }; - }; - "eslint-7.5.0" = { - name = "eslint"; - packageName = "eslint"; - version = "7.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.5.0.tgz"; - sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz"; + sha512 = "QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w=="; }; }; "eslint-config-google-0.14.0" = { @@ -2821,13 +2776,13 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-23.18.0" = { + "eslint-plugin-jest-23.20.0" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "23.18.0"; + version = "23.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.18.0.tgz"; - sha512 = "wLPM/Rm1SGhxrFQ2TKM/BYsYPhn7ch6ZEK92S2o/vGkAAnDXM0I4nTIo745RIX+VlCRMFgBuJEax6XfTHMdeKg=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.20.0.tgz"; + sha512 = "+6BGQt85OREevBDWCvhqj1yYA4+BFK4XnRZSGJionuEYmcglMZYLNNBBemwzbqUAckURaHdJSBcjHPyrtypZOw=="; }; }; "eslint-scope-5.1.0" = { @@ -2857,15 +2812,6 @@ let sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; }; - "espree-7.1.0" = { - name = "espree"; - packageName = "espree"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-7.1.0.tgz"; - sha512 = "dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw=="; - }; - }; "espree-7.2.0" = { name = "espree"; packageName = "espree"; @@ -2911,13 +2857,13 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estraverse-5.1.0" = { + "estraverse-5.2.0" = { name = "estraverse"; packageName = "estraverse"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz"; - sha512 = "FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="; + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; + sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; }; }; "esutils-2.0.3" = { @@ -2992,13 +2938,13 @@ let sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; }; - "expect-26.1.0" = { + "expect-26.2.0" = { name = "expect"; packageName = "expect"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-26.1.0.tgz"; - sha512 = "QbH4LZXDsno9AACrN9eM0zfnby9G+OsdNgZUohjg/P0mLy1O+/bzTAJGT6VSIjVCe8yKM6SzEl/ckEOFBT7Vnw=="; + url = "https://registry.npmjs.org/expect/-/expect-26.2.0.tgz"; + sha512 = "8AMBQ9UVcoUXt0B7v+5/U5H6yiUR87L6eKCfjE3spx7Ya5lF+ebUo37MCFBML2OiLfkX1sxmQOZhIDonyVTkcw=="; }; }; "ext-1.4.0" = { @@ -3496,13 +3442,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.1.3" = { + "har-validator-5.1.5" = { name = "har-validator"; packageName = "har-validator"; - version = "5.1.3"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; }; "has-flag-3.0.0" = { @@ -3586,13 +3532,13 @@ let sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "highlight.js-10.1.1" = { + "highlight.js-10.1.2" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz"; - sha512 = "b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.2.tgz"; + sha512 = "Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA=="; }; }; "hosted-git-info-2.8.8" = { @@ -3874,13 +3820,13 @@ let sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; }; - "is-docker-2.0.0" = { + "is-docker-2.1.1" = { name = "is-docker"; packageName = "is-docker"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz"; - sha512 = "pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ=="; + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz"; + sha512 = "ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="; }; }; "is-extendable-0.1.1" = { @@ -4162,40 +4108,40 @@ let sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw=="; }; }; - "jest-26.1.0" = { + "jest-26.2.2" = { name = "jest"; packageName = "jest"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-26.1.0.tgz"; - sha512 = "LIti8jppw5BcQvmNJe4w2g1N/3V68HUfAv9zDVm7v+VAtQulGhH0LnmmiVkbNE4M4I43Bj2fXPiBGKt26k9tHw=="; + url = "https://registry.npmjs.org/jest/-/jest-26.2.2.tgz"; + sha512 = "EkJNyHiAG1+A8pqSz7cXttoVa34hOEzN/MrnJhYnfp5VHxflVcf2pu3oJSrhiy6LfIutLdWo+n6q63tjcoIeig=="; }; }; - "jest-changed-files-26.1.0" = { + "jest-changed-files-26.2.0" = { name = "jest-changed-files"; packageName = "jest-changed-files"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.1.0.tgz"; - sha512 = "HS5MIJp3B8t0NRKGMCZkcDUZo36mVRvrDETl81aqljT1S9tqiHRSpyoOvWg9ZilzZG9TDisDNaN1IXm54fLRZw=="; + url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.2.0.tgz"; + sha512 = "+RyJb+F1K/XBLIYiL449vo5D+CvlHv29QveJUWNPXuUicyZcq+tf1wNxmmFeRvAU1+TzhwqczSjxnCCFt7+8iA=="; }; }; - "jest-cli-26.1.0" = { + "jest-cli-26.2.2" = { name = "jest-cli"; packageName = "jest-cli"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.1.0.tgz"; - sha512 = "Imumvjgi3rU7stq6SJ1JUEMaV5aAgJYXIs0jPqdUnF47N/Tk83EXfmtvNKQ+SnFVI6t6mDOvfM3aA9Sg6kQPSw=="; + url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.2.2.tgz"; + sha512 = "vVcly0n/ijZvdy6gPQiQt0YANwX2hLTPQZHtW7Vi3gcFdKTtif7YpI85F8R8JYy5DFSWz4x1OW0arnxlziu5Lw=="; }; }; - "jest-config-26.1.0" = { + "jest-config-26.2.2" = { name = "jest-config"; packageName = "jest-config"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-26.1.0.tgz"; - sha512 = "ONTGeoMbAwGCdq4WuKkMcdMoyfs5CLzHEkzFOlVvcDXufZSaIWh/OXMLa2fwKXiOaFcqEw8qFr4VOKJQfn4CVw=="; + url = "https://registry.npmjs.org/jest-config/-/jest-config-26.2.2.tgz"; + sha512 = "2lhxH0y4YFOijMJ65usuf78m7+9/8+hAb1PZQtdRdgnQpAb4zP6KcVDDktpHEkspBKnc2lmFu+RQdHukUUbiTg=="; }; }; "jest-diff-25.5.0" = { @@ -4207,13 +4153,13 @@ let sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A=="; }; }; - "jest-diff-26.1.0" = { + "jest-diff-26.2.0" = { name = "jest-diff"; packageName = "jest-diff"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.1.0.tgz"; - sha512 = "GZpIcom339y0OXznsEKjtkfKxNdg7bVbEofK8Q6MnevTIiR1jNhDWKhRX6X0SDXJlwn3dy59nZ1z55fLkAqPWg=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.2.0.tgz"; + sha512 = "Wu4Aopi2nzCsHWLBlD48TgRy3Z7OsxlwvHNd1YSnHc7q1NJfrmyCPoUXrTIrydQOG5ApaYpsAsdfnMbJqV1/wQ=="; }; }; "jest-docblock-26.0.0" = { @@ -4225,31 +4171,31 @@ let sha512 = "RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w=="; }; }; - "jest-each-26.1.0" = { + "jest-each-26.2.0" = { name = "jest-each"; packageName = "jest-each"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-26.1.0.tgz"; - sha512 = "lYiSo4Igr81q6QRsVQq9LIkJW0hZcKxkIkHzNeTMPENYYDw/W/Raq28iJ0sLlNFYz2qxxeLnc5K2gQoFYlu2bA=="; + url = "https://registry.npmjs.org/jest-each/-/jest-each-26.2.0.tgz"; + sha512 = "gHPCaho1twWHB5bpcfnozlc6mrMi+VAewVPNgmwf81x2Gzr6XO4dl+eOrwPWxbkYlgjgrYjWK2xgKnixbzH3Ew=="; }; }; - "jest-environment-jsdom-26.1.0" = { + "jest-environment-jsdom-26.2.0" = { name = "jest-environment-jsdom"; packageName = "jest-environment-jsdom"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.1.0.tgz"; - sha512 = "dWfiJ+spunVAwzXbdVqPH1LbuJW/kDL+FyqgA5YzquisHqTi0g9hquKif9xKm7c1bKBj6wbmJuDkeMCnxZEpUw=="; + url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.2.0.tgz"; + sha512 = "sDG24+5M4NuIGzkI3rJW8XUlrpkvIdE9Zz4jhD8OBnVxAw+Y1jUk9X+lAOD48nlfUTlnt3lbAI3k2Ox+WF3S0g=="; }; }; - "jest-environment-node-26.1.0" = { + "jest-environment-node-26.2.0" = { name = "jest-environment-node"; packageName = "jest-environment-node"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.1.0.tgz"; - sha512 = "DNm5x1aQH0iRAe9UYAkZenuzuJ69VKzDCAYISFHQ5i9e+2Tbeu2ONGY7YStubCLH8a1wdKBgqScYw85+ySxqxg=="; + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.2.0.tgz"; + sha512 = "4M5ExTYkJ19efBzkiXtBi74JqKLDciEk4CEsp5tTjWGYMrlKFQFtwIVG3tW1OGE0AlXhZjuHPwubuRYY4j4uOw=="; }; }; "jest-get-type-25.2.6" = { @@ -4270,58 +4216,58 @@ let sha512 = "zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg=="; }; }; - "jest-haste-map-26.1.0" = { + "jest-haste-map-26.2.2" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.1.0.tgz"; - sha512 = "WeBS54xCIz9twzkEdm6+vJBXgRBQfdbbXD0dk8lJh7gLihopABlJmIQFdWSDDtuDe4PRiObsjZSUjbJ1uhWEpA=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.2.2.tgz"; + sha512 = "3sJlMSt+NHnzCB+0KhJ1Ut4zKJBiJOlbrqEYNdRQGlXTv8kqzZWjUKQRY3pkjmlf+7rYjAV++MQ4D6g4DhAyOg=="; }; }; - "jest-jasmine2-26.1.0" = { + "jest-jasmine2-26.2.2" = { name = "jest-jasmine2"; packageName = "jest-jasmine2"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.1.0.tgz"; - sha512 = "1IPtoDKOAG+MeBrKvvuxxGPJb35MTTRSDglNdWWCndCB3TIVzbLThRBkwH9P081vXLgiJHZY8Bz3yzFS803xqQ=="; + url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.2.2.tgz"; + sha512 = "Q8AAHpbiZMVMy4Hz9j1j1bg2yUmPa1W9StBvcHqRaKa9PHaDUMwds8LwaDyzP/2fkybcTQE4+pTMDOG9826tEw=="; }; }; - "jest-leak-detector-26.1.0" = { + "jest-leak-detector-26.2.0" = { name = "jest-leak-detector"; packageName = "jest-leak-detector"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.1.0.tgz"; - sha512 = "dsMnKF+4BVOZwvQDlgn3MG+Ns4JuLv8jNvXH56bgqrrboyCbI1rQg6EI5rs+8IYagVcfVP2yZFKfWNZy0rK0Hw=="; + url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.2.0.tgz"; + sha512 = "aQdzTX1YiufkXA1teXZu5xXOJgy7wZQw6OJ0iH5CtQlOETe6gTSocaYKUNui1SzQ91xmqEUZ/WRavg9FD82rtQ=="; }; }; - "jest-matcher-utils-26.1.0" = { + "jest-matcher-utils-26.2.0" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.1.0.tgz"; - sha512 = "PW9JtItbYvES/xLn5mYxjMd+Rk+/kIt88EfH3N7w9KeOrHWaHrdYPnVHndGbsFGRJ2d5gKtwggCvkqbFDoouQA=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.2.0.tgz"; + sha512 = "2cf/LW2VFb3ayPHrH36ZDjp9+CAeAe/pWBAwsV8t3dKcrINzXPVxq8qMWOxwt5BaeBCx4ZupVGH7VIgB8v66vQ=="; }; }; - "jest-message-util-26.1.0" = { + "jest-message-util-26.2.0" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.1.0.tgz"; - sha512 = "dY0+UlldiAJwNDJ08SF0HdF32g9PkbF2NRK/+2iMPU40O6q+iSn1lgog/u0UH8ksWoPv0+gNq8cjhYO2MFtT0g=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.2.0.tgz"; + sha512 = "g362RhZaJuqeqG108n1sthz5vNpzTNy926eNDszo4ncRbmmcMRIUAZibnd6s5v2XSBCChAxQtCoN25gnzp7JbQ=="; }; }; - "jest-mock-26.1.0" = { + "jest-mock-26.2.0" = { name = "jest-mock"; packageName = "jest-mock"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.1.0.tgz"; - sha512 = "1Rm8EIJ3ZFA8yCIie92UbxZWj9SuVmUGcyhLHyAhY6WI3NIct38nVcfOPWhJteqSn8V8e3xOMha9Ojfazfpovw=="; + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.2.0.tgz"; + sha512 = "XeC7yWtWmWByoyVOHSsE7NYsbXJLtJNgmhD7z4MKumKm6ET0si81bsSLbQ64L5saK3TgsHo2B/UqG5KNZ1Sp/Q=="; }; }; "jest-pnp-resolver-1.2.2" = { @@ -4342,94 +4288,94 @@ let sha512 = "Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A=="; }; }; - "jest-resolve-26.1.0" = { + "jest-resolve-26.2.2" = { name = "jest-resolve"; packageName = "jest-resolve"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.1.0.tgz"; - sha512 = "KsY1JV9FeVgEmwIISbZZN83RNGJ1CC+XUCikf/ZWJBX/tO4a4NvA21YixokhdR9UnmPKKAC4LafVixJBrwlmfg=="; + url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.2.2.tgz"; + sha512 = "ye9Tj/ILn/0OgFPE/3dGpQPUqt4dHwIocxt5qSBkyzxQD8PbL0bVxBogX2FHxsd3zJA7V2H/cHXnBnNyyT9YoQ=="; }; }; - "jest-resolve-dependencies-26.1.0" = { + "jest-resolve-dependencies-26.2.2" = { name = "jest-resolve-dependencies"; packageName = "jest-resolve-dependencies"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.1.0.tgz"; - sha512 = "fQVEPHHQ1JjHRDxzlLU/buuQ9om+hqW6Vo928aa4b4yvq4ZHBtRSDsLdKQLuCqn5CkTVpYZ7ARh2fbA8WkRE6g=="; + url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.2.2.tgz"; + sha512 = "S5vufDmVbQXnpP7435gr710xeBGUFcKNpNswke7RmFvDQtmqPjPVU/rCeMlEU0p6vfpnjhwMYeaVjKZAy5QYJA=="; }; }; - "jest-runner-26.1.0" = { + "jest-runner-26.2.2" = { name = "jest-runner"; packageName = "jest-runner"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.1.0.tgz"; - sha512 = "elvP7y0fVDREnfqit0zAxiXkDRSw6dgCkzPCf1XvIMnSDZ8yogmSKJf192dpOgnUVykmQXwYYJnCx641uLTgcw=="; + url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.2.2.tgz"; + sha512 = "/qb6ptgX+KQ+aNMohJf1We695kaAfuu3u3ouh66TWfhTpLd9WbqcF6163d/tMoEY8GqPztXPLuyG0rHRVDLxCA=="; }; }; - "jest-runtime-26.1.0" = { + "jest-runtime-26.2.2" = { name = "jest-runtime"; packageName = "jest-runtime"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.1.0.tgz"; - sha512 = "1qiYN+EZLmG1QV2wdEBRf+Ci8i3VSfIYLF02U18PiUDrMbhfpN/EAMMkJtT02jgJUoaEOpHAIXG6zS3QRMzRmA=="; + url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.2.2.tgz"; + sha512 = "a8VXM3DxCDnCIdl9+QucWFfQ28KdqmyVFqeKLigHdErtsx56O2ZIdQkhFSuP1XtVrG9nTNHbKxjh5XL1UaFDVQ=="; }; }; - "jest-serializer-26.1.0" = { + "jest-serializer-26.2.0" = { name = "jest-serializer"; packageName = "jest-serializer"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.1.0.tgz"; - sha512 = "eqZOQG/0+MHmr25b2Z86g7+Kzd5dG9dhCiUoyUNJPgiqi38DqbDEOlHcNijyfZoj74soGBohKBZuJFS18YTJ5w=="; + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.2.0.tgz"; + sha512 = "V7snZI9IVmyJEu0Qy0inmuXgnMWDtrsbV2p9CRAcmlmPVwpC2ZM8wXyYpiugDQnwLHx0V4+Pnog9Exb3UO8M6Q=="; }; }; - "jest-snapshot-26.1.0" = { + "jest-snapshot-26.2.2" = { name = "jest-snapshot"; packageName = "jest-snapshot"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.1.0.tgz"; - sha512 = "YhSbU7eMTVQO/iRbNs8j0mKRxGp4plo7sJ3GzOQ0IYjvsBiwg0T1o0zGQAYepza7lYHuPTrG5J2yDd0CE2YxSw=="; + url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.2.2.tgz"; + sha512 = "NdjD8aJS7ePu268Wy/n/aR1TUisG0BOY+QOW4f6h46UHEKOgYmmkvJhh2BqdVZQ0BHSxTMt04WpCf9njzx8KtA=="; }; }; - "jest-util-26.1.0" = { + "jest-util-26.2.0" = { name = "jest-util"; packageName = "jest-util"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-26.1.0.tgz"; - sha512 = "rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-26.2.0.tgz"; + sha512 = "YmDwJxLZ1kFxpxPfhSJ0rIkiZOM0PQbRcfH0TzJOhqCisCAsI1WcmoQqO83My9xeVA2k4n+rzg2UuexVKzPpig=="; }; }; - "jest-validate-26.1.0" = { + "jest-validate-26.2.0" = { name = "jest-validate"; packageName = "jest-validate"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.1.0.tgz"; - sha512 = "WPApOOnXsiwhZtmkDsxnpye+XLb/tUISP+H6cHjfUIXvlG+eKwP+isnivsxlHCPaO9Q5wvbhloIBkdF3qUn+Nw=="; + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.2.0.tgz"; + sha512 = "8XKn3hM6VIVmLNuyzYLCPsRCT83o8jMZYhbieh4dAyKLc4Ypr36rVKC+c8WMpWkfHHpGnEkvWUjjIAyobEIY/Q=="; }; }; - "jest-watcher-26.1.0" = { + "jest-watcher-26.2.0" = { name = "jest-watcher"; packageName = "jest-watcher"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.1.0.tgz"; - sha512 = "ffEOhJl2EvAIki613oPsSG11usqnGUzIiK7MMX6hE4422aXOcVEG3ySCTDFLn1+LZNXGPE8tuJxhp8OBJ1pgzQ=="; + url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.2.0.tgz"; + sha512 = "674Boco4Joe0CzgKPL6K4Z9LgyLx+ZvW2GilbpYb8rFEUkmDGgsZdv1Hv5rxsRpb1HLgKUOL/JfbttRCuFdZXQ=="; }; }; - "jest-worker-26.1.0" = { + "jest-worker-26.2.1" = { name = "jest-worker"; packageName = "jest-worker"; - version = "26.1.0"; + version = "26.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.1.0.tgz"; - sha512 = "Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.2.1.tgz"; + sha512 = "+XcGMMJDTeEGncRb5M5Zq9P7K4sQ1sirhjdOxsN1462h6lFo9w59bl2LVQmdGEEeU3m+maZCkS2Tcc9SfCHO4A=="; }; }; "js-tokens-4.0.0" = { @@ -4459,13 +4405,13 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "jsdom-16.3.0" = { + "jsdom-16.4.0" = { name = "jsdom"; packageName = "jsdom"; - version = "16.3.0"; + version = "16.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-16.3.0.tgz"; - sha512 = "zggeX5UuEknpdZzv15+MS1dPYG0J/TftiiNunOeNxSl3qr8Z6cIlQpN0IdJa44z9aFxZRIVqRncvEhQ7X5DtZg=="; + url = "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz"; + sha512 = "lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w=="; }; }; "jsesc-0.5.0" = { @@ -5044,22 +4990,22 @@ let sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; }; }; - "node-notifier-7.0.1" = { + "node-notifier-7.0.2" = { name = "node-notifier"; packageName = "node-notifier"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.1.tgz"; - sha512 = "VkzhierE7DBmQEElhTGJIoiZa1oqRijOtgOlsXg32KrJRXsPy0NXFBqWGW/wTswnJlDCs5viRYaqWguqzsKcmg=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.2.tgz"; + sha512 = "ux+n4hPVETuTL8+daJXTOC6uKLgMsl1RYfFv7DKRzyvzBapqco0rZZ9g72ZN8VS6V+gvNYHYa/ofcCY8fkJWsA=="; }; }; - "node-releases-1.1.59" = { + "node-releases-1.1.60" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.59"; + version = "1.1.60"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz"; - sha512 = "H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz"; + sha512 = "gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="; }; }; "noop-logger-0.1.1" = { @@ -5233,13 +5179,13 @@ let sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; }; }; - "onetime-5.1.0" = { + "onetime-5.1.1" = { name = "onetime"; packageName = "onetime"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; - sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.1.tgz"; + sha512 = "ZpZpjcJeugQfWsfyQlshVoowIIQ1qBGSVll4rfDq6JJVO//fesjoX808hXWfBjY+ROZgpKDI5TRSRBSoJiZ8eg=="; }; }; "optionator-0.8.3" = { @@ -5323,13 +5269,13 @@ let sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; }; - "parse-json-5.0.0" = { + "parse-json-5.0.1" = { name = "parse-json"; packageName = "parse-json"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz"; - sha512 = "OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw=="; + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.0.1.tgz"; + sha512 = "ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ=="; }; }; "parse5-5.1.1" = { @@ -5494,13 +5440,13 @@ let sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="; }; }; - "pretty-format-26.1.0" = { + "pretty-format-26.2.0" = { name = "pretty-format"; packageName = "pretty-format"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz"; - sha512 = "GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.2.0.tgz"; + sha512 = "qi/8IuBu2clY9G7qCXgCdD1Bf9w+sXakdHTRToknzMtVy0g7c4MBWaZy7MfB7ndKZovRO6XRwJiAYqq+MC7SDA=="; }; }; "process-nextick-args-2.0.1" = { @@ -5674,13 +5620,13 @@ let sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; }; }; - "regenerator-runtime-0.13.5" = { + "regenerator-runtime-0.13.7" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.5"; + version = "0.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; }; }; "regenerator-transform-0.14.5" = { @@ -5782,22 +5728,22 @@ let sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; - "request-promise-core-1.1.3" = { + "request-promise-core-1.1.4" = { name = "request-promise-core"; packageName = "request-promise-core"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ=="; + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw=="; }; }; - "request-promise-native-1.0.8" = { + "request-promise-native-1.0.9" = { name = "request-promise-native"; packageName = "request-promise-native"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha512 = "dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ=="; + url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; "require-directory-2.1.1" = { @@ -5989,13 +5935,13 @@ let sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; }; }; - "serialport-9.0.0" = { + "serialport-9.0.1" = { name = "serialport"; packageName = "serialport"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-9.0.0.tgz"; - sha512 = "4kQqIM0XhT6QECyzJtPdSsDWRFt8u3/vscQxb+z4TrAMiPDkDGBTLDaXmCxarXDa1s7EeK1IyxMce9wzWPFzAQ=="; + url = "https://registry.npmjs.org/serialport/-/serialport-9.0.1.tgz"; + sha512 = "35Ms8dqjtAb73lptfEZG2l/nFZOxHt3hUjCHvl+g3Mu737gzFLDpSBrRywBJw4G4eS5ozZ3YcthwYnop1WO+ng=="; }; }; "set-blocking-2.0.0" = { @@ -6079,13 +6025,13 @@ let sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; - "simple-concat-1.0.0" = { + "simple-concat-1.0.1" = { name = "simple-concat"; packageName = "simple-concat"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz"; - sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; }; }; "simple-get-3.1.0" = { @@ -6466,15 +6412,6 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strip-json-comments-3.1.0" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; - sha512 = "e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w=="; - }; - }; "strip-json-comments-3.1.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -6853,13 +6790,13 @@ let sha512 = "zo09yRj+xwLFE3hyhJeVHWRSPuKEIAsFK5r2u47KL/HBKqpwdUSanoaz5L34IKiSATFrjG5ywmIu98hPVMfxZg=="; }; }; - "typedoc-plugin-markdown-2.3.1" = { + "typedoc-plugin-markdown-2.4.0" = { name = "typedoc-plugin-markdown"; packageName = "typedoc-plugin-markdown"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-2.3.1.tgz"; - sha512 = "7rlmg1tLjddYy11uznHCAlyoOpxdWnFXqGEZ7j2mJ4KJg2avwWgEpw6SFZVofgPCGn36zklpFS51lHxYSRTLVQ=="; + url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-2.4.0.tgz"; + sha512 = "m4eOwxSzeCbGNFzPDadNQcuMbkbc/45fgXsIP/m4K20i/8zVhCBmvoTxmKUqWYVTYc1BTtvQD5hY/qCueHoLFw=="; }; }; "typedoc-plugin-no-inherit-1.1.10" = { @@ -6880,22 +6817,22 @@ let sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA=="; }; }; - "typescript-3.9.6" = { + "typescript-3.9.7" = { name = "typescript"; packageName = "typescript"; - version = "3.9.6"; + version = "3.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.6.tgz"; - sha512 = "Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz"; + sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; }; }; - "uglify-js-3.10.0" = { + "uglify-js-3.10.1" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz"; - sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.1.tgz"; + sha512 = "RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q=="; }; }; "ultron-1.1.1" = { @@ -7060,13 +6997,13 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uuid-7.0.3" = { + "uuid-8.3.0" = { name = "uuid"; packageName = "uuid"; - version = "7.0.3"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; - sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz"; + sha512 = "fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="; }; }; "v8-compile-cache-2.1.1" = { @@ -7384,29 +7321,29 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; - "zigbee-herdsman-0.12.108" = { + "zigbee-herdsman-0.12.116" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.12.108"; + version = "0.12.116"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.108.tgz"; - sha512 = "5xPgCYFAu/Q8mibEzB2be/nkkyCjMNKox+sYnaNNbUm0w25YRcI3FWuxE+wl9v7UVopZ8P9Wfou+XGsFbdaWRA=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.116.tgz"; + sha512 = "eMpqW5KWiVR5jMW7gelDrZB7sgohD8CoJeAH91bd89zR/vM3sTnSTC/HRpqRlEsPeYqwCRBKExf57q2iDQbWaA=="; }; }; - "zigbee-herdsman-converters-12.0.147" = { + "zigbee-herdsman-converters-12.0.161" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "12.0.147"; + version = "12.0.161"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.147.tgz"; - sha512 = "WlNkN5xG+HdS1hZ5jTjR2vFii1OfOqTFUEQ+uZg06L7V1TucHRPlQ4AMY0WUQksnX2uuRqwehA3iuyszZjBAOg=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.161.tgz"; + sha512 = "iufUoZL86uTplW8vEjevFtAb7KITox2vXHB+0l9dE7lJqYyiGKyEoRqbjkmqBNqFjkJXD4eAM0VpsVAbHGbDMg=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.14.2"; + version = "1.14.3"; src = ./.; dependencies = [ sources."@dabh/diagnostics-2.0.2" @@ -7549,53 +7486,57 @@ let sources."wrappy-1.0.2" sources."ws-3.3.3" sources."xtend-4.0.2" - (sources."zigbee-herdsman-0.12.108" // { + (sources."zigbee-herdsman-0.12.116" // { dependencies = [ - sources."@babel/cli-7.10.4" + sources."@babel/cli-7.10.5" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.10.4" - sources."@babel/core-7.10.4" - sources."@babel/generator-7.10.4" + sources."@babel/compat-data-7.11.0" + sources."@babel/core-7.11.1" + sources."@babel/generator-7.11.0" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-compilation-targets-7.10.4" - sources."@babel/helper-create-class-features-plugin-7.10.4" + sources."@babel/helper-create-class-features-plugin-7.10.5" sources."@babel/helper-create-regexp-features-plugin-7.10.4" - sources."@babel/helper-define-map-7.10.4" + sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.10.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.4" + sources."@babel/helper-module-transforms-7.11.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-regex-7.10.4" + sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.10.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.10.4" - sources."@babel/plugin-proposal-async-generator-functions-7.10.4" + sources."@babel/parser-7.11.3" + sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" + sources."@babel/plugin-proposal-export-namespace-from-7.10.4" sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" sources."@babel/plugin-proposal-numeric-separator-7.10.4" - sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.11.0" sources."@babel/plugin-proposal-private-methods-7.10.4" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.10.4" sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" @@ -7609,7 +7550,7 @@ let sources."@babel/plugin-transform-arrow-functions-7.10.4" sources."@babel/plugin-transform-async-to-generator-7.10.4" sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.10.4" + sources."@babel/plugin-transform-block-scoping-7.11.1" sources."@babel/plugin-transform-classes-7.10.4" sources."@babel/plugin-transform-computed-properties-7.10.4" sources."@babel/plugin-transform-destructuring-7.10.4" @@ -7620,39 +7561,39 @@ let sources."@babel/plugin-transform-function-name-7.10.4" sources."@babel/plugin-transform-literals-7.10.4" sources."@babel/plugin-transform-member-expression-literals-7.10.4" - sources."@babel/plugin-transform-modules-amd-7.10.4" + sources."@babel/plugin-transform-modules-amd-7.10.5" sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.10.4" + sources."@babel/plugin-transform-modules-systemjs-7.10.5" sources."@babel/plugin-transform-modules-umd-7.10.4" sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" sources."@babel/plugin-transform-new-target-7.10.4" sources."@babel/plugin-transform-object-super-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.4" + sources."@babel/plugin-transform-parameters-7.10.5" sources."@babel/plugin-transform-property-literals-7.10.4" sources."@babel/plugin-transform-regenerator-7.10.4" sources."@babel/plugin-transform-reserved-words-7.10.4" sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.10.4" + sources."@babel/plugin-transform-spread-7.11.0" sources."@babel/plugin-transform-sticky-regex-7.10.4" - sources."@babel/plugin-transform-template-literals-7.10.4" + sources."@babel/plugin-transform-template-literals-7.10.5" sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-typescript-7.10.4" + sources."@babel/plugin-transform-typescript-7.11.0" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.10.4" + sources."@babel/preset-env-7.11.0" sources."@babel/preset-modules-0.1.3" sources."@babel/preset-typescript-7.10.4" - sources."@babel/runtime-7.10.4" + sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.10.4" - sources."@babel/types-7.10.4" + sources."@babel/traverse-7.11.0" + sources."@babel/types-7.11.0" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.2" - (sources."@jest/console-26.1.0" // { + (sources."@jest/console-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7662,9 +7603,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."@jest/core-26.1.0" // { + (sources."@jest/core-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" @@ -7682,9 +7623,9 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."@jest/environment-26.1.0" // { + (sources."@jest/environment-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7693,9 +7634,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."@jest/fake-timers-26.1.0" // { + (sources."@jest/fake-timers-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7704,9 +7645,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."@jest/globals-26.1.0" // { + (sources."@jest/globals-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7715,9 +7656,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."@jest/reporters-26.1.0" // { + (sources."@jest/reporters-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7733,9 +7674,9 @@ let sources."source-map-0.6.1" ]; }) - (sources."@jest/test-result-26.1.0" // { + (sources."@jest/test-result-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7744,10 +7685,10 @@ let sources."supports-color-7.1.0" ]; }) - sources."@jest/test-sequencer-26.1.0" - (sources."@jest/transform-26.1.0" // { + sources."@jest/test-sequencer-26.2.2" + (sources."@jest/transform-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" sources."chalk-4.1.0" @@ -7773,17 +7714,17 @@ let sources."supports-color-7.1.0" ]; }) - sources."@serialport/binding-abstract-9.0.0" - sources."@serialport/binding-mock-9.0.0" - sources."@serialport/bindings-9.0.0" - sources."@serialport/parser-byte-length-9.0.0" - sources."@serialport/parser-cctalk-9.0.0" - sources."@serialport/parser-delimiter-9.0.0" - sources."@serialport/parser-readline-9.0.0" - sources."@serialport/parser-ready-9.0.0" - sources."@serialport/parser-regex-9.0.0" - sources."@serialport/stream-9.0.0" - sources."@sinonjs/commons-1.8.0" + sources."@serialport/binding-abstract-9.0.1" + sources."@serialport/binding-mock-9.0.1" + sources."@serialport/bindings-9.0.1" + sources."@serialport/parser-byte-length-9.0.1" + sources."@serialport/parser-cctalk-9.0.1" + sources."@serialport/parser-delimiter-9.0.1" + sources."@serialport/parser-readline-9.0.1" + sources."@serialport/parser-ready-9.0.1" + sources."@serialport/parser-regex-9.0.1" + sources."@serialport/stream-9.0.1" + sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" sources."@types/babel__core-7.1.9" sources."@types/babel__generator-7.6.1" @@ -7796,32 +7737,32 @@ let sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/jest-26.0.4" + sources."@types/jest-26.0.9" sources."@types/json-schema-7.0.5" sources."@types/nedb-1.8.10" - sources."@types/node-14.0.22" + sources."@types/node-14.0.27" sources."@types/normalize-package-data-2.4.0" sources."@types/prettier-2.0.2" sources."@types/serialport-8.0.1" sources."@types/stack-utils-1.0.1" sources."@types/yargs-15.0.5" sources."@types/yargs-parser-15.0.0" - (sources."@typescript-eslint/eslint-plugin-3.6.0" // { + (sources."@typescript-eslint/eslint-plugin-3.8.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-3.6.0" - sources."@typescript-eslint/parser-3.6.0" - sources."@typescript-eslint/types-3.6.0" - (sources."@typescript-eslint/typescript-estree-3.6.0" // { + sources."@typescript-eslint/experimental-utils-3.8.0" + sources."@typescript-eslint/parser-3.8.0" + sources."@typescript-eslint/types-3.8.0" + (sources."@typescript-eslint/typescript-estree-3.8.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/visitor-keys-3.6.0" - sources."abab-2.0.3" - sources."acorn-7.3.1" + sources."@typescript-eslint/visitor-keys-3.8.0" + sources."abab-2.0.4" + sources."acorn-7.4.0" sources."acorn-globals-6.0.0" sources."acorn-jsx-5.2.0" sources."acorn-walk-7.2.0" @@ -7856,9 +7797,9 @@ let sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" - (sources."babel-jest-26.1.0" // { + (sources."babel-jest-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7870,9 +7811,9 @@ let }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-26.1.0" + sources."babel-plugin-jest-hoist-26.2.0" sources."babel-preset-current-node-syntax-0.1.3" - sources."babel-preset-jest-26.1.0" + sources."babel-preset-jest-26.2.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -7900,14 +7841,14 @@ let ]; }) sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.13.0" + sources."browserslist-4.14.0" sources."bser-2.1.1" sources."buffer-5.6.0" sources."buffer-from-1.1.1" sources."cache-base-1.0.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001099" + sources."caniuse-lite-1.0.30001112" sources."capture-exit-2.0.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -7948,11 +7889,7 @@ let ]; }) sources."core-util-is-1.0.2" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."which-1.3.1" - ]; - }) + sources."cross-spawn-6.0.5" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ @@ -7989,12 +7926,13 @@ let ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.496" + sources."electron-to-chromium-1.3.526" + sources."emittery-0.7.1" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."error-ex-1.3.2" - sources."escalade-3.0.1" + sources."escalade-3.0.2" sources."escape-string-regexp-1.0.5" (sources."escodegen-1.14.3" // { dependencies = [ @@ -8005,7 +7943,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-7.4.0" // { + (sources."eslint-7.6.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -8021,18 +7959,19 @@ let sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."strip-ansi-6.0.0" - sources."strip-json-comments-3.1.0" + sources."strip-json-comments-3.1.1" sources."supports-color-7.1.0" + sources."which-2.0.2" ]; }) sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" - sources."espree-7.1.0" + sources."espree-7.2.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -8050,9 +7989,9 @@ let ]; }) sources."expand-template-2.0.3" - (sources."expect-26.1.0" // { + (sources."expect-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8126,7 +8065,7 @@ let ]; }) sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" sources."has-unicode-2.0.1" @@ -8136,7 +8075,7 @@ let sources."kind-of-4.0.0" ]; }) - sources."highlight.js-10.1.1" + sources."highlight.js-10.1.2" sources."hosted-git-info-2.8.8" sources."html-encoding-sniffer-2.0.1" sources."html-escaper-2.0.2" @@ -8177,7 +8116,7 @@ let sources."kind-of-5.1.0" ]; }) - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -8218,21 +8157,21 @@ let ]; }) sources."istanbul-reports-3.0.2" - (sources."jest-26.1.0" // { + (sources."jest-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-cli-26.1.0" + sources."jest-cli-26.2.2" sources."supports-color-7.1.0" ]; }) - (sources."jest-changed-files-26.1.0" // { + (sources."jest-changed-files-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8247,11 +8186,12 @@ let sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."supports-color-7.1.0" + sources."which-2.0.2" ]; }) - (sources."jest-config-26.1.0" // { + (sources."jest-config-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" @@ -8263,7 +8203,7 @@ let sources."is-number-7.0.0" sources."jest-get-type-26.0.0" sources."micromatch-4.0.2" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."supports-color-7.1.0" sources."to-regex-range-5.0.1" ]; @@ -8279,9 +8219,9 @@ let ]; }) sources."jest-docblock-26.0.0" - (sources."jest-each-26.1.0" // { + (sources."jest-each-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -8289,13 +8229,13 @@ let sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-environment-jsdom-26.1.0" // { + (sources."jest-environment-jsdom-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8304,9 +8244,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."jest-environment-node-26.1.0" // { + (sources."jest-environment-node-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8316,9 +8256,9 @@ let ]; }) sources."jest-get-type-25.2.6" - (sources."jest-haste-map-26.1.0" // { + (sources."jest-haste-map-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."braces-3.0.2" @@ -8334,22 +8274,22 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."jest-jasmine2-26.1.0" // { + (sources."jest-jasmine2-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-leak-detector-26.1.0" // { + (sources."jest-leak-detector-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -8357,13 +8297,13 @@ let sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-matcher-utils-26.1.0" // { + (sources."jest-matcher-utils-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -8371,15 +8311,15 @@ let sources."color-name-1.1.4" sources."diff-sequences-26.0.0" sources."has-flag-4.0.0" - sources."jest-diff-26.1.0" + sources."jest-diff-26.2.0" sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-message-util-26.1.0" // { + (sources."jest-message-util-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" sources."chalk-4.1.0" @@ -8394,9 +8334,9 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."jest-mock-26.1.0" // { + (sources."jest-mock-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8407,9 +8347,9 @@ let }) sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-26.0.0" - (sources."jest-resolve-26.1.0" // { + (sources."jest-resolve-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8419,9 +8359,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."jest-resolve-dependencies-26.1.0" // { + (sources."jest-resolve-dependencies-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8430,9 +8370,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."jest-runner-26.1.0" // { + (sources."jest-runner-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8441,9 +8381,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."jest-runtime-26.1.0" // { + (sources."jest-runtime-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8453,10 +8393,10 @@ let sources."supports-color-7.1.0" ]; }) - sources."jest-serializer-26.1.0" - (sources."jest-snapshot-26.1.0" // { + sources."jest-serializer-26.2.0" + (sources."jest-snapshot-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -8464,16 +8404,16 @@ let sources."color-name-1.1.4" sources."diff-sequences-26.0.0" sources."has-flag-4.0.0" - sources."jest-diff-26.1.0" + sources."jest-diff-26.2.0" sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."semver-7.3.2" sources."supports-color-7.1.0" ]; }) - (sources."jest-util-26.1.0" // { + (sources."jest-util-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" sources."chalk-4.1.0" @@ -8487,9 +8427,9 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."jest-validate-26.1.0" // { + (sources."jest-validate-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."camelcase-6.0.0" @@ -8498,13 +8438,13 @@ let sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-watcher-26.1.0" // { + (sources."jest-watcher-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8513,7 +8453,7 @@ let sources."supports-color-7.1.0" ]; }) - (sources."jest-worker-26.1.0" // { + (sources."jest-worker-26.2.1" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.1.0" @@ -8522,7 +8462,7 @@ let sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsbn-0.1.1" - sources."jsdom-16.3.0" + sources."jsdom-16.4.0" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" @@ -8569,12 +8509,13 @@ let sources."node-abi-2.18.0" sources."node-int64-0.4.0" sources."node-modules-regexp-1.0.0" - (sources."node-notifier-7.0.1" // { + (sources."node-notifier-7.0.2" // { dependencies = [ sources."semver-7.3.2" + sources."which-2.0.2" ]; }) - sources."node-releases-1.1.59" + sources."node-releases-1.1.60" sources."noop-logger-0.1.1" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" @@ -8595,7 +8536,7 @@ let sources."object.assign-4.1.0" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."optionator-0.9.1" sources."p-each-series-2.1.0" sources."p-finally-1.0.0" @@ -8603,7 +8544,7 @@ let sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."parse5-5.1.1" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -8647,7 +8588,7 @@ let sources."rechoir-0.6.2" sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpp-3.1.0" @@ -8667,8 +8608,8 @@ let sources."uuid-3.4.0" ]; }) - sources."request-promise-core-1.1.3" - (sources."request-promise-native-1.0.8" // { + sources."request-promise-core-1.1.4" + (sources."request-promise-native-1.0.9" // { dependencies = [ sources."tough-cookie-2.5.0" ]; @@ -8688,7 +8629,7 @@ let sources."sane-4.1.0" sources."saxes-5.0.1" sources."semver-5.7.1" - sources."serialport-9.0.0" + sources."serialport-9.0.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -8700,7 +8641,7 @@ let sources."shelljs-0.8.4" sources."shellwords-0.1.1" sources."signal-exit-3.0.3" - sources."simple-concat-1.0.0" + sources."simple-concat-1.0.1" sources."simple-get-3.1.0" sources."sisteransi-1.0.5" sources."slash-2.0.0" @@ -8817,7 +8758,7 @@ let sources."typedarray-to-buffer-3.1.5" sources."typedoc-0.17.8" sources."typedoc-default-themes-0.10.2" - (sources."typedoc-plugin-markdown-2.3.1" // { + (sources."typedoc-plugin-markdown-2.4.0" // { dependencies = [ sources."fs-extra-9.0.1" sources."jsonfile-6.0.1" @@ -8826,8 +8767,8 @@ let }) sources."typedoc-plugin-no-inherit-1.1.10" sources."typedoc-plugin-sourcefile-url-1.0.6" - sources."typescript-3.9.6" - sources."uglify-js-3.10.0" + sources."typescript-3.9.7" + sources."uglify-js-3.10.1" sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" @@ -8849,7 +8790,7 @@ let sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-7.0.3" + sources."uuid-8.3.0" sources."v8-compile-cache-2.1.1" (sources."v8-to-istanbul-4.1.4" // { dependencies = [ @@ -8869,7 +8810,7 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."which-2.0.2" + sources."which-1.3.1" sources."which-module-2.0.0" sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" @@ -8906,10 +8847,10 @@ let sources."yargs-parser-18.1.3" ]; }) - (sources."zigbee-herdsman-converters-12.0.147" // { + (sources."zigbee-herdsman-converters-12.0.161" // { dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.10.5" // { + (sources."@babel/core-7.11.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -8917,21 +8858,21 @@ let sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.10.5" // { + (sources."@babel/generator-7.11.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.10.5" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.5" + sources."@babel/helper-module-transforms-7.11.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" (sources."@babel/highlight-7.10.4" // { @@ -8939,7 +8880,7 @@ let sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.10.5" + sources."@babel/parser-7.11.3" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.10.4" @@ -8952,14 +8893,14 @@ let sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.10.5" // { + (sources."@babel/traverse-7.11.0" // { dependencies = [ sources."debug-4.1.1" sources."globals-11.12.0" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.10.5" + sources."@babel/types-7.11.0" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" (sources."@istanbuljs/load-nyc-config-1.1.0" // { @@ -8968,21 +8909,21 @@ let ]; }) sources."@istanbuljs/schema-0.1.2" - sources."@jest/console-26.1.0" - (sources."@jest/core-26.1.0" // { + sources."@jest/console-26.2.0" + (sources."@jest/core-26.2.2" // { dependencies = [ sources."rimraf-3.0.2" ]; }) - sources."@jest/environment-26.1.0" - sources."@jest/fake-timers-26.1.0" - sources."@jest/globals-26.1.0" - sources."@jest/reporters-26.1.0" + sources."@jest/environment-26.2.0" + sources."@jest/fake-timers-26.2.0" + sources."@jest/globals-26.2.0" + sources."@jest/reporters-26.2.2" sources."@jest/source-map-26.1.0" - sources."@jest/test-result-26.1.0" - sources."@jest/test-sequencer-26.1.0" - sources."@jest/transform-26.1.0" - sources."@jest/types-26.1.0" + sources."@jest/test-result-26.2.0" + sources."@jest/test-sequencer-26.2.2" + sources."@jest/transform-26.2.2" + sources."@jest/types-26.2.0" sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" sources."@types/babel__core-7.1.9" @@ -8995,7 +8936,7 @@ let sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.5" - sources."@types/node-14.0.23" + sources."@types/node-14.0.27" sources."@types/normalize-package-data-2.4.0" sources."@types/prettier-2.0.2" sources."@types/stack-utils-1.0.1" @@ -9008,8 +8949,8 @@ let sources."ms-2.1.2" ]; }) - sources."abab-2.0.3" - sources."acorn-7.3.1" + sources."abab-2.0.4" + sources."acorn-7.4.0" sources."acorn-globals-6.0.0" sources."acorn-jsx-5.2.0" sources."acorn-walk-7.2.0" @@ -9043,11 +8984,11 @@ let sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."axios-0.19.2" - sources."babel-jest-26.1.0" + sources."babel-jest-26.2.2" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-26.1.0" + sources."babel-plugin-jest-hoist-26.2.0" sources."babel-preset-current-node-syntax-0.1.3" - sources."babel-preset-jest-26.1.0" + sources."babel-preset-jest-26.2.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -9141,6 +9082,7 @@ let ]; }) sources."ecc-jsbn-0.1.2" + sources."emittery-0.7.1" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -9154,14 +9096,14 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-7.5.0" // { + (sources."eslint-7.6.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-23.18.0" + sources."eslint-plugin-jest-23.20.0" sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" @@ -9169,7 +9111,7 @@ let sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -9194,7 +9136,7 @@ let sources."extend-shallow-2.0.1" ]; }) - (sources."expect-26.1.0" // { + (sources."expect-26.2.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -9247,7 +9189,7 @@ let sources."graceful-fs-4.2.4" sources."growly-1.3.0" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -9298,7 +9240,7 @@ let sources."kind-of-5.1.0" ]; }) - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -9334,12 +9276,12 @@ let ]; }) sources."istanbul-reports-3.0.2" - (sources."jest-26.1.0" // { + (sources."jest-26.2.2" // { dependencies = [ - sources."jest-cli-26.1.0" + sources."jest-cli-26.2.2" ]; }) - (sources."jest-changed-files-26.1.0" // { + (sources."jest-changed-files-26.2.0" // { dependencies = [ sources."execa-4.0.3" sources."get-stream-5.1.0" @@ -9347,35 +9289,35 @@ let sources."npm-run-path-4.0.1" ]; }) - sources."jest-config-26.1.0" - sources."jest-diff-26.1.0" + sources."jest-config-26.2.2" + sources."jest-diff-26.2.0" sources."jest-docblock-26.0.0" - sources."jest-each-26.1.0" - sources."jest-environment-jsdom-26.1.0" - sources."jest-environment-node-26.1.0" + sources."jest-each-26.2.0" + sources."jest-environment-jsdom-26.2.0" + sources."jest-environment-node-26.2.0" sources."jest-get-type-26.0.0" - sources."jest-haste-map-26.1.0" - sources."jest-jasmine2-26.1.0" - sources."jest-leak-detector-26.1.0" - sources."jest-matcher-utils-26.1.0" - sources."jest-message-util-26.1.0" - sources."jest-mock-26.1.0" + sources."jest-haste-map-26.2.2" + sources."jest-jasmine2-26.2.2" + sources."jest-leak-detector-26.2.0" + sources."jest-matcher-utils-26.2.0" + sources."jest-message-util-26.2.0" + sources."jest-mock-26.2.0" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-26.0.0" - sources."jest-resolve-26.1.0" - sources."jest-resolve-dependencies-26.1.0" - sources."jest-runner-26.1.0" - sources."jest-runtime-26.1.0" - sources."jest-serializer-26.1.0" - sources."jest-snapshot-26.1.0" - sources."jest-util-26.1.0" - (sources."jest-validate-26.1.0" // { + sources."jest-resolve-26.2.2" + sources."jest-resolve-dependencies-26.2.2" + sources."jest-runner-26.2.2" + sources."jest-runtime-26.2.2" + sources."jest-serializer-26.2.0" + sources."jest-snapshot-26.2.2" + sources."jest-util-26.2.0" + (sources."jest-validate-26.2.0" // { dependencies = [ sources."camelcase-6.0.0" ]; }) - sources."jest-watcher-26.1.0" - (sources."jest-worker-26.1.0" // { + sources."jest-watcher-26.2.0" + (sources."jest-worker-26.2.1" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.1.0" @@ -9384,7 +9326,7 @@ let sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsbn-0.1.1" - sources."jsdom-16.3.0" + sources."jsdom-16.4.0" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" @@ -9428,7 +9370,7 @@ let sources."nice-try-1.0.5" sources."node-int64-0.4.0" sources."node-modules-regexp-1.0.0" - sources."node-notifier-7.0.1" + sources."node-notifier-7.0.2" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -9451,7 +9393,7 @@ let sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."optionator-0.9.1" sources."p-each-series-2.1.0" sources."p-finally-1.0.0" @@ -9459,7 +9401,7 @@ let sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."parse5-5.1.1" sources."pascalcase-0.1.1" sources."path-exists-4.0.0" @@ -9472,7 +9414,7 @@ let sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" sources."prelude-ls-1.2.1" - (sources."pretty-format-26.1.0" // { + (sources."pretty-format-26.2.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -9504,8 +9446,8 @@ let sources."uuid-3.4.0" ]; }) - sources."request-promise-core-1.1.3" - (sources."request-promise-native-1.0.8" // { + sources."request-promise-core-1.1.4" + (sources."request-promise-native-1.0.9" // { dependencies = [ sources."tough-cookie-2.5.0" ]; @@ -9668,7 +9610,7 @@ let sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-7.0.3" + sources."uuid-8.3.0" sources."v8-compile-cache-2.1.1" (sources."v8-to-istanbul-4.1.4" // { dependencies = [ From 2dd6666da50e9d65ef7e278a995515b100084492 Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Sun, 23 Aug 2020 00:56:36 +0100 Subject: [PATCH 478/688] vimPlugins.vim-markbar: init at 2020-05-10 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index f555e25dca25..786be6ead6f9 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5713,6 +5713,18 @@ let meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; + vim-markbar = buildVimPluginFrom2Nix { + pname = "vim-markbar"; + version = "2020-05-10"; + src = fetchFromGitHub { + owner = "Yilin-Yang"; + repo = "vim-markbar"; + rev = "39953e36f6b6f6711e7ae3b1c65053ee23a1d8dc"; + sha256 = "1m1785chpik023nf4zcckr5vanzh7dcn5l7rc58hiqhdii7xamna"; + }; + meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; + }; + vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; version = "2020-07-14"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c8b3f9cfa90a..e08dabc6c952 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -631,6 +631,7 @@ xolox/vim-misc xuhdev/vim-latex-live-preview ycm-core/YouCompleteMe Yggdroot/indentLine +Yilin-Yang/vim-markbar yuki-ycino/ncm2-dictionary zah/nim.vim ziglang/zig.vim From 64d6ccc2b0a56ea89a90c04b860266a790e32bcd Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Sun, 23 Aug 2020 00:57:57 +0100 Subject: [PATCH 479/688] vimPlugins.vim-merginal: init at 2020-01-29 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 786be6ead6f9..77d5055cf056 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5761,6 +5761,18 @@ let meta.homepage = "https://github.com/samoshkin/vim-mergetool/"; }; + vim-merginal = buildVimPluginFrom2Nix { + pname = "vim-merginal"; + version = "2020-01-29"; + src = fetchFromGitHub { + owner = "idanarye"; + repo = "vim-merginal"; + rev = "02ac69b0468b7aec437df48df07f939558e85c9a"; + sha256 = "0m5lym56xzp1gnwb79vjmigfi6ar0iqbzaydv2r8c47jj7xyxiz6"; + }; + meta.homepage = "https://github.com/idanarye/vim-merginal/"; + }; + vim-metamath = buildVimPluginFrom2Nix { pname = "vim-metamath"; version = "2017-02-10"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e08dabc6c952..ac12e7b26454 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -155,6 +155,7 @@ hsitz/VimOrganizer iamcco/coc-spell-checker iamcco/coc-vimlsp ianks/vim-tsx +idanarye/vim-merginal idris-hackers/idris-vim ihsanturk/neuron.vim Inazuma110/deoplete-greek From 943986dbbf287ffe3a2b0493dc261bceb7f755a1 Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Sun, 23 Aug 2020 00:59:39 +0100 Subject: [PATCH 480/688] vimPlugins.vim-twiggy: init at 2019-06-24 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 77d5055cf056..e8a6255ed525 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -7094,6 +7094,18 @@ let meta.homepage = "https://github.com/lumiliet/vim-twig/"; }; + vim-twiggy = buildVimPluginFrom2Nix { + pname = "vim-twiggy"; + version = "2019-06-24"; + src = fetchFromGitHub { + owner = "sodapopcan"; + repo = "vim-twiggy"; + rev = "962b181f402f05b66641308fe1b3538d5f863ab8"; + sha256 = "0cqarsvdw9gr8pqp1gjy4rb6aaifjyb7iaaa2g8msr1ps0ihs3gd"; + }; + meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; + }; + vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; version = "2020-04-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ac12e7b26454..132e003db5ae 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -494,6 +494,7 @@ sjl/gundo.vim sjl/splice.vim sk1418/last256 slashmili/alchemist.vim +sodapopcan/vim-twiggy solarnz/arcanist.vim sonph/onehalf stefandtw/quickfix-reflector.vim From 3dc2bd11d296ade1fe0d17fda2b4745ecabd1ce6 Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Wed, 26 Aug 2020 23:24:44 +0100 Subject: [PATCH 481/688] vimPlugins.devdocs-vim: init at 2018-08-27 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e8a6255ed525..a373100a757e 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1386,6 +1386,18 @@ let meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; + devdocs-vim = buildVimPluginFrom2Nix { + pname = "devdocs-vim"; + version = "2018-08-27"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "devdocs.vim"; + rev = "1c91c619874f11f2062f80e6ca4b49456f21ae91"; + sha256 = "1nxww2mjabl2g2wchxc4h3a58j64acls24zb5jmfi71b8sai8a9b"; + }; + meta.homepage = "https://github.com/rhysd/devdocs.vim/"; + }; + dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; version = "2020-08-19"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 132e003db5ae..dc76ef20f306 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -443,6 +443,7 @@ rbgrouleff/bclose.vim reedes/vim-pencil reedes/vim-wordy rhysd/committia.vim +rhysd/devdocs.vim rhysd/git-messenger.vim rhysd/vim-clang-format rhysd/vim-grammarous From a7a65d83890ef0765b9a988fda3da8c93d30d4b3 Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Fri, 28 Aug 2020 20:20:01 +0100 Subject: [PATCH 482/688] vimPlugins.sideways-vim: init at 2020-08-24 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a373100a757e..09ee1b195a20 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3406,6 +3406,18 @@ let meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/"; }; + sideways-vim = buildVimPluginFrom2Nix { + pname = "sideways-vim"; + version = "2020-08-24"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "sideways.vim"; + rev = "b6e819e5d54efc3d160695499769cedca98b4f29"; + sha256 = "1ma4fin1dhxgz6bs4b6fk9gbdmnl89smpsdb2akj23pg2rslfysv"; + }; + meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; + }; + SimpylFold = buildVimPluginFrom2Nix { pname = "SimpylFold"; version = "2017-06-13"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index dc76ef20f306..1697d0fb12c4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -11,6 +11,7 @@ alx741/vim-stylishask amiorin/ctrlp-z andrep/vimacs andreshazard/vim-logreview +AndrewRadev/sideways.vim AndrewRadev/splitjoin.vim andsild/peskcolor.vim andviro/flake8-vim From f3fd1d5045b0f480dbe29a6e47a431c99e79fb54 Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Fri, 28 Aug 2020 20:58:35 +0100 Subject: [PATCH 483/688] vimPlugins.vim-after-object: init at 2018-09-17 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 09ee1b195a20..c80a54cb51a9 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4176,6 +4176,18 @@ let meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/"; }; + vim-after-object = buildVimPluginFrom2Nix { + pname = "vim-after-object"; + version = "2018-09-17"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "vim-after-object"; + rev = "7f52106df8a05e9bc1c53960c31a55f77e303903"; + sha256 = "13726m0c73n5pw9gil4ahbg71ibklrwkw9yvbr6qxxvn6qyijpdy"; + }; + meta.homepage = "https://github.com/junegunn/vim-after-object/"; + }; + vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; version = "2020-08-25"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1697d0fb12c4..30da24bf6eb8 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -207,6 +207,7 @@ junegunn/gv.vim junegunn/limelight.vim junegunn/seoul256.vim junegunn/vader.vim +junegunn/vim-after-object junegunn/vim-easy-align junegunn/vim-github-dashboard junegunn/vim-peekaboo From 0cea290a93d7d09dc6c192b7cca35af5ccc47e2a Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Mon, 31 Aug 2020 20:02:27 +0100 Subject: [PATCH 484/688] vimPlugins.vimspector: init at 2020-08-29 --- pkgs/misc/vim-plugins/generated.nix | 13 +++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index c80a54cb51a9..dd37d777392f 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -7466,6 +7466,19 @@ let meta.homepage = "https://github.com/Shougo/vimshell.vim/"; }; + vimspector = buildVimPluginFrom2Nix { + pname = "vimspector"; + version = "2020-08-29"; + src = fetchFromGitHub { + owner = "puremourning"; + repo = "vimspector"; + rev = "e634982d78573cf0d678b2981b9ac59cd99126cb"; + sha256 = "09ifckx1rks7qdj6zq7vqw3acfx6bxqa6ylsls1rnckn0fnn6li4"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/puremourning/vimspector/"; + }; + vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; version = "2020-08-21"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 30da24bf6eb8..6471485613f4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -429,6 +429,7 @@ preservim/nerdcommenter preservim/nerdtree psliwka/vim-smoothie ptzz/lf.vim +puremourning/vimspector purescript-contrib/purescript-vim python-mode/python-mode qnighy/lalrpop.vim From 10733cdd6da6bdd3fc998642689ee92203730e61 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 31 Aug 2020 12:09:37 -0700 Subject: [PATCH 485/688] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 240 ++++++++++++++-------------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index dd37d777392f..e3218ef657fd 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-08-24"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "3e2abe3f25493af63af91a6013447e378e09f6ec"; - sha256 = "1lxcwvjxrr2wdz5rzai2wd96zxhxmf81jyd62pcqhr5l9jil9ry7"; + rev = "d4a14746cdcda99ec70915c5540962c85e33f661"; + sha256 = "1k93gab46y3ld9s3h3ha3vmdfy37vhb3px79p5a62b21jwma9mxc"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -185,12 +185,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-08-15"; + version = "2020-08-26"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "0e04854da7695854e7df7c3c771e72ac55a60040"; - sha256 = "1i6y0p7fcvzgxkm82xrypwh7xgp1ywyvqlpglf93bgq8ygsll0v9"; + rev = "b89e17b44dc1bcc189298882a4cb6e3252c2fb4c"; + sha256 = "0grgii328c4y086par9l3f2cq2xh47dqv2w2f4lwd5z9zmnxkv4f"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -425,12 +425,12 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-08-25"; + version = "2020-08-27"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "606b437c4b6de1910c325eb631ee6b0f9bff8dd6"; - sha256 = "0a3vrimi87i6y6nc79smh2jiya2ciafxj0aifn6xhqnklj46isdh"; + rev = "085e54bf91b7f6ce19be9c2801ad4e69b15c24f9"; + sha256 = "0dfpl26jn6gc3nswbz0nclzr0s58fhmrhqvmknssg600wgnrd12v"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -641,12 +641,12 @@ let coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-08-25"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "fff876cee397d0d696cba74907e33aadfba4d601"; - sha256 = "0318a19qbp3rpcgqwqshzhrpcbsqcskl993yjxmgmpjxh4r85kh2"; + rev = "d66f9a5744477b317423d06463331df7b80a0a7f"; + sha256 = "0vlbyjz09n0zvkbx1kks44mawn21xr24ry28z21zgcv6r0clh1xk"; }; meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; @@ -882,24 +882,24 @@ let committia-vim = buildVimPluginFrom2Nix { pname = "committia-vim"; - version = "2020-08-26"; + version = "2020-08-27"; src = fetchFromGitHub { owner = "rhysd"; repo = "committia.vim"; - rev = "6c8e22b24283a4cc3f05339520e990af8e803915"; - sha256 = "05rjwn6fjwxd07c5imddkmxxpl8gq09iys385drrsvsqdx9f93vw"; + rev = "1d288281586d1e6b52646a4c412df3dd3a2fe231"; + sha256 = "11ik72qi7fvxkz7fnyisaa0xscy4pksq8l2pvclywzg3lcclhxp1"; }; meta.homepage = "https://github.com/rhysd/committia.vim/"; }; completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-08-13"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "43cb0b123544b602bd31747a3d8cf52ef0660723"; - sha256 = "0qllj4zqbw2fhp17lqk0xmbraq86gl9gjp9vszpd9jbw7h4lh168"; + rev = "ade764f6937721493cbfdc21b5b7e44ba71ee5cc"; + sha256 = "1abdgqpnljy17wfx3ixa73hyzhf3rixmnb2b8h8iyks3hgv9i36r"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -1086,12 +1086,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-08-19"; + version = "2020-08-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "1cfffcff2aba8a7b819f8b27414021d451abb4ce"; - sha256 = "0ysnkwv9hk84i4rdglrmjms24nh9i5x5qvr8lyzrjzzp8zj7qs2l"; + rev = "e4ea8290eba832997eaa36b6810e8ecc15ca1151"; + sha256 = "063vy5kl8vz9c3nnz7g8yw1f1v1vcmxfg4p59mzsfrqf93fs2y30"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1655,12 +1655,12 @@ let fruzzy = buildVimPluginFrom2Nix { pname = "fruzzy"; - version = "2019-10-28"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "raghur"; repo = "fruzzy"; - rev = "b312ae79db98cf6939c8319f2511efa06889e8e3"; - sha256 = "01iisbawq2w7yw866qvv109amnvyaymzyz9nqal3cjrrcwk6mmdk"; + rev = "4cdfee7b828a5cace22bfd93cf23fee0b2b233c4"; + sha256 = "1dmxz283ypz1klcmdf4jk699aifr3dywkh9y8v8v8vyflampqwwp"; }; meta.homepage = "https://github.com/raghur/fruzzy/"; }; @@ -1799,12 +1799,12 @@ let goyo-vim = buildVimPluginFrom2Nix { pname = "goyo-vim"; - version = "2020-06-08"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "goyo.vim"; - rev = "3e129198bba7d6b50406902002ad7d213a6cccaa"; - sha256 = "1b2wsxbg27nmwxrncwddkl2ck8hbiqdqi821vl9d1fl5nx042y2b"; + rev = "a865dec7ca7616dbbd69315ad1417b84d0c411f8"; + sha256 = "09mqmcz79dwcc5mv0p2wc84jc20ipa0vv2yckp4la4xh909ph4hm"; }; meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; @@ -2868,24 +2868,24 @@ let nvim-hs-vim = buildVimPluginFrom2Nix { pname = "nvim-hs-vim"; - version = "2019-04-14"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "neovimhaskell"; repo = "nvim-hs.vim"; - rev = "5bc177a87c9575c4995df90a098d330fe6e02f75"; - sha256 = "14jgvkvakpy36md5si2a3rf2w869snb65inriq68xbk32bg5pg8q"; + rev = "30baacd3c7a10625cb2d4dd64ae3bbfc4fe3f8c6"; + sha256 = "1w6cr6j77nwxszm1d0y4phvjsz9q4aw214xkscw6izakfmk06h1x"; }; meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-08-10"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "fc9d94ef006e082596c2e8724eb3f1c92ff203c7"; - sha256 = "1byji4p0xigyp8y71s00fs2vrhgz3xkf51mmyz489pp52c7nfx4v"; + rev = "b7b311e22a0b071dfb43aa6a9ccc0ed92e5eab3d"; + sha256 = "1q9z5hryjm6j2bb6iy57bwadm45m402k2bq1w0dkn1bgsnfkbsg3"; }; meta.homepage = "https://github.com/neovim/nvim-lsp/"; }; @@ -2904,12 +2904,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-08-26"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "e8fa0d0b31954314528bb88de3b8357af75d21fd"; - sha256 = "0rczmzzcc82499bbbvz4bfpv8llkzz21hx7i2pz3471c2c97s3hn"; + rev = "5948aba886e8aad26043402684cf85c307813c4d"; + sha256 = "1x9pmxwm3lh5w7d22danp8r8g5hycxl1w8q8d1milx882qsjwnqa"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3000,12 +3000,12 @@ let palenight-vim = buildVimPluginFrom2Nix { pname = "palenight-vim"; - version = "2020-08-10"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "drewtempelmeyer"; repo = "palenight.vim"; - rev = "9637fc4b6dc8ba852d5ec21c2c54851d81576490"; - sha256 = "1im9iggwiz86h0rydaz73482q8ildhd81hscq8czwigb03pslyxg"; + rev = "677745d52c4c03b344cd382dab0554a1d63b0692"; + sha256 = "0av2if81vcknv3w74h5y1mbip8y8i0kif94v5mdc17cfi6d5ngks"; }; meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; }; @@ -3408,12 +3408,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2020-08-24"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "b6e819e5d54efc3d160695499769cedca98b4f29"; - sha256 = "1ma4fin1dhxgz6bs4b6fk9gbdmnl89smpsdb2akj23pg2rslfysv"; + rev = "c81d2cabc1ada11f1531b05669fd07f52c75da22"; + sha256 = "042safg5i1f7rnfwlf37ic40rg6s5svsjci3cp06lzy3v9r8n2qf"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -3661,12 +3661,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-08-26"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "40413d8760146471757c69f08be68b24431f9474"; - sha256 = "1194kp8qzpjvv64lplb49n64ksyv5dbn25sng448b2fgd6wqk9ji"; + rev = "e5c864738db6135a27b6373585d6f4987ffdddb5"; + sha256 = "0zqmh4lrlb8v1l17789dbl2rj9i0ywcjdpjxzpikiajnsd8q4yl6"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -4190,24 +4190,24 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-08-25"; + version = "2020-08-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "5d3cfa40453fd8216be6ca68e9bd3846eed05176"; - sha256 = "150mdgmbyqp263rzmhp09a07547whalkbvzr9mi4jaq7paj21762"; + rev = "c77d89046e5dc66438190e2261fb2197df2a8932"; + sha256 = "009n427sgjmc12rvamda70marjaqpzi9zlddk5d1yim61qvh7djh"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-08-25"; + version = "2020-08-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "fd855c601c3d53b68f3971e1191f84c728d4d651"; - sha256 = "07s45ck4001lxrzpxcvqsyqfg6j61js4131gxi150y7jb2wwyjjd"; + rev = "155bce6665ab8c83447102e8402cc9d3b7c3b3f3"; + sha256 = "1qavi386va4wnalaf03b19lfxypbkjcjdiiasbdzfnlqpz7d4rwy"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -4406,12 +4406,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-08-20"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "e690bde9e7838894b68f9d3d4d1a131e86c13ffb"; - sha256 = "1pl32zgwn7ffyfn8xqqlck48sqv78jv8v4pfjay0rgr3jvaxis1v"; + rev = "3850f5aebffeddf3f1a9dfcd8430e8d0b1413480"; + sha256 = "1ivrsiqid4g89vb0kz3mdmlmar4m5irbnqb5j2lnaxbr7dfl7w3c"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4694,12 +4694,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2020-06-30"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "7c4dc5945b15a6b97ebef860070d30e36da01788"; - sha256 = "0mg8fdfsr59015m309kr9v5akwc3zfwfygn36x47c8q2bwjjr052"; + rev = "b136fd27a0afaee8306655eca7ac19d0e780faa3"; + sha256 = "0b6cjxjzkqsrip8b8glwgjam17hjrpk21pgyikfhdrv2cxqvil9z"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -4910,12 +4910,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2020-08-04"; + version = "2020-08-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "8963dd3b385410e27752fb859bd5cecdd22b5f71"; - sha256 = "0ax42ilx24cagy0m6ryda6h0fn7l8g1ckry24vfz2zp7d8y14hah"; + rev = "9e62520397f6e98c6031aba4cb63e611abe4583b"; + sha256 = "144qiari81xwaxw9rd5mh4g1ywn2r141438r3km6dh3acx18f6ij"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -4970,12 +4970,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-08-25"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "cc2ff0a07af75cd752afebbf3be62e6ebe234f2d"; - sha256 = "1q1jmbmx79ii5g991hcp6xd2nzcdqlv4m065vwc8hdpk3ghgc9d4"; + rev = "ff4c8b634676e67bf089e936c9afb1d308d594dc"; + sha256 = "1vj0qvbxsp6r4g8v2xwpgmswy54l4lvphzmmvkxp58cpwj7cc10w"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5018,12 +5018,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-07-31"; + version = "2020-08-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "260182c65cae653ac20e6a69ba8cc6124e7ba6c2"; - sha256 = "14dmar7d9qajjk2vy223mw7gwdcz548lcj5jg8pg7j4cyc6ffbyp"; + rev = "511d3035d4da2453a9cb0188b6020ed7bc8fc18f"; + sha256 = "003k746mqasd64yca0ay4lzbif7jx0p6ivs2g2f3mlnvpwiiim23"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5078,12 +5078,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-08-07"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "8005f71aabef13f5872b3ef4802f36503a16c451"; - sha256 = "0ns33dbkw8lc6rj6mvkgymdsl3i4g8slbh06g8h4rfn8qq5wjxbw"; + rev = "098b9c82e9ac39b0d203635a8041bb1aceb8426c"; + sha256 = "1d0shs6q509zwfpp0dqffhh5fm8fr8x6km6w8mf4m9p1fkxyaz1g"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5114,12 +5114,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-08-19"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "7c14e8ae5de7f4562c365249c83abc4d0e0d906c"; - sha256 = "1l96mlkfvpsa2bw9rc4m8s7abjvcfyy05gsm445rzbijqxigkknk"; + rev = "bf2dd524a7d7a2c6f50642ec3dae2bc1506b5c94"; + sha256 = "0d1gnszjppp4p1b39jxa19fdg77iq6baxm5hbjiinidmhgbal35w"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5138,12 +5138,12 @@ let vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2020-08-17"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "1b9db5b2089751dc80a5dab9fa976a9750c3066c"; - sha256 = "14bp6knckqa8rc9xwd5cnd6cnfhi0j6vgv0yl5nin47yzv0navha"; + rev = "e64fba4ee17fa8dd391405982500c72d68fc50b9"; + sha256 = "1pf0lpjy88hwmxn3lybjkq10w6s666wmpbzsfkjbp8xmqhzlvaf6"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -5511,12 +5511,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-07-23"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "ed31c776d1da96ed8d950aef5ffba3f767f2acb4"; - sha256 = "1qp5n04igirkqzqh7vfw0jnb31p36h356nc4n1kzna4zyqndzk9s"; + rev = "5bbe872ee41e50bd5b99bf6204d6147dab39cdc5"; + sha256 = "0jmmkqzan5mkc0j05243f5layqj7fny92rl1vlj32ipv8wgdmczn"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -5703,24 +5703,24 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-07-12"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "632d49bf7a227e13bea6ef341de35f89e45c55b0"; - sha256 = "1an37vkr9di0abxfnidlbij37xxy5z1cwnvpcnink4gman1msyzy"; + rev = "ab952d62a3c57d176e6c63b3f3c95b8ba37b0630"; + sha256 = "07caiz9k3bx5qn5kg5hbh2a2d77bfvyfg9rx7s7zkavpz312r4kc"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-08-24"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "69dc272277da464242bf729eb3b57ad79c5a0aed"; - sha256 = "0vxkfwdsfsfc91vjhdfbph2287hhr14jr5kzyblk5f1aldgr8901"; + rev = "1230ae8fa3d7004e6c3d74c1a5aa6c17acaf9f74"; + sha256 = "1q08h0in1x4hhhvpjx379qw07ghinrxizzvr8f7xxsgg9lpdjxji"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -5751,12 +5751,12 @@ let vim-markbar = buildVimPluginFrom2Nix { pname = "vim-markbar"; - version = "2020-05-10"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "39953e36f6b6f6711e7ae3b1c65053ee23a1d8dc"; - sha256 = "1m1785chpik023nf4zcckr5vanzh7dcn5l7rc58hiqhdii7xamna"; + rev = "df13c3abe88c01a716b1099de953dcfa1679e663"; + sha256 = "1y5w182d57z1nl8c7ng25m88by88pnxqdsxmcnnygdfjmvbv8jl9"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; @@ -5835,12 +5835,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2020-08-08"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "85b18e98a22b17f9e01867988c18cf396316c20f"; - sha256 = "1vzllvq1ncq4qyqbkp8z26sr4n9kpqv35zkfjas3r2jqbn958a93"; + rev = "e0714a6e21dfba55b1af202d09f8f50d27b00e85"; + sha256 = "0q1sxla2s381yjsyjjcd77pp4s98s0579mpr4iln59z60ysayc95"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -6219,12 +6219,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-08-08"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "13ea184015c30be5160ae285aedc0eaec0c72e6c"; - sha256 = "19vd5cmshlwrrf5ncgkny9p478d7bhjjwwjv71xb2adyfc9r1rv6"; + rev = "a9bf5bd72212ff7cf9e9e863c365a3464faa2426"; + sha256 = "0rrmz7vn3kxgrbwmil3vlddq13sy9wbgmn5kgz1r12wcbwf1sb56"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -6243,12 +6243,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-08-25"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "f0d6ecff07c88e7a406bc082d1ce98a5282b451c"; - sha256 = "1a8z7753a4g4zyi9dr24mkwhpi18r2wbnf9djjl4r4hr0hc7qcc1"; + rev = "d4fcef1aa835f20f4f9df41eceb406b66f446f70"; + sha256 = "1jn0581k1xcsvl0nz0q3qbz2k4cpzn9bjw77fn86xx3v9pg55szh"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6471,12 +6471,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-08-22"; + version = "2020-08-28"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "35dce70cdc2d7bf3c2031cc5eac2a47ddfb8c17b"; - sha256 = "0cc36cnqaz2q45287pfdkfxpb91dlhqi5a8kf8ghz61dny2xnv8r"; + rev = "e367f7b33fe9159c943963f3f839e4d08b74090e"; + sha256 = "1pngmr6ww4fmn71rshi1npyswp48dq3p7m02s6s703bg83smvmc8"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -6687,12 +6687,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2020-06-29"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "afe94543bb3bb95ef9ae2a58eebcbc17d69eb304"; - sha256 = "0iaksyh77xahg5cp0q9x5c14jdklsrgy9400jp4xjb83qgg6d7qq"; + rev = "7d82982e3858a6a514525acbba8bf2dff7da6c64"; + sha256 = "124iqc9vdaa4ms03v20d9np95dizbp23gs3680dws1gjskq9z2pv"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; @@ -6711,12 +6711,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-08-19"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "c093074fec6ba83aced4958ea44af11c5e5dff30"; - sha256 = "0919fhzpg7scm7idq4vh7kqjvlmc4037cn5d24ggsvziybi07k9p"; + rev = "c609efe753ccc2f2631908149e94febc0b257052"; + sha256 = "00m2kjkqyz1s36hn2m7qd98ms26cxhcbh1qhpnzbhfldz0wq9dd5"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6928,12 +6928,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-08-25"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "45c495d78143f73fc034781601ff44ca90e05687"; - sha256 = "0h3yjc5g8cklq988bilqjp8wv19yb16rmjphjhifa1c2fp23n7nk"; + rev = "d1b82e939135bbfc928d2fe54382631f20c6cbb3"; + sha256 = "1avlh0srwi0xyawp24s1s2hlzs1pj83d5wsn5ha8y9hd96byaxja"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -7216,12 +7216,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-08-23"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "28867f3dd99efdae7f56b18f6555fc78f30e043b"; - sha256 = "1av7cvpb8iqnpjbq1cg667k5yhgr8m4vkj6c030a82cy1j49m931"; + rev = "7bdd786c0ffe1f0876eabcd70daa15f82dc07af9"; + sha256 = "1bab231y2fcdnpi3fi3as79m2cx28d2drpy5iv77h5q1xgpz2jak"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7481,12 +7481,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-08-21"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "e27836fdf5b919ba8f4357abe16561ca4d0f60b1"; - sha256 = "1i5w7yijxa37jpn7k4whr3ri2d4nrmlrv94inanlpff006938fdd"; + rev = "5ff0ed043eefba26f93883759204e86d25323253"; + sha256 = "0nhxcfkr9f1svjki8m85if8acanw06ki1gax8x47sr43xns1i92r"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7699,24 +7699,24 @@ let zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; - version = "2020-08-24"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "jnurmine"; repo = "zenburn"; - rev = "de2cc6c93593938b9628e03eb424e318e5ec7959"; - sha256 = "17kvlbb49l3alqdd2bf6llvvhs0c9p75qn7i1kb1qavyipxi38a3"; + rev = "94b8319a881b0d2dfe738bae23dbc2129f0e78db"; + sha256 = "1js7zadw2y2gml3h1z5nqsjw8jafhgw4f2ajplr5nvai8j89j983"; }; meta.homepage = "https://github.com/jnurmine/zenburn/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-07-20"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "079985534a5f2795bfaf549f276d4a1c213bfcb1"; - sha256 = "173yx5nv9pnjm1qxcfkgbf4yfbjyifqjn5qvk8ibdvdxrhyvbrdn"; + rev = "3c95b67a76934959f9124e39e64eb14f65f14dc9"; + sha256 = "0m152kf9yw7q2slci2bzsqmycl9nxawhhclr4r9k5q87xdrzjqk0"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; From 9b9a97596923be691ce4266585676a6ba54acc76 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 31 Aug 2020 12:10:02 -0700 Subject: [PATCH 486/688] vimPlugins: resolve github repository redirects --- pkgs/misc/vim-plugins/deprecated.json | 4 ++++ pkgs/misc/vim-plugins/generated.nix | 8 ++++---- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/misc/vim-plugins/deprecated.json index 218a1ab622fd..b95e91a19b2c 100644 --- a/pkgs/misc/vim-plugins/deprecated.json +++ b/pkgs/misc/vim-plugins/deprecated.json @@ -3,6 +3,10 @@ "date": "2020-03-27", "new": "vim-gist" }, + "nvim-lsp": { + "date": "2020-08-31", + "new": "nvim-lspconfig" + }, "vim-jade": { "date": "2020-03-27", "new": "vim-pug" diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e3218ef657fd..77b1777ab634 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2878,16 +2878,16 @@ let meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; - nvim-lsp = buildVimPluginFrom2Nix { - pname = "nvim-lsp"; + nvim-lspconfig = buildVimPluginFrom2Nix { + pname = "nvim-lspconfig"; version = "2020-08-30"; src = fetchFromGitHub { owner = "neovim"; - repo = "nvim-lsp"; + repo = "nvim-lspconfig"; rev = "b7b311e22a0b071dfb43aa6a9ccc0ed92e5eab3d"; sha256 = "1q9z5hryjm6j2bb6iy57bwadm45m402k2bq1w0dkn1bgsnfkbsg3"; }; - meta.homepage = "https://github.com/neovim/nvim-lsp/"; + meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-terminal-lua = buildVimPluginFrom2Nix { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6471485613f4..0b367bd4bb17 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -384,7 +384,7 @@ neoclide/denite-extra neoclide/denite-git neoclide/vim-easygit neomake/neomake -neovim/nvim-lsp +neovim/nvim-lspconfig neovim/nvimdev.nvim neovimhaskell/haskell-vim neovimhaskell/nvim-hs.vim From 6b676b71bed2ec43b6d2729def73f1e3c91f7031 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 27 Aug 2020 00:50:09 -0700 Subject: [PATCH 487/688] firefox-beta-bin: 80.0b8 -> 81.0b4 --- .../browsers/firefox-bin/beta_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 10d9e7b2a22e..7548eb94fa6d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "80.0b8"; + version = "81.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ach/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ach/firefox-81.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "0dfa5e6840276f2bda03babdbf5273f7d5549d7610b3cf00983fae5a1e8e4ad6"; + sha256 = "4b133dd14e8ce1b934e482c4f7f7b5ca4b58751181bed89f6573ba5994ebe644"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/af/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/af/firefox-81.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ab51a6e8eb2fa5bd828da95600e7eeffa19c96fa8471299d832cc8024c5da998"; + sha256 = "8e50a0845eb058ee853fe40b13c88d764e721f7f8ac2eb54695049ab2a66e3e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/an/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/an/firefox-81.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "5b7f60f06964dc13d0dff9c603d00a8bdaf86b1c0871fc60b6b074cd535f5dd4"; + sha256 = "3edf8e157cac424b1cbfff019240877e7b7c3bf5ed1b576580569c155c5dd660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ar/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ar/firefox-81.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8be8cc6f547475cccae9ff6675689334c5baa10025208035bbed4a186ff3d61e"; + sha256 = "b2167ff357963e3295eed2ed423a1c3bcf62d645329b8f4cf817ad3c0e101c97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ast/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ast/firefox-81.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2efd5fcf0e69f155ae0aadb28534e141224d16c64706e05c1b72f6ef44fed6fc"; + sha256 = "805a87a99a417ff4b762c01a9a2b88c7963f53a04fc19b42015db304b15f4bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/az/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/az/firefox-81.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "9ab8f6b96db687367bf8f770ba2f72f19ee7f438a949373830d03eca0dca22bc"; + sha256 = "79c61c9515a683731649bcb5d36b26b95dd56165765e5a952339910310c9d259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/be/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/be/firefox-81.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b1b3e44c5733e197c53f013bfbe82eb7f6a300278f5b170338fcd56670445bd6"; + sha256 = "318fece7d1ad734f6a19faa7003e060b1254b31bf62e59580c70a64c4a167ec6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/bg/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bg/firefox-81.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e659b463c9a152e635dbc36ab972a64e3b6c28987ba5e5437672e68f24f6dcb7"; + sha256 = "55616606306dbd0933240d718fef8e83004fd65e4f53dd18f1601f09d0b94e92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/bn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bn/firefox-81.0b4.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "f2e4e6e80747754fa449105cc870b87fbae387b64d044f8dd2fef743e34c749f"; + sha256 = "c38fdef89f6aee7bf03362d2edfe4dcc665d540b1e1dc1dad8c53db20d70087d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/br/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/br/firefox-81.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "90749e4392f518e5636cc687946e066545eaa26badc23c46e6b63da6ce1cdd59"; + sha256 = "c5ac1c8e9dc2f4c5a1a2b6e33bf699a823a9422bce46922bc36222700a29d2e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/bs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bs/firefox-81.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "929758b30ab1ff8c034da26be688541ea1ba9e99e7206b981f11a7209ff6d771"; + sha256 = "a18718ef7f467ed87c76816fb6797165db3e06bc166c5e88b526c9f2ce5c1d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ca-valencia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca-valencia/firefox-81.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "1e60124bf4946605bd100945748302ba61d406b44563e9c51f58d781226d4a07"; + sha256 = "fcfccd0714c965801ce468f6817bf37eb074064e6e0b616c81be7218a6b632fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ca/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca/firefox-81.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6c16d41ae0748931de875f756b0a3b09268bc96c6ebec54a56e6fe8672879c95"; + sha256 = "5f08a2b2d357d5a6828865913b9e28fe90bda7a8ce17a0ea60effb25b8441b7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/cak/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cak/firefox-81.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f3f6877e2d8132737b978d073b54171ad6d30c227f50e1bb2dd2e1d15e2201db"; + sha256 = "db41156b75e1148527c51b915e3d9367d1c36a8d24a52132d1cc9cfe63bd9db6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/cs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cs/firefox-81.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "0677a8fd1ad69a8bb2869942624ae0cf37dfc5e89bc0bfccc68b79b7b4382688"; + sha256 = "d3287f28964581e63a3b1a5484e47e8ef33c136b39f13e07d6f3d555c27864cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/cy/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cy/firefox-81.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c037ba4d4f757784923aedd914527e8fc079ab33384d84694b469af3e9eaf125"; + sha256 = "f41fd34cf1cc72d5fc80113cdc9fae7f03f434e45e990e17a94dd68463464c49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/da/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/da/firefox-81.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "5c0b86cede27223a159a0052ea146f4f79a2cc95a9515d4da6bac598b1a792e7"; + sha256 = "dbbf1611913315ac5294f400c727cd5afbc832efbea56bd839b77cd4d6a5b823"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/de/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/de/firefox-81.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e40a4752fb32a31689bcf546aa4867ead0da80207de3583bb2ed43b944a12f53"; + sha256 = "1047799de5b42b5cb0827371872b7e85b93a4474bde9288da54a573841e156bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/dsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/dsb/firefox-81.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "d0e22abdfecbfbe2a25dbacf35e1bdaba716bfd2e09c0a4206c7260f405df15b"; + sha256 = "602eaa32d32db35d6a6d07f1c0cc53eaa4e432b7ab81d1f23b47d3125ac98d24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/el/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/el/firefox-81.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6a4206278f3aa89aa0a49b41df8372c4ae10a6afdd107210a7a1d8a240d800f8"; + sha256 = "8a460f9542e213b1605265c6497742e7d55213ac91b42d00a15b3123b47754ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/en-CA/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-CA/firefox-81.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "3b767fdf9d08e08526f72bb8bf14a7577370003f29734a39a61cd31d65491f80"; + sha256 = "9bcc44ca3f4192a2a7a001f27db6884dd481551663b6d0c348ed0b9281dabe87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/en-GB/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-GB/firefox-81.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "29108de728a833a8f6df04e2e4aaa21aadf3a572534844f4a44ee4ae0b78eb2d"; + sha256 = "9d241d56362ec52619ce02cdd2f11dc90c2e0f7c515c707ea56eca2e8f0eb306"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/en-US/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-US/firefox-81.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "01b005fe37487f7bc9ed39aacd09c891755fea9adff44addacb708000deebd1d"; + sha256 = "28972b08f8b3f2d19f5d50a2c9275fc459fc3e57df11c884149d1fdb9d99300b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/eo/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eo/firefox-81.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ca8f65b6bfb491ab66640ea2b02b234d2b68d268480532aafbba6fb6a190414f"; + sha256 = "013caa4590462b4bc5dc09cb963cfd85cba4b5419111cdc87316574ca5691e80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-AR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-AR/firefox-81.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "19bf5b10da6afe691cd50530c57256b18c4059c48561c1c776e5e35a7a0db327"; + sha256 = "d6970ccf4d58e2f1219cb0d43a8788084d0863f0f349ab3292e182fb0201e860"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-CL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-CL/firefox-81.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "42e383a691ef11afe1ed5afc64a0e6fc7e87534826d71d169e060f10fb07cd1e"; + sha256 = "76fb3c865b3efa1da1d34c8caa7b56b5b6d0af2cbbaeaef873fa96d2b8c93bb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-ES/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-ES/firefox-81.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7cb0aa8fbe6983bb68a583bd61d307d3b44a6a38f5b4c8cfcb1bd401bcd10421"; + sha256 = "7b41a2b297df4f0f6d4f44e1eb0ea0cbf02454382d0994f119a77876c578c4b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-MX/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-MX/firefox-81.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e9485c3a290a0a240d3cb9d18ec6929645aee333a919b4aa09776da106d943f8"; + sha256 = "733b90640a30df66700397ab0cc2045fcbc25af94ef9f36463a191228b511b77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/et/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/et/firefox-81.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "eb1a74b4e901b09cf287e59d1c8fcb500cf2f948ecd5098f3d928413ff219897"; + sha256 = "027286d744b1d9f21157d8242445ccd7610a08d8d541d64635fc16549aac1b4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/eu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eu/firefox-81.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8daba1de73e594e3138ffc8bf58865fd4ece581a43337097691f2bec4f419fc6"; + sha256 = "ff555da3aaf1abb2c384772b309fb4129dad57b9fd523fcabef5b2743d3063ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fa/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fa/firefox-81.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "f0cbaec0e1087ad8f55d24ba39d60fd91972189aa367d6b80a22de3f5b5ff821"; + sha256 = "c99f9297568f93eda17058d96dfaf83e587907be9b5005e8f649f693662e4fb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ff/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ff/firefox-81.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6b98dcb2d5493dc7084f626b6e8aa807d1b71d0d8bc1ad30f2ebd3c002bfde23"; + sha256 = "91658b195a622afa3c6fde535391eff1aa6b70f4c0cccc5c55e56e6d66459435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fi/firefox-81.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "4ebc56f8a38c32026380e02271cde2f651046d0b0fe4efadc48883fc2562fa50"; + sha256 = "cbc70d2051c96813ab081251c339f6cacd29ff26bdd8174b35caf9905a874635"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fr/firefox-81.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b6d4ca33e93968bc0efcb504db785f5dee55bed9834d90482ba5abf54ab97672"; + sha256 = "51890621c8c3c0e40103a10e705adbc860937e5dbbb8a3984eb71a5cae3ed63b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fy-NL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fy-NL/firefox-81.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "438d72ed1e22da87cd0ec63fad41b5e355cbd8d2417627d74ded59940b6b1b26"; + sha256 = "5c3a982a51951901732ec7684514be233fe1c44780531fb38f7205724c241387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ga-IE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ga-IE/firefox-81.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6d3b4a427fc80b4f7e69f94a90d5d2fb9ebd366d224136316de8e2b03c06ddb7"; + sha256 = "04b5d338c7557f12fc6fb2206d444a8a00be6814b1ca26de4923449a4425b57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gd/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gd/firefox-81.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ee54acaee8f5b2c0033fc3bf27cb6c90a6d1849c4eebb427e2efeb3a7fe44c0b"; + sha256 = "6bc0de0ac627203b1ba035f7a7ba7dd19bd82a7730c526c217150cc5de668fd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gl/firefox-81.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bce9bfb74c965ec6d2e346b86910c73dfc242be98473ba52f7d0cc34f14b42f8"; + sha256 = "37522d032422af770e37a93e33de6c0b8b79b2d22c6e71f32107cc8808de4d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gn/firefox-81.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "a98fce4baf9e0424317231aac5ffc0b3574c2ec6feddd9e538faab59bf9ab432"; + sha256 = "f761db975c72d7e419601988c0674acc7fe17227d5569cac85a1fe2d91f5141c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gu-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gu-IN/firefox-81.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "35161db5c7fb962ad5c60118d422250c2b6a776ef13d116bd23b31fa5c312a5b"; + sha256 = "8565c1965e09060ddc5b253fa126998f827d17dd58692ec4d17d194d29a464a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/he/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/he/firefox-81.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "66fc1b065881a4dea1ac8d82bbd64bb6aec223c1419663b7a50752cd1700781d"; + sha256 = "c3cc5911103ce955f89c5104ceb1ee50f7c047e4ec761681c8693b643f5d91a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hi-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hi-IN/firefox-81.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b1ce60f26dc79eb360e185805b98b2d1197a2e45c26cd24bd3c82edcfad42a5c"; + sha256 = "95463325675e56e700eaffb6e6690f4b398adb5cb77aaa34b87e16cb142f3533"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hr/firefox-81.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "712ce7b7e90c4b424a4ed46385a34905b7c4f59e6d07ced9e5e94a6108a3c206"; + sha256 = "6332ae812507f79baaed24e4fb79fc6c383418c4c9d41c0f3dbebc2fb72efef5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hsb/firefox-81.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "43fcc61024fa21216e7e05dd0fc46410b2dc32eaa87215014f9f3e0d83ebf37d"; + sha256 = "b18a7d31d3ce7373bcbd6bb7ff56adc023c58097126781d5f915828be8fef92b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hu/firefox-81.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0b73ab77e5e0f4ca34d0eed7fd734f30c1484a930751d5f2704e09e94179ed88"; + sha256 = "b1e4c6c9c21b2593f3fa111820a7e6a2e2e72e8b3065738f6a50df6ef4b7f18b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hy-AM/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hy-AM/firefox-81.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "bb52a07de2b0c1fccdc0910c0d861345822c9708f9f66471225a9e148f159cd4"; + sha256 = "562f4d9e094b688cb53860834e425997e65b78222724c48ff4ddd71ccca264fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ia/firefox-81.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "50cfffd20294f00e5194093b6114cfd1529e5f383f389565be7998c02a8802ae"; + sha256 = "87299a8aeee6da57666a06cc2d4f479b0c74c220e2b22ddf5254a052f11edacd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/id/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/id/firefox-81.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ed6473750ffa1006d0ed8a502809b56573681c85656f12cbc6fdfaf50506c15e"; + sha256 = "0cf1bae8def307d08e4c24fb44f7cfbebf150f1edfde2a3c0855a69775f26539"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/is/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/is/firefox-81.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1467ae111e51a4cddbf3611503e35da489fa6f506bedf441989fd093a1b507cf"; + sha256 = "6140d270e99173d995e42d32c0b696a51f72b1c6baa746549bdbbe7e2a08a811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/it/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/it/firefox-81.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "b4c96a1e12d8c6e16b7e85c0080ff0c1e50cf78d0762907af075a9e272ea9ed1"; + sha256 = "3583cf0223528929141879c085278354927ced41d71321fe8d832ebd356d4614"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ja/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ja/firefox-81.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "f79a5b441d4f6d10c9022e5b872e5e607065a6f8932b1f1ac4a32f586848a676"; + sha256 = "4a1bcf87b3cd09d7c3379bd922ede7a3c6c4a19bf11596e858634b408df95cad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ka/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ka/firefox-81.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "4e1e846659d18470e098dd9244278de6343bdb2d076927a46ae154f7b19b7843"; + sha256 = "320567daf4e4bb12c7209aff34d98efdbb2dead9b34f23d4a2181d2cdddeed71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/kab/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kab/firefox-81.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d538a9b1b4c439bb2f1c57cb076b9f6f5be5ad673ef7f4e468031cb8f9f83d86"; + sha256 = "5b9d60703b494a4eb5956e59bc2d6893bc70e8b890d0c940f25d25b605000c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/kk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kk/firefox-81.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3aad1bffa285439350fd1c3fb09450e1d27f51a011383106b5341f75450884a3"; + sha256 = "45580e0c3cbb265f718a69ac9de7220d3d89e52e3b8a5cfceb7363c20e63c83e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/km/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/km/firefox-81.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2d59a3a69a96e793efa5257fd9ba903fbcaefef99267f3f0921c3ef073a12f8e"; + sha256 = "24b4879f22829a2a5d72219cba2c5658bf7c7e73ffdc9640f6e897ec613733c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/kn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kn/firefox-81.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "804f85a1d5e8f5acd561aa8ae91e1100de2e62ae270d742f0b16111dab20f94f"; + sha256 = "905ed3fa762c73c5ba677b8ca5b620294cb1ad36dea2ac53fdfca5a739c0c0e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ko/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ko/firefox-81.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a09382d10e2114f02848e7deb8c770599ff8f84e18a5c0253f4884b7b7174233"; + sha256 = "a6a63ca4106ee9c710331ea50099e2a50842465095d38ea55a63dcb3ee3d80ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/lij/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lij/firefox-81.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b088949b9d87986b2ff1fe4020a59faed22b0c205a432ab29b862d07bda0dc42"; + sha256 = "b6fa42dc9bc68d4b71ae93eebfb1a19416f0cdd06d20fb344c0c0347aa2d4862"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/lt/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lt/firefox-81.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8dd0b88ab0d16dcdf218b58e9f2fe8d8311d826461de8a4c94c9cfdabc8bf905"; + sha256 = "c70f6e7c20e252fdef6bf136c99095ebc27672719594df302e58be801a3f06d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/lv/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lv/firefox-81.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "bf289b7115d3114a59e92a3c63cbaf98bdb3f3fd1cc03a9cd5976a4834ef147e"; + sha256 = "c64d561be20fc8f0e7507a0b1dc2e5d79af407531a37cc7da3fd880789899fdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/mk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mk/firefox-81.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "cd9b7abe6c53a221d88c5f49fee164d069c21d956285ad2d0fe06e7012b72870"; + sha256 = "aa38b13c6bc5288ab491f5ccee3a881474b1f42f1bd959435035782d1c39f407"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/mr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mr/firefox-81.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "370d8540a678b356a4f373a81e4807170b3599db6472633b34c768070c77217a"; + sha256 = "e56eea60ca1cd447e30cccc82ce7a4797fa23e9bb4871a5e20e05d44ac35f720"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ms/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ms/firefox-81.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f141f3a22d6b5914f8cebbef0d2e124fc50833ca86bb62dd2a01d957ced6c099"; + sha256 = "9d8445e2bda6a8cc8714a0eaf82e1b9ec03fbd94042c3557f07d9c8b25bc4b6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/my/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/my/firefox-81.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "ac62b25be480b30ee2c71371a6a702c37b58e537a4c4781b92e4f0b74c11cace"; + sha256 = "4a7527e5e3e6ea0181cc8b9a2f206bbe162a4e1867faa75b4af261f08e89ae0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/nb-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nb-NO/firefox-81.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c3364a0364176839b97d08294ec7291fa13d212edb806738392796218b7a7080"; + sha256 = "c2ae9f5fb235541cc69cc3c4307dd4b7de51a9f4b6e038ef3091a773edec6c5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ne-NP/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ne-NP/firefox-81.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "75d005443c28be517828d07be438b8c980d6885b4dacf42eba58573be4291b47"; + sha256 = "05acc175b06ab7f5861a3a7e58e9a92c40e0660224426fc8225fba6c25888726"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/nl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nl/firefox-81.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "cebae8c9c06bba81194c7126f115ffca44ae020af33b0de8e201ba930f4649f2"; + sha256 = "640be4e631343c9f2a55c24a4d5c63908627e9ab2d39a5346d1842d8e4a57799"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/nn-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nn-NO/firefox-81.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "27607aad3a1d5ac50f159289cdb92e71d882b77ec9d2d320b470dfba799295d4"; + sha256 = "46a898f41e5c3c9853b05fda8f44be01b2fd5a7fe3dad281c21588c2deaaedce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/oc/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/oc/firefox-81.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "634372a5d704c890d464c7c3dceb365689f260feeb9ee273e97d32d8b8c9a102"; + sha256 = "7481c8bad2e905a033f09ec4c20f8d4b184a0f90fce1c10648c4fc57a7a5f301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pa-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pa-IN/firefox-81.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "16a165ec3517839d07d2177cd3e88a61f063ad7341095a2c70baaa5de1f7a2b5"; + sha256 = "a460ed0241c569e1ac62727b17f8c8d0d4091e794900e2e2be7d8d8e2b90ada4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pl/firefox-81.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cceb8d8fc319344bf031c7d86ab5d19ddd059b67a7293a2bb785621b99cd98ad"; + sha256 = "d82e300cc8be61ddc2aa66bd4d4ec35cd18e47603bd19530cf48728c5fe67a5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pt-BR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-BR/firefox-81.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "5be4bd15fdfd7b80a156740c57166eb31c77ff32f7e4c354d403606aa3049f8d"; + sha256 = "1ee1560d4597adbd230fb0c556a4d8fa6984ee86bb731f7a5a936d660897eb99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pt-PT/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-PT/firefox-81.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "0dbb3aff49303f94539f82ad5d434351f5c2d1ffaf414b94f6b8ebf6535d656e"; + sha256 = "be7e484f8c3f4d8b7b894a437b70b2f4b448e3a7df518ce6906295df9be7749d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/rm/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/rm/firefox-81.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "6880c4976bb118fa934d189d6af4cde582d64b909ba0671a4ae62e41bba4d95b"; + sha256 = "819cf6a13d1690dee4e4255aa0c3f551411e2b7076f8ce3447bba47f07c806db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ro/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ro/firefox-81.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4e5ee175921c2e919d2cf1eace39d52c5b89c6bf4ff9bfd9080d885d2a2f83a5"; + sha256 = "2baa8154f358962983c7e0b26c4a7cc8cf97587b646884527fafe46f5d8d92ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ru/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ru/firefox-81.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d4be0a9f6d4dd99409a5099624429f951768585a955022c0efc0ca00140bebfb"; + sha256 = "eaaa5338ff8ffbc9bad5321ee3eb7410feb9a26a06d3cc49707c0a048f4412e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/si/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/si/firefox-81.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "77460dd1207e11ef6227756c1fabca26777a98a5ae92bd38be2e86161c0efa12"; + sha256 = "ce04721a96cea62eb7011c261f740e9e0ad6288ad9ff231538c3a6df86fb40ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sk/firefox-81.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "018602509df7c86cb001f007937dcd44694438fcfaa9002562995b8cec0d956f"; + sha256 = "4b19fef341d64f94ad97a0bb8821693b00e4e7e04454156f92f0c82f4fee0005"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sl/firefox-81.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f35c5a8d8b3eb56c9241a13d20708069073558caa02bf6ca55459150869ad114"; + sha256 = "96192922f2012a3e6be634c7ed09017cebf9498c6fc2862336bfddbc4ea40840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/son/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/son/firefox-81.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "561d9939c3065e2a604d7b51535a5b4b8c0da7e3fc9274657ea88366c5924c74"; + sha256 = "dfb144edeb3712bc0a3bf7e0675de80315c78bea7d7c6ee5f6047c077acbddf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sq/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sq/firefox-81.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "1e38655b0ca5684decc1619a51b2bec39b8fdd7ed302513a8f8d14a3ddc7533a"; + sha256 = "54dfab9e843dcde43cf188ae33922371fb90c1bfda53ef629df16576d6a0bac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sr/firefox-81.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ab879d65f27ebe393ee86c12b2eea256639d17f2dcfd8b4981072772a277d783"; + sha256 = "f00b5184ccb47223858128aa26481867fb33aa50a914a8c807235c9a2bdf74fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sv-SE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sv-SE/firefox-81.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "832ca5b1e0d41675066e7bcfd16563a9e03dd87bcd96d4592232ca26321af7e9"; + sha256 = "d3884cf4a9ff23971badfb1a794c9489e0006e6851a0e501e290d8793054cc1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ta/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ta/firefox-81.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ad9c6fcb91fc87aa11ac0912f049db9cf93f5e62797335a8a699b9ea8a7ede9f"; + sha256 = "53584d2093feffd36a8a5249ee438b82d21af834a3c2c210944030c127b91cb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/te/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/te/firefox-81.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "37c7836f86fc5f4f48aefcf28330e1003687752d506d1050528a19b592bbd7d7"; + sha256 = "63b65440720bc492fc95d080b191ba452cc87c8501b195e02df66ea4487fb902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/th/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/th/firefox-81.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "66cd4f8cd18f1c076b9d7538600459fe01998185cbf6899126841b16b3184321"; + sha256 = "3b01fff09734f2206e4aee227ee7f0c13544fb1635f92a5221ee356117955446"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/tl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tl/firefox-81.0b4.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d3f6102c2eeec1ecb1ba28884592c11e544e71d42ea2204de59ded1065f71f5f"; + sha256 = "00f1c65baf63246a9ff44d98171a6ceec6e276488f5d6fbdf6f97760509b3bc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/tr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tr/firefox-81.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ea161412fd08571782f607c2aab116a1e1912caa3eae785db1129f617b389f11"; + sha256 = "064d6c6036fae215fcb50a87863e6808bd1626084d9144a18f7ea1f4c7072093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/trs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/trs/firefox-81.0b4.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a1824abd2c3f0e0ab3e1ad971137cc81c636af48865f7bdf7eb1029a7d08a16e"; + sha256 = "73c892e0b0ab0bcdbcf6af88fdc8de335bcd5c56805675ba7b487ed3b620ed22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/uk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uk/firefox-81.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "38afb4f054d9b577257509b17e32049e7c5fb50e47971fe52bc5ecc7d9b5806d"; + sha256 = "8ac48524702e3f177e78fe97e4fcf528752a3ea0ef08e9212037dbd0febea53e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ur/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ur/firefox-81.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8b9503d7b5452c43e7300c8a1b1c2ec9d2b0572aed78e7b8f05fc7c1ca883d07"; + sha256 = "154dd642021769aa67a081080f33d87d736686b9e6e46cdfa2bd2201605bda26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/uz/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uz/firefox-81.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "789a4b08daadd64f6275bf267bc269ea92177902ae7a8b20dd14bdabcda49cde"; + sha256 = "dd36910596d777f49de3dfe8e22f2838b76081cb259107047b9a98c3445c01eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/vi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/vi/firefox-81.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "10702553917f359954b204b65bfe311826cd44f6e81e7864c05a94d541dbd636"; + sha256 = "3cef9f657f83bbfc68ab4a7c8ab84e1e937553cca98cfc30d3fbbec5c8be7907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/xh/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/xh/firefox-81.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "d99ea01e9d8bb5efeea45e2c2e14da6618d1eaaa25f4f1a1facfec1ebdef2291"; + sha256 = "30a98fa9218cbb07d792629e73a250659b321a3555eedca0a68e6ffb1d5191a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/zh-CN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-CN/firefox-81.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5c7c3d76a7e4fea7ca207cbcea698eedc970a6fb727fad7c071e19325fd8631d"; + sha256 = "bf15e819d84a3cd3825df2046bd9ffc139008f45fdbbdc64e04cec6a549af3e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/zh-TW/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-TW/firefox-81.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "9fbe3205110e83ff45fdc8f5c1659caeaef48c75db30a7014454d6338f1aceb7"; + sha256 = "b194749cb05fe282f59f2f6621a5d04fba42406d7a3ea71242b667fe94a5a857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ach/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ach/firefox-81.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "a6a965e26d90ef0dc4b892d0d90f8b0b81ea7ced3ea1de3a70126c4095731fd8"; + sha256 = "203ca1a13f76935935daf2124c662329df93af0e44b4bcee7334ff60092c8027"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/af/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/af/firefox-81.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "649d3f77f16832b3a645f98616bdab4b788fad7d2ecc2d91558d369b439857be"; + sha256 = "481d233552b0702a8b8092748b4c71da3c14c8df5e971c5b4662273cd8808022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/an/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/an/firefox-81.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "8b0e52a60af14565dbc514536a8808fc8aafefab56d765fb0ce42565f67ce1da"; + sha256 = "a128b96a34eea409a8b5fa412e6a1a36bcc28f2fbed40ba9b474b9d86d23dbae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ar/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ar/firefox-81.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "522f35d947d56354d31ed106ba5fc6feda9ad0a4c29476c7497aec6cb2f6dd36"; + sha256 = "a2ab8b556b6b477bb1aa287f630e7ae6aa902fd1b75968c01c2e2c76fe9cdf09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ast/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ast/firefox-81.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "03220451f980f89f3d9b23b53f90e852402fdbf54494ac99be7dc8932287d732"; + sha256 = "193422cbafcaf5ed58f334a9d5b30f9a6181aa1cb649303df18626d9a3484088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/az/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/az/firefox-81.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "2d70285230ec8fd4f5f0e3232d08b5c669e5f71d4758d88947b82f907305df3e"; + sha256 = "c206f5351f0ba474a5277e223514f032c7ff0b66029f570143f2d1d2b8ccf566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/be/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/be/firefox-81.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "02967f01fe3f8b225d60d462e4dd17cee0d031bd5171ec781d2938796b1174ed"; + sha256 = "c3d7d04ea43230b6a6e4227b799d47348bc5c2ab6a60e93f4107efa6e7b34ef3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/bg/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bg/firefox-81.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9b5acf3d80fc9f7e8ea20d0df282d6ff1b605fcd46a5a329a9138734df501035"; + sha256 = "08edf0db8aebd41f25366ef4302214b4ef00540be39406fc780eec288b0de324"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/bn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bn/firefox-81.0b4.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e8a65769c738e9079d1aa9fda2ba74d21b96cbb76d4e348acba7ea1887d90d52"; + sha256 = "a6d5dd5918d94e74ee8ffeb10c4caba65697ecdb81598b0bda815fa5d4830a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/br/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/br/firefox-81.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7c2a12900d2adfa765b4036e05875adbf59f70e4eaab33568799cae91d948b5a"; + sha256 = "4e7ffbc380b6f8716399ee9d7b9ffc5fcdcae72f48b63ae4bcd2011a85efa0b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/bs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bs/firefox-81.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "bd0e3d7b35cb845288f91eb1ae21d405f4dea2a6633897c30fcf56219982cd59"; + sha256 = "ef36dae13dc3c943e5981a16d7ca61b4c6daa9a4873d2cd87022fbbcd01c8907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ca-valencia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca-valencia/firefox-81.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "a167e7db353adf008d28458aa24209175c29c1af92f21da7e999729a8ce7e5b9"; + sha256 = "584a0370f79011dd2691461acd573133348a94cc1323d6fb99dea9dd6df1e155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ca/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca/firefox-81.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "809cca0c4549e747944f043c96bab11e50a1ee6f4ddd6436ae94f85cb55063e8"; + sha256 = "e280fe05f4e9320fd354407811ea8664d50de3810298e5eb4922b2d3e549ad11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/cak/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cak/firefox-81.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8575e1572ff2872993aa7cc07ea1fe82d66830e80c779f742412128344afdc07"; + sha256 = "3decca8b5b0d44db169abfa20f07b3c109bbea0a68ae3e44a35f97e3b989324b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/cs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cs/firefox-81.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a4e5c1e08e138c077a8cd5a3f54e3a7a1ebaf7ac674d2658e1c4cb10b4a26a5a"; + sha256 = "efccc2a43f961179f61eb7858b1e17ffd069bf7a26027faaad09f1b529ade52c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/cy/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cy/firefox-81.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "149d1bb8bcedcf215095629e71e530a58e0dfb60a13e72d6346db1200f79a882"; + sha256 = "dc8a1945d0230070e2bdf65b673a9aecc4868c9821f7f1e2f6e0d18bb98c912d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/da/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/da/firefox-81.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5eb27549c370ca89421a9d39bc5f33c948f85c48d67446b32281a54c50e12ea1"; + sha256 = "058b800e2c9fc464f2a75fa48542269056a88916b9474a953f0d29a3e9041257"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/de/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/de/firefox-81.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "d868edc9f9831a4f8f196f438a1235339592a05086c3d5e4ed25714df36421af"; + sha256 = "7fbd0b27073b2c46829fc0d631ed11fd9a38a07d0ce474f6837ad1f5c2adff62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/dsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/dsb/firefox-81.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ffc379cbd30f04c1f7c78f6991414b9214ca2c23280655690dea42c9a11992aa"; + sha256 = "d0b6083098d416366040a877a92b163d469e2764af995c65fced49de23148624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/el/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/el/firefox-81.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a87721a1a6da5674d0b9b754d142ad5c00fca4274cca7d4d1d5e15f1e21be389"; + sha256 = "104258b0e47b661d7c75c72f5a0d7750399a101a9996a3f8837f0f524e9820db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/en-CA/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-CA/firefox-81.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "dd04f6027f1cac7b5a34013ad4dfd3b0494f40f243665a80ae058887997ec299"; + sha256 = "be6750a6946b7ef58869d0c9f0412febffcbe4955c823a573d02822f9a14266e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/en-GB/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-GB/firefox-81.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "d425ea90fa18877faac09cd7ba1b499cc92133580f720cf0481dd651f529582c"; + sha256 = "e6d2c60c30aa90b6026cb85d6fc3a1d1b7266263980df652c9a1c158528cfc74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/en-US/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-US/firefox-81.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "777291dacd6ada8f3777c63e0264d36f3477b15e262d575e60b9efc4ac5de30d"; + sha256 = "be534d43126a7fdd297f3431b579495b6f22832a358a0c793a23bea8adce1c9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/eo/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eo/firefox-81.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "df865cc147074318eb89c0ac4966b42aedd12aecb2a637bab18f6c231fafbb29"; + sha256 = "6ffe84994fe7db178e59ea667495e95e6fba621cd0e4ec812d94dc3d98cf0a3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-AR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-AR/firefox-81.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "cbccc83c1e54a59716173e5f1a8e675ed1e3567a7a316e48b5bf83adbfe39597"; + sha256 = "982874a48791db0bc98559de45bb8884da93ee0a0738664c73ae5a08b3b1a2ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-CL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-CL/firefox-81.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "45b0243d594b5e8b4828746719b93a9388ab509aef54d03412292b76365f4fd2"; + sha256 = "c21fcdeacdf570a9f8bba9c34c64a60776aa8a4de56b5f773b1d26eca6d65b70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-ES/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-ES/firefox-81.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8eb9961ed19594381a761385af10bb0acd0bddc95166737a766b20de03e12e0c"; + sha256 = "bb34dda74d59c862ab24ad9ff0c5ad1e1fb5d73e6029b915f966d0913cf4506a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-MX/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-MX/firefox-81.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "d4cd439aa71e06af039922fa98dc33bd25f90c728faf09c6bfaab4bfefc6dc0f"; + sha256 = "53686263f77643ad4f769faac81697c7e1eca216ed0a7b051c2318b181318d7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/et/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/et/firefox-81.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "dedb23bc1ee86909143b02b1d1601beb1dce38e9bb14ec8cf015e274fbab9e97"; + sha256 = "053d8ad6cf01be9f51cd133090e99230dfe797effc749e14c8a21ba712546776"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/eu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eu/firefox-81.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "8e51b57208029e32ae01c93724f7b2f25d896f732e6739d5537e770b386e22be"; + sha256 = "77774b9126ccbca2b5716b1701f8eb7933ee67ec5437a00b8ab991f423888a80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fa/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fa/firefox-81.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1c332cda9a1445ba3b58ea93c614300f3b0679d3b32e9722068a554c92e3c8d8"; + sha256 = "4a0554bff8c11ca39f1de223537d595d298e6f61c2590543151e8ab1d8eca36e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ff/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ff/firefox-81.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "c99e29b5b31196dc71a8c89b66b0e34b9bca8ae630414190ef7f56133bd08959"; + sha256 = "272784bfa53ddc48fa43590b3ebd2fce808786b4649efa1d5b417488efbb8911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fi/firefox-81.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "98a35572115ce221a03215bc4a4347f9579a3052191d81f64af1455f38f47ff7"; + sha256 = "c389eb80f3cdd215549c7ce55402a7c03544eca2fa3c2074842af32755d14cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fr/firefox-81.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "34f0991b083d5a924a0e77000010d89f049767a86338db7f565a1fbc815216fe"; + sha256 = "dc5a79229fbdd3e9fada6b6bbb35183c17a703b9c3f29d9172f2b56cd5c0d289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fy-NL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fy-NL/firefox-81.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "157dacc021af4ca81590394c4dd01cb337f4436df1020718ffa424d43f023606"; + sha256 = "3eb69867818f0a8448e4f421f0ded4ad1a172bd5c99048065bd4b6cf83e8b25c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ga-IE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ga-IE/firefox-81.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0e338674ea0ebb68052aefbb33c8eadcbb0bd71c78fe9bb7eba455e7c58f1a5d"; + sha256 = "b09208ca65279e393f512a04712f91b2b170ca6e32777479acb7a03db89e87dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gd/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gd/firefox-81.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6129a4db1d2c0b0b2f250ea2ef30d08cf41da50c1d2401a7464ec4f6b8cbbe76"; + sha256 = "011beadfc3e78ff216a13d55a9b54471ebf84bb1be852aa986ab5ba1648836f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gl/firefox-81.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "94ea69444a49b0ea79f22d805963adff4a7d8fab8321e415fe8b4682b489e7b8"; + sha256 = "c492314ad418a190484fce335d1dc5a28a515f630c59b1cf2d7e812b6d3c3bf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gn/firefox-81.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "e3e6533130afd6577b8f1d41f66c2b16d3b385aeb398cfb211e7196073d7ff9e"; + sha256 = "25b03d5251a69631f5d0cbf9dd89d1ce1dd5355e05efcc233bcf62e5311d4d01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gu-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gu-IN/firefox-81.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "25ab691be04561a2dcfb2185fe5deac0b6e4785f3cbbed871b8f51e370429b3d"; + sha256 = "1cc9a3b933b625a26beeb7c31eb062e22ff8dc98c4860bf6ef4aef5567552d63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/he/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/he/firefox-81.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9ca2569009d5707c9ee9051173b24c5f531bb9c3aced445bc3bc01fe99c7926e"; + sha256 = "027cd01f51db3b4d27381870ddf95ca2f7252bf7c6588c3d073d303bebb45311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hi-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hi-IN/firefox-81.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "c39d4070be5517f8979527064b5553236d2f1f15eacfb3fc66fe4f7a2a063814"; + sha256 = "99d6d2159ae34ce2154678e4913145ccb9c96572ef19a18db6a223647b7ec68e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hr/firefox-81.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "c6c37633f91a675dbd33180761542d8f1af950e876dbd1635f73a0243e2165ec"; + sha256 = "d9b2fbc6474bac73fe7fb5c4eb818f5dc0d74cbbd52c3aacbed0f17db8bce9eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hsb/firefox-81.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4bc5975c97a98c4a93ffb4940b2f0f35670cbc9785f5fc07be5d387c3403fa64"; + sha256 = "dcd0c254c542a50807cbf1d0036a4cab5463c237318fb1d1fec9826d052aef62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hu/firefox-81.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5c76f9bed31bd9e906b0a044b67113f1cc6d91ae738d3c6e1c2746eeccf8854c"; + sha256 = "5a0a94eeb9c8d219b3e34e92fc51163e190c606f975735215177d521b7ed9656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hy-AM/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hy-AM/firefox-81.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "40d1896dd1763f035ea5f626430e6de77df4e0c83f3cb4d2d9c2b992379695fb"; + sha256 = "2ff26ab884697d226bcfe224ff5c068aed355f6bb00777fa6d9f3bd0b9f9b386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ia/firefox-81.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "5c8a0451233c3d55d764a3ab073ae25b3fd2125aae40c73968672fed9b2520f6"; + sha256 = "7bd9d940f81d76984886463cc10920896247084f91efedf99f787601a47abba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/id/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/id/firefox-81.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7328e7f45205c3f9109eef8d7e512f41dfaf179eea50233f63a549efec0412b4"; + sha256 = "c415b55ec7701219557cc4815ec0975d86f18312a2ef6a8abf3e82876edc5045"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/is/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/is/firefox-81.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3f9e92d8218acf6da2ca09bda7544b6ae6d99d1ec2398bd3281fd28aaf3b7845"; + sha256 = "3ee6e83bd9c244b123c1a1989fbcc0524c4101fefe697ea0a9ab7c6a05302ac5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/it/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/it/firefox-81.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "947b2947b5b33c3d62645fd2a5ba7e02eac525bd3fdc511f62881b61c77a1eb7"; + sha256 = "de141769375ff5da94ee1030f5af84b309917eeea48cde769419004ca5a015c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ja/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ja/firefox-81.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "fc82a3d2b816af47b8dd632d672135f7dfa3016a554c6b1840129394007f25da"; + sha256 = "69c5c01998a78c17ba55f262493c4e7bfa4fe03bd19a8ca605546f41f0c6f794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ka/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ka/firefox-81.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9dc51bcb8d60327d5f893f334a54181eb6a4f34800ca9f15671fbc833e8a4026"; + sha256 = "4c37f22f1a20c79c1b391b0f86bde8535c0766980a1b9a42ef912cbf91752392"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/kab/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kab/firefox-81.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "bda38d2522f0fdf8d1d6903bb11b63dcd242684bea412f9176c49fdf56b6d5f6"; + sha256 = "1c6722e18e1eff26918de17454d8103929115f7f036a1c23247695f7fee13051"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/kk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kk/firefox-81.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "d89d7aaea34b094c6a452c3d566ca03f42e4a1dae4db26d1dea5bc2da49d808d"; + sha256 = "9ef2e2142d2e6d49adf59e6dd190b4ff816cf566cd35e5d288f66794aa2d73c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/km/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/km/firefox-81.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "932469479db43ced4b9ee82a481ef00adb5808f7d2e859ef7564e20cd764417f"; + sha256 = "bf0899cad62f3331d157c557cbf3cf1f7faadaa7f9aeed3c6547b4533689dd7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/kn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kn/firefox-81.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "80564390296e12424ad2fbe1952397cf7b36af4e9dfc1fdcf914745aa01a5836"; + sha256 = "cfea495b254e1ca8c1be94e95f0c1f126d5f1a1c9d54129562fbec5ded6dec58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ko/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ko/firefox-81.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b3f091451469caea3f87f81be1da8d2e981327ba36df12224f8466ab68a2e9ea"; + sha256 = "ba8c93f8567a4f6bbf7af3c38a2d2ee793b05c0246638ded86538f91e6e9112b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/lij/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lij/firefox-81.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "becabccd189bad47d9e716889698811f39c0833474bf48df2e4f2792b67bca6f"; + sha256 = "c093b95b291af78460396e87ad39aa142d9925a7253f74aef9640fac0134e397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/lt/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lt/firefox-81.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "fe38d20e2cc294f3ae11df9ea7d34849489b1456355b7d110f8639649d5cd944"; + sha256 = "b035e58bfe373138626d9c5a22e6b6a8c6f35e8ba30ce821f80a1a85fd16c35c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/lv/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lv/firefox-81.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "1f6b7bf9f9b1fb0eeb80ef4a9ff280b042f9f524edd88b9ccd0500fa4ab40063"; + sha256 = "6dd5cf66db0207527966532a2728d37438f71d1e79caf9b97916d0e404c9509f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/mk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mk/firefox-81.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "732585681ae095a83428cdc32c4277f98861c73583c6b12fb1ba07f0265be8ab"; + sha256 = "1308f476d0052e1317b4c7db29d4d2218c60921a9ba7f619dde4455aee7978de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/mr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mr/firefox-81.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "1aea289a62cee8243f69bccb02770b026ed183b6621bb99f33b1f5b4c8a5b667"; + sha256 = "7336012a19cd650dfb8f842de37da8e29e7b0948cc707880667eca87bb31869a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ms/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ms/firefox-81.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "12726f171b6d5a831898fe0c6379949860e8aa899789c2dbff7df86281549076"; + sha256 = "192e12151ed1be4c3f7ea12beedd2c50f6e7fa877ae8c448cc899cd0fa1c6d24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/my/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/my/firefox-81.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4545ba6aee4231640d4670e08a5bfb71b0cae5faadd5bd3d9705b37df04f5dba"; + sha256 = "08db2ff728d5bfcf751e95eb9bba34a94c435e53863790ae06daf803d56c227d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/nb-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nb-NO/firefox-81.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "1b741c62a58ac9a0ca845fa942ae169576242a3d97018439d85c9efba09e41ed"; + sha256 = "22cfe518994fff77dc41e6f45550549593564ef2fa2dd34e31af17f5e42d636d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ne-NP/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ne-NP/firefox-81.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "5f44c3bb3351ded2b7f5ed216323fcee990175ef55b34a32026a2c6afa280ebd"; + sha256 = "605180e46adcaee8fb813dc41c4e7bbe5f509f181b607554137712405c0cc294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/nl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nl/firefox-81.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "5da24260eec62457572431b2667eba929876c68e0122f589cd87c7df3c364e7d"; + sha256 = "ba8b45685a1d428d5fa1e38e1a3ec024f55db2f3ce4221fd53b96b0e0801a6b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/nn-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nn-NO/firefox-81.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "3d8ae8f44295cb55a3c148510922e5e74b0ec8b69333fc9dde04e6f05d1109e4"; + sha256 = "0b76c63f7942576a2deb29cf15b089d2e73aa0b25f07eb1a511ccf033c68234a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/oc/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/oc/firefox-81.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "913bfa234f56906bb48d2410ba8bb400cce92f6f960d7e1557786092f03aec30"; + sha256 = "5de508b4039c395b594a0c78d25655113906b95a735d1e94f8e1171ca789da19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pa-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pa-IN/firefox-81.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f6c276a03f658fe7f62b49d8ed4e7ecfa14c9852384b224b732bb80d6d0421df"; + sha256 = "0bf9e4751ef967f4c6f63cb6332fe3940698b3e67d0e4873ea6bf639487159f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pl/firefox-81.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f1118903f6774c4e24cf2a01238f0cdefbb137e8af829dc403b13290bad64124"; + sha256 = "0fcece8a65132810cb297a599cd4b003604854f0af684b33c9de554fbf7b1e86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pt-BR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-BR/firefox-81.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "e421152016cf3551bc66382559e947aec03698090ed797514a35bbcee07229af"; + sha256 = "8363d209d1eb7e8053acb4805df119e230ab31e74b3389ddb01b53b032c12bf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pt-PT/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-PT/firefox-81.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a4da74dda8c2641e349cabc2360bbcf4ad531719d3652c96a8c9a8f2130794d1"; + sha256 = "cf2ecf2a673f0a4f17cecb10b330bec530fd6e37aff9ed821aa68e202f59f864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/rm/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/rm/firefox-81.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "578499fc230856e300a6774a8ab0b1d58c1afaee1e0fe6987ae16ea033cd6beb"; + sha256 = "8849e945e79f0f9605e288de967e9f5316c792b150654e23ca65f6c91bba8978"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ro/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ro/firefox-81.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "967ada36c6bfb6bd658493417f5f21e1cad56afc40081463072eee40a964f809"; + sha256 = "452496612b170e53423009a128f092a3d4a372e0e6fe352e649b3c989f6f254b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ru/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ru/firefox-81.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "58008daaf760fb6a9202d10771764cc3c46347b905aa622319b0631d833120e1"; + sha256 = "0e7787bee9fdbb1ca0bd3ef050b1ee5d6c6d8277da941232d6ef10c612003773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/si/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/si/firefox-81.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "c599e263b7084a69ea0730755483fdd6334610e07188c5c9f06b4be6bb7f073e"; + sha256 = "bfd6df7b86490aa941f5878ad749d7918bc3c907a177213ab8a60df0270eea69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sk/firefox-81.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a7170c138b30450e5b56ef7d5460f549288488455e482c8a89ea897dc9607f73"; + sha256 = "87c4827968ac3de5fb7609b9d7685653ef279bafbbb8b15f15f93cc876d6e021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sl/firefox-81.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "f7dea114d00831e71a6940348692b6523174a9fe099dad3743bb69f277cd2d7d"; + sha256 = "6b272ee0cc91ba6114dc777f1833ed5201a96fd905a0d68a71cbafafe1a066cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/son/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/son/firefox-81.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "9d9917d01601e3de913267d1836764cc10acb09363b05049867d7069964171ad"; + sha256 = "342f9eedcb359409fb324c13120ed25421435b614e9b5e15585ccf1551c263c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sq/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sq/firefox-81.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "85c34be5e061157f94444cfa07d8c8c1768aea4d4ed29a63d46b13bbb5d80438"; + sha256 = "ad11f5878139c46a2344d0bcf6b02ad2c19e59f9861e7ac74668801e14742b73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sr/firefox-81.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "15a348fbf5fb4ae31e0a33b17d866e40b655b4dd788329d579afc82bb5ed86a3"; + sha256 = "5e555aafe353036537609b9ba997374d106bb5ecaaa386b5395b7d156ff89901"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sv-SE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sv-SE/firefox-81.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "bb9bbd0edb5934f5d33d4f8db92d1e039f8519c0c126f5156f88d4a5be864902"; + sha256 = "cbd33b4fd20d8a7401e384196c28adf9fda6ee2bf24895d75e75f8b727d33e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ta/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ta/firefox-81.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "1d886bf18808d2dd3d6a95e5ae377c24be50f7e3788bf2c37c42606e2141d3ae"; + sha256 = "8e4e9919ec79c1847449cc75539f24801d972b67d6895727aafddf7485d95ed3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/te/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/te/firefox-81.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "72bcbe4f087f8ed8248d5056adc786d96982a87fb79bc3e83dfb9e9f209211e2"; + sha256 = "cb756aa758e69f26eb50d2e81bcb922c2a15a2304ef99debe67a57c44b2c3c52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/th/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/th/firefox-81.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ba0d8e25d5d2de631c05b9aa7317eca67dfa12564e677f9391a7da61c7630ddd"; + sha256 = "8c2be1458aa4077264ec946181d7ab3160086d12c821dc3d5fa3bbba46de3574"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/tl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tl/firefox-81.0b4.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "020791c52209fe806aa92f7945724ac1bbfc5554ec7827d7c320e1cefb5d6e60"; + sha256 = "e51e4cf97b79b3720129ed9467b57d393a4ffd5698a9a941cd28feffa1d166fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/tr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tr/firefox-81.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e803849628fb4a07aac2b23d457a8d1f954d2270d989fdd167c82e4ff407dd23"; + sha256 = "9f0a494434bc3d78c43428bc535517b5d61743326fbdbf1836a84f353408a54e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/trs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/trs/firefox-81.0b4.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "8aa74977fc2ae7e85150406541673b71b122f10a79762ae98787f9196d6e1ac9"; + sha256 = "24cadb7247a254595c29aebe60784d37061465f2c960a8d036096c6df71e4186"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/uk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uk/firefox-81.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7489d2f06cc74a759e6128a9e1ae19305ac8d81f026e8d16fce30dd8c23762de"; + sha256 = "6aa85e7119fd3ca00cd87d898eb93d954b1e58d01edf14106c41df98bdca4d99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ur/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ur/firefox-81.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "a0e924a25bdde879856fbf53fc0ca3972a3f701338079ef408694c0f87a13aa1"; + sha256 = "6b188379acb89178d08e827a60244c2298eae62434991d53378327c36829fa01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/uz/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uz/firefox-81.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4603be13c80926a5de1a2fac56d433798c2e2415ac5e769a7d4893b3eae7ec86"; + sha256 = "782ced50737f68a9fa6db854cde83ef7bbc6f95776a44918248efcedd95230ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/vi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/vi/firefox-81.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "1f9aef09fd0707121eb3335d60bf0b3b06554294594f45158cd41cd37f0beb07"; + sha256 = "37b600b306c901080f659955163b1696f5129e71bc3c5f65dc74d280ee6e3024"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/xh/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/xh/firefox-81.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "4c61f2ca3c4ecbc5b6a71edfa540400633d689c2cb042030c2291117443ade65"; + sha256 = "ebdfb9a50a5a7cad0508ade647ef3f81e18837d6b84212de6393a854bbfc652f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/zh-CN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-CN/firefox-81.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b24226ecd5946ea1320dd8ceabcf5402af96c7674c45d058b548aa212da1e1aa"; + sha256 = "fbc7b8952fa6d2d73b736abf4e60a10512eb983ea4588f7e746bff9512b953ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/zh-TW/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-TW/firefox-81.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "9765b5e72e0e2bb22b080d6a9a050a52fe003771e172f4865948b0c8b0000ff4"; + sha256 = "5c29c56ef6480703ef9b6a2dc3cae8bc45b2fc01495ba099bd1ee28bbcdce55a"; } ]; } From a9337c08730f97555bf24c3523db4f8f04b2596f Mon Sep 17 00:00:00 2001 From: kfollesdal Date: Sun, 30 Aug 2020 14:33:44 +0200 Subject: [PATCH 488/688] licenses: add databricks --- lib/licenses.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 5cdb43ded6d9..407ad9b7359f 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -436,6 +436,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { }; # Proprietary binaries; free to redistribute without modification. + databricks = { + fullName = "Databricks Proprietary License"; + url = "https://pypi.org/project/databricks-connect"; + + }; + issl = { fullName = "Intel Simplified Software License"; url = "https://software.intel.com/en-us/license/intel-simplified-software-license"; From ca9a8ff6c2a40a7994769210c7db0e5242d30539 Mon Sep 17 00:00:00 2001 From: kfollesdal Date: Sun, 30 Aug 2020 14:39:53 +0200 Subject: [PATCH 489/688] maintainers: add kfollesdal --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 002d8c435e28..78f3c9dcd2a2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4310,6 +4310,12 @@ githubId = 494012; name = "Kevin Cox"; }; + kfollesdal = { + email = "kfollesdal@gmail.com"; + github = "kfollesdal"; + githubId = 546087; + name = "Kristoffer K. Føllesdal"; + }; khumba = { email = "bog@khumba.net"; github = "khumba"; From bf7403695247dedc05e6c6a4138d980f0cd56728 Mon Sep 17 00:00:00 2001 From: kfollesdal Date: Sun, 30 Aug 2020 14:44:28 +0200 Subject: [PATCH 490/688] pythonPackages.databricks-connect: init at 7.1.0 --- lib/licenses.nix | 2 +- .../databricks-connect/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/databricks-connect/default.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index 407ad9b7359f..ee11966b0d53 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -439,7 +439,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { databricks = { fullName = "Databricks Proprietary License"; url = "https://pypi.org/project/databricks-connect"; - + free = false; }; issl = { diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix new file mode 100644 index 000000000000..59ebd4ef1142 --- /dev/null +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -0,0 +1,32 @@ +{ lib, jdk, buildPythonPackage, fetchPypi, six, py4j }: + +buildPythonPackage rec { + pname = "databricks-connect"; + version = "7.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "996a9d0f271f6c7edbd2d85b2efb6ff4e58d15222e80f87ca17fdbf224e17056"; + }; + + sourceRoot = "."; + + propagatedBuildInputs = [ py4j six jdk ]; + + # requires network access + doCheck = false; + + preFixup = '' + substituteInPlace "$out/bin/find-spark-home" \ + --replace find_spark_home.py .find_spark_home.py-wrapped + ''; + + pythonImportsCheck = [ "pyspark" "six" "py4j" ]; + + meta = with lib; { + description = "Client for connecting to remote Databricks clusters"; + homepage = "https://pypi.org/project/databricks-connect"; + license = licenses.databricks; + maintainers = with maintainers; [ kfollesdal ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8654a230391f..d6ce5710f8ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1412,6 +1412,8 @@ in { databricks-cli = callPackage ../development/python-modules/databricks-cli { }; + databricks-connect = callPackage ../development/python-modules/databricks-connect { inherit (pkgs) jdk; }; + dataclasses = callPackage ../development/python-modules/dataclasses { }; dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; From d7ec9a7e3dc04ab0a063959b74729843e3736947 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 31 Aug 2020 21:23:56 +0200 Subject: [PATCH 491/688] =?UTF-8?q?pythonPackages.ufonormalizer:=200.4.1?= =?UTF-8?q?=20=E2=86=92=200.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/ufonormalizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix index 70c9061d3666..1fbed4ad1aa5 100644 --- a/pkgs/development/python-modules/ufonormalizer/default.nix +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ufonormalizer"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "0nv80x7l7sya5wzyfk9ss93r6bjzjljpkw4k8gibxp1rqrzkdms4"; + sha256 = "1rn64a0i151qk6h5f9pijcmja195i2d6f8jbi5h4xkgkinm9wwzj"; extension = "zip"; }; From 48bbe60c43981d364caceacd6c4d3a13811e38f6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 31 Aug 2020 00:58:53 +0200 Subject: [PATCH 492/688] pythonPackages.unicodedata2: add description --- pkgs/development/python-modules/unicodedata2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix index e36f0f7b03cb..09b75e0c7776 100644 --- a/pkgs/development/python-modules/unicodedata2/default.nix +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { checkPhase = "pytest tests"; meta = with lib; { - description = ""; + description = "Backport and updates for the unicodedata module"; homepage = "http://github.com/mikekap/unicodedata2"; license = licenses.asl20; maintainers = [ maintainers.sternenseemann ]; From 1a51de1f3650218ba9499c1d4749e2cba84caea4 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Thu, 27 Aug 2020 03:04:54 +0300 Subject: [PATCH 493/688] =?UTF-8?q?tracy:=200.7=20=E2=86=92=200.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/tools/tracy/default.nix | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2507b7f20baf..b5586bdd3527 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9474,6 +9474,12 @@ github = "fzakaria"; githubId = 605070; }; + nagisa = { + name = "Simonas Kazlauskas"; + email = "nixpkgs@kazlauskas.me"; + github = "nagisa"; + githubId = 679122; + }; yevhenshymotiuk = { name = "Yevhen Shymotiuk"; email = "yevhenshymotiuk@gmail.com"; diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index a5087b3b52c6..96f232304aaf 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: +{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7"; + version = "0.7.1"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "07cmz2w7iv10f9i9q3fhg80s6riy9bxnk9xvc3q4lw47mc150skp"; + sha256 = "13zg3ijzhh7qkhgqff2ca23nd4gj7ac8jr0bp9w1gjf2cpgqkm40"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glfw capstone ] ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] - ++ lib.optionals stdenv.isLinux [ gtk2 tbb ]; + ++ lib.optionals stdenv.isLinux [ gtk3 tbb ]; NIX_CFLAGS_COMPILE = [ ] ++ lib.optional stdenv.isLinux "-ltbb" @@ -35,11 +35,15 @@ stdenv.mkDerivation rec { install -D ./update/build/unix/update-release $out/bin/update ''; + fixupPhase = lib.optionalString stdenv.isDarwin '' + install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/Tracy + ''; + meta = with stdenv.lib; { description = "A real time, nanosecond resolution, remote telemetry frame profiler for games and other applications."; homepage = "https://github.com/wolfpld/tracy"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; - maintainers = with maintainers; [ mpickering ]; + maintainers = with maintainers; [ mpickering nagisa ]; }; } From dba6fb36158502929bb3c6657e6f09bb6928e17d Mon Sep 17 00:00:00 2001 From: meutraa Date: Mon, 31 Aug 2020 23:07:25 +0100 Subject: [PATCH 494/688] androidStudioPackages.beta: 4.1.0.14 -> 4.1.0.17 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 14a6853af1c3..e84d2e9dac1a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j"; }; betaVersion = { - version = "4.1.0.14"; # "Android Studio 4.1 Beta 4" - build = "201.6667167"; - sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290"; + version = "4.1.0.17"; # "Android Studio 4.1 RC 2" + build = "201.6776251"; + sha256Hash = "sha256-3W+eUcffRk7lZxbvf3X/Np4hkwAUqU51sQ061XR7Ddc="; }; latestVersion = { # canary & dev version = "4.2.0.8"; # "Android Studio 4.2 Canary 8" From e909c93a293d5091f1bb2217eb4eabf56a315d12 Mon Sep 17 00:00:00 2001 From: meutraa Date: Mon, 31 Aug 2020 23:08:14 +0100 Subject: [PATCH 495/688] androidStudioPackages.beta: change maintainer to meutraa --- pkgs/applications/editors/android-studio/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index f1e680f60e67..605d810b3d9c 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -200,7 +200,7 @@ in runCommand platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { stable = [ meutraa ]; - beta = [ galagora ]; + beta = [ meutraa ]; canary = [ meutraa ]; dev = canary; }."${channel}"; From 03720f1cfb122d56d3200919acf754a12a641ad1 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 31 Aug 2020 17:20:53 -0500 Subject: [PATCH 496/688] linux_testing: 5.9-rc2 -> 5.9-rc3 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index cf2ca99f6f59..a78d853bb7ff 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9-rc2"; + version = "5.9-rc3"; extraMeta.branch = "5.9"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0mdh6gsd305kcgfqzyfgl5m886asjm5030ahg63gyias3ywzn5wd"; + sha256 = "1byckdxy0y5i3lgw3f3n7b4r3v1xb4g1z3ffiq3hp4ga4nf5xzw3"; }; # Should the testing kernels ever be built on Hydra? From 5e91e66591cbd745924185702fcf0f9c7283b213 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 31 Aug 2020 17:26:57 -0500 Subject: [PATCH 497/688] libbpf: 0.0.9 -> 0.1.0 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/libbpf/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 0a98475384d7..0f2f9aa86f42 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -6,13 +6,13 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.0.9"; + version = "0.1.0"; src = fetchFromGitHub { - owner = "libbpf"; - repo = "libbpf"; - rev = "v${version}"; - sha256 = "18l0gff7nm841mwhr7bc7x863xcyvwh58zl7mc0amnsjqlbrvqg7"; + owner = "libbpf"; + repo = "libbpf"; + rev = "v${version}"; + sha256 = "1wi3a795jq0smqg1c5ml2ghai47n1m5ijmch017wscybx4jdlynv"; }; nativeBuildInputs = [ pkgconfig ]; From 6fb7b160467dc5da322af42d26458292ddc88fbc Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 31 Aug 2020 17:40:18 -0500 Subject: [PATCH 498/688] linuxPackages.bpftrace: 0.9.4 -> 0.11.0 This fixes the `bcc` include directory (which was improperly set, and warned about at build-time, but masked by some backwards compat code, apparently) and also includes some missing libraries in `buildInputs` Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/bpftrace/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 0c360e60b7e0..fc7c8ecba2da 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub , cmake, pkgconfig, flex, bison -, llvmPackages, kernel, elfutils, libelf, bcc +, llvmPackages, kernel, elfutils +, libelf, libbfd, libbpf, libopcodes, bcc }: stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.9.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "refs/tags/v${version}"; - sha256 = "00fvkq3razwacnpb82zkpv63dgyigbqx3gj6g0ka94nwa74i5i77"; + sha256 = "02f2r731yj3fdc8341id1ksk4dma9rwm2765n2xgx2ldrrz5823y"; }; enableParallelBuilding = true; @@ -19,6 +20,7 @@ stdenv.mkDerivation rec { buildInputs = with llvmPackages; [ llvm clang-unwrapped kernel elfutils libelf bcc + libbpf libbfd libopcodes ]; nativeBuildInputs = [ cmake pkgconfig flex bison ] @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { # cmakeFlags = [ "-DBUILD_TESTING=FALSE" - "-DLIBBCC_INCLUDE_DIRS=${bcc}/include/bcc" + "-DLIBBCC_INCLUDE_DIRS=${bcc}/include" ]; # nuke the example/reference output .txt files, for the included tools, From 58bb6bf73a9177d2578f3856858aa2464338372a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 31 Aug 2020 17:46:14 -0500 Subject: [PATCH 499/688] linuxPackages.bcc: patch trace buffer bug in python library Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/bcc/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index f8e9a4135a39..de02ffb30a39 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, cmake, llvmPackages, kernel +{ stdenv, fetchurl, fetchpatch +, makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , systemtap, bash }: @@ -23,6 +24,12 @@ python.pkgs.buildPythonApplication rec { # This is needed until we fix # https://github.com/NixOS/nixpkgs/issues/40427 ./fix-deadlock-detector-import.patch + + # This is already upstream; remove it on the next release + (fetchpatch { + url = "https://github.com/iovisor/bcc/commit/60de17161fe7f44b534a8da343edbad2427220e3.patch"; + sha256 = "0pd5b4vgpdxbsrjwrw2kmn4l9hpj0rwdm3hvwvk7dsr3raz7w4b3"; + }) ]; propagatedBuildInputs = [ python.pkgs.netaddr ]; From fcf08a93fc2a57dd81249bf8395deefa18f06f10 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 31 Aug 2020 19:26:45 -0400 Subject: [PATCH 500/688] itk: 5.1.0 -> 5.1.1 --- pkgs/development/libraries/itk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 84dedfa0b3b6..1288242faf2c 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "itk"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; rev = "v${version}"; - sha256 = "0rvkp00xj1js60021jv2ydyl74wvbyb205gm9d7hf8gy2q456hgl"; + sha256 = "1z7rmqrhgl7hfb3d0077kvp8vpi05r2zk3qyqzmv7bzbal5sqqhv"; }; cmakeFlags = [ From 2cbc3f0aeccab2b882ade1200f672e6178bd3ddc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 Aug 2020 12:05:17 +0000 Subject: [PATCH 501/688] gitAndTools.pre-commit: 2.6.0 -> 2.7.1 --- pkgs/development/python-modules/pre-commit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index c0f536480da7..88fb6e3abf91 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "pre-commit"; - version = "2.6.0"; + version = "2.7.1"; disabled = isPy27; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "05d9635v0yzrj2848m2hn9axbvds0dymv49rlyj238v3vlzncmqn"; + sha256 = "0w2a104yhbw1z92rcwpq0gdjsxvr2bwx5ry5xhlf2psnfkjx6ky5"; }; patches = [ From afdc68d2155f31fa49bbd7f19f7ed577cfaf8066 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 08:21:16 +0000 Subject: [PATCH 502/688] sdcv: 0.5.2 -> 0.5.3 --- pkgs/applications/misc/sdcv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index 997786fc1072..d220047a0a3b 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sdcv"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "Dushistov"; repo = "sdcv"; rev = "v${version}"; - sha256 = "1b67s4nj0s5fh3cjk7858qvhiisc557xx72xwzrb8hq6ijpwx5k0"; + sha256 = "144qpl9b8r2php0zhi9b7vg6flpvdgjy6yfaipydwwhxi4wy9600"; }; hardeningDisable = [ "format" ]; From 5c2d5800b824a0593e94f3ed19b904a688ac2b3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 07:52:18 +0000 Subject: [PATCH 503/688] seafile-client: 7.0.7 -> 7.0.9 --- pkgs/applications/networking/seafile-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 0893ee21a558..69b7b432b0a0 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "7.0.7"; + version = "7.0.9"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "0szdyprljyckmbrw5sypizs22j96q84ak6nyidyr2j6gf4grh9mg"; + sha256 = "0pcn6lfzma2hvpwsp9q0002wvym7zabpp8fvq29l101gzirn79m9"; }; nativeBuildInputs = [ pkgconfig cmake ]; From 78167a293b26ce6589a5b24392ddc06fe07dc8d9 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 31 Aug 2020 22:56:08 +0000 Subject: [PATCH 504/688] pythonPackages.pdfminer_six: 20200720 -> 20200726 ocrmypdf 11.0.1 requires pdfminer_six 20200726 --- pkgs/development/python-modules/pdfminer_six/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 41459a8f4a14..08f482e6221f 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pdfminer_six"; - version = "20200720"; + version = "20200726"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "19cnl1b6mrk9i18a1k4vdl5k85ww8yhfq89w3fxh6rb0fla5d71i"; + sha256 = "1hlaz7ax1czb028x3nhk3l2jy07f26q5hbhmdirljaaga24vd96z"; }; propagatedBuildInputs = [ chardet cryptography sortedcontainers ]; From d56da56bf886cd738c979a5b6d72487552d7f115 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 31 Aug 2020 22:56:47 +0000 Subject: [PATCH 505/688] ocrmypdf: 10.3.0 -> 11.0.1 This fixes the build: ``` ERROR: Could not find a version that satisfies the requirement img2pdf<0.4,>=0.3.0 (from ocrmypdf==10.3.0) (from versions: none) ERROR: No matching distribution found for img2pdf<0.4,>=0.3.0 (from ocrmypdf==10.3.0) builder for '/nix/store/1ggj5wwl92xickc7w5hfl3zrjfscxnf1-ocrmypdf-10.3.0.drv' failed with exit code 1 error: build of '/nix/store/1ggj5wwl92xickc7w5hfl3zrjfscxnf1-ocrmypdf-10.3.0.drv' failed ``` --- pkgs/tools/text/ocrmypdf/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index b7864b05b6e1..bfa22a4fd182 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "10.3.0"; + version = "11.0.1"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0c6v7846lmkmbyfla07s35mpba4h09h0fx6pxqf0yvdjxmj46q8c"; + sha256 = "194ds9i1zd80ynzwgv7kprax0crh7bbchayawdcvg2lyr64a82xn"; }; nativeBuildInputs = with python3Packages; [ @@ -76,8 +76,6 @@ buildPythonApplication rec { src = ./liblept.patch; liblept = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}"; }) - # https://github.com/jbarlow83/OCRmyPDF/pull/596 - ./0001-Make-compatible-with-pdfminer.six-version-20200720.patch ]; makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ]; From f873eced5126fba5ff274557628c764d57eec90b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 Aug 2020 03:55:50 +0000 Subject: [PATCH 506/688] cockroachdb: 20.1.3 -> 20.1.4 --- pkgs/servers/sql/cockroachdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 852f1ea61ddc..a5071efb486f 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -14,13 +14,13 @@ let in buildGoPackage rec { pname = "cockroach"; - version = "20.1.3"; + version = "20.1.4"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0bg60rcfn2d4awg5al8d5xvk8h7bab986qlbpl9bkv6zpw9wipfb"; + sha256 = "1m82m776axyf7b5f1lzlv5y7zslyhikfxjgagqy7ci5zwn8j4i0n"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; From 6e1512d2d3733345c5c9e99a88965008e00efe35 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 27 Aug 2020 04:40:28 +0000 Subject: [PATCH 507/688] pcl: 1.11.0 -> 1.11.1 --- pkgs/development/libraries/pcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 506c78aca8a5..d1c39b42a9d5 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "pcl-1.11.0"; + name = "pcl-1.11.1"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "0nr3j71gh1v8x6wjr7a7xyr0438sw7vf621a5kbw4lmsxbj55k8g"; + sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; }; enableParallelBuilding = true; From 74801064505d0298102f7d9cb272486de2f95e7e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 Aug 2020 04:20:29 +0000 Subject: [PATCH 508/688] goffice: 0.10.47 -> 0.10.48 --- pkgs/development/libraries/goffice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 308a4db28006..46b40d00d780 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.47"; + version = "0.10.48"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xmigfdzvmlpa0fw79mf3xwchmxc8rlidryn5syv8bz7msmrb215"; + sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4"; }; nativeBuildInputs = [ pkgconfig intltool ]; From ceaf053456313d1cef1a0fe331bc7b644466af6d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 31 Aug 2020 17:12:06 -0700 Subject: [PATCH 509/688] gnumeric: 1.12.47 -> 1.12.48 --- pkgs/applications/office/gnumeric/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 40351ba64a18..b0609863c5ad 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, perlPackages +{ stdenv, fetchurl, pkg-config, intltool, perlPackages , goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages , itstool }: @@ -7,16 +7,16 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.47"; + version = "1.12.48"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1khrf72kiq50y8b5prbj2207k9shn36h2b2i588cc4wa28s9y5a0"; + sha256 = "14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p"; }; configureFlags = [ "--disable-component" ]; - nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool bison itstool wrapGAppsHook ]; # ToDo: optional libgda, introspection? buildInputs = [ From e9b48ee7be0675c8858f7ffc2a1ceadcf3921704 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 Aug 2020 03:19:58 +0000 Subject: [PATCH 510/688] ayatana-ido: 0.4.90 -> 0.8.0 --- pkgs/development/libraries/ayatana-ido/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix index 41e4c92e56b6..66ead87daa07 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.4.90"; + version = "0.8.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "02vqjryni96zzrpkq5d7kvgw7nf252d2fm2xq8fklvvb2vz3fa0w"; + sha256 = "1jmdvvgrgicpnpnygc24qcisqb9y026541gb6lw6fwapvc9aj73p"; }; nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc vala ]; From 31dabe01f2b23f5028038e25eda0d3be69674598 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Aug 2020 10:43:29 +0000 Subject: [PATCH 511/688] tikzit: 2.1.5 -> 2.1.6 --- pkgs/tools/typesetting/tikzit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index 31baa431bfc9..76b9b285d153 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -2,13 +2,13 @@ mkDerivation { pname = "tikzit"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "tikzit"; repo = "tikzit"; - rev = "v2.1.5"; - sha256 = "1xrx7r8b6nb912k91pkdwaz2gijfq6lzssyqxard0591h2mycbcg"; + rev = "v2.1.6"; + sha256 = "0ba99pgv54pj1xvhrwn9db2w0v4h07vsjajcnhpa2smy88ypg32h"; }; nativeBuildInputs = [ qmake qttools flex bison ]; From ca1cd1e40915ed03a2aea336283b3475c4bac20e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Aug 2020 11:23:03 +0000 Subject: [PATCH 512/688] tilt: 0.17.0 -> 0.17.2 --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index c2ffb816aa9d..c3ec58df35d4 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.17.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "0bd01fmrf17njzf8ri4bw4qi7bxcvd3dx7yyf42qfvnp7hrfzipk"; + sha256 = "0wiqnlam4f7085n3djvb5phhvw9df61bj8w6c5rcpffykg33vhmi"; }; vendorSha256 = null; From 46af6742bbf50cc58c7f22fc894c9e4f04a6061f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 Aug 2020 11:44:30 +0000 Subject: [PATCH 513/688] metabase: 0.36.2 -> 0.36.4 --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 6b3bcdf72d18..2298ecc84ce0 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.36.2"; + version = "0.36.4"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1m3wafv6fh3ivxi474bf0in3wryyimv27pqv3920ryvwkawz7gyi"; + sha256 = "1k6f22ii9vga8j9jxipl1r55msxgag0lbkjxw7vf285z1hdhwylq"; }; nativeBuildInputs = [ makeWrapper ]; From 71d933e214af9a9bdf968fb8620418a2577d45a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 Aug 2020 15:56:22 +0000 Subject: [PATCH 514/688] openhantek6022: 3.1.1 -> 3.1.2 --- .../science/electronics/openhantek6022/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix index 5a70831d8249..ad8fa3c7a7ae 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "17b0qmz7g0nk7n7jhbh5xhs135dpj9kv41n42vvpdzwr6z5rk4qm"; + sha256 = "104j7d3i5y6jd20c2z3l10sr6sgdy8iki3g9mlwhddnr8x6nzc03"; }; nativeBuildInputs = [ cmake makeWrapper ]; From c36700d828360b68c4d8a9da97c57c97ff845a1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 Aug 2020 09:42:55 +0000 Subject: [PATCH 515/688] libfilezilla: 0.23.0 -> 0.24.0 --- pkgs/development/libraries/libfilezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index ed9de3aaa4cd..5edcb7e410fd 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.23.0"; + version = "0.24.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0lk84aw5ylrhpy26djdw3byhjbn9qrzx5k98r0i4nwfizckw3smd"; + sha256 = "1372i9f501kn8p1vkqdydaqvvi6lzxsnw2yzyxx5j4syqd4p0qa5"; }; nativeBuildInputs = [ pkgconfig ]; From 8b1dc2f4a8504a6fb33e55825d5d84fcf7c0a41a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 03:24:12 +0000 Subject: [PATCH 516/688] teamviewer: 15.5.6 -> 15.8.3 --- pkgs/applications/networking/remote/teamviewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index a857abcfed13..9c3ed826a2d5 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.5.6"; + version = "15.8.3"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "12dzrg9qf5gj9srv482n3jsjar8jhs3s5kkp6v5pvfp8kbmwcbib"; + sha256 = "1c947yxgs0mv5x6qvy40dypbbhhjbglma1pwl66z39gzg51n2dmc"; }; unpackPhase = '' From 66eb5c8002c9a14d71027679e01492264859d51f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 31 Aug 2020 20:02:34 -0500 Subject: [PATCH 517/688] kdeplasma-addons: add kpurpose and qtwebengine as inputs --- pkgs/desktops/plasma-5/kdeplasma-addons.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index 398fc356fc93..f214d4070eec 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -1,17 +1,18 @@ { mkDerivation, extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kio, - knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus, - plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, kholidays + kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kholidays, + kio, knewstuff, kpurpose, kross, krunner, kservice, ksysguard, + kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative, + qtwebengine, qtx11extras }: mkDerivation { name = "kdeplasma-addons"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff - kross krunner kservice ksysguard kunitconversion ibus plasma-framework - plasma-workspace qtdeclarative qtx11extras kholidays + kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kholidays kio + knewstuff kpurpose kross krunner kservice ksysguard kunitconversion ibus + plasma-framework plasma-workspace qtdeclarative qtwebengine qtx11extras ]; } From f12217c366cedaf69ec7b1cb51c0be10c16f4dcd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Aug 2020 05:29:51 +0000 Subject: [PATCH 518/688] rust-cbindgen: 0.14.3 -> 0.14.4 --- pkgs/development/tools/rust/cbindgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 655d726e66ec..62b9a616644d 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "0pw55334i10k75qkig8bgcnlsy613zw2p5j4xyz8v71s4vh1a58j"; + sha256 = "06bis9kk3r0gishzmsq5wk3vv8r78ggk4m800562q2yhnhc37lfd"; }; - cargoSha256 = "0088ijnjhqfvdb1wxy9jc7hq8c0yxgj5brlg68n9vws1mz9rilpy"; + cargoSha256 = "0x8lxlik4n8rmlydcp0vqyiqwqm98cgwvw3h5hm2zviv8v0y8jnr"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From 7bc3a08d3a4c700b53a3b27f5acd149f24b931ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Aug 2020 08:48:41 +0000 Subject: [PATCH 519/688] sparsehash: 2.0.3 -> 2.0.4 --- pkgs/development/libraries/sparsehash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix index 6845c616e9c1..6007560a11ff 100644 --- a/pkgs/development/libraries/sparsehash/default.nix +++ b/pkgs/development/libraries/sparsehash/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "sparsehash-2.0.3"; + name = "sparsehash-2.0.4"; src = fetchFromGitHub { owner = "sparsehash"; repo = "sparsehash"; rev = name; - sha256 = "0m3f0cnpnpf6aak52wn8xbrrdw8p0yhq8csgc8nlvf9zp8c402na"; + sha256 = "1pf1cjvcjdmb9cd6gcazz64x0cd2ndpwh6ql2hqpypjv725xwxy7"; }; meta = with stdenv.lib; { From 1111bd259be819abe393fa9bdd8508bc6918f6cd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 1 Sep 2020 04:20:00 +0000 Subject: [PATCH 520/688] ncspot: 0.2.1 -> 0.2.2 https://github.com/hrkfdn/ncspot/releases/tag/v0.2.2 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 90dc4e6db330..2fcbf82107d6 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "1yx0fc24bgh1x6fdwznc1hqvjq0j7i0zvws3bsyijzs7q48jm0z7"; + sha256 = "1i17pidw2hylijwfn96f2bnswfxxwdln2ydsq8b1q4hfzfbxlfk2"; }; - cargoSha256 = "0bh2shg80xbs2cw10dabrdxkvhf2csk5h9wmmk5z87q6w25paz1f"; + cargoSha256 = "1cpy4wrj9dz2crva4p18f8hzym73x4m2mcfds4ppri4ir7qg29dr"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; From 4b07b00c0de3f6c5755048038ae49c57f86b7e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 1 Sep 2020 08:39:36 +0200 Subject: [PATCH 521/688] adobe-reader: add knownVulnerabilities We should really avoid that people unknowingly use Adobe Reader, it has literally tens of known high-score code execution vulnerabilities, probably exploited in the wild. --- pkgs/applications/misc/adobe-reader/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index b67e514ce54d..ecd130426de1 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -28,5 +28,9 @@ stdenv.mkDerivation { description = "Adobe Reader, a viewer for PDF documents"; homepage = "http://www.adobe.com/products/reader"; license = stdenv.lib.licenses.unfree; + knownVulnerabilities = [ + "Numerous unresolved vulnerabilities" + "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53" + ]; }; } From 82aeab778fb5b7d721312b90910fcf8d210555b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 1 Sep 2020 08:10:34 +0200 Subject: [PATCH 522/688] pciutils: support static compilation Close PR #96012 (thanks). This "static style" was discussed on: https://github.com/NixOS/nixpkgs/pull/96223#issuecomment-681204478 --- pkgs/tools/system/pciutils/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 4bbe2bdcee0a..1814d4b9765f 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }: +{ stdenv, fetchurl, pkgconfig, zlib, kmod, which +, static ? stdenv.targetPlatform.isStatic +}: stdenv.mkDerivation rec { name = "pciutils-3.7.0"; # with release-date database @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib kmod which ]; makeFlags = [ - "SHARED=yes" + "SHARED=${if static then "no" else "yes"}" "PREFIX=\${out}" "STRIP=" "HOST=${stdenv.hostPlatform.system}" From cc1920a109690a207ff5f49385d48dac40eef216 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sun, 12 Apr 2020 20:03:02 +0000 Subject: [PATCH 523/688] unbound: disable lto on static builds (PR #96020) Signed-off-by: Arthur Gautier Amended by vcunat (isMusl != isStatic). https://github.com/NixOS/nixpkgs/pull/96223#issuecomment-681204478 --- pkgs/tools/networking/unbound/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 39a7b11f09f1..4ee330eb9186 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { "--with-rootkey-file=${dns-root-data}/root.key" "--enable-pie" "--enable-relro-now" + ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic [ + "--disable-flto" ]; installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; From 60d0746a846bb498b4fd0422905a1bc116e895d3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 25 Aug 2020 07:33:55 +0200 Subject: [PATCH 524/688] coqPackages.dpdgraph: init at 0.6.8 for Coq 8.12 --- pkgs/development/coq-modules/dpdgraph/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 689745003df2..54654f37bac8 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,6 +1,10 @@ { stdenv, fetchFromGitHub, autoreconfHook, coq }: let params = { + "8.12" = { + version = "0.6.8"; + sha256 = "1mj6sknsd53xfb387sp3kdwvl4wn80ck24bfzf3s6mgw1a12vyps"; + }; "8.11" = { version = "0.6.7"; sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09"; From e92a5564686eb888eeb61bfcbd61a3a89bbeb7bf Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 27 Aug 2020 08:12:52 +0200 Subject: [PATCH 525/688] =?UTF-8?q?satysfi:=200.0.4=20=E2=86=92=200.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/typesetting/satysfi/default.nix | 32 +++++++++++++--------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 7a4b8010f04c..b97652bb4a69 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchFromGitHub, ruby, dune, ocamlPackages +{ stdenv, fetchzip, fetchFromGitHub, ruby, dune_2, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let @@ -6,8 +6,8 @@ let src = fetchFromGitHub { owner = "gfngfn"; repo = "camlpdf"; - rev = "v2.2.2+satysfi"; - sha256 = "1dkyibjd8qb9fzljlzdsfdhb798vc9m8xqkd7295fm6bcfpr5r5k"; + rev = "v2.3.1+satysfi"; + sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k"; }; }); otfm = ocamlPackages.otfm.overrideAttrs (o: { @@ -18,23 +18,29 @@ let sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p"; }; }); - yojson = ocamlPackages.yojson.overrideAttrs (o: { + yojson-with-position = ocamlPackages.buildDunePackage { + pname = "yojson-with-position"; + version = "1.4.2"; src = fetchFromGitHub { owner = "gfngfn"; - repo = "yojson"; - rev = "v1.4.1+satysfi"; - sha256 = "06lajzycwmvc6s26cf40s9xn001cjxrpxijgfha3s4f4rpybb1mp"; + repo = "yojson-with-position"; + rev = "v1.4.2+satysfi"; + sha256 = "17s5xrnpim54d1apy972b5l08bph4c0m5kzbndk600fl0vnlirnl"; }; - }); + useDune2 = true; + nativeBuildInputs = [ ocamlPackages.cppo ]; + propagatedBuildInputs = [ ocamlPackages.biniou ]; + inherit (ocamlPackages.yojson) meta; + }; in stdenv.mkDerivation rec { pname = "satysfi"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "gfngfn"; repo = "SATySFi"; rev = "v${version}"; - sha256 = "0ilvgixglklqwavf8p9mcbrjq6cjfm9pk4kqx163c0irh0lh0adv"; + sha256 = "1y72by6d15bc6qb1lv1ch6cm1i74gyr0w127nnvs2s657snm0y1n"; fetchSubmodules = true; }; @@ -44,11 +50,11 @@ in $out/share/satysfi ''; - nativeBuildInputs = [ ruby dune ]; + nativeBuildInputs = [ ruby dune_2 ]; - buildInputs = [ camlpdf otfm ] ++ (with ocamlPackages; [ + buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [ ocaml findlib menhir - batteries camlimages core_kernel ppx_deriving uutf yojson omd cppo re + batteries camlimages core_kernel ppx_deriving uutf omd cppo re ]); installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e27ff02b0465..ff78f212d8e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27146,9 +27146,7 @@ in sanoid = callPackage ../tools/backup/sanoid { }; - satysfi = callPackage ../tools/typesetting/satysfi { - ocamlPackages = ocaml-ng.ocamlPackages_4_07; - }; + satysfi = callPackage ../tools/typesetting/satysfi { }; sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { inherit libusb1; # Shadow python.pkgs.libusb1. From 1f96216844b817c37d9df987cd07669e929ecb6c Mon Sep 17 00:00:00 2001 From: Yves Fischer Date: Tue, 25 Aug 2020 23:00:03 +0200 Subject: [PATCH 526/688] qcad: 3.24.3.10 -> 3.25.0.0 * update upstream version to 3.25.0.0 * fix the application desktop file to use the right binary name * make building more robust when qt version changes, automatically try to copy qtscriptgenerator directory --- .../applications/misc/qcad/application-dir.patch | 13 +++++++++++++ pkgs/applications/misc/qcad/default.nix | 16 +++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/qcad/application-dir.patch b/pkgs/applications/misc/qcad/application-dir.patch index 84782e1e7178..0b8a29319eb3 100644 --- a/pkgs/applications/misc/qcad/application-dir.patch +++ b/pkgs/applications/misc/qcad/application-dir.patch @@ -33,3 +33,16 @@ index c6c31cbf5..c51b59ce6 100644 } int RSettings::getSnapRange() { +diff --git a/qcad.desktop b/qcad.desktop +index 93c5e9720..2d0e6bf32 100644 +--- a/qcad.desktop ++++ b/qcad.desktop +@@ -48,7 +48,7 @@ Comment[sv]=2D CAD-system + Comment[sl]=Sistem 2D CAD + Comment[uk]=2D САПР + Comment[tr]=2D CAD Sistemi +-Exec=qcad %F ++Exec=qcad-bin %F + X-MultipleArgs=true + Icon=qcad_icon + Terminal=false diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 0079cd220bde..26b6f3297644 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -11,13 +11,13 @@ mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.24.3.10"; + version = "3.25.0.0"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "0izyn4y1ffq1mgxs5dymkrqih6n6v9ifrcpyk1z2vyhbm5xx4qsa"; + sha256 = "07qph2645m1wi9yi04ixdvx8dli03q1vimj3laqdmnpipi54lljc"; }; patches = [ @@ -25,11 +25,13 @@ mkDerivationWith stdenv.mkDerivation rec { ]; postPatch = '' - mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} - cp \ - src/3rdparty/qt-labs-qtscriptgenerator-5.12.3/qt-labs-qtscriptgenerator-5.12.3.pro \ - src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro - ''; + if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} ]; then + mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} + cp \ + src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \ + src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro + fi + ''; qmakeFlags = [ "MUPARSER_DIR=${muparser}" From 2316f3520c29e46324789c7cbb0e3a3131c966af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Tue, 1 Sep 2020 07:18:52 +0000 Subject: [PATCH 527/688] ipfs-cluster: pin to go 1.14 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff78f212d8e9..296e1d8d4585 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4550,7 +4550,9 @@ in buildGoModule = buildGo114Module; }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { + buildGoModule = buildGo114Module; + }; ipget = callPackage ../applications/networking/ipget { }; From 46a0aa4176ce40a0cf21e2b97f4a6fcc2294baa1 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 31 Aug 2020 15:57:04 +0200 Subject: [PATCH 528/688] nixos/cri-o: unset hooks dir to avoid dir creation on startup Signed-off-by: Sascha Grunert --- nixos/modules/virtualisation/cri-o.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 9c818eee73b6..aa2fb73533ac 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -101,6 +101,7 @@ in log_level = "${cfg.logLevel}" manage_ns_lifecycle = true pinns_path = "${cfg.package}/bin/pinns" + hooks_dir = [] ${optionalString (cfg.runtime != null) '' default_runtime = "${cfg.runtime}" From f26043b428292e842bf1893a98e5452386f9343f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 25 Aug 2020 04:20:00 +0000 Subject: [PATCH 529/688] ocamlPackages.merlin: 3.3.6 -> 3.3.8 https://github.com/ocaml/merlin/releases/tag/v3.3.7 https://github.com/ocaml/merlin/releases/tag/v3.3.8 --- pkgs/development/tools/ocaml/merlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 4b11dd13983d..ed1a4361120e 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.6"; + version = "3.3.8"; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "1360cm0jkn2v2y5p3yzdyw9661a1vpddcibkbfblmk95qafx4civ"; + sha256 = "0j27piq9hqhr2jp89ni73kchw33pcx7gnjkh8rd6qa8hc12xd794"; }; buildInputs = [ yojson ]; From db7832d0e5fd85019835626e6fd30183dd9c51dc Mon Sep 17 00:00:00 2001 From: Moritz Scheuren Date: Tue, 1 Sep 2020 11:12:01 +0200 Subject: [PATCH 530/688] portfolio: 0.47.0 -> 0.48.0 --- pkgs/applications/office/portfolio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 73f50998f637..310f57d7cda7 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.47.0"; + version = "0.48.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0l328wvikdmm2i0kbpv9qwd0mkbs24y89cgfg28swhcvpywjpk36"; + sha256 = "12skl08isz2f1a6ksmcw7sm82xk909y636ch8jp80lglb21i0q1j"; }; nativeBuildInputs = [ From a72822c23fb1c55eef84fdb181f8e4292f06aa3c Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sun, 19 Jul 2020 17:13:23 -0700 Subject: [PATCH 531/688] libpwquality: fixup static build Close #96023 (original PR). Amended by vcunat (isMusl != isStatic). --- .../libraries/libpwquality/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index bd45cb529f1a..5d83b137b8e6 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3 }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3, fetchpatch }: stdenv.mkDerivation rec { pname = "libpwquality"; @@ -11,8 +11,21 @@ stdenv.mkDerivation rec { sha256 = "0n4pjhm7wfivk0wizggaxq4y4mcxic876wcarjabkp5z9k14y36h"; }; - nativeBuildInputs = [ autoreconfHook perl ]; - buildInputs = [ cracklib python3 ]; + nativeBuildInputs = [ autoreconfHook perl python3 ]; + buildInputs = [ cracklib ]; + + patches = lib.optional stdenv.hostPlatform.isStatic [ + (fetchpatch { + name = "static-build.patch"; + url = "https://github.com/libpwquality/libpwquality/pull/40.patch"; + sha256 = "1ypccq437wxwgddd98cvd330jfm7jscdlzlyxgy05g6yzrr68xyk"; + }) + ]; + + configureFlags = lib.optional stdenv.hostPlatform.isStatic [ + # Python binding generates a shared library which are unavailable with musl build + "--disable-python-bindings" + ]; meta = with lib; { description = "Password quality checking and random password generation library"; From 38fcee266e85c0d07a2bae3044f92bb85228975e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 1 Sep 2020 05:19:14 -0500 Subject: [PATCH 532/688] kinfocenter: add kirigami2 input --- pkgs/desktops/plasma-5/kinfocenter.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index b35493929ff3..cf353af58919 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -2,8 +2,9 @@ mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, - kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, - kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, solid + kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage, + kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, + solid }: mkDerivation { @@ -11,7 +12,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons - kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice - kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid + kdeclarative kdelibs4support ki18n kiconthemes kio kirigami2 kpackage + kservice kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid ]; } From cb44493a5d90ad0c23aa48a312cd74d6b7a98b41 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 1 Sep 2020 05:20:45 -0500 Subject: [PATCH 533/688] ksysguard: add libcap and libpcap inputs --- pkgs/desktops/plasma-5/ksysguard.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix index 01e740f74c4b..72793fdf0838 100644 --- a/pkgs/desktops/plasma-5/ksysguard.nix +++ b/pkgs/desktops/plasma-5/ksysguard.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, kdoctools, - lm_sensors, + libcap, libpcap, lm_sensors, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, knewstuff, libksysguard }: @@ -11,6 +11,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard - kdelibs4support ki18n lm_sensors + kdelibs4support ki18n libcap libpcap lm_sensors ]; } From 59e5dc4cb5655b48bc635dc8247bec5cf7bf6049 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 1 Sep 2020 05:27:19 -0500 Subject: [PATCH 534/688] kwin: add qtquickcontrols2 and qtvirtualkeyboard inputs --- pkgs/desktops/plasma-5/kwin/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index c3e9e2b9c245..7c1f2292ecaa 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -5,13 +5,14 @@ epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, xwayland, - qtdeclarative, qtmultimedia, qtscript, qtx11extras, + qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors, + qtvirtualkeyboard, qtx11extras, breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, - plasma-framework, qtsensors, libcap, libdrm, mesa + plasma-framework, libcap, libdrm, mesa }: # TODO (ttuegel): investigate qmlplugindump failure @@ -23,7 +24,8 @@ mkDerivation { epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor xwayland - qtdeclarative qtmultimedia qtscript qtx11extras qtsensors + qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors + qtvirtualkeyboard qtx11extras breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes From e904041bd2c902b0ba08ac9316f0be87da1ad375 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 1 Sep 2020 05:34:02 -0500 Subject: [PATCH 535/688] plasma-desktop: add qqc2-desktop-style input --- pkgs/desktops/plasma-5/plasma-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 4183b38ba493..b042fc3bd6ac 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -12,7 +12,7 @@ kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner, kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework, - plasma-workspace, xf86inputlibinput + plasma-workspace, qqc2-desktop-style, xf86inputlibinput }: mkDerivation { @@ -27,7 +27,7 @@ mkDerivation { attica baloo kactivities kactivities-stats kauth kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kscreenlocker - ksysguard kwallet kwin plasma-framework plasma-workspace + ksysguard kwallet kwin plasma-framework plasma-workspace qqc2-desktop-style ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); From 78c52f7c74e9f31b5de1ab1a25a7db194656fdb3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 1 Sep 2020 05:37:57 -0500 Subject: [PATCH 536/688] kquickcharts: init at 5.73.0 --- .../libraries/kde-frameworks/default.nix | 1 + .../libraries/kde-frameworks/kquickcharts.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++-- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks/kquickcharts.nix diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 966d89e4cbf7..02e25692ef16 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -112,6 +112,7 @@ let kitemmodels = callPackage ./kitemmodels.nix {}; kitemviews = callPackage ./kitemviews.nix {}; kplotting = callPackage ./kplotting.nix {}; + kquickcharts = callPackage ./kquickcharts.nix {}; kwayland = callPackage ./kwayland.nix {}; kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; kwindowsystem = callPackage ./kwindowsystem {}; diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix new file mode 100644 index 000000000000..5a06d4c1cad8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + qtquickcontrols2, +}: + +mkDerivation { + name = "kquickcharts"; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ qtquickcontrols2 ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb1bda7d3411..664dba98639b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14848,8 +14848,9 @@ in knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt - networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting - syndication threadweaver kirigami2 kholidays kpurpose kcontacts; + networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet + syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose + kcontacts kquickcharts; ### KDE PLASMA 5 From 6105abdeaa9c0292e20d3338ee297b32961639a8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 1 Sep 2020 05:46:04 -0500 Subject: [PATCH 537/688] plasma-workspace: add kquickcharts and appstream-qt inputs --- pkgs/desktops/plasma-5/plasma-workspace/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 99a649a026b9..2c4287f8edf7 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -11,7 +11,8 @@ kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner, kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt, - phonon, plasma-framework, prison, solid, kholidays, + phonon, plasma-framework, prison, solid, kholidays, kquickcharts, + appstream-qt, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtwayland, qtx11extras, @@ -31,7 +32,7 @@ mkDerivation { knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate networkmanager-qt phonon plasma-framework prison solid - kholidays + kholidays kquickcharts appstream-qt qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras ]; From 18dd58a1dff5d7a236383954e7447ec9038023c0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 1 Sep 2020 05:51:24 -0500 Subject: [PATCH 538/688] plasma-pa: add sound-theme-freedesktop input --- pkgs/desktops/plasma-5/plasma-pa.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index b60b5298d6db..e29df104f3c7 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,15 +1,20 @@ { mkDerivation, extra-cmake-modules, kdoctools, - gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, - libcanberra-gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem + kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework, + qtdeclarative, + gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop }: mkDerivation { name = "plasma-pa"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n - libcanberra-gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem + gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop + + kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework + kwindowsystem + + qtdeclarative ]; } From 75db15c41343ca31abe8714e4f20093bd5ce89bf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 1 Sep 2020 05:54:30 -0500 Subject: [PATCH 539/688] xdg-desktop-portal-kde: add epoxy and mesa inputs --- pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 8e2fd6ff0b19..c03c6a891614 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,15 +1,18 @@ { mkDerivation, extra-cmake-modules, gettext, kdoctools, python, - kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, kirigami2, kdeclarative, plasma-framework, - cups, pcre, pipewire, kio + cups, epoxy, mesa, pcre, pipewire, + kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, + kirigami2, kdeclarative, plasma-framework, kio }: mkDerivation { name = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ - cups pcre pipewire kio - kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem kirigami2 kdeclarative plasma-framework + cups epoxy mesa pcre pipewire + + kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem + kirigami2 kdeclarative plasma-framework ]; } From c5fe132b3c5da5044c01a9bd4aa4ab45795cb9e6 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 1 Sep 2020 11:28:34 +0000 Subject: [PATCH 540/688] Update architectures.nix --- lib/systems/architectures.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index acb6e417386b..9d1c29fd9f0b 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -59,8 +59,9 @@ rec { loongson2f = [ ]; }; - predicates = rec { + predicates = let featureSupport = feature: x: builtins.elem feature features.${x}; + in { sse3Support = featureSupport "sse3"; ssse3Support = featureSupport "ssse3"; sse4_1Support = featureSupport "sse4_1"; From 13ab2b4b10fdad81123802f0873e853a07c41746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 1 Sep 2020 13:29:46 +0200 Subject: [PATCH 541/688] zotero: fix reliance on coreutils being in PATH zotero currently fails in pure environments with: .zotero-wrapped: line 12: readlink: command not found .zotero-wrapped: line 12: dirname: command not found .zotero-wrapped: line 13: /zotero-bin: No such file or directory Because the script assumes that readlink and dirname are available. Fix by adding coreutils to PATH using the wrapper. --- pkgs/applications/office/zotero/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 567508c36753..d615f2a06f11 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, wrapGAppsHook, makeDesktopItem , atk , cairo +, coreutils , curl , cups , dbus-glib @@ -131,6 +132,12 @@ stdenv.mkDerivation rec { "$out/usr/lib/zotero-bin-${version}/{}" \; ''; + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils ]} + ) + ''; + meta = with stdenv.lib; { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; From eb3a3c275fc34599da379732e1db4a2ce9ff0b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 1 Sep 2020 15:04:34 +0200 Subject: [PATCH 542/688] _1password-gui: 0.8.3-1 -> 0.8.4 Changes: https://discussions.agilebits.com/discussion/115508/1password-development-preview-0-8-4 --- pkgs/tools/security/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index ee0bee8b8b72..91052f945ede 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.8.3-1"; + version = "0.8.4"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "06kzvdqsd7viaj7qz0ywi4k85662084cx73psk1b2hphklvdl24c"; + sha256 = "04rjlyi465pkg75pql3rfzmfj9zf8pfnxynz110x1wkqnvqmsxgw"; }; nativeBuildInputs = [ makeWrapper ]; From 0a64ff8152b46d691a0a087598a489c49752d142 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 1 Sep 2020 09:39:32 -0400 Subject: [PATCH 543/688] oh-my-zsh: 2020-08-28 -> 2020-08-31 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 33a32b48c30b..b8a3a7c5fdc7 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-08-28"; + version = "2020-08-31"; pname = "oh-my-zsh"; - rev = "4ed6fd2b8b6a0efb2f84f00a64503282aca260e7"; + rev = "a7f5170d68c0b75a9864763a90ac11e51ec67c81"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0f2f1k6s28lgxpjdgl4s7jisw6dgva9mcsqlsq0wg6041p246nai"; + sha256 = "03k1918cakqmg3x7kkiffdz1zwd86bipypkfigq3pgalh5zkyny9"; }; installPhase = '' From 24ebfb1e021b60ffa7ccb9970e5d9f0f664faa10 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 1 Sep 2020 08:48:03 -0500 Subject: [PATCH 544/688] powerdevil: update patches --- pkgs/desktops/plasma-5/powerdevil.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index 47cfd644ad76..e70d18621a93 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -21,16 +21,16 @@ mkDerivation { patches = [ # This fixes an issue where 'DDCA_Feature_List*' cannot be converted to # 'DDCA_Feature_List'. - # This can be dropped with the next release. # https://bugs.kde.org/show_bug.cgi?id=423605 (fetchpatch { url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch"; sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s"; }) - # This is a backport of - # https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch, - # which doesn't apply cleanly to 5.17.5. It should make it into 5.20, so - # this patch can be removed when we upgrade to 5.20. - ./patches/0001-Add-a-logging-category-config-file.patch + + # Reduce log message spam by setting the default log level to Warning. + (fetchpatch { + url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch"; + sha256 = "0vj70mhx6qhvbh4vn9qk9ir5w4s2m76hw2lsxmh3ibgsydz4yilz"; + }) ]; } From c51e7b7874f6db9f35b9e308971e1869094717c6 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 1 Sep 2020 10:07:28 -0400 Subject: [PATCH 545/688] nixos/beanstalkd: add openFirewall option --- nixos/modules/services/misc/beanstalkd.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/misc/beanstalkd.nix b/nixos/modules/services/misc/beanstalkd.nix index bcd133c97411..1c674a5b23bf 100644 --- a/nixos/modules/services/misc/beanstalkd.nix +++ b/nixos/modules/services/misc/beanstalkd.nix @@ -28,6 +28,12 @@ in example = "0.0.0.0"; }; }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Whether to open ports in the firewall for the server."; + }; }; }; @@ -35,6 +41,10 @@ in config = mkIf cfg.enable { + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.listen.port ]; + }; + environment.systemPackages = [ pkg ]; systemd.services.beanstalkd = { From e7da93bc9b5c3ebcb6399f3375b9ceca925a8d23 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Mon, 31 Aug 2020 18:08:13 -0400 Subject: [PATCH 546/688] notify-sharp: Update repo location. --- pkgs/development/libraries/notify-sharp/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index 403b0326bb5a..58d35767d1e0 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitLab, pkgconfig, autoreconfHook , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: stdenv.mkDerivation rec { pname = "notify-sharp"; version = "3.0.3"; - src = fetchFromGitHub { - owner = "GNOME"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "Archive"; repo = "notify-sharp"; rev = version; From b609ed3fb65d86955565c7c7447c10bcce3e182e Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Mon, 31 Aug 2020 18:12:52 -0400 Subject: [PATCH 547/688] appindicator-sharp: init at master --- .../libraries/appindicator-sharp/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/libraries/appindicator-sharp/default.nix diff --git a/pkgs/development/libraries/appindicator-sharp/default.nix b/pkgs/development/libraries/appindicator-sharp/default.nix new file mode 100644 index 000000000000..9eff4e3895ba --- /dev/null +++ b/pkgs/development/libraries/appindicator-sharp/default.nix @@ -0,0 +1,43 @@ +{ + autoreconfHook, + fetchFromGitHub, + lib, + libappindicator, + mono, + gtk-sharp-3_0, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "appindicator-sharp"; + version = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37"; + + src = fetchFromGitHub { + owner = "stsundermann"; + repo = "appindicator-sharp"; + rev = version; + sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l"; + }; + + nativeBuildInputs = [ + autoreconfHook + mono + pkg-config + ]; + + buildInputs = [ + gtk-sharp-3_0 + libappindicator + ]; + + ac_cv_path_MDOC = "no"; + installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"]; + + meta = { + description = "Bindings for appindicator using gobject-introspection"; + homepage = "https://github.com/stsundermann/appindicator-sharp"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ kevincox ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8274afa17a97..6205d60dfa56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -123,6 +123,8 @@ in appimageTools = callPackage ../build-support/appimage { }; + appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { }; + ensureNewerSourcesHook = { year }: makeSetupHook {} (writeScript "ensure-newer-sources-hook.sh" '' postUnpackHooks+=(_ensureNewerSources) From 5a3e36cbd364d16405dfea7e6411c95d76e6dfcf Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Mon, 31 Aug 2020 18:14:37 -0400 Subject: [PATCH 548/688] webkit2-sharp: init at master --- .../libraries/webkit2-sharp/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/libraries/webkit2-sharp/default.nix diff --git a/pkgs/development/libraries/webkit2-sharp/default.nix b/pkgs/development/libraries/webkit2-sharp/default.nix new file mode 100644 index 000000000000..b8a476b3b332 --- /dev/null +++ b/pkgs/development/libraries/webkit2-sharp/default.nix @@ -0,0 +1,49 @@ +{ + stdenv, + autoreconfHook, + fetchFromGitHub, + gtk-sharp-3_0, + lib, + libxslt, + mono, + pkg-config, + webkitgtk, +}: + +stdenv.mkDerivation rec { + pname = "webkit2-sharp"; + version = "a59fd76dd730432c76b12ee6347ea66567107ab9"; + + src = fetchFromGitHub { + owner = "hbons"; + repo = "webkit2-sharp"; + rev = version; + sha256 = "sha256:0a7vx81zvzn2wq4q2mqrxvlps1mqk28lm1gpfndqryxm4iiw28vc"; + }; + + nativeBuildInputs = [ + autoreconfHook + libxslt + mono + pkg-config + ]; + + buildInputs = [ + gtk-sharp-3_0 + webkitgtk + ]; + + ac_cv_path_MONODOCER = "no"; + installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"]; + + passthru = { + inherit webkitgtk; + }; + + meta = { + description = "C# bindings for WebKit 2 with GTK+ 3"; + homepage = "https://github.com/hbons/webkit2-sharp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kevincox ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6205d60dfa56..610bfd56354c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27350,6 +27350,8 @@ in webfs = callPackage ../servers/http/webfs { }; + webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { }; + websocketd = callPackage ../applications/networking/websocketd { }; wikicurses = callPackage ../applications/misc/wikicurses { From 2cd9dd502c23d59ce2e9c9ca3885950108e6e6e6 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Mon, 31 Aug 2020 18:51:24 -0400 Subject: [PATCH 549/688] sparkleshare: init at 3.28 --- .../sparkleshare/default.nix | 87 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 89 insertions(+) create mode 100644 pkgs/applications/version-management/sparkleshare/default.nix diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix new file mode 100644 index 000000000000..d4ae8a95b3ee --- /dev/null +++ b/pkgs/applications/version-management/sparkleshare/default.nix @@ -0,0 +1,87 @@ +{ + appindicator-sharp, + coreutils, + fetchFromGitHub, + git, + glib, + gtk-sharp-3_0, + lib, + makeWrapper, + meson, + mono, + ninja, + notify-sharp, + openssh, + openssl, + pkg-config, + stdenv, + symlinkJoin, + webkit2-sharp, + xdg_utils, +}: + +stdenv.mkDerivation rec { + pname = "sparkleshare"; + version = "3.28"; + + src = fetchFromGitHub { + owner = "hbons"; + repo = "SparkleShare"; + rev = version; + sha256 = "sha256:1x5nv2f3mrsr4a336bz5kc2lzkzilfh43bxy2yqhhjp2dgb20497"; + }; + + nativeBuildInputs = [ + makeWrapper + meson + mono + ninja + pkg-config + ]; + + buildInputs = [ + appindicator-sharp + gtk-sharp-3_0 + notify-sharp + webkit2-sharp + ]; + + patchPhase = '' + # Nix will manage the icon cache. + echo '#!/bin/sh' >scripts/post-install.sh + ''; + + postInstall = '' + wrapProgram $out/bin/sparkleshare \ + --set PATH ${symlinkJoin { + name = "mono-path"; + paths = [ + coreutils + git + glib + mono + openssh + openssl + xdg_utils + ]; + }}/bin \ + --set MONO_GAC_PREFIX ${lib.concatStringsSep ":" [ + appindicator-sharp + gtk-sharp-3_0 + webkit2-sharp + ]} \ + --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ + appindicator-sharp + gtk-sharp-3_0.gtk3 + webkit2-sharp + webkit2-sharp.webkitgtk + ]} + ''; + + meta = { + description = "Share and collaborate by syncing with any Git repository instantly. Linux, macOS, and Windows."; + homepage = "https://sparkleshare.org"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ kevincox ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 610bfd56354c..df8e021c901d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10237,6 +10237,8 @@ in spark = callPackage ../applications/networking/cluster/spark { }; + sparkleshare = callPackage ../applications/version-management/sparkleshare { }; + spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; From 2fb0ad3018044af858b9a93320752a2e3078d17d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 1 Sep 2020 15:49:05 +0200 Subject: [PATCH 550/688] python3Packages.transformers: 3.0.2 -> 3.1.0 Transformers now has `nlp` as an optional dependency. `nlp` will require some work to package, since it attempts to download modules into its Python package path by default. So, the `nlp`-based test is disable for the time being. --- .../python-modules/transformers/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index eb7c1c2aa483..aa6db6a73533 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "0rdlikh2qilwd0s9f3zif51p1q7sp3amxaccqic8p5qm6dqpfpz6"; + sha256 = "0wg36qrcljmpsyhjaxpqw3s1r6276yg8cq0bjrf52l4zlc5k4xzk"; }; propagatedBuildInputs = [ @@ -44,16 +44,23 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "tokenizers == 0.8.1.rc1" "tokenizers>=0.8" + --replace "tokenizers == 0.8.1.rc2" "tokenizers>=0.8" ''; preCheck = '' export HOME="$TMPDIR" cd tests + + # This test requires the nlp module, which we haven't + # packaged yet. However, nlp is optional for transformers + # itself + rm test_trainer.py ''; # Disable tests that require network access. disabledTests = [ + "PegasusTokenizationTest" + "T5TokenizationTest" "test_all_tokenizers" "test_batch_encoding_is_fast" "test_batch_encoding_pickle" @@ -63,6 +70,7 @@ buildPythonPackage rec { "test_hf_api" "test_outputs_can_be_shorter" "test_outputs_not_longer_than_maxlen" + "test_padding_accepts_tensors" "test_pretokenized_tokenizers" "test_tokenizer_equivalence_en_de" "test_tokenizer_from_model_type" @@ -74,6 +82,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/huggingface/transformers"; description = "State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch"; + changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ danieldk pashashocky ]; From 4751da4e13e1633a5dd43d4da15c30f2a474501c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksandar=20Topuzovi=C4=87?= Date: Tue, 1 Sep 2020 16:40:32 +0100 Subject: [PATCH 551/688] python3Packages.solo-python: 0.0.23 -> 0.0.26 --- pkgs/development/python-modules/solo-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 1b1896187f9d..0ce6e338e61f 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "solo-python"; - version = "0.0.23"; + version = "0.0.26"; format = "flit"; disabled = pythonOlder "3.6"; # only python>=3.6 is supported @@ -11,7 +11,7 @@ owner = "solokeys"; repo = pname; rev = version; - sha256 = "0r9cq0sd8pqnavgwa5cqgdxzbgly2baq8fpclnnz6anb2974kg3f"; + sha256 = "05rwqrhr1as6zqhg63d6wga7l42jm2azbav5w6ih8mx5zbxf61yz"; }; # replaced pinned fido, with unrestricted fido version From 9473cbef45ea6efd2b673fa49d8a87ff3aba462b Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Tue, 1 Sep 2020 10:47:33 -0700 Subject: [PATCH 552/688] doppler: 3.10.1 -> 3.10.3 --- pkgs/tools/security/doppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index b637eacd3da1..847d5d0cafb3 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.10.1"; + version = "3.10.3"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "0wzs480dg6q6j8jzhk5lkf5hs53jf7ljmnyw3i9xwqm9sxq7dsfx"; + sha256 = "15wmg67wwwgrs8q45r1z98k9v7mf2bfgsa40gcf8dr18ilnfpbn4"; }; vendorSha256 = "0wqbwk72k4r30a3vnf0gnx3k97y8xgnr2iavk5bc8f8vkjv0bsv6"; From 3b68a757ffc5321eccfed186af17037adff10b62 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 1 Sep 2020 22:21:09 +0200 Subject: [PATCH 553/688] nixos/gpaste: return sessionPath GPaste ships keybindings for gnome-control-center. Those depend on GSettings schemas but there is currently no mechanism for loading schemas other than using global ones from $XDG_DATA_DIRS. Eventually, I want to add such mechanism but until then, let's return the impure sessionPath option that was removed in https://github.com/NixOS/nixpkgs/commit/f63d94eba340c05cd241c478deb518204514fce8 --- nixos/modules/programs/gpaste.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/programs/gpaste.nix b/nixos/modules/programs/gpaste.nix index 4f6deb77e5eb..8bc52c28d814 100644 --- a/nixos/modules/programs/gpaste.nix +++ b/nixos/modules/programs/gpaste.nix @@ -30,5 +30,7 @@ with lib; environment.systemPackages = [ pkgs.gnome3.gpaste ]; services.dbus.packages = [ pkgs.gnome3.gpaste ]; systemd.packages = [ pkgs.gnome3.gpaste ]; + # gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas. + services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ]; }; } From 8ebee6e3a6495fac27e3ff867014bed8a0e294fb Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 1 Sep 2020 12:31:43 -0700 Subject: [PATCH 554/688] gtg: Run tests --- pkgs/applications/office/gtg/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index d990bc07ad23..9bd25cfff1df 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -50,9 +50,16 @@ python3Packages.buildPythonApplication rec { liblarch ]; + checkInputs = with python3Packages; [ + nose + mock + ]; + format = "other"; strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943) + checkPhase = "python3 ../run-tests"; + meta = with stdenv.lib; { description = " A personal tasks and TODO-list items organizer."; longDescription = '' From 5f28c070875599378ba6f9ab7823de3a22ee5388 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 10:33:50 +0000 Subject: [PATCH 555/688] suitesparse-graphblas: 3.3.0 -> 3.3.3 --- .../libraries/science/math/suitesparse-graphblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 5244ccdb2817..1c910a4f75bb 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.3.0"; + version = "3.3.3"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "1fin9741ild3dv7c9gk07kpizsnnx17ar9cv9lny8vl47pms940h"; + sha256 = "1nmygb2yny0mdqp0mc6760gbxklq1jjm0c6s39qkdwzf3n9f8j7p"; }; nativeBuildInputs = [ From 7bb51c2a6050742ab6588d9c4baf6fa6e3b0a0ff Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 1 Sep 2020 19:45:29 +0200 Subject: [PATCH 556/688] podman: 2.0.5 -> 2.0.6 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 7d214b4abd3f..871592c88c2f 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "0db0q52va9w8aprzx08xnv6y84l4x4lc113sd97hjgjnhknp8d3m"; + sha256 = "1kl8cfsqwfbjl14mbp58wrxfm90y2w58x6138zq0sn4jzwwpy1a4"; }; vendorSha256 = null; From 53f179dbe6c4ab85ad2a89bbd7fb6135b26acca8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 08:47:33 +0000 Subject: [PATCH 557/688] rpm-ostree: 2020.2 -> 2020.4 --- pkgs/tools/misc/rpm-ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index e04d37ba3c6b..d1aaf23a6ece 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2020.2"; + version = "2020.4"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "nuEBEVFqr9J+Nf98GZkvNNYOtpMUjKzYrzCc1T2cR3A="; + sha256 = "019hjmfjhnvlrnb056fvznnsasnyw5awd594aa2126nbsi1j45dc"; }; nativeBuildInputs = [ From 57b91fc5adda978993e675e144d72cb184f645f8 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 1 Sep 2020 16:59:16 +0200 Subject: [PATCH 558/688] go: 1.15 -> 1.15.1 Signed-off-by: Sascha Grunert --- pkgs/development/compilers/go/1.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index b3851741c69c..adc3185babbe 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -31,11 +31,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15"; + version = "1.15.1"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0fmc53pamxxbvmp5bcvh1fhffirpv3gz6y7qz97iacpmsiz8yhv9"; + sha256 = "0c2d2ngckcfsgrb7a4p6ag83mk5yd15npiq7q1f1p211li93fx6k"; }; # perl is used for testing go vet From 7042fefef12a15181483ad38388abadee64bf68e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Sep 2020 10:13:42 +1000 Subject: [PATCH 559/688] etcd: 3.3.22 -> 3.3.25 --- pkgs/servers/etcd/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 4c0df659f3ed..53ad0d6ed240 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "etcd"; - version = "3.3.22"; + version = "3.3.25"; goPackagePath = "github.com/coreos/etcd"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "1rd390qfx9k20j9gh1wp1g9ygc571f2kv1dg2wvqij3kwydhymcj"; + sha256 = "10cyy6jr2xzmla5yyn850cv323ixrk70fjpk8lxjjjvy0ffmb6hj"; }; buildPhase = '' @@ -24,10 +24,7 @@ buildGoPackage rec { install -Dm755 bin/* bin/functional/cmd/* -t $out/bin ''; - passthru.tests = with nixosTests; { - etcd = etcd; - etcd-cluster = etcd-cluster; - }; + passthru.tests = { inherit (nixosTests) etcd etcd-cluster; }; meta = with lib; { description = "Distributed reliable key-value store for the most critical data of a distributed system"; From 37a3ebb725f005e54004914b07af4d41f5b559df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 20:59:48 +0000 Subject: [PATCH 560/688] cldr-emoji-annotation: 37.0_13.0_0_1 -> 37.0_13.0_0_2 --- pkgs/data/misc/cldr-emoji-annotation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/cldr-emoji-annotation/default.nix b/pkgs/data/misc/cldr-emoji-annotation/default.nix index f2dc4213e004..8164012b69ae 100644 --- a/pkgs/data/misc/cldr-emoji-annotation/default.nix +++ b/pkgs/data/misc/cldr-emoji-annotation/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cldr-emoji-annotation"; - version = "37.0_13.0_0_1"; + version = "37.0_13.0_0_2"; src = fetchFromGitHub { owner = "fujiwarat"; repo = "cldr-emoji-annotation"; rev = version; - sha256 = "19cqxyrap3p7djzzs99pndjbcvzmdv86n2m1sw2zqiwpirw7y1sy"; + sha256 = "0la3h6l58j9jfjvzwz65x56ijx7sppirwpqbqc06if4c2g0kzswj"; }; nativeBuildInputs = [ From 6bab4b0f46f465953d38ece5a3758c52ccd7ba06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 31 Aug 2020 20:27:00 -0300 Subject: [PATCH 561/688] deepin: add throws related to the removal of deepin --- pkgs/top-level/aliases.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index da3d3bdfc6d1..4a8dee6f4477 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -104,6 +104,7 @@ mapAliases ({ deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 deadpixi-sam = deadpixi-sam-unstable; debian_devscripts = debian-devscripts; # added 2016-03-23 + deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 desktop_file_utils = desktop-file-utils; # added 2018-02-25 devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 @@ -326,6 +327,7 @@ mapAliases ({ nagiosPluginsOfficial = monitoring-plugins; ncat = nmap; # added 2016-01-26 netcat-openbsd = libressl.nc; # added 2018-04-25 + netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 From b5c9c03fac5e99f33e70df5abb9e85085dab611d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 31 Aug 2020 21:09:20 -0300 Subject: [PATCH 562/688] nixos/deepin: register as a removed module --- nixos/modules/rename.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1fe00e9142ba..fad0b40a9dbc 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -19,6 +19,7 @@ with lib; # Completely removed modules (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "") (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") From 20d491a317d9956ddca80913f07d04bd234ea432 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 23 Aug 2020 01:28:45 +0200 Subject: [PATCH 563/688] treewide: completely remove types.loaOf --- lib/modules.nix | 1 - lib/types.nix | 117 ++---------------- nixos/doc/manual/development/option-types.xml | 11 -- nixos/doc/manual/release-notes/rl-2009.xml | 12 ++ nixos/modules/config/users-groups.nix | 4 +- .../cd-dvd/sd-image-raspberrypi4.nix | 2 +- .../tools/nixos-option/nixos-option.cc | 2 +- nixos/modules/programs/ssh.nix | 2 +- nixos/modules/programs/tsm-client.nix | 4 +- nixos/modules/security/pam.nix | 2 +- nixos/modules/services/backup/znapzend.nix | 4 +- nixos/modules/services/desktops/geoclue2.nix | 2 +- .../hardware/sane_extra_backends/brscan4.nix | 2 +- .../services/networking/hylafax/options.nix | 4 +- nixos/modules/services/networking/nylon.nix | 2 +- nixos/modules/services/networking/prosody.nix | 2 +- .../modules/services/networking/ssh/sshd.nix | 2 +- nixos/modules/services/security/tor.nix | 2 +- nixos/modules/system/boot/luksroot.nix | 2 +- nixos/modules/system/boot/stage-1.nix | 2 +- nixos/modules/system/etc/etc.nix | 2 +- nixos/modules/tasks/encrypted-devices.nix | 2 +- nixos/modules/tasks/filesystems.nix | 4 +- nixos/modules/tasks/network-interfaces.nix | 4 +- .../virtualisation/nixos-containers.nix | 2 +- nixos/modules/virtualisation/railcar.nix | 4 +- 26 files changed, 52 insertions(+), 147 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 2ec346998095..decb96ffe111 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -613,7 +613,6 @@ rec { if tp.name == "option set" || tp.name == "submodule" then throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}." else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options) - else if optionSetIn "loaOf" then types.loaOf (types.submodule options) else if optionSetIn "listOf" then types.listOf (types.submodule options) else if optionSetIn "nullOr" then types.nullOr (types.submodule options) else tp; diff --git a/lib/types.nix b/lib/types.nix index 1845b6ae339e..17e7a939fe3d 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -252,8 +252,8 @@ rec { merge = mergeEqualOption; }; - # drop this in the future: - list = builtins.trace "`types.list` is deprecated; use `types.listOf` instead" types.listOf; + # TODO: drop this in the future: + list = builtins.trace "`types.list` has been removed; please use `types.listOf` instead" types.listOf; listOf = elemType: mkOptionType rec { name = "listOf"; @@ -326,110 +326,15 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; - # List or attribute set of ... - loaOf = elemType: - let - convertAllLists = loc: defs: - let - padWidth = stringLength (toString (length defs)); - unnamedPrefix = i: "unnamed-" + fixedWidthNumber padWidth i + "."; - in - imap1 (i: convertIfList loc (unnamedPrefix i)) defs; - convertIfList = loc: unnamedPrefix: def: - if isList def.value then - let - padWidth = stringLength (toString (length def.value)); - unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i; - anyString = placeholder "name"; - nameAttrs = [ - { path = [ "environment" "etc" ]; - name = "target"; - } - { path = [ "containers" anyString "bindMounts" ]; - name = "mountPoint"; - } - { path = [ "programs" "ssh" "knownHosts" ]; - # hostNames is actually a list so we would need to handle it only when singleton - name = "hostNames"; - } - { path = [ "fileSystems" ]; - name = "mountPoint"; - } - { path = [ "boot" "specialFileSystems" ]; - name = "mountPoint"; - } - { path = [ "services" "znapzend" "zetup" ]; - name = "dataset"; - } - { path = [ "services" "znapzend" "zetup" anyString "destinations" ]; - name = "label"; - } - { path = [ "services" "geoclue2" "appConfig" ]; - name = "desktopID"; - } - ]; - matched = let - equals = a: b: b == anyString || a == b; - fallback = { name = "name"; }; - in findFirst ({ path, ... }: all (v: v == true) (zipListsWith equals loc path)) fallback nameAttrs; - nameAttr = matched.name; - nameValueOld = value: - if isList value then - if length value > 0 then - "[ " + concatMapStringsSep " " escapeNixString value + " ]" - else - "[ ]" - else - escapeNixString value; - nameValueNew = value: unnamed: - if isList value then - if length value > 0 then - head value - else - unnamed - else - value; - res = - { inherit (def) file; - value = listToAttrs ( - imap1 (elemIdx: elem: - { name = nameValueNew (elem.${nameAttr} or (unnamed elemIdx)) (unnamed elemIdx); - value = elem; - }) def.value); - }; - option = concatStringsSep "." loc; - sample = take 3 def.value; - more = lib.optionalString (length def.value > 3) "... "; - list = concatMapStrings (x: ''{ ${nameAttr} = ${nameValueOld (x.${nameAttr} or "unnamed")}; ...} '') sample; - set = concatMapStrings (x: ''${nameValueNew (x.${nameAttr} or "unnamed") "unnamed"} = {...}; '') sample; - msg = '' - In file ${def.file} - a list is being assigned to the option config.${option}. - This will soon be an error as type loaOf is deprecated. - See https://github.com/NixOS/nixpkgs/pull/63103 for more information. - Do - ${option} = - { ${set}${more}} - instead of - ${option} = - [ ${list}${more}] - ''; - in - lib.warn msg res - else - def; - attrOnly = attrsOf elemType; - in mkOptionType rec { - name = "loaOf"; - description = "list or attribute set of ${elemType.description}s"; - check = x: isList x || isAttrs x; - merge = loc: defs: attrOnly.merge loc (convertAllLists loc defs); - emptyValue = { value = {}; }; - getSubOptions = prefix: elemType.getSubOptions (prefix ++ [""]); - getSubModules = elemType.getSubModules; - substSubModules = m: loaOf (elemType.substSubModules m); - functor = (defaultFunctor name) // { wrapped = elemType; }; - }; + # TODO: drop this in the future: + loaOf = + let msg = + '' + `types.loaOf` has been removed and mixing lists with attribute values + is no longer possible; please use `types.attrsOf` instead. + See https://github.com/NixOS/nixpkgs/issues/1800 for the motivation. + ''; + in builtins.trace msg types.attrsOf; # Value of given type but with no merging (i.e. `uniq list`s are not concatenated). uniq = elemType: mkOptionType rec { diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 957349ad1811..5a6dae6e9912 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -385,17 +385,6 @@ - - - types.loaOf t - - - - An attribute set or a list of t type. Multiple - definitions are merged according to the value. - - - types.nullOr t diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 83bc2f82bbfc..bf96fb21a415 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -743,6 +743,18 @@ CREATE ROLE postgres LOGIN SUPERUSER; See the PR that changed this for more info. + + + For NixOS configuration options, the type loaOf, after + its initial deprecation in release 20.03, has been removed. In NixOS and + Nixpkgs options using this type have been converted to attrsOf. + + + For more information on this change have look at these links: + issue #1800, + PR #63103. + + diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 56b7af98b617..0ab303d0ae47 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -463,7 +463,7 @@ in { users.users = mkOption { default = {}; - type = with types; loaOf (submodule userOpts); + type = with types; attrsOf (submodule userOpts); example = { alice = { uid = 1234; @@ -487,7 +487,7 @@ in { { students.gid = 1001; hackers = { }; }; - type = with types; loaOf (submodule groupOpts); + type = with types; attrsOf (submodule groupOpts); description = '' Additional groups to be created automatically by the system. ''; diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix index 79c835dc3909..87545e842030 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix @@ -27,7 +27,7 @@ }; fileSystems."/boot/firmware" = { - # This effectively "renames" the loaOf entry set in sd-image.nix + # This effectively "renames" the attrsOf entry set in sd-image.nix mountPoint = "/boot"; neededForBoot = true; }; diff --git a/nixos/modules/installer/tools/nixos-option/nixos-option.cc b/nixos/modules/installer/tools/nixos-option/nixos-option.cc index 1a7b07a74f8a..f779d82edbd6 100644 --- a/nixos/modules/installer/tools/nixos-option/nixos-option.cc +++ b/nixos/modules/installer/tools/nixos-option/nixos-option.cc @@ -224,7 +224,7 @@ bool optionTypeIs(Context & ctx, Value & v, const std::string & soughtType) bool isAggregateOptionType(Context & ctx, Value & v) { - return optionTypeIs(ctx, v, "attrsOf") || optionTypeIs(ctx, v, "listOf") || optionTypeIs(ctx, v, "loaOf"); + return optionTypeIs(ctx, v, "attrsOf") || optionTypeIs(ctx, v, "listOf"); } MakeError(OptionPathError, EvalError); diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index a983ffa4b890..40af4d0ff5ae 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -131,7 +131,7 @@ in knownHosts = mkOption { default = {}; - type = types.loaOf (types.submodule ({ name, ... }: { + type = types.attrsOf (types.submodule ({ name, ... }: { options = { certAuthority = mkOption { type = types.bool; diff --git a/nixos/modules/programs/tsm-client.nix b/nixos/modules/programs/tsm-client.nix index eb6f12475286..7ac4086d5f09 100644 --- a/nixos/modules/programs/tsm-client.nix +++ b/nixos/modules/programs/tsm-client.nix @@ -7,7 +7,7 @@ let inherit (lib.modules) mkDefault mkIf; inherit (lib.options) literalExample mkEnableOption mkOption; inherit (lib.strings) concatStringsSep optionalString toLower; - inherit (lib.types) addCheck attrsOf lines loaOf nullOr package path port str strMatching submodule; + inherit (lib.types) addCheck attrsOf lines nullOr package path port str strMatching submodule; # Checks if given list of strings contains unique # elements when compared without considering case. @@ -178,7 +178,7 @@ let client system-options file "dsm.sys" ''; servers = mkOption { - type = loaOf (submodule [ serverOptions ]); + type = attrsOf (submodule [ serverOptions ]); default = {}; example.mainTsmServer = { server = "tsmserver.company.com"; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 565c15dec24b..ce74805ef413 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -544,7 +544,7 @@ in security.pam.services = mkOption { default = []; - type = with types; loaOf (submodule pamOpts); + type = with types; attrsOf (submodule pamOpts); description = '' This option defines the PAM services. A service typically diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index 8098617d11f3..0ca71b413cee 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -220,7 +220,7 @@ let }; destinations = mkOption { - type = loaOf (destType config); + type = attrsOf (destType config); description = "Additional destinations."; default = {}; example = literalExample '' @@ -328,7 +328,7 @@ in }; zetup = mkOption { - type = loaOf srcType; + type = attrsOf srcType; description = "Znapzend configuration."; default = {}; example = literalExample '' diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index 542b2ead4104..6702bd395a03 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -160,7 +160,7 @@ in }; appConfig = mkOption { - type = types.loaOf appConfigModule; + type = types.attrsOf appConfigModule; default = {}; example = literalExample '' "com.github.app" = { diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix index 6f49a1ab6d40..a6afa01dd812 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix @@ -81,7 +81,7 @@ in { office1 = { model = "MFC-7860DW"; ip = "192.168.1.2"; }; office2 = { model = "MFC-7860DW"; nodename = "BRW0080927AFBCE"; }; }; - type = with types; loaOf (submodule netDeviceOpts); + type = with types; attrsOf (submodule netDeviceOpts); description = '' The list of network devices that will be registered against the brscan4 sane backend. diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix index 4ac6d3fa8432..9e28d09dffca 100644 --- a/nixos/modules/services/networking/hylafax/options.nix +++ b/nixos/modules/services/networking/hylafax/options.nix @@ -3,7 +3,7 @@ let inherit (lib.options) literalExample mkEnableOption mkOption; - inherit (lib.types) bool enum int lines loaOf nullOr path str submodule; + inherit (lib.types) bool enum int lines attrsOf nullOr path str submodule; inherit (lib.modules) mkDefault mkIf mkMerge; commonDescr = '' @@ -248,7 +248,7 @@ in }; modems = mkOption { - type = loaOf (submodule [ modemConfigOptions ]); + type = attrsOf (submodule [ modemConfigOptions ]); default = {}; example.ttyS1 = { type = "cirrus"; diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index 7c171281a926..bfc358cb12fb 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -140,7 +140,7 @@ in services.nylon = mkOption { default = {}; description = "Collection of named nylon instances"; - type = with types; loaOf (submodule nylonOpts); + type = with types; attrsOf (submodule nylonOpts); internal = true; }; diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index e53d7093be86..a6c1cb0f4797 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -655,7 +655,7 @@ in description = "Define the virtual hosts"; - type = with types; loaOf (submodule vHostOpts); + type = with types; attrsOf (submodule vHostOpts); example = { myhost = { diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 17f31e3a488d..6b27cbc56bd9 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -361,7 +361,7 @@ in }; users.users = mkOption { - type = with types; loaOf (submodule userOptions); + type = with types; attrsOf (submodule userOptions); }; }; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index b33e905c67de..885b23ac6946 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -597,7 +597,7 @@ in ]; } ''; - type = types.loaOf (types.submodule ({name, ...}: { + type = types.attrsOf (types.submodule ({name, ...}: { options = { name = mkOption { diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 166f89c70661..a4cbb03a8e32 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -516,7 +516,7 @@ in /dev/mapper/name. ''; - type = with types; loaOf (submodule ( + type = with types; attrsOf (submodule ( { name, ... }: { options = { name = mkOption { diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index a04660fb56e7..97eb1d286a35 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -555,7 +555,7 @@ in }; fileSystems = mkOption { - type = with lib.types; loaOf (submodule { + type = with lib.types; attrsOf (submodule { options.neededForBoot = mkOption { default = false; type = types.bool; diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 1f4d54a1ae20..7478e3e80717 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -46,7 +46,7 @@ in Set of files that have to be linked in /etc. ''; - type = with types; loaOf (submodule ( + type = with types; attrsOf (submodule ( { name, config, ... }: { options = { diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 9c3f2d8fccb2..dd337de98698 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -54,7 +54,7 @@ in options = { fileSystems = mkOption { - type = with lib.types; loaOf (submodule encryptedFSOptions); + type = with lib.types; attrsOf (submodule encryptedFSOptions); }; swapDevices = mkOption { type = with lib.types; listOf (submodule encryptedFSOptions); diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 0ade74b957a0..3ea67dac7146 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -159,7 +159,7 @@ in "/bigdisk".label = "bigdisk"; } ''; - type = types.loaOf (types.submodule [coreFileSystemOpts fileSystemOpts]); + type = types.attrsOf (types.submodule [coreFileSystemOpts fileSystemOpts]); description = '' The file systems to be mounted. It must include an entry for the root directory (mountPoint = "/"). Each @@ -193,7 +193,7 @@ in boot.specialFileSystems = mkOption { default = {}; - type = types.loaOf (types.submodule coreFileSystemOpts); + type = types.attrsOf (types.submodule coreFileSystemOpts); internal = true; description = '' Special filesystems that are mounted very early during boot. diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 565868724ad5..2e533fb604e7 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -519,7 +519,7 @@ in is true, then every interface not listed here will be configured using DHCP. ''; - type = with types; loaOf (submodule interfaceOpts); + type = with types; attrsOf (submodule interfaceOpts); }; networking.vswitches = mkOption { @@ -544,7 +544,7 @@ in interfaces = mkOption { example = [ "eth0" "eth1" ]; description = "The physical network interfaces connected by the vSwitch."; - type = with types; loaOf (submodule vswitchInterfaceOpts); + type = with types; attrsOf (submodule vswitchInterfaceOpts); }; controllers = mkOption { diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index b0fa03917c82..8fbb4efd2019 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -627,7 +627,7 @@ in }; bindMounts = mkOption { - type = with types; loaOf (submodule bindMountOpts); + type = with types; attrsOf (submodule bindMountOpts); default = {}; example = literalExample '' { "/home" = { hostPath = "/home/alice"; diff --git a/nixos/modules/virtualisation/railcar.nix b/nixos/modules/virtualisation/railcar.nix index 3f188fc68e55..10464f628984 100644 --- a/nixos/modules/virtualisation/railcar.nix +++ b/nixos/modules/virtualisation/railcar.nix @@ -41,7 +41,7 @@ let description = "Source for the in-container mount"; }; options = mkOption { - type = loaOf (str); + type = attrsOf (str); default = [ "bind" ]; description = '' Mount options of the filesystem to be used. @@ -61,7 +61,7 @@ in containers = mkOption { default = {}; description = "Declarative container configuration"; - type = with types; loaOf (submodule ({ name, config, ... }: { + type = with types; attrsOf (submodule ({ name, config, ... }: { options = { cmd = mkOption { type = types.lines; From bc62423a8733e0629600a8dbeb72f94a694cf14f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 23 Aug 2020 19:11:40 +0200 Subject: [PATCH 564/688] nixos/doc: convert loaOf options refs to attrsOf --- nixos/doc/manual/administration/boot-problems.xml | 4 ++-- .../manual/administration/imperative-containers.xml | 2 +- nixos/doc/manual/configuration/file-systems.xml | 8 ++++---- nixos/doc/manual/configuration/ipv4-config.xml | 2 +- nixos/doc/manual/configuration/ipv6-config.xml | 2 +- nixos/doc/manual/configuration/luks-file-systems.xml | 6 +++--- nixos/doc/manual/configuration/network-manager.xml | 2 +- nixos/doc/manual/configuration/ssh.xml | 2 +- nixos/doc/manual/configuration/user-mgmt.xml | 12 ++++++------ nixos/doc/manual/installation/changing-config.xml | 2 +- .../installation/installing-from-other-distro.xml | 2 +- nixos/doc/manual/installation/installing.xml | 2 +- nixos/doc/manual/release-notes/rl-2003.xml | 2 +- nixos/doc/manual/release-notes/rl-2009.xml | 2 -- nixos/modules/services/networking/prosody.xml | 8 ++++---- 15 files changed, 28 insertions(+), 30 deletions(-) diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml index badc374ebcfd..e0f662840101 100644 --- a/nixos/doc/manual/administration/boot-problems.xml +++ b/nixos/doc/manual/administration/boot-problems.xml @@ -58,9 +58,9 @@ Like boot.debug1 or boot.debug1devices, but runs stage1 until all filesystems that are mounted during initrd are mounted (see - + ). As a motivating example, this could be useful if you've forgotten to set - + on a file system. diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index 7ded0c11786e..435ed230f513 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -27,7 +27,7 @@ # nixos-container create foo --config ' = true; - users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; + users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; ' By default the next free address in the 10.233.0.0/16 subnet will be chosen diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml index 3ac02a975ebf..9747433375fc 100644 --- a/nixos/doc/manual/configuration/file-systems.xml +++ b/nixos/doc/manual/configuration/file-systems.xml @@ -23,12 +23,12 @@ systemd-fstab-generator. The filesystem will be mounted automatically unless "noauto" is present in options. + linkend="opt-fileSystems._name_.options">options. "noauto" filesystems can be mounted explicitly using systemctl e.g. systemctl start data.mount. Mount points are created automatically if they don’t already exist. For - , + , it’s best to use the topology-independent device aliases in /dev/disk/by-label and /dev/disk/by-uuid, as these don’t change if the @@ -36,7 +36,7 @@ You can usually omit the file system type - (), + (), since mount can usually detect the type and load the necessary kernel module automatically. However, if the file system is needed at early boot (in the initial ramdisk) and is not ext2, @@ -49,7 +49,7 @@ System startup will fail if any of the filesystems fails to mount, dropping you to the emergency shell. You can make a mount asynchronous and non-critical by adding - options = [ + options = [ "nofail" ];. diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index 71ddf41491ba..884becf0979a 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -10,7 +10,7 @@ automatically configure network interfaces. However, you can configure an interface manually as follows: -networking.interfaces.eth0.ipv4.addresses = [ { +networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index 675a5d9a260d..7b89b4092be7 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -26,7 +26,7 @@ As with IPv4 networking interfaces are automatically configured via DHCPv6. You can configure an interface manually: -networking.interfaces.eth0.ipv6.addresses = [ { +networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml index d3007843d68b..8a8168c095f0 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/nixos/doc/manual/configuration/luks-file-systems.xml @@ -30,7 +30,7 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** /, add the following to configuration.nix: -boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; +boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; ."/".device = "/dev/mapper/crypted"; Should grub be used as bootloader, and /boot is located @@ -60,13 +60,13 @@ Added to key to device /dev/sda2, slot: 2 To ensure that this file system is decrypted using the FIDO2 compatible key, add the following to configuration.nix: boot.initrd.luks.fido2Support = true; -boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; +boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; You can also use the FIDO2 passwordless setup, but for security reasons, you might want to enable it only when your device is PIN protected, such as Trezor. -boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; +boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index 3953e0ffe851..94d229fd803f 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -19,7 +19,7 @@ All users that should have permission to change network settings must belong to the networkmanager group: -users.users.alice.extraGroups = [ "networkmanager" ]; +users.users.alice.extraGroups = [ "networkmanager" ]; diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml index a4af1b96583d..95ad3edff935 100644 --- a/nixos/doc/manual/configuration/ssh.xml +++ b/nixos/doc/manual/configuration/ssh.xml @@ -20,7 +20,7 @@ follows: -users.users.alice.openssh.authorizedKeys.keys = +users.users.alice.openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 4b1710f3a2b1..68324cc85b54 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -11,11 +11,11 @@ that a user account named alice shall exist: .alice = { - isNormalUser = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; }; Note that alice is a member of the @@ -36,7 +36,7 @@ account will cease to exist. Also, imperative commands for managing users and groups, such as useradd, are no longer available. Passwords may still be assigned by setting the user's - hashedPassword + hashedPassword option. A hashed password can be generated using mkpasswd -m sha-512 after installing the mkpasswd package. diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index 48193d986ab7..4288806d5eb2 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -78,7 +78,7 @@ mutableUsers = false. Another way is to temporarily add the following to your configuration: -users.users.your-user.initialHashedPassword = "test"; +users.users.your-user.initialHashedPassword = "test"; Important: delete the $hostname.qcow2 file if you have started the virtual machine at least once without the right users, otherwise diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index 45d68f8787f1..d2d1245c57ac 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -211,7 +211,7 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable use sudo) -users.users.root.initialHashedPassword = ""; +users.users.root.initialHashedPassword = ""; diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 5f216df66f84..c7ed3b3c0c97 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -550,7 +550,7 @@ Retype new UNIX password: *** # Note: setting fileSystems is generally not # necessary, since nixos-generate-config figures them out # automatically in hardware-configuration.nix. - #fileSystems."/".device = "/dev/disk/by-label/nixos"; + #fileSystems."/".device = "/dev/disk/by-label/nixos"; # Enable the OpenSSH server. services.sshd.enable = true; diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 0e9ba027a382..87f122856194 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -796,7 +796,7 @@ users.users.me = or any other display manager in NixOS as they all support auto-login. If you used this module specifically because it permitted root auto-login you can override the lightdm-autologin pam module like: -security.pam.services.lightdm-autologin.text = lib.mkForce '' +security.pam.services.lightdm-autologin.text = lib.mkForce '' auth requisite pam_nologin.so auth required pam_succeed_if.so quiet auth required pam_permit.so diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index bf96fb21a415..3d156e517c8d 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -748,8 +748,6 @@ CREATE ROLE postgres LOGIN SUPERUSER; For NixOS configuration options, the type loaOf, after its initial deprecation in release 20.03, has been removed. In NixOS and Nixpkgs options using this type have been converted to attrsOf. - - For more information on this change have look at these links: issue #1800, PR #63103. diff --git a/nixos/modules/services/networking/prosody.xml b/nixos/modules/services/networking/prosody.xml index 7859cb1578b7..e3fedf8a67e1 100644 --- a/nixos/modules/services/networking/prosody.xml +++ b/nixos/modules/services/networking/prosody.xml @@ -43,10 +43,10 @@ services.prosody = { ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; ssl.key = "/var/lib/acme/example.org/key.pem"; virtualHosts."example.org" = { - enabled = true; - domain = "example.org"; - ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; - ssl.key = "/var/lib/acme/example.org/key.pem"; + enabled = true; + domain = "example.org"; + ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; + ssl.key = "/var/lib/acme/example.org/key.pem"; }; muc = [ { domain = "conference.example.org"; From 3f8a3246f409513653a9e8739c69371af3e9f7b0 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 1 Sep 2020 15:12:36 +0200 Subject: [PATCH 565/688] nixos/lib/make-options-doc: remove loaOf subs Remove the substitution for the placeholder used by loaOf, now that the type has been deprecated. --- nixos/lib/make-options-doc/options-to-docbook.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl index 72ac89d4ff62..18d19fddaca2 100644 --- a/nixos/lib/make-options-doc/options-to-docbook.xsl +++ b/nixos/lib/make-options-doc/options-to-docbook.xsl @@ -20,7 +20,7 @@ Configuration Options - + From 3b92996c0bbf2e6451747f41598a29b4ce11b8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 1 Sep 2020 19:46:34 -0300 Subject: [PATCH 566/688] nixos/doc: document removal of deepin in the release notes --- nixos/doc/manual/release-notes/rl-2009.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index cd1afb3c1c9e..e2e7f637f222 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -1031,6 +1031,19 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; documentation for more information. + + + The deepin package set has been removed from + nixpkgs. It was a work in progress to package the + Deepin Desktop Environment (DDE), + including libraries, tools and applications, and it was still + missing a service to lauch the desktop environment. It has shown + to no longer be a feasible goal due to reasons discussed in + issue #94870. + The package netease-cloud-music has also been + removed, as it depends on libraries from deepin. + + From a6d113b1cec3daeb9f08cd64755c584818c22249 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 2 Sep 2020 00:34:56 +0200 Subject: [PATCH 567/688] glib: remove fam module todo gamin is abandoned and we are going to drop it --- pkgs/development/libraries/glib/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index f7b0667741d3..cb2b8a11c039 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -16,9 +16,6 @@ with stdenv.lib; assert stdenv.isLinux -> utillinuxMinimal != null; # TODO: -# * Add gio-module-fam -# Problem: cyclic dependency on gamin -# Possible solution: build as a standalone module, set env. vars # * Make it build without python # Problem: an example (test?) program needs it. # Possible solution: disable compilation of this example somehow From 88bf62113b9ada4bf2b53f79c9be94d7d3d90bc5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 2 Sep 2020 00:34:18 +0200 Subject: [PATCH 568/688] fail2ban: drop unused gamin arg --- pkgs/tools/security/fail2ban/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 6377e829aa65..c27f82d70536 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, gamin }: +{ stdenv, fetchFromGitHub, python3 }: let version = "0.11.1"; in From 77293baff00ba0d81e310a4fe9d96bb16578bf5f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 2 Sep 2020 01:25:50 +0200 Subject: [PATCH 569/688] strigi: drop It has not been used by KDE for many years and depends on umaintained libraries we want to drop (Qt4 and Gamin). --- nixos/modules/programs/environment.nix | 1 - pkgs/development/libraries/strigi/default.nix | 43 ------------------ .../strigi/export_bufferedstream.patch | 12 ----- pkgs/development/libraries/strigi/gcc6.patch | 45 ------------------- pkgs/top-level/all-packages.nix | 2 - 5 files changed, 103 deletions(-) delete mode 100644 pkgs/development/libraries/strigi/default.nix delete mode 100644 pkgs/development/libraries/strigi/export_bufferedstream.patch delete mode 100644 pkgs/development/libraries/strigi/gcc6.patch diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 38bdabb4fa81..8877356360a5 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -33,7 +33,6 @@ in { PATH = [ "/bin" ]; INFOPATH = [ "/info" "/share/info" ]; KDEDIRS = [ "" ]; - STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ]; QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ]; QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ]; GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ]; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix deleted file mode 100644 index 33a2ae25b121..000000000000 --- a/pkgs/development/libraries/strigi/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2 -, clucene_core, fam, zlib, dbus, pkgconfig -}: - -stdenv.mkDerivation rec { - pname = "strigi"; - version = "0.7.8"; - - src = fetchurl { - url = "https://www.vandenoever.info/software/strigi/${pname}-${version}.tar.bz2"; - sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"; - }; - - includeAllQtDirs = true; - - CLUCENE_HOME = clucene_core; - - buildInputs = - [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus.out ]; - - nativeBuildInputs = [ cmake pkgconfig perl ]; - - patches = [ ./export_bufferedstream.patch ./gcc6.patch ]; - - enableParallelBuilding = true; - - # Strigi installs some libraries in an incorrect place - # ($out/$out/lib instead of $out/lib), so move them to the right - # place. - postInstall = - '' - mv $out/$out/lib/* $out/lib - rm -rf $out/nix - ''; - - meta = { - homepage = "http://strigi.sourceforge.net"; - description = "A very fast and efficient crawler to index data on your harddrive"; - license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [ sander ]; - inherit (qt4.meta) platforms; - }; -} diff --git a/pkgs/development/libraries/strigi/export_bufferedstream.patch b/pkgs/development/libraries/strigi/export_bufferedstream.patch deleted file mode 100644 index 4c6b34fe1bec..000000000000 --- a/pkgs/development/libraries/strigi/export_bufferedstream.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r strigi-0.7.8/libstreams/include/strigi/bufferedstream.h strigi-0.7.8_new/libstreams/include/strigi/bufferedstream.h ---- strigi-0.7.8/libstreams/include/strigi/bufferedstream.h 2013-02-05 13:34:57.000000000 -0800 -+++ strigi-0.7.8_new/libstreams/include/strigi/bufferedstream.h 2013-07-14 17:01:54.000000000 -0700 -@@ -34,7 +34,7 @@ - * BufferedStream will do the rest. - */ - template --class BufferedStream : public StreamBase { -+class STRIGI_EXPORT BufferedStream : public StreamBase { - private: - StreamBuffer buffer; - bool finishedWritingToBuffer; diff --git a/pkgs/development/libraries/strigi/gcc6.patch b/pkgs/development/libraries/strigi/gcc6.patch deleted file mode 100644 index b46f6c52b823..000000000000 --- a/pkgs/development/libraries/strigi/gcc6.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://sourceforge.net/p/strigi/patches/4/ - -and a fix for - -/tmp/nix-build-strigi-0.7.8.drv-0/strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp:325:37: error: no matching function for call to 'make_pair(std::__cxx11::string, std::__cxx11::string&)' - wchartoutf8(name), value)); - -diff -Naur strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake ---- strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake 2013-02-05 16:34:52.000000000 -0500 -+++ strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake 2016-05-14 11:39:54.586260564 -0400 -@@ -15,7 +15,7 @@ - # get the gcc version - exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) - -- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") -+ string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: - if (NOT _gcc_version) - string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") -diff -Naur strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake ---- strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake 2013-02-05 16:34:57.000000000 -0500 -+++ strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake 2016-05-14 11:40:11.340134414 -0400 -@@ -15,7 +15,7 @@ - # get the gcc version - exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) - -- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") -+ string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: - if (NOT _gcc_version) - string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") - -diff -ru strigi-0.7.8-orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp ---- strigi-0.7.8-orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2013-02-05 22:34:52.000000000 +0100 -+++ strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2017-07-31 10:56:27.067902643 +0200 -@@ -321,8 +321,7 @@ - string size = value; - doc.size = atoi(size.c_str()); - } else { -- doc.properties.insert(make_pair( -- wchartoutf8(name), value)); -+ doc.properties.emplace(wchartoutf8(name), value); - } - } - Variant diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df8e021c901d..83f0915de89d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15379,8 +15379,6 @@ in streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; }; streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {}; - strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; - subdl = callPackage ../applications/video/subdl { }; subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; }; From de1c05439d0b9ec95f5021e25fdc990dec17816c Mon Sep 17 00:00:00 2001 From: davidak Date: Tue, 1 Sep 2020 22:47:38 +0200 Subject: [PATCH 570/688] limesurvey: 3.17.12+190823 -> 3.23.0+200813 fixes at least 17 CVEs also adds test to package --- pkgs/servers/limesurvey/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix index 218630180876..5f5db310bf3f 100644 --- a/pkgs/servers/limesurvey/default.nix +++ b/pkgs/servers/limesurvey/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, writeText }: +{ stdenv, fetchFromGitHub, writeText, nixosTests }: stdenv.mkDerivation rec { pname = "limesurvey"; - version = "3.17.12+190823"; + version = "3.23.0+200813"; src = fetchFromGitHub { owner = "LimeSurvey"; repo = "LimeSurvey"; rev = version; - sha256 = "1i7jpxndrbya5ggl4babscwzmxx4c0jwri5kpl7h2ihqrn90m4b5"; + sha256 = "0r260z40g6b2bsfzxgfwdffbs17bl784xsc67n7q8222rs601hxf"; }; phpConfig = writeText "config.php" '' @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests = { + smoke-test = nixosTests.limesurvey; + }; + meta = with stdenv.lib; { description = "Open source survey application"; license = licenses.gpl2; From de5d2d6a61dbba0f7f3c211767b1110f3c074e4b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 1 Sep 2020 20:33:53 -0500 Subject: [PATCH 571/688] ibm-plex: 5.1.0 -> 5.1.3 --- pkgs/data/fonts/ibm-plex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index 4e1001adb693..cd33a834acc5 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "5.1.0"; + version = "5.1.3"; in fetchzip { name = "ibm-plex-${version}"; @@ -13,7 +13,7 @@ in fetchzip { unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "1lcbj6zkpnsq38s2xkx3z4d7bd43k630lmzmgdcv1w05gjij0pw5"; + sha256 = "0w07fkhav2lqdyki7ipnkpji5ngwarlhsyliy0ip7cd29x24ys5h"; meta = with lib; { description = "IBM Plex Typeface"; From 3db58a2f4c2c0f14b4cca6796b5cf2f30addcc91 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 2 Sep 2020 02:48:58 +0000 Subject: [PATCH 572/688] tunefish: init at unstable 2020-08-13 (#96539) Fails to build on aarch64 due to the use of x86 intrinsics. --- pkgs/applications/audio/tunefish/default.nix | 43 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/audio/tunefish/default.nix diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix new file mode 100644 index 000000000000..72802c4f8784 --- /dev/null +++ b/pkgs/applications/audio/tunefish/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, pkg-config, python3 +, alsaLib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk +}: + +stdenv.mkDerivation { + pname = "tunefish"; + version = "unstable-2020-08-13"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = "tunefish"; + rev = "b3d83cc66201619f6399500f6897fbeb1786d9ed"; + fetchSubmodules = true; + sha256 = "0rjpq3s609fblzkvnc9729glcnfinmxljh0z8ldpzr245h367zxh"; + }; + + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ alsaLib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ]; + + postPatch = '' + patchShebangs src/tunefish4/generate-lv2-ttl.py + ''; + + makeFlags = [ + "-C" "src/tunefish4/Builds/LinuxMakefile" + "CONFIG=Release" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 + cp -r src/tunefish4/Builds/LinuxMakefile/build/Tunefish4.lv2 $out/lib/lv2 + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://tunefish-synth.com/"; + description = "Virtual analog synthesizer LV2 plugin"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ce6903811e5..d95f1216e687 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23392,6 +23392,10 @@ in tudu = callPackage ../applications/office/tudu { }; + tunefish = callPackage ../applications/audio/tunefish { + stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4 + }; + tut = callPackage ../applications/misc/tut { }; tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; From 9d0d3a025fdb09b08a70f5678dda8ea6781dbb83 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 30 Aug 2020 22:36:56 +0000 Subject: [PATCH 573/688] linux-rt: add update script --- pkgs/os-specific/linux/kernel/update-rt.sh | 77 ++++++++++++++++++++++ pkgs/os-specific/linux/kernel/update.sh | 3 + 2 files changed, 80 insertions(+) create mode 100755 pkgs/os-specific/linux/kernel/update-rt.sh diff --git a/pkgs/os-specific/linux/kernel/update-rt.sh b/pkgs/os-specific/linux/kernel/update-rt.sh new file mode 100755 index 000000000000..bcfa494d7e7a --- /dev/null +++ b/pkgs/os-specific/linux/kernel/update-rt.sh @@ -0,0 +1,77 @@ +#!/usr/bin/env bash +set -euo pipefail + +# To update all rt kernels run: ./update-rt.sh + +# To update just one ./linux-rt-5.X.nix run: ./update-rt.sh ./linux-rt-5.X.nix + +# To add a new kernel branch 5.Y run: ./update-rt.sh ./linux-rt-5.Y.nix +# (with nonexistent .nix file) and update all-packages.nix. + +# To commit run with: env COMMIT=1 + +mirror=https://kernel.org/pub/linux/kernel + +main() { + if [ $# -ge 1 ]; then + update-if-needed "$1" + else + update-all-if-needed + fi +} + +update-all-if-needed() { + for f in "$(dirname "$0")"/linux-rt-*.nix; do + update-if-needed "$f" + done +} + +file-version() { + file="$1" # e.g. ./linux-rt-5.4.nix + if [ -e "$file" ]; then + grep ' version = ' "$file" | grep -o '[0-9].[^"]*' + fi +} + +latest-rt-version() { + branch="$1" # e.g. 5.4 + curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" | + sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/; p; q }' +} + +update-if-needed() { + file="$1" # e.g. ./linux-rt-5.4.nix (created if does not exist) + branch=$(basename "$file" .nix) # e.g. linux-rt-5.4 + branch=${branch#linux-rt-} # e.g. 5.4 + cur=$(file-version "$file") # e.g. 5.4.59-rt36 or empty + new=$(latest-rt-version "$branch") # e.g. 5.4.61-rt37 + kversion=${new%-*} # e.g. 5.4.61 + major=${branch%.*} # e.g 5 + nixattr="linux-rt_${branch/./_}" + if [ "$new" = "$cur" ]; then + echo "$nixattr: $cur (up-to-date)" + return + fi + khash=$(nix-prefetch-url "$mirror/v${major}.x/linux-${kversion}.tar.xz") + phash=$(nix-prefetch-url "$mirror/projects/rt/${branch}/older/patch-${new}.patch.xz") + if [ "$cur" ]; then + msg="$nixattr: $cur -> $new" + else + msg="$nixattr: init at $new" + prev=$(ls "$(dirname "$0")"/linux-rt-*.nix | tail -1) + cp "$prev" "$file" + cur=$(file-version "$file") + fi + echo "$msg" + sed -i "$file" \ + -e "s/$cur/$new/" \ + -e "s|kernel/v[0-9]*|kernel/v$major|" \ + -e "1,/.patch.xz/ s/sha256 = .*/sha256 = \"$khash\";/" \ + -e "1,/.patch.xz/! s/sha256 = .*/sha256 = \"$phash\";/" + if [ "${COMMIT:-}" ]; then + git add "$file" + git commit -m "$msg" + fi +} + +return 2>/dev/null || main "$@" diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index 55fdce06c973..560edced36ea 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -58,6 +58,9 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do echo "Updated $OLDVER -> $V" done +# Update linux-rt +COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-rt.sh + # Update linux-libre COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh From f623e0fbf8829430a978f9246b4a6bfb269a0c10 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 31 Aug 2020 01:39:10 +0300 Subject: [PATCH 574/688] linux-rt_5_4: init at 5.4.61-rt37 --- .../os-specific/linux/kernel/linux-rt-5.4.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 16 +++++++- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-rt-5.4.nix diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix new file mode 100644 index 000000000000..b59a367c4ad3 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -0,0 +1,41 @@ +{ lib, buildLinux, fetchurl +, kernelPatches ? [ ] +, structuredExtraConfig ? {} +, extraMeta ? {} +, argsOverride ? {} +, ... } @ args: + +let + version = "5.4.61-rt37"; # updated by ./update-rt.sh + branch = lib.versions.majorMinor version; + kversion = builtins.elemAt (lib.splitString "-" version) 0; +in buildLinux (args // { + inherit version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; + sha256 = "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6"; + }; + + kernelPatches = let rt-patch = { + name = "rt"; + patch = fetchurl { + url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; + sha256 = "1qgd55x62pczgmxcxbigkg6f622ma5a6mz4gi55a8mlbxzh2pddj"; + }; + }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; + + structuredExtraConfig = with lib.kernel; { + PREEMPT_RT = yes; + # Fix error: unused option: PREEMPT_RT. + EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) + # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). + PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. + # Fix error: unused option: RT_GROUP_SCHED. + RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. + } // structuredExtraConfig; + + extraMeta = extraMeta // { + inherit branch; + }; +} // argsOverride) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d95f1216e687..9dcef5fded44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17582,6 +17582,14 @@ in ]; }; + linux-rt_5_4 = callPackage ../os-specific/linux/kernel/linux-rt-5.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + linux_5_7 = callPackage ../os-specific/linux/kernel/linux-5.7.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17824,12 +17832,16 @@ in linuxPackages_latest = linuxPackages_5_8; linux_latest = linuxPackages_latest.kernel; - # Build the kernel modules for the some of the kernels. + # Realtime kernel packages. + linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; + linuxPackages-rt = linuxPackages-rt_5_4; + linux-rt = linuxPackages-rt.kernel; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi1 = linuxPackagesFor pkgs.linux_rpi1; linuxPackages_rpi2 = linuxPackagesFor pkgs.linux_rpi2; linuxPackages_rpi3 = linuxPackagesFor pkgs.linux_rpi3; linuxPackages_rpi4 = linuxPackagesFor pkgs.linux_rpi4; + # Build kernel modules for some of the kernels. linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); @@ -17838,7 +17850,7 @@ in linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7); linuxPackages_5_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_8); - # When adding to this list: + # When adding to the list above: # - Update linuxPackages_latest to the latest version # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. From 713b1622e725fc821f9e137712c7efb07933076e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 31 Aug 2020 01:40:23 +0300 Subject: [PATCH 575/688] linux-rt_5_6: init at 5.6.19-rt12 --- .../os-specific/linux/kernel/linux-rt-5.6.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 12 ++++++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/linux-rt-5.6.nix diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix new file mode 100644 index 000000000000..7c77454040d5 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix @@ -0,0 +1,41 @@ +{ lib, buildLinux, fetchurl +, kernelPatches ? [ ] +, structuredExtraConfig ? {} +, extraMeta ? {} +, argsOverride ? {} +, ... } @ args: + +let + version = "5.6.19-rt12"; # updated by ./update-rt.sh + branch = lib.versions.majorMinor version; + kversion = builtins.elemAt (lib.splitString "-" version) 0; +in buildLinux (args // { + inherit version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; + sha256 = "1s0yc1138sglbm4vyizl4r7hnc1l7nykdjp4063ad67yayr2ylv2"; + }; + + kernelPatches = let rt-patch = { + name = "rt"; + patch = fetchurl { + url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; + sha256 = "0ia8rx0615x0z2s4ppw1244crg7c5ak07c9n3wbnz7y8bk8hyxws"; + }; + }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; + + structuredExtraConfig = with lib.kernel; { + PREEMPT_RT = yes; + # Fix error: unused option: PREEMPT_RT. + EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) + # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). + PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. + # Fix error: unused option: RT_GROUP_SCHED. + RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. + } // structuredExtraConfig; + + extraMeta = extraMeta // { + inherit branch; + }; +} // argsOverride) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dcef5fded44..85a8dadf4d99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17590,6 +17590,14 @@ in ]; }; + linux-rt_5_6 = callPackage ../os-specific/linux/kernel/linux-rt-5.6.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + linux_5_7 = callPackage ../os-specific/linux/kernel/linux-5.7.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17836,6 +17844,10 @@ in linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; linuxPackages-rt = linuxPackages-rt_5_4; linux-rt = linuxPackages-rt.kernel; + linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6; + linuxPackages-rt_latest = linuxPackages-rt_5_6; + linux-rt_latest = linuxPackages-rt_latest.kernel; + linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi1 = linuxPackagesFor pkgs.linux_rpi1; linuxPackages_rpi2 = linuxPackagesFor pkgs.linux_rpi2; From 1a68e21d474c5d6005812459c9bce28168625384 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 2 Sep 2020 02:54:11 +0000 Subject: [PATCH 576/688] nixos/systemd: support adding and overriding tmpfiles.d via environment.etc (#96766) This allows the user to configure systemd tmpfiles.d via `environment.etc."tmpfiles.d/X.conf".text = "..."`, which after #93073 causes permission denied (with new X.conf): ``` ln: failed to create symbolic link '/nix/store/...-etc/etc/tmpfiles.d/X.conf': Permission denied builder for '/nix/store/...-etc.drv' failed with exit code 1 ``` or collision between environment.etc and systemd-default-tmpfiles packages (with existing X.conf, such as tmp.conf): ``` duplicate entry tmpfiles.d/tmp.conf -> /nix/store/...-etc-tmp.conf mismatched duplicate entry /nix/store/...-systemd-246/example/tmpfiles.d/tmp.conf <-> /nix/store/...-etc-tmp.conf builder for '/nix/store/...-etc.drv' failed with exit code 1 ``` Fixes #96755 --- nixos/modules/system/boot/systemd.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 10343df70aa3..f6c23c9b900e 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -1006,7 +1006,7 @@ in "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; - "tmpfiles.d".source = pkgs.symlinkJoin { + "tmpfiles.d".source = (pkgs.symlinkJoin { name = "tmpfiles.d"; paths = map (p: p + "/lib/tmpfiles.d") cfg.tmpfiles.packages; postBuild = '' @@ -1016,8 +1016,10 @@ in exit 1 ) done - ''; - }; + '' + concatMapStrings (name: optionalString (hasPrefix "tmpfiles.d/" name) '' + rm -f $out/${removePrefix "tmpfiles.d/" name} + '') config.system.build.etc.targets; + }) + "/*"; "systemd/system-generators" = { source = hooks "generators" cfg.generators; }; "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; }; From c66477beacdd86b9710237a94412466797221ff9 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Tue, 1 Sep 2020 20:44:48 -0500 Subject: [PATCH 577/688] =?UTF-8?q?git-town:=207.3.0=20=E2=86=92=207.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/git-town/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index 7a8b16c55e0d..34548abd818b 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -2,23 +2,22 @@ buildGoPackage rec { pname = "git-town"; - version = "7.3.0"; - - goPackagePath = "github.com/Originate/git-town"; + version = "7.4.0"; + goPackagePath = "github.com/git-town/git-town"; src = fetchFromGitHub { - owner = "Originate"; + owner = "git-town"; repo = "git-town"; rev = "v${version}"; - sha256 = "166g9i79hqga8k5wvs0b84q6rqniizzsd39v37s9w16axgdrm6nb"; + sha256 = "05s2hp4xn0bs3y6rgqkpgz0k8q8yfpwkw5m8vwim95hk6n41ps18"; }; - buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ]; + buildFlagsArray = [ "-ldflags=-X github.com/git-town/git-town/src/cmd.version=v${version} -X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; meta = with stdenv.lib; { description = "Generic, high-level git support for git-flow workflows"; homepage = "http://www.git-town.com/"; - maintainers = [ maintainers.allonsy ]; + maintainers = [ maintainers.allonsy maintainers.blaggacao ]; license = licenses.mit; }; } From d8d4fc6f6dee01c7aaa47791d87d06cb6b872c02 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 2 Sep 2020 04:20:00 +0000 Subject: [PATCH 578/688] git-lfs: 2.11.0 -> 2.12.0 https://github.com/git-lfs/git-lfs/releases/tag/v2.12.0 --- pkgs/applications/version-management/git-lfs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 80f236559f9e..2df8b335bda7 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "05qd96bn2cl7gn5qarbcv6scdpj28qiwdfzalamqk5jjiidpmng5"; + sha256 = "0pyvlcy6jxh0vzpsmywlbzwwdyj3jkcclnqb6sg786mmwrnqzj88"; }; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -30,6 +30,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; + changelog = "https://github.com/git-lfs/git-lfs/releases/tag/v${version}"; license = [ licenses.mit ]; maintainers = [ maintainers.twey maintainers.marsam ]; }; From 34c2ad14745e98bf49d178eff21832a0c51fbda8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 2 Sep 2020 06:29:49 +0200 Subject: [PATCH 579/688] pitivi: clean up * format with nixpkgs-fmt * use pkg-config instead of pkgconfig alias * reorder attributes * move version inside the mkDerivation --- pkgs/applications/video/pitivi/default.nix | 107 +++++++++++++++------ 1 file changed, 78 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 276c2fa787f2..a2b295facad8 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,12 +1,25 @@ -{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook -, python3Packages, gst_all_1, gtk3 -, gobject-introspection, librsvg, gnome3, libnotify, gsound -, meson, ninja, gsettings-desktop-schemas +{ stdenv +, fetchFromGitHub +, fetchurl +, pkg-config +, intltool +, itstool +, python3 +, wrapGAppsHook +, python3Packages +, gst_all_1 +, gtk3 +, gobject-introspection +, librsvg +, gnome3 +, libnotify +, gsound +, meson +, ninja +, gsettings-desktop-schemas }: let - version = "0.999"; - # gst-transcoder will eventually be merged with gstreamer (according to # gst-transcoder 1.8.0 release notes). For now the only user is pitivi so we # don't bother exposing the package to all of nixpkgs. @@ -19,20 +32,30 @@ let rev = version; sha256 = "16skiz9akavssii529v9nr8zd54w43livc14khdyzv164djg9q8f"; }; - nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection python3 ]; - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + gobject-introspection + python3 + ]; + buildInputs = with gst_all_1; [ + gstreamer + gst-plugins-base + ]; }; in python3Packages.buildPythonApplication rec { - name = "pitivi-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0mxp2p4gg976fp1vj3rb5rmpl5mqfzncm9vw2719irl32f1qlvyb"; - }; + pname = "pitivi"; + version = "0.999"; format = "other"; + src = fetchurl { + url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0mxp2p4gg976fp1vj3rb5rmpl5mqfzncm9vw2719irl32f1qlvyb"; + }; + patches = [ # By default, the build picks up environment variables like PYTHONPATH # and saves them to the generated binary. This would make the build-time @@ -40,25 +63,51 @@ in python3Packages.buildPythonApplication rec { ./prevent-closure-contamination.patch ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + intltool + itstool + python3 + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtk3 + librsvg + gnome3.gnome-desktop + gsound + gnome3.adwaita-icon-theme + gsettings-desktop-schemas + libnotify + gst-transcoder + ] ++ (with gst_all_1; [ + gstreamer + gst-editing-services + gst-plugins-base + (gst-plugins-good.override { gtkSupport = true; }) + gst-plugins-bad + gst-plugins-ugly + gst-libav + gst-validate + ]); + + pythonPath = with python3Packages; [ + pygobject3 + gst-python + pyxdg + numpy + pycairo + matplotlib + dbus-python + ]; + postPatch = '' patchShebangs ./getenvvar.py ''; - nativeBuildInputs = [ meson ninja pkgconfig intltool itstool python3 wrapGAppsHook ]; - - buildInputs = [ - gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound - gnome3.adwaita-icon-theme - gsettings-desktop-schemas libnotify - gst-transcoder - ] ++ (with gst_all_1; [ - gstreamer gst-editing-services - gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) - gst-plugins-bad gst-plugins-ugly gst-libav gst-validate - ]); - - pythonPath = with python3Packages; [ pygobject3 gst-python pyxdg numpy pycairo matplotlib dbus-python ]; - passthru = { updateScript = gnome3.updateScript { packageName = "pitivi"; From 895f0ce8104cfeb7846e63863bd6fed568387a66 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Wed, 2 Sep 2020 14:32:14 +1000 Subject: [PATCH 580/688] chromedriver: 83.0.4103.39 -> 85.0.4183.87 New dependency: libxcb --- .../tools/selenium/chromedriver/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 8aad3230003e..fc743d560168 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, cairo, fontconfig, freetype, gdk-pixbuf, glib , glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf -, libXi, libXrender, libXext +, libxcb, libXi, libXrender, libXext }: let allSpecs = { x86_64-linux = { system = "linux64"; - sha256 = "149p43zaz45malmff1274r2bwjcyjwsdickivk3pd0mvnjbfid2r"; + sha256 = "0absr1fp2h87gpyw6jxj2f08sbhkkh3pf13145hfyzdvajj5rfjy"; }; x86_64-darwin = { system = "mac64"; - sha256 = "1xpyqxpsz3r653ls67s6alv4g2vr4lxf29gyxc162ikywyrx80nr"; + sha256 = "1p9k92fgyx0xis6r50vhcpx3iws2gaspq3dnpigglv3bj9yg8zvi"; }; }; @@ -23,12 +23,12 @@ let cairo fontconfig freetype gdk-pixbuf glib gtk2 gconf libX11 nspr nss pango libXrender - gconf libXext libXi + gconf libxcb libXext libXi ]; in stdenv.mkDerivation rec { pname = "chromedriver"; - version = "83.0.4103.39"; + version = "85.0.4183.87"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; From f68e68497fa6e44a6b7e6e24be918eb94e4025c4 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 11 Mar 2020 10:05:29 +0100 Subject: [PATCH 581/688] surge: init at 1.6.6 --- pkgs/applications/audio/surge/default.nix | 59 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/applications/audio/surge/default.nix diff --git a/pkgs/applications/audio/surge/default.nix b/pkgs/applications/audio/surge/default.nix new file mode 100644 index 000000000000..014134c43fb7 --- /dev/null +++ b/pkgs/applications/audio/surge/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchFromGitHub, premake5, pkgconfig, cmake +,cairo, libxkbcommon, libxcb, xcb-util-cursor, xcbutilkeysyms, ncurses, which, getopt +,python, gnome3, lato }: + +stdenv.mkDerivation rec { + pname = "surge"; + version = "1.6.6"; + + src = fetchFromGitHub { + owner = "surge-synthesizer"; + repo = pname; + rev = "release_${version}"; + sha256 = "0al021f516ybhnp3lhqx8i6c6hpfaw3gqfwwxx3lx3hh4b8kjfjw"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ premake5 pkgconfig cmake ncurses which getopt python ]; + + buildInputs = [ cairo libxkbcommon libxcb xcb-util-cursor xcbutilkeysyms gnome3.zenity lato ]; + + buildFlags = [ "config=release_x64" ]; + + enableParallelBuilding = true; + + patchPhase = '' + patchShebangs build-linux.sh + substituteInPlace src/common/SurgeStorage.cpp --replace "/usr/share/Surge" "$out/share/surge" + substituteInPlace src/linux/UserInteractionsLinux.cpp --replace 'execlp("zenity"' 'execlp("${gnome3.zenity}/bin/zenity"' + substituteInPlace src/common/gui/PopupEditorDialog.cpp --replace zenity ${gnome3.zenity}/bin/zenity + ''; + + configurePhase = '' + ./build-linux.sh premake + python scripts/linux/emit-vector-piggy.py . + ''; + + installPhase = '' + mkdir -p $out/lib/lv2 + cp -r target/lv2/Release/Surge.lv2/ $out/lib/lv2 + mkdir -p $out/lib/vst + cp target/vst3/Release/Surge.so $out/lib/vst + mkdir -p $out/share/surge + cp -r resources/data/* $out/share/surge/ + ''; + + doInstallCheck = true; + installCheckPhase = '' + ./build-linux.sh build -p headless + ./target/headless/Release/Surge/Surge-Headless + ''; + + meta = with stdenv.lib; { + description = "LV2 & VST Synthesizer plug-in (previously released as Vember Audio Surge)"; + homepage = "https://surge-synthesizer.github.io"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85a8dadf4d99..49c7c45ae274 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23135,6 +23135,8 @@ in surf-display = callPackage ../desktops/surf-display { }; + surge = callPackage ../applications/audio/surge { }; + sunvox = callPackage ../applications/audio/sunvox { }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; From e0baa46feac7bd99c07407624ef3edbe29eb8919 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 28 Aug 2020 13:47:04 +0200 Subject: [PATCH 582/688] surge: 1.6.6 -> 1.7.1 --- pkgs/applications/audio/surge/default.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/surge/default.nix b/pkgs/applications/audio/surge/default.nix index 014134c43fb7..216caec9b1c6 100644 --- a/pkgs/applications/audio/surge/default.nix +++ b/pkgs/applications/audio/surge/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, premake5, pkgconfig, cmake ,cairo, libxkbcommon, libxcb, xcb-util-cursor, xcbutilkeysyms, ncurses, which, getopt -,python, gnome3, lato }: +,python, gnome3, lato, pcre, libpthreadstubs, libXdmcp, xcbutilrenderutil, xcbutilimage, libsndfile }: stdenv.mkDerivation rec { pname = "surge"; - version = "1.6.6"; + version = "1.7.1"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = pname; rev = "release_${version}"; - sha256 = "0al021f516ybhnp3lhqx8i6c6hpfaw3gqfwwxx3lx3hh4b8kjfjw"; + sha256 = "1jhk8iaqh89dnci4446b47315v2lc8gclraygk8m9jl20zpjxl0l"; fetchSubmodules = true; }; nativeBuildInputs = [ premake5 pkgconfig cmake ncurses which getopt python ]; - buildInputs = [ cairo libxkbcommon libxcb xcb-util-cursor xcbutilkeysyms gnome3.zenity lato ]; + buildInputs = [ cairo libxkbcommon libxcb xcb-util-cursor xcbutilkeysyms gnome3.zenity lato pcre libpthreadstubs libXdmcp xcbutilrenderutil xcbutilimage libsndfile ]; buildFlags = [ "config=release_x64" ]; @@ -29,16 +29,15 @@ stdenv.mkDerivation rec { substituteInPlace src/common/gui/PopupEditorDialog.cpp --replace zenity ${gnome3.zenity}/bin/zenity ''; - configurePhase = '' - ./build-linux.sh premake - python scripts/linux/emit-vector-piggy.py . - ''; + buildPhase = '' + ./build-linux.sh build; + ''; installPhase = '' mkdir -p $out/lib/lv2 - cp -r target/lv2/Release/Surge.lv2/ $out/lib/lv2 - mkdir -p $out/lib/vst - cp target/vst3/Release/Surge.so $out/lib/vst + cp -r buildlin/surge_products/Surge.lv2/ $out/lib/lv2 + mkdir -p $out/lib/vst3 + cp -r buildlin/surge_products/Surge.vst3/ $out/lib/vst3 mkdir -p $out/share/surge cp -r resources/data/* $out/share/surge/ ''; @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' ./build-linux.sh build -p headless - ./target/headless/Release/Surge/Surge-Headless + ./buildlin/surge-headless ''; meta = with stdenv.lib; { From 018f0862ba57c7d76573eb22bba90dc934800388 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 2 Sep 2020 04:05:52 +0000 Subject: [PATCH 583/688] surge: fix build --- pkgs/applications/audio/surge/default.nix | 48 +++++++++-------------- pkgs/top-level/all-packages.nix | 5 ++- 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/audio/surge/default.nix b/pkgs/applications/audio/surge/default.nix index 216caec9b1c6..1614bbfae667 100644 --- a/pkgs/applications/audio/surge/default.nix +++ b/pkgs/applications/audio/surge/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, premake5, pkgconfig, cmake -,cairo, libxkbcommon, libxcb, xcb-util-cursor, xcbutilkeysyms, ncurses, which, getopt -,python, gnome3, lato, pcre, libpthreadstubs, libXdmcp, xcbutilrenderutil, xcbutilimage, libsndfile }: +{ stdenv, fetchFromGitHub, cmake, git, pkg-config, python3 +, cairo, libsndfile, libxcb, libxkbcommon, xcbutil, xcbutilcursor, xcbutilkeysyms, zenity +}: stdenv.mkDerivation rec { pname = "surge"; @@ -10,49 +10,39 @@ stdenv.mkDerivation rec { owner = "surge-synthesizer"; repo = pname; rev = "release_${version}"; - sha256 = "1jhk8iaqh89dnci4446b47315v2lc8gclraygk8m9jl20zpjxl0l"; + sha256 = "1b3ccc78vrpzy18w7070zfa250dnd1bww147xxcnj457vd6n065s"; + leaveDotGit = true; # for SURGE_VERSION fetchSubmodules = true; }; - nativeBuildInputs = [ premake5 pkgconfig cmake ncurses which getopt python ]; + nativeBuildInputs = [ cmake git pkg-config python3 ]; + buildInputs = [ cairo libsndfile libxcb libxkbcommon xcbutil xcbutilcursor xcbutilkeysyms zenity ]; - buildInputs = [ cairo libxkbcommon libxcb xcb-util-cursor xcbutilkeysyms gnome3.zenity lato pcre libpthreadstubs libXdmcp xcbutilrenderutil xcbutilimage libsndfile ]; - - buildFlags = [ "config=release_x64" ]; - - enableParallelBuilding = true; - - patchPhase = '' - patchShebangs build-linux.sh + postPatch = '' substituteInPlace src/common/SurgeStorage.cpp --replace "/usr/share/Surge" "$out/share/surge" - substituteInPlace src/linux/UserInteractionsLinux.cpp --replace 'execlp("zenity"' 'execlp("${gnome3.zenity}/bin/zenity"' - substituteInPlace src/common/gui/PopupEditorDialog.cpp --replace zenity ${gnome3.zenity}/bin/zenity - ''; - - buildPhase = '' - ./build-linux.sh build; + substituteInPlace src/common/gui/PopupEditorDialog.cpp --replace '"zenity' '"${zenity}/bin/zenity' + substituteInPlace src/linux/UserInteractionsLinux.cpp --replace '"zenity' '"${zenity}/bin/zenity' + substituteInPlace vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp --replace /usr/bin/zenity ${zenity}/bin/zenity ''; installPhase = '' - mkdir -p $out/lib/lv2 - cp -r buildlin/surge_products/Surge.lv2/ $out/lib/lv2 - mkdir -p $out/lib/vst3 - cp -r buildlin/surge_products/Surge.vst3/ $out/lib/vst3 - mkdir -p $out/share/surge - cp -r resources/data/* $out/share/surge/ + mkdir -p $out/lib/lv2 $out/lib/vst3 $out/share/surge + cp -r surge_products/Surge.lv2 $out/lib/lv2/ + cp -r surge_products/Surge.vst3 $out/lib/vst3/ + cp -r ../resources/data/* $out/share/surge/ ''; doInstallCheck = true; installCheckPhase = '' - ./build-linux.sh build -p headless - ./buildlin/surge-headless + cd .. + build/surge-headless ''; meta = with stdenv.lib; { - description = "LV2 & VST Synthesizer plug-in (previously released as Vember Audio Surge)"; + description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)"; homepage = "https://surge-synthesizer.github.io"; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ magnetophon ]; + maintainers = with maintainers; [ magnetophon orivej ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49c7c45ae274..ae612d83797e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23135,7 +23135,10 @@ in surf-display = callPackage ../desktops/surf-display { }; - surge = callPackage ../applications/audio/surge { }; + surge = callPackage ../applications/audio/surge { + inherit (gnome3) zenity; + git = gitMinimal; + }; sunvox = callPackage ../applications/audio/sunvox { }; From 2c152eed4cb3f2493c87f773e9115c2a49470d6e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 2 Sep 2020 07:23:21 +0200 Subject: [PATCH 584/688] pitivi: Fix build The latest version is not compatible with Python 3.8, let's cherry-pick some patches from master. Also pre-prepare for incoming release of GStreamer 1.18. --- pkgs/applications/video/pitivi/default.nix | 49 +++++++++++++++++++--- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index a2b295facad8..b1c1dd285e20 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,8 +1,9 @@ { stdenv , fetchFromGitHub , fetchurl +, fetchpatch , pkg-config -, intltool +, gettext , itstool , python3 , wrapGAppsHook @@ -20,9 +21,8 @@ }: let - # gst-transcoder will eventually be merged with gstreamer (according to - # gst-transcoder 1.8.0 release notes). For now the only user is pitivi so we - # don't bother exposing the package to all of nixpkgs. + # gst-transcoder was merged with gst-plugins-bad 1.18. + # TODO: switch to that once available. gst-transcoder = stdenv.mkDerivation rec { version = "1.14.1"; pname = "gst-transcoder"; @@ -61,13 +61,49 @@ in python3Packages.buildPythonApplication rec { # and saves them to the generated binary. This would make the build-time # dependencies part of the closure so we remove it. ./prevent-closure-contamination.patch + + # Port from intltool to gettext. + # Needed for the following patches to apply. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/pitivi/commit/89b1053f2516c594f414c5c67c835471bce44b67.patch"; + sha256 = "8yhArzAtZC+WjHftcSDrstBlT8j6WlGHffU9Nj+ny+c="; + excludes = [ "po/POTFILES.in" ]; + }) + + # Complete switching to gst-transcoder in gst-plugins-bad. + # Otherwise there will likely be conflics. + # TODO: Apply this patch once we are using gst-transcoder from gst-plugins-bad. + # (fetchpatch { + # url = "https://gitlab.gnome.org/GNOME/pitivi/commit/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch"; + # sha256 = "zxJm+E5o+oZ3lW6wYNY/ERo2g4NmCjoY8oV+uScq8j8="; + # }) + + # Generate renderer.so on macOS instead of dylib. + # Needed for the following patch to apply. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/pitivi/commit/bcacadcafabf8911efb0fddc8d57329237d08cd1.patch"; + sha256 = "2BM5acIwOgdr1L9vhtMMN4trrLuqCg/K6v6ZYtD1Fjw="; + postFetch = '' + sed -i -e "s/1.90.0.1/0.999/g" "$out" + ''; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/pitivi/commit/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch"; + sha256 = "6DhqRlxFWFFdLwGoFem+vPt8x7v732KMVjMF9fypMK4="; + postFetch = '' + sed "$out" -i \ + -e "s/1.90.0.1/0.999/g" \ + -e "s/\(-python_dep.*\)/\1\n /" \ + -e "s/-1,9 +1,16/-1,10 +1,17/" + ''; + }) ]; nativeBuildInputs = [ meson ninja pkg-config - intltool + gettext itstool python3 wrapGAppsHook @@ -106,6 +142,9 @@ in python3Packages.buildPythonApplication rec { postPatch = '' patchShebangs ./getenvvar.py + + # fetchpatch does not support renamings + mv data/org.pitivi.Pitivi-mime.xml data/org.pitivi.Pitivi-mime.xml.in ''; passthru = { From 84d0f3fa7dfb7909a3bd92adac7b25af728175fa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 2 Sep 2020 07:33:07 +0200 Subject: [PATCH 585/688] pkgsMusl.libusb-compat-0_1: fix eval e89e2edc7349c0df15fa03b8229c370340547538 did not move all files when moving the directory. Fixes: https://github.com/NixOS/nixpkgs/issues/96947 --- .../libraries/{libusb => libusb-compat}/fix-headers.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkgs/development/libraries/{libusb => libusb-compat}/fix-headers.patch (100%) diff --git a/pkgs/development/libraries/libusb/fix-headers.patch b/pkgs/development/libraries/libusb-compat/fix-headers.patch similarity index 100% rename from pkgs/development/libraries/libusb/fix-headers.patch rename to pkgs/development/libraries/libusb-compat/fix-headers.patch From 8511890fe06da29fe76bf14be619a5f669a6836f Mon Sep 17 00:00:00 2001 From: rople380 <55679162+rople380@users.noreply.github.com> Date: Tue, 1 Sep 2020 01:40:32 +1000 Subject: [PATCH 586/688] maintainers: add rople380 --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cc2aa5a7efc3..d618f42a9661 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7117,6 +7117,16 @@ githubId = 3621083; name = "Roosembert (Roosemberth) Palacios"; }; + rople380 = { + name = "rople380"; + email = "55679162+rople380@users.noreply.github.com"; + github = "rople380"; + githubId = 55679162; + keys = [{ + longkeyid = "rsa2048/0x8526B7574A536236"; + fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; + }]; + }; royneary = { email = "christian@ulrich.earth"; github = "royneary"; From 128e0ec04b843cac5c9f593a62f34fafa4f72827 Mon Sep 17 00:00:00 2001 From: rople380 <55679162+rople380@users.noreply.github.com> Date: Tue, 25 Aug 2020 22:25:06 +1000 Subject: [PATCH 587/688] godu: init at 1.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniël de Kok --- pkgs/tools/misc/godu/default.nix | 24 ++++++++++++++++++++++ pkgs/tools/misc/godu/go-mod.patch | 33 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 59 insertions(+) create mode 100644 pkgs/tools/misc/godu/default.nix create mode 100644 pkgs/tools/misc/godu/go-mod.patch diff --git a/pkgs/tools/misc/godu/default.nix b/pkgs/tools/misc/godu/default.nix new file mode 100644 index 000000000000..37511d2e847c --- /dev/null +++ b/pkgs/tools/misc/godu/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "godu"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "viktomas"; + repo = pname; + rev = "v${version}"; + sha256 = "1fp8iq4x0qiswksznnd6qh7c6g5pwglzz6ga11a7vgic0201wsvb"; + }; + + patches = [ ./go-mod.patch ]; + + vendorSha256 = "1zq7b0zn24cbrjssk4g03i90szp1ms7ila4khwcm7hp9n1py245s"; + + meta = with lib; { + description = "Utility helping to discover large files/folders"; + homepage = "https://github.com/viktomas/godu"; + license = licenses.mit; + maintainers = with maintainers; [ rople380 ]; + }; +} diff --git a/pkgs/tools/misc/godu/go-mod.patch b/pkgs/tools/misc/godu/go-mod.patch new file mode 100644 index 000000000000..2b3efe6be604 --- /dev/null +++ b/pkgs/tools/misc/godu/go-mod.patch @@ -0,0 +1,33 @@ +diff --git a/go.mod b/go.mod +index cf8f2fb..e405e03 100644 +--- a/go.mod ++++ b/go.mod +@@ -5,5 +5,6 @@ go 1.14 + require ( + github.com/gdamore/tcell v1.1.1 + github.com/gosuri/uilive v0.0.0-20170323041506-ac356e6e42cd ++ github.com/mattn/go-isatty v0.0.12 // indirect + github.com/stretchr/testify v1.3.0 + ) +diff --git a/go.sum b/go.sum +index 23c1232..e25c87e 100644 +--- a/go.sum ++++ b/go.sum +@@ -8,6 +8,8 @@ github.com/gosuri/uilive v0.0.0-20170323041506-ac356e6e42cd h1:1e+0Z+T4t1mKL5xxv + github.com/gosuri/uilive v0.0.0-20170323041506-ac356e6e42cd/go.mod h1:qkLSc0A5EXSP6B04TrN4oQoxqFI7A8XvoXSlJi8cwk8= + github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08 h1:5MnxBC15uMxFv5FY/J/8vzyaBiArCOkMdFT9Jsw78iY= + github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4= ++github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= ++github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= + github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= + github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= + github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +@@ -16,6 +18,8 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= + github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= + github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= + github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= ++golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg= ++golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdrxJNoY= \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a7b46726fa8..8b58d4132935 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2008,6 +2008,8 @@ in gorilla-bin = callPackage ../tools/security/gorilla-bin { }; + godu = callPackage ../tools/misc/godu { }; + gosu = callPackage ../tools/misc/gosu { }; gotify-cli = callPackage ../tools/misc/gotify-cli { }; From f33329677676258c6e7bffe1a1554dd5c56cd447 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 8 Aug 2020 03:01:01 +0200 Subject: [PATCH 588/688] nixos/biboumi: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/biboumi.nix | 269 ++++++++++++++++++ pkgs/servers/xmpp/biboumi/default.nix | 7 +- 3 files changed, 272 insertions(+), 5 deletions(-) create mode 100644 nixos/modules/services/networking/biboumi.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2c89bed9c9c3..ca32aab07ca1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -588,6 +588,7 @@ ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix ./services/networking/babeld.nix + ./services/networking/biboumi.nix ./services/networking/bind.nix ./services/networking/bitcoind.nix ./services/networking/autossh.nix diff --git a/nixos/modules/services/networking/biboumi.nix b/nixos/modules/services/networking/biboumi.nix new file mode 100644 index 000000000000..66ddca93d818 --- /dev/null +++ b/nixos/modules/services/networking/biboumi.nix @@ -0,0 +1,269 @@ +{ config, lib, pkgs, options, ... }: +with lib; +let + cfg = config.services.biboumi; + inherit (config.environment) etc; + rootDir = "/run/biboumi/mnt-root"; + stateDir = "/var/lib/biboumi"; + settingsFile = pkgs.writeText "biboumi.cfg" ( + generators.toKeyValue { + mkKeyValue = k: v: + if v == null then "" + else generators.mkKeyValueDefault {} "=" k v; + } cfg.settings); + need_CAP_NET_BIND_SERVICE = cfg.settings.identd_port != 0 && cfg.settings.identd_port < 1024; +in +{ + options = { + services.biboumi = { + enable = mkEnableOption "the Biboumi XMPP gateway to IRC"; + + settings = mkOption { + description = '' + See biboumi 8.5 + for documentation. + ''; + default = {}; + type = types.submodule { + freeformType = with types; + (attrsOf (nullOr (oneOf [str int bool]))) // { + description = "settings option"; + }; + options.admin = mkOption { + type = with types; listOf str; + default = []; + example = ["admin@example.org"]; + apply = concatStringsSep ":"; + description = '' + The bare JID of the gateway administrator. This JID will have more + privileges than other standard users, for example some administration + ad-hoc commands will only be available to that JID. + ''; + }; + options.ca_file = mkOption { + type = types.path; + default = "/etc/ssl/certs/ca-certificates.crt"; + description = '' + Specifies which file should be used as the list of trusted CA + when negociating a TLS session. + ''; + }; + options.db_name = mkOption { + type = with types; either path str; + default = "${stateDir}/biboumi.sqlite"; + description = '' + The name of the database to use. + ''; + example = "postgresql://user:secret@localhost"; + }; + options.hostname = mkOption { + type = types.str; + example = "biboumi.example.org"; + description = '' + The hostname served by the XMPP gateway. + This domain must be configured in the XMPP server + as an external component. + ''; + }; + options.identd_port = mkOption { + type = types.port; + default = 113; + example = 0; + description = '' + The TCP port on which to listen for identd queries. + ''; + }; + options.log_level = mkOption { + type = types.ints.between 0 3; + default = 1; + description = '' + Indicate what type of log messages to write in the logs. + 0 is debug, 1 is info, 2 is warning, 3 is error. + ''; + }; + options.password = mkOption { + type = with types; nullOr str; + description = '' + The password used to authenticate the XMPP component to your XMPP server. + This password must be configured in the XMPP server, + associated with the external component on + hostname. + + Set it to null and use credentialsFile + if you do not want this password to go into the Nix store. + ''; + }; + options.persistent_by_default = mkOption { + type = types.bool; + default = false; + description = '' + Whether all rooms will be persistent by default: + the value of the “persistent” option in the global configuration of each + user will be “true”, but the value of each individual room will still + default to false. This means that a user just needs to change the global + “persistent” configuration option to false in order to override this. + ''; + }; + options.policy_directory = mkOption { + type = types.path; + default = "${pkgs.biboumi}/etc/biboumi"; + description = '' + A directory that should contain the policy files, + used to customize Botan’s behaviour + when negociating the TLS connections with the IRC servers. + ''; + }; + options.port = mkOption { + type = types.port; + default = 5347; + description = '' + The TCP port to use to connect to the local XMPP component. + ''; + }; + options.realname_customization = mkOption { + type = types.bool; + default = true; + description = '' + Whether the users will be able to use + the ad-hoc commands that lets them configure + their realname and username. + ''; + }; + options.realname_from_jid = mkOption { + type = types.bool; + default = false; + description = '' + Whether the realname and username of each biboumi + user will be extracted from their JID. + Otherwise they will be set to the nick + they used to connect to the IRC server. + ''; + }; + options.xmpp_server_ip = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + The IP address to connect to the XMPP server on. + The connection to the XMPP server is unencrypted, + so the biboumi instance and the server should + normally be on the same host. + ''; + }; + }; + }; + + credentialsFile = mkOption { + type = types.path; + description = '' + Path to a configuration file to be merged with the settings. + Beware not to surround "=" with spaces when setting biboumi's options in this file. + Useful to merge a file which is better kept out of the Nix store + because it contains sensible data like + password. + ''; + default = "/dev/null"; + example = "/run/keys/biboumi.cfg"; + }; + + openFirewall = mkEnableOption "opening of the identd port in the firewall"; + }; + }; + + config = mkIf cfg.enable { + networking.firewall = mkIf (cfg.openFirewall && cfg.settings.identd_port != 0) + { allowedTCPPorts = [ cfg.settings.identd_port ]; }; + + systemd.services.biboumi = { + description = "Biboumi, XMPP to IRC gateway"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "notify"; + # Biboumi supports systemd's watchdog. + WatchdogSec = 20; + Restart = "always"; + # Use "+" because credentialsFile may not be accessible to User= or Group=. + ExecStartPre = [("+" + pkgs.writeShellScript "biboumi-prestart" '' + set -eux + cat ${settingsFile} '${cfg.credentialsFile}' | + install -m 644 /dev/stdin /run/biboumi/biboumi.cfg + '')]; + ExecStart = "${pkgs.biboumi}/bin/biboumi /run/biboumi/biboumi.cfg"; + ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; + # Firewalls needing opening for output connections can still do that + # selectively for biboumi with: + # users.users.biboumi.isSystemUser = true; + # and, for example: + # networking.nftables.ruleset = '' + # add rule inet filter output meta skuid biboumi tcp accept + # ''; + DynamicUser = true; + RootDirectory = rootDir; + RootDirectoryStartOnly = true; + InaccessiblePaths = [ "-+${rootDir}" ]; + RuntimeDirectory = [ "biboumi" (removePrefix "/run/" rootDir) ]; + RuntimeDirectoryMode = "700"; + StateDirectory = "biboumi"; + StateDirectoryMode = "700"; + MountAPIVFS = true; + UMask = "0066"; + BindPaths = [ + stateDir + # This is for Type="notify" + # See https://github.com/systemd/systemd/issues/3544 + "/run/systemd/notify" + "/run/systemd/journal/socket" + ]; + BindReadOnlyPaths = [ + builtins.storeDir + "/etc" + ]; + # The following options are only for optimizing: + # systemd-analyze security biboumi + AmbientCapabilities = [ (optionalString need_CAP_NET_BIND_SERVICE "CAP_NET_BIND_SERVICE") ]; + CapabilityBoundingSet = [ (optionalString need_CAP_NET_BIND_SERVICE "CAP_NET_BIND_SERVICE") ]; + # ProtectClock= adds DeviceAllow=char-rtc r + DeviceAllow = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateNetwork = mkDefault false; + PrivateTmp = true; + # PrivateUsers=true breaks AmbientCapabilities=CAP_NET_BIND_SERVICE + # See https://bugs.archlinux.org/task/65921 + PrivateUsers = !need_CAP_NET_BIND_SERVICE; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RemoveIPC = true; + # AF_UNIX is for /run/systemd/notify + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallFilter = [ + "@system-service" + # Groups in @system-service which do not contain a syscall + # listed by perf stat -e 'syscalls:sys_enter_*' biboumi biboumi.cfg + # in tests, and seem likely not necessary for biboumi. + # To run such a perf in ExecStart=, you have to: + # - AmbientCapabilities="CAP_SYS_ADMIN" + # - mount -o remount,mode=755 /sys/kernel/debug/{,tracing} + "~@aio" "~@chown" "~@ipc" "~@keyring" "~@resources" "~@setuid" "~@timer" + ]; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + }; + }; + }; + + meta.maintainers = with maintainers; [ julm ]; +} diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index e1cec51e4ab0..257d94f4a733 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "biboumi"; - version = "8.3"; + version = "8.5"; src = fetchurl { url = "https://git.louiz.org/biboumi/snapshot/biboumi-${version}.tar.xz"; - sha256 = "0896f52nh8vd0idkdznv3gj6wqh1nqhjbwv0m560f0h62f01vm7k"; + sha256 = "0rn9p99iqdyvxjzjq9w0ra7pkk0mngjy65nlg3hqfdw8kq9mv5qf"; }; louiz_catch = fetchgit { @@ -24,10 +24,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi - substituteInPlace unit/biboumi.service.cmake --replace /bin/kill ${coreutils}/bin/kill cp $louiz_catch/single_include/catch.hpp tests/ - # echo "policy_directory=$out/etc/biboumi" >> conf/biboumi.cfg - # TODO include conf/biboumi.cfg as example somewhere ''; enableParallelBuilding = true; From df8eed0ccf69b52cce2e5c1cd634941d9740ba1b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 1 Sep 2020 04:20:00 +0000 Subject: [PATCH 589/688] ocaml-ng.ocamlPackages_4_11.ocaml: 4.11.0 -> 4.11.1 --- pkgs/development/compilers/ocaml/4.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix index 13cae5ae539c..afda8592818f 100644 --- a/pkgs/development/compilers/ocaml/4.11.nix +++ b/pkgs/development/compilers/ocaml/4.11.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "11"; - patch_version = "0"; - sha256 = "04b13yfismkqh21ag641q9dl0i602khgh4427g1a7pb77c4skr7z"; + patch_version = "1"; + sha256 = "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa"; } From 745a86726adb4565d4eb6018d70ccacfc64851b3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 28 Aug 2020 07:37:15 +0200 Subject: [PATCH 590/688] ocamlPackages.re: disable tests with OCaml < 4.04 --- pkgs/development/ocaml-modules/re/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 2031c469b29c..8881821490ab 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, buildDunePackage, ounit, seq }: +{ lib, fetchzip, buildDunePackage, ocaml, ounit, seq }: buildDunePackage rec { pname = "re"; @@ -11,14 +11,14 @@ buildDunePackage rec { sha256 = "07ycb103mr4mrkxfd63cwlsn023xvcjp0ra0k7n2gwrg0mwxmfss"; }; - buildInputs = [ ounit ]; + buildInputs = lib.optional doCheck ounit; propagatedBuildInputs = [ seq ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = { homepage = "https://github.com/ocaml/ocaml-re"; description = "Pure OCaml regular expressions, with support for Perl and POSIX-style strings"; - license = stdenv.lib.licenses.lgpl2; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl2; + maintainers = with lib.maintainers; [ vbgl ]; }; } From 910ac8645fb75a4482be59cb6d68d7e61b7a1c3c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 28 Aug 2020 07:37:21 +0200 Subject: [PATCH 591/688] =?UTF-8?q?ocamlPackages.ocp-index:=201.2=20?= =?UTF-8?q?=E2=86=92=201.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/ocp-index/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index b9404016b4e0..9c888e284fc5 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchurl, buildDunePackage, ocp-build, ocp-indent, cmdliner, re }: +{ lib, fetchzip, buildDunePackage, cppo, ocp-indent, cmdliner, re }: buildDunePackage rec { pname = "ocp-index"; - version = "1.2"; + version = "1.2.1"; - src = fetchurl { - url = "https://github.com/OCamlPro/ocp-index/releases/download/${version}/ocp-index-${version}.tbz"; - sha256 = "1lchw02sakjjppmzr0rzlarwbg1lc2bl7pwcfpsiycnaz46x6gmr"; + src = fetchzip { + url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz"; + sha256 = "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8"; }; - buildInputs = [ ocp-build cmdliner re ]; + buildInputs = [ cppo cmdliner re ]; propagatedBuildInputs = [ ocp-indent ]; From c5dcb9682ebb7b586601beb65267a9241df156f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 2 Sep 2020 11:13:21 +0200 Subject: [PATCH 592/688] powerdevil: fix hash of patch The hash added in 24ebfb1e021b belongs to pure download before normalization done by fetchpatch. --- pkgs/desktops/plasma-5/powerdevil.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index e70d18621a93..979d69a02f61 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -30,7 +30,7 @@ mkDerivation { # Reduce log message spam by setting the default log level to Warning. (fetchpatch { url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch"; - sha256 = "0vj70mhx6qhvbh4vn9qk9ir5w4s2m76hw2lsxmh3ibgsydz4yilz"; + sha256 = "077whhi0jrb3bajx357k7n66hv7nchis8jix0nfc1zjvi9fm6pi2"; }) ]; } From ee0d559dae1bd2bdf3591b3efc5ce832ebbf2b1d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Sep 2020 17:44:55 +1000 Subject: [PATCH 593/688] oci-seccomp-bpf-hook: move to linuxPackages --- .../linux}/oci-seccomp-bpf-hook/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/{applications/virtualization => os-specific/linux}/oci-seccomp-bpf-hook/default.nix (96%) diff --git a/pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix similarity index 96% rename from pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix rename to pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index 0e97a7c36464..3247e8c4eda5 100644 --- a/pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix +++ b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -3,9 +3,9 @@ , fetchFromGitHub , go-md2man , installShellFiles -, libseccomp -, linuxPackages , pkg-config +, bcc +, libseccomp }: buildGoModule rec { @@ -27,8 +27,8 @@ buildGoModule rec { pkg-config ]; buildInputs = [ + bcc libseccomp - linuxPackages.bcc ]; buildPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f99911a86212..b7f9053ca1c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17782,6 +17782,8 @@ in netatop = callPackage ../os-specific/linux/netatop { }; + oci-seccomp-bpf-hook = if stdenv.lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; + perf = callPackage ../os-specific/linux/kernel/perf.nix { }; phc-intel = if stdenv.lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; @@ -24872,8 +24874,6 @@ in nxengine-evo = callPackage ../games/nxengine-evo { }; - oci-seccomp-bpf-hook = callPackage ../applications/virtualization/oci-seccomp-bpf-hook { }; - odamex = callPackage ../games/odamex { }; oilrush = callPackage ../games/oilrush { }; From 27b0c4b15155ede4e42975a8e4c4a68b85b86f9d Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 31 Aug 2020 14:35:45 +0200 Subject: [PATCH 594/688] nixos/containers: add oci-seccomp-bpf-hook Signed-off-by: Sascha Grunert --- nixos/modules/virtualisation/containers.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 3a6767d84a9b..de97ba3f7bb0 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -43,6 +43,12 @@ in ''; }; + ociSeccompBpfHook.enable = mkOption { + type = types.bool; + default = false; + description = "Enable the OCI seccomp BPF hook"; + }; + containersConf = mkOption { default = {}; description = "containers.conf configuration"; @@ -116,6 +122,12 @@ in [network] cni_plugin_dirs = ["${pkgs.cni-plugins}/bin/"] + ${lib.optionalString (cfg.ociSeccompBpfHook.enable == true) '' + [engine] + hooks_dir = [ + "${config.boot.kernelPackages.oci-seccomp-bpf-hook}", + ] + ''} '' + cfg.containersConf.extraConfig; environment.etc."containers/registries.conf".source = toTOML "registries.conf" { From a38a9590d84d8cfdc27e3d63af9e7385ab470285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 31 Aug 2020 20:29:56 +0200 Subject: [PATCH 595/688] radicale: 3.0.3 -> 3.0.5 --- pkgs/servers/radicale/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 7b42bd3be34f..4b49b1e40c82 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.0.3"; + version = "3.0.5"; # No tests in PyPI tarball src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = version; - sha256 = "170mqxlnfzx15img4wb71axq9cnxwllk5cabsv8i008q7wyjqp0n"; + sha256 = "0w8qkjm7b62cr49dbis41kvv3179sfmvvzlhlc0rbqss6vmwbq4p"; }; propagatedBuildInputs = with python3.pkgs; [ From 3d3eef24ae0604a42f7b369b5c5903d5805c55ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 1 Sep 2020 09:42:27 +0200 Subject: [PATCH 596/688] etesync-dav: loosen radicale version bounds --- pkgs/applications/misc/etesync-dav/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index a27e6e485163..5e3a85c3b93f 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -9,6 +9,10 @@ python3Packages.buildPythonApplication rec { sha256 = "1q8h89hqi4kxphn1g5nbcia0haz5k57is9rycwaabm55mj9s9fah"; }; + postPatch = '' + substituteInPlace setup.py --replace "Radicale==" "Radicale>=" + ''; + propagatedBuildInputs = with python3Packages; [ etesync flask From ab525faf054d42eb18b7c7f899e8df057b6b63ce Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 31 Aug 2020 21:56:40 -0400 Subject: [PATCH 597/688] python3Packages.cirq: unbreak Remove unneeded test disables. Add changelog. Unpin most python dependencies. --- .../python-modules/cirq/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 83fc0d371c1d..21f9c5446c39 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -48,6 +48,15 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "freezegun~=0.3.15" "freezegun" \ + --replace "matplotlib~=3.0" "matplotlib" \ + --replace "networkx~=2.4" "networkx" \ + --replace "numpy~=1.16, < 1.19" "numpy" \ + --replace "protobuf~=3.12.0" "protobuf" + ''; + propagatedBuildInputs = [ freezegun google_api_core @@ -64,7 +73,7 @@ buildPythonPackage rec { ]; doCheck = true; - # pythonImportsCheck = [ "cirq" "cirq.Ciruit" ]; # cirq's importlib hook doesn't work here + # pythonImportsCheck = [ "cirq" "cirq.Circuit" ]; # cirq's importlib hook doesn't work here dontUseSetuptoolsCheck = true; checkInputs = [ pytestCheckHook @@ -78,16 +87,10 @@ buildPythonPackage rec { pytestFlagsArray = [ "--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope + "--benchmark-disable" # Don't need to run benchmarks when packaging. ]; disabledTests = [ - "test_serialize_sympy_constants" # fails due to small error in pi (~10e-7) - "test_convert_to_ion_gates" # fails due to rounding error, 0.75 != 0.750...2 - - # Newly disabled tests on cirq 0.8 - # TODO: test & figure out why failing - "engine_job_test" - "test_health" - "test_run_delegation" + "test_convert_to_ion_gates" # fails on some systems due to rounding error, 0.75 != 0.750...2 ] ++ lib.optionals stdenv.isAarch64 [ # Seem to fail due to math issues on aarch64? "expectation_from_wavefunction" @@ -97,6 +100,7 @@ buildPythonPackage rec { meta = with lib; { description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits."; homepage = "https://github.com/quantumlib/cirq"; + changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; From e5bb747c9d915498a292decde4f74efa58cd2332 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Wed, 2 Sep 2020 12:52:36 +0200 Subject: [PATCH 598/688] numworks-udev-rules: init on 02/09/2020 --- .../50-numworks-calculator.rules | 2 ++ .../linux/numworks-udev-rules/default.nix | 21 +++++++++++++++++++ .../linux/numworks-udev-rules/update.sh | 3 +++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 28 insertions(+) create mode 100644 pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules create mode 100644 pkgs/os-specific/linux/numworks-udev-rules/default.nix create mode 100755 pkgs/os-specific/linux/numworks-udev-rules/update.sh diff --git a/pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules b/pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules new file mode 100644 index 000000000000..ab07de99718b --- /dev/null +++ b/pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules @@ -0,0 +1,2 @@ +SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="a291", TAG+="uaccess" +SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="df11", TAG+="uaccess" diff --git a/pkgs/os-specific/linux/numworks-udev-rules/default.nix b/pkgs/os-specific/linux/numworks-udev-rules/default.nix new file mode 100644 index 000000000000..4a123b202730 --- /dev/null +++ b/pkgs/os-specific/linux/numworks-udev-rules/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "numworks-udev-rules"; + version = "unstable-2020-08-31"; + + udevRules = ./50-numworks-calculator.rules; + dontUnpack = true; + + installPhase = '' + install -Dm 644 "${udevRules}" "$out/lib/udev/rules.d/50-numworks-calculator.rules" + ''; + + meta = with stdenv.lib; { + description = "Udev rules for Numworks calculators"; + homepage = "https://numworks.com"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/numworks-udev-rules/update.sh b/pkgs/os-specific/linux/numworks-udev-rules/update.sh new file mode 100755 index 000000000000..3949f6fd8f41 --- /dev/null +++ b/pkgs/os-specific/linux/numworks-udev-rules/update.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +wget -O 50-numworks-calculator.rules "https://workshop.numworks.com/files/drivers/linux/50-numworks-calculator.rules" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 363d2aa84b01..b12776d3bce6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2151,6 +2151,8 @@ in numatop = callPackage ../os-specific/linux/numatop { }; + numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { }; + iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; From f9bf64f0c4ab3b0eeb7bc65950090272606f2547 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 2 Sep 2020 13:48:58 -0400 Subject: [PATCH 599/688] oh-my-zsh: 2020-08-31 -> 2020-09-02 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index b8a3a7c5fdc7..25bb91a84e22 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-08-31"; + version = "2020-09-02"; pname = "oh-my-zsh"; - rev = "a7f5170d68c0b75a9864763a90ac11e51ec67c81"; + rev = "7256c03ce1c54bd08ecab954c91a0231386556a6"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "03k1918cakqmg3x7kkiffdz1zwd86bipypkfigq3pgalh5zkyny9"; + sha256 = "0sp9np1kh0h0wdqhn871zibsd7jkp0hjjih8n88wcsbqhggmp95q"; }; installPhase = '' From b2679e8b4166c9fc08ca9a27b0ceb8f874842904 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Mon, 31 Aug 2020 19:49:52 +0200 Subject: [PATCH 600/688] rustup: add zlib as runtime dependency Fixes https://github.com/NixOS/nixpkgs/issues/92946. --- .../development/tools/rust/rustup/default.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index a51975b85caa..e5ef80b87ee4 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,7 +1,13 @@ { stdenv, lib, runCommand, patchelf -, fetchFromGitHub, rustPlatform +, fetchFromGitHub, rustPlatform, makeWrapper , pkgconfig, curl, zlib, Security, CoreServices }: +let + libPath = lib.makeLibraryPath [ + zlib # libz.so.1 + ]; +in + rustPlatform.buildRustPackage rec { pname = "rustup"; version = "1.22.1"; @@ -15,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0ghjrx7y25s6rjp06h0iyv4195x7daj57bqza01i1j4hm5nkhqhi"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ curl zlib @@ -24,19 +30,13 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features no-self-update" ]; patches = lib.optionals stdenv.isLinux [ - (let - libPath = lib.makeLibraryPath [ - zlib # libz.so.1 - ]; - in - (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' - export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) - substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ - --subst-var patchelf \ - --subst-var dynamicLinker \ - --subst-var libPath + (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' + export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) + substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ + --subst-var patchelf \ + --subst-var dynamicLinker \ + --subst-var libPath '') - ) ]; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; @@ -53,6 +53,8 @@ rustPlatform.buildRustPackage rec { done popd + wrapProgram $out/bin/rustup --prefix "LD_LIBRARY_PATH" : "${libPath}" + # tries to create .rustup export HOME=$(mktemp -d) mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} From 7f9acb799d6b738340282342b8a623f64b148798 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 9 Jul 2020 13:02:09 -0300 Subject: [PATCH 601/688] Zettlr: init at 1.7.5 Fixes #81516 --- pkgs/applications/misc/zettlr/default.nix | 38 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/misc/zettlr/default.nix diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix new file mode 100644 index 000000000000..3d762d9ab2a7 --- /dev/null +++ b/pkgs/applications/misc/zettlr/default.nix @@ -0,0 +1,38 @@ +{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas}: + +# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. +let + pname = "zettlr"; + version = "1.7.5"; + name = "${pname}-${version}"; + src = fetchurl { + url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; + sha256 = "040lx01ywdpla34d4abkmh51kchr11s17la6fk6yq77y8zb87xzi"; + }; + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 rec { + inherit name src; + + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + multiPkgs = null; # no 32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -m 444 -D ${appimageContents}/zettlr.desktop $out/share/applications/zettlr.desktop + install -m 444 -D ${appimageContents}/zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png + substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A markdown editor for writing academic texts and taking notes"; + homepage = "https://www.zettlr.com"; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl3; + maintainers = with maintainers; [ tfmoraes ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1f9b43b1e77..09afcd078868 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27821,4 +27821,6 @@ in gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; navidrome = callPackage ../servers/misc/navidrome {}; + + zettlr = callPackage ../applications/misc/zettlr { }; } From df58a632ca20f44ab1c70d31b8be92f9de42f0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 2 Sep 2020 22:15:08 +0200 Subject: [PATCH 602/688] left4gore: Init at 2.3 --- pkgs/games/left4gore/default.nix | 48 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/games/left4gore/default.nix diff --git a/pkgs/games/left4gore/default.nix b/pkgs/games/left4gore/default.nix new file mode 100644 index 000000000000..597f7da2b3d2 --- /dev/null +++ b/pkgs/games/left4gore/default.nix @@ -0,0 +1,48 @@ +{ stdenvNoCC, lib, fetchurl, buildFHSUserEnv }: + +let + version = "2.3"; + + # Unwrapped package, for putting into the FHS env + left4gore-unwrapped = stdenvNoCC.mkDerivation { + pname = "left4gore-unwrapped"; + inherit version; + + src = fetchurl { + url = "http://www.left4gore.com/dist/left4gore-${version}-linux.tar.gz"; + sha256 = "1n57nh32ybn6kirn8djh0nsjx6m84c0jfi1x8r4w2qr0qky3z7p0"; + }; + + installPhase = '' + mkdir -p $out/bin + cp left4gore $out/bin + ''; + }; + + # FHS env, as patchelf will not work + env = buildFHSUserEnv { + name = "left4gore-env-${version}"; + targetPkgs = _: [ left4gore-unwrapped ]; + runScript = "left4gore"; + }; + +in stdenvNoCC.mkDerivation { + pname = "left4gore"; + inherit version; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + ln -s ${env}/bin/* $out/bin/left4gore + ''; + + meta = with lib; { + homepage = "http://www.left4gore.com"; + description = "Memory patcher which adds the gore back into Left 4 Dead 2"; + license = licenses.unfree; # Probably the best choice + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 296e1d8d4585..6f53a1cadb38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24740,6 +24740,8 @@ in legendary-gl = python38Packages.callPackage ../games/legendary-gl { }; + left4gore-bin = callPackage ../games/left4gore { }; + lgogdownloader = callPackage ../games/lgogdownloader { }; liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; From a47d059689df48f07f466d719e5e6f26fe4f1e33 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 2 Sep 2020 16:16:49 -0400 Subject: [PATCH 603/688] dash: Fix cross build --- pkgs/shells/dash/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index f9dd578ad98b..3f344f673f16 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,4 +1,4 @@ -{ autoreconfHook, lib, stdenv, fetchurl }: +{ stdenv, buildPackages, autoreconfHook, fetchurl }: stdenv.mkDerivation rec { name = "dash-0.5.11.1"; @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # Temporary fix until a proper one is accepted upstream - patches = lib.lists.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; - nativeBuildInputs = lib.lists.optional stdenv.isDarwin autoreconfHook; + patches = stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; meta = with stdenv.lib; { homepage = "http://gondor.apana.org.au/~herbert/dash/"; From 9c6f11f89decaf93f2910515a93a80d494a176b6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 2 Sep 2020 22:36:08 +0200 Subject: [PATCH 604/688] signal-desktop: 1.34.5 -> 1.35.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 69a95b3459b7..c4eef754cd42 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.34.5"; # Please backport all updates to the stable channel. + version = "1.35.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1s8nksrkfivsf9r460ifxsf8l7bnc1zix5yj39kvnx0mbync8lg1"; + sha256 = "1nxj7h8yrp2sbxxd49q9xdh1zsqixcd01i83lr492f4322cg1yjf"; }; nativeBuildInputs = [ From 36782235f608e2d9218a09323f534487ce978e3f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 2 Sep 2020 21:21:21 +0000 Subject: [PATCH 605/688] rclone: 1.52.3 -> 1.53.0 --- .../networking/sync/rclone/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index db05056e7e1c..35315b729c1e 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "rclone"; - version = "1.52.3"; + version = "1.53.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1bf3rhs4dcb8vkzs4a6pk5xrhnkhqsrbf4xrhcqf407r668gdav1"; + sha256 = "1736np95di9ksy6i8glzmvzc7qp4d06354gvrnxbzimgf0mm11wn"; }; - goPackagePath = "github.com/rclone/rclone"; + vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88"; subPackages = [ "." ]; @@ -19,6 +19,8 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/rclone/rclone/fs.Version=${version}" ]; + postInstall = let rcloneBin = @@ -26,13 +28,13 @@ buildGoPackage rec { then "$out" else stdenv.lib.getBin buildPackages.rclone; in - '' - installManPage $src/rclone.1 - for shell in bash zsh fish; do - ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell - installShellCompletion rclone.$shell - done - ''; + '' + installManPage rclone.1 + for shell in bash zsh fish; do + ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell + installShellCompletion rclone.$shell + done + ''; meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; From 43afce40d6a2c4f2ddb9083f79ab50737c67498a Mon Sep 17 00:00:00 2001 From: Moritz Scheuren Date: Wed, 2 Sep 2020 22:42:29 +0200 Subject: [PATCH 606/688] portfolio: 0.48.0 -> 0.48.1 --- pkgs/applications/office/portfolio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 310f57d7cda7..b3538dd2b713 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.48.0"; + version = "0.48.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "12skl08isz2f1a6ksmcw7sm82xk909y636ch8jp80lglb21i0q1j"; + sha256 = "0xhxp4iglggv6rqwsg0xjn8z46v910rj372abkaviwa3cqzf7gdb"; }; nativeBuildInputs = [ From e1d6f7cfa46786be9ce012c940212f92b53cee46 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Wed, 2 Sep 2020 18:12:52 +0200 Subject: [PATCH 607/688] python3Packages.matrix-nio: 0.14.1 -> 0.15.1 https://github.com/poljar/matrix-nio/blob/master/CHANGELOG.md no obvious compatibility issue --- pkgs/development/python-modules/matrix-nio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 890518658a2b..59c3f47d2ca7 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.14.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "0mgb9m3298jvw3wa051zn7vp1m8qriys3ps0qn3sq54fndljgg5k"; + sha256 = "127n4sqdcip1ld42w9wz49pxkpvi765qzvivvwl26720n11zq5cd"; }; nativeBuildInputs = [ From 634d40434998badc215a6de6252c718a1e5809eb Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Wed, 2 Sep 2020 18:14:06 +0200 Subject: [PATCH 608/688] pantalaimon: 0.6.5 -> 0.7.0 changelog: https://github.com/matrix-org/pantalaimon/blob/0.7.0/CHANGELOG.md --- .../networking/instant-messengers/pantalaimon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index d58688565fdf..a751501376ff 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.6.5"; + version = "0.7.0"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "1pjrq71fkpvsc79nwhxhwjkqvqhj5wsnnwvsgslghaajdaw3n6wd"; + sha256 = "0cx8sqajf5lh8w61yy1l6ry67rv1b45xp264zkw3s7ip80i4ylb2"; }; propagatedBuildInputs = [ From 008f45f5916dd0fe3d9a591833fb92dce92dc777 Mon Sep 17 00:00:00 2001 From: yoctocell Date: Wed, 2 Sep 2020 18:54:19 +0200 Subject: [PATCH 609/688] gitAndTools.gita: 0.10.9 -> 0.10.10 --- .../version-management/git-and-tools/gita/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index 5fe6b34fd3b5..3e07a93458b7 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -9,11 +9,11 @@ }: buildPythonApplication rec { - version = "0.10.9"; + version = "0.10.10"; pname = "gita"; src = fetchFromGitHub { - sha256 = "0wilyf4nnn2jyxrfqs8krya3zvhj6x36szsp9xhb6h08g1ihzp5i"; + sha256 = "0k7hicncbrqvhmpq1w3v1309bqij6izw31xs8xcb8is85dvi754h"; rev = "v${version}"; repo = "gita"; owner = "nosarthur"; @@ -45,6 +45,7 @@ buildPythonApplication rec { postInstall = '' installShellCompletion --bash --name gita ${src}/.gita-completion.bash + installShellCompletion --zsh --name gita ${src}/.gita-completion.zsh ''; meta = with lib; { From eef56567c4808729d918384ff671a88c8dba0630 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 2 Sep 2020 07:21:55 +1000 Subject: [PATCH 610/688] go_1_14: 1.14.7 -> 1.14.8 --- pkgs/development/compilers/go/1.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 0bf972ff80f2..4cd281872307 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -31,11 +31,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.7"; + version = "1.14.8"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1qrhdjdzi1knchk1wmlaqgkqhxkq2niw14b931rhqrk36m1r4hq6"; + sha256 = "0sp3ss9mqcysc3h7ynwxhdjq4g0id9y6liakwy2cy27mapxi79nr"; }; # perl is used for testing go vet From e98facbda3249fd112f66addb4816ea05ea223b0 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 27 Aug 2020 22:36:12 +0100 Subject: [PATCH 611/688] pythonPackages.httpcore: init at 0.10.2 --- .../python-modules/httpcore/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/httpcore/default.nix diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix new file mode 100644 index 000000000000..9ac9b76d2e36 --- /dev/null +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, h11 +, sniffio +}: + +buildPythonPackage rec { + pname = "httpcore"; + version = "0.10.2"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "encode"; + repo = pname; + rev = version; + sha256 = "00gn8nfv814rg6fj7xv97mrra3fvx6fzjcgx9y051ihm6hxljdsi"; + }; + + propagatedBuildInputs = [ h11 sniffio ]; + + # tests require pythonic access to mitmproxy, which isn't (yet?) packaged as + # a pythonPackage. + doCheck = false; + pythonImportsCheck = [ "httpcore" ]; + + meta = with stdenv.lib; { + description = "A minimal HTTP client"; + homepage = "https://github.com/encode/httpcore"; + license = licenses.bsd3; + maintainers = [ maintainers.ris ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d6ce5710f8ab..27cb1517baa5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2683,6 +2683,8 @@ in { httpbin = callPackage ../development/python-modules/httpbin { }; + httpcore = callPackage ../development/python-modules/httpcore { }; + http-ece = callPackage ../development/python-modules/http-ece { }; httplib2 = callPackage ../development/python-modules/httplib2 { }; From 063692bb10a3407766572cb78752de18af14467b Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 27 Aug 2020 23:08:49 +0100 Subject: [PATCH 612/688] pythonPackages.httpx: 0.12.1 -> 0.14.2 slim down some no longer needed dependencies --- .../python-modules/httpx/default.nix | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 0b29c80fc39e..58152ca270ee 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -2,64 +2,60 @@ , buildPythonPackage , fetchFromGitHub , certifi -, hstspreload , chardet , h11 , h2 +, httpcore , idna , rfc3986 , sniffio , isPy27 , pytest +, pytest-asyncio +, pytest-trio , pytestcov , trustme , uvicorn -, trio , brotli -, urllib3 }: buildPythonPackage rec { pname = "httpx"; - version = "0.12.1"; + version = "0.14.2"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "1nrp4h1ppb5vll81fzxmks82p0hxcil9f3mja3dgya511kc703h6"; + sha256 = "08b6k5g8car3bic90aw4ysb2zvsa5nm8qk3hk4dgamllnnxzl5br"; }; propagatedBuildInputs = [ certifi - hstspreload chardet h11 h2 + httpcore idna rfc3986 sniffio - urllib3 ]; checkInputs = [ pytest + pytest-asyncio + pytest-trio pytestcov trustme uvicorn - trio brotli ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "h11==0.8.*" "h11" - ''; - checkPhase = '' - PYTHONPATH=.:$PYTHONPATH pytest + PYTHONPATH=.:$PYTHONPATH pytest -k 'not (test_connect_timeout or test_elapsed_timer)' ''; + pythonImportsCheck = [ "httpx" ]; meta = with lib; { description = "The next generation HTTP client"; From 4f612035e311c19c4f69f719d48ed9e7ebad7d06 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 27 Aug 2020 23:27:15 +0100 Subject: [PATCH 613/688] pythonPackages.starlette: 0.13.6 -> 0.13.8 remove outdated comment --- pkgs/development/python-modules/starlette/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 130a098a23f8..ff8a93d335ea 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -21,19 +21,14 @@ buildPythonPackage rec { pname = "starlette"; - # This is not the latest version of Starlette, however, later - # versions of Starlette break FastAPI due to - # https://github.com/tiangolo/fastapi/issues/683. Please update when - # possible. FastAPI is currently Starlette's only dependent. - - version = "0.13.6"; + version = "0.13.8"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "08d1d4qdwhi1xxag4am5ijingdyn0mbyqajs9ql5shxnybyjv321"; + sha256 = "11i0yd8cqwscixajl734g11vf8pghki11c81chzfh8ifmj6mf9jk"; }; propagatedBuildInputs = [ @@ -57,6 +52,7 @@ buildPythonPackage rec { checkPhase = '' pytest --ignore=tests/test_graphql.py ''; + pythonImportsCheck = [ "starlette" ]; meta = with lib; { homepage = "https://www.starlette.io/"; From ce47cdbeafcc4407a26e6211694be0d720b7eb1c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 27 Aug 2020 23:26:05 +0100 Subject: [PATCH 614/688] pythonPackages.asgi-csrf: init at 0.7 --- .../python-modules/asgi-csrf/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/asgi-csrf/default.nix diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix new file mode 100644 index 000000000000..12c94aee1573 --- /dev/null +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart +, pytest, starlette, httpx, pytest-asyncio }: + +buildPythonPackage rec { + version = "0.7"; + pname = "asgi-csrf"; + disabled = isPy27; + + # PyPI tarball doesn't include tests directory + src = fetchFromGitHub { + owner = "simonw"; + repo = pname; + rev = version; + sha256 = "1vf4lh007790836cp3hd6wf8wsgj045dcg0w1cm335p08zz6j4k7"; + }; + + propagatedBuildInputs = [ itsdangerous python-multipart ]; + + checkInputs = [ pytest starlette httpx pytest-asyncio ]; + checkPhase = '' + pytest test_asgi_csrf.py + ''; + pythonImportsCheck = [ "asgi_csrf" ]; + + meta = with stdenv.lib; { + description = "ASGI middleware for protecting against CSRF attacks"; + license = licenses.asl20; + homepage = "https://github.com/simonw/asgi-csrf"; + maintainers = [ maintainers.ris ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 27cb1517baa5..399d49978b27 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -377,6 +377,8 @@ in { else callPackage ../development/python-modules/ase { }; + asgi-csrf = callPackage ../development/python-modules/asgi-csrf { }; + asgiref = callPackage ../development/python-modules/asgiref { }; asn1ate = callPackage ../development/python-modules/asn1ate { }; From 4e946006041208a8026a2b0ce515ed6af79ac2d5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 27 Aug 2020 23:26:32 +0100 Subject: [PATCH 615/688] pythonPackages.mergedeep: init at 1.3.0 --- .../python-modules/mergedeep/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/mergedeep/default.nix diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix new file mode 100644 index 000000000000..3b5536ed6fbc --- /dev/null +++ b/pkgs/development/python-modules/mergedeep/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, isPy27, fetchFromGitHub, pytest }: + +buildPythonPackage rec { + pname = "mergedeep"; + version = "1.3.0"; + disabled = isPy27; + + # PyPI tarball doesn't include tests directory + src = fetchFromGitHub { + owner = "clarketm"; + repo = "mergedeep"; + rev = "v${version}"; + sha256 = "1a0y26a04limiggjwqyyqpryxiylbqya74nq1bij75zhz42sa02b"; + }; + + checkInputs = [ pytest ]; + checkPhase = "pytest"; + pythonImportsCheck = [ "mergedeep" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/clarketm/mergedeep"; + description = "A deep merge function for python"; + license = licenses.mit; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 399d49978b27..29e23ce83b6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3593,6 +3593,8 @@ in { mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { python3Packages = self; })); + mergedeep = callPackage ../development/python-modules/mergedeep { }; + merkletools = callPackage ../development/python-modules/merkletools { }; mesa = callPackage ../development/python-modules/mesa { }; From f1b9dcde97c8ddaa1884bccb578178b328032b36 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 27 Aug 2020 23:28:34 +0100 Subject: [PATCH 616/688] pythonPackages.datasette: 0.39 -> 0.46 enable more tests that now seem to work --- .../python-modules/datasette/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index b5d9c3dfad6a..5fa42c861ed9 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -2,19 +2,22 @@ , buildPythonPackage , fetchFromGitHub , aiofiles +, asgi-csrf , click , click-default-group , janus , jinja2 , hupper +, mergedeep , pint , pluggy +, python-baseconv +, pyyaml , uvicorn # Check Inputs , pytestCheckHook , pytestrunner , pytest-asyncio -, black , aiohttp , beautifulsoup4 , asgiref @@ -23,26 +26,30 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.39"; + version = "0.46"; src = fetchFromGitHub { owner = "simonw"; repo = "datasette"; rev = version; - sha256 = "07d46512bc9sdan9lv39sf1bwlf7vf1bfhcsm825vk7sv7g9kczd"; + sha256 = "0g4dfq5ykifa9628cb4i7gvx98p8hvb99gzfxk3bkvq1v9p4kcqq"; }; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ aiofiles + asgi-csrf click click-default-group janus jinja2 hupper + mergedeep pint pluggy + python-baseconv + pyyaml uvicorn setuptools ]; @@ -52,7 +59,6 @@ buildPythonPackage rec { pytest-asyncio aiohttp beautifulsoup4 - black asgiref ]; @@ -60,22 +66,17 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "click~=7.1.1" "click" \ --replace "click-default-group~=1.2.2" "click-default-group" \ - --replace "Jinja2~=2.10.3" "Jinja2" \ --replace "hupper~=1.9" "hupper" \ --replace "pint~=0.9" "pint" \ - --replace "pluggy~=0.13.0" "pint" \ + --replace "pluggy~=0.13.0" "pluggy" \ --replace "uvicorn~=0.11" "uvicorn" \ - --replace "aiofiles~=0.4.0" "aiofiles" \ - --replace "janus~=0.4.0" "janus" \ --replace "PyYAML~=5.3" "PyYAML" ''; - # many tests require network access + # test_html is very slow # test_black fails on darwin dontUseSetuptoolsCheck = true; pytestFlagsArray = [ - "--ignore=tests/test_api.py" - "--ignore=tests/test_csv.py" "--ignore=tests/test_html.py" "--ignore=tests/test_docs.py" "--ignore=tests/test_black.py" @@ -84,6 +85,7 @@ buildPythonPackage rec { "facet" "_invalid_database" # checks error message when connecting to invalid database ]; + pythonImportsCheck = [ "datasette" ]; meta = with lib; { description = "An instant JSON API for your SQLite databases"; From 1b235b43bc6d2a1b40001113c99155fb19785b0f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 09:05:47 +1000 Subject: [PATCH 617/688] dep2nix: regenerate deps.nix --- pkgs/development/tools/dep2nix/deps.nix | 272 +++++++++++------------- 1 file changed, 128 insertions(+), 144 deletions(-) diff --git a/pkgs/development/tools/dep2nix/deps.nix b/pkgs/development/tools/dep2nix/deps.nix index fc9280e9df5b..ceedc50fc887 100644 --- a/pkgs/development/tools/dep2nix/deps.nix +++ b/pkgs/development/tools/dep2nix/deps.nix @@ -1,145 +1,129 @@ - - # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) - [ - - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "a93e51b5a57ef416dac8bb02d11407b6f55d8929"; - sha256 = "1rd3p135r7iw0lvaa6vk7afxna87chq61a7a0wqnxd3xgpnpa9ik"; - }; - } - - { - goPackagePath = "github.com/Masterminds/vcs"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/vcs"; - rev = "6f1c6d150500e452704e9863f68c2559f58616bf"; - sha256 = "02bpyzccazw9lwqchcz349al4vlxnz4m5gzwigk02zg2qpa1j53j"; - }; - } - - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "1fca145dffbcaa8fe914309b1ec0cfc67500fe61"; - sha256 = "19jws9ngncpbhghzcy7biyb4r8jh14mzknyk67cvq6ln7kh1qyic"; - }; - } - - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"; - sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; - }; - } - - { - goPackagePath = "github.com/golang/dep"; - fetch = { - type = "git"; - url = "https://github.com/CrushedPixel/dep"; - rev = "fa9f32339c8855ebe7e7bc66e549036a7e06d37a"; - sha256 = "1knaxs1ji1b0b68393f24r8qzvahxz9x7rqwc8jsjlshvpz0hlm6"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175"; - sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4"; - }; - } - - { - goPackagePath = "github.com/jmank88/nuts"; - fetch = { - type = "git"; - url = "https://github.com/jmank88/nuts"; - rev = "8b28145dffc87104e66d074f62ea8080edfad7c8"; - sha256 = "1d0xj1dj1lfalq3pg15h0c645n84lf122xx3zkm7hawq9zri6n5k"; - }; - } - - { - goPackagePath = "github.com/nightlyone/lockfile"; - fetch = { - type = "git"; - url = "https://github.com/nightlyone/lockfile"; - rev = "6a197d5ea61168f2ac821de2b7f011b250904900"; - sha256 = "03znnf6rzyyi4h4qj81py1xpfs3pnfm39j4bfc9qzakz5j9y1gdl"; - }; - } - - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; - sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; - }; - } - - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - - { - goPackagePath = "github.com/sdboyer/constext"; - fetch = { - type = "git"; - url = "https://github.com/sdboyer/constext"; - rev = "836a144573533ea4da4e6929c235fd348aed1c80"; - sha256 = "0055yw73di4spa1wwpa2pyb708wmh9r3xd8dcv8pn81dba94if1w"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "dc948dff8834a7fe1ca525f8d04e261c2b56e70d"; - sha256 = "0gkw1am63agb1rgpxr2qhns9npr99mzwrxg7px88qq8h93zzd4kg"; - }; - } - - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; - sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd"; - sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; - }; - } - +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/carolynvs/semver.git"; + rev = "a93e51b5a57ef416dac8bb02d11407b6f55d8929"; + sha256 = "1rd3p135r7iw0lvaa6vk7afxna87chq61a7a0wqnxd3xgpnpa9ik"; + }; + } + { + goPackagePath = "github.com/Masterminds/vcs"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/vcs"; + rev = "6f1c6d150500e452704e9863f68c2559f58616bf"; + sha256 = "02bpyzccazw9lwqchcz349al4vlxnz4m5gzwigk02zg2qpa1j53j"; + }; + } + { + goPackagePath = "github.com/armon/go-radix"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-radix"; + rev = "1fca145dffbcaa8fe914309b1ec0cfc67500fe61"; + sha256 = "19jws9ngncpbhghzcy7biyb4r8jh14mzknyk67cvq6ln7kh1qyic"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"; + sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; + }; + } + { + goPackagePath = "github.com/golang/dep"; + fetch = { + type = "git"; + url = "https://github.com/CrushedPixel/dep"; + rev = "fa9f32339c8855ebe7e7bc66e549036a7e06d37a"; + sha256 = "1knaxs1ji1b0b68393f24r8qzvahxz9x7rqwc8jsjlshvpz0hlm6"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175"; + sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4"; + }; + } + { + goPackagePath = "github.com/jmank88/nuts"; + fetch = { + type = "git"; + url = "https://github.com/jmank88/nuts"; + rev = "8b28145dffc87104e66d074f62ea8080edfad7c8"; + sha256 = "1d0xj1dj1lfalq3pg15h0c645n84lf122xx3zkm7hawq9zri6n5k"; + }; + } + { + goPackagePath = "github.com/nightlyone/lockfile"; + fetch = { + type = "git"; + url = "https://github.com/nightlyone/lockfile"; + rev = "6a197d5ea61168f2ac821de2b7f011b250904900"; + sha256 = "03znnf6rzyyi4h4qj81py1xpfs3pnfm39j4bfc9qzakz5j9y1gdl"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; + sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/sdboyer/constext"; + fetch = { + type = "git"; + url = "https://github.com/sdboyer/constext"; + rev = "836a144573533ea4da4e6929c235fd348aed1c80"; + sha256 = "0055yw73di4spa1wwpa2pyb708wmh9r3xd8dcv8pn81dba94if1w"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "dc948dff8834a7fe1ca525f8d04e261c2b56e70d"; + sha256 = "0gkw1am63agb1rgpxr2qhns9npr99mzwrxg7px88qq8h93zzd4kg"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; + sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd"; + sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; + }; + } ] From e14d5a2cf125d029b374d8c0ff2715be95fc829d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 09:05:47 +1000 Subject: [PATCH 618/688] leaps: regenerate deps.nix --- pkgs/development/tools/leaps/deps.nix | 350 ++++++++++++-------------- 1 file changed, 165 insertions(+), 185 deletions(-) diff --git a/pkgs/development/tools/leaps/deps.nix b/pkgs/development/tools/leaps/deps.nix index afaf42779b3e..ee06659c72ec 100644 --- a/pkgs/development/tools/leaps/deps.nix +++ b/pkgs/development/tools/leaps/deps.nix @@ -1,185 +1,165 @@ - - # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) - [ - - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "fc3b03a2d2d1f43fad3007038bd16f044f870722"; - sha256 = "1j6aqbizlpiqcywdsj4dy4i76g8fbqc7d61c22ppc9knw0968h4r"; - }; - } - - { - goPackagePath = "github.com/Jeffail/gabs"; - fetch = { - type = "git"; - url = "https://github.com/Jeffail/gabs"; - rev = "2a3aa15961d5fee6047b8151b67ac2f08ba2c48c"; - sha256 = "1fx6fyl5x037viwlj319f3gsq749an17q5l6n2zvf3ny5wq0iqxr"; - }; - } - - { - goPackagePath = "github.com/amir/raidman"; - fetch = { - type = "git"; - url = "https://github.com/amir/raidman"; - rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"; - sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr"; - }; - } - - { - goPackagePath = "github.com/azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/azure/azure-sdk-for-go"; - rev = "21b68149ccf7c16b3f028bb4c7fd0ab458fe308f"; - sha256 = "0zlhrh3n9mc5w7r0sdaqmpqfm2d290b50an0k1bvrr892m4cnxaq"; - }; - } - - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "61153c768f31ee5f130071d08fc82b85208528de"; - sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; - }; - } - - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; - sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; - }; - } - - { - goPackagePath = "github.com/elazarl/go-bindata-assetfs"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/go-bindata-assetfs"; - rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"; - sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp"; - }; - } - - { - goPackagePath = "github.com/garyburd/redigo"; - fetch = { - type = "git"; - url = "https://github.com/garyburd/redigo"; - rev = "d1ed5c67e5794de818ea85e6b522fda02623a484"; - sha256 = "0gw18k9kg93hvdks93hckrdqppg1bav82sp2c98q6z36dkvaih24"; - }; - } - - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "a0583e0143b1624142adab07e0e97fe106d99561"; - sha256 = "1rw1m91dpm23s6nn6jc4zi6rq2mgl7zx07gyadrdn0sh7cj8c89d"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "925541529c1fa6821df4e44ce2723319eb2be768"; - sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; - }; - } - - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; - sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; - }; - } - - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; - }; - } - - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "88edab0803230a3898347e77b474f8c1820a1f20"; - sha256 = "02y7c8xy33x5q4167x2drzrys41nfi7wxxp9hy4vpazfws88al9p"; - }; - } - - { - goPackagePath = "github.com/marstr/guid"; - fetch = { - type = "git"; - url = "https://github.com/marstr/guid"; - rev = "8bdf7d1a087ccc975cf37dd6507da50698fd19ca"; - sha256 = "1mxcigzfc1bbh5b616hm89bp06allhwcsas9v9lks235h0acgn4x"; - }; - } - - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; - sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; - }; - } - - { - goPackagePath = "gopkg.in/alexcesaro/statsd.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alexcesaro/statsd.v2"; - rev = "7fea3f0d2fab1ad973e641e51dba45443a311a90"; - sha256 = "02jdx68vicwsgabrnwgg1rvc45rinyh8ikinqgbqc56c5hkx3brj"; - }; - } - - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; - sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; - }; - } - -] \ No newline at end of file +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "fc3b03a2d2d1f43fad3007038bd16f044f870722"; + sha256 = "1j6aqbizlpiqcywdsj4dy4i76g8fbqc7d61c22ppc9knw0968h4r"; + }; + } + { + goPackagePath = "github.com/Jeffail/gabs"; + fetch = { + type = "git"; + url = "https://github.com/Jeffail/gabs"; + rev = "2a3aa15961d5fee6047b8151b67ac2f08ba2c48c"; + sha256 = "1fx6fyl5x037viwlj319f3gsq749an17q5l6n2zvf3ny5wq0iqxr"; + }; + } + { + goPackagePath = "github.com/amir/raidman"; + fetch = { + type = "git"; + url = "https://github.com/amir/raidman"; + rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"; + sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr"; + }; + } + { + goPackagePath = "github.com/azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/azure/azure-sdk-for-go"; + rev = "21b68149ccf7c16b3f028bb4c7fd0ab458fe308f"; + sha256 = "0zlhrh3n9mc5w7r0sdaqmpqfm2d290b50an0k1bvrr892m4cnxaq"; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "61153c768f31ee5f130071d08fc82b85208528de"; + sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; + sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; + }; + } + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"; + sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp"; + }; + } + { + goPackagePath = "github.com/garyburd/redigo"; + fetch = { + type = "git"; + url = "https://github.com/garyburd/redigo"; + rev = "d1ed5c67e5794de818ea85e6b522fda02623a484"; + sha256 = "0gw18k9kg93hvdks93hckrdqppg1bav82sp2c98q6z36dkvaih24"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "a0583e0143b1624142adab07e0e97fe106d99561"; + sha256 = "1rw1m91dpm23s6nn6jc4zi6rq2mgl7zx07gyadrdn0sh7cj8c89d"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "925541529c1fa6821df4e44ce2723319eb2be768"; + sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; + sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "88edab0803230a3898347e77b474f8c1820a1f20"; + sha256 = "02y7c8xy33x5q4167x2drzrys41nfi7wxxp9hy4vpazfws88al9p"; + }; + } + { + goPackagePath = "github.com/marstr/guid"; + fetch = { + type = "git"; + url = "https://github.com/marstr/guid"; + rev = "8bdf7d1a087ccc975cf37dd6507da50698fd19ca"; + sha256 = "1mxcigzfc1bbh5b616hm89bp06allhwcsas9v9lks235h0acgn4x"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; + sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; + }; + } + { + goPackagePath = "gopkg.in/alexcesaro/statsd.v2"; + fetch = { + type = "git"; + url = "https://github.com/alexcesaro/statsd"; + rev = "7fea3f0d2fab1ad973e641e51dba45443a311a90"; + sha256 = "02jdx68vicwsgabrnwgg1rvc45rinyh8ikinqgbqc56c5hkx3brj"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + }; + } +] From 135a6f83ea104b73bc118e4bf3bf92476adb4a71 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 27 Aug 2020 14:37:40 -0700 Subject: [PATCH 619/688] python3Packages.phonopy: fix build and tests --- .../python-modules/phonopy/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 3bc510f678a4..b476543c06a9 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py }: +{ stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }: buildPythonPackage rec { pname = "phonopy"; @@ -9,15 +9,15 @@ buildPythonPackage rec { sha256 = "482c6ff29c058d091ac885e561e28ba3e516ea9e91c44a951cad11f3ae19856c"; }; - propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ]; + propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; - checkPhase = '' - cd test - # dynamic structure factor test ocassionally fails do to roundoff - # see issue https://github.com/atztogo/phonopy/issues/79 - rm spectrum/test_dynamic_structure_factor.py - ${python.interpreter} -m unittest discover -b - cd ../.. + checkInputs = [ pytestCheckHook ]; + # flakey due to floating point inaccuracy + disabledTests = [ "test_NaCl" ]; + + # prevent pytest from importing local directory + preCheck = '' + rm -r phonopy ''; meta = with stdenv.lib; { From 8761381344a56a2e05229e2cbbf8b580d206ceed Mon Sep 17 00:00:00 2001 From: Diego Rodriguez Date: Wed, 2 Sep 2020 18:24:23 -0600 Subject: [PATCH 620/688] terraform_0_13: 0.13.1 -> 0.13.2 (#96971) --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index dd1da887cb41..f29508ffe380 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -132,8 +132,8 @@ in rec { }); terraform_0_13 = pluggable (generic { - version = "0.13.1"; - sha256 = "0a2sjjb79ziv42ifhplpkvqgsg8gxvr1wdgkhdj59dwahqv64pm2"; + version = "0.13.2"; + sha256 = "04pm57l29j3ai6dvh2343q4yhskkxqj8ayr2hdw2qqjch52p8mrw"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From 2eacb60353575d49a9a4da29fb382aeea75711a3 Mon Sep 17 00:00:00 2001 From: Jason O'Conal Date: Mon, 31 Aug 2020 13:52:28 +0930 Subject: [PATCH 621/688] goreplay: init at 1.1.0 --- pkgs/tools/networking/goreplay/default.nix | 26 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/goreplay/default.nix diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/tools/networking/goreplay/default.nix new file mode 100644 index 000000000000..3daa6a983b24 --- /dev/null +++ b/pkgs/tools/networking/goreplay/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, libpcap }: + +buildGoPackage rec { + pname = "goreplay"; + version = "1.1.0"; + rev = "v${version}"; + + goPackagePath = "github.com/buger/goreplay"; + + src = fetchFromGitHub { + inherit rev; + owner = "buger"; + repo = "goreplay"; + sha256 = "07nsrx5hwmk6l8bqp48gqk40i9bxf0g4fbmpqbngx6j5f7lpbk2n"; + }; + + buildInputs = [ libpcap ]; + + meta = { + homepage = "https://github.com/buger/goreplay"; + license = stdenv.lib.licenses.lgpl3Only; + description = "GoReplay is an open-source tool for capturing and replaying live HTTP traffic."; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ea6814f75e4..f14dbf973a67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4062,6 +4062,8 @@ in gopro = callPackage ../tools/video/gopro { }; + goreplay = callPackage ../tools/networking/goreplay { }; + gource = callPackage ../applications/version-management/gource { }; govc = callPackage ../tools/virtualization/govc { }; From 4adac63234d55ae6e6f153fed391ab529668d7d1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 2 Sep 2020 21:54:00 -0500 Subject: [PATCH 622/688] recursive: 1.062 -> 1.064 --- pkgs/data/fonts/recursive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 9fc4b46c9522..39d63e7dd990 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.062"; + version = "1.064"; in fetchzip { name = "recursive-${version}"; @@ -15,7 +15,7 @@ fetchzip { unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "06qilfa0c897shh7m7rpwia02nay8cjwnizzzba27ylzy5pwd96r"; + sha256 = "1pbrqk848nkaambvsz0n8f88xdm8hyib83in27rmal739qh9d1z6"; meta = with lib; { homepage = "https://recursive.design/"; From f7100e698e3b4bd7147cc5087be27079ce10ebb2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 3 Sep 2020 04:20:00 +0000 Subject: [PATCH 623/688] flow: 0.132.0 -> 0.133.0 https://github.com/facebook/flow/releases/tag/v0.133.0 --- pkgs/development/tools/analysis/flow/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index a9ea826e2f63..cc3ef8ed0f7f 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.132.0"; + version = "0.133.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1080kf2zxhbgz1zhm54w3hqbbvwpfllapcq4pgwahfyvf6zb86d7"; + sha256 = "1r4s4gw50pvp4r4mq2w45s9i7fbkf7zycgp8rrj1dqzmkl9v6kii"; }; installPhase = '' @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/facebook/flow/releases/tag/v${version}"; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; + broken = stdenv.isAarch64; # https://github.com/facebook/flow/issues/7556 maintainers = with maintainers; [ marsam puffnfresh ]; }; } From 7b73713a98f8347c039067848a96efa36c65a182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 3 Sep 2020 08:42:24 +0200 Subject: [PATCH 624/688] programs.zsh: remove unnecessary `with` --- nixos/modules/programs/zsh/oh-my-zsh.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml index 568c2de65576..14a7228ad9b0 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.xml +++ b/nixos/modules/programs/zsh/oh-my-zsh.xml @@ -73,7 +73,7 @@ { pkgs, ... }: { - programs.zsh.ohMyZsh.customPkgs = with pkgs; [ + programs.zsh.ohMyZsh.customPkgs = [ pkgs.nix-zsh-completions # and even more... ]; From aadbc19804752b93cf7fa77654907fa75daa1eaf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 3 Sep 2020 10:18:05 +0200 Subject: [PATCH 625/688] bandwhich: 0.16.0 -> 0.17.0 https://github.com/imsnif/bandwhich/releases/tag/0.17.0 --- pkgs/tools/networking/bandwhich/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 31efdaddb740..7e815c6ccf07 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "074bgdgv6flg5xjzk7sxgqsy89ygnx7swhaqz75vvrcpx9ldysvz"; + sha256 = "0fhy3zys41bkpjmvhkxf413004hvv2kngcgf4819mw22w14zfvgr"; }; - cargoSha256 = "0aq3k64g04l03h42cnnpljqffkkl1gdg6r5rqi237h0jrhci8c7w"; + cargoSha256 = "015ff049xb699gig0cwr5i7n8hgw1316dkdpnqd4843h54x7bp5y"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From 412a28d43fe6e9c2b8280d17c1722c2dece284c2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 3 Sep 2020 10:19:16 +0200 Subject: [PATCH 626/688] element-web: 1.7.4 -> 1.7.5 https://github.com/vector-im/element-web/releases/tag/v1.7.5 --- .../networking/instant-messengers/element/element-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 9c818a8e8b66..1ed5a6261f1a 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.4"; + version = "1.7.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0ssyd5b9yrxidivr3rcjsd8ixkmppsmmr7a8k0sv16yk7hjnvz5b"; + sha256 = "07qc4hymdp1r2zn9gsgkpwxf6knk6xr88dc3iihlhipmlk46m58b"; }; installPhase = '' From bf007a2c0a8c60c4c552c3213b4f095de928ee23 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 3 Sep 2020 10:20:42 +0200 Subject: [PATCH 627/688] element-desktop: 1.7.4 -> 1.7.5 https://github.com/vector-im/element-desktop/releases/tag/v1.7.5 --- .../instant-messengers/element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/element-desktop.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 306457937287..610cb328d662 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.4", + "version": "1.7.5", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 09fd89b0da7f..46e859076bee 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "16ilkf5b8mz74x1r9fym5xjb4plxzhg3g5njj1sl4qvsbrkk6r9a"; + sha256 = "0781yg15bzkw5bpfzbdkqix239djgsc7kjdvbilv1d1xxqz3462y"; }; electron = electron_9; From e30287c590de2d65595c47e142af08d8030ca240 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 3 Sep 2020 11:52:46 +0300 Subject: [PATCH 628/688] gst_all_1.gst-rtsp-server: fix pkgconfig includedir and libdir --- .../libraries/gstreamer/rtsp-server/default.nix | 9 +++++++++ .../rtsp-server/fix_pkgconfig_includedir.patch | 15 +++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index dfb18754c839..92e8a45a4f6f 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + # To use split outputs, we need this so double prefix won't be used in the + # pkg-config files. Hopefully, this won't be needed on the next release, + # _if_ + # https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/merge_requests/1 + # will be merged. For the current release, this merge request won't apply. + ./fix_pkgconfig_includedir.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch new file mode 100644 index 000000000000..d31fe19fb0fe --- /dev/null +++ b/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git i/pkgconfig/meson.build w/pkgconfig/meson.build +index 8ed8299..594cbfe 100644 +--- i/pkgconfig/meson.build ++++ w/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', get_option('prefix')) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', api_version) + pkgconf.set('VERSION', gst_version) + From a2138186614b7db53b0800be9fd01a085f95f7b7 Mon Sep 17 00:00:00 2001 From: kon8522 Date: Thu, 3 Sep 2020 07:34:50 -0400 Subject: [PATCH 629/688] Add vscode json language server --- pkgs/development/node-packages/node-packages.json | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 69a61caae150..df5d4e68a54b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -199,6 +199,7 @@ , "vim-language-server" , "vscode-css-languageserver-bin" , "vscode-html-languageserver-bin" +, "vscode-json-languageserver-bin" , "vue-cli" , "vue-language-server" , "web-ext" From d217a00e874a69aa989ad26364d8c67b990c1430 Mon Sep 17 00:00:00 2001 From: kon8522 Date: Thu, 3 Sep 2020 08:02:14 -0400 Subject: [PATCH 630/688] Update node packages nix expression --- .../node-packages/node-packages.nix | 2878 +++++++++-------- 1 file changed, 1494 insertions(+), 1384 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 23bc954c5e78..db00f42aa05d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "VHRggJbRY8vHIADWVwbq9cZux0L9LdmlN31XA3daVAI4gMkKdQEocxB7KqGDt6SfIJ3NYi/qh1nRJGooYmTBiA=="; }; }; - "@angular-devkit/architect-0.1000.8" = { + "@angular-devkit/architect-0.1001.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1000.8"; + version = "0.1001.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz"; - sha512 = "2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.0.tgz"; + sha512 = "mJYy9tqy7ZfqAJYlQPgcHVUiaAxWnxEEpiTAftsKz/yqdO45YFkzehYXJfCqbAXYr4r7hYY3KqKMgj41ixkS8Q=="; }; }; "@angular-devkit/core-10.0.7" = { @@ -67,13 +67,13 @@ let sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw=="; }; }; - "@angular-devkit/core-10.0.8" = { + "@angular-devkit/core-10.1.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "10.0.8"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz"; - sha512 = "d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.0.tgz"; + sha512 = "oNRwAX+5uEwgheS3UUc1W+AerbimqGojCOTdWWcq5XtSviZnBCp1FeMZV+eB6XgUWfbmbWBu39S3sCYmXVHLwg=="; }; }; "@angular-devkit/core-9.1.12" = { @@ -94,13 +94,13 @@ let sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg=="; }; }; - "@angular-devkit/schematics-10.0.8" = { + "@angular-devkit/schematics-10.1.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "10.0.8"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.8.tgz"; - sha512 = "p2PjvrExuzOe/azyOEcBeIgwZIk4D6VeLkJf/KVjhXOVu13pjIXHX7/qWl+IYnbtj3NZGHqXM5Cr8nxsJNIMpw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.0.tgz"; + sha512 = "5Vl32bHpcB/oj0oNR8nPLXF7DwPVuzrJjosch8G+sPG2gAG6OpwjUhQjY1U6E4xJGDR6j7fX8jw+TwC2cMgUbQ=="; }; }; "@angular-devkit/schematics-9.1.12" = { @@ -229,13 +229,13 @@ let sha512 = "bQVb6PE34iDmZj6wZZzYm3rLjguxoSqHZj4QReVQsOle/LdIwl48hV9Iz/Pivy9NtVCui9LL/lmSQzMt0G0jkw=="; }; }; - "@apollo/federation-0.19.0" = { + "@apollo/federation-0.20.0" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.19.0"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.19.0.tgz"; - sha512 = "8cd8ftHgqaseDTN7RJrROT6FT1xy8RV2Qb9BGhhqPVMHqf08GtidBqQTk6hv1UDR0qu/TRZA6J4Kh7oXeMrPQg=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.0.tgz"; + sha512 = "Q2eGSjrArtY04FSVIxUK3/JaVDDw4aJZBRl0+UZ1dwrpk6YtBpydW2u4X6dPTnBqRDpKVGVmc9gkQr8d3LpcKA=="; }; }; "@apollo/protobufjs-1.0.5" = { @@ -355,22 +355,13 @@ let sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; }; }; - "@babel/core-7.11.4" = { + "@babel/core-7.11.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.11.4"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.11.4.tgz"; - sha512 = "5deljj5HlqRXN+5oJTY7Zs37iH3z3b++KjiKtIsJy1NrjOOVSEaJHEetLBhyu0aQOSNNZ/0IuEAan9GzRuDXHg=="; - }; - }; - "@babel/generator-7.11.0" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz"; - sha512 = "fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.11.5.tgz"; + sha512 = "fsEANVOcZHzrsV6dMVWqpSeXClq3lNbYrfFGme6DE25FQWe7pyeYpXyx9guqUnpy466JLzZ8z4uwSr2iv60V5Q=="; }; }; "@babel/generator-7.11.4" = { @@ -382,6 +373,15 @@ let sha512 = "Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g=="; }; }; + "@babel/generator-7.11.5" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.11.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.5.tgz"; + sha512 = "9UqHWJ4IwRTy4l0o8gq2ef8ws8UPzvtMkVKjTLAiRmza9p9V6Z+OfuNd9fB1j5Q67F+dVJtPC2sZXI8NM9br4g=="; + }; + }; "@babel/helper-annotate-as-pure-7.10.4" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; @@ -409,13 +409,13 @@ let sha512 = "5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg=="; }; }; - "@babel/helper-builder-react-jsx-experimental-7.10.5" = { + "@babel/helper-builder-react-jsx-experimental-7.11.5" = { name = "_at_babel_slash_helper-builder-react-jsx-experimental"; packageName = "@babel/helper-builder-react-jsx-experimental"; - version = "7.10.5"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.5.tgz"; - sha512 = "Buewnx6M4ttG+NLkKyt7baQn7ScC/Td+e99G914fRU8fGIUivDDgVIQeDHFa5e4CRSJQt58WpNHhsAZgtzVhsg=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz"; + sha512 = "Vc4aPJnRZKWfzeCBsqTBnzulVNjABVdahSPhtdMD3Vs80ykx4a87jTHtF/VR+alSrDmNvat7l13yrRHauGcHVw=="; }; }; "@babel/helper-compilation-targets-7.10.4" = { @@ -625,13 +625,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.11.4" = { + "@babel/parser-7.11.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.11.4"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz"; - sha512 = "MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"; + sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -1156,13 +1156,13 @@ let sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ=="; }; }; - "@babel/plugin-transform-runtime-7.11.0" = { + "@babel/plugin-transform-runtime-7.11.5" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz"; - sha512 = "LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz"; + sha512 = "9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg=="; }; }; "@babel/plugin-transform-shorthand-properties-7.10.4" = { @@ -1246,13 +1246,13 @@ let sha512 = "8BYcnVqQ5kMD2HXoHInBH7H1b/uP3KdnwCYXOqFnXqguOyuu443WXusbIUbWEfY3Z0Txk0M1uG/8YuAMhNl6zg=="; }; }; - "@babel/preset-env-7.11.0" = { + "@babel/preset-env-7.11.5" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz"; - sha512 = "2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz"; + sha512 = "kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA=="; }; }; "@babel/preset-flow-7.10.4" = { @@ -1264,13 +1264,13 @@ let sha512 = "XI6l1CptQCOBv+ZKYwynyswhtOKwpZZp5n0LG1QKCo8erRhqjoQV6nvx61Eg30JHpysWQSBwA2AWRU3pBbSY5g=="; }; }; - "@babel/preset-modules-0.1.3" = { + "@babel/preset-modules-0.1.4" = { name = "_at_babel_slash_preset-modules"; packageName = "@babel/preset-modules"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; - sha512 = "Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg=="; + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; }; "@babel/preset-stage-2-7.8.3" = { @@ -1291,13 +1291,13 @@ let sha512 = "SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ=="; }; }; - "@babel/register-7.10.5" = { + "@babel/register-7.11.5" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.10.5"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.10.5.tgz"; - sha512 = "eYHdLv43nyvmPn9bfNfrcC4+iYNwdQ8Pxk1MFJuU/U5LpSYl/PH4dFMazCYZDFVi8ueG3shvO+AQfLrxpYulQw=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.11.5.tgz"; + sha512 = "CAml0ioKX+kOAvBQDHa/+t1fgOt3qkTIz0TrRtRAT6XY0m5qYZXR85k6/sLCNPMGhYDlCFHCYuU0ybTJbvlC6w=="; }; }; "@babel/runtime-7.10.5" = { @@ -1327,13 +1327,13 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.11.0" = { + "@babel/traverse-7.11.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz"; - sha512 = "ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz"; + sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ=="; }; }; "@babel/types-7.10.4" = { @@ -1345,13 +1345,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.11.0" = { + "@babel/types-7.11.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz"; - sha512 = "O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"; + sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; }; }; "@bugsnag/browser-7.3.3" = { @@ -1579,6 +1579,15 @@ let sha512 = "ZHkXKq2XFFmAUdmSZrmqUSIrRM4O9gtkdpxMmV+LQl7kScUnbo6pMnXu6+FTDgZ12aW6SDoZoOJfS56WD+Eu6A=="; }; }; + "@eslint/eslintrc-0.1.3" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz"; + sha512 = "4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA=="; + }; + }; "@evocateur/libnpmaccess-3.1.2" = { name = "_at_evocateur_slash_libnpmaccess"; packageName = "@evocateur/libnpmaccess"; @@ -1615,13 +1624,22 @@ let sha512 = "EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w=="; }; }; - "@fluentui/date-time-utilities-7.6.0" = { + "@exodus/schemasafe-1.0.0-rc.2" = { + name = "_at_exodus_slash_schemasafe"; + packageName = "@exodus/schemasafe"; + version = "1.0.0-rc.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.2.tgz"; + sha512 = "W98NvvOe/Med3o66xTO03pd7a2omZebH79PV64gSE+ceDdU8uxQhFTa7ISiD1kseyqyOrMyW5/MNdsGEU02i3Q=="; + }; + }; + "@fluentui/date-time-utilities-7.7.0" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.6.0.tgz"; - sha512 = "lp8BjSF9FW8mpVrfcuVbldVOVZ/lxWzH9xzBG67rkdjIMYwtV0/mFgB6MrKsGvzqDIlvXcoptrcUQNl0/3QA7Q=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.7.0.tgz"; + sha512 = "rgtGX5x1AeYUfilfkgP6ag+ZKx41BJcUs16k6iSxXxd/mt00DAPOGY8ODGikKFpjGKcUwjKfYBssyKkVHDucfA=="; }; }; "@fluentui/keyboard-key-0.2.11" = { @@ -1633,40 +1651,49 @@ let sha512 = "4iG5vNlRD3PrLaMfDTimHNOP1x6V3Dad0fXOwtvBBMsfdySPE9zlY+G+0aqCFcgjymOriFOk0ANZVBpK7XrnTg=="; }; }; - "@fluentui/react-7.132.0" = { + "@fluentui/react-7.134.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.132.0"; + version = "7.134.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.132.0.tgz"; - sha512 = "k2ZMkhUJt+wmJPEZUyWi6oiM3NlXT5zWfF0yEEKJlGeFm55Q1OGr5XdflR5Crd9CYE+zoUN7PoYe3NGebdsIUA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.134.1.tgz"; + sha512 = "UMnf1pfTwuphU3lJAfwVsWZULu7MoJmxg/vJyirOvXa/+lQqGQr/SfXthqlkE0DPRMRr2qqtc9iNCfZxi7dfCg=="; }; }; - "@fluentui/react-focus-7.13.3" = { + "@fluentui/react-focus-7.15.0" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.13.3"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.13.3.tgz"; - sha512 = "P7iptQRBgyAuxLUq7yusVI0FL92wjo5jdzofatkoONxVHAzrTbGsboiu00PbeYbXxEKjA1+v2y2OfbgGRpglZw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.15.0.tgz"; + sha512 = "xbxB0cbyEoUfQZ19pAqBeWCYJ/4IOu1FG4bhVjDimqSD7qKwJbLlJSDNwmHr05SWprdhmqJe23KOwsHMgyvnrw=="; }; }; - "@fluentui/react-icons-0.2.2" = { + "@fluentui/react-icons-0.3.0" = { name = "_at_fluentui_slash_react-icons"; packageName = "@fluentui/react-icons"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.2.2.tgz"; - sha512 = "pofZsHgbBVcyVr3I/LlbrX3P06NZnToxlH7cS9xy3LFcyrj629S5+iEXFdVk4O496MJ6qd4/FyxI/3Ru9UNlDg=="; + url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.3.0.tgz"; + sha512 = "QDrIhLUpkxM5q5bFE4pkweJJsfaNswdfDoc+X6cmr22Dii+anDFTpOcePEJiTtILxdlEmH0968OcZ4BGZF/joQ=="; }; }; - "@fluentui/theme-0.1.2" = { + "@fluentui/react-window-provider-0.3.0" = { + name = "_at_fluentui_slash_react-window-provider"; + packageName = "@fluentui/react-window-provider"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-0.3.0.tgz"; + sha512 = "zHeH1PAmoFB3OkgU8f51E3oGHrL/CjuvdPBlb1SGpByUGNihAgH/CwvJohV9z0yPDkq+chfNUmxWA/oDVpbh6Q=="; + }; + }; + "@fluentui/theme-0.2.0" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-0.1.2.tgz"; - sha512 = "hjLowlMEH6vVrE+6dNgrZ8vWXK3a750959aWC5Ss0cWMZPtL3oNxCSwsLD6I65HwErhfDIEXw1HIqNEN9XbiAw=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-0.2.0.tgz"; + sha512 = "L5OwqymTdxTVwBa3ifkQLF1A3YU6WMkMTk6PFIMfOonjt8LJ3yMMqZgz+KQR3sF/tzgy4wzW4oBmrxtTfJS2EQ=="; }; }; "@graphql-cli/common-4.0.0" = { @@ -1687,94 +1714,94 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-tools/delegate-6.1.0" = { + "@graphql-tools/delegate-6.2.0" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.1.0.tgz"; - sha512 = "LBulO9tEx+4TvRIY3yCivCYdtI18BpDX/qlSs+K7AuTgCH8eJ/S/FinFRTpTK/9bQwXnBh/d9WjiiRekUCiW6g=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.0.tgz"; + sha512 = "jYwg6MuErovAHXhyReTSgRTzdvPB60VEO02KGZskaD5WPqCQy6oqYBetXOp1yG6PBwJvxCTpMKuZvyPVLRM9ww=="; }; }; - "@graphql-tools/graphql-file-loader-6.1.0" = { + "@graphql-tools/graphql-file-loader-6.2.0" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.1.0.tgz"; - sha512 = "UZsCx/JJPlkCPYoKJhOcMpDYRx0RagBJ/0gVjgUyiykGJyl8QqTUz34QZhRFg5WGPWcEyT8z18w5WocPCXwK+g=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.0.tgz"; + sha512 = "anl/fc2KTLF2Eu5Fd9fRYy+N22QBZskP2uKAqyiaJFPiIAOXWAUjK/WJ4uWAAjkGhEnseK0M8hUudgW36w8Smg=="; }; }; - "@graphql-tools/import-6.1.0" = { + "@graphql-tools/import-6.2.0" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.1.0.tgz"; - sha512 = "MuW9v8w8hc6GvsWQH41NnOAr1f7bkV4E6AWMYpndAHPcuwwGHiLHizLCEjbNovzdoA8N9h3sMenhQyRpCAiEzg=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.0.tgz"; + sha512 = "fYLyzAW3RKKfyPO+0nEA86yUP2V2uctdsZVZEamJ9MtjW+UhZf9kbR+NBuX/FbFAQR+F7UMe5GSPjUTKC13CEg=="; }; }; - "@graphql-tools/json-file-loader-6.1.0" = { + "@graphql-tools/json-file-loader-6.2.0" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.1.0.tgz"; - sha512 = "U5+aU4Bi9Se2+rFE0lwARHii1TyKtVG+WPNtBM1YJdgQ800/jrgjSCBl2Js/bd2YkICMLz++lCehyQSgrLpIsg=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.0.tgz"; + sha512 = "kpvYLGuxcq3V9cr996YOCAkw7F/4pC1JY1KxvI3360G0mYVVZcA8Q/XcxcwPwPZrBHDJMHhXvTRZD+svQ49Rxw=="; }; }; - "@graphql-tools/load-6.1.0" = { + "@graphql-tools/load-6.2.0" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.1.0.tgz"; - sha512 = "4puWwWPvLKskTtabMXlYW4fdm5yaAgHNwJeUhs3/ftX9mrJOa8HnfIxULZOES9XEbaRoaVQ0wPRBjJKcTBJ7CQ=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.0.tgz"; + sha512 = "ZsxPXMpLOjNh88Q2XtDmMTP65tQfknZjCgWm9vq+FxlUh//7Z8q6WiChogIEJ9g8G0+XKmLEcA+Vi4L45QX9GA=="; }; }; - "@graphql-tools/merge-6.1.0" = { + "@graphql-tools/merge-6.2.0" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.1.0.tgz"; - sha512 = "dD7J/LELhy87+5V8pko5EhSx2leoRIT02V5coa6S19PTiNrVqCJU/fMMKdWC1FmHSWUYOf+wZhItsilUxPr7XQ=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.0.tgz"; + sha512 = "q2bnFhdw6ssBzIlTkyUGPzBThLHgwuTVCRvjjCepegQCKGzwDypve0n+EMBUnoaOcJ3JRgQHR3eStP2x/S0AYw=="; }; }; - "@graphql-tools/schema-6.1.0" = { + "@graphql-tools/schema-6.2.0" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.1.0.tgz"; - sha512 = "AZflTf9HU3Uy8UgUwxwFXN9Lf+9D36LBoDRIxPRhsj6EtawbwCqsd3UFwNek0OgiwNi3BL2b+D+6QEcw2IOsDA=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.0.tgz"; + sha512 = "wlAIgN6pMgRaruiJqlZLIe+FM834ZYif/P7evCbG71sm7Ou8t0n+dkpf8+qZAa7D+PWO9G96BF1l2NPUlM+KvA=="; }; }; - "@graphql-tools/url-loader-6.1.0" = { + "@graphql-tools/url-loader-6.2.0" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.1.0.tgz"; - sha512 = "AzTDZPQqHv2jrTrKhPgLbeWBhEjwFMAFnRKPsaGnSxkZWAeTeA4XevbWS4wl9jho0klTtSRBbKnNBp+dxbpmwA=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.0.tgz"; + sha512 = "bPktwMT42tvsPIlJYQ4bwjnQKhOSwCsV/R81T0tsoh+UbKR2/QxccSQCoNJAUIxP6hXfR+Sc1wMXUw7m8/akrg=="; }; }; - "@graphql-tools/utils-6.1.0" = { + "@graphql-tools/utils-6.2.0" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.1.0.tgz"; - sha512 = "YcyslZ/8rk5nQOGnkEDp/xi6Xphu0mgjh5LTZ1qUio5P+d95/9MW44cPdmi3Feg4kO8u+1GcPC+685hFpJlZJw=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.0.tgz"; + sha512 = "Z5ONje6tGNvBzGwo/8eIafr98mwuvWpi3IwPp8CKHKjTBAKlUxY8hlwSn+bEMPyuA9uH/7nHWz4lamRQQEHAhg=="; }; }; - "@graphql-tools/wrap-6.1.0" = { + "@graphql-tools/wrap-6.2.0" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.1.0.tgz"; - sha512 = "sJ4ePvgQ2AKWGQ75hockh1k+0BhPbr7SZqe4T/HKNMCuATNiRi0m78FoxHTp/JODMKRPfhadunD74CXrxupy6A=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.0.tgz"; + sha512 = "I7EAvY6x6cBB92j+IrZLE3meYUdmHNK8r/TvHXJ8SmgMJGlt4z8bjOr7WmYdMPufyVdHBSGwECqjWcxOhSxLsA=="; }; }; "@hapi/address-2.1.4" = { @@ -2524,13 +2551,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.79" = { + "@microsoft/load-themed-styles-1.10.82" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.79"; + version = "1.10.82"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.79.tgz"; - sha512 = "p4Ym7B2d8HT1K0VHAQkUw1SRmXQrko59lmqg/cr8ORClXIhoqc6Zt3m6I53olz4af2pXzpiI0ynHu6KmYYLOfQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.82.tgz"; + sha512 = "p92TRErd5xpYkSy7TjNDs+0LmxDBSusmLSgnWCv7xZf9DGXZCW08ZiUVlbsaj3e49kGskOaWQvarMDejm2b+FQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -2569,22 +2596,22 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-3.3.2" = { + "@netlify/build-3.3.5" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "3.3.2"; + version = "3.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-3.3.2.tgz"; - sha512 = "nIjjJyKJP+6hAMAfNeNUfMMNvXm8qtAtIv/i+Va7PvapPNO37p5H15o0dlke7xLIQuxuDvd6UE3bilj/c1KvdQ=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-3.3.5.tgz"; + sha512 = "QhPsiexwv2pKJTCvxiOKYaR5LmQS1H9hlF+8PzZBqk/rUUQAt9y6L6gQQJ1hnXEdsFIQGUqBG0aPolKgWQ3H7A=="; }; }; - "@netlify/cache-utils-1.0.1" = { + "@netlify/cache-utils-1.0.2" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.1.tgz"; - sha512 = "wJBHxOWrqGiwgdgd/PxzJC6tVltODDYsqb5Dqs2pJi4LoIXFlAoW+scAWIIURHYs8zodte50pAcMg5cnLLUKPw=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.2.tgz"; + sha512 = "5eB8PpX4UaJsgVWwV+TSuGyzi/rysCqTSZzVVJVDSVr0sQa574N6LmLWuYl0WJluSTWeYtUUlATLeP838FaZfQ=="; }; }; "@netlify/config-0.11.11" = { @@ -2596,13 +2623,13 @@ let sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; }; }; - "@netlify/config-2.1.2" = { + "@netlify/config-2.1.3" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.1.2.tgz"; - sha512 = "2DvK5rw4DIrQ+Vla4A/C7euFtP43dCdW8Df2sPAiPvOWZLiV941N7flHRB8IJqOQcV/MaG4+qg+lMlR2KDC/Qg=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-2.1.3.tgz"; + sha512 = "rasNRIFI/U6j293k46capM+b9yc+NT/wfnqtSjd+WGsXuj6O4iMXuN5gpNteKg5RYGFP4mAkP4BjM+//OBFtvg=="; }; }; "@netlify/functions-utils-1.2.8" = { @@ -2641,13 +2668,13 @@ let sha512 = "TcdVJZ3J4iu+WYV9sLMBOr1jW2+XgLtIt1LfGYqsH+yqfkWoWavV27y5ttznM1BODFYQb9fMJG/xO2wAeXCzMw=="; }; }; - "@netlify/zip-it-and-ship-it-1.3.11" = { + "@netlify/zip-it-and-ship-it-1.3.12" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "1.3.11"; + version = "1.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.3.11.tgz"; - sha512 = "j+DSEwSztqoAMPSvx3PnfHqpR3aCW4B/piLbrRLq+Bp8UElq9UZZN3wzEvTL8NS+2VNb5HvwDYDPev208+Fz8g=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.3.12.tgz"; + sha512 = "FQM/59HXMAKp9k4z6rXDA/FBKFSUaU3n5SFpF2/jScmpCmHBpF+pYIWZmVB4fY17cvq3KIcuSfzf9PqD1B73XQ=="; }; }; "@node-red/editor-api-1.1.3" = { @@ -2749,13 +2776,13 @@ let sha512 = "oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="; }; }; - "@npmcli/git-2.0.3" = { + "@npmcli/git-2.0.4" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.3.tgz"; - sha512 = "c/ODsV5ppjB12VDXKc6hzVNgg6ZJX/etILUn3WgF5NLAYBhQLJ3fBq6uB2jQD4OwqOzJdPT1/xA3Xh3aaWGk5w=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.4.tgz"; + sha512 = "OJZCmJ9DNn1cz9HPXXsPmUBnqaArot3CGYo63CyajHQk+g87rPXVOJByGsskQJhPsUUEXJcsZ2Q6bWd2jSwnBA=="; }; }; "@npmcli/installed-package-contents-1.0.5" = { @@ -2803,15 +2830,6 @@ let sha512 = "M9o+DOrb8l603qvgz1FogJBUGLqcMFL1aFg2ZEL0FbXJofiNTLOWIeB4faeZTLwE6dt0xH9GpCVpzksMMzGbmA=="; }; }; - "@oclif/command-1.7.0" = { - name = "_at_oclif_slash_command"; - packageName = "@oclif/command"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.7.0.tgz"; - sha512 = "TkknFtWcZI8te0E8sW+ohiblExrLx73rIcV4KdIzDX01u+oTZWZaap51F6TSGFnR/Gey0WctaDvJhZlt4xgKdA=="; - }; - }; "@oclif/command-1.8.0" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; @@ -2821,15 +2839,6 @@ let sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; }; }; - "@oclif/config-1.16.0" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.16.0.tgz"; - sha512 = "vOnMPQcHokC03WBCuLipTxksTwgZcmDOnH2H0UHqndfKKN9GVDzpZTH6zaFVQBdjTME5VtRzg9A2UaNmq6OXWw=="; - }; - }; "@oclif/config-1.17.0" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; @@ -3091,13 +3100,13 @@ let sha512 = "LUuXiILPURVCF8u4gnE6SWQZ/+1kVnRatXK6SmQyk+ed8F4uDyNCGuIu3/W7jYQB+k7kD6eQZqINuPWvbPTzYQ=="; }; }; - "@primer/octicons-10.0.0" = { + "@primer/octicons-10.1.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "10.0.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-10.0.0.tgz"; - sha512 = "iuQubq62zXZjPmaqrsfsCZUqIJgZhmA6W0tKzIKGRbkoLnff4TFFCL87hfIRATZ5qZPM4m8ioT8/bXI7WVa9WQ=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-10.1.0.tgz"; + sha512 = "oXfV0uIe7I4cb3vUzBPlPZGL5SQ3+joyyRcmk28aJiGFySl8brzL0MJC63RahiNEnIFrL3D5BRVgz5ZGGuHCOg=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -3235,13 +3244,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-10.0.8" = { + "@schematics/angular-10.1.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "10.0.8"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.8.tgz"; - sha512 = "KNO61UGtiKMQSG+NbusqLtwLbxId0y+xpXJt9PKFwi+vaViOO+YzOPREfiFCuQ7q6X8SmNlrMj6sZ34E2YN1pQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.0.tgz"; + sha512 = "kQ925yMmOwiSITY+FhuTvrl3HuEIEUrdByBNB0NlvY+DyJwPlngEOo6Iu0cYWaJcoxM1JscOWL59ZR6W7YCFIg=="; }; }; "@schematics/schematics-0.1000.7" = { @@ -3253,13 +3262,13 @@ let sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw=="; }; }; - "@schematics/update-0.1000.8" = { + "@schematics/update-0.1001.0" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1000.8"; + version = "0.1001.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1000.8.tgz"; - sha512 = "xHuj6ME3PNTsVUrpftd98LF3WHPM0NU25GcT/n0E/j0/52yDTiaPS3wUnYSK8ZSv4Et4hcyGx7f/LEXAoOKJXw=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.0.tgz"; + sha512 = "LRGwo37akHe/BUl5FHj74mJ/xhM0Z7W8pWMWJ6zGihs+HNXjTgfYVgGA1TgN0amqQODa3AxxLL6aLj+hVYZi+g=="; }; }; "@serverless/cli-1.5.2" = { @@ -3280,13 +3289,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.34.7" = { + "@serverless/components-2.34.9" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.34.7"; + version = "2.34.9"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.34.7.tgz"; - sha512 = "zQ5S/DjqYKgcUUA/FJGr09m5cQ59eXWMXUoKanZAAmpaAfpvD5uaLbGGlgdIli6JZTks5hLqtjfcar87r94/qg=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.34.9.tgz"; + sha512 = "qFjIeGgR4SjS32Tbl4BvoxOtLpv3Vx4s/81HdmmpdIrMPe7ePGUfkBVBu3axxAXHf4ajlb4WC1HmhTmZAHHSLQ=="; }; }; "@serverless/core-1.1.2" = { @@ -3298,13 +3307,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.7.1" = { + "@serverless/enterprise-plugin-3.8.2" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.7.1"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.7.1.tgz"; - sha512 = "+9/gtrSRCXrO/5gLlFO9hZlxl90ctjsDx8dwKHnO9mVMXJ7RQmUWUj+5h2kSrD6bs2F1RmhLgQhwj7DCGEEAQg=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.8.2.tgz"; + sha512 = "tJqvVBHOQk110UXEO/RVeZIUh/tyBlxalaNnGRiTsbT2kRsq0s/OfznfMufANmlKaKPcoOXxHEW8oaAV4N1XyA=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -3325,22 +3334,22 @@ let sha512 = "2c5A6HSWwXluknPNJ2s+Z4WfBwP7Kn6kgsEKD+5xlXpDpBFsRku/xJyO9eqRCwxTM41stgHNC6TRsZ03+wH/rw=="; }; }; - "@serverless/platform-client-1.1.7" = { + "@serverless/platform-client-1.1.8" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.1.7.tgz"; - sha512 = "520U/OZN/IV1UnqVPGGMnoPM4TsflxffcyNSbs8Nr7G/9eGr1rcHw2vMAU5Z+4M7DoMDi7FogLNCrr51PLGxaQ=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.1.8.tgz"; + sha512 = "DmU71Lh0ALOMumGD7k2HfO6WwaFpJCA4ech1S9Kd8AQvpKZrT8fyUl9Ymc/E6GJLRC4s3a5wzcsLbu5AiDNyHA=="; }; }; - "@serverless/platform-client-china-1.0.34" = { + "@serverless/platform-client-china-1.0.37" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.34"; + version = "1.0.37"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.34.tgz"; - sha512 = "pEMq9hsPYIzMxEZY/tBscOiUDpGQ17yN7ORAdS/mLNjuoouyOJfTiYtehYoY+wNBm25BIcZnkX81+X+IpyF5ng=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.37.tgz"; + sha512 = "eN2UBK51Z9RkRY5Im0j2wCl3XuHBKiuY3kpQIxtGs52yuQx8PA0I/HBsYwyRgoTpvATK3MM/SsyeKpvNs90+uw=="; }; }; "@serverless/platform-sdk-2.3.1" = { @@ -3460,15 +3469,6 @@ let sha512 = "3X+OwwwT9j0r2ObqxYIiAgdaHsTW71b92PN3wawGAxl4YgPRrRVw8Fouhe41I4WJsn7OlKUNedylZguvpYg9qw=="; }; }; - "@snyk/cli-interface-2.8.0" = { - name = "_at_snyk_slash_cli-interface"; - packageName = "@snyk/cli-interface"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.8.0.tgz"; - sha512 = "St/G39iJG1zQK15L24kcVYM2gmFc/ylBCcBqU2DMZKJKwOPccKLUO6s+dWIUXMccQ+DFS6TuHPvuAKQNi9C4Yg=="; - }; - }; "@snyk/cli-interface-2.8.1" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; @@ -3478,6 +3478,15 @@ let sha512 = "pALcfgoY0hAavy/pBlDIqEu+FFC5m+D4bMnCwlQ26mObL/zzxp2+Ohx+HykCIom62u2J94SzAtRLFdm/2TgoOw=="; }; }; + "@snyk/cli-interface-2.9.0" = { + name = "_at_snyk_slash_cli-interface"; + packageName = "@snyk/cli-interface"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.0.tgz"; + sha512 = "KDVHsU71apUPHK1PiIUXVW7stGZilbwKIoi0ffz1Qa0Er03fm3aV602scnOinbTtVy5UTm3L4WmdCdQrRoBYOQ=="; + }; + }; "@snyk/cocoapods-lockfile-parser-3.5.1" = { name = "_at_snyk_slash_cocoapods-lockfile-parser"; packageName = "@snyk/cocoapods-lockfile-parser"; @@ -3910,13 +3919,13 @@ let sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; }; }; - "@types/babel-types-7.0.8" = { + "@types/babel-types-7.0.9" = { name = "_at_types_slash_babel-types"; packageName = "@types/babel-types"; - version = "7.0.8"; + version = "7.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.8.tgz"; - sha512 = "jvu8g4LR7+p6ao30RhTREnEhHxmP4/R9D9/rOR/Kq14FztORty9SKgtOZUNZNMB9CXLxZ54EWu4dArUE8WdTsw=="; + url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.9.tgz"; + sha512 = "qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA=="; }; }; "@types/babel__core-7.1.9" = { @@ -4135,13 +4144,13 @@ let sha512 = "dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ=="; }; }; - "@types/express-serve-static-core-4.17.9" = { + "@types/express-serve-static-core-4.17.12" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.9"; + version = "4.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.9.tgz"; - sha512 = "DG0BYg6yO+ePW+XoDENYz8zhNGC3jDDEpComMYn7WJc4mY1Us8Rw9ax2YhJXxpyk2SF47PQAoQ0YyVT1a0bEkA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.12.tgz"; + sha512 = "EaEdY+Dty1jEU7U6J4CUWwxL+hyEGMkO5jan5gplfegUgCUsIUWqXxqw47uGjimeT4Qgkz/XUfwoau08+fgvKA=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -4297,13 +4306,13 @@ let sha512 = "4jkASx74qGl2OUK8NNFEq10QP0MXriOIqeBeNb1IdevHP8k8VDqS5Uv6nIixAA6ZUjjF6/SwOvecrjXkbcaFzw=="; }; }; - "@types/json-schema-7.0.5" = { + "@types/json-schema-7.0.6" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz"; - sha512 = "7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; }; }; "@types/json5-0.0.29" = { @@ -4351,13 +4360,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.160" = { + "@types/lodash-4.14.161" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.160"; + version = "4.14.161"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.160.tgz"; - sha512 = "aP03BShJoO+WVndoVj/WNcB/YBPt+CIU1mvaao2GRAHy2yg4pT/XS4XnVHEQBjPJGycWf/9seKEO9vopTJGkvA=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz"; + sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; "@types/long-4.0.1" = { @@ -4414,13 +4423,13 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; - "@types/node-10.17.28" = { + "@types/node-10.17.29" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.28"; + version = "10.17.29"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.28.tgz"; - sha512 = "dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.29.tgz"; + sha512 = "zLo9rjUeQ5+QVhOufDwrb3XKyso31fJBJnk9wUUQIBDExF/O4LryvpOfozfUaxgqifTnlt7FyqsAPXUq5yFZSA=="; }; }; "@types/node-12.7.12" = { @@ -4432,31 +4441,31 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.15" = { + "@types/node-13.13.16" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.15"; + version = "13.13.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.15.tgz"; - sha512 = "kwbcs0jySLxzLsa2nWUAGOd/s21WU1jebrEdtzhsj1D4Yps1EOuyI1Qcu+FD56dL7NRNIJtDDjcqIG22NwkgLw=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.16.tgz"; + sha512 = "dJ9vXxJ8MEwzNn4GkoAGauejhXoKuJyYKegsA6Af25ZpEDXomeVXt5HUWUNVHk5UN7+U0f6ghC6otwt+7PdSDg=="; }; }; - "@types/node-14.6.0" = { + "@types/node-14.6.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.6.0"; + version = "14.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.6.0.tgz"; - sha512 = "mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.6.3.tgz"; + sha512 = "pC/hkcREG6YfDfui1FBmj8e20jFU5Exjw4NYDm8kEdrW+mOh0T1Zve8DWKnS7ZIZvgncrctcNCXF4Q2I+loyww=="; }; }; - "@types/node-6.14.10" = { + "@types/node-6.14.11" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.14.10"; + version = "6.14.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.14.10.tgz"; - sha512 = "pF4HjZGSog75kGq7B1InK/wt/N08BuPATo+7HRfv7gZUzccebwv/fmWVGs/j6LvSiLWpCuGGhql51M/wcQsNzA=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.14.11.tgz"; + sha512 = "htzPk08CmbGFjgIWaJut1oW2roZAAQxxOhkhsehCVLE7Uocx9wkcHfIQYdBWO7KqbuRvYrdBQtl5h5Mz/GxehA=="; }; }; "@types/node-fetch-2.5.7" = { @@ -4846,40 +4855,40 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.8.3" = { + "@uifabric/foundation-7.9.0" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.8.3.tgz"; - sha512 = "8b5gFeZlBb039iqx0iDZLMV4Pya1l10xJzCteg/C0B66GaKuJuW0sMv8GuFSsqXHnqMuzoakKqyq8zsRIN96Uw=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.0.tgz"; + sha512 = "4gdPwx0HV59aWvPKIw6yIje60CYwJZmTJsdLRXqh8Np1tWp2EsbA8U/IHQL1V91rEN0DlQhASqCDFhfQoD1jUw=="; }; }; - "@uifabric/icons-7.4.3" = { + "@uifabric/icons-7.5.0" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.4.3"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.4.3.tgz"; - sha512 = "/3+JxAXOGKeJAIQlLDFfiQaw7RSnLNWU3BnXbOCWRIzBAJme6XbvU3Oiy6Sgq79CEuSx1gwe8EifYvM8OFMYNA=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.0.tgz"; + sha512 = "RINA9VkajlCnlwEBbqiwLBaaGn38Bf9UvjOuwrrja4B9lclLeQzZuGrG/kp7CnDtIO+LC19OYl/7E3jW7yIihA=="; }; }; - "@uifabric/merge-styles-7.17.0" = { + "@uifabric/merge-styles-7.18.0" = { name = "_at_uifabric_slash_merge-styles"; packageName = "@uifabric/merge-styles"; - version = "7.17.0"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.17.0.tgz"; - sha512 = "UFG0pKqjz6iGcYhDFDSb2br5TEOys90mCaXeXPln8QrIc5NTJG1gWeO4znG6r65e23Ab/hBz+lmoyfYxgr3fZw=="; + url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.18.0.tgz"; + sha512 = "805WIbN7lAJATXKxZjjRbIgN7raRMwWYWeDkJJ52PCPuCesOvbpdr0GkH8rC6GQ7EB0MB7YM2i6Fiye7SFewbw=="; }; }; - "@uifabric/react-hooks-7.10.0" = { + "@uifabric/react-hooks-7.11.0" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.10.0.tgz"; - sha512 = "zbxsFrXexfj5bPDBDh4BNFZj8vs8Jf6jmvZYRk+r/ZtvfceDyjuWcF+fYc2fjCon6pDfL5N8/S5Bc4NRw6sfvw=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.11.0.tgz"; + sha512 = "iU7c+JR+rY5kBTPmrF8F6iJBQw309MX/MvOx6ElhmNceBaa8BqDuqR9+TVfkH+Bxp37bmZnCaQF5w4+QWHZ81g=="; }; }; "@uifabric/set-version-7.0.22" = { @@ -4891,22 +4900,22 @@ let sha512 = "IG35UNJNxqI7NC2eYuobGTD+v4W0VHQcC3bYd5Na9EgoC9jVgguS8n6EXUtP/lC1vJEYEyPEZdVwhPxKw4F4Sw=="; }; }; - "@uifabric/styling-7.15.3" = { + "@uifabric/styling-7.16.0" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.15.3"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.15.3.tgz"; - sha512 = "P8xHumpnr2De6AyiHhi0GBUf6HpV2R/wS8c5fSEhMpMomXjWQrnVeq7OS+896Qw/qCgvT/brjXAI2EzqEPwuvg=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.0.tgz"; + sha512 = "yO404ws8Wl4fjBwG4T58TFJjeU/K+SpWJ4w+WeNMDlJcYe4zXaWn2lbOJtKtQiMl324RAEjFSOuNkXzPb0uOGQ=="; }; }; - "@uifabric/utilities-7.30.0" = { + "@uifabric/utilities-7.31.0" = { name = "_at_uifabric_slash_utilities"; packageName = "@uifabric/utilities"; - version = "7.30.0"; + version = "7.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.30.0.tgz"; - sha512 = "NO+XkCBsaxVzOA+JytgSGAK3ihPDG5XLPQQhFbAXSEc5eC6qzcSY6JswRPy3hC1DIWicTUh+iTrDbb+x2vZ8Wg=="; + url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.31.0.tgz"; + sha512 = "m4Yeyn4gyW7xS8LvOnCesokPModYS2YuE9GQmO++MDZ/vC5RRNlvlyktUZDuxCZ84cNCiXyTQ8nImBaPGnxHVQ=="; }; }; "@vue/cli-shared-utils-4.5.4" = { @@ -4945,76 +4954,76 @@ let sha512 = "/7R3dMrv/tEP4AM22hBDPfXPF24OE/2ddR3cTF1c1fSoHT/LcUvqrlHIb8SlVgl3S7WvF9Prrunp+KzkHW9bSA=="; }; }; - "@vue/compiler-core-3.0.0-rc.9" = { + "@vue/compiler-core-3.0.0-rc.10" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0-rc.9.tgz"; - sha512 = "/Ns7KGT5P0wh4JTM91drBmNIiBlKrCFUqIE2vk8dmaVvqEJf1mqympz1CDZpikghCQC6hKu3tYKxA7qtcMRazw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0-rc.10.tgz"; + sha512 = "kQzHzRsM0NPAWHeqSTb2J4VsHhjRkGeLTsGzeMnW+sojgTnS3T94KacwvYgVS4qeZAKiDq0bMNZoJWrHVQ3T8g=="; }; }; - "@vue/compiler-dom-3.0.0-rc.9" = { + "@vue/compiler-dom-3.0.0-rc.10" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.9.tgz"; - sha512 = "0hCnrIxwp0TKVXKnGYFztM4LMUvFpfXW7YoEglvHqIfZsGkyKcnCYDx4FPk1frDM21xnrr5HgcHt42rlz8lDBA=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.10.tgz"; + sha512 = "pqIUf5leZm0P9379utrRSVBMxhV8XaqJTEFFp5etCtbEa/H5ALs29EjFMtMcm9sQaVkZlKLu86mgIacbYB9Q3w=="; }; }; - "@vue/compiler-sfc-3.0.0-rc.9" = { + "@vue/compiler-sfc-3.0.0-rc.10" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.9.tgz"; - sha512 = "kmjGzcyp93Q+ZKfvxC3GtI9bEXCa9TxsuO+Q9WtiyvOWBLxZkklQc1n5DFn6vtAUIjjlIE5GZoKawvn9LfKejA=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.10.tgz"; + sha512 = "VIJ+VXqeM7WoRNgD9uYSARVb6CYq+JS2NNHfeerfNc7Uk3pjYHRv1MwEicAvN6zWFm5GLC1ZYTVD+WFg3xGAkQ=="; }; }; - "@vue/compiler-ssr-3.0.0-rc.9" = { + "@vue/compiler-ssr-3.0.0-rc.10" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.9.tgz"; - sha512 = "lpbnkJrhkI5QgprLPXcB1Uq402QiibPFKRUQZ5vu3zeAvUeMYuQUtZS/Dslurcvqd1dbBC/HM0gCpLtjEQ+2qA=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.10.tgz"; + sha512 = "JBPil8sO5j7puB8acX2CQMRXEYB/EP8PoEur7RcF/+aqATI7C4yqWcSLC5TRJpigj6xE6ku6sx8om+j7ZHvgBw=="; }; }; - "@vue/reactivity-3.0.0-rc.9" = { + "@vue/reactivity-3.0.0-rc.10" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0-rc.9.tgz"; - sha512 = "1fJSt4zZ/icZUNsN3Te5BeVChmQ7Ner2xUYy9ALtShLSj2RwxRVhtysjXxLE16TbwLkHjsOHjA8tQWrdBfQG0A=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0-rc.10.tgz"; + sha512 = "mkUZfOJlbqGZx2cARmhCs5r2+xLJPL7VFNagmlA3Fd66ZXBc3ZvTQdYsY4VUbYJFe5ByIzqu9TZiAkzXY+JVaA=="; }; }; - "@vue/runtime-core-3.0.0-rc.9" = { + "@vue/runtime-core-3.0.0-rc.10" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0-rc.9.tgz"; - sha512 = "5tViEzPl8K1moMjCQJXqvTa/RjR/h8cZ9dUDgKfKWvZhxAmXHtmYlBWrvEeFTGWiEuZj0XlZkNxMNjuHLVF0Vg=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0-rc.10.tgz"; + sha512 = "VK/kq4gDDoqZ45CVwdbLLpikXLYLCt6YLhdgXX3fhf20gvPqrbEZv1ZNLruNnhhTpf9cLyU4tZ18DHeaUYPziw=="; }; }; - "@vue/runtime-dom-3.0.0-rc.9" = { + "@vue/runtime-dom-3.0.0-rc.10" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.9.tgz"; - sha512 = "OUKFLOaoshmQPaW7iaYuxl9ip3v08g8cXYr0bu68/0r94PF2/xO/b0GhoUoyeqp/pu1VzZ1TxulJ94JOXsuYjg=="; + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.10.tgz"; + sha512 = "bH4GuneHt3FQ+/21jba5orM/CO9N1cnT7J3wtrxopFJ4/4H5cvHXyG6v+ZVTu1d733Ij/6yMRA7xbtfi9a4zJw=="; }; }; - "@vue/shared-3.0.0-rc.9" = { + "@vue/shared-3.0.0-rc.10" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0-rc.9.tgz"; - sha512 = "SHD7qwziiG6208nKrs0qqbWbYckvBiCBCLwlRjUb6NEDUMN0TOVyzyaTvdnHND9ion/ZMdwEKMtWWtgJJkHDdw=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0-rc.10.tgz"; + sha512 = "fI6gVhhgb3cAmEkY4oeVVA2hWZ2xvkgogHdBI5PL7gSvZnOB6XZ2eQGsYjC4W+7BegvEkoMBuZsFXVa4ZQ07XQ=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -5395,22 +5404,22 @@ let sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; - "@yarnpkg/core-2.1.1" = { + "@yarnpkg/core-2.2.2" = { name = "_at_yarnpkg_slash_core"; packageName = "@yarnpkg/core"; - version = "2.1.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/core/-/core-2.1.1.tgz"; - sha512 = "qeBxz8nHjKAbGTP2ZcXBnXGfM7+cN0A73mIai/24uru1ayvCIgfjWL1uIj/MM+m+K5lJX0Dcn94ZBHWits9JWQ=="; + url = "https://registry.npmjs.org/@yarnpkg/core/-/core-2.2.2.tgz"; + sha512 = "TQ0wqQjbZQDrf31N5v4NtE4Juw1c16hYu9QwNloUxRgY/Z+AQIuqa6Jgv9BbAghchZkSIXDWp6bFGD7C+q7cuA=="; }; }; - "@yarnpkg/fslib-2.1.0" = { + "@yarnpkg/fslib-2.2.1" = { name = "_at_yarnpkg_slash_fslib"; packageName = "@yarnpkg/fslib"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.1.0.tgz"; - sha512 = "E+f8w5yQZnTf1soyTWy7qdf+GmHsY+A0yEN4Di44/Txk6XRIMruyc1ShDi93mOI6ilnXxD87rNms18zJ8WnspA=="; + url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.2.1.tgz"; + sha512 = "7SzLP/RHt8lEOaCTg6hMMrnxc2/Osbu3+UPwLZiZiGtLpYqwtTgtWTlAqddS3+MESXOZhc+3gKLX0lfqm6oWuw=="; }; }; "@yarnpkg/json-proxy-2.1.0" = { @@ -5422,13 +5431,13 @@ let sha512 = "rOgCg2DkyviLgr80mUMTt9vzdf5RGOujQB26yPiXjlz4WNePLBshKlTNG9rKSoKQSOYEQcw6cUmosfOKDatrCw=="; }; }; - "@yarnpkg/libzip-2.1.0" = { + "@yarnpkg/libzip-2.2.0" = { name = "_at_yarnpkg_slash_libzip"; packageName = "@yarnpkg/libzip"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.1.0.tgz"; - sha512 = "39c7KuSWcYUqVxlBLZwfqdD/D6lS+jplNVWd6uAnk8EpnacaYGJRegvkqWyfw5c8KHukNMeEGF5JHrXPZYBM0w=="; + url = "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.2.0.tgz"; + sha512 = "/YRSPJbPAvHeCJxcXJrUV4eRP9hER6YB6LyZxsFlpyF++eqdOzNu0WsuXRRJxfqYt3hl7SiGFkL23qB9jqC6cw=="; }; }; "@yarnpkg/lockfile-1.1.0" = { @@ -5440,31 +5449,31 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-2.1.0" = { + "@yarnpkg/parsers-2.2.0" = { name = "_at_yarnpkg_slash_parsers"; packageName = "@yarnpkg/parsers"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-2.1.0.tgz"; - sha512 = "75OYQ6PMs1C3zm+W+T1xhLyVDX78zXQGEVHpWd4o/QwpAbhneB3/5FXVGRzI3gjPPWWSb/pKOPB1S6p0xmQD2Q=="; + url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-2.2.0.tgz"; + sha512 = "k1XZaWYRHl7wCj04hcbtzKfPAZbKbsEi7xsB1Ka8obdS6DRnAw7n0gZPvvGjOoqkH95IqWf+Vi7vV5RhlGz63Q=="; }; }; - "@yarnpkg/pnp-2.1.0" = { + "@yarnpkg/pnp-2.2.1" = { name = "_at_yarnpkg_slash_pnp"; packageName = "@yarnpkg/pnp"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/pnp/-/pnp-2.1.0.tgz"; - sha512 = "b8NlB71EFifv1jDX47nFaRXrykROxHcS7YuGb2dQ+Gp9gqJ0thIaZ3yB9+qWF8acdWtNcMpjCug4xkfAAR5Odw=="; + url = "https://registry.npmjs.org/@yarnpkg/pnp/-/pnp-2.2.1.tgz"; + sha512 = "jrwJ3Q6M+nMs4n0O/GgxayU1Bq9mpLoZW2Mb8Nt2fs5whB0CeCr1/pGl9+yiCSjirv9jjp51TVFqF7OPvXy+gA=="; }; }; - "@yarnpkg/shell-2.1.0" = { + "@yarnpkg/shell-2.2.0" = { name = "_at_yarnpkg_slash_shell"; packageName = "@yarnpkg/shell"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/shell/-/shell-2.1.0.tgz"; - sha512 = "9i9ZWqeKHGV0DOfdxTVq5zl73Li8Fg947v57uLBEaytNF+HywkDfouNkg/6HfgBrpI0WH8OJ9Pz/uDaE5cpctw=="; + url = "https://registry.npmjs.org/@yarnpkg/shell/-/shell-2.2.0.tgz"; + sha512 = "IuOZhYxTydNySqP2HlKkfm1QjgCAgVBUZz5O5rXXxpS4vTNSa0q6fwqvNUSrHSWGKH/jAmJS23YbJqislj5wjg=="; }; }; "@zeit/schemas-2.6.0" = { @@ -6502,13 +6511,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.30.2" = { + "apollo-2.30.3" = { name = "apollo"; packageName = "apollo"; - version = "2.30.2"; + version = "2.30.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.30.2.tgz"; - sha512 = "CKQVvfjbeFPVew9q/dGuRNpohenK7oBTKNnwDs89ImEGoPDd7BpXRQUu/mNjUANoDpd2ztYRwO+ZxxVE8P4+sA=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.30.3.tgz"; + sha512 = "5X0a2PaMOYUWhk0DIRzzwu18j6WiVWIvgmciQHY++QV+aKngspXWeqAn+mugSkwkC/GVycl/0Jv/OCdnemE7Og=="; }; }; "apollo-cache-1.3.5" = { @@ -6547,49 +6556,49 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.37.8" = { + "apollo-codegen-core-0.37.9" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.37.8"; + version = "0.37.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.8.tgz"; - sha512 = "5mIF75iJCGaPXPvWthQjrWKb6YD7KRioODAM6OF5r+foN70Mli2S3g7wCsnmQ0J1TtstntHVnXykHsWClj4NIg=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.9.tgz"; + sha512 = "FfsLh/DZkwH1fb5mNaVonBVk9JdJp3D/Bj1AGthw9ldZmd/3s79YfsYXqOsCNJM1TZt6K/du08NMHSLS86YQBA=="; }; }; - "apollo-codegen-flow-0.35.8" = { + "apollo-codegen-flow-0.35.9" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.35.8"; + version = "0.35.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.8.tgz"; - sha512 = "nqTIvqmidL3/k6k0HcJOQfr/vG6a3i2CCKa+w1UwAR9zRJn487lvT3QGSRNuYaohB/wBdGtNk3a1V2FvFyH/xg=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.9.tgz"; + sha512 = "+9gJLQfSy04Y4DwPpicGLpKQ1GORo07sxQWKqJWMtVRj4exKMFXieNawDUKErvxqiwDKXcBO9B1q5MF8BcwWlA=="; }; }; - "apollo-codegen-scala-0.36.8" = { + "apollo-codegen-scala-0.36.9" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.36.8"; + version = "0.36.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.8.tgz"; - sha512 = "6/ulLUqlKUTac5mZNAaFtzYn5LnJbXeMLftCl1NL4dyzFRn4rj+gZjDRP5e74GfDCqLAMSPyVt/6OFBxFKrs7w=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.9.tgz"; + sha512 = "t1ew6IXsFL+sNvyy/kS0VWv8t1WjxC46lt1ISt5v5bgDVyGo2g+cH93SSeEFUjtv+hK3TyqSO1fM0SLHAy8oJA=="; }; }; - "apollo-codegen-swift-0.37.8" = { + "apollo-codegen-swift-0.37.9" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.37.8"; + version = "0.37.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.8.tgz"; - sha512 = "qRqXZg2fLBm5OhJopVwh3Y3RLXeurwAj+bH3xcpxiAX05qci9MVOxwej05nmSu4GUv1csJSLDn93ZjQfByabkQ=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.9.tgz"; + sha512 = "4N8s2yni41/jjbfsyoJ4yxbW8XbL6HbUbxRgvbmckGtoOjQS06PYUD56IibQWbsaBs8gEpu5Z/rE/dL2Y6hZug=="; }; }; - "apollo-codegen-typescript-0.37.8" = { + "apollo-codegen-typescript-0.37.9" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.37.8"; + version = "0.37.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.8.tgz"; - sha512 = "cYysqRnW2h1xKFEZH0o636IeKvWBeeTDZmNZEyfMcl2TtyMRd0cOFUmA0gokX0JK/QzvJuTJgBKD9le9W8wV2w=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.9.tgz"; + sha512 = "DFBa8vUbiVmd/kGG/mjq6umwWxFRYtzllmt2fwHIVCi9z4vDD8Y+6p9acwOxqjqKCVaJshRQCh94zGuW0gY6vA=="; }; }; "apollo-datasource-0.7.2" = { @@ -6637,13 +6646,22 @@ let sha512 = "YSdF/BKPbsnQpxWpmCE53pBJX44aaoif31Y22I/qKpB6ZSGzYijV5YBoCL5Q15H2oA/v/02Oazh9lbp4ek3eig=="; }; }; - "apollo-language-server-1.23.3" = { + "apollo-graphql-0.6.0" = { + name = "apollo-graphql"; + packageName = "apollo-graphql"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.6.0.tgz"; + sha512 = "BxTf5LOQe649e9BNTPdyCGItVv4Ll8wZ2BKnmiYpRAocYEXAVrQPWuSr3dO4iipqAU8X0gvle/Xu9mSqg5b7Qg=="; + }; + }; + "apollo-language-server-1.23.4" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.23.3"; + version = "1.23.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.23.3.tgz"; - sha512 = "WbK5tlqDpyy5TKjo1tjLIAeeTjlpZpvXURB1Qlx7ZfTqaG1846u9lgYpKw6Ydx/+1Viy60K8z530/gOgI/KmvQ=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.23.4.tgz"; + sha512 = "PaA25SsAQ30iXfR0noESlNYDNb4RH5S7tjVxBTj53VRArp/gQDWJM6eDvFbH5RH3vXXpfHRVna6YfymDfTPdqg=="; }; }; "apollo-link-1.2.14" = { @@ -6727,13 +6745,13 @@ let sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ=="; }; }; - "apollo-server-core-2.16.1" = { + "apollo-server-core-2.17.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.16.1"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.16.1.tgz"; - sha512 = "nuwn5ZBbmzPwDetb3FgiFFJlNK7ZBFg8kis/raymrjd3eBGdNcOyMTJDl6J9673X9Xqp+dXQmFYDW/G3G8S1YA=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.17.0.tgz"; + sha512 = "rjAkBbKSrGLDfg/g5bohnPlQahmkAxgEBuMDVsoF3aa+RaEPXPUMYrLbOxntl0LWeLbPiMa/IyFF43dvlGqV7w=="; }; }; "apollo-server-env-2.4.5" = { @@ -6754,13 +6772,13 @@ let sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; }; }; - "apollo-server-express-2.16.1" = { + "apollo-server-express-2.17.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.16.1"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.16.1.tgz"; - sha512 = "Oq5YNcaMYnRk6jDmA9LWf8oSd2KHDVe7jQ4wtooAvG9FVUD+FaFBgSkytXHMvtifQh2wdF07Ri8uDLMz6IQjTw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.17.0.tgz"; + sha512 = "PonpWOuM1DH3Cz0bu56Tusr3GXOnectC6AD/gy2GXK0v84E7tKTuxEY3SgsgxhvfvvhfwJbXTyIogL/wezqnCw=="; }; }; "apollo-server-plugin-base-0.9.1" = { @@ -6781,13 +6799,13 @@ let sha512 = "my2cPw+DAb2qVnIuBcsRKGyS28uIc2vjFxa1NpRoJZe9gK0BWUBk7wzXnIzWy3HZ5Er11e/40MPTUesNfMYNVA=="; }; }; - "apollo-tracing-0.11.1" = { + "apollo-tracing-0.11.2" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.1.tgz"; - sha512 = "l7g+uILw7v32GA46IRXIx5XXbZhFI96BhSqrGK9yyvfq+NMcvVZrj3kIhRImPGhAjMdV+5biA/jztabElAbDjg=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.2.tgz"; + sha512 = "QjmRd2ozGD+PfmF6U9w/w6jrclYSBNczN6Bzppr8qA5somEGl5pqdprIZYL28H0IapZiutA3x6p6ZVF/cVX8wA=="; }; }; "apollo-upload-client-11.0.0" = { @@ -7618,15 +7636,6 @@ let sha512 = "XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA=="; }; }; - "ast-types-0.13.4" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.13.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz"; - sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; - }; - }; "ast-types-0.14.1" = { name = "ast-types"; packageName = "ast-types"; @@ -8005,13 +8014,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.740.0" = { + "aws-sdk-2.745.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.740.0"; + version = "2.745.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.740.0.tgz"; - sha512 = "cSedIe7g5/S5o23jHvm9+vWhcYysmuKrmbML1Z0pO9KxlqOA9s4Z5f6Il7ZmvAktfmrxu1SyQu4YEoP5DL4/zw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.745.0.tgz"; + sha512 = "YTmDvxb0foJC/iZOSsn+MdO4g9nPnlyRdhIpFqvPUkrFzWn5rP4mPtDJan2Eu0j4R02pdwfDhmvr82ckH2w7OQ=="; }; }; "aws-sign2-0.6.0" = { @@ -9058,13 +9067,13 @@ let sha512 = "5LhLQeGxdVFumJTbveJS16Rc+Vzh/nbC6o80UMj6ZRvSkiVkk+4L782OMYI0VG1JTfUxiRFP4f+CZBFyuclLBg=="; }; }; - "bl-1.2.2" = { + "bl-1.2.3" = { name = "bl"; packageName = "bl"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; - sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; + url = "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz"; + sha512 = "pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww=="; }; }; "bl-4.0.3" = { @@ -9211,13 +9220,13 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "blueimp-md5-2.16.0" = { + "blueimp-md5-2.17.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.16.0"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.16.0.tgz"; - sha512 = "j4nzWIqEFpLSbdhUApHRGDwfXbV8ALhqOn+FY5L6XBdKPAXU9BpGgFSbDsgqogfqPPR9R2WooseWCsfhfEC6uQ=="; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.17.0.tgz"; + sha512 = "x5PKJHY5rHQYaADj6NwPUR2QRCUVSggPzrUKkeENpj871o9l9IefJbO2jkT5UvYykeOK9dx0VmkIo6dZ+vThYw=="; }; }; "bn.js-4.11.9" = { @@ -9319,6 +9328,15 @@ let sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; }; }; + "bootstrap-3.4.1" = { + name = "bootstrap"; + packageName = "bootstrap"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz"; + sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="; + }; + }; "bootstrap-vue-helper-json-1.1.1" = { name = "bootstrap-vue-helper-json"; packageName = "bootstrap-vue-helper-json"; @@ -10417,13 +10435,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001118" = { + "caniuse-lite-1.0.30001123" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001118"; + version = "1.0.30001123"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001118.tgz"; - sha512 = "RNKPLojZo74a0cP7jFMidQI7nvLER40HgNfgKQEJ2PFm225L0ectUungNQoK3Xk3StQcFbpBPNEvoWD59436Hg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001123.tgz"; + sha512 = "03dJDoa4YC4332jq0rqwiM+Hw6tA5RJtrnZKvOQy7ASoIUv8CinkcmGhYpCvCjedvkBQrrKnkcELxrUSW/XwNQ=="; }; }; "capital-case-1.0.3" = { @@ -11209,13 +11227,13 @@ let sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; }; }; - "cli-boxes-2.2.0" = { + "cli-boxes-2.2.1" = { name = "cli-boxes"; packageName = "cli-boxes"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz"; - sha512 = "gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w=="; + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz"; + sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; }; }; "cli-color-0.1.7" = { @@ -11371,13 +11389,13 @@ let sha512 = "s48Efw04VtGyQEwXDrERobMc2DF2DyYQ+2nmNsM7clxOVDtbRI9OjbXRwPeS6G2aFuHy0bB8GUq5MzkmkYt7yw=="; }; }; - "cli-ux-5.4.9" = { + "cli-ux-5.5.0" = { name = "cli-ux"; packageName = "cli-ux"; - version = "5.4.9"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.9.tgz"; - sha512 = "4yCKJbFQqNQxf1v0E5T5aBJLt3SbW6dXc/R7zHp4ycdPMg9fAy5f2vhPsWgXEGCMQg+fgN0Sp7EYcZ1XGkFyUA=="; + url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.5.0.tgz"; + sha512 = "aXoHgEOtkem8sJmQrU/jXsojCq8uOp8++9lybCbt9mFDyPouSNawSdoPjuM00PPaSPCJThvY0VNYOQNd6gGQCA=="; }; }; "cli-width-1.1.1" = { @@ -11434,13 +11452,13 @@ let sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; }; }; - "clipanion-2.4.4" = { + "clipanion-2.5.0" = { name = "clipanion"; packageName = "clipanion"; - version = "2.4.4"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/clipanion/-/clipanion-2.4.4.tgz"; - sha512 = "KjyCBz8xplftHjIK/nOqq/9b3hPlXbAAo/AxoITrO4yySpQ6a9QSJDAfOx9PfcRUHteeqbdNxZKSPfeFqQ7plg=="; + url = "https://registry.npmjs.org/clipanion/-/clipanion-2.5.0.tgz"; + sha512 = "VYOMl0h/mZXQC2BWq7oBto1zY1SkPWUaJjt+cuIred1HrmrcX1I2N+LNyNoRy8Iwu9r6vUxJwS/tWLwhQW4tPw=="; }; }; "clipboard-2.0.6" = { @@ -12253,6 +12271,15 @@ let sha512 = "s7EA+hDtTYNhuXkTlhqew4txMZVdszBmKWSPEMxGr8ru8JXR7bLUFIAtPhcSuFdJQ0ILMxnJi8GkQL0yvDy/YA=="; }; }; + "commander-6.1.0" = { + name = "commander"; + packageName = "commander"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz"; + sha512 = "wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -13262,13 +13289,13 @@ let sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw=="; }; }; - "cpy-8.1.0" = { + "cpy-8.1.1" = { name = "cpy"; packageName = "cpy"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cpy/-/cpy-8.1.0.tgz"; - sha512 = "XwlImkjPxMr01qXqC564VD4rfcDQ2eKtYmFlCy0ixsLRJ1cwYVUBh+v47jsQTO1IrmvdjqO813VpDQ0JiTuOdA=="; + url = "https://registry.npmjs.org/cpy/-/cpy-8.1.1.tgz"; + sha512 = "vqHT+9o67sMwJ5hUd/BAOYeemkU+MuFRsK2c36Xc3eefQpAsp1kAsyDxEDcc5JS1+y9l/XHPrIsVTcyGGmkUUQ=="; }; }; "crc-0.2.0" = { @@ -14162,6 +14189,15 @@ let sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ=="; }; }; + "dataloader-2.0.0" = { + name = "dataloader"; + packageName = "dataloader"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dataloader/-/dataloader-2.0.0.tgz"; + sha512 = "YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ=="; + }; + }; "date-fns-1.30.1" = { name = "date-fns"; packageName = "date-fns"; @@ -14225,13 +14261,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.34" = { + "dayjs-1.8.35" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.34"; + version = "1.8.35"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.34.tgz"; - sha512 = "Olb+E6EoMvdPmAMq2QoucuyZycKHjTlBXmRx8Ada+wGtq4SIXuDCdtoaX4KkK0yjf1fJLnwXQURr8gQKWKaybw=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.35.tgz"; + sha512 = "isAbIEenO4ilm6f8cpqvgjZCsuerDAz2Kb7ri201AiNn58aqXuaLJEnCtfIMdCvERZHNGRY5lDMTr/jdAnKSWQ=="; }; }; "deasync-0.1.15" = { @@ -16223,13 +16259,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.549" = { + "electron-to-chromium-1.3.560" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.549"; + version = "1.3.560"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.549.tgz"; - sha512 = "q09qZdginlqDH3+Y1P6ch5UDTW8nZ1ijwMkxFs15J/DAWOwqolIx8HZH1UP0vReByBigk/dPlU22xS1MaZ+kpQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.560.tgz"; + sha512 = "0cEFfOA3sNXfSxo0FIClBhrLVSe/QO9LBiqmmYPm3N/IYyt41NRTa2EhvOMWAOKpjd91t/rq062yhnJzfVMKkQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -17115,13 +17151,13 @@ let sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; }; }; - "eslint-7.7.0" = { + "eslint-7.8.1" = { name = "eslint"; packageName = "eslint"; - version = "7.7.0"; + version = "7.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz"; - sha512 = "1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.8.1.tgz"; + sha512 = "/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w=="; }; }; "eslint-plugin-no-unsanitized-3.1.2" = { @@ -17142,13 +17178,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.0.0-beta.2" = { + "eslint-plugin-vue-7.0.0-beta.3" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.0.0-beta.2"; + version = "7.0.0-beta.3"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.0.0-beta.2.tgz"; - sha512 = "EpAVWT62JTM7Yo6IUJIaIvNMSuayDaMVMXv1SC96d1/7nyx18U0FrLRKpN2GdTY8Efi4UepgR75XW7ucSRiI7A=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.0.0-beta.3.tgz"; + sha512 = "/p23IRPN9gFNN7dzesrctt06Kvs9E3VRB8BGIAPSEaQNk5yhlKUzntPARjUpsTWW+DQg0mqglZptfkUJK4+4EQ=="; }; }; "eslint-scope-3.7.3" = { @@ -17331,13 +17367,13 @@ let sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; }; }; - "esrecurse-4.2.1" = { + "esrecurse-4.3.0" = { name = "esrecurse"; packageName = "esrecurse"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; - sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; }; }; "essentials-1.1.1" = { @@ -17583,13 +17619,13 @@ let sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; - "eventemitter3-4.0.6" = { + "eventemitter3-4.0.7" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.6.tgz"; - sha512 = "s3GJL04SQoM+gn2c14oyqxvZ3Pcq7cduSDqy3sBFXx6UPSUmgVYwQM9zwkTn9je0lrfg0gHEwR42pF3Q2dCQkQ=="; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; }; "events-1.1.1" = { @@ -17718,15 +17754,6 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-2.1.0" = { - name = "execa"; - packageName = "execa"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz"; - sha512 = "Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw=="; - }; - }; "execa-3.4.0" = { name = "execa"; packageName = "execa"; @@ -19041,13 +19068,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.132.0" = { + "flow-parser-0.133.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.132.0"; + version = "0.133.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.132.0.tgz"; - sha512 = "y1P37zDCPSdphlk+w+roCqcOar6iQdNaAJldJ6xx5/2r4ZRv4KHO+qL+AXwPWp+34eN+oPxPjWnU7GybJnyISQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.133.0.tgz"; + sha512 = "ONvDDUcQVY7bMQG4ht7Ti+2IYjBBPphkc7fGmHXZHrrNNjGG4tykLZjIrIx710/k77x2djaY9VKlHC342Luy3A=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -20211,13 +20238,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "getmac-5.11.0" = { + "getmac-5.15.0" = { name = "getmac"; packageName = "getmac"; - version = "5.11.0"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-5.11.0.tgz"; - sha512 = "p3g41fJt9du5KKkIXaJm7bcUrwUxn8Jg/8AVBgUmBNdCCorczRJXHLqWSETJuib9dptwNuNcfbct/OoM/meiMA=="; + url = "https://registry.npmjs.org/getmac/-/getmac-5.15.0.tgz"; + sha512 = "+XN9PwRDWkZ1xFaQR5GOAPDqlK+eNi5M0QBfqeeJvFJaDrwZzplYg1N8uoOZSB9RtDoPcG58Xq2dOYnbZ23N2Q=="; }; }; "getpass-0.1.6" = { @@ -20391,15 +20418,6 @@ let sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; - "git-url-parse-11.1.2" = { - name = "git-url-parse"; - packageName = "git-url-parse"; - version = "11.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.1.2.tgz"; - sha512 = "gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ=="; - }; - }; "git-url-parse-11.1.3" = { name = "git-url-parse"; packageName = "git-url-parse"; @@ -20941,6 +20959,15 @@ let sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww=="; }; }; + "got-11.6.0" = { + name = "got"; + packageName = "got"; + version = "11.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-11.6.0.tgz"; + sha512 = "ErhWb4IUjQzJ3vGs3+RR12NWlBDDkRciFpAkQ1LPUxi6OnwhGj07gQxjPsyIk69s7qMihwKrKquV6VQq7JNYLA=="; + }; + }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -21112,15 +21139,6 @@ let sha512 = "6WzlBFC0lWmXJbIVE8OgFgXIP4RJi3OQgTPa0DVMsDXdpRDjTsM1K9wfl5HSYX7R87QAGlvcv2Y4BIZa/ItonA=="; }; }; - "graphql-tag-2.10.4" = { - name = "graphql-tag"; - packageName = "graphql-tag"; - version = "2.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.4.tgz"; - sha512 = "O7vG5BT3w6Sotc26ybcvLKNTdfr4GfsIVMD+LdYqXCeJIYPRyp8BIsDOUtxw7S1PYvRw5vH3278J2EDezR6mfA=="; - }; - }; "graphql-tag-2.11.0" = { name = "graphql-tag"; packageName = "graphql-tag"; @@ -22337,13 +22355,13 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; - "http-proxy-middleware-0.21.0" = { + "http-proxy-middleware-1.0.5" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; - version = "0.21.0"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.21.0.tgz"; - sha512 = "4Arcl5QQ6pRMRJmtM1WVHKHkFAQn5uvw83XuNeqnMTOikDiCoTxv5/vdudhKQsF+1mtaAawrK2SEB1v2tYecdQ=="; + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.0.5.tgz"; + sha512 = "CKzML7u4RdGob8wuKI//H8Ein6wNTEQR7yjVEzPbhBLGdOfkfvgTnp2HLnniKBDP9QW4eG10/724iTWLBeER3g=="; }; }; "http-signature-0.11.0" = { @@ -23057,13 +23075,13 @@ let sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw=="; }; }; - "ink-3.0.4" = { + "ink-3.0.5" = { name = "ink"; packageName = "ink"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-3.0.4.tgz"; - sha512 = "WURr4mZoIZNaIqrgRHS1QKJsZdhs4UEeZ7IFvQgGCE7xCgtC+Svu7f7MoEuVz2hexCsmOdBKrkhMCRwFncSe1A=="; + url = "https://registry.npmjs.org/ink/-/ink-3.0.5.tgz"; + sha512 = "Zc/Yoi3P0cY0DC9ryb3HTwmi4Qgke9332ebOhDRaK9Cw6D+ABAOQPeHG8IdmI1GOkMKRMZwTP/1jRs/b1D1n9Q=="; }; }; "ink-text-input-4.0.0" = { @@ -25280,13 +25298,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.18.2" = { + "jquery.terminal-2.18.3" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.18.2"; + version = "2.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.18.2.tgz"; - sha512 = "i6vjYLg+VwJu7r5rXggGx9ezB2o2VeBbGfAooliIANNQDLZSgh095+TtB7NeO/eS1Nfu6vHrXj5AjPL5v+9I8w=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.18.3.tgz"; + sha512 = "zzMVGYlAC+luF7Omm9UY1/nuvp00mozSgcGImObWSS3uDRtcxnxlwxQLC8tvlTT+koyfOvCBaWgB6AD4DvWVpQ=="; }; }; "js-base64-2.6.4" = { @@ -25550,13 +25568,13 @@ let sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; }; - "json-parse-even-better-errors-2.3.0" = { + "json-parse-even-better-errors-2.3.1" = { name = "json-parse-even-better-errors"; packageName = "json-parse-even-better-errors"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.0.tgz"; - sha512 = "o3aP+RsWDJZayj1SbHNQAI8x0v3T3SKiGoZlNYfbUP1S3omJQ6i9CnqADqkSPaOAxwua4/1YWx5CM7oiChJt2Q=="; + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; }; "json-parse-helpfulerror-1.0.3" = { @@ -27144,13 +27162,13 @@ let sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced"; }; }; - "locutus-2.0.11" = { + "locutus-2.0.12" = { name = "locutus"; packageName = "locutus"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/locutus/-/locutus-2.0.11.tgz"; - sha512 = "C0q1L38lK5q1t+wE0KY21/9szrBHxye6o2z5EJzU+5B79tubNOC+nLAEzTTn1vPUGoUuehKh8kYKqiVUTWRyaQ=="; + url = "https://registry.npmjs.org/locutus/-/locutus-2.0.12.tgz"; + sha512 = "wnzhY9xOdDb2djr17kQhTh9oZgEfp78zI27KRRiiV1GnPXWA2xfVODbpH3QgpIuUMLupM02+6X/rJXvktTpnoA=="; }; }; "lodash-2.4.2" = { @@ -29700,13 +29718,13 @@ let sha512 = "qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw=="; }; }; - "mem-6.1.0" = { + "mem-6.1.1" = { name = "mem"; packageName = "mem"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-6.1.0.tgz"; - sha512 = "RlbnLQgRHk5lwqTtpEkBTQ2ll/CG/iB+J4Hy2Wh97PjgZgXgWJWrFF+XXujh3UUVLvR4OOTgZzcWMMwnehlEUg=="; + url = "https://registry.npmjs.org/mem/-/mem-6.1.1.tgz"; + sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; "mem-fs-1.2.0" = { @@ -29898,13 +29916,13 @@ let sha512 = "3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg=="; }; }; - "meow-7.1.0" = { + "meow-7.1.1" = { name = "meow"; packageName = "meow"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-7.1.0.tgz"; - sha512 = "kq5F0KVteskZ3JdfyQFivJEj2RaA8NFsS4+r9DaMKLcUHpk5OcHS3Q0XkCXONB1mZRPsu/Y/qImKri0nwSEZog=="; + url = "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz"; + sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; }; }; "merge-1.2.1" = { @@ -30645,13 +30663,13 @@ let sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; - "mocha-8.1.2" = { + "mocha-8.1.3" = { name = "mocha"; packageName = "mocha"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.2.tgz"; - sha512 = "I8FRAcuACNMLQn3lS4qeWLxXqLvGf6r2CaLstDpZmMUUSmvW6Cnm1AuHxgbc7ctZVRcfwspCRbDHymPsi3dkJw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz"; + sha512 = "ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw=="; }; }; "mock-require-3.0.3" = { @@ -31203,13 +31221,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "mutexify-1.3.0" = { + "mutexify-1.3.1" = { name = "mutexify"; packageName = "mutexify"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mutexify/-/mutexify-1.3.0.tgz"; - sha512 = "WNPlgZ3AHETGSa4jeRP4aW6BPQ/a++MwoMFFIgrDg80+m70mbxuNOrevANfBDmur82zxTFAY3OwvMAvqrkV2sA=="; + url = "https://registry.npmjs.org/mutexify/-/mutexify-1.3.1.tgz"; + sha512 = "nU7mOEuaXiQIB/EgTIjYZJ7g8KqMm2D8l4qp+DqA4jxWOb/tnb1KEoqp+tlbdQIDIAiC1i7j7X/3yHDFXLxr9g=="; }; }; "muxrpc-6.5.0" = { @@ -31635,6 +31653,15 @@ let sha512 = "o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA=="; }; }; + "needle-2.5.2" = { + name = "needle"; + packageName = "needle"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz"; + sha512 = "LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ=="; + }; + }; "negotiator-0.3.0" = { name = "negotiator"; packageName = "negotiator"; @@ -31690,13 +31717,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-4.3.12" = { + "netlify-4.3.13" = { name = "netlify"; packageName = "netlify"; - version = "4.3.12"; + version = "4.3.13"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-4.3.12.tgz"; - sha512 = "uHyKa0wPwhTJblqY4uoxhOkR34I72o3rItJCpBPL4g+7ELDt88qk//WoV3p9CT1TX+sgXvLZuN92HHAM5OPk/w=="; + url = "https://registry.npmjs.org/netlify/-/netlify-4.3.13.tgz"; + sha512 = "nXiqUm89HOEGOzYiLtxGOUCZ+iJB01zxCMeolaQXaIia6UnFCw/jHMARGXMLpntxkgjclaMgMVzKO3aetbHAvQ=="; }; }; "netlify-redirect-parser-2.5.0" = { @@ -32951,22 +32978,22 @@ let sha512 = "pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ=="; }; }; - "oas-linter-3.1.3" = { + "oas-linter-3.2.0" = { name = "oas-linter"; packageName = "oas-linter"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.1.3.tgz"; - sha512 = "jFWBHjSoqODGo7cKA/VWqqWSLbHNtnyCEpa2nMMS64SzCUbZDk63Oe7LqQZ2qJA0K2VRreYLt6cVkYy6MqNRDg=="; + url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.2.0.tgz"; + sha512 = "LP5F1dhjULEJV5oGRg6ROztH2FddzttrrUEwq5J2GB2Zy938mg0vwt1+Rthn/qqDHtj4Qgq21duNGHh+Ew1wUg=="; }; }; - "oas-resolver-2.4.3" = { + "oas-resolver-2.4.4" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.3.tgz"; - sha512 = "+66lGk5GewIXoIkqxfeWp89M/SgQT67oITiuG6qNIUuq1gczIIy68ZrMiE+gyDZY2IAdVxY9k73o9nHBnKwHPA=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.4.tgz"; + sha512 = "670+SM5CXYrjI547cgUeQTdB1wJb2gyrJ7bnGywQMrmciKXhXj/EFbE/8c8wed+j1WmGAh7xS+QdQxiuIlNqlw=="; }; }; "oas-schema-walker-1.1.5" = { @@ -33330,13 +33357,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.132.0" = { + "office-ui-fabric-react-7.134.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.132.0"; + version = "7.134.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.132.0.tgz"; - sha512 = "tyJyra4Ovp4fwmttLs/SwPln2zQCEYwS+FwqgdojCaudPnp/J8nGtF78hCBiEdap4KEdnIJb6MCfyVLBW+zs9Q=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.134.1.tgz"; + sha512 = "yQhPdt5kQfzI/MQnqQMu9lf2mgdHSogEfVIYgfOjbvfMJoUzqA/hH3X2Z7RbncdJ/ca2H+GXVp5GvSgahCOs6g=="; }; }; "omggif-1.0.10" = { @@ -33573,6 +33600,15 @@ let sha512 = "4HeyhxCvBTI5uBePsAdi55C5fmqnWZ2e2MlmvWi5KW5tdH5rxoiv/aMtbeVxKZc3eWkT1GymMnLG8XC4Rq4TDQ=="; }; }; + "open-7.2.1" = { + name = "open"; + packageName = "open"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.2.1.tgz"; + sha512 = "xbYCJib4spUdmcs0g/2mK1nKo/jO2T7INClWd/beL7PFkXRWgr8B23ssDHX/USPn2M2IjDR5UdpYs6I67SnTSA=="; + }; + }; "openapi-default-setter-2.1.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; @@ -33699,13 +33735,13 @@ let sha512 = "8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q=="; }; }; - "opener-1.5.1" = { + "opener-1.5.2" = { name = "opener"; packageName = "opener"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz"; - sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="; + url = "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz"; + sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="; }; }; "openid-2.0.7" = { @@ -33906,6 +33942,15 @@ let sha512 = "77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww=="; }; }; + "ora-4.1.1" = { + name = "ora"; + packageName = "ora"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-4.1.1.tgz"; + sha512 = "sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A=="; + }; + }; "ora-5.0.0" = { name = "ora"; packageName = "ora"; @@ -34383,15 +34428,6 @@ let sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; - "p-wait-for-2.0.1" = { - name = "p-wait-for"; - packageName = "p-wait-for"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-wait-for/-/p-wait-for-2.0.1.tgz"; - sha512 = "edEuJC7eRokPf3AWycsS3lp8JimWLnVgCeGoWw67qFerUmsAHKyhRBj8rDvaBjPV2bTyzgTwmF+U8vNMMBEcyA=="; - }; - }; "p-wait-for-3.1.0" = { name = "p-wait-for"; packageName = "p-wait-for"; @@ -35859,13 +35895,13 @@ let sha512 = "40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="; }; }; - "polished-3.6.5" = { + "polished-3.6.6" = { name = "polished"; packageName = "polished"; - version = "3.6.5"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-3.6.5.tgz"; - sha512 = "VwhC9MlhW7O5dg/z7k32dabcAFW1VI2+7fSe8cE/kXcfL7mVdoa5UxciYGW2sJU78ldDLT6+ROEKIZKFNTnUXQ=="; + url = "https://registry.npmjs.org/polished/-/polished-3.6.6.tgz"; + sha512 = "yiB2ims2DZPem0kCD6V0wnhcVGFEhNh0Iw0axNpKU+oSAgFt6yx6HxIT23Qg0WWvgS379cS35zT4AOyZZRzpQQ=="; }; }; "portfinder-1.0.28" = { @@ -35932,13 +35968,13 @@ let sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; - "postcss-calc-7.0.3" = { + "postcss-calc-7.0.4" = { name = "postcss-calc"; packageName = "postcss-calc"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.3.tgz"; - sha512 = "IB/EAEmZhIMEIhG7Ov4x+l47UaXOS1n2f4FBUk/aKllQhtSCxWhTzn0nJgkqN7fo/jcWySvWTSB6Syk9L+31bA=="; + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.4.tgz"; + sha512 = "0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw=="; }; }; "postcss-colormin-4.0.3" = { @@ -36652,13 +36688,13 @@ let sha512 = "urhX7U/F+fu8sztEs/Z7CxNS8PdEytEwGKhQaH5fxxCdRmHGT45FoClyDlcZrMk9cK/8JpX/asFmTOHtSGJfLg=="; }; }; - "pretty-bytes-5.3.0" = { + "pretty-bytes-5.4.1" = { name = "pretty-bytes"; packageName = "pretty-bytes"; - version = "5.3.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz"; - sha512 = "hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg=="; + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.4.1.tgz"; + sha512 = "s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA=="; }; }; "pretty-format-23.6.0" = { @@ -38371,13 +38407,13 @@ let sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; }; }; - "random-item-1.0.0" = { + "random-item-3.0.0" = { name = "random-item"; packageName = "random-item"; - version = "1.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-item/-/random-item-1.0.0.tgz"; - sha1 = "16ee31626cb050c8a1686a5f0f42a6b99a2aaf11"; + url = "https://registry.npmjs.org/random-item/-/random-item-3.0.0.tgz"; + sha512 = "IpO3Jk9/Dt79R7iS/Fn2d2asGXahMNnXLNRsgSmjTTtiS0tZ972BWEEm9uUgm3YAon5YFUt8126FA9wJAjmeZw=="; }; }; "random-iterate-1.0.1" = { @@ -38767,15 +38803,6 @@ let sha512 = "XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg=="; }; }; - "read-pkg-up-6.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-6.0.0.tgz"; - sha512 = "odtTvLl+EXo1eTsMnoUHRmg/XmXdTkwXVxy4VFE9Kp6cCq7b3l7QMdBndND3eAFzrbSAXC/WCUOQQ9rLjifKZw=="; - }; - }; "read-pkg-up-7.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -38956,13 +38983,13 @@ let sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ=="; }; }; - "recast-0.19.1" = { + "recast-0.20.3" = { name = "recast"; packageName = "recast"; - version = "0.19.1"; + version = "0.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.19.1.tgz"; - sha512 = "8FCjrBxjeEU2O6I+2hyHyBFH1siJbMBLwIRvVr1T3FD2cL754sOaJDsJ/8h3xYltasbJ8jqWRIhMuDGBSiSbjw=="; + url = "https://registry.npmjs.org/recast/-/recast-0.20.3.tgz"; + sha512 = "jrEPzRV5B7wfRiN0UYMtjgIx1Hp8MRHdLcMYqMNd0DoOe1CB5JmPL/04I7WPuuApCs7LCSisYK/FfKnPEaJrzw=="; }; }; "rechoir-0.6.2" = { @@ -39073,13 +39100,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "reftools-1.1.5" = { + "reftools-1.1.6" = { name = "reftools"; packageName = "reftools"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/reftools/-/reftools-1.1.5.tgz"; - sha512 = "o7RX5wMzITYj+8P8oaccFH2xYu5nQ63TH0d73Ce5YgpiY9NyFytaQfeg1p1Z5T4yfjKSj0sYuUscBqZgkLsooQ=="; + url = "https://registry.npmjs.org/reftools/-/reftools-1.1.6.tgz"; + sha512 = "rQfJ025lvPjw9qyQuNPqE+cRs5qVs7BMrZwgRJnmuMcX/8r/eJE8f5/RCunJWViXKHmN5K2DFafYzglLOHE/tw=="; }; }; "regenerate-1.4.1" = { @@ -39505,6 +39532,15 @@ let sha512 = "q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A=="; }; }; + "remote-git-tags-3.0.0" = { + name = "remote-git-tags"; + packageName = "remote-git-tags"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz"; + sha512 = "C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w=="; + }; + }; "remove-array-items-1.1.1" = { name = "remove-array-items"; packageName = "remove-array-items"; @@ -40297,13 +40333,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.26.5" = { + "rollup-2.26.9" = { name = "rollup"; packageName = "rollup"; - version = "2.26.5"; + version = "2.26.9"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.26.5.tgz"; - sha512 = "rCyFG3ZtQdnn9YwfuAVH0l/Om34BdO5lwCA0W6Hq+bNB21dVEBbCRxhaHOmu1G7OBFDWytbzAC104u7rxHwGjA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.26.9.tgz"; + sha512 = "XIiWYLayLqV+oY4S2Lub/shJq4uk/QQLwWToYCL4LjZbYHbFK3czea4UDVRUJu+zNmKmxq5Zb/OG7c5HSvH2TQ=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -40837,6 +40873,15 @@ let sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A=="; }; }; + "schema-utils-2.7.1" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"; + sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; + }; + }; "scoped-regex-1.0.0" = { name = "scoped-regex"; packageName = "scoped-regex"; @@ -42124,13 +42169,13 @@ let sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-cpp-plugin-1.4.0" = { + "snyk-cpp-plugin-1.4.1" = { name = "snyk-cpp-plugin"; packageName = "snyk-cpp-plugin"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.4.0.tgz"; - sha512 = "DaI2u42FRvASQpcu+p52nzDd3QPsrIHLN4JxnvcH32diPps9ynkx5CMNkarBgDo00GZfsWgz9RrDfDFCx3TSQQ=="; + url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.4.1.tgz"; + sha512 = "akhVFsuGBD5yyQtTNoItzG8M6k7dd6A16cHBSoTsP8TgnQdm0QIJMrE2zj0Ak1wgyTCiZeGkI6NE9TDwvvfKLw=="; }; }; "snyk-docker-plugin-3.18.1" = { @@ -42160,13 +42205,13 @@ let sha512 = "XNGHEFyP+pCzcqmXnj5T/1Oy6AZzm2WkTSuUpohWQ/09ecMRCCv2yrr/kwMQemrKN4+7CoJS/9xfm3GnNlzVHA=="; }; }; - "snyk-gradle-plugin-3.5.1" = { + "snyk-gradle-plugin-3.6.2" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.5.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.5.1.tgz"; - sha512 = "8tZwQCqRbjp1azvc+bBRXSbn2AjbUpFAM6qoSpM/IZpfGl1RaOtz4/JTkGFxj+iBhTFoAkGxEunT66eO0pHZZw=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.6.2.tgz"; + sha512 = "JJmVOoLCCN58Wjcxdg93KeMjecnypP6+TfnCPuD4NbCNnKSn93c22VKpx6h1/AS1u6EK9dDTelwlYQOopBFA+w=="; }; }; "snyk-module-1.9.1" = { @@ -42430,13 +42475,13 @@ let sha512 = "o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA=="; }; }; - "socks-2.4.1" = { + "socks-2.4.2" = { name = "socks"; packageName = "socks"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.4.1.tgz"; - sha512 = "8mWHeYC1OA0500qzb+sqwm0Hzi8oBpeuI1JugoBVMEJtJvxSgco8xFSK+NRnZcHeeWjTbF82KUDo5sXH22TY5A=="; + url = "https://registry.npmjs.org/socks/-/socks-2.4.2.tgz"; + sha512 = "cE6P9R+/CET9XhIMvqhRgaNT1GXKIahioMjwwhgYOd+8UQWP50rrFm+faqG/4xkZsjTdVeBYr0Tb246BSC9/fg=="; }; }; "socks-proxy-agent-4.0.2" = { @@ -42790,13 +42835,13 @@ let sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; }; }; - "spawn-please-0.3.0" = { + "spawn-please-0.4.1" = { name = "spawn-please"; packageName = "spawn-please"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.3.0.tgz"; - sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; + url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.4.1.tgz"; + sha512 = "YJwFL/shPyY5fddOU1XXkShCDNVkMDGKsGlpB91FKOkRGa+pVAe+A5/CUUwLrZ3e89prqbTXaGapCzTlmc3HaA=="; }; }; "spawn-sync-1.0.15" = { @@ -43186,13 +43231,13 @@ let sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q=="; }; }; - "ssb-friends-4.2.0" = { + "ssb-friends-4.2.1" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.2.0.tgz"; - sha512 = "X8UewxMCZImUoYX9eNHdym6oFcfEA610iuyn2cGcHtYZre1J2WiKtCLBB2KIjwWZqlOs1mARE+mkVPYnduZy4Q=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.2.1.tgz"; + sha512 = "DgArf97p2MQxOKn9jWmyxA/6HUiyZkk5QFYohS/qo7CAFJzBJobgoJuvEGjzCgszJAZ/WmGwjYTrKTqFHwMEuQ=="; }; }; "ssb-git-0.5.0" = { @@ -43420,13 +43465,13 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-validate-4.1.1" = { + "ssb-validate-4.1.2" = { name = "ssb-validate"; packageName = "ssb-validate"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.1.tgz"; - sha512 = "3OsB6qTYlOMUqy4S1i0NuBtiqRW0s9z1Uf+Yqhjcqt7Zu8LTZk59HyhB1gfYmC3xzR/UnHeI7LkJZOt2+r//gA=="; + url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.2.tgz"; + sha512 = "dDINHOWMpKfMr/o0OlqCQouKKeqYsODHn9VDUPOpWa82vSW6bnEXmfSNXjFc7Sf7pzCDrUsYlJ81+UUr27CvsA=="; }; }; "ssb-ws-6.2.3" = { @@ -44878,6 +44923,15 @@ let sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; }; }; + "supports-color-7.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + }; "supports-hyperlinks-1.0.1" = { name = "supports-hyperlinks"; packageName = "supports-hyperlinks"; @@ -45004,13 +45058,13 @@ let sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; }; }; - "swagger-ui-dist-3.32.4" = { + "swagger-ui-dist-3.32.5" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.32.4"; + version = "3.32.5"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.32.4.tgz"; - sha512 = "3qUqK131a5nqGdDJhLflTNzvrjZgjBlINYNx+Jm5lw/Va88Lcu5iyjUupY3Js/Kf326z1XtXkrr6TbvE6r925g=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.32.5.tgz"; + sha512 = "3SKHv8UVqsKKknivtACHbFDGcn297jkoZN2h6zAZ7b2yoaJNMaRadQpC3qFw3GobZTGzqHCgHph4ZH9NkaCjrQ=="; }; }; "swagger2openapi-5.4.0" = { @@ -47003,15 +47057,6 @@ let sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="; }; }; - "type-fest-0.5.2" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz"; - sha512 = "DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw=="; - }; - }; "type-fest-0.6.0" = { name = "type-fest"; packageName = "type-fest"; @@ -47183,13 +47228,13 @@ let sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; }; }; - "uglify-js-3.10.2" = { + "uglify-js-3.10.3" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.2"; + version = "3.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.2.tgz"; - sha512 = "GXCYNwqoo0MbLARghYjxVBxDCnU0tLqN7IPLdHHbibCb1NI5zBkU2EPcy/GaVxc0BtTjqyGXJCINe6JMR2Dpow=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.3.tgz"; + sha512 = "Lh00i69Uf6G74mvYpHCI9KVVXLcHW/xu79YTvH7Mkc9zyKUeSPz0owW0dguj0Scavns3ZOh3wY63J0Zb97Za2g=="; }; }; "uglify-js-3.4.10" = { @@ -47363,6 +47408,15 @@ let sha512 = "N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="; }; }; + "underscore-1.11.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz"; + sha512 = "xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="; + }; + }; "underscore-1.2.1" = { name = "underscore"; packageName = "underscore"; @@ -47876,13 +47930,13 @@ let sha512 = "0g4wbluTF93npyPrp/ymd3tCDTMnP0yo2akFD2FIBAYXq/Sga3lwaU1D8OYKbtpioaI6CkDcQ6fsMnmtzt7htw=="; }; }; - "universal-analytics-0.4.20" = { + "universal-analytics-0.4.23" = { name = "universal-analytics"; packageName = "universal-analytics"; - version = "0.4.20"; + version = "0.4.23"; src = fetchurl { - url = "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz"; - sha512 = "gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw=="; + url = "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.23.tgz"; + sha512 = "lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A=="; }; }; "universal-user-agent-4.0.1" = { @@ -48173,13 +48227,13 @@ let sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; }; }; - "uri-js-4.2.2" = { + "uri-js-4.4.0" = { name = "uri-js"; packageName = "uri-js"; - version = "4.2.2"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"; + sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; }; }; "urijs-1.19.2" = { @@ -48551,15 +48605,6 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uuid-8.1.0" = { - name = "uuid"; - packageName = "uuid"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz"; - sha512 = "CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="; - }; - }; "uuid-8.3.0" = { name = "uuid"; packageName = "uuid"; @@ -49100,13 +49145,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "vsce-1.79.3" = { + "vsce-1.79.5" = { name = "vsce"; packageName = "vsce"; - version = "1.79.3"; + version = "1.79.5"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.79.3.tgz"; - sha512 = "TZb0XrLPDAm/Ns8McayGS2S8XCCMuQPwdUOluKC/0LopyEH7/NnTkM09hF4kOzfvIITuFWy4PT2R1apeLQw3kQ=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.79.5.tgz"; + sha512 = "KZFOthGwxWFwoGqwrkzfTfyCZGuniTofnJ1a/dCzQ2HP93u1UuCKrTQyGT+SuGHu8sNqdBYNe0hb9GC3qCN7fg=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -49145,13 +49190,22 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.8.1" = { + "vscode-json-languageservice-3.8.3" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.8.1"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.1.tgz"; - sha512 = "PYckar/Vgpa/YTthbSnqbxbawxwcGQ+xs/M48muw89uJWe4nZm5yto0oCKMMZHIFD8r3nN6BrmDzXQEaeQ1bBQ=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.3.tgz"; + sha512 = "8yPag/NQHCuTthahyaTtzK0DHT0FKM/xBU0mFBQ8nMo8C1i2P+FCyIVqICoNoHkRI2BTGlXKomPUpsqjSz0TnQ=="; + }; + }; + "vscode-jsonrpc-3.5.0" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz"; + sha1 = "87239d9e166b2d7352245b8a813597804c1d63aa"; }; }; "vscode-jsonrpc-3.6.0" = { @@ -49208,6 +49262,15 @@ let sha512 = "JrjCUhLpQZxQ5VpWpilOHDMhVsn0fdN5jBh1uFNhSr5c2loJvRdr9Km2EuSQOFfOQsBKx0+xvY8PbsypNEcJ6w=="; }; }; + "vscode-languageserver-3.5.1" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.1.tgz"; + sha512 = "RYUKn0DgHTFcS8kS4VaNCjNMaQXYqiXdN9bKrFjXzu5RPKfjIYcoh47oVWwZj4L3R/DPB0Se7HPaDatvYY2XgQ=="; + }; + }; "vscode-languageserver-4.0.0" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -49280,6 +49343,15 @@ let sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; }; }; + "vscode-languageserver-protocol-3.5.1" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz"; + sha512 = "1fPDIwsAv1difCV+8daOrJEGunClNJWqnUHq/ncWrjhitKWXgGmRCjlwZ3gDUTt54yRcvXz1PXJDaRNvNH6pYA=="; + }; + }; "vscode-languageserver-protocol-3.6.0" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -49343,6 +49415,24 @@ let sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="; }; }; + "vscode-languageserver-types-3.5.0" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz"; + sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374"; + }; + }; + "vscode-nls-2.0.2" = { + name = "vscode-nls"; + packageName = "vscode-nls"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz"; + sha1 = "808522380844b8ad153499af5c3b03921aea02da"; + }; + }; "vscode-nls-3.2.5" = { name = "vscode-nls"; packageName = "vscode-nls"; @@ -49442,13 +49532,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.0-rc.9" = { + "vue-3.0.0-rc.10" = { name = "vue"; packageName = "vue"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.0-rc.9.tgz"; - sha512 = "bimvpl5q/sKy1dAOE+KNX9T3p6Qq8kuNRmOYwaxtacI91ksjS7nVGse1FANhTL+XTQgl8+ySrd3f67xWi26nxw=="; + url = "https://registry.npmjs.org/vue/-/vue-3.0.0-rc.10.tgz"; + sha512 = "nRsyIQtOWLDMBb5dsPwg/WdIqznCMVWN6O6wJSzhseKC768wHlZKcJ7SPHhWPid9wi3Ykhtl9vtgvxTK/qICkw=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -49757,13 +49847,13 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "websocket-1.0.31" = { + "websocket-1.0.32" = { name = "websocket"; packageName = "websocket"; - version = "1.0.31"; + version = "1.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz"; - sha512 = "VAouplvGKPiKFDTeCCO65vYHsyay8DqoBSlzIO3fayrfOgU94lQN5a1uWVnFrMLceTJw/+fQXR5PGbUVRaHshQ=="; + url = "https://registry.npmjs.org/websocket/-/websocket-1.0.32.tgz"; + sha512 = "i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q=="; }; }; "websocket-driver-0.6.5" = { @@ -51009,13 +51099,13 @@ let sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; }; }; - "yaml-language-server-0.10.0" = { + "yaml-language-server-0.10.1" = { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.0.tgz"; - sha512 = "d2/7eGgonEIRcnW9kK+k+ERG4gTOk5BXHr9KjTVv8gEarXKa62Kk+nyFE4AXgMDZ0LXTu8nTuN/AdboJiGN+pQ=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.1.tgz"; + sha512 = "R9SEt/nWTuZ8weB040L7yyaIVARlZ0ian1Kv6ptu4+xyVlIMobTZXaBTtgyhlMWqcQ3BpsAZu4q/2plRVG3tLQ=="; }; }; "yamljs-0.3.0" = { @@ -51081,15 +51171,6 @@ let sha512 = "ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg=="; }; }; - "yargs-15.3.1" = { - name = "yargs"; - packageName = "yargs"; - version = "15.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz"; - sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; - }; - }; "yargs-15.4.1" = { name = "yargs"; packageName = "yargs"; @@ -51252,6 +51333,15 @@ let sha512 = "oYM7hi/lIWm9bCoDMEWgffW8aiNZXCWeZ1/tGy0DWrN6vmzjCXIKu2Y21o8DYVBUtiktwKcNoxyGl/2iKLUNGA=="; }; }; + "yarn-1.22.5" = { + name = "yarn"; + packageName = "yarn"; + version = "1.22.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.5.tgz"; + sha512 = "5uzKXwdMc++mYktXqkfpNYT9tY8ViWegU58Hgbo+KXzrzzhEyP1Ip+BTtXloLrXNcNlxFJbLiFKGaS9vK9ym6Q=="; + }; + }; "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; @@ -51306,13 +51396,13 @@ let sha512 = "pLIhhU9z/G+kjOXmJ2bPFm3nejfbH+f1fjYRSOteEXDBrv1EoJE/e+kuHixSXfCYfTkxjYsvRaDX+1QykLCnpQ=="; }; }; - "yeoman-generator-4.11.0" = { + "yeoman-generator-4.12.0" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "4.11.0"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.11.0.tgz"; - sha512 = "++t6t2Z6HjL5F1/UM7+uNvGknKmQdF8tstJx8WKzsUSEpB+19kLVtapSfQIh9uWqm0L59fLWDzUui//WXoynPw=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.12.0.tgz"; + sha512 = "lozwklVQHwUXMM1o8BgxEB8F5BB7vkHW4pjAo1Zt5sJ7FOlWhd6DJ4ZxJ2OK0w+gNYkY/ocPMkUV7DTz/uqEEg=="; }; }; "yn-3.1.1" = { @@ -51447,23 +51537,23 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "10.0.8"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-10.0.8.tgz"; - sha512 = "unTteffLepsFw7qQulHOLLyLqCpQMOaZo0WO4x6cQGcW2mc0WgwnwBW2JDYMx1U2434t/Q13LqYMPNYWyCGsog=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.0.tgz"; + sha512 = "sWGEVeQQ5PXKuu517fRFEQQ5qopzoWeW+8qBUTrmJt8FztiL2ASyu412iJse56wyGxZvqwUmtzpti5kWHR9XIw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1000.8" - sources."@angular-devkit/core-10.0.8" - sources."@angular-devkit/schematics-10.0.8" - sources."@schematics/angular-10.0.8" - sources."@schematics/update-0.1000.8" + sources."@angular-devkit/architect-0.1001.0" + sources."@angular-devkit/core-10.1.0" + sources."@angular-devkit/schematics-10.1.0" + sources."@schematics/angular-10.1.0" + sources."@schematics/update-0.1001.0" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" @@ -51489,12 +51579,12 @@ in ]; }) sources."caseless-0.12.0" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."chownr-1.1.4" sources."cli-cursor-3.1.0" sources."cli-spinners-2.4.0" - sources."cli-width-2.2.1" + sources."cli-width-3.0.0" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -51578,7 +51668,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-7.1.0" + sources."inquirer-7.3.3" sources."ip-1.1.5" sources."is-callable-1.2.0" sources."is-date-object-1.0.2" @@ -51594,23 +51684,15 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" + sources."jsonc-parser-2.3.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lodash-4.17.20" - (sources."log-symbols-3.0.0" // { - 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."log-symbols-4.0.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" (sources."make-fetch-happen-5.0.2" // { @@ -51668,8 +51750,8 @@ in sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.0.4" - sources."ora-4.0.4" + sources."open-7.2.0" + sources."ora-5.0.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -51720,7 +51802,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.5.5" + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.2" @@ -51756,7 +51838,7 @@ in ]; }) sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."symbol-observable-1.2.0" (sources."tar-4.4.13" // { dependencies = [ @@ -51774,16 +51856,15 @@ in sources."typedarray-0.0.6" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - (sources."universal-analytics-0.4.20" // { + (sources."universal-analytics-0.4.23" // { dependencies = [ - sources."debug-3.2.6" sources."uuid-3.4.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."util-promisify-2.1.0" - sources."uuid-8.1.0" + sources."uuid-8.3.0" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -52117,7 +52198,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -52292,7 +52373,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" @@ -52355,9 +52436,9 @@ in sources."@schematics/schematics-0.1000.7" sources."@types/anymatch-1.3.1" sources."@types/color-name-1.1.1" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -52467,7 +52548,7 @@ in 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."supports-color-7.2.0" ]; }) sources."chardet-0.7.0" @@ -52563,7 +52644,11 @@ in sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" @@ -52615,7 +52700,7 @@ in 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."supports-color-7.2.0" ]; }) sources."fragment-cache-0.2.1" @@ -52668,7 +52753,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."rxjs-6.6.2" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."interpret-1.4.0" @@ -52693,7 +52778,7 @@ in sources."isobject-3.0.1" sources."js-tokens-4.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json5-1.0.1" sources."jsonfile-6.0.1" @@ -52804,7 +52889,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."log-symbols-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."os-browserify-0.3.0" @@ -53008,7 +53093,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -53085,10 +53170,10 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.19.0" + sources."@apollo/federation-0.20.0" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.28" + sources."@types/node-10.17.29" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -53103,16 +53188,17 @@ in sources."semver-5.7.1" ]; }) - (sources."@babel/core-7.11.4" // { + (sources."@babel/core-7.11.5" // { dependencies = [ - sources."@babel/generator-7.11.4" - sources."@babel/types-7.11.0" + sources."@babel/generator-7.11.5" + sources."@babel/types-7.11.5" sources."semver-5.7.1" + sources."source-map-0.6.1" ]; }) - (sources."@babel/generator-7.11.0" // { + (sources."@babel/generator-7.11.4" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" ]; }) sources."@babel/helper-annotate-as-pure-7.10.4" @@ -53126,7 +53212,7 @@ in sources."@babel/helper-create-regexp-features-plugin-7.10.4" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" ]; }) sources."@babel/helper-explode-assignable-expression-7.11.4" @@ -53135,13 +53221,13 @@ in sources."@babel/helper-hoist-variables-7.10.4" (sources."@babel/helper-member-expression-to-functions-7.11.0" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" ]; }) sources."@babel/helper-module-imports-7.10.4" (sources."@babel/helper-module-transforms-7.11.0" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" ]; }) sources."@babel/helper-optimise-call-expression-7.10.4" @@ -53152,19 +53238,19 @@ in sources."@babel/helper-simple-access-7.10.4" (sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" ]; }) (sources."@babel/helper-split-export-declaration-7.11.0" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" ]; }) sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" @@ -53226,16 +53312,16 @@ in sources."@babel/plugin-transform-typescript-7.11.0" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - (sources."@babel/preset-env-7.11.0" // { + (sources."@babel/preset-env-7.11.5" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" sources."semver-5.7.1" ]; }) sources."@babel/preset-flow-7.10.4" - sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.10.4" - (sources."@babel/register-7.10.5" // { + (sources."@babel/register-7.11.5" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" @@ -53244,9 +53330,11 @@ in }) sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.11.0" // { + (sources."@babel/traverse-7.11.5" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/generator-7.11.5" + sources."@babel/types-7.11.5" + sources."source-map-0.6.1" ]; }) sources."@babel/types-7.10.4" @@ -53265,7 +53353,7 @@ in (sources."chalk-3.0.0" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."color-convert-2.0.1" @@ -53274,16 +53362,17 @@ in sources."strip-ansi-5.2.0" ]; }) - (sources."@oclif/command-1.7.0" // { + (sources."@oclif/command-1.8.0" // { dependencies = [ sources."@oclif/plugin-help-3.2.0" - sources."semver-5.7.1" + sources."semver-7.3.2" ]; }) - (sources."@oclif/config-1.16.0" // { + (sources."@oclif/config-1.17.0" // { dependencies = [ sources."globby-11.0.1" sources."is-wsl-2.2.0" + sources."tslib-2.0.1" ]; }) (sources."@oclif/errors-1.3.3" // { @@ -53358,7 +53447,7 @@ in sources."@types/cors-2.8.7" sources."@types/ejs-2.7.0" sources."@types/express-4.17.7" - sources."@types/express-serve-static-core-4.17.9" + sources."@types/express-serve-static-core-4.17.12" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" sources."@types/graphql-upload-8.0.3" @@ -53378,7 +53467,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -53399,22 +53488,22 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.4" sources."@vue/cli-ui-addon-widgets-4.5.4" - (sources."@vue/compiler-core-3.0.0-rc.9" // { + (sources."@vue/compiler-core-3.0.0-rc.10" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.0-rc.9" - (sources."@vue/compiler-sfc-3.0.0-rc.9" // { + sources."@vue/compiler-dom-3.0.0-rc.10" + (sources."@vue/compiler-sfc-3.0.0-rc.10" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.0.0-rc.9" - sources."@vue/reactivity-3.0.0-rc.9" - sources."@vue/runtime-core-3.0.0-rc.9" - sources."@vue/runtime-dom-3.0.0-rc.9" - sources."@vue/shared-3.0.0-rc.9" + sources."@vue/compiler-ssr-3.0.0-rc.10" + sources."@vue/reactivity-3.0.0-rc.10" + sources."@vue/runtime-core-3.0.0-rc.10" + sources."@vue/runtime-dom-3.0.0-rc.10" + sources."@vue/shared-3.0.0-rc.10" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -53458,9 +53547,10 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."apollo-2.30.2" // { + (sources."apollo-2.30.3" // { dependencies = [ - sources."graphql-tag-2.10.4" + sources."apollo-graphql-0.6.0" + sources."mkdirp-1.0.4" sources."strip-ansi-5.2.0" ]; }) @@ -53468,20 +53558,17 @@ in sources."apollo-cache-control-0.11.1" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.37.8" // { + (sources."apollo-codegen-core-0.37.9" // { dependencies = [ - (sources."recast-0.19.1" // { - dependencies = [ - sources."ast-types-0.13.3" - ]; - }) + sources."recast-0.20.3" sources."source-map-0.6.1" + sources."tslib-2.0.1" ]; }) - sources."apollo-codegen-flow-0.35.8" - sources."apollo-codegen-scala-0.36.8" - sources."apollo-codegen-swift-0.37.8" - sources."apollo-codegen-typescript-0.37.8" + sources."apollo-codegen-flow-0.35.9" + sources."apollo-codegen-scala-0.36.9" + sources."apollo-codegen-swift-0.37.9" + sources."apollo-codegen-typescript-0.37.9" sources."apollo-datasource-0.7.2" (sources."apollo-engine-reporting-2.3.0" // { dependencies = [ @@ -53491,7 +53578,11 @@ in sources."apollo-engine-reporting-protobuf-0.5.2" sources."apollo-env-0.6.5" sources."apollo-graphql-0.5.0" - sources."apollo-language-server-1.23.3" + (sources."apollo-language-server-1.23.4" // { + dependencies = [ + sources."apollo-graphql-0.6.0" + ]; + }) sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -53501,13 +53592,13 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" sources."apollo-server-caching-0.5.2" - sources."apollo-server-core-2.16.1" + sources."apollo-server-core-2.17.0" sources."apollo-server-env-2.4.5" sources."apollo-server-errors-2.4.2" - sources."apollo-server-express-2.16.1" + sources."apollo-server-express-2.17.0" sources."apollo-server-plugin-base-0.9.1" sources."apollo-server-types-0.5.1" - sources."apollo-tracing-0.11.1" + sources."apollo-tracing-0.11.2" sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.4" (sources."archive-type-4.0.0" // { @@ -53528,7 +53619,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - (sources."ast-types-0.13.4" // { + (sources."ast-types-0.14.1" // { dependencies = [ sources."tslib-2.0.1" ]; @@ -53558,7 +53649,7 @@ in sources."big.js-5.2.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."bl-1.2.2" + sources."bl-1.2.3" sources."bluebird-3.7.2" (sources."body-parser-1.19.0" // { dependencies = [ @@ -53579,14 +53670,14 @@ in sources."ansi-styles-4.2.1" sources."camelcase-5.3.1" sources."chalk-3.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-7.0.3" sources."has-flag-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-5.2.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."term-size-2.2.0" sources."type-fest-0.8.1" ]; @@ -53620,7 +53711,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001118" + sources."caniuse-lite-1.0.30001123" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -53674,11 +53765,11 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."cli-ux-5.4.9" // { + (sources."cli-ux-5.4.10" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."clean-stack-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -53687,9 +53778,9 @@ in sources."fs-extra-9.0.1" sources."has-flag-4.0.0" sources."is-wsl-2.2.0" - sources."semver-5.7.1" - sources."strip-ansi-5.2.0" - sources."supports-color-7.1.0" + sources."semver-7.3.2" + sources."supports-color-7.2.0" + sources."supports-hyperlinks-2.1.0" sources."tslib-2.0.1" sources."type-fest-0.11.0" ]; @@ -53828,7 +53919,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.549" + sources."electron-to-chromium-1.3.560" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -53919,7 +54010,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.132.0" + sources."flow-parser-0.133.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -53959,7 +54050,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.1.2" + sources."git-url-parse-11.1.3" sources."glob-7.1.5" sources."glob-parent-5.1.1" sources."glob-to-regexp-0.3.0" @@ -54088,7 +54179,7 @@ in sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."type-fest-0.11.0" ]; }) @@ -54169,7 +54260,7 @@ in sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -54791,7 +54882,7 @@ in }) sources."upper-case-2.0.1" sources."upper-case-first-2.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" @@ -54832,7 +54923,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.0-rc.9" + sources."vue-3.0.0-rc.10" ]; }) sources."watch-1.0.2" @@ -54876,7 +54967,7 @@ in sources."camelcase-5.3.1" ]; }) - sources."yarn-1.22.4" + sources."yarn-1.22.5" sources."yauzl-2.10.0" sources."yn-3.1.1" sources."zen-observable-0.8.15" @@ -55017,12 +55108,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/generator-7.11.4" + sources."@babel/generator-7.11.5" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/template-7.10.4" - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -55048,7 +55139,7 @@ in sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."lodash-4.17.20" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" ]; @@ -55102,16 +55193,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.11.4" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - (sources."@babel/generator-7.11.4" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) + sources."@babel/core-7.11.5" + sources."@babel/generator-7.11.5" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.11.0" @@ -55124,10 +55207,10 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -55228,7 +55311,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -55363,7 +55446,7 @@ in sources."turndown-4.0.2" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urijs-1.19.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -55768,7 +55851,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.15" + sources."@types/node-13.13.16" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.4" @@ -55829,7 +55912,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-6.0.0" + sources."commander-6.1.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -56128,7 +56211,7 @@ in sources."ultron-1.1.1" sources."underscore-1.6.0" sources."uniq-1.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."utfx-1.0.1" sources."util-deprecate-1.0.2" sources."utp-0.0.7" @@ -56564,7 +56647,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."@typescript-eslint/experimental-utils-3.10.1" sources."@typescript-eslint/parser-3.10.1" sources."@typescript-eslint/types-3.10.1" @@ -56632,7 +56715,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001118" + sources."caniuse-lite-1.0.30001123" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -56729,7 +56812,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.549" + sources."electron-to-chromium-1.3.560" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -56751,7 +56834,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" (sources."execa-0.7.0" // { @@ -56915,7 +57002,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."invert-kv-2.0.0" @@ -57441,7 +57528,7 @@ in }) sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."use-3.1.1" @@ -57559,10 +57646,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.15"; + version = "0.7.16"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.15.tgz"; - sha512 = "PYnLYoY2w0dsco/EmjjnVodQKsKOgbtDHdokjGphhK66J733ctg4Jww5I8WXAAuCkfUpQmALXdBvNg45PL7C9g=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.16.tgz"; + sha512 = "nYF/RznvKMwVXrW5z4k6Wrw13T6ogdF4TraAMp0P4upAHKhJkkA2aWwzCPiyq9wdadsp9/njWvmMTt5klfAI+g=="; }; buildInputs = globalBuildInputs; meta = { @@ -57636,8 +57723,16 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.11.4" - sources."@babel/generator-7.11.4" + (sources."@babel/core-7.11.5" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@babel/generator-7.11.5" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.11.0" @@ -57650,15 +57745,15 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -57709,7 +57804,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001118" + sources."caniuse-lite-1.0.30001123" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -57769,7 +57864,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.549" + sources."electron-to-chromium-1.3.560" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -58164,7 +58259,7 @@ in sources."has-values-0.1.4" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -58345,6 +58440,13 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" sources."@emmetio/extract-abbreviation-0.1.6" + (sources."@eslint/eslintrc-0.1.3" // { + dependencies = [ + sources."debug-4.2.0" + sources."ignore-4.0.6" + sources."strip-json-comments-3.1.1" + ]; + }) sources."@mrmlnc/readdir-enhanced-2.2.1" (sources."@nodelib/fs.scandir-2.1.3" // { dependencies = [ @@ -58378,10 +58480,10 @@ in sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/glob-7.1.3" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -58507,7 +58609,7 @@ in ]; }) sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" sources."cliui-4.1.0" @@ -58606,7 +58708,7 @@ in sources."enquirer-2.3.6" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.7.0" // { + (sources."eslint-7.8.1" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -58623,11 +58725,11 @@ in sources."shebang-regex-3.0.0" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."which-2.0.2" ]; }) - (sources."eslint-plugin-vue-7.0.0-beta.2" // { + (sources."eslint-plugin-vue-7.0.0-beta.3" // { dependencies = [ sources."semver-7.3.2" ]; @@ -58642,7 +58744,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."execa-0.7.0" @@ -58785,7 +58891,7 @@ in 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."supports-color-7.2.0" ]; }) sources."invert-kv-2.0.0" @@ -58838,7 +58944,7 @@ in sources."js-yaml-3.14.0" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.1.3" @@ -59294,7 +59400,7 @@ in }) sources."untildify-2.1.0" sources."update-notifier-3.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -59436,7 +59542,7 @@ in sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.1" + sources."vscode-json-languageservice-3.8.3" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -59453,7 +59559,7 @@ in sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.2" sources."yaml-ast-parser-custom-tags-0.0.43" - sources."yaml-language-server-0.10.0" + sources."yaml-language-server-0.10.1" ]; buildInputs = globalBuildInputs; meta = { @@ -59569,7 +59675,7 @@ in sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.6" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."fast-safe-stringify-2.0.7" sources."fecha-4.2.0" sources."follow-redirects-1.13.0" @@ -59688,7 +59794,7 @@ in sources."chalk-3.0.0" sources."chardet-0.7.0" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" sources."clone-response-1.0.2" @@ -59868,7 +59974,7 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -59927,7 +60033,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.2.0" + sources."open-7.2.1" sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -60042,7 +60148,7 @@ in sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."systeminformation-4.27.3" sources."term-size-2.2.0" sources."through-2.3.8" @@ -60057,12 +60163,12 @@ in sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."underscore-1.10.2" + sources."underscore-1.11.0" sources."unique-string-2.0.0" sources."universalify-1.0.0" sources."unpipe-1.0.0" sources."update-notifier-4.1.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -60130,7 +60236,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -60185,7 +60291,7 @@ in sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" sources."cp-file-7.0.0" - sources."cpy-8.1.0" + sources."cpy-8.1.1" sources."debug-2.6.9" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -60284,7 +60390,7 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."junk-3.1.0" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" @@ -60498,7 +60604,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -60735,7 +60841,7 @@ in sources."ansi-regex-4.1.0" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tar-2.2.2" (sources."tar-pack-3.4.1" // { dependencies = [ @@ -61175,7 +61281,7 @@ in sources."multicast-dns-7.2.2" sources."multistream-2.1.1" sources."mute-stream-0.0.8" - sources."mutexify-1.3.0" + sources."mutexify-1.3.1" sources."nan-2.14.1" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" @@ -61423,7 +61529,7 @@ in sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."use-3.1.1" @@ -61533,7 +61639,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.740.0" + sources."aws-sdk-2.745.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."base64-js-1.3.1" @@ -61549,7 +61655,7 @@ in sources."delay-4.4.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."events-1.1.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -61626,7 +61732,7 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."uri-js-4.2.2" // { + (sources."uri-js-4.4.0" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -61677,11 +61783,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.11.4" - sources."@babel/generator-7.11.4" + sources."@babel/core-7.11.5" + sources."@babel/generator-7.11.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.10.5" + sources."@babel/helper-builder-react-jsx-experimental-7.11.5" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.11.0" @@ -61695,7 +61801,7 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-syntax-jsx-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -61703,8 +61809,8 @@ in sources."@babel/plugin-transform-parameters-7.10.5" sources."@babel/plugin-transform-react-jsx-7.10.4" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -61712,7 +61818,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -61748,7 +61854,7 @@ in }) sources."chalk-2.4.2" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-truncate-2.1.0" sources."clipboardy-2.3.0" @@ -61797,7 +61903,7 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globals-11.12.0" - sources."got-11.5.2" + sources."got-11.6.0" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" @@ -61807,14 +61913,14 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.4" // { + (sources."ink-3.0.5" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.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."supports-color-7.2.0" ]; }) (sources."ink-text-input-4.0.0" // { @@ -61824,7 +61930,7 @@ in 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."supports-color-7.2.0" sources."type-fest-0.15.1" ]; }) @@ -61840,7 +61946,7 @@ in sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" sources."json5-2.1.3" @@ -61859,8 +61965,8 @@ in }) sources."map-age-cleaner-0.1.3" sources."map-obj-4.1.0" - sources."mem-6.1.0" - (sources."meow-7.1.0" // { + sources."mem-6.1.1" + (sources."meow-7.1.1" // { dependencies = [ sources."type-fest-0.13.1" ]; @@ -61948,7 +62054,7 @@ in sources."color-name-1.1.4" ]; }) - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -61974,7 +62080,7 @@ in sources."trim-newlines-3.0.0" sources."type-fest-0.12.0" sources."unicode-emoji-modifier-base-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" sources."widest-line-3.1.0" @@ -62038,10 +62144,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.7.0"; + version = "7.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz"; - sha512 = "1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.8.1.tgz"; + sha512 = "/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -62051,6 +62157,7 @@ in sources."chalk-2.4.2" ]; }) + sources."@eslint/eslintrc-0.1.3" sources."@types/color-name-1.1.1" sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" @@ -62069,7 +62176,7 @@ in 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."supports-color-7.2.0" ]; }) sources."color-convert-1.9.3" @@ -62092,7 +62199,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" @@ -62156,7 +62267,7 @@ in sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."v8-compile-cache-2.1.1" sources."which-2.0.2" sources."word-wrap-1.2.3" @@ -62189,6 +62300,7 @@ in sources."chalk-2.4.2" ]; }) + sources."@eslint/eslintrc-0.1.3" sources."@types/color-name-1.1.1" sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" @@ -62207,7 +62319,7 @@ in 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."supports-color-7.2.0" ]; }) sources."color-convert-1.9.3" @@ -62221,7 +62333,7 @@ in sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.7.0" + sources."eslint-7.8.1" sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" @@ -62232,7 +62344,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" @@ -62297,7 +62413,7 @@ in sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."v8-compile-cache-2.1.1" sources."which-2.0.2" sources."word-wrap-1.2.3" @@ -62477,7 +62593,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -62580,7 +62696,7 @@ in sources."is-stream-2.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" @@ -62664,7 +62780,7 @@ in sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" (sources."taskkill-3.1.0" // { dependencies = [ sources."execa-3.4.0" @@ -63271,7 +63387,7 @@ in sources."separator-escape-0.0.0" sources."sha.js-2.4.5" sources."smart-buffer-4.1.0" - sources."socks-2.4.1" + sources."socks-2.4.2" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -63406,7 +63522,7 @@ in sources."chalk-4.1.0" sources."chardet-0.7.0" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-spinners-2.4.0" sources."cli-width-3.0.0" @@ -63480,7 +63596,7 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" sources."keyv-3.1.0" @@ -63501,7 +63617,7 @@ in ]; }) sources."map-obj-4.1.0" - (sources."meow-7.1.0" // { + (sources."meow-7.1.1" // { dependencies = [ sources."type-fest-0.13.1" ]; @@ -63589,7 +63705,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."term-size-2.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -63604,7 +63720,7 @@ in sources."chalk-3.0.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" @@ -63648,34 +63764,35 @@ in ]; }) sources."@babel/runtime-7.11.2" + sources."@exodus/schemasafe-1.0.0-rc.2" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-tools/delegate-6.1.0" - (sources."@graphql-tools/graphql-file-loader-6.1.0" // { + sources."@graphql-tools/delegate-6.2.0" + (sources."@graphql-tools/graphql-file-loader-6.2.0" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/import-6.1.0" // { + (sources."@graphql-tools/import-6.2.0" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/json-file-loader-6.1.0" // { + (sources."@graphql-tools/json-file-loader-6.2.0" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - sources."@graphql-tools/load-6.1.0" - sources."@graphql-tools/merge-6.1.0" - sources."@graphql-tools/schema-6.1.0" - (sources."@graphql-tools/url-loader-6.1.0" // { + sources."@graphql-tools/load-6.2.0" + sources."@graphql-tools/merge-6.2.0" + sources."@graphql-tools/schema-6.2.0" + (sources."@graphql-tools/url-loader-6.2.0" // { dependencies = [ sources."cross-fetch-3.0.5" ]; }) - sources."@graphql-tools/utils-6.1.0" - sources."@graphql-tools/wrap-6.1.0" + sources."@graphql-tools/utils-6.2.0" + sources."@graphql-tools/wrap-6.2.0" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -63683,7 +63800,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -63721,6 +63838,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."bufferutil-4.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -63766,6 +63884,7 @@ in sources."cross-spawn-6.0.5" sources."d-1.0.1" sources."dashdash-1.14.1" + sources."dataloader-2.0.0" sources."debug-4.2.0" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" @@ -63904,7 +64023,7 @@ in sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" @@ -63948,7 +64067,6 @@ in sources."minimist-1.2.5" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nan-2.14.1" sources."next-tick-1.0.0" sources."nice-try-1.0.5" (sources."no-case-3.0.3" // { @@ -63958,14 +64076,15 @@ in }) sources."node-fetch-2.6.0" sources."node-fetch-h2-2.3.0" + sources."node-gyp-build-3.7.0" sources."node-readfiles-0.2.0" sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" - sources."oas-linter-3.1.3" - sources."oas-resolver-2.4.3" + sources."oas-linter-3.2.0" + sources."oas-resolver-2.4.4" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."oauth-sign-0.9.0" @@ -64027,7 +64146,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."rc-1.2.8" - sources."reftools-1.1.5" + sources."reftools-1.1.6" sources."regenerator-runtime-0.13.7" sources."regexp.prototype.flags-1.3.0" sources."registry-auth-token-4.2.0" @@ -64078,7 +64197,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."subscriptions-transport-ws-0.9.18" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" (sources."swagger2openapi-5.4.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -64102,13 +64221,14 @@ in sources."typedarray-to-buffer-3.1.5" sources."universalify-1.0.0" sources."unixify-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" + sources."utf-8-validate-5.0.2" sources."uuid-3.4.0" sources."valid-url-1.0.9" sources."verror-1.10.0" sources."wcwidth-1.0.1" - (sources."websocket-1.0.31" // { + (sources."websocket-1.0.32" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -64476,7 +64596,7 @@ in dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."memory-streams-0.1.3" @@ -64495,7 +64615,7 @@ in sources."supports-color-2.0.0" (sources."supports-hyperlinks-2.1.0" // { dependencies = [ - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."systeminformation-4.27.3" @@ -65367,7 +65487,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -65455,11 +65575,11 @@ in sources."safer-buffer-2.1.2" sources."sshpk-1.16.1" sources."strip-json-comments-3.1.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" sources."wrappy-1.0.2" @@ -65490,7 +65610,7 @@ in sources."corser-2.0.1" sources."debug-3.2.6" sources."ecstatic-3.3.2" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."follow-redirects-1.13.0" sources."he-1.2.0" sources."http-proxy-1.18.1" @@ -65499,7 +65619,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."opener-1.5.1" + sources."opener-1.5.2" sources."portfinder-1.0.28" sources."qs-6.9.4" sources."requires-port-1.0.0" @@ -65691,7 +65811,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."jquery-3.5.1" - sources."jquery.terminal-2.18.2" + sources."jquery.terminal-2.18.3" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -65927,7 +66047,7 @@ in }) sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.2.0" + sources."open-7.2.1" sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -66002,7 +66122,7 @@ in sources."debug-3.2.6" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tar-4.4.13" sources."through-2.3.8" sources."through2-3.0.2" @@ -66352,7 +66472,7 @@ in sources."unicoderegexp-0.4.1" sources."universalify-1.0.0" sources."unorm-1.6.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -66364,7 +66484,7 @@ in 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."supports-color-7.2.0" sources."tslib-2.0.1" ]; }) @@ -66577,7 +66697,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.740.0" // { + (sources."aws-sdk-2.745.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -66994,7 +67114,7 @@ in sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - (sources."needle-2.5.0" // { + (sources."needle-2.5.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -67307,7 +67427,7 @@ in ]; }) sources."upper-case-1.1.3" - (sources."uri-js-4.2.2" // { + (sources."uri-js-4.4.0" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -67437,7 +67557,7 @@ in sha512 = "SbY+i9ONuxSK35cgVHaI8O9senTE4CDYAmGSDJ5l3+sfe62Ff4gy96osy6OW84t4K4A8iGnMrlRrsSItSNp3RQ=="; }; dependencies = [ - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -67527,10 +67647,10 @@ in json = nodeEnv.buildNodePackage { name = "json"; packageName = "json"; - version = "9.0.6"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/json/-/json-9.0.6.tgz"; - sha1 = "7972c2a5a48a42678db2730c7c2c4ee6e4e24585"; + url = "https://registry.npmjs.org/json/-/json-10.0.0.tgz"; + sha512 = "iK7tAZtpoghibjdB1ncCWykeBMmke3JThUe+rnkD4qkZaglOIQ70Pw7r5UJ4lyUT+7gnw7ehmmLUHDuhqzQD+g=="; }; buildInputs = globalBuildInputs; meta = { @@ -67609,7 +67729,7 @@ in sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" sources."superagent-3.8.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -67664,7 +67784,7 @@ in sources."caseless-0.12.0" sources."chalk-3.0.0" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -67859,7 +67979,7 @@ in }) sources."strip-ansi-5.2.0" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."term-size-2.2.0" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" @@ -67872,7 +67992,7 @@ in sources."unique-string-2.0.0" sources."unpipe-1.0.0" sources."update-notifier-4.1.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -67932,10 +68052,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.1.1"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.1.1.tgz"; - sha512 = "xAlOr5PMqUbiKXSv5PCniHWV3aiwj6wIZ0gUVcwpTCPVQm/qH2WAMFWxtnpM6KJqhkRWrIpovR4Rb0rn8GtJzQ=="; + url = "https://registry.npmjs.org/karma/-/karma-5.2.1.tgz"; + sha512 = "+/AO2fWL7kC3aWTx/lHjtKXfOqh0O+KLtTy4BLQ/b/eciHR4VTHHdPhdrn9sDBQskgDieaBZ+sAKzlldc4GW/Q=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -67998,7 +68118,7 @@ in sources."engine.io-parser-2.2.0" sources."ent-2.2.0" sources."escape-html-1.0.3" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."extend-3.0.2" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" @@ -68094,7 +68214,7 @@ in sources."ms-2.1.2" ]; }) - sources."source-map-0.6.1" + sources."source-map-0.7.3" sources."statuses-1.5.0" (sources."streamroller-2.2.4" // { dependencies = [ @@ -68431,7 +68551,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."underscore-1.9.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" (sources."utile-0.3.0" // { dependencies = [ sources."async-0.9.2" @@ -68628,7 +68748,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -69067,7 +69187,7 @@ in sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -69100,7 +69220,7 @@ in sources."map-cache-0.2.2" sources."map-obj-4.1.0" sources."map-visit-1.0.0" - (sources."meow-7.1.0" // { + (sources."meow-7.1.1" // { dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" @@ -69431,7 +69551,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -69450,7 +69570,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -70384,7 +70504,7 @@ in sources."isobject-3.0.1" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -70414,8 +70534,8 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.11.0" - sources."@babel/core-7.11.4" - sources."@babel/generator-7.11.4" + sources."@babel/core-7.11.5" + sources."@babel/generator-7.11.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-compilation-targets-7.10.4" @@ -70445,7 +70565,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" @@ -70499,7 +70619,7 @@ in sources."@babel/plugin-transform-property-literals-7.10.4" sources."@babel/plugin-transform-regenerator-7.10.4" sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-runtime-7.11.0" + sources."@babel/plugin-transform-runtime-7.11.5" sources."@babel/plugin-transform-shorthand-properties-7.10.4" sources."@babel/plugin-transform-spread-7.11.0" sources."@babel/plugin-transform-sticky-regex-7.10.4" @@ -70507,22 +70627,18 @@ in sources."@babel/plugin-transform-typeof-symbol-7.10.4" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.0" - sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-env-7.11.5" + sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.2" - (sources."@jest/transform-25.5.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."@jest/transform-25.5.1" sources."@jest/types-25.5.0" sources."@types/babel__core-7.1.9" sources."@types/babel__generator-7.6.1" @@ -70534,8 +70650,8 @@ in sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/json-schema-7.0.5" - sources."@types/node-14.6.0" + sources."@types/json-schema-7.0.6" + sources."@types/node-14.6.3" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -70712,7 +70828,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001118" + sources."caniuse-lite-1.0.30001123" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -70721,7 +70837,7 @@ in 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."supports-color-7.2.0" ]; }) (sources."chokidar-3.4.2" // { @@ -70765,6 +70881,7 @@ in (sources."combine-source-map-0.8.0" // { dependencies = [ sources."convert-source-map-1.1.3" + sources."source-map-0.5.7" ]; }) sources."combined-stream-1.0.8" @@ -70834,7 +70951,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.549" + sources."electron-to-chromium-1.3.560" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -70855,7 +70972,11 @@ in sources."eslint-scope-4.0.3" sources."eslint-visitor-keys-1.3.0" sources."esprima-4.0.1" - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."estree-walker-0.6.1" sources."esutils-2.0.3" @@ -70992,7 +71113,11 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inline-source-map-0.6.2" + (sources."inline-source-map-0.6.2" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) sources."insert-module-globals-7.2.0" sources."interpret-1.4.0" sources."invariant-2.2.4" @@ -71038,7 +71163,7 @@ in (sources."jest-worker-25.5.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."js-tokens-4.0.0" @@ -71046,7 +71171,7 @@ in sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-0.0.1" @@ -71288,7 +71413,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."schema-utils-2.7.0" + sources."schema-utils-2.7.1" sources."semver-5.7.1" sources."serialize-javascript-4.0.0" sources."set-blocking-2.0.0" @@ -71325,6 +71450,7 @@ in sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" sources."ms-2.0.0" + sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -71338,13 +71464,9 @@ in ]; }) sources."source-list-map-0.1.8" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."source-map-support-0.5.19" sources."source-map-url-0.4.0" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.1" @@ -71399,15 +71521,10 @@ in sources."readable-stream-3.6.0" ]; }) - (sources."terser-4.8.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."terser-4.8.0" (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ sources."schema-utils-1.0.0" - sources."source-map-0.6.1" ]; }) sources."test-exclude-6.0.0" @@ -71452,7 +71569,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -71514,7 +71631,6 @@ in (sources."webpack-sources-1.4.3" // { dependencies = [ sources."source-list-map-2.0.1" - sources."source-map-0.6.1" ]; }) sources."which-2.0.2" @@ -71650,11 +71766,11 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sshpk-1.16.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" ]; @@ -71760,7 +71876,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."event-emitter-0.3.5" @@ -71932,7 +72052,7 @@ in sources."type-1.2.0" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -72019,22 +72139,23 @@ in sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-7.6.0" + sources."@fluentui/date-time-utilities-7.7.0" sources."@fluentui/keyboard-key-0.2.11" - sources."@fluentui/react-7.132.0" - sources."@fluentui/react-focus-7.13.3" - sources."@fluentui/react-icons-0.2.2" - sources."@fluentui/theme-0.1.2" - sources."@microsoft/load-themed-styles-1.10.79" + sources."@fluentui/react-7.134.1" + sources."@fluentui/react-focus-7.15.0" + sources."@fluentui/react-icons-0.3.0" + sources."@fluentui/react-window-provider-0.3.0" + sources."@fluentui/theme-0.2.0" + sources."@microsoft/load-themed-styles-1.10.82" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.8.3" - sources."@uifabric/icons-7.4.3" - sources."@uifabric/merge-styles-7.17.0" - sources."@uifabric/react-hooks-7.10.0" + sources."@uifabric/foundation-7.9.0" + sources."@uifabric/icons-7.5.0" + sources."@uifabric/merge-styles-7.18.0" + sources."@uifabric/react-hooks-7.11.0" sources."@uifabric/set-version-7.0.22" - sources."@uifabric/styling-7.15.3" - sources."@uifabric/utilities-7.30.0" + sources."@uifabric/styling-7.16.0" + sources."@uifabric/utilities-7.31.0" sources."accepts-1.3.7" sources."ajv-6.12.4" sources."ansi-escapes-1.4.0" @@ -72098,7 +72219,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."etag-1.8.1" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" sources."express-openapi-6.0.0" @@ -72160,7 +72281,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.132.0" + sources."office-ui-fabric-react-7.134.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -72259,7 +72380,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.32.4" + sources."swagger-ui-dist-3.32.5" sources."tail-2.0.4" sources."through-2.3.8" sources."tmp-0.0.33" @@ -72269,7 +72390,7 @@ in sources."tslib-1.13.0" sources."type-is-1.6.18" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -72290,10 +72411,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.2.tgz"; - sha512 = "I8FRAcuACNMLQn3lS4qeWLxXqLvGf6r2CaLstDpZmMUUSmvW6Cnm1AuHxgbc7ctZVRcfwspCRbDHymPsi3dkJw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz"; + sha512 = "ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -72501,7 +72622,7 @@ in sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" sources."superagent-3.8.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -72580,10 +72701,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.59.1"; + version = "2.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.59.1.tgz"; - sha512 = "HoqWho35I89wkJToOjMkcyfs3vXaeRG8/IDaKCXlVWfxLa4X4tEcN+YA/Xt6fHmiRTL8dvZttTO+rwlru7JaBQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.61.0.tgz"; + sha512 = "IGB8m/Cb0LB84K9wXSv3KbGJ29RzPTRt8CfHdH6mBMW5hWk3TfCGIIXl1xjqVR7am4ZxbGlKUcDDiMGGwF+/JQ=="; }; dependencies = [ sources."@analytics/cookie-utils-0.2.3" @@ -72592,7 +72713,7 @@ in sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@bugsnag/browser-7.3.3" sources."@bugsnag/core-7.3.3" sources."@bugsnag/cuid-3.0.0" @@ -72602,31 +72723,22 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-3.3.2" // { + (sources."@netlify/build-3.3.5" // { dependencies = [ - sources."ansi-styles-4.2.1" sources."chalk-3.0.0" - sources."execa-3.4.0" - sources."find-up-4.1.0" - sources."read-pkg-up-7.0.1" sources."resolve-2.0.0-next.1" - sources."uuid-8.3.0" ]; }) - sources."@netlify/cache-utils-1.0.1" - (sources."@netlify/config-2.1.2" // { + sources."@netlify/cache-utils-1.0.2" + (sources."@netlify/config-2.1.3" // { dependencies = [ - sources."ansi-styles-4.2.1" sources."chalk-3.0.0" - sources."execa-3.4.0" - sources."find-up-4.1.0" ]; }) sources."@netlify/functions-utils-1.2.8" (sources."@netlify/git-utils-1.0.1" // { dependencies = [ sources."braces-3.0.2" - sources."execa-3.4.0" sources."fill-range-7.0.1" sources."is-number-7.0.0" sources."micromatch-4.0.2" @@ -72634,14 +72746,9 @@ in ]; }) sources."@netlify/open-api-0.16.0" - (sources."@netlify/run-utils-1.0.0" // { + sources."@netlify/run-utils-1.0.0" + (sources."@netlify/zip-it-and-ship-it-1.3.12" // { dependencies = [ - sources."execa-3.4.0" - ]; - }) - (sources."@netlify/zip-it-and-ship-it-1.3.11" // { - dependencies = [ - sources."find-up-4.1.0" sources."resolve-2.0.0-next.1" ]; }) @@ -72654,22 +72761,25 @@ in sources."@nodelib/fs.walk-1.2.4" (sources."@oclif/color-0.1.2" // { dependencies = [ + sources."ansi-styles-3.2.1" (sources."chalk-3.0.0" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."has-flag-3.0.0" sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" - sources."tslib-1.13.0" ]; }) (sources."@oclif/command-1.8.0" // { dependencies = [ sources."@oclif/plugin-help-3.2.0" sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -72691,25 +72801,22 @@ in sources."micromatch-4.0.2" sources."slash-3.0.0" sources."to-regex-range-5.0.1" + sources."tslib-2.0.1" ]; }) (sources."@oclif/errors-1.3.3" // { dependencies = [ - sources."ansi-styles-4.2.1" sources."clean-stack-3.0.0" sources."fs-extra-9.0.1" sources."wrap-ansi-7.0.0" ]; }) sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.5" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) + sources."@oclif/parser-3.8.5" (sources."@oclif/plugin-help-2.2.3" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" sources."emoji-regex-7.0.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" @@ -72730,6 +72837,7 @@ in }) (sources."@oclif/plugin-not-found-1.2.4" // { dependencies = [ + sources."ansi-styles-3.2.1" sources."cli-ux-4.9.3" sources."fs-extra-7.0.1" sources."has-flag-3.0.0" @@ -72739,7 +72847,6 @@ in sources."semver-5.7.1" sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" - sources."tslib-1.13.0" sources."universalify-0.1.2" ]; }) @@ -72748,6 +72855,8 @@ in sources."fs-extra-7.0.1" sources."jsonfile-4.0.0" sources."npm-run-path-3.1.0" + sources."path-key-3.1.1" + sources."tslib-2.0.1" sources."universalify-0.1.2" ]; }) @@ -72803,7 +72912,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" sources."@types/semver-5.5.0" @@ -72824,10 +72933,10 @@ in }) sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" - (sources."ansi-styles-3.2.1" // { + (sources."ansi-styles-4.2.1" // { dependencies = [ - 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."ansicolors-0.3.2" @@ -72862,7 +72971,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.740.0" // { + (sources."aws-sdk-2.745.0" // { dependencies = [ sources."buffer-4.9.2" sources."uuid-3.3.2" @@ -72887,7 +72996,6 @@ in }) (sources."boxen-4.2.0" // { dependencies = [ - sources."ansi-styles-4.2.1" sources."chalk-3.0.0" ]; }) @@ -72919,6 +73027,7 @@ in sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ + sources."ansi-styles-3.2.1" sources."escape-string-regexp-1.0.5" sources."has-flag-3.0.0" sources."supports-color-5.5.0" @@ -72954,19 +73063,19 @@ in }) sources."clean-deep-3.4.0" sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-progress-3.8.2" - sources."cli-spinners-1.3.1" - (sources."cli-ux-5.4.10" // { + sources."cli-spinners-2.4.0" + (sources."cli-ux-5.5.0" // { dependencies = [ sources."ansi-escapes-4.3.1" - sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."clean-stack-3.0.0" sources."extract-stack-2.0.0" sources."fs-extra-9.0.1" sources."supports-hyperlinks-2.1.0" + sources."tslib-2.0.1" sources."type-fest-0.11.0" ]; }) @@ -72975,14 +73084,9 @@ in sources."clone-1.0.4" sources."clone-response-1.0.2" sources."collection-visit-1.0.0" - (sources."color-3.0.0" // { - dependencies = [ - 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."color-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."color-string-1.5.3" sources."colors-1.4.0" sources."colorspace-1.1.2" @@ -73023,10 +73127,19 @@ in }) sources."core-util-is-1.0.2" sources."cp-file-7.0.0" - sources."cpy-8.1.0" + (sources."cpy-8.1.1" // { + dependencies = [ + sources."globby-9.2.0" + ]; + }) sources."crc-3.8.0" sources."crc32-stream-3.0.1" - sources."cross-spawn-7.0.3" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + sources."which-1.3.1" + ]; + }) sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-time-2.1.0" @@ -73050,9 +73163,8 @@ in sources."decompress-response-3.3.0" (sources."decompress-tar-4.1.1" // { dependencies = [ - sources."bl-1.2.2" + sources."bl-1.2.3" sources."file-type-5.2.0" - sources."is-stream-1.1.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."tar-stream-1.6.2" @@ -73061,13 +73173,11 @@ in (sources."decompress-tarbz2-4.1.1" // { dependencies = [ sources."file-type-6.2.0" - sources."is-stream-1.1.0" ]; }) (sources."decompress-targz-4.1.1" // { dependencies = [ sources."file-type-5.2.0" - sources."is-stream-1.1.0" ]; }) (sources."decompress-unzip-4.0.1" // { @@ -73086,19 +73196,7 @@ in sources."define-property-2.0.2" (sources."del-5.1.0" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.3" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.4" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" - sources."globby-10.0.2" - sources."ignore-5.1.8" - sources."is-number-7.0.0" - sources."micromatch-4.0.2" sources."slash-3.0.0" - sources."to-regex-range-5.0.1" ]; }) sources."delayed-stream-1.0.0" @@ -73137,7 +73235,6 @@ in sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" sources."p-event-2.3.1" - sources."p-finally-1.0.0" sources."p-timeout-2.0.1" sources."pify-3.0.0" sources."sort-keys-2.0.0" @@ -73168,11 +73265,17 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."events-1.1.1" - (sources."execa-2.1.0" // { + (sources."execa-3.4.0" // { dependencies = [ - sources."npm-run-path-3.1.0" + sources."cross-spawn-7.0.3" + sources."is-stream-2.0.0" + sources."npm-run-path-4.0.1" + sources."p-finally-2.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" ]; }) (sources."expand-brackets-2.1.4" // { @@ -73246,13 +73349,7 @@ in sources."debug-2.6.9" ]; }) - (sources."find-up-3.0.0" // { - dependencies = [ - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."find-up-4.1.0" sources."flatten-1.0.3" sources."flush-write-stream-2.0.0" sources."fn.name-1.1.0" @@ -73303,7 +73400,22 @@ in sources."glob-to-regexp-0.3.0" sources."global-cache-dir-1.0.1" sources."global-dirs-2.0.1" - sources."globby-9.2.0" + (sources."globby-10.0.2" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.4" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + ]; + }) sources."gonzales-pe-4.3.0" (sources."got-9.6.0" // { dependencies = [ @@ -73334,11 +73446,16 @@ in ]; }) sources."has-yarn-2.1.0" - sources."hasha-5.2.0" + (sources."hasha-5.2.0" // { + dependencies = [ + sources."is-stream-2.0.0" + ]; + }) sources."hosted-git-info-2.8.8" sources."http-cache-semantics-4.1.0" (sources."http-call-5.3.0" // { dependencies = [ + sources."is-stream-2.0.0" sources."parse-json-4.0.0" ]; }) @@ -73348,7 +73465,7 @@ in ]; }) sources."http-proxy-1.18.1" - (sources."http-proxy-middleware-0.21.0" // { + (sources."http-proxy-middleware-1.0.5" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -73362,7 +73479,6 @@ in sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."ignore-4.0.6" - sources."ignore-walk-3.0.3" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -73391,7 +73507,6 @@ in (sources."inquirer-autocomplete-prompt-1.1.0" // { dependencies = [ sources."ansi-escapes-4.3.1" - sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."type-fest-0.11.0" ]; @@ -73407,12 +73522,13 @@ in sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" - sources."is-docker-1.1.0" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" + sources."is-interactive-1.0.0" sources."is-natural-number-4.0.1" sources."is-npm-4.0.0" (sources."is-number-3.0.0" // { @@ -73428,16 +73544,12 @@ in sources."is-plain-object-2.0.4" sources."is-regex-1.1.1" sources."is-retry-allowed-1.2.0" - sources."is-stream-2.0.0" + sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" - (sources."is-wsl-2.2.0" // { - dependencies = [ - sources."is-docker-2.1.1" - ]; - }) + sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."iserror-0.0.2" @@ -73452,15 +73564,11 @@ in sources."js-yaml-3.14.0" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."jsonfile-6.0.1" sources."junk-3.1.0" sources."jwt-decode-2.2.0" - (sources."keep-func-props-3.0.1" // { - dependencies = [ - sources."mimic-fn-3.1.0" - ]; - }) + sources."keep-func-props-3.0.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" @@ -73514,11 +73622,10 @@ in sources."lodash.uniq-4.5.0" (sources."log-process-errors-5.1.2" // { dependencies = [ - sources."ansi-styles-4.2.1" sources."chalk-3.0.0" ]; }) - sources."log-symbols-2.2.0" + sources."log-symbols-3.0.0" (sources."logform-2.2.0" // { dependencies = [ sources."ms-2.1.2" @@ -73554,7 +73661,7 @@ in sources."mime-1.6.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" - sources."mimic-fn-2.1.0" + sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -73589,19 +73696,15 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-4.3.12" // { + (sources."netlify-4.3.13" // { dependencies = [ - sources."p-wait-for-3.1.0" sources."qs-6.9.4" ]; }) (sources."netlify-redirect-parser-2.5.0" // { dependencies = [ sources."@netlify/config-0.11.11" - sources."ansi-styles-4.2.1" sources."chalk-3.0.0" - sources."execa-3.4.0" - sources."find-up-4.1.0" ]; }) sources."netlify-redirector-0.2.0" @@ -73616,15 +73719,12 @@ in }) sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" - sources."npm-bundled-1.1.1" (sources."npm-conf-1.1.3" // { dependencies = [ sources."pify-3.0.0" ]; }) - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" - sources."npm-run-path-4.0.1" + sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -73652,7 +73752,11 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."onetime-5.1.2" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) (sources."open-6.4.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -73664,10 +73768,12 @@ in ]; }) sources."optionator-0.8.3" - (sources."ora-3.4.0" // { + (sources."ora-4.1.1" // { dependencies = [ - sources."cli-spinners-2.4.0" - sources."strip-ansi-5.2.0" + sources."chalk-3.0.0" + sources."cli-cursor-3.1.0" + sources."mute-stream-0.0.8" + sources."restore-cursor-3.1.0" ]; }) sources."os-name-3.1.0" @@ -73684,24 +73790,15 @@ in sources."p-map-2.1.0" ]; }) - sources."p-finally-2.0.1" + sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-map-3.0.0" sources."p-reduce-2.1.0" - (sources."p-timeout-3.2.0" // { - dependencies = [ - sources."p-finally-1.0.0" - ]; - }) + sources."p-timeout-3.2.0" sources."p-try-2.2.0" - (sources."p-wait-for-2.0.1" // { - dependencies = [ - sources."p-finally-1.0.0" - sources."p-timeout-2.0.1" - ]; - }) + sources."p-wait-for-3.1.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" @@ -73719,20 +73816,11 @@ in sources."parse-ms-2.1.0" sources."parseurl-1.3.3" sources."pascalcase-0.1.1" - (sources."password-prompt-1.1.2" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - ]; - }) + sources."password-prompt-1.1.2" sources."path-dirname-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" + sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" @@ -73741,11 +73829,7 @@ in sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pkg-dir-4.2.0" // { - dependencies = [ - sources."find-up-4.1.0" - ]; - }) + sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.32" // { dependencies = [ @@ -73759,7 +73843,11 @@ in sources."precond-0.2.3" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."pretty-format-24.9.0" + (sources."pretty-format-24.9.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + ]; + }) sources."pretty-ms-5.1.0" sources."prettyjson-1.2.1" sources."process-nextick-args-2.0.1" @@ -73772,7 +73860,7 @@ in sources."query-string-5.1.1" sources."querystring-0.2.0" sources."random-bytes-1.0.0" - sources."random-item-1.0.0" + sources."random-item-3.0.0" sources."range-parser-1.2.1" (sources."raw-body-2.4.1" // { dependencies = [ @@ -73786,12 +73874,7 @@ in sources."type-fest-0.6.0" ]; }) - (sources."read-pkg-up-6.0.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."type-fest-0.5.2" - ]; - }) + sources."read-pkg-up-7.0.1" sources."readable-stream-3.6.0" sources."readdirp-3.4.0" sources."redeyed-2.1.1" @@ -73819,11 +73902,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - (sources."rxjs-6.6.2" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safe-join-0.1.3" sources."safe-json-stringify-1.2.0" @@ -73855,8 +73934,8 @@ in ]; }) sources."setprototypeof-1.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -73966,7 +74045,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" (sources."supports-hyperlinks-1.0.1" // { dependencies = [ sources."has-flag-2.0.0" @@ -74019,12 +74098,8 @@ in ]; }) sources."triple-beam-1.3.0" - sources."tslib-2.0.1" - (sources."tsutils-3.17.1" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) + sources."tslib-1.13.0" + sources."tsutils-3.17.1" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-fest-0.8.1" @@ -74056,7 +74131,6 @@ in }) (sources."update-notifier-4.1.1" // { dependencies = [ - sources."ansi-styles-4.2.1" sources."chalk-3.0.0" ]; }) @@ -74068,7 +74142,7 @@ in sources."util-deprecate-1.0.2" sources."util.promisify-1.0.1" sources."utils-merge-1.0.1" - sources."uuid-3.4.0" + sources."uuid-8.3.0" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" @@ -74084,20 +74158,15 @@ in sources."widest-line-3.1.0" (sources."windows-release-3.3.3" // { dependencies = [ - sources."cross-spawn-6.0.5" sources."execa-1.0.0" sources."get-stream-4.1.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."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" ]; }) - sources."winston-3.3.3" + (sources."winston-3.3.3" // { + dependencies = [ + sources."is-stream-2.0.0" + ]; + }) (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -74105,11 +74174,7 @@ in ]; }) sources."word-wrap-1.2.3" - (sources."wrap-ansi-6.2.0" // { - dependencies = [ - sources."ansi-styles-4.2.1" - ]; - }) + sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" @@ -74117,13 +74182,9 @@ in sources."xmlbuilder-9.0.7" sources."xtend-4.0.2" sources."y18n-4.0.0" - (sources."yargs-15.4.1" // { - dependencies = [ - sources."find-up-4.1.0" - ]; - }) + sources."yargs-15.4.1" sources."yargs-parser-18.1.3" - sources."yarn-1.22.4" + sources."yarn-1.22.5" sources."yauzl-2.10.0" sources."zip-stream-3.0.1" ]; @@ -74258,7 +74319,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -74632,7 +74693,7 @@ in sources."minizlib-1.3.3" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."needle-2.5.0" + sources."needle-2.5.2" sources."nopt-4.0.3" sources."npm-bundled-1.1.1" sources."npm-normalize-package-bin-1.0.1" @@ -74748,7 +74809,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - (sources."bl-1.2.2" // { + (sources."bl-1.2.3" // { dependencies = [ (sources."readable-stream-2.3.7" // { dependencies = [ @@ -74996,7 +75057,7 @@ in sources."mustache-4.0.1" sources."mute-stream-0.0.8" sources."nan-2.14.0" - (sources."needle-2.5.0" // { + (sources."needle-2.5.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -75135,7 +75196,7 @@ in sources."unique-stream-2.3.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -75348,7 +75409,7 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uid-number-0.0.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -75405,12 +75466,12 @@ in (sources."chalk-3.0.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."chokidar-3.4.2" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -75554,14 +75615,14 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "7.1.1"; + version = "8.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-7.1.1.tgz"; - sha512 = "mTth44/DK4EmTecdyqEzt6C76sSYdCnDrOo39lNcN1/JWOEkcb+uLQ2CRt0gqkCp6DohALs4RpVBVp+E2i+h8Q=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-8.0.5.tgz"; + sha512 = "EZ3DIFvKFNZzwV9OdEYITTAY6fmuD7evItEmf9XyntG4p29n8JpFaGrf9uCQIR0Hx3G5RFNsdCeURHzF6YXIAw=="; }; dependencies = [ sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.3" + sources."@npmcli/git-2.0.4" sources."@npmcli/installed-package-contents-1.0.5" sources."@npmcli/move-file-1.0.1" sources."@npmcli/promise-spawn-1.2.0" @@ -75622,7 +75683,7 @@ in sources."ci-info-2.0.0" sources."cint-8.2.1" sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-table-0.3.1" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -75630,7 +75691,7 @@ in sources."color-name-1.1.4" sources."colors-1.0.3" sources."combined-stream-1.0.8" - sources."commander-6.0.0" + sources."commander-6.1.0" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" @@ -75661,7 +75722,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."figgy-pudding-3.5.2" - sources."find-up-4.1.0" + sources."find-up-5.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-minipass-2.1.0" @@ -75711,7 +75772,7 @@ in sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-parse-helpfulerror-1.0.3" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -75727,11 +75788,12 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."path-exists-3.0.0" ]; }) - sources."locate-path-5.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.20" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -75800,8 +75862,8 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.0.2" + sources."p-locate-5.0.0" sources."p-map-4.0.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { @@ -75810,6 +75872,7 @@ in ]; }) sources."pacote-11.1.11" + sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" @@ -75831,6 +75894,7 @@ in sources."readdir-scoped-modules-1.1.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" + sources."remote-git-tags-3.0.0" sources."request-2.88.2" sources."require-from-string-2.0.2" sources."responselike-1.0.2" @@ -75849,9 +75913,9 @@ in sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."smart-buffer-4.1.0" - sources."socks-2.4.1" + sources."socks-2.4.2" sources."socks-proxy-agent-5.0.0" - sources."spawn-please-0.3.0" + sources."spawn-please-0.4.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."ssri-8.0.0" @@ -75859,7 +75923,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" (sources."tar-6.0.5" // { dependencies = [ sources."minizlib-2.1.2" @@ -75880,7 +75944,7 @@ in sources."chalk-3.0.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -76068,7 +76132,7 @@ in sources."tweetnacl-0.14.5" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -76138,21 +76202,16 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.11.0" - (sources."@babel/core-7.11.4" // { + (sources."@babel/core-7.11.5" // { dependencies = [ sources."json5-2.1.3" - sources."source-map-0.5.7" - ]; - }) - (sources."@babel/generator-7.11.4" // { - dependencies = [ - sources."source-map-0.5.7" ]; }) + sources."@babel/generator-7.11.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.10.5" + sources."@babel/helper-builder-react-jsx-experimental-7.11.5" sources."@babel/helper-compilation-targets-7.10.4" sources."@babel/helper-create-class-features-plugin-7.10.5" sources."@babel/helper-create-regexp-features-plugin-7.10.4" @@ -76176,7 +76235,7 @@ in sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" @@ -76238,12 +76297,12 @@ in sources."@babel/plugin-transform-typeof-symbol-7.10.4" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.0" - sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-env-7.11.5" + sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -76361,7 +76420,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001118" + sources."caniuse-lite-1.0.30001123" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -76495,7 +76554,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.549" + sources."electron-to-chromium-1.3.560" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -76795,7 +76854,7 @@ in sources."supports-color-6.1.0" ]; }) - (sources."postcss-calc-7.0.3" // { + (sources."postcss-calc-7.0.4" // { dependencies = [ sources."postcss-value-parser-4.1.0" ]; @@ -77051,7 +77110,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -77127,7 +77186,7 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bindings-1.5.0" - sources."bl-1.2.2" + sources."bl-1.2.3" sources."bluebird-3.7.2" (sources."body-parser-1.19.0" // { dependencies = [ @@ -77340,10 +77399,10 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -78045,7 +78104,7 @@ in sources."ultron-1.1.1" sources."uniq-1.0.1" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."utp-0.0.7" @@ -78073,10 +78132,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.5.3"; + version = "5.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.5.3.tgz"; - sha512 = "1FfqqDOaQKIn10WzP2Vdjwo4KOpdu7s2dRbBMDJi9llHa5BhhHf+ASrW8HTWyqKd03n6wf2NrbFvZreHJKQnZw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.5.10.tgz"; + sha512 = "lHaae4Xiiz2I6+1czn/3AvvM+O7sHDoiEiBW4UK0NPuWJdCBGuu6qcuneuo02cmo5Hur3KuqgGmUdkMKq7gMnw=="; }; buildInputs = globalBuildInputs; meta = { @@ -78091,10 +78150,10 @@ in postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.1.tgz"; - sha512 = "bYQy5ydAQJKCMSpvaMg0ThPBeGYqhQXumjbFOmWnL4u65CYXQ16RfS6afGQpit0dGv/fNzxbdDtx8dkqOhhIbg=="; + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.2.tgz"; + sha512 = "3mlEmN1v2NVuosMWZM2tP8bgZn7rO5PYxRRrXtdSyL5KipcgBDjJ9ct8/LKxImMCJJi3x5nYhCGFJOkGyEqXBQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -78133,7 +78192,7 @@ in sources."fs-extra-9.0.1" sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" - sources."get-stdin-7.0.0" + sources."get-stdin-8.0.0" sources."glob-parent-5.1.1" sources."globby-11.0.1" sources."graceful-fs-4.2.4" @@ -78214,7 +78273,7 @@ in sources."sprintf-js-1.0.3" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" sources."universalify-1.0.0" sources."which-module-2.0.0" @@ -78623,10 +78682,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.65"; + version = "1.1.66"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.65.tgz"; - sha512 = "G8tI8Ws5CwXJGJTQ48e0L+56cA31990t9V65EukrefKnLupySPVVpHuUGeCY21LCYqZPg1yY2R8KMbXH1y1uMQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.66.tgz"; + sha512 = "DbtdoFKrg3JrGAEG9bUjN4dNQQeoj7a/vy61Ppi/6KeA1sEclA/sUFFH8Yyb56UDUEXYg2U1dw78zr6mRw+Cog=="; }; buildInputs = globalBuildInputs; meta = { @@ -78805,11 +78864,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/generator-7.11.4" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) + sources."@babel/generator-7.11.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" @@ -78817,15 +78872,16 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" + sources."@exodus/schemasafe-1.0.0-rc.2" sources."@types/color-name-1.1.1" sources."ajv-5.5.2" sources."ansi-regex-3.0.0" @@ -79020,8 +79076,8 @@ in sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" - sources."oas-linter-3.1.3" - sources."oas-resolver-2.4.3" + sources."oas-linter-3.2.0" + sources."oas-resolver-2.4.4" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."object-assign-4.1.1" @@ -79044,7 +79100,7 @@ in sources."pbkdf2-3.1.1" sources."perfect-scrollbar-1.5.0" sources."picomatch-2.2.2" - sources."polished-3.6.5" + sources."polished-3.6.6" sources."postcss-value-parser-4.1.0" sources."prismjs-1.21.0" sources."process-0.11.10" @@ -79086,7 +79142,7 @@ in sources."tslib-1.13.0" ]; }) - sources."reftools-1.1.5" + sources."reftools-1.1.6" sources."regenerator-runtime-0.13.7" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" @@ -79137,7 +79193,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.0.1" sources."tty-browserify-0.0.0" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -79217,10 +79273,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.26.5"; + version = "2.26.9"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.26.5.tgz"; - sha512 = "rCyFG3ZtQdnn9YwfuAVH0l/Om34BdO5lwCA0W6Hq+bNB21dVEBbCRxhaHOmu1G7OBFDWytbzAC104u7rxHwGjA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.26.9.tgz"; + sha512 = "XIiWYLayLqV+oY4S2Lub/shJq4uk/QQLwWToYCL4LjZbYHbFK3czea4UDVRUJu+zNmKmxq5Zb/OG7c5HSvH2TQ=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -79248,6 +79304,7 @@ in sources."chalk-2.4.2" ]; }) + sources."@eslint/eslintrc-0.1.3" sources."@rollup/plugin-commonjs-13.0.2" sources."@rollup/plugin-node-resolve-8.4.0" sources."@rollup/pluginutils-3.1.0" @@ -79255,7 +79312,7 @@ in sources."@types/eslint-visitor-keys-1.0.0" sources."@types/estree-0.0.39" sources."@types/glob-7.1.3" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/mocha-7.0.2" sources."@types/node-12.7.12" @@ -79305,7 +79362,7 @@ in 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."supports-color-7.2.0" ]; }) sources."cheerio-1.0.0-rc.3" @@ -79355,7 +79412,7 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.7.0" // { + (sources."eslint-7.8.1" // { dependencies = [ sources."semver-7.3.2" ]; @@ -79370,7 +79427,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."estree-walker-1.0.1" sources."esutils-2.0.3" @@ -79460,7 +79521,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.1.2" // { + (sources."mocha-8.1.3" // { dependencies = [ sources."debug-4.1.1" sources."escape-string-regexp-4.0.0" @@ -79515,7 +79576,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.26.5" + sources."rollup-2.26.9" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -79556,11 +79617,11 @@ in sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.8.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.1.1" - (sources."vsce-1.79.3" // { + (sources."vsce-1.79.5" // { dependencies = [ sources."chalk-2.4.2" sources."semver-5.7.1" @@ -79741,7 +79802,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid2-0.0.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-0.4.9" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -79863,7 +79924,7 @@ in sources."supports-color-5.5.0" sources."term-size-1.2.0" sources."update-check-1.5.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."vary-1.1.2" sources."which-1.3.1" sources."widest-line-2.0.1" @@ -79882,10 +79943,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.80.0"; + version = "1.81.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.80.0.tgz"; - sha512 = "gIHWDwW5ZkKD+WKMhVUPAmhn95Tk8vFru7feYpbJ4WZgzz/M0HkHpph3rA7YxiWBJChghaLXO7HwvbnxJ1nvCw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.81.1.tgz"; + sha512 = "CaNAEFDc1V7egtIcJcF5A7ba6ipD9FG0ZPbHr0M4m8IMsmfWAewdhhj1BdlcpaD16mNZH9bjXYT28z+mHKZ4/w=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -79905,7 +79966,7 @@ in sources."@protobufjs/utf8-1.1.0" sources."@serverless/cli-1.5.2" sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-2.34.7" // { + (sources."@serverless/components-2.34.9" // { dependencies = [ sources."globby-10.0.2" sources."semver-7.3.2" @@ -79916,11 +79977,11 @@ in sources."fs-extra-7.0.1" ]; }) - sources."@serverless/enterprise-plugin-3.7.1" + sources."@serverless/enterprise-plugin-3.8.2" sources."@serverless/event-mocks-1.1.1" sources."@serverless/inquirer-1.1.2" - sources."@serverless/platform-client-1.1.7" - (sources."@serverless/platform-client-china-1.0.34" // { + sources."@serverless/platform-client-1.1.8" + (sources."@serverless/platform-client-china-1.0.37" // { dependencies = [ sources."archiver-4.0.2" sources."async-3.2.0" @@ -79945,10 +80006,10 @@ in sources."@types/chalk-2.2.0" sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" - sources."@types/lodash-4.14.160" + sources."@types/lodash-4.14.161" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/object-assign-4.0.30" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -80013,7 +80074,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.740.0" // { + (sources."aws-sdk-2.745.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -80100,7 +80161,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" (sources."cli-color-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -80152,7 +80213,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.34" + sources."dayjs-1.8.35" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -80164,7 +80225,7 @@ in sources."decompress-response-3.3.0" (sources."decompress-tar-4.1.1" // { dependencies = [ - sources."bl-1.2.2" + sources."bl-1.2.3" sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -80608,7 +80669,7 @@ in sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-2.0.1" - (sources."open-7.2.0" // { + (sources."open-7.2.1" // { dependencies = [ sources."is-docker-2.1.1" ]; @@ -80651,7 +80712,7 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.10.1" // { dependencies = [ - sources."@types/node-13.13.15" + sources."@types/node-13.13.16" ]; }) sources."pseudomap-1.0.2" @@ -80809,7 +80870,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" (sources."tabtab-3.0.2" // { dependencies = [ sources."debug-4.2.0" @@ -80867,7 +80928,7 @@ in sources."cli-boxes-1.0.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.10.3" // { dependencies = [ @@ -81128,7 +81189,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."utf8-2.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -81546,10 +81607,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.385.0"; + version = "1.388.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.385.0.tgz"; - sha512 = "sh+/Lt7764pWzuiXke+ICuBG88QLX9ZrCYmCJXJ9ZU0D9P+Uo25bVqE+OyJIhR4et6VRt60ZQim0iferz6K0mA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.388.0.tgz"; + sha512 = "Oe4aDzp3iyBNpZCYxAxNWaN7l5aAB7dAVd3MLuJ3jdbJXcucMwc3MAfoZ91dmVb4SMO2qsOpiq6+qO6W8nuASA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -81557,7 +81618,7 @@ in sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@sindresorhus/is-2.1.1" - (sources."@snyk/cli-interface-2.8.1" // { + (sources."@snyk/cli-interface-2.9.0" // { dependencies = [ (sources."@snyk/dep-graph-1.19.0" // { dependencies = [ @@ -81605,17 +81666,15 @@ in sources."@types/color-name-1.1.1" sources."@types/debug-4.1.5" sources."@types/emscripten-1.39.4" - sources."@types/glob-7.1.3" sources."@types/hosted-git-info-2.7.0" sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.15" + sources."@types/node-13.13.16" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.5" - (sources."@yarnpkg/core-2.1.1" // { + (sources."@yarnpkg/core-2.2.2" // { dependencies = [ sources."ansi-styles-4.2.1" sources."camelcase-5.3.1" @@ -81629,17 +81688,17 @@ in sources."semver-7.3.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."which-2.0.2" ]; }) - sources."@yarnpkg/fslib-2.1.0" + sources."@yarnpkg/fslib-2.2.1" sources."@yarnpkg/json-proxy-2.1.0" - sources."@yarnpkg/libzip-2.1.0" + sources."@yarnpkg/libzip-2.2.0" sources."@yarnpkg/lockfile-1.1.0" - sources."@yarnpkg/parsers-2.1.0" - sources."@yarnpkg/pnp-2.1.0" - (sources."@yarnpkg/shell-2.1.0" // { + sources."@yarnpkg/parsers-2.2.0" + sources."@yarnpkg/pnp-2.2.1" + (sources."@yarnpkg/shell-2.2.0" // { dependencies = [ sources."cross-spawn-7.0.3" sources."path-key-3.1.1" @@ -81694,7 +81753,7 @@ in 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."supports-color-7.2.0" ]; }) sources."brace-expansion-1.1.11" @@ -81713,13 +81772,12 @@ in sources."chalk-2.4.2" sources."chardet-0.7.0" sources."child-process-1.0.2" - sources."chownr-1.1.4" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-spinner-0.2.10" sources."cli-width-2.2.1" - sources."clipanion-2.4.4" + sources."clipanion-2.5.0" (sources."cliui-3.2.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -81797,7 +81855,6 @@ in sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."fs-constants-1.0.0" - sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { dependencies = [ @@ -81815,7 +81872,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."global-dirs-2.0.1" - sources."globby-10.0.2" + sources."globby-11.0.1" sources."got-11.4.0" sources."graceful-fs-4.2.4" sources."grapheme-splitter-1.0.4" @@ -81888,6 +81945,7 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."lie-3.3.0" + sources."lodash-4.17.20" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" @@ -81926,8 +81984,6 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -81948,7 +82004,7 @@ in sources."object.assign-4.1.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.2.0" + sources."open-7.2.1" sources."optionator-0.8.3" sources."os-locale-1.4.0" sources."os-name-3.1.0" @@ -81990,7 +82046,7 @@ in sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."pretty-bytes-5.3.0" + sources."pretty-bytes-5.4.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" @@ -82039,7 +82095,7 @@ in sources."slash-3.0.0" sources."smart-buffer-4.1.0" sources."snyk-config-3.1.0" - (sources."snyk-cpp-plugin-1.4.0" // { + (sources."snyk-cpp-plugin-1.4.1" // { dependencies = [ sources."tslib-2.0.1" ]; @@ -82064,25 +82120,15 @@ in sources."tmp-0.2.0" ]; }) - (sources."snyk-gradle-plugin-3.5.1" // { + (sources."snyk-gradle-plugin-3.6.2" // { dependencies = [ - (sources."@snyk/cli-interface-2.8.0" // { - dependencies = [ - (sources."@snyk/dep-graph-1.19.0" // { - dependencies = [ - sources."tslib-2.0.1" - ]; - }) - sources."tslib-1.13.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."has-flag-4.0.0" sources."rimraf-3.0.2" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tmp-0.2.1" sources."tslib-2.0.1" ]; @@ -82090,6 +82136,12 @@ in sources."snyk-module-3.1.0" (sources."snyk-mvn-plugin-2.19.1" // { dependencies = [ + sources."@snyk/cli-interface-2.8.1" + (sources."@snyk/dep-graph-1.19.0" // { + dependencies = [ + sources."tslib-2.0.1" + ]; + }) sources."tmp-0.1.0" sources."tslib-1.11.1" ]; @@ -82110,7 +82162,7 @@ in }) (sources."snyk-policy-1.14.1" // { dependencies = [ - sources."@types/node-6.14.10" + sources."@types/node-6.14.11" sources."hosted-git-info-2.8.8" (sources."snyk-module-2.1.0" // { dependencies = [ @@ -82127,7 +82179,7 @@ in }) (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ - sources."@types/node-6.14.10" + sources."@types/node-6.14.11" sources."debug-3.2.6" sources."hosted-git-info-2.8.8" sources."lru-cache-4.1.5" @@ -82186,11 +82238,6 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - (sources."tar-4.4.13" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) (sources."tar-stream-2.1.3" // { dependencies = [ sources."readable-stream-3.6.0" @@ -82221,7 +82268,7 @@ in sources."type-check-0.3.2" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" - sources."underscore-1.10.2" + sources."underscore-1.11.0" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-4.1.1" // { @@ -82231,7 +82278,7 @@ in 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."supports-color-7.2.0" ]; }) sources."url-parse-lax-3.0.0" @@ -82901,7 +82948,7 @@ in sources."multiserver-3.6.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" - sources."mutexify-1.3.0" + sources."mutexify-1.3.1" sources."muxrpc-6.5.0" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" @@ -83182,7 +83229,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.4.1" + sources."socks-2.4.2" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -83209,7 +83256,7 @@ in ]; }) sources."ssb-ebt-5.6.7" - sources."ssb-friends-4.2.0" + sources."ssb-friends-4.2.1" (sources."ssb-gossip-1.1.1" // { dependencies = [ sources."atomic-file-1.1.5" @@ -83242,7 +83289,7 @@ in sources."ssb-ref-2.14.0" sources."ssb-replicate-1.3.2" sources."ssb-unix-socket-1.0.0" - sources."ssb-validate-4.1.1" + sources."ssb-validate-4.1.2" sources."ssb-ws-6.2.3" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { @@ -83392,7 +83439,7 @@ in sources."ws-1.1.5" ]; }) - sources."@types/babel-types-7.0.8" + sources."@types/babel-types-7.0.9" sources."@types/babylon-6.16.5" sources."accepts-1.3.7" sources."acorn-3.3.0" @@ -83442,7 +83489,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.740.0" // { + (sources."aws-sdk-2.745.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -83677,7 +83724,7 @@ in }) (sources."http-proxy-1.18.1" // { dependencies = [ - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" ]; }) sources."http-signature-1.1.1" @@ -84096,7 +84143,7 @@ in sources."uid2-0.0.3" sources."ultron-1.0.2" sources."unpipe-1.0.0" - (sources."uri-js-4.2.2" // { + (sources."uri-js-4.4.0" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -84859,7 +84906,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -85020,7 +85067,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-module-2.0.0" @@ -85420,7 +85467,7 @@ in 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."supports-color-7.2.0" sources."type-fest-0.8.1" ]; }) @@ -85443,7 +85490,7 @@ in sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."clone-response-1.0.2" sources."collapse-white-space-1.0.6" sources."color-convert-1.9.3" @@ -85545,7 +85592,7 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" @@ -85581,7 +85628,7 @@ in sources."vfile-location-3.1.0" ]; }) - sources."meow-7.1.0" + sources."meow-7.1.1" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -85764,7 +85811,7 @@ in 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."supports-color-7.2.0" ]; }) sources."url-parse-lax-3.0.0" @@ -86168,7 +86215,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.0" @@ -86293,7 +86340,7 @@ in sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" (sources."express-4.17.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -86398,7 +86445,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - (sources."needle-2.5.0" // { + (sources."needle-2.5.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -86550,7 +86597,7 @@ in sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" sources."strtok3-6.0.4" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tar-4.4.13" sources."tlds-1.208.0" sources."to-array-0.1.4" @@ -86566,7 +86613,7 @@ in sources."ua-parser-js-0.7.21" sources."uc.micro-1.0.6" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."urlsafe-base64-1.0.0" sources."util-deprecate-1.0.2" @@ -86599,10 +86646,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.120.0"; + version = "0.120.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.120.0.tgz"; - sha512 = "Swffpi3EAHWkmqC1MagKEzR5XgwkDiyeWI3M7vkGbBc0xhq2LcQmJj5DqBruLkrgcZQ+fM/+fSQBU1tDvggO4A=="; + url = "https://registry.npmjs.org/three/-/three-0.120.1.tgz"; + sha512 = "ktaCRFUR7JUZcKec+cBRz+oBex5pOVaJhrtxvFF2T7on53o9UkEux+/Nh1g/4zeb4t/pbxIFcADbn/ACu3LC1g=="; }; buildInputs = globalBuildInputs; meta = { @@ -86734,7 +86781,7 @@ in sources."tweetnacl-0.14.5" sources."uglify-js-3.4.10" sources."universalify-0.1.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.3.3" sources."verror-1.10.0" (sources."winston-1.1.2" // { @@ -86964,7 +87011,7 @@ in sha512 = "N8E1X543CWEjg0/A70ZnA/kfAfAY/uogILsIuWBhHGxzv9kaJaj7/JCSwDiBH86CPEy37chSgW86KxVeYKsswQ=="; }; dependencies = [ - sources."@types/node-6.14.10" + sources."@types/node-6.14.11" sources."ansi-0.3.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -87084,10 +87131,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.2"; + version = "3.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.2.tgz"; - sha512 = "GXCYNwqoo0MbLARghYjxVBxDCnU0tLqN7IPLdHHbibCb1NI5zBkU2EPcy/GaVxc0BtTjqyGXJCINe6JMR2Dpow=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.3.tgz"; + sha512 = "Lh00i69Uf6G74mvYpHCI9KVVXLcHW/xu79YTvH7Mkc9zyKUeSPz0owW0dguj0Scavns3ZOh3wY63J0Zb97Za2g=="; }; buildInputs = globalBuildInputs; meta = { @@ -87102,18 +87149,18 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.9"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.9.tgz"; - sha512 = "H+CLr9LrO0xZ0UbDz8K3KK//oBc3XDuj4he86Xnw/zjIPJlknOuiHdmPRYTlgo7/0zGEmvVgxZ+m3aqUMIpIhQ=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.10.tgz"; + sha512 = "WLrNg3hngoQJc3Ka1NxbWQMYjFJx013Xd9hNiRvHU1NUFMy8H5/5dT83Wh64gr2CJz5zNQlrqTkrfaWbwS/jEQ=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."@primer/octicons-10.0.0" + sources."@primer/octicons-10.1.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -87134,8 +87181,9 @@ in sources."base64id-2.0.0" sources."better-assert-1.0.2" sources."blob-0.0.5" - sources."blueimp-md5-2.16.0" + sources."blueimp-md5-2.17.0" sources."body-parser-1.19.0" + sources."bootstrap-3.4.1" sources."brace-expansion-1.1.11" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { @@ -87218,7 +87266,7 @@ in sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" - sources."getmac-5.11.0" + sources."getmac-5.15.0" sources."glob-7.1.6" sources."got-9.6.0" sources."has-binary2-1.0.3" @@ -87290,7 +87338,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."open-7.0.4" + sources."open-7.2.1" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -87409,7 +87457,7 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."y18n-4.0.0" sources."yallist-2.1.2" - sources."yargs-15.3.1" + sources."yargs-15.4.1" sources."yargs-parser-18.1.3" sources."yeast-0.1.2" ]; @@ -87507,6 +87555,57 @@ in bypassCache = true; reconstructLock = true; }; + vscode-json-languageserver-bin = nodeEnv.buildNodePackage { + name = "vscode-json-languageserver-bin"; + packageName = "vscode-json-languageserver-bin"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-json-languageserver-bin/-/vscode-json-languageserver-bin-1.0.1.tgz"; + sha512 = "WU+Ks0OEo1c4pgFUA4gIockhzlRqWqSRL2NXHOCtYhJnuIqfrNgSyECZC+nCMyn/CnzpPuQQjzC74GWlIRXnZQ=="; + }; + dependencies = [ + sources."agent-base-4.3.0" + sources."debug-3.1.0" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."http-proxy-agent-2.1.0" + sources."https-proxy-agent-2.2.4" + sources."jsonc-parser-1.0.3" + sources."ms-2.0.0" + (sources."request-light-0.2.5" // { + dependencies = [ + sources."vscode-nls-4.1.2" + ]; + }) + (sources."vscode-json-languageservice-3.8.3" // { + dependencies = [ + sources."jsonc-parser-2.3.0" + sources."vscode-nls-4.1.2" + sources."vscode-uri-2.1.2" + ]; + }) + sources."vscode-jsonrpc-3.5.0" + sources."vscode-languageserver-3.5.1" + (sources."vscode-languageserver-protocol-3.5.1" // { + dependencies = [ + sources."vscode-languageserver-types-3.5.0" + ]; + }) + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.15.1" + sources."vscode-nls-2.0.2" + sources."vscode-uri-1.0.8" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "JSON language server"; + homepage = "https://github.com/vscode-langservers/vscode-json-languageserver-bin#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; vue-cli = nodeEnv.buildNodePackage { name = "vue-cli"; packageName = "vue-cli"; @@ -87537,7 +87636,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" - sources."bl-1.2.2" + sources."bl-1.2.3" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."buffer-5.6.0" @@ -87760,12 +87859,12 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" sources."unzip-response-2.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" sources."user-home-2.0.0" @@ -87819,7 +87918,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-14.6.0" + sources."@types/node-14.6.3" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -87942,7 +88041,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" sources."cliui-4.1.0" @@ -88032,7 +88131,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."execa-0.7.0" @@ -88658,7 +88761,7 @@ in }) sources."untildify-2.1.0" sources."update-notifier-3.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -88770,7 +88873,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."JSONSelect-0.2.1" sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" @@ -88839,7 +88942,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.1.0" sources."bindings-1.5.0" - (sources."bl-1.2.2" // { + (sources."bl-1.2.3" // { dependencies = [ (sources."readable-stream-2.3.7" // { dependencies = [ @@ -88916,7 +89019,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -89030,7 +89133,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."event-to-promise-0.8.0" @@ -89543,7 +89650,7 @@ in }) sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.1.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."table-5.4.6" (sources."tar-stream-1.6.2" // { dependencies = [ @@ -89601,7 +89708,7 @@ in sources."chalk-3.0.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -89881,7 +89988,11 @@ in }) sources."errno-0.1.7" sources."eslint-scope-4.0.3" - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" @@ -90193,7 +90304,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -90564,7 +90675,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."accepts-1.3.7" sources."ajv-6.12.4" sources."ajv-errors-1.0.1" @@ -90696,7 +90807,7 @@ in sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."eventsource-1.0.7" sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { @@ -91094,7 +91205,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -91143,17 +91254,17 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "6.0.3"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz"; - sha512 = "q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.1.0.tgz"; + sha512 = "aWjIuLt1OVQxaDVffnt3bnGmLA8zGgAJaFwPA+a+QYVPh1vhIKjVfh3SbOFLV0kRPvGBITbw17n5CsmiBS4LQQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@npmcli/move-file-1.0.1" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."aggregate-error-3.1.0" sources."ajv-6.12.4" sources."ajv-keywords-3.5.2" @@ -91228,7 +91339,7 @@ in sources."rimraf-3.0.2" sources."run-parallel-1.1.9" sources."safe-buffer-5.2.1" - sources."schema-utils-2.7.0" + sources."schema-utils-2.7.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" sources."slash-3.0.0" @@ -91239,7 +91350,7 @@ in sources."to-regex-range-5.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."webpack-sources-1.4.3" sources."wrappy-1.0.2" sources."yallist-4.0.0" @@ -91274,7 +91385,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.15" + sources."@types/node-13.13.16" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -91427,7 +91538,7 @@ in sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.2.0" + sources."open-7.2.1" sources."package-json-versionify-1.0.4" sources."parse-numeric-range-1.2.0" (sources."parse-torrent-7.1.3" // { @@ -91602,10 +91713,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.0.tgz"; - sha512 = "d2/7eGgonEIRcnW9kK+k+ERG4gTOk5BXHr9KjTVv8gEarXKa62Kk+nyFE4AXgMDZ0LXTu8nTuN/AdboJiGN+pQ=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.1.tgz"; + sha512 = "R9SEt/nWTuZ8weB040L7yyaIVARlZ0ian1Kv6ptu4+xyVlIMobTZXaBTtgyhlMWqcQ3BpsAZu4q/2plRVG3tLQ=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -91622,7 +91733,7 @@ in sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.1" + sources."vscode-json-languageservice-3.8.3" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -91653,15 +91764,14 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.22.4"; + version = "1.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.4.tgz"; - sha512 = "oYM7hi/lIWm9bCoDMEWgffW8aiNZXCWeZ1/tGy0DWrN6vmzjCXIKu2Y21o8DYVBUtiktwKcNoxyGl/2iKLUNGA=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.5.tgz"; + sha512 = "5uzKXwdMc++mYktXqkfpNYT9tY8ViWegU58Hgbo+KXzrzzhEyP1Ip+BTtXloLrXNcNlxFJbLiFKGaS9vK9ym6Q=="; }; buildInputs = globalBuildInputs; meta = { description = "📦🐈 Fast, reliable, and secure dependency management."; - homepage = "https://github.com/yarnpkg/yarn#readme"; license = "BSD-2-Clause"; }; production = true; @@ -91687,7 +91797,7 @@ in sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -92045,7 +92155,7 @@ in sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -92070,7 +92180,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."locutus-2.0.11" + sources."locutus-2.0.12" sources."lodash-4.17.20" sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" @@ -92221,7 +92331,7 @@ in sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" - sources."pretty-bytes-5.3.0" + sources."pretty-bytes-5.4.1" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" @@ -92476,7 +92586,7 @@ in sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" @@ -92563,12 +92673,12 @@ in sources."ansi-regex-3.0.0" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."type-fest-0.11.0" sources."which-2.0.2" ]; }) - (sources."yeoman-generator-4.11.0" // { + (sources."yeoman-generator-4.12.0" // { dependencies = [ sources."debug-4.2.0" sources."diff-4.0.2" From 31772af506a18a58cd837b798bf8b959d582cf91 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 3 Sep 2020 14:38:26 +0200 Subject: [PATCH 631/688] ddrescueview: 0.4alpha3 -> 0.4alpha4 Update required for compatibility with fpc 3.2.0. --- pkgs/tools/system/ddrescueview/default.nix | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix index 838873b7557f..6c8e9c56cdc9 100644 --- a/pkgs/tools/system/ddrescueview/default.nix +++ b/pkgs/tools/system/ddrescueview/default.nix @@ -1,20 +1,24 @@ { stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk-pixbuf, glib, gtk2, libX11, pango }: -stdenv.mkDerivation rec { - name = "ddrescueview-0.4alpha3"; +let + versionBase = "0.4"; + versionSuffix = "alpha4"; +in stdenv.mkDerivation rec { + pname = "ddrescueview"; + version = "${versionBase}${versionSuffix}"; + name = "ddrescueview-0.4alpha4"; src = fetchurl { - name = "${name}.tar.xz"; - url = "mirror://sourceforge/ddrescueview/ddrescueview-source-0.4%7Ealpha3.tar.xz"; - sha256 = "0603jisxkswfyh93s3i20f8ns4yf83dmgmy0lg5001rvaw9mkw9j"; + name = "ddrescueview-${versionBase}${versionSuffix}.tar.xz"; + url = "mirror://sourceforge/ddrescueview/ddrescueview-source-${versionBase}~${versionSuffix}.tar.xz"; + sha256 = "0v159nlc0lrqznbbwi7zda619is5h2rjk55gz6cl807j0kd19ycc"; }; + sourceRoot = "ddrescueview-source-${versionBase}~${versionSuffix}/source"; nativeBuildInputs = [ fpc lazarus ]; buildInputs = [ atk cairo gdk-pixbuf glib gtk2 libX11 pango ]; - sourceRoot = "source"; - NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = '' @@ -24,9 +28,8 @@ stdenv.mkDerivation rec { installPhase = '' install -Dt $out/bin ddrescueview cd ../resources/linux - install -Dt $out/share/applications ddrescueview.desktop - install -Dt $out/share/icons/hicolor/32x32/apps ddrescueview.xpm - install -Dt $out/share/man/man1 ddrescueview.1 + mkdir -p "$out/share" + cp -ar applications icons man $out/share ''; meta = with lib; { From 596de92ca7458e47b991472e3da59d30baf8d9c5 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 3 Sep 2020 14:26:08 +0200 Subject: [PATCH 632/688] ultrastardx: unstable-2019-01-07 -> 2020.4.0 Might as well update it while I fix it up for the fpc update. --- pkgs/games/ultrastardx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index b2d601df3498..7c5f4949d941 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -12,12 +12,12 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "unstable-2019-01-07"; + version = "2020.4.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; - rev = "3df142590f29db1505cc58746af9f8cf7cb4a6a5"; - sha256 = "0853rg7vppkmw37wm9xm0m0wab3r09ws6w04xs2wgwj1mwl0d70j"; + rev = "v${version}"; + sha256 = "0vmfv8zpyf8ymx3rjydpd7iqis080lni94vb316vfxkgvjmqbhym"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From d43db8abbca50a3cbae6273186e43286f88d7892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Thu, 3 Sep 2020 14:05:25 +0200 Subject: [PATCH 633/688] libreoffice-still: fix build --- .../office/libreoffice/src-still/override.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index c0880aa3ecb1..54935dd7072d 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,6 +1,13 @@ -{ stdenv, kdeIntegration, ... }: +{ stdenv, kdeIntegration, fetchpatch, ... }: attrs: { + patches = attrs.patches or [ ] ++ [ + (fetchpatch { + url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008"; + name = "poppler-0.86.patch"; + sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j"; + }) + ]; postConfigure = attrs.postConfigure + '' sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' ''; From f928b91f349403090d055a613abc527bb442254e Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 3 Sep 2020 12:49:11 +0200 Subject: [PATCH 634/688] fpc: 3.0.4 -> 3.2.0 There was no 3.1 for some reason. The old sed-based path patching was broken and resulted in syntax errors since it was a bit over-eager. Instead of fixing it, I decided to replace it with a patch file which is easier to inspect and will fail in a more obvious way next time. The patch is now applied unconditionally, since it actually applies to all linux platforms. The changes are localized to linux-specific code, so it does not hurt to apply it on non-linux platforms as well. Hedgewars needs a small fix to work with the new version. Done in the same commit to avoid a broken commit. --- pkgs/development/compilers/fpc/binary.nix | 15 +-- pkgs/development/compilers/fpc/default.nix | 19 ++-- .../compilers/fpc/mark-paths.patch | 100 ++++++++++++++++++ pkgs/games/hedgewars/default.nix | 6 +- pkgs/games/ultrastardx/default.nix | 35 +++++- 5 files changed, 155 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/compilers/fpc/mark-paths.patch diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index f160150d8b53..8441c91b09f2 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "fpc-3.0.0-binary"; +stdenv.mkDerivation rec { + pname = "fpc-binary"; + version = "3.2.0"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "mirror://sourceforge/project/freepascal/Linux/3.0.0/fpc-3.0.0.i386-linux.tar"; - sha256 = "0h3f1dgs1zsx7vvk9kg67anjvgw5sslfbmjblif7ishbcp3k3g5k"; + url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.i386-linux.tar"; + sha256 = "0y0510b2fbxbqz28967xx8b023k6q9fv5yclfrc1yc9mg8fyn411"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "mirror://sourceforge/project/freepascal/Linux/3.0.0/fpc-3.0.0.x86_64-linux.tar"; - sha256 = "1m2xx3nda45cb3zidbjgdr8kddd19zk0khvp7xxdlclszkqscln9"; + url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}-x86_64-linux.tar"; + sha256 = "0gfbwjvjqlx0562ayyl08khagslrws758al2yhbi4bz5rzk554ni"; } else throw "Not supported on ${stdenv.hostPlatform.system}."; @@ -21,4 +22,4 @@ stdenv.mkDerivation { meta = { description = "Free Pascal Compiler from a binary distribution"; }; -} +} diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 42804677dc08..6e7ffefca21f 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -3,23 +3,26 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { - version = "3.0.4"; + version = "3.2.0"; pname = "fpc"; src = fetchurl { url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; - sha256 = "0xjyhlhz846jbnp12y68c7nq4xmp4i65akfbrjyf3r62ybk18rgn"; + sha256 = "0f38glyn3ffmqww432snhx2b8wyrq0yj1njkp4zh56lqrvm19fgr"; }; buildInputs = [ startFPC gawk ]; glibc = stdenv.cc.libc.out; - preConfigure = - if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' - sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas - sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas - sed -e "s@/lib64[^']*@${glibc}/lib@" -i fpcsrc/compiler/systems/t_linux.pas - '' else ""; + # Patch paths for linux systems. Other platforms will need their own patches. + patches = [ + ./mark-paths.patch # mark paths for later substitution in postPatch + ]; + postPatch = '' + # substitute the markers set by the mark-paths patch + substituteInPlace fpcsrc/compiler/systems/t_linux.pas --subst-var-by dynlinker-prefix "${glibc}" + substituteInPlace fpcsrc/compiler/systems/t_linux.pas --subst-var-by syslibpath "${glibc}/lib" + ''; makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ]; diff --git a/pkgs/development/compilers/fpc/mark-paths.patch b/pkgs/development/compilers/fpc/mark-paths.patch new file mode 100644 index 000000000000..e8844ad7cfe7 --- /dev/null +++ b/pkgs/development/compilers/fpc/mark-paths.patch @@ -0,0 +1,100 @@ +diff --git a/fpcsrc/compiler/systems/t_linux.pas b/fpcsrc/compiler/systems/t_linux.pas +index a7398fb9..a1e41ecb 100644 +--- a/fpcsrc/compiler/systems/t_linux.pas ++++ b/fpcsrc/compiler/systems/t_linux.pas +@@ -135,13 +135,13 @@ begin + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib64',true); + { /lib64 should be the really first, so add it before everything else } + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib',true); +- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64',true); ++ LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true); + {$else} + {$ifdef powerpc64} + if target_info.abi<>abi_powerpc_elfv2 then +- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib64;=/usr/X11R6/lib64',true) ++ LibrarySearchPath.AddLibraryPath(sysrootpath,'=/@syslibpath@;=/usr/lib64;=/usr/X11R6/lib64',true) + else +- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib/powerpc64le-linux-gnu;=/usr/X11R6/powerpc64le-linux-gnu',true); ++ LibrarySearchPath.AddLibraryPath(sysrootpath,'=/@syslibpath@;=/usr/lib/powerpc64le-linux-gnu;=/usr/X11R6/powerpc64le-linux-gnu',true); + {$else powerpc64} + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true); + {$endif powerpc64} +@@ -185,53 +185,53 @@ begin + end; + + {$ifdef m68k} +- const defdynlinker='/lib/ld.so.1'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld.so.1'; + {$endif m68k} + + {$ifdef i386} +- const defdynlinker='/lib/ld-linux.so.2'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld-linux.so.2'; + {$endif} + + {$ifdef x86_64} +- const defdynlinker='/lib64/ld-linux-x86-64.so.2'; ++ const defdynlinker='@dynlinker-prefix@/lib64/ld-linux-x86-64.so.2'; + {$endif x86_64} + + {$ifdef sparc} +- const defdynlinker='/lib/ld-linux.so.2'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld-linux.so.2'; + {$endif sparc} + + {$ifdef powerpc} +- const defdynlinker='/lib/ld.so.1'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld.so.1'; + {$endif powerpc} + + {$ifdef powerpc64} +- const defdynlinkerv1='/lib64/ld64.so.1'; +- const defdynlinkerv2='/lib64/ld64.so.2'; ++ const defdynlinkerv1='@dynlinker-prefix@/lib64/ld64.so.1'; ++ const defdynlinkerv2='@dynlinker-prefix@/lib64/ld64.so.2'; + var defdynlinker: string; + {$endif powerpc64} + + {$ifdef arm} + {$ifdef FPC_ARMHF} +- const defdynlinker='/lib/ld-linux-armhf.so.3'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld-linux-armhf.so.3'; + {$else FPC_ARMHF} + {$ifdef FPC_ARMEL} +- const defdynlinker='/lib/ld-linux.so.3'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld-linux.so.3'; + {$else FPC_ARMEL} +- const defdynlinker='/lib/ld-linux.so.2'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld-linux.so.2'; + {$endif FPC_ARMEL} + {$endif FPC_ARMHF} + {$endif arm} + + {$ifdef aarch64} +-const defdynlinker='/lib/ld-linux-aarch64.so.1'; ++const defdynlinker='@dynlinker-prefix@/lib/ld-linux-aarch64.so.1'; + {$endif aarch64} + + {$ifdef mips} +- const defdynlinker='/lib/ld.so.1'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld.so.1'; + {$endif mips} + + {$ifdef sparc64} +- const defdynlinker='/lib64/ld-linux.so.2'; ++ const defdynlinker='@dynlinker-prefix@/lib64/ld-linux.so.2'; + {$endif sparc64} + + +@@ -266,9 +266,9 @@ begin + libctype:=uclibc; + end + {$ifdef i386} +- else if FileExists(sysrootpath+'/lib/ld-linux.so.1',false) then ++ else if FileExists(sysrootpath+'@dynlinker-prefix@/lib/ld-linux.so.1',false) then + begin +- DynamicLinker:='/lib/ld-linux.so.1'; ++ DynamicLinker:='@dynlinker-prefix@/lib/ld-linux.so.1'; + libctype:=glibc2; + end + {$endif i386} diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 00df6f338210..adc6506c6157 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -34,6 +34,10 @@ mkDerivation rec { postPatch = '' substituteInPlace gameServer/CMakeLists.txt \ --replace mask evaluate + + # compile with fpc >= 3.2.0 + # https://github.com/archlinux/svntogit-community/blob/75a1b3900fb3dd553d5114bbc8474d85fd6abb02/trunk/PKGBUILD#L26 + sed -i 's/procedure ShiftWorld(Dir: LongInt); inline;/procedure ShiftWorld(Dir: LongInt);/' hedgewars/uWorld.pas ''; cmakeFlags = [ @@ -42,7 +46,7 @@ mkDerivation rec { ]; - # hslogger brings network-3 and network-bsd which conflict with + # hslogger brings network-3 and network-bsd which conflict with # network-2.6.3.1 preConfigure = '' substituteInPlace gameServer/CMakeLists.txt \ diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 7c5f4949d941..b6e1da204edf 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -1,7 +1,26 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig -, lua, fpc, pcre, portaudio, freetype, libpng -, SDL2, SDL2_image, SDL2_gfx, SDL2_mixer, SDL2_net, SDL2_ttf -, ffmpeg, sqlite, zlib, libX11, libGLU, libGL }: +{ stdenv +, autoreconfHook +, fetchFromGitHub +, fetchpatch +, pkgconfig +, lua +, fpc +, pcre +, portaudio +, freetype +, libpng +, SDL2 +, SDL2_image +, SDL2_gfx +, SDL2_mixer +, SDL2_net, SDL2_ttf +, ffmpeg +, sqlite +, zlib +, libX11 +, libGLU +, libGL +}: let sharedLibs = [ @@ -23,6 +42,14 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ fpc libpng ] ++ sharedLibs; + patches = [ + (fetchpatch { + name = "fpc-3.2-support.patch"; + url = "https://github.com/UltraStar-Deluxe/USDX/commit/1b8e8714c1523ef49c2fd689a1545d097a3d76d7.patch"; + sha256 = "02zmjymj9w1mkpf7armdpf067byvml6lprs1ca4lhpkv45abddp4"; + }) + ]; + postPatch = '' substituteInPlace src/config.inc.in \ --subst-var-by libpcre_LIBNAME libpcre.so.1 From 6ff5c406eba3e5ef47a9552c4d0939d0ff9ec367 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 3 Sep 2020 12:51:31 +0200 Subject: [PATCH 635/688] fpc: add support for aarch64-linux Supported since fpc 3.2.0. --- pkgs/development/compilers/fpc/binary.nix | 5 +++++ pkgs/development/compilers/fpc/mark-paths.patch | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index 8441c91b09f2..c7e3ec30b49f 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}-x86_64-linux.tar"; sha256 = "0gfbwjvjqlx0562ayyl08khagslrws758al2yhbi4bz5rzk554ni"; } + else if stdenv.hostPlatform.system == "aarch64-linux" then + fetchurl { + url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar"; + sha256 = "1h481ngg3m8nlsg9mw7rr1bn2c4sj4wzqny9bxyq3xvcral12r71"; + } else throw "Not supported on ${stdenv.hostPlatform.system}."; builder = ./binary-builder.sh; diff --git a/pkgs/development/compilers/fpc/mark-paths.patch b/pkgs/development/compilers/fpc/mark-paths.patch index e8844ad7cfe7..707c5352de7f 100644 --- a/pkgs/development/compilers/fpc/mark-paths.patch +++ b/pkgs/development/compilers/fpc/mark-paths.patch @@ -1,5 +1,5 @@ diff --git a/fpcsrc/compiler/systems/t_linux.pas b/fpcsrc/compiler/systems/t_linux.pas -index a7398fb9..a1e41ecb 100644 +index a7398fb9..8e46fec0 100644 --- a/fpcsrc/compiler/systems/t_linux.pas +++ b/fpcsrc/compiler/systems/t_linux.pas @@ -135,13 +135,13 @@ begin @@ -19,6 +19,15 @@ index a7398fb9..a1e41ecb 100644 {$else powerpc64} LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true); {$endif powerpc64} +@@ -164,7 +164,7 @@ begin + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/i386-linux-gnu',true); + {$endif i386} + {$ifdef aarch64} +- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/aarch64-linux-gnu',true); ++ LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true); + {$endif aarch64} + {$ifdef powerpc} + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc-linux-gnu',true); @@ -185,53 +185,53 @@ begin end; From 53bce4da36f7a789929c983d29aebbaf873c7bef Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 29 Aug 2020 06:35:16 +0200 Subject: [PATCH 636/688] =?UTF-8?q?ocamlPackages.piqi-ocaml:=200.7.5=20?= =?UTF-8?q?=E2=86=92=200.7.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/piqi-ocaml/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 731a5303ff51..39201d0570b3 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, piqi, camlp4 }: +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims }: stdenv.mkDerivation rec { - version = "0.7.5"; + version = "0.7.7"; pname = "piqi-ocaml"; + name = "ocaml${ocaml.version}-${pname}-${version}"; - src = fetchurl { - url = "https://github.com/alavrik/piqi-ocaml/archive/v${version}.tar.gz"; - sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv"; + src = fetchFromGitHub { + owner = "alavrik"; + repo = pname; + rev = "v${version}"; + sha256 = "1913jpsb8mvqi8609j4g4sm5jhg50dq0xqxgy8nmvknfryyc89nm"; }; - patches = [ (fetchpatch { - url = "https://github.com/alavrik/piqi-ocaml/commit/336e8fdb84e77f4105e9bbb5ab545b8729101308.patch"; - sha256 = "071s4xjyr6xx95v6az2lbl2igc87n7z5jqnnbhfq2pidrxakd0la"; - })]; - - buildInputs = [ ocaml findlib piqi camlp4 ]; + buildInputs = [ ocaml findlib piqi stdlib-shims ]; createFindlibDestdir = true; From eda3730e6fbf9679f657b043ddd06a80116c6b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 3 Sep 2020 16:03:01 +0200 Subject: [PATCH 637/688] krohnkite: fix typo --- pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix index abd655db3753..95480bc5b968 100644 --- a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix +++ b/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix @@ -26,7 +26,7 @@ mkDerivation rec { plasmapkg2 --type kwinscript --install ${src}/res/ --packageroot $out/share/kwin/scripts install -Dm644 ${src}/res/metadata.desktop $out/share/kservices5/krohnkite.desktop - runHook postInstalll + runHook postInstall ''; meta = with lib; { From 31cb1dc7552621a7cba2e6a7bc8785c535a9b8a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 3 Sep 2020 16:03:35 +0200 Subject: [PATCH 638/688] kwin-tiling: fix typo --- pkgs/desktops/plasma-5/kwin/scripts/tiling.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix index da424d04da90..8a455cb88826 100644 --- a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix +++ b/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix @@ -31,7 +31,7 @@ mkDerivation rec { plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts install -Dm644 ${src}/metadata.desktop $out/share/kservices5/kwin-script-tiling.desktop - runHook postInstalll + runHook postInstall ''; meta = with lib; { From 970bfc04b0741bdf6d6ac7e8c9157c38e84c260f Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Thu, 3 Sep 2020 16:10:23 +0200 Subject: [PATCH 639/688] securefs: 0.8.3 -> 0.11.1 --- pkgs/tools/filesystems/securefs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index c5a5af212d90..c8efa4d61abd 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -4,13 +4,14 @@ stdenv.mkDerivation rec { pname = "securefs"; - version = "0.8.3"; + version = "0.11.1"; src = fetchFromGitHub { - sha256 = "0nf0bd163gz844mikqab2mh7xjlj31ixa6hi85qxdifyjpfjv7y4"; + sha256 = "1sxfgqgy63ml7vg7zj3glvra4wj2qmfv9jzmpm1jqy8hq7qlqlsx"; rev = version; repo = "securefs"; owner = "netheril96"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; From 556b29dd3efe7a064d2eee8af635bcb23d21bda5 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 3 Sep 2020 17:10:32 +0200 Subject: [PATCH 640/688] emacs: Add missing patches to the Emacs derivations patches were removed by a recent refactoring of Emacs packages: 967259e6b49 * emacs: Factor out expression to a generic build --- pkgs/applications/editors/emacs/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 69bb51e10f20..2067d6c77789 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -42,7 +42,7 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; let in stdenv.mkDerivation { - inherit pname version; + inherit pname version patches; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; From 6592980b19c44a7802322c00467fc48c7aedea5d Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 3 Sep 2020 17:24:46 +0200 Subject: [PATCH 641/688] direnv: 2.21.3 -> 2.22.0 (#97011) --- pkgs/tools/misc/direnv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 1096cce496ef..3fb2a5d76a06 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "direnv"; - version = "2.21.3"; + version = "2.22.0"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "1adi6ld9g4zgz0f6q0kkzrywclqrmikyp7yh22zm9lfdvd5hs8wp"; + sha256 = "06z85r99w0nr093fawva6sysdlrdsfjjf7asx96k1sjv56sb306m"; }; # we have no bash at the moment for windows From b9326ecf0a2bbf281fa5f9e7c1123e8a2f1dbbc0 Mon Sep 17 00:00:00 2001 From: cmacrae Date: Thu, 3 Sep 2020 17:23:46 +0100 Subject: [PATCH 642/688] yabai: 3.2.1 -> 3.3.0 --- pkgs/os-specific/darwin/yabai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 448e6865e18b..742a3948707e 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yabai"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "11rsi6z2z7ynfqs1xq3bvf187k5xnwm0d45a8ai9hrqdsf3f1j19"; + sha256 = "0y4idivqkmi3xsc8yjdzh1b15qzgyqlw7ifs26v3dc91lkjhfc4x"; }; buildInputs = [ Carbon Cocoa ScriptingBridge xxd ]; From baf51e4600bf14237c376ed3223174d9186af5af Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 3 Sep 2020 15:39:38 +0200 Subject: [PATCH 643/688] hedgewars: fix build on aarch64 Possible now that fpc works on aarch64. For some reason hedgewars requires llvm when building on that platform. --- pkgs/games/hedgewars/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index adc6506c6157..228c6c364102 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -2,6 +2,7 @@ , lib, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools +, llvm , withServer ? true }: @@ -27,6 +28,7 @@ mkDerivation rec { buildInputs = [ SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image fpc lua5_1 + llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 ffmpeg_3 freeglut physfs qtbase ] ++ lib.optional withServer ghc; From d1ffe81e1360ad12693345a945f74ac266a3f28d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 3 Sep 2020 19:58:24 +0300 Subject: [PATCH 644/688] htop: 3.0.0 -> 3.0.1 --- pkgs/tools/system/htop/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 2d86894808c4..fe4622f3381e 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,28 +1,18 @@ { lib, fetchFromGitHub, stdenv, autoreconfHook , ncurses, IOKit, python3 -, fetchpatch }: stdenv.mkDerivation rec { pname = "htop"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "096gdnpaszs5rfp7qj8npi2jkvdqpp8mznn89f97ykrg6pgagwq4"; + sha256 = "0kjlphdvwwbj91kk91s4ksc954d3c2bznddzx2223jmb1bn9rcsa"; }; - patches = [ - # Never use glyphs for checkmarks. Issue - https://github.com/htop-dev/htop/issues/29 - # Remove with the next release. - (fetchpatch { - url = "https://github.com/htop-dev/htop/commit/96074058278829facb86f6f4de099d56a00a0c0e.patch"; - sha256 = "1rnfvjfsvfgr1s7kzr1hk6nwik6shcq4mg6dlbgdq0f2fz0cnazk"; - }) - ]; - nativeBuildInputs = [ autoreconfHook python3 ]; buildInputs = [ ncurses From 30f07d16574bd572fa2db4505139e33d2cf36cfe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 3 Sep 2020 19:10:16 +0200 Subject: [PATCH 645/688] pythonPackages.dnspython: use 1.x for Python 2 --- pkgs/applications/misc/electrum/default.nix | 8 +------- pkgs/top-level/python-packages.nix | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index ac296c1224ac..db6b6f2e1813 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -25,13 +25,7 @@ let # use the latest 1.x release instead py = python3.override { packageOverrides = self: super: { - dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec { - version = "1.16.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; - }; - }); + dnspython = super.dnspython_1; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29e23ce83b6b..bae167e20bbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1694,7 +1694,13 @@ in { dnslib = callPackage ../development/python-modules/dnslib { }; - dnspython = callPackage ../development/python-modules/dnspython { }; + dnspython = if isPy3k then + callPackage ../development/python-modules/dnspython { } + else + self.dnspython_1; + + dnspython_1 = callPackage ../development/python-modules/dnspython/1.nix { }; + dns = self.dnspython; # Alias for compatibility, 2017-12-10 doc8 = callPackage ../development/python-modules/doc8 { }; From 79921889a05a3e7f2450a82fbaadd3dd552d3806 Mon Sep 17 00:00:00 2001 From: V Date: Tue, 25 Aug 2020 11:43:59 +0200 Subject: [PATCH 646/688] treewide: convert patch series files to Nix expressions Nix expressions provide all the features that Quilt series files have, so using those instead is pointless. Also, lib.readPathsFromFile (the function used to read series files) has the following warning: > NOTE: This function is not performant and should be avoided. This also removes some orphaned series files, and unused references to copyPathsToStore (which were probably missed in previous commits where calls to lib.readPathsFromFile were removed) --- pkgs/applications/kde/akonadi/default.nix | 2 +- pkgs/applications/kde/grantleetheme/default.nix | 2 +- pkgs/applications/kde/kdepim-apps-libs/default.nix | 2 +- pkgs/applications/kde/kdepim-runtime/default.nix | 2 +- pkgs/desktops/plasma-5/breeze-plymouth/default.nix | 5 +++-- pkgs/desktops/plasma-5/breeze-plymouth/series | 1 - pkgs/desktops/plasma-5/kwin/default.nix | 2 +- pkgs/desktops/plasma-5/libkscreen/default.nix | 6 ++++-- pkgs/desktops/plasma-5/libkscreen/series | 1 - pkgs/desktops/plasma-5/plasma-desktop/default.nix | 7 +++++-- pkgs/desktops/plasma-5/plasma-desktop/series | 2 -- pkgs/development/libraries/grantlee/5/default.nix | 7 +++++-- pkgs/development/libraries/grantlee/5/series | 2 -- .../kde-frameworks/extra-cmake-modules/default.nix | 6 ++++-- .../libraries/kde-frameworks/extra-cmake-modules/series | 1 - .../development/libraries/kde-frameworks/kauth/default.nix | 6 ++++-- pkgs/development/libraries/kde-frameworks/kauth/series | 1 - .../libraries/kde-frameworks/kcmutils/default.nix | 2 +- .../libraries/kde-frameworks/kdelibs4support/default.nix | 6 ++++-- .../libraries/kde-frameworks/kdelibs4support/series | 1 - .../libraries/kde-frameworks/kfilemetadata/default.nix | 6 ++++-- .../libraries/kde-frameworks/kfilemetadata/series | 1 - .../libraries/kde-frameworks/kiconthemes/default.nix | 6 ++++-- .../libraries/kde-frameworks/kiconthemes/series | 1 - .../development/libraries/kde-frameworks/kinit/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/kinit/series | 3 --- pkgs/development/libraries/kde-frameworks/kio/default.nix | 7 +++++-- pkgs/development/libraries/kde-frameworks/kio/series | 2 -- .../libraries/kde-frameworks/kpackage/default.nix | 7 +++++-- pkgs/development/libraries/kde-frameworks/kpackage/series | 2 -- .../libraries/kde-frameworks/kservice/default.nix | 7 +++++-- pkgs/development/libraries/kde-frameworks/kservice/series | 2 -- .../libraries/kde-frameworks/kwindowsystem/default.nix | 6 ++++-- .../libraries/kde-frameworks/kwindowsystem/series | 1 - 34 files changed, 63 insertions(+), 54 deletions(-) delete mode 100644 pkgs/desktops/plasma-5/breeze-plymouth/series delete mode 100644 pkgs/desktops/plasma-5/libkscreen/series delete mode 100644 pkgs/desktops/plasma-5/plasma-desktop/series delete mode 100644 pkgs/development/libraries/grantlee/5/series delete mode 100644 pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series delete mode 100644 pkgs/development/libraries/kde-frameworks/kauth/series delete mode 100644 pkgs/development/libraries/kde-frameworks/kdelibs4support/series delete mode 100644 pkgs/development/libraries/kde-frameworks/kfilemetadata/series delete mode 100644 pkgs/development/libraries/kde-frameworks/kiconthemes/series delete mode 100644 pkgs/development/libraries/kde-frameworks/kinit/series delete mode 100644 pkgs/development/libraries/kde-frameworks/kio/series delete mode 100644 pkgs/development/libraries/kde-frameworks/kpackage/series delete mode 100644 pkgs/development/libraries/kde-frameworks/kservice/series delete mode 100644 pkgs/development/libraries/kde-frameworks/kwindowsystem/series diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index 2c163445d5b0..7bb4e9217942 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, copyPathsToStore, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, shared-mime-info, boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 0e815127fa1d..6204919a3285 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, copyPathsToStore, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, }: diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix index a9b906b7b238..57c02ea4e84c 100644 --- a/pkgs/applications/kde/kdepim-apps-libs/default.nix +++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, copyPathsToStore, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets, kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison, diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 27ca6ff9aaf4..e0a5d43e654f 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, copyPathsToStore, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index 770e549fc2cd..36ac01725eab 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -1,7 +1,6 @@ { mkDerivation, lib, - copyPathsToStore, extra-cmake-modules, plymouth, nixos-icons, @@ -28,7 +27,9 @@ mkDerivation { name = "breeze-plymouth"; nativeBuildInputs = [ extra-cmake-modules ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ]; buildInputs = [ plymouth ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./install-paths.patch + ]; cmakeFlags = [] ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/series b/pkgs/desktops/plasma-5/breeze-plymouth/series deleted file mode 100644 index 8920e7ca5189..000000000000 --- a/pkgs/desktops/plasma-5/breeze-plymouth/series +++ /dev/null @@ -1 +0,0 @@ -install-paths.patch diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 7c1f2292ecaa..78b6909f046d 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kdoctools, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index cf9d70844014..db952944ecaa 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, propagate, + mkDerivation, lib, propagate, extra-cmake-modules, kwayland, libXrandr, qtbase, qtx11extras }: @@ -12,7 +12,9 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kwayland libXrandr qtx11extras ]; outputs = [ "out" "dev" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./libkscreen-backends-path.patch + ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\"" ''; diff --git a/pkgs/desktops/plasma-5/libkscreen/series b/pkgs/desktops/plasma-5/libkscreen/series deleted file mode 100644 index 86bf4ab10602..000000000000 --- a/pkgs/desktops/plasma-5/libkscreen/series +++ /dev/null @@ -1 +0,0 @@ -libkscreen-backends-path.patch diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index b042fc3bd6ac..8ae48b21f7be 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kdoctools, boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, @@ -30,7 +30,10 @@ mkDerivation { ksysguard kwallet kwin plasma-framework plasma-workspace qqc2-desktop-style ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./hwclock-path.patch + ./tzdir.patch + ]; postPatch = '' sed '1i#include ' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp ''; diff --git a/pkgs/desktops/plasma-5/plasma-desktop/series b/pkgs/desktops/plasma-5/plasma-desktop/series deleted file mode 100644 index 26517ba93565..000000000000 --- a/pkgs/desktops/plasma-5/plasma-desktop/series +++ /dev/null @@ -1,2 +0,0 @@ -hwclock-path.patch -tzdir.patch diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 09bf92224858..4eef2d407d8e 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }: +{ mkDerivation, lib, fetchurl, qtbase, qtscript, cmake }: mkDerivation rec { pname = "grantlee"; @@ -14,7 +14,10 @@ mkDerivation rec { buildInputs = [ qtbase qtscript ]; nativeBuildInputs = [ cmake ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./grantlee-nix-profiles.patch + ./grantlee-no-canonicalize-filepath.patch + ]; outputs = [ "out" "dev" ]; postFixup = diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series deleted file mode 100644 index 9c4015a1c197..000000000000 --- a/pkgs/development/libraries/grantlee/5/series +++ /dev/null @@ -1,2 +0,0 @@ -grantlee-nix-profiles.patch -grantlee-no-canonicalize-filepath.patch diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 3a3f066ad33b..645d05afc2be 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,9 +1,11 @@ -{ mkDerivation, lib, copyPathsToStore, cmake, pkgconfig }: +{ mkDerivation, lib, cmake, pkgconfig }: mkDerivation { name = "extra-cmake-modules"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./nix-lib-path.patch + ]; outputs = [ "out" ]; # this package has no runtime components diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series deleted file mode 100644 index b4569e50a5f7..000000000000 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series +++ /dev/null @@ -1 +0,0 @@ -nix-lib-path.patch diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index c94c8b91ecd2..0a513d6eed94 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, propagate, + mkDerivation, lib, propagate, extra-cmake-modules, kcoreaddons, polkit-qt, qttools }: @@ -9,7 +9,9 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ polkit-qt qttools ]; propagatedBuildInputs = [ kcoreaddons ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./cmake-install-paths.patch + ]; # library stores reference to plugin path, # separating $out from $bin would create a reference cycle outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kauth/series b/pkgs/development/libraries/kde-frameworks/kauth/series deleted file mode 100644 index d2689425c387..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kauth/series +++ /dev/null @@ -1 +0,0 @@ -cmake-install-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix index 29689c789d3e..ab14529be01e 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews, kpackage, kservice, kxmlgui, qtdeclarative, diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index 7e3de9d4d141..5eced8832877 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, docbook_xml_dtd_45, extra-cmake-modules, kdoctools, kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons, @@ -11,7 +11,9 @@ mkDerivation { name = "kdelibs4support"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./nix-kde-include-dir.patch + ]; setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedNativeBuildInputs = [ kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks/kdelibs4support/series deleted file mode 100644 index 9b08ab208774..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/series +++ /dev/null @@ -1 +0,0 @@ -nix-kde-include-dir.patch diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 90a7116f42ad..47831f0f5d92 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, attr, ebook_tools, exiv2, ffmpeg_3, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib }: @@ -12,5 +12,7 @@ mkDerivation { attr ebook_tools exiv2 ffmpeg_3 karchive kcoreaddons ki18n poppler qtbase qtmultimedia taglib ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./cmake-install-paths.patch + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks/kfilemetadata/series deleted file mode 100644 index d2689425c387..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/series +++ /dev/null @@ -1 +0,0 @@ -cmake-install-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 8faac005f2ac..76bf0fd05370 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews, qtbase, qtsvg, qttools, @@ -8,7 +8,9 @@ mkDerivation { name = "kiconthemes"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./default-theme-breeze.patch + ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ breeze-icons karchive kcoreaddons kconfigwidgets ki18n kitemviews diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/series b/pkgs/development/libraries/kde-frameworks/kiconthemes/series deleted file mode 100644 index ab5cc8a3edb2..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/series +++ /dev/null @@ -1 +0,0 @@ -default-theme-breeze.patch diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index 116f475e2f8c..654f6e20604a 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, writeScript, + mkDerivation, lib, writeScript, extra-cmake-modules, kdoctools, kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework }: diff --git a/pkgs/development/libraries/kde-frameworks/kinit/series b/pkgs/development/libraries/kde-frameworks/kinit/series deleted file mode 100644 index 9195a4e8e6b0..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kinit/series +++ /dev/null @@ -1,3 +0,0 @@ -kinit-libpath.patch -start_kdeinit-path.patch -kdeinit-extra_libs.patch diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index fee21a6a9235..434496c7b9a9 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kdoctools, qttools, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, @@ -21,5 +21,8 @@ mkDerivation { kxmlgui qtbase qttools solid ]; outputs = [ "out" "dev" ]; - patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series)); + patches = [ + ./samba-search-path.patch + ./kio-debug-module-loader.patch + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kio/series b/pkgs/development/libraries/kde-frameworks/kio/series deleted file mode 100644 index 5330c40a3306..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kio/series +++ /dev/null @@ -1,2 +0,0 @@ -samba-search-path.patch -kio-debug-module-loader.patch diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index 6779faa50cdc..6bd42420b85d 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kdoctools, karchive, kconfig, kcoreaddons, ki18n, qtbase, }: @@ -9,5 +9,8 @@ mkDerivation { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./allow-external-paths.patch + ./qdiriterator-follow-symlinks.patch + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/series b/pkgs/development/libraries/kde-frameworks/kpackage/series deleted file mode 100644 index 9b7f076efc70..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kpackage/series +++ /dev/null @@ -1,2 +0,0 @@ -allow-external-paths.patch -qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 356e6537a4fd..630582ecf763 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, bison, extra-cmake-modules, flex, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem, qtbase, shared-mime-info, @@ -15,5 +15,8 @@ mkDerivation { ]; propagatedBuildInputs = [ kconfig kcoreaddons ]; propagatedUserEnvPkgs = [ shared-mime-info ]; # for kbuildsycoca5 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./qdiriterator-follow-symlinks.patch + ./no-canonicalize-path.patch + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kservice/series b/pkgs/development/libraries/kde-frameworks/kservice/series deleted file mode 100644 index 3ce22dbd35a0..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kservice/series +++ /dev/null @@ -1,2 +0,0 @@ -qdiriterator-follow-symlinks.patch -no-canonicalize-path.patch \ No newline at end of file diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index c075adf02941..1e77b63f7c9a 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, libpthreadstubs, libXdmcp, qtbase, qttools, qtx11extras @@ -14,7 +14,9 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./platform-plugins-path.patch + ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" ''; diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/series b/pkgs/development/libraries/kde-frameworks/kwindowsystem/series deleted file mode 100644 index 2cd02056ff81..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/series +++ /dev/null @@ -1 +0,0 @@ -platform-plugins-path.patch From 423fc3f232e8b88c2c49ca48202358860aadb44b Mon Sep 17 00:00:00 2001 From: V Date: Tue, 25 Aug 2020 12:12:05 +0200 Subject: [PATCH 647/688] lib/strings: deprecate readPathsFromFile > NOTE: This function is not performant and should be avoided. It's not used at all in-tree now, so we can remove it completely after any remaining users are given notice. --- lib/strings.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 0baa942355c0..9fa9f023561e 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -689,14 +689,15 @@ rec { "/prefix/nix-profiles-library-paths.patch" "/prefix/compose-search-path.patch" ] */ - readPathsFromFile = rootPath: file: - let - lines = lib.splitString "\n" (builtins.readFile file); - removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); - relativePaths = removeComments lines; - absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths; - in - absolutePaths; + readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead" + (rootPath: file: + let + lines = lib.splitString "\n" (builtins.readFile file); + removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); + relativePaths = removeComments lines; + absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths; + in + absolutePaths); /* Read the contents of a file removing the trailing \n From 7a4e3e5762d7e15b3c0f1c966e991989750efa01 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 3 Sep 2020 19:16:59 +0200 Subject: [PATCH 648/688] pythonPackages.dnspython_1: add missing file, fixes eval --- .../python-modules/dnspython/1.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/dnspython/1.nix diff --git a/pkgs/development/python-modules/dnspython/1.nix b/pkgs/development/python-modules/dnspython/1.nix new file mode 100644 index 000000000000..d4ebaf82b3d2 --- /dev/null +++ b/pkgs/development/python-modules/dnspython/1.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, lib, pythonOlder }: + +buildPythonPackage rec { + pname = "dnspython"; + version = "1.16.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; + }; + + # needs networking for some tests + doCheck = false; + + meta = { + description = "A DNS toolkit for Python 3.x"; + homepage = "http://www.dnspython.org"; + # BSD-like, check http://www.dnspython.org/LICENSE for details + license = lib.licenses.free; + }; +} From 40a3b21b51f9a7daad001ad4ba856008d60ec44b Mon Sep 17 00:00:00 2001 From: V Date: Thu, 3 Sep 2020 19:20:55 +0200 Subject: [PATCH 649/688] breeze-plymouth: remove trailing whitespace --- pkgs/desktops/plasma-5/breeze-plymouth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index 36ac01725eab..9127b7fecb6e 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -15,13 +15,13 @@ bottomColor ? "black" }: -let +let validColors = [ "black" "cardboard_grey" "charcoal_grey" "icon_blue" "paper_white" "plasma_blue" "neon_blue" "neon_green" ]; resolvedLogoName = if (logoFile != null && logoName == null) then lib.strings.removeSuffix ".png" (baseNameOf(toString logoFile)) else logoName; in assert lib.asserts.assertOneOf "topColor" topColor validColors; assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; - + mkDerivation { name = "breeze-plymouth"; @@ -37,7 +37,7 @@ mkDerivation { ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}" ; - + postPatch = '' substituteInPlace cmake/FindPlymouth.cmake --subst-var out '' + lib.optionalString (logoFile != null) '' From ac9685996b9338be422620f65e3131a4329ce5eb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Sep 2020 12:58:18 -0400 Subject: [PATCH 650/688] linux: 4.14.195 -> 4.14.196 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 04d121de3071..05fc466f0f97 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.195"; + version = "4.14.196"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "08d08la3h48fbdlr3h8zbvdghydx3x9cwb4yrnm0n93hhrwjhkrr"; + sha256 = "16mhqymwkgqi8zalcij5c754smc8ysvfw6l2cwshr4scipsv4qay"; }; } // (args.argsOverride or {})) From 1272d20c2e3c15ca5bc4535d6f3dd92aa5f894c2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Sep 2020 12:58:35 -0400 Subject: [PATCH 651/688] linux: 4.19.142 -> 4.19.143 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 2eb697be6844..c683b222f0c7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.142"; + version = "4.19.143"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "19372sri4962dqf5rbr211lrfpckmj11kxsginfcwwid4hfdn4k9"; + sha256 = "1383yfwb962mhn25b3b3zqrwnpyp01g5xclsv14wra0fdz33ahra"; }; } // (args.argsOverride or {})) From 9c499986fa707a09f25e04905716954d1ed8d69b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Sep 2020 12:58:43 -0400 Subject: [PATCH 652/688] linux: 4.4.234 -> 4.4.235 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 0be1f1bef7b5..0fccc800c073 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.234"; + version = "4.4.235"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "123354h05fip161rzlxc8h0cn5lh0d1gz06gc5b7zyz9i2lxv539"; + sha256 = "0w5pkv936zb0shjgnpv17gcp5n8f91djznzq54p6j1bl5q2qdyqd"; }; } // (args.argsOverride or {})) From 0865dc9f5026c6e731c9a07b755719f65ae3dfc4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Sep 2020 12:58:50 -0400 Subject: [PATCH 653/688] linux: 4.9.234 -> 4.9.235 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 8ec9b8e51a34..75af5a09d4d6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.234"; + version = "4.9.235"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1qw26x2qc29yr094c7scw68m9yz4j0b2c4f92rvi3s31s928avvm"; + sha256 = "1hqcb3zw4546h6x5xy2mywdznha8813lx15mxbgfbvwm4qhsc9g6"; }; } // (args.argsOverride or {})) From e5aeed5120548ca68b3b984d4fd7fdfa88eecc32 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Sep 2020 12:58:58 -0400 Subject: [PATCH 654/688] linux: 5.4.61 -> 5.4.62 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 4c5d4bcd8e87..24bff3218690 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.61"; + version = "5.4.62"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6"; + sha256 = "0w49y8lymz23x4mr5byaxnrkhm56lwfhnqkra07hqyfr5y63v216"; }; } // (args.argsOverride or {})) From 94c2122d38aefec7aaf707757970e7a5a471b907 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Sep 2020 12:59:13 -0400 Subject: [PATCH 655/688] linux: 5.8.5 -> 5.8.6 --- pkgs/os-specific/linux/kernel/linux-5.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index 59acda122aac..5ea15aa5a1bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.5"; + version = "5.8.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0zwl0nk3x6fxwsbnmpx1drh7v0116yhgamisb1pghd472mmw6klx"; + sha256 = "180bka8a0f2ykaifgb323pzgh0n909mlrsk08l08zmifggnh19cc"; }; } // (args.argsOverride or {})) From 8cf4ec8b97f4a76aa3243e344e64c8a29b8788cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 19 Jun 2020 11:45:27 +0200 Subject: [PATCH 656/688] nixos/systemd: Don't use apply for $PATH When not using apply, other modules can use $PATH as a list instead of getting a colon-separated list to each /bin directory. --- nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ nixos/modules/system/boot/systemd-unit-options.nix | 1 - nixos/modules/system/boot/systemd.nix | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c936ae946adb..0a76bffd5c98 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -777,6 +777,11 @@ CREATE ROLE postgres LOGIN SUPERUSER; PR #63103. + + + config.systemd.services.${name}.path now returns a list of paths instead of a colon-separated string. + + diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index ac6fed440a26..5addc6f9ca44 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -234,7 +234,6 @@ in rec { path = mkOption { default = []; type = with types; listOf (oneOf [ package str ]); - apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}"; description = '' Packages added to the service's PATH environment variable. Both the bin diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index f6c23c9b900e..74d6957678f5 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -257,7 +257,7 @@ let pkgs.gnused systemd ]; - environment.PATH = config.path; + environment.PATH = "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}"; } (mkIf (config.preStart != "") { serviceConfig.ExecStartPre = From e0aea88d58a2ec681ace3e785451e4be42734e24 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 3 Sep 2020 21:25:48 +0200 Subject: [PATCH 657/688] openmpi: 4.0.4 -> 4.0.5 --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index d6f23a9060ff..95c2a9c3fcf4 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -18,7 +18,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.0.4"; + version = "4.0.5"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { src = with stdenv.lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1i0slg2dxjdgw513aml1n9dsbdxn2fimi2b5712d5r9z4ar4xqj7"; + sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5"; }; postPatch = '' From 653d9258f548faa2b415ae6474b19e62c06b7502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Perras?= Date: Wed, 2 Sep 2020 17:32:07 -0400 Subject: [PATCH 658/688] black-macchiato: init at 1.3.0 Adds the Python package `black-macchiato`, which allows the usage of `black` for subsets of an entire file. --- .../black-macchiato/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/black-macchiato/default.nix diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix new file mode 100644 index 000000000000..130d07d61ff4 --- /dev/null +++ b/pkgs/development/python-modules/black-macchiato/default.nix @@ -0,0 +1,35 @@ +{ stdenv, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, + black +}: + +buildPythonPackage rec { + pname = "black-macchiato"; + version = "1.3.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "wbolster"; + repo = pname; + rev = version; + sha256 = "0lc9w50nlbmlzj44krk7kxcia202fhybbnwfh77xixlc7vb4rayl"; + }; + + propagatedBuildInputs = [ black ]; + + checkInputs = [ pytestCheckHook black ]; + + pythonImportsCheck = [ "black" ]; + + meta = with stdenv.lib; { + description = "This is a small utility built on top of the black Python code formatter to enable formatting of partial files"; + homepage = "https://github.com/wbolster/black-macchiato"; + license = licenses.bsd3; + maintainers = with maintainers; [ jperras ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c0846b90fc6..78e00506d785 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10554,6 +10554,8 @@ in black = with python3Packages; toPythonApplication black; + black-macchiato = with python3Packages; toPythonApplication black-macchiato; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bae167e20bbd..30e0b3ad0e1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -842,6 +842,8 @@ in { black = callPackage ../development/python-modules/black { }; + black-macchiato = callPackage ../development/python-modules/black-macchiato { }; + bleach = callPackage ../development/python-modules/bleach { }; bleak = callPackage ../development/python-modules/bleak { }; From 80f1cc1e8376d3fc313e659570ef825c63cea682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Perras?= Date: Wed, 2 Sep 2020 19:01:13 -0400 Subject: [PATCH 659/688] maintainers: add jperras --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6ce51646edb9..a35b7956d3ca 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4098,6 +4098,12 @@ githubId = 1918771; name = "Joe Doyle"; }; + jperras = { + email = "joel@nerderati.com"; + github = "jperras"; + githubId = 20675; + name = "Joël Perras"; + }; jpierre03 = { email = "nix@prunetwork.fr"; github = "jpierre03"; From f6c94e70729f3addef65ed2a0853f2f15973351f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 3 Sep 2020 22:26:30 +0200 Subject: [PATCH 660/688] netpbm: clean up reorder attributes and use pkg-config instead of the alias --- pkgs/tools/graphics/netpbm/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index bfb50c45f40b..4507c4fed853 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchsvn -, pkgconfig +, pkg-config , libjpeg , libpng , flex @@ -27,14 +27,8 @@ stdenv.mkDerivation { sha256 = "1m7ks6k53gsjsdazgf22g16dfgj3pqvqy9mhxzlwszv5808sj5w5"; }; - postPatch = '' - # Install libnetpbm.so symlink to correct destination - substituteInPlace lib/Makefile \ - --replace '/sharedlink' '/lib' - ''; - nativeBuildInputs = [ - pkgconfig + pkg-config flex makeWrapper ]; @@ -48,6 +42,14 @@ stdenv.mkDerivation { libtiff ] ++ lib.optional enableX11 libX11; + enableParallelBuilding = true; + + postPatch = '' + # Install libnetpbm.so symlink to correct destination + substituteInPlace lib/Makefile \ + --replace '/sharedlink' '/lib' + ''; + configurePhase = '' runHook preConfigure @@ -72,8 +74,6 @@ stdenv.mkDerivation { runHook postConfigure ''; - enableParallelBuilding = true; - installPhase = '' runHook preInstall From 1c55613cd76fae83b674bb201296c3d7e7d6cdeb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 3 Sep 2020 22:34:13 +0200 Subject: [PATCH 661/688] hydra-unstable: 2020-08-04 -> 2020-09-02 Needed to fix Hydra with latest `nixUnstable`. --- pkgs/development/tools/misc/hydra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 716a30587852..a6b0383d54f7 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -24,12 +24,12 @@ # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-08-04"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "77c33c1d71a8c303f53ccad577eb0a3799e87bda"; - sha256 = "10pwiww96dbbszzvnj7abn851h89n30ziahjj2zm3liyzyvbylyf"; + rev = "e707990e2d6afab203c7ef1d769d49c564eff151"; + sha256 = "0iilf953f6s58szzyd1hzc9b2b2yw8lhbsb8xrb08szpfz7ifwqa"; }; nix = nixFlakes; From d86a966d65dc73b02a0509c22a34cfe559bdb3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 3 Sep 2020 14:02:52 +0200 Subject: [PATCH 662/688] kwin-dynamic-workspaces: init at 1.0.1 --- .../kwin/scripts/dynamic-workspaces.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix diff --git a/pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix new file mode 100644 index 000000000000..cea788f26403 --- /dev/null +++ b/pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix @@ -0,0 +1,39 @@ +{ lib, mkDerivation, fetchFromGitHub +, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: + +mkDerivation rec { + pname = "dynamic_workspaces"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "d86leader"; + repo = pname; + rev = "v${version}"; + sha256 = "1mnwh489i6l8z9s5a1zl7zybkw76pp9fdmmis41mym7r4wz4iznm"; + }; + + buildInputs = [ + kcoreaddons kwindowsystem plasma-framework systemsettings + ]; + + dontBuild = true; + + # 1. --global still installs to $HOME/.local/share so we use --packageroot + # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually + installPhase = '' + runHook preInstall + + plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts + install -Dm644 ${src}/metadata.desktop $out/share/kservices5/dynamic_workspaces.desktop + + runHook postInstall + ''; + + meta = with lib; { + description = "KWin script that automatically adds/removes virtual desktops"; + license = licenses.bsd3; + maintainers = with maintainers; [ samuelgrf ]; + inherit (src.meta) homepage; + inherit (kwindowsystem.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ea6814f75e4..15410f8ce97e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25472,6 +25472,8 @@ in plasma-applet-caffeine-plus = libsForQt5.callPackage ../desktops/plasma-5/addons/caffeine-plus.nix { }; + kwin-dynamic-workspaces = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix { }; + kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { }; krohnkite = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/krohnkite.nix { }; From 4e7728ea714250b6840fc73ca21847003a05f2fd Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Wed, 2 Sep 2020 21:36:44 -0400 Subject: [PATCH 663/688] svlint: init at 0.4.7 --- .../tools/analysis/svlint/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/analysis/svlint/default.nix diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix new file mode 100644 index 000000000000..adf17dabecee --- /dev/null +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "svlint"; + version = "0.4.7"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = "svlint"; + rev = "v${version}"; + sha256 = "0gn68achvhyxljvhw5rwraxjcgdwrl1bwbsn596ka15nrk4lwb34"; + }; + + cargoSha256 = "0v94zsh4jhzjnqbkgwn8rjbs72i5cw2nmkwn7xhdbbwxh17a88x4"; + + meta = with lib; { + description = "SystemVerilog linter"; + homepage = "https://github.com/dalance/svlint"; + license = licenses.mit; + maintainers = with maintainers; [ trepetti ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78e00506d785..e0081e45c06f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11505,6 +11505,8 @@ in summon = callPackage ../development/tools/summon { }; + svlint = callPackage ../development/tools/analysis/svlint { }; + swarm = callPackage ../development/tools/analysis/swarm { }; swiftformat = callPackage ../development/tools/swiftformat { }; From 4030b3fe79f6967faecdd2ae097a33dc74116abb Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Tue, 1 Sep 2020 17:34:09 -0700 Subject: [PATCH 664/688] cordless: init at 2020-08-30 --- .../instant-messengers/cordless/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/cordless/default.nix diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/applications/networking/instant-messengers/cordless/default.nix new file mode 100644 index 000000000000..a262b0487464 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/cordless/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "cordless"; + version = "2020-08-30"; + + src = fetchFromGitHub { + owner = "Bios-Marcel"; + repo = pname; + rev = version; + sha256 = "sha256-CwOI7Ah4+sxD9We+Va5a6jYat5mjOeBk2EsOfwskz6k="; + }; + + subPackages = [ "." ]; + + vendorSha256 = "sha256-01I7GrZkaskuz20kVK2YwqvP7ViPMlQ3BFaoLHwgvOE="; + + meta = with stdenv.lib; { + homepage = "https://github.com/Bios-Marcel/cordless"; + description = "Discord terminal client"; + license = licenses.bsd3; + maintainers = with maintainers; [ colemickens ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c840736728c6..1d6d4da64938 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19812,6 +19812,8 @@ in convchain = callPackage ../tools/graphics/convchain {}; + cordless = callPackage ../applications/networking/instant-messengers/cordless { }; + coursera-dl = callPackage ../applications/misc/coursera-dl {}; coyim = callPackage ../applications/networking/instant-messengers/coyim {}; From ea5d0dcd76a79b0fc43c5cef8a4346002e25aef7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 03:02:16 +0000 Subject: [PATCH 665/688] honggfuzz: 2.2 -> 2.3.1 --- pkgs/tools/security/honggfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index ce86e1171004..2846cf77b331 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -5,13 +5,13 @@ let honggfuzz = stdenv.mkDerivation rec { pname = "honggfuzz"; - version = "2.2"; + version = "2.3.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "${version}"; - sha256 = "0ycpx087mhv5s7w01chg2b6rfb3zgfpp9in0x73kpv7y4dcvg7gw"; + sha256 = "0dcl5a5jykgfmnfj42vl7kah9k26wg38l2g6yfh5pssmlf0nax33"; }; enableParallelBuilding = true; From c941a63cb0e6fbcf0b3c1c4f6e36ef806c544c9e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 3 Sep 2020 22:47:52 +0100 Subject: [PATCH 666/688] honggfuzz: patch hfuzz-cc.c to fix path to buildtime-provided clang i judged this slightly better than using a wrapper --- pkgs/tools/security/honggfuzz/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index 2846cf77b331..71146b15ea3d 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -13,6 +13,12 @@ let rev = "${version}"; sha256 = "0dcl5a5jykgfmnfj42vl7kah9k26wg38l2g6yfh5pssmlf0nax33"; }; + + postPatch = '' + substituteInPlace hfuzz_cc/hfuzz-cc.c \ + --replace '"clang' '"${clang}/bin/clang' + ''; + enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper ]; From 0fdc832be5cce9127ccb5f93087049d82d3aa65a Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 3 Sep 2020 20:31:47 +0200 Subject: [PATCH 667/688] buildah: 1.15.1 -> 1.15.2 Signed-off-by: Sascha Grunert --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 95e38e3a0f5e..ec47fdadd1b9 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "15pnyi6gay287vkcrgsirsyyps3ya2lsih1ljkcsqdxzr596mcv3"; + sha256 = "13kqcdrdzkbg6h5za6hhkzdx4nbrg5yl97ydj2hfcakl00q4y0dp"; }; outputs = [ "out" "man" ]; From 9ac15bd5c96ad20bde886b2288dc24423966c422 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Sep 2020 23:49:41 +0000 Subject: [PATCH 668/688] yarn: 1.22.4 -> 1.22.5 --- pkgs/development/tools/yarn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index dfdd921fd03d..22ce3553352f 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.4"; + version = "1.22.5"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1s054c9cmlmzy6cfkawhaxvaxhqcq0a17n4sb12p0bp2lzkax9lm"; + sha256 = "1yb1pb80jhw6mx1r28hf7zd54dygmnrf30r3fz7kn9nrgdpl5in8"; }; buildInputs = [ nodejs ]; From 04e0c46436209bf4645960a7f51f8ad6114c8529 Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Fri, 4 Sep 2020 00:52:10 +0100 Subject: [PATCH 669/688] snippetpixie: 1.3.3 -> 1.4.1 --- pkgs/tools/text/snippetpixie/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 002615077467..5c6025b245e0 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -19,19 +19,18 @@ , ibus , json-glib , pantheon -, libwnck3 , xorg }: stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.3.3"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "0ml57j6jagqvjlpgn1bcyx08h71kcxalh69y03y2lj84x5ib8qz3"; + sha256 = "1db3fbawh4qwdqby5ji4g26pksi4q253r5zvd3kv1m2ljmwrrwj0"; }; nativeBuildInputs = [ @@ -55,7 +54,6 @@ stdenv.mkDerivation rec { dbus ibus json-glib - libwnck3 xorg.libXtst pantheon.granite pantheon.elementary-gtk-theme @@ -83,6 +81,8 @@ stdenv.mkDerivation rec { Save your often used text snippets and then expand them whenever you type their abbreviation. For example:- "spr`" expands to "Snippet Pixie rules!" + + For non-accessible applications such as browsers and Electron apps, there's a shortcut (default is Ctrl+`) for opening a search window that pastes the selected snippet. ''; homepage = "https://www.snippetpixie.com"; license = licenses.gpl2Plus; From 565d04a1bf66cd4c0de084fa5408bacfbb39faf6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 02:45:00 +0000 Subject: [PATCH 670/688] argo: 2.10.0 -> 2.10.1 --- pkgs/applications/networking/cluster/argo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 45bbfbd6c40b..72c3955f90f3 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "19z1v6p59pcl8smywn1b5igqpv9wj48n6500wjxx5ayhc4mg00h2"; + sha256 = "1k023rq4p0hvq5famxm83csp3zsijrki8myk6v83xyfigwxc8sia"; }; vendorSha256 = "0fqdxs3r4249qxlc9cac0lpbqf2aifkcah07v0cckb9rxfyiwhjz"; From 476216ed889c23c33e912612333014c774c90f95 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Wed, 2 Sep 2020 22:35:05 -0600 Subject: [PATCH 671/688] croc: 8.0.13 -> 8.3.0 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index ed4f7a5f704f..54dd51ba9189 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.0.13"; + version = "8.3.0"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0vinccakinp996kqzry8irk7sf4djajxdfmpy982dl5y45491l4a"; + sha256 = "0kl6sbq0lzrvf4wzz5bvz81ncmfw5lm7pjr2r2xx4sws1w006nq2"; }; - vendorSha256 = "1d6gg7c0rb45zy9rilacn2xyr3kcb7acsh389hk6lppipmhpzr5a"; + vendorSha256 = "0qfrc3c4fsg3w2zcpdr93ilknxhshcysvin029va154sq3zmggbn"; doCheck = false; From 678e9184ef37ba2e1bfa4dfdc3434270e3b837c4 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 4 Sep 2020 02:13:30 -0400 Subject: [PATCH 672/688] hotspot: 1.2.0 -> 1.3.0 --- pkgs/development/tools/analysis/hotspot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index 23ca35b3717e..f04d060290f1 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "hotspot"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; rev = "v${version}"; - sha256 = "05rkzrvak93z8mzcpm4mcjxb933l8pjsxr9a595wfn1gn2ihmada"; + sha256 = "1f68bssh3p387hkavfjkqcf7qf7w5caznmjfjldicxphap4riqr5"; fetchSubmodules = true; }; From e8306e3be9a8334baff785bfdf70ec733e735d11 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Sep 2020 13:24:03 -0700 Subject: [PATCH 673/688] python3Packages.azure-mgmt-synapse: init at 0.3.0 --- .../azure-mgmt-synapse/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-synapse/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix new file mode 100644 index 000000000000..ffdb6eb53788 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, azure-common +, msrest +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-mgmt-synapse"; + version = "0.3.0"; + disabled = pythonOlder "3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0sa12s5af9xl1wnblilswxc6ydr2anm9an000iz3ks54pydby2vy"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + azure-common + msrest + msrestazure + ]; + + pythonImportsCheck = [ "azure.mgmt.synapse" ]; + + meta = with lib; { + description = "Azure python SDK"; + homepage = "https://github.com/Azure/azure-sdk-for-python/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30e0b3ad0e1b..ce0c74b2519d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -677,6 +677,8 @@ in { azure-mgmt-subscription = callPackage ../development/python-modules/azure-mgmt-subscription { }; + azure-mgmt-synapse = callPackage ../development/python-modules/azure-mgmt-synapse { }; + azure-mgmt-trafficmanager = callPackage ../development/python-modules/azure-mgmt-trafficmanager { }; azure-mgmt-web = callPackage ../development/python-modules/azure-mgmt-web { }; From 781b32ab4e7dccee4589de9a92bbb434b178a48f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Sep 2020 13:28:25 -0700 Subject: [PATCH 674/688] python3Packages.azure-multiapi-storage: 0.3.5 -> 0.4.1 --- .../python-modules/azure-multiapi-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 2d1ff4c29164..18e4a12d3b36 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.3.5"; + version = "0.4.1"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "71c238c785786a159b3ffd587a5e7fa1d9a517b66b592ae277fed73a9fbfa2b0"; + sha256 = "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3"; }; propagatedBuildInputs = [ From 81fcdbb6f766019545e59114c820496e6e25fff4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Sep 2020 13:30:59 -0700 Subject: [PATCH 675/688] python3Packages.azure-mgmt-appconfiguration: 0.5.0 -> 0.6.0 --- .../python-modules/azure-mgmt-appconfiguration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index e5879bd4e8c3..3c019cdf31ea 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "211527511d7616a383cc196956eaf2b7ee016f2367d367924b3715f2a41106da"; + sha256 = "fe6e216ce7293219b7d8d1cbcca7cf2f4511f134c2bf0b3455078bf086436c5f"; extension = "zip"; }; From c7e7a3c909c5686eb7dd374a0bdbcec546d3c113 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Sep 2020 13:30:59 -0700 Subject: [PATCH 676/688] python3Packages.azure-mgmt-containerservice: 9.2.0 -> 9.3.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 8e186da6d880..603bd81ad1cb 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "9.2.0"; + version = "9.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e7904b60c42a153b64b1604f3c698602686b38787bebdaed6e808cd43b6e5967"; + sha256 = "04ca071d1d6af854b6a5947c5aed803924ccbd2ea0d240285b6fa68dc4ab75a9"; }; propagatedBuildInputs = [ From 3d29275673bddc659c80977f6669081b63b06a5e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Sep 2020 13:31:00 -0700 Subject: [PATCH 677/688] python3Packages.azure-mgmt-reservations: 0.7.0 -> 0.8.0 --- .../python-modules/azure-mgmt-reservations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index 3873f08e3ce2..d5e4226b5ccc 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f65c1985a47e0ac55e7d5d9cc1bd5e95335a111566edc289d460aa2bc8f80991"; + sha256 = "b12318392e6f5100246c60de88879e24b15db104d00f9704a4ff51e7344594f1"; }; propagatedBuildInputs = [ From b346c10aec7e0730cd7ff55f25dd6ee2d7bb6ccc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Sep 2020 13:31:00 -0700 Subject: [PATCH 678/688] python3Packages.azure-mgmt-storage: 11.1.0 -> 11.2.0 --- .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 8e101ef051ac..b6cd9ca5c8ad 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "11.1.0"; + version = "11.2.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ef23587c1b6dc0866ebf0e91e83ba05d7f7e4fea7951b704781b9cd9f5f27f1c"; + sha256 = "fc8e3cbf3c58cab98d9b2218c774dae2cc90b693f5ab5a24a7a959febe6c0528"; }; propagatedBuildInputs = [ azure-mgmt-common ]; From 23ebed860a32650e83f84198a91810042db0495d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Sep 2020 13:39:05 -0700 Subject: [PATCH 679/688] python3Packages.azure-synapse-accesscontrol: init at 0.2.0 --- .../azure-synapse-accesscontrol/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix diff --git a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix new file mode 100644 index 000000000000..d9d0941abde0 --- /dev/null +++ b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, azure-common +, azure-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-synapse-accesscontrol"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rsdqrhrgy09kbw6c7krb4hlaxs1ldb6lilwrbxgp3zqybxxnh5b"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + ]; + + pythonImportsCheck = [ "azure.synapse.accesscontrol" ]; + + meta = with lib; { + description = "Azure python SDK"; + homepage = "https://github.com/Azure/azure-sdk-for-python/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce0c74b2519d..efe4604387b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -707,6 +707,8 @@ in { azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; + azure-synapse-accesscontrol = callPackage ../development/python-modules/azure-synapse-accesscontrol { }; + Babel = callPackage ../development/python-modules/Babel { }; babelfish = callPackage ../development/python-modules/babelfish { }; From fd45756014a47698dcb41ed3d6f1a4b654d28bb8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Sep 2020 13:50:12 -0700 Subject: [PATCH 680/688] python3Packages.azure-synapse-spark: init at 0.2.0 --- .../azure-synapse-spark/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/azure-synapse-spark/default.nix diff --git a/pkgs/development/python-modules/azure-synapse-spark/default.nix b/pkgs/development/python-modules/azure-synapse-spark/default.nix new file mode 100644 index 000000000000..bf75e987bdcb --- /dev/null +++ b/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, azure-common +, azure-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-synapse-spark"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qijqp6llshqas422lnqvpv45iv99n7f13v86znql40y3jp5n3ir"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + ]; + + pythonImportsCheck = [ "azure.synapse.spark" ]; + + meta = with lib; { + description = "Azure python SDK"; + homepage = "https://github.com/Azure/azure-sdk-for-python/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efe4604387b6..70841bbc822f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -709,6 +709,8 @@ in { azure-synapse-accesscontrol = callPackage ../development/python-modules/azure-synapse-accesscontrol { }; + azure-synapse-spark = callPackage ../development/python-modules/azure-synapse-spark { }; + Babel = callPackage ../development/python-modules/Babel { }; babelfish = callPackage ../development/python-modules/babelfish { }; From 3a3077ae241c86f74a559898348d98030dc0f3a9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Sep 2020 13:56:21 -0700 Subject: [PATCH 681/688] python3Packages.azure-mgmt-keyvault: fix overridden package --- pkgs/development/python-modules/azure-mgmt-keyvault/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index fd6cd26c7c6c..a4b1679b250a 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -7,6 +7,7 @@ , msrestazure , azure-common , azure-mgmt-nspkg +, azure-mgmt-core }: buildPythonPackage rec { @@ -23,6 +24,7 @@ buildPythonPackage rec { msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; From 25edae3499bb84dc6d94915acc0501a1ed4df080 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Sep 2020 13:56:54 -0700 Subject: [PATCH 682/688] azure-cli: 2.10.1 -> 2.11.1 --- pkgs/tools/admin/azure-cli/default.nix | 7 ++- .../tools/admin/azure-cli/python-packages.nix | 46 +++++++++++++++---- 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 192a788b935e..3743cad11a30 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.10.1"; + version = "2.11.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "03mard9cyffn109c1p0hrdi4cjxbwyk98677qrira9yvy6rw04bg"; + sha256 = "11jmgc73b0w725rq89j6hk6gh67nfdbzp3rmywmrnah683d6xbpx"; }; # put packages that needs to be overriden in the py package scope @@ -105,10 +105,13 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-sql azure-mgmt-sqlvirtualmachine azure-mgmt-storage + azure-mgmt-synapse azure-mgmt-trafficmanager azure-mgmt-web azure-multiapi-storage azure-storage-blob + azure-synapse-accesscontrol + azure-synapse-spark colorama cryptography Fabric diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 1ff74369432a..8d17c9ff2017 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -139,8 +139,8 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.1.0" "zip" - "1pgxl2gzc1dm7akcqm6fl0y35sb3jdgcz6d7k6vsq93gb3gzrrwv"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.2.0" "zip" + "ddfe4c0c55f0e3fd1f66dd82c1d4a3d872ce124639b9a77fcd172daf464438a5"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.5.0" "zip" "1nh626jg459p9f96glv74dph3vmpybm5cs8rrj1s65kn3m8jf591"; @@ -160,8 +160,8 @@ let azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.0.1" "zip" "11nqjpi9qypb0xvfy63l98q5m5jfv5iqx15mliksm96vkdkmji3y"; - azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.0.0" "zip" - "0pm565v05480f672l0n8z2sg6zk6iqyi91n0dhscibhdl54sy3si"; + azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip" + "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.15.0" "zip" "03ysr8kx0gavjrxsi9wqrgxpg3g17nvii7z68qfm0k2mv6ryj3z7"; @@ -187,8 +187,8 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.11.0" "zip" - "0193y0w5lcrayf8g0sxaj57w52kixdk3x5b8kga5is4pdjq7c6k2"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.12.0" "zip" + "7d773119bc02e3d6f9d7cffb7effc17e85676d5c5b1f656d05abc4489e472c76"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; @@ -229,6 +229,9 @@ let azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; + azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.3.0" "zip" + "0sa12s5af9xl1wnblilswxc6ydr2anm9an000iz3ks54pydby2vy"; + azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "0.1.0" "zip" "1pq5rn32yvrf5kqjafnj0kc92gpfg435w2l0k7cm8gvlja4r4m77"; @@ -238,8 +241,8 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.0.0" "zip" "1qisnwn0gqfsa3h5x0fdbsgdjwn92hdbg71gdijrja0kryb328k5"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.2.0" "zip" - "1r5ww9ndya6sifafrbp4cr5iyyaww2ns7wrbqm6hc6aqxcpf30qq"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "7.0.0b2" "zip" + "10kpfzgsyh648a9z194vysgfl5887qwwamyd1r32zfqi9fr4js5l"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip" "0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm"; @@ -265,8 +268,11 @@ let azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip" "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.6.0" "zip" - "004q3d2kj1i1cx3sad1544n3pkindfm255sw19gdlhbw61wn5l5i"; + azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.7.0" "zip" + "004q3d2kj1i1cx3sad1544n3pkindfm255sw19gdlhbw61wn5l5a"; + + azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.4.1" "zip" + "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3"; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; @@ -297,6 +303,26 @@ let }; }); + azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec { + version = "0.2.0"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "1rsdqrhrgy09kbw6c7krb4hlaxs1ldb6lilwrbxgp3zqybxxnh5b"; + extension = "zip"; + }; + }); + + azure-synapse-spark = super.azure-synapse-spark.overrideAttrs(oldAttrs: rec { + version = "0.2.0"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "1qijqp6llshqas422lnqvpv45iv99n7f13v86znql40y3jp5n3ir"; + extension = "zip"; + }; + }); + azure-keyvault = super.azure-keyvault.overrideAttrs(oldAttrs: rec { version = "1.1.0"; src = super.fetchPypi { From 762434fb02e1aff996dffdf3e03dc8fe985901b6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 1 Sep 2020 13:44:07 -0700 Subject: [PATCH 683/688] python39: 3.9.0b5 -> 3.9.0rc1 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 76963587c20d..db60c0ead6f8 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -108,9 +108,9 @@ in { major = "3"; minor = "9"; patch = "0"; - suffix = "b5"; + suffix = "rc1"; }; - sha256 = "0r0m82srq4z44dahczd1cv6wgmxcpqbn5dyd8czcpk2pp9ydgqbc"; + sha256 = "0w6wvyy9fbvfvrmhvmlb5gq18haagywk9hjkp1knjdarfczag9zv"; inherit (darwin) configd; inherit passthruFun; }; From 4906881a959d9ab2d772163abcf842cf1cb7f3d7 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Tue, 25 Aug 2020 19:30:22 +0200 Subject: [PATCH 684/688] vokosscreen-ng: init at 3.0.5 --- .../video/vokoscreen-ng/default.nix | 71 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 75 insertions(+) create mode 100644 pkgs/applications/video/vokoscreen-ng/default.nix diff --git a/pkgs/applications/video/vokoscreen-ng/default.nix b/pkgs/applications/video/vokoscreen-ng/default.nix new file mode 100644 index 000000000000..600bc715ffb4 --- /dev/null +++ b/pkgs/applications/video/vokoscreen-ng/default.nix @@ -0,0 +1,71 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, fetchpatch +, pkg-config +, qmake +, qttools +, gstreamer +, libX11 +, qtbase +, qtmultimedia +, qtx11extras + +, gst-plugins-base +, gst-plugins-good +, gst-plugins-bad +, gst-plugins-ugly +}: +mkDerivation rec { + + pname = "vokoscreen-ng"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = "vkohaupt"; + repo = "vokoscreenNG"; + rev = version; + sha256 = "1spyqw8h8bkc1prdb9aixiw5h3hk3gp2p0nj934bnwq04kmfp660"; + }; + + patches = [ + # Better linux integration + (fetchpatch { + url = "https://github.com/vkohaupt/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637.patch"; + sha256 = "1iibimv8xfxxfk44kkbrkay37ibdndjvs9g53mxr8x8vrsp917bz"; + }) + ]; + + qmakeFlags = [ "src/vokoscreenNG.pro" ]; + + nativeBuildInputs = [ qttools pkg-config qmake ]; + buildInputs = [ + gstreamer + libX11 + qtbase + qtmultimedia + qtx11extras + + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]; + + postPatch = '' + substituteInPlace src/vokoscreenNG.pro \ + --replace lrelease-qt5 lrelease + ''; + + postInstall = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "User friendly Open Source screencaster for Linux and Windows"; + license = licenses.gpl2Plus; + homepage = "https://github.com/vkohaupt/vokoscreenNG"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 043cd123261c..551a67b46b66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27374,6 +27374,10 @@ in vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { }; + vokoscreen-ng = libsForQt5.callPackage ../applications/video/vokoscreen-ng { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly; + }; + vttest = callPackage ../tools/misc/vttest { }; wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; From fd457ecb6cc57d4d22f97328587cb7cd4150c75b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 05:49:48 -0700 Subject: [PATCH 685/688] codeql: 2.2.4 -> 2.2.5 (#97097) --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index cc73e1469092..e450bbefe242 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.2.4"; + version = "2.2.5"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "0vrl9q7rm8bjxbb5076qx2cbva1wp1gp6z0pjwpg70z90gp49n2p"; + sha256 = "1x9crby4idkvfy6i5l0r00ixnx3ij68zjh1l5n92hyzlf0snv28d"; }; nativeBuildInputs = [ From e385f987926150a029dbce0048ebf7bfdd7fb174 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Sep 2020 09:25:47 -0400 Subject: [PATCH 686/688] oh-my-zsh: 2020-09-02 -> 2020-09-03 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 25bb91a84e22..018bf01f7d94 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-09-02"; + version = "2020-09-03"; pname = "oh-my-zsh"; - rev = "7256c03ce1c54bd08ecab954c91a0231386556a6"; + rev = "87edf16e05598505927410f6b06bbc5a6003805b"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0sp9np1kh0h0wdqhn871zibsd7jkp0hjjih8n88wcsbqhggmp95q"; + sha256 = "0c13vkh9w3sxdy12b17yqa676cp83jb3a4pwc2xx2xggcxpn72by"; }; installPhase = '' From cadc15222fa8fe399336332960471f0bd5e55331 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 2 Sep 2020 19:00:00 -0500 Subject: [PATCH 687/688] ocamlPackages.csexp: init at 1.3.1 --- .../ocaml-modules/csexp/default.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/csexp/default.nix diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix new file mode 100644 index 000000000000..512748907003 --- /dev/null +++ b/pkgs/development/ocaml-modules/csexp/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "csexp"; + version = "1.3.1"; + + useDune2 = true; + + minimumOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/ocaml-dune/csexp/releases/download/${version}/csexp-${version}.tbz"; + sha256 = "0maihbqbqq9bwr0r1cv51r3m4hrkx9cf5wnxcz7rjgn13lcc9s49"; + }; + + postPatch = '' + substituteInPlace src/csexp.ml --replace Result.result Result.t + ''; + + meta = with lib; { + homepage = "https://github.com/ocaml-dune/csexp"; + description = "Minimal support for Canonical S-expressions"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 32bb7d337860..d0dc0bf1e918 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -173,6 +173,8 @@ let cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; + csexp = callPackage ../development/ocaml-modules/csexp { }; + cstruct = if lib.versionAtLeast ocaml.version "4.2" then callPackage ../development/ocaml-modules/cstruct {} From c7e8da62257a8ff5537c3b3c43eb68228f51e5df Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 2 Sep 2020 19:01:00 -0500 Subject: [PATCH 688/688] dune_2: 2.7.0 -> 2.7.1 https://github.com/ocaml/dune/releases/tag/2.7.1 --- .../ocaml-modules/dune-action-plugin/default.nix | 2 +- .../ocaml-modules/dune-build-info/default.nix | 2 +- .../ocaml-modules/dune-configurator/default.nix | 6 +++--- .../ocaml-modules/dune-glob/default.nix | 2 +- .../ocaml-modules/dune-private-libs/default.nix | 2 +- pkgs/development/tools/ocaml/dune/2.nix | 14 +++++++++++--- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix index fcb93aac799d..65c55da6e3b3 100644 --- a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix +++ b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "dune-action-plugin"; - inherit (dune_2) src version; + inherit (dune_2) src version patches; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/dune-build-info/default.nix b/pkgs/development/ocaml-modules/dune-build-info/default.nix index 3c828ebdcdb9..5d9f105782b4 100644 --- a/pkgs/development/ocaml-modules/dune-build-info/default.nix +++ b/pkgs/development/ocaml-modules/dune-build-info/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "dune-build-info"; - inherit (dune_2) src version; + inherit (dune_2) src version patches; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix index aa12ebc8d796..16e365dd4f38 100644 --- a/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -1,15 +1,15 @@ -{ lib, buildDunePackage, dune_2, dune-private-libs }: +{ lib, buildDunePackage, dune_2, csexp, result }: buildDunePackage rec { pname = "dune-configurator"; useDune2 = true; - inherit (dune_2) src version; + inherit (dune_2) src version patches; dontAddPrefix = true; - propagatedBuildInputs = [ dune-private-libs ]; + propagatedBuildInputs = [ csexp result ]; meta = with lib; { description = "Helper library for gathering system configuration"; diff --git a/pkgs/development/ocaml-modules/dune-glob/default.nix b/pkgs/development/ocaml-modules/dune-glob/default.nix index 34b79068c115..c7c6f9be4ee0 100644 --- a/pkgs/development/ocaml-modules/dune-glob/default.nix +++ b/pkgs/development/ocaml-modules/dune-glob/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "dune-glob"; - inherit (dune_2) src version; + inherit (dune_2) src version patches; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 9eb253f02e5b..8a635efa3a59 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -5,7 +5,7 @@ buildDunePackage rec { useDune2 = true; - inherit (dune_2) src version; + inherit (dune_2) src version patches; minimumOCamlVersion = "4.08"; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index eac705294f39..30823b43acbc 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ stdenv, fetchurl, ocaml, findlib, fetchpatch }: if stdenv.lib.versionOlder ocaml.version "4.08" then throw "dune is not available for OCaml ${ocaml.version}" @@ -6,17 +6,25 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "058wiyncczbmlfxj3cnwn5n68wkmbaf4mgjm2bkp2hffpn2wl5xl"; + sha256 = "0lnfmc06yhbdiv6mmp0aksnnvzz4aw4zabrdg89p5msyzir3qrvn"; }; buildInputs = [ ocaml findlib ]; buildFlags = "release"; + patches = [ + # Fix setup.ml configure path. Remove with the next release. + (fetchpatch { + url = "https://github.com/ocaml/dune/commit/8a3d7f2f2015b71384caa07226d1a89dba9d6c25.patch"; + sha256 = "0dw4q10030h9xcdlxw2vp7qm0hd2qpkb98rir5d55m9vn65w8j28"; + }) + ]; + dontAddPrefix = true; installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ];