summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-10-14 13:16:11 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-10-14 13:16:11 +0200
commit061758490fe8f411604e5aefdf258ed576946120 (patch)
tree3a5ac25404972027350b800f96b2bac1788eb3b6 /pkgs/tools/package-management
parent6eeea6effda7636f003603d96b0a7b98d40ed50d (diff)
parent6351c4d24b4cf0c75d51aeb8cd3c3720488a111d (diff)
downloadnixlib-061758490fe8f411604e5aefdf258ed576946120.tar
nixlib-061758490fe8f411604e5aefdf258ed576946120.tar.gz
nixlib-061758490fe8f411604e5aefdf258ed576946120.tar.bz2
nixlib-061758490fe8f411604e5aefdf258ed576946120.tar.lz
nixlib-061758490fe8f411604e5aefdf258ed576946120.tar.xz
nixlib-061758490fe8f411604e5aefdf258ed576946120.tar.zst
nixlib-061758490fe8f411604e5aefdf258ed576946120.zip
Merge branch 'master' into staging
... to get the openssl mass rebuild: 942dbf89c.
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/fpm/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/fpm/default.nix b/pkgs/tools/package-management/fpm/default.nix
index ca2e44fcaf00..4a18bfb5345f 100644
--- a/pkgs/tools/package-management/fpm/default.nix
+++ b/pkgs/tools/package-management/fpm/default.nix
@@ -1,13 +1,9 @@
 { lib, bundlerEnv, ruby }:
 
 bundlerEnv rec {
-  name = "fpm-${version}";
-
-  version = (import gemset).fpm.version;
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  pname = "fpm";
+  gemdir = ./.;
 
   meta = with lib; {
     description = "Tool to build packages for multiple platforms with ease";