voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

suckess-conf and fixme dependencies moved to git.hbs2.net

This commit is contained in:
Dmitry Zuikov 2023-10-15 15:34:43 +03:00
parent 8d83317251
commit 35b7c87eef
3 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
flake.lock
View File

@ -9,17 +9,17 @@
"suckless-conf": "suckless-conf" "suckless-conf": "suckless-conf"
}, },
"locked": { "locked": {
"lastModified": 1679822846, "lastModified": 1697356303,
"narHash": "sha256-bXGorR8cLCVm3Cu7EcTUGNtaxPwqZH8zLrch7r/ST5c=", "narHash": "sha256-hJbJZtx7gdcXaKL8n5J8b/eVyoYe9VxM+037ZK7q8Gw=",
"owner": "voidlizard", "ref": "refs/heads/master",
"repo": "fixme", "rev": "e9b1dcfd78dc766a2255a8125c14b24f0d728c0e",
"rev": "ff3faeeee860b2ed2edf6e69cec26e9b49b167a3", "revCount": 139,
"type": "github" "type": "git",
"url": "http://git.hbs2.net/Fujv1Uy4W5d9Z7REEArMxbXSJ8nLLn4dYuvaAs8b86hr"
}, },
"original": { "original": {
"owner": "voidlizard", "type": "git",
"repo": "fixme", "url": "http://git.hbs2.net/Fujv1Uy4W5d9Z7REEArMxbXSJ8nLLn4dYuvaAs8b86hr"
"type": "github"
} }
}, },
"flake-utils": { "flake-utils": {
@ -211,21 +211,6 @@
} }
}, },
"nixpkgs": { "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": { "locked": {
"lastModified": 1687946342, "lastModified": 1687946342,
"narHash": "sha256-vRxti8pOuXS0rJmqjbD8ueEEFXWSK22ISHoCWkhgzzg=", "narHash": "sha256-vRxti8pOuXS0rJmqjbD8ueEEFXWSK22ISHoCWkhgzzg=",
@ -246,7 +231,7 @@
"fixme": "fixme", "fixme": "fixme",
"haskell-flake-utils": "haskell-flake-utils_3", "haskell-flake-utils": "haskell-flake-utils_3",
"hspup": "hspup", "hspup": "hspup",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"saltine": "saltine", "saltine": "saltine",
"suckless-conf": "suckless-conf_2" "suckless-conf": "suckless-conf_2"
} }
@ -271,14 +256,17 @@
"suckless-conf": { "suckless-conf": {
"inputs": { "inputs": {
"haskell-flake-utils": "haskell-flake-utils_2", "haskell-flake-utils": "haskell-flake-utils_2",
"nixpkgs": "nixpkgs" "nixpkgs": [
"fixme",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1679815688, "lastModified": 1697354514,
"narHash": "sha256-xLvIoeG5krM0CXfWRcwSgHGP7W8i8dsoKP5hUb182hE=", "narHash": "sha256-5doedGj2QU4vPuw1VZor1GGEJTxu0zFeO/PsybFIcn8=",
"owner": "voidlizard", "owner": "voidlizard",
"repo": "suckless-conf", "repo": "suckless-conf",
"rev": "04c432681d3627f180a402674523736f409f964d", "rev": "3f87278bc10ac4f14a6d9d2c75cbbed228509129",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,18 +283,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697251648, "lastModified": 1697360115,
"narHash": "sha256-dT305J8wIJLIbuVi4YhtaeaquNtVxFhutbB2tgsu938=", "narHash": "sha256-0XgKnuvxF83IxShuYEwCKPC0FHJcQd85Z9PxbInLET4=",
"owner": "voidlizard", "ref": "refs/heads/master",
"repo": "suckless-conf", "rev": "a0728838021e62742d1a345513112e6f9343f122",
"rev": "a79097e5b28da8a098405dc9c15235a57f887160", "revCount": 26,
"type": "github" "type": "git",
"url": "http://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ"
}, },
"original": { "original": {
"owner": "voidlizard", "type": "git",
"ref": "master", "url": "http://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ"
"repo": "suckless-conf",
"type": "github"
} }
} }
}, },

4
flake.nix
View File

@ -9,10 +9,10 @@ inputs = {
hspup.url = "github:voidlizard/hspup"; hspup.url = "github:voidlizard/hspup";
hspup.inputs.nixpkgs.follows = "nixpkgs"; hspup.inputs.nixpkgs.follows = "nixpkgs";
fixme.url = "github:voidlizard/fixme"; fixme.url = "git+http://git.hbs2.net/Fujv1Uy4W5d9Z7REEArMxbXSJ8nLLn4dYuvaAs8b86hr";
fixme.inputs.nixpkgs.follows = "nixpkgs"; 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"; suckless-conf.inputs.nixpkgs.follows = "nixpkgs";
saltine = { saltine = {

4
hbs2-git/reposync/ReposyncMain.hs
View File

@ -335,12 +335,12 @@ initRepo e@(RepoEntry{..}) = do
detectRPC :: (MonadUnliftIO m) => m (Maybe FilePath) detectRPC :: (MonadUnliftIO m) => m (Maybe FilePath)
detectRPC = do detectRPC = do
(_, o, _) <- readProcess (shell [qc|hbs2-peer poke|]) (_, o, _) <- readProcess (shell [qc|hbs2-peer poke|])
let answ = parseTop (LBS.unpack o) & fromRight mempty let answ = parseTop (LBS.unpack o) & fromRight mempty
pure (headMay [ Text.unpack r | ListVal (Key "rpc:" [LitStrVal r]) <- answ ]) pure (headMay [ Text.unpack r | ListVal (Key "rpc:" [LitStrVal r]) <- answ ])
withApp :: forall a m . MonadUnliftIO m withApp :: forall a m . MonadUnliftIO m
=> Maybe FilePath => Maybe FilePath
-> ReposyncM m a -> ReposyncM m a
@ -354,6 +354,8 @@ withApp cfg m = do
setLogging @WARN warnPrefix setLogging @WARN warnPrefix
setLogging @NOTICE noticePrefix setLogging @NOTICE noticePrefix
-- lrpc =
soname <- detectRPC `orDie` "RPC not found" soname <- detectRPC `orDie` "RPC not found"
client <- race ( pause @'Seconds 1) (newMessagingUnix False 1.0 soname) `orDie` "hbs2-peer rpc timeout!" client <- race ( pause @'Seconds 1) (newMessagingUnix False 1.0 soname) `orDie` "hbs2-peer rpc timeout!"