diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2017-01-19 09:34:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 09:34:14 +0100 |
| commit | 3fdde25b4c3c7c7962c6e92109d5f4d62f134fc8 (patch) | |
| tree | 813926a7bcaf292cca3e48dfbad1ac4dede80a4c /pkgs/applications/office | |
| parent | 485a1ac94b846144e0bc1a0d545dfa03f3530cdf (diff) | |
| parent | c9ff7e49a8303bd13a61b5c5cdf33cecfa52457c (diff) | |
| download | nixlib-3fdde25b4c3c7c7962c6e92109d5f4d62f134fc8.tar nixlib-3fdde25b4c3c7c7962c6e92109d5f4d62f134fc8.tar.gz nixlib-3fdde25b4c3c7c7962c6e92109d5f4d62f134fc8.tar.bz2 nixlib-3fdde25b4c3c7c7962c6e92109d5f4d62f134fc8.tar.lz nixlib-3fdde25b4c3c7c7962c6e92109d5f4d62f134fc8.tar.xz nixlib-3fdde25b4c3c7c7962c6e92109d5f4d62f134fc8.tar.zst nixlib-3fdde25b4c3c7c7962c6e92109d5f4d62f134fc8.zip | |
Merge pull request #21962 from Mic92/gemdir
bundleEnv: Used gemdir for most applications now
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/ledger-web/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/office/ppl-address-book/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/office/timetrap/default.nix | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index 6be5ad525db4..6f571bd2a1b0 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -6,11 +6,9 @@ bundlerEnv rec { name = "ledger-web-${version}"; - version = (import gemset).ledger_web.version; + version = (import ./gemset.nix).ledger_web.version; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; buildInputs = lib.optional withPostgresql postgresql ++ lib.optional withSqlite sqlite; diff --git a/pkgs/applications/office/ppl-address-book/default.nix b/pkgs/applications/office/ppl-address-book/default.nix index 1c48fc50842d..f15affaa8d67 100644 --- a/pkgs/applications/office/ppl-address-book/default.nix +++ b/pkgs/applications/office/ppl-address-book/default.nix @@ -8,9 +8,7 @@ let env = bundlerEnv rec { name = "${pname}-env-${version}"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; gemConfig.rugged = attrs: { buildInputs = [ which ]; }; }; diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index f6a408d03842..e68c753750f5 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "timetrap-1.10.0"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = { description = "A simple command line time tracker written in ruby"; |