diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index be6d1658d3e5..b714fe8bc593 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -1,26 +1,19 @@ -{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: +{ lib, goPackages, fetchFromGitHub }: -stdenv.mkDerivation rec { +with goPackages; + +buildGoPackage rec { version = "0.1.0"; name = "flannel-${version}"; - - src = import ./deps.nix { - inherit stdenv lib fetchFromGitHub; + goPackagePath = "github.com/coreos/flannel"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "flannel"; + rev = "v${version}"; + sha256 = "1f7x6a2c8ix6j5y1r0dq56b58bl2rs2ycbdqb9fz5zv1zk2w20rd"; }; - buildInputs = [ go ]; - - buildPhase = '' - export GOPATH=$src - go build -v -o flannel github.com/coreos/flannel - ''; - - installPhase = '' - mkdir -p $out/bin - mv flannel $out/bin/flannel - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "Flannel is an etcd backed network fabric for containers"; homepage = https://github.com/coreos/flannel; license = licenses.asl20; diff --git a/pkgs/tools/networking/flannel/deps.nix b/pkgs/tools/networking/flannel/deps.nix deleted file mode 100644 index 3af2404ba784..000000000000 --- a/pkgs/tools/networking/flannel/deps.nix +++ /dev/null @@ -1,28 +0,0 @@ -# This file was generated by go2nix. -{ stdenv, lib, fetchFromGitHub }: - -let - goDeps = [ - { - root = "github.com/coreos/flannel"; - src = fetchFromGitHub { - owner = "coreos"; - repo = "flannel"; - rev = "cd584fa5e1545ae86c965588e81ceb24455e980d"; - sha256 = "1f7x6a2c8ix6j5y1r0dq56b58bl2rs2ycbdqb9fz5zv1zk2w20rd"; - }; - } - ]; - -in - -stdenv.mkDerivation rec { - name = "go-deps"; - - buildCommand = - lib.concatStrings - (map (dep: '' - mkdir -p $out/src/`dirname ${dep.root}` - ln -s ${dep.src} $out/src/${dep.root} - '') goDeps); -}