From e6d46b3c598428ae1c3ae49d0f6bf1e7fe103d53 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 19 Apr 2021 17:58:53 +0000
Subject: [PATCH] pkgs: extract lohr from 'services/lohr'

---
 pkgs/default.nix      |  2 ++
 pkgs/lohr/default.nix | 21 +++++++++++++++++++++
 services/lohr.nix     |  6 +-----
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/lohr/default.nix

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 82ae94d..5c3c1bb 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,4 +1,6 @@
 { pkgs }:
 {
+  lohr = pkgs.callPackage ./lohr { };
+
   podgrab = pkgs.callPackage ./podgrab { };
 }
diff --git a/pkgs/lohr/default.nix b/pkgs/lohr/default.nix
new file mode 100644
index 0000000..1ceb018
--- /dev/null
+++ b/pkgs/lohr/default.nix
@@ -0,0 +1,21 @@
+{ fetchFromGitHub, lib, rustPlatform }:
+rustPlatform.buildRustPackage rec {
+  pname = "lohr";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "alarsyo";
+    repo = "lohr";
+    rev = "v${version}";
+    sha256 = "sha256-MplTVJG+SoeLMXQP+ix/zM3OSHuQmZnunn900YnyCBw=";
+  };
+
+  cargoSha256 = "sha256-iuMJj8tqetlmdfsrfudnU1afwUzjls/UdYLq1u0gr+g=";
+
+  meta = with lib; {
+    description = "Git mirroring daemon";
+    homepage = "https://github.com/alarsyo/lohr";
+    license = with licenses; [ mit asl20 ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/services/lohr.nix b/services/lohr.nix
index 4fafb05..fe925db 100644
--- a/services/lohr.nix
+++ b/services/lohr.nix
@@ -7,11 +7,7 @@ let
   domain = config.networking.domain;
   lohrDomain = "lohr.${config.networking.domain}";
 
-  lohrPkg =
-    let
-      flake = builtins.getFlake "github:alarsyo/lohr?rev=6c4a496ede8d7209be13d2bd597eef0789992fc3";
-    in
-    flake.defaultPackage."x86_64-linux"; # FIXME: use correct system
+  lohrPkg = pkgs.ambroisie.lohr;
 in
 {
   options.my.services.lohr = with lib; {