From 9356853f041e1d4570435f339a00bef89f18e042 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 17 Mar 2023 12:36:44 -0600
Subject: [PATCH] overlays: remove unused overlays

---
 overlays/default.nix | 56 --------------------------------------------
 pkgs/ghexport.nix    |  2 +-
 pkgs/kobuddy.nix     | 41 +++++++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 60 deletions(-)

diff --git a/overlays/default.nix b/overlays/default.nix
index a43d11a..cea50ba 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -9,62 +9,6 @@ in {
     openssh
     tailscale
 
-   (self: super: {
-     python310 = super.python310.override {
-       packageOverrides = python-self: python-super: {
-         dataset = python-super.dataset.overrideAttrs (old: {
-           src = python-super.fetchFromGitHub {
-             owner = "pudo";
-             repo = "dataset";
-             rev = "0757b5010b600a66ed07fbb06a0e86c7bb0e09bc";
-             hash = "sha256-BfIGQvXKlsydV3p93/qLYtbVujTNWqWfMg16/aENHks=";
-           };
-
-           prePatch = ''
-             substituteInPlace ./setup.py --replace "sqlalchemy >= 1.3.2, < 2.0.0" \
-              "sqlalchemy >= 1.3.2, <= 2.0.4"
-           '';
-
-           patch = [
-             (python-super.fetchpatch {
-               url = "https://patch-diff.githubusercontent.com/raw/pudo/dataset/pull/415.patch";
-               hash = "sha256-dz380ws4801lW669sOfshU5ZoUTmILkamwRgYCDZzAM=";
-             })
-           ];
-         });
-       };
-     };
-   })
-
-    # https://github.com/NixOS/nixpkgs/pull/213613
-    (self: super: {
-      tidal-hifi = super.tidal-hifi.overrideAttrs (old: rec {
-        version = "4.4.0";
-
-        src = super.fetchurl {
-          url =
-            "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";
-          sha256 = "sha256-6KlcxBV/zHN+ZnvIu1PcKNeS0u7LqhDqAjbXawT5Vv8=";
-        };
-
-        postFixup = ''
-          makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \
-            --prefix LD_LIBRARY_PATH : "${
-              lib.makeLibraryPath old.buildInputs
-            }" \
-            "''${gappsWrapperArgs[@]}"
-          substituteInPlace $out/share/applications/tidal-hifi.desktop \
-            --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi"
-
-          for size in 48 64 128 256 512; do
-            mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/
-            convert $out/share/icons/hicolor/0x0/apps/tidal-hifi.png \
-              -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/icon.png
-          done
-        '';
-
-      });
-    })
     (self: super: {
       rex = super.rex.overrideAttrs (old: {
         patches = [
diff --git a/pkgs/ghexport.nix b/pkgs/ghexport.nix
index 7722834..eec8352 100644
--- a/pkgs/ghexport.nix
+++ b/pkgs/ghexport.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "ghexport";
-  version = "2022-08-28";
+  version = "20220828";
 
   nativeBuildInputs = [ setuptools-scm ];
   propagatedBuildInputs = [ PyGithub pytz ];
diff --git a/pkgs/kobuddy.nix b/pkgs/kobuddy.nix
index 6033af3..f103984 100644
--- a/pkgs/kobuddy.nix
+++ b/pkgs/kobuddy.nix
@@ -1,6 +1,41 @@
-{ lib, buildPythonPackage, fetchPypi, setuptools-scm, dataset, pytz, ... }:
+{ lib, fetchFromGitHub, fetchpatch, buildPythonPackage, fetchPypi
+, setuptools-scm, pytz, alembic, banal, sqlalchemy, ... }:
 
-buildPythonPackage rec {
+let
+  myDataset = buildPythonPackage rec {
+    pname = "dataset";
+    version = "1.6.0";
+    format = "setuptools";
+
+    src = fetchFromGitHub {
+      owner = "pudo";
+      repo = pname;
+      rev = "0757b5010b600a66ed07fbb06a0e86c7bb0e09bc";
+      hash = "sha256-BfIGQvXKlsydV3p93/qLYtbVujTNWqWfMg16/aENHks=";
+    };
+
+    patches = [
+      (fetchpatch {
+        url = "http://sprunge.us/VjQHXp";
+        hash = "sha256-7TASRvvaNE4V1ShMkahdCb0js2Muaq+NC88wIsTvFu8=";
+      })
+    ];
+
+    propagatedBuildInputs = [ alembic banal sqlalchemy ];
+
+    # checks attempt to import nonexistent module 'test.test' and fail
+    doCheck = false;
+
+    pythonImportsCheck = [ "dataset" ];
+
+    meta = with lib; {
+      description = "Toolkit for Python-based database access";
+      homepage = "https://dataset.readthedocs.io";
+      license = licenses.mit;
+      maintainers = with maintainers; [ xfnw ];
+    };
+  };
+in buildPythonPackage rec {
   pname = "kobuddy";
   version = "0.2.20221023";
 
@@ -13,7 +48,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools-scm ];
 
-  propagatedBuildInputs = [ dataset pytz ];
+  propagatedBuildInputs = [ myDataset pytz ];
 
   meta = with lib; {
     homepage = "https://github.com/karlicoss/promnesia";