Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-02-10 06:16:56 +00:00 committed by GitHub
commit 459eb2d924
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 104 additions and 14 deletions

View file

@ -11,6 +11,15 @@ in
services.xserver.windowManager.herbstluftwm = {
enable = mkEnableOption "herbstluftwm";
package = mkOption {
type = types.package;
default = pkgs.herbstluftwm;
defaultText = "pkgs.herbstluftwm";
description = ''
Herbstluftwm package to use.
'';
};
configFile = mkOption {
default = null;
type = with types; nullOr path;
@ -31,8 +40,8 @@ in
(cfg.configFile != null)
''-c "${cfg.configFile}"''
;
in "${pkgs.herbstluftwm}/bin/herbstluftwm ${configFileClause}";
in "${cfg.package}/bin/herbstluftwm ${configFileClause}";
};
environment.systemPackages = [ pkgs.herbstluftwm ];
environment.systemPackages = [ cfg.package ];
};
}

View file

@ -0,0 +1,79 @@
{ stdenv
, lib
, fetchFromGitHub
, pkg-config
, libxcb
, libxkbcommon
, wayland
, wayland-protocols
, wlroots
, enable-xwayland ? true, xwayland, libX11
, patches ? [ ]
, conf ? null
, writeText
}:
stdenv.mkDerivation rec {
pname = "dwl";
version = "0.1";
src = fetchFromGitHub {
owner = "djpohly";
repo = pname;
rev = "v${version}";
sha256 = "QoKaeF5DbSX0xciwc/0VKpubn/001cJjoZ+UzVDX4qE=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libxcb
libxkbcommon
wayland
wayland-protocols
wlroots
] ++ lib.optionals enable-xwayland [ xwayland libX11 ];
# Allow users to set their own list of patches
inherit patches;
prePatch = lib.optionalString enable-xwayland ''
sed -i -e '$ s|^#||' config.mk
'';
# Allow users to set an alternative config.def.h
postPatch = let
configFile = if lib.isDerivation conf || builtins.isPath conf
then conf
else writeText "config.def.h" conf;
in lib.optionalString (conf != null) "cp ${configFile} config.def.h";
dontConfigure = true;
installPhase = ''
runHook preInstall
install -d $out/bin
install -m755 dwl $out/bin
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/djpohly/dwl/";
description = "Dynamic window manager for Wayland";
longDescription = ''
dwl is a compact, hackable compositor for Wayland based on wlroots. It is
intended to fill the same space in the Wayland world that dwm does in X11,
primarily in terms of philosophy, and secondarily in terms of
functionality. Like dwm, dwl is:
- Easy to understand, hack on, and extend with patches
- One C source file (or a very small number) configurable via config.h
- Limited to 2000 SLOC to promote hackability
- Tied to as few external dependencies as possible
'';
license = licenses.gpl3Only;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; linux;
};
}
# TODO: custom patches from upstream website
# TODO: investigate the modifications in the upstream unstable version

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "wire";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "google";
repo = "wire";
rev = "v${version}";
sha256 = "0fYXo/LnxKV/qoaP59XCyEtLLAysZm/WhRdm3RnLdvw=";
sha256 = "sha256-9xjymiyPFMKbysgZULmcBEMI26naUrLMgTA+d7Q+DA0=";
};
vendorSha256 = "ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc=";
vendorSha256 = "sha256-ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc=";
subPackages = [ "cmd/wire" ];

View file

@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "lucky-cli";
version = "0.25.0";
version = "0.26.0";
src = fetchFromGitHub {
owner = "luckyframework";
repo = "lucky_cli";
rev = "v${version}";
sha256 = "sha256-/DKDg2lJO6PikF7+kbwRX8ClS8rflH8KdrZNx7AR36g=";
sha256 = "sha256-bZWyAZrAYG45fqmEQYXsk8YLKurpppaahOkALAQXGhY=";
};
# the integration tests will try to clone a remote repos

View file

@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "10.23.2";
sha256 = "1iyvs56x5zvvqmpr6kkamgpfj70n2rj1fh7afc7q8hj3bq7f1985";
version = "10.23.3";
sha256 = "13za06bz17k71gcxyrx41l2j8al1kr3j627b8m7kqrf3l7rdfnsi";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

View file

@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "14.15.4";
sha256 = "177cxp4fhmglyx035j8smiy1bp5fz6q2phlcl0a2mdbldkvfrdxd";
version = "14.15.5";
sha256 = "0nv576mlmnf8pfs6yn7vsvwyg0a0xvs7m9pm4k131zjqx501v6z1";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "compsize";
version = "1.4";
version = "1.5";
src = fetchFromGitHub {
owner = "kilobyte";
repo = pname;
rev = "v${version}";
sha256 = "0gk2vibfl9fh7biznlbr3dwknrwbm5q5602q95jbjvk185g9z126";
sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8=";
};
buildInputs = [ btrfs-progs ];
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "btrfs: Find compression type/ratio on a file or set of files";
homepage = "https://github.com/kilobyte/compsize";
license = licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ CrazedProgrammer ];
platforms = platforms.linux;
};

View file

@ -21688,6 +21688,8 @@ in
inherit (gnome2) libgnomeui;
};
dwl = callPackage ../applications/window-managers/dwl { };
dwm = callPackage ../applications/window-managers/dwm { };
dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { };