Skip to content

Commit

Permalink
Merge pull request #60506 from manveru/update-cucumber
Browse files Browse the repository at this point in the history
cucumber: 2.4.0 -> 3.1.2, use bundlerApp
  • Loading branch information
alyssais committed May 4, 2019
2 parents bf72529 + fa33c37 commit 5b1a53f
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 27 deletions.
24 changes: 15 additions & 9 deletions pkgs/development/tools/cucumber/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
backports (3.14.0)
builder (3.2.3)
cucumber (2.4.0)
cucumber (3.1.2)
builder (>= 2.1.2)
cucumber-core (~> 1.5.0)
cucumber-core (~> 3.2.0)
cucumber-expressions (~> 6.0.1)
cucumber-wire (~> 0.0.1)
diff-lcs (>= 1.1.3)
gherkin (~> 4.0)
diff-lcs (~> 1.3)
gherkin (~> 5.1.0)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.2)
cucumber-core (1.5.0)
gherkin (~> 4.0)
cucumber-core (3.2.1)
backports (>= 3.8.0)
cucumber-tag_expressions (~> 1.1.0)
gherkin (~> 5.0)
cucumber-expressions (6.0.1)
cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1)
diff-lcs (1.3)
gherkin (4.1.3)
multi_json (1.12.1)
gherkin (5.1.0)
multi_json (1.13.1)
multi_test (0.1.2)

PLATFORMS
Expand All @@ -25,4 +31,4 @@ DEPENDENCIES
cucumber

BUNDLED WITH
1.14.4
1.17.2
16 changes: 6 additions & 10 deletions pkgs/development/tools/cucumber/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
{ lib, bundlerEnv, ruby }:
{ lib, bundlerApp }:

bundlerEnv rec {
name = "cucumber-${version}";

version = (import gemset).cucumber.version;
inherit ruby;
# expects Gemfile, Gemfile.lock and gemset.nix in the same directory
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
bundlerApp {
pname = "cucumber";
gemdir = ./.;
exes = [ "cucumber" ];

meta = with lib; {
description = "A tool for executable specifications";
homepage = https://cucumber.io/;
license = with licenses; mit;
maintainers = with maintainers; [ manveru ];
platforms = platforms.unix;
};
}
64 changes: 56 additions & 8 deletions pkgs/development/tools/cucumber/gemset.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
{
backports = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn";
type = "gem";
};
version = "3.14.0";
};
builder = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
Expand All @@ -8,22 +20,50 @@
version = "3.2.3";
};
cucumber = {
dependencies = ["builder" "cucumber-core" "cucumber-expressions" "cucumber-wire" "diff-lcs" "gherkin" "multi_json" "multi_test"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k4j31a93r0zhvyq2mm2k8irppbvkzbsg44r3mf023959v18fzih";
sha256 = "1s2brssrpal8hyhcgg974x3xyhpmvpwps5ypd9p8w2lg01l1pp3j";
type = "gem";
};
version = "2.4.0";
version = "3.1.2";
};
cucumber-core = {
dependencies = ["backports" "cucumber-tag_expressions" "gherkin"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iavlh8hqj9lwljbpkw06259gdicbr1bdb6pbj5yy3n8szgr8k3c";
type = "gem";
};
version = "3.2.1";
};
cucumber-expressions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zwmv6hznyz9vk81f5dhwcr9jhxx2vmbk8yyazayvllvhy0fkpdw";
type = "gem";
};
version = "6.0.1";
};
cucumber-tag_expressions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qj2fsqvp94nggnikbnrfvnmzr1pl6ifmdsxj69kdw1kkab30jjr";
sha256 = "0cvmbljybws0qzjs1l67fvr9gqr005l8jk1ni5gcsis9pfmqh3vc";
type = "gem";
};
version = "1.5.0";
version = "1.1.1";
};
cucumber-wire = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09ymvqb0sbw2if1nxg8rcj33sf0va88ancq5nmp8g01dfwzwma2f";
Expand All @@ -32,6 +72,8 @@
version = "0.0.1";
};
diff-lcs = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
Expand All @@ -40,22 +82,28 @@
version = "1.3";
};
gherkin = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d18r8mf2qyd9jbq9xxvca8adyysdzvwdy8v9c2s5hrd6p02kg79";
sha256 = "1cgcdchwwdm10rsk44frjwqd4ihprhxjbm799nscqy2q1raqfj5s";
type = "gem";
};
version = "4.1.3";
version = "5.1.0";
};
multi_json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
type = "gem";
};
version = "1.12.1";
version = "1.13.1";
};
multi_test = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sx356q81plr67hg16jfwz9hcqvnk03bd9n75pmdw8pfxjfy1yxd";
Expand Down

0 comments on commit 5b1a53f

Please sign in to comment.