From 2dad3d3b77f9cbf33769d62bbe3be73759f711c0 Mon Sep 17 00:00:00 2001
From: buffet <dev@buffet.sh>
Date: Tue, 20 Jun 2023 11:37:09 +0200
Subject: [PATCH] fix: manage apl source via flake

---
 flake.lock                 | 17 +++++++++++++++++
 flake.nix                  |  7 ++++++-
 overlay/apl386/default.nix | 11 +++--------
 overlay/default.nix        |  4 +++-
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5789252..3479548 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,6 +22,22 @@
         "type": "github"
       }
     },
+    "apl386": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1646646198,
+        "narHash": "sha256-oHk4e7NRgAjGtZzQmZToYz7wCZETaj7/yRwZMeeYF2M=",
+        "owner": "abrudz",
+        "repo": "APL386",
+        "rev": "6332c9dbb588946a0e8c9d7984dd0c003eeea266",
+        "type": "github"
+      },
+      "original": {
+        "owner": "abrudz",
+        "repo": "APL386",
+        "type": "github"
+      }
+    },
     "cmp-conventionalcommits": {
       "flake": false,
       "locked": {
@@ -247,6 +263,7 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "apl386": "apl386",
         "cmp-conventionalcommits": "cmp-conventionalcommits",
         "cmp-git": "cmp-git",
         "copilot-cmp": "copilot-cmp",
diff --git a/flake.nix b/flake.nix
index 366eafc..5fb41d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    apl386 = {
+      url = "github:abrudz/APL386";
+      flake = false;
+    };
+
     cmp-conventionalcommits = {
       url = "github:davidsierradz/cmp-conventionalcommits";
       flake = false;
@@ -76,7 +81,7 @@
       modules = [
         ./fanya.nix
 
-        (_: {nixpkgs.overlays = [(import ./overlay) overlay-unstable];})
+        (_: {nixpkgs.overlays = [(import ./overlay args) overlay-unstable];})
       ];
     };
   };
diff --git a/overlay/apl386/default.nix b/overlay/apl386/default.nix
index 453f04e..4f1b87d 100644
--- a/overlay/apl386/default.nix
+++ b/overlay/apl386/default.nix
@@ -1,18 +1,13 @@
 {
+  inputs,
   lib,
   stdenvNoCC,
-  fetchFromGitHub,
 }:
 stdenvNoCC.mkDerivation {
   pname = "apl386";
-  version = "2022-03-07";
+  version = "unstable";
 
-  src = fetchFromGitHub {
-    owner = "abrudz";
-    repo = "APL386";
-    rev = "6332c9dbb588946a0e8c9d7984dd0c003eeea266";
-    sha256 = "sha256-oHk4e7NRgAjGtZzQmZToYz7wCZETaj7/yRwZMeeYF2M=";
-  };
+  src = inputs.apl386;
 
   installPhase = ''
     runHook preInstall
diff --git a/overlay/default.nix b/overlay/default.nix
index aadb40c..037142d 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -1,3 +1,5 @@
-self: super: {
+inputs: self: super: {
+  inherit inputs;
+
   apl386 = super.callPackage ./apl386 {};
 }