From 4fe6ad28009eded7477b9a7a2c02d7650a69c6a0 Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Sat, 18 Mar 2023 15:11:32 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/6_ac_update_sync/world/grp/app-admin     |  5 +++++
 profiles/templates/6_ac_update_sync/world/grp/app-arch |  5 +++++
 .../templates/6_ac_update_sync/world/grp/app-portage   | 10 +++++-----
 profiles/templates/6_ac_update_sync/world/grp/app-text |  7 +++++++
 .../templates/6_ac_update_sync/world/grp/dev-haskell   |  5 +++++
 profiles/templates/6_ac_update_sync/world/grp/dev-lang |  5 +++++
 profiles/templates/6_ac_update_sync/world/grp/dev-util |  9 +++++++++
 profiles/templates/6_ac_update_sync/world/grp/net-mail |  4 ++++
 profiles/templates/6_ac_update_sync/world/grp/net-misc |  7 +++++++
 profiles/templates/6_ac_update_sync/world/grp/x11-misc |  5 +++++
 profiles/templates/6_ac_update_sync/world/grp/x11-wm   |  7 +++++++
 11 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 profiles/templates/6_ac_update_sync/world/grp/dev-haskell

diff --git a/profiles/templates/6_ac_update_sync/world/grp/app-admin b/profiles/templates/6_ac_update_sync/world/grp/app-admin
index 9ec5dbca..14c3d085 100644
--- a/profiles/templates/6_ac_update_sync/world/grp/app-admin
+++ b/profiles/templates/6_ac_update_sync/world/grp/app-admin
@@ -4,6 +4,7 @@
 #-world(#-cl_pass_file-#)-#
 !!fam:0
 !!gopass-hibp:0
+!!haskell-updater:0
 !!logsentry:0
 !!puppet-agent:0
 !!puppetserver:0
@@ -22,3 +23,7 @@ logsentry
 puppet-agent
 puppetserver
 #in#
+
+#?in(os_linux_pkglist, CB4)!=#
+haskell-updater
+#in#
diff --git a/profiles/templates/6_ac_update_sync/world/grp/app-arch b/profiles/templates/6_ac_update_sync/world/grp/app-arch
index 8a356379..d0750220 100644
--- a/profiles/templates/6_ac_update_sync/world/grp/app-arch
+++ b/profiles/templates/6_ac_update_sync/world/grp/app-arch
@@ -4,6 +4,7 @@
 #-world(#-cl_pass_file-#)-#
 !!deb2targz:0
 !!hardlink:0
+!!pack:0
 !!upx:0
 # EULA
 !!stuffit:0
@@ -13,6 +14,10 @@
 upx
 #in#
 
+#?in(os_linux_pkglist, CB4)!=#
+pack
+#in#
+
 #?in(os_linux_pkglist, CBS)!=#
 deb2targz
 #in#
diff --git a/profiles/templates/6_ac_update_sync/world/grp/app-portage b/profiles/templates/6_ac_update_sync/world/grp/app-portage
index 08c7bf2f..1d533b52 100644
--- a/profiles/templates/6_ac_update_sync/world/grp/app-portage
+++ b/profiles/templates/6_ac_update_sync/world/grp/app-portage
@@ -1,10 +1,10 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CB1)!=#
-#kuroo
-#in#
-
 #?in(os_linux_pkglist, CB3)!=#
 #-world(#-cl_pass_file-#)-#
-#!!kuroo:0
+!!hackport:0
+#in#
+
+#?in(os_linux_pkglist, CB4)!=#
+hackport
 #in#
diff --git a/profiles/templates/6_ac_update_sync/world/grp/app-text b/profiles/templates/6_ac_update_sync/world/grp/app-text
index 632c1bc8..982cde79 100644
--- a/profiles/templates/6_ac_update_sync/world/grp/app-text
+++ b/profiles/templates/6_ac_update_sync/world/grp/app-text
@@ -7,6 +7,8 @@
 !!hd2u:0
 !!krop:0
 !!llpp:0
+!!pandoc:0
+!!pandoc-bin:0
 !!pdfjam:0
 !!sigil:0
 !!trang:0
@@ -25,6 +27,11 @@ zathura-pdf-mupdf
 sigil
 #in#
 
+#?in(os_linux_pkglist, CB4)!=#
+hd2u
+pandoc
+#in#
+
 #?in(os_linux_pkglist, CBS)!=#
 ghostscript-gpl
 poppler
diff --git a/profiles/templates/6_ac_update_sync/world/grp/dev-haskell b/profiles/templates/6_ac_update_sync/world/grp/dev-haskell
new file mode 100644
index 00000000..f638e55a
--- /dev/null
+++ b/profiles/templates/6_ac_update_sync/world/grp/dev-haskell
@@ -0,0 +1,5 @@
+# Calculate name=world format=world
+
+#?in(os_linux_pkglist, CB4)!=#
+#-world(#-cl_pass_file-#)-#
+#in#
diff --git a/profiles/templates/6_ac_update_sync/world/grp/dev-lang b/profiles/templates/6_ac_update_sync/world/grp/dev-lang
index 9746cc28..66c939ee 100644
--- a/profiles/templates/6_ac_update_sync/world/grp/dev-lang
+++ b/profiles/templates/6_ac_update_sync/world/grp/dev-lang
@@ -9,6 +9,11 @@ scala-bin
 #-world(#-cl_pass_file-#)-#
 !!gnat-gpl:10
 !!scala-bin:0
+!!whitespace:0
+#in#
+
+#?in(os_linux_pkglist, CB4)!=#
+whitespace
 #in#
 
 #?in(os_linux_pkglist, CBS)!=#
diff --git a/profiles/templates/6_ac_update_sync/world/grp/dev-util b/profiles/templates/6_ac_update_sync/world/grp/dev-util
index 412d0ac1..a71d5411 100644
--- a/profiles/templates/6_ac_update_sync/world/grp/dev-util
+++ b/profiles/templates/6_ac_update_sync/world/grp/dev-util
@@ -21,6 +21,9 @@ dev-util/ccache
 !!ply:0
 !!ragel:0
 !!rpmdevtools:0
+!!shellcheck:0
+!!shellcheck-bin:0
+!!shelltestrunner:0
 !!sysdig:0
 
 # not compiled
@@ -43,3 +46,9 @@ ply
 # depend for mutter
 gdbus-codegen
 #in#
+
+#?in(os_linux_pkglist, CB4)!=#
+shellcheck
+shelltestrunner
+#in#
+
diff --git a/profiles/templates/6_ac_update_sync/world/grp/net-mail b/profiles/templates/6_ac_update_sync/world/grp/net-mail
index 948d4bed..e4ddc5c3 100644
--- a/profiles/templates/6_ac_update_sync/world/grp/net-mail
+++ b/profiles/templates/6_ac_update_sync/world/grp/net-mail
@@ -5,6 +5,8 @@
 !!automx2:0
 !!cyrus-imapd:0
 !!dovecot:0
+!!list-remote-forwards:0
+!!mailbox-count:0
 !!mu:0
 #in#
 
@@ -15,6 +17,8 @@ mu
 
 #?in(os_linux_pkglist, CB4)!=#
 dovecot
+list-remote-forwards
+mailbox-count
 #in#
 
 #?in(os_linux_pkglist, CBS)!=#
diff --git a/profiles/templates/6_ac_update_sync/world/grp/net-misc b/profiles/templates/6_ac_update_sync/world/grp/net-misc
index 40539412..6167b9b1 100644
--- a/profiles/templates/6_ac_update_sync/world/grp/net-misc
+++ b/profiles/templates/6_ac_update_sync/world/grp/net-misc
@@ -6,6 +6,8 @@
 !!electrum:0
 !!frr:0
 !!gsasl:0
+!!haeredes:0
+!!hath:0
 !!ntpsec:0
 !!openntpd:0
 !!openvswitch:0
@@ -29,6 +31,11 @@ yt-dlp
 dhcp
 #in#
 
+#?in(os_linux_pkglist, CB4)!=#
+haeredes
+hath
+#in#
+
 #?in(os_linux_pkglist, CBS)!=#
 aria2
 curl
diff --git a/profiles/templates/6_ac_update_sync/world/grp/x11-misc b/profiles/templates/6_ac_update_sync/world/grp/x11-misc
index a423639f..f987f918 100644
--- a/profiles/templates/6_ac_update_sync/world/grp/x11-misc
+++ b/profiles/templates/6_ac_update_sync/world/grp/x11-misc
@@ -16,6 +16,7 @@ sddm
 !!primus:0
 !!sddm:0
 !!unclutter-xfixes:0
+!!xmobar:0
 #in#
 
 #?in(os_linux_pkglist, CB3)!=#
@@ -24,3 +25,7 @@ notification-daemon
 primus
 unclutter-xfixes
 #in#
+
+#?in(os_linux_pkglist, CB4)!=#
+xmobar
+#in#
diff --git a/profiles/templates/6_ac_update_sync/world/grp/x11-wm b/profiles/templates/6_ac_update_sync/world/grp/x11-wm
index 426b8f36..1f4b42e3 100644
--- a/profiles/templates/6_ac_update_sync/world/grp/x11-wm
+++ b/profiles/templates/6_ac_update_sync/world/grp/x11-wm
@@ -7,4 +7,11 @@ i3-gaps
 #?in(os_linux_pkglist, CB3)!=#
 #-world(#-cl_pass_file-#)-#
 !!i3-gaps:0
+!!xmonad:0
+!!xmonad-contrib:0
+#in#
+
+#?in(os_linux_pkglist, CB4)!=#
+xmonad
+xmonad-contrib
 #in#