git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #92695 from davidtwco/wootility-3.5.10

wootility: 3.4.6 -> 3.5.10

commitfd70180e4524f1b3baa0991a527cd78bbaf089a9 authorRyan Mulligan <ryan@ryantm.com> dateThu 9 Jul 2020, 06:39 (6 years ago) parent3430e3eea0cec7
2 files changed+19−6
pkgs/tools/misc/wootility/default.nix+16−5 pkgs/top-level/all-packages.nix+3−1
pkgs/tools/misc/wootility/default.nix+16−5
@@ -1,15 +1,22 @@
1−{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3, udev, wooting-udev-rules }:
2−
1+{ appimageTools
2+, fetchurl
3+, lib
4+, gsettings-desktop-schemas
5+, gtk3
6+, libxkbfile
7+, udev
8+, wooting-udev-rules
9+}:
310let
411 pname = "wootility";
5− version = "3.4.6";
12+ version = "3.5.10";
613in
714appimageTools.wrapType2 rec {
815 name = "${pname}-${version}";
916
1017 src = fetchurl {
1118 url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-${version}.AppImage";
12− sha256 = "02ivbgnzr657iqb9hviaylmsym2kki2c84xmqfix3b0awsphn05q";
19+ sha256 = "1bhk4jcziis01lyn8dmx93abd6p41gmbrysphcd5810l7zcfz59y";
1320 };
1421
1522 profile = ''
@@ -19,7 +26,11 @@ appimageTools.wrapType2 rec {
1926
2027 multiPkgs = extraPkgs;
2128 extraPkgs =
22− pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ udev wooting-udev-rules ]);
29+ pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([
30+ udev
31+ wooting-udev-rules
32+ libxkbfile
33+ ]);
2334 extraInstallCommands = "mv $out/bin/{${name},${pname}}";
2435
2536 meta = with lib; {
pkgs/top-level/all-packages.nix+3−1
@@ -7541,7 +7541,9 @@ in
75417541
75427542 woof = callPackage ../tools/misc/woof { };
75437543
7544− wootility = callPackage ../tools/misc/wootility { };
7544+ wootility = callPackage ../tools/misc/wootility {
7545+ inherit (xorg) libxkbfile;
7546+ };
75457547
75467548 wpscan = callPackage ../tools/security/wpscan { };
75477549