diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-06-22 00:58:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 00:58:31 +0200 |
| commit | eef9694ebcb768345657b80e9d31bfc8e4be5190 (patch) | |
| tree | 459d10fae562984e52085fd7ffbf5ec2f8322216 | |
| parent | 449df5db04c51df006dc0c7fd877f95e6dbf4b88 (diff) | |
| parent | 9332bcad1813a87d7cd51e94dd9fd4a4aa11093c (diff) | |
| download | nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.tar nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.tar.gz nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.tar.bz2 nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.tar.lz nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.tar.xz nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.tar.zst nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.zip | |
Merge branch 'master' into staging-next
217 files changed, 3443 insertions, 1240 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 3c4323e3d96..4792f1cb592 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -742,7 +742,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({ stk = { shortName = "stk"; fullName = "Synthesis Tool Kit 4.3"; - url = https://github.com/thestk/stk/blob/master/LICENSE; + url = "https://github.com/thestk/stk/blob/master/LICENSE"; }; tcltk = spdx { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8e18d02698e..7c1c5aa2bd7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2381,6 +2381,16 @@ githubId = 75067; name = "Daniel Duan"; }; + dearrude = { + name = "Ebrahim Nejati"; + email = "dearrude@tfwno.gf"; + github = "dearrude"; + githubId = 30749142; + keys = [{ + longkeyid = "rsa4096/19151E03BF2CF012"; + fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000"; + }]; + }; deepfire = { email = "_deepfire@feelingofgreen.ru"; github = "deepfire"; @@ -5653,6 +5663,16 @@ githubId = 72546287; name = "L3af"; }; + lach = { + email = "iam@lach.pw"; + github = "CertainLach"; + githubId = 6235312; + keys = [{ + longkeyid = "rsa3072/40B5D6948143175F"; + fingerprint = "323C 95B5 DBF7 2D74 8570 C0B7 40B5 D694 8143 175F"; + }]; + name = "Yaroslav Bolyukin"; + }; laikq = { email = "gwen@quasebarth.de"; github = "laikq"; @@ -6200,6 +6220,12 @@ githubId = 36235154; name = "Sean Haugh"; }; + maaslalani = { + email = "maaslalani0@gmail.com"; + github = "maaslalani"; + githubId = 42545625; + name = "Maas Lalani"; + }; madjar = { email = "georges.dubus@compiletoi.net"; github = "madjar"; @@ -7324,6 +7350,12 @@ githubId = 17120571; name = "Xinhao Luo"; }; + newam = { + email = "alexmgit@protonmail.com"; + github = "newAM"; + githubId = 7845120; + name = "Alex M."; + }; nikitavoloboev = { email = "nikita.voloboev@gmail.com"; github = "nikitavoloboev"; @@ -11004,6 +11036,16 @@ githubId = 3889405; name = "vyp"; }; + wakira = { + name = "Sheng Wang"; + email = "sheng@a64.work"; + github = "wakira"; + githubId = 2338339; + keys = [{ + longkeyid = "rsa4096/0x8C9B0A8FC0C0D862"; + fingerprint = "47F7 009E 3AE3 1DA7 988E 12E1 8C9B 0A8F C0C0 D862"; + }]; + }; wamserma = { name = "Markus S. Wamser"; email = "github-dev@mail2013.wamser.eu"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 3e6843f0e57..e14b5b3e9b3 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -203,4 +203,12 @@ with lib.maintainers; { ]; scope = "Group registration for Serokell employees who collectively maintain packages."; }; + + tts = { + members = [ + hexa + mic92 + ]; + scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages"; + }; } diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 0908fb13726..2c7935078e3 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -309,6 +309,12 @@ </listitem> </itemizedlist> </listitem> + <listitem> + <para> + The <literal>antlr</literal> package now defaults to the 4.x + release instead of the old 2.7.7 version. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-notable-changes"> diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 54abbb6e38e..4ecdd23d2de 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -113,11 +113,11 @@ <itemizedlist> <listitem> <para> - <link xlink:href="https://www.gnuradio.org/">GNURadio</link> 3.8 was + <link xlink:href="https://www.gnuradio.org/">GNURadio</link> 3.8 and 3.9 were <link xlink:href="https://github.com/NixOS/nixpkgs/issues/82263">finally</link> packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. - Additionally, the attribute <code>gnuradio</code> and <code>gnuradio3_7</code> + Additionally, the attribute <code>gnuradio</code> (3.9), <code>gnuradio3_8</code> and <code>gnuradio3_7</code> now point to an externally wrapped by default derivations, that allow you to also add `extraPythonPackages` to the Python interpreter used by GNURadio. Missing environmental variables needed for operational GUI were also added @@ -853,7 +853,7 @@ environment.systemPackages = [ <listitem> <para> <link xlink:href="https://kodi.tv/">Kodi</link> has been updated to version 19.1 "Matrix". See - the <link xlink:href="https://kodi.tv/article/kodi-190-matrix-release">announcement</link> for + the <link xlink:href="https://kodi.tv/article/kodi-19-0-matrix-release">announcement</link> for further details. </para> </listitem> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index a603f735829..e97aed4ccf2 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -85,4 +85,7 @@ In addition to numerous new and upgraded packages, this release has the followin - GitVersionTree - NDeskOptions +* The `antlr` package now defaults to the 4.x release instead of the + old 2.7.7 version. + ## Other Notable Changes {#sec-release-21.11-notable-changes} diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 064e44f643b..f0a58628c68 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -41,7 +41,7 @@ rec { # The human version (e.g. 21.05-pre) is left as is, because it is useful # for external modules that test with e.g. nixosTest and rely on that # version number. - config.system.nixos.revision = "constant-nixos-revision"; + config.system.nixos.revision = mkForce "constant-nixos-revision"; } { key = "nodes"; _module.args.nodes = nodes; } ] ++ optional minimal ../modules/testing/minimal-kernel.nix; diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix index e7dd9e3393d..7eb6449e384 100644 --- a/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/nixos/modules/services/monitoring/zabbix-agent.nix @@ -157,7 +157,10 @@ in wantedBy = [ "multi-user.target" ]; - path = [ "/run/wrappers" ] ++ cfg.extraPackages; + # https://www.zabbix.com/documentation/current/manual/config/items/userparameters + # > User parameters are commands executed by Zabbix agent. + # > /bin/sh is used as a command line interpreter under UNIX operating systems. + path = with pkgs; [ bash "/run/wrappers" ] ++ cfg.extraPackages; serviceConfig = { ExecStart = "@${cfg.package}/sbin/zabbix_agentd zabbix_agentd -f --config ${configFile}"; diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index 0c24972823d..07702bfb9d0 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -257,7 +257,6 @@ in partOf = optional config.networking.firewall.enable "firewall.service"; restartTriggers = [ fail2banConf jailConf pathsConf ]; - reloadIfChanged = true; path = [ cfg.package cfg.packageFirewall pkgs.iproute2 ] ++ cfg.extraPackages; diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index ba5eb7cd528..d25090403e5 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -18,13 +18,29 @@ let maintainers = [ adisbladis ]; }; - machine = { pkgs, lib, ... }: { + machine = { pkgs, lib, ... }: + let + usersharePath = "/var/lib/samba/usershares"; + in { virtualisation.emptyDiskImages = [ 4096 ]; networking.hostId = "deadbeef"; boot.kernelPackages = kernelPackage; boot.supportedFilesystems = [ "zfs" ]; boot.zfs.enableUnstable = enableUnstable; + services.samba = { + enable = true; + extraConfig = '' + registry shares = yes + usershare path = ${usersharePath} + usershare allow guests = yes + usershare max shares = 100 + usershare owner only = no + ''; + }; + systemd.services.samba-smbd.serviceConfig.ExecStartPre = + "${pkgs.coreutils}/bin/mkdir -m +t -p ${usersharePath}"; + environment.systemPackages = [ pkgs.parted ]; # Setup regular fileSystems machinery to ensure forceImportAll can be @@ -58,8 +74,15 @@ let "udevadm settle", "zpool create rpool /dev/vdb1", "zfs create -o mountpoint=legacy rpool/root", + # shared datasets cannot have legacy mountpoint + "zfs create rpool/shared_smb", "mount -t zfs rpool/root /tmp/mnt", "udevadm settle", + # wait for samba services + "systemctl is-system-running --wait", + "zfs set sharesmb=on rpool/shared_smb", + "zfs share rpool/shared_smb", + "smbclient -gNL localhost | grep rpool_shared_smb", "umount /tmp/mnt", "zpool destroy rpool", "udevadm settle", diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index 6f63bf542f4..05e17bf7c98 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -1,42 +1,35 @@ -{ lib, buildGoModule, fetchFromGitHub, rnnoise-plugin }: +{ lib, buildGoModule, fetchFromGitHub, copyDesktopItems }: buildGoModule rec { pname = "NoiseTorch"; - version = "0.10.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "lawl"; repo = "NoiseTorch"; rev = version; - sha256 = "1a4g112h83m55pga8kq2a1wzxpycj59v4bygyjfyi1s09q1y97qg"; + sha256 = "0rjs6hbi7dvd179lzjmvqy4rv4pbc9amgzb8jfky4yc0zh8xf5z5"; }; - patches = [ - # Get version from environment instead of git tags - ./version.patch - ]; - vendorSha256 = null; doCheck = false; - subPackages = [ "." ]; + ldflags = [ "-X main.version=${version}" "-X main.distribution=nix" ]; - buildInputs = [ rnnoise-plugin ]; + subPackages = [ "." ]; - postPatch = "substituteInPlace main.go --replace 'librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so' '$RNNOISE_LADSPA_PLUGIN'"; + nativeBuildInputs = [ copyDesktopItems ]; preBuild = '' - export RNNOISE_LADSPA_PLUGIN="${rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; - go generate; + make -C c/ladspa/ + go generate rm ./scripts/* ''; postInstall = '' - mkdir -p $out/share/icons/hicolor/256x256/apps/ - cp assets/icon/noisetorch.png $out/share/icons/hicolor/256x256/apps/ - mkdir -p $out/share/applications/ - cp assets/noisetorch.desktop $out/share/applications/ + install -D ./assets/icon/noisetorch.png $out/share/icons/hicolor/256x256/apps/noisetorch.png + copyDesktopItems assets/noisetorch.desktop $out/share/applications/ ''; meta = with lib; { @@ -44,6 +37,6 @@ buildGoModule rec { homepage = "https://github.com/lawl/NoiseTorch"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ panaeon ]; + maintainers = with maintainers; [ panaeon legendofmiracles ]; }; } diff --git a/pkgs/applications/audio/noisetorch/version.patch b/pkgs/applications/audio/noisetorch/version.patch deleted file mode 100644 index 20c51863744..00000000000 --- a/pkgs/applications/audio/noisetorch/version.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/scripts/embedversion.go b/scripts/embedversion.go -index ce0a756..60e7a5e 100644 ---- a/scripts/embedversion.go -+++ b/scripts/embedversion.go -@@ -1,24 +1,18 @@ - package main - - import ( -- "os" -- "os/exec" -- "strings" -+ "os" -+ "strings" - ) - - func main() { -- cmd := exec.Command("git", "describe", "--tags") -- ret, err := cmd.Output() - -- if err != nil { -- panic("Couldn't read git tags to embed version number") -- } -- version := strings.TrimSpace(string(ret)) -+ version := strings.TrimSpace(string(os.Getenv("version"))) - -- out, _ := os.Create("version.go") -- defer out.Close() -+ out, _ := os.Create("version.go") -+ defer out.Close() - -- out.Write([]byte("package main\n\n//THIS FILE IS AUTOMATICALLY GENERATED BY `go generate` DO NOT EDIT!\n\nvar version=\"")) -- out.Write([]byte(version)) -- out.Write([]byte("\"\n")) -+ out.Write([]byte("package main\n\n//THIS FILE IS AUTOMATICALLY GENERATED BY `go generate` DO NOT EDIT!\n\nvar version=\"")) -+ out.Write([]byte(version)) -+ out.Write([]byte("\"\n")) - } diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 22b2a355b5e..9092ae0b91f 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.29"; + version = "1.31"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-xnw4UL30nUv/Ru6x/7d05gC0X9nREMdXO9QWBjVoIvo="; + sha256 = "sha256-hIm9HWKBTFmxU9jI41PfScZIHpZOZpjvV2jgaMX/KSg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 4cb21e5267d..347a0de0503 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-bzhabRVgl1eLTS4KtFkn4xw2KDTZJyFU6zCJdHW5IGE="; + sha256 = "sha256-AH9CvoWAaNLPLC+NL+VXtYq9CNCMt0AFtC1ZGXSlcHQ="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 105686777db..a80d7dd91ff 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-BxBrgcAJm6KM6ha494xlwiLYOSAr71gDFgqlH5RPqMM="; + sha256 = "sha256-fe6iCSp4TxKKsVVBrvbSMROXqigTfxFCOLN1gAqRTv0="; }; - cargoSha256 = "131fkdazcspblzblmd9nhkymwn7qh6lhaqvi1jqnsq4951l9f4ms"; + cargoSha256 = "18pg09v14991aqq7cjg0w5x36526y6sx1hvxlqb20zvrgmv722cq"; nativeBuildInputs = [ clang ]; diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix new file mode 100644 index 00000000000..9db38d14448 --- /dev/null +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, callPackage +, runCommand +, makeWrapper +, octave +, imagemagick +, python3 +}: + +# To test: +# $(nix-build -E 'with import <nixpkgs> {}; jupyter.override { definitions = { octave = octave-kernel.definition; }; }')/bin/jupyter-notebook + +let + kernel = callPackage ./kernel.nix { + python3Packages = python3.pkgs; + }; + +in + +rec { + launcher = runCommand "octave-kernel-launcher" { + inherit octave; + python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]); + buildInputs = [ makeWrapper ]; + } '' + mkdir -p $out/bin + + makeWrapper $python/bin/python $out/bin/octave-kernel \ + --add-flags "-m octave_kernel" \ + --suffix PATH : $octave/bin + ''; + + sizedLogo = size: stdenv.mkDerivation { + name = ''octave-logo-${octave.version}-${size}x${size}.png''; + + src = octave.src; + + buildInputs = [ imagemagick ]; + + dontConfigure = true; + dontInstall = true; + + buildPhase = '' + convert ./libgui/src/icons/logo.png -resize ${size}x${size} $out + ''; + }; + + definition = { + displayName = "Octave"; + argv = [ + "${launcher}/bin/octave-kernel" + "-f" + "{connection_file}" + ]; + language = "octave"; + logo32 = sizedLogo "32"; + logo64 = sizedLogo "64"; + }; +} diff --git a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix new file mode 100644 index 00000000000..9ebb4257784 --- /dev/null +++ b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix @@ -0,0 +1,30 @@ +{ lib, octave, python3Packages }: + +with python3Packages; + +buildPythonPackage rec { + pname = "octave-kernel"; + version = "0.32.0"; + + src = fetchPypi { + pname = "octave_kernel"; + inherit version; + sha256 = "0dfbxfcf3bz4jswnpkibnjwlkgy0y4j563nrhaqxv3nfa65bksif"; + }; + + propagatedBuildInputs = [ metakernel ipykernel ]; + + # Tests require jupyter_kernel_test to run, but it hasn't seen a + # release since 2017 and seems slightly abandoned. + # Doing fetchPypi on it doesn't work, even though it exists here: + # https://pypi.org/project/jupyter_kernel_test/. + doCheck = false; + + meta = with lib; { + description = "A Jupyter kernel for Octave."; + homepage = "https://github.com/Calysto/octave_kernel"; + license = licenses.bsd3; + maintainers = with maintainers; [ thomasjm ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 4fbbacf8f1e..fe32da4a42f 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pf9nA5DUAJ+PPNG+oP7RO4/TD8fy4ADsyq625a6cbFk="; + sha256 = "sha256-XVIkyf9cQZXjFuGGCliCSY22X8EkoPEl1EpGCrMTsgY="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/graphics/veusz/default.nix b/pkgs/applications/graphics/veusz/default.nix new file mode 100644 index 00000000000..5c5b1c91709 --- /dev/null +++ b/pkgs/applications/graphics/veusz/default.nix @@ -0,0 +1,71 @@ +{ python3Packages +, qtbase +, ghostscript +, wrapQtAppsHook +, lib +}: + +python3Packages.buildPythonApplication rec { + pname = "veusz"; + version = "3.3.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "4ClgYwiU21wHDve2q9cItSAVb9hbR2F+fJc8znGI8OA="; + }; + + nativeBuildInputs = [ wrapQtAppsHook python3Packages.sip ]; + + buildInputs = [ qtbase ]; + + # veusz is a script and not an ELF-executable, so wrapQtAppsHook will not wrap + # it automatically -> we have to do it explicitly + dontWrapQtApps = true; + preFixup = '' + wrapQtApp "$out/bin/veusz" + ''; + + # For some reason, if sip5 is found on the PATH, the option --sip-dir is + # ignored in setupPyBuildFlags, see + # https://github.com/veusz/veusz/blob/53b99dffa999f2bc41fdc5335d7797ae857c761f/pyqtdistutils.py#L292 + postPatch = '' + substituteInPlace pyqtdistutils.py \ + --replace "'-I', pyqt5_include_dir," "'-I', '${python3Packages.pyqt5}/share/sip/PyQt5'," + patchShebangs tests/runselftest.py + ''; + + # you can find these options at + # https://github.com/veusz/veusz/blob/53b99dffa999f2bc41fdc5335d7797ae857c761f/pyqtdistutils.py#L71 + setupPyBuildFlags = [ + # --sip-dir does nothing here, but it should be the correct way to set the + # sip_dir, so I'm leaving it here for future versions + "--sip-dir=${python3Packages.pyqt5}/share/sip" + "--qt-include-dir=${qtbase.dev}/include" + # veusz tries to find a libinfix and fails without one + # but we simply don't need a libinfix, so set it to empty here + "--qt-libinfix=" + ]; + + propagatedBuildInputs = with python3Packages; [ + numpy + pyqt5 + # optional requirements: + dbus-python + h5py + # astropy -- fails to build on master + # optional TODO: add iminuit, pyemf and sampy + ]; + + installCheckPhase = '' + wrapQtApp "tests/runselftest.py" + QT_QPA_PLATFORM=minimal tests/runselftest.py + ''; + + meta = with lib; { + description = "A scientific plotting and graphing program with a GUI"; + homepage = "https://veusz.github.io/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ laikq ]; + }; +} diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 0ce89afa6ce..585f6217861 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,24 +1,52 @@ -{ lib, fetchFromGitHub, python2Packages, gettext }: +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, python3 +, wrapGAppsHook +, gtkmm3 +, gtksourceview +, gtksourceviewmm +, gspell +, libxmlxx +, sqlite +, curl +, libuchardet +, fmt +, spdlog +}: -python2Packages.buildPythonApplication rec { +stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.39.4"; + version = "0.99.37"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "1wycgn1f3b858qb6kn2bsaabak8n52qkpd24w54xz6fjizlnw7x0"; - + sha256 = "1a2scwjrjijxwyfpqih23zzay3yqhyzpxnp66388fcir1cmp8zih"; }; - nativeBuildInputs = [ gettext ]; - - propagatedBuildInputs = with python2Packages; [ pygtk dbus-python pygtksourceview ]; - - patches = [ ./subprocess.patch ]; + nativeBuildInputs = [ + cmake + pkg-config + python3 + wrapGAppsHook + ]; - doCheck = false; + buildInputs = [ + gtkmm3 + gtksourceview + gtksourceviewmm + gspell + libxmlxx + sqlite + curl + libuchardet + fmt + spdlog + ]; meta = with lib; { description = "An hierarchical note taking application"; @@ -31,8 +59,9 @@ python2Packages.buildPythonApplication rec { you have scattered around your hard drive can be conveniently placed into a Cherrytree document where you can easily find it. ''; - homepage = "http://www.giuspen.com/cherrytree"; - license = licenses.gpl3; + homepage = "https://www.giuspen.com/cherrytree"; + changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${version}/changelog.txt"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/cherrytree/subprocess.patch b/pkgs/applications/misc/cherrytree/subprocess.patch deleted file mode 100644 index 1f80cde03b7..00000000000 --- a/pkgs/applications/misc/cherrytree/subprocess.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur cherrytree-0.37.1-orig/setup.py cherrytree-0.37.1/setup.py ---- cherrytree-0.37.1-orig/setup.py 2016-01-08 20:50:50.000000000 +0100 -+++ cherrytree-0.37.1/setup.py 2016-07-05 20:30:27.768178682 +0200 -@@ -205,4 +205,9 @@ - }, - distclass=CherryTreeDist - ) -- subprocess.call("update-desktop-database") -+ try: -+ subprocess.check_call(['update-desktop-database']) -+ except subprocess.CalledProcessError: -+ pass # handle errors in the called executable -+ except OSError: -+ pass # executable not found diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix new file mode 100644 index 00000000000..a9ccc6a8f87 --- /dev/null +++ b/pkgs/applications/misc/cobalt/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "cobalt"; + version = "0.16.5"; + + src = fetchFromGitHub { + owner = "cobalt-org"; + repo = "cobalt.rs"; + rev = "v${version}"; + sha256 = "wSvjPifnA8oc0vVmHBMdsMKzX7Gg6TdbPzIXl/SHqn8="; + }; + + cargoSha256 = "27LcoGBI4elt80uQkTwvToOyEmd2+/3ma5Y32OFrJaw="; + + meta = with lib; { + description = "Static site generator written in Rust"; + homepage = "https://github.com/cobalt-org/cobalt.rs/"; + license = licenses.mit; + maintainers = with maintainers; [ ethancedwards8 ]; + }; +} diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 8de49c5f950..b48640c1d2a 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.1.0"; # When updating also update fetchedMavenDeps.sha256 + version = "21.1.1"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-MHfW6gZFB2osE+8Ek7I40fg2cdowph3hvKqkjG7+rY4="; + sha256 = "sha256-enUwX+BxgPy4c1Vwo1+vN3lFYz4LgofgKvZOYuz/050="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-FdWQ+2U5bIXSASm3SaLjyQlaRc1AkYPpFJSP4PnCWJw="; + outputHash = "sha256-vNC+LmGEepZCepPodY3c783moReppqNw32d7AUuvBZc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 1b19d9ab9cc..41f3475a645 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchurl, curl, zlib, glib, xorg, dbus, fontconfig, libGL, - freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: +{ lib +, stdenv +, fetchurl +, curl +, zlib +, glib +, xorg +, dbus +, fontconfig +, libGL +, freetype +, xkeyboard_config +, makeDesktopItem +, makeWrapper +}: let curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; @@ -30,7 +43,7 @@ stdenv.mkDerivation rec { categories = "Development;IDE;"; }; - nativeBuildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc @@ -51,6 +64,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + BASEDIR=$out/lib/robo3t mkdir -p $BASEDIR/bin @@ -72,13 +87,15 @@ stdenv.mkDerivation rec { makeWrapper $BASEDIR/bin/robo3t $out/bin/robo3t \ --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb + + runHook postInstall ''; - meta = { + meta = with lib; { homepage = "https://robomongo.org/"; - description = "Query GUI for mongodb"; + description = "Query GUI for mongodb. Formerly called Robomongo"; platforms = [ "x86_64-linux" ]; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.eperuffo ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ eperuffo ]; }; } diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix deleted file mode 100644 index af5285909c6..00000000000 --- a/pkgs/applications/misc/robomongo/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, - freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "robomongo"; - version = "0.9.0"; - - src = fetchurl { - url = "https://download.robomongo.org/${version}/linux/robomongo-${version}-linux-x86_64-0786489.tar.gz"; - sha256 = "1q8ahdz3afcw002p8dl2pybzkq4srk6bnikrz216yx1gswivdcad"; - }; - - icon = fetchurl { - url = "https://github.com/Studio3T/robomongo/raw/${version}/trash/install/linux/robomongo.png"; - sha256 = "15li8536x600kkfkb3h6mw7y0f2ljkv951pc45dpiw036vldibv2"; - }; - - desktopItem = makeDesktopItem { - name = "robomongo"; - exec = "robomongo"; - icon = icon; - comment = "Query GUI for mongodb"; - desktopName = "Robomongo"; - genericName = "MongoDB management tool"; - categories = "Development;IDE;mongodb;"; - }; - - nativeBuildInputs = [makeWrapper]; - - ldLibraryPath = lib.makeLibraryPath [ - stdenv.cc.cc - zlib - glib - xorg.libXi - xorg.libxcb - xorg.libXrender - xorg.libX11 - xorg.libSM - xorg.libICE - xorg.libXext - dbus - fontconfig - freetype - ]; - - installPhase = '' - BASEDIR=$out/lib/robomongo - - mkdir -p $BASEDIR/bin - cp bin/* $BASEDIR/bin - - mkdir -p $BASEDIR/lib - cp -r lib/* $BASEDIR/lib - - mkdir -p $out/share/applications - cp $desktopItem/share/applications/* $out/share/applications - - mkdir -p $out/share/icons - cp ${icon} $out/share/icons/robomongo.png - - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robomongo - - mkdir $out/bin - - makeWrapper $BASEDIR/bin/robomongo $out/bin/robomongo \ - --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ - --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb - ''; - - meta = { - homepage = "https://robomongo.org/"; - description = "Query GUI for mongodb"; - platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.eperuffo ]; - }; -} diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix new file mode 100644 index 00000000000..ce5987d6c18 --- /dev/null +++ b/pkgs/applications/misc/slides/default.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub, bash, go, python3, ruby }: + +buildGoModule rec { + pname = "slides"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "maaslalani"; + repo = "slides"; + rev = "v${version}"; + sha256 = "0vwpisyvsgmvrzp26hapghgqmm3fhrzrvdnmws00xc2q3fsij9qx"; + }; + + checkInputs = [ + bash + go + python3 + ruby + ]; + + vendorSha256 = "0y6fz9rw702mji571k0gp4kpfx7xbv7rvlnmpfjygy6lmp7wga6f"; + + ldflags = [ + "-s" "-w" + "-X=main.Version=${version}" + ]; + + meta = with lib; { + description = "Terminal based presentation tool"; + homepage = "https://github.com/maaslalani/slides"; + license = licenses.mit; + maintainers = with maintainers; [ maaslalani ]; + }; +} diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index bb1573f74c5..b6059ac1a71 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -4,13 +4,13 @@ # logitech-udev-rules instead of adding this to services.udev.packages on NixOS python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = version; - sha256 = "sha256-k87DqIkvy5CVEsHT82ZArSM2JBi5sYdSCPfP4KjI850="; + sha256 = "sha256-Ys0005hIQ+fT4oMeU5iFtbLNqn1WM6iLdIKGwdyn7BM="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index fd37a692d84..a3e2dc11c6f 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.0.3"; + version = "4.2.0"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YVpspFBwao/7M2nTVMw+ANc0roL0vBO4DpNUb7Thp3Q="; + sha256 = "sha256-FavbBGmChWQ3xySPHlw5HisZwVaNe/NaxA6+InN8fL8="; }; - vendorSha256 = "sha256-nidOIjrTL4llV5GORebXOOPGeL6TxkurDY82cIc7+mU="; + vendorSha256 = "sha256-XBfTVd3X3IDxLCAaNnijf6E5bw+AZ94UdOG9w7BOdBU="; preBuild = '' buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}") diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 5e5fda23d44..33d0da5c93a 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -1,29 +1,39 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, makeself, yasm, fuse, wxGTK, lvm2 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, makeself +, yasm +, fuse +, wxGTK +, lvm2 +, substituteAll +, e2fsprogs +, exfat +, ntfs3g +, btrfs-progs +}: with lib; stdenv.mkDerivation rec { pname = "veracrypt"; - version = "1.24-Hotfix1"; + version = "1.24-Update7"; src = fetchurl { url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "8b40ece805b216843d7a71b1a30069c4057931341b030bf65caace59263c5c8c"; + sha256 = "0i7h44zn2mjzgh416l7kfs0dk6qc7b1bxsaxqqqcvgrpl453n7bc"; }; - patches = [ - # https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86 - (fetchpatch { - url = "https://github.com/veracrypt/VeraCrypt/commit/afe6b2f45b15393026a1159e5f3d165ac7d0b94a.patch"; - sha256 = "1xm9cl6zinlr0vah5xr9bvh0y9gw4331zl7d2n5xvqrcdxw3ww1y"; - stripLen = 1; - }) - # https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86 - (fetchpatch { - url = "https://github.com/veracrypt/VeraCrypt/commit/3fa636d477119fff6e372074568edb42d038f508.patch"; - sha256 = "0qsccilip0ksnlzxina38a052gb533r4s422lxhrj3wv9zgpp7l3"; - stripLen = 1; + (substituteAll { + src = ./fix-paths.patch; + ext2 = "${e2fsprogs}/bin/mkfs.ext2"; + ext3 = "${e2fsprogs}/bin/mkfs.ext3"; + ext4 = "${e2fsprogs}/bin/mkfs.ext4"; + exfat = "${exfat}/bin/mkfs.exfat"; + ntfs = "${ntfs3g}/bin/mkfs.ntfs"; + btrfs = "${btrfs-progs}/bin/mkfs.btrfs"; }) ]; diff --git a/pkgs/applications/misc/veracrypt/fix-paths.patch b/pkgs/applications/misc/veracrypt/fix-paths.patch new file mode 100644 index 00000000000..56b4fc48380 --- /dev/null +++ b/pkgs/applications/misc/veracrypt/fix-paths.patch @@ -0,0 +1,22 @@ +diff --color --unified --recursive --text a/Core/VolumeCreator.h b/Core/VolumeCreator.h +--- a/Core/VolumeCreator.h 2021-06-20 20:54:50.725210056 +0300 ++++ b/Core/VolumeCreator.h 2021-06-20 20:58:46.117742419 +0300 +@@ -77,12 +77,12 @@ + switch (fsType) + { + #if defined (TC_LINUX) +- case VolumeCreationOptions::FilesystemType::Ext2: return "mkfs.ext2"; +- case VolumeCreationOptions::FilesystemType::Ext3: return "mkfs.ext3"; +- case VolumeCreationOptions::FilesystemType::Ext4: return "mkfs.ext4"; +- case VolumeCreationOptions::FilesystemType::NTFS: return "mkfs.ntfs"; +- case VolumeCreationOptions::FilesystemType::exFAT: return "mkfs.exfat"; +- case VolumeCreationOptions::FilesystemType::Btrfs: return "mkfs.btrfs"; ++ case VolumeCreationOptions::FilesystemType::Ext2: return "@ext2@"; ++ case VolumeCreationOptions::FilesystemType::Ext3: return "@ext3@"; ++ case VolumeCreationOptions::FilesystemType::Ext4: return "@ext4@"; ++ case VolumeCreationOptions::FilesystemType::NTFS: return "@ntfs@"; ++ case VolumeCreationOptions::FilesystemType::exFAT: return "@exfat@"; ++ case VolumeCreationOptions::FilesystemType::Btrfs: return "@btrfs@"; + #elif defined (TC_MACOSX) + case VolumeCreationOptions::FilesystemType::MacOsExt: return "newfs_hfs"; + case VolumeCreationOptions::FilesystemType::exFAT: return "newfs_exfat"; diff --git a/pkgs/applications/misc/vul/default.nix b/pkgs/applications/misc/vul/default.nix new file mode 100644 index 00000000000..9acefa93942 --- /dev/null +++ b/pkgs/applications/misc/vul/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "vul"; + version = "unstable-2020-02-15"; + + src = fetchFromGitHub { + owner = "LukeSmithxyz"; + repo = pname; + rev = "f6ebd8f6b6fb8a111e7b59470d6748fcbe71c559"; + sha256 = "aUl4f82sGOWkEvTDNILDszj5hztDRvYpHVovFl4oOCc="; + }; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "Latin Vulgate Bible on the Command Line"; + homepage = "https://github.com/LukeSmithxyz/vul"; + license = licenses.publicDomain; + maintainers = [ maintainers.j0hax ]; + }; +} diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 51319838eda..5d3f2ee4df7 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.14.1"; + version = "0.14.2"; src = fetchCrate { inherit pname version; - sha256 = "08gb4dnnzdy3whn2411xmar1wpvmc014scbniicksra8p1xizh0b"; + sha256 = "1bgylz2x44rjxpd6dvd44pr57f18di0nj5sbqh4my8lkanr7isli"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "1yxbirqf6c4bc364gw0nnjrjvhvjy2j2pbmvlpakv0bmyfphhb95"; + cargoSha256 = "07rlmz4rkgdcvr0dvbrz56s5vacxcvy09rgz70kr692xlpym4jvq"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 34146274407..8b3cee86fdf 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.25.72"; + version = "1.25.73"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "7bvcLKc/ZyVSTGOsRIO9qgHc8dSYOJaoEHJw7V2Vl/M="; + sha256 = "mSK3hT0Rp03Bq0k+NCYo6S5w+eA9SXXxO3Lo7QWrc9U="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 377dd17afaa..e904409a178 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "91.0.4472.101", - "sha256": "1d3y621iclkq6nvxrapk5aihv50x13hjha0c2gcp2xxfma96253q", - "sha256bin64": "12j5q5b9v0jpiznjnh89831w8lv399vd1z4ljhbsnsidbsygrbr1", + "version": "91.0.4472.114", + "sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1", + "sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys", "deps": { "gn": { "version": "2021-04-06", @@ -55,8 +55,8 @@ "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x" }, "ungoogled-patches": { - "rev": "91.0.4472.101-1", - "sha256": "1ca8gjxz3w730446qns253ibs9lx22iysxq5sphb3pw2w0069q8r" + "rev": "91.0.4472.114-1", + "sha256": "1xb5g3hybaiwn3y1zw1fxd3g0zwmvplrs06sdqnxzsr1qm8b874h" } } } diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 5a2b45725df..0eeb5231159 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { - owner = "jelmerro"; + owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-0C2gD40nPgEZopGMPsd5ajwcwFRjcu4Xc2DTpEwSK4c="; + sha256 = "sha256-wLaOqjDxgjfv4+TJeLE0dkrhfdnNSjiDqtFcHTm8uG4="; }; packageJSON = ./package.json; @@ -50,6 +50,7 @@ mkYarnPackage rec { meta = with lib; { homepage = "https://vieb.dev/"; + changelog = "https://github.com/Jelmerro/Vieb/releases/tag/${version}"; description = "Vim Inspired Electron Browser"; maintainers = with maintainers; [ gebner fortuneteller2k ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index 94effdaa2e5..e12d86356c2 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -1,9 +1,8 @@ { "name": "vieb", "productName": "Vieb", - "version": "5.1.0", + "version": "5.2.0", "description": "Vim Inspired Electron Browser", - "bin": "app.js", "main": "app/index.js", "scripts": { "build": "node build.js", @@ -30,9 +29,9 @@ "license": "GPL-3.0-or-later", "devDependencies": { "archiver": "5.3.0", - "electron": "13.1.1", - "electron-builder": "22.11.5", - "eslint": "7.28.0", + "electron": "13.1.2", + "electron-builder": "22.11.7", + "eslint": "7.29.0", "eslint-plugin-compat": "3.9.0", "eslint-plugin-sort-keys-fix": "1.1.1", "jest-environment-jsdom": "27.0.3", diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index ff4a7248f61..af42526610d 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -14,32 +14,32 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" - integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== +"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" + integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== dependencies: - "@babel/highlight" "^7.12.13" + "@babel/highlight" "^7.14.5" -"@babel/compat-data@^7.14.4": - version "7.14.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz#45720fe0cecf3fd42019e1d12cc3d27fadc98d58" - integrity sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ== +"@babel/compat-data@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz#8ef4c18e58e801c5c95d3c1c0f2874a2680fadea" + integrity sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w== "@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5": - version "7.14.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz#5395e30405f0776067fbd9cf0884f15bfb770a38" - integrity sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.14.3" - "@babel/helper-compilation-targets" "^7.13.16" - "@babel/helper-module-transforms" "^7.14.2" - "@babel/helpers" "^7.14.0" - "@babel/parser" "^7.14.3" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.2" - "@babel/types" "^7.14.2" + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz#e0814ec1a950032ff16c13a2721de39a8416fcab" + integrity sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.14.5" + "@babel/helper-compilation-targets" "^7.14.5" + "@babel/helper-module-transforms" "^7.14.5" + "@babel/helpers" "^7.14.6" + "@babel/parser" "^7.14.6" + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.14.5" + "@babel/types" "^7.14.5" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -47,137 +47,144 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.14.2", "@babel/generator@^7.14.3", "@babel/generator@^7.7.2": - version "7.14.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz#0c2652d91f7bddab7cccc6ba8157e4f40dcedb91" - integrity sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA== +"@babel/generator@^7.14.5", "@babel/generator@^7.7.2": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz#848d7b9f031caca9d0cd0af01b063f226f52d785" + integrity sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA== dependencies: - "@babel/types" "^7.14.2" + "@babel/types" "^7.14.5" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-compilation-targets@^7.13.16": - version "7.14.4" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz#33ebd0ffc34248051ee2089350a929ab02f2a516" - integrity sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA== +"@babel/helper-compilation-targets@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf" + integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw== dependencies: - "@babel/compat-data" "^7.14.4" - "@babel/helper-validator-option" "^7.12.17" + "@babel/compat-data" "^7.14.5" + "@babel/helper-validator-option" "^7.14.5" browserslist "^4.16.6" semver "^6.3.0" -"@babel/helper-function-name@^7.14.2": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2" - integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ== - dependencies: - "@babel/helper-get-function-arity" "^7.12.13" - "@babel/template" "^7.12.13" - "@babel/types" "^7.14.2" - -"@babel/helper-get-function-arity@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" - integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-member-expression-to-functions@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72" - integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw== - dependencies: - "@babel/types" "^7.13.12" - -"@babel/helper-module-imports@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" - integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== - dependencies: - "@babel/types" "^7.13.12" - -"@babel/helper-module-transforms@^7.14.2": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5" - integrity sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA== - dependencies: - "@babel/helper-module-imports" "^7.13.12" - "@babel/helper-replace-supers" "^7.13.12" - "@babel/helper-simple-access" "^7.13.12" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.14.0" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.2" - "@babel/types" "^7.14.2" - -"@babel/helper-optimise-call-expression@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" - integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" - integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== - -"@babel/helper-replace-supers@^7.13.12": - version "7.14.4" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz#b2ab16875deecfff3ddfcd539bc315f72998d836" - integrity sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.13.12" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.14.2" - "@babel/types" "^7.14.4" - -"@babel/helper-simple-access@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6" - integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== - dependencies: - "@babel/types" "^7.13.12" - -"@babel/helper-split-export-declaration@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" - integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-validator-identifier@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" - integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== - -"@babel/helper-validator-option@^7.12.17": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" - integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== - -"@babel/helpers@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62" - integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg== - dependencies: - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.14.0" - -"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" - integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== - dependencies: - "@babel/helper-validator-identifier" "^7.14.0" +"@babel/helper-function-name@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" + integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== + dependencies: + "@babel/helper-get-function-arity" "^7.14.5" + "@babel/template" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helper-get-function-arity@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" + integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-hoist-variables@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" + integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-member-expression-to-functions@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz#d5c70e4ad13b402c95156c7a53568f504e2fb7b8" + integrity sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-module-imports@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3" + integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-module-transforms@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz#7de42f10d789b423eb902ebd24031ca77cb1e10e" + integrity sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA== + dependencies: + "@babel/helper-module-imports" "^7.14.5" + "@babel/helper-replace-supers" "^7.14.5" + "@babel/helper-simple-access" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/helper-validator-identifier" "^7.14.5" + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helper-optimise-call-expression@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c" + integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" + integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== + +"@babel/helper-replace-supers@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94" + integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.14.5" + "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/traverse" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helper-simple-access@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz#66ea85cf53ba0b4e588ba77fc813f53abcaa41c4" + integrity sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-split-export-declaration@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" + integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-validator-identifier@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8" + integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg== + +"@babel/helper-validator-option@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" + integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== + +"@babel/helpers@^7.14.6": + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz#5b58306b95f1b47e2a0199434fa8658fa6c21635" + integrity sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA== + dependencies: + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.14.3", "@babel/parser@^7.7.2": - version "7.14.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz#a5c560d6db6cd8e6ed342368dea8039232cbab18" - integrity sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.7.2": + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz#d85cc68ca3cac84eae384c06f032921f5227f4b2" + integrity sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -257,48 +264,49 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-top-level-await@^7.8.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" - integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.7.2": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474" - integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/template@^7.12.13", "@babel/template@^7.3.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" - integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/traverse@^7.1.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2", "@babel/traverse@^7.7.2": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b" - integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.14.2" - "@babel/helper-function-name" "^7.14.2" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.14.2" - "@babel/types" "^7.14.2" + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716" + integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/template@^7.14.5", "@babel/template@^7.3.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" + integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/parser" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/traverse@^7.1.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.7.2": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz#c111b0f58afab4fea3d3385a406f692748c59870" + integrity sha512-G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.14.5" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-hoist-variables" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/parser" "^7.14.5" + "@babel/types" "^7.14.5" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.14.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.14.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz#bfd6980108168593b38b3eb48a24aa026b919bc0" - integrity sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw== +"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz#3bb997ba829a2104cedb20689c4a5b8121d383ff" + integrity sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg== dependencies: - "@babel/helper-validator-identifier" "^7.14.0" + "@babel/helper-validator-identifier" "^7.14.5" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -306,20 +314,27 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.1.tgz#71bc0d0d473ae96d5086badb2f4d624769fa56c4" - integrity sha512-CSOCdK/SJOZVWGVJuurfL0KtPq1AhSp3ng6BAo3SLXAd+WP7obERw2qFWQ0uzrApY/N1a1hvzfw31uonqRakXg== +"@cliqz/adblocker-content@^1.22.1", "@cliqz/adblocker-content@^1.22.2": + version "1.22.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.2.tgz#643849d5f08c167eb84a2e7e3f1f9fbc41a3889b" + integrity sha512-EsV00IdW8sGujGnylOGR8dm401FdIfPRAjuevsRlZjgDE+hQKj6n5wwrZaylPIh994hWesg6bxWTmXpJ2Sy2QQ== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.22.1" + "@cliqz/adblocker-extended-selectors" "^1.22.2" -"@cliqz/adblocker-electron-preload@1.22.1", "@cliqz/adblocker-electron-preload@^1.22.1": +"@cliqz/adblocker-electron-preload@1.22.1": version "1.22.1" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz#8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af" integrity sha512-etkb6LNUaCViZ2Bg7Z0fwpKsdsrmHF6Qjqs5u7FcfS4fSZ2TgDv7Ir5PunUWd6MOUW7mapx5CdPIupnlVkiTLA== dependencies: "@cliqz/adblocker-content" "^1.22.1" +"@cliqz/adblocker-electron-preload@^1.22.1": + version "1.22.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.2.tgz#eea674767a60abe4e5f9ccb46188d33656f551d0" + integrity sha512-4JSqNNYo4hXMoZjnyBVTd3z2yV2n5qeoNPk+WaeOFEF9uJXhqPR+Sz7scNB6nMYnRuSQfraeogtdaA4s0JkJWQ== + dependencies: + "@cliqz/adblocker-content" "^1.22.2" + "@cliqz/adblocker-electron@1.22.1": version "1.22.1" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz#13fe6de4be0c3beb2851634b27ea1223d10ca92b" @@ -329,22 +344,22 @@ "@cliqz/adblocker-electron-preload" "^1.22.1" tldts-experimental "^5.6.21" -"@cliqz/adblocker-extended-selectors@^1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.1.tgz#234ee70a1736e3690b25a7a073818f5a851bf9a8" - integrity sha512-uXB1TybAq6MgqsG09fcY8Qw0P9EOWp4G7KQ4QNXQd4HIP4o3zcJgBd5MKeclJAD/QOyPdhnb+a9JdwVFyqMamQ== +"@cliqz/adblocker-extended-selectors@^1.22.2": + version "1.22.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.2.tgz#1cad3c1569b765d9e7f8672c85b2a7b1e8e9ee90" + integrity sha512-/u4SmQ1wr7d80iGP705fZrfHjJUTf/1MyRXz5Wltt7i3OHvOCQEoST2mqNlfx0W/9gIWzxA7cFRLY0/aITmzTw== "@cliqz/adblocker@^1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.1.tgz#dae3dd6c59f16244012d1e736150f618b2d578e6" - integrity sha512-kir/tVTe0VabtJfcRipDX+/UBnZn0aN0lX4GQT7wZIHMOACpW37eix7wGkzVS+icbwu1bEqZ+O8Q98UlORPm4w== + version "1.22.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.2.tgz#99a14d56327734d3083a077d96fe7b91c236bf7a" + integrity sha512-P+a8gYbRbQy38mYsr7932h2cnK/7AEuQrmCEfLTO1+abCr2v5RM2Qb+cCn/JVnQSeqnysebAIXoV+PUzrjfpiQ== dependencies: - "@cliqz/adblocker-content" "^1.22.1" - "@cliqz/adblocker-extended-selectors" "^1.22.1" + "@cliqz/adblocker-content" "^1.22.2" + "@cliqz/adblocker-extended-selectors" "^1.22.2" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.144" + "@types/chrome" "^0.0.145" "@types/firefox-webext-browser" "^82.0.0" tldts-experimental "^5.6.21" @@ -706,10 +721,10 @@ dependencies: "@babel/types" "^7.3.0" -"@types/chrome@^0.0.144": - version "0.0.144" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.144.tgz#7dd9188e355aa17e3ad397f50b5cd3ad12caf788" - integrity sha512-BgoiO7/KP9hRNrCR2Wq+aKWT5Dh9bTofuWaRtcqPcj8YKhZojQgb6sSdIqvds2C+eO63BwaR9KHVMYYgZdGGBg== +"@types/chrome@^0.0.145": + version "0.0.145" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.145.tgz#6c53ae0af5f25350b07bfd24cf459b5fe65cd9b8" + integrity sha512-vLvTMmfc8mvwOZzkmn2UwlWSNu0t0txBkyuIv8NgihRkvFCe6XJX65YZAgAP/RdBit3enhU2GTxCr+prn4uZmA== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -788,9 +803,9 @@ integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "15.12.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz#1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d" - integrity sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww== + version "15.12.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26" + integrity sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA== "@types/node@^14.6.2": version "14.17.3" @@ -806,9 +821,9 @@ xmlbuilder ">=11.0.1" "@types/prettier@^2.1.5": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0" - integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.0.tgz#2e8332cc7363f887d32ec5496b207d26ba8052bb" + integrity sha512-hkc1DATxFLQo4VxPDpMH1gCkPpBbpOoJ/4nhuXw4n63/0R6bCpQECj4+K226UJ4JO/eJQz+1mC2I7JsWanAdQw== "@types/stack-utils@^2.0.0": version "2.0.0" @@ -825,7 +840,7 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== -"@types/yargs@^16.0.0", "@types/yargs@^16.0.1": +"@types/yargs@^16.0.0", "@types/yargs@^16.0.2": version "16.0.3" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz#4b6d35bb8e680510a7dc2308518a80ee1ef27e01" integrity sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ== @@ -861,9 +876,9 @@ acorn@^7.1.1, acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.2.4: - version "8.3.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.3.0.tgz#1193f9b96c4e8232f00b11a9edff81b2c8b98b88" - integrity sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw== + version "8.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz#af53266e698d7cffa416714b503066a82221be60" + integrity sha512-ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w== agent-base@6: version "6.0.2" @@ -963,10 +978,10 @@ app-builder-bin@3.5.13: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz#6dd7f4de34a4e408806f99b8c7d6ef1601305b7e" integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg== -app-builder-lib@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.5.tgz#d49f49dc2d9fd225249e4ae7e30add2996e7062f" - integrity sha512-lLEDvJuLdc4IVyADJK6t4qEIjRhOUj4p19B1RS/8pN/oAb8X5Qe1t3Einbsi4oFBJBweH2LIygnSAwumjQh9iA== +app-builder-lib@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz#c0ad1119ebfbf4189a8280ad693625f5e684dca6" + integrity sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -974,12 +989,12 @@ app-builder-lib@22.11.5: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.11.5" - builder-util-runtime "8.7.6" + builder-util "22.11.7" + builder-util-runtime "8.7.7" chromium-pickle-js "^0.2.0" debug "^4.3.2" ejs "^3.1.6" - electron-publish "22.11.5" + electron-publish "22.11.7" fs-extra "^10.0.0" hosted-git-info "^4.0.2" is-ci "^3.0.0" @@ -1178,9 +1193,9 @@ bluebird@^3.5.5: integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== boolean@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.0.tgz#a245080649ebb80e7c0ea218a480e4e913136336" - integrity sha512-K6r5tvO1ykeYerI7jIyTvSFw2l6D6DzqkljGj2E2uyYAAdDo2SV4qGJIV75cHIQpTFyb6BB0BEHiDdDrFsNI+g== + version "3.1.2" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz#e30f210a26b02458482a8cc353ab06f262a780c2" + integrity sha512-YN6UmV0FfLlBVvRvNPx3pz5W/mUoYB24J4WSXOKP/OOJpi+Oq6WYqPaNTHzjI0QzwWtnvEd5CGYyQPgp1jFxnw== boxen@^5.0.0: version "5.0.1" @@ -1265,17 +1280,25 @@ builder-util-runtime@8.7.6: debug "^4.3.2" sax "^1.2.4" -builder-util@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.5.tgz#08836d00e6bef39bdffd8a66fb07d2d5021b9c3c" - integrity sha512-ur9ksncYOnJg/VuJz3PdsBQHeg9tjdOC2HVj8mQ0WNcn/H3MO4tnwKBOWWikPDiWEjeBSvFUmYBnGFkRiUNkww== +builder-util-runtime@8.7.7: + version "8.7.7" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz#6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d" + integrity sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow== + dependencies: + debug "^4.3.2" + sax "^1.2.4" + +builder-util@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz#ae9707afa6a31feafa13c274ac83b4fe28ef1467" + integrity sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.5" "@types/fs-extra" "^9.0.11" app-builder-bin "3.5.13" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.6" + builder-util-runtime "8.7.7" chalk "^4.1.1" debug "^4.3.2" fs-extra "^10.0.0" @@ -1314,9 +1337,9 @@ camelcase@^6.2.0: integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001219: - version "1.0.30001236" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz#0a80de4cdf62e1770bb46a30d884fc8d633e3958" - integrity sha512-o0PRQSrSCGJKCPZcgMzl5fUaj5xHe8qA2m4QRvnyY4e1lITqoNkr7q/Oh1NcpGSy0Th97UZ35yoKcINPoq7YOQ== + version "1.0.30001239" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz#66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8" + integrity sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ== chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" @@ -1498,16 +1521,16 @@ configstore@^5.0.1: xdg-basedir "^4.0.0" convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" - integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== dependencies: safe-buffer "~5.1.1" core-js@^3.6.5: - version "3.14.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz#62322b98c71cc2018b027971a69419e2425c2a6c" - integrity sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA== + version "3.15.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz#db9554ebce0b6fd90dc9b1f2465c841d2d055044" + integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1672,13 +1695,13 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.5.tgz#0df9843def73a217097956982fa21bb4d6a5836e" - integrity sha512-91Shh9+OK9RwBlBURxvhSnQNibEh/JYNAnMOfFguyNbasSfF50Jme4b3dgsQrHTTTfkFijcvzykPPFAZofQs6g== +dmg-builder@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz#5956008c18d40ee72c0ea01ffea9590dbf51df89" + integrity sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ== dependencies: - app-builder-lib "22.11.5" - builder-util "22.11.5" + app-builder-lib "22.11.7" + builder-util "22.11.7" builder-util-runtime "8.7.6" fs-extra "^10.0.0" iconv-lite "^0.6.2" @@ -1744,17 +1767,17 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.5.tgz#914d8183e1bab7cda43ef1d67fc3d17314c7e242" - integrity sha512-QIhzrmSLNteItRvmAjwNpsya08oZeOJIrxFww/Alkjcwnrn5Xgog2qf3Xfa3ocuNUQIwb+mMzZrzqnPu0Mamyg== +electron-builder@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz#cd97a0d9f6e6d388112e66b4376de431cca4d596" + integrity sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw== dependencies: - "@types/yargs" "^16.0.1" - app-builder-lib "22.11.5" - builder-util "22.11.5" - builder-util-runtime "8.7.6" + "@types/yargs" "^16.0.2" + app-builder-lib "22.11.7" + builder-util "22.11.7" + builder-util-runtime "8.7.7" chalk "^4.1.1" - dmg-builder "22.11.5" + dmg-builder "22.11.7" fs-extra "^10.0.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -1762,28 +1785,28 @@ electron-builder@22.11.5: update-notifier "^5.1.0" yargs "^17.0.1" -electron-publish@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.5.tgz#2fcd3280c4267e70e4aa15003c9b7dc34923320e" - integrity sha512-peN4tEP80Kb6reuwKKvSu9p/XUWpx/7x747u5NSg7Kg2axBjzdMtX5ZqBThfPtJWJhSWZ7PEYWmNyUCfdQl2Ag== +electron-publish@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz#4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a" + integrity sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "22.11.5" - builder-util-runtime "8.7.6" + builder-util "22.11.7" + builder-util-runtime "8.7.7" chalk "^4.1.1" fs-extra "^10.0.0" lazy-val "^1.0.5" mime "^2.5.2" electron-to-chromium@^1.3.723: - version "1.3.750" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz#7e5ef6f478316b0bd656af5942fe502610e97eaf" - integrity sha512-Eqy9eHNepZxJXT+Pc5++zvEi5nQ6AGikwFYDCYwXUFBr+ynJ6pDG7MzZmwGYCIuXShLJM0n4bq+aoKDmvSGJ8A== + version "1.3.752" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz#0728587f1b9b970ec9ffad932496429aef750d09" + integrity sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A== -electron@13.1.1: - version "13.1.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.1.tgz#de1ea908bcac2197d7a5a373fb68c0c66043e10e" - integrity sha512-kySSb5CbIkWU2Kd9mf2rpGZC9p1nWhVVNl+CJjuOUGeVPXHbojHvTkDU1iC8AvV28eik3gqHisSJss40Caprog== +electron@13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz#8c9abf9015766c9cbc16f10c99282d00d6ae1b90" + integrity sha512-aNT9t+LgdQaZ7FgN36pN7MjSEoj+EWc2T9yuOqBApbmR4HavGRadSz7u9N2Erw2ojdIXtei2RVIAvVm8mbDZ0g== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2" @@ -1916,10 +1939,10 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@7.28.0: - version "7.28.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820" - integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g== +eslint@7.29.0: + version "7.29.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0" + integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA== dependencies: "@babel/code-frame" "7.12.11" "@eslint/eslintrc" "^0.4.2" @@ -3718,9 +3741,9 @@ readdir-glob@^1.0.0: minimatch "^3.0.4" regexpp@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" - integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== registry-auth-token@^4.0.0: version "4.2.1" @@ -4455,9 +4478,9 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" ws@^7.4.5: - version "7.4.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" - integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== + version "7.5.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz#0033bafea031fb9df041b2026fc72a571ca44691" + integrity sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw== xdg-basedir@^4.0.0: version "4.0.0" @@ -4500,9 +4523,9 @@ yallist@^4.0.0: integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yargs-parser@^20.2.2: - version "20.2.7" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" - integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== yargs@^16.0.3: version "16.2.0" diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index 11cf84050d0..14e1b9902cc 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -18,163 +18,171 @@ }; } { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; + name = "_babel_code_frame___code_frame_7.14.5.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; }; } { - name = "_babel_compat_data___compat_data_7.14.4.tgz"; + name = "_babel_compat_data___compat_data_7.14.5.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz"; - sha1 = "45720fe0cecf3fd42019e1d12cc3d27fadc98d58"; + name = "_babel_compat_data___compat_data_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz"; + sha1 = "8ef4c18e58e801c5c95d3c1c0f2874a2680fadea"; }; } { - name = "_babel_core___core_7.14.3.tgz"; + name = "_babel_core___core_7.14.6.tgz"; path = fetchurl { - name = "_babel_core___core_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz"; - sha1 = "5395e30405f0776067fbd9cf0884f15bfb770a38"; + name = "_babel_core___core_7.14.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz"; + sha1 = "e0814ec1a950032ff16c13a2721de39a8416fcab"; }; } { - name = "_babel_generator___generator_7.14.3.tgz"; + name = "_babel_generator___generator_7.14.5.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz"; - sha1 = "0c2652d91f7bddab7cccc6ba8157e4f40dcedb91"; + name = "_babel_generator___generator_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz"; + sha1 = "848d7b9f031caca9d0cd0af01b063f226f52d785"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz"; - sha1 = "33ebd0ffc34248051ee2089350a929ab02f2a516"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz"; + sha1 = "7a99c5d0967911e972fe2c3411f7d5b498498ecf"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz"; - sha1 = "397688b590760b6ef7725b5f0860c82427ebaac2"; + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; + sha1 = "89e2c474972f15d8e233b52ee8c480e2cfcd50c4"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; - sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; + sha1 = "25fbfa579b0937eee1f3b805ece4ce398c431815"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; - sha1 = "dfe368f26d426a07299d8d6513821768216e6d72"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; + sha1 = "e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; - sha1 = "c6a369a6f3621cb25da014078684da9196b61977"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz"; + sha1 = "d5c70e4ad13b402c95156c7a53568f504e2fb7b8"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz"; - sha1 = "ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"; + name = "_babel_helper_module_imports___helper_module_imports_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz"; + sha1 = "6d1a44df6a38c957aa7c312da076429f11b422f3"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; - sha1 = "5c02d171b4c8615b1e7163f888c1c81c30a2aaea"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz"; + sha1 = "7de42f10d789b423eb902ebd24031ca77cb1e10e"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; - sha1 = "806526ce125aed03373bc416a828321e3a6a33af"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz"; + sha1 = "f27395a8619e0665b3f0364cddb41c25d71b499c"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz"; - sha1 = "b2ab16875deecfff3ddfcd539bc315f72998d836"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; + sha1 = "5ac822ce97eec46741ab70a517971e443a70c5a9"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; - sha1 = "dd6c538afb61819d205a012c31792a39c7a5eaf6"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz"; + sha1 = "0ecc0b03c41cd567b4024ea016134c28414abb94"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; - sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; + name = "_babel_helper_simple_access___helper_simple_access_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz"; + sha1 = "66ea85cf53ba0b4e588ba77fc813f53abcaa41c4"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; - sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; + sha1 = "22b23a54ef51c2b7605d851930c1976dd0bc693a"; }; } { - name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; - sha1 = "d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz"; + sha1 = "d0f0e277c512e0c938277faa85a3968c9a44c0e8"; }; } { - name = "_babel_helpers___helpers_7.14.0.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz"; - sha1 = "ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"; + name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; + sha1 = "6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"; }; } { - name = "_babel_highlight___highlight_7.14.0.tgz"; + name = "_babel_helpers___helpers_7.14.6.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz"; - sha1 = "3197e375711ef6bf834e67d0daec88e4f46113cf"; + name = "_babel_helpers___helpers_7.14.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz"; + sha1 = "5b58306b95f1b47e2a0199434fa8658fa6c21635"; }; } { - name = "_babel_parser___parser_7.14.4.tgz"; + name = "_babel_highlight___highlight_7.14.5.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz"; - sha1 = "a5c560d6db6cd8e6ed342368dea8039232cbab18"; + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; + }; + } + { + name = "_babel_parser___parser_7.14.6.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.14.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz"; + sha1 = "d85cc68ca3cac84eae384c06f032921f5227f4b2"; }; } { @@ -266,43 +274,43 @@ }; } { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; - sha1 = "c5f0fa6e249f5b739727f923540cf7a806130178"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; + sha1 = "c1cfdadc35a646240001f06138247b741c34d94c"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.13.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.14.5.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz"; - sha1 = "9dff111ca64154cef0f4dc52cf843d9f12ce4474"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz"; + sha1 = "b82c6ce471b165b5ce420cf92914d6fb46225716"; }; } { - name = "_babel_template___template_7.12.13.tgz"; + name = "_babel_template___template_7.14.5.tgz"; path = fetchurl { - name = "_babel_template___template_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; - sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; + name = "_babel_template___template_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz"; + sha1 = "a9bc9d8b33354ff6e55a9c60d1109200a68974f4"; }; } { - name = "_babel_traverse___traverse_7.14.2.tgz"; + name = "_babel_traverse___traverse_7.14.5.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz"; - sha1 = "9201a8d912723a831c2679c7ebbf2fe1416d765b"; + name = "_babel_traverse___traverse_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz"; + sha1 = "c111b0f58afab4fea3d3385a406f692748c59870"; }; } { - name = "_babel_types___types_7.14.4.tgz"; + name = "_babel_types___types_7.14.5.tgz"; path = fetchurl { - name = "_babel_types___types_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz"; - sha1 = "bfd6980108168593b38b3eb48a24aa026b919bc0"; + name = "_babel_types___types_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz"; + sha1 = "3bb997ba829a2104cedb20689c4a5b8121d383ff"; }; } { @@ -314,11 +322,11 @@ }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.22.1.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.22.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_content___adblocker_content_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.1.tgz"; - sha1 = "71bc0d0d473ae96d5086badb2f4d624769fa56c4"; + name = "_cliqz_adblocker_content___adblocker_content_1.22.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.2.tgz"; + sha1 = "643849d5f08c167eb84a2e7e3f1f9fbc41a3889b"; }; } { @@ -330,6 +338,14 @@ }; } { + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz"; + path = fetchurl { + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.2.tgz"; + sha1 = "eea674767a60abe4e5f9ccb46188d33656f551d0"; + }; + } + { name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; path = fetchurl { name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; @@ -338,19 +354,19 @@ }; } { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.1.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.1.tgz"; - sha1 = "234ee70a1736e3690b25a7a073818f5a851bf9a8"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.2.tgz"; + sha1 = "1cad3c1569b765d9e7f8672c85b2a7b1e8e9ee90"; }; } { - name = "_cliqz_adblocker___adblocker_1.22.1.tgz"; + name = "_cliqz_adblocker___adblocker_1.22.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker___adblocker_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.1.tgz"; - sha1 = "dae3dd6c59f16244012d1e736150f618b2d578e6"; + name = "_cliqz_adblocker___adblocker_1.22.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.2.tgz"; + sha1 = "99a14d56327734d3083a077d96fe7b91c236bf7a"; }; } { @@ -634,11 +650,11 @@ }; } { - name = "_types_chrome___chrome_0.0.144.tgz"; + name = "_types_chrome___chrome_0.0.145.tgz"; path = fetchurl { - name = "_types_chrome___chrome_0.0.144.tgz"; - url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.144.tgz"; - sha1 = "7dd9188e355aa17e3ad397f50b5cd3ad12caf788"; + name = "_types_chrome___chrome_0.0.145.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.145.tgz"; + sha1 = "6c53ae0af5f25350b07bfd24cf459b5fe65cd9b8"; }; } { @@ -738,11 +754,11 @@ }; } { - name = "_types_node___node_15.12.2.tgz"; + name = "_types_node___node_15.12.4.tgz"; path = fetchurl { - name = "_types_node___node_15.12.2.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz"; - sha1 = "1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d"; + name = "_types_node___node_15.12.4.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz"; + sha1 = "e1cf817d70a1e118e81922c4ff6683ce9d422e26"; }; } { @@ -762,11 +778,11 @@ }; } { - name = "_types_prettier___prettier_2.2.3.tgz"; + name = "_types_prettier___prettier_2.3.0.tgz"; path = fetchurl { - name = "_types_prettier___prettier_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz"; - sha1 = "ef65165aea2924c9359205bf748865b8881753c0"; + name = "_types_prettier___prettier_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.0.tgz"; + sha1 = "2e8332cc7363f887d32ec5496b207d26ba8052bb"; }; } { @@ -842,11 +858,11 @@ }; } { - name = "acorn___acorn_8.3.0.tgz"; + name = "acorn___acorn_8.4.0.tgz"; path = fetchurl { - name = "acorn___acorn_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.3.0.tgz"; - sha1 = "1193f9b96c4e8232f00b11a9edff81b2c8b98b88"; + name = "acorn___acorn_8.4.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz"; + sha1 = "af53266e698d7cffa416714b503066a82221be60"; }; } { @@ -970,11 +986,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_22.11.5.tgz"; + name = "app_builder_lib___app_builder_lib_22.11.7.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.11.5.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.5.tgz"; - sha1 = "d49f49dc2d9fd225249e4ae7e30add2996e7062f"; + name = "app_builder_lib___app_builder_lib_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz"; + sha1 = "c0ad1119ebfbf4189a8280ad693625f5e684dca6"; }; } { @@ -1162,11 +1178,11 @@ }; } { - name = "boolean___boolean_3.1.0.tgz"; + name = "boolean___boolean_3.1.2.tgz"; path = fetchurl { - name = "boolean___boolean_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.0.tgz"; - sha1 = "a245080649ebb80e7c0ea218a480e4e913136336"; + name = "boolean___boolean_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz"; + sha1 = "e30f210a26b02458482a8cc353ab06f262a780c2"; }; } { @@ -1258,11 +1274,19 @@ }; } { - name = "builder_util___builder_util_22.11.5.tgz"; + name = "builder_util_runtime___builder_util_runtime_8.7.7.tgz"; + path = fetchurl { + name = "builder_util_runtime___builder_util_runtime_8.7.7.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz"; + sha1 = "6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d"; + }; + } + { + name = "builder_util___builder_util_22.11.7.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.11.5.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.5.tgz"; - sha1 = "08836d00e6bef39bdffd8a66fb07d2d5021b9c3c"; + name = "builder_util___builder_util_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz"; + sha1 = "ae9707afa6a31feafa13c274ac83b4fe28ef1467"; }; } { @@ -1298,11 +1322,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001236.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001239.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001236.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz"; - sha1 = "0a80de4cdf62e1770bb46a30d884fc8d633e3958"; + name = "caniuse_lite___caniuse_lite_1.0.30001239.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz"; + sha1 = "66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8"; }; } { @@ -1522,19 +1546,19 @@ }; } { - name = "convert_source_map___convert_source_map_1.7.0.tgz"; + name = "convert_source_map___convert_source_map_1.8.0.tgz"; path = fetchurl { - name = "convert_source_map___convert_source_map_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha1 = "f3373c32d21b4d780dd8004514684fb791ca4369"; }; } { - name = "core_js___core_js_3.14.0.tgz"; + name = "core_js___core_js_3.15.0.tgz"; path = fetchurl { - name = "core_js___core_js_3.14.0.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz"; - sha1 = "62322b98c71cc2018b027971a69419e2425c2a6c"; + name = "core_js___core_js_3.15.0.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz"; + sha1 = "db9554ebce0b6fd90dc9b1f2465c841d2d055044"; }; } { @@ -1746,11 +1770,11 @@ }; } { - name = "dmg_builder___dmg_builder_22.11.5.tgz"; + name = "dmg_builder___dmg_builder_22.11.7.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.11.5.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.5.tgz"; - sha1 = "0df9843def73a217097956982fa21bb4d6a5836e"; + name = "dmg_builder___dmg_builder_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz"; + sha1 = "5956008c18d40ee72c0ea01ffea9590dbf51df89"; }; } { @@ -1818,35 +1842,35 @@ }; } { - name = "electron_builder___electron_builder_22.11.5.tgz"; + name = "electron_builder___electron_builder_22.11.7.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.11.5.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.5.tgz"; - sha1 = "914d8183e1bab7cda43ef1d67fc3d17314c7e242"; + name = "electron_builder___electron_builder_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz"; + sha1 = "cd97a0d9f6e6d388112e66b4376de431cca4d596"; }; } { - name = "electron_publish___electron_publish_22.11.5.tgz"; + name = "electron_publish___electron_publish_22.11.7.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.11.5.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.5.tgz"; - sha1 = "2fcd3280c4267e70e4aa15003c9b7dc34923320e"; + name = "electron_publish___electron_publish_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz"; + sha1 = "4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a"; }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.750.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.752.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.750.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz"; - sha1 = "7e5ef6f478316b0bd656af5942fe502610e97eaf"; + name = "electron_to_chromium___electron_to_chromium_1.3.752.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz"; + sha1 = "0728587f1b9b970ec9ffad932496429aef750d09"; }; } { - name = "electron___electron_13.1.1.tgz"; + name = "electron___electron_13.1.2.tgz"; path = fetchurl { - name = "electron___electron_13.1.1.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.1.1.tgz"; - sha1 = "de1ea908bcac2197d7a5a373fb68c0c66043e10e"; + name = "electron___electron_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz"; + sha1 = "8c9abf9015766c9cbc16f10c99282d00d6ae1b90"; }; } { @@ -2010,11 +2034,11 @@ }; } { - name = "eslint___eslint_7.28.0.tgz"; + name = "eslint___eslint_7.29.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.28.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz"; - sha1 = "435aa17a0b82c13bb2be9d51408b617e49c1e820"; + name = "eslint___eslint_7.29.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz"; + sha1 = "ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0"; }; } { @@ -3890,11 +3914,11 @@ }; } { - name = "regexpp___regexpp_3.1.0.tgz"; + name = "regexpp___regexpp_3.2.0.tgz"; path = fetchurl { - name = "regexpp___regexpp_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; - sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + name = "regexpp___regexpp_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; + sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2"; }; } { @@ -4786,11 +4810,11 @@ }; } { - name = "ws___ws_7.4.6.tgz"; + name = "ws___ws_7.5.0.tgz"; path = fetchurl { - name = "ws___ws_7.4.6.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; - sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; + name = "ws___ws_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz"; + sha1 = "0033bafea031fb9df041b2026fc72a571ca44691"; }; } { @@ -4858,11 +4882,11 @@ }; } { - name = "yargs_parser___yargs_parser_20.2.7.tgz"; + name = "yargs_parser___yargs_parser_20.2.9.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.7.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz"; - sha1 = "61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"; + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; }; } { diff --git a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix index fa893f3fa7d..e552113310f 100644 --- a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kubelogin"; - version = "1.23.2"; + version = "1.23.3"; src = fetchFromGitHub { owner = "int128"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Vj7qk1x4d94GgthmHhWbQvsfnZE1UL3Bdk5zjAb3vWs="; + sha256 = "sha256-qhdt/j1yFlCr+CCM3VQHxRVMEelZDsjhDJW9CYNCx2U="; }; subPackages = ["."]; - vendorSha256 = "sha256-JsBseRIbStsX44rLsGAERFUSWUuLcNycRDAcOMconnE="; + vendorSha256 = "sha256-RxIrnwIHDi9umu9bqpz3lnpNFdIWoTP657Te9iBv4IA="; # Rename the binary instead of symlinking to avoid conflict with the # Azure version of kubelogin diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3afce9ce1ab..390b1c757a3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1121,10 +1121,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", - "rev": "v1.24.3", - "sha256": "1sc60x3r4nb48p8yb7778fpk78acq808jzcd5ijnwxqakccml5kl", + "rev": "v2.0.1", + "sha256": "0ah3bi4zpg8j59v4bj9a8vyknpnyl1g8bx4qyfwwz4gnqp9m4anr", "vendorSha256": null, - "version": "1.24.3" + "version": "2.0.1" }, "vthunder": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index b5011c122d9..24ec320cc43 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -15,33 +15,27 @@ , webkitgtk , glib-networking , librsvg -, gst_all_1 , xdg-utils +, gst_all_1 }: stdenv.mkDerivation rec { pname = "newsflash"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - hash = "sha256-pskmvztKOwutXRHVnW5u68/0DAuV9Gb+Ovp2JbXiMYo="; + hash = "sha256-8W158GrvVGu5b3TG5bomK+hAF6jttZuImkmtcZOl91o="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-qq8cZplt5YWUwsXUShMDhQm3RGH2kCEBk64x6bOa50E="; + hash = "sha256-zHtD3NVWYQ5njg17Z2YmEttiK2oiq01OiAXIZofIqKI="; }; - # https://github.com/CasualX/obfstr/blob/v0.2.4/build.rs#L5 - # obfstr 0.2.4 fails to set RUSTC_BOOTSTRAP in its build script because cargo - # build scripts are forbidden from setting RUSTC_BOOTSTRAP since rustc 1.52.0 - # https://github.com/rust-lang/rust/blob/1.52.0/RELEASES.md#compatibility-notes - RUSTC_BOOTSTRAP = 1; - patches = [ # Post install tries to generate an icon cache & update the # desktop database. The gtk setup hook drop-icon-theme-cache.sh @@ -79,14 +73,14 @@ stdenv.mkDerivation rec { sqlite webkitgtk - # open link in browser - xdg-utils - # TLS support for loading external content in webkitgtk WebView glib-networking # SVG support for gdk-pixbuf librsvg + + # Open links in browser + xdg-utils ] ++ (with gst_all_1; [ # Audio & video support for webkitgtk WebView gstreamer @@ -100,5 +94,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/news-flash/news_flash_gtk"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch b/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch index cfdec206e77..b638f30cd44 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch +++ b/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index 53f911c..361a233 100644 +index 1d7089c..1952e7f 100644 --- a/meson.build +++ b/meson.build @@ -61,5 +61,3 @@ meson.add_dist_script( diff --git a/pkgs/applications/office/timedoctor/default.nix b/pkgs/applications/office/timedoctor/default.nix new file mode 100644 index 00000000000..f4ce436e963 --- /dev/null +++ b/pkgs/applications/office/timedoctor/default.nix @@ -0,0 +1,123 @@ +{ appimageTools +, fetchurl +, lib +}: + +# You can debug this package with: $ ELECTRON_ENABLE_LOGGING=true timedoctor +let + version = "3.12.12"; + sha256 = "01j149c6lacgysll3sajxlb43m1al08kdcwc6zyzw80nrp4iagf6"; +in +appimageTools.wrapType2 { + name = "timedoctor-${version}"; + src = fetchurl { + inherit sha256; + url = "https://repo2.timedoctor.com/td-desktop-hybrid/prod/v${version}/timedoctor-desktop_${version}_linux-x86_64.AppImage"; + }; + multiPkgs = _: with _; [ + alsaLib + atk + at-spi2-atk + at-spi2-core + cairo + coreutils + cups + dbus + dbus.lib + desktop-file-utils + expat + expat.dev + file + freetype + gcc + gcc-unwrapped.lib + gdb + gdk-pixbuf + git + glib + glibc + gnome.gdk_pixbuf + gnome.gtk + gnome.gtk.dev + gnome.zenity + gnome2.GConf + gnumake + gnutar + gpsd + gtk3 + gtk3.dev + gtk3-x11 + gtk3-x11.dev + kdialog + libappindicator-gtk2.out + libexif + (libjpeg.override { enableJpeg8 = true; }).out + libnotify + libpng + libxml2 + libxslt + netcat + nettools + nodePackages.asar + nspr + nss + openjdk + pango + patchelf + python38 + strace + sqlite + sqlite.dev + udev + unzip + utillinux + watch + wget + which + wrapGAppsHook + xdg_utils + xorg.libX11 + xorg.libXau + xorg.libXaw + xorg.libXaw3d + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXdmcp + xorg.libXext + xorg.libXfixes + xorg.libXfont + xorg.libXfont2 + xorg.libXft + xorg.libXi + xorg.libXinerama + xorg.libXmu + xorg.libXp + xorg.libXpm + xorg.libXpresent + xorg.libXrandr + xorg.libXrender + xorg.libXres + xorg.libXScrnSaver + xorg.libXt + xorg.libXTrap + xorg.libXtst + xorg.libXv + xorg.libXvMC + xorg.libXxf86dga + xorg.libXxf86misc + xorg.libXxf86vm + xorg.xcbutilkeysyms + zip + zlib + zsh + ]; + meta = with lib; { + description = "Employee time tracking software"; + homepage = "https://www.timedoctor.com"; + license = licenses.unfree; + maintainers = with maintainers; [ kamadorueda ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/chemistry/element/default.nix b/pkgs/applications/science/chemistry/element/default.nix new file mode 100644 index 00000000000..812272e2fb9 --- /dev/null +++ b/pkgs/applications/science/chemistry/element/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "element"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "gennaro-tedesco"; + repo = pname; + rev = "v${version}"; + sha256 = "gjdcNvYNnxb6hOE/MQjTezZeYGBWTr4E8/Pt8YQv3lY="; + }; + + vendorSha256 = "A4g2rQTaYrA4/0rqldUv7iuibzNINEvx9StUnaN2/Yg="; + + meta = with lib; { + description = "The periodic table on the command line"; + homepage = "https://github.com/gennaro-tedesco/element"; + license = licenses.asl20; + maintainers = [ maintainers.j0hax ]; + }; +} diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index b5a9fc3fa86..6b6bfd7d6e5 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texLive }: +{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo4, getopt, readline, texlive }: lib.fix (eukleides: stdenv.mkDerivation rec { pname = "eukleides"; @@ -9,12 +9,16 @@ lib.fix (eukleides: stdenv.mkDerivation rec { sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q"; }; - # use $CC instead of hardcoded gcc - patches = [ ./use-CC.patch ]; + patches = [ + # use $CC instead of hardcoded gcc + ./use-CC.patch + # allow PostScript transparency in epstopdf call + ./gs-allowpstransparency.patch + ]; - nativeBuildInputs = [ bison flex texinfo makeWrapper ]; + nativeBuildInputs = [ bison flex texinfo4 makeWrapper ]; - buildInputs = [ readline texLive ]; + buildInputs = [ getopt readline ]; preConfigure = '' substituteInPlace Makefile \ @@ -34,19 +38,15 @@ lib.fix (eukleides: stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/euktoeps \ - --set-default TEXINPUTS : \ - --prefix TEXINPUTS : "$tex/tex/latex/eukleides" \ - --prefix PATH : "${texLive}/bin" - wrapProgram $out/bin/euktopdf \ - --set-default TEXINPUTS : \ - --prefix TEXINPUTS : "$tex/tex/latex/eukleides" \ - --prefix PATH : "${texLive}/bin" + --prefix PATH : ${lib.makeBinPath [ getopt ]} ''; outputs = [ "out" "doc" "tex" ]; passthru.tlType = "run"; - passthru.pkgs = [ eukleides.tex ]; + passthru.pkgs = [ eukleides.tex ] + # packages needed by euktoeps, euktopdf and eukleides.sty + ++ (with texlive; collection-pstricks.pkgs ++ epstopdf.pkgs ++ iftex.pkgs ++ moreverb.pkgs); meta = { description = "Geometry Drawing Language"; diff --git a/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch b/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch new file mode 100644 index 00000000000..aa92e6cc9fa --- /dev/null +++ b/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch @@ -0,0 +1,10 @@ +--- a/bash/euktopdf ++++ b/bash/euktopdf +@@ -55,6 +55,6 @@ do + exit 1 + fi + dvips -q -E -o $base.eps $base.dvi && +- epstopdf $base.eps && ++ epstopdf --gsopt=-dALLOWPSTRANSPARENCY $base.eps && + rm -f $base.{tex,log,dvi,eps} + done diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index af56f54a414..fbebf6590d0 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -1,30 +1,41 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , cmake -, pkg-config +, glib , gtk3 +, makeWrapper +, pcre2 , perl +, pkg-config , vte -, pcre2 -, glib -, makeWrapper }: stdenv.mkDerivation rec { pname = "sakura"; - version = "3.7.1"; + version = "3.8.2"; src = fetchurl { url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos="; + sha256 = "sha256-nd/okZrg4RZzyiKHmuMkVl0Jh7FOlI4dK63/U4/htbk="; }; - nativeBuildInputs = [ cmake perl pkg-config makeWrapper ]; + nativeBuildInputs = [ + cmake + makeWrapper + perl + pkg-config + ]; - buildInputs = [ gtk3 vte pcre2 glib ]; + buildInputs = [ + glib + gtk3 + pcre2 + vte + ]; - # Set path to gsettings-schemata so sakura knows - # where to find colorchooser, fontchooser etc. + # Set path to gsettings-schemata so sakura knows where to find colorchooser, + # fontchooser etc. postInstall = '' wrapProgram $out/bin/sakura \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 3817ce7fa4f..ab0ce9c7cd0 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "1ffgh5826985phc8amvzl9iydvsnij5brh4gczfh201vfmw9d4hh"; + sha256 = "sha256-MQG4thW73gDqY68bKP2FO8z5uc2R/tED+/X9qas/GOA="; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index c13a08a711c..11dbfc299a4 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr, +{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr2, curl }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ./gcc6.patch ]; - nativeBuildInputs = [ cmake antlr ]; + nativeBuildInputs = [ cmake antlr2 ]; buildInputs = [ libxml2 libxslt boost libarchive python curl ]; meta = { diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index db9a7ef8257..f093e94696c 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xhyve"; - version = "20191001"; + version = "20210203"; src = fetchFromGitHub { owner = "machyve"; repo = "xhyve"; - rev = "1f46a3d0bbeb6c90883f302425844fcc3800a776"; - sha256 = "0mm9xa0v6n7xl2qypnppq5abdncd31vffiklrhcrlni5ymyh9ia5"; + rev = "83516a009c692ea5d2993d1071e68d05d359b11e"; + sha256 = "1pjdg4ppy6qh3vr1ls5zyw3jzcvwny9wydnmfpadwij1hvns7lj3"; }; buildInputs = [ Hypervisor vmnet xpc libobjc zlib ]; diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index ba9ad48e391..014d6bd6f85 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "0.039"; + version = "0.040"; in fetchzip { name = "JuliaMono-ttf-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-M9T78xnSN1hcHLXkut09eD2IFrgCRTG9fAPqMv4MXWY="; + sha256 = "sha256-Rrsvs682aWXZqydnOifXTJMa4uPl/aCGbVNRPGxkZng="; postFetch = '' mkdir -p $out/share/fonts/truetype diff --git a/pkgs/data/fonts/vazir-code-font/default.nix b/pkgs/data/fonts/vazir-code-font/default.nix new file mode 100644 index 00000000000..6702fd1b022 --- /dev/null +++ b/pkgs/data/fonts/vazir-code-font/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub }: + +let + pname = "vazir-code-font"; + version = "1.1.2"; +in fetchFromGitHub { + name = "${pname}-${version}"; + + owner = "rastikerdar"; + repo = "vazir-code-font"; + rev = "v${version}"; + + postFetch = '' + tar xf $downloadedFile --strip=1 + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + ''; + sha256 = "0ivwpn9xm2zwhwgg9mghyiy5v66cn4786w9j6rkff5cmzshv279r"; + + meta = with lib; { + homepage = "https://github.com/rastikerdar/vazir-code-font"; + description = "A Persian (farsi) Monospaced Font for coding"; + license = licenses.publicDomain; + platforms = platforms.all; + maintainers = [ maintainers.dearrude ]; + }; +} diff --git a/pkgs/data/themes/sweet/default.nix b/pkgs/data/themes/sweet/default.nix index 8a62735d2e5..bd1df3277c9 100644 --- a/pkgs/data/themes/sweet/default.nix +++ b/pkgs/data/themes/sweet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "sweet"; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { }) ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + sourceRoot = "."; installPhase = '' diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 6ccd2a0c612..c72d20b9d8f 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -35,6 +35,8 @@ lib.makeScope pkgs.newScope (self: with self; { thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { }; + thunar-media-tags-plugin = callPackage ./thunar-plugins/media-tags { }; + tumbler = callPackage ./core/tumbler { }; xfce4-panel = callPackage ./core/xfce4-panel { }; diff --git a/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix new file mode 100644 index 00000000000..0ae0c352336 --- /dev/null +++ b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix @@ -0,0 +1,36 @@ +{ lib +, mkXfceDerivation +, gtk3 +, thunar +, exo +, libxfce4util +, intltool +, gettext +, taglib +}: + +mkXfceDerivation { + category = "thunar-plugins"; + pname = "thunar-media-tags-plugin"; + version = "0.3.0"; + + sha256 = "sha256-jtgcHH5U5GOvzDVUwPEreMtTdk5DT6sXvFPDbzbF684="; + + nativeBuildInputs = [ + intltool + gettext + ]; + + buildInputs = [ + thunar + exo + gtk3 + libxfce4util + taglib + ]; + + meta = with lib; { + description = "Thunar plugin providing tagging and renaming features for media files"; + maintainers = with maintainers; [ ncfavier ]; + }; +} diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix new file mode 100644 index 00000000000..82e15db6685 --- /dev/null +++ b/pkgs/development/compilers/jrsonnet/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "jrsonnet"; + version = "0.3.8"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "CertainLach"; + repo = "jrsonnet"; + sha256 = "sha256-u6P/j7j6S7iPQQh00YFtp2G9Kt4xdWJGsxbuBjvHHZ4="; + }; + + postInstall = '' + ln -s $out/bin/jrsonnet $out/bin/jsonnet + ''; + + cargoSha256 = "sha256-KGQ3n3BBgLCT3ITIM8p9AxNa62ek4GHymqoD0eQSVKQ="; + + meta = { + description = "Purely-functional configuration language that helps you define JSON data"; + maintainers = with lib.maintainers; [ lach ]; + license = lib.licenses.mit; + homepage = "https://github.com/CertainLach/jrsonnet"; + }; +} diff --git a/pkgs/development/compilers/llvm/update-git.py b/pkgs/development/compilers/llvm/update-git.py index 1ef16cfb9b1..880cad1c72b 100755 --- a/pkgs/development/compilers/llvm/update-git.py +++ b/pkgs/development/compilers/llvm/update-git.py @@ -7,12 +7,16 @@ import json import os import re import subprocess +import sys from codecs import iterdecode from datetime import datetime from urllib.request import urlopen, Request +DEFAULT_NIX = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'git/default.nix') + + def get_latest_chromium_build(): HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux' print(f'GET {HISTORY_URL}') @@ -39,6 +43,16 @@ def get_commit(ref): return json.loads(http_response.read().decode()) +def get_current_revision(): + """Get the current revision of llvmPackages_git.""" + with open(DEFAULT_NIX) as f: + for line in f: + rev = re.search(r'^ rev = "(.*)";', line) + if rev: + return rev.group(1) + sys.exit(1) + + def nix_prefetch_url(url, algo='sha256'): """Prefetches the content of the given URL.""" print(f'nix-prefetch-url {url}') @@ -55,13 +69,15 @@ clang_revision = re.search(r"^CLANG_REVISION = '(.+)'$", clang_update_script, re clang_commit_short = re.search(r"llvmorg-[0-9]+-init-[0-9]+-g([0-9a-f]{8})", clang_revision).group(1) release_version = re.search(r"^RELEASE_VERSION = '(.+)'$", clang_update_script, re.MULTILINE).group(1) commit = get_commit(clang_commit_short) +if get_current_revision() == commit["sha"]: + print('No new update available.') + sys.exit(0) date = datetime.fromisoformat(commit['commit']['committer']['date'].rstrip('Z')).date().isoformat() version = f'unstable-{date}' print('Prefetching source tarball...') hash = nix_prefetch_url(f'https://github.com/llvm/llvm-project/archive/{commit["sha"]}.tar.gz') print('Updating default.nix...') -default_nix = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'git/default.nix') -with fileinput.FileInput(default_nix, inplace=True) as f: +with fileinput.FileInput(DEFAULT_NIX, inplace=True) as f: for line in f: result = re.sub(r'^ release_version = ".+";', f' release_version = "{release_version}";', line) result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result) diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix index f6d2053f315..e7dc9ceae6d 100644 --- a/pkgs/development/compilers/mosml/default.nix +++ b/pkgs/development/compilers/mosml/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { setSourceRoot = ''export sourceRoot="$(echo */src)"''; + # MosML needs a specific RPATH entry pointing to $(out)/lib (added + # by the build system), which patchelf will remove. + dontPatchELF = true; + meta = with lib; { description = "A light-weight implementation of Standard ML"; longDescription = '' diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 678ab3adb06..40c216d79c3 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -8,24 +8,24 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "3ee5f2f1d3316e228916788b300d786bb574d337"; - sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv"; + rev = "18eef33bd7a4bf5ad8c69f99cb72022608cf6e73"; + sha256 = "sha256-tkWVvYmSpJPaZ8VJOkAWndDWhA0PiHAkR3feBAo+knM="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "b63f0e5ed3e818870968ebf6af73317127fd07b0"; - sha256 = "1chv30azfp76nha428ivg4ixrij6d8pxj5kn3jam87gmkmgc9zhm"; + rev = "c2d5375fa7cc87c93f692e7200d5d974283d4391"; + sha256 = "sha256-tMJRljrlH+qb+27rTn+3LuEyMOVpiU0zSCiGNfUTb6g="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "979924c8bc839e4cb1b69d03d48398551f369ce7"; - sha256 = "07vyjlblpm4zhfds612h86lnz0qvrj5qqw5z2zzfa3m9fax7cm85"; + rev = "0c28b6451d77774912e52949c1e57fa726edf113"; + sha256 = "sha256-KpCMceTV/BRaoJe1qeXhKYQNQqdGaM6Q9nklpJKzHFY="; }; in stdenv.mkDerivation rec { pname = "shaderc"; - version = "2020.2"; + version = "2021.0"; outputs = [ "out" "lib" "bin" "dev" "static" ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { owner = "google"; repo = "shaderc"; rev = "v${version}"; - sha256 = "1sxz8872x3rdlrhmbn83r1vniq4j51jnk0ka3447fq68il4myf1w"; + sha256 = "sha256-RfSMzrGVtdXbr/mjSrHoN447e3vMQfJbesQMvLOARBs="; }; patchPhase = '' diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix index 5ff4ffd7565..638210f8412 100644 --- a/pkgs/development/gnuradio-modules/ais/default.nix +++ b/pkgs/development/gnuradio-modules/ais/default.nix @@ -8,18 +8,22 @@ , cppunit , log4cpp , osmosdr +, gmp +, mpir +, fftwFloat +, icu }: mkDerivation rec { pname = "gr-ais"; - version = "2015-12-20"; + version = "2020-08-13"; src = fetchFromGitHub { owner = "bistromath"; repo = "gr-ais"; - rev = "cdc1f52745853f9c739c718251830eb69704b26e"; - sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; + rev = "2162103226f3dae43c8c2ab23b79483b84346665"; + sha256 = "1vackka34722d8pcspfwj0j6gc9ic7dqq64sgkrpjm94sh3bmb0b"; }; - disabledForGRafter = "3.8"; + disabledForGRafter = "3.9"; nativeBuildInputs = [ cmake @@ -32,6 +36,10 @@ mkDerivation rec { osmosdr boost log4cpp + gmp + mpir + fftwFloat + icu ]; meta = with lib; { diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index 0a9e1de6126..73152fb9d2c 100644 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "guile-gcrypt"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitea { domain = "notabug.org"; owner = "cwebber"; repo = "guile-gcrypt"; rev = "v${version}"; - sha256 = "LKXIwO8v/T/h1JKARWD5ta57sgRcVu7hcYYwr3wUQ1g="; + sha256 = "sha256-lAaiKBOdTFWEWsmwKgx0C67ACvtnEKUxti66dslzSVQ="; }; postConfigure = '' diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index f337eefecb2..254afae0cc4 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "guile-git"; - version = "0.3.0"; + version = "0.5.1"; src = fetchFromGitLab { owner = "guile-git"; repo = pname; rev = "v${version}"; - sha256 = "1s77s70gzfj6h7bglq431kw8l4iknhsfpc0mnvcp4lkhwdcgyn1n"; + sha256 = "7Cnuyk9xAPTvz9R44O3lvKDrT6tUQui7YzxIoqhRfPQ="; }; postConfigure = '' diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index 1d84bf37ce5..5433bbb1aa6 100644 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ b/pkgs/development/guile-modules/guile-json/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "guile-json"; - version = "4.4.1"; + version = "4.5.2"; src = fetchurl { url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz"; - sha256 = "sha256-UqZt3pqXQzeHpzEiMvOMKSh1gK/K2KaJ70jMllNxBPc="; + sha256 = "GrBG7DaxxEwEGsJ1Vo2Bh4TXH6uaXZX5Eoz+iiUFGTM="; }; postConfigure = '' diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index 3ecbf3de2a9..9e344adc15a 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.3.4.3"; - sha256 = "wmR0XTMrJ3608HD341lNlYChwxs/8jb12Okw3RNHGCA="; + version = "23.3.4.4"; + sha256 = "dnoSGfBUZrgcnNQNAoqmVOxK/NQlt1DC187sxg7mPq8="; } diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 38ee086a88f..b8132cea4fc 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -208,7 +208,7 @@ in with passthru; stdenv.mkDerivation { # * https://bugs.python.org/issue35523 # * https://github.com/python/cpython/commit/e6b247c8e524 ./3.7/no-win64-workaround.patch - ] ++ optionals (isPy37 || isPy38 || isPy39) [ + ] ++ optionals (pythonAtLeast "3.7") [ # Fix darwin build https://bugs.python.org/issue34027 ./3.7/darwin-libutil.patch ] ++ optionals (pythonOlder "3.8") [ @@ -227,7 +227,7 @@ in with passthru; stdenv.mkDerivation { ( if isPy35 then ./3.5/python-3.x-distutils-C++.patch - else if isPy37 || isPy38 || isPy39 then + else if pythonAtLeast "3.7" then ./3.7/python-3.x-distutils-C++.patch else fetchpatch { diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 1b2655fe771..fdb3a78a1b7 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, perl, icu, zlib, gmp, lib, nqp }: +{ stdenv, fetchurl, perl, icu, zlib, gmp, lib, nqp, removeReferencesTo }: stdenv.mkDerivation rec { pname = "rakudo"; - version = "2021.05"; + version = "2021.06"; src = fetchurl { - url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "0h9kdb4vvscflifmclx0zhwb5qfakiggnbvlf9cx2hmp5vnk71jk"; + url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; + sha256 = "11ixlqmvbb37abksdysg5r4lkbwzr486lkc0ssl3wca4iiy3mhgf"; }; + nativeBuildInputs = [ removeReferencesTo ]; + buildInputs = [ icu zlib gmp perl ]; configureScript = "perl ./Configure.pl"; configureFlags = [ @@ -16,15 +18,14 @@ stdenv.mkDerivation rec { "--with-nqp=${nqp}/bin/nqp" ]; - # Remove test of profiler, fails since 2020.09 - preCheck = "rm t/09-moar/01-profilers.t"; - - # Some tests fail on Darwin - doCheck = !stdenv.isDarwin; + disallowedReferences = [ stdenv.cc.cc ]; + postFixup = '' + remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/share/perl6/runtime/dynext/libperl6_ops_moar.so)" + ''; meta = with lib; { description = "Raku implementation on top of Moar virtual machine"; - homepage = "https://www.rakudo.org"; + homepage = "https://rakudo.org"; license = licenses.artistic2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 0dbe0f5d97e..60a5e071545 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2021.05"; + version = "2021.06"; src = fetchurl { - url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "15x8lra3k7lpcisfxvrrz3jqp2dilfrwgqzxkknwlfsfcrw8fk5i"; + url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz"; + sha256 = "19vjcyb9fg9msjw1ih00c2qby480gl4highw24zx7j84slhsj013"; }; buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; - homepage = "https://www.moarvm.org/"; + homepage = "https://moarvm.org"; license = licenses.artistic2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 317a8226852..4b456d819f6 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2021.05"; + version = "2021.06"; src = fetchurl { url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0gzpzzvqs3xar5657yx07hsvqn3xckdfvq9jw73qfccbbb9gjg5l"; + sha256 = "1d00lajjdd2k510fb0cb6c8bpklvlnncykf6jz8j8djfp0b2i696"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index d19600f39b8..4dcb70bd3ec 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "1.0.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = version; - sha256 = "0ciia8hhkkyh6rmrxgbk3bgwjwzkcba6645wlcm0vlgk2w4i5m3z"; + sha256 = "191f60db2y1f3xw1x81mw88vclf1c4kgvnfv74g5vb3vn7n57c5j"; fetchSubmodules = true; }; - cargoSha256 = "140bzxhsyfif99x5a1m1d45ppb6jzvy9m4xil7z1wg2pnq9k7zz8"; + cargoSha256 = "0hhwixqhrl79hpzmvq7ga3kp2cfrwr4i8364cwnr7195xwnfxb0k"; nativeBuildInputs = [ cmake pkg-config ]; @@ -32,7 +32,9 @@ rustPlatform.buildRustPackage rec { ]; cargoTestFlags = [ - "--features" "test-cranelift,test-jit" + "--features" "test-cranelift" + # Can't use test-jit : + # error: Package `wasmer-workspace v2.0.0 (/build/source)` does not have the feature `test-jit` ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; @@ -47,6 +49,6 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://wasmer.io/"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne shamilton ]; }; } diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index faa819ec561..74122f7ed24 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7.4"; src = fetchurl { - url = "${meta.homepage}/files/${pname}-${version}.tar.gz"; + url = "https://liba52.sourceforge.net/files/${pname}-${version}.tar.gz"; sha256 = "oh1ySrOzkzMwGUNTaH34LEdbXfuZdRPu9MJd5shl7DM="; }; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { "--enable-shared" ]; + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; + # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686 # which can also be fixed with # hardeningDisable = lib.optional stdenv.isi686 "pic"; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 8234891046d..ebb989c9403 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -1,41 +1,42 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, libuuid, zlib, openssl, lib }: +{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, openssl, lib }: stdenv.mkDerivation rec { pname = "drogon"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "an-tao"; repo = "drogon"; rev = "v${version}"; - sha256 = "0ncdlsi3zhmpdwh83d52npb1b2q982y858yl88zl2nfq4zhcm3wa"; + sha256 = "18wn9ashv3h3pal6x5za6y7byfcrd49zy3wfx4hx0ygxzplmss0r"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - # examples are used in the test during installCheckPhase, otherwise they are unnecessary - "-DBUILD_EXAMPLES=${if doInstallCheck then "ON" else "OFF"}" + "-DBUILD_TESTING=${if doInstallCheck then "ON" else "OFF"}" + "-DBUILD_EXAMPLES=OFF" ]; propagatedBuildInputs = [ jsoncpp - libuuid + libossp_uuid zlib openssl ]; patches = [ - # this part of the test fails because it attempts to configure a CMake project that uses find_package on itself - # the rest of the test runs fine because it uses executables that are built in buildPhase when BUILD_EXAMPLES is enabled - ./no_cmake_test.patch + # this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself + # this patch makes drogon and trantor visible to the test + ./fix_find_package.patch ]; + # modifying PATH here makes drogon_ctl visible to the test installCheckPhase = '' cd .. patchShebangs test.sh - ./test.sh + PATH=$PATH:$out/bin ./test.sh ''; doInstallCheck = true; diff --git a/pkgs/development/libraries/drogon/fix_find_package.patch b/pkgs/development/libraries/drogon/fix_find_package.patch new file mode 100644 index 00000000000..b76dbfe4883 --- /dev/null +++ b/pkgs/development/libraries/drogon/fix_find_package.patch @@ -0,0 +1,13 @@ +diff --git a/test.sh b/test.sh +index f017b9a..027031e 100755 +--- a/test.sh ++++ b/test.sh +@@ -135,7 +135,7 @@ if [ $os = "windows" ]; then + conan install $src_dir -s compiler="Visual Studio" -s compiler.version=16 -sbuild_type=Debug -g cmake_paths + cmake_gen="$cmake_gen -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake -DCMAKE_INSTALL_PREFIX=$src_dir/install" + fi +-cmake .. $cmake_gen ++cmake .. $cmake_gen -DDrogon_DIR=$out/lib/cmake/Drogon -DTrantor_DIR=$out/lib/cmake/Trantor + + if [ $? -ne 0 ]; then + echo "Failed to run CMake for example project" diff --git a/pkgs/development/libraries/drogon/no_cmake_test.patch b/pkgs/development/libraries/drogon/no_cmake_test.patch deleted file mode 100644 index 8d38fbf44b7..00000000000 --- a/pkgs/development/libraries/drogon/no_cmake_test.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/test.sh b/test.sh -index e5da08e..ba620cc 100755 ---- a/test.sh -+++ b/test.sh -@@ -157,37 +157,6 @@ cd ../views - - echo "Hello, world!" >>hello.csp - --cd ../build --if [ $os = "windows" ]; then -- conan install $src_dir -s compiler="Visual Studio" -s compiler.version=16 -sbuild_type=Debug -g cmake_paths -- cmake_gen="$cmake_gen -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake -DCMAKE_INSTALL_PREFIX=$src_dir/install" --fi --cmake .. $cmake_gen -- --if [ $? -ne 0 ]; then -- echo "Error in testing" -- exit -1 --fi -- --cmake --build . -- $make_flags -- --if [ $? -ne 0 ]; then -- echo "Error in testing" -- exit -1 --fi -- --if [ $os = "linux" ]; then -- if [ ! -f "drogon_test" ]; then -- echo "Failed to build drogon_test" -- exit -1 -- fi --else -- if [ ! -f "Debug\drogon_test.exe" ]; then -- echo "Failed to build drogon_test" -- exit -1 -- fi --fi -- - cd ../../ - rm -rf drogon_test - diff --git a/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch b/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch new file mode 100644 index 00000000000..b2e71fe3aed --- /dev/null +++ b/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch @@ -0,0 +1,37 @@ +From 2d6dd1c286eb57fbf968510318cafc94888b98de Mon Sep 17 00:00:00 2001 +From: OPNA2608 <christoph.neidahl@gmail.com> +Date: Sun, 13 Jun 2021 21:56:03 +0200 +Subject: [PATCH] Darwin build fix + +--- + gspell/Makefile.am | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/gspell/Makefile.am b/gspell/Makefile.am +index 69ee421..7c58973 100644 +--- a/gspell/Makefile.am ++++ b/gspell/Makefile.am +@@ -95,6 +95,7 @@ nodist_libgspell_core_la_SOURCES = \ + $(BUILT_SOURCES) + + libgspell_core_la_LIBADD = \ ++ $(GTK_MAC_LIBS) \ + $(CODE_COVERAGE_LIBS) + + libgspell_core_la_CFLAGS = \ +@@ -161,6 +162,12 @@ gspell_private_headers += \ + gspell_private_c_files += \ + gspell-osx.c + ++libgspell_core_la_CFLAGS += \ ++ -xobjective-c ++ ++libgspell_core_la_LDFLAGS += \ ++ -framework Cocoa ++ + endif # OS_OSX + + if HAVE_INTROSPECTION +-- +2.29.3 + diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index f591246eaf8..be45a48090f 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -2,6 +2,8 @@ , fetchurl , pkg-config , libxml2 +, autoreconfHook +, gtk-doc , glib , gtk3 , enchant2 @@ -9,6 +11,7 @@ , vala , gobject-introspection , gnome +, gtk-mac-integration }: stdenv.mkDerivation rec { @@ -23,17 +26,26 @@ stdenv.mkDerivation rec { sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw"; }; + patches = [ + # Extracted from: https://github.com/Homebrew/homebrew-core/blob/2a27fb86b08afc7ae6dff79cf64aafb8ecc93275/Formula/gspell.rb#L125-L149 + ./0001-Darwin-build-fix.patch + ]; + nativeBuildInputs = [ pkg-config vala gobject-introspection libxml2 + autoreconfHook + gtk-doc ]; buildInputs = [ glib gtk3 icu + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + gtk-mac-integration ]; propagatedBuildInputs = [ @@ -53,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/gspell"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index fc4439e223e..2b912403259 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ glibmm gtkmm3 gtksourceview3 ]; meta = with lib; { - platforms = platforms.linux; + platforms = platforms.unix; homepage = "https://developer.gnome.org/gtksourceviewmm/"; description = "C++ wrapper for gtksourceview"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 4015ab02a3a..0011dc2f6e1 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -1,6 +1,16 @@ -{ stdenv, config, lib, fetchFromGitHub, cmake, libusb1, ninja, pkg-config, gcc +{ stdenv +, config +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, libusb1 +, ninja +, pkg-config +, gcc , cudaSupport ? config.cudaSupport or false, cudatoolkit -, enablePython ? false, pythonPackages ? null }: +, enablePython ? false, pythonPackages ? null +}: assert cudaSupport -> cudatoolkit != null; assert enablePython -> pythonPackages != null; @@ -24,7 +34,13 @@ stdenv.mkDerivation rec { ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]); - patches = lib.optionals enablePython [ + patches = [ + # fix build on aarch64-darwin + # https://github.com/IntelRealSense/librealsense/pull/9253 + (fetchpatch { + url = "https://github.com/IntelRealSense/librealsense/commit/beb4c44debc8336de991c983274cad841eb5c323.patch"; + sha256 = "05mxsd2pz3xrvywdqyxkwdvxx8hjfxzcgl51897avz4v2j89pyq8"; + }) ./py_sitepackage_dir.patch ./py_pybind11_no_external_download.patch ]; @@ -57,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/IntelRealSense/librealsense"; license = licenses.asl20; maintainers = with maintainers; [ brian-dawn ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index 7180587e8e6..f4eaa9c3199 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Zp1+PW0WtNzRYIA87X42CJeSzVFhi5sGi9/rlUP4Vo="; + sha256 = "sha256-AM6NxO4hjFiUAzRYbXV3fe18xwCBmzdM63n93UOxjKw="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 958be905f83..b7df32633b4 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: +{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }: stdenv.mkDerivation rec { version = "4.9.8"; pname = "nco"; - nativeBuildInputs = [ flex which antlr ]; + nativeBuildInputs = [ flex which antlr2 ]; buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ]; src = fetchzip { diff --git a/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/pkgs/development/libraries/science/chemistry/xcfun/default.nix new file mode 100644 index 00000000000..7f8ef3dc47d --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/xcfun/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub, cmake, gfortran, python3 } : + +stdenv.mkDerivation rec { + pname = "xcfun"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "dftlibs"; + repo = pname; + rev = "v${version}"; + sha256= "1bj70cnhbh6ziy02x988wwl7cbwaq17ld7qwhswqkgnnx8rpgxid"; + }; + + nativeBuildInputs = [ + cmake + gfortran + ]; + + propagatedBuildInputs = [ (python3.withPackages (p: with p; [ pybind11 ])) ]; + + cmakeFlags = [ "-DXCFUN_MAX_ORDER=3" ]; + + meta = with lib; { + description = "A library of exchange-correlation functionals with arbitrary-order derivatives"; + homepage = "https://github.com/dftlibs/xcfun"; + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 45cccf22c7d..074dfc001e6 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -3,7 +3,7 @@ # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html /*nixpkgsSource ? (builtins.fetchTarball { name = "nixpkgs-20.09"; - url = https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz; + url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy"; }), pkgs ? import nixpkgsSource {}, @@ -41,7 +41,7 @@ let # If you copy this example out of nixpkgs, something like this will work: /*androidEnvNixpkgs = fetchTarball { name = "androidenv"; - url = https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz; + url = "https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz"; sha256 = "<fill me in with nix-prefetch-url --unpack>"; }; diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index b652c28c629..9047910a213 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -14,6 +14,10 @@ buildPythonPackage rec { }; checkPhase = '' + export HOME=$TMPDIR + mkdir -p $HOME/.matplotlib + echo "backend: ps" > $HOME/.matplotlib/matplotlibrc + pushd tests py.test -Wignore::DeprecationWarning ./. popd diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 7072e9249da..641dd4ffa4f 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4q5JvkUmEoOomcwblXhvB/5Qdr6aMR0lDb4t4bjDjw8="; + sha256 = "01ywyiwqa7nyd4kprqxcycv50xydsi95q3lzidpm2r3kn1byis1y"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aladdin-connect/default.nix b/pkgs/development/python-modules/aladdin-connect/default.nix new file mode 100644 index 00000000000..d25cdadc89a --- /dev/null +++ b/pkgs/development/python-modules/aladdin-connect/default.nix @@ -0,0 +1,33 @@ +{ lib +, requests +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "aladdin-connect"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "shoejosh"; + repo = pname; + rev = version; + sha256 = "0nimd1nw1haxn8s2207fcrmpjyfp6nx97n560l6hzqyqqmf2d1d1"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "aladdin_connect" ]; + + meta = with lib; { + description = "Python library for interacting with Genie Aladdin Connect devices"; + homepage = "https://github.com/shoejosh/aladdin-connect"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/anyascii/default.nix b/pkgs/development/python-modules/anyascii/default.nix new file mode 100644 index 00000000000..8e8b1c92073 --- /dev/null +++ b/pkgs/development/python-modules/anyascii/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "anyascii"; + version = "0.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b6jdd9nx15py0jqjdn154m6m491517sqlk57bbyj3x4xzywadkh"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Unicode to ASCII transliteration"; + homepage = "https://github.com/anyascii/anyascii"; + license = licenses.isc; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix index c4df114e24d..96e18d76ba7 100644 --- a/pkgs/development/python-modules/coqpit/default.nix +++ b/pkgs/development/python-modules/coqpit/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "coqpit"; - version = "0.0.6.6"; + version = "0.0.9"; format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = pname; rev = "v${version}"; - sha256 = "0wb5wf84i5h4ycm732kn4316v7schhm91s2rrklfw9sny5dqmdnh"; + sha256 = "1dh3bp7m9fjfrfrahblibrx91sagndkdi0325ail63kyvlhzbkma"; }; checkInputs = [ @@ -32,6 +32,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/coqui-ai/coqpit"; license = licenses.mit; - maintainers = with maintainers; [ hexa mic92 ]; + maintainers = teams.tts.members; }; } diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 36430a29ef0..4a2a410c4ad 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -1,18 +1,23 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , stringcase , typing-inspect , marshmallow-enum +, hypothesis +, mypy +, pytestCheckHook }: buildPythonPackage rec { pname = "dataclasses-json"; version = "0.5.2"; - src = fetchPypi { - inherit pname version; - sha256 = "56ec931959ede74b5dedf65cf20772e6a79764d20c404794cce0111c88c085ff"; + src = fetchFromGitHub { + owner = "lidatong"; + repo = pname; + rev = "v${version}"; + sha256 = "1gcnm41rwg0jvq4vhr57vv9hyasws425zl8h4p05x2nzq86l0w1n"; }; propagatedBuildInputs = [ @@ -21,6 +26,19 @@ buildPythonPackage rec { marshmallow-enum ]; + checkInputs = [ + hypothesis + mypy + pytestCheckHook + ]; + + disabledTests = [ + # AssertionError: Type annotations check failed + "test_type_hints" + ]; + + pythonImportsCheck = [ "dataclasses_json" ]; + meta = with lib; { description = "Simple API for encoding and decoding dataclasses to and from JSON"; homepage = "https://github.com/lidatong/dataclasses-json"; diff --git a/pkgs/development/python-modules/downloader-cli/default.nix b/pkgs/development/python-modules/downloader-cli/default.nix new file mode 100644 index 00000000000..608286c8bcf --- /dev/null +++ b/pkgs/development/python-modules/downloader-cli/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, urllib3, pytest }: + +buildPythonPackage rec { + pname = "downloader-cli"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "deepjyoti30"; + repo = pname; + rev = version; + sha256 = "0gbbjxb9vf5g890cls3mwzl8lmcn6jkpgm5cbrif740mn2b4q228"; + }; + + propagatedBuildInputs = [ urllib3 ]; + + # Disable checks due to networking (Errno 101) + doCheck = false; + + pythonImportsCheck = [ "downloader_cli" ]; + + meta = with lib; { + description = "A simple downloader written in Python with an awesome customizable progressbar. "; + homepage = "https://github.com/deepjyoti30/downloader-cli"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/pkgs/development/python-modules/ecoaliface/default.nix b/pkgs/development/python-modules/ecoaliface/default.nix new file mode 100644 index 00000000000..e3001d7fa46 --- /dev/null +++ b/pkgs/development/python-modules/ecoaliface/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "ecoaliface"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hzx0r3311f952jik3pgmrg74xp5m6w9c5v6snfrb8w2m19vs6qy"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "ecoaliface" ]; + + meta = with lib; { + description = "Python library for interacting with eCoal water boiler controllers"; + homepage = "https://github.com/matkor/ecoaliface"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/enturclient/default.nix b/pkgs/development/python-modules/enturclient/default.nix new file mode 100644 index 00000000000..8ac474b6e5f --- /dev/null +++ b/pkgs/development/python-modules/enturclient/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "enturclient"; + version = "0.2.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hfurubotten"; + repo = pname; + rev = "v${version}"; + sha256 = "158xzv9c2drjgrdhfqm0xzx2d34v45gr5rnjfsi94scffvprgwrg"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "enturclient" ]; + + meta = with lib; { + description = "Python library for interacting with the Entur.org API"; + homepage = "https://github.com/hfurubotten/enturclient"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix index 38e9761952d..bf921207fc5 100644 --- a/pkgs/development/python-modules/feedparser/default.nix +++ b/pkgs/development/python-modules/feedparser/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "feedparser"; - version = "6.0.2"; + version = "6.0.6"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1b00a105425f492f3954fd346e5b524ca9cef3a4bbf95b8809470e9857aa1074"; + sha256 = "1syd15460a6m397rajdpbr9q0hgxm1j6xf9ba18z9pighxdjmxkq"; }; propagatedBuildInputs = [ sgmllib3k ]; diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 3f614258a8f..dd1dd0e34d1 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.2"; + version = "0.1.3"; src = fetchPypi { inherit pname version; - sha256 = "1qy7wv1xn7g3x5z0vvv0pwmxhin4hw2m9fs9iklnghy00vg37v0b"; + sha256 = "sha256-VFPmTKiFwwL1THpjDeFeHgssXvIRB+ppvZb9aU1yPV4="; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix new file mode 100644 index 00000000000..556bc09ed6e --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, grpc_google_iam_v1 +, mock +, proto-plus +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-cloud-appengine-logging"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rkayy2qzsc70b0rdvzd2bxwp5f07rfqb95cyj57dkphq71mrrhw"; + }; + + propagatedBuildInputs = [ + google-api-core + grpc_google_iam_v1 + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.appengine_logging" + "google.cloud.appengine_logging_v1" + ]; + + meta = with lib; { + description = "Appengine logging client library"; + homepage = "https://github.com/googleapis/python-appengine-logging"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index bd8bdc0b8c3..61e69c5b29d 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2, < 0.2.1"' + --replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2"' ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 94516e25a38..899eef02c9a 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -14,14 +14,18 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "874defad583e90e55a3e83aff27eb5fe108d9197d839cd45f3eacf2395881806"; + sha256 = "sha256-UjYzSWtP4cp0p7Is2qIGWBgEhjgTv0YeL0N9D7etIbY="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; checkInputs = [ google-cloud-storage @@ -35,10 +39,13 @@ buildPythonPackage rec { preCheck = '' # do not shadow imports rm -r google - # requires credentials - rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py ''; + disabledTestPaths = [ + # requires credentials + "tests/system/gapic/v1beta1/test_system_tables_client_v1.py" + ]; + disabledTests = [ # requires credentials "test_prediction_client_client_info" diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 8aff4915472..c7df1160631 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "98065257189388b6cc797478c4b2bdf86e9e8cdcaca5d170ded027646444a586"; + sha256 = "sha256-msjNBqYL/cUE85+80IblGAyGhM/+/ndFqf9qY5xXVik="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix new file mode 100644 index 00000000000..566c566bbe4 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, grpc_google_iam_v1 +, mock +, proto-plus +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-cloud-bigquery-logging"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s8vlw157z10yzzkrfyzfl31iad96wfl3ywk9g3gmmh0jfgy0gfj"; + }; + + propagatedBuildInputs = [ + google-api-core + grpc_google_iam_v1 + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.bigquery_logging" + "google.cloud.bigquery_logging_v1" + ]; + + meta = with lib; { + description = "Bigquery logging client library"; + homepage = "https://github.com/googleapis/python-bigquery-logging"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 0c62727ff8a..f79916e5115 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.13.1"; + version = "2.18.0"; src = fetchPypi { inherit pname version; - sha256 = "915f93c61c03d1d6024d5b19355bb96af25da9f924d0b5bab5cde851e1bd48f4"; + sha256 = "sha256-0JLyWfQKN7kYnXW/DRJp3ZH+EesLv7/CXJPmxXYtb4M="; }; propagatedBuildInputs = [ @@ -51,6 +51,8 @@ buildPythonPackage rec { # requires credentials "test_bigquery_magic" "TestBigQuery" + # Mocking of _ensure_bqstorage_client fails + "test_to_arrow_ensure_bqstorage_client_wo_bqstorage" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 786250ce9e1..f7eb9a51a8a 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -1,33 +1,55 @@ { lib , buildPythonPackage , fetchPypi -, grpc_google_iam_v1 , google-api-core , google-cloud-core -, pytest +, grpc_google_iam_v1 +, libcst , mock +, proto-plus +, pytestCheckHook }: buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "1.7.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "90bd53a19c33c34101b8567c82a6dc0386af4118d70e1ad69b49375358a21aa6"; + sha256 = "sha256-89fXmr3jHTtp8QOMFeueJwslHJ7Q6srQ/Kxsp0mLlKU="; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core google-cloud-core ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + grpc_google_iam_v1 + libcst + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; checkPhase = '' + # Prevent google directory from shadowing google imports rm -r google - pytest tests/unit -k 'not policy' ''; + disabledTests = [ + "policy" + ]; + + pythonImportsCheck = [ + "google.cloud.bigtable_admin_v2" + "google.cloud.bigtable_v2" + "google.cloud.bigtable" + ]; + meta = with lib; { description = "Google Cloud Bigtable API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-bigtable"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index ce21a27209f..d3fea60d33b 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "c62d15f58459fbe83ba5789f800ac27b4be9a1d7735f6c6b702cd6c3f8c6f0c9"; + sha256 = "sha256-59k8o5ndb7X9D5kZAkhTHJxYPRqF580snuSFSVRZ7ng="; }; propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 0115524d546..c7dce6cba11 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TADApBkE4DvEFkVFy56Flh2s6XR9uGxzGTf5aspohsA="; + sha256 = "sha256-blNz/r5CDisjddIlKychKfEaN/8biKdYcyKTEGO+jTg="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 4c8c79c7dda..dae19022d06 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,24 +13,37 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.1.0"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "1yyk9ix1jms5q4kk76cfxzy42wzzyl5qladdswjy5l0pg6iypr8i"; + sha256 = "sha256-56UQdZudVf9jyYPjxCy/XDX5tzEPTWEevjaX2mV2vLQ="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + libcst + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; preCheck = '' # directory shadows imports rm -r google - # requires credentials - rm tests/system/test_system.py ''; + disabledTestPaths = [ + # Requires credentials + "tests/system/test_system.py" + ]; + pythonImportsCheck = [ "google.cloud.datastore" "google.cloud.datastore_admin_v1" diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 47f0522e1a6..4674c1ce1dd 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "193c2c012639f0c063999e0b899f92d70763be605d5528f3d1da93d6734a1aa8"; + sha256 = "sha256-sPSPx5Y36MOjd81D8qDMpkWJ3YWQfRlEHqBn3N75NB4="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 8a481945efb..8aae0c072a0 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -21,12 +21,21 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace 'google-cloud-logging>=1.14.0, <2.1' 'google-cloud-logging>=1.14.0' + --replace 'google-cloud-logging>=1.14.0, <2.4' 'google-cloud-logging>=1.14.0' ''; - propagatedBuildInputs = [ google-cloud-logging libcst proto-plus ]; + propagatedBuildInputs = [ + google-cloud-logging + libcst + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # require credentials @@ -34,8 +43,8 @@ buildPythonPackage rec { "test_report_exception" ]; - # prevent google directory from shadowing google imports preCheck = '' + # prevent google directory from shadowing google imports rm -r google ''; diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index f0aac21ee31..4ff4c920c8a 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kG68fG9EqwvE72nzc89MXwEQ/YYEM9tYH6zK2iTCFJo="; + sha256 = "sha256-73sKlKHX7ThsdZJyT22wiqbema7o3aOIaWS8WYrri+w="; }; propagatedBuildInputs = [ @@ -39,10 +39,10 @@ buildPythonPackage rec { rm -r google ''; - pytestFlagsArray = [ - # tests are broken - "--ignore=tests/system/test_system.py" - "--ignore=tests/system/test_system_async.py" + disabledTestPaths = [ + # Tests are broken + "tests/system/test_system.py" + "tests/system/test_system_async.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix new file mode 100644 index 00000000000..55d36ac2a7c --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, grpc_google_iam_v1 +, mock +, proto-plus +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-cloud-iam-logging"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "19a8s634w2m1b16zq8f185cpaw7k6d0c7c61g1vzm19jl213rhiw"; + }; + + propagatedBuildInputs = [ + google-api-core + grpc_google_iam_v1 + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.iam_logging" + "google.cloud.iam_logging_v1" + ]; + + meta = with lib; { + description = "IAM Service Logging client library"; + homepage = "https://github.com/googleapis/python-iam-logging"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 243c2b86c1e..ddcc20c66bc 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d34604508e3e87b9161ccd5ff29474867ac91ffb8d29e1a2fc9ff0e26d934b73"; + sha256 = "sha256-H2S3jIVMBinyCQMBHW3vKMmBzlaCpSIQMfauHKoKH+o="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 55efb8e2c2d..458d5b720c0 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yi3lG7tKi2BkU7vtMIEPsll1UX/JxrNj4G+DJaGQ/+k="; + sha256 = "sha256-BuAqNkK817Zz4dbI16ttoVnapR+8DDrp8RGDZtUej7s="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 7ca698b6645..56932ec4859 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b463704affab327c1d3fa4af280a858635b5f59a88456b2a08db62a336a352aa"; + sha256 = "sha256-7qVemc7siW/8mO4wUXEKJBt9M18kagRyu/+7DLLe9FM="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 1a11fcfc731..6bce8cc5a89 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -13,24 +13,37 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5gyqZ+JthC/Qja8ZCX79r4K+evuZY5jPZ73cA6hrgSA="; + sha256 = "sha256-hwZVe3FTLHauxIQJ3KwYnKrEfPLey4hQrnVpS/cDJrI="; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + grpc_google_iam_v1 + google-api-core + libcst + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; preCheck = '' # prevent google directory from shadowing google imports rm -r google - # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com - rm -r tests/unit/pubsub_v1 ''; + disabledTestPaths = [ + # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com + "tests/unit/pubsub_v1" + ]; + pythonImportsCheck = [ "google.cloud.pubsub" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 8787eb6779a..9070d2f083e 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "957f436986275dcc82483906b424dcabe8d1f8c08ae5c9677bf7547a314b0a59"; + sha256 = "sha256-2X/ek2ECarZ/U1V6j+nz2yYSGVmrWG/kU/QqQB1A+0w="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 0a3285566f1..588918ad62e 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.32.1"; + version = "0.32.2"; src = fetchPypi { inherit pname version; - sha256 = "1bd8hlp0ssi20ds4gknbxai8mih6xiz8b60ab7p0ngpdqp1kw52p"; + sha256 = "sha256-UoWu+Y/bmmkefFR4nnxJPFFnS253/myWcXKujq27oCY="; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 184044594d5..ac630ba27c4 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.1.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1lgz6qpsfv4b7p5ff4sdpjpaddxpbazdvlcrqr1i0c0qil2lkm2i"; + sha256 = "sha256-cyJ58BPB7mYWbmHFxPAxnf2JX0b8kqLJF4hdcppaNNI="; }; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 726e48ee192..eae38f5dfc1 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,25 +14,42 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XnOCmxQ6YCO1C7RYHzcZY4ihrt2KommWTkTD9y+B5tg="; + sha256 = "sha256-8o7pr9msuMfIN7UMX+/gppmD3MWXt2hBqb7vcLUE22M="; }; - propagatedBuildInputs = [ google-cloud-core grpc_google_iam_v1 libcst proto-plus sqlparse ]; + propagatedBuildInputs = [ + google-cloud-core + grpc_google_iam_v1 + libcst + proto-plus + sqlparse + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; preCheck = '' # prevent google directory from shadowing google imports rm -r google - # disable tests which require credentials - rm tests/system/test_{system,system_dbapi}.py - rm tests/unit/spanner_dbapi/test_{connect,connection,cursor}.py ''; + disabledTestPaths = [ + # Requires credentials + "tests/system/test_system.py" + "tests/system/test_system_dbapi.py" + "tests/unit/spanner_dbapi/test_connect.py" + "tests/unit/spanner_dbapi/test_connection.py" + "tests/unit/spanner_dbapi/test_cursor.py" + ]; + pythonImportsCheck = [ "google.cloud.spanner_admin_database_v1" "google.cloud.spanner_admin_instance_v1" diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 2261345f420..bccc2ad8bac 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.2.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AviYDI68Z11M/rqHgQTQugYNemPTA5nW4aVQTiwMYxI="; + sha256 = "sha256-mR7gYBvJVhEOhzruGnREHWYiexDNWBGVV1Q1iEOE84s="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 40d70176c5d..e54a5247982 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.37.0"; + version = "1.38.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IAPF7Uc/mzfQRfMMTIvn0w19Dripe80sWLOovFScTMw="; + sha256 = "sha256-FiAR1m9kuNxdeTZgml2vAGbMUhIxVGrqAsEmpVWURsQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index c01c294ec33..d04c996acf9 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "6be2f2bca14b4eb1c1bdb0f4ba1dadf791e79a2a3e1fae762e5631a3d9fe094e"; + sha256 = "sha256-fMJNOJBzxAr0Hi/AkUF97G5YrwfbmxKVhT/D1UXIDP4="; }; propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index ab4415e3412..f1cbf3f307a 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zzssVnXA1xe3270yEOREJ9GdmyRPjV1F4EBelf9AQ/c="; + sha256 = "sha256-xQzCG134i2lmgNiqw6tshoIMDk0HHWpdzZtjSkVs9Z8="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 486a71c7a97..9f814c36c2b 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1lvcm4w1l7hiqg64kdscch3f3bq19q9ii49xj4lljn2a4xffxl8v"; + sha256 = "sha256-NoNHel10dFEzKjjWyM6mUrWZHbH25MOZB/o2eXCKwhg="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index a884919c7e1..b1167433b4c 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,16 +14,26 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zVRD2lWRaKtSlZn84Rqpj+a1OT7Wcak524TKsBctueE="; + sha256 = "sha256-jNlX9LKajHqYPgpCfCcSUzxBu3AHt2qMyI1sZQdcZ5o="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + libcst + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; preCheck = '' # prevent shadowing imports diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index f56b00af0a5..c68db2bfece 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gn/KWf3A4SkTqt9rqwYcsaxvfKXPvb7DXJ+zryGjWIA="; + sha256 = "sha256-CBBt3uyQon9Lxwb3Jn7BxS8r/3Rbr9RxC8aJhGDI6aY="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 5857de341d2..2a98edced7a 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6XYHADzyk0/WSGk9wni9bOtVURJ+U2Eve8LAh0Eg7KI="; + sha256 = "sha256-Nnqm+f2OSKBRTOpuB7PQBvAaunCA8XoontDfkuh/f4Q="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 971f5cce90e..5598a98cf83 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lrMnp9jVndz0C8VdreVudYdwh7zSdRniPHYm9BNdjak="; + sha256 = "sha256-Lg6yoqOu88lZHT/H9FPdgVgSDm7oLUaPm7T1UsXB8Fo="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix new file mode 100644 index 00000000000..6081f914c64 --- /dev/null +++ b/pkgs/development/python-modules/herepy/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, requests +, pytestCheckHook +, responses +}: + +buildPythonPackage rec { + pname = "herepy"; + version = "3.5.2"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "abdullahselek"; + repo = "HerePy"; + rev = version; + sha256 = "0z1brgnrzdzfmnydipja4hhrhnz4fwdjy3xa05mz28bwi6z52bcj"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ "herepy" ]; + + meta = with lib; { + description = "Library that provides a Python interface to the HERE APIs"; + homepage = "https://github.com/abdullahselek/HerePy"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix new file mode 100644 index 00000000000..d1bacfbe826 --- /dev/null +++ b/pkgs/development/python-modules/idasen/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, bleak +, pyyaml +, voluptuous +, pytestCheckHook +, pytest-asyncio +, poetry-core +}: + +buildPythonPackage rec { + pname = "idasen"; + version = "0.7.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "newAM"; + repo = "idasen"; + rev = "v${version}"; + sha256 = "1jdgdby33fd63mnxrfv04dz4fsrikkfmc0ybwwxi816mbkml7n34"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bleak + pyyaml + voluptuous + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ "idasen" ]; + + meta = with lib; { + description = "Python API and CLI for the ikea IDÅSEN desk"; + homepage = "https://github.com/newAM/idasen"; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index f81ceabd27e..9081a30ac6b 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -28,5 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/inflect"; changelog = "https://github.com/jaraco/inflect/blob/v${version}/CHANGES.rst"; license = licenses.mit; + maintainers = teams.tts.members; }; } diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 38f6f58910d..21e614d7d7c 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.17.0"; + version = "1.18.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "1xxg8z9zambbhr7nmxhmvmiwkd4578zxr6rl2vhdh2w77idsw29z"; + sha256 = "0xgp1wxdfa4y316dfkpmj38chlh68mndr8kqphckpnw16qxsl3d9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/itunespy/default.nix b/pkgs/development/python-modules/itunespy/default.nix new file mode 100644 index 00000000000..4720101d817 --- /dev/null +++ b/pkgs/development/python-modules/itunespy/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests, pycountry, mypy }: + +buildPythonPackage rec { + pname = "itunespy"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "sleepyfran"; + repo = pname; + rev = version; + sha256 = "0yc3az5531qs8nbcw4rhgrszwczgy4bikfwfar7xb2044360sslw"; + }; + + propagatedBuildInputs = [ requests pycountry mypy ]; + + # This module has no tests + doCheck = false; + + pythonImportsCheck = [ "itunespy" ]; + + meta = with lib; { + description = "A simple library to fetch data from the iTunes Store API"; + homepage = "https://github.com/sleepyfran/itunespy"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix index b515cd92b23..8b7146ebef9 100644 --- a/pkgs/development/python-modules/jieba/default.nix +++ b/pkgs/development/python-modules/jieba/default.nix @@ -29,5 +29,6 @@ buildPythonPackage rec { description = "Chinese Words Segementation Utilities"; homepage = "https://github.com/fxsjy/jieba"; license = licenses.mit; + maintainers = teams.tts.members; }; } diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 4e762e456ce..8df7d6f6e00 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -1,35 +1,65 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pbr, click, dataclasses-json, htmlmin, jinja2, markdown2, pygments, pytz, pyyaml, requests, pytestCheckHook, beautifulsoup4, tox +{ lib +, beautifulsoup4 +, buildPythonPackage +, click +, dataclasses-json +, fetchFromGitHub +, htmlmin +, jinja2 +, markdown2 +, pbr +, pygments +, pytestCheckHook +, pytz +, pyyaml +, requests }: buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.27.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "coveooss"; repo = pname; rev = "v${version}"; - sha256 = "0d2a4a2lcqssr5g9rmc76f86nkqc9grixh507vzc9fi1h3gbi765"; + sha256 = "1aj1w0qxdw8d6mf5vngk0xjgs7z8vzwc2aycahnkqg7q3cagq19n"; }; nativeBuildInputs = [ pbr ]; + propagatedBuildInputs = [ - click dataclasses-json htmlmin jinja2 markdown2 - pygments pytz pyyaml requests + click + dataclasses-json + htmlmin + jinja2 + markdown2 + pygments + pytz + pyyaml + requests ]; preBuild = '' export PBR_VERSION=0.0.1 ''; - checkInputs = [ pytestCheckHook beautifulsoup4 ]; - pytestFlagsArray = [ "--ignore tests/generate_test.py" ]; + checkInputs = [ + beautifulsoup4 + pytestCheckHook + ]; + + disabledTests = [ + # Tests require network access + "test_references_url" + ]; + + pythonImportsCheck = [ "json_schema_for_humans" ]; meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; - homepage = "https://github.com/coveooss/json-schema-for-humans"; - license = licenses.asl20; + homepage = "https://github.com/coveooss/json-schema-for-humans"; + license = licenses.asl20; maintainers = with maintainers; [ astro ]; }; } diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index ed6e7755bf1..314bc82cd4f 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -1,21 +1,22 @@ { lib +, black , buildPythonPackage +, dataclasses , fetchFromGitHub -, pythonOlder , hypothesis -, dataclasses -, hypothesmith -, pytestCheckHook +, isort +, pytest +, python +, pythonOlder , pyyaml , typing-extensions , typing-inspect -, black -, isort }: buildPythonPackage rec { pname = "libcst"; version = "0.3.18"; + disabled = pythonOlder "3.6"; # Some files for tests missing from PyPi # https://github.com/Instagram/LibCST/issues/331 @@ -26,25 +27,37 @@ buildPythonPackage rec { sha256 = "sha256-19yGaKBLpGASSPv/aSX0kx9lh2JxKExHJDKKtuBbuqI="; }; - disabled = pythonOlder "3.6"; - - propagatedBuildInputs = [ hypothesis typing-extensions typing-inspect pyyaml ] - ++ lib.optional (pythonOlder "3.7") dataclasses; - - checkInputs = [ black hypothesmith isort pytestCheckHook ]; + propagatedBuildInputs = [ + hypothesis + typing-extensions + typing-inspect + pyyaml + ] ++ lib.optional (pythonOlder "3.7") [ + dataclasses + ]; - # can't run tests due to circular dependency on hypothesmith -> licst - doCheck = false; + checkInputs = [ + black + isort + pytest + ]; preCheck = '' - python -m libcst.codegen.generate visitors - python -m libcst.codegen.generate return_types + ${python.interpreter} -m libcst.codegen.generate visitors + ${python.interpreter} -m libcst.codegen.generate return_types + # Can't run all tests due to circular dependency on hypothesmith -> libcst + rm -r {libcst/tests,libcst/codegen/tests,libcst/m*/tests} ''; + disabledTests = [ + # No files are generated + "test_codemod_formatter_error_input" + ]; + pythonImportsCheck = [ "libcst" ]; meta = with lib; { - description = "A Concrete Syntax Tree (CST) parser and serializer library for Python."; + description = "Concrete Syntax Tree (CST) parser and serializer library for Python"; homepage = "https://github.com/Instagram/libcst"; license = with licenses; [ mit asl20 psfl ]; maintainers = with maintainers; [ ruuda SuperSandro2000 ]; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 6a6e3536733..f61ace8960d 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.8.17"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "9a15a8e39f9d0b36c91dfe0f5dd1efc8752cc1d317057840a3dbffd6ee90e068"; + sha256 = "1810deb7f780700e7e0734e1844c1b4b2525ee990b8665f7b98e3f335a31bbcf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 6a39ff347cd..221410fa3ea 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "6.0.0"; + version = "6.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YBtVWcOZDt2jQB9bHDrSCP9f2OC+IHzJKlBBGorLnZU="; + sha256 = "sha256-ncw8ILOD+i5aW78opv62VRcV58MQb5IG33MGTqNgDRk="; }; propagatedBuildInputs = [ @@ -36,10 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace requirements.txt --replace "dnspython3" "dnspython" - ''; - pythonImportsCheck = [ "mcstatus" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix new file mode 100644 index 00000000000..eec3da25e0f --- /dev/null +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ipykernel +, isPy27 +, mock +, pytest +}: + +buildPythonPackage rec { + pname = "metakernel"; + version = "0.27.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0aqq9zil6h7kxsg3v2008nr6lv47qvcsash8qzmi1xh6r4x606zy"; + }; + + propagatedBuildInputs = [ ipykernel ]; + + # Tests hang, so disable + doCheck = false; + + meta = with lib; { + description = "Jupyter/IPython Kernel Tools"; + homepage = "https://github.com/Calysto/metakernel"; + license = licenses.bsd3; + maintainers = with maintainers; [ thomasjm ]; + }; +} diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 5ae4d0b280f..e104dbff4f6 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/GV5ZhrJxeChcYwmH/9FsLceAYRSeTCDe4lMEwdTa8Y="; + sha256 = "0pj987v04y5askczlma2ilwllwfsg7p5mwhv0h1lcl1lg0fbsvn9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 1e38f401a43..129275b2987 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -1,17 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi , requests -, testfixtures, mock, requests_toolbelt -, betamax, betamax-serializers, betamax-matchers, pytest +, testfixtures +, mock +, requests_toolbelt +, betamax +, betamax-serializers +, betamax-matchers +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "prawcore"; - version = "2.0.0"; - disabled = isPy27; # see https://github.com/praw-dev/prawcore/pull/101 + version = "2.2.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tJjZtvVJkQBecn1SNcj0nqW6DJpteT+3Q7QPoInNNtE="; + sha256 = "08wiij1r3flpnqzdx8bf536yf7lqyhg9461aybhcykcw8nnjzr5x"; }; propagatedBuildInputs = [ @@ -25,18 +33,16 @@ buildPythonPackage rec { betamax-serializers betamax-matchers requests_toolbelt - pytest + pytestCheckHook ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ "prawcore" ]; meta = with lib; { description = "Low-level communication layer for PRAW"; homepage = "https://praw.readthedocs.org/"; - license = licenses.gpl3; + license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pydes/default.nix b/pkgs/development/python-modules/pydes/default.nix new file mode 100644 index 00000000000..78f131d4243 --- /dev/null +++ b/pkgs/development/python-modules/pydes/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "pydes"; + version = "unstable-2019-01-08"; + + src = fetchFromGitHub { + owner = "twhiteman"; + repo = "pyDes"; + rev = "e988a5ffc9abb8010fc75dba54904d1c5dbe83db"; + sha256 = "0sic8wbyk5azb4d4m6zbc96lfqcw8s2pzcv9nric5yqc751613ww"; + }; + + checkPhase = "python test_pydes.py"; + + pythonImportsCheck = [ "pyDes" ]; + + meta = with lib; { + description = "A pure python module which implements the DES and Triple-DES encryption algorithms"; + homepage = "https://github.com/twhiteman/pyDes"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/pkgs/development/python-modules/pypca/default.nix b/pkgs/development/python-modules/pypca/default.nix new file mode 100644 index 00000000000..86adb4e3e14 --- /dev/null +++ b/pkgs/development/python-modules/pypca/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, colorlog +, fetchPypi +, pythonOlder +, pyserial +}: + +buildPythonPackage rec { + pname = "pypca"; + version = "0.0.13"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0y0p2rm22x21mykipiv42fjc79b0969qsbhk3cqkrdnqwh5psbdl"; + }; + + propagatedBuildInputs = [ + colorlog + pyserial + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pypca" ]; + + meta = with lib; { + description = "Python library for interacting with the PCA 301 smart plugs"; + homepage = "https://github.com/majuss/pypca"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 9615e07d7c7..edefbf16ca2 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "mozillazg"; repo = "python-pinyin"; rev = "v${version}"; - sha256 = "1s01dd5n6cgjg24dmji0abxkyvr1yi18lx4rpm9z54v0q3wkccg9"; + sha256 = "0i0ggizkgd809ylz74j1v5lfpyifz3wypj6f8l8fr5ad7a7r9s09"; }; postPatch = '' @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/mozillazg/python-pinyin"; changelog = "https://github.com/mozillazg/python-pinyin/blob/master/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ hexa mic92 ]; + maintainers = teams.tts.members; }; } diff --git a/pkgs/development/python-modules/pysbd/default.nix b/pkgs/development/python-modules/pysbd/default.nix index e1e0578c83b..f25283dbbbc 100644 --- a/pkgs/development/python-modules/pysbd/default.nix +++ b/pkgs/development/python-modules/pysbd/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Pysbd (Python Sentence Boundary Disambiguation) is a rule-based sentence boundary detection that works out-of-the-box across many languages"; homepage = "https://github.com/nipunsadvilkar/pySBD"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = teams.tts.members; }; } diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix new file mode 100644 index 00000000000..1f08eb14180 --- /dev/null +++ b/pkgs/development/python-modules/pysml/default.nix @@ -0,0 +1,37 @@ +{ lib +, async-timeout +, bitstring +, buildPythonPackage +, fetchFromGitHub +, pyserial-asyncio +}: + +buildPythonPackage rec { + pname = "pysml"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "mtdcr"; + repo = pname; + rev = version; + sha256 = "05zgrk49b2y5jflxnjww2kqg1flynl3j4ifm0jr28nk0li5wg2bs"; + }; + + propagatedBuildInputs = [ + async-timeout + bitstring + pyserial-asyncio + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "sml" ]; + + meta = with lib; { + description = "Python library for EDL21 smart meters using Smart Message Language (SML)"; + homepage = "https://github.com/mtdcr/pysml"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 49113dfad5e..bd8933be824 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , redis @@ -30,6 +31,10 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/ionelmc/python-redis-lock/issues/86 "test_no_overlap2" + ] ++ lib.optionals stdenv.isDarwin [ + # fail on Darwin because it defaults to multiprocessing `spawn` + "test_reset_signalizes" + "test_reset_all_signalizes" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 91198369101..34ef2355905 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.7.0"; + version = "6.7.1"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-Y0h5Aiu85/EWCmSc+eCtK6ZaPuu/LYZiwhXOx0XhfwQ="; + sha256 = "0g9yifv3p3zbcxbcdyg4p9k3vwvaq0vym40j3yrv534m4qbynwhk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix new file mode 100644 index 00000000000..d1471286bb8 --- /dev/null +++ b/pkgs/development/python-modules/simber/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, colorama, pytestCheckHook }: + +buildPythonPackage rec { + pname = "simber"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "deepjyoti30"; + repo = pname; + rev = version; + sha256 = "0ksc2m61j5ijj0sq6kkc0hhkmfy9f51h9z3cl2sf8g6wbr9vc47h"; + }; + + propagatedBuildInputs = [ colorama ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "simber" ]; + + meta = with lib; { + description = "Simple, minimal and powerful logger for Python"; + homepage = "https://github.com/deepjyoti30/simber"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index 8bdb69a3074..336a371c071 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, antlr, isPy3k }: +{ lib, fetchurl, buildPythonPackage, antlr2, isPy3k }: buildPythonPackage rec { pname = "PyStringTemplate"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml"; }; - propagatedBuildInputs = [ antlr ]; + propagatedBuildInputs = [ antlr2 ]; disabled = isPy3k; diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index dbf0f26c3a3..041b102ce34 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.17.5"; + version = "1.21.1"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "1v1rgr030z8s1ldv5lm1811znyd568c22pmlrzzf3ls972xk514m"; + sha256 = "sha256-mTyDfvdFrd+XKifXv7oM5Riihj0aUOBzclW3ZNI+DvI="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/unidic-lite/default.nix b/pkgs/development/python-modules/unidic-lite/default.nix new file mode 100644 index 00000000000..eec9c7022a0 --- /dev/null +++ b/pkgs/development/python-modules/unidic-lite/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "unidic-lite"; + version = "1.0.8"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "0idj4yp0sl27ylr2wzkybbh0wj7c843lp7cljw5d1m7xv5r4b7fv"; + }; + + # no tests + doCheck = false; + + pythonImportsCheck = [ + "unidic_lite" + ]; + + meta = with lib; { + description = "A small version of UniDic"; + homepage = "https://github.com/polm/unidic-lite"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 14cac499883..d3881032af1 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -5,11 +5,10 @@ , buildPythonPackage , libiconv }: -let + +buildPythonPackage rec { pname = "wasmer"; version = "1.0.0"; -in buildPythonPackage rec { - inherit pname version; src = fetchFromGitHub { owner = "wasmerio"; diff --git a/pkgs/development/python-modules/youtube-search/default.nix b/pkgs/development/python-modules/youtube-search/default.nix new file mode 100644 index 00000000000..41424aa56d2 --- /dev/null +++ b/pkgs/development/python-modules/youtube-search/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests }: + +buildPythonPackage rec { + pname = "youtube-search"; + version = "unstable-2021-02-27"; + + src = fetchFromGitHub { + owner = "joetats"; + repo = "youtube_search"; + rev = "886fe1b16c829215ee0984b6859f874b4a30d875"; + sha256 = "sha256-3ECJ6iHNzx5PLgpTFraFzAYbKnyMYRf/iJ0zajU+hlo="; + }; + + propagatedBuildInputs = [ requests ]; + + # Check disabled due to relative import with no known parent package + doCheck = false; + pythonImportsCheck = [ "youtube_search" ]; + + meta = with lib; { + description = "Tool for searching for youtube videos to avoid using their heavily rate-limited API"; + homepage = "https://github.com/joetats/youtube_search"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 545c9e165a1..67d9e39af62 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "scheme-bytestructures"; - version = "1.0.7"; + version = "1.0.10"; src = fetchFromGitHub { owner = "TaylanUB"; repo = pname; rev = "v${version}"; - sha256 = "0q0habjiy3h9cigb7q1br9kz6z212dn2ab31f6dgd3rrmsfn5rvb"; + sha256 = "04oDvwvzTRzAVyywbcCm3Ug3p3xNbxjI7nOKYakEZZI="; }; postConfigure = '' diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile b/pkgs/development/tools/analysis/brakeman/Gemfile new file mode 100644 index 00000000000..1ff5490b0a7 --- /dev/null +++ b/pkgs/development/tools/analysis/brakeman/Gemfile @@ -0,0 +1,2 @@ +source "https://rubygems.org" +gem "brakeman" diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/development/tools/analysis/brakeman/Gemfile.lock new file mode 100644 index 00000000000..13425cf9ee7 --- /dev/null +++ b/pkgs/development/tools/analysis/brakeman/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + brakeman (5.0.4) + +PLATFORMS + ruby + +DEPENDENCIES + brakeman + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix index 3ac6b34f948..72c4b1fbc3e 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -1,11 +1,11 @@ -{ lib, ruby, buildRubyGem }: +{ lib, ruby, bundlerApp, bundlerUpdateScript }: -buildRubyGem rec { - inherit ruby; - name = "${gemName}-${version}"; - gemName = "brakeman"; - version = "5.0.0"; - source.sha256 = "0k1ynqsr9b0vnxqb7d5hbdk4q1i98zjzdnx4y1ylikz4rmkizf91"; +bundlerApp rec { + pname = "brakeman"; + exes = [ "brakeman" ]; + gemdir = ./.; + + passthru.updateScript = bundlerUpdateScript "brakeman"; meta = with lib; { description = "Static analysis security scanner for Ruby on Rails"; diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/development/tools/analysis/brakeman/gemset.nix new file mode 100644 index 00000000000..f37158353e0 --- /dev/null +++ b/pkgs/development/tools/analysis/brakeman/gemset.nix @@ -0,0 +1,12 @@ +{ + brakeman = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1czqmrqbli2cnw4vv4pzz8bk78c7lpcnnyba74cj632swv1za6jd"; + type = "gem"; + }; + version = "5.0.4"; + }; +} diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 8d76b8925dc..c1060744f44 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -2,30 +2,54 @@ , buildGoModule , fetchFromGitHub , protobuf +, git }: buildGoModule rec { pname = "buf"; - version = "0.41.0"; + version = "0.43.2"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f1UcvsXWW+fMAgTRtHkEXmUN/DTrJ/Xd+9HbR2FjFog="; + sha256 = "sha256-Go0wLcJrxMgB67WlAI7TwX2UU2sQ/yfmC0h2igOkjc4="; + leaveDotGit = true; # Required by TestWorkspaceGit }; + vendorSha256 = "sha256-HT0dsGniBoQW2Y7MhahDeFvE0nCASoPdzHETju0JuRY="; patches = [ ./skip_test_requiring_network.patch ]; + nativeBuildInputs = [ protobuf ]; + checkInputs = [ git ]; + + ldflags = [ "-s" "-w" ]; + preCheck = '' export PATH=$PATH:$GOPATH/bin + # To skip TestCloneBranchAndRefToBucket + export CI=true ''; - nativeBuildInputs = [ protobuf ]; + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + dir="$GOPATH/bin" + # Only install required binaries, don't install testing binaries + for file in \ + "buf" \ + "protoc-gen-buf-breaking" \ + "protoc-gen-buf-lint" \ + "protoc-gen-buf-check-breaking" \ + "protoc-gen-buf-check-lint"; do + cp "$dir/$file" "$out/bin/" + done - vendorSha256 = "sha256-XMGXVsSLEzuzujX5Fg3LLkgzyJY+nIBJEO9iI2t9eGc="; + runHook postInstall + ''; meta = with lib; { description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ce3264e1add..d154adbdc1b 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.12.0"; + version = "14.0.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { - url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0m0r295520jy45wn8jw3jzhiixl4c6yrfx7gvgbd4c1v4y8ivrci"; + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64"; + sha256 = "156dm6kg154fyn3axgw7kcpq9xz8mxdyhch8snp0vxzh941sc74w"; }; docker_arm = fetchurl { - url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0syfggplp19bbmhhpyc17h0f1dii9hc6n04q483l0xdk7sv39fwx"; + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm"; + sha256 = "0cnjbcc3bdiahff3iyxwppj9gwaj7r7x80hk2cv2q4hkdpsji655"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "01ajl7zka5fnph5zcnp3z6ir8xr81wzkam69gxazwjb3nbs642an"; + sha256 = "14g78m5h5d02k04lc07jc8yp7sqmfkjif589rb8wkb9jmbh7glmi"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 40238d0effa..45b5f185880 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, antlr +{ mkDerivation, lib, fetchFromGitHub, cmake , qtbase, qttools, sqlite }: mkDerivation rec { @@ -16,7 +16,7 @@ mkDerivation rec { # but qscintilla is currently in a bit of a mess as some consumers expect a # -qt4 or -qt5 prefix while others do not. # We *really* should get that cleaned up. - buildInputs = [ antlr qtbase sqlite ]; + buildInputs = [ qtbase sqlite ]; nativeBuildInputs = [ cmake qttools ]; diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix index 133db2d9ff0..3045842d91f 100644 --- a/pkgs/development/tools/fission/default.nix +++ b/pkgs/development/tools/fission/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fission"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; rev = version; - sha256 = "0izvkjd7ydcxhr6zmgrbfm3ybz2kf4p27099lr07gd4x7c6xxmqr"; + sha256 = "sha256-WCynU5+d789d584JH99jmTZSEbyco2ysuBXIC2pW1r4="; }; - vendorSha256 = "12clw0wy4lypf45imqnabj39yxqpi348csr4m5d0d1rksxgvwngq"; + vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg="; buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}"; diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index c8339fe6d85..0b1e8d16b65 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.4"; + version = "3.14.5"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RFVn5aL5MqsB7heDPVUci3Eyq6F/qo3RmdEaZbsC+Ng="; + sha256 = "sha256-Er9V6mSe4Pt/RzFAPa3ci3J7FQh5GLbh9CjYHx/HnYM="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-hyupBMRKuw77SJNIk3mEUixV0LV5mEmZx8M70qGmYJY="; + vendorSha256 = "sha256-9M6SSxMQ8JMJ7ZNl8cjQuid/B0xc28/BuPozxftthe0="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix index 2f7c088cd48..d7715d67acb 100644 --- a/pkgs/development/tools/gamecube-tools/default.nix +++ b/pkgs/development/tools/gamecube-tools/default.nix @@ -2,7 +2,7 @@ , freeimage, libGL }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.0.4"; pname = "gamecube-tools"; nativeBuildInputs = [ autoreconfHook ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "devkitPro"; repo = "gamecube-tools"; rev = "v${version}"; - sha256 = "0zvpkzqvl8iv4ndzhkjkmrzpampyzgb91spv0h2x2arl8zy4z7ca"; + sha256 = "sha256-0iMY2LokfsYgHzIuFc8RlrVlJCURqVqprP54PG4oW0M="; }; meta = with lib; { diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index f4ff5dd2b94..32af811c000 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.41.0"; + version = "1.41.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-ogH3L2EG0xdGpCaEfMUYnCWyFTGgx/C/O54mMxcJSBA="; + sha256 = "sha256-7xokU2uw7oiXhirTKuNfqJ143PlnI7M1zSixT0S6jtE="; }; - vendorSha256 = "sha256-gYulktNetcgXk43Ydk4+WEMZMFCrmx6p5VnsFIJdQhk="; + vendorSha256 = "sha256-s0ZFQJIhF23FtLol1Gegljf6eyGkCmVxTKmHbQBtPvM="; doCheck = false; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index dfef3906602..1220ec90d90 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.70.0"; + version = "0.71.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-Fy7TvWJVRJI5fhfZzMuW+KBLaVLWKjk/I3Kx60Wazyo="; + sha256 = "sha256-+s2Wa+5Qznqpv84VEZCMmzy0bI1mN/BknPObYqJlaYs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index e297de7a0db..5493bf24428 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl, avro-c, libserdes }: stdenv.mkDerivation rec { pname = "kafkacat"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib rdkafka yajl ]; + buildInputs = [ zlib rdkafka yajl avro-c libserdes ]; preConfigure = '' patchShebangs ./configure diff --git a/pkgs/development/tools/misc/c2ffi/default.nix b/pkgs/development/tools/misc/c2ffi/default.nix new file mode 100644 index 00000000000..b7a5b1dc7eb --- /dev/null +++ b/pkgs/development/tools/misc/c2ffi/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, cmake +, llvmPackages_11 +, unstableGitUpdater +}: + +let + c2ffiBranch = "llvm-11.0.0"; + llvmPackages = llvmPackages_11; +in + +llvmPackages.stdenv.mkDerivation { + pname = "c2ffi-${c2ffiBranch}"; + version = "unstable-2021-04-15"; + + src = fetchFromGitHub { + owner = "rpav"; + repo = "c2ffi"; + rev = "0255131f80b21334e565231331c2b451b6bba8c4"; + sha256 = "0ihysgqjyg5xwi098hxf15lpdi6g4nwpzczp495is912c48fy6b6"; + }; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/rpav/c2ffi.git"; + branch = c2ffiBranch; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + llvmPackages.llvm + llvmPackages.clang + llvmPackages.libclang + ]; + + # This isn't much, but... + doInstallCheck = true; + installCheckPhase = '' + $out/bin/c2ffi --help 2>&1 >/dev/null + ''; + + # LLVM may be compiled with -fno-rtti, so let's just turn it off. + # A mismatch between lib{clang,LLVM}* and us can lead to the link time error: + # undefined reference to `typeinfo for clang::ASTConsumer' + CXXFLAGS="-fno-rtti"; + + meta = with lib; { + homepage = "https://github.com/rpav/c2ffi"; + description = "An LLVM based tool for extracting definitions from C, C++, and Objective C header files for use with foreign function call interfaces"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ attila-lendvai ]; + }; +} diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index 262d8c4945e..336cbef9bae 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "knurling-rs"; repo = pname; rev = "v${version}"; - sha256 = "avaGBIKldr+1Zwq+7NOHt2wldmY/6Lb6bi9uVHZFI5Q="; + sha256 = "0jvyqynhg2fva29bzj4wrg3f22xpvl1hdf9kqws2c3wdiz9lc8l4"; }; - cargoSha256 = "HmDKfb8F6sGnaX64FR3No2GbBYm4bVopbjs8d35WiZQ="; + cargoSha256 = "1jijpm4k3py09k9w9a2zj1795r02wsa53r4sxa4ws96d4gkv4x5b"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 117ac7ba00a..48250297e49 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "1p6k5al8vvafz2w4z27jnyw8w2cp316h70dlx40ir4c3lk511n2j"; + sha256 = "0idx4664p9ggv8p2pwgpch42li9ksiilszpwva19y4fa5xrmcyr2"; }; - cargoSha256 = "0ssfny11pv2b4zz7lh28cv603slp54pbcgj18y9k7b6jjajrz67q"; + cargoSha256 = "1hc7zvrfiiijk4wr6i5jk6k32nz0lf64gqin3n8b8x5pp9d8fcfk"; cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] ++ lib.optionals luauSupport [ "--features" "luau" ]; diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index eb12f9e1dcd..6ff541b933c 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "symfony-cli"; - version = "4.25.2"; + version = "4.25.4"; src = fetchurl { url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; - sha256 = "8bfa53c1479883e9b48d2e4e5d3f6f7a511df73d65fe5c7b07a4890ee2c75c7e"; + sha256 = "94ade97d79e6949022ac45e4f8f9c025a9e3efa54a1a891a086a24eb9a9765a7"; }; dontBuild = true; diff --git a/pkgs/development/web/protege-distribution/default.nix b/pkgs/development/web/protege-distribution/default.nix new file mode 100644 index 00000000000..49d28cb17ee --- /dev/null +++ b/pkgs/development/web/protege-distribution/default.nix @@ -0,0 +1,73 @@ +{ lib, stdenv, fetchurl, unzip, jre8, copyDesktopItems, makeDesktopItem }: + +stdenv.mkDerivation rec { + pname = "protege-distribution"; + version = "5.5.0"; + + src = fetchurl { + url = "https://github.com/protegeproject/protege-distribution/releases/download/v${version}/Protege-${version}-platform-independent.zip"; + sha256 = "092x22wyisdnhccx817mqq15sxqdfc7iz4whr4mbvzrd9di6ipjq"; + }; + + nativeBuildInputs = [ unzip copyDesktopItems ]; + + postPatch = '' + # Delete all those commands meant to change directory to the source directory + sed -i -e '3,9d' run.sh + + # Change directory to where the application is stored to avoid heavy patching + # of searchpaths + sed -i -e "2a\ + cd $out/protege" run.sh + + # Set the correct Java executable (Protege is a JRE 8 application) + substituteInPlace run.sh \ + --replace "java -X" "exec ${jre8.outPath}/bin/java -X" \ + + # Silence console logs, since these are not shown in graphical environments + sed -i -e '4,8d;21d' conf/logback.xml + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir $out + + # Delete non-Linux launch scripts + rm run.{bat,command} + + # Move launch script into /bin, giving it a recognizable name + install -D run.sh $out/bin/run-protege + + # Copy icon to where it can be found + install -D app/Protege.ico $out/share/icons/hicolor/128x128/apps/protege.ico + + # Move everything else under protege/ + mkdir $out/protege + mv {bin,bundles,conf,plugins} $out/protege + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Protege"; + desktopName = "Protege Desktop"; + icon = "protege.ico"; + comment = "OWL2 ontology editor"; + exec = "run-protege"; + }) + ]; + + meta = with lib; { + description = "The OWL2 ontology editor from Stanford, with third-party plugins included"; + homepage = "https://protege.stanford.edu/"; + downloadPage = "https://protege.stanford.edu/products.php#desktop-protege"; + maintainers = with maintainers; [ nessdoor ]; + license = with licenses; [ asl20 bsd2 epl10 lgpl3 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index d88103eba17..77c9c7adaf9 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -1,32 +1,71 @@ -{ lib, stdenv, fetchFromGitHub, cmake -, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python2, libvorbis -, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, SDL2 +, SDL2_mixer +, freetype +, libGL +, libiconv +, libpng +, libvlc +, libvorbis +, openal +, python2 # 0.9.0 crashes after character generation with py3, so stick to py2 for now +, zlib +}: +let + # the GLES backend on rpi is untested as I don't have the hardware + backend = + if (stdenv.isx86_32 || stdenv.isx86_64) then "OpenGL" else "GLES"; + +in stdenv.mkDerivation rec { pname = "gemrb"; - version = "0.8.8"; + version = "0.9.0"; src = fetchFromGitHub { owner = "gemrb"; repo = "gemrb"; rev = "v${version}"; - sha256 = "sha256-bUo+GP3r4jUjjo0FnDrif/5P2WpiIW0lJ96m+7goO/A="; + sha256 = "sha256-h/dNPY0QZ2m7aYgRla3r1E8APJqO99ePa2ABhhh3Aoc="; }; - # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl - # reqs) optional - buildInputs = [ freetype python2 openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ]; + buildInputs = [ + SDL2 + SDL2_mixer + freetype + libGL + libiconv + libpng + libvlc + libvorbis + openal + python2 + zlib + ]; nativeBuildInputs = [ cmake ]; - # TODO: add proper OpenGL support. We are currently (0.8.8) getting a shader - # error on execution when enabled. + LIBVLC_INCLUDE_PATH = "${lib.getDev libvlc}/include"; + LIBVLC_LIBRARY_PATH = "${lib.getLib libvlc}/lib"; + cmakeFlags = [ + # use the Mesa drivers for video on ARM (harmless on x86) + "-DDISABLE_VIDEOCORE=ON" "-DLAYOUT=opt" - # "-DOPENGL_BACKEND=GLES" - # "-DOpenGL_GL_PREFERENCE=GLVND" + "-DOPENGL_BACKEND=${backend}" + "-DOpenGL_GL_PREFERENCE=GLVND" ]; + postInstall = '' + for s in 36 48 72 96 144; do + install -Dm444 ../artwork/gemrb-logo-glow-''${s}px.png $out/share/icons/hicolor/''${s}x''${s}/gemrb.png + done + install -Dm444 ../artwork/gemrb-logo.png $out/share/icons/gemrb.png + ''; + meta = with lib; { description = "A reimplementation of the Infinity Engine, used by games such as Baldur's Gate"; longDescription = '' @@ -36,8 +75,7 @@ stdenv.mkDerivation rec { ruleset (Baldur's Gate and Icewind Dale series, Planescape: Torment). ''; homepage = "https://gemrb.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; }; } diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index d8ab3dcc5c6..8d511c05af2 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -127,12 +127,12 @@ in rec { dracula = mkTmuxPlugin rec { pluginName = "dracula"; - version = "unstable-2021-02-18"; + version = "1.0"; src = fetchFromGitHub { owner = "dracula"; repo = "tmux"; - rev = "8d1a7fa41b773d4f7b53dfff2d9fc5166d34f104"; - sha256 = "DG+oKbTkYO4hwoOlOqW5IuCLdVEttlvLM2en4DUHyMY="; + rev = "v${version}"; + sha256 = "YINyER/HT3L7RpTclD3UNiCRj1CL4GPCBBEUJRqUyEQ="; }; meta = with lib; { homepage = "https://draculatheme.com/tmux"; @@ -576,12 +576,12 @@ in rec { yank = mkTmuxPlugin { pluginName = "yank"; - version = "unstable-2019-12-02"; + version = "unstable-2021-06-20"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-yank"; - rev = "648005db64d9bf3c4650eff694ecb6cf3e42b0c8"; - sha256 = "1zg9k8yk1iw01vl8m44w4sv20lln4l0lq9dafc09lxmgxm9dllj4"; + rev = "1b1a436e19f095ae8f825243dbe29800a8acd25c"; + sha256 = "hRvkBf+YrWycecnDixAsD4CAHg3KsioomfJ/nLl5Zgs="; }; }; } diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index d4b7071117f..36b300b53b7 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -352,11 +352,21 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "11.1.3"; - sha256 = "sha256-hqJg3jP4bbXU4qSJOjeKfjkPx61yPDMsQdSUVZObK/U="; + version = "11.5.1"; + sha256 = "sha256-Ic7eT8WX2GDYIj/aTu1d4m+fgPtXe4YQx04G0awbwnM="; }; - meta = { - license = lib.licenses.mit; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; + description = "GitLens supercharges the Git capabilities built into Visual Studio Code."; + longDescription = '' + Supercharge the Git capabilities built into Visual Studio Code — Visualize code authorship at a glance via Git + blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via + powerful comparison commands, and so much more + ''; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens"; + homepage = "https://gitlens.amod.io/"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; }; }; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 84bc6086d12..30327fb1082 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # --whole-archive linker flag is required to be sure that linker # correctly chooses strong version of symbol regardless of order of # object files at command line. - + lib.optionalString stdenv.targetPlatform.isStatic '' + + lib.optionalString stdenv.hostPlatform.isStatic '' export LDFLAGS=-Wl,--whole-archive ''; meta = { diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 9f0afd6c2bd..d79f9f4c61b 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ./fix_pluginpath.patch # this fixes another bug with python3 (fetchpatch { - url = https://github.com/efexgee/dstat/commit/220a785321b13b6df92a536080aca6ef1cb644ad.patch ; + url = "https://github.com/efexgee/dstat/commit/220a785321b13b6df92a536080aca6ef1cb644ad.patch"; sha256 = "08kcz3yxvl35m55y7g1pr73x3bjcqnv0qlswxqyq8cqxg9zd64cn"; }) ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 303fe62adfd..20a6aedf9c6 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -6,7 +6,7 @@ # Userspace dependencies , zlib, libuuid, python3, attr, openssl , libtirpc -, nfs-utils +, nfs-utils, samba , gawk, gnugrep, gnused, systemd , smartmontools, enableMail ? false , sysstat, pkg-config @@ -55,6 +55,7 @@ let # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; }) }/bin/exportfs" + substituteInPlace ./lib/libshare/smb.h --replace "/usr/bin/net" "${samba}/bin/net" substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ --replace "/etc/default" "$out/etc/default" diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 06a1a53d520..d85d877ca44 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -19,7 +19,7 @@ "airly" = ps: with ps; [ airly ]; "airnow" = ps: with ps; [ pyairnow ]; "airvisual" = ps: with ps; [ pyairvisual ]; - "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect + "aladdin_connect" = ps: with ps; [ aladdin-connect ]; "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ adext ]; "alert" = ps: with ps; [ ]; @@ -202,13 +202,13 @@ "eafm" = ps: with ps; [ aioeafm ]; "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy - "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface + "ecoal_boiler" = ps: with ps; [ ecoaliface ]; "ecobee" = ps: with ps; [ python-ecobee-api ]; "econet" = ps: with ps; [ pyeconet ]; "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] "edimax" = ps: with ps; [ pyedimax ]; - "edl21" = ps: with ps; [ ]; # missing inputs: pysml + "edl21" = ps: with ps; [ pysml ]; "ee_brightbox" = ps: with ps; [ eebrightbox ]; "efergy" = ps: with ps; [ ]; "egardia" = ps: with ps; [ pythonegardia ]; @@ -216,7 +216,7 @@ "elgato" = ps: with ps; [ elgato ]; "eliqonline" = ps: with ps; [ ]; # missing inputs: eliqonline "elkm1" = ps: with ps; [ ]; # missing inputs: elkm1-lib - "elv" = ps: with ps; [ ]; # missing inputs: pypca + "elv" = ps: with ps; [ pypca ]; "emby" = ps: with ps; [ pyemby ]; "emoncms" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; @@ -227,7 +227,7 @@ "enigma2" = ps: with ps; [ openwebifpy ]; "enocean" = ps: with ps; [ enocean ]; "enphase_envoy" = ps: with ps; [ envoy-reader ]; - "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient + "entur_public_transport" = ps: with ps; [ enturclient ]; "environment_canada" = ps: with ps; [ ]; # missing inputs: env_canada "envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat "envisalink" = ps: with ps; [ pyenvisalink ]; @@ -345,7 +345,7 @@ "hdmi_cec" = ps: with ps; [ pycec ]; "heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3 "heos" = ps: with ps; [ pyheos ]; - "here_travel_time" = ps: with ps; [ ]; # missing inputs: herepy + "here_travel_time" = ps: with ps; [ herepy ]; "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision "hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1 diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8c73e23ef99..f6263022d86 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -441,6 +441,7 @@ in with py.pkgs; buildPythonApplication rec { "hassio" "hddtemp" "heos" + "here_travel_time" "history" "history_stats" "hive" @@ -743,8 +744,12 @@ in with py.pkgs; buildPythonApplication rec { "--only-rerun RuntimeError" # enable full variable printing on error "--showlocals" + # here_travel_time/test_sensor.py: Tries to access HERE API: herepy.error.HEREError: Error occured on __get + "--deselect tests/components/here_travel_time/test_sensor.py::test_invalid_credentials" # screenlogic/test_config_flow.py: Tries to send out UDP broadcasts "--deselect tests/components/screenlogic/test_config_flow.py::test_form_cannot_connect" + # abode/test_camera.py: Race condition in pickle file creationg + "--deselect tests/components/abode/test_camera.py::test_camera_off" # asuswrt/test_config_flow.py: Sandbox network limitations, fails with unexpected error "--deselect tests/components/asuswrt/test_config_flow.py::test_on_connect_failed" # shelly/test_config_flow.py: Tries to join multicast group diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 0bd0227ece6..5bb43ae316c 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.345"; + version = "0.18.364"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-cCUlKyndKAU57hSRZYWqwOthfjIirE5c95HRETnFEiA="; + sha256 = "sha256-QcwrgW07tP0PxA6UWqMf7VT0Y8uBZFJY9Uz7seorEfs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 9788e04ac44..8cfefcf9796 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "13.0.1"; + version = "14.0.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-81i8Yf9rEuHtUDqYThUCn0/Lb9YokRi4tGi/Ooyyxr8="; + sha256 = "sha256-NH2uNiYZZrEYE5DG2kDXzLN7/GgXR8IfBqRb6EoKA9s="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 337405ff672..d5fb9e7ed6e 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.14"; + version = "2.3.15"; nativeBuildInputs = [ perl pkg-config ]; buildInputs = @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "0jm3p52z619v7ajh533g2g7d790k82fk0w7ry0zqlm8ymzrxgcy8"; + sha256 = "141manrh54cy8xizr7f8fsa3vdzc2ccfgdz87l9rjylm8mfxvfr1"; }; enableParallelBuilding = true; preConfigure = '' patchShebangs src/config/settings-get.pl - ''; + '' + lib.optionalString (stdenv.isLinux) "export systemdsystemunitdir=$out/etc/systemd/system"; # We need this for sysconfdir, see remark below. installFlags = [ "DESTDIR=$(out)" ]; @@ -75,17 +75,18 @@ stdenv.mkDerivation rec { "lib_cv_va_copy=yes" "lib_cv___va_copy=yes" "lib_cv_va_val_copy=yes" - ] ++ lib.optional (stdenv.isLinux) "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ++ lib.optional (stdenv.isDarwin) "--enable-static" + ] ++ lib.optional stdenv.isLinux "--with-systemd" + ++ lib.optional stdenv.isDarwin "--enable-static" ++ lib.optional withMySQL "--with-mysql" ++ lib.optional withPgSQL "--with-pgsql" ++ lib.optional withSQLite "--with-sqlite"; - meta = { + meta = with lib; { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with lib.maintainers; [ peti fpletz globin ajs124 ]; - platforms = lib.platforms.unix; + license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ]; + maintainers = with maintainers; [ peti fpletz globin ajs124 ]; + platforms = platforms.unix; }; passthru.tests = { opensmtpd-interaction = nixosTests.opensmtpd; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 6cdb2ee06f2..33c66a46bb7 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -3,11 +3,11 @@ let dovecotMajorMinor = lib.versions.majorMinor dovecot.version; in stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.14"; + version = "0.5.15"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; - sha256 = "1lmjzz4kd90wbdslacybizd1dks4bhwmrx39lj8b19naldw0zjk8"; + sha256 = "1l2h0p8ddsl3ja2lnwk0mfqplqh8n0iw8k27awd3ak7prr88yjg1"; }; buildInputs = [ dovecot openssl ]; @@ -32,8 +32,8 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "http://pigeonhole.dovecot.org/"; description = "A sieve plugin for the Dovecot IMAP server"; - license = licenses.lgpl21; - maintainers = with maintainers; [ globin ]; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ globin ajs124 ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 392239a7140..3ef9cafebaf 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://gitlab.com/mailman/mailman/-/commit/4b206e2a5267a0e17f345fd7b2d957122ba57566.patch; + url = "https://gitlab.com/mailman/mailman/-/commit/4b206e2a5267a0e17f345fd7b2d957122ba57566.patch"; sha256 = "06axmrn74p81wvcki36c7gfj5fp5q15zxz2yl3lrvijic7hbs4n2"; }) (fetchpatch { - url = https://gitlab.com/mailman/mailman/-/commit/9613154f3c04fa2383fbf017031ef263c291418d.patch; + url = "https://gitlab.com/mailman/mailman/-/commit/9613154f3c04fa2383fbf017031ef263c291418d.patch"; sha256 = "0vyw87s857vfxbf7kihwb6w094xyxmxbi1bpdqi3ybjamjycp55r"; }) ./log-stderr.patch diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index c39394879fb..c7dc3ecad58 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -1,6 +1,18 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: -python3Packages.buildPythonPackage rec { +let + python = python3.override { + packageOverrides = self: super: { + mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { + version = "0.8.18"; + src = oldAttrs.src.override { + inherit version; + sha256 = "32daf7a7dcf5d4013b37321df7b319f36523f38884ccc3e2e965917d0a5c73c1"; + }; + }); + }; + }; +in python.pkgs.buildPythonPackage rec { pname = "mautrix-signal"; version = "0.1.1"; @@ -11,7 +23,7 @@ python3Packages.buildPythonPackage rec { sha256 = "11snsl7i407855h39g1fgk26hinnq0inr8sjrgd319li0d3jwzxl"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ CommonMark aiohttp asyncpg @@ -41,7 +53,7 @@ python3Packages.buildPythonPackage rec { " > $out/bin/mautrix-signal chmod +x $out/bin/mautrix-signal wrapProgram $out/bin/mautrix-signal \ - --set PATH ${python3Packages.python}/bin \ + --set PATH ${python}/bin \ --set PYTHONPATH "$PYTHONPATH" ''; diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index bf00462875b..f54657db38f 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -1,24 +1,34 @@ { lib, python3, mautrix-telegram, fetchFromGitHub }: -with python3.pkgs; - let + python = python3.override { + packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.24"; + src = oldAttrs.src.override { + inherit version; + sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; + }; + }); + }; + }; + # officially supported database drivers - dbDrivers = [ + dbDrivers = with python.pkgs; [ psycopg2 # sqlite driver is already shipped with python by default ]; -in buildPythonPackage rec { +in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.9.0"; - disabled = pythonOlder "3.7"; + version = "0.10.0"; + disabled = python.pythonOlder "3.7"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v${version}"; - sha256 = "1543ljjl3jg3ayid7ifi4bamqh4gq85pmlbs3m8i7phjbbm7g9dn"; + sha256 = "sha256-lLVKD+/pKqs8oWBdyL+R1lk22LqQOC9nbMlxhCK39xA="; }; patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ]; @@ -26,7 +36,7 @@ in buildPythonPackage rec { sed -i -e '/alembic>/d' requirements.txt ''; - propagatedBuildInputs = [ + propagatedBuildInputs = with python.pkgs; [ Mako aiohttp mautrix @@ -47,7 +57,7 @@ in buildPythonPackage rec { # # Hence we need to patch away `alembic` from `mautrix-telegram` and create an `alembic` # which has `mautrix-telegram` in its environment. - passthru.alembic = alembic.overrideAttrs (old: { + passthru.alembic = python.pkgs.alembic.overrideAttrs (old: { propagatedBuildInputs = old.propagatedBuildInputs ++ dbDrivers ++ [ mautrix-telegram ]; @@ -59,7 +69,7 @@ in buildPythonPackage rec { # The tests were touched the last time in 2019 and upstream CI doesn't even build # those, so it's safe to assume that this part of the software is abandoned. doCheck = false; - checkInputs = [ + checkInputs = with python.pkgs; [ pytest pytest-mock pytest-asyncio diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index f3a8a9d4cf6..32049fd11b6 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.53.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-CWoRkx3OPlIeyUuGCyaGTlJ0zgcgsxlebSG0Zljr0zg="; + sha256 = "sha256-hWrSjkEdhb0F5lwFGwjkR2G6gQ8T8HommH2lxJE+0bk="; }; vendorSha256 = "sha256-499c3Y9IUV8lc+O9qcEeFKQDT4QDvOPmu0rmps7M47w="; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 53b60bf2ce7..d6b264a4aa3 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.32.1"; + version = "1.32.2"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-S18SVSyFpIWkzQiRBY7i1siIPRiRR/SHAse3NJzwR3A="; + sha256 = "sha256-Yx+GA959AB6m62hDlZKYjsuT9Y9TJbIdzUVBMM8OgTg="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index 0e0c977acd0..068d87a3bfd 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fioctl"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-u23BQ/sRAfUO36uqv7xY+DkseDnlVesgamsgne8N8kU="; + sha256 = "sha256-uqJ08ftaU39gmhDtl+noVtGscu6utcl42rXz4XaGtWc="; }; vendorSha256 = "sha256-6a+JMj3hh6GPuqnLknv7/uR8vsUsOgsS+pdxHoMqH5w="; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 51976a2d6a1..0e57e19a288 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -12,20 +12,20 @@ # # If you upgrade from an old version you may have to delete old models from ~/.local/share/tts # Also note that your tts version might not support all available models so check: -# https://github.com/coqui-ai/TTS/releases/tag/v0.0.14 +# https://github.com/coqui-ai/TTS/releases/tag/v0.0.15.1 # # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 python3Packages.buildPythonApplication rec { pname = "tts"; - version = "0.0.14"; + version = "0.0.15.1"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "0cl0ri90mx0y19fmqww73lp5nv6qkpc45rm4157i7p6q6llajdhp"; + sha256 = "0z6sbzspgmw5ja8r2zysyhdk4jzlv88a0ihkvxvvwxslkyncdb89"; }; postPatch = '' @@ -41,6 +41,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + anyascii coqpit flask gdown @@ -48,6 +49,7 @@ python3Packages.buildPythonApplication rec { jieba librosa matplotlib + mecab-python3 numba pandas pypinyin @@ -56,9 +58,10 @@ python3Packages.buildPythonApplication rec { scipy soundfile tensorboardx + tensorflow tqdm umap-learn - unidecode + unidic-lite ]; postInstall = '' @@ -100,16 +103,15 @@ python3Packages.buildPythonApplication rec { disabledTestPaths = [ # requires tensorflow - "tests/test_tacotron2_tf_model.py" "tests/vocoder_tests/test_vocoder_tf_pqmf.py" "tests/vocoder_tests/test_vocoder_tf_melgan_generator.py" + "tests/tts_tests/test_tacotron2_tf_model.py" # RuntimeError: fft: ATen not compiled with MKL support "tests/vocoder_tests/test_fullband_melgan_train.py" "tests/vocoder_tests/test_hifigan_train.py" "tests/vocoder_tests/test_melgan_train.py" "tests/vocoder_tests/test_multiband_melgan_train.py" "tests/vocoder_tests/test_parallel_wavegan_train.py" - ]; meta = with lib; { diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 0013fac23a0..cbe35765cb4 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , substituteAll , meson , ninja @@ -58,14 +57,14 @@ let }; in stdenv.mkDerivation rec { pname = "yabridge"; - version = "3.2.0"; + version = "3.3.1"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - hash = "sha256-UT6st0Rc6HOaObE3N+qlPZZ8U1gl/MFLU0mjFuScdes="; + hash = "sha256-3B+6YuCWVJljqdyGpePjPf5JDwLSWFNgOCeLt8e4mO8="; }; # Unpack subproject sources @@ -80,13 +79,6 @@ in stdenv.mkDerivation rec { )''; patches = [ - # Fix for wine 6.8+ (remove patch in next release): - (fetchpatch { - url = "https://github.com/robbert-vdh/yabridge/commit/5577c4bfd842c60a8ae8ce2889bbfeb53a51c62b.patch"; - sha256 = "sha256-bTT08iWwDBVqi2PZPa7oal7/MqVu8t2Bh1gpjFMqLvQ="; - excludes = [ "CHANGELOG.md" ]; - }) - # Hard code wine path so wine version is correct in logs (substituteAll { src = ./hardcode-wine.patch; diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index 4f738310d85..bf0913372be 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoHash = "sha256-cB4Xp8pNLQRcPQ6HtVkDkLbfNSmM9yl+oRcEzcqrmkY="; + cargoHash = "sha256-f5k5OF+bEzH0b6M14Mdp8t4Qd5dP5Qj2fDsdiG1MkYk="; patches = [ # By default, yabridgectl locates libyabridge.so by using @@ -34,5 +34,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; + platforms = yabridge.meta.platforms; }; } diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 82d6bd5c601..49ac6452918 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "duply"; - version = "2.3"; + version = "2.3.1"; src = fetchurl { url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.3.x/duply_${version}.tgz"; - sha256 = "sha256-I1KkblFnZVOCvcWEarGsSXnzlod2+yZ4okaTpckLFbE="; + sha256 = "149hb9bk7hm5h3aqf19k37d0i2jf0viaqmpq2997i48qp3agji7h"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix new file mode 100644 index 00000000000..43d711588f8 --- /dev/null +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -0,0 +1,108 @@ +{ lib +, writeScriptBin +, bash +, stdenv +, fetchFromGitHub +, fpc +, lazarus-qt +, qt5 +, libX11 +, libqt5pas +, coreutils +, git +, gnugrep +, libnotify +, mesa-demos +, polkit +, procps +, systemd +, vulkan-tools +, which +}: + +let + # Finds data files using the XDG Base Directory Specification + # See https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html + find-xdg-data-files = writeScriptBin "find-xdg-data-files" '' + #!${bash}/bin/sh + IFS=: + for xdg_data_dir in ''${XDG_DATA_HOME:-$HOME/.local/share}:''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}; do + if [ -f "$xdg_data_dir/$1" ]; then + echo "$xdg_data_dir/$1" + fi + done + ''; +in stdenv.mkDerivation rec { + pname = "goverlay"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "benjamimgois"; + repo = pname; + rev = version; + hash = "sha256-Zl1pq2MeGJsPdNlwUEpov5MHlsr9pSMkWHVprt8ImKs="; + }; + + outputs = [ "out" "man" ]; + + patches = [ + # Find MangoHud & vkBasalt Vulkan layers using the XDG Base Directory Specification + ./find-xdg-data-files.patch + ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace 'prefix = /usr/local' "prefix = $out" + + substituteInPlace overlayunit.pas \ + --replace '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" + ''; + + nativeBuildInputs = [ + fpc + lazarus-qt + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + libX11 + libqt5pas + ]; + + NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + + buildPhase = '' + runHook preBuild + HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt}/share/lazarus -B goverlay.lpi + runHook postBuild + ''; + + qtWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ + bash + coreutils + find-xdg-data-files + git + gnugrep + libnotify + mesa-demos + polkit + procps + systemd + vulkan-tools + which + ]}" + + # Force xcb since libqt5pas doesn't support Wayland + # See https://github.com/benjamimgois/goverlay/issues/107 + "--set QT_QPA_PLATFORM xcb" + ]; + + meta = with lib; { + description = "An opensource project that aims to create a Graphical UI to help manage Linux overlays"; + homepage = "https://github.com/benjamimgois/goverlay"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kira-bruneau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch new file mode 100644 index 00000000000..862e4c3903c --- /dev/null +++ b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch @@ -0,0 +1,40 @@ +diff --git a/overlayunit.pas b/overlayunit.pas +index 59f6a81..a096543 100644 +--- a/overlayunit.pas ++++ b/overlayunit.pas +@@ -4871,7 +4871,7 @@ begin + //Determine Mangohud dependency status + + //locate MangoHud and store result in tmp folder +- RunCommand('bash -c ''find /usr/share/vulkan/implicit_layer.d/MangoHud.json >> /tmp/goverlay/dependency_mangohud''', s); ++ RunCommand('bash -c ''find-xdg-data-files vulkan/implicit_layer.d/MangoHud.json >> /tmp/goverlay/dependency_mangohud''', s); + + // Assign Text file dependency_mangohud to variable mangohudVAR + AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud'); +@@ -4880,7 +4880,7 @@ begin + CloseFile(mangohudVAR); + + // Read String and store value on mangohuddependencyVALUE based on result +- if mangohudSTR = '/usr/share/vulkan/implicit_layer.d/MangoHud.json' then ++ if mangohudSTR <> '' then + mangohuddependencyVALUE := 1 + else + mangohuddependencyVALUE := 0; +@@ -4889,7 +4889,7 @@ begin + //Determine vkBasalt dependency staus + + //locate vkBasalt and store result in tmp folder +- RunCommand('bash -c ''find /usr/share/vulkan/implicit_layer.d/vkBasalt.json >> /tmp/goverlay/dependency_vkbasalt''', s); ++ RunCommand('bash -c ''find-xdg-data-files vulkan/implicit_layer.d/vkBasalt.json >> /tmp/goverlay/dependency_vkbasalt''', s); + + // Assign Text file dependency_mangohud to variable mangohudVAR + AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt'); +@@ -4898,7 +4898,7 @@ begin + CloseFile(vkbasaltVAR); + + // Read String and store value on vkbasaltdependencyVALUE based on result +- if vkbasaltSTR = '/usr/share/vulkan/implicit_layer.d/vkBasalt.json' then ++ if vkbasaltSTR <> '' then + vkbasaltdependencyVALUE := 1 + else + vkbasaltdependencyVALUE := 0; diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 12db00af0dd..f4851c6bcab 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -1,22 +1,21 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config -, zlib, libpng, libjpeg, libGLU, libGL, glm +, zlib, libpng, libjpeg, libwebp, libGLU, libGL, glm , libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }: stdenv.mkDerivation rec { pname = "maim"; - version = "5.6.3"; + version = "5.7.4"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "181mjjrjb9fs1ficcv9miqbk94v95j1yli7fjp2dj514g7nj9l3x"; + sha256 = "sha256-uFtiwaM3H09vfvz3wVvumbqkoZhLNJxONkMqqqrJBs4="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = - [ zlib libpng libjpeg libGLU libGL glm + buildInputs = [ zlib libpng libjpeg libwebp libGLU libGL glm libX11 libXext libXfixes libXrandr libXcomposite slop icu ]; doCheck = false; diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index 91022eff31d..c73a95057c5 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch +, fetchurl , substituteAll , coreutils , curl @@ -9,7 +9,7 @@ , glxinfo , gnugrep , gnused -, pciutils +, lsof , xdg-utils , dbus , hwdata @@ -22,30 +22,50 @@ , ninja , pkg-config , python3Packages +, unzip , vulkan-loader , libXNVCtrl +, wayland +, addOpenGLRunpath }: -stdenv.mkDerivation rec { +let + # Derived from subprojects/imgui.wrap + imgui = rec { + version = "1.81"; + src = fetchFromGitHub { + owner = "ocornut"; + repo = "imgui"; + rev = "v${version}"; + hash = "sha256-rRkayXk3xz758v6vlMSaUu5fui6NR8Md3njhDB0gJ18="; + }; + patch = fetchurl { + url = "https://wrapdb.mesonbuild.com/v2/imgui_${version}-1/get_patch"; + hash = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18="; + }; + }; +in stdenv.mkDerivation rec { pname = "mangohud"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; rev = "v${version}"; - sha256 = "1bzfp37qrx9kk5zaq7sfisgkyccwnxd7i3b1l0blfcy2lrxgx0n6"; + sha256 = "wL+/wAqvVFph1QzuXPBbSEFjs33VA0S6euNWr/1J1Mk="; fetchSubmodules = true; }; - patches = [ - # Adds option to specify Vulkan's datadir when it's not the same as MangoHud's - # See https://github.com/flightlessmango/MangoHud/pull/522 - (fetchpatch { - url = "https://github.com/flightlessmango/MangoHud/commit/56682985d8cec711af7ad0841888a44099249b1b.patch"; - sha256 = "0l5vb374lfgfh54jiy4097bzsccpv4zsl1fdhn55sxggklymcad8"; - }) + outputs = [ "out" "doc" "man" ]; + # Unpack subproject sources + postUnpack = ''( + cd "$sourceRoot/subprojects" + cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} + unzip ${imgui.patch} + )''; + + patches = [ # Hard code dependencies. Can't use makeWrapper since the Vulkan # layer can be used without the mangohud executable by setting MANGOHUD=1. (substituteAll { @@ -58,7 +78,7 @@ stdenv.mkDerivation rec { glxinfo gnugrep gnused - pciutils + lsof xdg-utils ]; @@ -82,6 +102,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Duse_system_vulkan=enabled" "-Dvulkan_datadir=${vulkan-headers}/share" + "-Dwith_wayland=enabled" ]; nativeBuildInputs = [ @@ -92,6 +113,7 @@ stdenv.mkDerivation rec { pkg-config python3Packages.Mako python3Packages.python + unzip vulkan-loader ]; @@ -99,6 +121,7 @@ stdenv.mkDerivation rec { dbus libX11 libXNVCtrl + wayland ]; # Support 32bit Vulkan applications by linking in 32bit Vulkan layer @@ -108,11 +131,12 @@ stdenv.mkDerivation rec { "$out/share/vulkan/implicit_layer.d/MangoHud.x86.json" ''; - # Support overlaying Vulkan applications without requiring mangohud to be installed + # Support Nvidia cards by adding OpenGL path and support overlaying + # Vulkan applications without requiring MangoHud to be installed postFixup = '' wrapProgram "$out/bin/mangohud" \ - --prefix VK_LAYER_PATH : "$out/share/vulkan/implicit_layer.d" \ - --prefix VK_INSTANCE_LAYERS : VK_LAYER_MANGOHUD_overlay + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ addOpenGLRunpath.driverLink ]} \ + --prefix XDG_DATA_DIRS : "$out/share" ''; meta = with lib; { diff --git a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch index bdebcdca982..2ee5e2dd547 100644 --- a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch +++ b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch @@ -1,9 +1,9 @@ diff --git a/src/dbus.cpp b/src/dbus.cpp -index 0acccc3..7dd7c49 100644 +index 44ffafc..9baf57b 100644 --- a/src/dbus.cpp +++ b/src/dbus.cpp -@@ -157,7 +157,7 @@ bool dbus_manager::init(const std::string& requested_player) { - m_requested_player = "org.mpris.MediaPlayer2." + requested_player; +@@ -162,7 +162,7 @@ bool dbus_manager::init(const std::string& requested_player) { + return true; } - if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("libdbus-1.so.3")) { @@ -22,11 +22,11 @@ index 25c65bf..87488d5 100644 -std::shared_ptr<libx11_loader> g_x11(new libx11_loader("libX11.so.6")); +std::shared_ptr<libx11_loader> g_x11(new libx11_loader("@libX11@/lib/libX11.so.6")); diff --git a/src/logging.cpp b/src/logging.cpp -index f2c4271..d33e793 100644 +index ee8600b..c7c91a0 100644 --- a/src/logging.cpp +++ b/src/logging.cpp -@@ -17,7 +17,10 @@ string exec(string command) { - string result = ""; +@@ -19,7 +19,10 @@ string exec(string command) { + #ifdef __gnu_linux__ // Open pipe to file + char* originalPath = getenv("PATH"); diff --git a/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch b/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch index 3c0f6908617..4c6561180a1 100644 --- a/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch +++ b/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch @@ -1,5 +1,5 @@ diff --git a/bin/mangohud.in b/bin/mangohud.in -index eadce2d..e7b1aa4 100755 +index 8ec21de..f65304a 100755 --- a/bin/mangohud.in +++ b/bin/mangohud.in @@ -23,6 +23,6 @@ fi diff --git a/pkgs/tools/misc/clipbuzz/default.nix b/pkgs/tools/misc/clipbuzz/default.nix new file mode 100644 index 00000000000..aaa37ad7c18 --- /dev/null +++ b/pkgs/tools/misc/clipbuzz/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromSourcehut, zig, libX11, libXfixes }: + +stdenv.mkDerivation rec { + pname = "clipbuzz"; + version = "2.0.0"; + + src = fetchFromSourcehut { + owner = "~cnx"; + repo = pname; + rev = version; + sha256 = "1qn98bwp7v7blw4v0g4pckgxrky5ggvq9m0kck2kqw8jg9jc15jp"; + }; + + nativeBuildInputs = [ zig ]; + buildInputs = [ libX11 libXfixes ]; + + preBuild = '' + export HOME=$TMPDIR + ''; + + installPhase = '' + zig build -Drelease-safe -Dcpu=baseline --prefix $out install + ''; + + meta = with lib; { + description = "Buzz on new X11 clipboard events"; + homepage = "https://git.sr.ht/~cnx/clipbuzz"; + license = licenses.unlicense; + maintainers = [ maintainers.McSinyx ]; + }; +} diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 89435e76989..5fdd4b72e1e 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-n7X6VlNZVsL+Tn9t3L4mTblVjPTKgTMmcRdkDGPXI8U="; + sha256 = "sha256-/Mpdi414LNzavh4nUY2pnflyshzwTYv1XK1HmnAHJaQ="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/livedl/default.nix b/pkgs/tools/misc/livedl/default.nix new file mode 100644 index 00000000000..b989fe27a65 --- /dev/null +++ b/pkgs/tools/misc/livedl/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "livedl"; + version = "unstable-2021-05-16"; + + src = fetchFromGitHub { + owner = "himananiito"; + repo = pname; + rev = "a8720f1e358e5b0ade6fdeb8aacc00781e6cc504"; + sha256 = "1zax215jp6sl47m8ahssyyrbzn96dh74srq9g61jc76sq10xg329"; + }; + + sourceRoot = "source/src"; + + vendorSha256 = sha256:g5Y1IH1U1zOOHygTzAJuBnUj+MyPe64KHTYikipt3TY=; + + meta = with lib; { + description = "Command-line tool to download nicovideo.jp livestreams"; + homepage = "https://github.com/himananiito/livedl"; + license = licenses.mit; + maintainers = with maintainers; [ wakira ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index 27e228f0f20..c27252cc706 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgcenter"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lesovsky"; repo = "pgcenter"; rev = "v${version}"; - sha256 = "sha256-ow26wuM7nw/WbeaPVcNm5iYUYLydeujhw+7BcTirPcA="; + sha256 = "0l3da7migx1gprhlwc98x30qh6lmrn8hizanxgs3hxl0arbrn710"; }; - vendorSha256 = "sha256-9hYiyZ34atmSL7JvuXyiGU7HR4E6qN7bGZlyU+hP+FU="; + vendorSha256 = "0mgq9zl56wlr37dxxa1sh53wfkhrl9ybjvxj5y9djspqkp4j45pn"; subPackages = [ "cmd" ]; @@ -25,6 +25,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://pgcenter.org/"; + changelog = "https://github.com/lesovsky/pgcenter/raw/v${version}/doc/Changelog"; description = "Command-line admin tool for observing and troubleshooting PostgreSQL"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix index df244063b1b..ec77007804b 100644 --- a/pkgs/tools/misc/piston-cli/default.nix +++ b/pkgs/tools/misc/piston-cli/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "piston-cli"; - version = "1.4.1"; + version = "1.4.3"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "o8GPtSQ119AKB64hAH8VY6iJmhXcSFqjOanmXQl0tHo="; + sha256 = "qvDGVJcaMXUajdUQWl4W1dost8k0PsS9XX/o8uQrtfY="; }; propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 432eab680c8..f5f8f87e9ca 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8vrLvP8NevVpmqxqJHsySGXRTDX45c8FrfB7W7fdQvg="; + sha256 = "sha256-zXXjy90oxLO/Ac/TQC4J6rOvha2qGBMv0SAAXvDyITo="; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-lIZsYhyef9LsGME01Kb5TGamGpLyZiPrdIb+jUqvbOg="; + cargoSha256 = "sha256-TXmV1saqZ/XS4HxKpGXWu3HuoZ3WIptSc8oTNnPCqYE="; preCheck = '' HOME=$TMPDIR diff --git a/pkgs/tools/misc/ytmdl/default.nix b/pkgs/tools/misc/ytmdl/default.nix new file mode 100644 index 00000000000..0827168d60c --- /dev/null +++ b/pkgs/tools/misc/ytmdl/default.nix @@ -0,0 +1,48 @@ +{ lib, fetchFromGitHub, buildPythonApplication, ffmpeg, ffmpeg-python, musicbrainzngs, rich, simber, pydes, youtube-search, unidecode, pyxdg, downloader-cli, beautifulsoup4, itunespy, mutagen, pysocks, youtube-dl }: + +buildPythonApplication rec { + pname = "ytmdl"; + version = "2021.05.26"; + + src = fetchFromGitHub { + owner = "deepjyoti30"; + repo = pname; + rev = version; + sha256 = "sha256-AYBhPmv1/cOaMh44kqm7JpJSudHbfriiJztcGL5mbEk="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "bs4" "beautifulsoup4" + ''; + + + propagatedBuildInputs = [ + ffmpeg + ffmpeg-python + musicbrainzngs + rich + simber + pydes + youtube-search + unidecode + pyxdg + downloader-cli + beautifulsoup4 + itunespy + mutagen + pysocks + youtube-dl + ]; + + # This application has no tests + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/deepjyoti30/ytmdl"; + description = "YouTube Music Downloader"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 5da02aa771b..7a421aaeebf 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ gcc9Stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.63.0"; + version = "0.63.1"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-+D1KosfeoEzRgAE6WheO0Vo/1oq7+1tWPa7rRemyZYo="; + sha256 = "sha256-SwkqFSAl99fQoXT96BPRqKFqJg3HEziiT+jXcugPyxM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index db76c9913f6..cbe10e85f66 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - hash = "sha256-SrBPqGRIsP0+ZWDe96sqjqCpJoY3Sn3VoPpMw7ellC0="; + hash = "sha256-Vmxb8SjPhcSqFzykHRPsLtAoSwomN+se+icwHkucbX8="; }; patches = [ diff --git a/pkgs/tools/package-management/protontricks/steam-run.patch b/pkgs/tools/package-management/protontricks/steam-run.patch index 76b7b7f6036..82ddec1abb8 100644 --- a/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/pkgs/tools/package-management/protontricks/steam-run.patch @@ -69,7 +69,7 @@ index cc65a03..5c3fc7a 100755 # Pass the command directly into the shell *without* # escaping it diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py -index f9fb9ec..e1e588a 100644 +index 4ab778b..f3f5f99 100644 --- a/src/protontricks/steam.py +++ b/src/protontricks/steam.py @@ -12,8 +12,8 @@ from .util import lower_dict @@ -81,9 +81,9 @@ index f9fb9ec..e1e588a 100644 + "get_appinfo_sections", "get_proton_appid", + "find_steam_proton_app", "find_appid_proton_prefix", "find_proton_app", "get_steam_lib_paths", "get_compat_tool_dirs", - "get_proton_installations", "get_custom_proton_installations", + "get_custom_proton_installations_in_dir", "get_custom_proton_installations", "find_current_steamid3", "get_appid_from_shortcut", -@@ -286,37 +286,6 @@ def find_steam_path(): +@@ -300,37 +300,6 @@ def find_steam_path(): return None, None @@ -122,7 +122,7 @@ index f9fb9ec..e1e588a 100644 APPINFO_STRUCT_SECTION = "<LLLLQ20sL" diff --git a/src/protontricks/util.py b/src/protontricks/util.py -index 2abda99..3a25368 100644 +index b6617de..85f8b2d 100644 --- a/src/protontricks/util.py +++ b/src/protontricks/util.py @@ -4,15 +4,14 @@ import shlex @@ -146,8 +146,8 @@ index 2abda99..3a25368 100644 ) logger = logging.getLogger("protontricks") -@@ -39,24 +38,6 @@ def lower_dict(d): - return {k.lower(): v for k, v in d.items()} +@@ -46,24 +45,6 @@ def lower_dict(d): + return {k.lower(): _lower_value(v) for k, v in d.items()} -def get_legacy_runtime_library_paths(legacy_steam_runtime_path, proton_app): @@ -171,7 +171,7 @@ index 2abda99..3a25368 100644 def get_host_library_paths(): """ Get host library paths to use when creating the LD_LIBRARY_PATH environment -@@ -68,7 +49,7 @@ def get_host_library_paths(): +@@ -75,7 +56,7 @@ def get_host_library_paths(): # Since that command is unavailable with newer Steam Runtime releases, # do it ourselves here. result = run( @@ -180,7 +180,7 @@ index 2abda99..3a25368 100644 check=True, stdout=PIPE, stderr=PIPE ) lines = result.stdout.decode("utf-8").split("\n") -@@ -86,7 +67,7 @@ RUNTIME_ROOT_GLOB_PATTERNS = ( +@@ -93,7 +74,7 @@ RUNTIME_ROOT_GLOB_PATTERNS = ( ) @@ -189,7 +189,7 @@ index 2abda99..3a25368 100644 """ Get LD_LIBRARY_PATH value to use when running a command using Steam Runtime """ -@@ -109,7 +90,7 @@ def get_runtime_library_paths(proton_app, use_bwrap=True): +@@ -116,7 +97,7 @@ def get_runtime_library_paths(proton_app, use_bwrap=True): ) ) @@ -198,7 +198,7 @@ index 2abda99..3a25368 100644 return "".join([ str(proton_app.proton_dist_path / "lib"), os.pathsep, str(proton_app.proton_dist_path / "lib64"), os.pathsep -@@ -125,14 +106,19 @@ def get_runtime_library_paths(proton_app, use_bwrap=True): +@@ -132,14 +113,19 @@ def get_runtime_library_paths(proton_app, use_bwrap=True): ]) @@ -225,7 +225,7 @@ index 2abda99..3a25368 100644 # Helper script created by Protontricks to run Wine binaries using Steam Runtime set -o errexit -@@ -200,7 +186,10 @@ if [[ -n "$PROTONTRICKS_INSIDE_STEAM_RUNTIME" ]]; then +@@ -207,7 +193,10 @@ if [[ -n "$PROTONTRICKS_INSIDE_STEAM_RUNTIME" ]]; then export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$PROTON_LD_LIBRARY_PATH" "$PROTON_DIST_PATH"/bin/{name} "$@" else @@ -237,7 +237,7 @@ index 2abda99..3a25368 100644 "${{mount_params[@]}}" -- \ env PROTONTRICKS_INSIDE_STEAM_RUNTIME=1 \ "$PROTONTRICKS_PROXY_SCRIPT_PATH" "$@" -@@ -266,7 +255,6 @@ def create_wine_bin_dir(proton_app, use_bwrap=True): +@@ -273,7 +262,6 @@ def create_wine_bin_dir(proton_app, use_bwrap=True): def run_command( winetricks_path, proton_app, steam_app, command, use_steam_runtime=False, @@ -245,7 +245,7 @@ index 2abda99..3a25368 100644 use_bwrap=True, **kwargs): """Run an arbitrary command with the correct environment variables -@@ -343,7 +331,7 @@ def run_command( +@@ -350,7 +338,7 @@ def run_command( os.environ["STEAM_RUNTIME_PATH"] = \ str(proton_app.required_tool_app.install_path) os.environ["PROTON_LD_LIBRARY_PATH"] = \ @@ -254,7 +254,7 @@ index 2abda99..3a25368 100644 runtime_name = proton_app.required_tool_app.name logger.info( -@@ -366,11 +354,8 @@ def run_command( +@@ -373,11 +361,8 @@ def run_command( "Current Steam Runtime not recognized by Protontricks." ) else: @@ -267,7 +267,7 @@ index 2abda99..3a25368 100644 # When Steam Runtime is enabled, create a set of helper scripts # that load the underlying Proton Wine executables with Steam Runtime -@@ -378,8 +363,6 @@ def run_command( +@@ -385,8 +370,6 @@ def run_command( wine_bin_dir = create_wine_bin_dir( proton_app=proton_app, use_bwrap=use_bwrap ) diff --git a/pkgs/tools/security/agebox/default.nix b/pkgs/tools/security/agebox/default.nix new file mode 100644 index 00000000000..29199870c7f --- /dev/null +++ b/pkgs/tools/security/agebox/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "agebox"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "slok"; + repo = pname; + rev = "v${version}"; + sha256 = "0zn7jibhw5jd9wp1alx9ahj4szaig4a54ci3676kk5zqxr2hjz0c"; + }; + vendorSha256 = "0bc2pwz3yhzwqi0bcwqkkkrglg473qxhmz5s5955fvgajvjk7drn"; + + ldflags = [ + "-s" "-w" + "-X main.Version=${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/slok/agebox"; + changelog = "https://github.com/slok/agebox/releases/tag/v${version}"; + description = "Age based repository file encryption gitops tool"; + license = licenses.asl20; + maintainers = with maintainers; [ lesuisse ]; + }; +} diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 922b6c3f2ba..d5d698088e6 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 = "2021-06-18"; + version = "2021-06-19"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "0b91r7bl3abg3mb7vg4qnk319jy7civ583la0054xhpg0c0svyk1"; + sha256 = "1qhznaq06plbkld4al3whrfvfpqgpwaxgwzdkyndvh40yn4sh1fz"; }; installPhase = '' diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index cc2765bd707..1a4b1de1b1f 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -1,32 +1,34 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, ncurses, python3, openssl, libgpgerror, gpgme, xorg, AppKit, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, ncurses, python3, openssl, libgpgerror, gpgme, xorg, AppKit, Security, installShellFiles }: with rustPlatform; buildRustPackage rec { - version = "0.4.0"; + version = "0.5.1"; pname = "ripasso-cursive"; src = fetchFromGitHub { owner = "cortex"; repo = "ripasso"; rev = "release-${version}"; - sha256 = "164da20j727p8l7hh37j2r8pai9sj402nhswvg0nrlgj53nr6083"; + sha256 = "1jx6qv7skikl1ap3g1r34rkz4ab756kra7dgwwv45vl2fb6x74k4"; }; patches = [ ./fix-tests.patch ]; - cargoSha256 = "1sv5czhrafk15yj5xyd1x9jdqn1dz6aqpxxnyz49icx53qlg9f8g"; + cargoSha256 = "1li1gmcs7lnjr4qhzs0rrgngdcxy1paiibjwk9zx2rrs71021cgk"; - cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; + cargoBuildFlags = [ "-p ripasso-cursive" ]; - nativeBuildInputs = [ pkg-config gpgme python3 ]; + nativeBuildInputs = [ pkg-config gpgme python3 installShellFiles ]; buildInputs = [ ncurses openssl libgpgerror gpgme xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; - preFixup = '' - mkdir -p "$out/man/man1" - $out/bin/ripasso-man > $out/man/man1/ripasso-cursive.1 - rm $out/bin/ripasso-man + preCheck = '' + export HOME=$TMPDIR + ''; + + postInstall = '' + installManPage target/man-page/cursive/ripasso-cursive.1 ''; meta = with lib; { diff --git a/pkgs/tools/security/ripasso/fix-tests.patch b/pkgs/tools/security/ripasso/fix-tests.patch index 433ff933b1f..85b1714e5c2 100644 --- a/pkgs/tools/security/ripasso/fix-tests.patch +++ b/pkgs/tools/security/ripasso/fix-tests.patch @@ -1,35 +1,82 @@ -diff --git a/src/pass/test.rs b/src/pass/test.rs -index c980a2f..2e6c8cc 100644 --- a/src/pass/test.rs -+++ b/src/pass/test.rs -@@ -56,6 +56,7 @@ fn populate_password_list_small_repo() { ++++ a/src/pass/test.rs +@@ -83,6 +83,7 @@ base_path.pop(); base_path.pop(); base_path.pop(); + base_path.pop(); base_path.push("testres"); - let mut password_dir: PathBuf = base_path.clone(); -@@ -84,6 +85,7 @@ fn populate_password_list_repo_with_deleted_files() { + let home: PathBuf = base_path.clone(); +@@ -114,6 +115,7 @@ base_path.pop(); base_path.pop(); base_path.pop(); + base_path.pop(); base_path.push("testres"); - let mut password_dir: PathBuf = base_path.clone(); -@@ -112,6 +114,7 @@ fn populate_password_list_directory_without_git() { + let home: PathBuf = base_path.clone(); +@@ -144,6 +146,7 @@ base_path.pop(); base_path.pop(); base_path.pop(); + base_path.pop(); base_path.push("testres"); - let mut password_dir: PathBuf = base_path.clone(); -@@ -149,4 +152,4 @@ fn parse_signing_keys_empty() { - let result = PasswordStore::parse_signing_keys(&None).unwrap(); + let home: PathBuf = base_path.clone(); +@@ -185,6 +188,7 @@ + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.push("testres"); + + let home: PathBuf = base_path.clone(); +@@ -220,6 +224,7 @@ + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.push("testres"); + + let home: PathBuf = base_path.clone(); +@@ -267,6 +272,7 @@ + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.push("testres"); + + let home: PathBuf = base_path.clone(); +@@ -298,6 +304,7 @@ + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.push("testres"); + + let home: PathBuf = base_path.clone(); +@@ -337,6 +344,7 @@ + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.push("testres"); + + let home: PathBuf = base_path.clone(); +@@ -828,6 +836,7 @@ + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.push("testres"); + + let home: PathBuf = base_path.clone(); +@@ -860,6 +869,7 @@ + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.pop(); + base_path.push("testres"); - assert_eq!(result.len(), 0); --} -\ No newline at end of file -+} diff --git a/pkgs/tools/security/truecrack/default.nix b/pkgs/tools/security/truecrack/default.nix new file mode 100644 index 00000000000..cf64b234c66 --- /dev/null +++ b/pkgs/tools/security/truecrack/default.nix @@ -0,0 +1,40 @@ +{ lib, gccStdenv, fetchFromGitLab, cudatoolkit +, cudaSupport ? false +, pkg-config }: + +gccStdenv.mkDerivation rec { + pname = "truecrack"; + version = "3.6"; + + src = fetchFromGitLab { + owner = "kalilinux"; + repo = "packages/truecrack"; + rev = "debian/${version}+git20150326-0kali1"; + sha256 = "+Rw9SfaQtO1AJO6UVVDMCo8DT0dYEbv7zX8SI+pHCRQ="; + }; + + configureFlags = (if cudaSupport then [ + "--with-cuda=${cudatoolkit}" + ] else [ + "--enable-cpu" + ]); + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = lib.optionals cudaSupport [ + cudatoolkit + ]; + + installFlags = [ "prefix=$(out)" ]; + enableParallelBuilding = true; + + meta = with lib; { + description = "TrueCrack is a brute-force password cracker for TrueCrypt volumes. It works on Linux and it is optimized for Nvidia Cuda technology."; + homepage = "https://gitlab.com/kalilinux/packages/truecrack"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ethancedwards8 ]; + }; +} diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index e00c2bfafb3..673d29d61aa 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config +{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests , curl, libcap, libuuid, lm_sensors, zlib @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; buildInputs = [ curl.dev zlib.dev ] ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { ]; postFixup = '' - rm -r $out/sbin + wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]} ''; passthru.tests.netdata = nixosTests.netdata; diff --git a/pkgs/tools/text/pn/default.nix b/pkgs/tools/text/pn/default.nix new file mode 100644 index 00000000000..81e4c1eb358 --- /dev/null +++ b/pkgs/tools/text/pn/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake, libphonenumber, icu, protobuf }: + +stdenv.mkDerivation rec { + pname = "pn"; + version = "unstable-2021-01-28"; + + src = fetchFromGitHub { + owner = "Orange-OpenSource"; + repo = pname; + rev = "41e1215397129ed0d42b5f137fb35b5e0648edda"; + sha256 = "1g8r7y230k01ghraa55g1bhz3fiz6bjdgcsddy2dfa5ih8c4s3jm"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libphonenumber icu protobuf ]; + + meta = with lib; { + description = "A libphonenumber command-line wrapper"; + homepage = "https://github.com/Orange-OpenSource/pn"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.McSinyx ]; + }; +} diff --git a/pkgs/tools/wayland/clipman/default.nix b/pkgs/tools/wayland/clipman/default.nix index 3a2c2ca6015..d5ed6ae88ff 100644 --- a/pkgs/tools/wayland/clipman/default.nix +++ b/pkgs/tools/wayland/clipman/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clipman"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "yory8"; repo = pname; rev = "v${version}"; - sha256 = "1lf5fbzplyc1mpdqgfwbrn8m5568vhjf48580fvvfgbhz6zcil8n"; + sha256 = "sha256-Yq71nYNL3bFvwhVzrQ1g8n7/4tMmLuYUJ9pMBmxL8e8="; }; - vendorSha256 = "18jw4z0lcrh00yjr3qdkgvlrpfwqbsm0ncz7fp1h72pzkh41byv7"; + vendorSha256 = "sha256-Z/sVCJz/igPDdeczC6pemLub6X6z4ZGlBwBmRsEnXKI="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b06539e5d90..b4f26f0cc50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1010,6 +1010,8 @@ in tilix = callPackage ../applications/terminal-emulators/tilix { }; + timedoctor = callPackage ../applications/office/timedoctor { }; + twine = with python3Packages; toPythonApplication twine; wayst = callPackage ../applications/terminal-emulators/wayst { }; @@ -2562,6 +2564,8 @@ in electron-mail = callPackage ../applications/networking/mailreaders/electron-mail { }; + element = callPackage ../applications/science/chemistry/element { }; + element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { }; element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { @@ -3117,6 +3121,8 @@ in playerctl = callPackage ../tools/audio/playerctl { }; + pn = callPackage ../tools/text/pn { }; + poweralertd = callPackage ../tools/misc/poweralertd { }; ps_mem = callPackage ../tools/system/ps_mem { }; @@ -3788,6 +3794,8 @@ in age = callPackage ../tools/security/age { }; + agebox = callPackage ../tools/security/agebox { }; + brotli = callPackage ../tools/compression/brotli { }; biosdevname = callPackage ../tools/networking/biosdevname { }; @@ -3838,6 +3846,8 @@ in cloud-utils = callPackage ../tools/misc/cloud-utils { }; + cobalt = callPackage ../applications/misc/cobalt { }; + cocoapods = callPackage ../development/mobile/cocoapods { }; cocoapods-beta = lowPrio (callPackage ../development/mobile/cocoapods { beta = true; }); @@ -5371,6 +5381,8 @@ in govc = callPackage ../tools/virtualization/govc { }; + goverlay = callPackage ../tools/graphics/goverlay { }; + gpart = callPackage ../tools/filesystems/gpart { }; gparted = callPackage ../tools/misc/gparted { }; @@ -8710,6 +8722,8 @@ in # Not updated upstream since 2018, doesn't support qt newer than 5.12 sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {}; + slides = callPackage ../applications/misc/slides { }; + slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; slsnif = callPackage ../tools/misc/slsnif { }; @@ -9765,6 +9779,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + truecrack = callPackage ../tools/security/truecrack { }; + truecrack-cuda = truecrack.override { cudaSupport = true; }; + ts = callPackage ../tools/system/ts { }; transfig = callPackage ../tools/graphics/transfig { @@ -9818,6 +9835,8 @@ in unrar = callPackage ../tools/archivers/unrar { }; + vul = callPackage ../applications/misc/vul { }; + xar = callPackage ../tools/compression/xar { }; xarchive = callPackage ../tools/archivers/xarchive { }; @@ -10015,6 +10034,8 @@ in clipnotify = callPackage ../tools/misc/clipnotify { }; + clipbuzz = callPackage ../tools/misc/clipbuzz { }; + xclip = callPackage ../tools/misc/xclip { }; xcur2png = callPackage ../tools/graphics/xcur2png { }; @@ -12375,6 +12396,8 @@ in overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; }; + octave-kernel = callPackage ../applications/editors/jupyter-kernels/octave { }; + octavePackages = recurseIntoAttrs octave.pkgs; ocropus = callPackage ../applications/misc/ocropus { }; @@ -12752,6 +12775,8 @@ in pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64; pharo-launcher = callPackage ../development/pharo/launcher { }; + protege-distribution = callPackage ../development/web/protege-distribution { }; + umr = callPackage ../development/misc/umr { llvmPackages = llvmPackages_latest; }; @@ -12796,7 +12821,7 @@ in ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; - antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { + antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { jdk = jdk8; # todo: remove override https://github.com/nixos/nixpkgs/pull/89731 }; @@ -12814,6 +12839,8 @@ in antlr4 = antlr4_8; + antlr = antlr4; + apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; @@ -14105,6 +14132,8 @@ in swig = swig3; swigWithJava = swig; + c2ffi = callPackage ../development/tools/misc/c2ffi { }; + swfmill = callPackage ../tools/video/swfmill { }; swftools = callPackage ../tools/video/swftools { @@ -15668,6 +15697,8 @@ in id3lib = callPackage ../development/libraries/id3lib { }; + idasen = with python3Packages; toPythonApplication idasen; + ilbc = callPackage ../development/libraries/ilbc { }; ilixi = callPackage ../development/libraries/ilixi { }; @@ -15775,6 +15806,8 @@ in jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { }; + jrsonnet = callPackage ../development/compilers/jrsonnet { }; + go-jsonnet = callPackage ../development/compilers/go-jsonnet { }; jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { }; @@ -27233,6 +27266,8 @@ in inherit (gnome2) libgnomeui; }; + veusz = libsForQt5.callPackage ../applications/graphics/veusz { }; + vim = callPackage ../applications/editors/vim { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -28015,6 +28050,8 @@ in ytmdesktop = callPackage ../applications/audio/ytmdesktop { }; + ytmdl = python3Packages.callPackage ../tools/misc/ytmdl { }; + zam-plugins = callPackage ../applications/audio/zam-plugins { }; zanshin = libsForQt5.callPackage ../applications/office/zanshin { }; @@ -28172,6 +28209,8 @@ in }; litecoind = litecoin.override { withGui = false; }; + livedl = callPackage ../tools/misc/livedl { }; + lnd = callPackage ../applications/blockchains/lnd.nix { }; lndconnect = callPackage ../applications/blockchains/lndconnect { }; @@ -30151,10 +30190,7 @@ in ecm = callPackage ../applications/science/math/ecm { }; - eukleides = callPackage ../applications/science/math/eukleides { - texLive = texlive.combine { inherit (texlive) scheme-small; }; - texinfo = texinfo4; - }; + eukleides = callPackage ../applications/science/math/eukleides { }; form = callPackage ../applications/science/math/form { }; @@ -31400,6 +31436,8 @@ in vaultenv = haskellPackages.vaultenv; + vazir-code-font = callPackage ../data/fonts/vazir-code-font { }; + vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; vbam = callPackage ../misc/emulators/vbam { }; @@ -31974,6 +32012,8 @@ in xcolor = callPackage ../tools/graphics/xcolor { }; + xcfun = callPackage ../development/libraries/science/chemistry/xcfun { }; + zthrottle = callPackage ../tools/misc/zthrottle { }; zktree = callPackage ../applications/misc/zktree {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f67e28a1dc9..ef4b58fe78c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11108,11 +11108,13 @@ let url = "mirror://cpan/authors/id/B/BR/BRMILLER/${pname}-${version}.tar.gz"; sha256 = "0dr69rgl4si9i9ww1r4dc7apgb7y6f7ih808w4g0924cvz823s0x"; }; + outputs = [ "out" "tex" ]; propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PerlMagick PodParser TextUnidecode XMLLibXSLT ]; preCheck = '' rm t/931_epub.t # epub test fails ''; nativeBuildInputs = [ pkgs.makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + makeMakerFlags = "TEXMF=\${tex} NOMKTEXLSR"; # shebangs need to be patched before executables are copied to $out preBuild = '' patchShebangs bin/ @@ -11129,7 +11131,13 @@ let ''; meta = { description = "Transforms TeX and LaTeX into XML/HTML/MathML"; - license = lib.licenses.free; + homepage = "https://dlmf.nist.gov/LaTeXML/"; + license = lib.licenses.publicDomain; + maintainers = with maintainers; [ xworld21 ]; + }; + passthru = { + tlType = "run"; + pkgs = [ LaTeXML.tex ]; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d212cb5ea0..c192dd10979 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -385,6 +385,8 @@ in { alabaster = callPackage ../development/python-modules/alabaster { }; + aladdin-connect = callPackage ../development/python-modules/aladdin-connect { }; + alarmdecoder = callPackage ../development/python-modules/alarmdecoder { }; alembic = callPackage ../development/python-modules/alembic { }; @@ -463,6 +465,8 @@ in { inherit (pkgs) antlr4; }; + anyascii = callPackage ../development/python-modules/anyascii { }; + anyio = callPackage ../development/python-modules/anyio { }; anyjson = callPackage ../development/python-modules/anyjson { }; @@ -2158,6 +2162,8 @@ in { dotmap = callPackage ../development/python-modules/dotmap { }; + downloader-cli = callPackage ../development/python-modules/downloader-cli { }; + dparse = callPackage ../development/python-modules/dparse { }; dpath = callPackage ../development/python-modules/dpath { }; @@ -2221,6 +2227,8 @@ in { ecdsa = callPackage ../development/python-modules/ecdsa { }; + ecoaliface = callPackage ../development/python-modules/ecoaliface { }; + ecos = callPackage ../development/python-modules/ecos { }; ecpy = callPackage ../development/python-modules/ecpy { }; @@ -2287,6 +2295,8 @@ in { entrypoints = callPackage ../development/python-modules/entrypoints { }; + enturclient = callPackage ../development/python-modules/enturclient { }; + enum34 = callPackage ../development/python-modules/enum34 { }; enum-compat = callPackage ../development/python-modules/enum-compat { }; @@ -2910,6 +2920,8 @@ in { google-cloud-access-context-manager = callPackage ../development/python-modules/google-cloud-access-context-manager { }; + google-cloud-appengine-logging = callPackage ../development/python-modules/google-cloud-appengine-logging { }; + google-cloud-asset = callPackage ../development/python-modules/google-cloud-asset { }; google-cloud-automl = callPackage ../development/python-modules/google-cloud-automl { }; @@ -2918,6 +2930,8 @@ in { google-cloud-bigquery-datatransfer = callPackage ../development/python-modules/google-cloud-bigquery-datatransfer { }; + google-cloud-bigquery-logging = callPackage ../development/python-modules/google-cloud-bigquery-logging { }; + google-cloud-bigtable = callPackage ../development/python-modules/google-cloud-bigtable { }; google-cloud-container = callPackage ../development/python-modules/google-cloud-container { }; @@ -2938,6 +2952,8 @@ in { google-cloud-iam = callPackage ../development/python-modules/google-cloud-iam { }; + google-cloud-iam-logging = callPackage ../development/python-modules/google-cloud-iam-logging { }; + google-cloud-iot = callPackage ../development/python-modules/google-cloud-iot { }; google-cloud-kms = callPackage ../development/python-modules/google-cloud-kms { }; @@ -3208,6 +3224,8 @@ in { inherit python; }); + herepy = callPackage ../development/python-modules/herepy { }; + hetzner = callPackage ../development/python-modules/hetzner { }; heudiconv = callPackage ../development/python-modules/heudiconv { }; @@ -3385,6 +3403,8 @@ in { ics = callPackage ../development/python-modules/ics { }; + idasen = callPackage ../development/python-modules/idasen { }; + identify = callPackage ../development/python-modules/identify { }; idna = callPackage ../development/python-modules/idna { }; @@ -3570,6 +3590,8 @@ in { itsdangerous = callPackage ../development/python-modules/itsdangerous { }; + itunespy = callPackage ../development/python-modules/itunespy { }; + itypes = callPackage ../development/python-modules/itypes { }; j2cli = callPackage ../development/python-modules/j2cli { }; @@ -4369,6 +4391,8 @@ in { mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; + metakernel = callPackage ../development/python-modules/metakernel { }; + metar = callPackage ../development/python-modules/metar { }; meteoalertapi = callPackage ../development/python-modules/meteoalertapi { }; @@ -5763,6 +5787,8 @@ in { pydenticon = callPackage ../development/python-modules/pydenticon { }; + pydes = callPackage ../development/python-modules/pydes { }; + py-desmume = callPackage ../development/python-modules/py-desmume { }; pydexcom = callPackage ../development/python-modules/pydexcom { }; @@ -6240,6 +6266,8 @@ in { pypblib = callPackage ../development/python-modules/pypblib { }; + pypca = callPackage ../development/python-modules/pypca { }; + pypcap = callPackage ../development/python-modules/pypcap { }; pypck = callPackage ../development/python-modules/pypck { }; @@ -6490,6 +6518,8 @@ in { pysmi = callPackage ../development/python-modules/pysmi { }; + pysml = callPackage ../development/python-modules/pysml { }; + pysmt = callPackage ../development/python-modules/pysmt { }; pysnmp = callPackage ../development/python-modules/pysnmp { }; @@ -7837,6 +7867,8 @@ in { simanneal = callPackage ../development/python-modules/simanneal { }; + simber = callPackage ../development/python-modules/simber { }; + simpleaudio = callPackage ../development/python-modules/simpleaudio { }; simplebayes = callPackage ../development/python-modules/simplebayes { }; @@ -8766,6 +8798,8 @@ in { unidecode = callPackage ../development/python-modules/unidecode { }; + unidic-lite = callPackage ../development/python-modules/unidic-lite { }; + unidiff = callPackage ../development/python-modules/unidiff { }; unifi = callPackage ../development/python-modules/unifi { }; @@ -9272,6 +9306,8 @@ in { phantomjsSupport = false; }; + youtube-search = callPackage ../development/python-modules/youtube-search { }; + yowsup = callPackage ../development/python-modules/yowsup { }; yq = callPackage ../development/python-modules/yq { |