From 3a0bd1cd024bd622e480721e240d68a72bd10a2f Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 10 May 2024 12:08:51 +0200
Subject: [PATCH] Make a proper default.nix, cleanup lockfile

---
 default.nix |  34 ++++++++++
 lock.json   | 178 +++-------------------------------------------------
 shell.nix   |  11 ----
 3 files changed, 43 insertions(+), 180 deletions(-)
 create mode 100644 default.nix
 delete mode 100644 shell.nix

diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..77e1765
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,34 @@
+{
+  pkgs ? import <nixpkgs> { },
+}:
+
+let
+  inherit (pkgs)
+    lib
+    buildNimPackage
+    fetchFromGitea
+    libxml2
+    libxslt
+    openssl
+    pkg-config
+    postgresql
+    sqlite
+    ;
+in
+
+buildNimPackage {
+  pname = "syndicate_utils";
+  version = "unstable";
+
+  src = if lib.inNixShell then null else lib.cleanSource ./.;
+
+  buildInputs = [
+    postgresql.out
+    sqlite
+    libxml2
+    libxslt
+    openssl
+  ];
+
+  lockFile = ./lock.json;
+}
diff --git a/lock.json b/lock.json
index 0ba07a0..3ffb3c3 100644
--- a/lock.json
+++ b/lock.json
@@ -1,16 +1,5 @@
 {
   "depends": [
-    {
-      "method": "fetchzip",
-      "packages": [
-        "bigints"
-      ],
-      "path": "/nix/store/jvrm392g8adfsgf36prgwkbyd7vh5jsw-source",
-      "rev": "86ea14d31eea9275e1408ca34e6bfe9c99989a96",
-      "sha256": "15pcpmnk1bnw3k8769rjzcpg00nahyrypwbxs88jnwr4aczp99j4",
-      "srcDir": "src",
-      "url": "https://github.com/ehmry/nim-bigints/archive/86ea14d31eea9275e1408ca34e6bfe9c99989a96.tar.gz"
-    },
     {
       "method": "fetchzip",
       "packages": [
@@ -22,28 +11,6 @@
       "srcDir": "",
       "url": "https://github.com/ehmry/cps/archive/c90530ac57f98a842b7be969115c6ef08bdcc564.tar.gz"
     },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "cps"
-      ],
-      "path": "/nix/store/8gbhwni0akqskdb3qhn5nfgv6gkdz0vz-source",
-      "rev": "c90530ac57f98a842b7be969115c6ef08bdcc564",
-      "sha256": "0h8ghs2fqg68j3jdcg7grnxssmllmgg99kym2w0a3vlwca1zvr62",
-      "srcDir": "",
-      "url": "https://github.com/ehmry/cps/archive/c90530ac57f98a842b7be969115c6ef08bdcc564.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "getdns"
-      ],
-      "path": "/nix/store/x9xmn7w4k6jg8nv5bnx148ibhnsfh362-source",
-      "rev": "c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6",
-      "sha256": "1sbgx2x51szr22i72n7c8jglnfmr8m7y7ga0v85d58fwadiv7g6b",
-      "srcDir": "src",
-      "url": "https://git.sr.ht/~ehmry/getdns-nim/archive/c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6.tar.gz"
-    },
     {
       "method": "fetchzip",
       "packages": [
@@ -110,39 +77,6 @@
       "srcDir": "src",
       "url": "https://github.com/ehmry/nim-sys/archive/4ef3b624db86e331ba334e705c1aa235d55b05e1.tar.gz"
     },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "sys"
-      ],
-      "path": "/nix/store/syhxsjlsdqfap0hk4qp3s6kayk8cqknd-source",
-      "rev": "4ef3b624db86e331ba334e705c1aa235d55b05e1",
-      "sha256": "1q4qgw4an4mmmcbx48l6xk1jig1vc8p9cq9dbx39kpnb0890j32q",
-      "srcDir": "src",
-      "url": "https://github.com/ehmry/nim-sys/archive/4ef3b624db86e331ba334e705c1aa235d55b05e1.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "sys"
-      ],
-      "path": "/nix/store/vf9ls2wip6d8xhsi3rjh0dqsqg597i6b-source",
-      "rev": "c117ee60542f084525f254e6ade590675a6a2ed6",
-      "sha256": "12qzx2lnh84xqfgypy0pka8nflq0y8n1izfwx8mb4zya5nzawmyf",
-      "srcDir": "src",
-      "url": "https://github.com/alaviss/nim-sys/archive/c117ee60542f084525f254e6ade590675a6a2ed6.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "taps"
-      ],
-      "path": "/nix/store/6y14ia52kr7jyaa0izx37mlablmq9s65-source",
-      "rev": "8c8572cd971d1283e6621006b310993c632da247",
-      "sha256": "1dp166bv9x773jmfqppg5i3v3rilgff013vb11yzwcid9l7s3iy8",
-      "srcDir": "src",
-      "url": "https://git.sr.ht/~ehmry/nim_taps/archive/8c8572cd971d1283e6621006b310993c632da247.tar.gz"
-    },
     {
       "method": "fetchzip",
       "packages": [
@@ -174,35 +108,24 @@
     {
       "method": "fetchzip",
       "packages": [
-        "getdns"
+        "bigints"
       ],
-      "path": "/nix/store/x9xmn7w4k6jg8nv5bnx148ibhnsfh362-source",
-      "rev": "c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6",
-      "sha256": "1sbgx2x51szr22i72n7c8jglnfmr8m7y7ga0v85d58fwadiv7g6b",
+      "path": "/nix/store/jvrm392g8adfsgf36prgwkbyd7vh5jsw-source",
+      "rev": "86ea14d31eea9275e1408ca34e6bfe9c99989a96",
+      "sha256": "15pcpmnk1bnw3k8769rjzcpg00nahyrypwbxs88jnwr4aczp99j4",
       "srcDir": "src",
-      "url": "https://git.sr.ht/~ehmry/getdns-nim/archive/c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "getdns"
-      ],
-      "path": "/nix/store/x9xmn7w4k6jg8nv5bnx148ibhnsfh362-source",
-      "rev": "c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6",
-      "sha256": "1sbgx2x51szr22i72n7c8jglnfmr8m7y7ga0v85d58fwadiv7g6b",
-      "srcDir": "src",
-      "url": "https://git.sr.ht/~ehmry/getdns-nim/archive/c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6.tar.gz"
+      "url": "https://github.com/ehmry/nim-bigints/archive/86ea14d31eea9275e1408ca34e6bfe9c99989a96.tar.gz"
     },
     {
       "method": "fetchzip",
       "packages": [
         "nimcrypto"
       ],
-      "path": "/nix/store/s0s1zrbzmhhg7vmvdj4a2cx4lp8j4hkg-source",
-      "rev": "6f205db5b39cbcb015f19e71f6e9d80e8e9b375a",
-      "sha256": "1yi3413iysfsa2w4p08ln875kmxi7dp3kkidz3929klliq212ppb",
+      "path": "/nix/store/h7lgq3by9mx8in03vzh0y964lnnlkalp-source",
+      "rev": "ff6afc6a753bd645cad4568472c7733d1715e31e",
+      "sha256": "0h9vpayp66pg66114bl0nsvlv1nzp7f0x5b35gbsbd7svzlcz5zj",
       "srcDir": "",
-      "url": "https://github.com/cheatfate/nimcrypto/archive/6f205db5b39cbcb015f19e71f6e9d80e8e9b375a.tar.gz"
+      "url": "https://github.com/cheatfate/nimcrypto/archive/ff6afc6a753bd645cad4568472c7733d1715e31e.tar.gz"
     },
     {
       "method": "fetchzip",
@@ -214,89 +137,6 @@
       "sha256": "1fi9ls3xl20bmv1ikillxywl96i9al6zmmxrbffx448gbrxs86kg",
       "srcDir": "src",
       "url": "https://github.com/zevv/npeg/archive/ec0cc6e64ea4c62d2aa382b176a4838474238f8d.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "stew"
-      ],
-      "path": "/nix/store/mqg8qzsbcc8xqabq2yzvlhvcyqypk72c-source",
-      "rev": "3c91b8694e15137a81ec7db37c6c58194ec94a6a",
-      "sha256": "17lfhfxp5nxvld78xa83p258y80ks5jb4n53152cdr57xk86y07w",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-stew/archive/3c91b8694e15137a81ec7db37c6c58194ec94a6a.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "sys"
-      ],
-      "path": "/nix/store/vf9ls2wip6d8xhsi3rjh0dqsqg597i6b-source",
-      "rev": "c117ee60542f084525f254e6ade590675a6a2ed6",
-      "sha256": "12qzx2lnh84xqfgypy0pka8nflq0y8n1izfwx8mb4zya5nzawmyf",
-      "srcDir": "src",
-      "url": "https://github.com/alaviss/nim-sys/archive/c117ee60542f084525f254e6ade590675a6a2ed6.tar.gz"
-    },
-    {
-      "date": "2024-04-02T15:38:57+01:00",
-      "deepClone": false,
-      "fetchLFS": false,
-      "fetchSubmodules": true,
-      "hash": "sha256-iZb9aAgYr4FGkqfIg49QWiCqeizIi047kFhugHiP8o0=",
-      "leaveDotGit": false,
-      "method": "git",
-      "packages": [
-        "solo5_dispatcher"
-      ],
-      "path": "/nix/store/sf5dgj2ljvahcm6my7d61ibda51vnrii-solo5_dispatcher",
-      "rev": "a7a894a96a2221284012800e6fd32923d83d20bd",
-      "sha256": "13gjixw80vjqj0xlx2y85ixal82sa27q7j57j9383bqq11lgv5l9",
-      "srcDir": "pkg",
-      "url": "https://git.sr.ht/~ehmry/solo5_dispatcher"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "cps"
-      ],
-      "path": "/nix/store/phdf6siqbhj7vx4qq507lzla81si60iz-source",
-      "rev": "58772ff9ddb38a4b2ec52da142d8532ba2fe7039",
-      "sha256": "1lph7v27nqwgm3a0ssi8q348gjrkjwgqc50agw38j7xif6wj80cw",
-      "srcDir": "",
-      "url": "https://github.com/ehmry/cps/archive/58772ff9ddb38a4b2ec52da142d8532ba2fe7039.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "cps"
-      ],
-      "path": "/nix/store/phdf6siqbhj7vx4qq507lzla81si60iz-source",
-      "rev": "58772ff9ddb38a4b2ec52da142d8532ba2fe7039",
-      "sha256": "1lph7v27nqwgm3a0ssi8q348gjrkjwgqc50agw38j7xif6wj80cw",
-      "srcDir": "",
-      "url": "https://github.com/ehmry/cps/archive/58772ff9ddb38a4b2ec52da142d8532ba2fe7039.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "stew"
-      ],
-      "path": "/nix/store/mqg8qzsbcc8xqabq2yzvlhvcyqypk72c-source",
-      "rev": "3c91b8694e15137a81ec7db37c6c58194ec94a6a",
-      "sha256": "17lfhfxp5nxvld78xa83p258y80ks5jb4n53152cdr57xk86y07w",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-stew/archive/3c91b8694e15137a81ec7db37c6c58194ec94a6a.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "stew"
-      ],
-      "path": "/nix/store/mqg8qzsbcc8xqabq2yzvlhvcyqypk72c-source",
-      "rev": "3c91b8694e15137a81ec7db37c6c58194ec94a6a",
-      "sha256": "17lfhfxp5nxvld78xa83p258y80ks5jb4n53152cdr57xk86y07w",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-stew/archive/3c91b8694e15137a81ec7db37c6c58194ec94a6a.tar.gz"
     }
   ]
 }
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index e3693e3..0000000
--- a/shell.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs ? import <nixpkgs> { } }:
-
-pkgs.buildNimPackage {
-  name = "syndicate_utils";
-  propagatedNativeBuildInputs =
-    builtins.attrValues { inherit (pkgs) pkg-config solo5; };
-  propagatedBuildInputs = builtins.attrValues {
-    inherit (pkgs) getdns postgresql solo5 sqlite libxml2 libxslt;
-  };
-  lockFile = ./lock.json;
-}