diff --git a/README.md b/README.md index 9b0e238935ce4f3335a5cb7a4a9dee8f66a77f9c..d1fc24ab4668cb71e81d6a4f09ad3445f2f8d535 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,6 @@ This package set has the following policy. * servant * sydtest * tasty - * xmonad-contrib - * xmonad * wai-app-static * warp diff --git a/horizon.dhall b/horizon.dhall index 8805ded52fe2100fead2af3f8c8b4a70b2afb8dc..9f7dd59d7e35392df92a5043ade277be78e4d6c4 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -1308,8 +1308,6 @@ let packages = , xml-conduit-writer = H.callHackage "xml-conduit-writer" "0.1.1.2" , xml-types = H.callHackage "xml-types" "0.3.8" , xmlgen = H.callHackage "xmlgen" "0.6.2.2" - , xmonad = H.callHackage "xmonad" "0.17.1" - , xmonad-contrib = H.callHackage "xmonad-contrib" "0.17.1" , xss-sanitize = H.callHackage "xss-sanitize" "0.3.7.1" , yaml = H.callHackage "yaml" "0.11.11.0" , zip-archive = H.callHackage "zip-archive" "0.4.3" diff --git a/horizon.lock b/horizon.lock index 54319642e1e5740b6c87412f2bda197cbe81d611..58d64347f98c978e39ea2683bdc1edb8cd7593fb 100644 --- a/horizon.lock +++ b/horizon.lock @@ -4258,14 +4258,6 @@ , mapValue = "aeac0e76759cb8619684b88819ac5a77adebf5ab31ff742f70b53065d36622fc" } -, { mapKey = "xmonad" - , mapValue = - "bd06ce3270b688e30225ab533fa0cbbed2ffc80226529b83ceeca899e7a8ebb7" - } -, { mapKey = "xmonad-contrib" - , mapValue = - "331d6b1fcb6ee755bee39c1073d53ffedb768d226cb8acfededc6fd09f514fe0" - } , { mapKey = "xss-sanitize" , mapValue = "e4c3bfb0cabee974da9e5d0ee58dedb23f836ba2f41472f737e79ce84524845e" diff --git a/initial-packages.nix b/initial-packages.nix index d926b628ba5bca6142383be1ae26c49a3e9e6fff..04f8b096fc097bc47ebcf640ee3d1cca82644ff4 100644 --- a/initial-packages.nix +++ b/initial-packages.nix @@ -2131,10 +2131,6 @@ self: with pkgs.haskell.lib; { xmlgen = self.callPackage (./pkgs/xmlgen.nix) { }; - xmonad = self.callPackage (./pkgs/xmonad.nix) { }; - - xmonad-contrib = self.callPackage (./pkgs/xmonad-contrib.nix) { }; - xss-sanitize = self.callPackage (./pkgs/xss-sanitize.nix) { }; yaml = self.callPackage (./pkgs/yaml.nix) { }; diff --git a/pkgs/xmonad-contrib.nix b/pkgs/xmonad-contrib.nix deleted file mode 100644 index d450a2a4d51103dbc96cedd6f7f3f41d0660a31b..0000000000000000000000000000000000000000 --- a/pkgs/xmonad-contrib.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ mkDerivation, QuickCheck, X11, X11-xft, base, bytestring -, containers, deepseq, directory, filepath, hspec, lib, mtl -, process, random, time, unix, utf8-string, xmonad -}: -mkDerivation { - pname = "xmonad-contrib"; - version = "0.17.1"; - sha256 = "ab378337f48f8f359f6ff6425b1d7cfefccf336e527c3a7606d070e567479253"; - revision = "1"; - editedCabalFile = "0dc9nbn0kaw98rgpi1rq8np601zjhdr1y0ydg6yb82wwaqawql6z"; - isLibrary = true; - isExecutable = false; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ - base bytestring containers deepseq directory filepath mtl process - random time unix utf8-string X11 X11-xft xmonad - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory hspec mtl process - QuickCheck random time unix utf8-string X11 xmonad - ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = false; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - homepage = "https://xmonad.org/"; - description = "Community-maintained extensions for xmonad"; - license = lib.licenses.bsd3; - broken = false; -} \ No newline at end of file diff --git a/pkgs/xmonad.nix b/pkgs/xmonad.nix deleted file mode 100644 index f06cbdc0d0ac06d9f208ca1ecac62a0446feb94b..0000000000000000000000000000000000000000 --- a/pkgs/xmonad.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ mkDerivation, QuickCheck, X11, base, containers -, data-default-class, directory, filepath, lib, mtl, process -, quickcheck-classes, setlocale, time, transformers, unix -}: -mkDerivation { - pname = "xmonad"; - version = "0.17.1"; - sha256 = "884a32837e41410bab622b26a4b5dc38bd88f1b78a6efd5c552f1456b1e7f8aa"; - revision = "2"; - editedCabalFile = "1rgwrnyb7kijzl2mqm8ks2nydh37q5vkbg4400rg9n6x13w2r9b3"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ - base containers data-default-class directory filepath mtl process - setlocale time transformers unix X11 - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers QuickCheck quickcheck-classes X11 - ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = false; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - postInstall = '' - install -D man/xmonad.1 ''${!outputDoc}/share/man/man1/xmonad.1 - install -D man/xmonad.hs ''${!outputDoc}/share/doc/$name/sample-xmonad.hs - ''; - homepage = "http://xmonad.org"; - description = "A tiling window manager"; - license = lib.licenses.bsd3; - broken = false; -} \ No newline at end of file