Merge branch 'master' into hardened-stdenv

2024-09-29 07:32:58 +00:00 · 2016-08-13 16:59:55 +02:00 · 2016-08-13 16:59:55 +02:00 · bd4490e277
commit bd4490e277
parent fa3a35b241 79149ac12d
106 changed files with 3736 additions and 2595 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -11,10 +11,10 @@ matrix:
          dist: trusty
          before_script:
              - sudo mount -o remount,exec,size=2G,mode=755 /run/user
-          script: ./maintainers/scripts/travis-nox-review-pr.sh pr
+          script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
        - os: osx
          osx_image: xcode7.3
-          script: ./maintainers/scripts/travis-nox-review-pr.sh pr
+          script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
 git:
    depth: 1
 env:
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@ -86,13 +86,6 @@ the following arguments are of special significance to the function:
          "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
          "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
        }
-    },
-    {
-    "include": "../../libs.json", <co xml:id='ex-goDeps-4' />
-    "packages": [ <co xml:id='ex-goDeps-5' />
-            "github.com/docopt/docopt-go",
-            "golang.org/x/crypto",
-        ]
    }
 ]
 </programlisting>
@ -122,20 +115,6 @@ the following arguments are of special significance to the function:
    </para>
  </callout>

-  <callout arearefs='ex-goDeps-4'>
-    <para>
-      <varname>include</varname> could be used to reuse <varname>goDeps</varname> between Go programs.
-      There is a common libs set in <varname>&lt;nixpkgs/pkgs/development/go-modules/libs.json&gt;</varname>
-      with pinned versions of many packages that you can reuse.
-    </para>
-  </callout>
-
-  <callout arearefs='ex-goDeps-5'>
-    <para>
-      <varname>packages</varname> enumerates all Go packages that will be imported from included file.
-    </para>
-  </callout>
-
 </calloutlist>

 </para>
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@ -748,6 +748,23 @@ in newpkgs.python35.withPackages (ps: [ps.blaze])
 ```
 The requested package `blaze` depends upon `pandas` which itself depends on `scipy`.

+### `python setup.py bdist_wheel` cannot create .whl
+
+Executing `python setup.py bdist_wheel` fails with
+```
+ValueError: ZIP does not support timestamps before 1980
+```
+This is because files are included that depend on items in the Nix store which have a timestamp of, that is, it corresponds to January the 1st, 1970 at 00:00:00. And as the error informs you, ZIP does not support that.
+Fortunately `bdist_wheel` takes into account `SOURCE_DATE_EPOCH`. On Nix this value is set to 1. By setting it to a value correspond to 1980 or later it is possible to build wheels.
+
+Use 1980 as timestamp:
+```
+SOURCE_DATE_EPOCH=315532800 python3 setup.py bdist_wheel
+```
+or the current time:
+```
+SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel
+```

 ### `install_data` / `data_files` problems

--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@ -44,6 +44,13 @@ while test -n "$1"; do
            nix-shell --packages nixpkgs-lint --run "nixpkgs-lint -f $TRAVIS_BUILD_DIR"
            ;;

+        nox)
+            echo "=== Fetching Nox from binary cache"
+
+            # build nox silently so it's not in the log
+            nix-build "<nixpkgs>" -A nox
+            ;;
+
        pr)
            if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
                echo "=== No pull request found"
@ -55,7 +62,7 @@ while test -n "$1"; do
                    token="--token $GITHUB_TOKEN"
                fi

-                nix-shell --packages nox git --run "nox-review pr --slug $TRAVIS_REPO_SLUG $token $TRAVIS_PULL_REQUEST"
+                nix-shell --packages nox --run "nox-review pr --slug $TRAVIS_REPO_SLUG $token $TRAVIS_PULL_REQUEST"
            fi
            ;;

--- a/nixos/modules/i18n/input-method/default.xml
+++ b/nixos/modules/i18n/input-method/default.xml
@ -88,6 +88,8 @@ i18n.inputMethod = {
      methods among Traditional Chinese Unix users.</para></listitem>
  <listitem><para>Hangul (<literal>fcitx-engines.hangul</literal>): Korean input 
      method.</para></listitem>
+  <listitem><para>Unikey (<literal>fcitx-engines.unikey</literal>): Vietnamese input 
+      method.</para></listitem>
  <listitem><para>m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input 
      method that uses input methods and corresponding icons in the m17n 
      database.</para></listitem>
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -136,7 +136,6 @@
  ./services/continuous-integration/jenkins/slave.nix
  ./services/databases/4store-endpoint.nix
  ./services/databases/4store.nix
-  ./services/databases/cassandra.nix
  ./services/databases/couchdb.nix
  ./services/databases/firebird.nix
  ./services/databases/hbase.nix
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@ -380,6 +380,7 @@ in {
        User = cfg.user;
        Group = cfg.group;
        TimeoutSec = "300";
+        Restart = "on-failure";
        WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
        ExecStart="${cfg.packages.gitlab.env}/bin/bundle exec \"sidekiq -q post_receive -q mailers -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.statePath}/tmp/sidekiq.pid\"";
      };
@ -404,6 +405,7 @@ in {
        User = cfg.user;
        Group = cfg.group;
        TimeoutSec = "300";
+        Restart = "on-failure";
        ExecStart =
          "${cfg.packages.gitlab-workhorse}/bin/gitlab-workhorse "
          + "-listenUmask 0 "
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@ -63,7 +63,6 @@ in rec {
      imagemagick
      jdk
      linux
-      mysql51
      mysql55
      nginx
      nodejs
--- a/nixos/release.nix
+++ b/nixos/release.nix
@ -211,7 +211,6 @@ in rec {
  tests.boot = callSubTests tests/boot.nix {};
  tests.boot-stage1 = callTest tests/boot-stage1.nix {};
  tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
-  tests.cassandra = callTest tests/cassandra.nix {};
  tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable;
  tests.cjdns = callTest tests/cjdns.nix {};
  tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@ -1,69 +1,71 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs
-, gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg
-, libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper
-, mpg123, neon, faad2, gnome3
+{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
+, libmowgli, libmcs, dbus_glib, libxml2, xorg, gnome3, alsaLib
+, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
+, libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
+, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
+, neon, faad2, lame, libnotify, libsidplayfp
 }:

-let version = "3.5.2"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  name = "audacious-${version}";
+  version = "3.7.2";

  src = fetchurl {
-    url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
-    sha256 = "0mhrdj76h0g6q197wgp8rxk6gqsrirrw49hfidcb5b7q5rlvj59r";
+    url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2";
+    sha256 = "1pvyxi8niy70nv13kc16g2vaywwahmg2650fa7v4rlbmykifk75z";
  };

  pluginsSrc = fetchurl {
-    url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
-    sha256 = "1nacd8n46q3pqnwavq3i2ayls609gvxfcp3qqpcsfcdfz3bh15hp";
+    url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2";
+    sha256 = "0gxka0lp9a35k2xgq8bx69wyv83dvrqnpwcsqliy3h3yz6v1fv2v";
  };

-  buildInputs =
-    [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib
-      libmad xorg.libXcomposite libogg libvorbis flac alsaLib libcdio
-      libcddb ffmpeg makeWrapper mpg123 neon faad2 gnome3.defaultIconTheme
-    ];
+  nativeBuildInputs = [
+    pkgconfig wrapGAppsHook
+  ];

-  # Here we build bouth audacious and audacious-plugins in one
+  buildInputs = [
+    gettext glib gtk3 libmowgli libmcs dbus_glib libxml2
+    xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
+    libpulseaudio fluidsynth libmad libogg libvorbis libcdio082
+    libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
+    libmodplug libsamplerate soxr lirc curl wavpack neon faad2
+    lame libnotify libsidplayfp
+  ];
+
+  configureFlags = [ "--enable-statusicon" ];
+
+  # Here we build both audacious and audacious-plugins in one
  # derivations, since they really expect to be in the same prefix.
  # This is slighly tricky.
-  builder = builtins.toFile "builder.sh"
-    ''
-      # First build audacious.
-      (
-        source $stdenv/setup
-        genericBuild
-      )
+  builder = builtins.toFile "builder.sh" ''
+    # First build audacious.
+    (
+      source $stdenv/setup
+      genericBuild
+    )

-      # Then build the plugins.
-      (
-        nativeBuildInputs="$out $nativeBuildInputs" # to find audacious
-        source $stdenv/setup
-        rm -rfv audacious-*
-        src=$pluginsSrc
-        genericBuild
-      )
-
-      (
-        source $stdenv/setup
-        # gsettings schemas for file dialogues
-        # XDG_ICON_DIRS is set by hook for gnome3.defaultIconTheme
-        for file in "$out/bin/"*; do
-          wrapProgram "$file" \
-            --prefix XDG_DATA_DIRS : "$XDG_ADD:$GSETTINGS_SCHEMAS_PATH" \
-            --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
-        done
-      )
-    '';
-  XDG_ADD = gtk3 + "/share";
+    # Then build the plugins.
+    (
+      dontWrapGApps=true
+      nativeBuildInputs="$out $nativeBuildInputs" # to find audacious
+      source $stdenv/setup
+      rm -rfv audacious-*
+      src=$pluginsSrc
+      genericBuild
+    )
+  '';

  enableParallelBuilding = true;

-  meta = {
+  meta = with stdenv.lib; {
    description = "Audio player";
    homepage = http://audacious-media-player.org/;
-    maintainers = with stdenv.lib.maintainers; [ eelco ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ eelco ramkromberg ];
+    platforms = with platforms; linux;
+    license = with licenses; [
+      bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING
+      gpl2 gpl3 lgpl2Plus #http://redmine.audacious-media-player.org/issues/46
+    ];
  };
 }
--- a/pkgs/applications/misc/hugo/deps.json
+++ b/pkgs/applications/misc/hugo/deps.json
@ -1,44 +1,317 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-        "gopkg.in/yaml.v2",
-        "github.com/hashicorp/hcl",
-        "github.com/pkg/sftp",
-        "golang.org/x/sys",
-        "github.com/hashicorp/go-multierror",
-        "golang.org/x/crypto",
-        "github.com/pkg/errors",
-        "github.com/kr/fs",
-        "github.com/kyokomi/emoji",
-        "github.com/bep/inflect",
-        "github.com/BurntSushi/toml",
-        "github.com/PuerkitoBio/purell",
-        "github.com/PuerkitoBio/urlesc",
-        "github.com/dchest/cssmin",
-        "github.com/eknkc/amber",
-        "github.com/gorilla/websocket",
-        "github.com/kardianos/osext",
-        "github.com/miekg/mmark",
-        "github.com/mitchellh/mapstructure",
-        "github.com/russross/blackfriday",
-        "github.com/shurcooL/sanitized_anchor_name",
-        "github.com/spf13/afero",
-        "github.com/spf13/cast",
-        "github.com/spf13/jwalterweatherman",
-        "github.com/spf13/cobra",
-        "github.com/cpuguy83/go-md2man",
-        "github.com/inconshreveable/mousetrap",
-        "github.com/spf13/pflag",
-        "github.com/spf13/fsync",
-        "github.com/spf13/viper",
-        "github.com/kr/pretty",
-        "github.com/kr/text",
-        "github.com/magiconair/properties",
-        "golang.org/x/text",
-        "github.com/yosssi/ace",
-        "github.com/spf13/nitro",
-        "github.com/fsnotify/fsnotify"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/sys",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/sys",
+            "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f",
+            "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/yaml.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/yaml.v2",
+            "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
+            "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/gorilla/websocket",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/gorilla/websocket",
+            "rev": "a622679ebd7a3b813862379232f645f8e690e43f",
+            "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"
+        }
+    },
+    {
+        "goPackagePath": "github.com/inconshreveable/mousetrap",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/inconshreveable/mousetrap",
+            "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa",
+            "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"
+        }
+    },
+    {
+        "goPackagePath": "github.com/kardianos/osext",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/kardianos/osext",
+            "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc",
+            "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"
+        }
+    },
+    {
+        "goPackagePath": "github.com/hashicorp/hcl",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/hashicorp/hcl",
+            "rev": "54864211433d45cb780682431585b3e573b49e4a",
+            "sha256": "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"
+        }
+    },
+    {
+        "goPackagePath": "github.com/hashicorp/go-multierror",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/hashicorp/go-multierror",
+            "rev": "56912fb08d85084aa318edcf2bba735b97cf35c5",
+            "sha256": "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"
+        }
+    },
+    {
+        "goPackagePath": "github.com/BurntSushi/toml",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/BurntSushi/toml",
+            "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4",
+            "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mitchellh/mapstructure",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mitchellh/mapstructure",
+            "rev": "281073eb9eb092240d33ef253c404f1cca550309",
+            "sha256": "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/text",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/text",
+            "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e",
+            "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"
+        }
+    },
+    {
+        "goPackagePath": "github.com/shurcooL/sanitized_anchor_name",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/shurcooL/sanitized_anchor_name",
+            "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77",
+            "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"
+        }
+    },
+    {
+        "goPackagePath": "github.com/russross/blackfriday",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/russross/blackfriday",
+            "rev": "d18b67ae0afd61dae240896eae1785f00709aa31",
+            "sha256": "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"
+        }
+    },
+    {
+        "goPackagePath": "github.com/yosssi/ace",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/yosssi/ace",
+            "rev": "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d",
+            "sha256": "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k"
+        }
+    },
+    {
+        "goPackagePath": "github.com/spf13/viper",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/spf13/viper",
+            "rev": "c1ccc378a054ea8d4e38d8c67f6938d4760b53dd",
+            "sha256": "0lpdzalqhqp9pwsg63inkxwjji7m0pp42ryw1499bqbjp97hriq0"
+        }
+    },
+    {
+        "goPackagePath": "github.com/spf13/pflag",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/spf13/pflag",
+            "rev": "367864438f1b1a3c7db4da06a2f55b144e6784e0",
+            "sha256": "03c6654hv4v1fj79i5sri3p9q2afqgicka4nicb6fr4kcfkkgbfp"
+        }
+    },
+    {
+        "goPackagePath": "github.com/spf13/jwalterweatherman",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/spf13/jwalterweatherman",
+            "rev": "33c24e77fb80341fe7130ee7c594256ff08ccc46",
+            "sha256": "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z"
+        }
+    },
+    {
+        "goPackagePath": "github.com/fsnotify/fsnotify",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/fsnotify/fsnotify",
+            "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8",
+            "sha256": "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"
+        }
+    },
+    {
+        "goPackagePath": "github.com/magiconair/properties",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/magiconair/properties",
+            "rev": "c265cfa48dda6474e208715ca93e987829f572f8",
+            "sha256": "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3"
+        }
+    },
+    {
+        "goPackagePath": "github.com/bep/inflect",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/bep/inflect",
+            "rev": "b896c45f5af983b1f416bdf3bb89c4f1f0926f69",
+            "sha256": "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"
+        }
+    },
+    {
+        "goPackagePath": "github.com/eknkc/amber",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/eknkc/amber",
+            "rev": "91774f050c1453128146169b626489e60108ec03",
+            "sha256": "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis"
+        }
+    },
+    {
+        "goPackagePath": "github.com/spf13/afero",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/spf13/afero",
+            "rev": "1a8ecf8b9da1fb5306e149e83128fc447957d2a8",
+            "sha256": "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw"
+        }
+    },
+    {
+        "goPackagePath": "github.com/spf13/cast",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/spf13/cast",
+            "rev": "27b586b42e29bec072fe7379259cc719e1289da6",
+            "sha256": "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x"
+        }
+    },
+    {
+        "goPackagePath": "github.com/spf13/cobra",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/spf13/cobra",
+            "rev": "bc81c21bd0d8be5ba2d6630a505d79d4467566e7",
+            "sha256": "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r"
+        }
+    },
+    {
+        "goPackagePath": "github.com/dchest/cssmin",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/dchest/cssmin",
+            "rev": "fb8d9b44afdc258bfff6052d3667521babcb2239",
+            "sha256": "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"
+        }
+    },
+    {
+        "goPackagePath": "github.com/spf13/fsync",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/spf13/fsync",
+            "rev": "eefee59ad7de621617d4ff085cf768aab4b919b1",
+            "sha256": "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p"
+        }
+    },
+    {
+        "goPackagePath": "github.com/cpuguy83/go-md2man",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/cpuguy83/go-md2man",
+            "rev": "2724a9c9051aa62e9cca11304e7dd518e9e41599",
+            "sha256": "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/miekg/mmark",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/miekg/mmark",
+            "rev": "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a",
+            "sha256": "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/spf13/nitro",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/spf13/nitro",
+            "rev": "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8",
+            "sha256": "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"
+        }
+    },
+    {
+        "goPackagePath": "github.com/PuerkitoBio/purell",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/PuerkitoBio/purell",
+            "rev": "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3",
+            "sha256": "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb"
+        }
+    },
+    {
+        "goPackagePath": "github.com/pkg/sftp",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/pkg/sftp",
+            "rev": "d4c18e7ffdc496a38de67dde6e29b2f364afc472",
+            "sha256": "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/kr/fs",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/kr/fs",
+            "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b",
+            "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"
+        }
+    },
+    {
+        "goPackagePath": "github.com/kyokomi/emoji",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/kyokomi/emoji",
+            "rev": "17c5e7085c9d59630aa578df67f4469481fbe7a9",
+            "sha256": "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp"
+        }
+    },
+    {
+        "goPackagePath": "github.com/pkg/errors",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/pkg/errors",
+            "rev": "494e70f7620561491c2ca11e185bbef4b70060da",
+            "sha256": "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/PuerkitoBio/urlesc",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/PuerkitoBio/urlesc",
+            "rev": "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587",
+            "sha256": "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni"
+        }
+    }
 ]
--- a/pkgs/applications/misc/mop/deps.json
+++ b/pkgs/applications/misc/mop/deps.json
@ -1,8 +1,11 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/nsf/termbox-go"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/nsf/termbox-go",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/nsf/termbox-go",
+            "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b",
+            "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"
+        }
+    }
 ]
--- a/pkgs/applications/misc/wego/deps.json
+++ b/pkgs/applications/misc/wego/deps.json
@ -1,10 +1,29 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/mattn/go-colorable",
-      "github.com/mattn/go-runewidth",
-      "github.com/schachmat/ingo"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/mattn/go-runewidth",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mattn/go-runewidth",
+            "rev": "d6bea18f789704b5f83375793155289da36a3c7f",
+            "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mattn/go-colorable",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mattn/go-colorable",
+            "rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe",
+            "sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"
+        }
+    },
+    {
+        "goPackagePath": "github.com/schachmat/ingo",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/schachmat/ingo",
+            "rev": "fab41e4e62cbef5d92998746ec25f7e195100f38",
+            "sha256": "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb"
+        }
+    }
 ]
--- a/pkgs/applications/networking/drive/deps.json
+++ b/pkgs/applications/networking/drive/deps.json
@ -1,26 +1,164 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/boltdb/bolt",
-      "github.com/cheggaaa/pb",
-      "github.com/odeke-em/cli-spinner",
-      "github.com/odeke-em/statos",
-      "golang.org/x/oauth2",
-      "github.com/odeke-em/exponential-backoff",
-      "github.com/odeke-em/extractor",
-      "github.com/odeke-em/meddler",
-      "github.com/odeke-em/xon",
-      "github.com/odeke-em/cache",
-      "github.com/odeke-em/drive",
-      "github.com/odeke-em/command",
-      "github.com/odeke-em/log",
-      "github.com/odeke-em/pretty-words",
-      "github.com/skratchdot/open-golang",
-      "google.golang.org/cloud",
-      "google.golang.org/api",
-      "github.com/mattn/go-isatty",
-      "golang.org/x/net"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/net",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/net",
+            "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",
+            "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"
+        }
+    },
+    {
+        "goPackagePath": "google.golang.org/api",
+        "fetch": {
+            "type": "git",
+            "url": "https://code.googlesource.com/google-api-go-client",
+            "rev": "a5c3e2a4792aff40e59840d9ecdff0542a202a80",
+            "sha256": "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"
+        }
+    },
+    {
+        "goPackagePath": "google.golang.org/cloud",
+        "fetch": {
+            "type": "git",
+            "url": "https://code.googlesource.com/gocloud",
+            "rev": "6335269abf9002cf5a84613c13cda6010842b834",
+            "sha256": "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/oauth2",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/oauth2",
+            "rev": "397fe7649477ff2e8ced8fc0b2696f781e53745a",
+            "sha256": "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mattn/go-isatty",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mattn/go-isatty",
+            "rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449",
+            "sha256": "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/boltdb/bolt",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/boltdb/bolt",
+            "rev": "957d850b5158a4eebf915476058e720f43459584",
+            "sha256": "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf"
+        }
+    },
+    {
+        "goPackagePath": "github.com/cheggaaa/pb",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/cheggaaa/pb",
+            "rev": "e648e12b78cedf14ebb2fc1855033f07b034cfbb",
+            "sha256": "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam"
+        }
+    },
+    {
+        "goPackagePath": "github.com/odeke-em/cli-spinner",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/odeke-em/cli-spinner",
+            "rev": "610063bb4aeef25f7645b3e6080456655ec0fb33",
+            "sha256": "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c"
+        }
+    },
+    {
+        "goPackagePath": "github.com/odeke-em/statos",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/odeke-em/statos",
+            "rev": "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6",
+            "sha256": "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs"
+        }
+    },
+    {
+        "goPackagePath": "github.com/odeke-em/exponential-backoff",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/odeke-em/exponential-backoff",
+            "rev": "96e25d36ae36ad09ac02cbfe653b44c4043a8e09",
+            "sha256": "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6"
+        }
+    },
+    {
+        "goPackagePath": "github.com/odeke-em/extractor",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/odeke-em/extractor",
+            "rev": "801861aedb854c7ac5e1329e9713023e9dc2b4d4",
+            "sha256": "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1"
+        }
+    },
+    {
+        "goPackagePath": "github.com/odeke-em/meddler",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/odeke-em/meddler",
+            "rev": "d2b51d2b40e786ab5f810d85e65b96404cf33570",
+            "sha256": "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x"
+        }
+    },
+    {
+        "goPackagePath": "github.com/odeke-em/xon",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/odeke-em/xon",
+            "rev": "d580be739d723da4f6378083128f93017b8ab295",
+            "sha256": "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc"
+        }
+    },
+    {
+        "goPackagePath": "github.com/odeke-em/cache",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/odeke-em/cache",
+            "rev": "b51b08cb6cf889deda6c941a5205baecfd16f3eb",
+            "sha256": "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4"
+        }
+    },
+    {
+        "goPackagePath": "github.com/odeke-em/command",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/odeke-em/command",
+            "rev": "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561",
+            "sha256": "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62"
+        }
+    },
+    {
+        "goPackagePath": "github.com/odeke-em/log",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/odeke-em/log",
+            "rev": "cad53c4565a0b0304577bd13f3862350bdc5f907",
+            "sha256": "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w"
+        }
+    },
+    {
+        "goPackagePath": "github.com/odeke-em/pretty-words",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/odeke-em/pretty-words",
+            "rev": "9d37a7fcb4ae6f94b288d371938482994458cecb",
+            "sha256": "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl"
+        }
+    },
+    {
+        "goPackagePath": "github.com/skratchdot/open-golang",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/skratchdot/open-golang",
+            "rev": "c8748311a7528d0ba7330d302adbc5a677ef9c9e",
+            "sha256": "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac"
+        }
+    }
 ]
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:

-let version = "3.20.0"; in
+let version = "3.20.1"; in
 stdenv.mkDerivation {
  name = "filezilla-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "0clfw266c980w2kjl4xm56d80ixpv8lj675p58hv2bz70ihxpwaa";
+    sha256 = "0bcy0j89y2mpjyzwnz1qa33412n7yl0g8px2r4v7gla25r2x5qwa";
  };

  configureFlags = [
--- a/pkgs/applications/networking/instant-messengers/pond/deps.json
+++ b/pkgs/applications/networking/instant-messengers/pond/deps.json
@ -1,12 +1,47 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "golang.org/x/net",
-      "github.com/golang/protobuf",
-      "github.com/agl/ed25519",
-      "golang.org/x/crypto",
-      "github.com/agl/go-gtk"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/agl/ed25519",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/agl/ed25519",
+            "rev": "278e1ec8e8a6e017cd07577924d6766039146ced",
+            "sha256": "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/net",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/net",
+            "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",
+            "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"
+        }
+    },
+    {
+        "goPackagePath": "github.com/agl/go-gtk",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/agl/go-gtk",
+            "rev": "91c1edb38c241d73129e6b098ca1c9fa83abfc15",
+            "sha256": "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d"
+        }
+    }
 ]
--- a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json
+++ b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json
@ -1,9 +1,20 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "golang.org/x/crypto",
-      "golang.org/x/net"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/net",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/net",
+            "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",
+            "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
+    }
 ]
--- a/pkgs/applications/networking/syncthing012/deps.json
+++ b/pkgs/applications/networking/syncthing012/deps.json
@ -1,21 +1,128 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/bkaradzic/go-lz4",
-      "github.com/calmh/luhn",
-      "golang.org/x/text",
-      "github.com/kardianos/osext",
-      "github.com/vitrun/qart",
-      "github.com/calmh/du",
-      "github.com/calmh/xdr",
-      "github.com/juju/ratelimit",
-      "github.com/thejerf/suture",
-      "github.com/golang/snappy",
-      "github.com/rcrowley/go-metrics",
-      "github.com/syndtr/goleveldb",
-      "golang.org/x/crypto",
-      "golang.org/x/net"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/net",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/net",
+            "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",
+            "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"
+        }
+    },
+    {
+        "goPackagePath": "github.com/rcrowley/go-metrics",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/rcrowley/go-metrics",
+            "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3",
+            "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/kardianos/osext",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/kardianos/osext",
+            "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc",
+            "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"
+        }
+    },
+    {
+        "goPackagePath": "github.com/bkaradzic/go-lz4",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/bkaradzic/go-lz4",
+            "rev": "74ddf82598bc4745b965729e9c6a463bedd33049",
+            "sha256": "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"
+        }
+    },
+    {
+        "goPackagePath": "github.com/calmh/luhn",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/calmh/luhn",
+            "rev": "0c8388ff95fa92d4094011e5a04fc99dea3d1632",
+            "sha256": "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/text",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/text",
+            "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e",
+            "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"
+        }
+    },
+    {
+        "goPackagePath": "github.com/vitrun/qart",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/vitrun/qart",
+            "rev": "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0",
+            "sha256": "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8"
+        }
+    },
+    {
+        "goPackagePath": "github.com/calmh/du",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/calmh/du",
+            "rev": "3c0690cca16228b97741327b1b6781397afbdb24",
+            "sha256": "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/calmh/xdr",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/calmh/xdr",
+            "rev": "e467b5aeb65ca8516fb3925c84991bf1d7cc935e",
+            "sha256": "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra"
+        }
+    },
+    {
+        "goPackagePath": "github.com/juju/ratelimit",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/juju/ratelimit",
+            "rev": "772f5c38e468398c4511514f4f6aa9a4185bc0a0",
+            "sha256": "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p"
+        }
+    },
+    {
+        "goPackagePath": "github.com/thejerf/suture",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/thejerf/suture",
+            "rev": "99c1f2d613756768fc4299acd9dc621e11ed3fd7",
+            "sha256": "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4"
+        }
+    },
+    {
+        "goPackagePath": "github.com/golang/snappy",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/snappy",
+            "rev": "723cc1e459b8eea2dea4583200fd60757d40097a",
+            "sha256": "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"
+        }
+    },
+    {
+        "goPackagePath": "github.com/syndtr/goleveldb",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/syndtr/goleveldb",
+            "rev": "1a9d62f03ea92815b46fcaab357cfd4df264b1a0",
+            "sha256": "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"
+        }
+    }
 ]
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl, gfortran, texLive, ffmpeg, tk
+{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk
 , imagemagick, liblapack, python, openssl, libpng
 , which
 }:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "102mrzzi215g1xn5zgcv501x9sghwg758jagx2jixvg1rj2jijj9";
  };

-  buildInputs = [ m4 perl gfortran texLive ffmpeg tk imagemagick liblapack
+  buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg tk imagemagick liblapack
                  python openssl libpng which];

  patches = [ ./spkg-singular.patch ./spkg-python.patch ./spkg-git.patch ];
@ -25,9 +25,12 @@ stdenv.mkDerivation rec {
    export HOME=$out/sageHome
  '';

+  preBuild = "patchShebangs build";
+
  installPhase = ''DESTDIR=$out make install'';

  meta = {
+    broken = true;
    homepage = "http://www.sagemath.org";
    description = "A free open source mathematics software system";
    license = stdenv.lib.licenses.gpl2Plus;
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  name = "diff-so-fancy-${version}";
-  version = "0.10.1";
+  version = "0.11.1";

  # perl is needed here so patchShebangs can do its job
  buildInputs = [perl makeWrapper];
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    owner = "so-fancy";
    repo = "diff-so-fancy";
    rev = "v${version}";
-    sha256 = "0wp5civn70jzil1gbygx6ccrxfrmc8xx90v7zgf36rqi2yhvv64m";
+    sha256 = "1dw32c5i9mry6zr2a6h1369fhp1qbqimx04qgdmdnmn1imyck1h3";
  };

  buildPhase = null;
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    # itself, so we are copying executable to lib, and only symlink it
    # from bin/
    cp diff-so-fancy $out/lib/diff-so-fancy
-    cp -r lib $out/lib/diff-so-fancy
+    cp -r libexec $out/lib/diff-so-fancy
    ln -s $out/lib/diff-so-fancy/diff-so-fancy $out/bin

    # ncurses is needed for `tput`
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json
@ -1,9 +1,20 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/pquerna/ffjson",
-      "gopkg.in/kothar/go-backblaze.v0"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/pquerna/ffjson",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/pquerna/ffjson",
+            "rev": "674bc015b5b3f50f9bb2561179778586b9af68c5",
+            "sha256": "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/kothar/go-backblaze.v0",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/kothar/go-backblaze.v0",
+            "rev": "373819725fc560fa962c6cd883b533d2ebec4844",
+            "sha256": "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx"
+        }
+    }
 ]
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@ -0,0 +1,34 @@
+{ stdenv, fetchurl, fetchFromGitHub }:
+
+let version = "1.04"; in
+stdenv.mkDerivation {
+  name = "yadm-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "TheLocehiliosan";
+    repo   = "yadm";
+    rev    = "${version}";
+    sha256 = "1g5nz4y63ccxlbz67klm78525ps41ynis8683iayakg4907vd898";
+  };
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1
+    sed -e 's:/bin/bash:/usr/bin/env bash:' $src/yadm > $out/bin/yadm
+    chmod 755 $out/bin/yadm
+    install -m 644 $src/yadm.1 $out/share/man/man1/yadm.1
+  '';
+
+  meta = {
+    homepage = "https://github.com/TheLocehiliosan/yadm";
+    description = "Yet Another Dotfiles Manager";
+    longDescription = ''
+    yadm is a dotfile management tool with 3 main features: Manages files across
+    systems using a single Git repository. Provides a way to use alternate files on
+    a specific OS or host. Supplies a method of encrypting confidential data so it
+    can safely be stored in your repository.
+    '';
+    licence = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@ -290,34 +290,49 @@ rec {

  # Sage mirrors (http://www.sagemath.org/mirrors.html)
  sagemath = [
-    http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/
-    http://echidna.maths.usyd.edu.au/sage/src/
-    http://ftp.iitm.ac.in/sage/src/
+    # Africa
+    http://sagemath.polytechnic.edu.na/src/
+    ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/src/
+    http://sagemath.mirror.ac.za/src/
+    https://ftp.leg.uct.ac.za/pub/packages/sage/src/
+    http://mirror.ufs.ac.za/sagemath/src/
+
+    # America, North
+    http://mirrors-usa.go-parts.com/sage/sagemath/src/
+    http://mirrors.mit.edu/sage/src/
+    http://www.cecm.sfu.ca/sage/src/
+    http://files.sagemath.org/src/
+    http://mirror.clibre.uqam.ca/sage/src/
+    https://mirrors.xmission.com/sage/src/
+
+    # America, South
+    http://sagemath.c3sl.ufpr.br/src/
+    http://linorg.usp.br/sage/
+
+    # Asia
+    http://sage.asis.io/src/
+    http://mirror.hust.edu.cn/sagemath/src/
+    https://ftp.iitm.ac.in/sage/src/
    http://ftp.kaist.ac.kr/sage/src/
    http://ftp.riken.jp/sagemath/src/
+    https://mirrors.tuna.tsinghua.edu.cn/sagemath/src/
+    https://mirrors.ustc.edu.cn/sagemath/src/
    http://ftp.tsukuba.wide.ad.jp/software/sage/src/
-    http://jambu.spms.ntu.edu.sg/sage/src/
-    http://linorg.usp.br/sage/src/
-    http://mirror.aarnet.edu.au/pub/sage/src/
-    http://mirror.clibre.uqam.ca/sage/src/
-    http://mirror.hust.edu.cn/sagemath/src/
-    http://mirror.switch.ch/mirror/sagemath/src/
-    http://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/
-    http://mirrors.fe.up.pt/pub/sage/src/
-    http://mirrors.hustunique.com/sagemath/src/
-    http://mirrors.ustc.edu.cn/sagemath/src/
-    http://mirrors.xmission.com/sage/src/
-    http://sage.asis.io/src/
+    http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/src/
+    https://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/
+
+    # Australia
+    http://echidna.maths.usyd.edu.au/sage/src/
+
+    # Europe
    http://sage.mirror.garr.it/mirrors/sage/src/
-    http://sage.yasar.edu.tr/src/
-    http://sagemath.c3sl.ufpr.br/src/
-    http://sagemath.polytechnic.edu.na/src/
    http://sunsite.rediris.es/mirror/sagemath/src/
+    http://mirror.switch.ch/mirror/sagemath/src/
+    http://mirrors.fe.up.pt/pub/sage/src/
    http://www-ftp.lip6.fr/pub/math/sagemath/src/
-    http://www.mirrorservice.org/sites/www.sagemath.org/src/
+    http://ftp.ntua.gr/pub/sagemath/src/

    # Old versions
-    http://www.cecm.sfu.ca/sage/src/
    http://sagemath.org/src-old/
  ];

--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -1124,6 +1124,32 @@ rec {
      unifiedSystemDir = true;
    };

+    fedora24i386 = {
+      name = "fedora-24-i386";
+      fullName = "Fedora 24 (i386)";
+      packagesList = fetchurl rec {
+        url = "mirror://fedora/linux/releases/24/Everything/i386/os/repodata/${sha256}-primary.xml.gz";
+        sha256 = "6928e251628da7a74b79180739a43784e534eaa744ba4bcb18c847dff541f344";
+      };
+      urlPrefix = mirror://fedora/linux/releases/24/Everything/i386/os;
+      archs = ["noarch" "i386" "i586" "i686"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+      unifiedSystemDir = true;
+    };
+
+    fedora24x86_64 = {
+      name = "fedora-24-x86_64";
+      fullName = "Fedora 24 (x86_64)";
+      packagesList = fetchurl rec {
+        url = "mirror://fedora/linux/releases/24/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz";
+        sha256 = "8dcc989396ed27fadd252ba9b655019934bc3d9915f186f1f2f27e71eba7b42f";
+      };
+      urlPrefix = mirror://fedora/linux/releases/24/Everything/x86_64/os;
+      archs = ["noarch" "x86_64"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+      unifiedSystemDir = true;
+    };
+
    opensuse103i386 = {
      name = "opensuse-10.3-i586";
      fullName = "openSUSE 10.3 (i586)";
--- a/pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix
@ -1,11 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update

-fetchurl: rec {
-  major = "3.20";
-  name = "evolution-${major}.4";
+fetchurl: {
+  name = "evolution-3.20.5";

  src = fetchurl {
-    url = "mirror://gnome/sources/evolution/${major}/${name}.tar.xz";
-    sha256 = "1g1nai6jz0irz94d06vx8gbwbzdp7r53qjxvjfhdqhlhnhy76a9c";
+    url = mirror://gnome/sources/evolution/3.20/evolution-3.20.5.tar.xz;
+    sha256 = "2e13551ce0996963506f0bdde5e01c3b8aa0622849a272ff12877cd595baeb6e";
  };
 }
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix
@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update

 fetchurl: {
-  name = "gnome-maps-3.20.1";
+  name = "gnome-maps-3.20.2";

  src = fetchurl {
-    url = mirror://gnome/sources/gnome-maps/3.20/gnome-maps-3.20.1.tar.xz;
-    sha256 = "4874d10a3cfdffd5d1db6084d67b5e8dc8c2db2ff995302b80060ecfc5e99bd5";
+    url = mirror://gnome/sources/gnome-maps/3.20/gnome-maps-3.20.2.tar.xz;
+    sha256 = "e860144795339fdbb2f1239c4db092ad12beb9acaa3f3f8aa1d935c36d86bc3f";
  };
 }
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix
@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update

 fetchurl: {
-  name = "gnome-photos-3.20.2";
+  name = "gnome-photos-3.20.3";

  src = fetchurl {
-    url = mirror://gnome/sources/gnome-photos/3.20/gnome-photos-3.20.2.tar.xz;
-    sha256 = "ec6b95ad1c4aeeb065a65d2d48335036c0750761c7f6762bafcf874791272b46";
+    url = mirror://gnome/sources/gnome-photos/3.20/gnome-photos-3.20.3.tar.xz;
+    sha256 = "d1dd8bd8178dd1d0120abd2ff3e959fb1199f4e1751558f925ce7f1278548996";
  };
 }
--- a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix
@ -1,11 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update

-fetchurl: rec {
-  major = "3.20";
-  name = "evolution-data-server-${major}.4";
+fetchurl: {
+  name = "evolution-data-server-3.20.5";

  src = fetchurl {
-    url = "mirror://gnome/sources/evolution-data-server/${major}/${name}.tar.xz";
-    sha256 = "03h81dnk34b3xf2065rymr1jd7as4dmpd89hyf380c5np36f6l7j";
+    url = mirror://gnome/sources/evolution-data-server/3.20/evolution-data-server-3.20.5.tar.xz;
+    sha256 = "0d1586cd326d997497a2a6fddd939a83892be07cb20f8c88fda5013f8c5bbe7e";
  };
 }
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix
@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update

 fetchurl: {
-  name = "gnome-calculator-3.20.1";
+  name = "gnome-calculator-3.20.2";

  src = fetchurl {
-    url = mirror://gnome/sources/gnome-calculator/3.20/gnome-calculator-3.20.1.tar.xz;
-    sha256 = "02edcf99857599ac10ecd2faaf33ad20a9f11f7c5a89a52ee1b511d99b594b90";
+    url = mirror://gnome/sources/gnome-calculator/3.20/gnome-calculator-3.20.2.tar.xz;
+    sha256 = "2af1c12a12a230f90fc221ff908efd80fe7eebfeaad56cd698c393d2fc34a8fb";
  };
 }
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix
@ -1,11 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update

-fetchurl: rec {
-  major = "3.20";
-  name = "gnome-online-accounts-${major}.2";
+fetchurl: {
+  name = "gnome-online-accounts-3.20.3";

  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-accounts/${major}/${name}.tar.xz";
-    sha256 = "1pf1rn1i7dqll9ph6scg2g281njx5pq6z0wyj9493m474nfmsmab";
+    url = mirror://gnome/sources/gnome-online-accounts/3.20/gnome-online-accounts-3.20.3.tar.xz;
+    sha256 = "094fc04cf3e0b4ace667fce3b5bdcca5093e0c93f9184439e663c69546c1e046";
  };
 }
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix
@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update

 fetchurl: {
-  name = "gnome-software-3.20.0";
+  name = "gnome-software-3.20.4";

  src = fetchurl {
-    url = mirror://gnome/sources/gnome-software/3.20/gnome-software-3.20.0.tar.xz;
-    sha256 = "0w0bp29fm13a235gq8vylihzjfxx20ri46w4w2syaw0cixxihbix";
+    url = mirror://gnome/sources/gnome-software/3.20/gnome-software-3.20.4.tar.xz;
+    sha256 = "d6a2794348e2c543218e3efb01105a7e6d51e93ad3055a2482e3104ca75345f2";
  };
 }
--- a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix
@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update

 fetchurl: {
-  name = "nautilus-3.20.1";
+  name = "nautilus-3.20.2";

  src = fetchurl {
-    url = mirror://gnome/sources/nautilus/3.20/nautilus-3.20.1.tar.xz;
-    sha256 = "f2a907b994026412a7ed7c8145d4ab4f886ac87e780353b967473305a35e81e8";
+    url = mirror://gnome/sources/nautilus/3.20/nautilus-3.20.2.tar.xz;
+    sha256 = "8d6e679b880dc78c0c2e2dabf6025e6da34ff279dee501f7c75f3649c1a6caae";
  };
 }
--- a/pkgs/desktops/gnome-3/3.20/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/default.nix
@ -321,6 +321,8 @@ let

  gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };

+  nemiver = callPackage ./devtools/nemiver { };
+
 #### Games

  aisleriot = callPackage ./games/aisleriot { };
--- a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/bool_slot.patch
+++ b/pkgs/desktops/gnome-3/3.20/devtools/nemiver/bool_slot.patch
@ -0,0 +1,13 @@
+--- a/src/dbgengine/nmv-dbg-common.h	2014-07-09 10:36:05.000000000 +0200
+++ b/src/dbgengine/nmv-dbg-common.h	2016-08-04 22:40:28.447842746 +0200
+@@ -171,7 +171,9 @@
+ 
+     bool has_slot () const
+     {
+-        return m_slot;
+        //return m_slot;
+        // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822502
+        return static_cast<bool> (m_slot);
+     }
+ 
+     template<class T>
--- a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/devtools/nemiver/default.nix
@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb,
+  boost, sqlite, gconf, libgtop, glibmm, gtkmm, vte, gtksourceview, 
+  gtksourceviewmm, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  inherit (import ./src.nix fetchurl) name src;
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+  buildInputs = [ gtk3 libxml2 intltool itstool gdb boost sqlite gconf libgtop 
+    glibmm gtkmm vte gtksourceview gtksourceviewmm ];
+
+  patches = [ ./bool_slot.patch ./safe_ptr.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://wiki.gnome.org/Apps/Nemiver";
+    description = "Easy to use standalone C/C++ debugger";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.juliendehos ];
+  };
+}
+
--- a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/safe_ptr.patch
+++ b/pkgs/desktops/gnome-3/3.20/devtools/nemiver/safe_ptr.patch
@ -0,0 +1,10 @@
+--- a/src/confmgr/nmv-gconf-mgr.cc	2014-07-08 10:24:06.000000000 +0200
+++ b/src/confmgr/nmv-gconf-mgr.cc	2016-08-04 23:50:08.143060464 +0200
+@@ -32,6 +32,7 @@
+ NEMIVER_BEGIN_NAMESPACE (nemiver)
+ 
+ using nemiver::common::GCharSafePtr;
+using nemiver::common::GErrorSafePtr;
+ 
+ class GConfMgr : public IConfMgr {
+     GConfMgr (const GConfMgr &);
--- a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/devtools/nemiver/src.nix
@ -0,0 +1,11 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "nemiver-0.9.6";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/nemiver/0.9/nemiver-0.9.6.tar.xz;
+    sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
+  };
+}
+
--- a/pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix
@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update

 fetchurl: {
-  name = "five-or-more-3.20.0";
+  name = "five-or-more-3.20.1";

  src = fetchurl {
-    url = mirror://gnome/sources/five-or-more/3.20/five-or-more-3.20.0.tar.xz;
-    sha256 = "4290a0e4a1817d76db2f042854efbc580d6ac06f2c42176afac2b412dcd456e0";
+    url = mirror://gnome/sources/five-or-more/3.20/five-or-more-3.20.1.tar.xz;
+    sha256 = "9f6dff43b6511b12ef062f4dc4d9ab8de2579676747f0ead4802e0f166a5e85f";
  };
 }
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@ -42,6 +42,7 @@ let
    gpgmepp = callPackage ./gpgmepp.nix {};
    gwenview = callPackage ./gwenview.nix {};
    kate = callPackage ./kate.nix {};
+    kdenlive = callPackage ./kdenlive.nix {};
    kcalc = callPackage ./kcalc.nix {};
    kcolorchooser = callPackage ./kcolorchooser.nix {};
    kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
--- a/pkgs/desktops/kde-5/applications/kdenlive.nix
+++ b/pkgs/desktops/kde-5/applications/kdenlive.nix
@ -0,0 +1,81 @@
+{ kdeApp
+, kdeWrapper
+, lib
+, extra-cmake-modules
+, kdoctools
+, qtscript
+, kactivities
+, kconfig
+, kcrash
+, kguiaddons
+, kiconthemes
+, ki18n
+, kinit
+, kio
+, kio-extras
+, kwindowsystem
+, kdbusaddons
+, plasma-framework
+, knotifications
+, knewstuff
+, karchive
+, knotifyconfig
+, kplotting
+, ktextwidgets
+, mlt
+, shared_mime_info
+, libv4l
+, kfilemetadata
+, ffmpeg
+, phonon-backend-vlc
+, qtquickcontrols
+}:
+
+let
+unwrapped = kdeApp {
+  name = "kdenlive";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    qtscript
+    kconfig
+    kcrash
+    kguiaddons
+    kiconthemes
+    kinit
+    kdbusaddons
+    knotifications
+    knewstuff
+    karchive
+    knotifyconfig
+    kplotting
+    ktextwidgets
+    mlt
+    shared_mime_info
+    libv4l
+    ffmpeg
+  ];
+  propagatedBuildInputs = [
+    kactivities
+    ki18n
+    kio
+    kio-extras
+    kwindowsystem
+    kfilemetadata
+    plasma-framework
+    phonon-backend-vlc
+    qtquickcontrols
+  ];
+  enableParallelBuilding = true;
+  meta = {
+    license = with lib.licenses; [ gpl2Plus ];
+  };
+};
+in
+kdeWrapper unwrapped
+{
+  targets = [ "bin/kdenlive" ];
+  paths = [ kinit ];
+}
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@ -55,13 +55,8 @@ let
      else abort "Unrecognized package fetch type";
    };

-  importGodeps = { depsFile, filterPackages ? [] }:
-  let
-    deps = lib.importJSON depsFile;
-    external = filter (d: d ? include) deps;
-    direct = filter (d: d ? goPackagePath && (length filterPackages == 0 || elem d.goPackagePath filterPackages)) deps;
-  in
-    concatLists (map importGodeps (map (d: { depsFile = ./. + d.include; filterPackages = d.packages; }) external)) ++ (map dep2src direct);
+  importGodeps = { depsFile }:
+    map dep2src (lib.importJSON depsFile);

  goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs
                             else extraSrcs;
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@ -14,7 +14,17 @@ stdenv.mkDerivation rec {

  configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi " --enable-music-native-midi-gpl";

-  postInstall = "ln -s $out/include/SDL/SDL_mixer.h $out/include/";
+  postInstall = ''
+    ln -s $out/include/SDL/SDL_mixer.h $out/include/
+
+    for f in $out/include/SDL/SDL_mixer.h
+    do
+      for i in SDL_types.h SDL_rwops.h SDL_audio.h SDL_endian.h SDL_version.h begin_code.h close_code.h
+      do
+        substituteInPlace $f --replace "#include \"$i\"" "#include <SDL/$i>"
+      done
+    done
+  '';

  meta = with stdenv.lib; {
    description = "SDL multi-channel audio mixer library";
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@ -5,13 +5,13 @@
 }:

 stdenv.mkDerivation rec {
-  name = "appstream-glib-0.5.11";
+  name = "appstream-glib-0.5.12";

  src = fetchFromGitHub {
    owner = "hughsie";
    repo = "appstream-glib";
    rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
-    sha256 = "1rvfncm9z29h70pd718j73cd263g6yyxkxrg7zfzy0gj6wwzvhkh";
+    sha256 = "00b0441f409vzgy0znn42k093w7hwv3495qvsakxnhvk1h1ws23s";
  };

  nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ];
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {

  doCheck = true;

+  configureFlags = [ "--enable-libgdbm-compat" ];
+
  meta = with stdenv.lib; {
    description = "GNU dbm key/value database library";

--- a/pkgs/development/libraries/gegl/3.0.nix
+++ b/pkgs/development/libraries/gegl/3.0.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
-, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook }:
+, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw }:

 stdenv.mkDerivation rec {
  name = "gegl-0.3.6";
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    babl libpng cairo libjpeg librsvg pango gtk bzip2 which json_glib intltool
+    libraw
  ];

  nativeBuildInputs = [ pkgconfig autoreconfHook ];
--- a/pkgs/development/libraries/libircclient/default.nix
+++ b/pkgs/development/libraries/libircclient/default.nix
@ -0,0 +1,31 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  name    = "${pname}-${version}";
+  version = "1.9";
+  pname   = "libircclient";
+
+  src = fetchurl {
+    url    = "mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
+    sha256 = "0r60i76jh4drjh2jgp5sx71chagqllmkaq49zv67nrhqwvp9ghw1";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  configureFlags = [ "--enable-shared" ];
+
+  postPatch = ''
+    substituteInPlace src/Makefile.in \
+      --replace "@prefix@/include" "@prefix@/include/libircclient" \
+      --replace "@libdir@"         "@prefix@/lib" \
+      --replace "cp "              "install "
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A small but extremely powerful library which implements the client IRC protocol";
+    homepage    = http://www.ulduzsoft.com/libircclient/;
+    license     = licenses.lgpl3;
+    maintainers = with maintainers; [ obadz ];
+    platforms   = platforms.all;
+  };
+}
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
    sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5";
  };

-  buildInputs = [ lcms2 jasper ];
+  buildInputs = [ jasper ];
+
+  propagatedBuildInputs = [ lcms2 ];

  nativeBuildInputs = [ pkgconfig ];

--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/pkgs/development/libraries/libsidplayfp/default.nix
@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig
+, docSupport ? true, doxygen ? null, graphviz ? null }:
+
+assert docSupport -> doxygen != null && graphviz != null;
+
+stdenv.mkDerivation rec {
+  pname = "libsidplayfp";
+  major = "1";
+  minor = "8";
+  level = "6";
+  version = "${major}.${minor}.${level}";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${name}.tar.gz";
+    sha256 = "0lzivfdq0crmfr01c6f5h883yr7wvagq198xkk3srdmvshhxmwnw";
+  };
+
+  nativeBuildInputs = [ pkgconfig ]
+    ++ stdenv.lib.optionals docSupport [ doxygen graphviz ];
+
+  installTargets = [ "install" ]
+    ++ stdenv.lib.optionals docSupport [ "doc" ];
+
+  outputs = [ "out" ] ++ stdenv.lib.optionals docSupport [ "doc" ];
+
+  postInstall = stdenv.lib.optionalString docSupport ''
+    mkdir -p $doc/share/doc/libsidplayfp
+    mv docs/html $doc/share/doc/libsidplayfp/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A library to play Commodore 64 music derived from libsidplay2";
+    homepage = https://sourceforge.net/projects/sidplay-residfp/;
+    license = with licenses; [ gpl2Plus ];
+    maintainers = with maintainers; [ ramkromberg ];
+    platforms = with platforms; unix;
+  };
+}
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@ -4,11 +4,11 @@

 stdenv.mkDerivation rec {
  name = "mlt-${version}";
-  version = "0.9.6";
+  version = "0.9.8";

  src = fetchurl {
    url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz";
-    sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh";
+    sha256 = "0x0hsb05i7g70dh3jll41qlvcylailfgsr0y1dpx7hyigynxc50j";
  };

  buildInputs = [
--- a/pkgs/development/tools/deis/deps.json
+++ b/pkgs/development/tools/deis/deps.json
@ -1,10 +1,29 @@
 [
    {
-        "include": "../../../go-modules/libs.json",
-        "packages": [
-            "github.com/docopt/docopt-go",
-            "golang.org/x/crypto",
-            "gopkg.in/yaml.v2"
-        ]
+        "goPackagePath": "gopkg.in/yaml.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/yaml.v2",
+            "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
+            "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
+        }
+    },
+    {
+        "goPackagePath": "github.com/docopt/docopt-go",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/docopt/docopt-go",
+            "rev": "784ddc588536785e7299f7272f39101f7faccc3f",
+            "sha256": "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
    }
 ]
--- a/pkgs/development/tools/go2nix/deps.json
+++ b/pkgs/development/tools/go2nix/deps.json
@ -1,9 +1,20 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/Masterminds/vcs",
-      "github.com/jawher/mow.cli"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/Masterminds/vcs",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/Masterminds/vcs",
+            "rev": "7af28b64c5ec41b1558f5514fd938379822c237c",
+            "sha256": "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6"
+        }
+    },
+    {
+        "goPackagePath": "github.com/jawher/mow.cli",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/jawher/mow.cli",
+            "rev": "772320464101e904cd51198160eb4d489be9cc49",
+            "sha256": "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j"
+        }
+    }
 ]
--- a/pkgs/development/tools/golint/deps.json
+++ b/pkgs/development/tools/golint/deps.json
@ -1,8 +1,11 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "golang.org/x/tools"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/tools",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/tools",
+            "rev": "9ae4729fba20b3533d829a9c6ba8195b068f2abc",
+            "sha256": "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"
+        }
+    }
 ]
--- a/pkgs/development/tools/gotools/deps.json
+++ b/pkgs/development/tools/gotools/deps.json
@ -1,8 +1,11 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "golang.org/x/net"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/net",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/net",
+            "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",
+            "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"
+        }
+    }
 ]
--- a/pkgs/development/tools/gox/deps.json
+++ b/pkgs/development/tools/gox/deps.json
@ -1,8 +1,11 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/mitchellh/iochan"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/mitchellh/iochan",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mitchellh/iochan",
+            "rev": "b584a329b193e206025682ae6c10cdbe03b0cd77",
+            "sha256": "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"
+        }
+    }
 ]
--- a/pkgs/development/tools/remarshal/deps.json
+++ b/pkgs/development/tools/remarshal/deps.json
@ -1,9 +1,20 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/BurntSushi/toml",
-      "gopkg.in/yaml.v2"
-    ]
-  }
+    {
+        "goPackagePath": "gopkg.in/yaml.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/yaml.v2",
+            "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
+            "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
+        }
+    },
+    {
+        "goPackagePath": "github.com/BurntSushi/toml",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/BurntSushi/toml",
+            "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4",
+            "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"
+        }
+    }
 ]
--- a/pkgs/development/tools/textql/deps.json
+++ b/pkgs/development/tools/textql/deps.json
@ -1,8 +1,11 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/mattn/go-sqlite3"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/mattn/go-sqlite3",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mattn/go-sqlite3",
+            "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42",
+            "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"
+        }
+    }
 ]
--- a/pkgs/development/web/minify/deps.json
+++ b/pkgs/development/web/minify/deps.json
@ -1,15 +1,74 @@
 [
    {
-        "include": "../../libs.json",
-        "packages": [
-            "github.com/tdewolff/buffer",
-            "github.com/tdewolff/parse",
-            "github.com/tdewolff/strconv",
-            "github.com/dustin/go-humanize",
-            "github.com/fsnotify/fsnotify",
-            "github.com/matryer/try",
-            "github.com/ogier/pflag",
-            "golang.org/x/sys"
-        ]
+        "goPackagePath": "golang.org/x/sys",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/sys",
+            "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f",
+            "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"
+        }
+    },
+    {
+        "goPackagePath": "github.com/dustin/go-humanize",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/dustin/go-humanize",
+            "rev": "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0",
+            "sha256": "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0"
+        }
+    },
+    {
+        "goPackagePath": "github.com/tdewolff/buffer",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/tdewolff/buffer",
+            "rev": "0edfcb7b750146ff879e95831de2ef53605a5cb5",
+            "sha256": "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl"
+        }
+    },
+    {
+        "goPackagePath": "github.com/tdewolff/parse",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/tdewolff/parse",
+            "rev": "34d5c1160d4503da4b456e5094609f2331d6dde3",
+            "sha256": "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v"
+        }
+    },
+    {
+        "goPackagePath": "github.com/tdewolff/strconv",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/tdewolff/strconv",
+            "rev": "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3",
+            "sha256": "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp"
+        }
+    },
+    {
+        "goPackagePath": "github.com/matryer/try",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/matryer/try",
+            "rev": "93d30e50512f879b73829eb79867df38084bcd31",
+            "sha256": "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f"
+        }
+    },
+    {
+        "goPackagePath": "github.com/fsnotify/fsnotify",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/fsnotify/fsnotify",
+            "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8",
+            "sha256": "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"
+        }
+    },
+    {
+        "goPackagePath": "github.com/ogier/pflag",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/ogier/pflag",
+            "rev": "45c278ab3607870051a2ea9040bb85fcb8557481",
+            "sha256": "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"
+        }
    }
 ]
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@ -0,0 +1,41 @@
+{ stdenv, lib, fetchFromGitHub, qmake4Hook, qt4, protobuf, boost155, tinyxml2, libgcrypt, sqlite, gsasl, curl, SDL, SDL_mixer, libircclient }:
+
+let boost = boost155;
+in stdenv.mkDerivation rec {
+  name            = "${pname}-${version}";
+  pname           = "pokerth";
+  version         = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner  = pname;
+    repo   = pname;
+    rev    = "7f3c8a860848c16c8c2f78e3929a65a54ef4c04c";
+    sha256 = "1md3sl7pdpn3n42k75pxqbkkl19cz4699g1vdi04qpp0jxx09a2k";
+  };
+
+  buildInputs = [ qmake4Hook qt4 protobuf boost tinyxml2 libgcrypt sqlite gsasl curl SDL SDL_mixer libircclient ];
+
+  outputs = [ "out" "server" ];
+
+  qmakeFlags = [ "pokerth.pro" ];
+
+  postPatch = ''
+    for f in connectivity.pro load.pro pokerth_game.pro pokerth_server.pro
+    do
+      substituteInPlace $f \
+        --replace 'LIB_DIRS =' 'LIB_DIRS = ${boost.out}/lib'
+    done
+  '';
+
+  postInstall = ''
+    install -D -m755 bin/pokerth_server $server/bin/pokerth_server
+  '';
+
+  meta = with stdenv.lib; {
+    homepage    = http://www.pokerth.net/;
+    description = "Open Source Poker client and server";
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ obadz ];
+    platforms   = platforms.all;
+  };
+}
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@ -1,20 +1,22 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:

 import ./generic.nix (args // rec {
-  mptcpVersion = "0.90.1";
-  modDirVersion = "3.18.25";
+  mptcpVersion = "0.91";
+  modDirVersion = "4.1.26";
  version = "${modDirVersion}-mptcp_v${mptcpVersion}";

  extraMeta = {
-    branch = "3.18";
+    branch = "4.1";
    maintainers = stdenv.lib.maintainers.layus;
  };

  src = fetchurl {
    url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz";
-    sha256 = "088cpxl960xzrsz7x2lkq28ksa4gzjb1hp5yf8hxshihyhdaspwl";
+    sha256 = "0rbvgz89j5wk781y201qdxy2kz4gmlamb72wdbxj8mxv92x56lh3";
  };

+  kernelPatches = args.kernelPatches;
+
  extraConfig = ''
    IPV6 y
    MPTCP y
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@ -136,10 +136,6 @@ rec {
    { name = "mfd_fix_dependency";
      patch = ./chromiumos-patches/mfd-fix-dependency.patch;
    };
-  qat_common_Makefile =
-    { name = "qat_common_Makefile";
-      patch = ./qat_common_Makefile.patch;
-    };

  hiddev_CVE_2016_5829 =
    { name = "hiddev_CVE_2016_5829";
--- a/pkgs/os-specific/linux/kernel/qat_common_Makefile.patch
+++ b/pkgs/os-specific/linux/kernel/qat_common_Makefile.patch
@ -1,10 +0,0 @@
--- a/drivers/crypto/qat/qat_common/Makefile
-+++ b/drivers/crypto/qat/qat_common/Makefile
-@@ -2,6 +2,7 @@
- 			     $(obj)/qat_rsapubkey-asn1.h
- $(obj)/qat_rsaprivkey-asn1.o: $(obj)/qat_rsaprivkey-asn1.c \
- 			      $(obj)/qat_rsaprivkey-asn1.h
-+$(obj)/qat_asym_algs.o: $(obj)/qat_rsaprivkey-asn1.h $(obj)/qat_rsapubkey-asn1.h
- 
- clean-files += qat_rsapubkey-asn1.c qat_rsapubkey-asn1.h
- clean-files += qat_rsaprivkey-asn1.c qat_rsapvivkey-asn1.h
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "microcode-intel-${version}";
-  version = "20150121";
+  version = "20160714";

  src = fetchurl {
-    url = "http://downloadmirror.intel.com/24661/eng/microcode-${version}.tgz";
-    sha256 = "1cznv3f25cxkwxdc930ab0ifvq0c76fryppadi4p26a2pf9knd93";
+    url = "http://downloadmirror.intel.com/26156/eng/microcode-${version}.tgz";
+    sha256 = "03l4pkymrgbd5y9m5ys7kq85zvckmjbw7xr6pkzg2nr7jgycdagk";
  };

  buildInputs = [ libarchive ];
--- a/pkgs/servers/caddy/deps.json
+++ b/pkgs/servers/caddy/deps.json
@ -1,23 +1,146 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/BurntSushi/toml",
-      "github.com/flynn/go-shlex",
-      "github.com/hashicorp/go-syslog",
-      "gopkg.in/yaml.v2",
-      "github.com/xenolf/lego",
-      "golang.org/x/crypto",
-      "gopkg.in/natefinch/lumberjack.v2",
-      "github.com/shurcooL/sanitized_anchor_name",
-      "gopkg.in/square/go-jose.v1",
-      "github.com/mholt/archiver",
-      "github.com/dustin/go-humanize",
-      "github.com/gorilla/websocket",
-      "github.com/jimstudt/http-authentication",
-      "github.com/miekg/dns",
-      "golang.org/x/net",
-      "github.com/russross/blackfriday"
-    ]
-  }
+    {
+        "goPackagePath": "gopkg.in/yaml.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/yaml.v2",
+            "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
+            "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/net",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/net",
+            "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",
+            "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"
+        }
+    },
+    {
+        "goPackagePath": "github.com/gorilla/websocket",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/gorilla/websocket",
+            "rev": "a622679ebd7a3b813862379232f645f8e690e43f",
+            "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"
+        }
+    },
+    {
+        "goPackagePath": "github.com/miekg/dns",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/miekg/dns",
+            "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa",
+            "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"
+        }
+    },
+    {
+        "goPackagePath": "github.com/BurntSushi/toml",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/BurntSushi/toml",
+            "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4",
+            "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"
+        }
+    },
+    {
+        "goPackagePath": "github.com/hashicorp/go-syslog",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/hashicorp/go-syslog",
+            "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba",
+            "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"
+        }
+    },
+    {
+        "goPackagePath": "github.com/flynn/go-shlex",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/flynn/go-shlex",
+            "rev": "3f9db97f856818214da2e1057f8ad84803971cff",
+            "sha256": "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"
+        }
+    },
+    {
+        "goPackagePath": "github.com/xenolf/lego",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/xenolf/lego",
+            "rev": "ca19a90028e242e878585941c2a27c8f3b3efc25",
+            "sha256": "1zkcsbdzbmfzk3kqmcj9l13li8sz228xhrw2wj3ab4a0w6drbw3x"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/natefinch/lumberjack.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/natefinch/lumberjack.v2",
+            "rev": "514cbda263a734ae8caac038dadf05f8f3f9f738",
+            "sha256": "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82"
+        }
+    },
+    {
+        "goPackagePath": "github.com/shurcooL/sanitized_anchor_name",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/shurcooL/sanitized_anchor_name",
+            "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77",
+            "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/square/go-jose.v1",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/square/go-jose.v1",
+            "rev": "40d457b439244b546f023d056628e5184136899b",
+            "sha256": "0asa1kl1qbx0cyayk44jhxxff0awpkwiw6va7yzrzjzhfc5kvg7p"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mholt/archiver",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mholt/archiver",
+            "rev": "85f054813ed511646b0ce5e047697e0651b8e1a4",
+            "sha256": "0b38mrfm3rwgdi7hrp4gjhf0y0f6bw73qjkfrkafxjrdpdg7nyly"
+        }
+    },
+    {
+        "goPackagePath": "github.com/dustin/go-humanize",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/dustin/go-humanize",
+            "rev": "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0",
+            "sha256": "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0"
+        }
+    },
+    {
+        "goPackagePath": "github.com/jimstudt/http-authentication",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/jimstudt/http-authentication",
+            "rev": "3eca13d6893afd7ecabe15f4445f5d2872a1b012",
+            "sha256": "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08"
+        }
+    },
+    {
+        "goPackagePath": "github.com/russross/blackfriday",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/russross/blackfriday",
+            "rev": "d18b67ae0afd61dae240896eae1785f00709aa31",
+            "sha256": "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"
+        }
+    }
 ]
--- a/pkgs/servers/etcd/deps.json
+++ b/pkgs/servers/etcd/deps.json
@ -1,9 +1,20 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/olekukonko/tablewriter",
-      "github.com/mattn/go-runewidth"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/olekukonko/tablewriter",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/olekukonko/tablewriter",
+            "rev": "cca8bbc0798408af109aaaa239cbd2634846b340",
+            "sha256": "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mattn/go-runewidth",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mattn/go-runewidth",
+            "rev": "d6bea18f789704b5f83375793155289da36a3c7f",
+            "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"
+        }
+    }
 ]
--- a/pkgs/servers/gotty/deps.json
+++ b/pkgs/servers/gotty/deps.json
@ -1,15 +1,74 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/kr/pty",
-      "github.com/braintree/manners",
-      "github.com/codegangsta/cli",
-      "github.com/elazarl/go-bindata-assetfs",
-      "github.com/fatih/structs",
-      "github.com/gorilla/websocket",
-      "github.com/hashicorp/hcl",
-      "github.com/hashicorp/go-multierror"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/gorilla/websocket",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/gorilla/websocket",
+            "rev": "a622679ebd7a3b813862379232f645f8e690e43f",
+            "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"
+        }
+    },
+    {
+        "goPackagePath": "github.com/kr/pty",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/kr/pty",
+            "rev": "67e2db24c831afa6c64fc17b4a143390674365ef",
+            "sha256": "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"
+        }
+    },
+    {
+        "goPackagePath": "github.com/braintree/manners",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/braintree/manners",
+            "rev": "cab36f97339b1925cd89e158632728025557e550",
+            "sha256": "1q508c62iiklghkhwqz9c0zsn9hrij7kqb93gdywzj7ms7x6hlfh"
+        }
+    },
+    {
+        "goPackagePath": "github.com/codegangsta/cli",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/codegangsta/cli",
+            "rev": "71f57d300dd6a780ac1856c005c4b518cfd498ec",
+            "sha256": "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3"
+        }
+    },
+    {
+        "goPackagePath": "github.com/elazarl/go-bindata-assetfs",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/elazarl/go-bindata-assetfs",
+            "rev": "d5cac425555ca5cf00694df246e04f05e6a55150",
+            "sha256": "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17"
+        }
+    },
+    {
+        "goPackagePath": "github.com/fatih/structs",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/fatih/structs",
+            "rev": "a9f7daa9c2729e97450c2da2feda19130a367d8f",
+            "sha256": "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50"
+        }
+    },
+    {
+        "goPackagePath": "github.com/hashicorp/hcl",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/hashicorp/hcl",
+            "rev": "54864211433d45cb780682431585b3e573b49e4a",
+            "sha256": "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"
+        }
+    },
+    {
+        "goPackagePath": "github.com/hashicorp/go-multierror",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/hashicorp/go-multierror",
+            "rev": "56912fb08d85084aa318edcf2bba735b97cf35c5",
+            "sha256": "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"
+        }
+    }
 ]
--- a/pkgs/servers/interlock/deps.json
+++ b/pkgs/servers/interlock/deps.json
@ -1,14 +1,65 @@
 [
-  {
-    "include": "../../../go-modules/libs.json",
-    "packages": [
-      "github.com/Sirupsen/logrus",
-      "github.com/agl/ed25519",
-      "github.com/golang/protobuf",
-      "github.com/janimo/textsecure",
-      "golang.org/x/crypto",
-      "golang.org/x/net",
-      "gopkg.in/yaml.v2"
-    ]
-  }
+    {
+        "goPackagePath": "gopkg.in/yaml.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/yaml.v2",
+            "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
+            "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/Sirupsen/logrus",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/Sirupsen/logrus",
+            "rev": "be52937128b38f1d99787bb476c789e2af1147f1",
+            "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"
+        }
+    },
+    {
+        "goPackagePath": "github.com/agl/ed25519",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/agl/ed25519",
+            "rev": "278e1ec8e8a6e017cd07577924d6766039146ced",
+            "sha256": "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/janimo/textsecure",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/janimo/textsecure",
+            "rev": "c38f429e48d6b2776d17b4171f216f132185b0f6",
+            "sha256": "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/net",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/net",
+            "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",
+            "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"
+        }
+    }
 ]
--- a/pkgs/servers/mesos-dns/deps.json
+++ b/pkgs/servers/mesos-dns/deps.json
@ -1,18 +1,101 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/gogo/protobuf",
-      "github.com/golang/glog",
-      "github.com/mesos/mesos-go",
-      "github.com/pmezard/go-difflib",
-      "github.com/samuel/go-zookeeper",
-      "github.com/stretchr/objx",
-      "github.com/davecgh/go-spew",
-      "github.com/emicklei/go-restful",
-      "github.com/stretchr/testify",
-      "github.com/miekg/dns",
-      "golang.org/x/net"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/net",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/net",
+            "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",
+            "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"
+        }
+    },
+    {
+        "goPackagePath": "github.com/miekg/dns",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/miekg/dns",
+            "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa",
+            "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"
+        }
+    },
+    {
+        "goPackagePath": "github.com/gogo/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/gogo/protobuf",
+            "rev": "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4",
+            "sha256": "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372"
+        }
+    },
+    {
+        "goPackagePath": "github.com/golang/glog",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/glog",
+            "rev": "fca8c8854093a154ff1eb580aae10276ad6b1b5f",
+            "sha256": "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mesos/mesos-go",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mesos/mesos-go",
+            "rev": "aaa5b2fecf0e2db463f4f996c89617d6766b2969",
+            "sha256": "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk"
+        }
+    },
+    {
+        "goPackagePath": "github.com/pmezard/go-difflib",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/pmezard/go-difflib",
+            "rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d",
+            "sha256": "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"
+        }
+    },
+    {
+        "goPackagePath": "github.com/samuel/go-zookeeper",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/samuel/go-zookeeper",
+            "rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4",
+            "sha256": "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"
+        }
+    },
+    {
+        "goPackagePath": "github.com/stretchr/objx",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/stretchr/objx",
+            "rev": "cbeaeb16a013161a98496fad62933b1d21786672",
+            "sha256": "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"
+        }
+    },
+    {
+        "goPackagePath": "github.com/davecgh/go-spew",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/davecgh/go-spew",
+            "rev": "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d",
+            "sha256": "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"
+        }
+    },
+    {
+        "goPackagePath": "github.com/emicklei/go-restful",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/emicklei/go-restful",
+            "rev": "892402ba11a2e2fd5e1295dd633481f27365f14d",
+            "sha256": "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x"
+        }
+    },
+    {
+        "goPackagePath": "github.com/stretchr/testify",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/stretchr/testify",
+            "rev": "089c7181b8c728499929ff09b62d3fdd8df8adff",
+            "sha256": "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p"
+        }
+    }
 ]
--- a/pkgs/servers/monitoring/prometheus/cli_deps.json
+++ b/pkgs/servers/monitoring/prometheus/cli_deps.json
@ -1,8 +1,11 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/prometheus/client_golang"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/prometheus/client_golang",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_golang",
+            "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864",
+            "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"
+        }
+    }
 ]
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json
@ -1,14 +1,65 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/prometheus/client_golang",
-      "github.com/prometheus/client_model",
-      "github.com/prometheus/procfs",
-      "bitbucket.org/ww/goautoneg",
-      "github.com/beorn7/perks",
-      "github.com/golang/protobuf",
-      "github.com/matttproud/golang_protobuf_extensions"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_model",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_model",
+            "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6",
+            "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/beorn7/perks",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/beorn7/perks",
+            "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d",
+            "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"
+        }
+    },
+    {
+        "goPackagePath": "github.com/matttproud/golang_protobuf_extensions",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/matttproud/golang_protobuf_extensions",
+            "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a",
+            "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_golang",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_golang",
+            "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864",
+            "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/procfs",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/procfs",
+            "rev": "c91d8eefde16bd047416409eb56353ea84a186e4",
+            "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"
+        }
+    },
+    {
+        "goPackagePath": "bitbucket.org/ww/goautoneg",
+        "fetch": {
+            "type": "hg",
+            "url": "bitbucket.org/ww/goautoneg",
+            "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675",
+            "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"
+        }
+    }
 ]
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json
@ -1,14 +1,65 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/prometheus/client_golang",
-      "github.com/prometheus/client_model",
-      "github.com/matttproud/golang_protobuf_extensions",
-      "github.com/prometheus/procfs",
-      "github.com/beorn7/perks",
-      "github.com/golang/protobuf",
-      "bitbucket.org/ww/goautoneg"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_model",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_model",
+            "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6",
+            "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/beorn7/perks",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/beorn7/perks",
+            "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d",
+            "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"
+        }
+    },
+    {
+        "goPackagePath": "github.com/matttproud/golang_protobuf_extensions",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/matttproud/golang_protobuf_extensions",
+            "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a",
+            "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_golang",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_golang",
+            "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864",
+            "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/procfs",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/procfs",
+            "rev": "c91d8eefde16bd047416409eb56353ea84a186e4",
+            "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"
+        }
+    },
+    {
+        "goPackagePath": "bitbucket.org/ww/goautoneg",
+        "fetch": {
+            "type": "hg",
+            "url": "bitbucket.org/ww/goautoneg",
+            "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675",
+            "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"
+        }
+    }
 ]
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json
+++ b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json
@ -1,16 +1,83 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/golang/glog",
-      "github.com/prometheus/client_golang",
-      "github.com/prometheus/client_model",
-      "github.com/antonlindstrom/mesos_stats",
-      "github.com/beorn7/perks",
-      "github.com/golang/protobuf",
-      "github.com/matttproud/golang_protobuf_extensions",
-      "github.com/prometheus/procfs",
-      "bitbucket.org/ww/goautoneg"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_model",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_model",
+            "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6",
+            "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/beorn7/perks",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/beorn7/perks",
+            "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d",
+            "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"
+        }
+    },
+    {
+        "goPackagePath": "github.com/matttproud/golang_protobuf_extensions",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/matttproud/golang_protobuf_extensions",
+            "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a",
+            "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_golang",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_golang",
+            "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864",
+            "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/procfs",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/procfs",
+            "rev": "c91d8eefde16bd047416409eb56353ea84a186e4",
+            "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"
+        }
+    },
+    {
+        "goPackagePath": "github.com/golang/glog",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/glog",
+            "rev": "fca8c8854093a154ff1eb580aae10276ad6b1b5f",
+            "sha256": "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"
+        }
+    },
+    {
+        "goPackagePath": "bitbucket.org/ww/goautoneg",
+        "fetch": {
+            "type": "hg",
+            "url": "bitbucket.org/ww/goautoneg",
+            "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675",
+            "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"
+        }
+    },
+    {
+        "goPackagePath": "github.com/antonlindstrom/mesos_stats",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/antonlindstrom/mesos_stats",
+            "rev": "0c6ea494c19bedc67ebb85ce3d187ec21050e920",
+            "sha256": "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"
+        }
+    }
 ]
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json
@ -1,15 +1,74 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/prometheus/client_golang",
-      "github.com/prometheus/client_model",
-      "github.com/matttproud/golang_protobuf_extensions",
-      "github.com/prometheus/procfs",
-      "github.com/beorn7/perks",
-      "github.com/golang/protobuf",
-      "bitbucket.org/ww/goautoneg",
-      "github.com/go-sql-driver/mysql"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_model",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_model",
+            "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6",
+            "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/beorn7/perks",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/beorn7/perks",
+            "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d",
+            "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"
+        }
+    },
+    {
+        "goPackagePath": "github.com/matttproud/golang_protobuf_extensions",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/matttproud/golang_protobuf_extensions",
+            "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a",
+            "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_golang",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_golang",
+            "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864",
+            "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/procfs",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/procfs",
+            "rev": "c91d8eefde16bd047416409eb56353ea84a186e4",
+            "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"
+        }
+    },
+    {
+        "goPackagePath": "bitbucket.org/ww/goautoneg",
+        "fetch": {
+            "type": "hg",
+            "url": "bitbucket.org/ww/goautoneg",
+            "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675",
+            "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"
+        }
+    },
+    {
+        "goPackagePath": "github.com/go-sql-driver/mysql",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/go-sql-driver/mysql",
+            "rev": "fb7299726d2e68745a8805b14f2ff44b5c2cfa84",
+            "sha256": "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w"
+        }
+    }
 ]
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json
@ -1,16 +1,83 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/prometheus/log",
-      "github.com/prometheus/client_golang",
-      "github.com/prometheus/client_model",
-      "github.com/prometheus/procfs",
-      "github.com/Sirupsen/logrus",
-      "github.com/beorn7/perks",
-      "github.com/golang/protobuf",
-      "github.com/matttproud/golang_protobuf_extensions",
-      "bitbucket.org/ww/goautoneg"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/Sirupsen/logrus",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/Sirupsen/logrus",
+            "rev": "be52937128b38f1d99787bb476c789e2af1147f1",
+            "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"
+        }
+    },
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_model",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_model",
+            "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6",
+            "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/beorn7/perks",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/beorn7/perks",
+            "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d",
+            "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"
+        }
+    },
+    {
+        "goPackagePath": "github.com/matttproud/golang_protobuf_extensions",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/matttproud/golang_protobuf_extensions",
+            "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a",
+            "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_golang",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_golang",
+            "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864",
+            "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/procfs",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/procfs",
+            "rev": "c91d8eefde16bd047416409eb56353ea84a186e4",
+            "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"
+        }
+    },
+    {
+        "goPackagePath": "bitbucket.org/ww/goautoneg",
+        "fetch": {
+            "type": "hg",
+            "url": "bitbucket.org/ww/goautoneg",
+            "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675",
+            "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/log",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/log",
+            "rev": "439e5db48fbb50ebbaf2c816030473a62f505f55",
+            "sha256": "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"
+        }
+    }
 ]
--- a/pkgs/servers/monitoring/prometheus/prom2json_deps.json
+++ b/pkgs/servers/monitoring/prometheus/prom2json_deps.json
@ -1,11 +1,38 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/golang/protobuf",
-      "github.com/matttproud/golang_protobuf_extensions",
-      "github.com/prometheus/client_golang",
-      "github.com/prometheus/client_model"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_model",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_model",
+            "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6",
+            "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/matttproud/golang_protobuf_extensions",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/matttproud/golang_protobuf_extensions",
+            "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a",
+            "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_golang",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_golang",
+            "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864",
+            "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"
+        }
+    }
 ]
--- a/pkgs/servers/monitoring/prometheus/pushgateway_deps.json
+++ b/pkgs/servers/monitoring/prometheus/pushgateway_deps.json
@ -1,15 +1,74 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/julienschmidt/httprouter",
-      "github.com/prometheus/client_golang",
-      "github.com/prometheus/client_model",
-      "bitbucket.org/ww/goautoneg",
-      "github.com/golang/protobuf",
-      "github.com/matttproud/golang_protobuf_extensions",
-      "github.com/prometheus/procfs",
-      "github.com/beorn7/perks"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_model",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_model",
+            "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6",
+            "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/beorn7/perks",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/beorn7/perks",
+            "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d",
+            "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"
+        }
+    },
+    {
+        "goPackagePath": "github.com/matttproud/golang_protobuf_extensions",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/matttproud/golang_protobuf_extensions",
+            "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a",
+            "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_golang",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_golang",
+            "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864",
+            "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/procfs",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/procfs",
+            "rev": "c91d8eefde16bd047416409eb56353ea84a186e4",
+            "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"
+        }
+    },
+    {
+        "goPackagePath": "bitbucket.org/ww/goautoneg",
+        "fetch": {
+            "type": "hg",
+            "url": "bitbucket.org/ww/goautoneg",
+            "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675",
+            "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"
+        }
+    },
+    {
+        "goPackagePath": "github.com/julienschmidt/httprouter",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/julienschmidt/httprouter",
+            "rev": "6aacfd5ab513e34f7e64ea9627ab9670371b34e7",
+            "sha256": "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl"
+        }
+    }
 ]
--- a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json
+++ b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json
@ -1,15 +1,74 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/howeyc/fsnotify",
-      "github.com/prometheus/client_golang",
-      "github.com/prometheus/client_model",
-      "bitbucket.org/ww/goautoneg",
-      "github.com/beorn7/perks",
-      "github.com/golang/protobuf",
-      "github.com/matttproud/golang_protobuf_extensions",
-      "github.com/prometheus/procfs"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_model",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_model",
+            "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6",
+            "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/beorn7/perks",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/beorn7/perks",
+            "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d",
+            "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"
+        }
+    },
+    {
+        "goPackagePath": "github.com/matttproud/golang_protobuf_extensions",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/matttproud/golang_protobuf_extensions",
+            "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a",
+            "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_golang",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_golang",
+            "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864",
+            "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/procfs",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/procfs",
+            "rev": "c91d8eefde16bd047416409eb56353ea84a186e4",
+            "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"
+        }
+    },
+    {
+        "goPackagePath": "bitbucket.org/ww/goautoneg",
+        "fetch": {
+            "type": "hg",
+            "url": "bitbucket.org/ww/goautoneg",
+            "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675",
+            "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"
+        }
+    },
+    {
+        "goPackagePath": "github.com/howeyc/fsnotify",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/fsnotify/fsnotify",
+            "rev": "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6",
+            "sha256": "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9"
+        }
+    }
 ]
--- a/pkgs/servers/nsq/deps.json
+++ b/pkgs/servers/nsq/deps.json
@ -1,16 +1,83 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/mreiferson/go-snappystream",
-      "github.com/bitly/go-nsq",
-      "github.com/bitly/go-simplejson",
-      "github.com/blang/semver",
-      "github.com/bmizerany/perks",
-      "github.com/BurntSushi/toml",
-      "github.com/bitly/go-hostpool",
-      "github.com/bitly/timer_metrics",
-      "github.com/mreiferson/go-options"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/mreiferson/go-snappystream",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mreiferson/go-snappystream",
+            "rev": "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504",
+            "sha256": "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"
+        }
+    },
+    {
+        "goPackagePath": "github.com/bitly/go-nsq",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/bitly/go-nsq",
+            "rev": "22a8bd48c443ec23bb559675b6df8284bbbdab29",
+            "sha256": "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46"
+        }
+    },
+    {
+        "goPackagePath": "github.com/bitly/go-simplejson",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/bitly/go-simplejson",
+            "rev": "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a",
+            "sha256": "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"
+        }
+    },
+    {
+        "goPackagePath": "github.com/blang/semver",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/blang/semver",
+            "rev": "9bf7bff48b0388cb75991e58c6df7d13e982f1f2",
+            "sha256": "11sinbf942dpyc9wdpidkhmqn438cfp5n8x3xqnmq9aszkld9hy7"
+        }
+    },
+    {
+        "goPackagePath": "github.com/bmizerany/perks",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/bmizerany/perks",
+            "rev": "6cb9d9d729303ee2628580d9aec5db968da3a607",
+            "sha256": "0cdh84hmn21is6hvv6dy9qjdcg9w3l2k8avlk0881a8cqm09s90j"
+        }
+    },
+    {
+        "goPackagePath": "github.com/BurntSushi/toml",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/BurntSushi/toml",
+            "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4",
+            "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"
+        }
+    },
+    {
+        "goPackagePath": "github.com/bitly/go-hostpool",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/bitly/go-hostpool",
+            "rev": "d0e59c22a56e8dadfed24f74f452cea5a52722d2",
+            "sha256": "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"
+        }
+    },
+    {
+        "goPackagePath": "github.com/bitly/timer_metrics",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/bitly/timer_metrics",
+            "rev": "afad1794bb13e2a094720aeb27c088aa64564895",
+            "sha256": "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mreiferson/go-options",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mreiferson/go-options",
+            "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52",
+            "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"
+        }
+    }
 ]
--- a/pkgs/servers/oauth2_proxy/deps.json
+++ b/pkgs/servers/oauth2_proxy/deps.json
@ -1,16 +1,83 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "google.golang.org/api",
-      "google.golang.org/cloud",
-      "golang.org/x/oauth2",
-      "github.com/18F/hmacauth",
-      "github.com/mreiferson/go-options",
-      "github.com/BurntSushi/toml",
-      "github.com/bitly/go-simplejson",
-      "golang.org/x/net",
-      "gopkg.in/fsnotify.v1"
-    ]
-  }
+    {
+        "goPackagePath": "gopkg.in/fsnotify.v1",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/fsnotify.v1",
+            "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0",
+            "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/net",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/net",
+            "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",
+            "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"
+        }
+    },
+    {
+        "goPackagePath": "github.com/bitly/go-simplejson",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/bitly/go-simplejson",
+            "rev": "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a",
+            "sha256": "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"
+        }
+    },
+    {
+        "goPackagePath": "github.com/BurntSushi/toml",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/BurntSushi/toml",
+            "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4",
+            "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mreiferson/go-options",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mreiferson/go-options",
+            "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52",
+            "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"
+        }
+    },
+    {
+        "goPackagePath": "google.golang.org/api",
+        "fetch": {
+            "type": "git",
+            "url": "https://code.googlesource.com/google-api-go-client",
+            "rev": "a5c3e2a4792aff40e59840d9ecdff0542a202a80",
+            "sha256": "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"
+        }
+    },
+    {
+        "goPackagePath": "google.golang.org/cloud",
+        "fetch": {
+            "type": "git",
+            "url": "https://code.googlesource.com/gocloud",
+            "rev": "6335269abf9002cf5a84613c13cda6010842b834",
+            "sha256": "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/oauth2",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/oauth2",
+            "rev": "397fe7649477ff2e8ced8fc0b2696f781e53745a",
+            "sha256": "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"
+        }
+    },
+    {
+        "goPackagePath": "github.com/18F/hmacauth",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/18F/hmacauth",
+            "rev": "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd",
+            "sha256": "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1"
+        }
+    }
 ]
--- a/pkgs/servers/serf/deps.json
+++ b/pkgs/servers/serf/deps.json
@ -1,23 +1,137 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/armon/go-metrics",
-      "github.com/mattn/go-isatty",
-      "github.com/hashicorp/logutils",
-      "github.com/armon/go-radix",
-      "github.com/bgentry/speakeasy",
-      "github.com/hashicorp/go-syslog",
-      "github.com/hashicorp/memberlist",
-      "github.com/mitchellh/mapstructure",
-      "github.com/armon/circbuf",
-      "github.com/hashicorp/go-msgpack",
-      "github.com/hashicorp/go.net",
-      "github.com/hashicorp/mdns",
-      "github.com/mitchellh/cli",
-      "github.com/ryanuber/columnize",
-      "github.com/miekg/dns",
-      "golang.org/x/crypto"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/miekg/dns",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/miekg/dns",
+            "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa",
+            "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"
+        }
+    },
+    {
+        "goPackagePath": "github.com/armon/go-metrics",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/armon/go-metrics",
+            "rev": "b2d95e5291cdbc26997d1301a5e467ecbb240e25",
+            "sha256": "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mattn/go-isatty",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mattn/go-isatty",
+            "rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449",
+            "sha256": "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/hashicorp/logutils",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/hashicorp/logutils",
+            "rev": "0dc08b1671f34c4250ce212759ebd880f743d883",
+            "sha256": "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r"
+        }
+    },
+    {
+        "goPackagePath": "github.com/armon/go-radix",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/armon/go-radix",
+            "rev": "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93",
+            "sha256": "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c"
+        }
+    },
+    {
+        "goPackagePath": "github.com/hashicorp/go-syslog",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/hashicorp/go-syslog",
+            "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba",
+            "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"
+        }
+    },
+    {
+        "goPackagePath": "github.com/hashicorp/memberlist",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/hashicorp/memberlist",
+            "rev": "6025015f2dc659ca2c735112d37e753bda6e329d",
+            "sha256": "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mitchellh/mapstructure",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mitchellh/mapstructure",
+            "rev": "281073eb9eb092240d33ef253c404f1cca550309",
+            "sha256": "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"
+        }
+    },
+    {
+        "goPackagePath": "github.com/armon/circbuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/armon/circbuf",
+            "rev": "f092b4f207b6e5cce0569056fba9e1a2735cb6cf",
+            "sha256": "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"
+        }
+    },
+    {
+        "goPackagePath": "github.com/hashicorp/mdns",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/hashicorp/mdns",
+            "rev": "2b439d37011456df8ff83a70ffd1cd6046410113",
+            "sha256": "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mitchellh/cli",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mitchellh/cli",
+            "rev": "8102d0ed5ea2709ade1243798785888175f6e415",
+            "sha256": "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2"
+        }
+    },
+    {
+        "goPackagePath": "github.com/ryanuber/columnize",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/ryanuber/columnize",
+            "rev": "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a",
+            "sha256": "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/hashicorp/go-msgpack",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/ugorji/go",
+            "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6",
+            "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"
+        }
+    },
+    {
+        "goPackagePath": "github.com/hashicorp/go.net",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/hashicorp/go.net",
+            "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29",
+            "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"
+        }
+    }
 ]
--- a/pkgs/servers/skydns/deps.json
+++ b/pkgs/servers/skydns/deps.json
@ -1,21 +1,128 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/miekg/dns",
-      "github.com/prometheus/client_golang",
-      "github.com/prometheus/client_model",
-      "bitbucket.org/ww/goautoneg",
-      "github.com/prometheus/common",
-      "github.com/prometheus/procfs",
-      "github.com/coreos/go-systemd",
-      "github.com/matttproud/golang_protobuf_extensions",
-      "github.com/ugorji/go",
-      "github.com/golang/protobuf",
-      "github.com/stathat/go",
-      "github.com/beorn7/perks",
-      "github.com/coreos/go-etcd",
-      "github.com/rcrowley/go-metrics"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/coreos/go-systemd",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/coreos/go-systemd",
+            "rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1",
+            "sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"
+        }
+    },
+    {
+        "goPackagePath": "github.com/rcrowley/go-metrics",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/rcrowley/go-metrics",
+            "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3",
+            "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_model",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_model",
+            "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6",
+            "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/common",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/common",
+            "rev": "40456948a47496dc22168e6af39297a2f8fbf38c",
+            "sha256": "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l"
+        }
+    },
+    {
+        "goPackagePath": "github.com/beorn7/perks",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/beorn7/perks",
+            "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d",
+            "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"
+        }
+    },
+    {
+        "goPackagePath": "github.com/coreos/go-etcd",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/coreos/go-etcd",
+            "rev": "9847b93751a5fbaf227b893d172cee0104ac6427",
+            "sha256": "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"
+        }
+    },
+    {
+        "goPackagePath": "github.com/matttproud/golang_protobuf_extensions",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/matttproud/golang_protobuf_extensions",
+            "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a",
+            "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/client_golang",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/client_golang",
+            "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864",
+            "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"
+        }
+    },
+    {
+        "goPackagePath": "github.com/stathat/go",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/stathat/go",
+            "rev": "91dfa3a59c5b233fef9a346a1460f6e2bc889d93",
+            "sha256": "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r"
+        }
+    },
+    {
+        "goPackagePath": "github.com/ugorji/go",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/ugorji/go",
+            "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6",
+            "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"
+        }
+    },
+    {
+        "goPackagePath": "github.com/miekg/dns",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/miekg/dns",
+            "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa",
+            "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"
+        }
+    },
+    {
+        "goPackagePath": "github.com/prometheus/procfs",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/prometheus/procfs",
+            "rev": "c91d8eefde16bd047416409eb56353ea84a186e4",
+            "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"
+        }
+    },
+    {
+        "goPackagePath": "bitbucket.org/ww/goautoneg",
+        "fetch": {
+            "type": "hg",
+            "url": "bitbucket.org/ww/goautoneg",
+            "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675",
+            "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"
+        }
+    }
 ]
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@ -32,8 +32,8 @@ common = rec { # attributes common to both builds
  nativeBuildInputs = [ cmake pkgconfig ];

  buildInputs = [
-    ncurses openssl zlib pcre jemalloc
-  ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ]
+    ncurses openssl zlib pcre
+  ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd ]
    ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];

  cmakeFlags = [
@ -51,6 +51,7 @@ common = rec { # attributes common to both builds
    "-DWITH_PCRE=system"
  ]
    ++ optional stdenv.isDarwin "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
+    ++ optional (!stdenv.isLinux) "-DWITH_JEMALLOC=no" # bad build at least on Darwin
    ;

  preConfigure = ''
--- a/pkgs/servers/uftp/default.nix
+++ b/pkgs/servers/uftp/default.nix
@ -0,0 +1,35 @@
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "uftp-${version}";
+  version = "4.9.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz";
+    sha256 = "0pra2sm8rdscyqkagi2v99az1vxbcch47wkdnz9wv4qg1x5phpmr";
+  };
+
+  buildInputs = [
+    openssl
+  ];
+
+  outputs = [ "out" "doc" ];
+
+  patchPhase = ''
+    substituteInPlace makefile --replace gcc cc
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $doc/share/man/man1
+    cp {uftp,uftpd,uftp_keymgt,uftpproxyd} $out/bin/
+    cp {uftp.1,uftpd.1,uftp_keymgt.1,uftpproxyd.1} $doc/share/man/man1
+  '';
+
+  meta = {
+    description = "Encrypted UDP based FTP with multicast";
+    homepage = http://uftp-multicast.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.fadenb ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}
--- a/pkgs/shells/elvish/deps.json
+++ b/pkgs/shells/elvish/deps.json
@ -1,9 +1,20 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/mattn/go-sqlite3",
-      "github.com/elves/getopt"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/elves/getopt",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/elves/getopt",
+            "rev": "f91a7bf920995832d55a1182f26657bc975b9c24",
+            "sha256": "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mattn/go-sqlite3",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mattn/go-sqlite3",
+            "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42",
+            "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"
+        }
+    }
 ]
--- a/pkgs/shells/oh/deps.json
+++ b/pkgs/shells/oh/deps.json
@ -1,10 +1,29 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/michaelmacinnis/adapted",
-      "github.com/peterh/liner",
-      "golang.org/x/sys"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/sys",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/sys",
+            "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f",
+            "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"
+        }
+    },
+    {
+        "goPackagePath": "github.com/michaelmacinnis/adapted",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/michaelmacinnis/adapted",
+            "rev": "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978",
+            "sha256": "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv"
+        }
+    },
+    {
+        "goPackagePath": "github.com/peterh/liner",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/peterh/liner",
+            "rev": "ad1edfd30321d8f006ccf05f1e0524adeb943060",
+            "sha256": "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317"
+        }
+    }
 ]
--- a/pkgs/tools/X11/go-sct/deps.json
+++ b/pkgs/tools/X11/go-sct/deps.json
@ -1,8 +1,11 @@
 [
-  {
-    "include": "../../../go-modules/libs.json",
-    "packages": [
-      "github.com/cpucycle/astrotime"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/cpucycle/astrotime",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/cpucycle/astrotime",
+            "rev": "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca",
+            "sha256": "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1"
+        }
+    }
 ]
--- a/pkgs/tools/admin/lxd/deps.json
+++ b/pkgs/tools/admin/lxd/deps.json
@ -1,26 +1,173 @@
 [
-  {
-    "include": "../../../go-modules/libs.json",
-    "packages": [
-      "github.com/golang/protobuf",
-      "github.com/gorilla/websocket",
-      "github.com/syndtr/gocapability",
-      "gopkg.in/inconshreveable/log15.v2",
-      "github.com/gorilla/mux",
-      "github.com/pborman/uuid",
-      "golang.org/x/crypto",
-      "gopkg.in/flosch/pongo2.v3",
-      "gopkg.in/tomb.v2",
-      "github.com/olekukonko/tablewriter",
-      "github.com/mattn/go-sqlite3",
-      "gopkg.in/lxc/go-lxc.v2",
-      "gopkg.in/yaml.v2",
-      "github.com/mattn/go-runewidth",
-      "github.com/coreos/go-systemd",
-      "github.com/dustinkirkland/golang-petname",
-      "github.com/gorilla/context",
-      "github.com/mattn/go-colorable",
-      "github.com/gosexy/gettext"
-    ]
-  }
+    {
+        "goPackagePath": "gopkg.in/yaml.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/yaml.v2",
+            "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
+            "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/tomb.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/tomb.v2",
+            "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8",
+            "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"
+        }
+    },
+    {
+        "goPackagePath": "github.com/gorilla/websocket",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/gorilla/websocket",
+            "rev": "a622679ebd7a3b813862379232f645f8e690e43f",
+            "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"
+        }
+    },
+    {
+        "goPackagePath": "github.com/syndtr/gocapability",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/syndtr/gocapability",
+            "rev": "2c00daeb6c3b45114c80ac44119e7b8801fdd852",
+            "sha256": "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/inconshreveable/log15.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/inconshreveable/log15.v2",
+            "rev": "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f",
+            "sha256": "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"
+        }
+    },
+    {
+        "goPackagePath": "github.com/gorilla/mux",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/gorilla/mux",
+            "rev": "8096f47503459bcc74d1f4c487b7e6e42e5746b5",
+            "sha256": "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/pborman/uuid",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/pborman/uuid",
+            "rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4",
+            "sha256": "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/flosch/pongo2.v3",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/flosch/pongo2.v3",
+            "rev": "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9",
+            "sha256": "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"
+        }
+    },
+    {
+        "goPackagePath": "github.com/olekukonko/tablewriter",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/olekukonko/tablewriter",
+            "rev": "cca8bbc0798408af109aaaa239cbd2634846b340",
+            "sha256": "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mattn/go-sqlite3",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mattn/go-sqlite3",
+            "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42",
+            "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/lxc/go-lxc.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/lxc/go-lxc.v2",
+            "rev": "8f9e220b36393c03854c2d224c5a55644b13e205",
+            "sha256": "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mattn/go-runewidth",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mattn/go-runewidth",
+            "rev": "d6bea18f789704b5f83375793155289da36a3c7f",
+            "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"
+        }
+    },
+    {
+        "goPackagePath": "github.com/coreos/go-systemd",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/coreos/go-systemd",
+            "rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1",
+            "sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"
+        }
+    },
+    {
+        "goPackagePath": "github.com/dustinkirkland/golang-petname",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/dustinkirkland/golang-petname",
+            "rev": "2182cecef7f257230fc998bc351a08a5505f5e6c",
+            "sha256": "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl"
+        }
+    },
+    {
+        "goPackagePath": "github.com/gorilla/context",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/gorilla/context",
+            "rev": "215affda49addc4c8ef7e2534915df2c8c35c6cd",
+            "sha256": "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mattn/go-colorable",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mattn/go-colorable",
+            "rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe",
+            "sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"
+        }
+    },
+    {
+        "goPackagePath": "github.com/gosexy/gettext",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/gosexy/gettext",
+            "rev": "305f360aee30243660f32600b87c3c1eaa947187",
+            "sha256": "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09"
+        }
+    }
 ]
--- a/pkgs/tools/filesystems/go-mtpfs/deps.json
+++ b/pkgs/tools/filesystems/go-mtpfs/deps.json
@ -1,17 +1,20 @@
 [
-  {
-    "include": "../../../go-modules/libs.json",
-    "packages": [
-      "github.com/hanwen/go-fuse"
-    ]
-  },
-  {
-    "goPackagePath": "github.com/hanwen/usb",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/hanwen/usb",
-      "rev": "69aee4530ac705cec7c5344418d982aaf15cf0b1",
-      "sha256": "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"
+    {
+        "goPackagePath": "github.com/hanwen/go-fuse",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/hanwen/go-fuse",
+            "rev": "bd746dd8bcc8c059a9d953a786a6156eb83f398e",
+            "sha256": "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56"
+        }
+    },
+    {
+        "goPackagePath": "github.com/hanwen/usb",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/hanwen/usb",
+            "rev": "69aee4530ac705cec7c5344418d982aaf15cf0b1",
+            "sha256": "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"
+        }
    }
-  }
 ]
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
@ -0,0 +1,31 @@
+{ stdenv, fetchurl, cmake, fcitx, gettext, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "fcitx-unikey-${version}";
+  version = "0.2.5";
+
+  src = fetchurl {
+    url = "http://download.fcitx-im.org/fcitx-unikey/${name}.tar.xz";
+    sha256 = "063vc29v7ycaai98v3z4q319sv9sm91my17pmhblw1vifxnw02wf";
+  };
+
+  buildInputs = [ cmake fcitx gettext pkgconfig ];
+
+  preInstall = ''
+    substituteInPlace src/cmake_install.cmake \
+      --replace ${fcitx} $out
+    substituteInPlace data/cmake_install.cmake \
+      --replace ${fcitx} $out
+  '';
+  
+  meta = with stdenv.lib; {
+    isFcitxEngine = true;
+    homepage      = "https://github.com/fcitx/fcitx-unikey";
+    downloadPage  = "http://download.fcitx-im.org/fcitx-table-other/";
+    description   = "Fcitx wrapper for unikey";
+    license       = licenses.gpl3Plus;
+    platforms     = platforms.linux;
+    maintainers   = with maintainers; [ ericsagnes ];
+  };
+
+}
--- a/pkgs/tools/misc/gawp/deps.json
+++ b/pkgs/tools/misc/gawp/deps.json
@ -1,10 +1,29 @@
 [
    {
-        "include": "../../../../development/go-modules/libs.json",
-        "packages": [
-            "golang.org/x/sys",
-            "gopkg.in/yaml.v2",
-            "gopkg.in/fsnotify.v1"
-        ]
+        "goPackagePath": "golang.org/x/sys",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/sys",
+            "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f",
+            "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/fsnotify.v1",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/fsnotify.v1",
+            "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0",
+            "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/yaml.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/yaml.v2",
+            "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
+            "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
+        }
    }
 ]
--- a/pkgs/tools/misc/i3cat/deps.json
+++ b/pkgs/tools/misc/i3cat/deps.json
@ -1,8 +1,11 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/vincent-petithory/structfield"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/vincent-petithory/structfield",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/vincent-petithory/structfield",
+            "rev": "01a738558a47fbf16712994d1737fb31c77e7d11",
+            "sha256": "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw"
+        }
+    }
 ]
--- a/pkgs/tools/misc/mongodb-tools/deps.json
+++ b/pkgs/tools/misc/mongodb-tools/deps.json
@ -1,12 +1,47 @@
 [
-  {
-    "include": "../../../go-modules/libs.json",
-    "packages": [
-      "github.com/howeyc/gopass",
-      "github.com/jessevdk/go-flags",
-      "golang.org/x/crypto",
-      "gopkg.in/mgo.v2",
-      "gopkg.in/tomb.v2"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/howeyc/gopass",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/howeyc/gopass",
+            "rev": "2c70fa70727c953c51695f800f25d6b44abb368e",
+            "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/mgo.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/mgo.v2",
+            "rev": "c6a7dce14133ccac2dcac3793f1d6e2ef048503a",
+            "sha256": "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/tomb.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/tomb.v2",
+            "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8",
+            "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"
+        }
+    },
+    {
+        "goPackagePath": "github.com/jessevdk/go-flags",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/jessevdk/go-flags",
+            "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539",
+            "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"
+        }
+    }
 ]
--- a/pkgs/tools/misc/upower-notify/deps.json
+++ b/pkgs/tools/misc/upower-notify/deps.json
@ -1,8 +1,11 @@
 [
-  {
-    "include": "../../../go-modules/libs.json",
-    "packages": [
-      "github.com/godbus/dbus"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/godbus/dbus",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/godbus/dbus",
+            "rev": "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15",
+            "sha256": "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3"
+        }
+    }
 ]
--- a/pkgs/tools/networking/ngrok/deps.json
+++ b/pkgs/tools/networking/ngrok/deps.json
@ -1,19 +1,101 @@
 [
-  {
-    "include": "../../../go-modules/libs.json",
-    "packages": [
-      "gopkg.in/yaml.v1",
-      "github.com/gorilla/websocket",
-      "github.com/rcrowley/go-metrics",
-      "github.com/inconshreveable/go-vhost",
-      "code.google.com/p/log4go",
-      "github.com/daviddengcn/go-colortext",
-      "gopkg.in/yaml.v1",
-      "github.com/inconshreveable/mousetrap",
-      "github.com/nsf/termbox-go",
-      "gopkg.in/inconshreveable/go-update.v0",
-      "github.com/kardianos/osext",
-      "github.com/kr/binarydist"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/gorilla/websocket",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/gorilla/websocket",
+            "rev": "a622679ebd7a3b813862379232f645f8e690e43f",
+            "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"
+        }
+    },
+    {
+        "goPackagePath": "github.com/rcrowley/go-metrics",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/rcrowley/go-metrics",
+            "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3",
+            "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/inconshreveable/go-vhost",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/inconshreveable/go-vhost",
+            "rev": "c4c28117502e4bf00960c8282b2d1c51c865fe2c",
+            "sha256": "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32"
+        }
+    },
+    {
+        "goPackagePath": "code.google.com/p/log4go",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/ccpaging/log4go",
+            "rev": "cb4cc51cd03958183d3b637d0750497d88c2f7a8",
+            "sha256": "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2"
+        }
+    },
+    {
+        "goPackagePath": "github.com/daviddengcn/go-colortext",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/daviddengcn/go-colortext",
+            "rev": "13eaeb896f5985a1ab74ddea58707a73d875ba57",
+            "sha256": "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/yaml.v1",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/go-yaml/yaml",
+            "rev": "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a",
+            "sha256": "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy"
+        }
+    },
+    {
+        "goPackagePath": "github.com/inconshreveable/mousetrap",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/inconshreveable/mousetrap",
+            "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa",
+            "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"
+        }
+    },
+    {
+        "goPackagePath": "github.com/nsf/termbox-go",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/nsf/termbox-go",
+            "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b",
+            "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/inconshreveable/go-update.v0",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/inconshreveable/go-update",
+            "rev": "d8b0b1d421aa1cbf392c05869f8abbc669bb7066",
+            "sha256": "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/kardianos/osext",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/kardianos/osext",
+            "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc",
+            "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"
+        }
+    },
+    {
+        "goPackagePath": "github.com/kr/binarydist",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/kr/binarydist",
+            "rev": "9955b0ab8708602d411341e55fffd7e0700f86bd",
+            "sha256": "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"
+        }
+    }
 ]
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, sqlite3 }:

 pythonPackages.buildPythonApplication rec {
-  version = "7.0.4";
+  version = "7.0.5";
  name = "offlineimap-${version}";
  namePrefix = "";

@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
    owner = "OfflineIMAP";
    repo = "offlineimap";
    rev = "v${version}";
-    sha256 = "1ixm4qp3gljbnbi40h8n6j7c0pzk1ry8hpm4bcf7n68gc07r557n";
+    sha256 = "0gmypc0sribxzglxgymfc5x3saxnkyhbky06dhxanxm6pa1p4blh";
  };

  doCheck = false;
--- a/pkgs/tools/networking/s3gof3r/deps.json
+++ b/pkgs/tools/networking/s3gof3r/deps.json
@ -1,8 +1,11 @@
 [
-  {
-    "include": "../../../go-modules/libs.json",
-    "packages": [
-      "github.com/jessevdk/go-flags"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/jessevdk/go-flags",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/jessevdk/go-flags",
+            "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539",
+            "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"
+        }
+    }
 ]
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@ -1,4 +1,4 @@
-{ lib, pythonPackages, fetchurl }:
+{ lib, pythonPackages, fetchurl, git }:

 pythonPackages.buildPythonApplication rec {
  name = "nox-${version}";
@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
    sha256 = "11f6css8rnh7qz55z7i81cnb5h9ys98fqxq3fps3hsh64zlydj52";
  };

-  buildInputs = [ pythonPackages.pbr ];
+  buildInputs = [ pythonPackages.pbr git ];

  propagatedBuildInputs = with pythonPackages; [
      dogpile_cache
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@ -1,23 +1,23 @@
-{ stdenv, fetchFromGitHub, intltool, glib, pkgconfig, polkit, python, sqlite, systemd
+{ stdenv, fetchFromGitHub, lib
+, intltool, glib, pkgconfig, polkit, python, sqlite, systemd
 , gobjectIntrospection, vala, gtk_doc, autoreconfHook, autoconf-archive
 , nix, boost
 , enableCommandNotFound ? false
 , enableBashCompletion ? false, bashCompletion ? null }:

-with stdenv.lib;
-
 stdenv.mkDerivation rec {
-  name = "packagekit-2016-06-03";
+  name = "packagekit-${version}";
+  version = "1.1.3";

  src = fetchFromGitHub {
    owner = "hughsie";
    repo = "PackageKit";
-    rev = "99fd83bbb26badf43c6a17a9f0c6dc054c7484c8";
-    sha256 = "0y42vl6r1wh57sbjfkn4khjs78q54wshf4p0v4nly9s7hydxpi6a";
+    rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
+    sha256 = "150mpar7bhlvwfpwsr6zrjn3yggvklzr6nlhk0shaxnrfkfxvvb6";
  };

  buildInputs = [ glib polkit systemd python gobjectIntrospection vala ]
-                  ++ optional enableBashCompletion bashCompletion;
+                  ++ lib.optional enableBashCompletion bashCompletion;
  propagatedBuildInputs = [ sqlite nix boost ];
  nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ];

@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
    "--with-dbus-sys=$(out)/etc/dbus-1/system.d"
    "--with-systemdsystemunitdir=$(out)/lib/systemd/system/"
  ]
-  ++ optional (!enableBashCompletion) "--disable-bash-completion"
-  ++ optional (!enableCommandNotFound) "--disable-command-not-found";
+  ++ lib.optional (!enableBashCompletion) "--disable-bash-completion"
+  ++ lib.optional (!enableCommandNotFound) "--disable-command-not-found";

  enableParallelBuilding = true;

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
    "localstatedir=\${TMPDIR}"
  ];

-  meta = {
+  meta = with lib; {
    description = "System to facilitate installing and updating packages";
    longDescription = ''
      PackageKit is a system designed to make installing and updating software
--- a/pkgs/tools/security/hologram/deps.json
+++ b/pkgs/tools/security/hologram/deps.json
@ -1,19 +1,101 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/aybabtme/rgbterm",
-      "github.com/vaughan0/go-ini",
-      "github.com/howeyc/gopass",
-      "github.com/AdRoll/hologram",
-      "github.com/mitchellh/go-homedir",
-      "github.com/goamz/goamz",
-      "github.com/nmcclain/asn1-ber",
-      "gopkg.in/asn1-ber.v1",
-      "github.com/peterbourgon/g2s",
-      "github.com/nmcclain/ldap",
-      "github.com/golang/protobuf",
-      "golang.org/x/crypto"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/howeyc/gopass",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/howeyc/gopass",
+            "rev": "2c70fa70727c953c51695f800f25d6b44abb368e",
+            "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"
+        }
+    },
+    {
+        "goPackagePath": "github.com/aybabtme/rgbterm",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/aybabtme/rgbterm",
+            "rev": "c07e2f009ed2311e9c35bca12ec00b38ccd48283",
+            "sha256": "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"
+        }
+    },
+    {
+        "goPackagePath": "github.com/vaughan0/go-ini",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/vaughan0/go-ini",
+            "rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1",
+            "sha256": "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mitchellh/go-homedir",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mitchellh/go-homedir",
+            "rev": "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4",
+            "sha256": "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/goamz/goamz",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/goamz/goamz",
+            "rev": "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7",
+            "sha256": "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b"
+        }
+    },
+    {
+        "goPackagePath": "github.com/nmcclain/asn1-ber",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/go-asn1-ber/asn1-ber",
+            "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72",
+            "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/asn1-ber.v1",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/go-asn1-ber/asn1-ber",
+            "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72",
+            "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/peterbourgon/g2s",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/peterbourgon/g2s",
+            "rev": "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc",
+            "sha256": "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/nmcclain/ldap",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/go-ldap/ldap",
+            "rev": "83e65426fd1c06626e88aa8a085e5bfed0208e29",
+            "sha256": "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"
+        }
+    }
 ]
--- a/pkgs/tools/security/shc/default.nix
+++ b/pkgs/tools/security/shc/default.nix
@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "shc-${version}";
+  version = "3.9.3";
+  rev = "${version}";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "neurobin";
+    repo = "shc";
+    sha256 = "00fqzg4a0f4kp4wr8swhi5zqds3gh3gf7cgi1cipn16av0818xsa";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://neurobin.github.io/shc;
+    description = "Shell Script Compiler";
+    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3;
+  };
+}
--- a/Show More
+++ b/Show More