Move haskell source overrides into niv

2 files changed, 51 insertions, 31 deletions

diff --git a/nix/haskell-overlay.nix b/nix/haskell-overlay.nix
index b496cd4..e384b4f 100644
--- a/nix/haskell-overlay.nix
+++ b/nix/haskell-overlay.nix
@@ -1,43 +1,24 @@
-self: super:
+_: nixpkgs:
 
-let
- claySrc = super.pkgs.fetchFromGitHub {
-    owner = "sebastiaanvisser";
-    repo = "clay";
-    rev = "cc7729b1b42a79e261091ff7835f7fc2a7ae3cee";
-    sha256 = "1vd67976lvi5l4qq18zy6j44apynkl44ps04p8vwfx4gzr895dyp";
-  };
- jsaddleSrc = super.pkgs.fetchFromGitHub {
-    owner = "ghcjs";
-    repo = "jsaddle";
-    rev = "1e39844";
-    sha256 = "1qrjrjagmrrlcalys33636w5cb67db52i183masb7xd93wir8963";
-  };
-  misoSrc = super.pkgs.fetchFromGitHub {
-    owner = "dmjio";
-    repo = "miso";
-    rev = "1.5";
-    sha256 = "00al7gw760vzzlqpf035k4n4li0rdymcjpxn184z9nc4m92cjv9z";
-  };
-in {
-  haskell = super.haskell // {
-    packages = super.haskell.packages // {
-      ghc865 = super.haskell.packages.ghc865.override (old: {
-        overrides = with super.pkgs.haskell.lib; self: super: {
-          clay = self.callCabal2nix "clay" claySrc {};
-          miso = self.callCabal2nix "miso" misoSrc {};
+{
+  haskell = nixpkgs.haskell // {
+    packages = nixpkgs.haskell.packages // {
+      ghc865 = nixpkgs.haskell.packages.ghc865.override (old: {
+        overrides = with nixpkgs.pkgs.haskell.lib; self: super: {
+          clay = self.callCabal2nix "clay" nixpkgs.sources.clay {};
+          miso = self.callCabal2nix "miso" nixpkgs.sources.miso {};
           wai-middleware-metrics = dontCheck super.wai-middleware-metrics;
         };
       });
-      ghcjs = super.haskell.packages.ghcjs.override (old: {
-        overrides = with super.haskell.lib; self: super: {
+      ghcjs = nixpkgs.haskell.packages.ghcjs.override (old: {
+        overrides = with nixpkgs.haskell.lib; self: super: {
           QuickCheck = dontCheck super.QuickCheck;
           base-compat-batteries = dontCheck super.http-types;
           clay = dontCheck (self.callCabal2nix "clay" claySrc {});
           comonad = dontCheck super.comonad;
-          jsaddle-warp = dontCheck (self.callCabal2nix "jsaddle-warp" "${jsaddleSrc}/jsaddle-warp" {});
+          jsaddle-warp = dontCheck (self.callCabal2nix "jsaddle-warp" "${nixpkgs.sources.jsaddle}/jsaddle-warp" {});
           http-types = dontCheck super.http-types;
-          miso = self.callCabal2nix "miso" misoSrc {};
+          miso = self.callCabal2nix "miso" nixpkgs.sources.miso {};
           network-uri= dontCheck super.network-uri;
           scientific = dontCheck super.scientific; # takes forever
           servant = dontCheck super.servant;
diff --git a/nix/sources.json b/nix/sources.json
index 76ad1f1..195a218 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -1,4 +1,43 @@
 {
+    "clay": {
+        "branch": "master",
+        "description": "A CSS preprocessor as embedded Haskell.",
+        "homepage": "",
+        "owner": "sebastiaanvisser",
+        "repo": "clay",
+        "rev": "dcc4fc6d8b55af4814bd3f9bbb6d32e2fa2751a8",
+        "sha256": "1dm71z1q7yaq0kl2yb0vr0lsbd8byq5qkdb2kvr26jq48nfq2xdc",
+        "type": "tarball",
+        "url": "https://github.com/sebastiaanvisser/clay/archive/dcc4fc6d8b55af4814bd3f9bbb6d32e2fa2751a8.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+        "version": "cc7729b1b42a79e261091ff7835f7fc2a7ae3cee"
+    },
+    "jsaddle": {
+        "branch": "master",
+        "description": "JavaScript interface that works with GHCJS or GHC",
+        "homepage": "",
+        "owner": "ghcjs",
+        "repo": "jsaddle",
+        "rev": "d569be43f92b9b8c01dc3ee4c41401ab406a2076",
+        "sha256": "1m1xxy4l9ii91k1k504qkxh9k1ybprm1m66mkb9dqlwcpyhcccmv",
+        "type": "tarball",
+        "url": "https://github.com/ghcjs/jsaddle/archive/d569be43f92b9b8c01dc3ee4c41401ab406a2076.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+        "version": "1e39844"
+    },
+    "miso": {
+        "branch": "master",
+        "description": ":ramen: A tasty Haskell front-end framework",
+        "homepage": "https://haskell-miso.org",
+        "owner": "dmjio",
+        "repo": "miso",
+        "rev": "41234e419d6177fe05913a1bd885f811afe5cc9f",
+        "sha256": "1nby1y8yixv0a47h1bzdfjcwzah3km7bfd0phdb520ci4dgs30w1",
+        "type": "tarball",
+        "url": "https://github.com/dmjio/miso/archive/41234e419d6177fe05913a1bd885f811afe5cc9f.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+        "version": "1.5"
+    },
     "niv": {
         "branch": "master",
         "description": "Easy dependency management for Nix projects",