From 4c391b43292d8370de0846ccec6ded81c147528a Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Fri, 27 Aug 2021 23:42:04 +1000 Subject: [PATCH 001/106] pythonPackages.pandas: disable tests on armv7l --- pkgs/development/python-modules/pandas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index b7e237a3e3ba..e0bd07310514 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" ''; - doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture + doCheck = !stdenv.isAarch32 && !stdenv.isAarch64; # upstream doesn't test this architecture pytestFlagsArray = [ "--skip-slow" From 235c562c9e16615350d946ac55ce0495b9b8f729 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Sat, 23 Oct 2021 11:08:19 +0200 Subject: [PATCH 002/106] salt: 3003.3 -> 3004 --- pkgs/tools/admin/salt/default.nix | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 9e411e1ae3a4..6f7b86f04489 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -5,20 +5,36 @@ # passing them in this array enables Salt to find them. , extraInputs ? [] }: -python3.pkgs.buildPythonApplication rec { - pname = "salt"; - version = "3003.3"; - src = python3.pkgs.fetchPypi { +let + py = python3.override { + packageOverrides = self: super: { + # Incompatible with pyzmq 22 + pyzmq = super.pyzmq.overridePythonAttrs (oldAttrs: rec { + version = "21.0.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "CYwTxhmJE8KgaQI1+nTS5JFhdV9mtmO+rsiWUVVMx5w="; + }; + }); + }; + }; +in +py.pkgs.buildPythonApplication rec { + pname = "salt"; + version = "3004"; + + src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "pvnIyLXiYA6oYgtKZzcd4XYRvrT42X5LubCzCKN+0eI="; + sha256 = "PVNWG8huAU3KLsPcmBB5vgTVXqBHiQyr3iXlsQv6WxM="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with py.pkgs; [ distro jinja2 markupsafe msgpack + psutil pycryptodomex pyyaml pyzmq From d492837c98aa5e26b75cda16cafb52b8d2af3a32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 03:14:38 +0000 Subject: [PATCH 003/106] betaflight-configurator: 10.7.0 -> 10.7.1 --- .../science/robotics/betaflight-configurator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 2fafa2ebf875..3331877e1f2c 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { inherit pname; - version = "10.7.0"; + version = "10.7.1"; src = fetchurl { url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip"; - sha256 = "07r60n9422g5sm7x5b62p044cp961l51vx0s8ig2hy24s74hkam1"; + sha256 = "sha256-mMjy7Ve7wEmPxkAmux0WahUgJ86ylnWZP4smDZeBs8Q="; }; nativeBuildInputs = [ wrapGAppsHook unzip ]; From 0c23bd5c4681b75bd0cc1d7fd311fce3d46fdac1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 09:32:44 +0000 Subject: [PATCH 004/106] libmysofa: 1.2 -> 1.2.1 --- pkgs/development/libraries/audio/libmysofa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 821a9ea9226a..5626c5fa8f8d 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "sha256-f+1CIVSxyScyNF92cPIiZwfnnCVrWfCZlbrIXtduIdY="; + sha256 = "sha256-SCyeicZ+JkJU1x2X3efOvxUXT2qF2IiUsj+anLg5Lsg="; }; nativeBuildInputs = [ cmake ]; From 84ba0119869aa7f42734a0e9cff8bca1ebf382c2 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 4 Nov 2021 21:45:34 -0700 Subject: [PATCH 005/106] linode-cli: 5.11.1 -> 5.12.0 --- pkgs/tools/virtualization/linode-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 3faddb498ba9..e47898276d67 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,10 +11,10 @@ }: let - sha256 = "1hhbwyhw6nmzb2a88papfca5rjavav6srcnvmbni5l6ln79pgqj7"; + sha256 = "1kvlf9qcl0i7g24s9f2pj25msmlj0cjicjwrnnc65q8qkmk2br9q"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.107.0"; - specSha256 = "1z260w0517k3sgd2ygzwzkhq5w9rbkls69mnl84501fpd2nx7qvi"; + specVersion = "4.108.0"; + specSha256 = "17n9wjd0hpkzc2bvsawdvl8hc5285r0n19xq59h4amqb2fhp676w"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; @@ -24,7 +24,7 @@ in buildPythonApplication rec { pname = "linode-cli"; - version = "5.11.1"; + version = "5.12.0"; src = fetchFromGitHub { owner = "linode"; From 992458a7842e45021fb4b4c4b520736c8210bd79 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 7 Nov 2021 08:19:12 +0000 Subject: [PATCH 006/106] freesweep: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: gpl.c:416:25: error: format not a string literal and no format arguments [-Werror=format-security] 416 | mvwprintw(GPLWin,CurrentY++,2,Messages[CurrentLine++]); | ^~~~~~~~~ While at it also pull fix for tool chains that default to -fno-common. --- pkgs/games/freesweep/default.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index 7c17877e9341..b0d556914fa7 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, ncurses, lib, stdenv, +{ fetchFromGitHub, fetchpatch, ncurses, lib, stdenv, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { @@ -12,6 +12,25 @@ stdenv.mkDerivation rec { sha256 = "0grkwmz9whg1vlnk6gbr0vv9i2zgbd036182pk0xj4cavaj9rpjb"; }; + patches = [ + # Pull fix pending upstream inclusion for -fno-common toolchains + # like upstream gcc-10+ or clang-13: + # https://github.com/rwestlund/freesweep/pull/8 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/rwestlund/freesweep/commit/a86245df4f3ff276a393f799d737d28a5cb0a5a8.patch"; + sha256 = "13gs3bjb68ixyn9micza7gjd489rd2f5pdrv6sip9fsa6ya29xky"; + }) + + # Pull fix pending upstream inclusion for ncurses-6.3: + # https://github.com/rwestlund/freesweep/pull/10 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/rwestlund/freesweep/commit/b0aef2bd0b2409d1e859af7d29bf2d86fc7bcea7.patch"; + sha256 = "1nzvmvxhjxgm8228h1zz16w62iy6lak5sibif1s1f6p1ssn659jp"; + }) + ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; buildInputs = [ ncurses ]; From dee3169047a7f5cf4713ca7dc85a8e491354c418 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 7 Nov 2021 09:47:57 +0000 Subject: [PATCH 007/106] gmu: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: src/tools/ui.c: In function 'ui_draw_footer_button': src/tools/ui.c:329:9: error: format not a string literal and no format arguments [-Werror=format-security] 329 | wprintw(ui->win_footer->win, key); | ^~~~~~~ While at it pulled fix for upstream gcc-10 and clang-12 which default to -fno-common. Otherwise build would fail as: $ nix build --impure --expr 'with import ./. {}; gmu.override { stdenv = clang12Stdenv; }' -L ... gmu> ld: feloader.o:(.bss+0x8): multiple definition of `dlsymunion'; decloader.o:(.bss+0x8): first defined here --- pkgs/applications/audio/gmu/default.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index b2b9f5e34750..cc2b46cd6ace 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod +{lib, stdenv, fetchurl, fetchpatch, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod , speex, ncurses , keymap ? "default" , conf ? "unknown" @@ -13,6 +13,24 @@ stdenv.mkDerivation rec { sha256 = "03x0mc0xw2if0bpf0a15yprcyx1xccki039zvl2099dagwk6xskv"; }; + patches = [ + # pull pending upstream inclusion fix for ncurses-6.3: + # https://github.com/jhe2/gmu/pull/7 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/jhe2/gmu/commit/c8b3a10afee136feb333754ef6ec26383b11072f.patch"; + sha256 = "0xp2j3jp8pkmv6yvnzi378m2dylbfsaqrsrkw7hbxw6kglzj399r"; + }) + + # pull upstream fix for -fno-common toolchains like + # upstream gcc-10 of clang-13. + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/jhe2/gmu/commit/b705209f08ddfda141ad358ccd0c3d2d099be5e6.patch"; + sha256 = "1ci2b8kz3r58rzmivlfhqjmcgqwlkwlzzhnyxlk36vmk240a3gqq"; + }) + ]; + buildInputs = [ SDL SDL_gfx SDL_image tremor flac mpg123 libmikmod speex ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; From 08c5c121f573de019932d02c9e7f95e0104c84e5 Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Mon, 8 Nov 2021 17:34:41 +0200 Subject: [PATCH 008/106] mopidy-iris: 3.59.0 -> 3.60.0 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index d02ca3d747eb..5b2cbe031c67 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.59.0"; + version = "3.60.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0llvn0khl07ni34jvb3a1r6rnkf0ljizhpqrs5bdishfhpwyhm0j"; + sha256 = "18w6qqmxzn8psiacybryxailm826f3j1wgiv0c03fbdsy6kr5f7l"; }; propagatedBuildInputs = [ From 16f44b24f8d1c1136f27b588a234b7393a6465b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Wed, 27 Oct 2021 18:58:55 +0200 Subject: [PATCH 009/106] nixpkgs-basic-release-checks: check for use of url literals Nixpkgs should not rely on that deprecated feature. --- pkgs/top-level/nixpkgs-basic-release-checks.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index 350dd273fe2e..758c8bf06c36 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -36,6 +36,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } nix-env -f $src \ --show-trace --argstr system "$platform" \ --arg config '{ allowAliases = false; }' \ + --option experimental-features 'no-url-literals' \ -qa --drv-path --system-filter \* --system \ "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log @@ -48,6 +49,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } nix-env -f $src \ --show-trace --argstr system "$platform" \ --arg config '{ allowAliases = false; }' \ + --option experimental-features 'no-url-literals' \ -qa --drv-path --system-filter \* --system --meta --xml \ "''${opts[@]}" > /dev/null done From dd00c495c3b63692558235ea0c88e115ae3d6bf1 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 13 Nov 2021 13:29:53 +0100 Subject: [PATCH 010/106] linux_lqx: 5.14.16 -> 5.14.17 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 98a340cf9480..6b43bea16f51 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.14.16"; + version = "5.14.17"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-nWeHvKnVo/ln8sTLdFTK1pG09HMTdZ75a+3Ehxjd5pc="; + sha256 = "sha256-9njh5J+wMac+fmrHrM93QWjyjyE3iiN0p9/JI7ZoDVI="; }; extraMeta = { From f0af311f6286c6416866ecd468449134789a3ce2 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 13 Nov 2021 23:08:27 +0100 Subject: [PATCH 011/106] linux_lqx: 5.14.17 -> 5.14.18 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 6b43bea16f51..02e3902d3c5c 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.14.17"; + version = "5.14.18"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-9njh5J+wMac+fmrHrM93QWjyjyE3iiN0p9/JI7ZoDVI="; + sha256 = "sha256-jn2Y/zusxwOvT5MXlM5HCojiyY0ssC36O92iv7/ZMWU="; }; extraMeta = { From 3247e757416496ef6a19fb53ffdc4c92c969f39a Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 7 Oct 2021 00:31:03 +0200 Subject: [PATCH 012/106] emacs: resolve wrapper load-path at build time MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the included package set is determined at build time we can also generate the `subdirs.el` file at build time. This improves startup time somewhat since we don't have to traverse the directory to add to `load-path`. For example, ``` sh-session $ bench './emacs-old -Q --batch --kill' './emacs-new -Q --batch --kill' benchmarking bench/./emacs-old -Q --batch --kill time 72.77 ms (71.66 ms .. 73.65 ms) 1.000 R² (0.999 R² .. 1.000 R²) mean 72.49 ms (72.06 ms .. 72.92 ms) std dev 746.5 μs (582.4 μs .. 1.008 ms) benchmarking bench/./emacs-new -Q --batch --kill time 40.56 ms (40.24 ms .. 40.86 ms) 1.000 R² (0.999 R² .. 1.000 R²) mean 40.30 ms (40.12 ms .. 40.51 ms) std dev 401.9 μs (311.1 μs .. 555.8 μs) ``` The change does not actually affect the content of `load-path`: ``` sh-session $ diff -s <(./emacs-old --batch --eval '(prin1 load-path)' | sed -E 's!/nix/store/[[:alnum:]]{32}-!!g') \ <(./emacs-new --batch --eval '(prin1 load-path)' | sed -E 's!/nix/store/[[:alnum:]]{32}-!!g') Files /dev/fd/63 and /dev/fd/62 are identical ``` So in principle the only observable effect should be the improved startup time. --- pkgs/build-support/emacs/mk-wrapper-subdirs.el | 6 ++++++ pkgs/build-support/emacs/wrapper.nix | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 pkgs/build-support/emacs/mk-wrapper-subdirs.el diff --git a/pkgs/build-support/emacs/mk-wrapper-subdirs.el b/pkgs/build-support/emacs/mk-wrapper-subdirs.el new file mode 100644 index 000000000000..7d30400a5c65 --- /dev/null +++ b/pkgs/build-support/emacs/mk-wrapper-subdirs.el @@ -0,0 +1,6 @@ +(defmacro mk-subdirs-expr (path) + `(setq load-path + (delete-dups (append '(,path) + ',(let ((default-directory path)) + (normal-top-level-add-subdirs-to-load-path)) + load-path)))) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index ccbd58485ea8..2aa61d6d2f62 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -165,8 +165,13 @@ runCommand (add-to-list 'native-comp-eln-load-path "$out/share/emacs/native-lisp/") ''} EOF - # Link subdirs.el from the emacs distribution - ln -s $emacs/share/emacs/site-lisp/subdirs.el -T $subdirs + + # Generate a subdirs.el that statically adds all subdirectories to load-path. + $emacs/bin/emacs \ + --batch \ + --load ${./mk-wrapper-subdirs.el} \ + --eval "(prin1 (macroexpand-1 '(mk-subdirs-expr \"$out/share/emacs/site-lisp\")))" \ + > "$subdirs" # Byte-compiling improves start-up time only slightly, but costs nothing. $emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs" From c7f31cfa6a26bb71e7198594c228f43ba92112b7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 31 Oct 2021 20:23:34 +0000 Subject: [PATCH 013/106] cvise: 2.3.0 -> 2.4.0 Add new python3Packages.chardet dependency and switch to latest llvm. cvise does a good job supporting llvm version range. --- pkgs/development/tools/misc/cvise/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index 80d2a73cc425..d6ad65164b74 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -1,17 +1,17 @@ { lib, buildPythonApplication, fetchFromGitHub, bash, cmake, flex , libclang, llvm, unifdef -, pebble, psutil, pytestCheckHook, pytest-flake8 +, chardet, pebble, psutil, pytestCheckHook, pytest-flake8 }: buildPythonApplication rec { pname = "cvise"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "marxin"; repo = "cvise"; rev = "v${version}"; - sha256 = "1x2i8nv0nncgvr07znhh2slngbrg8qcsz2zqx76bcyq9hssn6yal"; + sha256 = "0cfzikkhp91hjgxjk3izzczb8d9p8v9zsfyk6iklk92n5qf1aakq"; }; patches = [ @@ -21,7 +21,7 @@ buildPythonApplication rec { nativeBuildInputs = [ cmake flex llvm.dev ]; buildInputs = [ bash libclang llvm llvm.dev unifdef ]; - propagatedBuildInputs = [ pebble psutil ]; + propagatedBuildInputs = [ chardet pebble psutil ]; checkInputs = [ pytestCheckHook pytest-flake8 unifdef ]; # 'cvise --command=...' generates a script with hardcoded shebang. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df080da43e7b..8299fee4ff4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14290,7 +14290,8 @@ with pkgs; cvehound = callPackage ../development/tools/analysis/cvehound { }; cvise = python3Packages.callPackage ../development/tools/misc/cvise { - inherit (llvmPackages_11) llvm libclang; + # cvise keeps up with fresh llvm releases and supports wide version range + inherit (llvmPackages_latest) llvm libclang; }; cwltool = callPackage ../applications/science/misc/cwltool { }; From 129c47ae88eadcc50e66357a621bab5c3f96bc26 Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 17 Nov 2021 02:55:36 +0100 Subject: [PATCH 014/106] nixos/locate: include missing filesystems taken from Ubuntu config --- nixos/modules/misc/locate.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 2f2986c2fec5..2f0f676a0ba3 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -84,12 +84,15 @@ in { "bdev" "binfmt" "binfmt_misc" + "ceph" "cgroup" + "cgroup2" "cifs" "coda" "configfs" "cramfs" "cpuset" + "curlftpfs" "debugfs" "devfs" "devpts" @@ -101,6 +104,13 @@ in { "ftpfs" "fuse" "fusectl" + "fusesmb" + "fuse.ceph" + "fuse.glusterfs" + "fuse.gvfsd-fuse" + "fuse.mfs" + "fuse.rclone" + "fuse.rozofs" "fuse.sshfs" "gfs" "gfs2" @@ -110,9 +120,15 @@ in { "iso9660" "jffs2" "lustre" + "lustre_lite" "misc" + "mfs" "mqueue" "ncpfs" + "nfs" + "NFS" + "nfs4" + "nfsd" "nnpfs" "ocfs" "ocfs2" @@ -127,16 +143,14 @@ in { "smbfs" "sockfs" "spufs" - "nfs" - "NFS" - "nfs4" - "nfsd" "sshfs" "subfs" "supermount" "sysfs" "tmpfs" + "tracefs" "ubifs" + "udev" "udf" "usbfs" "vboxsf" From acf504773240020d57b1b26a5936b63c45ff796c Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 16 Nov 2021 20:05:44 -0600 Subject: [PATCH 015/106] qflipper: init at 0.5.3 --- pkgs/tools/misc/qflipper/default.nix | 31 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/qflipper/default.nix diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix new file mode 100644 index 000000000000..78bb6c839e6e --- /dev/null +++ b/pkgs/tools/misc/qflipper/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "qflipper"; + version = "0.5.3"; + name = "${pname}-${version}"; + src = fetchurl { + url = "https://update.flipperzero.one/builds/qFlipper/${version}/qFlipper-x86_64-${version}.AppImage"; + sha256 = "sha256-UFGFl1zb0t1y7FBd5EX1YS3npWM5slL/wLiTOF/CLNM="; + }; + appimageContents = appimageTools.extractType2 { inherit name src; }; + +in appimageTools.wrapType2 { + inherit name src; + + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/qFlipper + install -m 444 -D ${appimageContents}/qFlipper.desktop -t $out/share/applications + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Cross-platform desktop tool to manage your flipper device"; + homepage = "https://flipperzero.one/"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e74192a7b299..b34f80c1744a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -972,6 +972,8 @@ with pkgs; pferd = callPackage ../tools/misc/pferd {}; + qflipper = callPackage ../tools/misc/qflipper { }; + quich = callPackage ../tools/misc/quich { } ; redfang = callPackage ../tools/networking/redfang { }; From 5287d0146d0cab7ef0186cf26835be296d0470aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Nov 2021 04:26:42 +0100 Subject: [PATCH 016/106] nixos/locate: PRUNE_BIND_MOUNTSFR -> PRUNE_BIND_MOUNTS PRUNE_BIND_MOUNTSFR seems to be a typo. The man page only mentions it in a header and further in the paragraph it is PRUNE_BIND_MOUNTS. Also breaks plocate which complains about the unknown option. --- nixos/modules/misc/locate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 2f2986c2fec5..6ee66d5da128 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -202,7 +202,7 @@ in { PRUNEFS="${lib.concatStringsSep " " cfg.pruneFS}" PRUNENAMES="${lib.concatStringsSep " " cfg.pruneNames}" PRUNEPATHS="${lib.concatStringsSep " " cfg.prunePaths}" - PRUNE_BIND_MOUNTSFR="${lib.boolToString cfg.pruneBindMounts}" + PRUNE_BIND_MOUNTS="${if cfg.pruneBindMounts then "yes" else "no"}" ''; }; }; From 978c08a5dea7b1c04401f965479b782024fcc7eb Mon Sep 17 00:00:00 2001 From: luhuaei Date: Sat, 13 Nov 2021 20:04:58 +0800 Subject: [PATCH 017/106] Add kotlin-language-server --- .../tools/kotlin-language-server/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/kotlin-language-server/default.nix diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/kotlin-language-server/default.nix new file mode 100644 index 000000000000..510cd1f60f30 --- /dev/null +++ b/pkgs/development/tools/kotlin-language-server/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl, unzip, openjdk11, gradle }: + +stdenv.mkDerivation rec { + pname = "kotlin-language-server"; + version = "1.1.2"; + src = fetchurl { + url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; + sha256 = "d8850ee2be8c49e5e642c4a41f52304098ae0bcce009e4d91531a9aeecd64916"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/lib + mkdir -p $out/bin + cp -r lib/* $out/lib + cp -r bin/* $out/bin + ''; + + nativeBuildInputs = [ unzip gradle ]; + buildInputs = [ openjdk11 gradle ]; + + meta = { + description = "kotlin language server"; + longDescription = '' + About Kotlin code completion, linting and more for any editor/IDE + using the Language Server Protocol Topics''; + homepage = "https://github.com/fwcd/kotlin-language-server"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb92dc9a69b1..a52f1dae1517 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12385,6 +12385,8 @@ with pkgs; kotlin = callPackage ../development/compilers/kotlin { }; kotlin-native = callPackage ../development/compilers/kotlin/native.nix { }; + kotlin-language-server = callPackage ../development/tools/kotlin-language-server {}; + lazarus = callPackage ../development/compilers/fpc/lazarus.nix { fpc = fpc; }; From 9cb930ff687a6f5dc9d37477e50ad24aea38fd5f Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 18 Nov 2021 21:47:12 +0100 Subject: [PATCH 018/106] nixos/nginx: fix start when recommendedOptimisation is off Also done by other distros for example Fedora https://bodhi.fedoraproject.org/updates/FEDORA-2020-78690e2cdd --- nixos/modules/services/web-servers/nginx/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 5717b86b3bea..96e45cfc4f77 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -79,6 +79,11 @@ let # we use a list of mime types from the mailcap package, which is also # used by most other Linux distributions by default. include ${pkgs.mailcap}/etc/nginx/mime.types; + # When recommendedOptimisation is disabled nginx fails to start because the mailmap mime.types database + # contains 1026 enries and the default is only 1024. Setting to a higher number to remove the need to + # overwrite it because nginx does not allow duplicated settings. + types_hash_max_size 4096; + include ${cfg.package}/conf/fastcgi.conf; include ${cfg.package}/conf/uwsgi_params; @@ -113,7 +118,6 @@ let tcp_nopush on; tcp_nodelay on; keepalive_timeout 65; - types_hash_max_size 4096; ''} ssl_protocols ${cfg.sslProtocols}; From 046ac66948a7470bdc7bc1ac9317568718ecc266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 20 Nov 2021 00:48:42 +0100 Subject: [PATCH 019/106] keen4: convert away from builder.sh --- pkgs/games/keen4/builder.sh | 36 ------------------------------------ pkgs/games/keen4/default.nix | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 39 deletions(-) delete mode 100644 pkgs/games/keen4/builder.sh diff --git a/pkgs/games/keen4/builder.sh b/pkgs/games/keen4/builder.sh deleted file mode 100644 index f39edc789995..000000000000 --- a/pkgs/games/keen4/builder.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset - -# shellcheck source=/dev/null -source "${stdenv}/setup" - -mkdir -p "${out}/share/keen4" -unzip -j "$dist" -d "${out}/share/keen4" - -mkdir -p "${out}/bin" -cat > "${out}/bin/keen4" < $out/bin/keen4 < Date: Sat, 20 Nov 2021 13:05:37 -0500 Subject: [PATCH 020/106] lunar-client: 2.7.3 -> 2.8.8 --- pkgs/games/lunar-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index df361c69b049..7f30383cecf9 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -2,7 +2,7 @@ let name = "lunar-client"; - version = "2.7.3"; + version = "2.8.8"; desktopItem = makeDesktopItem { name = "Lunar Client"; @@ -21,7 +21,7 @@ let src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; name = "lunar-client.AppImage"; - sha256 = "0ihi937rrj677y9b377b4hhp9wsarbqwrdrd6k3lhzx3jyh2fynf"; + sha256 = "sha256-zPu0rc/Qi6+EyHXeXRJfkPHKK6Hr1JsENBvLt8a9WBM="; }; in appimageTools.wrapType1 rec { inherit name src; From 8765f1cae4e9cb75f4bbf3b437cf922cd8ffd79f Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 21 Nov 2021 16:32:20 +0100 Subject: [PATCH 021/106] gscan2pdf: 2.12.3 -> 2.12.4 --- pkgs/applications/graphics/gscan2pdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 4f76af0afb4f..e9c624d3c965 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.12.3"; + version = "2.12.4"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "tdXTcoI7DnrBsXtXR0r07hz0lDcAjZJad+o4wwxHcOk="; + sha256 = "sha256-UrBt0QkSk7IP4mZYFoxFNJQ1Qmcb53CemvlYfsxjZ/s="; }; nativeBuildInputs = [ wrapGAppsHook ]; From d793cbc4aa4192c19abee64718ac0b3785cda10f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 21 Nov 2021 16:26:29 +0000 Subject: [PATCH 022/106] nx-libs: fix build on upcoming binutils-2.36 Without the change build fails on binutils-2.36 as: ar: libdeps specified more than once failed command: ar clq libdix.a atom.o colormap.o cursor.o --- pkgs/tools/X11/nx-libs/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 022111e4b314..ed28cfbb8d87 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo +{ lib, stdenv, autoconf, automake, fetchFromGitHub, fetchpatch +, libgcc, libjpeg_turbo , libpng, libtool, libxml2, pkg-config, which, xorg , libtirpc }: @@ -12,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-qVOdD85sBMxKYx1cSLAGKeODsKKAm9UPBmYzPBbBOzQ="; }; + patches = [ + (fetchpatch { + name = "binutils-2.36.patch"; + url = "https://github.com/ArcticaProject/nx-libs/commit/605a266911b50ababbb3f8a8b224efb42743379c.patch"; + sha256 = "sha256-kk5ms3i0PrHL74I4OlsqDrdDcCJ0us03cQcBy4zjAoQ="; + }) + ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config which xorg.gccmakedep xorg.imake ]; buildInputs = [ libgcc libjpeg_turbo libpng libxml2 xorg.fontutil From 2470459e2eb5563806f780dbceb0b781159de64b Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Sun, 21 Nov 2021 14:14:54 -0600 Subject: [PATCH 023/106] indilib: 1.9.2 -> 1.9.3 --- .../libraries/science/astronomy/indilib/default.nix | 4 ++-- .../libraries/science/astronomy/indilib/indi-full.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 0ab4c8cd6ca6..2ac1ba9536f6 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-5MaN1aNyHpZzKwQPUpp9NYRh7i+lx1N70+J1gczdtAE="; + sha256 = "sha256-Ik62kbOetA2vSMpnwrSiNRNJqOgmqlCB2+KNhpBo9TA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index 5cdd4c4b2b26..a20c92dfaeba 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -1,12 +1,12 @@ { stdenv, lib, callPackage, fetchFromGitHub, indilib }: let - indi-version = "1.9.2"; + indi-version = "1.9.3"; indi-3rdparty-src = fetchFromGitHub { owner = "indilib"; repo = "indi-3rdparty"; rev = "v${indi-version}"; - sha256 = "sha256-dpuJ/J5gc+kAklbvMjsWic9jusXWB4gUcT8E/1eSLXQ="; + sha256 = "sha256-TBccdheBEO48uIXd6tya6dytkzxaHg2+YancBkcL3bw="; }; indi-firmware = callPackage ./indi-firmware.nix { version = indi-version; From 51839886b359e5350bd235983b475d490348b540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 22 Nov 2021 07:51:55 +0100 Subject: [PATCH 024/106] nvidia_x11: add production alias As described on https://www.nvidia.com/en-us/drivers/unix/ this refers to the production branch --- pkgs/os-specific/linux/nvidia-x11/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d88d18b85caf..98ab557cc113 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -26,6 +26,9 @@ rec { } else legacy_390; + # see https://www.nvidia.com/en-us/drivers/unix/ "Production branch" + production = legacy_470; + beta = generic { version = "495.29.05"; sha256_64bit = "sha256-9yVLl9QAxpJQR5ZJb059j2TpOx4xxCeGCk8hmhhvEl4="; From 0824be950d5991c9e46f7f1f4d155dd56114c085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 22 Nov 2021 20:30:12 -0300 Subject: [PATCH 025/106] python3Packages.ledgerwallet: use upstream patch Follow up to 5d56c78f373 (python3Packages.ledgerwallet: fix build, 2021-11-17), now with upstream patch. --- .../python-modules/ledgerwallet/default.nix | 11 +++++++---- .../ledgerwallet/remove-iterateints.patch | 19 ------------------- 2 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index 421a24e9ee12..cf2be98f922a 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , buildPythonPackage , cryptography , click @@ -26,10 +27,12 @@ buildPythonPackage rec { }; patches = [ - # Fix removed function in construct library - # https://github.com/LedgerHQ/ledgerctl/issues/17 - # https://github.com/construct/construct/commit/8915512f53552b1493afdbce5bbf8bb6f2aa4411 - ./remove-iterateints.patch + (fetchpatch { + # Fix removed function in construct library + url = "https://github.com/LedgerHQ/ledgerctl/commit/fd23d0e14721b93789071e80632e6bd9e47c1256.patch"; + sha256 = "sha256-YNlENguPQW5FNFT7mqED+ghF3TJiKao4H+56Eu+j+Eo="; + excludes = [ "setup.py" ]; + }) ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch b/pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch deleted file mode 100644 index c97785f1d04b..000000000000 --- a/pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/ledgerwallet/params.py 2021-11-17 20:31:10.488954050 -0300 -+++ b/ledgerwallet/params.py 2021-11-17 20:31:30.619477930 -0300 -@@ -19,7 +19,6 @@ - ) - from construct.core import ( - byte2int, -- iterateints, - singleton, - stream_read, - stream_write, -@@ -40,7 +39,7 @@ - num_bytes = byte & 0x80 - encoded_len = stream_read(stream, num_bytes) - num = 0 -- for len_byte in iterateints(encoded_len): -+ for len_byte in encoded_len: - num = num << 8 + len_byte - return num - From 5b2e2ba60c0b877f87bea336aeaa93aa482c9545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 22 Nov 2021 20:42:59 -0300 Subject: [PATCH 026/106] python3Packages.pyahocorasick: use upstream patch Follow up to 46c3452a16a (python3Packages.pyahocorasick: fix build on Hydra (x86_64-darwin), 2021-11-21), now with upstream patch. --- .../python-modules/pyahocorasick/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix index 7bb2f7c988a9..56e5636622b8 100644 --- a/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/pkgs/development/python-modules/pyahocorasick/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook }: @@ -15,10 +16,13 @@ buildPythonPackage rec { sha256 = "13x3718if28l50474xrz1b9709kvnvdg3nzm6y8bh7mc9a4zyss5"; }; - postPatch = '' - substituteInPlace unittests.py \ - --replace '(tmp, "test.dat")' "(\"$TMPDIR\", \"test.dat\")" - ''; + patches = [ + # Use proper temporary directory on Hydra + (fetchpatch { + url = "https://github.com/WojciechMula/pyahocorasick/commit/b6549e06f3cced7ffdf4d1b587cd7de12041f495.patch"; + sha256 = "sha256-v3J/0aIPOnBhLlJ18r/l7O0MckqLOCtcmqIS9ZegaSI="; + }) + ]; checkInputs = [ pytestCheckHook ]; From a00c0e093e14d7ecc1361cfe757e68f681a7174c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 22 Nov 2021 16:50:32 -0800 Subject: [PATCH 027/106] python3Packages.pikepdf: 4.0.1.post1 -> 4.0.2 --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 9f04e68a378f..e9a768019c7f 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "4.0.1.post1"; + version = "4.0.2"; disabled = ! isPy3k; src = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - sha256 = "sha256-s7eS7jYGohYt75/r++4v9K6BRfiQ3drdG5wbIL3WoiU="; + sha256 = "sha256-bUf9fef/YQsSj78kwoKl5a3zOjpeKWla9YY0azk0lIQ="; }; patches = [ From b8b08eb07ee6ed03d32f78b775171966cbd52122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 22 Nov 2021 19:41:57 -0800 Subject: [PATCH 028/106] python3Packages.total-connect-client: 2021.11.4 -> 2021.11.5 https://github.com/craigjmidwinter/total-connect-client/releases/tag/2021.11.5 --- .../python-modules/total-connect-client/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index bcf4910b0d44..cc1ddbf70123 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2021.11.4"; + version = "2021.11.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - sha256 = "sha256-iggxKefrVZP4ljf8jGRrCAq0/xQLsr54L42KkdjBqgI="; + sha256 = "sha256-6hyeU0jigQZsZtdb4E8/iD8YfQeNOKm6IK1CHBizZQs="; }; propagatedBuildInputs = [ @@ -28,15 +28,6 @@ buildPythonPackage rec { pytestCheckHook ]; - preCheck = '' - export PYTHONPATH="total_connect_client:$PYTHONPATH" - ''; - - disabledTests = [ - # Tests require network access - "tests_request" - ]; - pythonImportsCheck = [ "total_connect_client" ]; From 1e31ea1b44a1f54d79e5a6ced74a24dbb6503410 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 23 Nov 2021 22:30:19 +0000 Subject: [PATCH 029/106] bviplus: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: creadline.c:71:3: error: format not a string literal and no format arguments [-Werror=format-security] 71 | mvwprintw(w, y, x, prompt); | ^~~~~~~~~ --- pkgs/applications/editors/bviplus/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index e48a147e6daf..22d15d54f193 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses }: stdenv.mkDerivation rec { pname = "bviplus"; @@ -9,6 +9,18 @@ stdenv.mkDerivation rec { sha256 = "08q2fdyiirabbsp5qpn3v8jxp4gd85l776w6gqvrbjwqa29a8arg"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://sourceforge.net/p/bviplus/bugs/7/ + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://sourceforge.net/p/bviplus/bugs/7/attachment/bviplus-ncurses-6.2.patch"; + sha256 = "1g3s2fdly3qliy67f3dlb12a03a21zkjbya6gap4mqxhyyjbp46x"; + # svn patch, rely on prefix added by fetchpatch: + extraPrefix = ""; + }) + ]; + buildInputs = [ ncurses ]; From e63e7a33586309c70776739cb5973dadf6d2d388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 24 Nov 2021 13:27:22 -0800 Subject: [PATCH 030/106] python3Packages.bimmer-connected: 0.8.0 -> 0.8.2 --- .../python-modules/bimmer-connected/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index c91af48b9e9e..bc92fed9a6ae 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -4,13 +4,15 @@ , fetchFromGitHub , pbr , requests +, pycryptodome +, pyjwt , pytestCheckHook , requests-mock }: buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.8.0"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +21,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = version; - sha256 = "sha256-sox24UpuIK5SP0IWVxa/NiyR5IrTzXe0SVTCd4FB6mo="; + hash = "sha256-/AkQ7hEjzgL4/ruXqTdchh+N8PY5q3ILNKKo43EOGg4="; }; nativeBuildInputs = [ @@ -30,6 +32,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests + pycryptodome + pyjwt ]; checkInputs = [ From 79e5ac3df42fb197535b0814399e9dd4516bfdfa Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 25 Nov 2021 21:43:54 +0100 Subject: [PATCH 031/106] scribusUnstable: clarify license --- pkgs/applications/office/scribus/unstable.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 549865cd8d85..701ecab1f97b 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -77,10 +77,11 @@ mkDerivation rec { platforms = platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; homepage = "https://www.scribus.net"; - # There are a lot of licenses... https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 + # There are a lot of licenses... + # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 license = with licenses; [ bsd3 - gpl2 + gpl2Plus mit publicDomain ]; From 283e178e6c3667c5b8527a5bb603d8b6ae2e384e Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 25 Nov 2021 22:15:29 +0100 Subject: [PATCH 032/106] scribusUnstable: patch for harfbuzz 3.0 --- pkgs/applications/office/scribus/unstable.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 701ecab1f97b..6aed41d7f9af 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -3,6 +3,7 @@ , cmake , cups , fetchurl +, fetchpatch , fontconfig , freetype , harfbuzzFull @@ -42,6 +43,19 @@ mkDerivation rec { sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4="; }; + patches = [ + # For harfbuzz >= 2.9.0 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch"; + sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4="; + }) + # For harfbuzz >= 3.0 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch"; + sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From 28237545a5553bf4bfe1bb2702867cc5288c53d8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 25 Nov 2021 18:55:23 +0000 Subject: [PATCH 033/106] =?UTF-8?q?sharedown:=202.0.0=20=E2=86=92=203.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/kylon/Sharedown/releases/tag/3.0.0 https://github.com/kylon/Sharedown/releases/tag/3.0.1 Also fix the update script (the source needs to be updated before we can re-generate the lockfile.) --- pkgs/tools/misc/sharedown/default.nix | 4 +- pkgs/tools/misc/sharedown/update.sh | 4 +- pkgs/tools/misc/sharedown/yarn.lock | 504 ++++++++++++++----------- pkgs/tools/misc/sharedown/yarndeps.nix | 472 +++++++++++++---------- 4 files changed, 552 insertions(+), 432 deletions(-) diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 0dd4c230566c..2fb9553a7fea 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "2.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "kylon"; repo = pname; rev = version; - sha256 = "sha256-Z6OsZvVzk//qEkl4ciNz4cQRqC2GFg0qYgmliAyz6fo="; + sha256 = "sha256-0moxrRxydH/g3J5cQmaFSDhTZh9OnUi8ncPVw7q1JC0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/sharedown/update.sh b/pkgs/tools/misc/sharedown/update.sh index 5ba572f23698..584cb8511a7c 100755 --- a/pkgs/tools/misc/sharedown/update.sh +++ b/pkgs/tools/misc/sharedown/update.sh @@ -3,12 +3,12 @@ set -euo pipefail +nix-update sharedown + dirname="$(realpath "$(dirname "$0")")" sourceDir="$(nix-build -A sharedown.src --no-out-link)" tempDir="$(mktemp -d)" -nix-update sharedown - cp -r "$sourceDir"/* "$tempDir" cd "$tempDir" PUPPETEER_SKIP_DOWNLOAD=1 yarn install diff --git a/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/tools/misc/sharedown/yarn.lock index 48f5917ec278..5b5638db5055 100644 --- a/pkgs/tools/misc/sharedown/yarn.lock +++ b/pkgs/tools/misc/sharedown/yarn.lock @@ -16,9 +16,9 @@ ajv-keywords "^3.4.1" "@electron/get@^1.13.0": - version "1.13.0" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz#95c6bcaff4f9a505ea46792424f451efea89228c" - integrity sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ== + version "1.13.1" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368" + integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA== dependencies: debug "^4.1.1" env-paths "^2.2.0" @@ -28,7 +28,7 @@ semver "^6.2.0" sumchecker "^3.0.1" optionalDependencies: - global-agent "^2.0.2" + global-agent "^3.0.0" global-tunnel-ng "^2.7.1" "@electron/universal@1.0.5": @@ -71,12 +71,12 @@ dependencies: defer-to-connect "^1.0.1" -"@tedconf/fessonia@*": +"@tedconf/fessonia@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@tedconf/fessonia/-/fessonia-2.2.1.tgz#24499e69c3aeda4926670675b9fdfeb9ab15f19d" integrity sha512-eX+O8P/xIkuCDeDI3IOIoyzuTJLVqbGnoBhLiBoFU7MwntF02ygQcByMinhUtXv2zm0pOSy6zeKoQTKAVBK60A== -"@types/debug@^4.1.5": +"@types/debug@^4.1.6": version "4.1.7" resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== @@ -91,9 +91,9 @@ "@types/node" "*" "@types/glob@^7.1.1": - version "7.1.4" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672" - integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA== + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" + integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== dependencies: "@types/minimatch" "*" "@types/node" "*" @@ -109,14 +109,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "16.9.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.6.tgz#040a64d7faf9e5d9e940357125f0963012e66f04" - integrity sha512-YHUZhBOMTM3mjFkXVcK+WwAcYmyhe1wL4lfqNtzI0b3qAy7yuSetnM7QJazgE5PFmgVTNGiLOgRFfJMqW7XpSQ== + version "16.11.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz#2e3ad0a680d96367103d3e670d41c2fed3da61ae" + integrity sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA== "@types/node@^14.6.2": - version "14.17.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.18.tgz#0198489a751005f71217744aa966cd1f29447c81" - integrity sha512-haYyibw4pbteEhkSg0xdDLAI3679L75EJ799ymVrPxOA922bPx3ML59SoDsQ//rHlvqpu+e36kcbR3XRQtFblA== + version "14.17.34" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.34.tgz#fe4b38b3f07617c0fa31ae923fca9249641038f0" + integrity sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg== "@types/plist@^3.0.1": version "3.0.2" @@ -136,10 +136,10 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== -"@types/yargs@^16.0.2": - version "16.0.4" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977" - integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw== +"@types/yargs@^17.0.1": + version "17.0.7" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.7.tgz#44a484c634761da4391477515a98772b82b5060f" + integrity sha512-OvLKmpKdea1aWtqHv9bxVVcMoT6syAeK+198dfETIFkAevYRGwqh4H+KFxfjUETZuUuE5sQCAFwdOdoHUdo8eg== dependencies: "@types/yargs-parser" "*" @@ -173,23 +173,18 @@ ajv@^6.10.0, ajv@^6.12.0: uri-js "^4.2.2" ansi-align@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" - integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== dependencies: - string-width "^3.0.0" + string-width "^4.1.0" ansi-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - -ansi-regex@^5.0.0: +ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== @@ -208,15 +203,15 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -app-builder-bin@3.5.13: - version "3.5.13" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz#6dd7f4de34a4e408806f99b8c7d6ef1601305b7e" - integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg== +app-builder-bin@3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz#cb0825c5e12efc85b196ac3ed9c89f076c61040e" + integrity sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw== -app-builder-lib@22.11.7: - version "22.11.7" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz#c0ad1119ebfbf4189a8280ad693625f5e684dca6" - integrity sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ== +app-builder-lib@22.14.5: + version "22.14.5" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.5.tgz#a61a50b132b858e98fdc70b6b88994ae99b4f96d" + integrity sha512-k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -224,12 +219,14 @@ app-builder-lib@22.11.7: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.11.7" - builder-util-runtime "8.7.7" + builder-util "22.14.5" + builder-util-runtime "8.9.1" chromium-pickle-js "^0.2.0" debug "^4.3.2" ejs "^3.1.6" - electron-publish "22.11.7" + electron-osx-sign "^0.5.0" + electron-publish "22.14.5" + form-data "^4.0.0" fs-extra "^10.0.0" hosted-git-info "^4.0.2" is-ci "^3.0.0" @@ -279,17 +276,22 @@ async@0.9.x: resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + at-least-node@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -axios@*: - version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== +axios@^0.24.0: + version "0.24.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" + integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA== dependencies: - follow-redirects "^1.14.0" + follow-redirects "^1.14.4" balanced-match@^1.0.0: version "1.0.2" @@ -317,7 +319,7 @@ bluebird-lst@^1.0.9: dependencies: bluebird "^3.5.5" -bluebird@^3.5.5: +bluebird@^3.5.0, bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -327,10 +329,10 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz#f51a2fb5838a99e06f9b6ec1edb674de67026435" integrity sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w== -bootstrap@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.1.tgz#9d6eed81e08feaccedf3adaca51fe4b73a2871df" - integrity sha512-/jUa4sSuDZWlDLQ1gwQQR8uoYSvLJzDd8m5o6bPKh3asLAMYVZKdRCjb1joUd5WXf0WwCNzd2EjwQQhupou0dA== +bootstrap@5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34" + integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q== boxen@^5.0.0: version "5.1.2" @@ -354,6 +356,19 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" @@ -364,6 +379,11 @@ buffer-equal@1.0.0: resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= + buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" @@ -377,34 +397,27 @@ buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@8.7.6: - version "8.7.6" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz#4b43c96db2bd494ced7694bcd7674934655e8324" - integrity sha512-rj9AIY7CzLSuTOXpToiaQkruYh6UEQ+kYnd5UET22ch8MGClEtIZKXHG14qEiXEr2x4EOKDMxkcTa+9TYaE+ug== +builder-util-runtime@8.9.1: + version "8.9.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz#25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a" + integrity sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg== dependencies: debug "^4.3.2" sax "^1.2.4" -builder-util-runtime@8.7.7: - version "8.7.7" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz#6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d" - integrity sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow== - dependencies: - debug "^4.3.2" - sax "^1.2.4" - -builder-util@22.11.7: - version "22.11.7" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz#ae9707afa6a31feafa13c274ac83b4fe28ef1467" - integrity sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA== +builder-util@22.14.5: + version "22.14.5" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.5.tgz#42a18608d2a566c0846e91266464776c8bfb0cc9" + integrity sha512-zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA== dependencies: "7zip-bin" "~5.1.1" - "@types/debug" "^4.1.5" + "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" - app-builder-bin "3.5.13" + app-builder-bin "3.7.1" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.7" + builder-util-runtime "8.9.1" chalk "^4.1.1" + cross-spawn "^7.0.3" debug "^4.3.2" fs-extra "^10.0.0" is-ci "^3.0.0" @@ -427,9 +440,9 @@ cacheable-request@^6.0.0: responselike "^1.0.2" camelcase@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" - integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + version "6.2.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" + integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== chalk@^2.4.2: version "2.4.2" @@ -468,10 +481,10 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -ci-info@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6" - integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A== +ci-info@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" + integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== cli-boxes@^2.2.1: version "2.2.1" @@ -486,7 +499,7 @@ cli-truncate@^1.1.0: slice-ansi "^1.0.0" string-width "^2.0.0" -clipboardy@^2.3.0: +clipboardy@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290" integrity sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ== @@ -540,6 +553,13 @@ colors@1.0.3: resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + commander@2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" @@ -552,6 +572,11 @@ commander@^5.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== +compare-version@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" + integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA= + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -587,11 +612,6 @@ configstore@^5.0.1: write-file-atomic "^3.0.0" xdg-basedir "^4.0.0" -core-js@^3.6.5: - version "3.18.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.18.0.tgz#9af3f4a6df9ba3428a3fb1b171f1503b3f40cc49" - integrity sha512-WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w== - core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -620,7 +640,7 @@ cross-spawn@^6.0.0: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.1: +cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -639,21 +659,14 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: +debug@4, debug@4.3.2, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== dependencies: ms "2.1.2" -debug@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -debug@^2.6.9: +debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -684,6 +697,11 @@ define-properties@^1.1.3: dependencies: object-keys "^1.0.12" +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + detect-node@^2.0.4: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" @@ -704,14 +722,14 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@22.11.7: - version "22.11.7" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz#5956008c18d40ee72c0ea01ffea9590dbf51df89" - integrity sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ== +dmg-builder@22.14.5: + version "22.14.5" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.5.tgz#137c0b55e639badcc0b119eb060e6fa4ed61d948" + integrity sha512-1GvFGQE332bvPamcMwZDqWqfWfJTyyDLOsHMcGi0zs+Jh7JOn6/zuBkHJIWHdsj2QJbhzLVyd2/ZqttOKv7I8w== dependencies: - app-builder-lib "22.11.7" - builder-util "22.11.7" - builder-util-runtime "8.7.6" + app-builder-lib "22.14.5" + builder-util "22.14.5" + builder-util-runtime "8.9.1" fs-extra "^10.0.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -762,17 +780,17 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@^22.11.7: - version "22.11.7" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz#cd97a0d9f6e6d388112e66b4376de431cca4d596" - integrity sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw== +electron-builder@^22.13.1: + version "22.14.5" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz#3a25547bd4fe3728d4704da80956a794c5c31496" + integrity sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg== dependencies: - "@types/yargs" "^16.0.2" - app-builder-lib "22.11.7" - builder-util "22.11.7" - builder-util-runtime "8.7.7" + "@types/yargs" "^17.0.1" + app-builder-lib "22.14.5" + builder-util "22.14.5" + builder-util-runtime "8.9.1" chalk "^4.1.1" - dmg-builder "22.11.7" + dmg-builder "22.14.5" fs-extra "^10.0.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -780,33 +798,40 @@ electron-builder@^22.11.7: update-notifier "^5.1.0" yargs "^17.0.1" -electron-publish@22.11.7: - version "22.11.7" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz#4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a" - integrity sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw== +electron-osx-sign@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz#fc258c5e896859904bbe3d01da06902c04b51c3a" + integrity sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ== + dependencies: + bluebird "^3.5.0" + compare-version "^0.1.2" + debug "^2.6.8" + isbinaryfile "^3.0.2" + minimist "^1.2.0" + plist "^3.0.1" + +electron-publish@22.14.5: + version "22.14.5" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.5.tgz#34bcdce671f0e651330db20040d6919c77c94bd6" + integrity sha512-h+NANRdaA0PqGF15GKvorseWPzh1PXa/zx4I37//PIokW8eKIov8ky23foUSb55ZFWUHGpxQJux7y2NCfBtQeg== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "22.11.7" - builder-util-runtime "8.7.7" + builder-util "22.14.5" + builder-util-runtime "8.9.1" chalk "^4.1.1" fs-extra "^10.0.0" lazy-val "^1.0.5" mime "^2.5.2" -electron@*: - version "15.0.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-15.0.0.tgz#b1b6244b1cffddf348c27c54b1310b3a3680246e" - integrity sha512-LlBjN5nCJoC7EDrgfDQwEGSGSAo/o08nSP5uJxN2m+ZtNA69SxpnWv4yPgo1K08X/iQPoGhoZu6C8LYYlk1Dtg== +electron@^15.3.1: + version "15.3.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz#4f0cbad781d14e0194f5dfef1709e09a70c8074a" + integrity sha512-sEpOX10gjAyvq33HDxJrq2HhYZT3qndZjUrHkzG16QTLjykP7lMvGnJ/bt6wn+T75f4wwv59FUbQx2hW3Xz5TQ== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" extract-zip "^1.0.3" -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -889,9 +914,9 @@ extract-zip@^1.0.3: yauzl "^2.10.0" extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + version "1.4.1" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== fast-deep-equal@^3.1.1: version "3.1.3" @@ -925,16 +950,25 @@ find-up@^4.0.0: locate-path "^5.0.0" path-exists "^4.0.0" -follow-redirects@^1.14.0: - version "1.14.4" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379" - integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g== +follow-redirects@^1.14.4: + version "1.14.5" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" + integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA== -font-awesome@*: +font-awesome@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM= +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" @@ -993,9 +1027,9 @@ get-stream@^5.1.0: pump "^3.0.0" glob@^7.1.3, glob@^7.1.6: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -1004,13 +1038,12 @@ glob@^7.1.3, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -global-agent@^2.0.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz#566331b0646e6bf79429a16877685c4a1fbf76dc" - integrity sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg== +global-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" + integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== dependencies: boolean "^3.0.1" - core-js "^3.6.5" es6-error "^4.1.1" matcher "^3.0.0" roarr "^2.15.3" @@ -1169,11 +1202,11 @@ is-ci@^2.0.0: ci-info "^2.0.0" is-ci@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz#c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994" - integrity sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ== + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" + integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== dependencies: - ci-info "^3.1.1" + ci-info "^3.2.0" is-docker@^2.0.0: version "2.2.1" @@ -1240,6 +1273,13 @@ isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isbinaryfile@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" + integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== + dependencies: + buffer-alloc "^1.2.0" + isbinaryfile@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" @@ -1250,7 +1290,7 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -iso8601-duration@*: +iso8601-duration@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/iso8601-duration/-/iso8601-duration-1.3.0.tgz#29d7b69e0574e4acdee50c5e5e09adab4137ba5a" integrity sha512-K4CiUBzo3YeWk76FuET/dQPH03WE04R94feo5TSKQCXpoXQt9E4yx2CnY737QZnSAI3PI4WlKo/zfqizGx52QQ== @@ -1372,7 +1412,7 @@ matcher@^3.0.0: dependencies: escape-string-regexp "^4.0.0" -md5@*: +md5@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f" integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g== @@ -1381,10 +1421,22 @@ md5@*: crypt "0.0.2" is-buffer "~1.1.6" +mime-db@1.51.0: + version "1.51.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== + +mime-types@^2.1.12: + version "2.1.34" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== + dependencies: + mime-db "1.51.0" + mime@^2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" - integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== + version "2.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" @@ -1403,7 +1455,12 @@ minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp@^0.5.1, mkdirp@^0.5.4: +mkdirp-classic@^0.5.2: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + +mkdirp@^0.5.4: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -1430,10 +1487,12 @@ node-addon-api@^1.6.3: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== -node-fetch@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== +node-fetch@2.6.5: + version "2.6.5" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" + integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== + dependencies: + whatwg-url "^5.0.0" normalize-url@^4.1.0: version "4.5.1" @@ -1561,12 +1620,7 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -progress@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31" - integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg== - -progress@^2.0.3: +progress@2.0.3, progress@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== @@ -1601,23 +1655,23 @@ pupa@^2.1.1: dependencies: escape-goat "^2.0.0" -puppeteer@10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.2.0.tgz#7d8d7fda91e19a7cfd56986e0275448e6351849e" - integrity sha512-OR2CCHRashF+f30+LBOtAjK6sNtz2HEyTr5FqAvhf8lR/qB3uBRoIZOwQKgwoyZnMBsxX7ZdazlyBgGjpnkiMw== +puppeteer@11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-11.0.0.tgz#0808719c38e15315ecc1b1c28911f1c9054d201f" + integrity sha512-6rPFqN1ABjn4shgOICGDBITTRV09EjXVqhDERBDKwCLz0UyBxeeBH6Ay0vQUJ84VACmlxwzOIzVEJXThcF3aNg== dependencies: - debug "4.3.1" + debug "4.3.2" devtools-protocol "0.0.901419" extract-zip "2.0.1" https-proxy-agent "5.0.0" - node-fetch "2.6.1" + node-fetch "2.6.5" pkg-dir "4.2.0" - progress "2.0.1" + progress "2.0.3" proxy-from-env "1.1.0" rimraf "3.0.2" - tar-fs "2.0.0" - unbzip2-stream "1.3.3" - ws "7.4.6" + tar-fs "2.1.1" + unbzip2-stream "1.4.3" + ws "8.2.3" rc@^1.2.8: version "1.2.8" @@ -1795,9 +1849,9 @@ shebang-regex@^3.0.0: integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.4" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.4.tgz#366a4684d175b9cab2081e3681fda3747b6c51d7" - integrity sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q== + version "3.0.6" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== slice-ansi@^1.0.0: version "1.0.0" @@ -1812,9 +1866,9 @@ smart-buffer@^4.0.2: integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== source-map-support@^0.5.19: - version "0.5.20" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" - integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -1842,23 +1896,14 @@ string-width@^2.0.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" string_decoder@^1.1.1: version "1.3.0" @@ -1881,19 +1926,12 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: - ansi-regex "^4.1.0" - -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" + ansi-regex "^5.0.1" strip-eof@^1.0.0: version "1.0.0" @@ -1926,17 +1964,17 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -tar-fs@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad" - integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA== +tar-fs@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== dependencies: chownr "^1.1.1" - mkdirp "^0.5.1" + mkdirp-classic "^0.5.2" pump "^3.0.0" - tar-stream "^2.0.0" + tar-stream "^2.1.4" -tar-stream@^2.0.0: +tar-stream@^2.1.4: version "2.2.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== @@ -1961,9 +1999,9 @@ through@^2.3.8: integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= tmp-promise@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.2.tgz#6e933782abff8b00c3119d63589ca1fb9caaa62a" - integrity sha512-OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA== + version "3.0.3" + resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" + integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== dependencies: tmp "^0.2.0" @@ -1979,6 +2017,11 @@ to-readable-stream@^1.0.0: resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + truncate-utf8-bytes@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" @@ -2013,10 +2056,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -unbzip2-stream@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a" - integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg== +unbzip2-stream@1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" + integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== dependencies: buffer "^5.2.1" through "^2.3.8" @@ -2083,14 +2126,27 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1: integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= verror@^1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + version "1.10.1" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" + integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg== dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" extsprintf "^1.2.0" +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -2136,10 +2192,10 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -ws@7.4.6: - version "7.4.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" - integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== +ws@8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" + integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== xdg-basedir@^4.0.0: version "4.0.0" @@ -2172,9 +2228,9 @@ yargs-parser@^20.2.2: integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== yargs@^17.0.1: - version "17.1.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz#c2a8091564bdb196f7c0a67c1d12e5b85b8067ba" - integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ== + version "17.2.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea" + integrity sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q== dependencies: cliui "^7.0.2" escalade "^3.1.1" diff --git a/pkgs/tools/misc/sharedown/yarndeps.nix b/pkgs/tools/misc/sharedown/yarndeps.nix index a980ad628f28..046a6c71bad2 100644 --- a/pkgs/tools/misc/sharedown/yarndeps.nix +++ b/pkgs/tools/misc/sharedown/yarndeps.nix @@ -18,11 +18,11 @@ }; } { - name = "_electron_get___get_1.13.0.tgz"; + name = "_electron_get___get_1.13.1.tgz"; path = fetchurl { - name = "_electron_get___get_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz"; - sha1 = "95c6bcaff4f9a505ea46792424f451efea89228c"; + name = "_electron_get___get_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz"; + sha1 = "42a0aa62fd1189638bd966e23effaebb16108368"; }; } { @@ -90,11 +90,11 @@ }; } { - name = "_types_glob___glob_7.1.4.tgz"; + name = "_types_glob___glob_7.2.0.tgz"; path = fetchurl { - name = "_types_glob___glob_7.1.4.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz"; - sha1 = "ea59e21d2ee5c517914cb4bc8e4153b99e566672"; + name = "_types_glob___glob_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz"; + sha1 = "bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"; }; } { @@ -114,19 +114,19 @@ }; } { - name = "_types_node___node_16.9.6.tgz"; + name = "_types_node___node_16.11.10.tgz"; path = fetchurl { - name = "_types_node___node_16.9.6.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.9.6.tgz"; - sha1 = "040a64d7faf9e5d9e940357125f0963012e66f04"; + name = "_types_node___node_16.11.10.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz"; + sha1 = "2e3ad0a680d96367103d3e670d41c2fed3da61ae"; }; } { - name = "_types_node___node_14.17.18.tgz"; + name = "_types_node___node_14.17.34.tgz"; path = fetchurl { - name = "_types_node___node_14.17.18.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.18.tgz"; - sha1 = "0198489a751005f71217744aa966cd1f29447c81"; + name = "_types_node___node_14.17.34.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.34.tgz"; + sha1 = "fe4b38b3f07617c0fa31ae923fca9249641038f0"; }; } { @@ -154,11 +154,11 @@ }; } { - name = "_types_yargs___yargs_16.0.4.tgz"; + name = "_types_yargs___yargs_17.0.7.tgz"; path = fetchurl { - name = "_types_yargs___yargs_16.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz"; - sha1 = "26aad98dd2c2a38e421086ea9ad42b9e51642977"; + name = "_types_yargs___yargs_17.0.7.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.7.tgz"; + sha1 = "44a484c634761da4391477515a98772b82b5060f"; }; } { @@ -194,11 +194,11 @@ }; } { - name = "ansi_align___ansi_align_3.0.0.tgz"; + name = "ansi_align___ansi_align_3.0.1.tgz"; path = fetchurl { - name = "ansi_align___ansi_align_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz"; - sha1 = "b536b371cf687caaef236c18d3e21fe3797467cb"; + name = "ansi_align___ansi_align_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; + sha1 = "0cdf12e111ace773a86e9a1fad1225c43cb19a59"; }; } { @@ -209,14 +209,6 @@ sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; } - { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; - }; - } { name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { @@ -242,19 +234,19 @@ }; } { - name = "app_builder_bin___app_builder_bin_3.5.13.tgz"; + name = "app_builder_bin___app_builder_bin_3.7.1.tgz"; path = fetchurl { - name = "app_builder_bin___app_builder_bin_3.5.13.tgz"; - url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz"; - sha1 = "6dd7f4de34a4e408806f99b8c7d6ef1601305b7e"; + name = "app_builder_bin___app_builder_bin_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz"; + sha1 = "cb0825c5e12efc85b196ac3ed9c89f076c61040e"; }; } { - name = "app_builder_lib___app_builder_lib_22.11.7.tgz"; + name = "app_builder_lib___app_builder_lib_22.14.5.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.11.7.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz"; - sha1 = "c0ad1119ebfbf4189a8280ad693625f5e684dca6"; + name = "app_builder_lib___app_builder_lib_22.14.5.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.5.tgz"; + sha1 = "a61a50b132b858e98fdc70b6b88994ae99b4f96d"; }; } { @@ -305,6 +297,14 @@ sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; }; } + { + name = "asynckit___asynckit_0.4.0.tgz"; + path = fetchurl { + name = "asynckit___asynckit_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } { name = "at_least_node___at_least_node_1.0.0.tgz"; path = fetchurl { @@ -314,11 +314,11 @@ }; } { - name = "axios___axios_0.21.4.tgz"; + name = "axios___axios_0.24.0.tgz"; path = fetchurl { - name = "axios___axios_0.21.4.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz"; - sha1 = "c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"; + name = "axios___axios_0.24.0.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz"; + sha1 = "804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"; }; } { @@ -370,11 +370,11 @@ }; } { - name = "bootstrap___bootstrap_5.1.1.tgz"; + name = "bootstrap___bootstrap_5.1.3.tgz"; path = fetchurl { - name = "bootstrap___bootstrap_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.1.tgz"; - sha1 = "9d6eed81e08feaccedf3adaca51fe4b73a2871df"; + name = "bootstrap___bootstrap_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz"; + sha1 = "ba081b0c130f810fa70900acbc1c6d3c28fa8f34"; }; } { @@ -393,6 +393,22 @@ sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; }; } + { + name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; + path = fetchurl { + name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; + sha1 = "bd7dc26ae2972d0eda253be061dba992349c19f0"; + }; + } + { + name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; + path = fetchurl { + name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; + sha1 = "890dd90d923a873e08e10e5fd51a57e5b7cce0ec"; + }; + } { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; path = fetchurl { @@ -409,6 +425,14 @@ sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; }; } + { + name = "buffer_fill___buffer_fill_1.0.0.tgz"; + path = fetchurl { + name = "buffer_fill___buffer_fill_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; + sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c"; + }; + } { name = "buffer_from___buffer_from_1.1.2.tgz"; path = fetchurl { @@ -426,27 +450,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_8.7.6.tgz"; + name = "builder_util_runtime___builder_util_runtime_8.9.1.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_8.7.6.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz"; - sha1 = "4b43c96db2bd494ced7694bcd7674934655e8324"; + name = "builder_util_runtime___builder_util_runtime_8.9.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz"; + sha1 = "25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a"; }; } { - name = "builder_util_runtime___builder_util_runtime_8.7.7.tgz"; + name = "builder_util___builder_util_22.14.5.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_8.7.7.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz"; - sha1 = "6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d"; - }; - } - { - name = "builder_util___builder_util_22.11.7.tgz"; - path = fetchurl { - name = "builder_util___builder_util_22.11.7.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz"; - sha1 = "ae9707afa6a31feafa13c274ac83b4fe28ef1467"; + name = "builder_util___builder_util_22.14.5.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.5.tgz"; + sha1 = "42a18608d2a566c0846e91266464776c8bfb0cc9"; }; } { @@ -458,11 +474,11 @@ }; } { - name = "camelcase___camelcase_6.2.0.tgz"; + name = "camelcase___camelcase_6.2.1.tgz"; path = fetchurl { - name = "camelcase___camelcase_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; - sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; + name = "camelcase___camelcase_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz"; + sha1 = "250fd350cfd555d0d2160b1d51510eaf8326e86e"; }; } { @@ -514,11 +530,11 @@ }; } { - name = "ci_info___ci_info_3.2.0.tgz"; + name = "ci_info___ci_info_3.3.0.tgz"; path = fetchurl { - name = "ci_info___ci_info_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz"; - sha1 = "2876cb948a498797b5236f0095bc057d0dca38b6"; + name = "ci_info___ci_info_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz"; + sha1 = "b4ed1fb6818dea4803a55c623041f9165d2066b2"; }; } { @@ -601,6 +617,14 @@ sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } { name = "commander___commander_2.9.0.tgz"; path = fetchurl { @@ -617,6 +641,14 @@ sha1 = "46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"; }; } + { + name = "compare_version___compare_version_0.1.2.tgz"; + path = fetchurl { + name = "compare_version___compare_version_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz"; + sha1 = "0162ec2d9351f5ddd59a9202cba935366a725080"; + }; + } { name = "concat_map___concat_map_0.0.1.tgz"; path = fetchurl { @@ -649,14 +681,6 @@ sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"; }; } - { - name = "core_js___core_js_3.18.0.tgz"; - path = fetchurl { - name = "core_js___core_js_3.18.0.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.18.0.tgz"; - sha1 = "9af3f4a6df9ba3428a3fb1b171f1503b3f40cc49"; - }; - } { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { @@ -721,14 +745,6 @@ sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; }; } - { - name = "debug___debug_4.3.1.tgz"; - path = fetchurl { - name = "debug___debug_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; - sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; - }; - } { name = "debug___debug_2.6.9.tgz"; path = fetchurl { @@ -769,6 +785,14 @@ sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; }; } + { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + path = fetchurl { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } { name = "detect_node___detect_node_2.1.0.tgz"; path = fetchurl { @@ -794,11 +818,11 @@ }; } { - name = "dmg_builder___dmg_builder_22.11.7.tgz"; + name = "dmg_builder___dmg_builder_22.14.5.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.11.7.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz"; - sha1 = "5956008c18d40ee72c0ea01ffea9590dbf51df89"; + name = "dmg_builder___dmg_builder_22.14.5.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.5.tgz"; + sha1 = "137c0b55e639badcc0b119eb060e6fa4ed61d948"; }; } { @@ -850,35 +874,35 @@ }; } { - name = "electron_builder___electron_builder_22.11.7.tgz"; + name = "electron_builder___electron_builder_22.14.5.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.11.7.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz"; - sha1 = "cd97a0d9f6e6d388112e66b4376de431cca4d596"; + name = "electron_builder___electron_builder_22.14.5.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz"; + sha1 = "3a25547bd4fe3728d4704da80956a794c5c31496"; }; } { - name = "electron_publish___electron_publish_22.11.7.tgz"; + name = "electron_osx_sign___electron_osx_sign_0.5.0.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.11.7.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz"; - sha1 = "4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a"; + name = "electron_osx_sign___electron_osx_sign_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz"; + sha1 = "fc258c5e896859904bbe3d01da06902c04b51c3a"; }; } { - name = "electron___electron_15.0.0.tgz"; + name = "electron_publish___electron_publish_22.14.5.tgz"; path = fetchurl { - name = "electron___electron_15.0.0.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-15.0.0.tgz"; - sha1 = "b1b6244b1cffddf348c27c54b1310b3a3680246e"; + name = "electron_publish___electron_publish_22.14.5.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.5.tgz"; + sha1 = "34bcdce671f0e651330db20040d6919c77c94bd6"; }; } { - name = "emoji_regex___emoji_regex_7.0.3.tgz"; + name = "electron___electron_15.3.2.tgz"; path = fetchurl { - name = "emoji_regex___emoji_regex_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + name = "electron___electron_15.3.2.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz"; + sha1 = "4f0cbad781d14e0194f5dfef1709e09a70c8074a"; }; } { @@ -978,11 +1002,11 @@ }; } { - name = "extsprintf___extsprintf_1.4.0.tgz"; + name = "extsprintf___extsprintf_1.4.1.tgz"; path = fetchurl { - name = "extsprintf___extsprintf_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; - sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + name = "extsprintf___extsprintf_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz"; + sha1 = "8d172c064867f235c0c84a596806d279bf4bcc07"; }; } { @@ -1026,11 +1050,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.14.4.tgz"; + name = "follow_redirects___follow_redirects_1.14.5.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.4.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz"; - sha1 = "838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"; + name = "follow_redirects___follow_redirects_1.14.5.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz"; + sha1 = "f09a5848981d3c772b5392309778523f8d85c381"; }; } { @@ -1041,6 +1065,14 @@ sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133"; }; } + { + name = "form_data___form_data_4.0.0.tgz"; + path = fetchurl { + name = "form_data___form_data_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz"; + sha1 = "93919daeaf361ee529584b9b31664dc12c9fa452"; + }; + } { name = "fs_constants___fs_constants_1.0.0.tgz"; path = fetchurl { @@ -1106,19 +1138,19 @@ }; } { - name = "glob___glob_7.1.7.tgz"; + name = "glob___glob_7.2.0.tgz"; path = fetchurl { - name = "glob___glob_7.1.7.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; - sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + name = "glob___glob_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; + sha1 = "d15535af7732e02e948f4c41628bd910293f6023"; }; } { - name = "global_agent___global_agent_2.2.0.tgz"; + name = "global_agent___global_agent_3.0.0.tgz"; path = fetchurl { - name = "global_agent___global_agent_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz"; - sha1 = "566331b0646e6bf79429a16877685c4a1fbf76dc"; + name = "global_agent___global_agent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz"; + sha1 = "ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"; }; } { @@ -1306,11 +1338,11 @@ }; } { - name = "is_ci___is_ci_3.0.0.tgz"; + name = "is_ci___is_ci_3.0.1.tgz"; path = fetchurl { - name = "is_ci___is_ci_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz"; - sha1 = "c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994"; + name = "is_ci___is_ci_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz"; + sha1 = "db6ecbed1bd659c43dac0f45661e7674103d1867"; }; } { @@ -1409,6 +1441,14 @@ sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; } + { + name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; + sha1 = "5d6def3edebf6e8ca8cae9c30183a804b5f8be80"; + }; + } { name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; path = fetchurl { @@ -1586,11 +1626,27 @@ }; } { - name = "mime___mime_2.5.2.tgz"; + name = "mime_db___mime_db_1.51.0.tgz"; path = fetchurl { - name = "mime___mime_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; - sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; + name = "mime_db___mime_db_1.51.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; + sha1 = "d9ff62451859b18342d960850dc3cfb77e63fb0c"; + }; + } + { + name = "mime_types___mime_types_2.1.34.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.34.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz"; + sha1 = "5a712f9ec1503511a945803640fafe09d3793c24"; + }; + } + { + name = "mime___mime_2.6.0.tgz"; + path = fetchurl { + name = "mime___mime_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz"; + sha1 = "a2a682a95cd4d0cb1d6257e28f83da7e35800367"; }; } { @@ -1617,6 +1673,14 @@ sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } + { + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; + path = fetchurl { + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; + }; + } { name = "mkdirp___mkdirp_0.5.5.tgz"; path = fetchurl { @@ -1658,11 +1722,11 @@ }; } { - name = "node_fetch___node_fetch_2.6.1.tgz"; + name = "node_fetch___node_fetch_2.6.5.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; - sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + name = "node_fetch___node_fetch_2.6.5.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz"; + sha1 = "42735537d7f080a7e5f78b6c549b7146be1742fd"; }; } { @@ -1833,14 +1897,6 @@ sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; }; } - { - name = "progress___progress_2.0.1.tgz"; - path = fetchurl { - name = "progress___progress_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz"; - sha1 = "c9242169342b1c29d275889c95734621b1952e31"; - }; - } { name = "progress___progress_2.0.3.tgz"; path = fetchurl { @@ -1890,11 +1946,11 @@ }; } { - name = "puppeteer___puppeteer_10.2.0.tgz"; + name = "puppeteer___puppeteer_11.0.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_10.2.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.2.0.tgz"; - sha1 = "7d8d7fda91e19a7cfd56986e0275448e6351849e"; + name = "puppeteer___puppeteer_11.0.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-11.0.0.tgz"; + sha1 = "0808719c38e15315ecc1b1c28911f1c9054d201f"; }; } { @@ -2098,11 +2154,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.4.tgz"; + name = "signal_exit___signal_exit_3.0.6.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.4.tgz"; - sha1 = "366a4684d175b9cab2081e3681fda3747b6c51d7"; + name = "signal_exit___signal_exit_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; + sha1 = "24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"; }; } { @@ -2122,11 +2178,11 @@ }; } { - name = "source_map_support___source_map_support_0.5.20.tgz"; + name = "source_map_support___source_map_support_0.5.21.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.20.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz"; - sha1 = "12166089f8f5e5e8c56926b377633392dd2cb6c9"; + name = "source_map_support___source_map_support_0.5.21.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; + sha1 = "04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"; }; } { @@ -2162,19 +2218,11 @@ }; } { - name = "string_width___string_width_3.1.0.tgz"; + name = "string_width___string_width_4.2.3.tgz"; path = fetchurl { - name = "string_width___string_width_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; - sha1 = "22767be21b62af1081574306f69ac51b62203961"; - }; - } - { - name = "string_width___string_width_4.2.2.tgz"; - path = fetchurl { - name = "string_width___string_width_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; - sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; + name = "string_width___string_width_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; + sha1 = "269c7117d27b05ad2e536830a8ec895ef9c6d010"; }; } { @@ -2202,19 +2250,11 @@ }; } { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; + name = "strip_ansi___strip_ansi_6.0.1.tgz"; path = fetchurl { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; - }; - } - { - name = "strip_ansi___strip_ansi_6.0.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + name = "strip_ansi___strip_ansi_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha1 = "9e26c63d30f53443e9489495b2105d37b67a85d9"; }; } { @@ -2258,11 +2298,11 @@ }; } { - name = "tar_fs___tar_fs_2.0.0.tgz"; + name = "tar_fs___tar_fs_2.1.1.tgz"; path = fetchurl { - name = "tar_fs___tar_fs_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz"; - sha1 = "677700fc0c8b337a78bee3623fdc235f21d7afad"; + name = "tar_fs___tar_fs_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz"; + sha1 = "489a15ab85f1f0befabb370b7de4f9eb5cbe8784"; }; } { @@ -2290,11 +2330,11 @@ }; } { - name = "tmp_promise___tmp_promise_3.0.2.tgz"; + name = "tmp_promise___tmp_promise_3.0.3.tgz"; path = fetchurl { - name = "tmp_promise___tmp_promise_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.2.tgz"; - sha1 = "6e933782abff8b00c3119d63589ca1fb9caaa62a"; + name = "tmp_promise___tmp_promise_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz"; + sha1 = "60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"; }; } { @@ -2313,6 +2353,14 @@ sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; }; } + { + name = "tr46___tr46_0.0.3.tgz"; + path = fetchurl { + name = "tr46___tr46_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz"; + sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + }; + } { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; path = fetchurl { @@ -2362,11 +2410,11 @@ }; } { - name = "unbzip2_stream___unbzip2_stream_1.3.3.tgz"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; path = fetchurl { - name = "unbzip2_stream___unbzip2_stream_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz"; - sha1 = "d156d205e670d8d8c393e1c02ebd506422873f6a"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; + sha1 = "b0da04c4371311df771cdc215e87f2130991ace7"; }; } { @@ -2434,11 +2482,27 @@ }; } { - name = "verror___verror_1.10.0.tgz"; + name = "verror___verror_1.10.1.tgz"; path = fetchurl { - name = "verror___verror_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + name = "verror___verror_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz"; + sha1 = "4bf09eeccf4563b109ed4b3d458380c972b0cdeb"; + }; + } + { + name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; + sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + }; + } + { + name = "whatwg_url___whatwg_url_5.0.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz"; + sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; }; } { @@ -2490,11 +2554,11 @@ }; } { - name = "ws___ws_7.4.6.tgz"; + name = "ws___ws_8.2.3.tgz"; path = fetchurl { - name = "ws___ws_7.4.6.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; - sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; + name = "ws___ws_8.2.3.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz"; + sha1 = "63a56456db1b04367d0b721a0b80cae6d8becbba"; }; } { @@ -2546,11 +2610,11 @@ }; } { - name = "yargs___yargs_17.1.1.tgz"; + name = "yargs___yargs_17.2.1.tgz"; path = fetchurl { - name = "yargs___yargs_17.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz"; - sha1 = "c2a8091564bdb196f7c0a67c1d12e5b85b8067ba"; + name = "yargs___yargs_17.2.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz"; + sha1 = "e2c95b9796a0e1f7f3bf4427863b42e0418191ea"; }; } { From 5677e477d34f45d5c12be2f39f1f5d471762b495 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Nov 2021 12:40:19 +0100 Subject: [PATCH 034/106] ldns: 1.7.1 -> 1.8.0 --- pkgs/development/libraries/ldns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 5873e707e7cc..c0e3470f9738 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ldns"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz"; - sha256 = "0ac242n7996fswq1a3nlh1bbbhrsdwsq4mx7xq8ffq6aplb4rj4a"; + sha256 = "sha256-glElB2mAMcN5AulByE3so+2tjPeR58MnWi2Z1OU/jPw="; }; postPatch = '' From 21364d1579b2f66af4af8983c5674e7accca09c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Nov 2021 10:40:13 -0800 Subject: [PATCH 035/106] abcmidi: 2021.10.15 -> 2021.11.25 --- 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 f10b79d2ab00..678fccc913c6 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 = "2021.10.15"; + version = "2021.11.25"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-OEkSgT3Rg0ZcTCTeOd2+GlopzhI19spOLkH3nDDCWo8="; + hash = "sha256-rpEIYM3hAU0/5WwZIvJly45ZynDQn7fjSuoCzjE+bcI="; }; meta = with lib; { From 5881a720d3643fa7c30cd2532f054d0f81fced3b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 10 Sep 2021 17:49:16 +0100 Subject: [PATCH 036/106] gst_all_1.gst-plugins-bad: fix gcc-11 build by applying fix unconditionally Without the change build on `gcc-11` fails as: $ nix build --impure --expr 'with import ./. {}; gst_all_1.gst-plugins-bad.override { stdenv = gcc11Stdenv; }' -L ... include/glib-2.0/glib/gatomic.h:113:19: error: argument 2 of '__atomic_load' must not be a pointer to a 'volatile' type 113 | __atomic_load (gapg_temp_atomic, &gapg_temp_newval, __ATOMIC_SEQ_CST); \ | ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- pkgs/development/libraries/gstreamer/bad/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index de6ccd153780..8c6a8b056781 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -105,7 +105,6 @@ stdenv.mkDerivation rec { patches = [ # Use pkgconfig to inject the includedirs ./fix_pkgconfig_includedir.patch - ] ++ lib.optionals stdenv.isDarwin [ # Fix “error: cannot initialize a parameter of type 'unsigned long *' with an rvalue of type 'typename std::remove_reference::type *' (aka 'volatile unsigned long *')” on Darwin. (fetchpatch { url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/640a65bf966df065d41a511e2d76d1f26a2e770c.patch"; From 4648545542a33726ef9eecccc3e5393a52f012ae Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 10 Sep 2021 22:28:41 +0100 Subject: [PATCH 037/106] qca-qt5: fix gcc-11 from upstream Without the change build n `gcc-11` fails as: $ nix build --impure --expr 'with import ./. {}; qca-qt5.override { stdenv = gcc11Stdenv; }' -L ... ...gcc-11.2.0/include/c++/11.2.0/bits/stl_raw_storage_iter.h:69:22: error: expected template-name before '<' token 69 | : public iterator | ^ --- pkgs/development/libraries/qca-qt5/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index f8159417378c..9bd57e7ae97b 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-wThREJq+/EYjNwmJ+uOnRb9rGss8KhOolYU5gj6XTks="; }; + patches = [ + # Pull upstream fix for gcc-11 + (fetchurl { + url = "https://github.com/KDE/qca/commit/32275f1a74c161d2fed8c056b2dd9555687a22f2.patch"; + sha256 = "sha256-SUH2eyzP2vH/ZjYcX8ybwiqhoTm/QjuEpTKjb2iH1No="; + }) + ]; + buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkg-config ]; From f028a5195a7fb8e046ee4e281cb1a4a552b82b37 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 27 Nov 2021 10:26:55 +0100 Subject: [PATCH 038/106] solaar: 1.0.7 -> 1.1.0 --- pkgs/applications/misc/solaar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 75d617bceeb5..e4e149df0ec8 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -13,13 +13,13 @@ # logitech-udev-rules instead of adding this to services.udev.packages on NixOS python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.0.7"; + version = "1.1.0"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = version; - sha256 = "sha256-RQ7iSiw/0xbPOYhuHg4cQpuJyRcaigWKVw4Jt12T9Uw="; + sha256 = "sha256-rNz296pKw2/WaryxHekWHSAS1jdTviZxXDgO/L/PJCU="; }; nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ]; From 856a428ecf003bb955841708696a4e2bd10e7efb Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 27 Nov 2021 15:03:03 +0100 Subject: [PATCH 039/106] suricata: 6.0.3 -> 6.0.4 https://forum.suricata.io/t/suricata-6-0-4-and-5-0-8-released/1942 Fixes CVE-2021-37592. --- pkgs/applications/networking/ids/suricata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 5d24f589abca..4edc97a0640d 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "6.0.3"; + version = "6.0.4"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-2vE0uy18mAA16a5g96rzEzI6gJNAAJ8m5IEQzN6B9gI="; + sha256 = "sha256-qPGX4z0WeGieu/e8Gr6Ek0xGXSLFBMR8LH6bdKoELQ0="; }; nativeBuildInputs = [ From 9c431b8569e0c046b1a1709dfae04dabbca2ef8e Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Sat, 27 Nov 2021 15:39:22 -0800 Subject: [PATCH 040/106] vowpalwabbit: fix build --- .../python-modules/vowpalwabbit/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 4cd6fb1128cd..2f950ecd6c44 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -10,7 +10,11 @@ , pygments , numpy , scipy -, scikit-learn }: +, scikit-learn +, spdlog +, fmt +, rapidjson +}: buildPythonPackage rec { pname = "vowpalwabbit"; @@ -31,8 +35,15 @@ buildPythonPackage rec { pygments python.pkgs.boost zlib.dev + spdlog + fmt + rapidjson ]; + # As we disable configure via cmake, pass explicit global options to enable + # spdlog and fmt packages + setupPyGlobalFlags = [ "--cmake-options=\"-DSPDLOG_SYS_DEP=ON;-DFMT_SYS_DEP=ON\"" ]; + propagatedBuildInputs = [ numpy scikit-learn From 56cd5ac4db773ddfdd833ca34844927efdcaf3d3 Mon Sep 17 00:00:00 2001 From: "Yestin L. Harrison" Date: Sat, 27 Nov 2021 23:06:56 -0800 Subject: [PATCH 041/106] vcs: substitute standalone getopt outside of linux --- pkgs/applications/video/vcs/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix index 4998797fcf3a..37ea20718fd6 100644 --- a/pkgs/applications/video/vcs/default.nix +++ b/pkgs/applications/video/vcs/default.nix @@ -1,11 +1,15 @@ { lib, stdenv, fetchurl, makeWrapper -, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, util-linux +, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer +, util-linux, getopt , dejavu_fonts }: with lib; let version = "1.13.4"; - runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer util-linux ]; + gopt = if stdenv.isLinux then util-linux else getopt; + runtimeDeps = [ + coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer gopt + ]; in stdenv.mkDerivation { pname = "vcs"; From 18f8296fb9d11cbd6f788f5d8576cae54cb00e37 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 24 Sep 2021 22:28:41 +0100 Subject: [PATCH 042/106] cdrkit: fix -fno-common build Without the change build on toolchain with `-fno-common` default fails as: $ nix build --impure --expr 'with import ./. {}; cdrkit.override { stdenv = clang12Stdenv; }' -L ... cdrkit> ld: CMakeFiles/genisoimage.dir/apple.o:(.bss+0x2040): multiple definition of `outfile'; CMakeFiles/genisoimage.dir/genisoimage.o:(.bss+0x280): first defined here --- .../cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch | 11 +++++++++++ pkgs/tools/cd-dvd/cdrkit/default.nix | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch diff --git a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch b/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch new file mode 100644 index 000000000000..c7db796cfcfc --- /dev/null +++ b/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch @@ -0,0 +1,11 @@ +--- a/genisoimage/genisoimage.h ++++ b/genisoimage/genisoimage.h +@@ -377,7 +377,7 @@ extern int use_fileversion; + extern int split_SL_component; + extern int split_SL_field; + extern char *trans_tbl; +-char *outfile; ++extern char *outfile; + + #define JMAX 64 /* maximum Joliet file name length (spec) */ + #define JLONGMAX 103 /* out of spec Joliet file name length */ diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 1bc84cf59dfe..e3d53297193f 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244 - patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ]; + patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ]; postInstall = '' # file name compatibility with the old cdrecord (growisofs wants this name) From 730fc9cae014027254c3ff78bcf8b03dd28296bc Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sun, 28 Nov 2021 15:24:52 +0100 Subject: [PATCH 043/106] bakelite: init at unstable-2021-10-19 --- pkgs/tools/backup/bakelite/default.nix | 29 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/backup/bakelite/default.nix diff --git a/pkgs/tools/backup/bakelite/default.nix b/pkgs/tools/backup/bakelite/default.nix new file mode 100644 index 000000000000..15ddd3e2ea63 --- /dev/null +++ b/pkgs/tools/backup/bakelite/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "bakelite"; + version = "unstable-2021-10-19"; + + src = fetchFromGitHub { + owner = "richfelker"; + repo = pname; + rev = "5fc3cf9704dbaa191b95f97d2a700588ea878a36"; + sha256 = "xoGor8KMG1vU6hP6v6gHcADKjVpaClvkivxkcPUJtss="; + }; + + hardeningEnable = [ "pie" ]; + buildFlags = [ "CFLAGS=-D_GNU_SOURCE" ]; + + installPhase = '' + mkdir -p $out/bin + cp bakelite $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/richfelker/bakelite"; + description = "Incremental backup with strong cryptographic confidentality"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ mvs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5a817bc8aa6..0d14ec586170 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -204,6 +204,8 @@ with pkgs; bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; + bakelite = callPackage ../tools/backup/bakelite { }; + breakpad = callPackage ../development/misc/breakpad { }; buf = callPackage ../development/tools/buf { }; From a94a2370bb1831dc212e8567bd3e273fd0b5be7f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 28 Nov 2021 16:04:23 +0000 Subject: [PATCH 044/106] noice: fix build against ncurses-6.3 Without the change the build on upcoming `ncurses-6.3` fails as: noice.c:377:9: error: format not a string literal and no format arguments [-Werror=format-security] 377 | printw(str); | ^~~~~~ --- pkgs/applications/misc/noice/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix index 73648d896d08..e67346c51715 100644 --- a/pkgs/applications/misc/noice/default.nix +++ b/pkgs/applications/misc/noice/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0975j4m93s9a21pazwdzn4gqhkngwq7q6ghp0q8a75r6c4fb7aar"; }; + postPatch = '' + # Add support for ncurses-6.3. Can be dropped with 0.9 release. + # Fixed upstream at: https://git.2f30.org/noice/commit/53c35e6b340b7c135038e00057a198f03cb7d7cf.html + substituteInPlace noice.c --replace 'printw(str);' 'printw("%s", str);' + ''; + configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; From 3e894f67fe87c887cf4ff44110603a0437c6a639 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 1 Nov 2021 07:55:47 +0000 Subject: [PATCH 045/106] gptfdisk: fix build against upcoming ncurses-6.3 On ncurses-6.3 with extra printf() annotations gcc now detects use of user input in place of format strings: gptcurses.cc:274:10: error: format not a string literal and no format arguments [-Werror=format-security] 274 | printw(theLine.c_str()); | ~~~~~~^~~~~~~~~~~~~~~~~ --- pkgs/tools/system/gptfdisk/default.nix | 6 ++ pkgs/tools/system/gptfdisk/ncurses-6.3.patch | 96 ++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 pkgs/tools/system/gptfdisk/ncurses-6.3.patch diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 0e7aff32bf07..fc6bf89e4498 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-ldGYVvAE2rxLjDQrJhLo0KnuvdUgBClxiDafFS6dxt8="; }; + patches = [ + # fix build failure against ncurses-6.3 (pending upstream inclusion): + # https://sourceforge.net/p/gptfdisk/mailman/message/37392412/ + ./ncurses-6.3.patch + ]; + postPatch = '' patchShebangs gdisk_test.sh '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/system/gptfdisk/ncurses-6.3.patch b/pkgs/tools/system/gptfdisk/ncurses-6.3.patch new file mode 100644 index 000000000000..4b8ec91aa04e --- /dev/null +++ b/pkgs/tools/system/gptfdisk/ncurses-6.3.patch @@ -0,0 +1,96 @@ +From 9d5032d1487a8fe6ef7229d413418a27e32a28e5 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 1 Nov 2021 07:51:10 +0000 +Subject: [PATCH:gptfdisk] gptcurses.cc: always use "%s"-style format for printf()-style + functions + +`ncuses-6.3` added printf-style function attributes and now makes +it easier to catch cases when user input is used in palce of format +string when built with CFLAGS=-Werror=format-security: + + gptcurses.cc:274:10: error: + format not a string literal and no format arguments [-Werror=format-security] + 274 | printw(theLine.c_str()); + | ~~~~~~^~~~~~~~~~~~~~~~~ + +Let's wrap all the missing places with "%s" format. +--- + gptcurses.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +--- a/gptcurses.cc ++++ b/gptcurses.cc +@@ -239,22 +239,22 @@ Space* GPTDataCurses::ShowSpace(int spaceNum, int lineNum) { + ClearLine(lineNum); + if (space->partNum == -1) { // space is empty + move(lineNum, 12); +- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); ++ printw("%s", BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); + move(lineNum, 24); + printw("free space"); + } else { // space holds a partition + move(lineNum, 3); + printw("%d", space->partNum + 1); + move(lineNum, 12); +- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); ++ printw("%s", BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); + move(lineNum, 24); +- printw(space->origPart->GetTypeName().c_str()); ++ printw("%s", space->origPart->GetTypeName().c_str()); + move(lineNum, 50); + #ifdef USE_UTF16 + space->origPart->GetDescription().extract(0, 39, temp, 39); +- printw(temp); ++ printw("%s", temp); + #else +- printw(space->origPart->GetDescription().c_str()); ++ printw("%s", space->origPart->GetDescription().c_str()); + #endif + } // if/else + } // if +@@ -271,10 +271,10 @@ int GPTDataCurses::DisplayParts(int selected) { + + move(lineNum++, 0); + theLine = "Part. # Size Partition Type Partition Name"; +- printw(theLine.c_str()); ++ printw("%s", theLine.c_str()); + move(lineNum++, 0); + theLine = "----------------------------------------------------------------"; +- printw(theLine.c_str()); ++ printw("%s", theLine.c_str()); + numToShow = LINES - RESERVED_TOP - RESERVED_BOTTOM; + pageNum = selected / numToShow; + for (i = pageNum * numToShow; i <= (pageNum + 1) * numToShow - 1; i++) { +@@ -636,7 +636,7 @@ void GPTDataCurses::DisplayOptions(char selectedKey) { + } // if/else + } // for + move(LINES - 1, (COLS - optionDesc.length()) / 2); +- printw(optionDesc.c_str()); ++ printw("%s", optionDesc.c_str()); + currentKey = selectedKey; + } // if + } // GPTDataCurses::DisplayOptions() +@@ -748,11 +748,11 @@ void GPTDataCurses::DrawMenu(void) { + + clear(); + move(0, (COLS - title.length()) / 2); +- printw(title.c_str()); ++ printw("%s", title.c_str()); + move(2, (COLS - drive.length()) / 2); +- printw(drive.c_str()); ++ printw("%s", drive.c_str()); + move(3, (COLS - size.str().length()) / 2); +- printw(size.str().c_str()); ++ printw("%s", size.str().c_str()); + DisplayParts(currentSpaceNum); + } // DrawMenu + +@@ -802,7 +802,7 @@ void PromptToContinue(void) { + void Report(string theText) { + clear(); + move(0, 0); +- printw(theText.c_str()); ++ printw("%s", theText.c_str()); + move(LINES - 2, (COLS - 29) / 2); + printw("Press any key to continue...."); + cbreak(); From 05d3fb59a34699b4bbe31be3c0547b1fc7dfb2dd Mon Sep 17 00:00:00 2001 From: Delan Azabani Date: Mon, 29 Nov 2021 12:30:49 +0800 Subject: [PATCH 046/106] bore: 0.3.3 -> 0.4.1 --- pkgs/tools/networking/bore/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index cfe78590483f..66334e062103 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -2,22 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "bore"; - version = "0.3.3"; + version = "0.4.1"; src = fetchFromBitbucket { owner = "delan"; repo = "nonymous"; - rev = version; - sha256 = "0gws1f625izrb3armh6bay1k8l9p9csl37jx03yss1r720k4vn2x"; + rev = "${pname}-${version}"; + sha256 = "1fdnnx7d18gj4rkv1dc6q379dqabl66zks9i0rjarjwcci8m30d9"; }; - cargoSha256 = "1n09gcp1y885lz6g2f73zw3fd0fmv7nwlvaqba2yl0kylzk7naa6"; + cargoSha256 = "1xlbfzmy0wjyz3jpr17r4ma4i79d9b32yqwwi10vrcjzr7vsyhmx"; cargoBuildFlags = "-p ${pname}"; # FIXME can’t test --all-targets and --doc in a single invocation - checkFeatures = [ "std" ]; - cargoTestFlags = [ "--all-targets" "--workspace" ]; + checkFeatures = [ "std" ]; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isDarwin llvmPackages.libclang; From 43f1a2e59f48cd59a9d31aa98c450696bd08eb6d Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 29 Nov 2021 13:07:54 +0530 Subject: [PATCH 047/106] got: 0.60 -> 0.64 --- pkgs/applications/version-management/got/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index b80712fd96da..61e938b093b3 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.60"; + version = "0.64"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-tT8F3Kx7Rcjd/tWjIXXNWygYlkMddWwrttpjnYLnBdo="; + sha256 = "1qigv8fnmiynrx6qrg28n2981a30n56nh3xbhmlpihl7fqxmg1sq"; }; nativeBuildInputs = [ pkg-config ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installCheckPhase = '' runHook preInstallCheck - test "$($out/bin/got --version)" = '${pname} "${version}"' + test "$($out/bin/got --version)" = '${pname} ${version}' runHook postInstallCheck ''; From 4aa1a4d8a220cd937fab8eeb16d4fa9b82a030b3 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 14 Nov 2021 18:06:50 +0300 Subject: [PATCH 048/106] quictls: init at v3.0.0+quic_unstable-2021-11-02 --- .../development/libraries/quictls/default.nix | 170 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 172 insertions(+) create mode 100644 pkgs/development/libraries/quictls/default.nix diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix new file mode 100644 index 000000000000..a91015e1b8a7 --- /dev/null +++ b/pkgs/development/libraries/quictls/default.nix @@ -0,0 +1,170 @@ +{ lib, stdenv, fetchurl, buildPackages, perl, coreutils, fetchFromGitHub +, withCryptodev ? false, cryptodev +, enableSSL2 ? false +, enableSSL3 ? false +, static ? stdenv.hostPlatform.isStatic +# Used to avoid cross compiling perl, for example, in darwin bootstrap tools. +# This will cause c_rehash to refer to perl via the environment, but otherwise +# will produce a perfectly functional openssl binary and library. +, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform +}: + +assert ( + lib.assertMsg (!withPerl -> stdenv.hostPlatform != stdenv.buildPlatform) + "withPerl should not be disabled unless cross compiling" +); + +stdenv.mkDerivation rec { + pname = "quictls"; + version = "3.0.0+quick_unstable-2021-11.02"; + + src = fetchFromGitHub { + owner = "quictls"; + repo = "openssl"; + rev = "62d4de00abfa82fc01efa2eba1982a86c4864f39"; + sha256 = "11mi4bkkyy4qd2wml6p7xcsbps0mabk3bp537rp7n43qnhwyg1g3"; + }; + + patches = [ + ../openssl/3.0/nix-ssl-cert-file.patch + + # openssl will only compile in KTLS if the current kernel supports it. + # This patch disables build-time detection. + ../openssl/3.0/openssl-disable-kernel-detection.patch + + (if stdenv.hostPlatform.isDarwin + then ../openssl/use-etc-ssl-certs-darwin.patch + else ../openssl/use-etc-ssl-certs.patch) + ]; + + postPatch = '' + patchShebangs Configure + '' + # config is a configure script which is not installed. + + '' + substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace crypto/async/arch/async_posix.h \ + --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ + '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' + ''; + + outputs = [ "bin" "dev" "out" "man" "doc" ]; + setOutputFlags = false; + separateDebugInfo = + !stdenv.hostPlatform.isDarwin && + !(stdenv.hostPlatform.useLLVM or false) && + stdenv.cc.isGNU; + + nativeBuildInputs = [ perl ]; + buildInputs = lib.optional withCryptodev cryptodev + # perl is included to allow the interpreter path fixup hook to set the + # correct interpreter in c_rehash. + ++ lib.optional withPerl perl; + + # TODO(@Ericson2314): Improve with mass rebuild + configurePlatforms = []; + configureScript = { + armv5tel-linux = "./Configure linux-armv4 -march=armv5te"; + armv6l-linux = "./Configure linux-armv4 -march=armv6"; + armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; + x86_64-darwin = "./Configure darwin64-x86_64-cc"; + aarch64-darwin = "./Configure darwin64-arm64-cc"; + x86_64-linux = "./Configure linux-x86_64"; + x86_64-solaris = "./Configure solaris64-x86_64-gcc"; + riscv64-linux = "./Configure linux64-riscv64"; + }.${stdenv.hostPlatform.system} or ( + if stdenv.hostPlatform == stdenv.buildPlatform + then "./config" + else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_64 + then "./Configure BSD-x86_64" + else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_32 + then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf" + else if stdenv.hostPlatform.isBSD + then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" + else if stdenv.hostPlatform.isMinGW + then "./Configure mingw${lib.optionalString + (stdenv.hostPlatform.parsed.cpu.bits != 32) + (toString stdenv.hostPlatform.parsed.cpu.bits)}" + else if stdenv.hostPlatform.isLinux + then "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" + else if stdenv.hostPlatform.isiOS + then "./Configure ios${toString stdenv.hostPlatform.parsed.cpu.bits}-cross" + else + throw "Not sure what configuration to use for ${stdenv.hostPlatform.config}" + ); + + # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. + dontAddStaticConfigureFlags = true; + configureFlags = [ + "shared" # "shared" builds both shared and static libraries + "--libdir=lib" + "--openssldir=etc/ssl" + "enable-ktls" + ] ++ lib.optionals withCryptodev [ + "-DHAVE_CRYPTODEV" + "-DUSE_CRYPTODEV_DIGESTS" + ] ++ lib.optional enableSSL2 "enable-ssl2" + ++ lib.optional enableSSL3 "enable-ssl3" + ++ lib.optional stdenv.hostPlatform.isAarch64 "no-afalgeng" + # OpenSSL needs a specific `no-shared` configure flag. + # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options + # for a comprehensive list of configuration options. + ++ lib.optional static "no-shared"; + + makeFlags = [ + "MANDIR=$(man)/share/man" + # This avoids conflicts between man pages of openssl subcommands (for + # example 'ts' and 'err') man pages and their equivalent top-level + # command in other packages (respectively man-pages and moreutils). + # This is done in ubuntu and archlinux, and possiibly many other distros. + "MANSUFFIX=ssl" + ]; + + enableParallelBuilding = true; + + postInstall = lib.optionalString (!static) '' + # If we're building dynamic libraries, then don't install static + # libraries. + if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then + rm "$out/lib/"*.a + fi + '' + lib.optionalString (!stdenv.hostPlatform.isWindows) + # Fix bin/c_rehash's perl interpreter line + # + # - openssl 1_0_2: embeds a reference to buildPackages.perl + # - openssl 1_1: emits "#!/usr/bin/env perl" + # + # In the case of openssl_1_0_2, reset the invalid reference and let the + # interpreter hook take care of it. + # + # In both cases, if withPerl = false, the intepreter line is expected be + # "#!/usr/bin/env perl" + '' + substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl}/bin/perl "/usr/bin/env perl" + '' + '' + mkdir -p $bin + mv $out/bin $bin/bin + mkdir $dev + mv $out/include $dev/ + # remove dependency on Perl at runtime + rm -r $out/etc/ssl/misc + rmdir $out/etc/ssl/{certs,private} + ''; + + postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' + # Check to make sure the main output doesn't depend on perl + if grep -r '${buildPackages.perl}' $out; then + echo "Found an erroneous dependency on perl ^^^" >&2 + exit 1 + fi + ''; + + meta = with lib; { + homepage = "https://quictls.github.io/openssl/"; + description = "TLS/SSL and crypto library with QUIC APIs"; + license = licenses.openssl; + platforms = platforms.all; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76ca8774dcfe..3d0139a65376 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8948,6 +8948,8 @@ with pkgs; quickserve = callPackage ../tools/networking/quickserve { }; + quictls = callPackage ../development/libraries/quictls { }; + quicktun = callPackage ../tools/networking/quicktun { }; quilt = callPackage ../development/tools/quilt { }; From 955e944d95cfc34ffe941afebdd2894f7641b13d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 14 Nov 2021 18:12:35 +0300 Subject: [PATCH 049/106] nghttp3: init at unstable-2021-11-10 --- .../development/libraries/nghttp3/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/nghttp3/default.nix diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix new file mode 100644 index 000000000000..85a66f940658 --- /dev/null +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, cunit, file +}: + +stdenv.mkDerivation rec { + pname = "nghttp3"; + version = "unstable-2021-11-10"; + + src = fetchFromGitHub { + owner = "ngtcp2"; + repo = pname; + rev = "270e75447ed9e2a05b78ba89d0699d076230ea60"; + sha256 = "01cla03cv8nd2rf5p77h0xzvn9f8sfwn8pp3r2jshvqp9ipa8065"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config cunit file ]; + + preConfigure = '' + substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file + ''; + + outputs = [ "out" "dev" ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/ngtcp2/nghttp3"; + description = "nghttp3 is an implementation of HTTP/3 mapping over QUIC and QPACK in C."; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d0139a65376..924f47c7fcc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18829,7 +18829,7 @@ with pkgs; nghttp2 = callPackage ../development/libraries/nghttp2 { }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins { }; + nghttp3 = callPackage ../development/libraries/nghttp3 { }; nika-fonts = callPackage ../data/fonts/nika-fonts { }; From 89dd3384d1e011916130961c6499f1f90ad3d8a2 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 14 Nov 2021 18:17:29 +0300 Subject: [PATCH 050/106] ngtcp2: init at unstable-2021-11-10 --- pkgs/development/libraries/ngtcp2/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/ngtcp2/default.nix diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix new file mode 100644 index 000000000000..0d4002ca10d7 --- /dev/null +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, cunit, file +, jemalloc, libev, nghttp3, quictls +}: + +stdenv.mkDerivation rec { + pname = "ngtcp2"; + version = "unstable-2021-11-10"; + + src = fetchFromGitHub { + owner = "ngtcp2"; + repo = pname; + rev = "7039808c044152c14b44046468bd16249b4d7048"; + sha256 = "1cjsky24f6fazw9b1r6w9cgp09vi8wp99sv76gg2b1r8ic3hgq23"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config cunit file ]; + buildInputs = [ jemalloc libev nghttp3 quictls ]; + + preConfigure = '' + substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file + ''; + + outputs = [ "out" "dev" ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/ngtcp2/ngtcp2"; + description = "ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization."; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 924f47c7fcc7..341779c42cc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18831,6 +18831,10 @@ with pkgs; nghttp3 = callPackage ../development/libraries/nghttp3 { }; + ngtcp2 = callPackage ../development/libraries/ngtcp2 { }; + + nix-plugins = callPackage ../development/libraries/nix-plugins { }; + nika-fonts = callPackage ../data/fonts/nika-fonts { }; nikto = callPackage ../tools/networking/nikto { }; From 640e54cda9166b43e2b53f876dee8145834b0765 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Sun, 21 Nov 2021 12:51:05 +0800 Subject: [PATCH 051/106] maintainers: Rename pengmeiyu to pmy --- maintainers/maintainer-list.nix | 12 ++++++------ .../modules/services/network-filesystems/webdav.nix | 2 +- pkgs/data/misc/rime-data/default.nix | 2 +- pkgs/os-specific/linux/lm-sensors/default.nix | 2 +- pkgs/servers/webdav/default.nix | 2 +- .../inputmethods/ibus-engines/ibus-rime/default.nix | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c2c0d56dfee4..207ee62cff25 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8967,12 +8967,6 @@ githubId = 8641; name = "Pierre Carrier"; }; - pengmeiyu = { - email = "pengmyu@gmail.com"; - github = "pmeiyu"; - githubId = 8529551; - name = "Peng Mei Yu"; - }; penguwin = { email = "penguwin@penguwin.eu"; github = "penguwin"; @@ -9248,6 +9242,12 @@ githubId = 178496; name = "Philipp Middendorf"; }; + pmy = { + email = "pmy@xqzp.net"; + github = "pmeiyu"; + githubId = 8529551; + name = "Peng Mei Yu"; + }; pmyjavec = { email = "pauly@myjavec.com"; github = "pmyjavec"; diff --git a/nixos/modules/services/network-filesystems/webdav.nix b/nixos/modules/services/network-filesystems/webdav.nix index 4086a0f5d562..48602390bd74 100644 --- a/nixos/modules/services/network-filesystems/webdav.nix +++ b/nixos/modules/services/network-filesystems/webdav.nix @@ -103,5 +103,5 @@ in }; }; - meta.maintainers = with maintainers; [ pengmeiyu ]; + meta.maintainers = with maintainers; [ pmy ]; } diff --git a/pkgs/data/misc/rime-data/default.nix b/pkgs/data/misc/rime-data/default.nix index 371a07d3ec1a..fbf65bc12a9f 100644 --- a/pkgs/data/misc/rime-data/default.nix +++ b/pkgs/data/misc/rime-data/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation { # rime-cantonese cc-by-40 ]; - maintainers = [ maintainers.pengmeiyu ]; + maintainers = with maintainers; [ pmy ]; }; } diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 3590f87e37ad..c40a37940543 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/V${dashedVersion}/CHANGES"; description = "Tools for reading hardware sensors"; license = with licenses; [ lgpl21Plus gpl2Plus ]; - maintainers = with maintainers; [ pengmeiyu ]; + maintainers = with maintainers; [ pmy ]; platforms = platforms.linux; mainProgram = "sensors"; }; diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index 2e6a6a891ecf..4a3aca9f6e91 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -17,6 +17,6 @@ buildGoModule rec { description = "Simple WebDAV server"; homepage = "https://github.com/hacdias/webdav"; license = licenses.mit; - maintainers = with maintainers; [ pengmeiyu ]; + maintainers = with maintainers; [ pmy ]; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix index af3fcbe4e2cc..d415b6b5a45d 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://rime.im/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ pengmeiyu ]; + maintainers = with maintainers; [ pmy ]; }; } From 26f82bcea78203ed32a185f388c54637221b905c Mon Sep 17 00:00:00 2001 From: MoritzBoehme Date: Mon, 29 Nov 2021 16:00:05 +0100 Subject: [PATCH 052/106] legendary-gl: 0.20.10 -> 0.20.18 --- pkgs/games/legendary-gl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index f09503ea8b9d..cbdfbc22891b 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.10"; + version = "0.20.18"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = version; - sha256 = "sha256-/OttNHwS08gHx/ZpOuB6yxfK2cX3BbMeQLZC7iXKKrk="; + sha256 = "0d31c8grvcw7y3sh2x90cxhj612k6f491w2r12j1q33d2v9sqm4j"; }; propagatedBuildInputs = [ requests ]; From 8cbd56b6718d8d6562c7f74a9facabc2d125e5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 29 Nov 2021 17:34:50 +0100 Subject: [PATCH 053/106] cinnamon.*: apply nixpkgs-fmt --- pkgs/desktops/cinnamon/bulky/default.nix | 2 +- .../cinnamon/cinnamon-common/default.nix | 5 +++-- .../cinnamon-control-center/default.nix | 7 ++++--- .../cinnamon/cinnamon-desktop/default.nix | 3 ++- .../cinnamon-gsettings-overrides/default.nix | 20 +++++++++---------- .../cinnamon/cinnamon-menus/default.nix | 3 ++- .../cinnamon/cinnamon-screensaver/default.nix | 3 ++- .../cinnamon/cinnamon-session/default.nix | 3 ++- pkgs/desktops/cinnamon/default.nix | 6 +++--- .../desktops/cinnamon/mint-themes/default.nix | 3 ++- .../cinnamon/mint-x-icons/default.nix | 3 ++- .../cinnamon/mint-y-icons/default.nix | 3 ++- pkgs/desktops/cinnamon/muffin/default.nix | 3 ++- pkgs/desktops/cinnamon/nemo/default.nix | 3 ++- pkgs/desktops/cinnamon/xapps/default.nix | 5 +++-- pkgs/desktops/cinnamon/xviewer/default.nix | 3 ++- 16 files changed, 44 insertions(+), 31 deletions(-) diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index f7579f3e4c6b..56cf5a0ff515 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (python3.withPackages(p: with p; [ pygobject3 magic setproctitle ])) + (python3.withPackages (p: with p; [ pygobject3 magic setproctitle ])) gsettings-desktop-schemas gtk3 glib diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 0ce9c53c2fef..303443cc5f9e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -25,7 +25,8 @@ , networkmanager , pkg-config , polkit -, lib, stdenv +, lib +, stdenv , wrapGAppsHook , libxml2 , gtk-doc @@ -153,7 +154,7 @@ stdenv.mkDerivation rec { ''; passthru = { - providedSessions = ["cinnamon" "cinnamon2d"]; + providedSessions = [ "cinnamon" "cinnamon2d" ]; }; meta = with lib; { diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index f516e4818308..a105f39ac46a 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , pkg-config , glib @@ -68,8 +69,8 @@ stdenv.mkDerivation rec { ]; /* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/" - ./panels/datetime/tz.h:32:# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" - ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */ + ./panels/datetime/tz.h:32:# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" + ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */ postPatch = '' sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 717f2633b9a1..ec786c7bacb9 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -8,7 +8,8 @@ , pkg-config , pulseaudio , python3 -, lib, stdenv +, lib +, stdenv , xkeyboard_config , xorg , wrapGAppsHook diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 6f54515569ee..3066d7fcd807 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -5,7 +5,7 @@ , gtk3 , gsettings-desktop-schemas , extraGSettingsOverrides ? "" -, extraGSettingsOverridePackages ? [] +, extraGSettingsOverridePackages ? [ ] , mint-artwork , muffin @@ -41,19 +41,19 @@ in with lib; # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this -runCommand "cinnamon-gsettings-overrides" {} +runCommand "cinnamon-gsettings-overrides" { } '' - schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - mkdir -p $schema_dir + mkdir -p $schema_dir - ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml ${glib.getSchemaPath pkg}/*.gschema.override $schema_dir\n") gsettingsOverridePackages} + ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml ${glib.getSchemaPath pkg}/*.gschema.override $schema_dir\n") gsettingsOverridePackages} - chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides + chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides - cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF - ${extraGSettingsOverrides} - EOF + cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF + ${extraGSettingsOverrides} + EOF - ${glib.dev}/bin/glib-compile-schemas $schema_dir + ${glib.dev}/bin/glib-compile-schemas $schema_dir '' diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index d143176f765f..99008b4726ee 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -4,7 +4,8 @@ , meson , ninja , pkg-config -, lib, stdenv +, lib +, stdenv , wrapGAppsHook }: diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index ad4f079359fe..3d84a6a0622c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , pkg-config , meson diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index a26580a56821..91c03796a888 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -15,7 +15,8 @@ , ninja , pkg-config , python3 -, lib, stdenv +, lib +, stdenv , systemd , wrapGAppsHook , xapps diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 00927b0fa919..7f9d332ed140 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -1,19 +1,19 @@ { pkgs, lib }: lib.makeScope pkgs.newScope (self: with self; { - iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs(p: p // { + iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs (p: p // { buildPhase = "make png-country-320x240-fancy"; # installPhase = "mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png-320x420"; installPhase = "mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png"; }); - iso-flags-svg = pkgs.iso-flags.overrideAttrs(p: p // { + iso-flags-svg = pkgs.iso-flags.overrideAttrs (p: p // { buildPhase = "mkdir -p $out/share"; installPhase = "mv svg $out/share/iso-flags-svg"; }); # blueberry -> pkgs/tools/bluetooth/blueberry/default.nix - bulky = callPackage ./bulky {}; + bulky = callPackage ./bulky { }; cinnamon-common = callPackage ./cinnamon-common { }; cinnamon-control-center = callPackage ./cinnamon-control-center { }; cinnamon-desktop = callPackage ./cinnamon-desktop { }; diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index acdd293050df..f25cb9df2fdd 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub -, lib, stdenv +, lib +, stdenv , python3 , sassc , sass diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index c0a82dd24a96..bfcc95c4ff93 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub -, lib, stdenv +, lib +, stdenv , gnome , gnome-icon-theme , hicolor-icon-theme diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index e400ab14ff19..c1afd2828d2c 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub -, lib, stdenv +, lib +, stdenv , gnome , gnome-icon-theme , hicolor-icon-theme diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 6377737d6b0e..6f35d6b5901d 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -14,7 +14,8 @@ , libXtst , libxkbcommon , pkg-config -, lib, stdenv +, lib +, stdenv , udev , xorg , wrapGAppsHook diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index f931ac3158ae..8baadab496e2 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -5,7 +5,8 @@ , meson , ninja , pkg-config -, lib, stdenv +, lib +, stdenv , wrapGAppsHook , libxml2 , gtk3 diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix index 9e7654827b0d..dfde8773ec06 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapps/default.nix @@ -10,7 +10,8 @@ , ninja , pkg-config , python3 -, lib, stdenv +, lib +, stdenv , vala , wrapGAppsHook , inxi @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ gobject-introspection - (python3.withPackages(ps: with ps; [ + (python3.withPackages (ps: with ps; [ pygobject3 setproctitle # mate applet ])) diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 6f68481b92db..42a4beb4f5e5 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -21,7 +21,8 @@ , shared-mime-info , wrapGAppsHook , xapps -, yelp-tools }: +, yelp-tools +}: stdenv.mkDerivation rec { pname = "xviewer"; From b1308f90793ed57f35c43b880948b6a59f5d38f7 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 29 Nov 2021 20:04:49 +0300 Subject: [PATCH 054/106] =?UTF-8?q?telescope:=200.5.2=20=E2=86=92=200.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/browsers/telescope/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/applications/networking/browsers/telescope/default.nix index dafcc0e63a88..ae4a649724b3 100644 --- a/pkgs/applications/networking/browsers/telescope/default.nix +++ b/pkgs/applications/networking/browsers/telescope/default.nix @@ -7,17 +7,18 @@ , libressl , ncurses , autoreconfHook +, buildPackages }: stdenv.mkDerivation rec { pname = "telescope"; - version = "0.5.2"; + version = "0.6.1"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-AdbFJfoicQUgJ9kesIWZ9ygttyjjDeC0UHRI98GwoZ8="; + sha256 = "sha256-r2+jvmnW9EeQf/2X2cOxnOa+HGuGHV6YMftT2MxbSYQ="; }; nativeBuildInputs = [ @@ -32,6 +33,10 @@ stdenv.mkDerivation rec { ncurses ]; + configureFlags = [ + "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" + ]; + meta = with lib; { description = "Telescope is a w3m-like browser for Gemini"; homepage = "https://telescope.omarpolo.com/"; From 7cbda5539d48d899d99d9f77cfc0c305d07ef161 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 29 Nov 2021 18:57:33 +0000 Subject: [PATCH 055/106] cppe: fix build with clang --- .../development/libraries/science/chemistry/cppe/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/chemistry/cppe/default.nix b/pkgs/development/libraries/science/chemistry/cppe/default.nix index 51083e5a2ae9..9781ce780660 100644 --- a/pkgs/development/libraries/science/chemistry/cppe/default.nix +++ b/pkgs/development/libraries/science/chemistry/cppe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages }: stdenv.mkDerivation rec { pname = "cppe"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-guM7+ZWDJLcAUJtPkKLvC4LYSA2eBvER7cgwPZ7FxHw="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] + ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; From f2ce374855a063a17c7940011b28f20ae5079081 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 29 Nov 2021 20:02:34 +0000 Subject: [PATCH 056/106] python3Packages.cppe: fix build with clang --- pkgs/development/python-modules/cppe/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cppe/default.nix b/pkgs/development/python-modules/cppe/default.nix index df00bd8dd120..52031bab74f7 100644 --- a/pkgs/development/python-modules/cppe/default.nix +++ b/pkgs/development/python-modules/cppe/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , lib +, stdenv , cmake , cppe , eigen @@ -12,6 +13,7 @@ , pandas , polarizationsolver , pytest +, llvmPackages }: buildPythonPackage rec { @@ -31,7 +33,12 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - buildInputs = [ pybind11 ]; + buildInputs = [ pybind11 ] + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; + + NIX_CFLAGS_LINK = lib.optional stdenv.cc.isClang "-lomp"; + + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; checkInputs = [ pytest From 9c7406a10fbd5da521ceb357a53a2d9e169abb72 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 Nov 2021 16:01:23 -0500 Subject: [PATCH 057/106] vimPlugins.vim-clap: fix cargoSha256 --- pkgs/misc/vim-plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 497c64c7c2c8..768b58e850e7 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -744,7 +744,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-DiCQpgyz0iNEm6gjaJU5IGdsQISHhPqlDQBzZafngjY="; + cargoSha256 = "sha256-XFo3FLaeLnXVQAEZol9PipqYYZ9C1z23S/qijxf0uIE="; }; in '' From 04a499cdde91c75ccaac3724827b2636c5e4460e Mon Sep 17 00:00:00 2001 From: Artturi Date: Mon, 29 Nov 2021 23:26:46 +0200 Subject: [PATCH 058/106] Revert "nixos/hidpi: add xserver dpi" --- nixos/modules/hardware/video/hidpi.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/hardware/video/hidpi.nix b/nixos/modules/hardware/video/hidpi.nix index c480cc481dfc..ac72b652504e 100644 --- a/nixos/modules/hardware/video/hidpi.nix +++ b/nixos/modules/hardware/video/hidpi.nix @@ -12,6 +12,5 @@ with lib; boot.loader.systemd-boot.consoleMode = mkDefault "1"; # TODO Find reasonable defaults X11 & wayland - services.xserver.dpi = lib.mkDefault 192; }; } From a75207e966c24b2c5d9a57e9fbea4dcc70f1742e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Nov 2021 17:31:48 +0100 Subject: [PATCH 059/106] python3Packages.socid-extractor: init at 0.0.22 --- .../socid-extractor/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/socid-extractor/default.nix diff --git a/pkgs/development/python-modules/socid-extractor/default.nix b/pkgs/development/python-modules/socid-extractor/default.nix new file mode 100644 index 000000000000..34c0c20e075a --- /dev/null +++ b/pkgs/development/python-modules/socid-extractor/default.nix @@ -0,0 +1,43 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, python-dateutil +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "socid-extractor"; + version = "0.0.22"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "soxoj"; + repo = pname; + rev = "v${version}"; + sha256 = "kHF9CBlUKrD/DRVwJveenpFMr7pIrxEBNkFHHLa46KQ="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + python-dateutil + requests + ]; + + # Test require network access + doCheck = false; + + pythonImportsCheck = [ + "socid_extractor" + ]; + + meta = with lib; { + description = "Python module to extract details from personal pages"; + homepage = "https://github.com/soxoj/socid-extractor"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6002b1220813..0e434b6a9b1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8803,6 +8803,8 @@ in { socialscan = callPackage ../development/python-modules/socialscan { }; + socid-extractor = callPackage ../development/python-modules/socid-extractor { }; + sockjs = callPackage ../development/python-modules/sockjs { }; sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; From 1f2c16475455fb4a83465e152886d400cb211d30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Nov 2021 17:58:48 +0100 Subject: [PATCH 060/106] python3Packages.xmind: init at 1.2.0 --- .../python-modules/xmind/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/xmind/default.nix diff --git a/pkgs/development/python-modules/xmind/default.nix b/pkgs/development/python-modules/xmind/default.nix new file mode 100644 index 000000000000..ab12f26a72df --- /dev/null +++ b/pkgs/development/python-modules/xmind/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "xmind"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "zhuifengshen"; + repo = pname; + rev = "v${version}"; + sha256 = "xC1WpHz2eHb5+xShM/QUQAIYnJNyK1EKWbTXJKhDwbQ="; + }; + + # Projec thas no tests + doCheck = false; + + pythonImportsCheck = [ + "xmind" + ]; + + meta = with lib; { + description = "Python module to create mindmaps"; + homepage = "https://github.com/zhuifengshen/xmind"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e434b6a9b1c..7bf6e52459c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10147,6 +10147,8 @@ in { xlwt = callPackage ../development/python-modules/xlwt { }; + xmind = callPackage ../development/python-modules/xmind { }; + xml2rfc = callPackage ../development/python-modules/xml2rfc { }; xmldiff = callPackage ../development/python-modules/xmldiff { }; From cd959d22517bebb1d767a91c758f626e16337536 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Nov 2021 17:59:11 +0100 Subject: [PATCH 061/106] maigret: init at 0.3.1 --- pkgs/tools/security/maigret/default.nix | 92 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 94 insertions(+) create mode 100644 pkgs/tools/security/maigret/default.nix diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/tools/security/maigret/default.nix new file mode 100644 index 000000000000..08ef82ff9d6e --- /dev/null +++ b/pkgs/tools/security/maigret/default.nix @@ -0,0 +1,92 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "maigret"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "soxoj"; + repo = pname; + rev = "v${version}"; + sha256 = "cq7pATICVQa2yTx2uiP58OBTn4B6iCjIB6LMmpaQfx0="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + aiodns + aiohttp + aiohttp-socks + arabic-reshaper + async-timeout + attrs + beautifulsoup4 + certifi + chardet + colorama + future + html5lib + idna + jinja2 + lxml + markupsafe + mock + multidict + networkx + pycountry + pypdf2 + pysocks + python-bidi + pyvis + requests + requests-futures + six + socid-extractor + soupsieve + stem + torrequest + tqdm + typing-extensions + webencodings + xhtml2pdf + xmind + yarl + ]; + + checkInputs = with python3.pkgs; [ + pytest-httpserver + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Remove all version pinning + sed -i -e "s/==[0-9.]*//" requirements.txt + # We are not build for Python < 3.7 + sed -i -e '/future-annotations/d' requirements.txt + # We can't work with dummy packages + sed -i -e 's/bs4/beautifulsoup4/g' requirements.txt + ''; + + disabledTests = [ + # Tests require network access + "test_extract_ids_from_page" + "test_import_aiohttp_cookies" + "test_maigret_results" + "test_pdf_report" + "test_self_check_db_negative_enabled" + "test_self_check_db_positive_enable" + ]; + + pythonImportsCheck = [ + "maigret" + ]; + + meta = with lib; { + description = "Tool to collect details about an username"; + homepage = "https://maigret.readthedocs.io"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96cea130180a..406f301b40f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3278,6 +3278,8 @@ with pkgs; lynis = callPackage ../tools/security/lynis { }; + maigret = callPackage ../tools/security/maigret { }; + mapcidr = callPackage ../tools/misc/mapcidr { }; mapproxy = callPackage ../applications/misc/mapproxy { }; From f30f9c8aa8b4f1a128d08692fe9edbf81079b884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 29 Nov 2021 23:02:40 +0100 Subject: [PATCH 062/106] frogatto-data: 2020-12-17 -> 2021-11-29 Updating the engine required updating the data. Otherwise a crash would happen at the 2nd level (out of the main house). --- pkgs/games/frogatto/data.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index d31826ad2959..3ca955a09c39 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "frogatto"; repo = "frogatto"; - # master branch as of 2020-12-17 - rev = "8b0f2bc8f9f172f6225b8e0d806552cb94f35e2a"; - sha256 = "09nrna9l1zj2ma2bazdhdvphwy570kfz4br4xgpwq21rsjrvrqiy"; + # master branch as of 2021-11-29 + rev = "82d3dafa0cfeaad016a427bdbc729eb9509748f1"; + sha256 = "0fmwn584xl0vafcsh72b4xnryfqyjxk5zhmymg5i8rzp6h03n8xq"; }; installPhase = '' From 1191cd58ba5e7b4394e60868029dc114e8dc7de1 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 30 Nov 2021 01:23:01 +0300 Subject: [PATCH 063/106] =?UTF-8?q?viking:=201.9=20=E2=86=92=201.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/viking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 72c0fefd4e6c..cca8032e1834 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "viking"; - version = "1.9"; + version = "1.10"; src = fetchurl { url = "mirror://sourceforge/viking/viking-${version}.tar.bz2"; - sha256 = "0fybpy6k0vmjp231h5ckysl3c0rcnh2afznijwq6y78j4hywyjpy"; + sha256 = "sha256-lFXIlfmLwT3iS9ayNM0PHV7NwbBotMvG62ZE9hJuRaw="; }; nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook yelp-tools ]; From eefac98f1a0e3363a57288703fa1961ea554d13e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 29 Nov 2021 23:19:07 +0000 Subject: [PATCH 064/106] python3Packages.pyvex: fix build for aarch64-linux --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 2d5a83da3957..d054a0c8e8f7 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -22,6 +22,8 @@ buildPythonPackage rec { substituteInPlace vex/Makefile-gcc --replace '/usr/bin/ar' 'ar' ''; + setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ]; + propagatedBuildInputs = [ archinfo bitstring @@ -45,7 +47,5 @@ buildPythonPackage rec { homepage = "https://github.com/angr/pyvex"; license = with licenses; [ bsd2 gpl3Plus lgpl3Plus ]; maintainers = with maintainers; [ fab ]; - # ERROR: pyvex-X-py3-none-manylinux1_aarch64.whl is not a supported wheel on this platform. - broken = stdenv.isAarch64; }; } From fa6ad743e97e9955fce97ca9bb346d13a3e1f9bd Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 29 Nov 2021 23:00:43 +0100 Subject: [PATCH 065/106] zellij: 0.20.1 -> 0.21.0 --- pkgs/tools/misc/zellij/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 480334514edd..edb7f183e6ba 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -6,20 +6,22 @@ , pkg-config , libiconv , openssl +, zellij +, testVersion }: rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-VeFKUNAOhNvNAqIp4yg0dulIVC6vCvD3ClYjMg1vM1g="; + sha256 = "1n033qvidahpfsp4k3x30sav3asldhjlsbydb23vg0v7bxjl2c2q"; }; - cargoSha256 = "sha256-qZjyl+irC5Cj3tpUs97jLxs1UB+7E1xZKbnF3TPFhKE="; + cargoSha256 = "1pjmlwx966pgri58xx2zqr84wili0bzpl9gzhjdkvcx0j1f66anb"; nativeBuildInputs = [ installShellFiles @@ -43,9 +45,12 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/zellij setup --generate-completion zsh) ''; + passthru.tests.version = testVersion { package = zellij; }; + meta = with lib; { description = "A terminal workspace with batteries included"; homepage = "https://zellij.dev/"; + changelog = "https://github.com/zellij-org/zellij/blob/v${version}/Changelog.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ therealansh _0x4A6F ]; }; From 34fa1ffbe4140d501bb8d8bfdee5afdf55d50d10 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 30 Nov 2021 10:36:50 +1000 Subject: [PATCH 066/106] Revert ".github/workflows/editorconfig.yml: Don't use GitHub API for PR diff." This reverts commit 4db84ed126a16e226c5f1a3f13c7bee92fa0a3a4. Causing CI errors. --- .github/workflows/editorconfig.yml | 33 ++++++++++++++++-------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 7433d03eea7d..4cd3a1dfa8e8 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -13,30 +13,33 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: + - name: Get list of changed files from PR + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + echo 'PR_DIFF<> $GITHUB_ENV + gh api \ + repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \ + | jq '.[] | select(.status != "removed") | .filename' \ + >> $GITHUB_ENV + echo 'EOF' >> $GITHUB_ENV - uses: actions/checkout@v2 + with: + # pull_request_target checks out the base branch by default + ref: refs/pull/${{ github.event.pull_request.number }}/merge + if: env.PR_DIFF - uses: cachix/install-nix-action@v16 + if: env.PR_DIFF with: # nixpkgs commit is pinned so that it doesn't break nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz - name: install editorconfig-checker run: nix-env -iA editorconfig-checker -f '' - - name: Get list of changed files from PR - run: | - git fetch origin --depth 1 ${{ github.event.pull_request.head.sha }} - git checkout ${{ github.event.pull_request.head.sha }} - - git fetch origin --depth 1 ${{ github.event.pull_request.base.sha }} - git checkout ${{ github.event.pull_request.base.sha }} - - git fetch origin --depth 1 pull/${{ github.event.pull_request.number }}/merge - # check this out last as editorconfig should check this commit - git checkout FETCH_HEAD - - # everything except --diff-filter=D (deleted) - git diff --diff-filter=ACMRTUXB --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} > $HOME/changed_files + if: env.PR_DIFF - name: Checking EditorConfig + if: env.PR_DIFF run: | - cat $HOME/changed_files | xargs -r editorconfig-checker -disable-indent-size + echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size - if: ${{ failure() }} run: | echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." From 6f968f15727cbf39adbb0d60623f2c11f56eab6b Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 29 Nov 2021 20:00:16 -0500 Subject: [PATCH 067/106] python3Packages.ignite: remove optional pynvml dependency --- pkgs/development/python-modules/ignite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 177fd8915607..da5dfddcfb13 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -8,7 +8,6 @@ , matplotlib , mock , pytorch -, pynvml , scikit-learn , tqdm }: @@ -25,7 +24,7 @@ buildPythonPackage rec { }; checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; - propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ]; + propagatedBuildInputs = [ pytorch scikit-learn tqdm ]; # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite. doCheck = pythonOlder "3.9"; @@ -51,6 +50,7 @@ buildPythonPackage rec { "idist" "mlflow" "tensorboard" + "test_gpu_info" # needs pynvml "test_integration" "test_output_handler" # needs mlflow "test_pbar" # slight output differences From af92f1c0cc2d83361771f7b3f6612219ffca5b3c Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Mon, 29 Nov 2021 03:27:50 -0500 Subject: [PATCH 068/106] [21.11] update README.md [21.11] update upgrading [21.11] update release date run generation --- README.md | 4 ++-- .../from_md/installation/upgrading.chapter.xml | 16 ++++++++-------- .../from_md/release-notes/rl-2111.section.xml | 18 +++++++++--------- .../manual/installation/upgrading.chapter.md | 16 ++++++++-------- .../manual/release-notes/rl-2111.section.md | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index a09b7d92e3e5..e0970f85ff23 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/). * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for the NixOS 21.05 release](https://hydra.nixos.org/jobset/nixos/release-21.05) +* [Continuous package builds for the NixOS 21.11 release](https://hydra.nixos.org/jobset/nixos/release-21.11) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for the NixOS 21.05 release](https://hydra.nixos.org/job/nixos/release-21.05/tested#tabs-constituents) +* [Tests for the NixOS 21.11 release](https://hydra.nixos.org/job/nixos/release-21.11/tested#tabs-constituents) Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/. When successful build and test criteria are diff --git a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml index c0c5a2190fb2..e3b77d4c3650 100644 --- a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml +++ b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml @@ -12,7 +12,7 @@ Stable channels, such as - nixos-21.05. + nixos-21.11. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), @@ -33,7 +33,7 @@ Small channels, such as - nixos-21.05-small + nixos-21.11-small or nixos-unstable-small. These are identical to the stable and unstable channels @@ -60,8 +60,8 @@ When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For - instance, if you installed from a 21.05 ISO, you will be subscribed - to the nixos-21.05 channel. To see which NixOS + instance, if you installed from a 21.11 ISO, you will be subscribed + to the nixos-21.11 channel. To see which NixOS channel you’re subscribed to, run the following as root: @@ -76,17 +76,17 @@ nixos https://nixos.org/channels/nixos-unstable (Be sure to include the nixos parameter at the - end.) For instance, to use the NixOS 21.05 stable channel: + end.) For instance, to use the NixOS 21.11 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos +# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos If you have a server, you may want to use the small channel instead: -# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos +# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos And if you want to live on the bleeding edge: @@ -146,7 +146,7 @@ system.autoUpgrade.allowReboot = true; also specify a channel explicitly, e.g. -system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05; +system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index f0e39471ecee..1e430b94ae7e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1,5 +1,5 @@
- Release 21.11 (“Porcupine”, 2021.11/??) + Release 21.11 (“Porcupine”, 2021/11/30) In addition to numerous new and upgraded packages, this release has the following highlights: @@ -37,7 +37,7 @@ - kOps now defaults to 1.21.1, which uses containerd as the + kops now defaults to 1.21.1, which uses containerd as the default runtime. @@ -84,13 +84,13 @@ - Activation scripts can now opt int to be run when running - nixos-rebuild dry-activate and detect the - dry activation by reading $NIXOS_ACTION. - This allows activation scripts to output what they would - change if the activation was really run. The users/modules - activation script supports this and outputs some of is - actions. + Activation scripts can now, optionally, be run during a + nixos-rebuild dry-activate and can detect + the dry activation by reading + $NIXOS_ACTION. This allows activation + scripts to output what they would change if the activation was + really run. The users/modules activation script supports this + and outputs some of is actions. diff --git a/nixos/doc/manual/installation/upgrading.chapter.md b/nixos/doc/manual/installation/upgrading.chapter.md index b7903b9d3cbb..faeefc4451dc 100644 --- a/nixos/doc/manual/installation/upgrading.chapter.md +++ b/nixos/doc/manual/installation/upgrading.chapter.md @@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated automatically from NixOS's Git repository after certain tests have passed and all packages have been built. These channels are: -- *Stable channels*, such as [`nixos-21.05`](https://nixos.org/channels/nixos-21.05). +- *Stable channels*, such as [`nixos-21.11`](https://nixos.org/channels/nixos-21.11). These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not @@ -19,7 +19,7 @@ passed and all packages have been built. These channels are: radical changes between channel updates. It's not recommended for production systems. -- *Small channels*, such as [`nixos-21.05-small`](https://nixos.org/channels/nixos-21.05-small) +- *Small channels*, such as [`nixos-21.11-small`](https://nixos.org/channels/nixos-21.11-small) or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small). These are identical to the stable and unstable channels described above, except that they contain fewer binary packages. This means they get updated @@ -38,8 +38,8 @@ newest supported stable release. When you first install NixOS, you're automatically subscribed to the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 21.05 ISO, you will be subscribed to -the `nixos-21.05` channel. To see which NixOS channel you're subscribed +instance, if you installed from a 21.11 ISO, you will be subscribed to +the `nixos-21.11` channel. To see which NixOS channel you're subscribed to, run the following as root: ```ShellSession @@ -54,16 +54,16 @@ To switch to a different NixOS channel, do ``` (Be sure to include the `nixos` parameter at the end.) For instance, to -use the NixOS 21.05 stable channel: +use the NixOS 21.11 stable channel: ```ShellSession -# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos +# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos ``` If you have a server, you may want to use the "small" channel instead: ```ShellSession -# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos +# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos ``` And if you want to live on the bleeding edge: @@ -114,5 +114,5 @@ the new generation contains a different kernel, initrd or kernel modules. You can also specify a channel explicitly, e.g. ```nix -system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05; +system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11; ``` diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 3bdda82c026f..71e7669a02a3 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -1,4 +1,4 @@ -# Release 21.11 (“Porcupine”, 2021.11/??) {#sec-release-21.11} +# Release 21.11 (“Porcupine”, 2021.11/29) {#sec-release-21.11} In addition to numerous new and upgraded packages, this release has the following highlights: From b1faa37cdf91a5c06b3eccd2611dc8faa7e6e6ec Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Mon, 29 Nov 2021 10:51:59 -0700 Subject: [PATCH 069/106] 21.11 Release Notes: fix typos --- nixos/doc/manual/release-notes/rl-2111.section.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 71e7669a02a3..e66b2aee2072 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -1,4 +1,4 @@ -# Release 21.11 (“Porcupine”, 2021.11/29) {#sec-release-21.11} +# Release 21.11 (“Porcupine”, 2021/11/30) {#sec-release-21.11} In addition to numerous new and upgraded packages, this release has the following highlights: @@ -12,7 +12,7 @@ In addition to numerous new and upgraded packages, this release has the followin - PHP now defaults to PHP 8.0, updated from 7.4. -- kOps now defaults to 1.21.1, which uses containerd as the default runtime. +- kops now defaults to 1.21.1, which uses containerd as the default runtime. - `python3` now defaults to Python 3.9, updated from Python 3.8. @@ -25,7 +25,7 @@ In addition to numerous new and upgraded packages, this release has the followin - Hadoop now defaults to Hadoop 3, updated from 2. - JournalNode, ZKFS and HTTPFS services have been added. -- Activation scripts can now opt int to be run when running `nixos-rebuild dry-activate` and detect the dry activation by reading `$NIXOS_ACTION`. +- Activation scripts can now, optionally, be run during a `nixos-rebuild dry-activate` and can detect the dry activation by reading `$NIXOS_ACTION`. This allows activation scripts to output what they would change if the activation was really run. The users/modules activation script supports this and outputs some of is actions. From c19234d0dff963a1d49628f648db3d618e8a9c29 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 30 Nov 2021 03:53:14 +0200 Subject: [PATCH 070/106] nixos/tests/installer: increase /boot sizes to 100MB --- nixos/tests/installer.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 513d2506e941..bc41b6efc2e7 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -354,8 +354,8 @@ let createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary linux-swap 50M 1024M" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" + " mkpart primary 1024M -1s", # LUKS "udevadm settle", "mkswap /dev/vda2 -L swap", @@ -456,9 +456,9 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel gpt" - + " mkpart ESP fat32 1M 50MiB" # /boot + + " mkpart ESP fat32 1M 100MiB" # /boot + " set 1 boot on" - + " mkpart primary linux-swap 50MiB 1024MiB" + + " mkpart primary linux-swap 100MiB 1024MiB" + " mkpart primary ext2 1024MiB -1MiB", # / "udevadm settle", "mkswap /dev/vda2 -L swap", @@ -483,8 +483,8 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary linux-swap 50MB 1024M" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100MB 1024M" + " mkpart primary ext2 1024M -1s", # / "udevadm settle", "mkswap /dev/vda2 -L swap", @@ -503,8 +503,8 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary linux-swap 50MB 1024M" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100MB 1024M" + " mkpart primary ext2 1024M -1s", # / "udevadm settle", "mkswap /dev/vda2 -L swap", @@ -599,8 +599,8 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary linux-swap 50M 1024M" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" + " mkpart primary 1024M 1280M" # LUKS with keyfile + " mkpart primary 1280M -1s", "udevadm settle", @@ -674,8 +674,8 @@ in { machine.succeed( "flock /dev/vda parted --script /dev/vda --" + " mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary 50MB 512MB " # swap + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary 100MB 512MB " # swap + " mkpart primary 512MB 1024MB" # Cache (typically SSD) + " mkpart primary 1024MB -1s ", # Backing device (typically HDD) "modprobe bcache", From 2253021b7e911016509bae8ad922f9b8db1d27ac Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Mon, 29 Nov 2021 19:59:54 -0600 Subject: [PATCH 071/106] alfaview: init at 8.32.0 --- .../instant-messengers/alfaview/default.nix | 78 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/alfaview/default.nix diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix new file mode 100644 index 000000000000..52754e3ad529 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -0,0 +1,78 @@ +{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper +, alsa-lib, dbus, fontconfig, freetype, glib, gst_all_1, libGL +, libinput, libpulseaudio, libsecret, libtiff, libxkbcommon +, mesa, openssl, systemd, xorg }: + +stdenv.mkDerivation rec { + pname = "alfaview"; + version = "8.32.0"; + + src = fetchurl { + url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; + sha256 = "sha256-cBf/9MdNXhFRYPAOhQQ8j3rpY4JYh/+NyA7Eji9/E9Q="; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + alsa-lib + dbus + fontconfig + freetype + glib + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + libGL + libinput + libpulseaudio + libsecret + libtiff + libxkbcommon + mesa + openssl + stdenv.cc.cc + systemd + xorg.libX11 + xorg.xcbutilwm + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + ]; + + libPath = lib.makeLibraryPath buildInputs; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + + substituteInPlace $out/share/applications/alfaview.desktop \ + --replace "/opt/alfaview" "$out/bin" \ + --replace "/usr/share/pixmaps/alfaview_production.png" alfaview_production + + makeWrapper $out/opt/alfaview/alfaview $out/bin/alfaview \ + --prefix LD_LIBRARY_PATH : ${libPath} + + runHook postInstall + ''; + + meta = with lib; { + description = "Video-conferencing application, specialized in virtual online meetings, seminars, training sessions and conferences"; + homepage = "https://alfaview.com"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f65cbdb60fc3..40eef05ac004 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23989,6 +23989,8 @@ with pkgs; alembic = callPackage ../development/libraries/alembic {}; + alfaview = callPackage ../applications/networking/instant-messengers/alfaview { }; + alchemy = callPackage ../applications/graphics/alchemy { }; alock = callPackage ../misc/screensavers/alock { }; From c60adb947e363a915e057244cfd1c2d61fa22d9a Mon Sep 17 00:00:00 2001 From: iury fukuda Date: Wed, 17 Nov 2021 19:42:30 -0300 Subject: [PATCH 072/106] kuma: init at 1.4.0 --- .../networking/cluster/kuma/default.nix | 65 +++++++++++++++++++ .../networking/cluster/kumactl/default.nix | 34 ---------- pkgs/top-level/all-packages.nix | 23 ++++++- 3 files changed, 87 insertions(+), 35 deletions(-) create mode 100644 pkgs/applications/networking/cluster/kuma/default.nix delete mode 100644 pkgs/applications/networking/cluster/kumactl/default.nix diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix new file mode 100644 index 000000000000..d7a58f09b4e7 --- /dev/null +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -0,0 +1,65 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, coredns +, installShellFiles +, isFull ? false +, enableGateway ? false +, pname ? "kuma" +, components ? lib.optionals isFull [ + "kumactl" + "kuma-cp" + "kuma-prometheus-sd" + "kuma-dp" + ] +}: + +buildGoModule rec { + inherit pname ; + version = "1.4.0"; + tags = lib.optionals enableGateway ["gateway"]; + vendorSha256 = "1fc5psvbd9bpc6c3y2cpx5dx8cgr2fcp7nln3kwfgbryahq2y8wl"; + + src = fetchFromGitHub { + owner = "kumahq"; + repo = "kuma"; + rev = version; + sha256 = "0agib3w5s270n5rhg54m3p4f21s5fhdrhaks374j7l21njs7xhqb"; + }; + + doCheck = false; + + nativeBuildInputs = [installShellFiles] ++ lib.optionals isFull [coredns]; + + preBuild = '' + export HOME=$TMPDIR + ''; + + subPackages = map (p: "app/" + p) components; + + postInstall = lib.concatMapStringsSep "\n" (p: '' + installShellCompletion --cmd ${p} \ + --bash <($out/bin/${p} completion bash) \ + --fish <($out/bin/${p} completion fish) \ + --zsh <($out/bin/${p} completion zsh) + '') components + lib.optionalString isFull '' + ln -sLf ${coredns}/bin/coredns $out/bin + ''; + + ldflags = let + prefix = "github.com/kumahq/kuma/pkg/version"; + in [ + "-s" "-w" + "-X ${prefix}.version=${version}" + "-X ${prefix}.gitTag=${version}" + "-X ${prefix}.gitCommit=${version}" + "-X ${prefix}.buildDate=${version}" + ]; + + meta = with lib; { + description = "Service mesh controller"; + homepage = "https://kuma.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ zbioe ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kumactl/default.nix b/pkgs/applications/networking/cluster/kumactl/default.nix deleted file mode 100644 index d13db27444fb..000000000000 --- a/pkgs/applications/networking/cluster/kumactl/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { - pname = "kumactl"; - version = "1.3.1"; - - src = fetchFromGitHub { - owner = "kumahq"; - repo = "kuma"; - rev = version; - sha256 = "0b554cngg2j3wnadpqwhq3dv3la8vvvzyww2diw4il4gl4j6xj0j"; - }; - - vendorSha256 = "0r26h4vp11wbl7nk3y7c22p60q7lspy8nr58khxyczdqjk6wrdjp"; - - subPackages = [ "app/kumactl" ]; - - ldflags = let - prefix = "github.com/kumahq/kuma/pkg/version"; - in [ - "-s" "-w" - "-X ${prefix}.version=${version}" - "-X ${prefix}.gitTag=${version}" - "-X ${prefix}.gitCommit=${version}" - "-X ${prefix}.buildDate=${version}" - ]; - - meta = with lib; { - description = "Kuma service mesh controller"; - homepage = "https://kuma.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ zbioe ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c6b850e8f57..0b40bb0bb1cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26275,7 +26275,28 @@ with pkgs; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; linkerd_stable = linkerd; - kumactl = callPackage ../applications/networking/cluster/kumactl { }; + kuma = callPackage ../applications/networking/cluster/kuma { isFull = true; }; + kuma-experimental = callPackage ../applications/networking/cluster/kuma { + isFull = true; + enableGateway = true; + pname = "kuma-experimental"; + }; + kumactl = callPackage ../applications/networking/cluster/kuma { + components = ["kumactl"]; + pname = "kumactl"; + }; + kuma-cp = callPackage ../applications/networking/cluster/kuma { + components = ["kuma-cp"]; + pname = "kuma-cp"; + }; + kuma-dp = callPackage ../applications/networking/cluster/kuma { + components = ["kuma-dp"]; + pname = "kuma-dp"; + }; + kuma-prometheus-sd = callPackage ../applications/networking/cluster/kuma { + components = ["kuma-prometheus-sd"]; + pname = "kuma-prometheus-sd"; + }; kile-wl = callPackage ../applications/misc/kile-wl { }; From 34ec1a380a6897ffe631aabe0612c367a5bb3727 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Sun, 21 Nov 2021 13:01:45 +0800 Subject: [PATCH 073/106] webdav-server-rs: init at unstable-2021-08-16 --- pkgs/servers/webdav-server-rs/default.nix | 47 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/servers/webdav-server-rs/default.nix diff --git a/pkgs/servers/webdav-server-rs/default.nix b/pkgs/servers/webdav-server-rs/default.nix new file mode 100644 index 000000000000..06c8716ba877 --- /dev/null +++ b/pkgs/servers/webdav-server-rs/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, libtirpc +, pam +, rpcsvc-proto +, enablePAM ? stdenv.isLinux +}: + +rustPlatform.buildRustPackage rec { + pname = "webdav-server-rs"; + # The v0.4.0 tag cannot build. So we use the 547602e commit. + version = "unstable-2021-08-16"; + + src = fetchFromGitHub { + owner = "miquels"; + repo = pname; + rev = "547602e78783935b4ddd038fb795366c9c476bcc"; + sha256 = "sha256-nTygUEjAUXD0mRTmjt8/UPVfZA4rP6oop1s/fI5mYeg="; + }; + + cargoHash = "sha256-TDDfGQig4i/DpsilTPqMQ1oT0mXK5DKlZmwsPPLrzFc="; + + buildInputs = [ libtirpc ] ++ lib.optional enablePAM pam; + nativeBuildInputs = [ rpcsvc-proto ]; + + buildNoDefaultFeatures = true; + buildFeatures = [ "quota" ] ++ lib.optional enablePAM "pam"; + + postPatch = '' + substituteInPlace fs_quota/build.rs \ + --replace '/usr/include/tirpc' '${libtirpc.dev}/include/tirpc' + ''; + + meta = with lib; { + description = "An implementation of WebDAV server in Rust"; + longDescription = '' + webdav-server-rs is an implementation of WebDAV with full support for + RFC4918. It also supports local unix accounts, PAM authentication, and + quota. + ''; + homepage = "https://github.com/miquels/webdav-server-rs"; + license = licenses.asl20; + maintainers = with maintainers; [ pmy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76ca8774dcfe..22f426d4f364 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21697,6 +21697,8 @@ with pkgs; webdav = callPackage ../servers/webdav { }; + webdav-server-rs = callPackage ../servers/webdav-server-rs { }; + webmetro = callPackage ../servers/webmetro { }; wsdd = callPackage ../servers/wsdd { }; From ce4ad53e6a985ba9d35462d4734014223fa79758 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Sun, 21 Nov 2021 13:04:06 +0800 Subject: [PATCH 074/106] nixos/webdav-server-rs: init --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../network-filesystems/webdav-server-rs.nix | 144 ++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 nixos/modules/services/network-filesystems/webdav-server-rs.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index f392ca52566f..273ed95e1bce 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -351,6 +351,7 @@ in hqplayer = 319; moonraker = 320; distcc = 321; + webdav = 322; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -656,6 +657,7 @@ in hqplayer = 319; moonraker = 320; distcc = 321; + webdav = 322; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9eca0b8d65f2..1d51fca02fbf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -685,6 +685,7 @@ ./services/network-filesystems/diod.nix ./services/network-filesystems/u9fs.nix ./services/network-filesystems/webdav.nix + ./services/network-filesystems/webdav-server-rs.nix ./services/network-filesystems/yandex-disk.nix ./services/network-filesystems/xtreemfs.nix ./services/network-filesystems/ceph.nix diff --git a/nixos/modules/services/network-filesystems/webdav-server-rs.nix b/nixos/modules/services/network-filesystems/webdav-server-rs.nix new file mode 100644 index 000000000000..1c5c299cb673 --- /dev/null +++ b/nixos/modules/services/network-filesystems/webdav-server-rs.nix @@ -0,0 +1,144 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.webdav-server-rs; + format = pkgs.formats.toml { }; + settings = recursiveUpdate + { + server.uid = config.users.users."${cfg.user}".uid; + server.gid = config.users.groups."${cfg.group}".gid; + } + cfg.settings; +in +{ + options = { + services.webdav-server-rs = { + enable = mkEnableOption "WebDAV server"; + + user = mkOption { + type = types.str; + default = "webdav"; + description = "User to run under when setuid is not enabled."; + }; + + group = mkOption { + type = types.str; + default = "webdav"; + description = "Group to run under when setuid is not enabled."; + }; + + settings = mkOption { + type = format.type; + default = { }; + description = '' + Attrset that is converted and passed as config file. Available + options can be found at + here. + ''; + example = literalExpression '' + { + server.listen = [ "0.0.0.0:4918" "[::]:4918" ]; + accounts = { + auth-type = "htpasswd.default"; + acct-type = "unix"; + }; + htpasswd.default = { + htpasswd = "/etc/htpasswd"; + }; + location = [ + { + route = [ "/public/*path" ]; + directory = "/srv/public"; + handler = "filesystem"; + methods = [ "webdav-ro" ]; + autoindex = true; + auth = "false"; + } + { + route = [ "/user/:user/*path" ]; + directory = "~"; + handler = "filesystem"; + methods = [ "webdav-rw" ]; + autoindex = true; + auth = "true"; + setuid = true; + } + ]; + } + ''; + }; + + configFile = mkOption { + type = types.path; + default = format.generate "webdav-server.toml" settings; + defaultText = "Config file generated from services.webdav-server-rs.settings"; + description = '' + Path to config file. If this option is set, it will override any + configuration done in services.webdav-server-rs.settings. + ''; + example = "/etc/webdav-server.toml"; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = hasAttr cfg.user config.users.users && config.users.users."${cfg.user}".uid != null; + message = "users.users.${cfg.user} and users.users.${cfg.user}.uid must be defined."; + } + { + assertion = hasAttr cfg.group config.users.groups && config.users.groups."${cfg.group}".gid != null; + message = "users.groups.${cfg.group} and users.groups.${cfg.group}.gid must be defined."; + } + ]; + + users.users = optionalAttrs (cfg.user == "webdav") { + webdav = { + description = "WebDAV user"; + group = cfg.group; + uid = config.ids.uids.webdav; + }; + }; + + users.groups = optionalAttrs (cfg.group == "webdav") { + webdav.gid = config.ids.gids.webdav; + }; + + systemd.services.webdav-server-rs = { + description = "WebDAV server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.webdav-server-rs}/bin/webdav-server -c ${cfg.configFile}"; + + CapabilityBoundingSet = [ + "CAP_SETUID" + "CAP_SETGID" + ]; + + NoExecPaths = [ "/" ]; + ExecPaths = [ "/nix/store" ]; + + # This program actively detects if it is running in root user account + # when it starts and uses root privilege to switch process uid to + # respective unix user when a user logs in. Maybe we can enable + # DynamicUser in the future when it's able to detect CAP_SETUID and + # CAP_SETGID capabilities. + + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = true; + }; + }; + }; + + meta.maintainers = with maintainers; [ pmy ]; +} From 4abccb54668940f1d83c825daab64620a727ebb6 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Mon, 22 Nov 2021 12:18:55 +0800 Subject: [PATCH 075/106] nixos/webdav: set uid and gid --- nixos/modules/services/network-filesystems/webdav.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/network-filesystems/webdav.nix b/nixos/modules/services/network-filesystems/webdav.nix index 48602390bd74..a810af40fd47 100644 --- a/nixos/modules/services/network-filesystems/webdav.nix +++ b/nixos/modules/services/network-filesystems/webdav.nix @@ -80,13 +80,13 @@ in users.users = mkIf (cfg.user == "webdav") { webdav = { description = "WebDAV daemon user"; - isSystemUser = true; group = cfg.group; + uid = config.ids.uids.webdav; }; }; users.groups = mkIf (cfg.group == "webdav") { - webdav = { }; + webdav.gid = config.ids.gids.webdav; }; systemd.services.webdav = { From 94d1b0d54154614c17be5e4c9465f05b45cf851d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 30 Nov 2021 09:13:44 +0800 Subject: [PATCH 076/106] pantheon.elementary-files: 6.0.4 -> 6.1.0 --- .../apps/elementary-files/default.nix | 6 ++-- ...-portal-hardcode-gsettings-for-nixos.patch | 28 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index dcd4591f1363..91dc48cf1c2f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.0.4"; + version = "6.1.0"; repoName = "files"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-FH6EYtgKADp8jjBoCwsdRdknlKS9v3iOtPiT3CyEc/8="; + sha256 = "sha256-aGiFEeSvDV5rPD2Ll/BuDoWclEPhR1UuoCxUSS9CGmw="; }; passthru = { @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { chmod +x meson/post_install.py patchShebangs meson/post_install.py - substituteInPlace filechooser-portal/LegacyFileChooserDialog.vala \ + substituteInPlace filechooser-portal/FileChooserDialog.vala \ --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch b/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch index b04208cc8b86..9ad9ee542728 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch +++ b/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch @@ -1,24 +1,24 @@ -From 726ab4c0ab01273cb2197e4c151a5b69ff0954b6 Mon Sep 17 00:00:00 2001 +From 256d80aa2ab2b84316260d0be5263b02fd5e796f Mon Sep 17 00:00:00 2001 From: Bobby Rong -Date: Fri, 16 Jul 2021 18:24:58 +0800 +Date: Tue, 30 Nov 2021 10:24:39 +0800 Subject: [PATCH] filechooser-portal: hardcode gsettings for nixos --- - filechooser-portal/LegacyFileChooserDialog.vala | 4 +++- + filechooser-portal/FileChooserDialog.vala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/filechooser-portal/LegacyFileChooserDialog.vala b/filechooser-portal/LegacyFileChooserDialog.vala -index 330718f..f383bb1 100644 ---- a/filechooser-portal/LegacyFileChooserDialog.vala -+++ b/filechooser-portal/LegacyFileChooserDialog.vala -@@ -60,7 +60,9 @@ public class Files.LegacyFileChooserDialog : Object { - /* If not local only during creation, strange bug occurs on fresh installs */ - chooser_dialog.local_only = true; +diff --git a/filechooser-portal/FileChooserDialog.vala b/filechooser-portal/FileChooserDialog.vala +index 4a84016db..4bf2b32a1 100755 +--- a/filechooser-portal/FileChooserDialog.vala ++++ b/filechooser-portal/FileChooserDialog.vala +@@ -160,7 +160,9 @@ public class Files.FileChooserDialog : Hdy.Window, Xdp.Request { + accept_button.grab_default (); + setup_chooser (); -- var chooser_settings = new Settings ("io.elementary.files.file-chooser"); +- var settings = new Settings ("io.elementary.files.file-chooser"); + SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); + SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false); -+ var chooser_settings = new Settings.full (chooser_schema, null, null); - - action_area = (Gtk.ButtonBox) chooser_dialog.get_action_area (); ++ var settings = new Settings.full (chooser_schema, null, null); + int width, height; + settings.get ("window-size", "(ii)", out width, out height); From 94365b62a84143b1f59d155a761e8409ac4f1b11 Mon Sep 17 00:00:00 2001 From: Joel Date: Tue, 30 Nov 2021 15:01:10 +1000 Subject: [PATCH 077/106] apkeep: 0.6.0 -> 0.7.0 --- pkgs/tools/misc/apkeep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index 4f6d4d983eb8..fb3568451836 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "apkeep"; - version = "0.6.0"; + version = "0.7.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-RTzYvDkmE0kgl4FSOSjDuQ5G1E0ugFU41zVAMMroofM="; + sha256 = "0anfp3nwsainx9sw4njcmkzczq1rmib3dyncwhcf7y3j9v978d3h"; }; - cargoSha256 = "sha256-YFs2AOMGp0WNrceK14AnigZdJl+UsQdUchpxaI7HSXw="; + cargoSha256 = "0npw8f8c0qcprcins0pc12c5w47kv8dd1nrzv4xyllr44vx488mc"; prePatch = '' rm .cargo/config.toml From d05b606009fc8e8780ba5223349a789d320167fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 15:05:59 +0000 Subject: [PATCH 078/106] opencl-clhpp: 2.0.12 -> 2.0.15 --- pkgs/development/libraries/opencl-clhpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix index b6aa71491680..8410aa4aa063 100644 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/pkgs/development/libraries/opencl-clhpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opencl-clhpp"; - version = "2.0.12"; + version = "2.0.15"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-CLHPP"; rev = "v${version}"; - sha256 = "04g3mg2cpbi048fxxkghra81bpxzqr4r3gspx5mvqipx1lzypsci"; + sha256 = "sha256-A12GdevbMaO2QkGAk3VsXzwcDkF+6dEapse2xfdqzPM="; }; nativeBuildInputs = [ cmake python3 ]; From af21d41260846fb9c9840a75e310e56dfe97d6a3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 30 Nov 2021 13:20:21 +0800 Subject: [PATCH 079/106] .github/PULL_REQUEST_TEMPLATE.md, CONTRIBUTING.md: 21.11 -> 22.05 (#147977) * .github/PULL_REQUEST_TEMPLATE.md: 21.11 -> 22.05 * CONTRIBUTING.md: 21.11 -> 22.05 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- CONTRIBUTING.md | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 35c70da769f1..268b1594de71 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -28,7 +28,7 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing- - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) -- [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes) +- [22.05 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2205-release-notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0219aec7f528..e3a18c6e7eb4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,10 +53,10 @@ For package version upgrades and such a one-line commit message is usually suffi Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches). 1. Take note of the commits in which the change was introduced into `master` branch. -2. Check out the target _release branch_, e.g. `release-20.09`. Do not use a _channel branch_ like `nixos-20.09` or `nixpkgs-20.09`. +2. Check out the target _release branch_, e.g. `release-21.11`. Do not use a _channel branch_ like `nixos-21.11` or `nixpkgs-21.11-darwin`. 3. Create a branch for your change, e.g. `git checkout -b backport`. 4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe ` and add a reason. Otherwise use `git cherry-pick -x `. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. -5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`. +5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-21.11`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[21.11]`. 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. ## Criteria for Backporting changes @@ -68,17 +68,17 @@ Anything that does not cause user or downstream dependency regressions can be ba - Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`) - Security critical applications (E.g. `firefox`) -## Generating 21.11 Release Notes +## Generating 22.05 Release Notes -(This section also applies to backporting 21.05 release notes: substitute "rl-2111" for "rl-2105".) +(This section also applies to backporting 21.11 release notes: substitute "rl-2205" for "rl-2111".) Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document. -Steps for updating 21.11 Release notes: +Steps for updating 22.05 Release notes: -1. Edit `nixos/doc/manual/release-notes/rl-2111.section.md` with the desired changes -2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2111.section.xml` -3. Include changes to `rl-2111.section.md` and `rl-2111.section.xml` in the same commit. +1. Edit `nixos/doc/manual/release-notes/rl-2205.section.md` with the desired changes +2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2205.section.xml` +3. Include changes to `rl-2205.section.md` and `rl-2205.section.xml` in the same commit. ## Reviewing contributions From bc3eea0c68d0be91f7491d22df63f2665ec3e1dc Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Mon, 29 Nov 2021 03:26:46 -0600 Subject: [PATCH 080/106] chezmoi: 2.7.4 -> 2.9.0 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index d9ac3a894c67..debbe6c0a53b 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.7.4"; + version = "2.9.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-RX9Hgjl/i/FWXHFp+yYWQEYDiOQijU+eiBnREu4K1Mg="; + sha256 = "sha256-jeg9XI2enNyZvv2D4URWluCaT+oD8QbHItx2etrGBpQ="; }; - vendorSha256 = "sha256-tz3Vcw/p7BKcgc3EsLsSPOKhwqN5kysOcmER7OoKQ+w="; + vendorSha256 = "sha256-jaEaVfPlYbmQ998KwZm8PUfbNlPEIr1lX5fx90jcqV4="; doCheck = false; From 3c92df54cc3135abc77195424f9745028aefbc24 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Tue, 30 Nov 2021 08:32:57 +0100 Subject: [PATCH 081/106] protoc-gen-twirp: 8.1.0 -> 8.1.1 --- pkgs/development/tools/protoc-gen-twirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-twirp/default.nix b/pkgs/development/tools/protoc-gen-twirp/default.nix index 363dfcaed612..663fa37b62c9 100644 --- a/pkgs/development/tools/protoc-gen-twirp/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "protoc-gen-twirp"; - version = "8.1.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "twitchtv"; repo = "twirp"; rev = "v${version}"; - sha256 = "sha256-ezSNrDfOE1nj4FlX7E7Z7/eGfQw1B7NP34aj8ml5pDk="; + sha256 = "sha256-PnL7jgxAx/Xk/wajtQ+Q1G9KLes2NVANF2YmBcGFqe0="; }; goPackagePath = "github.com/twitchtv/twirp"; From 0a989ec7caa63aabd47b4aff5aecd5a754cd6cea Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 30 Nov 2021 15:38:11 +0800 Subject: [PATCH 082/106] pantheon.elementary-files: drop filechooser-portal-hardcode-gsettings-for-nixos.patch --- .../apps/elementary-files/default.nix | 8 +------ ...-portal-hardcode-gsettings-for-nixos.patch | 24 ------------------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 91dc48cf1c2f..747f9662680d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { bamf elementary-dock elementary-icon-theme + glib granite gtk3 libcanberra @@ -82,16 +83,9 @@ stdenv.mkDerivation rec { zeitgeist ]; - patches = [ - ./filechooser-portal-hardcode-gsettings-for-nixos.patch - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py - - substituteInPlace filechooser-portal/FileChooserDialog.vala \ - --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch b/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch deleted file mode 100644 index 9ad9ee542728..000000000000 --- a/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 256d80aa2ab2b84316260d0be5263b02fd5e796f Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Tue, 30 Nov 2021 10:24:39 +0800 -Subject: [PATCH] filechooser-portal: hardcode gsettings for nixos - ---- - filechooser-portal/FileChooserDialog.vala | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/filechooser-portal/FileChooserDialog.vala b/filechooser-portal/FileChooserDialog.vala -index 4a84016db..4bf2b32a1 100755 ---- a/filechooser-portal/FileChooserDialog.vala -+++ b/filechooser-portal/FileChooserDialog.vala -@@ -160,7 +160,9 @@ public class Files.FileChooserDialog : Hdy.Window, Xdp.Request { - accept_button.grab_default (); - setup_chooser (); - -- var settings = new Settings ("io.elementary.files.file-chooser"); -+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); -+ SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false); -+ var settings = new Settings.full (chooser_schema, null, null); - int width, height; - - settings.get ("window-size", "(ii)", out width, out height); From a0683eed686936a99810f2b0b215485f37e8664b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20George=20Dr=C3=B6ge?= Date: Tue, 30 Nov 2021 10:00:56 +0100 Subject: [PATCH 083/106] python3Packages.ipympl: 0.8.0 -> 0.8.2 --- .../development/python-modules/ipympl/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 4075ae5d1909..ff4880e49f9e 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -1,21 +1,22 @@ { lib , buildPythonPackage , fetchPypi +, ipykernel , ipywidgets -, matplotlib -, jupyter-packaging }: buildPythonPackage rec { pname = "ipympl"; - version = "0.8.0"; + version = "0.8.2"; + format = "wheel"; src = fetchPypi { - inherit pname version; - sha256 = "ef5d21820ed88a8bd6efddb884c333d0eaea7f2f7d4b3054e6d386b07a36dd9d"; + inherit pname version format; + sha256 = "0509gzm5557lyxx8k3qqgp14ifnmfx796cfc8f592mv97pxkyibl"; }; - propagatedBuildInputs = [ ipywidgets matplotlib jupyter-packaging ]; + + propagatedBuildInputs = [ ipykernel ipywidgets ]; # There are no unit tests in repository doCheck = false; @@ -24,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Matplotlib Jupyter Extension"; homepage = "https://github.com/matplotlib/jupyter-matplotlib"; - maintainers = with maintainers; [ jluttine ]; + maintainers = with maintainers; [ jluttine fabiangd ]; license = licenses.bsd3; }; } From 9d3d02f9c1272f1845bcd3295a22f4a3acb6326a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 30 Nov 2021 09:04:12 +0000 Subject: [PATCH 084/106] screen: disable parallel build (#147990) Parallel build fails for missing generated header dependencies: screen.h:48:10: fatal error: comm.h: No such file or directory 48 | #include "comm.h" | ^~~~~~~~ Upstream fixes are intermingled with added features and are not straightforward to backport. Let's disable parallelism until next release. --- pkgs/tools/misc/screen/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index d1e02e8b9a36..dd61b82d4080 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ] ++ lib.optional stdenv.isLinux pam ++ lib.optional stdenv.isDarwin utmp; + # Build fails due to missing dependencies on autogenerated header: + # screen.h:48:10: fatal error: comm.h: No such file or directory + # It will be fixed in next screen-4.9.0 release. The patches are + # invasive. Disabling parallelism for 4.8.0. + enableParallelBuilding = false; + doCheck = true; meta = with lib; { From eab0561eb02a240c9ce7797b2be4119a167e3194 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 30 Nov 2021 20:12:29 +1100 Subject: [PATCH 085/106] singularity: 3.8.4 -> 3.8.5 --- pkgs/applications/virtualization/singularity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index e8d78c5bb4a1..4d6fb0ef4afa 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.8.4"; + version = "3.8.5"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-y5Xm1osNIPK4fWDyOjv3B7fT6HzuDdSqQ4D49IGlfrw="; + sha256 = "sha256-f/94tcB7XU0IJpvSZ6xemUOQ+TMyHlTv1rfIZoMVPOQ="; }; goPackagePath = "github.com/sylabs/singularity"; From 62df72857c2987a270e0bdb7c6f2738f56132e4a Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Tue, 30 Nov 2021 20:34:17 +1300 Subject: [PATCH 086/106] pythonPackages.requests-toolbelt: disable time-dependant tests Tests include certificates and fail because they are expired. Upstream issue exists but has been ignored: https://github.com/requests/toolbelt/issues/306 closes #147776 --- pkgs/development/python-modules/requests-toolbelt/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index 5a87d0a0e05b..3ad219025a92 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -24,7 +24,9 @@ buildPythonPackage rec { # disabled tests access the network py.test tests -k "not test_no_content_length_header \ and not test_read_file \ - and not test_reads_file_from_url_wrapper" + and not test_reads_file_from_url_wrapper \ + and not test_x509_der \ + and not test_x509_pem" ''; meta = { From 716815ce2a1fcb135843c7441648a59d62fb6eb6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 30 Nov 2021 09:33:42 +0000 Subject: [PATCH 087/106] re2: enable parallel builds (#147991) --- pkgs/development/libraries/re2/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index d2942e6be2a0..a70ad0f69e03 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "re2"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1fyhypw345xz8zdh53gz6j1fwgrx0gszk1d349ja37dpxh4jp2jh"; }; + patches = [ + # Pull upstreal fix for parallel testing. + (fetchpatch { + name = "parallel-tests.patch"; + url = "https://github.com/google/re2/commit/9262284a7edc1b83e7172f4ec2d7967d695e7420.patch"; + sha256 = "1knhfx9cs4841r09jw4ha6mdx9qwpvlcxvd04i8vr84kd0lilqms"; + }) + ]; + preConfigure = '' substituteInPlace Makefile --replace "/usr/local" "$out" # we're using gnu sed, even on darwin @@ -19,6 +28,8 @@ stdenv.mkDerivation rec { buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ]; + enableParallelBuilding = true; + preCheck = "patchShebangs runtests"; doCheck = true; checkTarget = "test"; From b5a27cef4bb1d99b1e7bc61c07f84b6f4f2a383b Mon Sep 17 00:00:00 2001 From: philipp Date: Tue, 30 Nov 2021 11:12:50 +0100 Subject: [PATCH 088/106] nextcloud21: 21.0.5 -> 21.0.7 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 0b7fb6f50fe7..348ffa0e37e0 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,8 +46,8 @@ in { ''; nextcloud21 = generic { - version = "21.0.5"; - sha256 = "1q46h480kn97k7h3xm7r5gsa8l3f0kfiicapi46sh0p39pbjbyhv"; + version = "21.0.7"; + sha256 = "sha256-WZMhWW613q5c6grR/dzVSCKJKru7XPtRoxgBhi8VE7c="; }; nextcloud22 = generic { From 87aed70b18c88598f7f27d79e0e53f673a7e5094 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 30 Nov 2021 11:59:48 +0100 Subject: [PATCH 089/106] warzone2100: 4.2.2 -> 4.2.3 --- pkgs/games/warzone2100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 96d2e303bceb..9dc3cb1dd3af 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-F7TlnlQeEfGp1IBXlfKUgILKukUQxBFkoqXYmxfQOpk="; + sha256 = "sha256-nmHl/Qk8Knck9kDF8cuPUzOUxNNx0Vk/g1NW/H82vo0="; }; buildInputs = [ From 5d06f6933d5373f9f4c4ea63d03029869855f876 Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Sun, 6 Jun 2021 12:45:40 +0200 Subject: [PATCH 090/106] qemu, runInLinuxVM: fix KVM availability check KVM should only be considered abailable if /dev/kvm exists and is read-writable by the user that is trying to launch it. The previous check for existance only had the consequence that on some Linux distributions running VMs with Nix's QEMU only worked if KVM was NOT installed. fixes #124371 --- pkgs/applications/virtualization/qemu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 93a215f1003b..7e89871786d6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -231,7 +231,7 @@ stdenv.mkDerivation rec { if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \ $out/bin/qemu-kvm \ - --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" + --add-flags "\$([ -r /dev/kvm -a -w /dev/kvm ] && echo -enable-kvm)" fi ''; From 08bbd123d562fb13d031cdd955dbe21097a6e9c0 Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Fri, 5 Nov 2021 19:13:47 +0100 Subject: [PATCH 091/106] qemu: emit warnings when KVM acceleration is not usable This fixes the qemu-kvm wrapper we add for convenience silently not using KVM, when the system would support it by at least leaving an indication in the log that the build ran slower because it ran without KVM. --- .../virtualization/qemu/default.nix | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7e89871786d6..b4a31c657cdc 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool -, makeWrapper, autoPatchelfHook +, makeWrapper, autoPatchelfHook, runtimeShell , attr, libcap, libcap_ng , CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl @@ -228,9 +228,12 @@ stdenv.mkDerivation rec { # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' + cp -- $emitKvmWarningsPath $out/libexec/emit-kvm-warnings + chmod a+x -- $out/libexec/emit-kvm-warnings if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \ $out/bin/qemu-kvm \ + --run $out/libexec/emit-kvm-warnings \ --add-flags "\$([ -r /dev/kvm -a -w /dev/kvm ] && echo -enable-kvm)" fi ''; @@ -242,6 +245,26 @@ stdenv.mkDerivation rec { # Builds in ~3h with 2 cores, and ~20m with a big-parallel builder. requiredSystemFeatures = [ "big-parallel" ]; + emitKvmWarnings = '' + #!${runtimeShell} + WARNCOL='\033[1;35m' + NEUTRALCOL='\033[0m' + WARNING="''${WARNCOL}warning:''${NEUTRALCOL}" + if [ ! -e /dev/kvm ]; then + echo -e "''${WARNING} KVM is not available - execution will be slow" >&2 + echo "Consider installing KVM for hardware-accelerated execution." >&2 + echo "If KVM is already installed make sure the kernel module is loaded." >&2 + elif [ ! -r /dev/kvm -o ! -w /dev/kvm ]; then + echo -e "''${WARNING} /dev/kvm is not read-/writable - execution will be slow" >&2 + echo "/dev/kvm needs to be read-/writable by the user executing QEMU." >&2 + echo "" >&2 + echo "For hardware-acceleration inside the nix build sandbox /dev/kvm" >&2 + echo "must be world-read-/writable (rw-rw-rw-)." >&2 + fi + ''; + + passAsFile = [ "emitKvmWarnings" ]; + meta = with lib; { homepage = "http://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; From af180d554b5a81878cd030f65a470f56116c7566 Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Mon, 22 Nov 2021 16:38:20 +0100 Subject: [PATCH 092/106] qemu, runInLinuxVM: change default cpu to qemu64 The flag -cpu max leaves QEMU 6.1.0 stuck on some systems, for example when /dev/kvm is not read-writable. This does not happen with -cpu qemu64. Getting stuck like that is a regression in 6.1.0 not yet present in 6.0.0 and should be fixed with 6.2.0 according to early testing with rc1. We should consider reverting this change when we merge QEMU 6.2.0. See #146526. fixes #141596 --- nixos/lib/qemu-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index 1a1f7531feb0..f3af85040bd6 100644 --- a/nixos/lib/qemu-common.nix +++ b/nixos/lib/qemu-common.nix @@ -22,7 +22,7 @@ rec { else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { - x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max"; + x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu qemu64"; armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; From 442468f4ade3b315e1c9e092536109a79f600d9b Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 28 Nov 2021 09:29:49 -0500 Subject: [PATCH 093/106] python3Packages.pyarrow: enable dataset module --- pkgs/development/python-modules/pyarrow/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 7360cab01f37..762b1db02c51 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -17,7 +17,10 @@ buildPythonPackage rec { checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; PYARROW_BUILD_TYPE = "release"; + + PYARROW_WITH_DATASET = true; PYARROW_WITH_PARQUET = true; + PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" @@ -62,6 +65,6 @@ buildPythonPackage rec { homepage = "https://arrow.apache.org/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ veprbl ]; + maintainers = with maintainers; [ veprbl cpcloud ]; }; } From da8dfd5128d9ba847b48ea21fbf4da7a313cfb34 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 28 Nov 2021 09:30:24 -0500 Subject: [PATCH 094/106] python3Packages.pyarrow: enable flight module --- pkgs/development/libraries/arrow-cpp/default.nix | 3 +++ pkgs/development/python-modules/pyarrow/default.nix | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 574ba3b12501..55efb99b8bd0 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -238,4 +238,7 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ tobim veprbl cpcloud ]; }; + passthru = { + inherit enableFlight enableJemalloc enableS3 enableGcs; + }; } diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 762b1db02c51..9c74f0a5ea6a 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { PYARROW_BUILD_TYPE = "release"; PYARROW_WITH_DATASET = true; + PYARROW_WITH_FLIGHT = _arrow-cpp.enableFlight; PYARROW_WITH_PARQUET = true; PYARROW_CMAKE_OPTIONS = [ @@ -28,9 +29,13 @@ buildPythonPackage rec { # ourselves "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" ]; + ARROW_HOME = _arrow-cpp; PARQUET_HOME = _arrow-cpp; + ARROW_TEST_DATA = lib.optionalString doCheck _arrow-cpp.ARROW_TEST_DATA; + + doCheck = true; dontUseCmakeConfigure = true; preBuild = '' From de6181dc51d9606848becf5cc469fbb7225cae70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Fro=C5=82ow?= Date: Tue, 30 Nov 2021 13:31:50 +0000 Subject: [PATCH 095/106] nixos/acme: fix typo in docs --- nixos/modules/security/acme.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 8249da948c6d..bf93800a0af4 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -253,7 +253,7 @@ chmod 400 /var/lib/secrets/certs.secret - Now you're all set to generate certs! You should monitor the first invokation + Now you're all set to generate certs! You should monitor the first invocation by running systemctl start acme-example.com.service & journalctl -fu acme-example.com.service and watching its log output. From 86bc7865897ba69e54c394ffb86f541af8919dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Tue, 30 Nov 2021 13:57:36 +0000 Subject: [PATCH 096/106] ledger-live-desktop: 2.35.1 -> 2.35.2 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index eb44dc219b66..55d928e6072f 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.35.1"; + version = "2.35.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256:0z60c4sjq63r5rs95rbv7afliia05l1p9bgfd5zv7i51qxgzfs4a"; + hash = "sha256-VJr1H6YcPtCzm6FeFA+rNANvYUQ3wZQalI9RdSv68cI="; }; appimageContents = appimageTools.extractType2 { From 1143032da0c331dae5f24f29a51b9a0d83894277 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Nov 2021 15:41:47 +0100 Subject: [PATCH 097/106] solanum: unstable-2021-04-27 -> unstable-2021-11-14 --- pkgs/servers/irc/solanum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index d5e70799cf54..9dc7a8abe2c8 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "solanum"; - version = "unstable-2021-04-27"; + version = "unstable-2021-11-14"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = pname; - rev = "3ff5a12e75662e9a642f2a4364797bd361eb0925"; - sha256 = "14ywmfdv8cncbyg08y2qdis00kwg8lvhkcgj185is67smh0qf88f"; + rev = "bd38559fedcdfded4d9acbcbf988e4a8f5057eeb"; + sha256 = "sha256-2P+mqf5b+TD9+9dLahXOdH7ZZhPWUoR1eV73YHbRbAA="; }; patches = [ From 6700494410b7cf9c24d2a1515fb7731d9ff21249 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 30 Nov 2021 11:50:03 -0300 Subject: [PATCH 098/106] babashka: 0.6.5 -> 0.6.7 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 5e7731b69039..3b7f611f2c9b 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.6.5"; + version = "0.6.7"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-72D/HzDIxkGD4zTPE9gHf/uFtboLbNnT7CTslSlAqjc="; + sha256 = "sha256-e5Mq2fPYqsPEENVGO+gBz9K79KcKOykdDtItjcXU/DI="; }; executable = "bb"; From dad4fddd52923d90c5ad981d5e29963e829de3c1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 30 Nov 2021 16:06:21 +0100 Subject: [PATCH 099/106] nixos/nvidia: check modesetting for gdm-wayland only when gdm is enabled Reported in https://github.com/NixOS/nixpkgs/pull/147153#issuecomment-982695772 --- nixos/modules/hardware/video/nvidia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 5b379505608a..ff4225dc29ad 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -179,7 +179,7 @@ in in mkIf enabled { assertions = [ { - assertion = with config.services.xserver.displayManager; gdm.nvidiaWayland -> cfg.modesetting.enable; + assertion = with config.services.xserver.displayManager; (gdm.enable && gdm.nvidiaWayland) -> cfg.modesetting.enable; message = "You cannot use wayland with GDM without modesetting enabled for NVIDIA drivers, set `hardware.nvidia.modesetting.enable = true`"; } From 29d1f6e1f625d246dcf84a78ef97b4da3cafc6ea Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Dec 2021 01:29:03 +1000 Subject: [PATCH 100/106] direnv: 2.28.0 -> 2.29.0 (#147956) https://github.com/direnv/direnv/releases/tag/v2.29.0 --- pkgs/tools/misc/direnv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 5fa6b8db60e7..cdc77803bb2c 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "direnv"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "sha256-iZ3Lf7Yg+N9BWyLLF+MrT2gpPT9BTcp6pNMpfqwcZXo="; + sha256 = "sha256-gbaD//wkgdZEgQUuCUphqx0n9Xf2VFzQrBFrwOdQmi4="; }; vendorSha256 = "sha256-P8NLY1iGh86ntmYsTVlnNh5akdaM8nzcxDn6Nfmgr84="; From 1b6daffd8494af0ed1504370cb7f541fd93bb7cd Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Thu, 25 Nov 2021 11:07:52 -0700 Subject: [PATCH 101/106] matrix-synapse: 1.47.1 -> 1.48.0 --- 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 7e2b2e0ceeda..37ca8d235749 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.47.1"; + version = "1.48.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ldk14yMaFZ1uegiTwB6txomGJTV1Gf/LqJyWJARmhJ4="; + sha256 = "sha256-G09VbfC9mZ0+shLHRNutR91URewvLW4l4lQaVrsZYaQ="; }; patches = [ From efd9bd36672e8115eeb7011c0e1fb56bb6622031 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 30 Nov 2021 09:49:58 -0600 Subject: [PATCH 102/106] lifeograph: init at 2.0.2 --- .../editors/lifeograph/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/editors/lifeograph/default.nix diff --git a/pkgs/applications/editors/lifeograph/default.nix b/pkgs/applications/editors/lifeograph/default.nix new file mode 100644 index 000000000000..b998b02f50da --- /dev/null +++ b/pkgs/applications/editors/lifeograph/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchgit, pkg-config, meson, ninja +, enchant, gtkmm3, libchamplain, libgcrypt }: + +stdenv.mkDerivation rec { + pname = "lifeograph"; + version = "2.0.2"; + + src = fetchgit { + url = "https://git.launchpad.net/lifeograph"; + # Specific commit hash related to version + rev = "d635bbb30011c0d33c33643e6fa5c006f98ed7d6"; + sha256 = "0j9wn5bj7cbfnmyyx7ikx961sksv50agnb53prymldbsq43rfgnq"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + libgcrypt + enchant + gtkmm3 + libchamplain + ]; + + postInstall = '' + substituteInPlace $out/share/applications/net.sourceforge.Lifeograph.desktop \ + --replace "Exec=" "Exec=$out/bin/" + ''; + + meta = with lib; { + homepage = "http://lifeograph.sourceforge.net/wiki/Main_Page"; + description = "Lifeograph is an off-line and private journal and note taking application"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5df9d009bf48..6222b80dd8d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3242,6 +3242,8 @@ with pkgs; libxnd = callPackage ../development/libraries/libxnd { }; + lifeograph = callPackage ../applications/editors/lifeograph { }; + link-grammar = callPackage ../tools/text/link-grammar { }; linuxptp = callPackage ../os-specific/linux/linuxptp { }; From 1923c51c0ae99671ba5af07c25c77996fd46a49a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 30 Nov 2021 19:10:07 +0000 Subject: [PATCH 103/106] cdesktopenv: fix build on upcoming binutils-2.36 (#146750) Co-authored-by: Sandro --- pkgs/desktops/cdesktopenv/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index 563a1b49e516..7715f4f232ad 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, xorgproto, libX11, bison, ksh, perl, gnum4 +{ lib, stdenv, fetchurl +, fetchpatch +, xorgproto, libX11, bison, ksh, perl, gnum4 , libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps , libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf , ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales, gawk @@ -27,6 +29,13 @@ in stdenv.mkDerivation rec { patches = [ ./2.3.2.patch ./0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch + + (fetchpatch { + name = "binutils-2.36.patch"; + url = "https://github.com/cdesktopenv/cde/commit/0b7849e210a99a413ddeb52a0eb5aef9a08504a0.patch"; + sha256 = "0wlhs617hws3rwln9v74y1nw27n3pp7jkpnxlala7k5y64506ipj"; + stripLen = 1; + }) ]; buildInputs = [ From ed5709050c6963a798ff41567b410ae677df6a98 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 30 Nov 2021 17:57:50 -0300 Subject: [PATCH 104/106] pythonPackages.debugpy: add aarch64-linux compile flags --- pkgs/development/python-modules/debugpy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index ed3e70e3ab2e..bf2ed3628675 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { ${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{ "x86_64-linux" = "-shared -m64 -o attach_linux_amd64.so"; "i686-linux" = "-shared -m32 -o attach_linux_x86.so"; + "aarch64-linux" = "-shared -o attach_linux_arm64.so"; "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib"; @@ -87,6 +88,6 @@ buildPythonPackage rec { homepage = "https://github.com/microsoft/debugpy"; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "i686-darwin" "aarch64-darwin" ]; }; } From 47fbfa2a57aa0e62ac21daa893a9b126758ba3df Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 30 Nov 2021 13:41:01 -0800 Subject: [PATCH 105/106] gir-rs: unstable-2021-05-05 -> unstable-2021-11-21 (#147785) --- pkgs/development/tools/gir/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index 2d1cdfc546b2..d72befbaa15c 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -2,17 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "gir"; - version = "unstable-2021-05-05"; + version = "unstable-2021-11-21"; src = fetchFromGitHub { owner = "gtk-rs"; repo = "gir"; - rev = "c148542ce89b0bf7cbb9f5ef4179c96a45d022df"; - sha256 = "0vy366ipwnn0cpp14l1v5g3dpnsr3hd8mjp3333lp0946igfqsy5"; - leaveDotGit = true; # required for build.rs + rev = "a69abbe5ee1a745e554cac9433c65d2ac26a7688"; + sha256 = "16ygy1bcbcj69x6ss72g9n62qlsd1bacr5hz91f8whw6qm9am46m"; }; - cargoSha256 = "11as1v88zf0f7l2ngllg5zqycvd05nb4vrsyl1dlarjvbq7fhvv8"; + cargoSha256 = "14srs2369yryqpkklmfp64fyqxrhf91b2bjy0068nx2myr25m624"; + + postPatch = '' + rm build.rs + sed -i '/build = "build\.rs"/d' Cargo.toml + echo "pub const VERSION: &str = \"$version\";" > src/gir_version.rs + ''; meta = with lib; { description = "Tool to generate rust bindings and user API for glib-based libraries"; From ca09b01f37c1db288a72aec8363fd56dfc6b7a92 Mon Sep 17 00:00:00 2001 From: Francesco Zanini Date: Mon, 29 Nov 2021 09:50:42 +0100 Subject: [PATCH 106/106] libgphoto2: fix build of all camlibs The camlibs `lumix` and `docupen` were excluded from compilation and bundling due to the missing depdendencies. --- .../libraries/libgphoto2/default.nix | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 666135f91bb9..63015fdf6cb3 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,10 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages -, autoreconfHook, pkg-config, gettext +{ lib +, stdenv +, fetchFromGitHub +, buildPackages +, autoreconfHook +, pkg-config +, gettext , libusb1 , libtool , libexif , libgphoto2 , libjpeg +, curl +, libxml2 +, gd }: stdenv.mkDerivation rec { @@ -24,12 +32,16 @@ stdenv.mkDerivation rec { autoreconfHook gettext libtool + pkg-config ]; buildInputs = [ libjpeg libtool # for libltdl libusb1 + curl + libxml2 + gd ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. @@ -37,17 +49,20 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - postInstall = let - executablePrefix = if stdenv.buildPlatform == stdenv.hostPlatform then - "$out" - else - buildPackages.libgphoto2; - in '' - mkdir -p $out/lib/udev/rules.d - ${executablePrefix}/lib/libgphoto2/print-camera-list \ - udev-rules version 175 group camera \ - >$out/lib/udev/rules.d/40-gphoto2.rules - ''; + postInstall = + let + executablePrefix = + if stdenv.buildPlatform == stdenv.hostPlatform then + "$out" + else + buildPackages.libgphoto2; + in + '' + mkdir -p $out/lib/udev/rules.d + ${executablePrefix}/lib/libgphoto2/print-camera-list \ + udev-rules version 175 group camera \ + >$out/lib/udev/rules.d/40-gphoto2.rules + ''; meta = { homepage = "http://www.gphoto.org/proj/libgphoto2/";