diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-10-14 13:16:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-10-14 13:16:11 +0200 |
| commit | 061758490fe8f411604e5aefdf258ed576946120 (patch) | |
| tree | 3a5ac25404972027350b800f96b2bac1788eb3b6 /pkgs/tools/misc | |
| parent | 6eeea6effda7636f003603d96b0a7b98d40ed50d (diff) | |
| parent | 6351c4d24b4cf0c75d51aeb8cd3c3720488a111d (diff) | |
| download | nixlib-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/misc')
| -rw-r--r-- | pkgs/tools/misc/fluentd/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/misc/lolcat/default.nix | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index 4c5de7448409..25e083b6bf57 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -1,12 +1,10 @@ { stdenv, lib, bundlerEnv, ruby, curl }: bundlerEnv { - name = "fluentd-0.14.0"; - inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + + pname = "fluentd"; + gemdir = ./.; meta = with lib; { description = "A data collector"; diff --git a/pkgs/tools/misc/lolcat/default.nix b/pkgs/tools/misc/lolcat/default.nix index 21355652d3e3..21377d7bfa4a 100644 --- a/pkgs/tools/misc/lolcat/default.nix +++ b/pkgs/tools/misc/lolcat/default.nix @@ -2,12 +2,10 @@ , pkgconfig, which }: bundlerEnv { - name = "lolcat-42.1.0"; - inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + + pname = "lolcat"; + gemdir = ./.; meta = with lib; { description = "A rainbow version of cat"; |