From ab1302a32a52f310177eaf8771146fbfedad20a6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 21 May 2021 04:20:00 +0000 Subject: [PATCH] rubocop: alias to rubyPackages.rubocop --- pkgs/development/tools/rubocop/Gemfile | 2 - pkgs/development/tools/rubocop/Gemfile.lock | 32 ------ pkgs/development/tools/rubocop/default.nix | 18 ---- pkgs/development/tools/rubocop/gemset.nix | 105 -------------------- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 1 insertion(+), 158 deletions(-) delete mode 100644 pkgs/development/tools/rubocop/Gemfile delete mode 100644 pkgs/development/tools/rubocop/Gemfile.lock delete mode 100644 pkgs/development/tools/rubocop/default.nix delete mode 100644 pkgs/development/tools/rubocop/gemset.nix diff --git a/pkgs/development/tools/rubocop/Gemfile b/pkgs/development/tools/rubocop/Gemfile deleted file mode 100644 index 18a39cab1c3..00000000000 --- a/pkgs/development/tools/rubocop/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'https://rubygems.org' -gem 'rubocop' diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock deleted file mode 100644 index 61792b3ec58..00000000000 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ /dev/null @@ -1,32 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - ast (2.4.2) - parallel (1.20.1) - parser (3.0.0.0) - ast (~> 2.4.1) - rainbow (3.0.0) - regexp_parser (2.1.1) - rexml (3.2.4) - rubocop (1.12.1) - parallel (~> 1.10) - parser (>= 3.0.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) - ruby-progressbar (1.11.0) - unicode-display_width (2.0.0) - -PLATFORMS - ruby - -DEPENDENCIES - rubocop - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix deleted file mode 100644 index 2122236af5e..00000000000 --- a/pkgs/development/tools/rubocop/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, bundlerEnv, ruby, bundlerUpdateScript }: - -bundlerEnv { - pname = "rubocop"; - - inherit ruby; - - gemdir = ./.; - - passthru.updateScript = bundlerUpdateScript "rubocop"; - - meta = with lib; { - description = "Automatic Ruby code style checking tool"; - homepage = "https://rubocop.org/"; - license = licenses.mit; - maintainers = with maintainers; [ marsam leemachin ]; - }; -} diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix deleted file mode 100644 index a9793749628..00000000000 --- a/pkgs/development/tools/rubocop/gemset.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ - ast = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; - type = "gem"; - }; - version = "2.4.2"; - }; - parallel = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; - type = "gem"; - }; - version = "1.20.1"; - }; - parser = { - dependencies = ["ast"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml"; - type = "gem"; - }; - version = "3.0.0.0"; - }; - rainbow = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; - type = "gem"; - }; - version = "3.0.0"; - }; - regexp_parser = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr"; - type = "gem"; - }; - version = "2.1.1"; - }; - rexml = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; - type = "gem"; - }; - version = "3.2.4"; - }; - rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hi2c3a6alya9yx07nirnjzlc0mvmidnx67874njp6wf7d5xqqr9"; - type = "gem"; - }; - version = "1.12.1"; - }; - rubocop-ast = { - dependencies = ["parser"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; - type = "gem"; - }; - version = "1.4.1"; - }; - ruby-progressbar = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; - type = "gem"; - }; - version = "1.11.0"; - }; - unicode-display_width = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bilbnc8j6jkb59lrf177i3p1pdyxll0n8400hzqr35vl3r3kv2m"; - type = "gem"; - }; - version = "2.0.0"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5b4c1104e9..44e9a0f737f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8217,7 +8217,7 @@ in rubber = callPackage ../tools/typesetting/rubber { }; - rubocop = callPackage ../development/tools/rubocop { }; + rubocop = rubyPackages.rubocop; ruffle = callPackage ../misc/emulators/ruffle { };