summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorAlex Vorobiev <alexander.vorobiev@gmail.com>2017-10-23 20:51:14 -0500
committerFranz Pletz <fpletz@fnordicwalking.de>2017-10-24 09:52:52 +0200
commit770bedbc204a8b696b43110f54eca98201207697 (patch)
tree622cf44c07483bbc528ca6947698ea9c0d0e1186 /pkgs/top-level
parentc47d77ce216b790a45893b5c1eb3694cefb4de37 (diff)
downloadnixlib-770bedbc204a8b696b43110f54eca98201207697.tar
nixlib-770bedbc204a8b696b43110f54eca98201207697.tar.gz
nixlib-770bedbc204a8b696b43110f54eca98201207697.tar.bz2
nixlib-770bedbc204a8b696b43110f54eca98201207697.tar.lz
nixlib-770bedbc204a8b696b43110f54eca98201207697.tar.xz
nixlib-770bedbc204a8b696b43110f54eca98201207697.tar.zst
nixlib-770bedbc204a8b696b43110f54eca98201207697.zip
meritous: init at 1.4
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a0280bcdf40..170a487f7684 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1141,6 +1141,8 @@ with pkgs;
 
   masscan = callPackage ../tools/security/masscan { };
 
+  meritous = callPackage ../games/meritous { };
+
   meson = callPackage ../development/tools/build-managers/meson { };
 
   mp3fs = callPackage ../tools/filesystems/mp3fs { };