diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-02 12:01:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 12:01:22 +0000 |
| commit | fc393d5731026ad533167bce923152c82d10b064 (patch) | |
| tree | e3ef6b29f9433f1c13f5a802046a0e6e3aa43bb0 /pkgs/tools | |
| parent | 532efa882790faa8d2abcb3a7f98564d8b2c74a8 (diff) | |
| parent | f3ec61b6dfe2f23caaa52b2f9d420dc1bd376b5c (diff) | |
| download | nixpkgs-fc393d5731026ad533167bce923152c82d10b064.tar nixpkgs-fc393d5731026ad533167bce923152c82d10b064.tar.gz nixpkgs-fc393d5731026ad533167bce923152c82d10b064.tar.bz2 nixpkgs-fc393d5731026ad533167bce923152c82d10b064.tar.lz nixpkgs-fc393d5731026ad533167bce923152c82d10b064.tar.xz nixpkgs-fc393d5731026ad533167bce923152c82d10b064.tar.zst nixpkgs-fc393d5731026ad533167bce923152c82d10b064.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/security/kdigger/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/text/xml/basex/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/wayland/wayland-utils/default.nix | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/tools/security/kdigger/default.nix b/pkgs/tools/security/kdigger/default.nix index 9fdc358e9ca..1b97147f7ce 100644 --- a/pkgs/tools/security/kdigger/default.nix +++ b/pkgs/tools/security/kdigger/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kdigger"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "quarkslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2H7aQoKtNABNI7R01ZOyHCFYUBIu1C7O0snO/i9807o="; + sha256 = "sha256-/KkqwjFxTipa5dCVRFlrKzl+PB4QB4aY0wjlsi1Phug="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -23,7 +23,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-Whw8zdfipbWjOXYEAQayfttH0GTTRdJAVjmvLjmsZPw="; + vendorSha256 = "sha256-rDJFowbOj77n/sBoDgFEF+2PgghxufvIgzbMqrHehws="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index ae91a0877f1..36d7dea4cea 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "basex"; - version = "10.1"; + version = "10.2"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-d11kqwsLsHopFi7w+wTDWx9h+UVM7Z5kY7vKXsBrvuo="; + hash = "sha256-byx1gY/tzUmdi120tQzUywj9XroLyxYVMb4UilkChNk="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; diff --git a/pkgs/tools/wayland/wayland-utils/default.nix b/pkgs/tools/wayland/wayland-utils/default.nix index ff3eb8a676c..b3863d732cc 100644 --- a/pkgs/tools/wayland/wayland-utils/default.nix +++ b/pkgs/tools/wayland/wayland-utils/default.nix @@ -1,21 +1,21 @@ { lib, stdenv, fetchurl , meson, pkg-config, ninja, wayland-scanner -, wayland, wayland-protocols +, libdrm, wayland, wayland-protocols }: stdenv.mkDerivation rec { pname = "wayland-utils"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1h38l850ww6hxjb1l8iwa33nkbz8q88bw6lh0aryjyp8b16crzk4"; + url = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${version}/downloads/wayland-utils-${version}.tar.xz"; + sha256 = "sha256-nmhYYwJbT+reNtU7vI4xtD4mSYvnQ96oTHqEkSlZQQo="; }; strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ]; - buildInputs = [ wayland wayland-protocols ]; + buildInputs = [ libdrm wayland wayland-protocols ]; meta = with lib; { description = "Wayland utilities (wayland-info)"; |