From 020dec07d4cd3dacc925183f76eb520a798ed0d1 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 30 Apr 2019 17:36:25 +0200 Subject: [PATCH] procodile: 1.0.17 -> 1.0.23, use bundlerApp --- pkgs/tools/system/procodile/Gemfile.lock | 6 +++--- pkgs/tools/system/procodile/default.nix | 17 +++++------------ pkgs/tools/system/procodile/gemset.nix | 12 ++++++++---- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/system/procodile/Gemfile.lock b/pkgs/tools/system/procodile/Gemfile.lock index 51ab44a762a..7989b7bf1f7 100644 --- a/pkgs/tools/system/procodile/Gemfile.lock +++ b/pkgs/tools/system/procodile/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - json (2.1.0) - procodile (1.0.17) + json (2.2.0) + procodile (1.0.23) json PLATFORMS @@ -12,4 +12,4 @@ DEPENDENCIES procodile BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/tools/system/procodile/default.nix index 5414d670423..22dc59a9e8e 100644 --- a/pkgs/tools/system/procodile/default.nix +++ b/pkgs/tools/system/procodile/default.nix @@ -1,22 +1,15 @@ -{ lib, bundlerEnv, ruby }: - -bundlerEnv rec { - name = "procodile-${version}"; - - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; - - version = (import gemset).procodile.version; - inherit ruby; +{ lib, bundlerApp }: +bundlerApp { + pname = "procodile"; gemdir = ./.; + exes = [ "procodile" ]; meta = with lib; { description = "Run processes in the background (and foreground) on Mac & Linux from a Procfile (for production and/or development environments)"; homepage = https://adam.ac/procodile; license = with licenses; mit; - maintainers = [ maintainers.ravloony ]; + maintainers = with maintainers; [ ravloony manveru ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/procodile/gemset.nix b/pkgs/tools/system/procodile/gemset.nix index 8216159ad94..36ec2a9cf18 100644 --- a/pkgs/tools/system/procodile/gemset.nix +++ b/pkgs/tools/system/procodile/gemset.nix @@ -1,19 +1,23 @@ { json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; procodile = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gfms2h4k9zqq7jn04nphibcsjykgxiqwdyyz2r4kq428a25kqsf"; + sha256 = "025pbr1kah7cgs527n5q56m5agaa2smzac4rpmpk619xg4r1rdhs"; type = "gem"; }; - version = "1.0.17"; + version = "1.0.23"; }; } \ No newline at end of file