From 5f71fb6e026093dd84b4df1a522c78d87953c075 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 10 Aug 2022 04:53:56 -0300 Subject: [PATCH 1/5] harec: 2022-06-20 -> 2022-07-02 --- pkgs/development/compilers/hare/harec.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/hare/harec.nix b/pkgs/development/compilers/hare/harec.nix index 4c77a77bd0d1..bdc9ef56b9d1 100644 --- a/pkgs/development/compilers/hare/harec.nix +++ b/pkgs/development/compilers/hare/harec.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; }; -} +}) From ca39dc6915fc258cc057b37303df44e305512514 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 10 Aug 2022 04:55:38 -0300 Subject: [PATCH 2/5] hare: 2022-06-18 -> 2022-07-30 --- pkgs/development/compilers/hare/hare.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/hare/hare.nix b/pkgs/development/compilers/hare/hare.nix index e24fc68ab422..9411f4e4e905 100644 --- a/pkgs/development/compilers/hare/hare.nix +++ b/pkgs/development/compilers/hare/hare.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; }; -} +}) From d3993e24c65b51c35edda148e30d251f5dd18cad Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 10 Aug 2022 05:02:16 -0300 Subject: [PATCH 3/5] 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; From 30b628476afe59cf71e62f2a4c17dc76a67f782e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 10 Aug 2022 05:23:28 -0300 Subject: [PATCH 4/5] move hare aliases to aliases.nix --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c19acf8ce4e0..75ead26d9f27 100644 --- a/pkgs/top-level/aliases.nix +++ b/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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4309b34b332c..ce134dcd035b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7212,7 +7212,6 @@ with pkgs; }; harePackages = recurseIntoAttrs (callPackage ../development/compilers/hare { }); - inherit (harePackages) hare harec; ham = pkgs.perlPackages.ham; From 38972a4cf08d9ad681063fadcd544681c21afdf6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 10 Aug 2022 16:18:37 -0300 Subject: [PATCH 5/5] himitsu, himitsu-firefox: update parameter --- pkgs/top-level/all-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce134dcd035b..c9f897a550f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2533,9 +2533,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;