From bbd9caea83ea8a0191503a47ab7e919783804456 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <janerik@fnordig.de>
Date: Sun, 2 Jun 2024 00:22:03 +0200
Subject: [PATCH] linux hare src as inputs

---
 flake.lock           | 26 ++++++++++++++++++++++++++
 flake.nix            | 16 +++++++++++++---
 pkgs/linux/hare.nix  | 11 ++---------
 pkgs/linux/harec.nix |  8 ++------
 4 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7a8b971..47e3608 100644
--- a/flake.lock
+++ b/flake.lock
@@ -32,6 +32,30 @@
         "type": "github"
       }
     },
+    "linux-hare-src": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-v32f8c4eN2FiSUMZgwByXaFlS6m4ILJsWiTGp4x8qnA=",
+        "type": "file",
+        "url": "https://git.sr.ht/~sircmpwn/hare"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://git.sr.ht/~sircmpwn/hare"
+      }
+    },
+    "linux-harec-src": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-QjzxiXC2zS8bl2b0RJDwqhcOn8I9rcN830LYHnSyP6k=",
+        "type": "file",
+        "url": "https://git.sr.ht/~sircmpwn/harec"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://git.sr.ht/~sircmpwn/harec"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1716220750,
@@ -50,6 +74,8 @@
       "inputs": {
         "hare-src": "hare-src",
         "harec-src": "harec-src",
+        "linux-hare-src": "linux-hare-src",
+        "linux-harec-src": "linux-harec-src",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index 8c053b5..29fa71c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,9 +10,19 @@
       url = "github:badboy/harelang";
       flake = false;
     };
+
+    linux-harec-src = {
+      url = "https://git.sr.ht/~sircmpwn/harec";
+      flake = false;
+    };
+
+    linux-hare-src = {
+      url = "https://git.sr.ht/~sircmpwn/hare";
+      flake = false;
+    };
   };
 
-  outputs = { nixpkgs, harec-src, hare-src, ... }:
+  outputs = { nixpkgs, harec-src, hare-src, linux-harec-src, linux-hare-src, ... }:
     let
       darwinSystems = [ "x86_64-darwin" "aarch64-darwin" ];
       linuxSystems = [ "x86_64-linux" "aarch64-linux" ];
@@ -38,8 +48,8 @@
         nixpkgs.lib.genAttrs linuxSystems (system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-          harec = pkgs.callPackage ./pkgs/linux/harec.nix { };
-          hare = pkgs.callPackage ./pkgs/linux/hare.nix { inherit harec; };
+          harec = pkgs.callPackage ./pkgs/linux/harec.nix { harec-src = linux-hare-src; };
+          hare = pkgs.callPackage ./pkgs/linux/hare.nix { inherit harec; hare-src = linux-hare-src; };
         in
         {
           default = pkgs.mkShell {
diff --git a/pkgs/linux/hare.nix b/pkgs/linux/hare.nix
index 041ce53..9e7f86c 100644
--- a/pkgs/linux/hare.nix
+++ b/pkgs/linux/hare.nix
@@ -3,8 +3,8 @@
   lib,
   makeWrapper,
   scdoc,
-  substituteAll,
   qbe,
+  hare-src,
   harec,
   binutils-unwrapped,
   tzdata
@@ -20,14 +20,7 @@ in
 stdenv.mkDerivation  (finalAttrs: {
   pname = "hare";
   version = "0.24";
-  src = builtins.fetchGit {
-    url = "https://git.sr.ht/~sircmpwn/hare";
-    ref = "master";
-    rev = "0cd51184a7acdfd4ef20195d1648622b04477293";
-  };
-
-  patches = [
-  ];
+  src = hare-src;
 
   nativeBuildInputs = [
     harec
diff --git a/pkgs/linux/harec.nix b/pkgs/linux/harec.nix
index 87678f7..a21665d 100644
--- a/pkgs/linux/harec.nix
+++ b/pkgs/linux/harec.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, qbe }:
+{ stdenv, qbe, hare-src }:
 let
   arch = stdenv.hostPlatform.uname.processor;
   qbePlatform = {
@@ -10,11 +10,7 @@ in
 stdenv.mkDerivation  (finalAttrs: {
   pname = "harec";
   version = "0.24";
-  src = builtins.fetchGit {
-    url = "https://git.sr.ht/~sircmpwn/harec";
-    ref = "master";
-    rev = "3be960cf19ecf9528b8b3aaafc135229291e01b1";
-  };
+  src = hare-src;
   buildInputs = [ qbe ];
   nativeBuildInputs = [ qbe ];