diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-10 10:34:04 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-10 10:34:04 +0100 |
commit | 5ad16cb27fd81cb67db4da80283e147bea4e1c25 (patch) | |
tree | ad648118454028113d3b5236b27754151dc498b5 /pkgs/development/tools | |
parent | eb1369670b5a4e616ff0cf4100616479b1fa3064 (diff) | |
parent | 773494d0ea6fdf3a40561b44b805b90ae1949292 (diff) | |
download | nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.gz nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.bz2 nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.lz nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.xz nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.zst nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/micronaut/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/misc/kibana/7.x.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/pry/Gemfile | 2 | ||||
-rw-r--r-- | pkgs/development/tools/pry/Gemfile.lock | 17 | ||||
-rw-r--r-- | pkgs/development/tools/pry/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/tools/pry/gemset.nix | 33 |
6 files changed, 75 insertions, 6 deletions
diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index fd9fa5f02da..7b9223ddec0 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.2.6"; + version = "1.2.8"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "0y7qshg6v8s5rwi0fz9xpyhd1yhv8jrw2jhp276a30dfkglx19qn"; + sha256 = "1znrgmwi11pnanvlaqlrffp5y3pz2ql6vrglbzqx8m9ydvdn1cp1"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index 83651e6d17e..a0f2f8f546a 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -18,12 +18,12 @@ let shas = if enableUnfree then { - x86_64-linux = "0sc5709k3z7lb8qcjpj49s6vfv69ds2wc8319ag9x776nyz1pqxi"; - x86_64-darwin = "0zh4q46vfdwaihs838ck8fap92i3b4x10wbpmx8mcwyfk5v0fkch"; + x86_64-linux = "1wq4fc2fifkg1qz7nxdfb4yi2biay8cgdz7kl5k0p37sxn0sbkja"; + x86_64-darwin = "06346kj7bv49py49pmmnmh8m24322m88v1af19909pj9cxgd0p6v"; } else { - x86_64-linux = "1pq17fasryharvw4byybvmcf5172hcmy6cp0m8bxhkxagwilprba"; - x86_64-darwin = "11crpx2qs2nzkzv6fvs1gqn9v4zalxkzsc5br0fy1y02lzm26zbm"; + x86_64-linux = "0ygpmcm6wdcnvw8azwqc5257lyic7yw31rqvm2pw3afhpha62lpj"; + x86_64-darwin = "0xy81g0bhxp47p29kkkh5llfzqkzqzr5dk50ap2hy0hjw33ld6g1"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/pry/Gemfile b/pkgs/development/tools/pry/Gemfile new file mode 100644 index 00000000000..ec63e2251d5 --- /dev/null +++ b/pkgs/development/tools/pry/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'pry' diff --git a/pkgs/development/tools/pry/Gemfile.lock b/pkgs/development/tools/pry/Gemfile.lock new file mode 100644 index 00000000000..e6025f50ca1 --- /dev/null +++ b/pkgs/development/tools/pry/Gemfile.lock @@ -0,0 +1,17 @@ +GEM + remote: https://rubygems.org/ + specs: + coderay (1.1.2) + method_source (0.9.2) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + +PLATFORMS + ruby + +DEPENDENCIES + pry + +BUNDLED WITH + 1.17.2 diff --git a/pkgs/development/tools/pry/default.nix b/pkgs/development/tools/pry/default.nix new file mode 100644 index 00000000000..974b61617fb --- /dev/null +++ b/pkgs/development/tools/pry/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "pry"; + gemdir = ./.; + exes = [ "pry" ]; + + passthru.updateScript = bundlerUpdateScript "pry"; + + meta = with lib; { + description = "A Ruby runtime developer console and IRB alternative"; + homepage = https://pryrepl.org; + license = licenses.mit; + maintainers = [ maintainers.tckmn ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/pry/gemset.nix b/pkgs/development/tools/pry/gemset.nix new file mode 100644 index 00000000000..e779c48aebf --- /dev/null +++ b/pkgs/development/tools/pry/gemset.nix @@ -0,0 +1,33 @@ +{ + coderay = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + type = "gem"; + }; + version = "1.1.2"; + }; + method_source = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + type = "gem"; + }; + version = "0.9.2"; + }; + pry = { + dependencies = ["coderay" "method_source"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + type = "gem"; + }; + version = "0.12.2"; + }; +} \ No newline at end of file |