From 743ab70eee974aa9ed934e79b32be01a7688c427 Mon Sep 17 00:00:00 2001
From: heyarne <hi@arnes.space>
Date: Fri, 11 Jun 2021 16:59:19 +0200
Subject: [PATCH] Use manual build process in org-file for now for more
 flexibility

---
 .envrc      |  1 +
 default.nix | 15 ---------------
 flake.lock  | 19 ++++++++++++++++++-
 flake.nix   | 36 ++++++++++++++++++++++++++----------
 shell.nix   | 25 -------------------------
 5 files changed, 45 insertions(+), 51 deletions(-)
 create mode 100644 .envrc
 delete mode 100644 default.nix
 delete mode 100644 shell.nix

diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/default.nix b/default.nix
deleted file mode 100644
index 4fa4396..0000000
--- a/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-let 
-  name = "earth";
-  builder = ./importers/owid.sh;
-  src = ./sources/cumulative_co2_emissions.csv;
-
-  csvsToSqlite = pkgs.csvs-to-sqlite;
-in
-  pkgs.stdenv.mkDerivation {
-    name = "${name}.db";
-    inherit src;
-    inherit builder;
-
-    inherit csvsToSqlite;
-  }
diff --git a/flake.lock b/flake.lock
index 85302d9..e56d912 100644
--- a/flake.lock
+++ b/flake.lock
@@ -30,10 +30,27 @@
         "type": "github"
       }
     },
+    "owid-co2-data": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1612965128,
+        "narHash": "sha256-F9Qb+wGbJ8x/k1gT+C/GyXBHi1XxFnoqyHkuy6oslU0=",
+        "owner": "owid",
+        "repo": "co2-data",
+        "rev": "5ce76ff7269c024e12c6554bf041eca68babaf2c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "owid",
+        "repo": "co2-data",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "owid-co2-data": "owid-co2-data"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index f4e5d61..0b582dc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,22 +4,38 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
+
+    # data sources
+    owid-co2-data = {
+      # TODO Include these two files:
+      # - https://github.com/owid/co2-data/blob/master/owid-co2-data.csv
+      # - https://github.com/owid/co2-data/blob/master/owid-co2-codebook.csv
+      url = "github:owid/co2-data";
+      flake = false;
+    };
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem
       (system:
         let pkgs = nixpkgs.legacyPackages.${system}; in
         {
-          devShell = import ./shell.nix { inherit pkgs; };
+          devShell =
+            let
+              lib = pkgs.lib;
+            in pkgs.mkShell rec {
+              name = "datasette";
+              buildInputs = with pkgs; [
+                sqlite
+                libspatialite
+                spatialite_tools
+                rlwrap
+            
+                datasette
+              ];
+            
+              LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}";
+          };
         }
       );
-  # outputs = { self, nixpkgs, flake-utils, ... }:
-  #   flake-utils.lib.eachDefaultSystem
-  #     (system:
-  #     let pkgs.legacyPackages.${system}; in
-  #     {
-  #         devShell = import ./shell.nix { inherit pkgs; };
-  #       }
-  #     );
 }
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index a4dd6f3..0000000
--- a/shell.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ pkgs ? import <nixpkgs> { } }:
-
-let
-  lib = pkgs.lib;
-in pkgs.mkShell rec {
-  name = "datasette";
-  buildInputs = with pkgs; [
-    sqlite
-    libspatialite
-    spatialite_tools
-    rlwrap
-
-    datasette
-  ];
-
-  LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}";
-
-  shellHook = ''
-    datasette \
-      --load-extension=mod_spatialite.so \
-      -m metadata.yml -h 0.0.0.0 --cors --setting default_cache_ttl 1800 \
-      --immutable dbs/*.db
-    datasette dbs/*
-  '';
-}