Update groundhog to throw SqlError instead of use fail

obsidiansystems · May 7, 2020 · 2c53fe5 · 2c53fe5
1 parent ee08d02
commit 2c53fe5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/dep/groundhog/default.nix b/dep/groundhog/default.nix
@@ -1,7 +1,2 @@
 # DO NOT HAND-EDIT THIS FILE
-import ((import <nixpkgs> {}).fetchFromGitHub (
-  let json = builtins.fromJSON (builtins.readFile ./github.json);
-  in { inherit (json) owner repo rev sha256;
-       private = json.private or false;
-     }
-))
+import (import ./thunk.nix)
diff --git a/dep/groundhog/github.json b/dep/groundhog/github.json
@@ -2,6 +2,7 @@
   "owner": "obsidiansystems",
   "repo": "groundhog",
   "branch": "develop",
-  "rev": "e08021aef70f17196214e795789d0993177231b5",
-  "sha256": "13ikpayvzv85wmfgh7wnf73ayhjy77384mnwvqcxi0nbn5m7kk56"
+  "private": false,
+  "rev": "fb16055662e81bed258bd246380bc67bb6f7afab",
+  "sha256": "0071nvdw296bz5apvxg7r6inskg4znayqp050pjbnbl72b6aq8n8"
 }
diff --git a/dep/groundhog/thunk.nix b/dep/groundhog/thunk.nix
@@ -0,0 +1,9 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import <nixpkgs> {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json