From e705d10feb93753bb841f8b0bf2554156d3cec9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Sun, 2 Jun 2019 01:51:30 +0200
Subject: [PATCH] quote-db: import from derivation; + k(rebs)paste

---
 configs/default.nix   | 38 +++++++++++++++++++++++++-------------
 packages/quote-db.nix | 26 --------------------------
 2 files changed, 25 insertions(+), 39 deletions(-)
 delete mode 100644 packages/quote-db.nix

diff --git a/configs/default.nix b/configs/default.nix
index f9afb6d..1ff4c36 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -83,13 +83,20 @@
               sncli = new.callPackage <packages/sncli.nix> {};
             };
           };
-          haskellPackages = pkgs.haskellPackages.override {
-            overrides = new: old: {
-              quote-db = new.callPackage <packages/quote-db.nix> {};
-              blessings = new.callPackage <packages/blessings.nix> {};
-              scanner = new.callPackage <stockholm/krebs/5pkgs/haskell/scanner.nix> {};
+          haskellPackages =
+            let quote-db-package = pkgs.fetchFromGitHub {
+              repo = "quote-db";
+              owner = "kmein";
+              rev = "bca21ca3d7c0baf680389ff9cf5ad5297f0e3dc3";
+              sha256 = "0cxdvfsvhg15q75zpdnhwaykawv53hblgjpkz03ihvnzaypps7pn";
+            };
+            in pkgs.haskellPackages.override {
+              overrides = new: old: {
+                quote-db = new.callPackage quote-db-package {};
+                blessings = new.callPackage <packages/blessings.nix> {};
+                scanner = new.callPackage <stockholm/krebs/5pkgs/haskell/scanner.nix> {};
+              };
             };
-          };
 
           autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {};
           bvg = pkgs.callPackage <packages/bvg.nix> {};
@@ -107,14 +114,14 @@
           libcoap = pkgs.callPackage <packages/libcoap.nix> {};
           writeDash = pkgs.writers.writeDash;
           writeDashBin = pkgs.writers.writeDashBin;
-          ikea-smartlight =
-            let ikea-smartlight-package = pkgs.fetchFromGitHub {
+          traadfri =
+            let traadfri-package = pkgs.fetchFromGitHub {
               owner = "kmein";
-              repo = "ikea-smartlight";
-              rev = "e2a2b00651bc33c9c81634a4f485ab66c8d93f70";
-              sha256 = "033564ffasqxdc5gga16jpb8aibajyins0pfnpkwvd6ljnnni0n2";
+              repo = "traadfri";
+              rev = "c77cc778d88ddb1b667d9952803dd943a8594036";
+              sha256 = "0800h9gakvkn1260dxxd8g8rn0n3pifkya4pwcbxb8j0sli86ch4";
             };
-            in pkgs.callPackage ikea-smartlight-package {};
+            in pkgs.python3Packages.callPackage traadfri-package {};
 
           dic = pkgs.callPackage <stockholm/krebs/5pkgs/simple/dic> {};
           yt-next = pkgs.callPackage <stockholm/lass/5pkgs/yt-next> {};
@@ -122,6 +129,9 @@
           urban = pkgs.callPackage <stockholm/lass/5pkgs/urban> {};
           mpv-poll = pkgs.callPackage <stockholm/lass/5pkgs/mpv-poll> {};
           untilport = pkgs.callPackage <stockholm/krebs/5pkgs/simple/untilport> {};
+          kpaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/kpaste> {};
+          krebspaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/krebspaste> {};
+          bepasty-client-cli = pkgs.callPackage <stockholm/krebs/5pkgs/simple/bepasty-client-cli> {};
         };
       };
     }
@@ -368,6 +378,8 @@
         yt-next
         acronym
         urban
+        kpaste
+        krebspaste
         daybook
         gnupg
         jo
@@ -388,7 +400,7 @@
         n
       ] ++ [
         libcoap
-        ikea-smartlight
+        traadfri
       ];
     }
   ];
diff --git a/packages/quote-db.nix b/packages/quote-db.nix
deleted file mode 100644
index b158ea3..0000000
--- a/packages/quote-db.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, bytestring, cassava, hasmin, HaTeX, lucid
-, megaparsec, optparse-applicative, prettyprinter, raw-strings-qq
-, stdenv, text
-, fetchFromGitHub
-}:
-mkDerivation {
-  pname = "quote-db";
-  version = "0.1.0.0";
-  src = fetchFromGitHub {
-    owner = "kmein";
-    repo = "quote-db";
-    rev = "2a9776293d306cf2777bfd63412d8e30082826d1";
-    sha256 = "18nmi6rds1dfwkrnvdbqzl261szg93b6rbx6in2zmpz8v6k6z5f9";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    base bytestring cassava hasmin HaTeX lucid megaparsec prettyprinter
-    raw-strings-qq text
-  ];
-  executableHaskellDepends = [ base optparse-applicative text ];
-  testHaskellDepends = [ base ];
-  homepage = "https://github.com/kmein/quote-db#readme";
-  description = "A tool for managing a database of literature quotes";
-  license = stdenv.lib.licenses.mit;
-}