dasher: 2018-04-03 -> unstable-2021-04-25

+31 -18
+31 -18
pkgs/applications/accessibility/dasher/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub 2 - , autoreconfHook, pkg-config, wrapGAppsHook 3 - , glib, gtk3, expat, gnome-doc-utils, which 4 - , at-spi2-core, dbus 5 - , libxslt, libxml2 6 - , speechSupport ? true, speechd ? null 1 + { stdenv 2 + , lib 3 + , fetchFromGitLab 4 + , autoreconfHook 5 + , pkg-config 6 + , wrapGAppsHook 7 + , glib 8 + , gtk3 9 + , expat 10 + , itstool 11 + , gnome-doc-utils 12 + , which 13 + , at-spi2-core 14 + , dbus 15 + , libxslt 16 + , libxml2 17 + , speechSupport ? true 18 + , speechd 7 19 }: 8 20 9 - assert speechSupport -> speechd != null; 10 - 11 21 stdenv.mkDerivation { 12 22 pname = "dasher"; 13 - version = "2018-04-03"; 23 + version = "unstable-2021-04-25"; 14 24 15 - src = fetchFromGitHub { 16 - owner = "dasher-project"; 25 + src = fetchFromGitLab { 26 + domain = "gitlab.gnome.org"; 27 + owner = "GNOME"; 17 28 repo = "dasher"; 18 - rev = "9ab12462e51d17a38c0ddc7f7ffe1cb5fe83b627"; 19 - sha256 = "1r9xn966nx3pv2bidd6i3pxmprvlw6insnsb38zabmac609h9d9s"; 29 + rev = "90c753b87564fa3f42cb2d04e1eb6662dc8e0f8f"; 30 + sha256 = "sha256-aM05CV68pCRlhfIPyhuHWeRL+tDroB3fVsoX08OU8hY="; 20 31 }; 21 32 22 33 prePatch = '' ··· 33 44 # doc generation 34 45 gnome-doc-utils 35 46 which 36 - libxslt libxml2 47 + libxslt 48 + libxml2 37 49 ]; 38 50 39 51 buildInputs = [ 40 52 glib 41 53 gtk3 42 54 expat 55 + itstool 43 56 # at-spi2 needs dbus to be recognized by pkg-config 44 - at-spi2-core dbus 57 + at-spi2-core 58 + dbus 45 59 ] ++ lib.optional speechSupport speechd; 46 60 47 61 meta = { 48 - homepage = "http://www.inference.org.uk/dasher/"; 62 + homepage = "https://www.inference.org.uk/dasher/"; 49 63 description = "Information-efficient text-entry interface, driven by natural continuous pointing gestures"; 50 - license = lib.licenses.gpl2; 64 + license = lib.licenses.gpl2Only; 51 65 maintainers = [ lib.maintainers.Profpatsch ]; 52 66 platforms = lib.platforms.all; 53 67 }; 54 - 55 68 }