From 213b5457fc0a343d71c9ee1a84ea3722b3b05388 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 9 Sep 2018 07:12:36 +0000
Subject: Inline JSON files

---
 pkgs/games/dwarf-fortress/dfhack/default.nix | 39 +++++++++++++++++++++++++++-
 pkgs/games/dwarf-fortress/dfhack/dfhack.json | 38 ---------------------------
 pkgs/games/dwarf-fortress/themes/default.nix |  2 +-
 pkgs/games/dwarf-fortress/twbt/default.nix   | 33 ++++++++++++++++++++++-
 pkgs/games/dwarf-fortress/twbt/twbt.json     | 32 -----------------------
 pkgs/games/dwarf-fortress/unfuck.json        | 26 -------------------
 pkgs/games/dwarf-fortress/unfuck.nix         | 27 ++++++++++++++++++-
 7 files changed, 97 insertions(+), 100 deletions(-)
 delete mode 100644 pkgs/games/dwarf-fortress/dfhack/dfhack.json
 delete mode 100644 pkgs/games/dwarf-fortress/twbt/twbt.json
 delete mode 100644 pkgs/games/dwarf-fortress/unfuck.json

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 5dcdeda7ba28..d65bdab84911 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -9,7 +9,44 @@
 with lib;
 
 let
-  dfhack-releases = builtins.fromJSON (builtins.readFile ./dfhack.json);
+  dfhack-releases = {
+    "0.43.05" = {
+      dfHackRelease = "0.43.05-r3.1";
+      sha256 = "1ds366i0qcfbn62w9qv98lsqcrm38npzgvcr35hf6ihqa6nc6xrl";
+      xmlRev = "860a9041a75305609643d465123a4b598140dd7f";
+      prerelease = false;
+    };
+    "0.44.05" = {
+      dfHackRelease = "0.44.05-r2";
+      sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9";
+      xmlRev = "2794f8a6d7405d4858bac486a0bb17b94740c142";
+      prerelease = false;
+    };
+    "0.44.09" = {
+      dfHackRelease = "0.44.09-r1";
+      sha256 = "1nkfaa43pisbyik5inj5q2hja2vza5lwidg5z02jyh136jm64hwk";
+      xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5";
+      prerelease = false;
+    };
+    "0.44.10" = {
+      dfHackRelease = "0.44.10-r2";
+      sha256 = "19bxsghxzw3bilhr8sm4axz7p7z8lrvbdsd1vdjf5zbg04rs866i";
+      xmlRev = "321bd48b10c4c3f694cc801a7dee6be392c09b7b";
+      prerelease = false;
+    };
+    "0.44.11" = {
+      dfHackRelease = "0.44.11-beta2.1";
+      sha256 = "1jgwcqg9m1ybv3szgnklp6zfpiw5mswla464dlj2gfi5v82zqbv2";
+      xmlRev = "f27ebae6aa8fb12c46217adec5a812cd49a905c8";
+      prerelease = true;
+    };
+    "0.44.12" = {
+      dfHackRelease = "0.44.12-r1";
+      sha256 = "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy";
+      xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094";
+      prerelease = false;
+    };
+  };
 
   release = if hasAttr dfVersion dfhack-releases
             then getAttr dfVersion dfhack-releases
diff --git a/pkgs/games/dwarf-fortress/dfhack/dfhack.json b/pkgs/games/dwarf-fortress/dfhack/dfhack.json
deleted file mode 100644
index d1907fb38afb..000000000000
--- a/pkgs/games/dwarf-fortress/dfhack/dfhack.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "0.43.05": {
-    "dfHackRelease": "0.43.05-r3.1",
-    "sha256": "1ds366i0qcfbn62w9qv98lsqcrm38npzgvcr35hf6ihqa6nc6xrl",
-    "xmlRev": "860a9041a75305609643d465123a4b598140dd7f",
-    "prerelease": false
-  },
-  "0.44.05": {
-    "dfHackRelease": "0.44.05-r2",
-    "sha256": "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9",
-    "xmlRev": "2794f8a6d7405d4858bac486a0bb17b94740c142",
-    "prerelease": false
-  },
-  "0.44.09": {
-    "dfHackRelease": "0.44.09-r1",
-    "sha256": "1nkfaa43pisbyik5inj5q2hja2vza5lwidg5z02jyh136jm64hwk",
-    "xmlRev": "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5",
-    "prerelease": false
-  },
-  "0.44.10": {
-    "dfHackRelease": "0.44.10-r2",
-    "sha256": "19bxsghxzw3bilhr8sm4axz7p7z8lrvbdsd1vdjf5zbg04rs866i",
-    "xmlRev": "321bd48b10c4c3f694cc801a7dee6be392c09b7b",
-    "prerelease": false
-  },
-  "0.44.11": {
-    "dfHackRelease": "0.44.11-beta2.1",
-    "sha256": "1jgwcqg9m1ybv3szgnklp6zfpiw5mswla464dlj2gfi5v82zqbv2",
-    "xmlRev": "f27ebae6aa8fb12c46217adec5a812cd49a905c8",
-    "prerelease": true
-  },
-  "0.44.12": {
-    "dfHackRelease": "0.44.12-r1",
-    "sha256": "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy",
-    "xmlRev": "23500e4e9bd1885365d0a2ef1746c321c1dd5094",
-    "prerelease": false
-  }
-}
diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix
index 0b8eb23a7b9d..feb4782d7c32 100644
--- a/pkgs/games/dwarf-fortress/themes/default.nix
+++ b/pkgs/games/dwarf-fortress/themes/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchFromGitHub}:
+{lib, fetchFromGitHub, ...}:
 
 with builtins;
 
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index 1bdbddb56de4..7c80c1012462 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -5,7 +5,38 @@
 with lib;
 
 let
-  twbt-releases = builtins.fromJSON (builtins.readFile ./twbt.json);
+  twbt-releases = {
+    "0.43.05" = {
+      twbtRelease = "6.22";
+      sha256 = "0di5d38f6jj9smsz0wjcs1zav4zba6hrk8cbn59kwpb1wamsh5c7";
+      prerelease = false;
+    };
+    "0.44.05" = {
+      twbtRelease = "6.35";
+      sha256 = "0qjkgl7dsqzsd7pdq8a5bihhi1wplfkv1id7sj6dp3swjpsfxp8g";
+      prerelease = false;
+    };
+    "0.44.09" = {
+      twbtRelease = "6.41";
+      sha256 = "0nsq15z05pbhqjvw2xqs1a9b1n2ma0aalhc3vh3mi4cd4k7lxh44";
+      prerelease = false;
+    };
+    "0.44.10" = {
+      twbtRelease = "6.49";
+      sha256 = "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz";
+      prerelease = false;
+    };
+    "0.44.11" = {
+      twbtRelease = "6.51";
+      sha256 = "1yclqmarjd97ch054h425a12r8a5ailmflsd7b39cg4qhdr1nii5";
+      prerelease = true;
+    };
+    "0.44.12" = {
+      twbtRelease = "6.54";
+      sha256 = "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh";
+      prerelease = false;
+    };
+  };
 
   release = if hasAttr dfVersion twbt-releases
             then getAttr dfVersion twbt-releases
diff --git a/pkgs/games/dwarf-fortress/twbt/twbt.json b/pkgs/games/dwarf-fortress/twbt/twbt.json
deleted file mode 100644
index f7de1c14e6b6..000000000000
--- a/pkgs/games/dwarf-fortress/twbt/twbt.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "0.43.05": {
-    "twbtRelease": "6.22",
-    "sha256": "0di5d38f6jj9smsz0wjcs1zav4zba6hrk8cbn59kwpb1wamsh5c7",
-    "prerelease": false
-  },
-  "0.44.05": {
-    "twbtRelease": "6.35",
-    "sha256": "0qjkgl7dsqzsd7pdq8a5bihhi1wplfkv1id7sj6dp3swjpsfxp8g",
-    "prerelease": false
-  },
-  "0.44.09": {
-    "twbtRelease": "6.41",
-    "sha256": "0nsq15z05pbhqjvw2xqs1a9b1n2ma0aalhc3vh3mi4cd4k7lxh44",
-    "prerelease": false
-  },
-  "0.44.10": {
-    "twbtRelease": "6.49",
-    "sha256": "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz",
-    "prerelease": false
-  },
-  "0.44.11": {
-    "twbtRelease": "6.51",
-    "sha256": "1yclqmarjd97ch054h425a12r8a5ailmflsd7b39cg4qhdr1nii5",
-    "prerelease": true
-  },
-  "0.44.12": {
-    "twbtRelease": "6.54",
-    "sha256": "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh",
-    "prerelease": false
-  }
-}
diff --git a/pkgs/games/dwarf-fortress/unfuck.json b/pkgs/games/dwarf-fortress/unfuck.json
deleted file mode 100644
index f7a4974c575c..000000000000
--- a/pkgs/games/dwarf-fortress/unfuck.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "0.43.05": {
-    "unfuckRelease": "0.43.05",
-    "sha256": "173dyrbxlzqvjf1j3n7vpns4gfjkpyvk9z16430xnmd5m6nda8p2"
-  },
-  "0.44.05": {
-    "unfuckRelease": "0.44.05",
-    "sha256": "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b"
-  },
-  "0.44.09": {
-    "unfuckRelease": "0.44.09",
-    "sha256": "138p0v8z2x47f0fk9k6g75ikw5wb3vxldwv5ggbkf4hhvlw6lvzm"
-  },
-  "0.44.10": {
-    "unfuckRelease": "0.44.10",
-    "sha256": "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj"
-  },
-  "0.44.11": {
-    "unfuckRelease": "0.44.11.1",
-    "sha256": "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"
-  },
-  "0.44.12": {
-    "unfuckRelease": "0.44.12",
-    "sha256": "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"
-  }
-}
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 732003118713..c4d01b3ff392 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -7,7 +7,32 @@
 with lib;
 
 let
-  unfuck-releases = builtins.fromJSON (builtins.readFile ./unfuck.json);
+  unfuck-releases = {
+    "0.43.05" = {
+      unfuckRelease = "0.43.05";
+      sha256 = "173dyrbxlzqvjf1j3n7vpns4gfjkpyvk9z16430xnmd5m6nda8p2";
+    };
+    "0.44.05" = {
+      unfuckRelease = "0.44.05";
+      sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b";
+    };
+    "0.44.09" = {
+      unfuckRelease = "0.44.09";
+      sha256 = "138p0v8z2x47f0fk9k6g75ikw5wb3vxldwv5ggbkf4hhvlw6lvzm";
+    };
+    "0.44.10" = {
+      unfuckRelease = "0.44.10";
+      sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj";
+    };
+    "0.44.11" = {
+      unfuckRelease = "0.44.11.1";
+      sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz";
+    };
+    "0.44.12" = {
+      unfuckRelease = "0.44.12";
+      sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz";
+    };
+  };
 
   release = if hasAttr dfVersion unfuck-releases
             then getAttr dfVersion unfuck-releases
-- 
cgit 1.4.1