Updated data

4 files changed, 48 insertions, 17 deletions

diff --git a/data/licenses.yaml b/data/licenses.yaml
index 6b24558..0efbdaf 100644
--- a/data/licenses.yaml
+++ b/data/licenses.yaml
@@ -1,23 +1,53 @@
 - name: Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
   short: CC BY-NC-SA 4.0
   link: "https://creativecommons.org/licenses/by-nc-sa/4.0/"
+  image: "https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-nc-sa.png"
 
 - name: Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported
   short: CC BY-NC-SA 3.0
   link: "https://creativecommons.org/licenses/by-nc-sa/3.0/"
+  image: "https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-nc-sa.png"
 
 - name: Creative Commons Attribution-ShareAlike 4.0 International
   short: CC BY-SA 4.0
   link: "https://creativecommons.org/licenses/by-sa/4.0/"
+  image: "https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-sa.png"
 
 - name: Creative Commons Attribution-NonCommercial-NoDerivs 4.0 International
   short: CC BY-NC-ND 4.0
   link: "https://creativecommons.org/licenses/by-nc-nd/4.0/"
+  image: "https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-nc-nd.png"
+
+- name: Creative Commons Attribution 4.0 International
+  short: CC BY 4.0
+  link: "https://creativecommons.org/licenses/by/4.0/"
+  image: "https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by.png"
+
+- name: Creative Commons Zero 1.0 Universal
+  short: CC0
+  link: "https://creativecommons.org/publicdomain/zero/1.0/"
+  image: "https://mirrors.creativecommons.org/presskit/buttons/88x31/png/cc-zero.png"
 
 - name: GNU Free Documentation License
   short: GFDL
   link: "https://www.gnu.org/licenses/fdl-1.3.html"
+  image: "https://www.gnu.org/graphics/gfdl-logo-small.png"
 
 - name: GNU General Public License, version 2
   short: GPLv2
   link: "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+
+- name: GNU General Public License, version 3
+  short: GPLv3
+  link: "https://www.gnu.org/licenses/gpl-3.0.html"
+  image: "https://www.gnu.org/graphics/gplv3-127x51.png"
+
+- name: GNU Lesser General Public License, version 3
+  short: LGPLv3
+  link: "https://www.gnu.org/licenses/lgpl-3.0.html"
+  image: "https://www.gnu.org/graphics/lgplv3-147x51.png"
+
+- name: Do What The Fuck You Want To Public License
+  short: WTFPL
+  link: "https://www.wtfpl.net/"
+  image: "http://www.wtfpl.net/wp-content/uploads/2012/12/wtfpl-badge-1.png"
diff --git a/data/people.yaml b/data/people.yaml
index 9916db8..caf26c4 100644
--- a/data/people.yaml
+++ b/data/people.yaml
@@ -34,6 +34,8 @@
   aliases:
     - Jessica De Silva
 
+- name: Jared DeLeo
+
 - name: Phil DeOrsey
   aliases:
     - Philip DeOrsey
@@ -46,6 +48,9 @@
 
 - name: Enrique Gomez-Leos
 
+- name: Owen Henderschedt
+  webpage: "https://www.owenh-math.com/home"
+
 - name: Leslie Hogben
   webpage: "https://www.aimath.org/~hogben/"
 
diff --git a/flake.lock b/flake.lock
index ab80ea9..c8f0f7e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,18 +18,18 @@
         "type": "github"
       }
     },
-    "haskell-flake": {
+    "nix-filter": {
       "locked": {
-        "lastModified": 1767025773,
-        "narHash": "sha256-yiJDBXfcTQJGhENquQLD+U3IAXiplv7M5myXz7oBF6k=",
-        "owner": "srid",
-        "repo": "haskell-flake",
-        "rev": "396eb65d91bf5eed4a61da8bd0b025059591445e",
+        "lastModified": 1757882181,
+        "narHash": "sha256-+cCxYIh2UNalTz364p+QYmWHs0P+6wDhiWR4jDIKQIU=",
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "rev": "59c44d1909c72441144b93cf0f054be7fe764de5",
         "type": "github"
       },
       "original": {
-        "owner": "srid",
-        "repo": "haskell-flake",
+        "owner": "numtide",
+        "repo": "nix-filter",
         "type": "github"
       }
     },
@@ -66,7 +66,7 @@
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "haskell-flake": "haskell-flake",
+        "nix-filter": "nix-filter",
         "nixpkgs": "nixpkgs",
         "systems": "systems"
       }
diff --git a/flake.nix b/flake.nix
index b3ac2b2..66caa92 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,18 +4,12 @@
     nixpkgs.url = "github:nixos/nixpkgs";
     flake-parts.url = "github:hercules-ci/flake-parts";
     systems.url = "github:nix-systems/default";
-    haskell-flake.url = "github:srid/haskell-flake";
-    # flake-utils.url = "github:numtide/flake-utils";
-    # nix-filter.url = "github:numtide/nix-filter";
+    nix-filter.url = "github:numtide/nix-filter";
   };
 
   outputs = inputs@{self, flake-parts, nixpkgs, ... }: flake-parts.lib.mkFlake { inherit self inputs; } {
     systems = import inputs.systems;
 
-    imports = [
-      inputs.haskell-flake.flakeModule
-    ];
-
     flake.lib = {
       rubberWith = { pkgs, texPath }: pkgs.symlinkJoin rec {
         name = "rubber";
@@ -51,7 +45,9 @@
 
     flake.overlays.default = final: prev: {
       haskellPackages = prev.haskellPackages.extend (hfinal: _hprev: {
-        www-main = hfinal.callCabal2nix "www-main" ./. {};
+        www-main = let 
+          src = ./.;
+        in hfinal.callCabal2nix "www-main" src {};
       });
     };