Merge pull request #185871 from AndersonTorres/hare

Hare language updates

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 { };
+})

pkgs/development/compilers/hare/hare/default.nix

@@ -9,16 +9,15 @@
 , substituteAll
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "hare";
-  version = "unstable-2022-06-18";
+  version = "unstable-2022-07-30";
 
   src = fetchFromSourcehut {
-    name = pname + "-src";
     owner = "~sircmpwn";
-    repo = pname;
-    rev = "ac9b2c35c09d555e09dbd81c5ed95bdfa14313ba";
-    hash = "sha256-eeS14LGkbi9IamvKzK+HF0Rvk9NFp4QVYcrHwNSNBx4=";
+    repo = "hare";
+    rev = "296925c91d79362d6b8ac94e0336a38e9af0f1c9";
+    hash = "sha256-LeIUnpTMZ6vxgAy/LPm9/IMit41RgezdVESIv+gQFHc=";
   };
 
   patches = [ ./disable-failing-test-cases.patch ];
@@ -37,7 +36,6 @@ stdenv.mkDerivation rec {
     qbe
   ];
 
-  setupHook = ./setup-hook.sh;
   strictDeps = true;
 
   configurePhase =
@@ -86,6 +84,8 @@ stdenv.mkDerivation rec {
         wrapProgram $out/bin/hare --prefix PATH : ${binPath}
       '';
 
+  setupHook = ./setup-hook.sh;
+
   meta = with lib; {
     homepage = "http://harelang.org/";
     description =
@@ -94,4 +94,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ AndersonTorres ];
     inherit (harec.meta) platforms badPlatforms;
   };
-}
+})

pkgs/development/compilers/hare/harec/default.nix

@@ -4,16 +4,15 @@
 , qbe
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "harec";
-  version = "unstable-2022-06-20";
+  version = "unstable-2022-07-02";
 
   src = fetchFromSourcehut {
-    name = pname + "-src";
     owner = "~sircmpwn";
-    repo = pname;
-    rev = "2eccbc4b959a590dda91143c8487edda841106d9";
-    hash = "sha256-pwy7cNxAqIbhx9kpcjfgk7sCEns9oA6zhKSQJdHLZCM=";
+    repo = "harec";
+    rev = "56359312644f76941de1878d33a1a0b840be8056";
+    hash = "sha256-8SFYRJSvX8hmsHBgaLUfhLUV7d54im22ETZds1eASc4=";
   };
 
   nativeBuildInputs = [
@@ -42,4 +41,4 @@ stdenv.mkDerivation rec {
       lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64);
     badPlatforms = with platforms; darwin;
   };
-}
+})

pkgs/top-level/aliases.nix

@@ -581,6 +581,7 @@ mapAliases ({
   ### H ###
 
   hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07
+  inherit (harePackages) hare harec; # Added 2022-08-10
   hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15
   heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05
   heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22

pkgs/top-level/all-packages.nix

@@ -2535,9 +2535,13 @@ with pkgs;
 
   hime = callPackage ../tools/inputmethods/hime {};
 
-  himitsu = callPackage ../tools/security/himitsu { };
+  himitsu = callPackage ../tools/security/himitsu {
+    inherit (harePackages) hare;
+  };
 
-  himitsu-firefox = callPackage ../tools/security/himitsu-firefox { };
+  himitsu-firefox = callPackage ../tools/security/himitsu-firefox {
+    inherit (harePackages) hare;
+  };
 
   hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit;
 
@@ -7215,8 +7219,7 @@ 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 { });
 
   ham = pkgs.perlPackages.ham;