From b65eb7ec84816acba5b6b5721fd6a3cdddf160a3 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Wed, 5 Jan 2022 08:35:16 -0500
Subject: [PATCH 1/2] obb: switch to fetchFromGitHub

---
 pkgs/development/interpreters/clojure/obb.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/obb.nix b/pkgs/development/interpreters/clojure/obb.nix
index 3e0a63b5e28c..2b37428b25ba 100644
--- a/pkgs/development/interpreters/clojure/obb.nix
+++ b/pkgs/development/interpreters/clojure/obb.nix
@@ -7,6 +7,7 @@
 , git
 , jdk
 , callPackage
+, fetchFromGitHub
 , makeWrapper
 , runCommand }:
 
@@ -14,9 +15,11 @@ stdenv.mkDerivation rec {
   pname = "obb";
   version = "0.0.1";
 
-  src = fetchurl {
-    url = "https://github.com/babashka/${pname}/archive/refs/tags/v${version}.tar.gz";
-    sha256 = "sha256-ZVd3VCJ7vdQGQ7iY5v2b+gRX/Ni0/03hzqBElqpPvpI=";
+  src = fetchFromGitHub {
+    owner = "babashka";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-WxQjBg6el6XMiHTurmSo1GgZnTdaJjRmcV3+3X4yohc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 3dd76988673bd6a67ab43567963ead57030af355 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Wed, 5 Jan 2022 08:39:26 -0500
Subject: [PATCH 2/2] obb: switch to passthru.tests

---
 pkgs/development/interpreters/clojure/obb.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/obb.nix b/pkgs/development/interpreters/clojure/obb.nix
index 2b37428b25ba..9583be923939 100644
--- a/pkgs/development/interpreters/clojure/obb.nix
+++ b/pkgs/development/interpreters/clojure/obb.nix
@@ -6,7 +6,7 @@
 , clojure
 , git
 , jdk
-, callPackage
+, obb
 , fetchFromGitHub
 , makeWrapper
 , runCommand }:
@@ -64,11 +64,12 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  doInstallCheck = true;
-  installCheckPhase = ''
-    [ $($out/bin/obb -e '(+ 1 2)') = '3' ]
-  '';
-
+  passthru.tests = {
+    simple = runCommand "${pname}-test" {} ''
+      [ $(${obb}/bin/obb -e '(+ 1 2)') = '3' ]
+      touch $out
+    '';
+  };
 
   meta = with lib; {
     description = "Ad-hoc ClojureScript scripting of Mac applications via Apple's Open Scripting Architecture";