summary refs log tree commit diff
path: root/gnu/packages/haskell-xyz.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-09-10 17:27:06 +0200
committerMarius Bakke <marius@gnu.org>2022-09-10 17:27:06 +0200
commit07140e8b10c56bc271c74fa82470a900684b91c6 (patch)
tree8b452a7a676f4791d4d824e19f9892d6ae6eaf82 /gnu/packages/haskell-xyz.scm
parentcbc391102966336a1a175204ebbf4aeec66e3018 (diff)
parent575dbab74622ee8304827b98865a26225145e22a (diff)
downloadguix-07140e8b10c56bc271c74fa82470a900684b91c6.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/haskell-xyz.scm')
-rw-r--r--gnu/packages/haskell-xyz.scm5
1 files changed, 5 insertions, 0 deletions
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index a01248f355..43eb448c7e 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -16123,3 +16123,8 @@ data Dec a
      "This package provides Type-level booleans.")
     (license license:bsd-3)))
 
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above by existing packages with similar
+;;; functionality or similar names.
+;;;