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

bspwm: 0.9.10 -> 0.9.11

Browse Source 
https://github.com/baskerville/bspwm/releases/tag/0.9.11
This commit is contained in:
Naïm Camille Favier
2025-09-24 15:24:26 +02:00
parent 659e1897c7
commit 02c0a71520
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/services/x11/window-managers/bspwm.nix
View File

@@ -16,9 +16,7 @@ in
services.xserver.windowManager.bspwm = { services.xserver.windowManager.bspwm = {
enable = mkEnableOption "bspwm"; enable = mkEnableOption "bspwm";
package = mkPackageOption pkgs "bspwm" { package = mkPackageOption pkgs "bspwm" { };
example = "bspwm-unstable";
};
configFile = mkOption { configFile = mkOption {
type = with types; nullOr path; type = with types; nullOr path;
example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"''; example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"'';
@@ -30,9 +28,7 @@ in
}; };
sxhkd = { sxhkd = {
package = mkPackageOption pkgs "sxhkd" { package = mkPackageOption pkgs "sxhkd" { };
example = "sxhkd-unstable";
};
configFile = mkOption { configFile = mkOption {
type = with types; nullOr path; type = with types; nullOr path;
example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"''; example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"'';
@@ -52,9 +48,11 @@ in
start = '' start = ''
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${ SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${
optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\"" optionalString (cfg.sxhkd.configFile != null) "-c ${escapeShellArg cfg.sxhkd.configFile}"
} &
${cfg.package}/bin/bspwm ${
optionalString (cfg.configFile != null) "-c ${escapeShellArg cfg.configFile}"
} & } &
${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} &
waitPID=$! waitPID=$!
''; '';
}; };
@@ -62,9 +60,6 @@ in
}; };
imports = [ imports = [
(mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ]
"Use services.xserver.windowManager.bspwm.enable and set services.xserver.windowManager.bspwm.package to pkgs.bspwm-unstable to use the unstable version of bspwm."
)
(mkRemovedOptionModule [ (mkRemovedOptionModule [
"services" "services"
"xserver" "xserver"

14
pkgs/by-name/bs/bspwm/package.nix
View File

@@ -7,17 +7,18 @@
xcbutil, xcbutil,
xcbutilkeysyms, xcbutilkeysyms,
xcbutilwm, xcbutilwm,
nixosTests,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bspwm"; pname = "bspwm";
version = "0.9.10"; version = "0.9.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "baskerville"; owner = "baskerville";
repo = "bspwm"; repo = "bspwm";
rev = version; rev = version;
sha256 = "0qlv7b4c2mmjfd65y100d11x8iqyg5f6lfiws3cgmpjidhdygnxc"; sha256 = "sha256-5mAw3uSsDozGUJdYE1gD1u0u6Xnik3/LbE654vCFU9E=";
}; };
buildInputs = [ buildInputs = [
@@ -30,10 +31,17 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
passthru.tests = {
inherit (nixosTests) startx;
};
meta = with lib; { meta = with lib; {
description = "Tiling window manager based on binary space partitioning"; description = "Tiling window manager based on binary space partitioning";
homepage = "https://github.com/baskerville/bspwm"; homepage = "https://github.com/baskerville/bspwm";
maintainers = with maintainers; [ meisternu ]; maintainers = with maintainers; [
meisternu
ncfavier
];
license = licenses.bsd2; license = licenses.bsd2;
platforms = platforms.linux; platforms = platforms.linux;
}; };