From 7f05ada11a7007f60b4b4076abcbddb745f83c13 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 31 Mar 2022 22:04:03 +0200 Subject: [PATCH] clfswm: remove after being marked broken for over two years It was marked in commit 9ae0e6633edb0ac53edaa6d3970b7cacc1db7834 by Joachim Fasting on 2016-03-18 (commited on 2016-03-19) --- .../window-managers/clfswm/default.nix | 51 ------------------- .../window-managers/clfswm/require-clx.patch | 13 ----- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 66 deletions(-) delete mode 100644 pkgs/applications/window-managers/clfswm/default.nix delete mode 100644 pkgs/applications/window-managers/clfswm/require-clx.patch diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix deleted file mode 100644 index 9984e8788460..000000000000 --- a/pkgs/applications/window-managers/clfswm/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 -, makeWrapper }: - -stdenv.mkDerivation { - pname = "clfswm"; - version = "unstable-2016-11-12"; - - src = fetchgit { - url = "https://gitlab.common-lisp.net/clfswm/clfswm.git"; - rev = "3c7721dba6339ebb4f8c8d7ce2341740fa86f837"; - sha256 = "0hynzh3a1zr719cxfb0k4cvh5lskzs616hwn7p942isyvhwzhynd"; - }; - - buildInputs = [ - texinfo4 makeWrapper autoconf - sbcl - lispPackages.clx - lispPackages.cl-ppcre - xdpyinfo - ]; - - patches = [ ./require-clx.patch ]; - - # Stripping destroys the generated SBCL image - dontStrip = true; - - configurePhase = '' - substituteInPlace load.lisp --replace \ - ";; (setf *contrib-dir* \"/usr/local/lib/clfswm/\")" \ - "(setf *contrib-dir* \"$out/lib/clfswm/\")" - ''; - - installPhase = '' - mkdir -pv $out/bin - make DESTDIR=$out install - - # Paths in the compressed image $out/bin/clfswm are not - # recognized by Nix. Add explicit reference here. - mkdir $out/nix-support - echo ${xdpyinfo} ${lispPackages.clx} ${lispPackages.cl-ppcre} > $out/nix-support/depends - ''; - - meta = with lib; { - description = "A(nother) Common Lisp FullScreen Window Manager"; - homepage = "https://common-lisp.net/project/clfswm/"; - license = licenses.gpl3; - maintainers = with maintainers; [ robgssp ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/applications/window-managers/clfswm/require-clx.patch b/pkgs/applications/window-managers/clfswm/require-clx.patch deleted file mode 100644 index ae2234461d25..000000000000 --- a/pkgs/applications/window-managers/clfswm/require-clx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/load.lisp b/load.lisp -index c8c4cf0..8c9ca2e 100644 ---- a/load.lisp -+++ b/load.lisp -@@ -111,6 +111,8 @@ from $XDG_CONFIG_HOME/clfswm/clfswmrc") - ;;;------------------ - (load-info "Requiring CLX") - -+(require 'clx) -+ - ;;; Loading clisp dynamic module. This part needs clisp >= 2.50 - ;;#+(AND CLISP (not CLX)) - ;;(when (fboundp 'require) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a000c498ccc6..f4293f8c9a8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25198,8 +25198,6 @@ with pkgs; inherit (xorg) libSM; }; - clfswm = callPackage ../applications/window-managers/clfswm { }; - clickshare-csc1 = callPackage ../applications/video/clickshare-csc1 { }; cligh = python3Packages.callPackage ../development/tools/github/cligh {};