From 35b7c87eef910c2eda85d84bb886675cc8898e42 Mon Sep 17 00:00:00 2001
From: Dmitry Zuikov <dzuikov@gmail.com>
Date: Sun, 15 Oct 2023 15:34:43 +0300
Subject: [PATCH] suckess-conf and fixme dependencies moved to git.hbs2.net

---
 flake.lock                        | 65 +++++++++++++------------------
 flake.nix                         |  4 +-
 hbs2-git/reposync/ReposyncMain.hs |  4 +-
 3 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/flake.lock b/flake.lock
index 297ddfe5..e572aaf3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,17 +9,17 @@
         "suckless-conf": "suckless-conf"
       },
       "locked": {
-        "lastModified": 1679822846,
-        "narHash": "sha256-bXGorR8cLCVm3Cu7EcTUGNtaxPwqZH8zLrch7r/ST5c=",
-        "owner": "voidlizard",
-        "repo": "fixme",
-        "rev": "ff3faeeee860b2ed2edf6e69cec26e9b49b167a3",
-        "type": "github"
+        "lastModified": 1697356303,
+        "narHash": "sha256-hJbJZtx7gdcXaKL8n5J8b/eVyoYe9VxM+037ZK7q8Gw=",
+        "ref": "refs/heads/master",
+        "rev": "e9b1dcfd78dc766a2255a8125c14b24f0d728c0e",
+        "revCount": 139,
+        "type": "git",
+        "url": "http://git.hbs2.net/Fujv1Uy4W5d9Z7REEArMxbXSJ8nLLn4dYuvaAs8b86hr"
       },
       "original": {
-        "owner": "voidlizard",
-        "repo": "fixme",
-        "type": "github"
+        "type": "git",
+        "url": "http://git.hbs2.net/Fujv1Uy4W5d9Z7REEArMxbXSJ8nLLn4dYuvaAs8b86hr"
       }
     },
     "flake-utils": {
@@ -211,21 +211,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1675758091,
-        "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1687946342,
         "narHash": "sha256-vRxti8pOuXS0rJmqjbD8ueEEFXWSK22ISHoCWkhgzzg=",
@@ -246,7 +231,7 @@
         "fixme": "fixme",
         "haskell-flake-utils": "haskell-flake-utils_3",
         "hspup": "hspup",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "saltine": "saltine",
         "suckless-conf": "suckless-conf_2"
       }
@@ -271,14 +256,17 @@
     "suckless-conf": {
       "inputs": {
         "haskell-flake-utils": "haskell-flake-utils_2",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "fixme",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1679815688,
-        "narHash": "sha256-xLvIoeG5krM0CXfWRcwSgHGP7W8i8dsoKP5hUb182hE=",
+        "lastModified": 1697354514,
+        "narHash": "sha256-5doedGj2QU4vPuw1VZor1GGEJTxu0zFeO/PsybFIcn8=",
         "owner": "voidlizard",
         "repo": "suckless-conf",
-        "rev": "04c432681d3627f180a402674523736f409f964d",
+        "rev": "3f87278bc10ac4f14a6d9d2c75cbbed228509129",
         "type": "github"
       },
       "original": {
@@ -295,18 +283,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1697251648,
-        "narHash": "sha256-dT305J8wIJLIbuVi4YhtaeaquNtVxFhutbB2tgsu938=",
-        "owner": "voidlizard",
-        "repo": "suckless-conf",
-        "rev": "a79097e5b28da8a098405dc9c15235a57f887160",
-        "type": "github"
+        "lastModified": 1697360115,
+        "narHash": "sha256-0XgKnuvxF83IxShuYEwCKPC0FHJcQd85Z9PxbInLET4=",
+        "ref": "refs/heads/master",
+        "rev": "a0728838021e62742d1a345513112e6f9343f122",
+        "revCount": 26,
+        "type": "git",
+        "url": "http://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ"
       },
       "original": {
-        "owner": "voidlizard",
-        "ref": "master",
-        "repo": "suckless-conf",
-        "type": "github"
+        "type": "git",
+        "url": "http://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 8b2daa17..d1b7d207 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,10 +9,10 @@ inputs = {
     hspup.url = "github:voidlizard/hspup";
     hspup.inputs.nixpkgs.follows = "nixpkgs";
 
-    fixme.url = "github:voidlizard/fixme";
+    fixme.url = "git+http://git.hbs2.net/Fujv1Uy4W5d9Z7REEArMxbXSJ8nLLn4dYuvaAs8b86hr";
     fixme.inputs.nixpkgs.follows = "nixpkgs";
 
-    suckless-conf.url = "github:voidlizard/suckless-conf/master";
+    suckless-conf.url = "git+http://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ";
     suckless-conf.inputs.nixpkgs.follows = "nixpkgs";
 
     saltine = {
diff --git a/hbs2-git/reposync/ReposyncMain.hs b/hbs2-git/reposync/ReposyncMain.hs
index d6cf5837..94ed9c48 100644
--- a/hbs2-git/reposync/ReposyncMain.hs
+++ b/hbs2-git/reposync/ReposyncMain.hs
@@ -335,12 +335,12 @@ initRepo e@(RepoEntry{..}) = do
 
 detectRPC :: (MonadUnliftIO m) => m (Maybe FilePath)
 detectRPC = do
+
   (_, o, _) <- readProcess (shell [qc|hbs2-peer poke|])
   let answ = parseTop (LBS.unpack o) & fromRight mempty
 
   pure (headMay [ Text.unpack r | ListVal (Key "rpc:" [LitStrVal r]) <- answ  ])
 
-
 withApp :: forall a m . MonadUnliftIO m
         => Maybe FilePath
         -> ReposyncM m a
@@ -354,6 +354,8 @@ withApp cfg m = do
   setLogging @WARN   warnPrefix
   setLogging @NOTICE noticePrefix
 
+  -- lrpc =
+
   soname <- detectRPC `orDie` "RPC not found"
 
   client <- race ( pause @'Seconds 1) (newMessagingUnix False 1.0 soname) `orDie` "hbs2-peer rpc timeout!"