diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix deleted file mode 100644 index 0af104fa380f..000000000000 --- a/pkgs/applications/networking/drive/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - rev = "4530cf8d59e1047cb1c005a6bd5b14ecb98b9e68"; - name = "drive-${lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/odeke-em/drive"; - src = fetchFromGitHub { - inherit rev; - owner = "odeke-em"; - repo = "drive"; - sha256 = "1y4qlzvgg84mh8l6bhaazzy6bv6dwjcbpm0rxvvc5aknvvh581ps"; - }; - - subPackages = [ "cmd/drive" ]; - - buildInputs = [ pb go-isatty command dts odeke-em.log statos xon odeke-em.google-api-go-client cli-spinner oauth2 text net ]; - - dontInstallSrc = true; - - meta = with lib; { - description = "A tiny program to pull or push Google Drive files"; - homepage = https://github.com/odeke-em/drive; - license = licenses.asl20; - maintainers = with maintainers; [ bobvanderlinden ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d91b59c9598..73a152de4628 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1351,7 +1351,7 @@ let doomseeker = callPackage ../applications/misc/doomseeker { }; - drive = callPackage ../applications/networking/drive { goPackages = go14Packages; }; + drive = go14Packages.drive.bin // { outputs = [ "bin" ]; }; driftnet = callPackage ../tools/networking/driftnet {}; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 6f625eb6dec6..3cdf30300567 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -537,6 +537,19 @@ let sha256 = "1sddkxgl1pwlipfvmv14h8vg9b9wq1km427j1gjarhb5yfqhh3l1"; }; + drive = buildFromGitHub { + rev = "4530cf8d59e1047cb1c005a6bd5b14ecb98b9e68"; + owner = "odeke-em"; + repo = "drive"; + sha256 = "1y4qlzvgg84mh8l6bhaazzy6bv6dwjcbpm0rxvvc5aknvvh581ps"; + subPackages = [ "cmd/drive" ]; + buildInputs = [ + pb go-isatty command dts odeke-em.log statos xon odeke-em.google-api-go-client + cli-spinner oauth2 text net + ]; + disabled = !isGo14; + }; + dts = buildFromGitHub { rev = "ec2daabf2f9078e887405f7bcddb3d79cb65502d"; owner = "odeke-em";