diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5c35cba3a70a..6e6792c1a7fc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1464,6 +1464,11 @@ self: super: { ''; }) super.hledger-flow; + # xmonad-contrib >= 0.18.1 for latest XMonad + xmonad-contrib_0_18_1 = super.xmonad-contrib_0_18_1.override { + xmonad = self.xmonad_0_18_0; + }; + # Chart-tests needs and compiles some modules from Chart itself Chart-tests = overrideCabal (old: { # https://github.com/timbod7/haskell-chart/issues/233 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 54de9da13f79..15bb0c421782 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -34,6 +34,8 @@ default-package-overrides: - chs-cabal < 0.1.1.2 # Incompatible with Cabal < 3.12 # 2024-08-17: Stackage doesn't contain hnix-store-core >= 0.8 yet, so we need to restrict hnix-store-remote - hnix-store-remote < 0.7 + # 2024-09-12: match xmonad 0.17.* from Stackage LTS + - xmonad-contrib < 0.18.1 extra-packages: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 867105f67a8e..46071ca84040 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -337742,6 +337742,31 @@ self: { }) {}; "xmonad-contrib" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , filepath, hspec, mtl, process, QuickCheck, random, time, unix + , utf8-string, X11, X11-xft, xmonad + }: + mkDerivation { + pname = "xmonad-contrib"; + version = "0.18.0"; + sha256 = "1ccccz7jmksm2j5maqdfq2z135ggpdh0fl92k87w05663hxq1cb4"; + 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 + ]; + description = "Community-maintained extensions for xmonad"; + license = lib.licenses.bsd3; + maintainers = [ + lib.maintainers.dschrempf lib.maintainers.ivanbrennan + lib.maintainers.peti lib.maintainers.slotThe + ]; + }) {}; + + "xmonad-contrib_0_18_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , filepath, hspec, mtl, process, QuickCheck, random, time , transformers, unix, utf8-string, X11, X11-xft, xmonad @@ -337760,6 +337785,7 @@ self: { ]; description = "Community-maintained extensions for xmonad"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf lib.maintainers.ivanbrennan lib.maintainers.peti lib.maintainers.slotThe