From 29bfa3330ea6cccc96c4a9b9daa7d75dca5fc4c9 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 17 Mar 2023 12:15:42 -0600
Subject: [PATCH] all: attempt to fix pythonPackages.dataset issue

---
 flake.lock           | 24 ++++++++++++------------
 overlays/default.nix | 29 ++++++++++++++++++++++++++++-
 pkgs/promnesia.nix   | 19 ++++++++++++-------
 3 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index 86b75dc..2c1c22d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -60,11 +60,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "lastModified": 1678901627,
+        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
         "type": "github"
       },
       "original": {
@@ -339,11 +339,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1678803540,
-        "narHash": "sha256-nHCi/KLdawIyDW68VPqBchIFvwyVmJlq9MJFGzRq4tc=",
+        "lastModified": 1678944041,
+        "narHash": "sha256-Mdl+pMrnbphMfRPMRqf9anpIvzqhVkNtsQNZ3NJ/eLo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b0bdfe19cde52b55c811fb05b22dde0cf7f6a1d8",
+        "rev": "8914c044050cf975209c87d26690eeac7a27ca12",
         "type": "github"
       },
       "original": {
@@ -452,11 +452,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1678852289,
-        "narHash": "sha256-tWthwF/grWehpRjxpCTCs2KYynvxFKyKv2abO91GwVE=",
+        "lastModified": 1679016989,
+        "narHash": "sha256-duyz4fwtCuS32vNaGTzlMMsJ2prgNFtKVZCQK88DrnE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1a8edfe192baf0775391ce520092db3c37ff5035",
+        "rev": "6a88bba059564e521acd1b0e811939f12369e3e8",
         "type": "github"
       },
       "original": {
@@ -467,11 +467,11 @@
     },
     "unstableSmall": {
       "locked": {
-        "lastModified": 1678780369,
-        "narHash": "sha256-D8wM0K1EkWLwbUu9fohC57+n89zC9qQ3hdC9Bys5GYw=",
+        "lastModified": 1678951128,
+        "narHash": "sha256-UcfF8/GyllRG/kfOcW/pr9s+YdoND430umc/MkfWpdk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1474943fd91fbe5567f7582acf568e0f999f4af1",
+        "rev": "bf209075b7584ef4fe74db23a86f719555d31d49",
         "type": "github"
       },
       "original": {
diff --git a/overlays/default.nix b/overlays/default.nix
index c347f8a..a43d11a 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,4 +1,4 @@
-{ self, config, pkgs, lib, isUnstable, ... }:
+{ pkgs, lib, isUnstable, ... }:
 let
   openssh = import ./openssh.nix;
   tailscale = import ./tailscale.nix;
@@ -9,6 +9,33 @@ 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 {
diff --git a/pkgs/promnesia.nix b/pkgs/promnesia.nix
index 339a9d0..1a66d71 100644
--- a/pkgs/promnesia.nix
+++ b/pkgs/promnesia.nix
@@ -1,7 +1,8 @@
-{ lib, buildPythonPackage, fetchPypi, beautifulsoup4, fastapi, httptools, pytest
-, logzero, lxml, mistletoe, more-itertools, mypy, pytz, setuptools, appdirs
-, sqlalchemy, tzlocal, urlextract, uvicorn, uvloop, watchfiles, websockets
-, orjson, pandas, simplejson, setuptools-scm, decorator, geopy, pkgs, ... }:
+{ lib, buildPythonPackage, fetchFromGitHub, beautifulsoup4, fastapi, httptools
+, pytest, logzero, lxml, mistletoe, more-itertools, mypy, pytz, setuptools
+, appdirs, sqlalchemy, tzlocal, urlextract, uvicorn, uvloop, watchfiles
+, websockets, orjson, pandas, simplejson, setuptools-scm, decorator, geopy, pkgs
+, ... }:
 with pkgs;
 let
   hpi = pkgs.python3Packages.callPackage ./hpi.nix { inherit pkgs; };
@@ -12,11 +13,15 @@ in buildPythonPackage rec {
   pname = "promnesia";
   version = "1.1.20230129";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-T6sayrPkz8I0u11ZvFbkDdOyVodbaTVkRzLib5lMX+Q=";
+  src = fetchFromGitHub {
+    owner = "karlicoss";
+    repo = pname;
+    rev = "c4a7b47e198a3822dd540968c5a8e6b95ab51b53";
+    hash = "sha256-QMqvqspuqkyIsz05aA1xObT0tKaJmbts3Cn3O9rlQ1k=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   doCheck = true;
 
   nativeBuildInputs = [ setuptools-scm ];