From 5feb8d3a9b1f9101f4bb3a7ba862d79d6e925f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 1 Jun 2018 10:22:01 +0100 Subject: [PATCH] godep: remove in favor of dep upstream deprecated this and recommend dep --- pkgs/development/tools/godep/default.nix | 30 ----------- pkgs/development/tools/godep/deps.nix | 67 ------------------------ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 99 deletions(-) delete mode 100644 pkgs/development/tools/godep/default.nix delete mode 100644 pkgs/development/tools/godep/deps.nix diff --git a/pkgs/development/tools/godep/default.nix b/pkgs/development/tools/godep/default.nix deleted file mode 100644 index 3503a6c2c62..00000000000 --- a/pkgs/development/tools/godep/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: - -stdenv.mkDerivation rec { - version = "73"; - name = "godep-${version}"; - - src = import ./deps.nix { - inherit stdenv lib fetchgit; - }; - - buildInputs = [ go ]; - - buildPhase = '' - export GOPATH=$src - go build -v -o godep github.com/tools/godep - ''; - - installPhase = '' - mkdir -p $out/bin - mv godep $out/bin - ''; - - meta = with stdenv.lib; { - description = "Dependency tool for go"; - homepage = https://github.com/tools/godep; - license = licenses.bsd3; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/godep/deps.nix b/pkgs/development/tools/godep/deps.nix deleted file mode 100644 index 10071fa5195..00000000000 --- a/pkgs/development/tools/godep/deps.nix +++ /dev/null @@ -1,67 +0,0 @@ -# This file was generated by go2nix. -{ stdenv, lib, fetchgit }: - -let - goDeps = [ - { - root = "github.com/kr/fs"; - src = fetchgit { - url = "https://github.com/kr/fs.git"; - rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; - sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; - }; - } - { - root = "github.com/tools/godep"; - src = fetchgit { - url = "https://github.com/tools/godep.git"; - rev = "f4edf338389e6e2bde0e8307886718133dc0613e"; - sha256 = "1jdza8kwnzdsh3layqjzy9dnr92xdg3kfhnzvqkq3p50vsdims9w"; - }; - } - { - root = "github.com/kr/pretty"; - src = fetchgit { - url = "https://github.com/kr/pretty"; - rev = "f31442d60e51465c69811e2107ae978868dbea5c"; - sha256 = "12nczwymikxmivb10q5ml5yxrwpz9s8p6k4vqig9g9707yhpxrkh"; - }; - } - { - root = "github.com/kr/text"; - src = fetchgit { - url = "https://github.com/kr/text"; - rev = "6807e777504f54ad073ecef66747de158294b639"; - sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698"; - }; - } - { - root = "github.com/pmezard/go-difflib"; - src = fetchgit { - url = "https://github.com/pmezard/go-difflib"; - rev = "f78a839676152fd9f4863704f5d516195c18fc14"; - sha256 = "1bws3qyy572b62i3wkwfr1aw1g2nwcim2sy42jqsvh9pajjsf1vz"; - }; - } - { - root = "golang.org/x/tools"; - src = fetchgit { - url = "https://go.googlesource.com/tools"; - rev = "1f1b3322f67af76803c942fd237291538ec68262"; - sha256 = "0h2yarcvcgg1px20r8n58psra1czv0sgly5gins2q3wp25iql6gj"; - }; - } - ]; - -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); -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7c718fe878..16df78a7a11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13890,8 +13890,6 @@ with pkgs; golint = callPackage ../development/tools/golint { }; - godep = callPackage ../development/tools/godep { }; - godef = callPackage ../development/tools/godef { }; goimports = callPackage ../development/tools/goimports { };