From 068c9c6c53e65e9ef7ca12bf1784ffec9f433279 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 18 Jan 2017 00:09:22 +0100 Subject: r10k: use gemdir --- pkgs/tools/system/r10k/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix index 0695504cc012..95462e2c0035 100644 --- a/pkgs/tools/system/r10k/default.nix +++ b/pkgs/tools/system/r10k/default.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "${name}-gems"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; inherit ruby; }; -- cgit 1.4.1 From 4237a2bd18084cd72396f14f637f231a56ad47a8 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 18 Jan 2017 00:10:47 +0100 Subject: reckon: use gemdir --- pkgs/tools/text/reckon/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index b6340fd2df46..de03963a4128 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -7,9 +7,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "${name}-gems"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; }; phases = [ "installPhase" ]; -- cgit 1.4.1 From 57b06f45dba3764c74e8164d22445f92b34acdd5 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 18 Jan 2017 00:17:06 +0100 Subject: ruby-zoom: use gemdir --- pkgs/tools/text/ruby-zoom/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/text/ruby-zoom/default.nix b/pkgs/tools/text/ruby-zoom/default.nix index eb3968a0db93..b939e1500e49 100644 --- a/pkgs/tools/text/ruby-zoom/default.nix +++ b/pkgs/tools/text/ruby-zoom/default.nix @@ -4,9 +4,7 @@ bundlerEnv { pname = "ruby-zoom"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "Quickly open CLI search results in your favorite editor!"; -- cgit 1.4.1 From 246fd4c950a7333c9168863a33929af196868262 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 18 Jan 2017 00:17:50 +0100 Subject: maphosts: use gemdir --- pkgs/tools/networking/maphosts/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index 08c56574dcf7..3a48814928e5 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -6,9 +6,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "maphosts-gems"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; }; phases = ["installPhase"]; -- cgit 1.4.1 From 53cd750ec6ff96eb87782ba441c733eb9444239f Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 18 Jan 2017 00:18:29 +0100 Subject: backup: use gemdir --- pkgs/tools/backup/backup/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/backup/backup/default.nix b/pkgs/tools/backup/backup/default.nix index 1890e8121c18..20c96b65a624 100644 --- a/pkgs/tools/backup/backup/default.nix +++ b/pkgs/tools/backup/backup/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "backup_v4"; ruby = ruby_2_1; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; buildInputs = [ curl ]; -- cgit 1.4.1 From d16aefb405b686e404275bcffe65f978afc21bbf Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 18 Jan 2017 00:19:14 +0100 Subject: mpdcron: use gemdir --- pkgs/tools/audio/mpdcron/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index a8556c4ada12..49425cf65b77 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -4,9 +4,7 @@ let gemEnv = bundlerEnv { name = "mpdcron-bundle"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; }; in stdenv.mkDerivation rec { version = "20130809"; -- cgit 1.4.1 From bf99d330adc11c0190ab5b23058b2cf42a76d719 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 18 Jan 2017 00:20:34 +0100 Subject: homesick: use gemdir --- pkgs/tools/misc/homesick/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix index da167026ade5..81e417ee5abd 100644 --- a/pkgs/tools/misc/homesick/default.nix +++ b/pkgs/tools/misc/homesick/default.nix @@ -2,9 +2,7 @@ bundlerEnv { name = "homesick-1.1.3"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; # Cannot use `wrapProgram` because the the help is aware of the file name. postInstall = '' -- cgit 1.4.1 From 18fbdf14cdb5fc99fb13be206dccf8f7730a12e0 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 18 Jan 2017 00:21:16 +0100 Subject: pws: use gemdir --- pkgs/tools/misc/pws/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index ac4f4524b992..7294c61da8fa 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation rec { inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; }; buildInputs = [ makeWrapper ]; -- cgit 1.4.1