From d3993e24c65b51c35edda148e30d251f5dd18cad Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Wed, 10 Aug 2022 05:02:16 -0300
Subject: [PATCH] harePackages: create subtree

This is a subtree for the (past, present and future) Hare language
infrastructure.
---
 pkgs/development/compilers/hare/default.nix                | 7 +++++++
 .../compilers/hare/{ => hare}/config-template.mk           | 0
 .../compilers/hare/{hare.nix => hare/default.nix}          | 0
 .../hare/{ => hare}/disable-failing-test-cases.patch       | 0
 pkgs/development/compilers/hare/{ => hare}/setup-hook.sh   | 0
 .../compilers/hare/{harec.nix => harec/default.nix}        | 0
 pkgs/top-level/all-packages.nix                            | 4 ++--
 7 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/hare/default.nix
 rename pkgs/development/compilers/hare/{ => hare}/config-template.mk (100%)
 rename pkgs/development/compilers/hare/{hare.nix => hare/default.nix} (100%)
 rename pkgs/development/compilers/hare/{ => hare}/disable-failing-test-cases.patch (100%)
 rename pkgs/development/compilers/hare/{ => hare}/setup-hook.sh (100%)
 rename pkgs/development/compilers/hare/{harec.nix => harec/default.nix} (100%)

diff --git a/pkgs/development/compilers/hare/default.nix b/pkgs/development/compilers/hare/default.nix
new file mode 100644
index 000000000000..c04897fad1bb
--- /dev/null
+++ b/pkgs/development/compilers/hare/default.nix
@@ -0,0 +1,7 @@
+{ config, lib, pkgs }:
+
+lib.makeScope pkgs.newScope (self: with self; {
+
+  harec = callPackage ./harec { };
+  hare = callPackage ./hare { };
+})
diff --git a/pkgs/development/compilers/hare/config-template.mk b/pkgs/development/compilers/hare/hare/config-template.mk
similarity index 100%
rename from pkgs/development/compilers/hare/config-template.mk
rename to pkgs/development/compilers/hare/hare/config-template.mk
diff --git a/pkgs/development/compilers/hare/hare.nix b/pkgs/development/compilers/hare/hare/default.nix
similarity index 100%
rename from pkgs/development/compilers/hare/hare.nix
rename to pkgs/development/compilers/hare/hare/default.nix
diff --git a/pkgs/development/compilers/hare/disable-failing-test-cases.patch b/pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch
similarity index 100%
rename from pkgs/development/compilers/hare/disable-failing-test-cases.patch
rename to pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch
diff --git a/pkgs/development/compilers/hare/setup-hook.sh b/pkgs/development/compilers/hare/hare/setup-hook.sh
similarity index 100%
rename from pkgs/development/compilers/hare/setup-hook.sh
rename to pkgs/development/compilers/hare/hare/setup-hook.sh
diff --git a/pkgs/development/compilers/hare/harec.nix b/pkgs/development/compilers/hare/harec/default.nix
similarity index 100%
rename from pkgs/development/compilers/hare/harec.nix
rename to pkgs/development/compilers/hare/harec/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56bff6bb6d91..4309b34b332c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7211,8 +7211,8 @@ with pkgs;
     llvmPackages = llvmPackages_9;
   };
 
-  harec = callPackage ../development/compilers/hare/harec.nix { };
-  hare = callPackage ../development/compilers/hare/hare.nix { };
+  harePackages = recurseIntoAttrs (callPackage ../development/compilers/hare { });
+  inherit (harePackages) hare harec;
 
   ham = pkgs.perlPackages.ham;