Fetch from Hackage where possible

4 files changed, 12 insertions, 28 deletions

diff --git a/modules/pkgs/juandelacosa/main.nix b/modules/pkgs/juandelacosa/main.nix
index ddb6af7..913e057 100644
--- a/modules/pkgs/juandelacosa/main.nix
+++ b/modules/pkgs/juandelacosa/main.nix
@@ -1,17 +1,13 @@
 { mkDerivation, base, base64-bytestring, bytestring
-, data-default-class, docopt, entropy, fast-logger, fetchgit
-, http-types, interpolatedstring-perl6, mtl, mysql, mysql-simple
-, network, resource-pool, scotty, stdenv, text, unix, wai
-, wai-extra, wai-middleware-static, warp
+, data-default-class, docopt, entropy, fast-logger, http-types
+, interpolatedstring-perl6, mtl, mysql, mysql-simple, network
+, resource-pool, scotty, stdenv, text, unix, wai, wai-extra
+, wai-middleware-static, warp
 }:
 mkDerivation {
   pname = "juandelacosa";
   version = "0.1.1";
-  src = fetchgit {
-    url = "https://github.com/zalora/juandelacosa.git";
-    sha256 = "c260feae989f518484881e7dc7ebcd51d5b25fcda92412445942a5e34c1f9459";
-    rev = "0940da0cdfb1201768d35c58433891feacbaedd5";
-  };
+  sha256 = "060zq739i3xhr7w448p460r7x3jyyzf7pn61abp7f9g8vjn6vqw7";
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
diff --git a/modules/pkgs/mywatch/main.nix b/modules/pkgs/mywatch/main.nix
index 7f72b5f..df6e9b9 100644
--- a/modules/pkgs/mywatch/main.nix
+++ b/modules/pkgs/mywatch/main.nix
@@ -1,5 +1,5 @@
 { mkDerivation, aeson, base, bytestring, ConfigFile
-, data-default-class, docopt, fast-logger, fetchgit, http-types
+, data-default-class, docopt, fast-logger, http-types
 , interpolatedstring-perl6, MissingH, mtl, mysql, mysql-simple
 , network, resource-pool, scotty, stdenv, text, unix
 , unordered-containers, wai, wai-extra, wai-middleware-static, warp
@@ -7,11 +7,7 @@
 mkDerivation {
   pname = "mywatch";
   version = "0.2.1";
-  src = fetchgit {
-    url = "https://github.com/zalora/mywatch.git";
-    sha256 = "7c646cb69958fd1010682873c193afad0f5d93a4abb8f5ce728c0500fb43912b";
-    rev = "523b6029eb4b8569504086dfb5b8538330e5f522";
-  };
+  sha256 = "1yi19mj1hqxym7baf524sf5ih3w1csmvy65izq10xdk5lalkpkzh";
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
diff --git a/modules/pkgs/sproxy-web/cabal2nix.nix b/modules/pkgs/sproxy-web/cabal2nix.nix
index b993b44..0583964 100644
--- a/modules/pkgs/sproxy-web/cabal2nix.nix
+++ b/modules/pkgs/sproxy-web/cabal2nix.nix
@@ -1,17 +1,13 @@
 { mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-, data-default-class, directory, docopt, fast-logger, fetchgit
-, filepath, http-types, interpolatedstring-perl6, mtl, network
+, data-default-class, directory, docopt, fast-logger, filepath
+, http-types, interpolatedstring-perl6, mtl, network
 , postgresql-simple, resource-pool, scotty, stdenv, text, unix, wai
 , wai-extra, wai-middleware-static, warp
 }:
 mkDerivation {
   pname = "sproxy-web";
   version = "0.4.1";
-  src = fetchgit {
-    url = "https://github.com/zalora/sproxy-web.git";
-    sha256 = "01cybqrbf2i6sfxibdmri8sicnhxzqdhmrngzmgz9vizffyf9fbd";
-    rev = "5d7ee61deb55359ae8ce6013dd7fe81bcdc0f9a9";
-  };
+  sha256 = "0jvkvk5yqp4gibg61q67iczaqvfszikxvvgf04fg6xs23gjkpihp";
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
diff --git a/modules/pkgs/sproxy2/main.nix b/modules/pkgs/sproxy2/main.nix
index 18fc482..e5ca817 100644
--- a/modules/pkgs/sproxy2/main.nix
+++ b/modules/pkgs/sproxy2/main.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, base, base64-bytestring, blaze-builder
 , bytestring, cereal, conduit, containers, cookie, docopt, entropy
-, fetchgit, Glob, http-client, http-conduit, http-types
+, Glob, http-client, http-conduit, http-types
 , interpolatedstring-perl6, network, postgresql-simple
 , resource-pool, SHA, sqlite-simple, stdenv, text, time, unix
 , unordered-containers, wai, wai-conduit, warp, warp-tls, word8
@@ -9,11 +9,7 @@
 mkDerivation {
   pname = "sproxy2";
   version = "1.93.0";
-  src = fetchgit {
-    url = "https://github.com/ip1981/sproxy2.git";
-    sha256 = "0kg3904v3ij5l6qlal4yqd4412dxk73jn0gqsxdajxai6n8qmypv";
-    rev = "cfda358dfd234edf5af50fd052187ab0e464b2f5";
-  };
+  sha256 = "1jfwm9h665dpcjm4d4n18nhshcj8s4rd77mp3lh7fk8f99374b0n";
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [