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/version-management | |
| 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/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix index a3cf434360b9..341b50f0ef22 100644 --- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix @@ -3,11 +3,9 @@ bundlerEnv rec { name = "bitbucket-server-cli-${version}"; - version = (import gemset).atlassian-stash.version; + version = (import ./gemset.nix).atlassian-stash.version; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; pname = "atlassian-stash"; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 6c2b42ddbc51..659e002dfb6e 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -9,9 +9,7 @@ let env = bundlerEnv { name = "gitlab"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { homepage = http://www.gitlab.com/; platforms = platforms.linux; |