diff options
Diffstat (limited to 'pkgs/applications/window-managers')
61 files changed, 120 insertions, 415 deletions
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix index 4072c74d7f838..09f3a0ebce628 100644 --- a/pkgs/applications/window-managers/2bwm/default.nix +++ b/pkgs/applications/window-managers/2bwm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/venam/2bwm"; - description = "A fast floating WM written over the XCB library and derived from mcwm"; + description = "Fast floating WM written over the XCB library and derived from mcwm"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; platforms = platforms.unix; diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 53807e65a3cb4..bfd18f2f02a9c 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "A tiling window manager based on binary space partitioning"; + description = "Tiling window manager based on binary space partitioning"; homepage = "https://github.com/baskerville/bspwm"; maintainers = with maintainers; [ meisternu ]; license = licenses.bsd2; diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index c94263f816125..73c9f7c4c5115 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { passthru.tests.basic-nixos-module-functionality = nixosTests.cage; meta = with lib; { - description = "A Wayland kiosk that runs a single, maximized application"; + description = "Wayland kiosk that runs a single, maximized application"; homepage = "https://www.hjdskes.nl/projects/cage/"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index da3f2a97082e4..c897e3f66d8f2 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/project-repo/cagebreak"; - description = "A Wayland tiling compositor inspired by ratpoison"; + description = "Wayland tiling compositor inspired by ratpoison"; license = licenses.mit; maintainers = with maintainers; [ berbiche ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index 5560a04dcd61f..89187c89d6cab 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; meta = with lib; { - description = "A lightweight and efficient window manager for X11"; + description = "Lightweight and efficient window manager for X11"; homepage = "https://github.com/leahneukirchen/cwm"; maintainers = with maintainers; [ _0x4A6F mkf ]; license = licenses.isc; diff --git a/pkgs/applications/window-managers/dk/default.nix b/pkgs/applications/window-managers/dk/default.nix index 631e7b85d18eb..a0efe1ad768f6 100644 --- a/pkgs/applications/window-managers/dk/default.nix +++ b/pkgs/applications/window-managers/dk/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://bitbucket.org/natemaia/dk"; - description = "A list based tiling window manager in the vein of dwm, bspwm, and xmonad"; + description = "List based tiling window manager in the vein of dwm, bspwm, and xmonad"; license = lib.licenses.x11; maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 0905e3f15150e..10fef61b49a1a 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://dwm.suckless.org/"; - description = "An extremely fast, small, and dynamic window manager for X"; + description = "Extremely fast, small, and dynamic window manager for X"; longDescription = '' dwm is a dynamic window manager for X. It manages windows in tiled, monocle and floating layouts. All of the layouts can be applied diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 6ee2c94230de8..69391589f8c5c 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = ["-Wno-error" "-I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"]; meta = with lib; { - description = "A stand-alone panel"; + description = "Stand-alone panel"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/applications/window-managers/hackedbox/default.nix b/pkgs/applications/window-managers/hackedbox/default.nix index 45f17c0c912ed..e5812c4c63fa4 100644 --- a/pkgs/applications/window-managers/hackedbox/default.nix +++ b/pkgs/applications/window-managers/hackedbox/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "A bastard hacked offspring of Blackbox"; + description = "Bastard hacked offspring of Blackbox"; homepage = "https://github.com/museoa/hackedbox/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index e7cde84375ec8..825ae0de85e42 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A manual tiling window manager for X"; + description = "Manual tiling window manager for X"; homepage = "https://herbstluftwm.org/"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix index 18aa5e32261f8..3952256b8d410 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cairo , cmake , glib @@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { inherit (finalAttrs.src.meta) homepage; - description = "A tiling X11 window manager written in modern C++"; + description = "Tiling X11 window manager written in modern C++"; license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres ]; inherit (libX11.meta) platforms; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index 76754dd5f0d8a..859ddf6dcecc0 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -22,27 +22,27 @@ let plugins = { hy3 = { fetchFromGitHub, cmake, hyprland }: - mkHyprlandPlugin hyprland { + mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.39.1"; + version = "0.41.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl0.39.1"; - hash = "sha256-PqVld+oFziSt7VZTNBomPyboaMEAIkerPQFwNJL/Wjw="; + rev = "hl${version}"; + hash = "sha256-gEEWWlQRvejSR2RRg78Lubz6siIgknqj6CslveyyIP4="; }; nativeBuildInputs = [ cmake ]; dontStrip = true; - meta = with lib; { + meta = { homepage = "https://github.com/outfoxxed/hy3"; description = "Hyprland plugin for an i3 / sway like manual tiling layout"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.aacebedo ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aacebedo ]; }; }; }; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix index 050c1c73d63c4..8815205b0e9d1 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprland-protocols"; - version = "0.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc="; + hash = "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix deleted file mode 100644 index 4d50b39ebedad..0000000000000 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ /dev/null @@ -1,155 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, makeWrapper -, meson -, ninja -, binutils -, cairo -, git -, hyprcursor -, hyprland-protocols -, hyprlang -, jq -, libGL -, libdrm -, libexecinfo -, libinput -, libxcb -, libxkbcommon -, mesa -, pango -, pciutils -, systemd -, tomlplusplus -, udis86-hyprland -, wayland -, wayland-protocols -, wayland-scanner -, wlroots-hyprland -, xcbutilwm -, xwayland -, debug ? false -, enableXWayland ? true -, legacyRenderer ? false -, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, wrapRuntimeDeps ? true - # deprecated flags -, nvidiaPatches ? false -, hidpiXWayland ? false -, enableNvidiaPatches ? false -}: -assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed."; -assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; -assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; - -let - wlr = wlroots-hyprland.override { inherit enableXWayland; }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.39.1"; - src = fetchFromGitHub { - owner = "hyprwm"; - repo = finalAttrs.pname; - rev = "v${finalAttrs.version}"; - hash = "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g="; - }; - - patches = [ - # make meson use the provided dependencies instead of the git submodules - "${finalAttrs.src}/nix/patches/meson-build.patch" - ]; - - postPatch = '' - # Fix hardcoded paths to /usr installation - sed -i "s#/usr#$out#" src/render/OpenGL.cpp - - # Generate version.h - cp src/version.h.in src/version.h - substituteInPlace src/version.h \ - --replace "@HASH@" '${finalAttrs.src.rev}' \ - --replace "@BRANCH@" "" \ - --replace "@MESSAGE@" "" \ - --replace "@DATE@" "2024-04-16" \ - --replace "@TAG@" "" \ - --replace "@DIRTY@" "" - ''; - - depsBuildBuild = [ - # to find wayland-scanner when cross-compiling - pkg-config - ]; - - nativeBuildInputs = [ - jq - makeWrapper - meson - ninja - pkg-config - wayland-scanner - ]; - - outputs = [ - "out" - "man" - "dev" - ]; - - buildInputs = - wlr.buildInputs ++ [ - cairo - git - hyprcursor - hyprland-protocols - hyprlang - libGL - libdrm - libinput - libxkbcommon - mesa - udis86-hyprland - wayland - wayland-protocols - pango - pciutils - tomlplusplus - wlr - ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ] - ++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ] - ++ lib.optionals withSystemd [ systemd ]; - - mesonBuildType = - if debug - then "debug" - else "release"; - - mesonAutoFeatures = "disabled"; - - mesonFlags = [ - (lib.mesonEnable "xwayland" enableXWayland) - (lib.mesonEnable "legacy_renderer" legacyRenderer) - (lib.mesonEnable "systemd" withSystemd) - ]; - - postInstall = '' - ln -s ${wlr}/include/wlr $dev/include/hyprland/wlroots - ${lib.optionalString wrapRuntimeDeps '' - wrapProgram $out/bin/Hyprland \ - --suffix PATH : ${lib.makeBinPath [binutils pciutils stdenv.cc]} - ''} - ''; - - passthru.providedSessions = [ "hyprland" ]; - - meta = with lib; { - homepage = "https://github.com/hyprwm/Hyprland"; - description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; - license = licenses.bsd3; - maintainers = with maintainers; [ wozeparrot fufexan ]; - mainProgram = "Hyprland"; - platforms = wlr.meta.platforms; - }; -}) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix b/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix deleted file mode 100644 index b72083c4560a1..0000000000000 --- a/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ udis86 -, fetchFromGitHub -}: -udis86.overrideAttrs (old: { - version = "unstable-2022-10-13"; - - src = fetchFromGitHub { - owner = "canihavesomecoffee"; - repo = "udis86"; - rev = "5336633af70f3917760a6d441ff02d93477b0c86"; - hash = "sha256-HifdUQPGsKQKQprByeIznvRLONdOXeolOsU5nkwIv3g="; - }; - - patches = [ ]; -}) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix deleted file mode 100644 index b2f4a52126dcf..0000000000000 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchFromGitHub -, wlroots -, enableXWayland ? true -}: -wlroots.overrideAttrs - (old: { - inherit enableXWayland; - version = "0.18.0-dev"; - - src = fetchFromGitHub { - owner = "hyprwm"; - repo = "wlroots-hyprland"; - rev = "611a4f24cd2384378f6e500253983107c6656c64"; - hash = "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI="; - }; - - patches = [ ]; # don't inherit old.patches - - pname = "${old.pname}-hyprland"; - }) diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix index fca98486e4de2..9da143be08bf1 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { inherit (finalAttrs.src.meta) homepage; - description = "A blazing fast wayland wallpaper utility"; + description = "Blazing fast wayland wallpaper utility"; license = licenses.bsd3; maintainers = with maintainers; [ wozeparrot fufexan ]; inherit (wayland.meta) platforms; diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix index a4a747fba3f99..4089d82a3b977 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix @@ -19,19 +19,18 @@ , wayland , wayland-protocols , wayland-scanner -, wlroots , libXdmcp , debug ? false }: stdenv.mkDerivation (finalAttrs: { pname = "hyprpicker" + lib.optionalString debug "-debug"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-bys8S7wuY9FJRLD5WriktWED5Hi7nCKSiNbs1Rvfk4s="; + hash = "sha256-BYQF1zM6bJ44ag9FJ0aTSkhOTY9U7uRdp3SmRCs5fJM="; }; cmakeBuildType = if debug then "Debug" else "Release"; @@ -57,40 +56,17 @@ stdenv.mkDerivation (finalAttrs: { wayland wayland-protocols wayland-scanner - wlroots libXdmcp util-linux ]; - configurePhase = '' - runHook preConfigure - - make protocols - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - make release - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share/licenses} - - install -Dm755 build/hyprpicker -t $out/bin - install -Dm644 LICENSE -t $out/share/licenses/hyprpicker - - runHook postInstall + postInstall = '' + mkdir -p $out/share/licenses + install -Dm644 $src/LICENSE -t $out/share/licenses/hyprpicker ''; meta = with lib; { - description = "A wlroots-compatible Wayland color picker that does not suck"; + description = "Wlroots-compatible Wayland color picker that does not suck"; homepage = "https://github.com/hyprwm/hyprpicker"; license = licenses.bsd3; maintainers = with maintainers; [ fufexan ]; diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 2825ef3a65636..609da88715661 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (self: { pname = "xdg-desktop-portal-hyprland"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; rev = "v${self.version}"; - hash = "sha256-wP611tGIWBA4IXShWbah7TxqdbvhfcfT2vnXalX/qzk="; + hash = "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index 657e8d2dca1c5..1d9043686bb2d 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps"; + description = "Flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps"; mainProgram = "i3blocks"; homepage = "https://github.com/Airblader/i3blocks-gaps"; license = licenses.gpl3; diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index e8f628fb4dc9f..d9ed823400d65 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = { - description = "A flexible scheduler for your i3bar blocks"; + description = "Flexible scheduler for your i3bar blocks"; mainProgram = "i3blocks"; homepage = "https://github.com/vivien/i3blocks"; license = licenses.gpl3; diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/default.nix b/pkgs/applications/window-managers/i3/bumblebee-status/default.nix index 9583d71052bb0..6346672181487 100644 --- a/pkgs/applications/window-managers/i3/bumblebee-status/default.nix +++ b/pkgs/applications/window-managers/i3/bumblebee-status/default.nix @@ -57,7 +57,7 @@ python.pkgs.buildPythonPackage { ''; meta = with lib; { - description = "A modular, theme-able status line generator for the i3 window manager"; + description = "Modular, theme-able status line generator for the i3 window manager"; homepage = "https://github.com/tobi-wan-kenobi/bumblebee-status"; mainProgram = "bumblebee-status"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/i3/cycle-focus.nix b/pkgs/applications/window-managers/i3/cycle-focus.nix index 7927985460e29..f6ae488b07891 100644 --- a/pkgs/applications/window-managers/i3/cycle-focus.nix +++ b/pkgs/applications/window-managers/i3/cycle-focus.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-9glaxThm/ovgvUWCyrycS/Oe5t8iN5P38fF5vO5awQE="; meta = with lib; { - description = "A simple tool to cyclically switch between the windows on the active workspace"; + description = "Simple tool to cyclically switch between the windows on the active workspace"; mainProgram = "i3-cycle-focus"; homepage = "https://github.com/TheDoctor314/i3-cycle-focus"; license = licenses.unlicense; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index d7f1bc2176a8c..16dd2e6485e77 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; meta = with lib; { - description = "A tiling window manager"; + description = "Tiling window manager"; homepage = "https://i3wm.org"; maintainers = with maintainers; [ modulistic fpletz ]; mainProgram = "i3"; diff --git a/pkgs/applications/window-managers/i3/i3-resurrect.nix b/pkgs/applications/window-managers/i3/i3-resurrect.nix index c5fedfbe36e75..015bbee6013f2 100644 --- a/pkgs/applications/window-managers/i3/i3-resurrect.nix +++ b/pkgs/applications/window-managers/i3/i3-resurrect.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/JonnyHaystack/i3-resurrect"; - description = "A simple but flexible solution to saving and restoring i3 workspaces"; + description = "Simple but flexible solution to saving and restoring i3 workspaces"; mainProgram = "i3-resurrect"; license = licenses.gpl3; platforms= platforms.linux; diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix index a6a77600ee5f1..9362cdcfdcec7 100644 --- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A C interface library to i3wm"; + description = "C interface library to i3wm"; homepage = "https://github.com/acrisci/i3ipc-glib"; maintainers = with maintainers; [teto]; license = licenses.gpl3; diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/applications/window-managers/i3/lock-blur.nix index f9f6de9212706..e3eabc547b5f9 100644 --- a/pkgs/applications/window-managers/i3/lock-blur.nix +++ b/pkgs/applications/window-managers/i3/lock-blur.nix @@ -24,7 +24,7 @@ i3lock-color.overrideAttrs (oldAttrs : rec { buildInputs = oldAttrs.buildInputs ++ [ libGL ]; meta = with lib; { - description = "An improved screenlocker based upon XCB and PAM with background blurring filter"; + description = "Improved screenlocker based upon XCB and PAM with background blurring filter"; homepage = "https://github.com/karulont/i3lock-blur/"; license = licenses.bsd3; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 596aa8ceea124..584e13f553697 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sed -i 's/\(^\|\s\|"\)i3lock\(\s\|$\)/\1i3lock-color\2/g' $out/share/man/man1/i3lock-color.1 ''; meta = with lib; { - description = "A simple screen locker like slock, enhanced version with extra configuration options"; + description = "Simple screen locker like slock, enhanced version with extra configuration options"; longDescription = '' Simple screen locker. After locking, a colored background (default: white) or a configurable image is shown, and a ring-shaped unlock-indicator gives feedback diff --git a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix index 7060a502f128c..654841c7ffcea 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A faster implementation of i3lock-fancy"; + description = "Faster implementation of i3lock-fancy"; homepage = "https://github.com/yvbbrjdr/i3lock-fancy-rapid"; maintainers = with maintainers; [ nickhu ]; license = licenses.bsd3; diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index f3963b43b54af..a66e52bc40b0d 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -1,54 +1,67 @@ -{ lib -, stdenv +{ coreutils , fetchFromGitHub -, coreutils -, scrot -, imagemagick +, fontconfig , gawk -, i3lock-color , getopt -, fontconfig +, i3lock-color +, imagemagick +, installShellFiles +, lib +, makeWrapper +, scrot +, stdenv + +, screenshotCommand ? "" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "i3lock-fancy"; - version = "unstable-2018-11-25"; + version = "unstable-2023-04-28"; src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; - rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a"; - sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1"; + rev = "55f5c30071403faf5ae4363a54b6d1f63876d5ce"; + hash = "sha256-ISymKlxLE4/ChDiyjnavFx4T5hEVI62cCxYLWrWiHrg="; }; + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + postPatch = '' sed -i i3lock-fancy \ - -e "s|mktemp|${coreutils}/bin/mktemp|" \ - -e "s|'rm -f |'${coreutils}/bin/rm -f |" \ - -e "s|scrot -z |${scrot}/bin/scrot -z |" \ - -e "s|convert |${imagemagick.out}/bin/convert |" \ - -e "s|awk -F|${gawk}/bin/awk -F|" \ - -e "s| awk | ${gawk}/bin/awk |" \ - -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" \ -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' \ - -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' \ - -e "s|getopt |${getopt}/bin/getopt |" \ - -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" \ - -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z -o)|" + -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' rm Makefile + '' + lib.optionalString (screenshotCommand != "") '' + sed -i i3lock-fancy \ + -e "s|shot=(import -silent -window root)|shot=(${screenshotCommand})|"; ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/i3lock-fancy/icons cp i3lock-fancy $out/bin/i3lock-fancy ln -s $out/bin/i3lock-fancy $out/bin/i3lock cp icons/lock*.png $out/share/i3lock-fancy/icons + installManPage doc/i3lock-fancy.1 + + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/i3lock-fancy \ + --prefix PATH : ${lib.makeBinPath [ coreutils fontconfig gawk getopt i3lock-color imagemagick scrot ]} ''; meta = with lib; { description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; homepage = "https://github.com/meskarune/i3lock-fancy"; - maintainers = with maintainers; [ ]; + maintainers = [ maintainers.reedrw ]; + mainProgram = "i3lock-fancy"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 41096a70a68d1..8c226ac22ba42 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pam libX11 libev cairo libxkbcommon libxkbfile xorg.xcbutil ]; meta = with lib; { - description = "A simple screen locker like slock"; + description = "Simple screen locker like slock"; longDescription = '' Simple screen locker. After locking, a colored background (default: white) or a configurable image is shown, and a ring-shaped unlock-indicator gives feedback diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 73136980aa93f..66450eec6c321 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/enkore/i3pystatus"; - description = "A complete replacement for i3status"; + description = "Complete replacement for i3status"; longDescription = '' i3pystatus is a growing collection of python scripts for status output compatible to i3status / i3bar of the i3 window manager. diff --git a/pkgs/applications/window-managers/i3/rounded.nix b/pkgs/applications/window-managers/i3/rounded.nix index aa3701975fcca..ee04f4246fefa 100644 --- a/pkgs/applications/window-managers/i3/rounded.nix +++ b/pkgs/applications/window-managers/i3/rounded.nix @@ -14,7 +14,7 @@ i3.overrideAttrs (oldAttrs: rec { buildInputs = oldAttrs.buildInputs ++ [ pcre ]; meta = with lib; { - description = "A fork of i3-gaps that adds rounding to window corners"; + description = "Fork of i3-gaps that adds rounding to window corners"; homepage = "https://github.com/LinoBigatti/i3-rounded"; maintainers = with maintainers; [ marsupialgutz ]; license = licenses.bsd3; diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/applications/window-managers/jay/default.nix index 6b7951c14c374..68644b7535424 100644 --- a/pkgs/applications/window-managers/jay/default.nix +++ b/pkgs/applications/window-managers/jay/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "jay"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "mahkoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9fWwVUqeYADt33HGaJRRFmM20WM7qRWbNGpt3rk9xQM="; + sha256 = "sha256-D+dG0/MSC6LzGZBMNofU8WKVYvn52kNWunXExQPoOu8="; }; - cargoSha256 = "sha256-oPGY/rVx94BkWgKkwwyDjfASMyGGU32R5IZuNjOv+EM="; + cargoHash = "sha256-WEEAFr5lemyOfeIKC9Pvr9sYMz8rLO6k1BFgbxXJ0Pk="; SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A Wayland compositor written in Rust"; + description = "Wayland compositor written in Rust"; homepage = "https://github.com/mahkoh/jay"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index d01e1bfdf9752..20caf7291c5da 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A full configuration manager for JWM"; + description = "Full configuration manager for JWM"; homepage = "https://joewing.net/projects/jwm"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index ea2a41413a08d..ac9a17a489b75 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { dontPatchELF = true; meta = { - description = "A tiling window manager for the adventurer"; + description = "Tiling window manager for the adventurer"; homepage = "https://github.com/leftwm/leftwm"; license = lib.licenses.mit; platforms = lib.platforms.linux; diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index d5763a0489f1a..1c66b6fe7ffda 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lemonbar"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "LemonBoy"; repo = "bar"; rev = "v${version}"; - sha256 = "sha256-lmppcnQ8r4jEuhegpTBxYqxfTTS/IrbtQVZ44HqnoWo="; + sha256 = "sha256-OLhgu0kmMZhjv/VST8AXvIH+ysMq72m4TEOypdnatlU="; }; buildInputs = [ libxcb perl ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = with lib; { - description = "A lightweight xcb based bar"; + description = "Lightweight xcb based bar"; homepage = "https://github.com/LemonBoy/bar"; maintainers = with maintainers; [ meisternu moni ]; license = licenses.mit; diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index 80439f945fdc2..014376a37c405 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = with lib; { - description = "A lightweight xcb based bar with XFT-support"; + description = "Lightweight xcb based bar with XFT-support"; mainProgram = "lemonbar"; homepage = "https://github.com/drscream/lemonbar-xft"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/lesbar/default.nix b/pkgs/applications/window-managers/lesbar/default.nix index 553e79f9e6dc7..5649ae27810a6 100644 --- a/pkgs/applications/window-managers/lesbar/default.nix +++ b/pkgs/applications/window-managers/lesbar/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "A programming language agnostic view layer for creating desktop widgets and status bars"; + description = "Programming language agnostic view layer for creating desktop widgets and status bars"; homepage = "https://git.sr.ht/~salmiak/lesbar"; license = licenses.mit; maintainers = with maintainers; [ jpentland ]; diff --git a/pkgs/applications/window-managers/maui-shell/default.nix b/pkgs/applications/window-managers/maui-shell/default.nix index 215b871312a44..0ac02b0957fa9 100644 --- a/pkgs/applications/window-managers/maui-shell/default.nix +++ b/pkgs/applications/window-managers/maui-shell/default.nix @@ -79,7 +79,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A convergent shell for desktops, tablets, and phones"; + description = "Convergent shell for desktops, tablets, and phones"; homepage = "https://github.com/Nitrux/maui-shell"; license = licenses.lgpl3; maintainers = with maintainers; [ onny ]; diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index b56127cc2948e..a51f3838aa3aa 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "0-unstable-2024-04-30"; + version = "0-unstable-2024-05-17"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "726ef446c89a75510311638a4892e97ad9e0fa4e"; - hash = "sha256-7OoCoZ4IHXYI73W93P9MzVGYFv/+MDcbbhPdJY9lD2M="; + rev = "5be8f60326181b22e111f02918ae5778cf1a89b0"; + hash = "sha256-dHY0bfVfRpiBY5rPnhmu3aHXx1l9jQhXBtcBbej2JFk="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix index bb6615b708609..8a112b0d8855f 100644 --- a/pkgs/applications/window-managers/neocomp/default.nix +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ twey moni ]; platforms = platforms.linux; - description = "A fork of Compton, a compositor for X11"; + description = "Fork of Compton, a compositor for X11"; longDescription = '' NeoComp is a (hopefully) fast and (hopefully) simple compositor for X11, focused on delivering frames from the window to the diff --git a/pkgs/applications/window-managers/owl/default.nix b/pkgs/applications/window-managers/owl/default.nix index d3f018eb12021..2bef1b024b3eb 100644 --- a/pkgs/applications/window-managers/owl/default.nix +++ b/pkgs/applications/window-managers/owl/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A portable Wayland compositor in Objective-C"; + description = "Portable Wayland compositor in Objective-C"; homepage = "https://github.com/owl-compositor/owl"; license = licenses.gpl3Plus; maintainers = with maintainers; [ wegank ]; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 853ceb8a083b9..32ece77e4fb04 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -36,12 +36,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "phosh"; - version = "0.37.1"; + version = "0.39.0"; src = fetchurl { # Release tarball which includes subprojects gvc and libcall-ui url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-74H4GLFIIs97iVE8IWPxS9hALkBGkcKmrMe6/uxtPuM="; + hash = "sha256-n1ZegSJAUr1Lbn0+Mx64vHhl4bwSJEdnO1xN/QdEKlw="; }; nativeBuildInputs = [ @@ -120,11 +120,11 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A pure Wayland shell prototype for GNOME on mobile devices"; + description = "Pure Wayland shell prototype for GNOME on mobile devices"; homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; changelog = "https://gitlab.gnome.org/World/Phosh/phosh/-/blob/v${finalAttrs.version}/debian/changelog"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ masipcat tomfitzhenry zhaofengli ]; + maintainers = with maintainers; [ masipcat zhaofengli ]; platforms = platforms.linux; mainProgram = "phosh-session"; }; diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 0635d7a5e407e..26211ca2f89c6 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A settings app for mobile specific things"; + description = "Settings app for mobile specific things"; mainProgram = "phosh-mobile-settings"; homepage = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings"; changelog = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings/-/blob/v${version}/debian/changelog"; diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix deleted file mode 100644 index 3d3008692922b..0000000000000 --- a/pkgs/applications/window-managers/river/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib -, stdenv -, fetchFromGitea -, libGL -, libX11 -, libevdev -, libinput -, libxkbcommon -, pixman -, pkg-config -, scdoc -, udev -, wayland -, wayland-protocols -, wlroots_0_17 -, xwayland -, zig_0_11 -, withManpages ? true -, xwaylandSupport ? true -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "river"; - version = "0.3.0"; - - outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "river"; - repo = "river"; - rev = "refs/tags/v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-6LZuWx0sC6bW0K7D0PR8hJlVW6i6NIzOOORdMu3Gk5U="; - }; - - nativeBuildInputs = [ - pkg-config - wayland - xwayland - zig_0_11.hook - ] - ++ lib.optional withManpages scdoc; - - buildInputs = [ - libGL - libevdev - libinput - libxkbcommon - pixman - udev - wayland-protocols - wlroots_0_17 - ] ++ lib.optional xwaylandSupport libX11; - - dontConfigure = true; - - zigBuildFlags = lib.optional withManpages "-Dman-pages" - ++ lib.optional xwaylandSupport "-Dxwayland"; - - postInstall = '' - install contrib/river.desktop -Dt $out/share/wayland-sessions - ''; - - passthru.providedSessions = [ "river" ]; - - meta = { - homepage = "https://codeberg.org/river/river"; - description = "A dynamic tiling wayland compositor"; - longDescription = '' - River is a dynamic tiling Wayland compositor with flexible runtime - configuration. - - Its design goals are: - - Simple and predictable behavior, river should be easy to use and have a - low cognitive load. - - Window management based on a stack of views and tags. - - Dynamic layouts generated by external, user-written executables. A - default rivertile layout generator is provided. - - Scriptable configuration and control through a custom Wayland protocol - and separate riverctl binary implementing it. - ''; - changelog = "https://codeberg.org/river/river/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - adamcstephens - moni - rodrgz - ]; - mainProgram = "river"; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index fc518fa81f281..c5bd29d2589fe 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://sawfish.tuxfamily.org/"; - description = "An extensible, Lisp-based window manager"; + description = "Extensible, Lisp-based window manager"; longDescription = '' Sawfish is an extensible window manager using a Lisp-based scripting language. Its policy is very minimal compared to most window managers. Its diff --git a/pkgs/applications/window-managers/shod/default.nix b/pkgs/applications/window-managers/shod/default.nix index 1ed5b6e13a7fd..a71efe4b52c10 100644 --- a/pkgs/applications/window-managers/shod/default.nix +++ b/pkgs/applications/window-managers/shod/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "A mouse-based window manager that can tile windows inside floating containers"; + description = "Mouse-based window manager that can tile windows inside floating containers"; longDescription = '' shod is a multi-monitor floating reparenting X11 window manager that supports tiled and tabbed containers. shod sets no keybindings, reads no diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/applications/window-managers/sommelier/default.nix index f0b9407761283..a5b0398d44425 100644 --- a/pkgs/applications/window-managers/sommelier/default.nix +++ b/pkgs/applications/window-managers/sommelier/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "sommelier"; - version = "123.0"; + version = "125.0"; src = fetchzip rec { url = "https://chromium.googlesource.com/chromiumos/platform2/+archive/${passthru.rev}/vm_tools/sommelier.tar.gz"; - passthru.rev = "1abc91204f35cde76db37853ff3643c5cdb607e6"; + passthru.rev = "4445ac169a9e043fd260a835384aaa49c457c358"; stripRoot = false; - sha256 = "Wa30MU7iK1Y7pKNeC+FPFXDwDxFLWOZPG4jkm8cnWeg="; + sha256 = "1PofODGZDknZpzXI1d3JcoNYz3IGfw32nm+SmUpeqb8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 2bb5aca9d91c1..ef1a90fd2b92e 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { - description = "A tiling window manager"; + description = "Tiling window manager"; homepage = "https://github.com/conformal/spectrwm"; maintainers = with maintainers; [ rake5k ]; license = licenses.isc; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index 60984987ab62e..61976edfe96bd 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/sargon/trayer-srg"; license = licenses.mit; - description = "A lightweight GTK2-based systray for UNIX desktop"; + description = "Lightweight GTK2-based systray for UNIX desktop"; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; mainProgram = "trayer"; diff --git a/pkgs/applications/window-managers/wayfire/focus-request.nix b/pkgs/applications/window-managers/wayfire/focus-request.nix index 41d5314172504..4c885c7a42fdc 100644 --- a/pkgs/applications/window-managers/wayfire/focus-request.nix +++ b/pkgs/applications/window-managers/wayfire/focus-request.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://gitlab.com/wayfireplugins/focus-request"; - description = "The wayfire plugin provides a mechanism to grant focus to views that make a focus self-request"; + description = "Wayfire plugin provides a mechanism to grant focus to views that make a focus self-request"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ rewine ]; inherit (wayfire.meta) platforms; diff --git a/pkgs/applications/window-managers/wayfire/windecor.nix b/pkgs/applications/window-managers/wayfire/windecor.nix index 29c95ff1a91de..a87d95344d41f 100644 --- a/pkgs/applications/window-managers/wayfire/windecor.nix +++ b/pkgs/applications/window-managers/wayfire/windecor.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://gitlab.com/wayfireplugins/windecor"; - description = "A window decoration plugin for wayfire"; + description = "Window decoration plugin for wayfire"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ rewine ]; inherit (wayfire.meta) platforms; diff --git a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix b/pkgs/applications/window-managers/wayfire/wwp-switcher.nix index 9ca4718e17096..34252d98dd838 100644 --- a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix +++ b/pkgs/applications/window-managers/wayfire/wwp-switcher.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/wb9688/wwp-switcher"; - description = "A plugin to switch active window"; + description = "Plugin to switch active window"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ rewine ]; inherit (wayfire.meta) platforms; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index a4e36c18368e6..c67b760e4df39 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "weston"; - version = "13.0.1"; + version = "13.0.3"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-6hVmq09f/Ofp/U96H8pbMMquTVACO/RZITmUCU4Cspo="; + hash = "sha256-J/aNluO5fZjare8TogI1ZSSST6OBQY+mcWuRNu8JkJM="; }; postPatch = '' @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "weston" ]; meta = with lib; { - description = "A lightweight and functional Wayland compositor"; + description = "Lightweight and functional Wayland compositor"; longDescription = '' Weston is the reference implementation of a Wayland compositor, as well as a useful environment in and of itself. diff --git a/pkgs/applications/window-managers/windowchef/default.nix b/pkgs/applications/window-managers/windowchef/default.nix index f5a5e6dbd5c94..bf1a7c305dcd1 100644 --- a/pkgs/applications/window-managers/windowchef/default.nix +++ b/pkgs/applications/window-managers/windowchef/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "A stacking window manager that cooks windows with orders from the Waitron"; + description = "Stacking window manager that cooks windows with orders from the Waitron"; homepage = "https://github.com/tudurom/windowchef"; maintainers = with maintainers; [ bhougland ]; license = licenses.isc; diff --git a/pkgs/applications/window-managers/wmderlandc/default.nix b/pkgs/applications/window-managers/wmderlandc/default.nix index 45170ab0d15a2..3bb8f2364ef6f 100644 --- a/pkgs/applications/window-managers/wmderlandc/default.nix +++ b/pkgs/applications/window-managers/wmderlandc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "A tiny program to interact with wmderland"; + description = "Tiny program to interact with wmderland"; homepage = "https://github.com/aesophor/wmderland/tree/master/ipc-client"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix index 11f669da37a6f..b5a94ed955dce 100644 --- a/pkgs/applications/window-managers/wmii/default.nix +++ b/pkgs/applications/window-managers/wmii/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/0intro/wmii"; - description = "A small, scriptable window manager, with a 9P filesystem interface and an acme-like layout"; + description = "Small, scriptable window manager, with a 9P filesystem interface and an acme-like layout"; maintainers = with lib.maintainers; [ kovirobi ]; license = lib.licenses.mit; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 2e41cc2c97c63..c31b3c80b8d4c 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kalj/xmonad-log-applet"; license = licenses.bsd3; broken = desktopSupport == "gnomeflashback" || desktopSupport == "xfce4"; - description = "An applet that will display XMonad log information (${desktopSupport} version)"; + description = "Applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/applications/window-managers/xmonad/xmonadctl.nix b/pkgs/applications/window-managers/xmonad/xmonadctl.nix index f7dfe1354025a..23495f5d00418 100644 --- a/pkgs/applications/window-managers/xmonad/xmonadctl.nix +++ b/pkgs/applications/window-managers/xmonad/xmonadctl.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, ghcWithPackages, haskellPackages, ... }: +{ stdenv, lib, ghcWithPackages, haskellPackages, ... }: let xmonadctlEnv = ghcWithPackages (self: [ self.xmonad-contrib self.X11 ]); in stdenv.mkDerivation rec { diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index d66c905fea90b..e68dcdcd0e812 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A modern and lightweight status bar for X window managers"; + description = "Modern and lightweight status bar for X window managers"; homepage = "https://github.com/geommer/yabar"; license = licenses.mit; platforms = platforms.linux; |