diff options
Diffstat (limited to 'pkgs/tools')
172 files changed, 3110 insertions, 1338 deletions
diff --git a/pkgs/tools/X11/libstrangle/default.nix b/pkgs/tools/X11/libstrangle/default.nix index 2d7f6b456c4bf..64992a9b5ee85 100644 --- a/pkgs/tools/X11/libstrangle/default.nix +++ b/pkgs/tools/X11/libstrangle/default.nix @@ -2,20 +2,22 @@ stdenv.mkDerivation rec { pname = "libstrangle"; - version = "0.1.1"; + version = "unstable-202202022"; buildInputs = [ libGL libX11 ]; src = fetchFromGitLab { owner = "torkel104"; repo = pname; - rev = version; - sha256 = "135icr544w5ynlxfnxqgjn794bsm9i703rh9jfnracjb7jgnha4w"; + rev = "0273e318e3b0cc759155db8729ad74266b74cb9b"; + sha256 = "sha256-h10QA7m7hIQHq1g/vCYuZsFR2NVbtWBB46V6OWP5wgM="; }; makeFlags = [ "prefix=" "DESTDIR=$(out)" ]; - patches = [ ./nixos.patch ]; + patches = [ + ./nixos.patch + ]; postPatch = '' substituteAllInPlace src/strangle.sh diff --git a/pkgs/tools/X11/libstrangle/nixos.patch b/pkgs/tools/X11/libstrangle/nixos.patch index 05364028e3e78..c23a76f4e202b 100644 --- a/pkgs/tools/X11/libstrangle/nixos.patch +++ b/pkgs/tools/X11/libstrangle/nixos.patch @@ -7,7 +7,7 @@ diff --git a/makefile b/makefile -install-ld: ld - install -m 0644 -D -T $(BUILDDIR)/libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf -- ldconfig +- if [ -z "$(DESTDIR)" ]; then ldconfig; fi - install-32: 32-bit install -m 0755 -D -T $(BUILDDIR)/libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so diff --git a/pkgs/tools/X11/mmutils/default.nix b/pkgs/tools/X11/mmutils/default.nix new file mode 100644 index 0000000000000..580abbc779895 --- /dev/null +++ b/pkgs/tools/X11/mmutils/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, libxcb }: + +stdenv.mkDerivation rec { + pname = "wmutils"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "pockata"; + repo = "mmutils"; + rev = "v${version}"; + sha256 = "08wlb278m5lr218c87yqashk7farzny51ybl5h6j60i7pbpm01ml"; + }; + + buildInputs = [ libxcb ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A set of utilities for querying xrandr monitor information"; + homepage = "https://github.com/pockata/mmutils"; + license = licenses.isc; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix index 9330291014d16..aa1c77ef68e47 100644 --- a/pkgs/tools/admin/aws-google-auth/default.nix +++ b/pkgs/tools/admin/aws-google-auth/default.nix @@ -20,15 +20,15 @@ buildPythonApplication rec { pname = "aws-google-auth"; - version = "0.0.37"; + version = "0.0.38"; # Pypi doesn't ship the tests, so we fetch directly from GitHub # https://github.com/cevoaustralia/aws-google-auth/issues/120 src = fetchFromGitHub { owner = "cevoaustralia"; repo = "aws-google-auth"; - rev = version; - sha256 = "1bh733n4m5rsslpbjvhdigx6768nrvacybkakrm9704d2md9vkqd"; + rev = "refs/tags/${version}"; + sha256 = "sha256-/Xe4RDA9sBEsBBV1VP91VX0VfO8alK8L70m9WrB7qu4="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 4978603c1922b..44752c09fb235 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -1,17 +1,26 @@ -# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, cli53 }: -buildGoPackage { +buildGoModule rec { pname = "cli53"; - version = "0.8.12"; - - goPackagePath = "github.com/barnybug/cli53"; + version = "0.8.18"; src = fetchFromGitHub { owner = "barnybug"; repo = "cli53"; - rev = "2624c7c4b38a33cdbd166dad1d3e512830f453e4"; - sha256 = "0bhczmzrgf7ypnhhzdrgnvg8cw8ch1x1d0cgajc5kklq9ixv9ygi"; + rev = version; + sha256 = "sha256-RgU4+/FQEqNpVxBktZUwoVD9ilLrTm5ZT7D8jbt2sRM="; + }; + + vendorSha256 = "sha256-uqBa2YrQwXdTemP9yB2otkSFWJqDxw/NAvIvlEbhk90="; + + ldflags = [ + "-s" + "-w" + "-X github.com/barnybug/cli53.version=${version}" + ]; + + passthru.tests.version = testers.testVersion { + package = cli53; }; meta = with lib; { diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/tools/admin/colmena/default.nix index 8d7982060de69..c0ed0e60f1f29 100644 --- a/pkgs/tools/admin/colmena/default.nix +++ b/pkgs/tools/admin/colmena/default.nix @@ -1,20 +1,25 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, colmena, testers }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, nix-eval-jobs +, colmena, testers }: rustPlatform.buildRustPackage rec { pname = "colmena"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "colmena"; rev = "v${version}"; - sha256 = "sha256-VsqFiqZUjGpDZfw6ws1rvqm/NGUfFBXHa0N8ZkBaMh8="; + sha256 = "sha256-aGpMiY9pS2616AfAVWA87tULKatDYF2kCKxwYstK8V0="; }; - cargoSha256 = "sha256-NVvPh0+53YIm5Kb/lNyXb7M3bbADBVdsTaPptyb37lw="; + cargoSha256 = "sha256-ckCArDFjVwVWWK0Ffj0AYe411b9xU33CBc1zeCh2kns="; nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ nix-eval-jobs ]; + + NIX_EVAL_JOBS = "${nix-eval-jobs}/bin/nix-eval-jobs"; + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' installShellCompletion --cmd colmena \ --bash <($out/bin/colmena gen-completions bash) \ @@ -37,6 +42,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://zhaofengli.github.io/colmena/${passthru.apiVersion}"; license = licenses.mit; maintainers = with maintainers; [ zhaofengli ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index e9afcb4d56820..996ab16360b11 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.94.0"; + version = "0.95.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-6I/rzdSJ0iwoazt7EHsQ3gEynGfzBoLR7ekPNUo/YQs="; + sha256 = "sha256-WAu2ghQAih+f1PdfflsroUOAV5Cs+hvECOyw34DRugU="; }; - vendorSha256 = "sha256-cWZvMP19xTq68kKJ50d2RYXHu9AfiEE+zQL2IsQ4eiY="; + vendorSha256 = "sha256-zedhE9WWCktqYig+bI4v9bQhzSW8laClgTI2Gsrz+FM="; doCheck = false; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 3fcb68a5b66ff..48cb73be8310e 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -11,13 +11,13 @@ buildGo118Package rec { pname = "lxd"; - version = "5.0.0"; + version = "5.1"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "sha256-qZt+37UsgZWy3kmIhE0y1zvmQm9s/yhAglBReyOP3vk="; + sha256 = "sha256-MZ9Ok1BuIUTtqigLAYX7N8Q3TPfXRopeXIwbZ4GJJQo="; }; postPatch = '' @@ -25,6 +25,8 @@ buildGo118Package rec { --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" ''; + excludedPackages = [ "test" "lxd/db/generate" ]; + preBuild = '' # required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939 export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" @@ -33,9 +35,6 @@ buildGo118Package rec { ''; postInstall = '' - # test binaries, code generation - rm $out/bin/{deps,macaroon-identity,generate} - wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( [ iptables ] ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu attr ] diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 84781688ec1ab..d917acd656c82 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -1,21 +1,21 @@ -{ stdenv -, lib +{ lib , python3 , fetchurl , zlib , mkYarnModules , sphinx , nixosTests +, pkgs }: let pname = "pgadmin"; - version = "6.7"; + version = "6.8"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - sha256 = "1g2yxwgj9fp1fkn8j2jrdhmr2b2s6y8sgv4jq55aaxm4hfkkqh6d"; + sha256 = "sha256-kS9GV/j28zkXTJZkRrG2JDgas210rQqXOJrwwxzepbw="; }; yarnDeps = mkYarnModules { @@ -25,9 +25,78 @@ let yarnLock = ./yarn.lock; yarnNix = ./yarn.nix; }; + + # move buildDeps here to easily pass to test suite + buildDeps = with pythonPackages; [ + flask + flask-gravatar + flask_login + flask_mail + flask_migrate + flask_sqlalchemy + flask_wtf + flask-compress + passlib + pytz + simplejson + six + sqlparse + wtforms + flask-paranoid + psutil + psycopg2 + python-dateutil + sqlalchemy + itsdangerous + flask-security-too + bcrypt + cryptography + sshtunnel + ldap3 + flask-babelex + flask-babel + gssapi + flask-socketio + eventlet + httpagentparser + user-agents + wheel + authlib + qrcode + pillow + pyotp + botocore + boto3 + ]; + + # override necessary on pgadmin4 6.8 + pythonPackages = python3.pkgs.overrideScope (final: prev: rec { + flask = prev.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.0.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; + }; + disabledTests = (oldAttrs.disabledTests or [ ]) ++ [ + "test_aborting" + ]; + }); + flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec { + # tests fail due to downgrades here + doCheck = false; + }); + werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.0.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; + }; + }); + }); + in -python3.pkgs.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { inherit pname version src; # from Dockerfile @@ -43,19 +112,19 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # patching Makefile, so it doesn't try to build sphinx documentation here # (will do so later) - substituteInPlace Makefile --replace "LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html" "true" + substituteInPlace Makefile --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true" # fix document which refers a non-existing document and fails substituteInPlace docs/en_US/contributions.rst --replace "code_snippets" "" patchShebangs . # relax dependencies substituteInPlace requirements.txt \ - --replace "Pillow==8.3.*" "Pillow>=8.3.0" \ --replace "psycopg2==2.9.*" "psycopg2>=2.9" \ --replace "cryptography==3.*" "cryptography>=3.0" \ --replace "requests==2.25.*" "requests>=2.25.0" \ --replace "boto3==1.20.*" "boto3>=1.20" \ --replace "botocore==1.23.*" "botocore>=1.23" \ - --replace "pytz==2021.*" "pytz" + --replace "pytz==2021.*" "pytz" \ + --replace "Werkzeug==2.0.3" "werkzeug>=2.*" # don't use Server Mode (can be overridden later) substituteInPlace pkg/pip/setup_pip.py \ --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \ @@ -101,10 +170,10 @@ python3.pkgs.buildPythonApplication rec { cp -v ../pkg/pip/setup_pip.py setup.py ''; - nativeBuildInputs = [ python3 python3.pkgs.cython python3.pkgs.pip ]; + nativeBuildInputs = with pythonPackages; [ cython pip ]; buildInputs = [ zlib - python3.pkgs.wheel + pythonPackages.wheel ]; # tests need an own data, log directory @@ -112,57 +181,21 @@ python3.pkgs.buildPythonApplication rec { # checks will be run through nixos/tests doCheck = false; - propagatedBuildInputs = with python3.pkgs; [ - flask - flask-gravatar - flask_login - flask_mail - flask_migrate - flask_sqlalchemy - flask_wtf - flask-compress - passlib - pytz - simplejson - six - speaklater3 - sqlparse - wtforms - flask-paranoid - psutil - psycopg2 - python-dateutil - sqlalchemy - itsdangerous - flask-security-too - bcrypt - cryptography - sshtunnel - ldap3 - flask-babelex - flask-babel - gssapi - flask-socketio - eventlet - httpagentparser - user-agents - wheel - authlib - qrcode - pillow - pyotp - botocore - boto3 - ]; + # speaklater3 is seperate because when passing buildDeps + # to the test, it fails there due to a collision with speaklater + propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ]; - passthru = { - tests = { inherit (nixosTests) pgadmin4 pgadmin4-standalone; }; + passthru.tests = { + standalone = nixosTests.pgadmin4-standalone; + # regression and function tests of the package itself + package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; pythonEnv = pythonPackages; })); }; meta = with lib; { description = "Administration and development platform for PostgreSQL"; homepage = "https://www.pgadmin.org/"; license = licenses.mit; + changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major version}_${lib.versions.minor version}.html"; maintainers = with maintainers; [ gador ]; }; } diff --git a/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json index e4a27bd10d7ba..d708b05e4883e 100644 --- a/pkgs/tools/admin/pgadmin/package.json +++ b/pkgs/tools/admin/pgadmin/package.json @@ -8,8 +8,8 @@ "license": "PostgreSQL", "devDependencies": { "@babel/core": "^7.10.2", - "@babel/eslint-parser": "^7.12.13", - "@babel/eslint-plugin": "^7.12.13", + "@babel/eslint-parser": "^7.17.0", + "@babel/eslint-plugin": "^7.17.7", "@babel/plugin-proposal-object-rest-spread": "^7.10.1", "@babel/plugin-syntax-jsx": "^7.16.0", "@babel/preset-env": "^7.10.2", @@ -82,11 +82,12 @@ "@date-io/core": "^1.3.6", "@date-io/date-fns": "1.x", "@emotion/sheet": "^1.0.1", - "@fortawesome/fontawesome-free": "^5.14.0", "@material-ui/core": "4.11.0", "@material-ui/icons": "^4.11.2", "@material-ui/lab": "4.0.0-alpha.58", "@material-ui/pickers": "^3.2.10", + "@mui/icons-material": "^5.4.2", + "@mui/material": "^5.4.3", "@projectstorm/react-diagrams": "^6.6.1", "@simonwep/pickr": "^1.5.1", "@szhsin/react-menu": "^2.2.0", @@ -145,7 +146,7 @@ "path-fx": "^2.0.0", "pathfinding": "^0.4.18", "paths-js": "^0.4.9", - "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422", + "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613", "postcss": "^8.2.15", "raf": "^3.4.1", "rc-dock": "^3.2.9", @@ -154,6 +155,8 @@ "react-checkbox-tree": "^1.7.2", "react-dom": "^17.0.1", "react-draggable": "^4.4.4", + "react-rnd": "^10.3.5", + "react-router-dom": "^6.2.2", "react-select": "^4.2.1", "react-table": "^7.6.3", "react-timer-hook": "^3.0.5", diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index 7dc709ab5add9..bfb47913f8fbf 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -91,19 +91,19 @@ json5 "^2.1.2" semver "^6.3.0" -"@babel/eslint-parser@^7.12.13": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz#6f2bde6b0690fcc0598b4869fc7c8e8b55b17687" - integrity sha512-XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw== +"@babel/eslint-parser@^7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6" + integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA== dependencies: - eslint-scope "5.1.0" - eslint-visitor-keys "^1.3.0" + eslint-scope "^5.1.1" + eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/eslint-plugin@^7.12.13": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz#e6d99efcd6b8551adf479e382a47218726179b1b" - integrity sha512-YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w== +"@babel/eslint-plugin@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz#4ee1d5b29b79130f3bb5a933358376bcbee172b8" + integrity sha512-JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw== dependencies: eslint-rule-composer "^0.3.0" @@ -1741,6 +1741,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.17.2", "@babel/runtime@^7.7.6": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" + integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.12.13", "@babel/template@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" @@ -1849,6 +1856,17 @@ "@emotion/weak-memoize" "^0.2.5" stylis "^4.0.3" +"@emotion/cache@^11.7.1": + version "11.7.1" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539" + integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A== + dependencies: + "@emotion/memoize" "^0.7.4" + "@emotion/sheet" "^1.1.0" + "@emotion/utils" "^1.0.0" + "@emotion/weak-memoize" "^0.2.5" + stylis "4.0.13" + "@emotion/core@^10.0.14": version "10.1.1" resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3" @@ -1882,6 +1900,13 @@ dependencies: "@emotion/memoize" "0.7.4" +"@emotion/is-prop-valid@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95" + integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ== + dependencies: + "@emotion/memoize" "^0.7.4" + "@emotion/memoize@0.7.4": version "0.7.4" resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" @@ -1937,6 +1962,11 @@ resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698" integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g== +"@emotion/sheet@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2" + integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g== + "@emotion/styled-base@^10.0.27": version "10.0.31" resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a" @@ -2117,6 +2147,93 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" +"@mui/base@5.0.0-alpha.74": + version "5.0.0-alpha.74" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz#15509242e7911446d5957375b1b18cbb72b3a750" + integrity sha512-pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ== + dependencies: + "@babel/runtime" "^7.17.2" + "@emotion/is-prop-valid" "^1.1.2" + "@mui/types" "^7.1.3" + "@mui/utils" "^5.5.3" + "@popperjs/core" "^2.11.4" + clsx "^1.1.1" + prop-types "^15.7.2" + react-is "^17.0.2" + +"@mui/icons-material@^5.4.2": + version "5.5.1" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz#848a57972617411370775980cbc6990588d4aafb" + integrity sha512-40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA== + dependencies: + "@babel/runtime" "^7.17.2" + +"@mui/material@^5.4.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz#411e53a69da3f9d6664e99f1bdcdaf2760540fdc" + integrity sha512-eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/base" "5.0.0-alpha.74" + "@mui/system" "^5.5.3" + "@mui/types" "^7.1.3" + "@mui/utils" "^5.5.3" + "@types/react-transition-group" "^4.4.4" + clsx "^1.1.1" + csstype "^3.0.11" + hoist-non-react-statics "^3.3.2" + prop-types "^15.7.2" + react-is "^17.0.2" + react-transition-group "^4.4.2" + +"@mui/private-theming@^5.5.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz#c232a39dd3c268fdef7e92ccc40d51bda9eec3ab" + integrity sha512-Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/utils" "^5.5.3" + prop-types "^15.7.2" + +"@mui/styled-engine@^5.5.2": + version "5.5.2" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz#1f92dd27d76f0b7df7aa52c7c7a710e59b2275a6" + integrity sha512-jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA== + dependencies: + "@babel/runtime" "^7.17.2" + "@emotion/cache" "^11.7.1" + prop-types "^15.7.2" + +"@mui/system@^5.5.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz#c78d4c16009430389ffd3495d694945422d72ca5" + integrity sha512-J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/private-theming" "^5.5.3" + "@mui/styled-engine" "^5.5.2" + "@mui/types" "^7.1.3" + "@mui/utils" "^5.5.3" + clsx "^1.1.1" + csstype "^3.0.11" + prop-types "^15.7.2" + +"@mui/types@^7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz#d7636f3046110bcccc63e6acfd100e2ad9ca712a" + integrity sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA== + +"@mui/utils@^5.5.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz#f6e1f10c0e8f4d0bf750588c2c3a96ad819c5b65" + integrity sha512-t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag== + dependencies: + "@babel/runtime" "^7.17.2" + "@types/prop-types" "^15.7.4" + "@types/react-is" "^16.7.1 || ^17.0.0" + prop-types "^15.7.2" + react-is "^17.0.2" + "@nodelib/fs.scandir@2.1.4": version "2.1.4" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" @@ -2159,6 +2276,11 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23" integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA== +"@popperjs/core@^2.11.4": + version "2.11.4" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503" + integrity sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg== + "@popperjs/core@^2.8.3": version "2.9.0" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.0.tgz#32e63212293dd3efbb521cd35a5020ab66eaa546" @@ -2436,6 +2558,11 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== +"@types/prop-types@^15.7.4": + version "15.7.4" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== + "@types/q@^1.5.1": version "1.5.4" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" @@ -2448,6 +2575,13 @@ dependencies: "@types/react" "^16" +"@types/react-is@^16.7.1 || ^17.0.0": + version "17.0.3" + resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz#2d855ba575f2fc8d17ef9861f084acc4b90a137a" + integrity sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw== + dependencies: + "@types/react" "*" + "@types/react-transition-group@^4.2.0": version "4.4.1" resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1" @@ -2455,6 +2589,13 @@ dependencies: "@types/react" "*" +"@types/react-transition-group@^4.4.4": + version "4.4.4" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e" + integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug== + dependencies: + "@types/react" "*" + "@types/react@*", "@types/react@^16": version "16.14.10" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.10.tgz#76bc1c42ed5ab0d2ab13e5c58faaccaad3449477" @@ -4540,6 +4681,11 @@ csstype@^2.5.2, csstype@^2.5.7: resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39" integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q== +csstype@^3.0.11: + version "3.0.11" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33" + integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw== + csstype@^3.0.2: version "3.0.8" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" @@ -5223,14 +5369,6 @@ eslint-rule-composer@^0.3.0: resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9" integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg== -eslint-scope@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" - integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w== - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -5251,7 +5389,7 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint-visitor-keys@^2.0.0: +eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== @@ -5320,7 +5458,7 @@ esquery@^1.4.0: dependencies: estraverse "^5.1.0" -esrecurse@^4.1.0, esrecurse@^4.3.0: +esrecurse@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== @@ -5498,6 +5636,11 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fast-memoize@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e" + integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw== + fast-safe-stringify@^2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" @@ -6059,6 +6202,13 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== +history@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b" + integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ== + dependencies: + "@babel/runtime" "^7.7.6" + hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -8351,9 +8501,9 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422": +"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613": version "1.0.0" - resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422" + resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613" dependencies: "@types/classnames" "^2.2.6" "@types/react" "^16.7.18" @@ -9023,6 +9173,13 @@ rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.5.0 react-is "^16.12.0" shallowequal "^1.1.0" +re-resizable@6.9.1: + version "6.9.1" + resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz#6be082b55d02364ca4bfee139e04feebdf52441c" + integrity sha512-KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ== + dependencies: + fast-memoize "^2.5.1" + react-aspen@^1.1.0, react-aspen@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.1.1.tgz#61a85ef43748158322c4a3b73faaa5e563edd038" @@ -9063,6 +9220,14 @@ react-dom@^17.0.1: object-assign "^4.1.1" scheduler "^0.20.2" +react-draggable@4.4.3: + version "4.4.3" + resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3" + integrity sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w== + dependencies: + classnames "^2.2.5" + prop-types "^15.6.0" + react-draggable@^4.4.4: version "4.4.4" resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f" @@ -9093,6 +9258,30 @@ react-property@1.0.1: resolved "https://registry.yarnpkg.com/react-property/-/react-property-1.0.1.tgz#4ae4211557d0a0ae050a71aa8ad288c074bea4e6" integrity sha512-1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ== +react-rnd@^10.3.5: + version "10.3.5" + resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz#b66e5e06f1eb6823e72eb4b552081b4b9241b139" + integrity sha512-LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw== + dependencies: + re-resizable "6.9.1" + react-draggable "4.4.3" + tslib "2.3.0" + +react-router-dom@^6.2.2: + version "6.3.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d" + integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw== + dependencies: + history "^5.2.0" + react-router "6.3.0" + +react-router@6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557" + integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ== + dependencies: + history "^5.2.0" + react-select@^4.2.1: version "4.3.1" resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81" @@ -9144,6 +9333,16 @@ react-transition-group@^4.0.0, react-transition-group@^4.3.0, react-transition-g loose-envify "^1.4.0" prop-types "^15.6.2" +react-transition-group@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" + integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== + dependencies: + "@babel/runtime" "^7.5.5" + dom-helpers "^5.0.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + react-transition-state@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/react-transition-state/-/react-transition-state-1.1.3.tgz#6d999dc640ffd3a7442021a14a58e13347f4e95f" @@ -10161,6 +10360,11 @@ stylehacks@^5.0.1: browserslist "^4.16.0" postcss-selector-parser "^6.0.4" +stylis@4.0.13: + version "4.0.13" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91" + integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag== + stylis@^4.0.3, stylis@^4.0.7: version "4.0.10" resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240" @@ -10511,6 +10715,11 @@ trim-right@^1.0.1: resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= +tslib@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + tslib@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" diff --git a/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix index eca056bc92183..9e2ed892fcd2d 100644 --- a/pkgs/tools/admin/pgadmin/yarn.nix +++ b/pkgs/tools/admin/pgadmin/yarn.nix @@ -74,19 +74,19 @@ }; } { - name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz"; + name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz"; path = fetchurl { - name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz"; - sha512 = "XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw=="; + name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz"; + sha512 = "PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA=="; }; } { - name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz"; + name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz"; path = fetchurl { - name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz"; - sha512 = "YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w=="; + name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz"; + sha512 = "JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw=="; }; } { @@ -1578,6 +1578,14 @@ }; } { + name = "_babel_runtime___runtime_7.17.8.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.17.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz"; + sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA=="; + }; + } + { name = "_babel_template___template_7.14.5.tgz"; path = fetchurl { name = "_babel_template___template_7.14.5.tgz"; @@ -1674,6 +1682,14 @@ }; } { + name = "_emotion_cache___cache_11.7.1.tgz"; + path = fetchurl { + name = "_emotion_cache___cache_11.7.1.tgz"; + url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz"; + sha512 = "r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A=="; + }; + } + { name = "_emotion_core___core_10.1.1.tgz"; path = fetchurl { name = "_emotion_core___core_10.1.1.tgz"; @@ -1706,6 +1722,14 @@ }; } { + name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz"; + path = fetchurl { + name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz"; + sha512 = "3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ=="; + }; + } + { name = "_emotion_memoize___memoize_0.7.4.tgz"; path = fetchurl { name = "_emotion_memoize___memoize_0.7.4.tgz"; @@ -1762,6 +1786,14 @@ }; } { + name = "_emotion_sheet___sheet_1.1.0.tgz"; + path = fetchurl { + name = "_emotion_sheet___sheet_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz"; + sha512 = "u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g=="; + }; + } + { name = "_emotion_styled_base___styled_base_10.0.31.tgz"; path = fetchurl { name = "_emotion_styled_base___styled_base_10.0.31.tgz"; @@ -1930,6 +1962,70 @@ }; } { + name = "_mui_base___base_5.0.0_alpha.74.tgz"; + path = fetchurl { + name = "_mui_base___base_5.0.0_alpha.74.tgz"; + url = "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz"; + sha512 = "pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ=="; + }; + } + { + name = "_mui_icons_material___icons_material_5.5.1.tgz"; + path = fetchurl { + name = "_mui_icons_material___icons_material_5.5.1.tgz"; + url = "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz"; + sha512 = "40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA=="; + }; + } + { + name = "_mui_material___material_5.5.3.tgz"; + path = fetchurl { + name = "_mui_material___material_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz"; + sha512 = "eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A=="; + }; + } + { + name = "_mui_private_theming___private_theming_5.5.3.tgz"; + path = fetchurl { + name = "_mui_private_theming___private_theming_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz"; + sha512 = "Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A=="; + }; + } + { + name = "_mui_styled_engine___styled_engine_5.5.2.tgz"; + path = fetchurl { + name = "_mui_styled_engine___styled_engine_5.5.2.tgz"; + url = "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz"; + sha512 = "jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA=="; + }; + } + { + name = "_mui_system___system_5.5.3.tgz"; + path = fetchurl { + name = "_mui_system___system_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz"; + sha512 = "J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw=="; + }; + } + { + name = "_mui_types___types_7.1.3.tgz"; + path = fetchurl { + name = "_mui_types___types_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz"; + sha512 = "DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA=="; + }; + } + { + name = "_mui_utils___utils_5.5.3.tgz"; + path = fetchurl { + name = "_mui_utils___utils_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz"; + sha512 = "t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag=="; + }; + } + { name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; path = fetchurl { name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; @@ -1978,6 +2074,14 @@ }; } { + name = "_popperjs_core___core_2.11.4.tgz"; + path = fetchurl { + name = "_popperjs_core___core_2.11.4.tgz"; + url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz"; + sha512 = "q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg=="; + }; + } + { name = "_popperjs_core___core_2.9.0.tgz"; path = fetchurl { name = "_popperjs_core___core_2.9.0.tgz"; @@ -2314,6 +2418,14 @@ }; } { + name = "_types_prop_types___prop_types_15.7.4.tgz"; + path = fetchurl { + name = "_types_prop_types___prop_types_15.7.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz"; + sha512 = "rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="; + }; + } + { name = "_types_q___q_1.5.4.tgz"; path = fetchurl { name = "_types_q___q_1.5.4.tgz"; @@ -2330,6 +2442,14 @@ }; } { + name = "_types_react_is___react_is_17.0.3.tgz"; + path = fetchurl { + name = "_types_react_is___react_is_17.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz"; + sha512 = "aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw=="; + }; + } + { name = "_types_react_transition_group___react_transition_group_4.4.1.tgz"; path = fetchurl { name = "_types_react_transition_group___react_transition_group_4.4.1.tgz"; @@ -2338,6 +2458,14 @@ }; } { + name = "_types_react_transition_group___react_transition_group_4.4.4.tgz"; + path = fetchurl { + name = "_types_react_transition_group___react_transition_group_4.4.4.tgz"; + url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz"; + sha512 = "7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug=="; + }; + } + { name = "_types_react___react_16.14.10.tgz"; path = fetchurl { name = "_types_react___react_16.14.10.tgz"; @@ -4474,6 +4602,14 @@ }; } { + name = "csstype___csstype_3.0.11.tgz"; + path = fetchurl { + name = "csstype___csstype_3.0.11.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz"; + sha512 = "sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="; + }; + } + { name = "csstype___csstype_3.0.8.tgz"; path = fetchurl { name = "csstype___csstype_3.0.8.tgz"; @@ -5186,14 +5322,6 @@ }; } { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz"; - sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w=="; - }; - } - { name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { name = "eslint_scope___eslint_scope_5.1.1.tgz"; @@ -5442,6 +5570,14 @@ }; } { + name = "fast_memoize___fast_memoize_2.5.2.tgz"; + path = fetchurl { + name = "fast_memoize___fast_memoize_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz"; + sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="; + }; + } + { name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; path = fetchurl { name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; @@ -6082,6 +6218,14 @@ }; } { + name = "history___history_5.3.0.tgz"; + path = fetchurl { + name = "history___history_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz"; + sha512 = "ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ=="; + }; + } + { name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; path = fetchurl { name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; @@ -8823,8 +8967,8 @@ let repo = fetchgit { url = "https://github.com/EnterpriseDB/pgadmin4-treeview/"; - rev = "bf7ac7be65898883e3e05c9733426152a1da6422"; - sha256 = "0nsn7s0d1kpgpb554hkz7nsifzdyff06qc78gqmzd8j3sfcbjk63"; + rev = "c966febebcdffaa46f1ccf0769fe5308f179d613"; + sha256 = "0fxjalh7g8fwy3fczbj9pvf8g06chq41gw1jidz106wadjr72081"; }; in runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } '' @@ -9554,6 +9698,14 @@ }; } { + name = "re_resizable___re_resizable_6.9.1.tgz"; + path = fetchurl { + name = "re_resizable___re_resizable_6.9.1.tgz"; + url = "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz"; + sha512 = "KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ=="; + }; + } + { name = "react_aspen___react_aspen_1.1.1.tgz"; path = fetchurl { name = "react_aspen___react_aspen_1.1.1.tgz"; @@ -9586,6 +9738,14 @@ }; } { + name = "react_draggable___react_draggable_4.4.3.tgz"; + path = fetchurl { + name = "react_draggable___react_draggable_4.4.3.tgz"; + url = "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz"; + sha512 = "jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w=="; + }; + } + { name = "react_draggable___react_draggable_4.4.4.tgz"; path = fetchurl { name = "react_draggable___react_draggable_4.4.4.tgz"; @@ -9626,6 +9786,30 @@ }; } { + name = "react_rnd___react_rnd_10.3.5.tgz"; + path = fetchurl { + name = "react_rnd___react_rnd_10.3.5.tgz"; + url = "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz"; + sha512 = "LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw=="; + }; + } + { + name = "react_router_dom___react_router_dom_6.3.0.tgz"; + path = fetchurl { + name = "react_router_dom___react_router_dom_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz"; + sha512 = "uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw=="; + }; + } + { + name = "react_router___react_router_6.3.0.tgz"; + path = fetchurl { + name = "react_router___react_router_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz"; + sha512 = "7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ=="; + }; + } + { name = "react_select___react_select_4.3.1.tgz"; path = fetchurl { name = "react_select___react_select_4.3.1.tgz"; @@ -9674,6 +9858,14 @@ }; } { + name = "react_transition_group___react_transition_group_4.4.2.tgz"; + path = fetchurl { + name = "react_transition_group___react_transition_group_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz"; + sha512 = "/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg=="; + }; + } + { name = "react_transition_state___react_transition_state_1.1.3.tgz"; path = fetchurl { name = "react_transition_state___react_transition_state_1.1.3.tgz"; @@ -10866,6 +11058,14 @@ }; } { + name = "stylis___stylis_4.0.13.tgz"; + path = fetchurl { + name = "stylis___stylis_4.0.13.tgz"; + url = "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz"; + sha512 = "xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag=="; + }; + } + { name = "stylis___stylis_4.0.10.tgz"; path = fetchurl { name = "stylis___stylis_4.0.10.tgz"; @@ -11234,6 +11434,14 @@ }; } { + name = "tslib___tslib_2.3.0.tgz"; + path = fetchurl { + name = "tslib___tslib_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz"; + sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="; + }; + } + { name = "tslib___tslib_2.2.0.tgz"; path = fetchurl { name = "tslib___tslib_2.2.0.tgz"; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index b21151d9b5884..29f9cbe0f3fc4 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.30.0"; + version = "3.31.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.30.0-linux-x64.tar.gz"; - sha256 = "1js63rdmim5dq40fi6vwz982bc2604c0y0hmyj4mc5ag114lfz5w"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.31.0-linux-x64.tar.gz"; + sha256 = "195jqrgax3sy9bz9i36d60x5y3j47bp43453yhs2zdcllh29jfn2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.1-linux-amd64.tar.gz"; @@ -29,20 +29,20 @@ sha256 = "1x1fvnxhnhhv9fhqp4syhqcybjqpa2rq8d9nb8yvm9rxgcjllr0n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.2.0-linux-amd64.tar.gz"; - sha256 = "0fwj6xdfvh0ysa58pzx37i4ysdf3idhp84d0lfwkbj4wvm6c15ga"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.3.0-linux-amd64.tar.gz"; + sha256 = "0srdq0blsm5p10kxds64ybh0pmy7n6v4sdd2s0555gc6w9l1ir40"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.20.0-linux-amd64.tar.gz"; - sha256 = "1113nqv4hg8fp5algq3jjn0l6sl56vmlbgxpfm8211m6z99kpjyx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.3.0-linux-amd64.tar.gz"; + sha256 = "1mla2lc639w5shlih3nsf6hp696h7n592bwbhn9hl3xlpxvmwhdz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-linux-amd64.tar.gz"; - sha256 = "1z8f287mm2mqfa76021fp5a1bj9045iwxcy8xs1ygh48b1890j49"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.21.0-linux-amd64.tar.gz"; + sha256 = "06sp11azls8agqcrww3pgk19232ngbd19v9czp55321xpmgs0d6h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.2.0-linux-amd64.tar.gz"; - sha256 = "1mqp79h915zwdmvsqs82pnqbs3qv4nbh65b4ismdvgim667ykydy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-linux-amd64.tar.gz"; + sha256 = "1z8f287mm2mqfa76021fp5a1bj9045iwxcy8xs1ygh48b1890j49"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.6.0-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "0n1xqsfsqi773lwg9xbvglrd4pfb060fq8llxf06qj8h2imlxx34"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.20.0-linux-amd64.tar.gz"; - sha256 = "1q39n02cgp69jjl44xfxn13lcvmcqdb5szpk3d8cybp4kndsklf2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.21.0-linux-amd64.tar.gz"; + sha256 = "18m3c22lgh1byj3va8mxv8dk6ivaphmf4azqz8ndvva7jmiqayyb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.11.0-linux-amd64.tar.gz"; @@ -93,8 +93,8 @@ sha256 = "1gfiiwgb51ylwns3mqgnbgm2knrdzvy9r9v23yx0z03ba189d3m9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.2-linux-amd64.tar.gz"; - sha256 = "13pwyqfj8mlvwd2s7marfhbp4jsb7ym9qzf02bl3aw99ngzzybsl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.3-linux-amd64.tar.gz"; + sha256 = "1bs8bdkaa6qrrzddppar7yzcn3ml9rfvdmd72fcgvz1hw5vp7gzn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-amd64.tar.gz"; @@ -117,8 +117,8 @@ sha256 = "156wmbxm8c15lzqj2mx4mm14p569skfddfbq9rjyjlvxljklx2fd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.2-linux-amd64.tar.gz"; - sha256 = "0agf96ji7mzkf4k4axm1v3psm5wkml41714dz88rn0csq0b31ca9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.5.0-linux-amd64.tar.gz"; + sha256 = "0fs68z18lmhl46dl45fnavhycysfbfkparvq9irhcc679icwn5id"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.7.0-linux-amd64.tar.gz"; @@ -137,8 +137,8 @@ sha256 = "0yhsidz5mi6xznmrkvlg1jxyykhg3kccqd4fxg9zj9yv4l8ih2rw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.2.2-linux-amd64.tar.gz"; - sha256 = "1x30qyrjrhn4gglcz2gc1h6n8px1v198fpsjf2wmf3v13pb15ix8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.3.0-linux-amd64.tar.gz"; + sha256 = "14kgn1xz3i5lh096chd1bqac0391g13zma0nkraynnaqziqw5xgf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.4.1-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.30.0-darwin-x64.tar.gz"; - sha256 = "0hbdcn5aby9a9nz3jb1p8rr7r35mv7hxdbb8lsqph70bzavw5bzi"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.31.0-darwin-x64.tar.gz"; + sha256 = "1n1c05dpv1xhj7wsy4vxh31mzppmiz1qvjz9vhjnpjhcp9r949gr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.1-darwin-amd64.tar.gz"; @@ -187,20 +187,20 @@ sha256 = "15a89ydv8yp71aamd9kciz9yggxza5njdikch5pvmd24jvar03gm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.2.0-darwin-amd64.tar.gz"; - sha256 = "1jqqycasnk2i8w16qf52yya0p35ilfmabpd6alfgmpkk6ag7asa5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.3.0-darwin-amd64.tar.gz"; + sha256 = "1qqbqjr0yh5ipyj074a86hjga126dib9x0c3rp40x7q03avsii3g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.20.0-darwin-amd64.tar.gz"; - sha256 = "0lx3sfdck18ppmd76ijmih51adm9i2rc2ai564psqx41261zpjyr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.3.0-darwin-amd64.tar.gz"; + sha256 = "0pig9hcmhig7ygx43fj0jjpv1js9kgdryhak62sfdvbsvcaqzp44"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-darwin-amd64.tar.gz"; - sha256 = "1shc7m4xlsmcjnrlbi2jyvmnvf9bg1cs6knfkl82jfs65ya5iidf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.21.0-darwin-amd64.tar.gz"; + sha256 = "18b63y3wiw99wmkna5zv8k7bkrnnzm9nv4k14f93lg22jcmnhrkc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.2.0-darwin-amd64.tar.gz"; - sha256 = "0xsk8d982w2zqvxfyqk1s3nilbsiqwnn3bwxm6d6zvhbi9ym63p7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-darwin-amd64.tar.gz"; + sha256 = "1shc7m4xlsmcjnrlbi2jyvmnvf9bg1cs6knfkl82jfs65ya5iidf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.6.0-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "0i3aysdy7i13fx2a2kpnvd3qpn7vmc2mbln718kks3mikiz26aii"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.20.0-darwin-amd64.tar.gz"; - sha256 = "0rgqihk76hwyps1krhzg4an280ds9rjyq2pzhk1gbvljflplri4w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.21.0-darwin-amd64.tar.gz"; + sha256 = "1zqbxqyv4x1fsyrdjpy2ham5fjs1yzjly0i3jpqrrkxfxw68z7an"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.11.0-darwin-amd64.tar.gz"; @@ -251,8 +251,8 @@ sha256 = "11r73jfqkc0wgdf66zp6pmgq5packlm4dkjp12a00z6l2s4f0w4h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.2-darwin-amd64.tar.gz"; - sha256 = "041h4qsgzz5qd74q3lzcafqn3332gps4cf2i18x9pbnwvh7my69a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.3-darwin-amd64.tar.gz"; + sha256 = "0ffnl6mbh9wpfb384zbv5v1sss4vvn0hqrcsy6v585984v1pays2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-amd64.tar.gz"; @@ -275,8 +275,8 @@ sha256 = "0zjha6vv6j386h2gfhvwicpqz53v13v7zdfl6bydjzh3mw2x7bcg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.2-darwin-amd64.tar.gz"; - sha256 = "1wmvmhxnjp32kp43fhjp8w9nrb0biki63w23l4zjxsdk7njply7c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.5.0-darwin-amd64.tar.gz"; + sha256 = "1fnv2d4b458blx5k2s861lj8zc0fcxkw5jfjcm25nhdc7694v04w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.7.0-darwin-amd64.tar.gz"; @@ -295,8 +295,8 @@ sha256 = "1n6w6da58crv2dyi0s7pjzjk3y85qlz6qaa77r0lm58f8wcj4a9d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.2.2-darwin-amd64.tar.gz"; - sha256 = "1shfz3qz92plxsn31kqsvzk6sibgbglq66j34w5aj98g2g5891f4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.3.0-darwin-amd64.tar.gz"; + sha256 = "0whh7br959dc4hz47iskgkcxf4d6zg9lv9jvx1b9lyplra7iwyv0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.4.1-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.30.0-linux-arm64.tar.gz"; - sha256 = "1d7a4r0wyig5fbbs9d6jal2ria44ajca0441szsf1rd5ds29fvj3"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.31.0-linux-arm64.tar.gz"; + sha256 = "1p3c7ks1q6i9frz8ljjf7jn00sr6bgqm53hxxwxkim7hkr614ndp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.1-linux-arm64.tar.gz"; @@ -345,20 +345,20 @@ sha256 = "0j5wa27zhqf4vvpxgs4cmay8n3a74jsif4sr9x60mhkrhr0s117k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.2.0-linux-arm64.tar.gz"; - sha256 = "1i4rbjaabqwhgfrsi75i8rr5imrn3lifkrgng1amyf279svsrc3q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.3.0-linux-arm64.tar.gz"; + sha256 = "051lksfn7na30y6r7qn24wg222kf4bsvd26ga3y7i2xh00nh82kp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.20.0-linux-arm64.tar.gz"; - sha256 = "15fszcgdnqnwjd1676sgrnlk45791927xagg22j5vf588v897ikj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.3.0-linux-arm64.tar.gz"; + sha256 = "0g41dc6q42rr81167n4319llznjvb9i6zgfs5hrlxgz622grmax0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-linux-arm64.tar.gz"; - sha256 = "0w55pk3ham08lrg3vq0hg3p23qipz21ln01g61xd0cpl79aysbq4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.21.0-linux-arm64.tar.gz"; + sha256 = "1wyryxfmahcr668cp8kqc7l1spa6c1pzhxkwscd8payar78rswls"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.2.0-linux-arm64.tar.gz"; - sha256 = "0faxw096gf86z1bcl7g613hmnnabpcav9kzmc0bgdl4jja3l9flp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-linux-arm64.tar.gz"; + sha256 = "0w55pk3ham08lrg3vq0hg3p23qipz21ln01g61xd0cpl79aysbq4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.6.0-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "0qpan6zvny2h2ckigwnf4dhsgmnywam1m4d2jp0nj9pm3628pldv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.20.0-linux-arm64.tar.gz"; - sha256 = "0rz1y61gg728l70rsk9mnd5qkdp3akxfdcfcmakabzs1axycvrzp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.21.0-linux-arm64.tar.gz"; + sha256 = "0zwlr58wyd9aly58shffr24vsbna8bj2igl8l0j8gsf2g310n513"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.11.0-linux-arm64.tar.gz"; @@ -409,8 +409,8 @@ sha256 = "1vrz3pm14i5zdmk3yibny2sghxk8kzwb2qi77mjbiyfhbvciy97q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.2-linux-arm64.tar.gz"; - sha256 = "0k46bm706i76svmxb03w3vb7jw3j9gxknx1y5fv6drnrmbzxgazq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.3-linux-arm64.tar.gz"; + sha256 = "1ydmpcf13yj8jiw72nzzvnzpg3qwnwfr8j2qhr2jdwp1wxw46658"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-arm64.tar.gz"; @@ -433,8 +433,8 @@ sha256 = "11y6vbmhrjqdlgzg9px1sm2p058v6mvk69gzhy2ix1c1a2sh6c56"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.2-linux-arm64.tar.gz"; - sha256 = "1x8v39icapr8iakp9yd50md9dyvj63z7yj93cl3b07qlwr9lcvmv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.5.0-linux-arm64.tar.gz"; + sha256 = "16wshr4q9wfp7gi09n2c2ckvybg28adw429mghzmcs13aws1cycp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.7.0-linux-arm64.tar.gz"; @@ -453,8 +453,8 @@ sha256 = "0zkmkg9bivf5hlcbdj2aqyszpsqk7x8ag99z0x2yd00v72x2qcb5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.2.2-linux-arm64.tar.gz"; - sha256 = "1km5fhlic0vidqijx8bfjr0h1w0wwl9zk60ydz86kdxpby4b2flb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.3.0-linux-arm64.tar.gz"; + sha256 = "06djcfard6yq6qd98gbsnkry0jv3nnlgmwr90d818vbf923z0b1h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.4.1-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.30.0-darwin-arm64.tar.gz"; - sha256 = "10f2mamxg0h8lm4zf38j3a43s5d8r52f6lp6lrg0j705356w49bn"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.31.0-darwin-arm64.tar.gz"; + sha256 = "0ixqqvzigq9l8xr2rcdf1ln7a3xhf9f52qz0zkabr8kq7l11vz3v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.1-darwin-arm64.tar.gz"; @@ -503,20 +503,20 @@ sha256 = "1qx9717a5qajn3dp4i0gswd2pb80dq98igfad9nbz1f9sbbax2dv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.2.0-darwin-arm64.tar.gz"; - sha256 = "1sl0d642nb6xpga8izgzbl9h94faynjjrjygccc7ccnrfdh4i0dv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.3.0-darwin-arm64.tar.gz"; + sha256 = "0miqrbsivw7r4sw9q25lkn9z8fxq00sdx0l88agvzjp6rgsggbsl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.20.0-darwin-arm64.tar.gz"; - sha256 = "0dwwwf7m7592nfk4lyc2vyh3ffqf6yfwr948b3padml89s2bmafx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.3.0-darwin-arm64.tar.gz"; + sha256 = "0nxmcssbsn2yqbndaz50xj7jmd7ynjak13yicmli0l7jcrw7ksyp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-darwin-arm64.tar.gz"; - sha256 = "0ivwpfhknhyidpafm2347g1pair7vk055ajhhyg631vizx53hrr9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.21.0-darwin-arm64.tar.gz"; + sha256 = "1a7psd9l3rpf6sfil3wjc55mfdz856h5ixnsbjkpjy9zfblv42nv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.2.0-darwin-arm64.tar.gz"; - sha256 = "09a6nxg66lv82zsis9axnch9slka136nsx43c2sqzmr5x5n11qww"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-darwin-arm64.tar.gz"; + sha256 = "0ivwpfhknhyidpafm2347g1pair7vk055ajhhyg631vizx53hrr9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.6.0-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "0jj35mj57sivi5qsbwv8qm2jginppi192qlx6ashvgm352gia9r1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.20.0-darwin-arm64.tar.gz"; - sha256 = "0ag3m8nnhni98cwaffj30ir8s94b8xvrjsbhn32lin1lnqwm1114"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.21.0-darwin-arm64.tar.gz"; + sha256 = "0k3cyflqnf5n72lg02my28mmclacrnxpyjkakl4gj8qknsj7q94r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.11.0-darwin-arm64.tar.gz"; @@ -567,8 +567,8 @@ sha256 = "058f1j40ar4xh860c3qrm0qaagm69fdmbw14avvrhsmw245cyyzc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.2-darwin-arm64.tar.gz"; - sha256 = "0scmn5cx23g5ap31x93ybimyyx3sqwyz429881px2qdl3k4m75vw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.18.3-darwin-arm64.tar.gz"; + sha256 = "1smhffxxr9kfpx1czd5c2sx4srgnp2yafrqv7r4y7xqdxi92x2k0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-arm64.tar.gz"; @@ -591,8 +591,8 @@ sha256 = "14qp5vlmny68hjca1xykc06z2f740q1flkn9d7n2k6knzp1db9xq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.2-darwin-arm64.tar.gz"; - sha256 = "1rbig2n5x2lzxpscnja0ya9a68z3jk0qz2zwdnzi66xy7i3zd39l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.5.0-darwin-arm64.tar.gz"; + sha256 = "1m6rbisrfh6im9l9c5kfmi0fqp1ndr8wayc33ay18yikrnpfiibj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.7.0-darwin-arm64.tar.gz"; @@ -611,8 +611,8 @@ sha256 = "1vbbca4z6z92yk2y6g15s0cyvs5n6vx84h30ldnn4mn3gdfdi7gg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.2.2-darwin-arm64.tar.gz"; - sha256 = "1ln8qizgisnf1z98vyflid99d5pl1zryrj0hg995d1lf2r0dy35g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.3.0-darwin-arm64.tar.gz"; + sha256 = "16rnbbzx6fsck769sqghb9gqkkpl6vwbpczm8wrfa5ya90743mcm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.4.1-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 671a9875a6f1c..fadc64cf1dfef 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -8,9 +8,11 @@ if [ -z "${GITHUB_TOKEN}" ]; then exit 1 fi +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.30.0" +VERSION="3.31.0" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. @@ -157,4 +159,4 @@ EOF echo " };" echo "}" -} > data.nix +} > "${SCRIPT_DIR}/data.nix" diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 75e14391736d1..f080a3f1d4740 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -13,6 +13,16 @@ buildGoModule rec { vendorSha256 = "sha256-aaYS0WqNa8997kdV38blUsYovtUHHtEUXCTG9vwv2ko="; + ldflags = [ + "-w" + "-extldflags" + "-static" + "-X main.Version=${version}" + "-X main.GitCommit=ref/tags/${version}" + "-X main.GitBranch=HEAD" + "-X main.BuildDate=unknown" + ]; + # some tests require network access to scaleway's API, failing when sandboxed doCheck = false; diff --git a/pkgs/tools/admin/ssh-import-id/default.nix b/pkgs/tools/admin/ssh-import-id/default.nix index 031bb316ca55f..e4202033b99cb 100644 --- a/pkgs/tools/admin/ssh-import-id/default.nix +++ b/pkgs/tools/admin/ssh-import-id/default.nix @@ -4,6 +4,7 @@ , requests , distro , makeWrapper +, installShellFiles , extraHandlers ? [] }: @@ -24,15 +25,20 @@ buildPythonPackage rec { nativeBuildInputs = [ makeWrapper + installShellFiles ]; + postInstall = '' + installManPage $src/usr/share/man/man1/ssh-import-id.1 + ''; + # handlers require main bin, main bin requires handlers makeWrapperArgs = [ "--prefix" ":" "$out/bin" ]; meta = with lib; { description = "Retrieves an SSH public key and installs it locally"; license = licenses.gpl3; - maintainers = with maintainers; [ mkg20001 ]; + maintainers = with maintainers; [ mkg20001 viraptor ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index e3241aacab698..a02e34df631d4 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -1,27 +1,68 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv }: buildGoModule rec { pname = "stripe-cli"; - version = "1.8.4"; + version = "1.8.8"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TP366SozSNfxUGYXIOObfIul0BhQtIGQYZLwH/TPFs0="; + sha256 = "sha256-frVQ2nqOflY26ZZWVYJGMNMOdbLuIojQDu/79kLilBk="; }; - vendorSha256 = "sha256-1c+YtfRy1ey0z117YHHkrCnpb7g+DmM+LR1rjn1YwMQ="; - subPackages = [ - "cmd/stripe" + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/stripe/stripe-cli/pkg/version.Version=${version}" ]; + preCheck = '' + # the tests expect the Version ldflag not to be set + unset ldflags + '' + lib.optionalString ( + # delete plugin tests on all platforms but exact matches + # https://github.com/stripe/stripe-cli/issues/850 + ! lib.lists.any + (platform: lib.meta.platformMatch stdenv.hostPlatform platform) + [ "x86_64-linux" "x86_64-darwin" ] + ) '' + rm pkg/plugins/plugin_test.go + ''; + + postInstall = '' + installShellCompletion --cmd stripe \ + --bash <($out/bin/stripe completion --write-to-stdout --shell bash) \ + --zsh <($out/bin/stripe completion --write-to-stdout --shell zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/stripe --help + $out/bin/stripe --version | grep "${version}" + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://stripe.com/docs/stripe-cli"; + changelog = "https://github.com/stripe/stripe-cli/releases/tag/v${version}"; description = "A command-line tool for Stripe"; + longDescription = '' + The Stripe CLI helps you build, test, and manage your Stripe integration + right from the terminal. + + With the CLI, you can: + Securely test webhooks without relying on 3rd party software + Trigger webhook events or resend events for easy testing + Tail your API request logs in real-time + Create, retrieve, update, or delete API objects. + ''; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ RaghavSood ]; + maintainers = with maintainers; [ RaghavSood jk ]; mainProgram = "stripe"; }; } diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index c9595286173d4..66b99c79453d8 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.26.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Se42a9Q76LsMk6b04P2C2sWSZ2UgfnQrpJUC2gwdCwY="; + sha256 = "sha256-eyvxBpGuOXicuqINYhl4/fUgN/j+Awe5vgMaMxtAMr0="; }; - vendorSha256 = "sha256-y/7KhDx6p+n6nvFHWcvGbvOWsXvvL81jOgfjxsL/JDg="; + vendorSha256 = "sha256-91tq4ipi3JobVgffASn8KRd3JQkgbOx/7PsjKq5vJdE="; excludedPackages = "misc"; diff --git a/pkgs/tools/admin/winbox/default.nix b/pkgs/tools/admin/winbox/default.nix index c845d890ce505..ae55eb4ed69e9 100644 --- a/pkgs/tools/admin/winbox/default.nix +++ b/pkgs/tools/admin/winbox/default.nix @@ -70,7 +70,7 @@ symlinkJoin { homepage = "https://mikrotik.com"; downloadPage = "https://mikrotik.com/download"; changelog = "https://wiki.mikrotik.com/wiki/Winbox_changelog"; - license = licenses.gpl3Plus; + license = licenses.unfree; maintainers = with maintainers; [ yrd ]; }; } diff --git a/pkgs/tools/archivers/gbl/default.nix b/pkgs/tools/archivers/gbl/default.nix index 4c057469f0370..266b0830d5cc5 100644 --- a/pkgs/tools/archivers/gbl/default.nix +++ b/pkgs/tools/archivers/gbl/default.nix @@ -4,7 +4,7 @@ , fetchpatch , pkg-config , openssl -, testVersion +, testers , gbl }: @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; passthru.tests.version = - testVersion { package = gbl; }; + testers.testVersion { package = gbl; }; meta = with lib; { description = "GBL Firmware file manipulation"; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index b4a5420aa9c09..cd2661128a9a0 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 = "2022.04.06"; + version = "2022.04.28"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-s1LFiwFXQsodQdGvgNy7pgXhsWYHw7lVhRXuNYHnvNQ="; + hash = "sha256-a/zFCxdy+GTh5daZO7QBHWeeJ1dead3Dn7dk02jBnc0="; }; meta = with lib; { diff --git a/pkgs/tools/audio/mictray/default.nix b/pkgs/tools/audio/mictray/default.nix new file mode 100644 index 0000000000000..e757bac966829 --- /dev/null +++ b/pkgs/tools/audio/mictray/default.nix @@ -0,0 +1,53 @@ +{ fetchFromGitHub +, gtk3 +, lib +, libgee +, libnotify +, meson +, ninja +, pkg-config +, pulseaudio +, stdenv +, vala +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "mictray"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "Junker"; + repo = "mictray"; + rev = "1f879aeda03fbe87ae5a761f46c042e09912e1c0"; + sha256 = "0achj6r545c1sigls79c8qdzryz3sgldcyzd3pwak1ymim9i9c74"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libgee + libnotify + pulseaudio + ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/Junker/mictray"; + description = "System tray application for microphone"; + longDescription = '' + MicTray is a Lightweight system tray application which lets you control the microphone state and volume. + ''; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.anpryl ]; + }; +} diff --git a/pkgs/tools/audio/mpdsync/default.nix b/pkgs/tools/audio/mpdsync/default.nix deleted file mode 100644 index c89404fbba1cb..0000000000000 --- a/pkgs/tools/audio/mpdsync/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, python2, fetchFromGitHub }: -with python2.pkgs; -stdenv.mkDerivation { - pname = "mpdsync"; - version = "unstable-2017-06-15"; - - src = fetchFromGitHub { - owner = "alphapapa"; - repo = "mpdsync"; - rev = "da90058f44dd9578cc5f2fb96a1fb2b26da40d07"; - sha256 = "1mfg3ipqj5dvyyqbgp6ia6sc1ja5gmm2c9mfrwx0jw2dl182if6q"; - }; - - pythonPath = [ mpd2 ]; - - nativeBuildInputs = [ - wrapPython - ]; - - dontBuild = true; - - installPhase = "install -D mpdsync.py $out/bin/mpdsync"; - postFixup = "wrapPythonPrograms"; - -} diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 49ac645291897..1db9ef848fa29 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg, bash +{ lib, stdenv, fetchurl, coreutils, python3, duplicity, gawk, gnupg, bash , gnugrep, txt2man, makeWrapper, which }: stdenv.mkDerivation rec { pname = "duply"; - version = "2.3.1"; + version = "2.4"; src = fetchurl { - url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.3.x/duply_${version}.tgz"; - sha256 = "149hb9bk7hm5h3aqf19k37d0i2jf0viaqmpq2997i48qp3agji7h"; + url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.4.x/duply_${version}.tgz"; + hash = "sha256-DCrp3o/ukzkfnVaLbIK84bmYnXvqKsvlkGn3GJY3iNg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/man/man1" install -vD duply "$out/bin" wrapProgram "$out/bin/duply" --set PATH \ - ${lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]} + ${lib.makeBinPath [ coreutils python3 duplicity gawk gnupg bash gnugrep txt2man which ]} "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" ''; diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 5aeaffdb50406..926c2247e2de9 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -24,7 +24,7 @@ let }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); in stdenv.mkDerivation rec { pname = "ventoy-bin"; - version = "1.0.72"; + version = "1.0.74"; nativeBuildInputs = [ autoPatchelfHook makeWrapper ] ++ lib.optional withQt5 qt5.wrapQtAppsHook; @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - sha256 = "sha256-1mfe6ZnqkeBNGNjI7Qx7jG5FLgfn6rVwr0VQvSOG7Ow="; + sha256 = "sha256-raoVbj1+6nSR4knq/FmgVpzXRV71Hrcqd8C6Zsi34Uo="; }; patches = [ (fetchpatch { name = "sanitize.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=19f8922b3d96c5ff55eeefc269ae43369a0748e8"; - sha256 = "sha256-RDdxPCmrfNMwXNuJwQW48fAiJPbMjdHiBmF03fKqm2o="; + url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=057f2d1eb496c7a3aaa8229e99a7f709428fa4c5"; + sha256 = "sha256-iAtLtM+Q4OsXDK83eCnPNomeNSEqdRLFfK2x7ybPSpk="; }) ./fix-for-read-only-file-system.patch ./add-mips64.patch @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { aarch64) rm -r {tool/,VentoyGUI.}{x86_64,i386,mips64el};; mips64el) rm -r {tool/,VentoyGUI.}{x86_64,i386,aarch64};; esac - rm README tool/VentoyWorker.sh.orig + rm README rm tool/"$ARCH"/Ventoy2Disk.gtk2 || true # For aarch64 and mips64el. # Copy from "$src" to "$out". @@ -106,10 +106,15 @@ in stdenv.mkDerivation rec { makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \ --prefix PATH : "${lib.makeBinPath buildInputs}" \ --chdir "$VENTOY_PATH" + mkdir "$out"/share/{applications,pixmaps} + ln -s "$VENTOY_PATH"/WebUI/static/img/VentoyLogo.png "$out"/share/pixmaps/ + cp ${./ventoy-gui.desktop} "$out"/share/applications/ '' + lib.optionalString (!withGtk3) '' - rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.gtk3" + rm "$VENTOY_PATH"/tool/{"$ARCH"/Ventoy2Disk.gtk3,VentoyGTK.glade} '' + lib.optionalString (!withQt5) '' rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.qt5" + '' + lib.optionalString (!withGtk3 && !withQt5) '' + rm "$VENTOY_PATH"/VentoyGUI.* ''; meta = with lib; { diff --git a/pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktop b/pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktop new file mode 100644 index 0000000000000..a132f3bbf5a4d --- /dev/null +++ b/pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Categories=Utility; +Comment=Tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files +Exec=ventoy-gui +Hidden=false +Icon=VentoyLogo +Name=Ventoy +StartupNotify=true +Terminal=false +Type=Application diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index b94f1d83394b3..bd8bf1adb9fc8 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2022-04-08"; + version = "unstable-2022-05-02"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "986533d8d5b21c8eb512bbb3f0496d3d2a087c5d"; - sha256 = "1qvb5l937nnls5j82ipgrdh6q5fk923z752rzzqqcms6fz7rrjs4"; + rev = "6f5afc0c12bbf56ffdabe5b2c5297aef255c4baa"; + sha256 = "0483zhm3gmk6fd1pn815i3fixwlwsnks3817gn7n3idbbw0kg5ng"; }; postPatch = '' diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 1162c4e69b127..678835bf7bf86 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -9,7 +9,7 @@ , gtest , cunit, snappy , makeWrapper -, leveldb, oathToolkit +, leveldb, oath-toolkit , libnl, libcap_ng , rdkafka , nixosTests @@ -161,7 +161,7 @@ in rec { buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit - snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka + snappy lz4 oath-toolkit leveldb libnl libcap_ng rdkafka cryptsetup sqlite lua icu bzip2 ] ++ lib.optionals stdenv.isLinux [ linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index 0367ed6037e25..3efca6553a226 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "fuse-7z-ng"; - version = "git-2014-06-08"; + version = "unstable-2014-06-08"; src = fetchFromGitHub { owner = "kedazo"; diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix new file mode 100644 index 0000000000000..5c0bc74245f62 --- /dev/null +++ b/pkgs/tools/filesystems/httm/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "httm"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "kimono-koans"; + repo = pname; + rev = version; + sha256 = "sha256-uqzwS7+OQsPdMv3+fWdn3yVFJwtFZNd8kVWw//mQZj8="; + }; + + cargoSha256 = "sha256-EC3E5NawsDe+CU5WEu0G3FWVLuqW5nXOoUURN0iDPK0="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage httm.1 + + installShellCompletion --cmd httm \ + --zsh scripts/httm-key-bindings.zsh + ''; + + meta = with lib; { + description = "Interactive, file-level ZFS Time Machine-like tool"; + homepage = "https://github.com/kimono-koans/httm"; + license = licenses.mpl20; + platforms = platforms.unix; + maintainers = with maintainers; [ wyndon ]; + }; +} diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index a7fdf9e2fb251..0bc16aa7fc5db 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man, texinfo, libtool, cppzmq, libarchive +{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq, libarchive , avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2, nanodbc, fmt , nlohmann_json, spdlog }: # Common attributes of irods packages { - nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ]; + nativeBuildInputs = [ autoconf automake cmake help2man texinfo which gcc ]; buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost libcxx catch2 nanodbc fmt nlohmann_json spdlog ]; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 7931911b65f3d..afe1f2ffcd972 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man, texinfo, libtool, cppzmq +{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 , nanodbc_llvm, fmt, nlohmann_json, spdlog }: @@ -8,7 +8,7 @@ let in let common = import ./common.nix { - inherit lib stdenv bzip2 zlib autoconf automake cmake gnumake + inherit lib stdenv bzip2 zlib autoconf automake cmake help2man texinfo libtool cppzmq libarchive jansson zeromq openssl pam libiodbc libkrb5 gcc libcxx boost avro-cpp which catch2 nanodbc fmt nlohmann_json @@ -99,4 +99,3 @@ rec { }; }); } - diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 340c5add295e4..3be3865ccd071 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -24,12 +24,21 @@ stdenv.mkDerivation rec { }; patches = [ + # remove once https://github.com/plougher/squashfs-tools/pull/177 is merged and in a release + (fetchpatch { + url = "https://github.com/plougher/squashfs-tools/commit/6100e82c7e7f18f503c003c67c87791025d5f01b.patch"; + sha256 = "sha256-bMBQsbSKQ4E7r9avns2QaomGAYl3s82m58gYyTQdB08="; + }) # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. ./4k-align.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; - buildInputs = [ zlib xz zstd lz4 lzo which help2man ]; + strictDeps = true; + nativeBuildInputs = [ which ] + # when cross-compiling help2man cannot run the cross-compiled binary + ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ help2man ]; + buildInputs = [ zlib xz zstd lz4 lzo ]; preBuild = '' cd squashfs-tools diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index 14938113a1e0e..98c9ae525f4e0 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , autoreconfHook -, gnused , boost , fuse , log4cxx @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-contrib/zookeeper-contrib-zkfuse"; - nativeBuildInputs = [ autoreconfHook gnused ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zookeeper_mt log4cxx boost fuse ]; postPatch = '' diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 51d3e1e868da2..a205f03f079c3 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, makeWrapper, gawk +{ lib, fetchFromGitHub, makeWrapper , makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages , stdenv, shortenPerlShebang }: @@ -22,7 +22,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - nativeBuildInputs = [ makeWrapper gawk ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; buildInputs = [ gnuplot perl ] ++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]); diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index c6c90442ddce7..e29e259b13464 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let in (if withQt then mkDerivation else stdenv.mkDerivation) rec { pname = "gnuplot"; - version = "5.4.2"; + version = "5.4.3"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz"; - sha256 = "sha256-5Xx14TGBM5UdMqg7zcSv8X/tKHIsTnHyMFz8KuHK57o="; + sha256 = "sha256-UfiburkPltNUP5UjU2jRiOseJu2ilpEiVqvNNTW9TYQ="; }; nativeBuildInputs = [ makeWrapper pkg-config texinfo ] ++ lib.optional withQt qttools; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index e2c5f9f63fc56..924ac901f6a8c 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -16,7 +16,6 @@ , pango , bash , bison -, fetchpatch , xorg , ApplicationServices , python3 @@ -28,26 +27,16 @@ let in stdenv.mkDerivation { pname = "graphviz"; - version = "2.49.3"; + version = "2.50.0"; src = fetchFromGitLab { owner = "graphviz"; repo = "graphviz"; # use rev as tags have disappeared before - rev = "3425dae078262591d04fec107ec71ab010651852"; - sha256 = "1qvyjly7r1ihacdvxq0r59l4csr09sc05palpshzqsiz2wb1izk0"; + rev = "ca43e4c6a217650447e2928c2e9cb493c73ebd7d"; + sha256 = "1psfgr8y4hh9yyzl04f7xbqb2y9k1xbja051j6b06q9dx7bmkmky"; }; - patches = [ - # Fix cross. - # https://gitlab.com/graphviz/graphviz/-/merge_requests/2281 - # Remove when version > 2.49.3. - (fetchpatch { - url = "https://gitlab.com/graphviz/graphviz/-/commit/0cdb89acbb0caf5baf3d04a8821c9d0dfe065ea8.patch"; - sha256 = "130mqlxzhzaz3vp4ccaq7z7fd9q6vjxmimz70g8y818igsbb13rf"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index d815b6ac83e2c..2bc40f1cc7889 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { libGLU libGL freeglut ]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; }); - patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ]; + patches = [ ./glut.patch ./threads.patch ./pfstools.patch ./pfsalign.patch ]; meta = with lib; { homepage = "http://pfstools.sourceforge.net/"; diff --git a/pkgs/tools/graphics/pfstools/glut.patch b/pkgs/tools/graphics/pfstools/glut.patch new file mode 100644 index 0000000000000..b540b5ebc6a6e --- /dev/null +++ b/pkgs/tools/graphics/pfstools/glut.patch @@ -0,0 +1,12 @@ +--- a/src/pfsglview/CMakeLists.txt 2022-04-04 23:21:11.164016369 +0300 ++++ b/src/pfsglview/CMakeLists.txt 2022-04-04 23:21:32.757878750 +0300 +@@ -11,8 +11,7 @@ + + add_executable(pfsglview pfsglview.cpp picture_io.cpp module.cpp m_histogram.cpp m_status.cpp m_on_screen_display.cpp) + +-# TODO: Use ${GLUT_LIBRARY} instead. +-target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_glut_LIBRARY} pfs) ++target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} pfs) + + install (TARGETS pfsglview DESTINATION bin) + install (FILES pfsglview.1 DESTINATION ${MAN_DIR}) diff --git a/pkgs/tools/graphics/pixel2svg/default.nix b/pkgs/tools/graphics/pixel2svg/default.nix new file mode 100644 index 0000000000000..630e896ee75bb --- /dev/null +++ b/pkgs/tools/graphics/pixel2svg/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, python310Packages }: + +python310Packages.buildPythonPackage rec { + pname = "pixel2svg"; + version = "0.3.0"; + + src = fetchurl { + url = "https://static.florian-berger.de/pixel2svg-${version}.zip"; + sha256 = "sha256-aqcTTmZKcdRdVd8GGz5cuaQ4gjPapVJNtiiZu22TZgQ="; + }; + + propagatedBuildInputs = with python310Packages; [ pillow svgwrite ]; + + meta = with lib; { + homepage = "https://florian-berger.de/en/software/pixel2svg/"; + description = "Converts pixel art to SVG - pixel by pixel"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ papojari ]; + }; +} diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix new file mode 100644 index 0000000000000..c2938a69b57ac --- /dev/null +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "SVGCleaner"; + version = "unstable-2021-08-30"; + + src = fetchFromGitHub { + owner = "RazrFalcon"; + repo = pname; + rev = "575eac74400a5ac45c912b144f0c002aa4a0135f"; + sha256 = "sha256-pRDRRVb8Lyna8X/PEjS9tS5dbG4g7vyMCU5AqPlpxec="; + }; + + cargoSha256 = "sha256-SZWmJGiCc/FevxMWJpa8xKVz/rbll52oNbFtqPpz74g="; + + meta = with lib; { + description = "Clean and optimize SVG files from unnecessary data"; + homepage = "https://github.com/RazrFalcon/SVGCleaner"; + changelog = "https://github.com/RazrFalcon/svgcleaner/releases"; + license = licenses.gpl2; + maintainers = with maintainers; [ yuu ]; + }; +} diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index df41ecd485db6..ea1acfb4edfce 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.2.198.0"; + version = "1.3.211.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "sdk-${version}"; - sha256 = "sha256-g674rw8lXyP1WUoJmbRRL7s+1Yxs00sR04+hTQ3l3dE="; + sha256 = "sha256-ixCfHnp6YAOuR4NMTGjhhqkfm0H7ZcO/8xKFJqw16YE="; }); nativeBuildInputs = [ cmake jq ]; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index ae9e0e86b2521..7bdfafad13f88 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; # The version must match that in vulkan-headers - version = "1.2.189.1"; + version = "1.3.211.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "sdk-${version}"; - sha256 = "0431dgplv5wiz8bj0ja91mbpc2qhjgdhqhrgaqarvyvjr1f7jw52"; + sha256 = "sha256-Pkz2FV0AnTKm/4jVmkQNkYzpxpKJaSoy2fRAhVh5OKU="; fetchSubmodules = true; }); diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 987511b1cc967..9cc83e1976910 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,9 +1,24 @@ -{ stdenv, lib, fetchFromGitHub, cmake, glslang, libX11, libxcb -, libXrandr, vulkan-headers, vulkan-loader, wayland }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, glslang +, libffi +, libX11 +, libXau +, libxcb +, libXdmcp +, libXrandr +, vulkan-headers +, vulkan-loader +, wayland +, wayland-protocols +}: stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.2.198.0"; + version = "1.3.211.0"; # It's not strictly necessary to have matching versions here, however # since we're using the SDK version we may as well be consistent with @@ -13,11 +28,27 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "sha256-oNJm9Gi41aA5krkpkQI0EYdIlMcQpdodv9yqXhnNURA="; + sha256 = "sha256-iXsWTKNllPZy1Kpo3JHzEEus3Hu9LofvMB3c4Gn6/DM="; }); - nativeBuildInputs = [ cmake ]; - buildInputs = [ glslang libX11 libxcb libXrandr vulkan-headers vulkan-loader wayland ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + glslang + libffi + libX11 + libXau + libxcb + libXdmcp + libXrandr + vulkan-headers + vulkan-loader + wayland + wayland-protocols + ]; libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; @@ -28,6 +59,7 @@ stdenv.mkDerivation rec { "-DBUILD_ICD=OFF" # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH "-DCMAKE_INSTALL_RPATH=${libraryPath}" + "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" # Hide dev warnings that are useless for packaging "-Wno-dev" ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patch b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patch new file mode 100644 index 0000000000000..428a0232dc3ba --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patch @@ -0,0 +1,18 @@ +:100644 100644 fac4f53 aed9617 M src/rimeengine.cpp + +diff --git a/src/rimeengine.cpp b/src/rimeengine.cpp +index fac4f53..aed9617 100644 +--- a/src/rimeengine.cpp ++++ b/src/rimeengine.cpp +@@ -164,7 +164,10 @@ void RimeEngine::rimeStart(bool fullcheck) { + RIME_ERROR() << "Failed to create user directory: " << userDir; + } + } +- const char *sharedDataDir = RIME_DATA_DIR; ++ const char *sharedDataDir = getenv("NIX_RIME_DATA_DIR"); ++ if (!sharedDataDir) { ++ sharedDataDir = RIME_DATA_DIR; ++ } + + RIME_STRUCT(RimeTraits, fcitx_rime_traits); + fcitx_rime_traits.shared_data_dir = sharedDataDir; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 3743d6cb9fc8a..fac81c8dea12b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { librime ]; + patches = [ ./fcitx5-rime-with-nix-env-variable.patch ]; + meta = with lib; { description = "RIME support for Fcitx5"; homepage = "https://github.com/fcitx/fcitx5-rime"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index 0785b7563456d..e67443d0367c4 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, glib , gettext , xorg , pkg-config @@ -11,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ibus-bamboo"; - version = "0.7.0"; + version = "0.7.7"; src = fetchFromGitHub { owner = "BambooEngine"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WKNDrm8PSU/F8MzpVsJ9oUkbolCxrwbjOZYYNiFr5Qs="; + sha256 = "1qdkimq4n9bxqjlnd00dggvx09cf4wqwk0kpgj01jd0i6ahggns1"; }; nativeBuildInputs = [ @@ -28,6 +29,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glib + gtk3 xorg.libX11 xorg.xorgproto xorg.libXtst diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index 18fc21e980884..d725691a04522 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,22 +2,18 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.12"; + version = "1.3.13"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-2k7JtLr+zO71rbTz11CCiIPx+orn0dw/Y8m47WfRDEU="; + sha256 = "sha256-XN11iOShWyzRzmo/Ke+1Qh//o4ZhsmJWimgA1by2VZo="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ibus ibus-table python3 ]; preBuild = '' - export HOME=$(mktemp -d)/ibus-table-others - ''; - - postFixup = '' - rm -rf $HOME + export HOME=$TMPDIR ''; meta = with lib; { diff --git a/pkgs/tools/inputmethods/lisgd/default.nix b/pkgs/tools/inputmethods/lisgd/default.nix index 3592f2373b269..c525772d5d0c8 100644 --- a/pkgs/tools/inputmethods/lisgd/default.nix +++ b/pkgs/tools/inputmethods/lisgd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "lisgd"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromSourcehut { owner = "~mil"; repo = "lisgd"; rev = version; - sha256 = "sha256-zcDxR2fKsjuX+vxjhr5UcqEsiNM+zWd2SBaA6Xly3AI="; + hash = "sha256-ZzPdIwN4/G5Te51gJpbNcHVkG4Rplcaa8yHDJr58oyk="; }; inherit patches; diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix index 9c4b5c00a6655..deee88a7303f4 100644 --- a/pkgs/tools/misc/agedu/default.nix +++ b/pkgs/tools/misc/agedu/default.nix @@ -1,7 +1,11 @@ -{lib, stdenv, fetchgit, autoreconfHook, halibut}: +{ lib, stdenv +, fetchgit +, cmake +, halibut +}: let - date = "20200705"; - rev = "2a7d4a2"; + date = "20211129"; + rev = "8cd63c5"; in stdenv.mkDerivation { pname = "agedu"; @@ -11,10 +15,10 @@ stdenv.mkDerivation { src = fetchgit { url = "https://git.tartarus.org/simon/agedu.git"; inherit rev; - sha256 = "gRNscl/vhBoZaHFCs9JjDBHDRoEpILJLtiI4YV+K/b4="; + hash = "sha256-5wqpL7wrFwIf6lxVte+GXLsXYY0/36EIAUepVNDCnSE="; }; - nativeBuildInputs = [autoreconfHook halibut]; + nativeBuildInputs = [ cmake halibut ]; meta = with lib; { description = "A Unix utility for tracking down wasted disk space"; diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index c7e629c280ee5..b39d9b17002fe 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-8DCQAgwXaJxRl6NxzSCow9XpP4HhHw3hlPXvmqpq/nc="; + sha256 = "sha256-Qn2XT/l3zx0u3twKsQr1cHbaRiLTglQf0WNx8tqtKro="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index cb483567f215b..76e2906a94212 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, bat +{ lib, stdenv, fetchFromGitHub, makeWrapper, bat # batdiff, batgrep, and batwatch , coreutils , getconf @@ -15,6 +15,8 @@ # batdiff , gitMinimal , withDelta ? delta != null, delta ? null +# batman +, util-linux }: let @@ -33,7 +35,7 @@ let }; # bat needs to be in the PATH during building so EXECUTABLE_BAT picks it up - nativeBuildInputs = [ bash bat ]; + nativeBuildInputs = [ bat ]; dontConfigure = true; @@ -93,7 +95,7 @@ let src = core; - nativeBuildInputs = [ bash makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # Make the dependencies available to the tests. buildInputs = dependencies; @@ -136,7 +138,7 @@ in { batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta); batgrep = script "batgrep" [ less coreutils ripgrep ]; - batman = script "batman" []; + batman = script "batman" [ util-linux ]; batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr); prettybat = script "prettybat" ([] ++ optionalDep withShFmt shfmt diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index 61fc84fef7e76..b9e7c9712daab 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -5,9 +5,7 @@ stdenv.mkDerivation rec { pname = "bcunit"; - # Latest release 3.0.2 is missing some functions needed by bctoolbox. See: - # https://gitlab.linphone.org/BC/public/bcunit/issues/1 - version = "unstable-2019-11-19"; + version = "linphone-4.4.1"; nativeBuildInputs = [ cmake ]; src = fetchFromGitLab { @@ -15,12 +13,12 @@ stdenv.mkDerivation rec { owner = "public"; group = "BC"; repo = pname; - rev = "3c720fbf67dd3c02b0c7011ed4036982b2c93532"; - sha256 = "1237hpmkls2igp60gdfkbknxpgwvxn1vmv2m41vyl25xw1d3g35w"; + rev = "c5eebcc7f794e9567d3c72d15d3f28bffe6bfd0f"; + sha256 = "sha256-8DSfqHerx/V00SJjTSQaG9Rjqx330iG6sGivBDUvQfA="; }; meta = with lib; { - description = "A fork of CUnit test framework"; + description = "Belledonne Communications' fork of CUnit test framework. Part of the Linphone project."; homepage = "https://gitlab.linphone.org/BC/public/bcunit"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin jluttine ]; diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/tools/misc/calamares-nixos-extensions/default.nix new file mode 100644 index 0000000000000..793f341a07310 --- /dev/null +++ b/pkgs/tools/misc/calamares-nixos-extensions/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation rec { + pname = "calamares-nixos-extensions"; + version = "0.3.8"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "calamares-nixos-extensions"; + rev = version; + sha256 = "MtqAOwlY5euVNAGRl2pRkbg/OolJPNOSQcR4DS5gFz4="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/{lib,share}/calamares + cp -r modules $out/lib/calamares/ + cp -r config/* $out/share/calamares/ + cp -r branding $out/share/calamares/ + runHook postInstall + ''; + + meta = with lib; { + description = "Calamares modules for NixOS"; + homepage = "https://github.com/NixOS/calamares-nixos-extensions"; + license = with licenses; [ gpl3Plus bsd2 cc-by-40 cc-by-sa-40 cc0 ]; + maintainers = with maintainers; [ vlinkz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 9112041502127..8afb103e9d497 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,24 +1,48 @@ -{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore -, kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase -, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata +{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore, kirigami2 +, kservice, libatasmart, libxcb, libyamlcpp, libpwquality, parted, polkit-qt, python +, qtbase, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata , ckbcomp, xkeyboard_config, mkDerivation +, nixos-extensions ? false }: mkDerivation rec { pname = "calamares"; - version = "3.2.55"; + version = "3.2.56"; # release including submodule src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-1xf02rjy6+83zbU2yxGUGjcIGJfYS8ryqi4CBzrh7kI="; + url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "e1402d7693659b85c5e553481a7252d91350c3f33ffea413488d7712d3281e03"; }; + patches = lib.optionals nixos-extensions [ + # Modifies the users module to only set passwords of user and root + # as the users will have already been created in the configuration.nix file + ./userjob.patch + # Makes calamares search /run/current-system/sw/share/calamares/ for extra configuration files + # as by default it only searches /usr/share/calamares/ and /nix/store/<hash>-calamares-<version>/share/calamares/ + # but calamares-nixos-extensions is not in either of these locations + ./nixos-extensions-paths.patch + # Uses pkexec within modules in order to run calamares without root permissions as a whole + # Also fixes storage check in the welcome module + ./nonroot.patch + # Adds unfree qml to packagechooserq + ./unfreeq.patch + # Adds config to change name of packagechooserq + # Upstreamed in PR: https://github.com/calamares/calamares/pull/1932 + ./packagechooserq.patch + # Modifies finished module to add some NixOS resources + # Modifies packagechooser module to change the UI + ./uimod.patch + # Remove options for unsupported partition types + ./partitions.patch + ]; + nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ - boost kparts.dev kpmcore.out kservice.dev - libatasmart libxcb libyamlcpp parted polkit-qt python qtbase - qtquickcontrols qtsvg qttools qtwebengine.dev util-linux + boost kparts.dev kpmcore.out kservice.dev kirigami2 + libatasmart libxcb libyamlcpp libpwquality parted polkit-qt python + qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; cmakeFlags = [ @@ -32,15 +56,28 @@ mkDerivation rec { POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions"; postPatch = '' + # Run calamares without root. Other patches make it functional as a normal user + sed -e "s,pkexec calamares,calamares," \ + -i calamares.desktop + + sed -e "s,X-AppStream-Ignore=true,&\nStartupWMClass=io.calamares.calamares," \ + -i calamares.desktop + + # Fix desktop reference with wayland + mv calamares.desktop io.calamares.calamares.desktop + + sed -e "s,calamares.desktop,io.calamares.calamares.desktop," \ + -i CMakeLists.txt + sed -e "s,/usr/bin/calamares,$out/bin/calamares," \ - -i calamares.desktop \ -i com.github.calamares.calamares.policy sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \ - -i src/modules/locale/SetTimezoneJob.cpp + -i src/modules/locale/SetTimezoneJob.cpp \ + -i src/libcalamares/locale/TimeZone.cpp sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \ - -i src/modules/keyboard/keyboardwidget/keyboardglobal.h + -i src/modules/keyboard/keyboardwidget/keyboardglobal.cpp sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \ -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp @@ -51,8 +88,9 @@ mkDerivation rec { meta = with lib; { description = "Distribution-independent installer framework"; - license = with licenses; [ gpl3Plus bsd2 ]; - maintainers = with maintainers; [ manveru ]; + homepage = "https://calamares.io/"; + license = with licenses; [ gpl3Plus bsd2 cc0 ]; + maintainers = with maintainers; [ manveru vlinkz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/calamares/nixos-extensions-paths.patch b/pkgs/tools/misc/calamares/nixos-extensions-paths.patch new file mode 100644 index 0000000000000..4e0012160e9fb --- /dev/null +++ b/pkgs/tools/misc/calamares/nixos-extensions-paths.patch @@ -0,0 +1,46 @@ +diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp +index de709156f..a0b6c5faf 100644 +--- a/src/calamares/main.cpp ++++ b/src/calamares/main.cpp +@@ -131,6 +132,8 @@ main( int argc, char* argv[] ) + // TODO: umount anything in /tmp/calamares-... as an emergency save function + #endif + ++ CalamaresUtils::setNixosDirs(); ++ + bool is_debug = handle_args( a ); + + #ifdef WITH_KF5DBus +diff --git a/src/libcalamares/utils/Dirs.cpp b/src/libcalamares/utils/Dirs.cpp +index f333d6e64..6118fb412 100644 +--- a/src/libcalamares/utils/Dirs.cpp ++++ b/src/libcalamares/utils/Dirs.cpp +@@ -115,6 +116,14 @@ setXdgDirs() + s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() ); + } + ++void ++setNixosDirs() ++{ ++ s_extraConfigDirs << "/run/current-system/sw/share/calamares/"; ++ s_extraDataDirs << "/run/current-system/sw/share/calamares/"; ++ s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() ); ++} ++ + QStringList + extraConfigDirs() + { +diff --git a/src/libcalamares/utils/Dirs.h b/src/libcalamares/utils/Dirs.h +index 445cbe1f1..da869d446 100644 +--- a/src/libcalamares/utils/Dirs.h ++++ b/src/libcalamares/utils/Dirs.h +@@ -50,6 +50,9 @@ DLLEXPORT bool isAppDataDirOverridden(); + /** @brief Setup extra config and data dirs from the XDG variables. + */ + DLLEXPORT void setXdgDirs(); ++/** @brief Setup extra config and data dirs fir NixOS. ++ */ ++DLLEXPORT void setNixosDirs(); + /** @brief Are any extra directories configured? */ + DLLEXPORT bool haveExtraDirs(); + /** @brief XDG_CONFIG_DIRS, each guaranteed to end with / */ diff --git a/pkgs/tools/misc/calamares/nonroot.patch b/pkgs/tools/misc/calamares/nonroot.patch new file mode 100644 index 0000000000000..7843f45f284ce --- /dev/null +++ b/pkgs/tools/misc/calamares/nonroot.patch @@ -0,0 +1,105 @@ +diff --git a/src/libcalamares/utils/Runner.cpp b/src/libcalamares/utils/Runner.cpp +index c7146c2d7..e165d9a8f 100644 +--- a/src/libcalamares/utils/Runner.cpp ++++ b/src/libcalamares/utils/Runner.cpp +@@ -140,13 +140,13 @@ Calamares::Utils::Runner::run() + } + if ( m_location == RunLocation::RunInTarget ) + { +- process.setProgram( "chroot" ); +- process.setArguments( QStringList { workingDirectory.absolutePath() } << m_command ); ++ process.setProgram( "pkexec" ); ++ process.setArguments( QStringList { "chroot" } + QStringList { workingDirectory.absolutePath() } << m_command ); + } + else + { +- process.setProgram( "env" ); +- process.setArguments( m_command ); ++ process.setProgram( "pkexec" ); ++ process.setArguments( QStringList { "env" } + m_command ); + } + + if ( m_output ) +diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py +index a3318d1a0..5fbe202fd 100644 +--- a/src/modules/mount/main.py ++++ b/src/modules/mount/main.py +@@ -152,7 +152,8 @@ def mount_partition(root_mount_point, partition, partitions): + + # Ensure that the created directory has the correct SELinux context on + # SELinux-enabled systems. +- os.makedirs(mount_point, exist_ok=True) ++ subprocess.check_call(["pkexec", "mkdir", "-p", mount_point]) ++ + try: + subprocess.call(['chcon', '--reference=' + raw_mount_point, mount_point]) + except FileNotFoundError as e: +@@ -193,13 +194,13 @@ def mount_partition(root_mount_point, partition, partitions): + for s in btrfs_subvolumes: + if not s["subvolume"]: + continue +- os.makedirs(root_mount_point + os.path.dirname(s["subvolume"]), exist_ok=True) +- subprocess.check_call(["btrfs", "subvolume", "create", ++ subprocess.check_call(["pkexec", "mkdir", "-p", root_mount_point + os.path.dirname(s["subvolume"])]) ++ subprocess.check_call(["pkexec", "btrfs", "subvolume", "create", + root_mount_point + s["subvolume"]]) + if s["mountPoint"] == "/": + # insert the root subvolume into global storage + libcalamares.globalstorage.insert("btrfsRootSubvolume", s["subvolume"]) +- subprocess.check_call(["umount", "-v", root_mount_point]) ++ subprocess.check_call(["pkexec", "umount", "-v", root_mount_point]) + + device = partition["device"] + +diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp +index ca7219ca4..6ac682ba4 100644 +--- a/src/modules/welcome/checker/GeneralRequirements.cpp ++++ b/src/modules/welcome/checker/GeneralRequirements.cpp +@@ -371,10 +371,34 @@ GeneralRequirements::checkEnoughStorage( qint64 requiredSpace ) + cWarning() << "GeneralRequirements is configured without libparted."; + return false; + #else +- return check_big_enough( requiredSpace ); ++ return big_enough( requiredSpace ); + #endif + } + ++bool ++GeneralRequirements::big_enough( qint64 requiredSpace ) ++{ ++ FILE *fpipe; ++ char command[128]; ++ snprintf(command, sizeof(command), "lsblk --bytes -no SIZE,TYPE | grep disk | awk '$1 > %llu {print $1}'", requiredSpace); ++ char c = 0; ++ ++ if (0 == (fpipe = (FILE*)popen(command, "r"))) ++ { ++ cWarning() << "Failed to check storage size."; ++ return false; ++ } ++ ++ while (fread(&c, sizeof c, 1, fpipe)) ++ { ++ pclose(fpipe); ++ return true; ++ } ++ ++ pclose(fpipe); ++ ++ return false; ++} + + bool + GeneralRequirements::checkEnoughRam( qint64 requiredRam ) +diff --git a/src/modules/welcome/checker/GeneralRequirements.h b/src/modules/welcome/checker/GeneralRequirements.h +index b6646da11..ea27324fa 100644 +--- a/src/modules/welcome/checker/GeneralRequirements.h ++++ b/src/modules/welcome/checker/GeneralRequirements.h +@@ -36,6 +36,7 @@ private: + bool checkHasPower(); + bool checkHasInternet(); + bool checkIsRoot(); ++ bool big_enough( qint64 requiredSpace ); + + qreal m_requiredStorageGiB; + qreal m_requiredRamGiB; diff --git a/pkgs/tools/misc/calamares/packagechooserq.patch b/pkgs/tools/misc/calamares/packagechooserq.patch new file mode 100644 index 0000000000000..90a7b22de8b54 --- /dev/null +++ b/pkgs/tools/misc/calamares/packagechooserq.patch @@ -0,0 +1,136 @@ +diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp +index 491fe5c25..667621597 100644 +--- a/src/modules/packagechooser/Config.cpp ++++ b/src/modules/packagechooser/Config.cpp +@@ -237,6 +237,12 @@ Config::setPackageChoice( const QString& packageChoice ) + emit packageChoiceChanged( m_packageChoice.value_or( QString() ) ); + } + ++QString ++Config::prettyName() const ++{ ++ return m_stepName ? m_stepName->get() : tr( "Packages" ); ++} ++ + QString + Config::prettyStatus() const + { +@@ -343,4 +349,14 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) + cWarning() << "Single-selection QML module must use 'Legacy' method."; + } + } ++ ++ bool labels_ok = false; ++ auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok ); ++ if ( labels_ok ) ++ { ++ if ( labels.contains( "step" ) ) ++ { ++ m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" ); ++ } ++ } + } +diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h +index b04b1c30b..d1b783a8d 100644 +--- a/src/modules/packagechooser/Config.h ++++ b/src/modules/packagechooser/Config.h +@@ -98,6 +98,7 @@ public: + QString packageChoice() const { return m_packageChoice.value_or( QString() ); } + void setPackageChoice( const QString& packageChoice ); + ++ QString prettyName() const; + QString prettyStatus() const; + + signals: +@@ -120,6 +121,7 @@ private: + * Reading the property will return an empty QString. + */ + std::optional< QString > m_packageChoice; ++ CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar + }; + + +diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp +index 9057004de..8eacf82ec 100644 +--- a/src/modules/packagechooser/PackageChooserViewStep.cpp ++++ b/src/modules/packagechooser/PackageChooserViewStep.cpp +@@ -29,7 +29,6 @@ PackageChooserViewStep::PackageChooserViewStep( QObject* parent ) + : Calamares::ViewStep( parent ) + , m_config( new Config( this ) ) + , m_widget( nullptr ) +- , m_stepName( nullptr ) + { + emit nextStatusChanged( false ); + } +@@ -41,14 +40,12 @@ PackageChooserViewStep::~PackageChooserViewStep() + { + m_widget->deleteLater(); + } +- delete m_stepName; + } + +- + QString + PackageChooserViewStep::prettyName() const + { +- return m_stepName ? m_stepName->get() : tr( "Packages" ); ++ return m_config->prettyName(); + } + + +@@ -139,16 +136,6 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap + m_config->setDefaultId( moduleInstanceKey() ); + m_config->setConfigurationMap( configurationMap ); + +- bool labels_ok = false; +- auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok ); +- if ( labels_ok ) +- { +- if ( labels.contains( "step" ) ) +- { +- m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" ); +- } +- } +- + if ( m_widget ) + { + hookupModel(); +diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h +index 7561f2bd7..76b35aed8 100644 +--- a/src/modules/packagechooser/PackageChooserViewStep.h ++++ b/src/modules/packagechooser/PackageChooserViewStep.h +@@ -50,7 +50,6 @@ private: + + Config* m_config; + PackageChooserPage* m_widget; +- CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar + }; + + CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserViewStepFactory ) +diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp +index 543c9771d..7c4d5fda7 100644 +--- a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp ++++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp +@@ -29,7 +29,7 @@ PackageChooserQmlViewStep::PackageChooserQmlViewStep( QObject* parent ) + QString + PackageChooserQmlViewStep::prettyName() const + { +- return tr( "Packages" ); ++ return m_config->prettyName(); + } + + QString +@@ -83,4 +83,13 @@ PackageChooserQmlViewStep::setConfigurationMap( const QVariantMap& configuration + m_config->setDefaultId( moduleInstanceKey() ); + m_config->setConfigurationMap( configurationMap ); + Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last ++ /*bool labels_ok = false; ++ auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok ); ++ if ( labels_ok ) ++ { ++ if ( labels.contains( "step" ) ) ++ { ++ m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" ); ++ } ++ }*/ + } diff --git a/pkgs/tools/misc/calamares/partitions.patch b/pkgs/tools/misc/calamares/partitions.patch new file mode 100644 index 0000000000000..ae3c7961ae644 --- /dev/null +++ b/pkgs/tools/misc/calamares/partitions.patch @@ -0,0 +1,28 @@ +diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp +index c5b17c69e..353b6f964 100644 +--- a/src/modules/partition/gui/CreatePartitionDialog.cpp ++++ b/src/modules/partition/gui/CreatePartitionDialog.cpp +@@ -107,7 +107,8 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, + { + // We need to ensure zfs is added to the list if the zfs module is enabled + if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) ) +- || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) ) ++ || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ++ && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix ) ) + { + fsNames << userVisibleFS( fs ); // This is put into the combobox + if ( fs->type() == defaultFSType ) +diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp +index 0bc35cabe..3cf8a7fa2 100644 +--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp ++++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp +@@ -95,7 +95,8 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, + { + // We need to ensure zfs is added to the list if the zfs module is enabled + if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) ) +- || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) ) ++ || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ++ && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix) ) + { + fsNames << userVisibleFS( fs ); // For the combo box + } diff --git a/pkgs/tools/misc/calamares/uimod.patch b/pkgs/tools/misc/calamares/uimod.patch new file mode 100644 index 0000000000000..5a6ec6cdeea2e --- /dev/null +++ b/pkgs/tools/misc/calamares/uimod.patch @@ -0,0 +1,85 @@ +diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp +index 6c5f9ad16..24d75e07b 100644 +--- a/src/modules/finished/FinishedPage.cpp ++++ b/src/modules/finished/FinishedPage.cpp +@@ -71,7 +71,10 @@ FinishedPage::retranslate() + { + ui->mainText->setText( tr( "<h1>All done.</h1><br/>" + "%1 has been set up on your computer.<br/>" +- "You may now start using your new system." ) ++ "You may now start using your new system.<br/>" ++ "You can change every setting later except the bootloader.<br/>" ++ "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>" ++ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>") + .arg( branding->versionedName() ) ); + ui->restartCheckBox->setToolTip( tr( "<html><head/><body>" + "<p>When this box is checked, your system will " +@@ -84,7 +87,10 @@ FinishedPage::retranslate() + ui->mainText->setText( tr( "<h1>All done.</h1><br/>" + "%1 has been installed on your computer.<br/>" + "You may now restart into your new system, or continue " +- "using the %2 Live environment." ) ++ "using the %2 Live environment.<br/>" ++ "You can change every setting later except the bootloader.<br/>" ++ "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>" ++ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>") + .arg( branding->versionedName(), branding->productName() ) ); + ui->restartCheckBox->setToolTip( tr( "<html><head/><body>" + "<p>When this box is checked, your system will " +diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp +index 721329c1b..164b9945e 100644 +--- a/src/modules/packagechooser/PackageChooserPage.cpp ++++ b/src/modules/packagechooser/PackageChooserPage.cpp +@@ -52,6 +52,7 @@ PackageChooserPage::currentChanged( const QModelIndex& index ) + if ( !index.isValid() || !ui->products->selectionModel()->hasSelection() ) + { + ui->productName->setText( m_introduction.name.get() ); ++ ui->productName->setStyleSheet("font-weight: bold"); + ui->productScreenshot->setPixmap( m_introduction.screenshot ); + ui->productDescription->setText( m_introduction.description.get() ); + } +diff --git a/src/modules/packagechooser/page_package.ui b/src/modules/packagechooser/page_package.ui +index d021b08b3..fecfa3060 100644 +--- a/src/modules/packagechooser/page_package.ui ++++ b/src/modules/packagechooser/page_package.ui +@@ -38,19 +38,6 @@ SPDX-License-Identifier: GPL-3.0-or-later + </item> + <item> +- <layout class="QVBoxLayout" name="verticalLayout" stretch="1,30,1"> ++ <layout class="QVBoxLayout" name="verticalLayout" stretch="30,1,1"> +- <item> +- <widget class="QLabel" name="productName"> +- <property name="sizePolicy"> +- <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text"> +- <string>Product Name</string> +- </property> +- </widget> +- </item> + <item> + <widget class="FixedAspectRatioLabel" name="productScreenshot"> + <property name="sizePolicy"> +@@ -67,6 +54,19 @@ SPDX-License-Identifier: GPL-3.0-or-later + </property> + </widget> + </item> ++ <item> ++ <widget class="QLabel" name="productName"> ++ <property name="sizePolicy"> ++ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text"> ++ <string>Product Name</string> ++ </property> ++ </widget> ++ </item> + <item> + <widget class="QLabel" name="productDescription"> + <property name="sizePolicy"> diff --git a/pkgs/tools/misc/calamares/unfreeq.patch b/pkgs/tools/misc/calamares/unfreeq.patch new file mode 100644 index 0000000000000..a234113a726ee --- /dev/null +++ b/pkgs/tools/misc/calamares/unfreeq.patch @@ -0,0 +1,109 @@ +diff --git a/src/modules/packagechooserq/packagechooserq.qrc b/src/modules/packagechooserq/packagechooserq.qrc +index 1b892dce1..ee80a934b 100644 +--- a/src/modules/packagechooserq/packagechooserq.qrc ++++ b/src/modules/packagechooserq/packagechooserq.qrc +@@ -4,5 +4,6 @@ + <file>images/libreoffice.jpg</file> + <file>images/no-selection.png</file> + <file>images/plasma.png</file> ++ <file>packagechooserq@unfree.qml</file> + </qresource> + </RCC> +diff --git a/src/modules/packagechooserq/packagechooserq@unfree.qml b/src/modules/packagechooserq/packagechooserq@unfree.qml +new file mode 100644 +index 000000000..cb87d864a +--- /dev/null ++++ b/src/modules/packagechooserq/packagechooserq@unfree.qml +@@ -0,0 +1,75 @@ ++/* === This file is part of Calamares - <https://calamares.io> === ++ * ++ * SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us> ++ * SPDX-License-Identifier: GPL-3.0-or-later ++ * ++ * Calamares is Free Software: see the License-Identifier above. ++ * ++ */ ++ ++import io.calamares.core 1.0 ++import io.calamares.ui 1.0 ++ ++import QtQuick 2.15 ++import QtQuick.Controls 2.15 ++import QtQuick.Layouts 1.3 ++ ++Item { ++ ++ SystemPalette { ++ id: palette ++ colorGroup: SystemPalette.Active ++ } ++ ++ width: parent.width ++ height: parent.height ++ ++ Rectangle { ++ anchors.fill: parent ++ color: palette.window ++ ++ ButtonGroup { ++ id: switchGroup ++ } ++ ++ Column { ++ id: column ++ anchors.centerIn: parent ++ spacing: 5 ++ ++ Rectangle { ++ width: 700 ++ height: 200 ++ color: palette.base ++ radius: 10 ++ border.width: 0 ++ Text { ++ color: palette.text ++ width: 600 ++ height: 150 ++ anchors.centerIn: parent ++ text: qsTr("NixOS is fully open source, but it also provides software packages with unfree licenses. By default unfree packages are not allowed, but you can enable it here. If you check this box, software installed might have additional End User License Agreements (EULAs) attached. If not enabled, some hardware might not work fully when no suitable open source drivers are available.<br/>") ++ font.pointSize: 12 ++ wrapMode: Text.WordWrap ++ } ++ ++ CheckBox { ++ id: element2 ++ anchors.horizontalCenter: parent.horizontalCenter ++ y: 145 ++ text: qsTr("Allow unfree software") ++ checked: false ++ ++ onCheckedChanged: { ++ if ( checked ) { ++ config.packageChoice = "unfree" ++ } else { ++ config.packageChoice = "free" ++ } ++ } ++ } ++ } ++ } ++ } ++ ++} +diff --git a/src/modules/packagechooserq/unfree.conf b/src/modules/packagechooserq/unfree.conf +new file mode 100644 +index 000000000..da79a8eac +--- /dev/null ++++ b/src/modules/packagechooserq/unfree.conf +@@ -0,0 +1,11 @@ ++# SPDX-FileCopyrightText: no ++# SPDX-License-Identifier: CC0-1.0 ++# ++--- ++qmlLabel: ++ label: "Unfree Software" ++method: legacy ++mode: required ++labels: ++ step: "Unfree Software" ++packageChoice: free diff --git a/pkgs/tools/misc/calamares/userjob.patch b/pkgs/tools/misc/calamares/userjob.patch new file mode 100644 index 0000000000000..a0bfea9bb05aa --- /dev/null +++ b/pkgs/tools/misc/calamares/userjob.patch @@ -0,0 +1,31 @@ +diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp +index eedfd274d..0f3e78848 100644 +--- a/src/modules/users/Config.cpp ++++ b/src/modules/users/Config.cpp +@@ -972,26 +972,11 @@ Config::createJobs() const + + Calamares::Job* j; + +- if ( !m_sudoersGroup.isEmpty() ) +- { +- j = new SetupSudoJob( m_sudoersGroup, m_sudoStyle ); +- jobs.append( Calamares::job_ptr( j ) ); +- } +- +- j = new SetupGroupsJob( this ); +- jobs.append( Calamares::job_ptr( j ) ); +- +- j = new CreateUserJob( this ); +- jobs.append( Calamares::job_ptr( j ) ); +- + j = new SetPasswordJob( loginName(), userPassword() ); + jobs.append( Calamares::job_ptr( j ) ); + + j = new SetPasswordJob( "root", rootPassword() ); + jobs.append( Calamares::job_ptr( j ) ); + +- j = new SetHostNameJob( this ); +- jobs.append( Calamares::job_ptr( j ) ); +- + return jobs; + } diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 0364065be24c6..b34b1ee4d5170 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "unstable-2022-04-17"; + version = "unstable-2022-04-18"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "7f769d6f3697541e55fd3ea9b71f190296529e48"; - sha256 = "+V3q71neW9X0JPJHqvNGopvIJfUv0VD9GKkz7YqN6Eo="; + rev = "571377f2f79422398a701cb1864487124ec3dcc6"; + sha256 = "0e9YhYcxU9t0SFeT1TjoRGTM3h1xRC528ae69tvz+a0="; }; # Fix ".cht.sh-wrapped" in the help message diff --git a/pkgs/tools/misc/cmdpack/default.nix b/pkgs/tools/misc/cmdpack/default.nix new file mode 100644 index 0000000000000..0fe2c75d1ea0a --- /dev/null +++ b/pkgs/tools/misc/cmdpack/default.nix @@ -0,0 +1,136 @@ +{ stdenv, lib, fetchurl }: +let + mkCmdPackDerivation = { pname, postInstall ? "", description }: stdenv.mkDerivation { + inherit pname postInstall; + + version = "1.03"; + + src = fetchurl { + url = "https://web.archive.org/web/20140330233023/http://www.neillcorlett.com/downloads/cmdpack-1.03-src.tar.gz"; + sha256 = "0v0a9rpv59w8lsp1cs8f65568qj65kd9qp7854z1ivfxfpq0da2n"; + }; + + buildPhase = '' + runHook preBuild + + gcc -o ${pname} src/${pname}.c + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp ${pname} $out/bin + + runHook postInstall + ''; + + meta = with lib; { + inherit description; + + homepage = "https://web.archive.org/web/20140330233023/http://www.neillcorlett.com/cmdpack/"; + platforms = platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ zane ]; + }; + }; +in +{ + bin2iso = mkCmdPackDerivation { + pname = "bin2iso"; + description = "Convert CD .BIN to .ISO"; + }; + + bincomp = mkCmdPackDerivation { + pname = "bincomp"; + description = "Compare binary files"; + }; + + brrrip = mkCmdPackDerivation { + pname = "brrrip"; + description = "Rip SNES BRR sound samples"; + }; + + byteshuf = mkCmdPackDerivation { + pname = "byteshuf"; + description = "Shuffle or unshuffle bytes in a file"; + }; + + byteswap = mkCmdPackDerivation { + pname = "byteswap"; + description = "Swap byte order of files"; + }; + + cdpatch = mkCmdPackDerivation { + pname = "cdpatch"; + description = "CD-XA image insert/extract utility"; + }; + + ecm = mkCmdPackDerivation { + pname = "ecm"; + postInstall = "ln $out/bin/ecm $out/bin/unecm"; + description = "Encoder/decoder for Error Code Modeler format"; + }; + + fakecrc = mkCmdPackDerivation { + pname = "fakecrc"; + description = "Fake the CRC32 of a file"; + }; + + hax65816 = mkCmdPackDerivation { + pname = "hax65816"; + description = "Simple 65816 disassembler"; + }; + + id3point = mkCmdPackDerivation { + pname = "id3point"; + description = "Pointless ID3v1 Tagger"; + }; + + pecompat = mkCmdPackDerivation { + pname = "pecompat"; + description = "Maximize compatibility of a Win32 PE file"; + }; + + rels = mkCmdPackDerivation { + pname = "rels"; + description = "Relative Searcher"; + }; + + screamf = mkCmdPackDerivation { + pname = "screamf"; + description = ".AMF to .S3M converter"; + }; + + subfile = mkCmdPackDerivation { + pname = "subfile"; + description = "Extract a portion of a file"; + }; + + uips = mkCmdPackDerivation { + pname = "uips"; + description = "Universal IPS patch create/apply utility"; + }; + + usfv = mkCmdPackDerivation { + pname = "usfv"; + description = "Universal SFV create/verify utility"; + }; + + vb2rip = mkCmdPackDerivation { + pname = "vb2rip"; + description = "VB2 sound format ripping utility"; + }; + + wordadd = mkCmdPackDerivation { + pname = "wordadd"; + description = "Addition word puzzle solver"; + }; + + zerofill = mkCmdPackDerivation { + pname = "zerofill"; + description = "Create a large, empty file"; + }; +} diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index e0ecf5be6c60e..72cc82282e3af 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -4,53 +4,57 @@ , buildGoModule , runCommand , nix-update-script -, dsq +, fetchurl , testers -, diffutils +, python3 +, curl +, jq +, dsq }: buildGoModule rec { pname = "dsq"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "multiprocessio"; repo = "dsq"; rev = version; - hash = "sha256-AT5M3o1cvRIZyyA28uX+AI4p9I3SzX3OCdBcIFGKspw="; + hash = "sha256-emBLYiNOHYp3XsaY172DDtIdquj3U3U/Q6bogC3rvFQ="; }; - vendorSha256 = "sha256-yfhLQBmWkG0ZLjI/ArLZkEGvClmZXkl0o7fEu5JqHM8="; - - nativeBuildInputs = [ diffutils ]; + vendorSha256 = "sha256-ZZDZ3FWgOpRJB+X1hrlP8Hh1n3l7jUd39H5MDz88wOs="; ldflags = [ "-X" "main.Version=${version}" ]; + checkInputs = [ python3 curl jq ]; + + preCheck = + let + taxiCsv = fetchurl { + url = "https://s3.amazonaws.com/nyc-tlc/trip+data/yellow_tripdata_2021-04.csv"; + hash = "sha256-CXJPraOYAy5tViDcBi9gxI/rJ3ZXqOa/nJ/d+aREV+M="; + }; + in + '' + substituteInPlace scripts/test.py \ + --replace '${taxiCsv.url}' file://${taxiCsv} \ + --replace 'dsq latest' 'dsq ${version}' + ''; + + checkPhase = '' + runHook preCheck + + cp "$GOPATH/bin/dsq" . + python3 scripts/test.py + + runHook postCheck + ''; + passthru = { updateScript = nix-update-script { attrPath = pname; }; - tests = { - version = testers.testVersion { package = dsq; }; - - pretty-csv = runCommand "${pname}-test" { } '' - mkdir "$out" - cat <<EOF > "$out/input.csv" - first,second - 1,a - 2,b - EOF - cat <<EOF > "$out/expected.txt" - +-------+--------+ - | first | second | - +-------+--------+ - | 1 | a | - | 2 | b | - +-------+--------+ - EOF - ${dsq}/bin/dsq --pretty "$out/input.csv" 'select first, second from {}' > "$out/actual.txt" - diff "$out/expected.txt" "$out/actual.txt" - ''; - }; + tests.version = testers.testVersion { package = dsq; }; }; meta = with lib; { diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 2854456c1b055..874e3525f691e 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.20.1"; + version = "0.23.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3xIJkV/BC+qdMP2vsUr5wIwqzaz2uCV/j6VdC6uvzgY="; + sha256 = "sha256-ICuhBoiCBmoy+jW+OK5OU5oAopyyOxSB6uHpZv2dEKI="; }; - cargoSha256 = "sha256-GN8vz67/Pd39E3iYeqVfjC7zxvcA8u88lv42kWovlCo="; + cargoSha256 = "sha256-NXkXxRDJcfB2F7hXF5nBFnQ+IFhZTSHg915NyRyuS8c="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 988483fbd6a18..3e6ebb2f0d672 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLOCALDIR=${placeholder "out"}/share/fortunes" + "-DNO_OFFENSIVE=true" ]; patches = [ (builtins.toFile "not-a-game.patch" '' @@ -36,6 +37,10 @@ stdenv.mkDerivation rec { -- '') ]; + postFixup = '' + rm -f $out/share/fortunes/men-women* + ''; + meta = with lib; { mainProgram = "fortune"; description = "A program that displays a pseudorandom message from a database of quotations"; diff --git a/pkgs/tools/misc/geekbench/4.nix b/pkgs/tools/misc/geekbench/4.nix new file mode 100644 index 0000000000000..03a79644ffb26 --- /dev/null +++ b/pkgs/tools/misc/geekbench/4.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchurl, makeWrapper, ocl-icd, vulkan-loader, linuxPackages }: + +stdenv.mkDerivation rec { + pname = "geekbench"; + version = "4.4.4"; + + src = fetchurl { + url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; + sha256 = "sha256-KVsBE0ueWewmoVY/vzxX2sKhRTzityPNR+wmTwZBWiI="; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp -r geekbench.plar geekbench4 geekbench_x86_64 $out/bin + + # needed for compute benchmark + ln -s ${linuxPackages.nvidia_x11}/lib/libcuda.so $out/lib/ + ln -s ${ocl-icd}/lib/libOpenCL.so $out/lib/ + ln -s ${ocl-icd}/lib/libOpenCL.so.1 $out/lib/ + ln -s ${vulkan-loader}/lib/libvulkan.so $out/lib/ + ln -s ${vulkan-loader}/lib/libvulkan.so.1 $out/lib/ + + for f in geekbench4 geekbench_x86_64 ; do + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f + wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/" + done + ''; + + meta = with lib; { + description = "Cross-platform benchmark"; + homepage = "https://geekbench.com/"; + license = licenses.unfree; + maintainers = [ maintainers.michalrus ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index 0831649f6008f..80daf996b8559 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testVersion, gosu }: +{ lib, buildGoModule, fetchFromGitHub, testers, gosu }: buildGoModule rec { pname = "gosu"; @@ -15,7 +15,7 @@ buildGoModule rec { ldflags = [ "-d" "-s" "-w" ]; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = gosu; }; diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index e43ab2ae8797a..6a4fa89616150 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, emacs, gnulib, autoconf, bison, automake, gettext, gperf, texinfo, perl, rsync, gawk}: +{ fetchurl, lib, stdenv, emacs, gnulib, autoconf, bison, automake, gettext, gperf, texinfo, perl, rsync}: stdenv.mkDerivation rec { pname = "idutils"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; buildInputs = lib.optional stdenv.isLinux emacs; - nativeBuildInputs = [ gnulib autoconf bison automake gettext gperf texinfo perl rsync gawk ]; + nativeBuildInputs = [ gnulib autoconf bison automake gettext gperf texinfo perl rsync ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/tools/misc/ikill/default.nix b/pkgs/tools/misc/ikill/default.nix new file mode 100644 index 0000000000000..176c2f378294c --- /dev/null +++ b/pkgs/tools/misc/ikill/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "ikill"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "pjmp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-sxFuDHlrEO2/gA9I++yNAISvsF7wFjSMUI+diVM/+EI="; + }; + + cargoSha256 = "sha256-dJa+bXJTA2Jju1p29Fyj87N0Pr/l6XRr3QqemhD2BAA="; + + meta = with lib; { + description = "Interactively kill running processes"; + homepage = "https://github.com/pjmp/ikill"; + maintainers = with maintainers; [ zendo ]; + license = [ licenses.mit ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/tools/misc/lrzsz/default.nix index e4b5e71a25601..e097ab12f082e 100644 --- a/pkgs/tools/misc/lrzsz/default.nix +++ b/pkgs/tools/misc/lrzsz/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { }) ]; + makeFlags = [ "AR:=$(AR)" ]; + nativeBuildInputs = [ gettext ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 157cc1adf8d73..dc370b6a3e7e2 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , rustPlatform , installShellFiles +, pandoc , testers , lsd }: @@ -19,8 +20,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-P0HJVp2ReJuLSZrArw/EAfLFDOZqswI0nD1SCHwegoE="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles pandoc ]; postInstall = '' + pandoc --standalone --to man doc/lsd.md -o lsd.1 + installManPage lsd.1 + installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}} ''; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 4f08f9e63b8c3..8992e9ff0dafe 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; outputMan = "out"; # users will want `man man` to work + strictDeps = true; nativeBuildInputs = [ autoreconfHook groff makeWrapper pkg-config zstd ]; buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) checkInputs = [ libiconv /* for 'iconv' binary */ ]; @@ -41,12 +42,6 @@ stdenv.mkDerivation rec { # Add mandb locations for the above echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in - - # use absolute paths to reference programs, otherwise artifacts will have undeclared dependencies - for f in configure.ac m4/man-check-progs.m4 m4/man-po4a.m4; do - substituteInPlace $f \ - --replace AC_CHECK_PROGS AC_PATH_PROGS - done ''; configureFlags = [ @@ -72,21 +67,15 @@ stdenv.mkDerivation rec { # (multi-call binary). `apropos` is actually just a symlink to whatis. So we need to # make sure that we don't wrap symlinks (since that changes argv[0] to the -wrapped name) find "$out/bin" -type f | while read file; do - wrapProgram "$file" --prefix PATH : "${groff}/bin" + wrapProgram "$file" \ + --prefix PATH : "${lib.getBin groff}/bin" \ + --prefix PATH : "${lib.getBin zstd}/bin" done ''; - postFixup = lib.optionalString (buildPackages.groff != groff) '' - # Check to make sure none of the outputs depend on build-time-only groff: - for outName in $outputs; do - out=''${!outName} - echo "Checking $outName(=$out) for references to build-time groff..." - if grep -r '${buildPackages.groff}' $out; then - echo "Found an erroneous dependency on groff ^^^" >&2 - exit 1 - fi - done - ''; + disallowedReferences = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + buildPackages.groff + ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 13d54c5f90ce1..5b6ba782d7de2 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchzip }: +{ lib, buildGo118Module, fetchFromGitHub, fetchzip }: -buildGoModule rec { +buildGo118Module rec { pname = "mutagen"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WFEbiPyE029q9+ZXYioESXLm9fmpwihaNwgLcPYQYFE="; + sha256 = "sha256-OoRXf0QboRQkZE4zcwlGFyoToGOy1bbgGSo17BQLqCE="; }; - vendorSha256 = "sha256-kMX0E3yCg+wRaVMRWNSkeW+dN8b/EG04C0P77x9TQC0="; + vendorSha256 = "sha256-dkPpz0SZEAMPR7mq11kDHGCgeIpnXj2lRnJo1Ws32Cc="; agents = fetchzip { name = "mutagen-agents-${version}"; @@ -21,7 +21,7 @@ buildGoModule rec { extraPostFetch = '' rm $out/mutagen # Keep only mutagen-agents.tar.gz. ''; - sha256 = "sha256-QwPOt2pK9fRPrfvpc6qqr/uBZ/XK8CMlYNSLb7eWzg4="; + sha256 = "sha256-AlAo55/ewTE04WfS0beVonGA97AmpR1pAw/QxKAYjv8="; }; doCheck = false; diff --git a/pkgs/tools/misc/ncdu_2/c-import-order.patch b/pkgs/tools/misc/ncdu_2/c-import-order.patch deleted file mode 100644 index a094f3237ad6b..0000000000000 --- a/pkgs/tools/misc/ncdu_2/c-import-order.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/ui.zig b/src/ui.zig -index 8401910..50171a7 100644 ---- a/src/ui.zig -+++ b/src/ui.zig -@@ -8,11 +8,11 @@ const main = @import("main.zig"); - const util = @import("util.zig"); - - pub const c = @cImport({ -+ @cDefine("_XOPEN_SOURCE", "1"); - @cInclude("stdio.h"); - @cInclude("string.h"); - @cInclude("curses.h"); - @cInclude("time.h"); -- @cDefine("_X_OPEN_SOURCE", "1"); - @cInclude("wchar.h"); - @cInclude("locale.h"); - }); diff --git a/pkgs/tools/misc/ncdu_2/default.nix b/pkgs/tools/misc/ncdu_2/default.nix index a703cf3eca6c2..0cfb78bcf0bc2 100644 --- a/pkgs/tools/misc/ncdu_2/default.nix +++ b/pkgs/tools/misc/ncdu_2/default.nix @@ -1,18 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, zig, ncurses }: +{ lib, stdenv, fetchurl, zig, ncurses }: stdenv.mkDerivation rec { pname = "ncdu"; - version = "2.0"; + version = "2.1.2"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-Zs2mgEdnsukbeM/cqCX5/a9qCkxuQAYloBrVWVQYR8w="; + sha256 = "sha256-ng1u8DYYo8MWcmv0khe37+Rc7HWLLJF86JLe10Myxtw="; }; - patches = [ - ./c-import-order.patch # https://code.blicky.net/yorhel/ncdu/issues/183 - ]; - XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv nativeBuildInputs = [ diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index f7c55dfa91a19..17e26fc33d19c 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "1.20.0"; + version = "1.21.2"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-JwRI58FadN7DH4MOO033EYmcbqCIuPxw5wWeafoInSg="; + sha256 = "sha256-bMVClVt+D+LSvlD0m82MHJc+dcUuqGKo6gxtSqFwkHM="; }; - vendorSha256 = "sha256-nzcCLDN/vJ6DS6isCSLL9ycxFkIyUwy4Um6M7NWAPTk="; + vendorSha256 = "sha256-Sx6l5GJ72A0SHEHyVtlte8Ed9fuJzZAkJzC0zpCbvK8="; doCheck = false; diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index 064590ef979b7..c1abe01be5659 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchurl, lib, makeWrapper , extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook -, kconfig, kcrash, kinit, kpmcore +, kconfig, kcrash, kinit, kpmcore, polkit-qt , cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux , btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs , jfsutils, nilfs-utils, ntfs3g, reiser4progs, reiserfsprogs, udftools, xfsprogs, zfs @@ -41,16 +41,16 @@ let in mkDerivation rec { pname = "partitionmanager"; # NOTE: When changing this version, also change the version of `kpmcore`. - version = "4.2.0"; + version = "22.04.0"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-6Qlt1c47Eek6TkWWBzTyBZYJ1jfhtwsC9X5q5h6IhPg="; + url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; + hash = "sha256-eChn3OkdLHC9pedDBBwszTeTj2l7ky2W79INqvjrkBo="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ]; - propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ]; + propagatedBuildInputs = [ kconfig kcrash kinit kpmcore polkit-qt ]; postFixup = '' wrapProgram $out/bin/partitionmanager \ diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix index 76df2a6882738..518547e183784 100644 --- a/pkgs/tools/misc/pferd/default.nix +++ b/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.3.1"; + version = "3.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "v${version}"; - sha256 = "162s966kmpngmp0h55x185qxsy96q2kxz2dd8w0zyh0n2hbap3lh"; + sha256 = "1nwrkc0z2zghy2nk9hfdrffg1k8anh3mn3hx31ql8xqwhv5ksh9g"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 821cf8d21d5e1..d6171bda5d8ae 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc, callPackage }: +{ lib, stdenv, fetchurl, php, which, makeWrapper, gnumake, gcc, callPackage }: stdenv.mkDerivation rec { pname = "phoronix-test-suite"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ php ]; - nativeBuildInputs = [ which gnused makeWrapper ]; + nativeBuildInputs = [ which makeWrapper ]; installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/pouf/default.nix b/pkgs/tools/misc/pouf/default.nix index 9a6520453938c..06a1e37836de3 100644 --- a/pkgs/tools/misc/pouf/default.nix +++ b/pkgs/tools/misc/pouf/default.nix @@ -6,16 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "pouf"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "mothsart"; repo = pname; rev = version; - sha256 = "0q7kj6x61xci8piax6vg3bsm9di11li7pm84vj13iwahdydhs1hn"; + sha256 = "1dgk2g13hz64vdx9sqkixl0321cnfnhrm7hxp68vwfcfx3gvfjv8"; }; - cargoSha256 = "128fgdp74lyv5k054cdjxzwmyb5cyy0jq0a9l4bsc34122mznnq7"; + cargoSha256 = "0ipyc9l9kr7izh3dmvczq1i7al56yiaz20yaarz8bpsfcrmgwy3s"; + + postInstall = "make PREFIX=$out copy-data"; meta = with lib; { description = "A cli program for produce fake datas."; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 2b70329295004..e7025217e34dd 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -29,7 +29,7 @@ , bubblewrap , pcre , check -, python2 +, python3 , json_c , zchunk , libmodulemd @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + python3 pkg-config which autoconf @@ -82,7 +83,6 @@ stdenv.mkDerivation rec { librepo pcre check - python2 # libdnf # vendored unstable branch # required by vendored libdnf diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix index cdc3dbdae1016..bfd4db8ff8829 100644 --- a/pkgs/tools/misc/rust-motd/default.nix +++ b/pkgs/tools/misc/rust-motd/default.nix @@ -9,21 +9,23 @@ rustPlatform.buildRustPackage rec { pname = "rust-motd"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { owner = "rust-motd"; repo = pname; rev = "v${version}"; - sha256 = "0xhdbhl0riaq9n4g9n333pgw966bsi60zpcy7gpndzfj21bj2x1m"; + sha256 = "sha256-iuADR7m+wdmsQ897o4CQHqDv9PmYu/vJgO5C6Dluao4="; }; - cargoSha256 = "sha256-l9Sit+niCLOnL1mdK6i8jea8NWsJlFM6p9lMTXyWOKY="; + cargoSha256 = "sha256-kdSMcADoTpMU4w2XSv0pPQZC155rrQACQ4XTVyj7eeA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + OPENSSL_NO_VENDOR = 1; + meta = with lib; { description = "Beautiful, useful MOTD generation with zero runtime dependencies"; homepage = "https://github.com/rust-motd/rust-motd"; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 84877508607e2..fe6fbf8717c71 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-portable-utils"; - version = "2.2.3.4"; - sha256 = "04n9i9ydaa3cb3pip9d02dm24k26v3djvwrafjzq5qx94zvrifip"; + version = "2.2.4.0"; + sha256 = "sha256-yx7qifAxEAbwEyqkUyT/lvp3VtEaX0Nmxo0ISDnlpW8="; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 78c86aeff74c6..f1e44851dc2ae 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -17,13 +17,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "3.1.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "kylon"; repo = pname; rev = version; - sha256 = "sha256-wQEP3fdp+Mhgoz873cgF65WouWtbEdCdXfLiVSmrjyA="; + sha256 = "sha256-hHYk7B0+wqmpOmU5wf44MBTuocLM//Oif5SOtNzO++c="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/tools/misc/sharedown/yarn.lock index 58cfe65b3dd20..1e8fbe79ef99a 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.1" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368" - integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA== + version "1.14.1" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" + integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== dependencies: debug "^4.1.1" env-paths "^2.2.0" @@ -71,10 +71,10 @@ dependencies: defer-to-connect "^1.0.1" -"@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== +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== "@types/debug@^4.1.6": version "4.1.7" @@ -109,14 +109,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "17.0.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab" - integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog== + version "17.0.23" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da" + integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw== "@types/node@^14.6.2": - version "14.18.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.9.tgz#0e5944eefe2b287391279a19b407aa98bd14436d" - integrity sha512-j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q== + version "14.18.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24" + integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A== "@types/plist@^3.0.1": version "3.0.2" @@ -132,14 +132,14 @@ integrity sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw== "@types/yargs-parser@*": - version "20.2.1" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" - integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== + version "21.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" + integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^17.0.1": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.8.tgz#d23a3476fd3da8a0ea44b5494ca7fa677b9dad4c" - integrity sha512-wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw== + version "17.0.10" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a" + integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA== dependencies: "@types/yargs-parser" "*" @@ -189,13 +189,6 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" @@ -208,10 +201,10 @@ app-builder-bin@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.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== +app-builder-lib@22.14.13: + version "22.14.13" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.13.tgz#c1f5b6afc86596357598bb90b69eef06c7c2eeb3" + integrity sha512-SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -219,13 +212,13 @@ app-builder-lib@22.14.5: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.14.5" - builder-util-runtime "8.9.1" + builder-util "22.14.13" + builder-util-runtime "8.9.2" chromium-pickle-js "^0.2.0" debug "^4.3.2" ejs "^3.1.6" electron-osx-sign "^0.5.0" - electron-publish "22.14.5" + electron-publish "22.14.13" form-data "^4.0.0" fs-extra "^10.0.0" hosted-git-info "^4.0.2" @@ -304,12 +297,12 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -axios@^0.24.0: - version "0.24.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" - integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA== +axios@^0.26.1: + version "0.26.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" + integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== dependencies: - follow-redirects "^1.14.4" + follow-redirects "^1.14.8" balanced-match@^1.0.0: version "1.0.2" @@ -343,9 +336,9 @@ bluebird@^3.5.0, bluebird@^3.5.5: integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== boolean@^3.0.1: - version "3.1.4" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz#f51a2fb5838a99e06f9b6ec1edb674de67026435" - integrity sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w== + version "3.2.0" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" + integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== bootstrap@5.1.3: version "5.1.3" @@ -415,29 +408,31 @@ 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.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== +builder-util-runtime@8.9.2: + version "8.9.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28" + integrity sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A== dependencies: debug "^4.3.2" sax "^1.2.4" -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== +builder-util@22.14.13: + version "22.14.13" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.13.tgz#41b5b7b4ee53aff4e09cc007fb144522598f3ce6" + integrity sha512-oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" app-builder-bin "3.7.1" bluebird-lst "^1.0.9" - builder-util-runtime "8.9.1" + builder-util-runtime "8.9.2" chalk "^4.1.1" cross-spawn "^7.0.3" debug "^4.3.2" fs-extra "^10.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" is-ci "^3.0.0" js-yaml "^4.1.0" source-map-support "^0.5.19" @@ -462,16 +457,7 @@ camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -479,11 +465,6 @@ chalk@^4.1.0, chalk@^4.1.1: ansi-styles "^4.1.0" supports-color "^7.1.0" -charenc@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" - integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc= - chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -547,13 +528,6 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -561,11 +535,6 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" @@ -657,6 +626,13 @@ crc@^3.8.0: dependencies: buffer "^5.1.0" +cross-fetch@3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" + integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== + dependencies: + node-fetch "2.6.7" + cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -677,27 +653,22 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -crypt@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" - integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs= - crypto-random-string@^2.0.0: version "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: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -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== +debug@4.3.3: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== dependencies: ms "2.1.2" @@ -715,12 +686,12 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" -decompress-response@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" - integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== dependencies: - mimic-response "^2.0.0" + mimic-response "^3.1.0" deep-extend@^0.6.0: version "0.6.0" @@ -749,20 +720,20 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -detect-libc@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= +detect-libc@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" + integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== detect-node@^2.0.4: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -devtools-protocol@0.0.937139: - version "0.0.937139" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.937139.tgz#bdee3751fdfdb81cb701fd3afa94b1065dafafcf" - integrity sha512-daj+rzR3QSxsPRy5vjjthn58axO8c11j58uY0lG5vvlJk/EiOdCWOptGdkXDjtuRHr78emKq0udHCXM4trhoDQ== +devtools-protocol@0.0.969999: + version "0.0.969999" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.969999.tgz#3d6be0a126b3607bb399ae2719b471dda71f3478" + integrity sha512-6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ== dir-compare@^2.4.0: version "2.4.0" @@ -774,14 +745,14 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -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== +dmg-builder@22.14.13: + version "22.14.13" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.13.tgz#cc613f3c18e889b8777d525991fd52f50a564f8c" + integrity sha512-xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg== dependencies: - app-builder-lib "22.14.5" - builder-util "22.14.5" - builder-util-runtime "8.9.1" + app-builder-lib "22.14.13" + builder-util "22.14.13" + builder-util-runtime "8.9.2" fs-extra "^10.0.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -789,9 +760,9 @@ dmg-builder@22.14.5: dmg-license "^1.0.9" dmg-license@^1.0.9: - version "1.0.10" - resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.10.tgz#89f52afae25d827fce8d818c13aff30af1c16bcc" - integrity sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A== + version "1.0.11" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a" + integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q== dependencies: "@types/plist" "^3.0.1" "@types/verror" "^1.10.3" @@ -831,17 +802,17 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@^22.14.5: - 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== +electron-builder@^22.14.13: + version "22.14.13" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.13.tgz#fd40564685cf5422a8f8d667940af3d3776f4fb8" + integrity sha512-3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw== dependencies: "@types/yargs" "^17.0.1" - app-builder-lib "22.14.5" - builder-util "22.14.5" - builder-util-runtime "8.9.1" + app-builder-lib "22.14.13" + builder-util "22.14.13" + builder-util-runtime "8.9.2" chalk "^4.1.1" - dmg-builder "22.14.5" + dmg-builder "22.14.13" fs-extra "^10.0.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -861,23 +832,23 @@ electron-osx-sign@^0.5.0: 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== +electron-publish@22.14.13: + version "22.14.13" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.13.tgz#8b71e6975af8cc6ac5b21f293ade23f8704047c7" + integrity sha512-0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "22.14.5" - builder-util-runtime "8.9.1" + builder-util "22.14.13" + builder-util-runtime "8.9.2" chalk "^4.1.1" fs-extra "^10.0.0" lazy-val "^1.0.5" mime "^2.5.2" -electron@^16.0.6: - version "16.0.7" - resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz#87eaccd05ab61563d3c17dfbad2949bba7ead162" - integrity sha512-/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w== +electron@^17.1.1: + version "17.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-17.2.0.tgz#a5c42c16352ea968fcb5d1ce256bec51e7d140fe" + integrity sha512-eNXhPVEUofkgAeqRFvTizzYecoCMyS0Rar08WZHSAw9wjfZXawYMvTpjjjk9GiX9W/+Cjxua4YtGn5bOTabc0A== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" @@ -920,11 +891,6 @@ escape-goat@^2.0.0: resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" @@ -991,6 +957,11 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" +fessonia@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/fessonia/-/fessonia-2.2.2.tgz#c8f9da5701d2e63efc9fd5793368929ddfaaf776" + integrity sha512-FvlDFdwHBIxWl2K9XynAIR38NB8xn4vPPZDNK5nIQBnGwZ0xv5FxDXsz+pzYZrUqoEQPQBJemNrYhueD2de7qw== + filelist@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" @@ -1006,10 +977,10 @@ find-up@^4.0.0: locate-path "^5.0.0" path-exists "^4.0.0" -follow-redirects@^1.14.4: - version "1.14.7" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" - integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== +follow-redirects@^1.14.8: + version "1.14.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" + integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== font-awesome@^4.7.0: version "4.7.0" @@ -1031,9 +1002,9 @@ fs-constants@^1.0.0: integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== fs-extra@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" - integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ== + version "10.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8" + integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -1176,11 +1147,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" @@ -1208,7 +1174,16 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== -https-proxy-agent@5.0.0: +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== + dependencies: + "@tootallnate/once" "2" + agent-base "6" + debug "4" + +https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== @@ -1269,11 +1244,6 @@ ini@^1.3.4, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -is-buffer@~1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== - is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -1363,9 +1333,9 @@ isbinaryfile@^3.0.2: 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" - integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== + version "4.0.10" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" + integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== isexe@^2.0.0: version "2.0.0" @@ -1378,12 +1348,12 @@ iso8601-duration@^1.3.0: integrity sha512-K4CiUBzo3YeWk76FuET/dQPH03WE04R94feo5TSKQCXpoXQt9E4yx2CnY737QZnSAI3PI4WlKo/zfqizGx52QQ== jake@^10.6.1: - version "10.8.2" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" - integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== + version "10.8.4" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.4.tgz#f6a8b7bf90c6306f768aa82bb7b98bf4ca15e84a" + integrity sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA== dependencies: async "0.9.x" - chalk "^2.4.2" + chalk "^4.0.2" filelist "^1.0.1" minimatch "^3.0.4" @@ -1410,11 +1380,9 @@ json-stringify-safe@^5.0.1: integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= json5@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" + version "2.2.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" + integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== jsonfile@^4.0.0: version "4.0.0" @@ -1432,13 +1400,13 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -keytar@^7.7.0: - version "7.7.0" - resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz#3002b106c01631aa79b1aa9ee0493b94179bbbd2" - integrity sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A== +keytar@^7.9.0: + version "7.9.0" + resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz#4c6225708f51b50cbf77c5aae81721964c2918cb" + integrity sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ== dependencies: - node-addon-api "^3.0.0" - prebuild-install "^6.0.0" + node-addon-api "^4.3.0" + prebuild-install "^7.0.1" keyv@^3.0.0: version "3.1.0" @@ -1502,26 +1470,17 @@ matcher@^3.0.0: dependencies: escape-string-regexp "^4.0.0" -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== - dependencies: - charenc "0.0.2" - 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-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== 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== + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: - mime-db "1.51.0" + mime-db "1.52.0" mime@^2.5.2: version "2.6.0" @@ -1533,22 +1492,29 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -mimic-response@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" - integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== -minimatch@3.0.4, minimatch@^3.0.4: +minimatch@3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimatch@^3.0.4: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: version "0.5.3" @@ -1556,11 +1522,11 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: 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== + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== dependencies: - minimist "^1.2.5" + minimist "^1.2.6" ms@2.0.0: version "2.0.0" @@ -1582,27 +1548,27 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-abi@^2.21.0: - version "2.30.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" - integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== +node-abi@^3.3.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.8.0.tgz#679957dc8e7aa47b0a02589dbfde4f77b29ccb32" + integrity sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw== dependencies: - semver "^5.4.1" + semver "^7.3.5" node-addon-api@^1.6.3: version "1.7.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== -node-addon-api@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" - integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== +node-addon-api@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" + integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== -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== +node-fetch@2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: whatwg-url "^5.0.0" @@ -1735,29 +1701,29 @@ pkg-dir@4.2.0: find-up "^4.0.0" plist@^3.0.1, plist@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" - integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== + version "3.0.5" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987" + integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA== dependencies: base64-js "^1.5.1" xmlbuilder "^9.0.7" -prebuild-install@^6.0.0: - version "6.1.4" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" - integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== +prebuild-install@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz#c10075727c318efe72412f333e0ef625beaf3870" + integrity sha512-QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg== dependencies: - detect-libc "^1.0.3" + detect-libc "^2.0.0" expand-template "^2.0.3" github-from-package "0.0.0" minimist "^1.2.3" mkdirp-classic "^0.5.3" napi-build-utils "^1.0.1" - node-abi "^2.21.0" + node-abi "^3.3.0" npmlog "^4.0.1" pump "^3.0.0" rc "^1.2.7" - simple-get "^3.0.3" + simple-get "^4.0.0" tar-fs "^2.0.0" tunnel-agent "^0.6.0" @@ -1806,23 +1772,23 @@ pupa@^2.1.1: dependencies: escape-goat "^2.0.0" -puppeteer@13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.0.1.tgz#9cd9bb8ec090bade183ca186bf342396bdffa135" - integrity sha512-wqGIx59LzYqWhYcJQphMT+ux0sgatEUbjKG0lbjJxNVqVIT3ZC5m4Bvmq2gHE3qhb63EwS+rNkql08bm4BvO0A== +puppeteer@13.5.1: + version "13.5.1" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.5.1.tgz#d0f751bf36120efc2ebf74c7562a204a84e500e9" + integrity sha512-wWxO//vMiqxlvuzHMAJ0pRJeDHvDtM7DQpW1GKdStz2nZo2G42kOXBDgkmQ+zqjwMCFofKGesBeeKxIkX9BO+w== dependencies: - debug "4.3.2" - devtools-protocol "0.0.937139" + cross-fetch "3.1.5" + debug "4.3.3" + devtools-protocol "0.0.969999" extract-zip "2.0.1" https-proxy-agent "5.0.0" - node-fetch "2.6.5" pkg-dir "4.2.0" progress "2.0.3" proxy-from-env "1.1.0" rimraf "3.0.2" tar-fs "2.1.1" unbzip2-stream "1.4.3" - ws "8.2.3" + ws "8.5.0" rc@^1.2.7, rc@^1.2.8: version "1.2.8" @@ -1951,7 +1917,7 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -semver@^5.4.1, semver@^5.5.0: +semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -2005,21 +1971,21 @@ shebang-regex@^3.0.0: integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.6" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" - integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== simple-concat@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== -simple-get@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" - integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== +simple-get@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== dependencies: - decompress-response "^4.2.0" + decompress-response "^6.0.0" once "^1.3.1" simple-concat "^1.0.0" @@ -2123,13 +2089,6 @@ sumchecker@^3.0.1: dependencies: debug "^4.1.0" -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -2379,10 +2338,10 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -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== +ws@8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" + integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== xdg-basedir@^4.0.0: version "4.0.0" @@ -2410,14 +2369,14 @@ yallist@^4.0.0: integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yargs-parser@^21.0.0: - version "21.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55" - integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA== + version "21.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" + integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== yargs@^17.0.1: - version "17.3.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9" - integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA== + version "17.4.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.4.0.tgz#9fc9efc96bd3aa2c1240446af28499f0e7593d00" + integrity sha512-WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA== 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 153a9282427dd..993bd2c1054eb 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.1.tgz"; + name = "_electron_get___get_1.14.1.tgz"; path = fetchurl { - name = "_electron_get___get_1.13.1.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz"; - sha512 = "U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA=="; + name = "_electron_get___get_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz"; + sha512 = "BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw=="; }; } { @@ -66,11 +66,11 @@ }; } { - name = "_tedconf_fessonia___fessonia_2.2.1.tgz"; + name = "_tootallnate_once___once_2.0.0.tgz"; path = fetchurl { - name = "_tedconf_fessonia___fessonia_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/@tedconf/fessonia/-/fessonia-2.2.1.tgz"; - sha512 = "eX+O8P/xIkuCDeDI3IOIoyzuTJLVqbGnoBhLiBoFU7MwntF02ygQcByMinhUtXv2zm0pOSy6zeKoQTKAVBK60A=="; + name = "_tootallnate_once___once_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz"; + sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; }; } { @@ -114,19 +114,19 @@ }; } { - name = "_types_node___node_17.0.10.tgz"; + name = "_types_node___node_17.0.23.tgz"; path = fetchurl { - name = "_types_node___node_17.0.10.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz"; - sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; + name = "_types_node___node_17.0.23.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz"; + sha512 = "UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="; }; } { - name = "_types_node___node_14.18.9.tgz"; + name = "_types_node___node_14.18.12.tgz"; path = fetchurl { - name = "_types_node___node_14.18.9.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.9.tgz"; - sha512 = "j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q=="; + name = "_types_node___node_14.18.12.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz"; + sha512 = "q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A=="; }; } { @@ -146,19 +146,19 @@ }; } { - name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; + name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; path = fetchurl { - name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; + name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; + sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; } { - name = "_types_yargs___yargs_17.0.8.tgz"; + name = "_types_yargs___yargs_17.0.10.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.8.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.8.tgz"; - sha512 = "wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw=="; + name = "_types_yargs___yargs_17.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz"; + sha512 = "gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA=="; }; } { @@ -218,14 +218,6 @@ }; } { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - } - { name = "ansi_styles___ansi_styles_4.3.0.tgz"; path = fetchurl { name = "ansi_styles___ansi_styles_4.3.0.tgz"; @@ -242,11 +234,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_22.14.5.tgz"; + name = "app_builder_lib___app_builder_lib_22.14.13.tgz"; path = fetchurl { - 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"; - sha512 = "k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg=="; + name = "app_builder_lib___app_builder_lib_22.14.13.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.13.tgz"; + sha512 = "SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg=="; }; } { @@ -338,11 +330,11 @@ }; } { - name = "axios___axios_0.24.0.tgz"; + name = "axios___axios_0.26.1.tgz"; path = fetchurl { - name = "axios___axios_0.24.0.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; + name = "axios___axios_0.26.1.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz"; + sha512 = "fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA=="; }; } { @@ -386,11 +378,11 @@ }; } { - name = "boolean___boolean_3.1.4.tgz"; + name = "boolean___boolean_3.2.0.tgz"; path = fetchurl { - name = "boolean___boolean_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz"; - sha512 = "3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w=="; + name = "boolean___boolean_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz"; + sha512 = "d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="; }; } { @@ -474,19 +466,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_8.9.1.tgz"; + name = "builder_util_runtime___builder_util_runtime_8.9.2.tgz"; path = fetchurl { - 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"; - sha512 = "c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg=="; + name = "builder_util_runtime___builder_util_runtime_8.9.2.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz"; + sha512 = "rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A=="; }; } { - name = "builder_util___builder_util_22.14.5.tgz"; + name = "builder_util___builder_util_22.14.13.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.14.5.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.5.tgz"; - sha512 = "zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA=="; + name = "builder_util___builder_util_22.14.13.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.13.tgz"; + sha512 = "oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA=="; }; } { @@ -506,14 +498,6 @@ }; } { - name = "chalk___chalk_2.4.2.tgz"; - path = fetchurl { - name = "chalk___chalk_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - } - { name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { name = "chalk___chalk_4.1.2.tgz"; @@ -522,14 +506,6 @@ }; } { - name = "charenc___charenc_0.0.2.tgz"; - path = fetchurl { - name = "charenc___charenc_0.0.2.tgz"; - url = "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz"; - sha1 = "wKHS86cJLgN3S/qD8UwPxXkKhmc="; - }; - } - { name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { name = "chownr___chownr_1.1.4.tgz"; @@ -610,14 +586,6 @@ }; } { - name = "color_convert___color_convert_1.9.3.tgz"; - path = fetchurl { - name = "color_convert___color_convert_1.9.3.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - } - { name = "color_convert___color_convert_2.0.1.tgz"; path = fetchurl { name = "color_convert___color_convert_2.0.1.tgz"; @@ -626,14 +594,6 @@ }; } { - name = "color_name___color_name_1.1.3.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; - }; - } - { name = "color_name___color_name_1.1.4.tgz"; path = fetchurl { name = "color_name___color_name_1.1.4.tgz"; @@ -746,6 +706,14 @@ }; } { + name = "cross_fetch___cross_fetch_3.1.5.tgz"; + path = fetchurl { + name = "cross_fetch___cross_fetch_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz"; + sha512 = "lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw=="; + }; + } + { name = "cross_spawn___cross_spawn_6.0.5.tgz"; path = fetchurl { name = "cross_spawn___cross_spawn_6.0.5.tgz"; @@ -762,14 +730,6 @@ }; } { - name = "crypt___crypt_0.0.2.tgz"; - path = fetchurl { - name = "crypt___crypt_0.0.2.tgz"; - url = "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz"; - sha1 = "iNf/fsDfuG9xPch7u0LQRNPmxBs="; - }; - } - { name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; path = fetchurl { name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; @@ -778,19 +738,19 @@ }; } { - name = "debug___debug_4.3.3.tgz"; + name = "debug___debug_4.3.4.tgz"; path = fetchurl { - name = "debug___debug_4.3.3.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; - sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; + name = "debug___debug_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; } { - name = "debug___debug_4.3.2.tgz"; + name = "debug___debug_4.3.3.tgz"; path = fetchurl { - name = "debug___debug_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + name = "debug___debug_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; } { @@ -810,11 +770,11 @@ }; } { - name = "decompress_response___decompress_response_4.2.1.tgz"; + name = "decompress_response___decompress_response_6.0.0.tgz"; path = fetchurl { - name = "decompress_response___decompress_response_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz"; - sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; + name = "decompress_response___decompress_response_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz"; + sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; } { @@ -858,11 +818,11 @@ }; } { - name = "detect_libc___detect_libc_1.0.3.tgz"; + name = "detect_libc___detect_libc_2.0.1.tgz"; path = fetchurl { - name = "detect_libc___detect_libc_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "+hN8S9aY7fVc1c0CrFWfkaTEups="; + name = "detect_libc___detect_libc_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz"; + sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; }; } { @@ -874,11 +834,11 @@ }; } { - name = "devtools_protocol___devtools_protocol_0.0.937139.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.969999.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.937139.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.937139.tgz"; - sha512 = "daj+rzR3QSxsPRy5vjjthn58axO8c11j58uY0lG5vvlJk/EiOdCWOptGdkXDjtuRHr78emKq0udHCXM4trhoDQ=="; + name = "devtools_protocol___devtools_protocol_0.0.969999.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.969999.tgz"; + sha512 = "6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ=="; }; } { @@ -890,19 +850,19 @@ }; } { - name = "dmg_builder___dmg_builder_22.14.5.tgz"; + name = "dmg_builder___dmg_builder_22.14.13.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.14.5.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.5.tgz"; - sha512 = "1GvFGQE332bvPamcMwZDqWqfWfJTyyDLOsHMcGi0zs+Jh7JOn6/zuBkHJIWHdsj2QJbhzLVyd2/ZqttOKv7I8w=="; + name = "dmg_builder___dmg_builder_22.14.13.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.13.tgz"; + sha512 = "xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg=="; }; } { - name = "dmg_license___dmg_license_1.0.10.tgz"; + name = "dmg_license___dmg_license_1.0.11.tgz"; path = fetchurl { - name = "dmg_license___dmg_license_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.10.tgz"; - sha512 = "SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A=="; + name = "dmg_license___dmg_license_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz"; + sha512 = "ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q=="; }; } { @@ -946,11 +906,11 @@ }; } { - name = "electron_builder___electron_builder_22.14.5.tgz"; + name = "electron_builder___electron_builder_22.14.13.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.14.5.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz"; - sha512 = "N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg=="; + name = "electron_builder___electron_builder_22.14.13.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.13.tgz"; + sha512 = "3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw=="; }; } { @@ -962,19 +922,19 @@ }; } { - name = "electron_publish___electron_publish_22.14.5.tgz"; + name = "electron_publish___electron_publish_22.14.13.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.14.5.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.5.tgz"; - sha512 = "h+NANRdaA0PqGF15GKvorseWPzh1PXa/zx4I37//PIokW8eKIov8ky23foUSb55ZFWUHGpxQJux7y2NCfBtQeg=="; + name = "electron_publish___electron_publish_22.14.13.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.13.tgz"; + sha512 = "0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ=="; }; } { - name = "electron___electron_16.0.7.tgz"; + name = "electron___electron_17.2.0.tgz"; path = fetchurl { - name = "electron___electron_16.0.7.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz"; - sha512 = "/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w=="; + name = "electron___electron_17.2.0.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-17.2.0.tgz"; + sha512 = "eNXhPVEUofkgAeqRFvTizzYecoCMyS0Rar08WZHSAw9wjfZXawYMvTpjjjk9GiX9W/+Cjxua4YtGn5bOTabc0A=="; }; } { @@ -1034,14 +994,6 @@ }; } { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; - }; - } - { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; path = fetchurl { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; @@ -1114,6 +1066,14 @@ }; } { + name = "fessonia___fessonia_2.2.2.tgz"; + path = fetchurl { + name = "fessonia___fessonia_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/fessonia/-/fessonia-2.2.2.tgz"; + sha512 = "FvlDFdwHBIxWl2K9XynAIR38NB8xn4vPPZDNK5nIQBnGwZ0xv5FxDXsz+pzYZrUqoEQPQBJemNrYhueD2de7qw=="; + }; + } + { name = "filelist___filelist_1.0.2.tgz"; path = fetchurl { name = "filelist___filelist_1.0.2.tgz"; @@ -1130,11 +1090,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.14.7.tgz"; + name = "follow_redirects___follow_redirects_1.14.9.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.7.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz"; - sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; + name = "follow_redirects___follow_redirects_1.14.9.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz"; + sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; }; } { @@ -1162,11 +1122,11 @@ }; } { - name = "fs_extra___fs_extra_10.0.0.tgz"; + name = "fs_extra___fs_extra_10.0.1.tgz"; path = fetchurl { - name = "fs_extra___fs_extra_10.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz"; - sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; + name = "fs_extra___fs_extra_10.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz"; + sha512 = "NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag=="; }; } { @@ -1298,14 +1258,6 @@ }; } { - name = "has_flag___has_flag_3.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; - }; - } - { name = "has_flag___has_flag_4.0.0.tgz"; path = fetchurl { name = "has_flag___has_flag_4.0.0.tgz"; @@ -1346,6 +1298,14 @@ }; } { + name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; + sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; + }; + } + { name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; path = fetchurl { name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; @@ -1426,14 +1386,6 @@ }; } { - name = "is_buffer___is_buffer_1.1.6.tgz"; - path = fetchurl { - name = "is_buffer___is_buffer_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; - }; - } - { name = "is_ci___is_ci_2.0.0.tgz"; path = fetchurl { name = "is_ci___is_ci_2.0.0.tgz"; @@ -1554,11 +1506,11 @@ }; } { - name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; + name = "isbinaryfile___isbinaryfile_4.0.10.tgz"; path = fetchurl { - name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; - sha512 = "53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w=="; + name = "isbinaryfile___isbinaryfile_4.0.10.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz"; + sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; }; } { @@ -1578,11 +1530,11 @@ }; } { - name = "jake___jake_10.8.2.tgz"; + name = "jake___jake_10.8.4.tgz"; path = fetchurl { - name = "jake___jake_10.8.2.tgz"; - url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; - sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; + name = "jake___jake_10.8.4.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.4.tgz"; + sha512 = "MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA=="; }; } { @@ -1618,11 +1570,11 @@ }; } { - name = "json5___json5_2.2.0.tgz"; + name = "json5___json5_2.2.1.tgz"; path = fetchurl { - name = "json5___json5_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; - sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; + name = "json5___json5_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; + sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; }; } { @@ -1642,11 +1594,11 @@ }; } { - name = "keytar___keytar_7.7.0.tgz"; + name = "keytar___keytar_7.9.0.tgz"; path = fetchurl { - name = "keytar___keytar_7.7.0.tgz"; - url = "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz"; - sha512 = "YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A=="; + name = "keytar___keytar_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz"; + sha512 = "VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ=="; }; } { @@ -1730,27 +1682,19 @@ }; } { - name = "md5___md5_2.3.0.tgz"; - path = fetchurl { - name = "md5___md5_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz"; - sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; - }; - } - { - name = "mime_db___mime_db_1.51.0.tgz"; + name = "mime_db___mime_db_1.52.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.51.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; - sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; + name = "mime_db___mime_db_1.52.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; }; } { - name = "mime_types___mime_types_2.1.34.tgz"; + name = "mime_types___mime_types_2.1.35.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"; - sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; + name = "mime_types___mime_types_2.1.35.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; }; } { @@ -1770,11 +1714,11 @@ }; } { - name = "mimic_response___mimic_response_2.1.0.tgz"; + name = "mimic_response___mimic_response_3.1.0.tgz"; path = fetchurl { - name = "mimic_response___mimic_response_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz"; - sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; + name = "mimic_response___mimic_response_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz"; + sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; }; } { @@ -1786,11 +1730,19 @@ }; } { - name = "minimist___minimist_1.2.5.tgz"; + name = "minimatch___minimatch_3.1.2.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.5.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + name = "minimatch___minimatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; + }; + } + { + name = "minimist___minimist_1.2.6.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; } { @@ -1802,11 +1754,11 @@ }; } { - name = "mkdirp___mkdirp_0.5.5.tgz"; + name = "mkdirp___mkdirp_0.5.6.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + name = "mkdirp___mkdirp_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; }; } { @@ -1842,11 +1794,11 @@ }; } { - name = "node_abi___node_abi_2.30.1.tgz"; + name = "node_abi___node_abi_3.8.0.tgz"; path = fetchurl { - name = "node_abi___node_abi_2.30.1.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz"; - sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; + name = "node_abi___node_abi_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.8.0.tgz"; + sha512 = "tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw=="; }; } { @@ -1858,19 +1810,19 @@ }; } { - name = "node_addon_api___node_addon_api_3.2.1.tgz"; + name = "node_addon_api___node_addon_api_4.3.0.tgz"; path = fetchurl { - name = "node_addon_api___node_addon_api_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz"; - sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; + name = "node_addon_api___node_addon_api_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz"; + sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="; }; } { - name = "node_fetch___node_fetch_2.6.5.tgz"; + name = "node_fetch___node_fetch_2.6.7.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.6.5.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz"; - sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ=="; + name = "node_fetch___node_fetch_2.6.7.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz"; + sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; } { @@ -2042,19 +1994,19 @@ }; } { - name = "plist___plist_3.0.4.tgz"; + name = "plist___plist_3.0.5.tgz"; path = fetchurl { - name = "plist___plist_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz"; - sha512 = "ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg=="; + name = "plist___plist_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz"; + sha512 = "83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA=="; }; } { - name = "prebuild_install___prebuild_install_6.1.4.tgz"; + name = "prebuild_install___prebuild_install_7.0.1.tgz"; path = fetchurl { - name = "prebuild_install___prebuild_install_6.1.4.tgz"; - url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz"; - sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; + name = "prebuild_install___prebuild_install_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz"; + sha512 = "QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg=="; }; } { @@ -2122,11 +2074,11 @@ }; } { - name = "puppeteer___puppeteer_13.0.1.tgz"; + name = "puppeteer___puppeteer_13.5.1.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_13.0.1.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.0.1.tgz"; - sha512 = "wqGIx59LzYqWhYcJQphMT+ux0sgatEUbjKG0lbjJxNVqVIT3ZC5m4Bvmq2gHE3qhb63EwS+rNkql08bm4BvO0A=="; + name = "puppeteer___puppeteer_13.5.1.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.5.1.tgz"; + sha512 = "wWxO//vMiqxlvuzHMAJ0pRJeDHvDtM7DQpW1GKdStz2nZo2G42kOXBDgkmQ+zqjwMCFofKGesBeeKxIkX9BO+w=="; }; } { @@ -2338,11 +2290,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.6.tgz"; + name = "signal_exit___signal_exit_3.0.7.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; - sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; + name = "signal_exit___signal_exit_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; } { @@ -2354,11 +2306,11 @@ }; } { - name = "simple_get___simple_get_3.1.0.tgz"; + name = "simple_get___simple_get_4.0.1.tgz"; path = fetchurl { - name = "simple_get___simple_get_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz"; - sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; + name = "simple_get___simple_get_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz"; + sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; } { @@ -2482,14 +2434,6 @@ }; } { - name = "supports_color___supports_color_5.5.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - } - { name = "supports_color___supports_color_7.2.0.tgz"; path = fetchurl { name = "supports_color___supports_color_7.2.0.tgz"; @@ -2770,11 +2714,11 @@ }; } { - name = "ws___ws_8.2.3.tgz"; + name = "ws___ws_8.5.0.tgz"; path = fetchurl { - name = "ws___ws_8.2.3.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz"; - sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="; + name = "ws___ws_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz"; + sha512 = "BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg=="; }; } { @@ -2818,19 +2762,19 @@ }; } { - name = "yargs_parser___yargs_parser_21.0.0.tgz"; + name = "yargs_parser___yargs_parser_21.0.1.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_21.0.0.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz"; - sha512 = "z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA=="; + name = "yargs_parser___yargs_parser_21.0.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz"; + sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; }; } { - name = "yargs___yargs_17.3.1.tgz"; + name = "yargs___yargs_17.4.0.tgz"; path = fetchurl { - name = "yargs___yargs_17.3.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz"; - sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; + name = "yargs___yargs_17.4.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.4.0.tgz"; + sha512 = "WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA=="; }; } { diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 72e239229b3fc..e14d3732d76c9 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 -, lvm2, pam, python2, util-linux, json_c, nixosTests +, lvm2, pam, util-linux, json_c, nixosTests , ncurses }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2 - lvm2 pam python2 util-linux json_c ncurses + lvm2 pam util-linux json_c ncurses ]; passthru.tests.snapper = nixosTests.snapper; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index f327747748123..861667c11e2a8 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Swxc2gl3YP+0Kf+trp37rGhr5G8NT4L3Bb3lHwLm50Q="; + sha256 = "sha256-CZU1pQixbv/Fvqy6lMLXNYWj+2/pplNq+IXloED1Pt8="; }; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-UvIectx6qWkXg/yVQe11NXhh2UD0D/dMCtK1kj3ln6M="; + cargoSha256 = "sha256-5iAo8Gqvbba8W1KXtmFoKx+W1s3dwxR/T+v/R5+S38g="; preCheck = '' HOME=$TMPDIR diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/tools/misc/swaglyrics/default.nix index cc1835c554983..8fff712c323f2 100644 --- a/pkgs/tools/misc/swaglyrics/default.nix +++ b/pkgs/tools/misc/swaglyrics/default.nix @@ -1,18 +1,38 @@ -{ lib, python3, fetchFromGitHub, ncurses }: +{ lib +, python3 +, fetchFromGitHub +, ncurses +}: python3.pkgs.buildPythonApplication rec { pname = "swaglyrics"; version = "unstable-2021-06-17"; + format = "setuptools"; src = fetchFromGitHub { owner = "SwagLyrics"; repo = "SwagLyrics-For-Spotify"; rev = "99fe764a9e45cac6cb9fcdf724c7d2f8cb4524fb"; - sha256 = "sha256-O48T1WsUIVnNQb8gmzSkFFHTOiFOKVSAEYhF9zUqZz0="; + hash = "sha256-O48T1WsUIVnNQb8gmzSkFFHTOiFOKVSAEYhF9zUqZz0="; }; propagatedBuildInputs = with python3.pkgs; [ - unidecode colorama beautifulsoup4 flask requests swspotify + beautifulsoup4 + colorama + flask + requests + swspotify + unidecode + ]; + + checkInputs = with python3.pkgs; [ + blinker + flask + flask-testing + mock + pytestCheckHook + ] ++ [ + ncurses ]; preConfigure = '' @@ -22,10 +42,12 @@ python3.pkgs.buildPythonApplication rec { --replace 'flask==2.0.1' 'flask>=2.0.1' ''; - preBuild = "export HOME=$NIX_BUILD_TOP"; + preBuild = '' + export HOME=$(mktemp -d) + ''; - # disable tests which touch network disabledTests = [ + # Disable tests which touch network "test_database_for_unsupported_song" "test_that_lyrics_works_for_unsupported_songs" "test_that_get_lyrics_works" @@ -33,9 +55,9 @@ python3.pkgs.buildPythonApplication rec { "test_songchanged_can_raise_songplaying" ]; - checkInputs = with python3.pkgs; - [ blinker swspotify pytestCheckHook flask mock flask_testing ] - ++ [ ncurses ]; + pythonImportsCheck = [ + "swaglyrics" + ]; meta = with lib; { description = "Lyrics fetcher for currently playing Spotify song"; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 151b8292a5964..cbcc2ba38d212 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -40,7 +40,7 @@ ]; buildInputs = [ perl ]; - nativeBuildInputs = [ makeWrapper gnused ]; + nativeBuildInputs = [ makeWrapper ]; # XXX: While [1] states that DESTDIR should not be used, and that the correct # variable to set is, in fact, PREFIX, tlp thinks otherwise. The Makefile for diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index dfa9b18afd22b..78e2dc219b730 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -1,19 +1,26 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation, installShellFiles }: +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, Cocoa +, Foundation +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "8.3.0"; + version = "8.3.1"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iFS8Bf2IF0GoW168DwfBbkiPd7IGJhGShofFnBESpUc="; + sha256 = "sha256-EsC17VUQDgrhCU26fsqf2zXOTKa/WeKHiWG0Zn1Qao4="; }; - cargoSha256 = "sha256-8Ag4rDXnDZgxdwFpiWnYNjDeau9vr9EIfbJzeQlqSDM="; + cargoSha256 = "sha256-e5QJw5yY+ZkijqoqRauA5ncvLWiRlalYZCwSG5U7uDk="; - buildInputs = lib.optional stdenv.isDarwin Foundation; + buildInputs = lib.optionals stdenv.isDarwin [ Cocoa Foundation ]; nativeBuildInputs = [ installShellFiles ]; @@ -25,6 +32,7 @@ rustPlatform.buildRustPackage rec { description = "Upgrade all the things"; homepage = "https://github.com/r-darwish/topgrade"; license = licenses.gpl3Only; - maintainers = with maintainers; [ Br1ght0ne hugoreeves SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/tools/misc/wlc/default.nix index 2bac81fd3ca0e..2e76719012e88 100644 --- a/pkgs/tools/misc/wlc/default.nix +++ b/pkgs/tools/misc/wlc/default.nix @@ -6,11 +6,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "wlc"; - version = "1.12"; + version = "1.13"; src = fetchPypi { inherit pname version; - sha256 = "sha256:01c1qxq6dxvpn8rgpbqs4iw5daa0rmlgygb3xhhfj7xpqv1v84ir"; + sha256 = "sha256-MZ6avuMNT5HIIXW7ezukAJeO70o+SrgJnBnGjNy4tYE="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 1c49d68cd00a8..13868bf2940eb 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "20220213"; + version = "20220425"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "sha256-lFb8NwKg8GBgkVsg01rlGrP31APwhFaCFT7QdqiT6J0="; + sha256 = "sha256-PIoJ+enbRwXiszh7BTkfeoA6IfDXoFOi9WitzQp3EQE="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index a08fdcb1dd2cf..90b29d80ac18a 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1555"; + version = "0.4.1602"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "99282aca720c7ee1d9ef4b63bbbd226e906ea170b789a459fafd5b0627b0b15f"; + sha256 = "sha256-RwbAbMS5CA6pO08TuaTb67YM/hLRkceOF7D6iV0XcI8="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index efabd8bc453b9..1a87a31e3385b 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -10,6 +10,7 @@ , pycryptodomex , websockets , mutagen +, atomicparsleySupport ? true , ffmpegSupport ? true , rtmpSupport ? true , phantomjsSupport ? false @@ -37,11 +38,12 @@ buildPythonPackage rec { # - atomicparsley: embedding thumbnails makeWrapperArgs = let - packagesToBinPath = [ atomicparsley ] + packagesToBinPath = [] + ++ lib.optional atomicparsleySupport atomicparsley ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional rtmpSupport rtmpdump ++ lib.optional phantomjsSupport phantomjs2; - in + in lib.optionalString (packagesToBinPath != []) [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; setupPyBuildFlags = [ diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/tools/misc/ytarchive/default.nix index 7176ea0953d24..ecf1fe9ff6947 100644 --- a/pkgs/tools/misc/ytarchive/default.nix +++ b/pkgs/tools/misc/ytarchive/default.nix @@ -1,20 +1,26 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, ffmpeg }: buildGoModule rec { pname = "ytarchive"; - version = "unstable-2022-02-16"; + version = "unstable-2022-03-11"; src = fetchFromGitHub { owner = "Kethsar"; repo = "ytarchive"; - rev = "66a1ca003de7302c99bda943500257d5fd374199"; - sha256 = "sha256-6eLNyInqXB+LWbZ18DvXbTdpRpiCDMGwJaiyQfZZ4xM="; + rev = "34825e8777637ca114a0ab394a4b4fead6ad7c88"; + sha256 = "sha256-/x6YcF2EyjOFnIHlsh+ZESF+7AYO3QRNaqbJgycQai4="; }; vendorSha256 = "sha256-r9fDFSCDItQ7YSj9aTY1LXRrFE9T3XD0X36ywCfu0R8="; + nativeBuildInputs = [ makeWrapper ]; + ldflags = [ "-s" "-w" ]; + postInstall = '' + wrapProgram $out/bin/ytarchive --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} + ''; + meta = with lib; { homepage = "https://github.com/Kethsar/ytarchive"; description = "Garbage Youtube livestream downloader"; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 6d80cd2400d2c..187782fd406a1 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,20 +1,28 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, check, pcsclite, PCSC +{ lib, stdenv, fetchurl, pkg-config, openssl, check, pcsclite, PCSC, gengetopt, cmake , withApplePCSC ? stdenv.isDarwin }: stdenv.mkDerivation rec { pname = "yubico-piv-tool"; - version = "2.0.0"; + version = "2.2.1"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz"; - sha256 = "124lhlim05gw32ydjh1yawqbnx6wdllz1ir9j00j09wji3m11rfs"; + sha256 = "sha256-t+3k3cPW4x3mey4t3NMZsitAzC4Jc7mGbQUqdUSTsU4="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config cmake gengetopt ]; buildInputs = [ openssl check ] ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); + cmakeFlags = [ + "-DGENERATE_MAN_PAGES=OFF" # Use the man page generated at release time + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_MANDIR=share/man" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ]; meta = with lib; { @@ -32,5 +40,6 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd2; platforms = platforms.all; + maintainers = with maintainers; [ viraptor ]; }; } diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index b12d096435bd1..421c7d21d305b 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.27.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-iQ+Z1A/wiui2IHuK35e6T/44TYaf6+KbaDl5GfVF2vo="; + sha256 = "sha256-KuelmMQdCazwTlolH5xvvNXZfzHQDUV6rrlk037GFb8="; }; - cargoSha256 = "sha256-DMHIvqClBpBplvqqXM2dUOumO+Ean4yAHWDplJ9PaUM="; + cargoSha256 = "sha256-He8rMY8n15ZSF/GcbuYTx2JfZgqQnsZLfqP+lUYxnzw="; nativeBuildInputs = [ mandown diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix index 370a726caa643..5ca16499fe823 100644 --- a/pkgs/tools/networking/bore-cli/default.nix +++ b/pkgs/tools/networking/bore-cli/default.nix @@ -1,17 +1,26 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, Security +}: rustPlatform.buildRustPackage rec { pname = "bore-cli"; - version = "0.2.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "ekzhang"; repo = "bore"; rev = "v${version}"; - sha256 = "sha256-KSJ5KYXOwjtK1oE9IpsVKb7H4uuKJroCpM1Dk+2XJlY="; + hash = "sha256-ywdJH39OYLaM4st/DIcvvtIUzExpbAucMMpqouJL1yI="; }; - cargoSha256 = "sha256-HPMEbHDRmsmcr7Fuhsyr+NkdI9t1sL7q8uzj8sFks0s="; + cargoSha256 = "sha256-ZnEVTFiPo3AFyo1BoV88X2nCqYzRK6PkcbawiR+QnV0="; + + buildInputs = lib.optional stdenv.isDarwin [ + Security + ]; # tests do not find grcov path correctly meta = with lib; { @@ -19,5 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ekzhang/bore"; license = licenses.mit; maintainers = with maintainers; [ DieracDelta ]; + mainProgram = "bore"; }; } diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 360cc96b707bb..47187961ffe7c 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "1.1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "sha256-1v7jAYLIflXIKY0zltzkre4sNv9qqWxFGWrQuOBr2s0="; + sha256 = "sha256-JhdR1UKHnzXIUoe1shb3IZne3q198NLwRROEYuKsnW4="; }; - vendorSha256 = "sha256-oS9nI1BELDLFksN+NbLT1Eklg67liOvcRbxtGdYGJJA="; + vendorSha256 = "sha256-w15dRxIBzDN5i4RNEDuSfCHHb4wc4fw1B2wjlTk40iE="; # Since the tarball pulled from GitHub doesn't contain git tag information, # we fetch the expected tag's timestamp from a file in the root of the diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 46b91fdf84c24..b6e5150fe8e24 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.5.3"; + version = "9.5.5"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yBXW9jrE9VUEu0EoBCtctTkQo129Vo+zFgP0Hkmm5hQ="; + sha256 = "sha256-YBg7mY8po7yVrSX1GaoI9/E3zFbdWWQEVCuR0H0DgJ4="; }; - vendorSha256 = "sha256-nRZbSkSix2knIQBEMPx5oC47VKXNZ2e1NgKt9mAhaPQ="; + vendorSha256 = "sha256-kaqTJMRbLSF1zy6qXqdOSzmbcV35rzrou4X0WzoQoGc="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 7c7f301552e7e..a4056fd28a92c 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -108,11 +108,6 @@ stdenv.mkDerivation rec { configureFlags = [ # Build without manual "--disable-manual" - # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback - # to nss-cacert from the default profile. - # https://github.com/curl/curl/issues/8696 - fallback is not supported by HTTP3 - (if http3Support then "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" else "--without-ca-bundle") - "--without-ca-path" (lib.enableFeature c-aresSupport "ares") (lib.enableFeature ldapSupport "ldap") (lib.enableFeature ldapSupport "ldaps") @@ -136,6 +131,12 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" + ] ++ lib.optionals stdenv.isDarwin [ + # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback to nss-cacert from the default profile. + # Without this curl might detect /etc/ssl/cert.pem at build time on macOS, causing curl to ignore NIX_SSL_CERT_FILE. + # https://github.com/curl/curl/issues/8696 - fallback is not supported by HTTP3 + (if http3Support then "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" else "--without-ca-bundle") + "--without-ca-path" ]; CXX = "${stdenv.cc.targetPrefix}c++"; diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 1423230ad4706..5e39491096f27 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JutR1yrxbwhfcw6qTh493yVeo7KzLl83himPTX8FJlA="; + sha256 = "sha256-Ubc9jRZ+rkJ5TelizP6z9Hef6TkypfGMhZN+H4Awdqc="; }; - vendorSha256 = "sha256-HOfcVPrJ6TBrhToqYN2CJ0i3re95awrIxQk2Mm8x3DU="; + vendorSha256 = "sha256-5ljUbEvynNo1AxGpJq9B0bTFgzVfgVZbsqXcPBERLMI="; doCheck = false; diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix index f4b0607d49fba..29f017c81d3fa 100644 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "globalprotect-openconnect"; - version = "1.3.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "yuezk"; repo = "GlobalProtect-openconnect"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-w2y6DOFgQ8Xpi1abibvRNpEUbBsdvwDMGqlJxQSCpVg="; + sha256 = "sha256-J4f+DJuKQUGK49muAtPU1aL/KI9mofIjyCcIztNVyr4="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 0e1096240abc8..27ff7a2597784 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "godns"; - version = "2.7.4"; + version = "2.7.6"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-0aE+XcRqk/3/auscVdqdzehrpM6CeSdAJTugHXY8rek="; + sha256 = "sha256-w0hHl7QOpIOINRbCrocZM68b44h+IwkHmXTDnVfT0o0="; }; vendorSha256 = "sha256-vhByl9oJjFIvOskAgLubZ5RCcitKd2jjxi8D9nU6850="; diff --git a/pkgs/tools/networking/gof5/default.nix b/pkgs/tools/networking/gof5/default.nix new file mode 100644 index 0000000000000..9b437ee49ee6d --- /dev/null +++ b/pkgs/tools/networking/gof5/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "gof5"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "kayrus"; + repo = pname; + rev = "v${version}"; + sha256 = "10qh7rj8s540ghjdvymly53vny3n0qd0z0ixy24n026jjhgjvnpl"; + }; + + vendorSha256 = null; + + # The tests are broken and apparently you need to uncomment some lines in the + # code in order for it to work. + # See: https://github.com/kayrus/gof5/blob/674485bdf5a0eb2ab57879a32a2cb4bab8d5d44c/pkg/client/http.go#L172-L174 + doCheck = false; + + meta = with lib; { + description = "Open Source F5 BIG-IP VPN client"; + homepage = "https://github.com/kayrus/gof5"; + license = licenses.asl20; + maintainers = with maintainers; [ leixb ]; + }; +} diff --git a/pkgs/tools/networking/magic-wormhole-rs/default.nix b/pkgs/tools/networking/magic-wormhole-rs/default.nix index 951a066437640..3d9e20d14dce6 100644 --- a/pkgs/tools/networking/magic-wormhole-rs/default.nix +++ b/pkgs/tools/networking/magic-wormhole-rs/default.nix @@ -4,7 +4,7 @@ , rustPlatform }: rustPlatform.buildRustPackage rec { - name = "magic-wormhole-rs"; + pname = "magic-wormhole-rs"; version = "0.3.0"; src = fetchFromGitHub { @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { # https://github.com/NixOS/nixpkgs/issues/30742 # and can probably be removed once the issue is resolved cargoPatches = [ ./Cargo.toml.patch ]; - cargoSha256 = "sha256-DG1kyukgzDbolX9Mg9hK1TRyzIWbAX6f54jSM8clj/c="; + cargoSha256 = "sha256-ujwvwr4GR/rQWnXFfL8sqPyz4QvGeOxwBrT+gf+vjsI="; # all tests involve networking and are bound fail doCheck = false; diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/tools/networking/mqttui/default.nix index 4243c7ddbd887..98190ed31df69 100644 --- a/pkgs/tools/networking/mqttui/default.nix +++ b/pkgs/tools/networking/mqttui/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mqttui"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "EdJoPaTo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nLUDuLolv52WJAwBG5gSADWM2LmquJt5jZJioZWX8VA="; + sha256 = "sha256-u2KuB0cw0xCAc5uRgHNsQknTfLwQmO9CZjSJTdycEnc="; }; - cargoSha256 = "sha256-Z6V7k69fjtiG01s1Xf0UA8lhRsq3T+ImDsCHPSVIDfQ="; + cargoSha256 = "sha256-asJvunklc0zcrkgirC6wznwKNKLFQ6sN/B1GukI/NCo="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix index 88ccad59bd1a9..889f15659592e 100644 --- a/pkgs/tools/networking/networkmanager/l2tp/default.nix +++ b/pkgs/tools/networking/networkmanager/l2tp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkg-config -, file, findutils +, file , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret , withGnome ? true, libnma, glib }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ networkmanager ppp glib ] ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file findutils ]; + nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file ]; preConfigure = '' intltoolize -f diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 652ad4e288670..d5700c42534c2 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, bash, autoreconfHook +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, autoreconfHook , zeromq, ndpi, json_c, openssl, libpcap, libcap, curl, libmaxminddb , rrdtool, sqlite, libmysqlclient, expat, net-snmp }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ bash autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ zeromq ndpi json_c openssl libpcap curl libmaxminddb rrdtool sqlite diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix new file mode 100644 index 0000000000000..b6feafb4a0039 --- /dev/null +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ooniprobe-cli"; + version = "3.14.2"; + + src = fetchFromGitHub { + owner = "ooni"; + repo = "probe-cli"; + rev = "v${version}"; + hash = "sha256-9n/Ozyy1QzjFum/R/X2DChzTHl70e+JQuo09nToAIcE="; + }; + + vendorSha256 = "/fN9nRYOy00EeI8zZQFkCgTMGLZ0pFbYmRdTr2NLIsc="; + + subPackages = [ "cmd/ooniprobe" ]; + + meta = with lib; { + description = "The Open Observatory of Network Interference command line network probe"; + homepage = "https://ooni.org/install/cli"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix deleted file mode 100644 index dc447f3a86b90..0000000000000 --- a/pkgs/tools/networking/philter/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, python2 }: - -stdenv.mkDerivation rec { - pname = "philter"; - version = "1.1"; - src = fetchurl { - url = "mirror://sourceforge/philter/${pname}-${version}.tar.gz"; - sha256 = "177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l"; - }; - - installPhase = '' - mkdir -p "$out"/{bin,share/philter} - cp .philterrc "$out"/share/philter/philterrc - sed -i 's@/usr/local/bin@${python2}/bin@' src/philter.py - cp src/philter.py "$out"/bin/philter - chmod +x "$out"/bin/philter - ''; - - meta = with lib; { - description = "Mail sorter for Maildirs"; - homepage = "http://philter.sourceforge.net"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.all; - license = licenses.gpl2; - }; - - passthru = { - updateInfo = { - downloadPage = "http://philter.sourceforge.net/"; - }; - }; -} diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix index 1d7d006f537a3..69236a690968f 100644 --- a/pkgs/tools/networking/pssh/default.nix +++ b/pkgs/tools/networking/pssh/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, python2Packages, openssh, rsync }: +{ lib, fetchFromGitHub, python3Packages, openssh, rsync }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pssh"; - version = "2.3.1"; + version = "2.3.4"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "pssh"; rev = "v${version}"; - sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq"; + hash = "sha256-B1dIa6hNeq4iE8GKVhTp3Gzq7vp+v5Yyzj8uF8X71yg="; }; postPatch = '' @@ -20,6 +20,9 @@ python2Packages.buildPythonApplication rec { done ''; + # Tests do not run with python3: https://github.com/lilydjwg/pssh/issues/126 + doCheck = false; + meta = with lib; { description = "Parallel SSH Tools"; longDescription = '' diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 44b08bc137264..5064ea9e238ac 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.12"; + version = "1.2.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "sha256-NhE5XxInNfGN6hTyZItc7+4HBjcyBLAFTpirEidcipk="; + sha256 = "sha256-wVisE4YAK52yfeM2itnBqCmhRKlrKRs0NEppQzZPok8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index 65449c203e1d9..77f86458ad152 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "SSTP client for Linux"; homepage = "http://sstp-client.sourceforge.net/"; platforms = platforms.linux; - maintainers = with maintainers; [ ktosiek ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix index 5542adca77af9..4a497a767f4c8 100644 --- a/pkgs/tools/networking/termscp/default.nix +++ b/pkgs/tools/networking/termscp/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "termscp"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "veeso"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WqOkud8gOa81P6FT44y5RZX4CWjmou9HufZ3QPoYuAk="; + sha256 = "sha256-7T3VmcI9CWrKROQ0U2du2d8e0A6XnOxpd8Zl0T4w+KQ="; }; - cargoSha256 = "sha256-jckJiFhiUvbn0fkgKzqDorWQvuLenx/S8+RyPoqaWUg="; + cargoSha256 = "sha256-WuoN7b9Fw2Op8tck4ek8gyufInlbPkDHHtLAsbG1NLE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/networking/tun2socks/default.nix b/pkgs/tools/networking/tun2socks/default.nix new file mode 100644 index 0000000000000..7706ff8e8886c --- /dev/null +++ b/pkgs/tools/networking/tun2socks/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "tun2socks"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "xjasonlyu"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FBYRqxS8DJbIc8j8X6WNxl6a1YRcNrPSnNfrq/Y0fMM="; + }; + + vendorSha256 = "sha256-XWzbEtYd8h63QdpAQZTGxyxMAAnpKO9Fp4y8/eeZ7Xw="; + + ldflags = [ + "-w" "-s" "-buildid=" + "-X github.com/xjasonlyu/tun2socks/v2/internal/version.Version=v${version}" + "-X github.com/xjasonlyu/tun2socks/v2/internal/version.GitCommit=v${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/xjasonlyu/tun2socks"; + description = "tun2socks - powered by gVisor TCP/IP stack"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 46093f2c5b945..472c699a3d8c7 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlwatch"; - version = "2.24"; + version = "2.25"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "sha256-H7dusAXVEGOUu2fr6UjiXjw13Gm9xNeJDQ4jqV+8QmU="; + hash = "sha256-+ayHMY0gEAVhOgDDh+RfRrUpV0tSX8mMmfPzyg+YSv4="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index a9885fc135181..74e59c2c6acac 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -6,7 +6,7 @@ , nix , nix-index , rustPlatform -, testVersion +, testers }: rustPlatform.buildRustPackage rec { @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; passthru.tests = { - version = testVersion { package = comma; }; + version = testers.testVersion { package = comma; }; }; meta = with lib; { diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 2d50dbc571d01..2fb514cf29321 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-3/F9q6MRebTltJzuhIukHrxgUyd5pi34IzaklfdvKe4="; + hash = "sha256-NCUVRiZqg9JgS+hlAczvPDb0M5uIwyyqhdKe5K1P360="; }; buildInputs = [ boost diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 8e0860dfe5812..cf9b26a5603ac 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -89,12 +89,12 @@ in lib.makeExtensible (self: { unstable = lib.lowPrio (common rec { version = "2.8"; - suffix = "pre20220411_${lib.substring 0 7 src.rev}"; + suffix = "pre20220503_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "f7276bc948705f452b2bfcc2a08bc44152f1d5a8"; - sha256 = "sha256-brqGGdr2CzqufY3NXU8tGm6QbCTSFGfboruU2cUWhu8="; + rev = "9489b4b7ef73ab20e8f49213d8711ca56b59107e"; + sha256 = "sha256-eTRr2MkP9MMqpmHtsCPMbyLBQLrLPnTh4D8RXT4MKk4="; }; }); }) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 15f94aceaa4e7..66064139f3800 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -11,7 +11,6 @@ , vala , gtk-doc , nix -, nlohmann_json ? null , boost , meson , ninja @@ -27,12 +26,6 @@ , enableSystemd ? stdenv.isLinux , systemd }: -let - nix_version = lib.removeSuffix nix.VERSION_SUFFIX nix.version; - useNlohmann = lib.versionAtLeast "2.7" nix_version; -in - -assert useNlohmann -> nlohmann_json != null; stdenv.mkDerivation rec { pname = "packagekit"; @@ -43,8 +36,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "PackageKit"; repo = "PackageKit"; - rev = "33b847c49b4a42499e3c0f10fef62830c874e086"; - sha256 = "UDpMswf0EBwcoHTqoWiztXnIAwM69nM+S9MPsR24amw="; + rev = "30bb82da8d4161330a6d7a20c9989149303421a1"; + sha256 = "k2osc2v0OuGrNjwxdqn785RsbHEJP3p79PG9YqnVE3U="; }; buildInputs = [ @@ -59,7 +52,6 @@ stdenv.mkDerivation rec { nix boost ] ++ lib.optional enableSystemd systemd - ++ lib.optional useNlohmann nlohmann_json ++ lib.optional enableBashCompletion bash-completion; nativeBuildInputs = [ vala diff --git a/pkgs/tools/security/adreaper/default.nix b/pkgs/tools/security/adreaper/default.nix new file mode 100644 index 0000000000000..e0329a83f62b2 --- /dev/null +++ b/pkgs/tools/security/adreaper/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "adreaper"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "AidenPearce369"; + repo = "ADReaper"; + rev = "ADReaperv${version}"; + sha256 = "sha256-+FCb5TV9MUcRyex2M4rn2RhcIsXQFbtm1T4r7MpcRQs="; + }; + + vendorSha256 = "sha256-lU39kj/uz0l7Rodsu6+UMv2o579eu1KUbutUNZni7bM="; + + postInstall = lib.optionalString (!stdenv.isDarwin) '' + mv $out/bin/ADReaper $out/bin/$pname + ''; + + meta = with lib; { + description = "Enumeration tool for Windows Active Directories"; + homepage = "https://github.com/AidenPearce369/ADReaper"; + # Upstream doesn't have a license yet + # https://github.com/AidenPearce369/ADReaper/issues/2 + license = with licenses; [ unfree ]; + maintainers = with maintainers; [ fab ]; + mainProgram = "ADReaper"; + }; +} diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index ad75742576105..7f3dd2afd8158 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "bitwarden"; - version = "1.31.3"; + version = "1.32.1"; src = fetchurl { url = "https://github.com/bitwarden/desktop/releases/download/v${version}/Bitwarden-${version}-amd64.deb"; - sha256 = "sha256-ASL4+FZh5st3V5Z+jsfvLD26hG9KNVI+tht7kL8lbL4="; + sha256 = "sha256-G1k8kf00EQVH/z2foH4NHCw82/eTi7BMMfkVtX6IfQo="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index 9aec14e0a418b..ba96e2a70fe5d 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -1,18 +1,18 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, gnupg }: buildGoModule rec { pname = "browserpass"; - version = "3.0.6"; + version = "3.0.10"; src = fetchFromGitHub { owner = "browserpass"; repo = "browserpass-native"; rev = version; - sha256 = "0q3bsla07zjl6i69nj1axbkg2ia89pvh0jg6nlqgbm2kpzzbn0pz"; + sha256 = "8eAwUwcRTnhVDkQc3HsvTP0TqC4LfVrUelxdbJxe9t0="; }; nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = "1wcbn0ip596f2dp68y6jmxgv20l0dgrcxg5cwclkawigj05416zj"; + vendorSha256 = "gWXcYyIp86b/Pn6vj7qBj/VZS9rTr4weVw0YWmg+36c="; doCheck = false; @@ -21,8 +21,8 @@ buildGoModule rec { # variables to be valid by default substituteInPlace Makefile \ --replace "PREFIX ?= /usr" "" - sed -i -e 's/SED :=.*/SED := sed/' Makefile - sed -i -e 's/INSTALL :=.*/INSTALL := install/' Makefile + sed -i -e 's/SED =.*/SED = sed/' Makefile + sed -i -e 's/INSTALL =.*/INSTALL = install/' Makefile ''; DESTDIR = placeholder "out"; diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 2d24c8292b68a..b4d33a1729160 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Jxtu4f3JeQ1LH2IjSc5hRKDrWXllczQWWHBa4eTzOIY="; + sha256 = "sha256-9zA50tnUWR8dglPvMagiGcJDkPHs7yXuqYV2jnRdWqA="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,7 +16,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-fBmSuxjguNc1LOoXqOue0/Ki3979NpqJTzuuqqsjooM="; + vendorSha256 = "sha256-buOdutDZUFu+GbjyF0Ql8QAXpNEv2ej0mwjSZMHDmdA="; subPackages = [ "cmd/cosign" diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 57e420f866995..76b5f5216636c 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -6,13 +6,13 @@ let pname = "cryptomator"; - version = "1.6.8"; + version = "1.6.10"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - sha256 = "sha256-2bvIjfutxfTPBtYiSXpgdEh63Eg74uqSf8CDo/Oma0U="; + sha256 = "sha256-klNkMCgXC0gGqNV7S5EObHYCcgN4SayeNHXF9bq+20s="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) @@ -37,7 +37,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-quYUJX/JErtWuUQBYXXee/uZGkO0UBr4qxcGticxGUc="; + outputHash = "sha256-biQBP0rV94+Hoqte36Xmzm1XWtWC+1ne5lgpUj0GPak="; doCheck = false; }; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 129d335bf4966..2c76d28bae25a 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-04-23"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-KAbPiZ/iOwT8plqqZ4Q3Cl8+we2Tsi2GkkmXZCcmhHs="; + sha256 = "sha256-GYAIbE6Vrq6gBnCkeOSvo6gSJqPOhDh2f8n1b6B/x30="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index 4098a1015180b..acfce66834ff8 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,47 +2,50 @@ buildGoModule rec { pname = "fulcio"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jcmjfNGruDhQPhVn5R2hdUr+d42qQnIVj8+CCX5HMMM="; + sha256 = "sha256-b+2M28cI+4UkzrIqI+BioxJsGqT0pqJVPTPmXe+NsZo="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; postFetch = '' cd "$out" git rev-parse HEAD > $out/COMMIT - # '0000-00-00T00:00:00Z' - date -u -d "@$(git log -1 --pretty=%ct)" "+'%Y-%m-%dT%H:%M:%SZ'" > $out/SOURCE_DATE_EPOCH + # 0000-00-00T00:00:00Z + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-WQ0MuNEJWCxKTjkyqA66bGPoMrS/7W/YTiGU3yd+Ge8="; + vendorSha256 = "sha256-INPMsSyjFs4GyapOlc/k5fcI2ePUKgp4BtASOKwQhck="; - # install completions post-install nativeBuildInputs = [ installShellFiles ]; - excludedPackages = [ "federation" "test/prometheus" ]; + subPackages = [ "." ]; ldflags = [ "-s" "-w" - "-X github.com/sigstore/fulcio/cmd/app.gitVersion=v${version}" - "-X github.com/sigstore/fulcio/cmd/app.gitTreeState=clean" + "-X github.com/sigstore/fulcio/pkg/api.gitVersion=v${version}" + "-X github.com/sigstore/fulcio/pkg/api.gitTreeState=clean" ]; # ldflags based on metadata from git and source preBuild = '' - ldflags+=" -X github.com/sigstore/fulcio/cmd/app.gitCommit=$(cat COMMIT)" - ldflags+=" -X github.com/sigstore/fulcio/cmd/app.buildDate=$(cat SOURCE_DATE_EPOCH)" + ldflags+=" -X github.com/sigstore/fulcio/pkg/api.gitCommit=$(cat COMMIT)" + ldflags+=" -X github.com/sigstore/fulcio/pkg/api.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; preCheck = '' - # remove test that requires networking - rm pkg/config/config_test.go + # test all paths + unset subPackages + + # skip test that requires networking + substituteInPlace pkg/config/config_test.go \ + --replace "TestLoad" "SkipLoad" ''; postInstall = '' @@ -55,10 +58,8 @@ buildGoModule rec { doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck - $out/bin/fulcio --help $out/bin/fulcio version | grep "v${version}" - runHook postInstallCheck ''; @@ -66,8 +67,17 @@ buildGoModule rec { homepage = "https://github.com/sigstore/fulcio"; changelog = "https://github.com/sigstore/fulcio/releases/tag/v${version}"; description = "A Root-CA for code signing certs - issuing certificates based on an OIDC email address"; + longDescription = '' + Fulcio is a free code signing Certificate Authority, built to make + short-lived certificates available to anyone. Based on an Open ID Connect + email address, Fulcio signs x509 certificates valid for under 20 minutes. + + Fulcio was designed to run as a centralized, public-good instance backed + up by other transparency logs. Development is now underway to support + different delegation models, and to deploy and run Fulcio as a + disconnected instance. + ''; license = licenses.asl20; maintainers = with maintainers; [ lesuisse jk ]; - mainProgram = "fulcio-server"; }; } diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index a298f10d2d50f..d03a0ce1cac84 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.8.2"; + version = "8.8.4"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WEVlddqG7t01yl05EujxH/XXBYZxePSKY6IQwkKUkws="; + sha256 = "sha256-EW5skmSnnQiMCMqyh51t1q4F5JVYWLSuj1qTqfWp/ok="; }; vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk="; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 6825e6cbba80d..4e3926d7f0642 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.14.0"; + version = "1.14.1"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-swvZrsRuevBe8lVg67J0R9u3GB/Wc2ZR54Y6j1Bsa3E="; + sha256 = "sha256-vdMOD6Zrl718jcntjEzOG+4Rr0aqhm0YidA0x3Gseqg="; }; - vendorSha256 = "sha256-Fq9jEJm65efBL5ShcB/XCM70UVDO/8STbbTOOHXrpSk="; + vendorSha256 = "sha256-mdPAZrcdlq7R7DRIfuxf4PCpEJoJjzo/+TDKAVglk7A="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index c8326fe09ff25..0b67babddef26 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "grype"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DZ3/t6+iVmPCH4LBbtEqIdPdzmQu7fsNlJnHZ54alVw="; + sha256 = "sha256-8bU7vuTbPoHGCoXiCc4p0rPzCSsYuXM3A2NAgIaHuIw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorSha256 = "sha256-RHsDwbQO+2OLmpqCSC9goHv9ut64Kp+cw18jdLvhmK8="; + vendorSha256 = "sha256-Dn3lDdwUK+C7pQwN3uq7p4WkyG5tXTPd18rQGpwqcPI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index 2aadf1fb7b27d..1358d9f3198ef 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - hash = "sha256-G2BgGhWk0Prbjni6HPZ/0+bWiC9uI2O13Q1SDCE5mBE="; + hash = "sha256-uDNHjajGqEeXOIC5SaluhHWOkA2j3LUvB6O3MHB2+YA="; }; deps = stdenv.mkDerivation { @@ -40,7 +40,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-QZClHuj7oCUYX3I8B3A90m4zK7+FP24C19RIzYyPC1w="; + outputHash = "sha256-SFj3VPCIxEA2mj/xsibXZ1MDmV/BnmvQJUBav1gfEGM="; }; in stdenv.mkDerivation { inherit pname version src; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index be6514630f56a..9a3c03d6d2bc3 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2 -, gcc, python3Packages, perl, perlPackages, makeWrapper +{ lib, stdenv, fetchFromGitHub, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2 +, gcc, python3Packages, perl, perlPackages, makeWrapper, fetchpatch }: with lib; @@ -8,11 +8,21 @@ stdenv.mkDerivation rec { pname = "john"; version = "1.9.0-jumbo-1"; - src = fetchurl { - url = "http://www.openwall.com/john/k/${pname}-${version}.tar.xz"; - sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm"; + src = fetchFromGitHub { + owner = "openwall"; + repo = pname; + rev = "1.9.0-Jumbo-1"; + sha256 = "sha256-O1iPh5QTMjZ78sKvGbvSpaHFbBuVc1z49UKTbMa24Rs="; }; + patches = [ + (fetchpatch { + name = "fix-gcc-11-struct-allignment-incompatibility.patch"; + url = "https://github.com/openwall/john/commit/154ee1156d62dd207aff0052b04c61796a1fde3b.patch"; + sha256 = "sha256-3rfS2tu/TF+KW2MQiR+bh4w/FVECciTooDQNTHNw31A="; + }) + ]; + postPatch = '' sed -ri -e ' s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/! @@ -69,8 +79,8 @@ stdenv.mkDerivation rec { meta = { description = "John the Ripper password cracker"; - license = licenses.gpl2; - homepage = "https://github.com/magnumripper/JohnTheRipper/"; + license = licenses.gpl2Plus; + homepage = "https://github.com/openwall/john/"; maintainers = with maintainers; [ offline matthewbauer ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 98b297fe83185..20c172fc5017d 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "0w7fqmh8gihknvdamnq1n519253d4lxrpv378jajca9x906rqy1r"; + sha256 = "01aqqjynfcrn3m36hfjwcfh870imcd0hj5gifxzpnjiqjwpvys59"; }; - cargoSha256 = "0b7m23azy8cb8d5wkawnw6nv8k7lfnfwc06swmbkfvg8vcxfsacs"; + cargoSha256 = "1n4gmqmi975cd2zyrf0yi4gbxjjg9f99xa191mgmrdyyij7id3cf"; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index 2042ec30fff6e..d410663e4fcea 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-ih154MtLWBUdo7+ugu6tg5O/XSjlgFC00wgWC71VeaE="; + sha256 = "sha256-f88hT9+rbZXkSQ39mUuGHqmBYN/7pdd5q4Aq4gGjVdY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 9ac0d904345bd..83534ca07c6b0 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.39" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.40" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index bbadd24eb8cd5..779d1f9c99745 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: e1016aceec3bfd4aff85d0bcdc89ee7c88cf5bd4 - ref: refs/tags/6.1.39 + revision: 82d111481b8f46bf50473770673305b0ec0eb5d2 + ref: refs/tags/6.1.40 specs: - metasploit-framework (6.1.39) + metasploit-framework (6.1.40) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -99,25 +99,25 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (6.1.5) - actionview (= 6.1.5) - activesupport (= 6.1.5) + actionpack (6.1.5.1) + actionview (= 6.1.5.1) + activesupport (= 6.1.5.1) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.5) - activesupport (= 6.1.5) + actionview (6.1.5.1) + activesupport (= 6.1.5.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (6.1.5) - activesupport (= 6.1.5) - activerecord (6.1.5) - activemodel (= 6.1.5) - activesupport (= 6.1.5) - activesupport (6.1.5) + activemodel (6.1.5.1) + activesupport (= 6.1.5.1) + activerecord (6.1.5.1) + activemodel (= 6.1.5.1) + activesupport (= 6.1.5.1) + activesupport (6.1.5.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -129,13 +129,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.579.0) + aws-partitions (1.581.0) aws-sdk-core (3.130.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.308.0) + aws-sdk-ec2 (1.309.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.68.0) @@ -144,7 +144,7 @@ GEM aws-sdk-kms (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.0) + aws-sdk-s3 (1.113.2) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -232,7 +232,7 @@ GEM logging (2.3.0) little-plugger (~> 1.1) multi_json (~> 1.14) - loofah (2.16.0) + loofah (2.17.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.5) @@ -322,9 +322,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (6.1.5) - actionpack (= 6.1.5) - activesupport (= 6.1.5) + railties (6.1.5.1) + actionpack (= 6.1.5.1) + activesupport (= 6.1.5.1) method_source rake (>= 12.2) thor (~> 1.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 435b641a0b663..7fc91f012db96 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.39"; + version = "6.1.40"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-Idhxk9wNnWZmrY33afgkIicnSO3wWnqjiXYUFbXbERE="; + sha256 = "sha256-3aQwzFaEANgc2inlZd2huu9W3vpv9bgIeRib4Q2zI3I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index e3c486c4b9f9c..383456bcf3789 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kk8c6n94lg5gyarsy33wakw04zbmdwgfr7zxv4zzmbnp1yach0w"; + sha256 = "1b2vxprwfkza3h6z3pq508hsjh1hz9f8d7739j469mqlxsq5jh1l"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w7pl8ir253g1dzlzx4mwrjsx3v7fl7zn941xz53zb4ld286mhi"; + sha256 = "0y54nw3x38lj0qh36hlzjw82px328k01fyrk21d6xlpn1w0j98gv"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16anyz7wqwmphzb6w1sgmvdvj50g3zp70s94s5v8hwxj680f6195"; + sha256 = "01bbxwbih29qcmqrrvqymlc6hjf0r38rpwdfgaimisp5vms3xxsn"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jl6jc9g9jxsljfnnmbkxrgwrz86icw6g745cv6iavryizrmw939"; + sha256 = "1yscjy5766g67ip3g7614b0hhrpgz5qk22nj8ghzcjqh3fj2k2n0"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmqndx3a46hpwz33ximqch27018n3mk9z19azgpylm33w7xpkx4"; + sha256 = "1ylj0nwk9y5hbgv93wk8kkbg9z9bv1052ic37n9ib34w0bkgrzw4"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; addressable = { groups = ["default"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ilhspsph7icrrz94f3qngjkj585hsyv9bnxr44iabcqqwymr79w"; + sha256 = "0qn84zn8g8aaqq9cmc2mkaakpgysl50mnhalzphxxvamg9pah5hq"; type = "gem"; }; - version = "1.579.0"; + version = "1.581.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bqrgdw8kiy1pg3v4by1siqqhmjffr2xi5s0l5wj6l7z87n9wi9g"; + sha256 = "05fw7sxwn5k9a944j0010kn6dl93fv10q1f8kmvdkb4i231xbxwl"; type = "gem"; }; - version = "1.308.0"; + version = "1.309.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -154,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax"; + sha256 = "17pc197a6axmnj6rbhgsvks2w0mv2mmr2bwh1k4mazbfp72ss87i"; type = "gem"; }; - version = "1.113.0"; + version = "1.113.2"; }; aws-sigv4 = { groups = ["default"]; @@ -654,10 +654,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; + sha256 = "0fpx5p8n0jq4bdazb2vn19sqkmh398rk9b2pa3gdi43snfn485cr"; type = "gem"; }; - version = "2.16.0"; + version = "2.17.0"; }; metasm = { groups = ["default"]; @@ -694,12 +694,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "e1016aceec3bfd4aff85d0bcdc89ee7c88cf5bd4"; - sha256 = "048ivfsia53ni6iplnphxm42f9r24kw6kxwdmmk6d78dvj9p3n11"; + rev = "82d111481b8f46bf50473770673305b0ec0eb5d2"; + sha256 = "0wi3nc6y36qqg44bixbgzbg5dvxsl7fnbr99v8fdh044av63196x"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.39"; + version = "6.1.40"; }; metasploit-model = { groups = ["default"]; @@ -1097,10 +1097,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fdqhv8qhk2dspkrr9f5dj3806g52cb0l1chh2hx8v81y218cl93"; + sha256 = "0lirp0g1n114gwkqbqki2fjqwnbyzhn30z97jhikqldd0r54f4b9"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; rake = { groups = ["default"]; diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix index 01e208958a502..2c242f256d3df 100644 --- a/pkgs/tools/security/munge/default.nix +++ b/pkgs/tools/security/munge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libgcrypt, zlib, bzip2 }: stdenv.mkDerivation rec { pname = "munge"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "15h805rwcb9f89dyrkxfclzs41n3ff8x7cc1dbvs8mb0ds682c4j"; }; - nativeBuildInputs = [ autoreconfHook gawk gnused ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libgcrypt zlib bzip2 ]; preAutoreconf = '' diff --git a/pkgs/tools/security/oath-toolkit/update.sh b/pkgs/tools/security/oath-toolkit/update.sh index 3502a541fa8ca..9f56ae412323d 100755 --- a/pkgs/tools/security/oath-toolkit/update.sh +++ b/pkgs/tools/security/oath-toolkit/update.sh @@ -5,7 +5,7 @@ set -euo pipefail nixfile='default.nix' release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/' -attr='oathToolkit' +attr='oath-toolkit' command='oathtool --version' color() { diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix index 8d9b350543dc6..15f075ccec402 100644 --- a/pkgs/tools/security/pass/extensions/otp.nix +++ b/pkgs/tools/security/pass/extensions/otp.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, oathToolkit }: +{ lib, stdenv, fetchFromGitHub, oath-toolkit }: stdenv.mkDerivation rec { pname = "pass-otp"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v"; }; - buildInputs = [ oathToolkit ]; + buildInputs = [ oath-toolkit ]; dontBuild = true; patchPhase = '' - sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash + sed -i -e 's|OATH=\$(which oathtool)|OATH=${oath-toolkit}/bin/oathtool|' otp.bash ''; installFlags = [ "PREFIX=$(out)" diff --git a/pkgs/tools/security/plasma-pass/default.nix b/pkgs/tools/security/plasma-pass/default.nix index 20f64b725f112..2ff2ab38cefb2 100644 --- a/pkgs/tools/security/plasma-pass/default.nix +++ b/pkgs/tools/security/plasma-pass/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules , ki18n , kitemmodels -, oathToolkit +, oath-toolkit , qgpgme , plasma-framework , qt5 }: @@ -21,7 +21,7 @@ mkDerivation rec { buildInputs = [ ki18n kitemmodels - oathToolkit + oath-toolkit qgpgme plasma-framework qt5.qtbase diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 589a56adc3299..09e7b2b416959 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -1,20 +1,29 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles -, Foundation, Security, libiconv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, installShellFiles +, Foundation +, Security +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "rage"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0OQnYc1IWYscvSw5YZH54Fh8cBasLlcVqrQcQ4MAsU8="; + sha256 = "sha256-ra68q5gwcbod5iajPIWEIGQceMK8ikSq/UKUfIEYaGE="; }; - cargoSha256 = "sha256-31s70pgEQDw3uifmhv1iWQuzKQVc2q+f76PPnGKIYdc="; + cargoSha256 = "sha256-o5HVMRWSIrCsbOEOeUvCvj+mkmjqRY3XaHx82IY73Cc="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; buildInputs = lib.optionals stdenv.isDarwin [ Foundation diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index d3099340ff1ba..6f2ac26ebdc2e 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "0.4.2"; + version = "0.4.3"; format = "pyproject"; src = fetchFromGitHub { owner = "SigmaHQ"; repo = pname; - rev = "v${version}"; - hash = "sha256-UA28A/C7RyIs96a/U98WpkgeCotT4qmpZwvO3HYUE9Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-3LFakeS3aQaacm7HqeAJPMJhi3Wf8zbJc//SEWUA1Rg="; }; nativeBuildInputs = with python3.pkgs; [ @@ -48,5 +48,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/SigmaHQ/sigma-cli"; license = with licenses; [ lgpl21Plus ]; maintainers = with maintainers; [ fab ]; + mainProgram = "sigma"; }; } diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index 0f8f37a4890c5..dc09e8476bf37 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Ki6MrLVJf2U4Q0y6jtOQZOti/m3SULWNKZ9SdirlOVA="; + sha256 = "sha256-ZH3OrJGh7TekODW5rh8JShNHKfuxPr5HhVD7wsvi8M0="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-ftBZQmtrnGFMZRXDKmMyqnfxuY5vtrZDXVR43yd1shk="; + vendorSha256 = "sha256-hJEL6kUc6aXKq7X23dRWhAni5oRDJ3CuNTx6JL049gA="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 14e0be73f01ea..90485ae817ed3 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.6.10"; + version = "0.4.7.7"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "lMzWDgTlWPM75zAyvITqJBZg+S9Yz7iHib2miTc54xw="; + sha256 = "sha256-PhMRWLUrlDXX5D0cR+8oi5bQBTQsxEuMlQu0A4UaW0Q="; }; outputs = [ "out" "geoip" ]; @@ -45,9 +45,13 @@ stdenv.mkDerivation rec { patches = [ ./disable-monotonic-timer-tests.patch ]; - # cross compiles correctly but needs the following - configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "--disable-tool-name-check"; + configureFlags = + # cross compiles correctly but needs the following + lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ] + ++ + # sandbox is broken on aarch64-linux https://gitlab.torproject.org/tpo/core/tor/-/issues/40599 + lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "--disable-seccomp" ] + ; NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s"; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 907f3f4e7c552..ba70e99d64694 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-In+rc5H8HNx5hGySYvCqx6hQ7tmTioHiNdJIMyMRNvU="; + sha256 = "sha256-ilyS2M/VRPNz8fW2JFrP09GvX0FlOznqnxJoFvfwUVo="; }; - vendorSha256 = "sha256-z0PsLrT4jtSof4Bd62juGLv58EV22TnPx6fosMvW97c="; + vendorSha256 = "sha256-ZdxpsfTRscgAjrRTq0tXhHe7pGirDgoZ6vlE71oJS9w="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index f29c3e493c5ea..048d06f200434 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.10.1"; + version = "1.10.2"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-8qrCGJNEWs3I/IRK1CiGfbbpQhwziFgoQyMcUX40wbw="; - aarch64-linux = "sha256-/rW39m2XnJp0MsBmXs4ktRnQriLdYHRJ9MIEtO9MxNk="; - i686-linux = "sha256-NHIxN3rdX+3yLjbh25c1IwB+Q/QRQCrIBF9XwxIwVpY="; - x86_64-darwin = "sha256-2OuJZftsP+fKInhBYlcRLZ1Rs+j/jl7Ve4M6Oz3Q7Ac="; - aarch64-darwin = "sha256-JSu8eS4jzRl8d8MOWnAgmvO68xGzxFRn8HW28gQbzmU="; + x86_64-linux = "sha256-8DF97kpBRqKvRqCi20QdVgE5T4QugM+Hh+2e1qdZAA8="; + aarch64-linux = "sha256-SZ1+q4um6aFMPoF6t5ycOrG5gQQRDNC7SGFJi/JReBI="; + i686-linux = "sha256-AatWqF2eDOslpK5J5fyGdrrjkag9GnCJcM0DnYCSZqg="; + x86_64-darwin = "sha256-pFQLm967yRiAWHm7PcZRknB4H6ZoEahf4rl8CCdh5AA="; + aarch64-darwin = "sha256-Br6fbJUkuIe7BVJU+bGGB9UOQyn2FV+Xy4ajfdfWCcM="; }; in fetchzip { diff --git a/pkgs/tools/security/wprecon/default.nix b/pkgs/tools/security/wprecon/default.nix index bd343a5f1b125..964b6b7ff5bfb 100644 --- a/pkgs/tools/security/wprecon/default.nix +++ b/pkgs/tools/security/wprecon/default.nix @@ -5,16 +5,21 @@ buildGoModule rec { pname = "wprecon"; - version = "1.6.3a"; + version = "2.4.5"; src = fetchFromGitHub { owner = "blackbinn"; repo = pname; rev = version; - sha256 = "0gqi4799ha3mf8r7ini0wj4ilkfsh80vnnxijfv9a343r6z5w0dn"; + hash = "sha256-23zJD3Nnkeko+J2FjPq5RA5dIjORMXvwt3wtAYiVlQs="; }; - vendorSha256 = "1sab58shspll96rqy1rp659s0yikqdcx59z9b88d6p4w8a98ns87"; + vendorSha256 = "sha256-FYdsLcW6FYxSgixZ5US9cBPABOAVwidC3ejUNbs1lbA="; + + postFixup = '' + # Rename binary + mv $out/bin/cli $out/bin/${pname} + ''; meta = with lib; { description = "WordPress vulnerability recognition tool"; @@ -23,6 +28,5 @@ buildGoModule rec { # https://github.com/blackbinn/wprecon/blob/master/LICENSE license = with licenses; [ unfree ]; maintainers = with maintainers; [ fab ]; - broken = true; # build fails, missing tag }; } diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 9295dd4009920..e12fab02f1e4d 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "yara"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "VirusTotal"; repo = pname; rev = "v${version}"; - hash = "sha256-ECvNob5QbOe5JfaDMGvSxCS+E9nqdsfSCZAVlAs18q4="; + hash = "sha256-/6EMnNVNSgeYHrbPF3QDS5oc0eLaggKNuZi2pXx/CqY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix index 9e8180b318a66..71ff489b566f3 100644 --- a/pkgs/tools/system/envconsul/default.nix +++ b/pkgs/tools/system/envconsul/default.nix @@ -1,19 +1,24 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "envconsul"; - version = "0.7.3"; - rev = "v${version}"; - - goPackagePath = "github.com/hashicorp/envconsul"; + version = "0.12.1"; src = fetchFromGitHub { - inherit rev; owner = "hashicorp"; repo = "envconsul"; - sha256 = "03cgxkyyynr067dg5b0lhvaxn60318fj9fh55p1n43vj5nrzgnbc"; + rev = "v${version}"; + sha256 = "sha256-oV+dGenyNYdVLFn43p+J9TgIbliYOppAKr1ePlMF0d4="; }; + vendorSha256 = "sha256-kal1HR9zRVhQKR/ql63hju7XIHU1KRNDTAlOEqzYR4o="; + + ldflags = [ + "-s" + "-w" + "-X github.com/hashicorp/envconsul/version.Name=envconsul" + ]; + meta = with lib; { homepage = "https://github.com/hashicorp/envconsul/"; description = "Read and set environmental variables for processes from Consul"; diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 09b7b31279940..0820869fb0d11 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }: +{ buildPackages, fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }: stdenv.mkDerivation rec { version = "1.6.9"; @@ -9,8 +9,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-8l4cNfPQ8bWpnMMezCNTyoPtRqFRY4QvuocBJ9ycggY="; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + buildInputs = [ libgcrypt readline libgpg-error ]; + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) + [ "ac_cv_file__dev_urandom=true" "ac_cv_file__dev_random=true" ]; + doCheck = true; meta = { diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 26d10d1278da2..47ebee52fe166 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -5,48 +5,46 @@ , systemdSupport ? stdenv.isLinux, systemd }: -with lib; - assert systemdSupport -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "htop"; - version = "3.1.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "sha256-RKYS8UYZTVKMR/3DG31eqkG4knPRl8WXsZU/XGmGmAg="; + sha256 = "sha256-p/lc7G/XFllulXrM47mPE6W5vVuoi4uXB8To36PIgZo="; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses ] - ++ optional stdenv.isDarwin IOKit - ++ optional sensorsSupport lm_sensors - ++ optional systemdSupport systemd + ++ lib.optional stdenv.isDarwin IOKit + ++ lib.optional sensorsSupport lm_sensors + ++ lib.optional systemdSupport systemd ; configureFlags = [ "--enable-unicode" "--sysconfdir=/etc" ] - ++ optional sensorsSupport "--with-sensors" + ++ lib.optional sensorsSupport "--with-sensors" ; postFixup = let - optionalPatch = pred: so: optionalString pred "patchelf --add-needed ${so} $out/bin/htop"; + optionalPatch = pred: so: lib.optionalString pred "patchelf --add-needed ${so} $out/bin/htop"; in '' ${optionalPatch sensorsSupport "${lm_sensors}/lib/libsensors.so"} ${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"} ''; - meta = { - description = "An interactive process viewer for Linux"; + meta = with lib; { + description = "An interactive process viewer"; homepage = "https://htop.dev"; license = licenses.gpl2Only; platforms = platforms.all; - maintainers = with maintainers; [ rob relrod ]; - changelog = "https://github.com/htop-dev/${pname}/blob/${version}/ChangeLog"; + maintainers = with maintainers; [ rob relrod SuperSandro2000 ]; + changelog = "https://github.com/htop-dev/htop/blob/${version}/ChangeLog"; }; } diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 1a2530d0a06c3..2cce74b0534dd 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-smi"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; rev = "rocm-${version}"; - hash = "sha256-SQ6eBQzZ8CBD9RlIjt25FrOuWUSybBzx6ZzCOzHbxdI="; + hash = "sha256-11o4xUyeQ3W/RPY62r8ahwcljKh/rkVSyTk5ruTU66U="; }; nativeBuildInputs = [ cmake wrapPython ]; diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/tools/system/runitor/default.nix new file mode 100644 index 0000000000000..5bb821afdaf1a --- /dev/null +++ b/pkgs/tools/system/runitor/default.nix @@ -0,0 +1,52 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, runitor }: + +buildGoModule rec { + pname = "runitor"; + version = "0.9.2"; + vendorSha256 = null; + + src = fetchFromGitHub { + owner = "bdd"; + repo = "runitor"; + rev = "v${version}"; + sha256 = "sha256-LuCxn4j0MlnJjSh3d18YNzNrtbqtMPxgkZttqKUGJd4"; + }; + + ldflags = [ + "-s" "-w" "-X main.Version=v${version}" + ]; + + # TODO(cole-h): + # End-to-end tests requiring localhost networking currently under + # OfBorg's Linux builders, while passing under Darwin. + # + # Ref: https://github.com/NixOS/nixpkgs/pull/170566#issuecomment-1114034891 + # + # Temporarily disable tests. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = runitor; + command = "runitor -version"; + version = "v${version}"; + }; + + # Unit tests require binding to local addresses for listening sockets. + __darwinAllowLocalNetworking = true; + + meta = with lib; { + homepage = "https://bdd.fi/x/runitor"; + description = "A command runner with healthchecks.io integration"; + longDescription = '' + Runitor runs the supplied command, captures its output, and based on its exit + code reports successful or failed execution to https://healthchecks.io or your + private instance. + + Healthchecks.io is a web service for monitoring periodic tasks. It's like a + dead man's switch for your cron jobs. You get alerted if they don't run on time + or terminate with a failure. + ''; + license = licenses.bsd0; + maintainers = with maintainers; [ bdd ]; + }; +} diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 0144a605e4087..5a1a4b0929cd4 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-rc"; - version = "0.5.3.0"; - sha256 = "09rznjlz988fk9pff6mxc3dknwh2mibbawr9g62gcscmscmiv8wk"; + version = "0.5.3.1"; + sha256 = "sha256-BYxu25KLvihOyUtc1xObrPNEcszF/5YDo65qGNU7PBI="; description = "A service manager for s6-based systems"; platforms = lib.platforms.unix; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index f1215f9934d7f..eb04e10a31a4d 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.11.0.1"; - sha256 = "02pr4q4cr9wc8i8ad8s6184a6fyndpmpnylgxwhfnkk3hx2j0zxd"; + version = "2.11.1.0"; + sha256 = "sha256-rmTcK6II/4DkrEeSzpDdUmtCvxnJZtx9jrmmhw5Lwjo="; description = "skarnet.org's small & secure supervision software suite"; diff --git a/pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch b/pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch new file mode 100644 index 0000000000000..7e6c78dd9dcb5 --- /dev/null +++ b/pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch @@ -0,0 +1,25 @@ +From 1990ac93c9dbf3ada0eb2f045ef1aa95bbef7018 Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" <d.ol.rod@tutanota.com> +Date: Thu, 21 Apr 2022 07:40:30 -0600 +Subject: [PATCH] Setting markdown_bin + +--- + bb.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bb.sh b/bb.sh +index 9d8e645..40fb54d 100755 +--- a/bb.sh ++++ b/bb.sh +@@ -160,7 +160,7 @@ global_variables() { + + # Markdown location. Trying to autodetect by default. + # The invocation must support the signature 'markdown_bin in.md > out.html' +- [[ -f Markdown.pl ]] && markdown_bin=./Markdown.pl || markdown_bin=$(which Markdown.pl 2>/dev/null || which markdown 2>/dev/null) ++ markdown_bin=@markdown_path@ + } + + # Check for the validity of some variables +-- +2.35.1 + diff --git a/pkgs/tools/text/bashblog/default.nix b/pkgs/tools/text/bashblog/default.nix new file mode 100644 index 0000000000000..2649b5640441d --- /dev/null +++ b/pkgs/tools/text/bashblog/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, lib +, fetchzip +, fetchFromGitHub +, makeWrapper +, substituteAll +, perlPackages +# Flags to enable processors +# Currently, Markdown.pl does not work +, usePandoc ? true +, pandoc }: + +let + inherit (perlPackages) TextMarkdown; + # As bashblog supports various markdown processors + # we can set flags to enable a certain processor + markdownpl_path = "${perlPackages.TextMarkdown}/bin/Markdown.pl"; + pandoc_path = "${pandoc}/bin/pandoc"; + +in stdenv.mkDerivation rec { + pname = "bashblog"; + version = "unstable-2022-03-26"; + + src = fetchFromGitHub { + owner = "cfenollosa"; + repo = "bashblog"; + rev = "c3d4cc1d905560ecfefce911c319469f7a7ff8a8"; + sha256 = "sha256-THlP/JuaZzDq9QctidwLRiUVFxRhGNhRKleWbQiqsgg="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ TextMarkdown ] + ++ lib.optionals usePandoc [ pandoc ]; + + patches = [ + (substituteAll { + src = ./0001-Setting-markdown_bin.patch; + markdown_path = if usePandoc then pandoc_path else markdownpl_path; + }) + ]; + + postPatch = '' + patchShebangs bb.sh + ''; + + installPhase = '' + mkdir -p $out/bin + install -Dm755 bb.sh $out/bin/bashblog + ''; + + meta = with lib; { + description = "A single Bash script to create blogs"; + homepage = "https://github.com/cfenollosa/bashblog"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/tools/text/cmigemo/default.nix index 92be45bbd9d7f..8bd60b516fd13 100644 --- a/pkgs/tools/text/cmigemo/default.nix +++ b/pkgs/tools/text/cmigemo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, buildPackages -, gzip, libiconv, nkf, perl, which +, libiconv, nkf, perl, which , skk-dicts }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "0xrblwhaf70m0knkd5584iahaq84rlk0926bhdsrzmakpw77hils"; }; - nativeBuildInputs = [ gzip libiconv nkf perl which ]; + nativeBuildInputs = [ libiconv nkf perl which ]; postUnpack = '' cp ${skk-dicts}/share/SKK-JISYO.L source/dict/ diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index cb57fb2bb07f1..100c2b439075d 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -5,6 +5,7 @@ , autoreconfHook , pkg-config , texinfo +, bash }: stdenv.mkDerivation rec { @@ -18,6 +19,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" "info" "perl" ]; + # Parallel build is failing for missing depends. Known upstream as: + # https://savannah.gnu.org/bugs/?62084 enableParallelBuilding = false; patches = [ @@ -31,7 +34,11 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString (psutils != null) '' + postPatch = '' + # BASH_PROG gets replaced with a path to the build bash which doesn't get automatically patched by patchShebangs + substituteInPlace contrib/gdiffmk/gdiffmk.sh \ + --replace "@BASH_PROG@" "/bin/sh" + '' + lib.optionalString (psutils != null) '' substituteInPlace src/preproc/html/pre-html.cpp \ --replace "psselect" "${psutils}/bin/psselect" '' + lib.optionalString (netpbm != null) '' @@ -45,7 +52,8 @@ stdenv.mkDerivation rec { --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage" ''; - buildInputs = [ ghostscript psutils netpbm perl ]; + strictDeps = true; + buildInputs = [ ghostscript psutils netpbm perl bash ]; nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; # Builds running without a chroot environment may detect the presence diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index c937e6c7ab16e..3e87b7cb79c11 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -1,29 +1,31 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, gucci }: -buildGoPackage rec { +buildGoModule rec { pname = "gucci"; - version = "0.1.0"; - - goPackagePath = "github.com/noqcks/gucci"; + version = "1.5.4"; src = fetchFromGitHub { owner = "noqcks"; repo = "gucci"; - rev = version; - sha256 = "0ksrmzb3iggc7gm51fl0jbb15d0gmpclslpkq2sl2xjzk29pkllq"; + rev = "refs/tags/${version}"; + sha256 = "sha256-HJPNpLRJPnziSMvxLCiNDeCWO439ELSZs/4Cq1a7Amo="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-rAZCj5xtwTgd9/KDYnQTU1jbabtWJF5MCFgcmixDN/Q="; + + ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" ]; + + passthru.tests.version = testers.testVersion { + package = gucci; + }; - ldflags = [ - "-X main.AppVersion=${version}" - ]; + checkFlags = [ "-short" ]; meta = with lib; { description = "A simple CLI templating tool written in golang"; homepage = "https://github.com/noqcks/gucci"; license = licenses.mit; - maintainers = [ maintainers.braydenjw ]; + maintainers = with maintainers; [ braydenjw ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/gucci/deps.nix b/pkgs/tools/text/gucci/deps.nix deleted file mode 100644 index 8e2cc5af3bf10..0000000000000 --- a/pkgs/tools/text/gucci/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "v0.3.6"; - sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } -] - diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 5b14a3d2162fa..dac2cfc0d9605 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.15.5"; + version = "2.16.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-D/HCdYqQCqpgJjEhqAkCf0Dy9lpJUMXeyEemhgGhUco="; + sha256 = "sha256-kqyktQxQX4/jBj6vBw1VXRzD5D3wfLwnfi+QKgEqN5A="; }; - vendorSha256 = "sha256-5pmocQTTgc6hsHyKFPC/RhKqn3eYjPeiXVNKWjPjWiU="; + vendorSha256 = "sha256-EFuzbSVIhsGUJ8a2YoQHOq7BQpOHV43r9VKynR8UZ7k="; postInstall = '' mkdir -p $data/share/vale @@ -24,7 +24,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { - homepage = "https://docs.errata.ai/vale/about"; + homepage = "https://vale.sh/"; description = "A syntax-aware linter for prose built with speed and extensibility in mind"; license = licenses.mit; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 4b4ec194a9773..ecab3c4a8fa62 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -9,25 +9,26 @@ , pkg-config , makeWrapper , biber +, icu }: rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; fetchSubmodules = true; - sha256 = "sha256-Xw/Rs30mH81b8qqdpmbXjSSYIG08wwRvykzhPpF94uk="; + sha256 = "mfIEfue64kG4NmIEdTPRAqt6y22XfcgH6GtvJxuH6TU="; }; - cargoSha256 = "sha256-JzYCxsaBuQ5I+FgHVRQPNM32bJlE4H9Fd+48/jXDcr0="; + cargoSha256 = "CH1FdZ7cPrE0V0yjauOjDKrRNioC3MjtcnZaOTkMptc="; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ fontconfig harfbuzz openssl ] + buildInputs = [ icu fontconfig harfbuzz openssl ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); # Tectonic runs biber when it detects it needs to run it, see: @@ -51,6 +52,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://tectonic-typesetting.github.io/"; changelog = "https://github.com/tectonic-typesetting/tectonic/blob/tectonic@${version}/CHANGELOG.md"; license = with licenses; [ mit ]; - maintainers = [ maintainers.lluchs maintainers.doronbehar ]; + maintainers = with maintainers; [ lluchs doronbehar ]; }; } diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/tools/virtualization/nixos-container/default.nix index 17065a2aa8b95..be17753b3436e 100644 --- a/pkgs/tools/virtualization/nixos-container/default.nix +++ b/pkgs/tools/virtualization/nixos-container/default.nix @@ -1,4 +1,11 @@ -{ substituteAll, perl, shadow, util-linux }: +{ substituteAll +, perl +, shadow +, util-linux +, configurationDirectory ? "/etc/nixos-containers" +, stateDirectory ? "/var/lib/nixos-containers" +, nixosTests +}: substituteAll { name = "nixos-container"; @@ -9,6 +16,19 @@ substituteAll { su = "${shadow.su}/bin/su"; utillinux = util-linux; + inherit configurationDirectory stateDirectory; + + passthru = { + tests = { + inherit (nixosTests) + containers-imperative + containers-ip + containers-tmpfs + containers-ephemeral + ; + }; + }; + postInstall = '' t=$out/share/bash-completion/completions mkdir -p $t diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index d99b4cfba4a3e..38f4c8d31699e 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -12,6 +12,9 @@ use Time::HiRes; my $nsenter = "@utillinux@/bin/nsenter"; my $su = "@su@"; +my $configurationDirectory = "@configurationDirectory@"; +my $stateDirectory = "@stateDirectory@"; + # Ensure a consistent umask. umask 0022; @@ -132,11 +135,17 @@ if (defined $flake && $flake =~ /^(.*)#([^#"]+)$/) { # Execute the selected action. -mkpath("/etc/containers", 0, 0755); -mkpath("/var/lib/containers", 0, 0700); +mkpath("$configurationDirectory", 0, 0755); +mkpath("$stateDirectory", 0, 0700); + if ($action eq "list") { - foreach my $confFile (glob "/etc/containers/*.conf") { + foreach my $confFile (glob "$configurationDirectory/*.conf") { + # Filter libpod configuration files + # From 22.05 and onwards this is not an issue any more as directories dont clash + if($confFile eq "/etc/containers/libpod.conf" || $confFile eq "/etc/containers/containers.conf" || $confFile eq "/etc/containers/registries.conf") { + next + } $confFile =~ /\/([^\/]+).conf$/ or next; print "$1\n"; } @@ -198,15 +207,15 @@ if ($action eq "create") { open(my $lock, '>>', $lockFN) or die "$0: opening $lockFN: $!"; flock($lock, LOCK_EX) or die "$0: could not lock $lockFN: $!"; - my $confFile = "/etc/containers/$containerName.conf"; - my $root = "/var/lib/containers/$containerName"; + my $confFile = "$configurationDirectory/$containerName.conf"; + my $root = "$stateDirectory/$containerName"; # Maybe generate a unique name. if ($ensureUniqueName) { my $base = $containerName; for (my $nr = 0; ; $nr++) { - $confFile = "/etc/containers/$containerName.conf"; - $root = "/var/lib/containers/$containerName"; + $confFile = "$configurationDirectory/$containerName.conf"; + $root = "$stateDirectory/$containerName"; last unless -e $confFile || -e $root; $containerName = "$base-$nr"; } @@ -220,7 +229,12 @@ if ($action eq "create") { # Get an unused IP address. my %usedIPs; - foreach my $confFile2 (glob "/etc/containers/*.conf") { + foreach my $confFile2 (glob "$configurationDirectory/*.conf") { + # Filter libpod configuration files + # From 22.05 and onwards this is not an issue any more as directories dont clash + if($confFile2 eq "/etc/containers/libpod.conf" || $confFile2 eq "/etc/containers/containers.conf" || $confFile2 eq "/etc/containers/registries.conf") { + next + } my $s = read_file($confFile2) or die; $usedIPs{$1} = 1 if $s =~ /^HOST_ADDRESS=([0-9\.]+)$/m; $usedIPs{$1} = 1 if $s =~ /^LOCAL_ADDRESS=([0-9\.]+)$/m; @@ -292,10 +306,10 @@ if ($action eq "create") { exit 0; } -my $root = "/var/lib/containers/$containerName"; +my $root = "$stateDirectory/$containerName"; my $profileDir = "/nix/var/nix/profiles/per-container/$containerName"; my $gcRootsDir = "/nix/var/nix/gcroots/per-container/$containerName"; -my $confFile = "/etc/containers/$containerName.conf"; +my $confFile = "$configurationDirectory/$containerName.conf"; if (!-e $confFile) { if ($action eq "destroy") { exit 0; diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/tools/wayland/swaysome/default.nix index 65c0f3af65cd7..2159322a5870d 100644 --- a/pkgs/tools/wayland/swaysome/default.nix +++ b/pkgs/tools/wayland/swaysome/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swaysome"; - version = "1.1.2"; + version = "1.1.4"; src = fetchFromGitLab { owner = "hyask"; repo = pname; rev = version; - sha256 = "sha256-eX2Pzn5It4yf94ZWH/7yAJjwpayVYvpvbrvk7qvbimg="; + sha256 = "sha256-hI6XPND05m67dxo9EwIDhFTyC2UrL4Ll1V/WcBoJymU="; }; - cargoSha256 = "sha256-WXjmXwqeWnQVyFs51t81kHHMMn9HQQjBRw1g1cU+6/M="; + cargoSha256 = "sha256-jG6HZiL2almALyEnQRmbeCTRG11URP3+Bxqyn8hLs7w="; meta = with lib; { description = "Helper to make sway behave more like awesomewm"; |