Merge master into staging-next

pkgs/applications/window-managers/river/default.nix

@@ -6,37 +6,41 @@
 
 stdenv.mkDerivation rec {
   pname = "river";
-  version = "unstable-2021-04-27";
+  version = "unstable-2021-05-07";
 
   src = fetchFromGitHub {
     owner = "ifreund";
     repo = pname;
-    rev = "0c8e718d95a6a621b9cba0caa9158915e567b076";
-    sha256 = "1jjh0dzxi7hy4mg8vag6ipfwb9qxm5lfc07njp1mx6m81nq76ybk";
+    rev = "7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d";
+    sha256 = "1z5qjid73lfn654f2k74nwgvpr88fpdfpbzhihybx9cyy1mqfz7j";
     fetchSubmodules = true;
   };
 
-  buildInputs = [ xwayland wayland-protocols wlroots pixman
+  buildInputs = [ wayland-protocols wlroots pixman
     libxkbcommon pixman udev libevdev libX11 libGL
   ];
 
+  dontConfigure = true;
+
   preBuild = ''
     export HOME=$TMPDIR
   '';
   installPhase = ''
+    runHook preInstall
     zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install
+    runHook postInstall
   '';
 
-  nativeBuildInputs = [ zig wayland scdoc pkg-config ];
+  nativeBuildInputs = [ zig wayland xwayland scdoc pkg-config ];
 
+  # Builder patch install dir into river to get default config
+  # When installFlags is removed, river becomes half broken
+  # see https://github.com/ifreund/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
   installFlags = [ "DESTDIR=$(out)" ];
 
   meta = with lib; {
-    description = "A dynamic tiling wayland compositor";
-    longDescription = ''
-      river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm.
-    '';
     homepage = "https://github.com/ifreund/river";
+    description = "A dynamic tiling wayland compositor";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ branwright1 ];

pkgs/applications/window-managers/stumpwm/default.nix

@@ -1,103 +0,0 @@
-{ lib, stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
-, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop
-, extraModulePaths ? []
-, version }:
-
-let
-  contrib = (fetchgit {
-    url = "https://github.com/stumpwm/stumpwm-contrib.git";
-    rev = "9bebe3622b2b6c31a6bada9055ef3862fa79b86f";
-    sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc";
-  });
-  versionSpec = {
-    latest = {
-      name = "1.0.0";
-      rev = "refs/tags/1.0.0";
-      sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb";
-      patches = [];
-    };
-    "0.9.9" = {
-      name = "0.9.9";
-      rev = "refs/tags/0.9.9";
-      sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k";
-      patches = [ ./fix-module-path.patch ];
-    };
-    git = {
-        name = "git-20170203";
-        rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97";
-        sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70";
-        patches = [];
-    };
-  }.${version};
-in
-stdenv.mkDerivation {
-  name = "stumpwm-${versionSpec.name}";
-
-  src = fetchgit {
-    url = "https://github.com/stumpwm/stumpwm";
-    rev = versionSpec.rev;
-    sha256 = versionSpec.sha256;
-  };
-
-  # NOTE: The patch needs an update for the next release.
-  # `(stumpwm:set-module-dir "@MODULE_DIR@")' needs to be in it.
-  patches = versionSpec.patches;
-
-  buildInputs = [
-    texinfo4 makeWrapper autoconf
-    sbcl
-    lispPackages.clx
-    lispPackages.cl-ppcre
-    lispPackages.alexandria
-    xdpyinfo
-  ];
-
-
-  # Stripping destroys the generated SBCL image
-  dontStrip = true;
-
-  configurePhase = ''
-    ./autogen.sh
-    ./configure --prefix=$out --with-module-dir=$out/share/stumpwm/modules
-  '';
-
-  preBuild = ''
-    cp -r --no-preserve=mode ${contrib} modules
-    substituteInPlace  head.lisp \
-      --replace 'run-shell-command "xdpyinfo' 'run-shell-command "${xdpyinfo}/bin/xdpyinfo'
-  '';
-
-  installPhase = ''
-    mkdir -pv $out/bin
-    make install
-
-    mkdir -p $out/share/stumpwm/modules
-    cp -r modules/* $out/share/stumpwm/modules/
-    for d in ${lib.concatStringsSep " " extraModulePaths}; do
-      cp -r --no-preserve=mode "$d" $out/share/stumpwm/modules/
-    done
-
-    # Copy stumpish;
-    cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/
-    chmod +x $out/bin/stumpish
-    wrapProgram $out/bin/stumpish \
-      --prefix PATH ":" "${lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}"
-
-    # Paths in the compressed image $out/bin/stumpwm are not
-    # recognized by Nix. Add explicit reference here.
-    mkdir $out/nix-support
-    echo ${xdpyinfo} > $out/nix-support/xdpyinfo
-  '';
-
-  passthru = {
-    inherit sbcl lispPackages contrib;
-  };
-
-  meta = with lib; {
-    description = "A tiling window manager for X11";
-    homepage    = "https://github.com/stumpwm/";
-    license     = licenses.gpl2Plus;
-    platforms   = platforms.linux;
-    broken = true; # 2018-04-11
-  };
-}

pkgs/applications/window-managers/stumpwm/fix-module-path.patch

@@ -1,16 +0,0 @@
-diff --git a/make-image.lisp.in b/make-image.lisp.in
-index 121e9d6..2210242 100644
---- a/make-image.lisp.in
-+++ b/make-image.lisp.in
-@@ -2,7 +2,10 @@
- 
- (load "load-stumpwm.lisp")
- 
--#-ecl (stumpwm:set-module-dir "@CONTRIB_DIR@")
-+(setf asdf::*immutable-systems*
-+      (uiop:list-to-hash-set (asdf:already-loaded-systems)))
-+
-+#-ecl (stumpwm:set-module-dir "@MODULE_DIR@")
- 
- #+sbcl
- (sb-ext:save-lisp-and-die "stumpwm" :toplevel (lambda ()