diff options
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r-- | pkgs/tools/X11/alttab/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/X11/ckbcomp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/X11/xborders/default.nix | 57 | ||||
-rw-r--r-- | pkgs/tools/X11/xborders/setup.py | 12 | ||||
-rw-r--r-- | pkgs/tools/X11/xnotify/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/X11/xpra/fix-122159.patch | 22 | ||||
-rw-r--r-- | pkgs/tools/X11/xpra/fix-paths.patch | 23 |
8 files changed, 91 insertions, 46 deletions
diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix index 9f71ba2fc8dd1..ab4a8156f96f0 100644 --- a/pkgs/tools/X11/alttab/default.nix +++ b/pkgs/tools/X11/alttab/default.nix @@ -2,7 +2,7 @@ libpng, uthash , which, xnee, xorg, python3Packages }: stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.7.0"; pname = "alttab"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "sagb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g56207IGNDnBIqZmbpcgOLcfAGKwBE0DYu2Dq0bLS8o="; + sha256 = "sha256-AxHagyGbU3bWJ+sP2S7YjHBHsIbd/doONPgd2tsBtKY="; }; nativeBuildInputs = [ @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { description = "X11 window switcher designed for minimalistic window managers or standalone X11 session"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = [ maintainers.sgraf ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 8f547a9501bc7..e9bd772a94d1f 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.212"; + version = "1.217"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "sha256-ePWWBbMLXWZABztKeVV0nIfLfyO+9oBiSRNShbmOObw="; + sha256 = "sha256-oiHY0ZylhPKrC3dZS760J6LSjzP6y7UiXGAmUp9idMI="; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/X11/xborders/default.nix b/pkgs/tools/X11/xborders/default.nix new file mode 100644 index 0000000000000..f9e78034c3c04 --- /dev/null +++ b/pkgs/tools/X11/xborders/default.nix @@ -0,0 +1,57 @@ +{ lib +, python3Packages +, fetchFromGitHub +, libwnck +, gtk3 +, libnotify +, wrapGAppsHook +, gobject-introspection +, substituteAll +}: + +python3Packages.buildPythonPackage rec { + pname = "xborders"; + version = "3.4"; # in version.txt + + src = fetchFromGitHub { + owner = "deter0"; + repo = "xborder"; + rev = "e74ae532b9555c59d195537934fa355b3fea73c5"; + hash = "sha256-UKsseNkXest6npPqJKvKL0iBWeK+S7zynrDlyXIOmF4="; + }; + + buildInputs = [ + libwnck + gtk3 + libnotify + ]; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + ]; + + propagatedBuildInputs = with python3Packages; [ + pycairo + requests + pygobject3 + ]; + + postPatch = let + setup = substituteAll { + src = ./setup.py; + desc = meta.description; # "description" is reserved + inherit pname version; + }; + in '' + ln -s ${setup} setup.py + ''; + + meta = with lib; { + description = "Active window border replacement for window managers"; + homepage = "https://github.com/deter0/xborder"; + license = licenses.unlicense; + maintainers = with maintainers; [ elnudev ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/X11/xborders/setup.py b/pkgs/tools/X11/xborders/setup.py new file mode 100644 index 0000000000000..a002625fa064d --- /dev/null +++ b/pkgs/tools/X11/xborders/setup.py @@ -0,0 +1,12 @@ +from setuptools import setup + +setup( + name='@pname@', + version='@version@', + author='deter0', + description='@desc@', + install_requires=['pycairo', 'requests', 'PyGObject'], + scripts=[ + 'xborders', + ], +) diff --git a/pkgs/tools/X11/xnotify/default.nix b/pkgs/tools/X11/xnotify/default.nix index dd153adfa73b1..e5c6c31e7dbb0 100644 --- a/pkgs/tools/X11/xnotify/default.nix +++ b/pkgs/tools/X11/xnotify/default.nix @@ -8,7 +8,6 @@ , libXft , libXinerama , conf ? null -, nix-update-script }: stdenv.mkDerivation rec { @@ -18,8 +17,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "phillbush"; repo = "xnotify"; - rev = "58c7d5763c3fb1c32a76560c85d20a25f59d4687"; - sha256 = "sha256-BSZesuBGAWYp3IMiiZi6CAyZEiz3sBJLQe6/JnxviLs="; + rev = "v${version}"; + hash = "sha256-RfnmiAEFTPqQZursyVPDIZ6J3KBouvaaxyhTc1liqBc="; }; buildInputs = [ @@ -40,8 +39,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - passthru.updateScript = nix-update-script { }; - meta = with lib; { description = "A tool to read notifications from stdin and pop them up on the screen"; longDescription = '' diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 72cb79388cfcd..e51d5f386b1eb 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -20,6 +20,7 @@ , librsvg , libvpx , libwebp +, lz4 , nv-codec-headers-10 , nvidia_x11 ? null , pam @@ -68,11 +69,11 @@ let ''; in buildPythonApplication rec { pname = "xpra"; - version = "4.3.3"; + version = "4.4.3"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - hash = "sha256-J6zzkho0A1faCVzS/0wDlbgLtJmyPrnBkEcR7kDld7A="; + hash = "sha256-j7tHT486ylyWAmR34BBWw9+HbDPnYMvHU88HV+Cs1w8="; }; patches = [ @@ -122,6 +123,7 @@ in buildPythonApplication rec { librsvg libvpx libwebp + lz4 pam pango x264 diff --git a/pkgs/tools/X11/xpra/fix-122159.patch b/pkgs/tools/X11/xpra/fix-122159.patch index fecc7e8130d1c..510b40422a2a3 100644 --- a/pkgs/tools/X11/xpra/fix-122159.patch +++ b/pkgs/tools/X11/xpra/fix-122159.patch @@ -1,16 +1,16 @@ diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py -index 6def9e0ad..031f8aba9 100755 +index 031a41f9e..6232ba830 100755 --- a/xpra/scripts/main.py +++ b/xpra/scripts/main.py -@@ -364,11 +364,7 @@ def run_mode(script_file, cmdline, error_cb, options, args, mode, defaults): - "shadow", - ) and not display_is_remote: - if use_systemd_run(options.systemd_run): -- #make sure we run via the same interpreter, -- #inject it into the command line if we have to: - argv = list(cmdline) -- if argv[0].find("python")<0: -- argv.insert(0, "python%i.%i" % (sys.version_info.major, sys.version_info.minor)) - return systemd_run_wrap(mode, argv, options.systemd_run_args) +@@ -377,11 +377,7 @@ def run_mode(script_file, cmdline, error_cb, options, args, mode, defaults): + "seamless", "desktop", "shadow", "expand", + "upgrade", "upgrade-seamless", "upgrade-desktop", + ) and not display_is_remote and use_systemd_run(options.systemd_run): +- #make sure we run via the same interpreter, +- #inject it into the command line if we have to: + argv = list(cmdline) +- if argv[0].find("python")<0: +- argv.insert(0, "python%i.%i" % (sys.version_info.major, sys.version_info.minor)) + return systemd_run_wrap(mode, argv, options.systemd_run_args) configure_env(options.env) configure_logging(options, mode) diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch index aee47a6ad53b6..be9438f2616da 100644 --- a/pkgs/tools/X11/xpra/fix-paths.patch +++ b/pkgs/tools/X11/xpra/fix-paths.patch @@ -1,26 +1,3 @@ -diff --git a/setup.py b/setup.py -index fc67abb50a..c29db3a6d2 100755 ---- a/setup.py -+++ b/setup.py -@@ -2348,17 +2348,7 @@ if v4l2_ENABLED: - break - constants_pxi = "xpra/codecs/v4l2/constants.pxi" - if not os.path.exists(videodev2_h) or should_rebuild(videodev2_h, constants_pxi): -- ENABLE_DEVICE_CAPS = 0 -- if os.path.exists(videodev2_h): -- try: -- with subprocess.Popen("cpp -fpreprocessed %s | grep -q device_caps" % videodev2_h, -- shell=True) as proc: -- ENABLE_DEVICE_CAPS = proc.wait()==0 -- except OSError: -- with open(videodev2_h) as f: -- hdata = f.read() -- ENABLE_DEVICE_CAPS = int(hdata.find("device_caps")>=0) -- print("failed to detect device caps, assuming off") -+ ENABLE_DEVICE_CAPS = 1 - with open(constants_pxi, "wb") as f: - f.write(b"DEF ENABLE_DEVICE_CAPS=%i" % ENABLE_DEVICE_CAPS) - add_cython_ext("xpra.codecs.v4l2.pusher", diff --git a/xpra/x11/fakeXinerama.py b/xpra/x11/fakeXinerama.py index d5c1c8bb10..88c77e8142 100755 --- a/xpra/x11/fakeXinerama.py |