From 91e766e44fbbc0a76336ba4685623add4e16f367 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Mon, 8 Apr 2019 01:28:55 +0200 Subject: [PATCH] rhc: remove --- pkgs/development/tools/rhc/Gemfile | 4 -- pkgs/development/tools/rhc/Gemfile.lock | 40 ------------ pkgs/development/tools/rhc/default.nix | 30 --------- pkgs/development/tools/rhc/gemset.nix | 84 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 6 files changed, 1 insertion(+), 160 deletions(-) delete mode 100644 pkgs/development/tools/rhc/Gemfile delete mode 100644 pkgs/development/tools/rhc/Gemfile.lock delete mode 100644 pkgs/development/tools/rhc/default.nix delete mode 100644 pkgs/development/tools/rhc/gemset.nix diff --git a/pkgs/development/tools/rhc/Gemfile b/pkgs/development/tools/rhc/Gemfile deleted file mode 100644 index a780461e254e..000000000000 --- a/pkgs/development/tools/rhc/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'archive-tar-minitar', '>= 0.5.2.1', github: 'peterhoeg/archive-tar-minitar' -gem 'rhc' diff --git a/pkgs/development/tools/rhc/Gemfile.lock b/pkgs/development/tools/rhc/Gemfile.lock deleted file mode 100644 index 004c293b9655..000000000000 --- a/pkgs/development/tools/rhc/Gemfile.lock +++ /dev/null @@ -1,40 +0,0 @@ -GIT - remote: git://github.com/peterhoeg/archive-tar-minitar.git - revision: dae32ca550a87dba32597115ae18805db4782ebe - specs: - archive-tar-minitar (0.5.2.1) - -GEM - remote: https://rubygems.org/ - specs: - commander (4.2.1) - highline (~> 1.6.11) - highline (1.6.21) - httpclient (2.6.0.1) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (4.0.1) - net-ssh-gateway (2.0.0) - net-ssh (>= 4.0.0) - net-ssh-multi (1.2.1) - net-ssh (>= 2.6.5) - net-ssh-gateway (>= 1.2.0) - open4 (1.3.4) - rhc (1.38.7) - archive-tar-minitar - commander (>= 4.0, < 4.3.0) - highline (~> 1.6.11) - httpclient (>= 2.4.0, < 2.7.0) - net-scp (>= 1.1.2) - net-ssh-multi (>= 1.2.0) - open4 - -PLATFORMS - ruby - -DEPENDENCIES - archive-tar-minitar (>= 0.5.2.1)! - rhc - -BUNDLED WITH - 1.13.6 diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix deleted file mode 100644 index 46665e8b47ec..000000000000 --- a/pkgs/development/tools/rhc/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, bundlerEnv, ruby, stdenv, makeWrapper }: - -stdenv.mkDerivation rec { - name = "rhc-1.38.7"; - - env = bundlerEnv { - name = "rhc-1.38.7-gems"; - - inherit ruby; - - gemdir = ./.; - }; - - buildInputs = [ makeWrapper ]; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/bin - makeWrapper ${env}/bin/rhc $out/bin/rhc - ''; - - meta = with lib; { - broken = true; # requires ruby 2.2 - homepage = https://github.com/openshift/rhc; - description = "OpenShift client tools"; - license = licenses.asl20; - maintainers = [ maintainers.szczyp ]; - }; -} diff --git a/pkgs/development/tools/rhc/gemset.nix b/pkgs/development/tools/rhc/gemset.nix deleted file mode 100644 index 933a7dc95afa..000000000000 --- a/pkgs/development/tools/rhc/gemset.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ - archive-tar-minitar = { - source = { - fetchSubmodules = false; - rev = "dae32ca550a87dba32597115ae18805db4782ebe"; - sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd"; - type = "git"; - url = "git://github.com/peterhoeg/archive-tar-minitar.git"; - }; - version = "0.5.2.1"; - }; - commander = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zwfhswnbhwv0zzj2b3s0qvpqijbbnmh7zvq6v0274rqbxyf1jwc"; - type = "gem"; - }; - version = "4.2.1"; - }; - highline = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1"; - type = "gem"; - }; - version = "1.6.21"; - }; - httpclient = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0haz4s9xnzr73mkfpgabspj43bhfm9znmpmgdk74n6gih1xlrx1l"; - type = "gem"; - }; - version = "2.6.0.1"; - }; - net-scp = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; - type = "gem"; - }; - version = "1.2.1"; - }; - net-ssh = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02xj3pcpqr32nlak0vsx71gd5z65jl3q1hwi2x157vabw1kgjanq"; - type = "gem"; - }; - version = "4.0.1"; - }; - net-ssh-gateway = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1l3v761y32aw0n8lm0c0m42lr4ay8cq6q4sc5yc68b9fwlfvb70x"; - type = "gem"; - }; - version = "2.0.0"; - }; - net-ssh-multi = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71"; - type = "gem"; - }; - version = "1.2.1"; - }; - open4 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1"; - type = "gem"; - }; - version = "1.3.4"; - }; - rhc = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yaq42szq81ph44q7ckzml9yrhz1pkjfik77rxvfzlf90l1g2ibk"; - type = "gem"; - }; - version = "1.38.7"; - }; -} \ No newline at end of file diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fac60ece8108..f059704d2786 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -261,6 +261,7 @@ mapAliases ({ qwt6 = libsForQt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 + rhc = throw "deprecated in 2019-04-09: abandoned by upstream."; rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10bb5104352f..d74c96530997 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9262,8 +9262,6 @@ in withPEPatterns = true; }; - rhc = callPackage ../development/tools/rhc { }; - rman = callPackage ../development/tools/misc/rman { }; rolespec = callPackage ../development/tools/misc/rolespec { };