From e65febdb5b035e7403cdeec51723147097d79e62 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sat, 25 Sep 2021 14:35:05 +0200
Subject: [PATCH] Update preserves-nim

Build and install the utilities.
---
 flake.lock                |  6 +++---
 preserves-nim/default.nix | 22 ++++++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0731fd0..fa32e81 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1632386563,
-        "narHash": "sha256-8X0nNHyIQYLpcxbE4WSO5+Q5u9/3vB5n00dKP5mRP2I=",
+        "lastModified": 1632570486,
+        "narHash": "sha256-1CPYfW5dgquaizUwJPtCL+9xu1peHWixLN2DI62oJoQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bc2ba06323f101f413abe38736c1330388272ffd",
+        "rev": "f05a99e116df08af551c7c49e7d4aa4020d43acd",
         "type": "github"
       },
       "original": {
diff --git a/preserves-nim/default.nix b/preserves-nim/default.nix
index 8715a7e..f6001e2 100644
--- a/preserves-nim/default.nix
+++ b/preserves-nim/default.nix
@@ -1,4 +1,4 @@
-{ lib, nimPackages, fetchgit }:
+{ lib, nimPackages, fetchFromSourcehut }:
 with nimPackages;
 
 let
@@ -22,12 +22,22 @@ let
 
 in buildNimPackage rec {
   outputs = [ "out" "dev" ];
+
   pname = "preserves";
-  version = "1.0.0";
-  src = fetchgit {
-    url = "https://git.sr.ht/~ehmry/preserves-nim";
-    rev = "v${version}";
-    sha256 = "18702q7vmyf5kkgn9nqf96kcar5pqxisf03ybrqw3hfp95vxixn4";
+  version = "1.1.0";
+  src = fetchFromSourcehut {
+    owner = "~ehmry";
+    repo = "preserves-nim";
+    rev = "2dd63903f05b963aaefcc7a12bb11b078ae7eed5";
+    sha256 = "sha256-qBoAAZ2ixpqX9UWEAh/Bs0cYo+u3CW8dIk5Kfr9+HMc=";
   };
   buildInputs = [ compiler bigints npeg ];
+  postInstall = ''
+    pushd $out/bin
+    for link in preserves_decode preserves_from_json preserves_to_json;
+    do ln -s  preserves_encode $link
+    done
+    popd
+  '';
+  doCheck = true;
 }