From 688e6e099ab5a94ea0594d05ef574f098275f806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= <val@codejam.info>
Date: Sun, 28 Feb 2016 23:00:45 -0500
Subject: [PATCH 1/5] Gogs: init at 20160227-d320915

---
 .../version-management/gogs/default.nix       | 445 ++++++++++++++++++
 .../version-management/gogs/default.nix.patch |  22 +
 .../gogs/gogs-definition.nix                  |  74 +++
 .../version-management/gogs/sqlite.awk        |  21 +
 .../gogs/update-gogs-definition               |   9 +
 pkgs/top-level/all-packages.nix               |   2 +
 6 files changed, 573 insertions(+)
 create mode 100644 pkgs/applications/version-management/gogs/default.nix
 create mode 100644 pkgs/applications/version-management/gogs/default.nix.patch
 create mode 100644 pkgs/applications/version-management/gogs/gogs-definition.nix
 create mode 100644 pkgs/applications/version-management/gogs/sqlite.awk
 create mode 100755 pkgs/applications/version-management/gogs/update-gogs-definition

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
new file mode 100644
index 000000000000..a8ba49288726
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -0,0 +1,445 @@
+# This file was generated by go2nix.
+{ stdenv, lib, makeWrapper, go, goPackages, git, fetchgit, sqliteSupport ? true }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "gogs-${version}";
+  version = "20160227-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "d320915ad2a7b4bbab075b98890aa50f91f0ced5";
+
+  buildInputs = [ makeWrapper go ];
+  buildFlags = lib.optional (sqliteSupport) "-tags sqlite";
+  goPackagePath = "github.com/gogits/gogs";
+
+  postInstall = ''
+    wrapProgram $bin/bin/gogs \
+      --prefix PATH : ${git}/bin \
+      --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
+      --run 'cd "$GOGS_WORK_DIR"' \
+      --run "ln -fs $out/share/go/src/${goPackagePath}/{public,templates} ."
+  '';
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/gogits/gogs.git";
+    sha256 = "0wpyn3linpb9jgqrpzbmmgn2s54rdhnqv286x2vj4lrngjc8xbc7";
+  };
+
+  extraSrcs = [
+    {
+      goPackagePath = "github.com/Unknwon/cae";
+
+      src = fetchgit {
+        url = "https://github.com/Unknwon/cae";
+        rev = "7f5e046bc8a6c3cde743c233b96ee4fd84ee6ecd";
+          sha256 = "1sp9mlm42r50ydsk1dyyhshrryy364pjdj8m275b5av8yg374dq2";
+      };
+    }
+    {
+      goPackagePath = "github.com/Unknwon/com";
+
+      src = fetchgit {
+        url = "https://github.com/Unknwon/com";
+        rev = "28b053d5a2923b87ce8c5a08f3af779894a72758";
+          sha256 = "1nq7pdjczgllm0yb2dlgr6zclwpwabl9a86dyw4bz0zd6qginfxy";
+      };
+    }
+    {
+      goPackagePath = "github.com/Unknwon/i18n";
+
+      src = fetchgit {
+        url = "https://github.com/Unknwon/i18n";
+        rev = "3b48b6662051bed72d36efa3c1e897bdf96b2e37";
+          sha256 = "1h18024641z473gx1ghwxd741c5sbhww4zsc0f3wwig6dghsfy0f";
+      };
+    }
+    {
+      goPackagePath = "github.com/Unknwon/paginater";
+
+      src = fetchgit {
+        url = "https://github.com/Unknwon/paginater";
+        rev = "7748a72e01415173a27d79866b984328e7b0c12b";
+          sha256 = "11lf3grqdr7ynhm39xp7siihf7b7v5p7r1vf9f3lbnyy99092v9p";
+      };
+    }
+    {
+      goPackagePath = "github.com/bradfitz/gomemcache";
+
+      src = fetchgit {
+        url = "https://github.com/bradfitz/gomemcache";
+        rev = "fb1f79c6b65acda83063cbc69f6bba1522558bfc";
+          sha256 = "0s4azbz3q681psi31r6z1697rkhqpaap8lif9yg85v6fc0zm7wvc";
+      };
+    }
+    {
+      goPackagePath = "github.com/codegangsta/cli";
+
+      src = fetchgit {
+        url = "https://github.com/codegangsta/cli";
+        rev = "a2943485b110df8842045ae0600047f88a3a56a1";
+          sha256 = "1hdbr6riv7j4all09w2a5zdc27fq11rf005v7v3wdccq07zmsmaa";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/binding";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/binding";
+        rev = "a68f34212fe257219981e43adfe4c96ab48f42cd";
+          sha256 = "00ny0khwbcv9n7kbnc2mfl07sp6dyp4xc5y4wiqvsgj66gb90yf7";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/cache";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/cache";
+        rev = "56173531277692bc2925924d51fda1cd0a6b8178";
+          sha256 = "05b2bbndkdr5z63f2xz4z1k8ls3zz7xi17vkhqnz0g0dvsx34l38";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/captcha";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/captcha";
+        rev = "8aa5919789ab301e865595eb4b1114d6b9847deb";
+          sha256 = "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/csrf";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/csrf";
+        rev = "715bca06a911dbd91c4f1d9ec65fd329664b5211";
+          sha256 = "1jljqv96ib5iih0jx7smsykbsfc0wy33salf19djad5xb64clpmi";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/gzip";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/gzip";
+        rev = "cad1c6580a07c56f5f6bc52d66002a05985c5854";
+          sha256 = "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/i18n";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/i18n";
+        rev = "d2d3329f13b52314f3292c4cecb601fad13f02c8";
+          sha256 = "18f59fkw3wy5b80x8jcqnywqscs7qvj7cnfi85d23m9kq353pifs";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/inject";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/inject";
+        rev = "c5ab7bf3a307593cd44cb272d1a5beea473dd072";
+          sha256 = "0v7plrgwx9qn9iknm7p5fr5c53zzx5aaqvdcgyh6hnfwjjf5zny4";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/session";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/session";
+        rev = "66031fcb37a0fff002a1f028eb0b3a815c78306b";
+          sha256 = "0h6l1af93cipcmy3p6asw79cbmhkl34rmf0nyzywpm2pmn7pqznc";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/toolbox";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/toolbox";
+        rev = "82b511550b0aefc36b3a28062ad3a52e812bee38";
+          sha256 = "1s2psf7sw3asag3hnw0n3ah6ywwghf2p4yn4m0pf5d9883sf4pgm";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-sql-driver/mysql";
+
+      src = fetchgit {
+        url = "https://github.com/go-sql-driver/mysql";
+        rev = "71f003c6e927d2550713e7637affb769977ece78";
+          sha256 = "197x3hlmgaw736hyvyxla1m2c6bcwif68zjvk3qd7mxxbfi5ic6s";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-xorm/core";
+
+      src = fetchgit {
+        url = "https://github.com/go-xorm/core";
+        rev = "9ddf4ee12e7a370dacf0092d9896979ae6e3fb16";
+          sha256 = "1qn7kgfyc7yv78ggwc8w2f75jklbm68a4wirglysf8kf70l3m773";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-xorm/xorm";
+
+      src = fetchgit {
+        url = "https://github.com/go-xorm/xorm";
+        rev = "67d038a63f23ce98f7fbc5ef3a87075d82d50f93";
+          sha256 = "0qk1h3ihdl0mqmi28gljxx46lnngjh4l80zrxvlsqlwrlj95yw7k";
+      };
+    }
+    {
+      goPackagePath = "github.com/gogits/chardet";
+
+      src = fetchgit {
+        url = "https://github.com/gogits/chardet";
+        rev = "2404f777256163ea3eadb273dada5dcb037993c0";
+          sha256 = "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd";
+      };
+    }
+    {
+      goPackagePath = "github.com/gogits/cron";
+
+      src = fetchgit {
+        url = "https://github.com/gogits/cron";
+        rev = "3abc0f88f2062336bcc41b43a4febbd847a390ce";
+          sha256 = "0y3z048wym595w8rgngz2mpd1bg8gc282li1l0bmg5q8a4hyb0x5";
+      };
+    }
+    {
+      goPackagePath = "github.com/gogits/git-module";
+
+      src = fetchgit {
+        url = "https://github.com/gogits/git-module";
+        rev = "a1c50966a193fa4cfc9a9142c59189348c97387c";
+          sha256 = "1xaffyzgbif84n73s79g8yynpp89d61lajn0y0vf4pnkh1j500v0";
+      };
+    }
+    {
+      goPackagePath = "github.com/gogits/go-gogs-client";
+
+      src = fetchgit {
+        url = "https://github.com/gogits/go-gogs-client";
+        rev = "d584b1e0fb4d8ad0e8cf2fae2368838f2526b408";
+          sha256 = "1g9kb0bj50dnwh261r3sq00jy1d8pyywh3ybav83lnmn95sbzsns";
+      };
+    }
+    {
+      goPackagePath = "github.com/gogits/gogs";
+
+      src = fetchgit {
+        url = "https://github.com/gogits/gogs.git";
+        rev = "d320915ad2a7b4bbab075b98890aa50f91f0ced5";
+          sha256 = "0wpyn3linpb9jgqrpzbmmgn2s54rdhnqv286x2vj4lrngjc8xbc7";
+      };
+    }
+    {
+      goPackagePath = "github.com/issue9/identicon";
+
+      src = fetchgit {
+        url = "https://github.com/issue9/identicon";
+        rev = "f8c0d2ce04db79c663b1da33d3a9f62be753ee88";
+          sha256 = "0zilbp4dqmbslhs9p10gb04xggf3z0xlr0vw2g7c5gyc2w02q27f";
+      };
+    }
+    {
+      goPackagePath = "github.com/klauspost/compress";
+
+      src = fetchgit {
+        url = "https://github.com/klauspost/compress";
+        rev = "f9625351863b5e94c1da72862187b8fe9a91af90";
+          sha256 = "0yjl58zk2dlb1jvgc3frnhgbsrc680ajkpb8bbyd9m5d21hmkq56";
+      };
+    }
+    {
+      goPackagePath = "github.com/klauspost/cpuid";
+
+      src = fetchgit {
+        url = "https://github.com/klauspost/cpuid";
+        rev = "2c698c6aef5976c7860074cc7040e8af7866aa21";
+          sha256 = "1gyxikc62ivs0yf6d4kpbj2038pwyziz47v1vn4qxg4phr2rd5h7";
+      };
+    }
+    {
+      goPackagePath = "github.com/klauspost/crc32";
+
+      src = fetchgit {
+        url = "https://github.com/klauspost/crc32";
+        rev = "19b0b332c9e4516a6370a0456e6182c3b5036720";
+          sha256 = "0r11v6vaqg49sa8zvxh2y6md4pp0sfh4ia43gsw1arwwlsah39vz";
+      };
+    }
+    {
+      goPackagePath = "github.com/lib/pq";
+
+      src = fetchgit {
+        url = "https://github.com/lib/pq";
+        rev = "69552e54d2a9d4c6a2438926a774930f7bc398ec";
+          sha256 = "1y9923j9yl1qqizsy80mzaylg4ysyqp6gyrf85x91x17p2adq2ll";
+      };
+    }
+    ] ++ (lib.optional (sqliteSupport) {
+      goPackagePath = "github.com/mattn/go-sqlite3";
+
+      src = fetchgit {
+        url = "https://github.com/mattn/go-sqlite3";
+        rev = "09d5c451710ef887470709463f4f04ff83e1e039";
+          sha256 = "16c8vl9j693gb0q2cqv5ijnxdvfgnpm1sgaicbpd25lbqningcfc";
+      };
+    }) ++ [
+    {
+      goPackagePath = "github.com/mcuadros/go-version";
+
+      src = fetchgit {
+        url = "https://github.com/mcuadros/go-version";
+        rev = "d52711f8d6bea8dc01efafdb68ad95a4e2606630";
+          sha256 = "1b4h6557y5aar74bi1xqmpm4zr1kla95x9q49k48w99n3sis3h7m";
+      };
+    }
+    {
+      goPackagePath = "github.com/microcosm-cc/bluemonday";
+
+      src = fetchgit {
+        url = "https://github.com/microcosm-cc/bluemonday";
+        rev = "4ac6f27528d0a3f2a59e0b0a6f6b3ff0bb89fe20";
+          sha256 = "0xacnj369mhpff6zykm9rykh7r2i4c6mjfmg5cd1ra4irpskx5sb";
+      };
+    }
+    {
+      goPackagePath = "github.com/nfnt/resize";
+
+      src = fetchgit {
+        url = "https://github.com/nfnt/resize";
+        rev = "4d93a29130b1b6aba503e2aa8b50f516213ea80e";
+          sha256 = "1s6z241726nd1xd5rwlnj6l4p0na4v20ibfg5sh9cp7pl98mn5gv";
+      };
+    }
+    {
+      goPackagePath = "github.com/russross/blackfriday";
+
+      src = fetchgit {
+        url = "https://github.com/russross/blackfriday";
+        rev = "006144af03eeeff1037240a71865a9fd61f1c25f";
+          sha256 = "1z9zdkxgyk10xngyk55f0433ix6q9kwfrcyljj6xaqjb19wldz7j";
+      };
+    }
+    {
+      goPackagePath = "github.com/satori/go.uuid";
+
+      src = fetchgit {
+        url = "https://github.com/satori/go.uuid";
+        rev = "e673fdd4dea8a7334adbbe7f57b7e4b00bdc5502";
+          sha256 = "0nm2dqj87vvv1bmcfl3x9k6kal655yfamxnb7xkfzqkvldigy0qf";
+      };
+    }
+    {
+      goPackagePath = "github.com/sergi/go-diff";
+
+      src = fetchgit {
+        url = "https://github.com/sergi/go-diff";
+        rev = "ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7";
+          sha256 = "049xnl182h5q8fs5z70wb9yh9jvi98h4v3z13xps2rys9xl9rh5x";
+      };
+    }
+    {
+      goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+
+      src = fetchgit {
+        url = "https://github.com/shurcooL/sanitized_anchor_name";
+        rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77";
+          sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01";
+      };
+    }
+    {
+      goPackagePath = "golang.org/x/crypto";
+
+      src = fetchgit {
+        url = "https://go.googlesource.com/crypto";
+        rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3";
+          sha256 = "0b2s9gidpy2r85z0n9w2knh3dkfhjg89z3lyi620vcf1li6qhdl3";
+      };
+    }
+    {
+      goPackagePath = "golang.org/x/net";
+
+      src = fetchgit {
+        url = "https://go.googlesource.com/net";
+        rev = "6acef71eb69611914f7a30939ea9f6e194c78172";
+          sha256 = "0vy75lfl2viiikp3k9626g3ncxq6vpnwmhkgyaxdnq14hb4xgw2k";
+      };
+    }
+    {
+      goPackagePath = "golang.org/x/text";
+
+      src = fetchgit {
+        url = "https://go.googlesource.com/text";
+        rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34";
+          sha256 = "1wm63llpn1ix85f47ac3c9jx92i9cfbdw2ih7p8gdq964k7px53c";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/asn1-ber.v1";
+
+      src = fetchgit {
+        url = "https://gopkg.in/asn1-ber.v1";
+        rev = "4e86f4367175e39f69d9358a5f17b4dda270378d";
+          sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/bufio.v1";
+
+      src = fetchgit {
+        url = "https://gopkg.in/bufio.v1";
+        rev = "567b2bfa514e796916c4747494d6ff5132a1dfce";
+          sha256 = "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/gomail.v2";
+
+      src = fetchgit {
+        url = "https://gopkg.in/gomail.v2";
+        rev = "fbb71ddc63acd07dd0ed49ababdf02c551e2539a";
+          sha256 = "1q8xa51bxcmbwsww8s2x42152w1xn553xmmpyq5jz66a2vf1wlvl";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/ini.v1";
+
+      src = fetchgit {
+        url = "https://gopkg.in/ini.v1";
+        rev = "776aa739ce9373377cd16f526cdf06cb4c89b40f";
+          sha256 = "04pmr4mdvpzawpxinwqpas4ksjzq54q5a0qapw0kkb651p06vqhn";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/ldap.v2";
+
+      src = fetchgit {
+        url = "https://gopkg.in/ldap.v2";
+        rev = "07a7330929b9ee80495c88a4439657d89c7dbd87";
+          sha256 = "0qsy0ldvkd0rhh6wfdrm51145ps9sd8nc8qx3fw1f90irb3a71sh";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/macaron.v1";
+
+      src = fetchgit {
+        url = "https://gopkg.in/macaron.v1";
+        rev = "b9eee382bef2f2f678fadbcf368fc1e52306bed1";
+          sha256 = "1rbj1l8742vgar4zchf4r203qvids9vv0iz9a20l5585xz21cmsj";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/redis.v2";
+
+      src = fetchgit {
+        url = "https://gopkg.in/redis.v2";
+        rev = "e6179049628164864e6e84e973cfb56335748dea";
+          sha256 = "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h";
+      };
+    }
+  ];
+}
diff --git a/pkgs/applications/version-management/gogs/default.nix.patch b/pkgs/applications/version-management/gogs/default.nix.patch
new file mode 100644
index 000000000000..f9b6b3aafbc7
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/default.nix.patch
@@ -0,0 +1,22 @@
+2,3c2
+< #with import <nixpkgs> {};
+< { stdenv, lib, go, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+---
+> { stdenv, lib, makeWrapper, go, goPackages, git, fetchgit, sqliteSupport ? true }:
+12,15c11,12
+<   buildInputs = [ go ];
+<   
+<   buildFlags = "--tags sqlite";
+<   
+---
+>   buildInputs = [ makeWrapper go ];
+>   buildFlags = lib.optional (sqliteSupport) "-tags sqlite";
+17a15,22
+>   postInstall = ''
+>     wrapProgram $bin/bin/gogs \
+>       --prefix PATH : ${git}/bin \
+>       --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
+>       --run 'cd "$GOGS_WORK_DIR"' \
+>       --run "ln -fs $out/share/go/src/${goPackagePath}/{public,templates} ."
+>   '';
+> 
diff --git a/pkgs/applications/version-management/gogs/gogs-definition.nix b/pkgs/applications/version-management/gogs/gogs-definition.nix
new file mode 100644
index 000000000000..626986081977
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/gogs-definition.nix
@@ -0,0 +1,74 @@
+with import <nixpkgs> {};
+
+let
+  # My go2nix fork to be able to build in a pure environment,
+  # with build tags support, fixed bugs that affected Gogs
+  # and with latest nix-prefetch-git output style.
+  my-go2nix = lib.overrideDerivation go2nix (oldAttrs: {
+    src = fetchFromGitHub {
+      rev = "336ac3d93272860c9d8f518f43ce6f70c3b11bf4";
+      owner = "valeriangalliat";
+      repo = "go2nix";
+      sha256 = "0m9srjcl9lrphl4gsrscibf2c7yz2kmmja9qylbli4lwjw53g7p7";
+    };
+
+    buildInputs = [ makeWrapper ] ++ oldAttrs.buildInputs;
+
+    preFixup = "";
+
+    postInstall = ''
+      wrapProgram $bin/bin/go2nix \
+        --prefix PATH : ${nix-prefetch-git}/bin  \
+        --prefix PATH : ${git}/bin  \
+    '';
+
+    disallowedReferences = [];
+  });
+
+  # Fetch a Go tree from a Go package repository and build tags.
+  # All dependencies are fetched according to `go get` rules, so the
+  # output of this derivation is not deterministic (but that's the
+  # point since we use it to automatically update the package and its
+  # dependencies).
+  fetchgo =
+    { goPackagePath, url, rev ? "HEAD", tags ? [] }:
+    stdenv.mkDerivation {
+      name = builtins.replaceStrings ["/"] ["_"] goPackagePath;
+      buildInputs = [ go git ];
+      phases = [ "installPhase" ];
+
+      installPhase = ''
+        export GOPATH=$out
+        repo=$out/src/${goPackagePath}
+        mkdir -p $repo
+        git clone ${url} $repo
+        cd $repo
+        git reset --hard ${rev}
+        go get -v -d -tags ${builtins.concatStringsSep "," tags}
+      '';
+    };
+
+  goPackagePath = "github.com/gogits/gogs";
+  url = "https://${goPackagePath}.git";
+  rev = "d320915ad2a7b4bbab075b98890aa50f91f0ced5";
+  tags = [ "sqlite" ];
+
+in
+
+stdenv.mkDerivation {
+  name = "gogs-definition";
+
+  src = fetchgo {
+    inherit goPackagePath url rev tags;
+   };
+
+  buildInputs = [ nix my-go2nix.bin ];
+
+  installPhase = ''
+    export GOPATH=$PWD
+    cd src/${goPackagePath}
+    go2nix save --tags ${builtins.concatStringsSep "," tags}
+    patch default.nix < ${./default.nix.patch}
+    cat default.nix | awk -f ${./sqlite.awk} | sed '/# can be improved/d' > $out
+  '';
+}
diff --git a/pkgs/applications/version-management/gogs/sqlite.awk b/pkgs/applications/version-management/gogs/sqlite.awk
new file mode 100644
index 000000000000..40c73261cefa
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/sqlite.awk
@@ -0,0 +1,21 @@
+/goPackagePath/ && /sqlite/ {
+  sqlite=1
+  prev="    ] ++ (lib.optional (sqliteSupport) {"
+}
+
+sqlite && /}$/ {
+  sqlite=0
+  $0="    }) ++ ["
+}
+
+NR > 1 {
+  print prev
+}
+
+{
+  prev=$0
+}
+
+END {
+  print prev
+}
diff --git a/pkgs/applications/version-management/gogs/update-gogs-definition b/pkgs/applications/version-management/gogs/update-gogs-definition
new file mode 100755
index 000000000000..b467af463f1b
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/update-gogs-definition
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+#
+# Regenerates `default.nix` using `gogs-definition.nix`.
+#
+# The latter should be updated to a new revision of Gogs in order
+# to update.
+#
+
+cat "$(nix-build --no-out-link gogs-definition.nix)" > default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8b7341cd399..5250906c66f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1865,6 +1865,8 @@ in
 
   gitstats = callPackage ../applications/version-management/gitstats { };
 
+  gogs = callPackage ../applications/version-management/gogs { };
+
   git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
 
   glusterfs = callPackage ../tools/filesystems/glusterfs { };

From 5a7d267ec3211b21c8f56cdd9dd8e031bcc2745e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= <val@codejam.info>
Date: Thu, 28 Jul 2016 11:22:53 -0400
Subject: [PATCH 2/5] Gogs: use new go2nix and `goPackages` format

Introduced with #16017.
---
 .../version-management/gogs/default.nix       | 434 +-----------------
 .../version-management/gogs/default.nix.patch |  22 -
 .../version-management/gogs/deps.json         | 425 +++++++++++++++++
 .../gogs/gogs-definition.nix                  |  74 ---
 .../version-management/gogs/sqlite.awk        |  21 -
 .../gogs/update-gogs-definition               |   9 -
 6 files changed, 433 insertions(+), 552 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gogs/default.nix.patch
 create mode 100644 pkgs/applications/version-management/gogs/deps.json
 delete mode 100644 pkgs/applications/version-management/gogs/gogs-definition.nix
 delete mode 100644 pkgs/applications/version-management/gogs/sqlite.awk
 delete mode 100755 pkgs/applications/version-management/gogs/update-gogs-definition

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index a8ba49288726..1e237b706152 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -1,15 +1,12 @@
-# This file was generated by go2nix.
-{ stdenv, lib, makeWrapper, go, goPackages, git, fetchgit, sqliteSupport ? true }:
-
-with goPackages;
+{ stdenv, buildGoPackage, fetchgit, makeWrapper, git, sqliteSupport ? true  }:
 
 buildGoPackage rec {
   name = "gogs-${version}";
-  version = "20160227-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "d320915ad2a7b4bbab075b98890aa50f91f0ced5";
+  version = "20160728-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "ad7ea88923e371df7558835d8f3e0236cfdf69ba";
 
-  buildInputs = [ makeWrapper go ];
-  buildFlags = lib.optional (sqliteSupport) "-tags sqlite";
+  buildInputs = [ makeWrapper ];
+  buildFlags = stdenv.lib.optional (sqliteSupport) "-tags sqlite";
   goPackagePath = "github.com/gogits/gogs";
 
   postInstall = ''
@@ -22,424 +19,9 @@ buildGoPackage rec {
 
   src = fetchgit {
     inherit rev;
-    url = "https://github.com/gogits/gogs.git";
-    sha256 = "0wpyn3linpb9jgqrpzbmmgn2s54rdhnqv286x2vj4lrngjc8xbc7";
+    url = "https://github.com/gogits/gogs";
+    sha256 = "0vgkhpwvj79shpi3bq2sr1nza53fidmnbmh814ic09jnb2dilnrm";
   };
 
-  extraSrcs = [
-    {
-      goPackagePath = "github.com/Unknwon/cae";
-
-      src = fetchgit {
-        url = "https://github.com/Unknwon/cae";
-        rev = "7f5e046bc8a6c3cde743c233b96ee4fd84ee6ecd";
-          sha256 = "1sp9mlm42r50ydsk1dyyhshrryy364pjdj8m275b5av8yg374dq2";
-      };
-    }
-    {
-      goPackagePath = "github.com/Unknwon/com";
-
-      src = fetchgit {
-        url = "https://github.com/Unknwon/com";
-        rev = "28b053d5a2923b87ce8c5a08f3af779894a72758";
-          sha256 = "1nq7pdjczgllm0yb2dlgr6zclwpwabl9a86dyw4bz0zd6qginfxy";
-      };
-    }
-    {
-      goPackagePath = "github.com/Unknwon/i18n";
-
-      src = fetchgit {
-        url = "https://github.com/Unknwon/i18n";
-        rev = "3b48b6662051bed72d36efa3c1e897bdf96b2e37";
-          sha256 = "1h18024641z473gx1ghwxd741c5sbhww4zsc0f3wwig6dghsfy0f";
-      };
-    }
-    {
-      goPackagePath = "github.com/Unknwon/paginater";
-
-      src = fetchgit {
-        url = "https://github.com/Unknwon/paginater";
-        rev = "7748a72e01415173a27d79866b984328e7b0c12b";
-          sha256 = "11lf3grqdr7ynhm39xp7siihf7b7v5p7r1vf9f3lbnyy99092v9p";
-      };
-    }
-    {
-      goPackagePath = "github.com/bradfitz/gomemcache";
-
-      src = fetchgit {
-        url = "https://github.com/bradfitz/gomemcache";
-        rev = "fb1f79c6b65acda83063cbc69f6bba1522558bfc";
-          sha256 = "0s4azbz3q681psi31r6z1697rkhqpaap8lif9yg85v6fc0zm7wvc";
-      };
-    }
-    {
-      goPackagePath = "github.com/codegangsta/cli";
-
-      src = fetchgit {
-        url = "https://github.com/codegangsta/cli";
-        rev = "a2943485b110df8842045ae0600047f88a3a56a1";
-          sha256 = "1hdbr6riv7j4all09w2a5zdc27fq11rf005v7v3wdccq07zmsmaa";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/binding";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/binding";
-        rev = "a68f34212fe257219981e43adfe4c96ab48f42cd";
-          sha256 = "00ny0khwbcv9n7kbnc2mfl07sp6dyp4xc5y4wiqvsgj66gb90yf7";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/cache";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/cache";
-        rev = "56173531277692bc2925924d51fda1cd0a6b8178";
-          sha256 = "05b2bbndkdr5z63f2xz4z1k8ls3zz7xi17vkhqnz0g0dvsx34l38";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/captcha";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/captcha";
-        rev = "8aa5919789ab301e865595eb4b1114d6b9847deb";
-          sha256 = "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/csrf";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/csrf";
-        rev = "715bca06a911dbd91c4f1d9ec65fd329664b5211";
-          sha256 = "1jljqv96ib5iih0jx7smsykbsfc0wy33salf19djad5xb64clpmi";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/gzip";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/gzip";
-        rev = "cad1c6580a07c56f5f6bc52d66002a05985c5854";
-          sha256 = "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/i18n";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/i18n";
-        rev = "d2d3329f13b52314f3292c4cecb601fad13f02c8";
-          sha256 = "18f59fkw3wy5b80x8jcqnywqscs7qvj7cnfi85d23m9kq353pifs";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/inject";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/inject";
-        rev = "c5ab7bf3a307593cd44cb272d1a5beea473dd072";
-          sha256 = "0v7plrgwx9qn9iknm7p5fr5c53zzx5aaqvdcgyh6hnfwjjf5zny4";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/session";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/session";
-        rev = "66031fcb37a0fff002a1f028eb0b3a815c78306b";
-          sha256 = "0h6l1af93cipcmy3p6asw79cbmhkl34rmf0nyzywpm2pmn7pqznc";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/toolbox";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/toolbox";
-        rev = "82b511550b0aefc36b3a28062ad3a52e812bee38";
-          sha256 = "1s2psf7sw3asag3hnw0n3ah6ywwghf2p4yn4m0pf5d9883sf4pgm";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-sql-driver/mysql";
-
-      src = fetchgit {
-        url = "https://github.com/go-sql-driver/mysql";
-        rev = "71f003c6e927d2550713e7637affb769977ece78";
-          sha256 = "197x3hlmgaw736hyvyxla1m2c6bcwif68zjvk3qd7mxxbfi5ic6s";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-xorm/core";
-
-      src = fetchgit {
-        url = "https://github.com/go-xorm/core";
-        rev = "9ddf4ee12e7a370dacf0092d9896979ae6e3fb16";
-          sha256 = "1qn7kgfyc7yv78ggwc8w2f75jklbm68a4wirglysf8kf70l3m773";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-xorm/xorm";
-
-      src = fetchgit {
-        url = "https://github.com/go-xorm/xorm";
-        rev = "67d038a63f23ce98f7fbc5ef3a87075d82d50f93";
-          sha256 = "0qk1h3ihdl0mqmi28gljxx46lnngjh4l80zrxvlsqlwrlj95yw7k";
-      };
-    }
-    {
-      goPackagePath = "github.com/gogits/chardet";
-
-      src = fetchgit {
-        url = "https://github.com/gogits/chardet";
-        rev = "2404f777256163ea3eadb273dada5dcb037993c0";
-          sha256 = "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd";
-      };
-    }
-    {
-      goPackagePath = "github.com/gogits/cron";
-
-      src = fetchgit {
-        url = "https://github.com/gogits/cron";
-        rev = "3abc0f88f2062336bcc41b43a4febbd847a390ce";
-          sha256 = "0y3z048wym595w8rgngz2mpd1bg8gc282li1l0bmg5q8a4hyb0x5";
-      };
-    }
-    {
-      goPackagePath = "github.com/gogits/git-module";
-
-      src = fetchgit {
-        url = "https://github.com/gogits/git-module";
-        rev = "a1c50966a193fa4cfc9a9142c59189348c97387c";
-          sha256 = "1xaffyzgbif84n73s79g8yynpp89d61lajn0y0vf4pnkh1j500v0";
-      };
-    }
-    {
-      goPackagePath = "github.com/gogits/go-gogs-client";
-
-      src = fetchgit {
-        url = "https://github.com/gogits/go-gogs-client";
-        rev = "d584b1e0fb4d8ad0e8cf2fae2368838f2526b408";
-          sha256 = "1g9kb0bj50dnwh261r3sq00jy1d8pyywh3ybav83lnmn95sbzsns";
-      };
-    }
-    {
-      goPackagePath = "github.com/gogits/gogs";
-
-      src = fetchgit {
-        url = "https://github.com/gogits/gogs.git";
-        rev = "d320915ad2a7b4bbab075b98890aa50f91f0ced5";
-          sha256 = "0wpyn3linpb9jgqrpzbmmgn2s54rdhnqv286x2vj4lrngjc8xbc7";
-      };
-    }
-    {
-      goPackagePath = "github.com/issue9/identicon";
-
-      src = fetchgit {
-        url = "https://github.com/issue9/identicon";
-        rev = "f8c0d2ce04db79c663b1da33d3a9f62be753ee88";
-          sha256 = "0zilbp4dqmbslhs9p10gb04xggf3z0xlr0vw2g7c5gyc2w02q27f";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/compress";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/compress";
-        rev = "f9625351863b5e94c1da72862187b8fe9a91af90";
-          sha256 = "0yjl58zk2dlb1jvgc3frnhgbsrc680ajkpb8bbyd9m5d21hmkq56";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/cpuid";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/cpuid";
-        rev = "2c698c6aef5976c7860074cc7040e8af7866aa21";
-          sha256 = "1gyxikc62ivs0yf6d4kpbj2038pwyziz47v1vn4qxg4phr2rd5h7";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/crc32";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/crc32";
-        rev = "19b0b332c9e4516a6370a0456e6182c3b5036720";
-          sha256 = "0r11v6vaqg49sa8zvxh2y6md4pp0sfh4ia43gsw1arwwlsah39vz";
-      };
-    }
-    {
-      goPackagePath = "github.com/lib/pq";
-
-      src = fetchgit {
-        url = "https://github.com/lib/pq";
-        rev = "69552e54d2a9d4c6a2438926a774930f7bc398ec";
-          sha256 = "1y9923j9yl1qqizsy80mzaylg4ysyqp6gyrf85x91x17p2adq2ll";
-      };
-    }
-    ] ++ (lib.optional (sqliteSupport) {
-      goPackagePath = "github.com/mattn/go-sqlite3";
-
-      src = fetchgit {
-        url = "https://github.com/mattn/go-sqlite3";
-        rev = "09d5c451710ef887470709463f4f04ff83e1e039";
-          sha256 = "16c8vl9j693gb0q2cqv5ijnxdvfgnpm1sgaicbpd25lbqningcfc";
-      };
-    }) ++ [
-    {
-      goPackagePath = "github.com/mcuadros/go-version";
-
-      src = fetchgit {
-        url = "https://github.com/mcuadros/go-version";
-        rev = "d52711f8d6bea8dc01efafdb68ad95a4e2606630";
-          sha256 = "1b4h6557y5aar74bi1xqmpm4zr1kla95x9q49k48w99n3sis3h7m";
-      };
-    }
-    {
-      goPackagePath = "github.com/microcosm-cc/bluemonday";
-
-      src = fetchgit {
-        url = "https://github.com/microcosm-cc/bluemonday";
-        rev = "4ac6f27528d0a3f2a59e0b0a6f6b3ff0bb89fe20";
-          sha256 = "0xacnj369mhpff6zykm9rykh7r2i4c6mjfmg5cd1ra4irpskx5sb";
-      };
-    }
-    {
-      goPackagePath = "github.com/nfnt/resize";
-
-      src = fetchgit {
-        url = "https://github.com/nfnt/resize";
-        rev = "4d93a29130b1b6aba503e2aa8b50f516213ea80e";
-          sha256 = "1s6z241726nd1xd5rwlnj6l4p0na4v20ibfg5sh9cp7pl98mn5gv";
-      };
-    }
-    {
-      goPackagePath = "github.com/russross/blackfriday";
-
-      src = fetchgit {
-        url = "https://github.com/russross/blackfriday";
-        rev = "006144af03eeeff1037240a71865a9fd61f1c25f";
-          sha256 = "1z9zdkxgyk10xngyk55f0433ix6q9kwfrcyljj6xaqjb19wldz7j";
-      };
-    }
-    {
-      goPackagePath = "github.com/satori/go.uuid";
-
-      src = fetchgit {
-        url = "https://github.com/satori/go.uuid";
-        rev = "e673fdd4dea8a7334adbbe7f57b7e4b00bdc5502";
-          sha256 = "0nm2dqj87vvv1bmcfl3x9k6kal655yfamxnb7xkfzqkvldigy0qf";
-      };
-    }
-    {
-      goPackagePath = "github.com/sergi/go-diff";
-
-      src = fetchgit {
-        url = "https://github.com/sergi/go-diff";
-        rev = "ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7";
-          sha256 = "049xnl182h5q8fs5z70wb9yh9jvi98h4v3z13xps2rys9xl9rh5x";
-      };
-    }
-    {
-      goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
-
-      src = fetchgit {
-        url = "https://github.com/shurcooL/sanitized_anchor_name";
-        rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77";
-          sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/crypto";
-
-      src = fetchgit {
-        url = "https://go.googlesource.com/crypto";
-        rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3";
-          sha256 = "0b2s9gidpy2r85z0n9w2knh3dkfhjg89z3lyi620vcf1li6qhdl3";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/net";
-
-      src = fetchgit {
-        url = "https://go.googlesource.com/net";
-        rev = "6acef71eb69611914f7a30939ea9f6e194c78172";
-          sha256 = "0vy75lfl2viiikp3k9626g3ncxq6vpnwmhkgyaxdnq14hb4xgw2k";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/text";
-
-      src = fetchgit {
-        url = "https://go.googlesource.com/text";
-        rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34";
-          sha256 = "1wm63llpn1ix85f47ac3c9jx92i9cfbdw2ih7p8gdq964k7px53c";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/asn1-ber.v1";
-
-      src = fetchgit {
-        url = "https://gopkg.in/asn1-ber.v1";
-        rev = "4e86f4367175e39f69d9358a5f17b4dda270378d";
-          sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/bufio.v1";
-
-      src = fetchgit {
-        url = "https://gopkg.in/bufio.v1";
-        rev = "567b2bfa514e796916c4747494d6ff5132a1dfce";
-          sha256 = "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/gomail.v2";
-
-      src = fetchgit {
-        url = "https://gopkg.in/gomail.v2";
-        rev = "fbb71ddc63acd07dd0ed49ababdf02c551e2539a";
-          sha256 = "1q8xa51bxcmbwsww8s2x42152w1xn553xmmpyq5jz66a2vf1wlvl";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/ini.v1";
-
-      src = fetchgit {
-        url = "https://gopkg.in/ini.v1";
-        rev = "776aa739ce9373377cd16f526cdf06cb4c89b40f";
-          sha256 = "04pmr4mdvpzawpxinwqpas4ksjzq54q5a0qapw0kkb651p06vqhn";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/ldap.v2";
-
-      src = fetchgit {
-        url = "https://gopkg.in/ldap.v2";
-        rev = "07a7330929b9ee80495c88a4439657d89c7dbd87";
-          sha256 = "0qsy0ldvkd0rhh6wfdrm51145ps9sd8nc8qx3fw1f90irb3a71sh";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/macaron.v1";
-
-      src = fetchgit {
-        url = "https://gopkg.in/macaron.v1";
-        rev = "b9eee382bef2f2f678fadbcf368fc1e52306bed1";
-          sha256 = "1rbj1l8742vgar4zchf4r203qvids9vv0iz9a20l5585xz21cmsj";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/redis.v2";
-
-      src = fetchgit {
-        url = "https://gopkg.in/redis.v2";
-        rev = "e6179049628164864e6e84e973cfb56335748dea";
-          sha256 = "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h";
-      };
-    }
-  ];
+  goDeps = ./deps.json;
 }
diff --git a/pkgs/applications/version-management/gogs/default.nix.patch b/pkgs/applications/version-management/gogs/default.nix.patch
deleted file mode 100644
index f9b6b3aafbc7..000000000000
--- a/pkgs/applications/version-management/gogs/default.nix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-2,3c2
-< #with import <nixpkgs> {};
-< { stdenv, lib, go, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
----
-> { stdenv, lib, makeWrapper, go, goPackages, git, fetchgit, sqliteSupport ? true }:
-12,15c11,12
-<   buildInputs = [ go ];
-<   
-<   buildFlags = "--tags sqlite";
-<   
----
->   buildInputs = [ makeWrapper go ];
->   buildFlags = lib.optional (sqliteSupport) "-tags sqlite";
-17a15,22
->   postInstall = ''
->     wrapProgram $bin/bin/gogs \
->       --prefix PATH : ${git}/bin \
->       --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
->       --run 'cd "$GOGS_WORK_DIR"' \
->       --run "ln -fs $out/share/go/src/${goPackagePath}/{public,templates} ."
->   '';
-> 
diff --git a/pkgs/applications/version-management/gogs/deps.json b/pkgs/applications/version-management/gogs/deps.json
new file mode 100644
index 000000000000..f93c53e8b348
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/deps.json
@@ -0,0 +1,425 @@
+[
+  {
+    "goPackagePath": "github.com/Unknwon/cae",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/Unknwon/cae",
+      "rev": "c6aac99ea2cae2ebaf23f26f76b04fe3fcfc9f8c",
+      "sha256": "0j6l1fcs6gp4qw6b9w3pg9fgah18lh1hanfz5y64r6ks244v3l7s"
+    }
+  },
+  {
+    "goPackagePath": "github.com/Unknwon/com",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/Unknwon/com",
+      "rev": "28b053d5a2923b87ce8c5a08f3af779894a72758",
+      "sha256": "09i9slj4zbsqmwkkx9bqi7cgpv6hqby6r98l6qx1wag89qijybz2"
+    }
+  },
+  {
+    "goPackagePath": "github.com/Unknwon/i18n",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/Unknwon/i18n",
+      "rev": "39d6f2727e0698b1021ceb6a77c1801aa92e7d5d",
+      "sha256": "1f4s9srdaqw2yqgc3d76vww3glbwka2f5q4zrwn8bb66kcazbfb7"
+    }
+  },
+  {
+    "goPackagePath": "github.com/Unknwon/paginater",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/Unknwon/paginater",
+      "rev": "7748a72e01415173a27d79866b984328e7b0c12b",
+      "sha256": "0ighsa75ixgx6c4hc397c06lapf0pz50cj3cgkdvssp9an38kw2c"
+    }
+  },
+  {
+    "goPackagePath": "github.com/bradfitz/gomemcache",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bradfitz/gomemcache",
+      "rev": "fb1f79c6b65acda83063cbc69f6bba1522558bfc",
+      "sha256": "0mq5rn07bbpy2yla7hassrmj966p6r7ffbf9w41l31yy0fc07i68"
+    }
+  },
+  {
+    "goPackagePath": "github.com/codegangsta/cli",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/codegangsta/cli",
+      "rev": "d9021faab69f92295ef7061bd39e4a76dcbdef32",
+      "sha256": "0rwxc84rq6w2adymvffydyvd2va4zxqb6kv9dk7j5iikcs021yn0"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/binding",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/binding",
+      "rev": "9440f336b443056c90d7d448a0a55ad8c7599880",
+      "sha256": "0g3ya3h8vjaykgp1npdxbizcf8kzv4m47vymcsq06vpihrfhbvg7"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/cache",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/cache",
+      "rev": "56173531277692bc2925924d51fda1cd0a6b8178",
+      "sha256": "1116a22wm43q2l54nnycgli90kix787j20mpgya9qb6xnglcck59"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/captcha",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/captcha",
+      "rev": "8aa5919789ab301e865595eb4b1114d6b9847deb",
+      "sha256": "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/csrf",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/csrf",
+      "rev": "6a9a7df172cc1fcd81e4585f44b09200b6087cc0",
+      "sha256": "173da2hl9fcfgkn0nv1ws3pr0gyyp88amhj2bfk4414k5a3r0nsa"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/gzip",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/gzip",
+      "rev": "cad1c6580a07c56f5f6bc52d66002a05985c5854",
+      "sha256": "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/i18n",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/i18n",
+      "rev": "ef57533c3b0fc2d8581deda14937e52f11a203ab",
+      "sha256": "1nkrcnpjl3x6fhjss2vp29mnvam20vpvxvxpfg1zspi1rjmpyhqy"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/inject",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/inject",
+      "rev": "d8a0b8677191f4380287cfebd08e462217bac7ad",
+      "sha256": "0p47pz699xhmi8yxhahvrpai9r49rqap5ckwmz1dlkrnh3zwhrhh"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/session",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/session",
+      "rev": "66031fcb37a0fff002a1f028eb0b3a815c78306b",
+      "sha256": "1prrfv8xdlyxrdbagbqzjkx69x74hjzif5ki4lzl2y6fk3nb0cd5"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/toolbox",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/toolbox",
+      "rev": "99a42f20e9e88daec5c0d7beb4e7eac134680ab0",
+      "sha256": "0r6ksiqzrii7b9vv8daz68044pyifsxmpz48m6h8m6l3h9ygz8cx"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-sql-driver/mysql",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-sql-driver/mysql",
+      "rev": "3654d25ec346ee8ce71a68431025458d52a38ac0",
+      "sha256": "0yr44mbx8632ynhmy8hg5ybwsqsc7byy3n7aqawq7jgih83ivdvq"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-xorm/core",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-xorm/core",
+      "rev": "bc1b7f81f0e369289078424064634a5ee7d21051",
+      "sha256": "01y3bk0yxw0chbi834ykda0bfxr4xaarkbb237k4x5sj3wcv30v1"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-xorm/xorm",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-xorm/xorm",
+      "rev": "dddc985b860d64f7b6370afd65a8316425e13181",
+      "sha256": "0wmcvrw50d0hk35wrxjky8hmhmqpjf49zq9vfj36ai7qrn7vhvlr"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gogits/chardet",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogits/chardet",
+      "rev": "2404f777256163ea3eadb273dada5dcb037993c0",
+      "sha256": "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gogits/cron",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogits/cron",
+      "rev": "96040e4fab17baa0391ce571694e4ccb5fce5dac",
+      "sha256": "1a1f38mzjhdz7n5fclxq2ninqngcqjqx1jy1p4533an3jyjhyh10"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gogits/git-module",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogits/git-module",
+      "rev": "53bcb7352ff838610c537c9b589ca79bca92c661",
+      "sha256": "1xk63sccq0gapgrz5a0y2fi4vifqalgrypcv1yhiq53ha3r4fkya"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gogits/go-gogs-client",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogits/go-gogs-client",
+      "rev": "442b4e5ddc8029932c91872f8322fb7a2c2de858",
+      "sha256": "0nllqias2kv2fs2dlp2vxxi9nkw3mgm84j6s3n9ccixk7bkxc6a6"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gogits/gogs",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogits/gogs",
+      "rev": "ad7ea88923e371df7558835d8f3e0236cfdf69ba",
+      "sha256": "0vgkhpwvj79shpi3bq2sr1nza53fidmnbmh814ic09jnb2dilnrm"
+    }
+  },
+  {
+    "goPackagePath": "github.com/issue9/identicon",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/issue9/identicon",
+      "rev": "d36b54562f4cf70c83653e13dc95c220c79ef521",
+      "sha256": "0y82b3gq8rpqglvf3lsqhgp5djfdammwd1w24k3i97iqls0rch7l"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jaytaylor/html2text",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jaytaylor/html2text",
+      "rev": "52d9b785554a1918cb09909b89a1509a98b853fd",
+      "sha256": "1hhvabh01ghbpxml245w1786vcxhaaqvcrjssfw0aph1idc9rwix"
+    }
+  },
+  {
+    "goPackagePath": "github.com/klauspost/compress",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/klauspost/compress",
+      "rev": "14eb9c4951195779ecfbec34431a976de7335b0a",
+      "sha256": "0lzkifj6jb365wvk340zywpiah7g16zkd5f7pcbi0gjym0a9ljvc"
+    }
+  },
+  {
+    "goPackagePath": "github.com/klauspost/cpuid",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/klauspost/cpuid",
+      "rev": "09cded8978dc9e80714c4d85b0322337b0a1e5e0",
+      "sha256": "05l8pfch0gvxh0khapwxhsk4xajn40vbjr360n49vh2z5531v2xq"
+    }
+  },
+  {
+    "goPackagePath": "github.com/klauspost/crc32",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/klauspost/crc32",
+      "rev": "19b0b332c9e4516a6370a0456e6182c3b5036720",
+      "sha256": "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r"
+    }
+  },
+  {
+    "goPackagePath": "github.com/lib/pq",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/lib/pq",
+      "rev": "4dd446efc17690bc53e154025146f73203b18309",
+      "sha256": "14idja467kcz2zlbqv07q3wp939khq620163fr5hhl7x362l5di6"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mattn/go-sqlite3",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mattn/go-sqlite3",
+      "rev": "e118d4451349065b8e7ce0f0af32e033995363f8",
+      "sha256": "1bf5mazb6h7mpvf0g8bxbpzb6kzsbm1qx1scs57x52zsb1la317k"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mcuadros/go-version",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mcuadros/go-version",
+      "rev": "d52711f8d6bea8dc01efafdb68ad95a4e2606630",
+      "sha256": "08ps27vvn77jhrnks8p8mx5cwgb1ikhaddcnrpgpz7aq905a5kzn"
+    }
+  },
+  {
+    "goPackagePath": "github.com/microcosm-cc/bluemonday",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/microcosm-cc/bluemonday",
+      "rev": "9dc199233bf72cc1aad9b61f73daf2f0075b9ee4",
+      "sha256": "067v28gj25niabi29h958af494b6kwfs60mdsvwa4bl99613i8ja"
+    }
+  },
+  {
+    "goPackagePath": "github.com/nfnt/resize",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/nfnt/resize",
+      "rev": "891127d8d1b52734debe1b3c3d7e747502b6c366",
+      "sha256": "08lg2v4s1iyzqja7xb69d57gpz1y43yqfwv7i4fa7a06m595r9iw"
+    }
+  },
+  {
+    "goPackagePath": "github.com/russross/blackfriday",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/russross/blackfriday",
+      "rev": "93622da34e54fb6529bfb7c57e710f37a8d9cbd8",
+      "sha256": "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2"
+    }
+  },
+  {
+    "goPackagePath": "github.com/satori/go.uuid",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/satori/go.uuid",
+      "rev": "0aa62d5ddceb50dbcb909d790b5345affd3669b6",
+      "sha256": "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w"
+    }
+  },
+  {
+    "goPackagePath": "github.com/sergi/go-diff",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/sergi/go-diff",
+      "rev": "ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7",
+      "sha256": "1lpxhwqbypssj2vhlkj11fircllvxx4n985w6f76id5jany05h2w"
+    }
+  },
+  {
+    "goPackagePath": "github.com/shurcooL/sanitized_anchor_name",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/shurcooL/sanitized_anchor_name",
+      "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77",
+      "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/crypto",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/crypto",
+      "rev": "bc89c496413265e715159bdc8478ee9a92fdc265",
+      "sha256": "0a4s0hxq3gq7ylg6cq4s8m8gx9bjsqsj49p9n7k9pij5daydabcf"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/net",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/net",
+      "rev": "6a513affb38dc9788b449d59ffed099b8de18fa0",
+      "sha256": "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/text",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/text",
+      "rev": "2910a502d2bf9e43193af9d68ca516529614eed3",
+      "sha256": "1h2bxzsnqksnvrk2lplpqzzpp9m9zmd6f2aajyahc56bxb1804jq"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/asn1-ber.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/asn1-ber.v1",
+      "rev": "4e86f4367175e39f69d9358a5f17b4dda270378d",
+      "sha256": "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/bufio.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/bufio.v1",
+      "rev": "567b2bfa514e796916c4747494d6ff5132a1dfce",
+      "sha256": "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/gomail.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/gomail.v2",
+      "rev": "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1",
+      "sha256": "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/ini.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/ini.v1",
+      "rev": "cf53f9204df4fbdd7ec4164b57fa6184ba168292",
+      "sha256": "045nl3hc4mwngr9j1ahrfv2x6izf8y57ij8k6kdgh9xahyhb6rwb"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/ldap.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/ldap.v2",
+      "rev": "537128fee7cca108d8ce74e4309fdfcdd9c7f496",
+      "sha256": "09zvf3q0p3p4czcisv4x0bn5x0carpw35cisnygkxh6s1sp4im9q"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/macaron.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/macaron.v1",
+      "rev": "2133042f8d1022b8253e4e23f7940467941409ce",
+      "sha256": "1z11hkxcmv40qvhqzqn97kymm294kh219fjybvm7p3hz3xgkgcjq"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/redis.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/redis.v2",
+      "rev": "e6179049628164864e6e84e973cfb56335748dea",
+      "sha256": "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h"
+    }
+  }
+]
diff --git a/pkgs/applications/version-management/gogs/gogs-definition.nix b/pkgs/applications/version-management/gogs/gogs-definition.nix
deleted file mode 100644
index 626986081977..000000000000
--- a/pkgs/applications/version-management/gogs/gogs-definition.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-with import <nixpkgs> {};
-
-let
-  # My go2nix fork to be able to build in a pure environment,
-  # with build tags support, fixed bugs that affected Gogs
-  # and with latest nix-prefetch-git output style.
-  my-go2nix = lib.overrideDerivation go2nix (oldAttrs: {
-    src = fetchFromGitHub {
-      rev = "336ac3d93272860c9d8f518f43ce6f70c3b11bf4";
-      owner = "valeriangalliat";
-      repo = "go2nix";
-      sha256 = "0m9srjcl9lrphl4gsrscibf2c7yz2kmmja9qylbli4lwjw53g7p7";
-    };
-
-    buildInputs = [ makeWrapper ] ++ oldAttrs.buildInputs;
-
-    preFixup = "";
-
-    postInstall = ''
-      wrapProgram $bin/bin/go2nix \
-        --prefix PATH : ${nix-prefetch-git}/bin  \
-        --prefix PATH : ${git}/bin  \
-    '';
-
-    disallowedReferences = [];
-  });
-
-  # Fetch a Go tree from a Go package repository and build tags.
-  # All dependencies are fetched according to `go get` rules, so the
-  # output of this derivation is not deterministic (but that's the
-  # point since we use it to automatically update the package and its
-  # dependencies).
-  fetchgo =
-    { goPackagePath, url, rev ? "HEAD", tags ? [] }:
-    stdenv.mkDerivation {
-      name = builtins.replaceStrings ["/"] ["_"] goPackagePath;
-      buildInputs = [ go git ];
-      phases = [ "installPhase" ];
-
-      installPhase = ''
-        export GOPATH=$out
-        repo=$out/src/${goPackagePath}
-        mkdir -p $repo
-        git clone ${url} $repo
-        cd $repo
-        git reset --hard ${rev}
-        go get -v -d -tags ${builtins.concatStringsSep "," tags}
-      '';
-    };
-
-  goPackagePath = "github.com/gogits/gogs";
-  url = "https://${goPackagePath}.git";
-  rev = "d320915ad2a7b4bbab075b98890aa50f91f0ced5";
-  tags = [ "sqlite" ];
-
-in
-
-stdenv.mkDerivation {
-  name = "gogs-definition";
-
-  src = fetchgo {
-    inherit goPackagePath url rev tags;
-   };
-
-  buildInputs = [ nix my-go2nix.bin ];
-
-  installPhase = ''
-    export GOPATH=$PWD
-    cd src/${goPackagePath}
-    go2nix save --tags ${builtins.concatStringsSep "," tags}
-    patch default.nix < ${./default.nix.patch}
-    cat default.nix | awk -f ${./sqlite.awk} | sed '/# can be improved/d' > $out
-  '';
-}
diff --git a/pkgs/applications/version-management/gogs/sqlite.awk b/pkgs/applications/version-management/gogs/sqlite.awk
deleted file mode 100644
index 40c73261cefa..000000000000
--- a/pkgs/applications/version-management/gogs/sqlite.awk
+++ /dev/null
@@ -1,21 +0,0 @@
-/goPackagePath/ && /sqlite/ {
-  sqlite=1
-  prev="    ] ++ (lib.optional (sqliteSupport) {"
-}
-
-sqlite && /}$/ {
-  sqlite=0
-  $0="    }) ++ ["
-}
-
-NR > 1 {
-  print prev
-}
-
-{
-  prev=$0
-}
-
-END {
-  print prev
-}
diff --git a/pkgs/applications/version-management/gogs/update-gogs-definition b/pkgs/applications/version-management/gogs/update-gogs-definition
deleted file mode 100755
index b467af463f1b..000000000000
--- a/pkgs/applications/version-management/gogs/update-gogs-definition
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-#
-# Regenerates `default.nix` using `gogs-definition.nix`.
-#
-# The latter should be updated to a new revision of Gogs in order
-# to update.
-#
-
-cat "$(nix-build --no-out-link gogs-definition.nix)" > default.nix

From 6101eb2454155baf042a64caed7868421f065127 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 29 Jul 2016 18:32:13 +0200
Subject: [PATCH 3/5] gogs: FIX `public` and `templates` use from `bin`

---
 pkgs/applications/version-management/gogs/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 1e237b706152..9ba36c4311dd 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -8,13 +8,17 @@ buildGoPackage rec {
   buildInputs = [ makeWrapper ];
   buildFlags = stdenv.lib.optional (sqliteSupport) "-tags sqlite";
   goPackagePath = "github.com/gogits/gogs";
+  outputs = [ "out" "bin" "data" ];
 
   postInstall = ''
+    mkdir $data
+    cp -R $src/{public,templates} $data
+
     wrapProgram $bin/bin/gogs \
       --prefix PATH : ${git}/bin \
       --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
       --run 'cd "$GOGS_WORK_DIR"' \
-      --run "ln -fs $out/share/go/src/${goPackagePath}/{public,templates} ."
+      --run "ln -fs $data/{public,templates} ."
   '';
 
   src = fetchgit {

From e6ab60dee8201c8168442638344a04d853937907 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Mon, 10 Oct 2016 17:11:58 +0200
Subject: [PATCH 4/5] gogs: 20160304-d57a2b9 -> 0.9.97

---
 .../version-management/gogs/default.nix       |  45 +-
 .../version-management/gogs/deps.json         | 425 ----------------
 .../version-management/gogs/deps.nix          | 452 ++++++++++++++++++
 3 files changed, 483 insertions(+), 439 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gogs/deps.json
 create mode 100644 pkgs/applications/version-management/gogs/deps.nix

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 9ba36c4311dd..6a2e0d90a3ef 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -1,31 +1,48 @@
-{ stdenv, buildGoPackage, fetchgit, makeWrapper, git, sqliteSupport ? true  }:
+{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
+, git, coreutils, bash, gzip, openssh
+, sqliteSupport ? true
+}:
 
 buildGoPackage rec {
   name = "gogs-${version}";
-  version = "20160728-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "ad7ea88923e371df7558835d8f3e0236cfdf69ba";
+  version = "0.9.97";
+
+  src = fetchFromGitHub {
+    owner = "gogits";
+    repo = "gogs";
+    rev = "v${version}";
+    sha256 = "151mmd8h5zd4bvafd42nsky0m9gblf5fcpd6jacqcrry1796hxk9";
+  };
+
+  patchPhase = ''
+    substituteInPlace models/repo.go \
+      --replace '#!/usr/bin/env' '#!${coreutils}/bin/env'
+  '';
 
   buildInputs = [ makeWrapper ];
-  buildFlags = stdenv.lib.optional (sqliteSupport) "-tags sqlite";
-  goPackagePath = "github.com/gogits/gogs";
-  outputs = [ "out" "bin" "data" ];
+
+  buildFlags = stdenv.lib.optionalString sqliteSupport "-tags sqlite";
+
+  outputs = [ "bin" "out" "data" ];
 
   postInstall = ''
     mkdir $data
     cp -R $src/{public,templates} $data
 
     wrapProgram $bin/bin/gogs \
-      --prefix PATH : ${git}/bin \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ bash git gzip openssh ]} \
       --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
-      --run 'cd "$GOGS_WORK_DIR"' \
+      --run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \
       --run "ln -fs $data/{public,templates} ."
   '';
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/gogits/gogs";
-    sha256 = "0vgkhpwvj79shpi3bq2sr1nza53fidmnbmh814ic09jnb2dilnrm";
-  };
+  goPackagePath = "github.com/gogits/gogs";
+  goDeps = ./deps.nix;
 
-  goDeps = ./deps.json;
+  meta = {
+    description = "A painless self-hosted Git service";
+    homepage = "https://gogs.io";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ schneefux ];
+  };
 }
diff --git a/pkgs/applications/version-management/gogs/deps.json b/pkgs/applications/version-management/gogs/deps.json
deleted file mode 100644
index f93c53e8b348..000000000000
--- a/pkgs/applications/version-management/gogs/deps.json
+++ /dev/null
@@ -1,425 +0,0 @@
-[
-  {
-    "goPackagePath": "github.com/Unknwon/cae",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/Unknwon/cae",
-      "rev": "c6aac99ea2cae2ebaf23f26f76b04fe3fcfc9f8c",
-      "sha256": "0j6l1fcs6gp4qw6b9w3pg9fgah18lh1hanfz5y64r6ks244v3l7s"
-    }
-  },
-  {
-    "goPackagePath": "github.com/Unknwon/com",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/Unknwon/com",
-      "rev": "28b053d5a2923b87ce8c5a08f3af779894a72758",
-      "sha256": "09i9slj4zbsqmwkkx9bqi7cgpv6hqby6r98l6qx1wag89qijybz2"
-    }
-  },
-  {
-    "goPackagePath": "github.com/Unknwon/i18n",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/Unknwon/i18n",
-      "rev": "39d6f2727e0698b1021ceb6a77c1801aa92e7d5d",
-      "sha256": "1f4s9srdaqw2yqgc3d76vww3glbwka2f5q4zrwn8bb66kcazbfb7"
-    }
-  },
-  {
-    "goPackagePath": "github.com/Unknwon/paginater",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/Unknwon/paginater",
-      "rev": "7748a72e01415173a27d79866b984328e7b0c12b",
-      "sha256": "0ighsa75ixgx6c4hc397c06lapf0pz50cj3cgkdvssp9an38kw2c"
-    }
-  },
-  {
-    "goPackagePath": "github.com/bradfitz/gomemcache",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/bradfitz/gomemcache",
-      "rev": "fb1f79c6b65acda83063cbc69f6bba1522558bfc",
-      "sha256": "0mq5rn07bbpy2yla7hassrmj966p6r7ffbf9w41l31yy0fc07i68"
-    }
-  },
-  {
-    "goPackagePath": "github.com/codegangsta/cli",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/codegangsta/cli",
-      "rev": "d9021faab69f92295ef7061bd39e4a76dcbdef32",
-      "sha256": "0rwxc84rq6w2adymvffydyvd2va4zxqb6kv9dk7j5iikcs021yn0"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/binding",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/binding",
-      "rev": "9440f336b443056c90d7d448a0a55ad8c7599880",
-      "sha256": "0g3ya3h8vjaykgp1npdxbizcf8kzv4m47vymcsq06vpihrfhbvg7"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/cache",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/cache",
-      "rev": "56173531277692bc2925924d51fda1cd0a6b8178",
-      "sha256": "1116a22wm43q2l54nnycgli90kix787j20mpgya9qb6xnglcck59"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/captcha",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/captcha",
-      "rev": "8aa5919789ab301e865595eb4b1114d6b9847deb",
-      "sha256": "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/csrf",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/csrf",
-      "rev": "6a9a7df172cc1fcd81e4585f44b09200b6087cc0",
-      "sha256": "173da2hl9fcfgkn0nv1ws3pr0gyyp88amhj2bfk4414k5a3r0nsa"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/gzip",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/gzip",
-      "rev": "cad1c6580a07c56f5f6bc52d66002a05985c5854",
-      "sha256": "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/i18n",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/i18n",
-      "rev": "ef57533c3b0fc2d8581deda14937e52f11a203ab",
-      "sha256": "1nkrcnpjl3x6fhjss2vp29mnvam20vpvxvxpfg1zspi1rjmpyhqy"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/inject",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/inject",
-      "rev": "d8a0b8677191f4380287cfebd08e462217bac7ad",
-      "sha256": "0p47pz699xhmi8yxhahvrpai9r49rqap5ckwmz1dlkrnh3zwhrhh"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/session",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/session",
-      "rev": "66031fcb37a0fff002a1f028eb0b3a815c78306b",
-      "sha256": "1prrfv8xdlyxrdbagbqzjkx69x74hjzif5ki4lzl2y6fk3nb0cd5"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/toolbox",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/toolbox",
-      "rev": "99a42f20e9e88daec5c0d7beb4e7eac134680ab0",
-      "sha256": "0r6ksiqzrii7b9vv8daz68044pyifsxmpz48m6h8m6l3h9ygz8cx"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-sql-driver/mysql",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-sql-driver/mysql",
-      "rev": "3654d25ec346ee8ce71a68431025458d52a38ac0",
-      "sha256": "0yr44mbx8632ynhmy8hg5ybwsqsc7byy3n7aqawq7jgih83ivdvq"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-xorm/core",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-xorm/core",
-      "rev": "bc1b7f81f0e369289078424064634a5ee7d21051",
-      "sha256": "01y3bk0yxw0chbi834ykda0bfxr4xaarkbb237k4x5sj3wcv30v1"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-xorm/xorm",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-xorm/xorm",
-      "rev": "dddc985b860d64f7b6370afd65a8316425e13181",
-      "sha256": "0wmcvrw50d0hk35wrxjky8hmhmqpjf49zq9vfj36ai7qrn7vhvlr"
-    }
-  },
-  {
-    "goPackagePath": "github.com/gogits/chardet",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/gogits/chardet",
-      "rev": "2404f777256163ea3eadb273dada5dcb037993c0",
-      "sha256": "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd"
-    }
-  },
-  {
-    "goPackagePath": "github.com/gogits/cron",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/gogits/cron",
-      "rev": "96040e4fab17baa0391ce571694e4ccb5fce5dac",
-      "sha256": "1a1f38mzjhdz7n5fclxq2ninqngcqjqx1jy1p4533an3jyjhyh10"
-    }
-  },
-  {
-    "goPackagePath": "github.com/gogits/git-module",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/gogits/git-module",
-      "rev": "53bcb7352ff838610c537c9b589ca79bca92c661",
-      "sha256": "1xk63sccq0gapgrz5a0y2fi4vifqalgrypcv1yhiq53ha3r4fkya"
-    }
-  },
-  {
-    "goPackagePath": "github.com/gogits/go-gogs-client",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/gogits/go-gogs-client",
-      "rev": "442b4e5ddc8029932c91872f8322fb7a2c2de858",
-      "sha256": "0nllqias2kv2fs2dlp2vxxi9nkw3mgm84j6s3n9ccixk7bkxc6a6"
-    }
-  },
-  {
-    "goPackagePath": "github.com/gogits/gogs",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/gogits/gogs",
-      "rev": "ad7ea88923e371df7558835d8f3e0236cfdf69ba",
-      "sha256": "0vgkhpwvj79shpi3bq2sr1nza53fidmnbmh814ic09jnb2dilnrm"
-    }
-  },
-  {
-    "goPackagePath": "github.com/issue9/identicon",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/issue9/identicon",
-      "rev": "d36b54562f4cf70c83653e13dc95c220c79ef521",
-      "sha256": "0y82b3gq8rpqglvf3lsqhgp5djfdammwd1w24k3i97iqls0rch7l"
-    }
-  },
-  {
-    "goPackagePath": "github.com/jaytaylor/html2text",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/jaytaylor/html2text",
-      "rev": "52d9b785554a1918cb09909b89a1509a98b853fd",
-      "sha256": "1hhvabh01ghbpxml245w1786vcxhaaqvcrjssfw0aph1idc9rwix"
-    }
-  },
-  {
-    "goPackagePath": "github.com/klauspost/compress",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/klauspost/compress",
-      "rev": "14eb9c4951195779ecfbec34431a976de7335b0a",
-      "sha256": "0lzkifj6jb365wvk340zywpiah7g16zkd5f7pcbi0gjym0a9ljvc"
-    }
-  },
-  {
-    "goPackagePath": "github.com/klauspost/cpuid",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/klauspost/cpuid",
-      "rev": "09cded8978dc9e80714c4d85b0322337b0a1e5e0",
-      "sha256": "05l8pfch0gvxh0khapwxhsk4xajn40vbjr360n49vh2z5531v2xq"
-    }
-  },
-  {
-    "goPackagePath": "github.com/klauspost/crc32",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/klauspost/crc32",
-      "rev": "19b0b332c9e4516a6370a0456e6182c3b5036720",
-      "sha256": "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r"
-    }
-  },
-  {
-    "goPackagePath": "github.com/lib/pq",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/lib/pq",
-      "rev": "4dd446efc17690bc53e154025146f73203b18309",
-      "sha256": "14idja467kcz2zlbqv07q3wp939khq620163fr5hhl7x362l5di6"
-    }
-  },
-  {
-    "goPackagePath": "github.com/mattn/go-sqlite3",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/mattn/go-sqlite3",
-      "rev": "e118d4451349065b8e7ce0f0af32e033995363f8",
-      "sha256": "1bf5mazb6h7mpvf0g8bxbpzb6kzsbm1qx1scs57x52zsb1la317k"
-    }
-  },
-  {
-    "goPackagePath": "github.com/mcuadros/go-version",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/mcuadros/go-version",
-      "rev": "d52711f8d6bea8dc01efafdb68ad95a4e2606630",
-      "sha256": "08ps27vvn77jhrnks8p8mx5cwgb1ikhaddcnrpgpz7aq905a5kzn"
-    }
-  },
-  {
-    "goPackagePath": "github.com/microcosm-cc/bluemonday",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/microcosm-cc/bluemonday",
-      "rev": "9dc199233bf72cc1aad9b61f73daf2f0075b9ee4",
-      "sha256": "067v28gj25niabi29h958af494b6kwfs60mdsvwa4bl99613i8ja"
-    }
-  },
-  {
-    "goPackagePath": "github.com/nfnt/resize",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/nfnt/resize",
-      "rev": "891127d8d1b52734debe1b3c3d7e747502b6c366",
-      "sha256": "08lg2v4s1iyzqja7xb69d57gpz1y43yqfwv7i4fa7a06m595r9iw"
-    }
-  },
-  {
-    "goPackagePath": "github.com/russross/blackfriday",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/russross/blackfriday",
-      "rev": "93622da34e54fb6529bfb7c57e710f37a8d9cbd8",
-      "sha256": "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2"
-    }
-  },
-  {
-    "goPackagePath": "github.com/satori/go.uuid",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/satori/go.uuid",
-      "rev": "0aa62d5ddceb50dbcb909d790b5345affd3669b6",
-      "sha256": "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w"
-    }
-  },
-  {
-    "goPackagePath": "github.com/sergi/go-diff",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/sergi/go-diff",
-      "rev": "ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7",
-      "sha256": "1lpxhwqbypssj2vhlkj11fircllvxx4n985w6f76id5jany05h2w"
-    }
-  },
-  {
-    "goPackagePath": "github.com/shurcooL/sanitized_anchor_name",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/shurcooL/sanitized_anchor_name",
-      "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77",
-      "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"
-    }
-  },
-  {
-    "goPackagePath": "golang.org/x/crypto",
-    "fetch": {
-      "type": "git",
-      "url": "https://go.googlesource.com/crypto",
-      "rev": "bc89c496413265e715159bdc8478ee9a92fdc265",
-      "sha256": "0a4s0hxq3gq7ylg6cq4s8m8gx9bjsqsj49p9n7k9pij5daydabcf"
-    }
-  },
-  {
-    "goPackagePath": "golang.org/x/net",
-    "fetch": {
-      "type": "git",
-      "url": "https://go.googlesource.com/net",
-      "rev": "6a513affb38dc9788b449d59ffed099b8de18fa0",
-      "sha256": "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval"
-    }
-  },
-  {
-    "goPackagePath": "golang.org/x/text",
-    "fetch": {
-      "type": "git",
-      "url": "https://go.googlesource.com/text",
-      "rev": "2910a502d2bf9e43193af9d68ca516529614eed3",
-      "sha256": "1h2bxzsnqksnvrk2lplpqzzpp9m9zmd6f2aajyahc56bxb1804jq"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/asn1-ber.v1",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/asn1-ber.v1",
-      "rev": "4e86f4367175e39f69d9358a5f17b4dda270378d",
-      "sha256": "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/bufio.v1",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/bufio.v1",
-      "rev": "567b2bfa514e796916c4747494d6ff5132a1dfce",
-      "sha256": "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/gomail.v2",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/gomail.v2",
-      "rev": "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1",
-      "sha256": "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/ini.v1",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/ini.v1",
-      "rev": "cf53f9204df4fbdd7ec4164b57fa6184ba168292",
-      "sha256": "045nl3hc4mwngr9j1ahrfv2x6izf8y57ij8k6kdgh9xahyhb6rwb"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/ldap.v2",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/ldap.v2",
-      "rev": "537128fee7cca108d8ce74e4309fdfcdd9c7f496",
-      "sha256": "09zvf3q0p3p4czcisv4x0bn5x0carpw35cisnygkxh6s1sp4im9q"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/macaron.v1",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/macaron.v1",
-      "rev": "2133042f8d1022b8253e4e23f7940467941409ce",
-      "sha256": "1z11hkxcmv40qvhqzqn97kymm294kh219fjybvm7p3hz3xgkgcjq"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/redis.v2",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/redis.v2",
-      "rev": "e6179049628164864e6e84e973cfb56335748dea",
-      "sha256": "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h"
-    }
-  }
-]
diff --git a/pkgs/applications/version-management/gogs/deps.nix b/pkgs/applications/version-management/gogs/deps.nix
new file mode 100644
index 000000000000..e6de8e343134
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/deps.nix
@@ -0,0 +1,452 @@
+[
+  {
+    goPackagePath = "github.com/Unknwon/cae";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Unknwon/cae";
+      rev = "c6aac99ea2cae2ebaf23f26f76b04fe3fcfc9f8c";
+      sha256 = "0j6l1fcs6gp4qw6b9w3pg9fgah18lh1hanfz5y64r6ks244v3l7s";
+    };
+  }
+  {
+    goPackagePath = "github.com/Unknwon/com";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Unknwon/com";
+      rev = "28b053d5a2923b87ce8c5a08f3af779894a72758";
+      sha256 = "09i9slj4zbsqmwkkx9bqi7cgpv6hqby6r98l6qx1wag89qijybz2";
+    };
+  }
+  {
+    goPackagePath = "github.com/Unknwon/i18n";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Unknwon/i18n";
+      rev = "39d6f2727e0698b1021ceb6a77c1801aa92e7d5d";
+      sha256 = "1f4s9srdaqw2yqgc3d76vww3glbwka2f5q4zrwn8bb66kcazbfb7";
+    };
+  }
+  {
+    goPackagePath = "github.com/Unknwon/paginater";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Unknwon/paginater";
+      rev = "7748a72e01415173a27d79866b984328e7b0c12b";
+      sha256 = "0ighsa75ixgx6c4hc397c06lapf0pz50cj3cgkdvssp9an38kw2c";
+    };
+  }
+  {
+    goPackagePath = "github.com/bradfitz/gomemcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bradfitz/gomemcache";
+      rev = "fb1f79c6b65acda83063cbc69f6bba1522558bfc";
+      sha256 = "0mq5rn07bbpy2yla7hassrmj966p6r7ffbf9w41l31yy0fc07i68";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/binding";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/binding";
+      rev = "9440f336b443056c90d7d448a0a55ad8c7599880";
+      sha256 = "0g3ya3h8vjaykgp1npdxbizcf8kzv4m47vymcsq06vpihrfhbvg7";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/cache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/cache";
+      rev = "56173531277692bc2925924d51fda1cd0a6b8178";
+      sha256 = "1116a22wm43q2l54nnycgli90kix787j20mpgya9qb6xnglcck59";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/captcha";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/captcha";
+      rev = "8aa5919789ab301e865595eb4b1114d6b9847deb";
+      sha256 = "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/csrf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/csrf";
+      rev = "6a9a7df172cc1fcd81e4585f44b09200b6087cc0";
+      sha256 = "173da2hl9fcfgkn0nv1ws3pr0gyyp88amhj2bfk4414k5a3r0nsa";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/gzip";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/gzip";
+      rev = "cad1c6580a07c56f5f6bc52d66002a05985c5854";
+      sha256 = "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/i18n";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/i18n";
+      rev = "ef57533c3b0fc2d8581deda14937e52f11a203ab";
+      sha256 = "1nkrcnpjl3x6fhjss2vp29mnvam20vpvxvxpfg1zspi1rjmpyhqy";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/inject";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/inject";
+      rev = "d8a0b8677191f4380287cfebd08e462217bac7ad";
+      sha256 = "0p47pz699xhmi8yxhahvrpai9r49rqap5ckwmz1dlkrnh3zwhrhh";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/session";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/session";
+      rev = "66031fcb37a0fff002a1f028eb0b3a815c78306b";
+      sha256 = "1prrfv8xdlyxrdbagbqzjkx69x74hjzif5ki4lzl2y6fk3nb0cd5";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/toolbox";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/toolbox";
+      rev = "99a42f20e9e88daec5c0d7beb4e7eac134680ab0";
+      sha256 = "0r6ksiqzrii7b9vv8daz68044pyifsxmpz48m6h8m6l3h9ygz8cx";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev = "0b58b37b664c21f3010e836f1b931e1d0b0b0685";
+      sha256 = "1dvizip0xzir3gd1ghamfyngwvq5kv7m10d8460fm58g6sy0j512";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-xorm/builder";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-xorm/builder";
+      rev = "f502bd375c1feb5febb467d7e1b840b74adddf0f";
+      sha256 = "144m9mb01lhjz05d6h0jkq14dj52844vycn21kay5vjj9yxipzls";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-xorm/core";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-xorm/core";
+      rev = "5bf745d7d163f4380e6c2bba8c4afa60534dd087";
+      sha256 = "0nx12akm0bb6nxg7x6j40vhhbh0k1lsxk0x8lndnwqsbhznpg7dz";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-xorm/xorm";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-xorm/xorm";
+      rev = "838b2268ae0847e6cfab5c0359c496983223e9dd";
+      sha256 = "0f979lil952gy7gr61xwdj0nid2wkxjd7gzzr9iki4rrq67h23vy";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogits/chardet";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogits/chardet";
+      rev = "2404f777256163ea3eadb273dada5dcb037993c0";
+      sha256 = "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogits/cron";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogits/cron";
+      rev = "7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c";
+      sha256 = "0y7z62g727pygnm5y1jp4i8izz4kzrnih8ihapxhin0isbfd3b6y";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogits/git-module";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogits/git-module";
+      rev = "b3009dc4f5842cf9e2e80fef1e125e79c38e4949";
+      sha256 = "1f5mms15hknnj17nvb5dwwk8fcm8a9msy9qdjvkplihxgaqm0amz";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogits/go-gogs-client";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogits/go-gogs-client";
+      rev = "d8aff570fa22d4e38954c753ec8b21862239b31d";
+      sha256 = "07gmvvljd48jwpkgsqlcp19rphn7ybcd4hzf7zahhl4dd4b8p4p3";
+    };
+  }
+  {
+    goPackagePath = "github.com/issue9/identicon";
+    fetch = {
+      type = "git";
+      url = "https://github.com/issue9/identicon";
+      rev = "d36b54562f4cf70c83653e13dc95c220c79ef521";
+      sha256 = "0y82b3gq8rpqglvf3lsqhgp5djfdammwd1w24k3i97iqls0rch7l";
+    };
+  }
+  {
+    goPackagePath = "github.com/jaytaylor/html2text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jaytaylor/html2text";
+      rev = "8fb95d837f7d6db1913fecfd7bcc5333e6499596";
+      sha256 = "0pzyidlp5jmzl5smhr9f8a81qpfls80j5m7156b032fvyvjwanlr";
+    };
+  }
+  {
+    goPackagePath = "github.com/klauspost/compress";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/compress";
+      rev = "d0763f13d86e630f5d3ea9fa848a6ecc68255297";
+      sha256 = "18nf5iqsrz2xq899zy9gvi1s0gaxn4zwjgkxxvlqmjzs7waq946y";
+    };
+  }
+  {
+    goPackagePath = "github.com/klauspost/cpuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/cpuid";
+      rev = "09cded8978dc9e80714c4d85b0322337b0a1e5e0";
+      sha256 = "05l8pfch0gvxh0khapwxhsk4xajn40vbjr360n49vh2z5531v2xq";
+    };
+  }
+  {
+    goPackagePath = "github.com/klauspost/crc32";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/crc32";
+      rev = "19b0b332c9e4516a6370a0456e6182c3b5036720";
+      sha256 = "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r";
+    };
+  }
+  {
+    goPackagePath = "github.com/lib/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lib/pq";
+      rev = "50761b0867bd1d9d069276790bcd4a3bccf2324a";
+      sha256 = "1bz46slzri958wdnvlvyx12bp3pmy8iny5m0m16i3n8h1q84dhp5";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
+      sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
+    };
+  }
+  {
+    goPackagePath = "github.com/mcuadros/go-version";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mcuadros/go-version";
+      rev = "d52711f8d6bea8dc01efafdb68ad95a4e2606630";
+      sha256 = "08ps27vvn77jhrnks8p8mx5cwgb1ikhaddcnrpgpz7aq905a5kzn";
+    };
+  }
+  {
+    goPackagePath = "github.com/microcosm-cc/bluemonday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/microcosm-cc/bluemonday";
+      rev = "7d0cad0ac7ef5e3afd74816444b44b56327422a4";
+      sha256 = "0cnszfgmajg6r3icy4n5fx9sxw4igmi7vpqmms4884ypg1va4kq5";
+    };
+  }
+  {
+    goPackagePath = "github.com/msteinert/pam";
+    fetch = {
+      type = "git";
+      url = "https://github.com/msteinert/pam";
+      rev = "02ccfbfaf0cc627aa3aec8ef7ed5cfeec5b43f63";
+      sha256 = "0vx7w1ybwi049wizlamm8hqw0vz4rnpiipn7rkvfapa2xmdyd71h";
+    };
+  }
+  {
+    goPackagePath = "github.com/nfnt/resize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nfnt/resize";
+      rev = "891127d8d1b52734debe1b3c3d7e747502b6c366";
+      sha256 = "08lg2v4s1iyzqja7xb69d57gpz1y43yqfwv7i4fa7a06m595r9iw";
+    };
+  }
+  {
+    goPackagePath = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70";
+      sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k";
+    };
+  }
+  {
+    goPackagePath = "github.com/satori/go.uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/satori/go.uuid";
+      rev = "b061729afc07e77a8aa4fad0a2fd840958f1942a";
+      sha256 = "0q87n5an7ha2d8kl6gn9wi41rq0whsxq68w5x3nxz7w9vgkfnq1k";
+    };
+  }
+  {
+    goPackagePath = "github.com/sergi/go-diff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sergi/go-diff";
+      rev = "ce4a6e0e61d6908298eed511fc0683062d4c7f3b";
+      sha256 = "193fhvj6nf7az4lmlcr05brn52ydl0pky79fb1s83bllf8mrhqg7";
+    };
+  }
+  {
+    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/sanitized_anchor_name";
+      rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2";
+      sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg";
+    };
+  }
+  {
+    goPackagePath = "github.com/strk/go-libravatar";
+    fetch = {
+      type = "git";
+      url = "https://github.com/strk/go-libravatar";
+      rev = "5eed7bff870ae19ef51c5773dbc8f3e9fcbd0982";
+      sha256 = "1pjb7a4v42dg7y3j880qv20il77fq0cqwfsl9pz7ywi5rmgfnq6v";
+    };
+  }
+  {
+    goPackagePath = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev = "d53eb991652b1d438abdd34ce4bfa3ef1539108e";
+      sha256 = "0d02mmx79hrwd42wn0bchf28jqi47aj17pkfczq22gdxp6jd3r9w";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "7682e7e3945130cf3cde089834664f68afdd1523";
+      sha256 = "1yg53yycnzn569jssij0w1jxhjs9wmscw29hasqqkvhkzdwyjzhf";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "ffe101cce3477a6c6d8f0754d103bb0a84ec1266";
+      sha256 = "013jzyxix30izpi4485fvh43r5wf8icj85acslizrg6pd1m6mhmm";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "098f51fb687dbaba1f6efabeafbb6461203f9e21";
+      sha256 = "17h1qkgh436gn6sgv81d7xhbdxhscdhbhjfhh9z7r2s6vm05g1ai";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/asn1-ber.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/asn1-ber.v1";
+      rev = "4e86f4367175e39f69d9358a5f17b4dda270378d";
+      sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/bufio.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/bufio.v1";
+      rev = "567b2bfa514e796916c4747494d6ff5132a1dfce";
+      sha256 = "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/editorconfig/editorconfig-core-go.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/editorconfig/editorconfig-core-go.v1";
+      rev = "a872f05c2e34b37b567401384d202aff11ba06d4";
+      sha256 = "17mc7rm0fl5vi7ky95c2bd7c8ck0ms5bghzmgx9qk7x1zrw91335";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/gomail.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/gomail.v2";
+      rev = "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1";
+      sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/ini.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/ini.v1";
+      rev = "6e4869b434bd001f6983749881c7ead3545887d8";
+      sha256 = "1w7qcl0k7bsp6871vr8mbli09imd67qqq1vbvpll33d2vw12wmva";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/ldap.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/ldap.v2";
+      rev = "d0a5ced67b4dc310b9158d63a2c6f9c5ec13f105";
+      sha256 = "02pgng2m8bfdh7471mjd6g19h53448hlsnl8l7jv9hm8mh1gp7jm";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/macaron.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/macaron.v1";
+      rev = "4974334b10dbb6f5c0e17f4c10555ff050a16329";
+      sha256 = "0jryd9xah6571xpn03i59wiziiz0w6v2dwda202y8y2yrjdxnzlp";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/redis.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/redis.v2";
+      rev = "e6179049628164864e6e84e973cfb56335748dea";
+      sha256 = "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h";
+    };
+  }
+]

From 3a1da126a172e9f331921bdb945bf3294f6f758c Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 7 Jan 2017 14:35:20 +0100
Subject: [PATCH 5/5] gogs: 0.9.7 -> 0.9.113

---
 .../version-management/gogs/default.nix       |   4 +-
 .../version-management/gogs/deps.nix          | 145 ++++++++----------
 2 files changed, 70 insertions(+), 79 deletions(-)

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 6a2e0d90a3ef..b9a1f2e7a843 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -5,13 +5,13 @@
 
 buildGoPackage rec {
   name = "gogs-${version}";
-  version = "0.9.97";
+  version = "0.9.113";
 
   src = fetchFromGitHub {
     owner = "gogits";
     repo = "gogs";
     rev = "v${version}";
-    sha256 = "151mmd8h5zd4bvafd42nsky0m9gblf5fcpd6jacqcrry1796hxk9";
+    sha256 = "1zk83c9jiazfw3221yi2sidp7917q3dxb2xb7wrjg4an18gj46j7";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/version-management/gogs/deps.nix b/pkgs/applications/version-management/gogs/deps.nix
index e6de8e343134..4596eb1d2437 100644
--- a/pkgs/applications/version-management/gogs/deps.nix
+++ b/pkgs/applications/version-management/gogs/deps.nix
@@ -31,8 +31,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/Unknwon/paginater";
-      rev = "7748a72e01415173a27d79866b984328e7b0c12b";
-      sha256 = "0ighsa75ixgx6c4hc397c06lapf0pz50cj3cgkdvssp9an38kw2c";
+      rev = "701c23f468663c34d1b1768c3ae1bcc57e11c5b3";
+      sha256 = "09h3gyd9wyzgbkny5g5ihd4ckmv0bams8g5y2xfkd55gizlmx07p";
     };
   }
   {
@@ -40,8 +40,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/bradfitz/gomemcache";
-      rev = "fb1f79c6b65acda83063cbc69f6bba1522558bfc";
-      sha256 = "0mq5rn07bbpy2yla7hassrmj966p6r7ffbf9w41l31yy0fc07i68";
+      rev = "2fafb84a66c4911e11a8f50955b01e74fe3ab9c5";
+      sha256 = "1k3vqmq008gad1cq1gaqa35k5ldn0z8fcx07c15x9v8p9xjbhkc9";
     };
   }
   {
@@ -49,8 +49,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-macaron/binding";
-      rev = "9440f336b443056c90d7d448a0a55ad8c7599880";
-      sha256 = "0g3ya3h8vjaykgp1npdxbizcf8kzv4m47vymcsq06vpihrfhbvg7";
+      rev = "48920167fa152d02f228cfbece7e0f1e452d200a";
+      sha256 = "00h4mdyhqkh75vgafyyyn54kdpwj82ifg9l6lxv9gnkw6frxhkan";
     };
   }
   {
@@ -112,8 +112,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-macaron/session";
-      rev = "66031fcb37a0fff002a1f028eb0b3a815c78306b";
-      sha256 = "1prrfv8xdlyxrdbagbqzjkx69x74hjzif5ki4lzl2y6fk3nb0cd5";
+      rev = "b8a2b5ef7fb4c91c1c8ca23e2a52e29a4bcbb22f";
+      sha256 = "1nz823fn23wp87pzzhpxlbr6j7q4khywa9n0h1kpdikiy87z5k5m";
     };
   }
   {
@@ -130,8 +130,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-sql-driver/mysql";
-      rev = "0b58b37b664c21f3010e836f1b931e1d0b0b0685";
-      sha256 = "1dvizip0xzir3gd1ghamfyngwvq5kv7m10d8460fm58g6sy0j512";
+      rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034";
+      sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5";
     };
   }
   {
@@ -139,8 +139,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-xorm/builder";
-      rev = "f502bd375c1feb5febb467d7e1b840b74adddf0f";
-      sha256 = "144m9mb01lhjz05d6h0jkq14dj52844vycn21kay5vjj9yxipzls";
+      rev = "db75972580de4a7c6c20fff5b16a924c3de3fa12";
+      sha256 = "0qgrvjfghkgfhbrm989yhrwgs36d6wxcap012glpmd2ddp5klw46";
     };
   }
   {
@@ -148,8 +148,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-xorm/core";
-      rev = "5bf745d7d163f4380e6c2bba8c4afa60534dd087";
-      sha256 = "0nx12akm0bb6nxg7x6j40vhhbh0k1lsxk0x8lndnwqsbhznpg7dz";
+      rev = "2fbe2c76c6781d9e1c0398fc25386426e611f975";
+      sha256 = "1rfry5md6g8b6d6vyqpqys3wl2mxf6v55d2aapxlx3hqn6lz0lax";
     };
   }
   {
@@ -157,8 +157,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-xorm/xorm";
-      rev = "838b2268ae0847e6cfab5c0359c496983223e9dd";
-      sha256 = "0f979lil952gy7gr61xwdj0nid2wkxjd7gzzr9iki4rrq67h23vy";
+      rev = "2189b36884a485d1d609fc5690bfc71a8a7de8c3";
+      sha256 = "02z140xbwqins6ql8hwdr6ar3d67jqrkm22bamqbj2rmfl7z0846";
     };
   }
   {
@@ -175,8 +175,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gogits/cron";
-      rev = "7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c";
-      sha256 = "0y7z62g727pygnm5y1jp4i8izz4kzrnih8ihapxhin0isbfd3b6y";
+      rev = "2fc07a4c4f1e3c4d2301c5ed578d5e2c31c70421";
+      sha256 = "0a153pspisnhjpxjsryqdb29y6b8ics0203icbq5lps2g5jyaiw0";
     };
   }
   {
@@ -184,8 +184,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gogits/git-module";
-      rev = "b3009dc4f5842cf9e2e80fef1e125e79c38e4949";
-      sha256 = "1f5mms15hknnj17nvb5dwwk8fcm8a9msy9qdjvkplihxgaqm0amz";
+      rev = "df1013f8eb4dc70de90bc5597bf560a4b7da802e";
+      sha256 = "1vnfiwdwp210hn7z7fgi5i80mggk76blbhykqg8wvx8bi0wxlrs8";
     };
   }
   {
@@ -193,8 +193,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/gogits/go-gogs-client";
-      rev = "d8aff570fa22d4e38954c753ec8b21862239b31d";
-      sha256 = "07gmvvljd48jwpkgsqlcp19rphn7ybcd4hzf7zahhl4dd4b8p4p3";
+      rev = "98046bb98061fc6baa5bb86359af0b7c300d384a";
+      sha256 = "1wsg70irk4lwyak4kn2ml64j1fglqkyzs2lgc2mk4n4j5kn9hs1k";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogits/go-libravatar";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogits/go-libravatar";
+      rev = "cd1abbd55d09b793672732a7a1dfdaa12a40dfd0";
+      sha256 = "00xvnddfh1m5g17mrnvp505i4sgwpk1r0wqz6a15bp6lvadwwlnj";
     };
   }
   {
@@ -211,8 +220,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/jaytaylor/html2text";
-      rev = "8fb95d837f7d6db1913fecfd7bcc5333e6499596";
-      sha256 = "0pzyidlp5jmzl5smhr9f8a81qpfls80j5m7156b032fvyvjwanlr";
+      rev = "4b9124c9b0a2279e2092c4a9aaf1c83bbd2dcffc";
+      sha256 = "1yp0rawzziia9diffxs6k5g85acq3a62yb5ajbvy04r2p04dv85h";
     };
   }
   {
@@ -220,8 +229,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/klauspost/compress";
-      rev = "d0763f13d86e630f5d3ea9fa848a6ecc68255297";
-      sha256 = "18nf5iqsrz2xq899zy9gvi1s0gaxn4zwjgkxxvlqmjzs7waq946y";
+      rev = "e3b7981a12dd3cab49afa1d3a50e715846f23732";
+      sha256 = "0hxciiaqrbf7rr112r7rwk7jcwhvjpbhnp8ikszp56zwqd64k9vn";
     };
   }
   {
@@ -238,8 +247,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/klauspost/crc32";
-      rev = "19b0b332c9e4516a6370a0456e6182c3b5036720";
-      sha256 = "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r";
+      rev = "cb6bfca970f6908083f26f39a79009d608efd5cd";
+      sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n";
     };
   }
   {
@@ -247,17 +256,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/lib/pq";
-      rev = "50761b0867bd1d9d069276790bcd4a3bccf2324a";
-      sha256 = "1bz46slzri958wdnvlvyx12bp3pmy8iny5m0m16i3n8h1q84dhp5";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-sqlite3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-sqlite3";
-      rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
-      sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
+      rev = "8df6253d1317616f36b0c3740eb30c239a7372cb";
+      sha256 = "0djs6k6rdh06v8bz0msn0lv532hk2vrljj1pz4kgmbqcmd17y31k";
     };
   }
   {
@@ -265,8 +265,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mcuadros/go-version";
-      rev = "d52711f8d6bea8dc01efafdb68ad95a4e2606630";
-      sha256 = "08ps27vvn77jhrnks8p8mx5cwgb1ikhaddcnrpgpz7aq905a5kzn";
+      rev = "257f7b9a7d87427c8d7f89469a5958d57f8abd7c";
+      sha256 = "0mpbcc698503hbrlc74l3nqd6hdr0n6vybfzw10pg7qx3cpmn512";
     };
   }
   {
@@ -274,17 +274,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/microcosm-cc/bluemonday";
-      rev = "7d0cad0ac7ef5e3afd74816444b44b56327422a4";
-      sha256 = "0cnszfgmajg6r3icy4n5fx9sxw4igmi7vpqmms4884ypg1va4kq5";
-    };
-  }
-  {
-    goPackagePath = "github.com/msteinert/pam";
-    fetch = {
-      type = "git";
-      url = "https://github.com/msteinert/pam";
-      rev = "02ccfbfaf0cc627aa3aec8ef7ed5cfeec5b43f63";
-      sha256 = "0vx7w1ybwi049wizlamm8hqw0vz4rnpiipn7rkvfapa2xmdyd71h";
+      rev = "e79763773ab6222ca1d5a7cbd9d62d83c1f77081";
+      sha256 = "04rd8jzy8kzzm0j0k7wy90pykl8ws43yhhwl2gkyz6rak10jhqpz";
     };
   }
   {
@@ -319,8 +310,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/sergi/go-diff";
-      rev = "ce4a6e0e61d6908298eed511fc0683062d4c7f3b";
-      sha256 = "193fhvj6nf7az4lmlcr05brn52ydl0pky79fb1s83bllf8mrhqg7";
+      rev = "83532ca1c1caa393179c677b6facf48e61f4ca5d";
+      sha256 = "08niiivkn9a1hdl738w2sq4vq6csqhw91an8wq83dk40q62f4sq8";
     };
   }
   {
@@ -332,22 +323,13 @@
       sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg";
     };
   }
-  {
-    goPackagePath = "github.com/strk/go-libravatar";
-    fetch = {
-      type = "git";
-      url = "https://github.com/strk/go-libravatar";
-      rev = "5eed7bff870ae19ef51c5773dbc8f3e9fcbd0982";
-      sha256 = "1pjb7a4v42dg7y3j880qv20il77fq0cqwfsl9pz7ywi5rmgfnq6v";
-    };
-  }
   {
     goPackagePath = "github.com/urfave/cli";
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "d53eb991652b1d438abdd34ce4bfa3ef1539108e";
-      sha256 = "0d02mmx79hrwd42wn0bchf28jqi47aj17pkfczq22gdxp6jd3r9w";
+      rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
+      sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
     };
   }
   {
@@ -355,8 +337,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "7682e7e3945130cf3cde089834664f68afdd1523";
-      sha256 = "1yg53yycnzn569jssij0w1jxhjs9wmscw29hasqqkvhkzdwyjzhf";
+      rev = "cb497ae8f18e3c55f81bc9f3876c8f4c3d8a2813";
+      sha256 = "0zah08y0a9rqk1ggp0ylkpycr3amrc22ncsppyrymry44g56xyfj";
     };
   }
   {
@@ -364,8 +346,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "ffe101cce3477a6c6d8f0754d103bb0a84ec1266";
-      sha256 = "013jzyxix30izpi4485fvh43r5wf8icj85acslizrg6pd1m6mhmm";
+      rev = "ae05321a78c1401cec22ba7bc203b597ea372496";
+      sha256 = "1fzbijklrmhwj4mlwrnrxbbrhlzpgrsbv05zldbkvhic14g0ii2c";
     };
   }
   {
@@ -373,8 +355,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "098f51fb687dbaba1f6efabeafbb6461203f9e21";
-      sha256 = "17h1qkgh436gn6sgv81d7xhbdxhscdhbhjfhh9z7r2s6vm05g1ai";
+      rev = "44f4f658a783b0cee41fe0a23b8fc91d9c120558";
+      sha256 = "1hgwc2p5azfyzvl7i47my3wnbp2g7814a2sshqw63dvggs9mszcx";
     };
   }
   {
@@ -418,8 +400,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/ini.v1";
-      rev = "6e4869b434bd001f6983749881c7ead3545887d8";
-      sha256 = "1w7qcl0k7bsp6871vr8mbli09imd67qqq1vbvpll33d2vw12wmva";
+      rev = "6f66b0e091edb3c7b380f7c4f0f884274d550b67";
+      sha256 = "1n09b7ypbayhk6x7qi3g3hrqjlmj5yszwl5d8jykjd5azp6h8sb8";
     };
   }
   {
@@ -427,8 +409,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/ldap.v2";
-      rev = "d0a5ced67b4dc310b9158d63a2c6f9c5ec13f105";
-      sha256 = "02pgng2m8bfdh7471mjd6g19h53448hlsnl8l7jv9hm8mh1gp7jm";
+      rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f";
+      sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895";
     };
   }
   {
@@ -436,8 +418,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/macaron.v1";
-      rev = "4974334b10dbb6f5c0e17f4c10555ff050a16329";
-      sha256 = "0jryd9xah6571xpn03i59wiziiz0w6v2dwda202y8y2yrjdxnzlp";
+      rev = "ddb19a9f3e8cedd44696b9dd5854dc8a43f3dd6c";
+      sha256 = "0riggdq8zxy5x6zhks66slvsg22b9i4399f7ns2l6daj79myqyvy";
     };
   }
   {
@@ -449,4 +431,13 @@
       sha256 = "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h";
     };
   }
+  {
+    goPackagePath = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
+      sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
+    };
+  }
 ]