From 7d9795a0f2573a1cb9dacbc8c3b42410f91be5d4 Mon Sep 17 00:00:00 2001 From: Kridsada Thanabulpong Date: Wed, 1 Jun 2016 00:36:04 +0700 Subject: [PATCH] tmuxinator: 0.6.9 -> 0.8.1 --- pkgs/tools/misc/tmuxinator/Gemfile | 3 --- pkgs/tools/misc/tmuxinator/Gemfile.lock | 14 ---------- pkgs/tools/misc/tmuxinator/default.nix | 35 ++++++++++++++++++++----- pkgs/tools/misc/tmuxinator/gemset.nix | 27 ------------------- 4 files changed, 28 insertions(+), 51 deletions(-) delete mode 100644 pkgs/tools/misc/tmuxinator/Gemfile delete mode 100644 pkgs/tools/misc/tmuxinator/Gemfile.lock delete mode 100644 pkgs/tools/misc/tmuxinator/gemset.nix diff --git a/pkgs/tools/misc/tmuxinator/Gemfile b/pkgs/tools/misc/tmuxinator/Gemfile deleted file mode 100644 index 5fa4859adfc1..000000000000 --- a/pkgs/tools/misc/tmuxinator/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem 'tmuxinator' diff --git a/pkgs/tools/misc/tmuxinator/Gemfile.lock b/pkgs/tools/misc/tmuxinator/Gemfile.lock deleted file mode 100644 index 6f05b475ff2a..000000000000 --- a/pkgs/tools/misc/tmuxinator/Gemfile.lock +++ /dev/null @@ -1,14 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - erubis (2.7.0) - thor (0.19.1) - tmuxinator (0.6.9) - erubis (~> 2.6) - thor (~> 0.19, >= 0.15.0) - -PLATFORMS - ruby - -DEPENDENCIES - tmuxinator diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index f5ac891d8e64..5e8966108661 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -1,12 +1,33 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, buildRubyGem, makeWrapper, ruby }: -bundlerEnv { - name = "tmuxinator-0.6.9"; +# Cannot use bundleEnv because bundleEnv create stub with +# BUNDLE_FROZEN='1' environment variable set, which broke everything +# that rely on Bundler that runs under Tmuxinator. +buildRubyGem rec { inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + name = "${gemName}-${version}"; + gemName = "tmuxinator"; + version = "0.8.1"; + sha256 = "1cpmlfa684j9r1hjya70nfcl5lzdbzmbi9hqbs5nhxha97b77qs5"; + + erubis = buildRubyGem rec { + inherit ruby; + name = "ruby${ruby.version}-${gemName}-${version}"; + gemName = "erubis"; + version = "2.7.0"; + sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + }; + + thor = buildRubyGem rec { + inherit ruby; + name = "ruby${ruby.version}-${gemName}-${version}"; + gemName = "thor"; + version = "0.19.1"; + sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + }; + + propagatedBuildInputs = [ erubis thor ]; meta = with lib; { description = "Manage complex tmux sessions easily"; @@ -15,4 +36,4 @@ bundlerEnv { maintainers = with maintainers; [ auntie ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/tmuxinator/gemset.nix b/pkgs/tools/misc/tmuxinator/gemset.nix deleted file mode 100644 index 1b5b1605c4cc..000000000000 --- a/pkgs/tools/misc/tmuxinator/gemset.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - "erubis" = { - version = "2.7.0"; - source = { - type = "gem"; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - }; - }; - "thor" = { - version = "0.19.1"; - source = { - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; - }; - "tmuxinator" = { - version = "0.6.9"; - source = { - type = "gem"; - sha256 = "0q0ld82dznjsan7ciblfsxz59brcc16fwmvr9n3c7vdcndj8rd27"; - }; - dependencies = [ - "erubis" - "thor" - ]; - }; -} \ No newline at end of file