JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opentabletdriver: 0.4.2 -> 0.5.0

Browse Source
This commit is contained in:
Thiago Kenji Okada 2021-01-19 11:33:01 -03:00
parent 98873022d4
commit 313ee6bd96
3 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixos/tests/opentabletdriver.nix
View File

@ -1,4 +1,6 @@
import ./make-test-python.nix ( { pkgs, ... }: {
import ./make-test-python.nix ( { pkgs, ... }: let
testUser = "alice";
in {
name = "opentabletdriver";
meta = {
maintainers = with pkgs.lib.maintainers; [ thiagokokada ];
@ -10,7 +12,7 @@ import ./make-test-python.nix ( { pkgs, ... }: {
./common/user-account.nix
./common/x11.nix
];
test-support.displayManager.auto.user = "alice";
test-support.displayManager.auto.user = testUser;
hardware.opentabletdriver.enable = true;
};
@ -18,10 +20,11 @@ import ./make-test-python.nix ( { pkgs, ... }: {
''
machine.start()
machine.wait_for_x()
machine.wait_for_unit("opentabletdriver.service", "alice")
machine.wait_for_unit("opentabletdriver.service", "${testUser}")
machine.succeed("cat /etc/udev/rules.d/30-opentabletdriver.rules")
machine.succeed("cat /etc/udev/rules.d/99-opentabletdriver.rules")
# Will fail if service is not running
machine.succeed("otd detect")
# Needs to run as the same user that started the service
machine.succeed("su - ${testUser} -c 'otd detect'")
'';
})

10
pkgs/tools/X11/opentabletdriver/default.nix
View File

@ -23,18 +23,18 @@
stdenv.mkDerivation rec {
pname = "OpenTabletDriver";
version = "0.4.2";
version = "0.5.0";
src = fetchFromGitHub {
owner = "InfinityGhost";
repo = "OpenTabletDriver";
rev = "v${version}";
sha256 = "048y7gjlk2yw4vh62px1d9w0va6ap1a0cndcpbirlyj9q6b8jxax";
sha256 = "1xi97nn5zb4fs3pyyqznvxnz07j30j3p967s7jigjmlm9321vkqp";
};
debPkg = fetchurl {
url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb";
sha256 = "13gg0dhvjy88h9lhcrp30fjiwgb9dzjsgk1k760pi1ki71a5vz2r";
sha256 = "06m2g5qvc02ga9f98f2ssa7wr2b7b2qm90qwaf17fz5z8rr0qmp0";
};
nativeBuildInputs = [
@ -134,8 +134,8 @@ stdenv.mkDerivation rec {
install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps
# TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead
dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/30-opentabletdriver.rules
install -Dm644 ./usr/lib/udev/rules.d/30-opentabletdriver.rules -t $out/lib/udev/rules.d
dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/99-opentabletdriver.rules
install -Dm644 ./usr/lib/udev/rules.d/99-opentabletdriver.rules -t $out/lib/udev/rules.d
runHook postInstall
'';

33
pkgs/tools/X11/opentabletdriver/deps.nix generated
View File

@ -11,13 +11,13 @@
})
(fetchNuGet {
name = "Eto.Forms";
version = "2.5.6";
sha256 = "035ny8jlanchwq16gcq0xb6ywabjl71c7qbpv26sjwg96na8vz51";
version = "2.5.10";
sha256 = "1d71wglk4ixfqfbm6sxmj753x5iwbar8i9zzjy3bh64fy1dn8lz7";
})
(fetchNuGet {
name = "Eto.Platform.Gtk";
version = "2.5.6";
sha256 = "1ijkjd3lc7x59yk369kxipzgk1zhyr9g6k319wc0n033vij26mwl";
version = "2.5.10";
sha256 = "1pkqvlfx7bzracnw19bl50i9jg4ym376vihmy9qq7m5z5nfdqn4g";
})
(fetchNuGet {
name = "GdkSharp";
@ -41,8 +41,8 @@
})
(fetchNuGet {
name = "HidSharpCore";
version = "1.1.0";
sha256 = "122s5j3wrv8hcgnbxrnjqydvcfz7gdm8xq0wlwzrgwdjk44lr45a";
version = "1.2.1";
sha256 = "0vcw38skr9g691gxbzv3cf6y9rk11vh5pvcyjshdgii2z1z8a4g2";
})
(fetchNuGet {
name = "MessagePack.Annotations";
@ -120,9 +120,9 @@
sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5";
})
(fetchNuGet {
name = "Newtonsoft.Json";
version = "12.0.3";
sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x";
name = "Octokit";
version = "0.48.0";
sha256 = "17ria1shx04rb6knbaswpqndmwam6v3r3lsfsd486q584798ccn8";
})
(fetchNuGet {
name = "PangoSharp";
@ -204,6 +204,11 @@
version = "4.3.2";
sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c";
})
(fetchNuGet {
name = "SharpZipLib";
version = "1.3.1";
sha256 = "09zypjfils38143da507s5fi4hzvdlz32wfav219hksnpl35y8x0";
})
(fetchNuGet {
name = "StreamJsonRpc";
version = "2.6.121";
@ -229,11 +234,6 @@
version = "2.0.0-beta1.20253.1";
sha256 = "16saf1fm9q80bb624fkqz0ksrwpnbw9617d7xg3jib7a2wgagm2r";
})
(fetchNuGet {
name = "System.CommandLine";
version = "2.0.0-beta1.20303.1";
sha256 = "0isnz8ipqlqim06hf56zlaq2vnsy5facvf5nvq6kzm5h1dm3l2vn";
})
(fetchNuGet {
name = "System.ComponentModel.Annotations";
version = "4.7.0";
@ -319,11 +319,6 @@
version = "4.3.0";
sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p";
})
(fetchNuGet {
name = "System.Numerics.Vectors";
version = "4.5.0";
sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59";
})
(fetchNuGet {
name = "System.Reflection.Emit.Lightweight";
version = "4.6.0";