From 59bf0274c0e9fb1d13fc1e7ebb145d9289a43ac0 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 20 Dec 2021 15:16:38 +0100
Subject: [PATCH 1/2] pkgs: add groups, sort alphabetically

---
 pkgs/default.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 7fb8d0d..9475328 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -6,23 +6,27 @@ in
 , pkgsUnstable ? import nixpkgsPinned.nixpkgs-unstable { config = {}; overlays = []; }
 }:
 let self = {
-  rtl = pkgs.callPackage ./rtl { };
   cl-rest = pkgs.callPackage ./cl-rest { };
-  spark-wallet = pkgs.callPackage ./spark-wallet { };
-  liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { };
-  joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3Packages; };
-  generate-secrets = import ./generate-secrets-deprecated.nix;
-  nixops19_09 = pkgs.callPackage ./nixops { };
-  krops = import ./krops { };
-  netns-exec = pkgs.callPackage ./netns-exec { };
-  clightning-plugins = pkgs.recurseIntoAttrs (import ./clightning-plugins pkgs self.nbPython3Packages);
   clboss = pkgs.callPackage ./clboss { };
+  clightning-plugins = pkgs.recurseIntoAttrs (import ./clightning-plugins pkgs self.nbPython3Packages);
+  joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3Packages; };
+  liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { };
+  rtl = pkgs.callPackage ./rtl { };
   secp256k1 = pkgs.callPackage ./secp256k1 { };
+  spark-wallet = pkgs.callPackage ./spark-wallet { };
 
   nbPython3Packages = (pkgs.python3.override {
     packageOverrides = import ./python-packages self;
   }).pkgs;
 
+  # Internal pkgs
+  netns-exec = pkgs.callPackage ./netns-exec { };
+  krops = import ./krops { };
+
+  # Deprecated pkgs
+  generate-secrets = import ./generate-secrets-deprecated.nix;
+  nixops19_09 = pkgs.callPackage ./nixops { };
+
   pinned = import ./pinned.nix pkgs pkgsUnstable;
 
   modulesPkgs = self // self.pinned;

From 2493c8c20186d2aae93388ab3cf92865a01fac1e Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 28 Feb 2022 14:01:54 +0100
Subject: [PATCH 2/2] liquidd: add service timeouts like in bitcoind

Previously, liquidd could fail with error:
liquidd.service: start operation timed out. Terminating.
---
 modules/liquid.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/liquid.nix b/modules/liquid.nix
index 075b918..f884e85 100644
--- a/modules/liquid.nix
+++ b/modules/liquid.nix
@@ -270,6 +270,8 @@ in {
         NotifyAccess = "all";
         User = cfg.user;
         Group = cfg.group;
+        TimeoutStartSec = "5min";
+        TimeoutStopSec = "10min";
         ExecStart = "${nbPkgs.elementsd}/bin/elementsd -datadir='${cfg.dataDir}'";
         Restart = "on-failure";
         ReadWritePaths = cfg.dataDir;