summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorlethalman <lucabru@src.gnome.org>2015-03-23 10:03:12 +0100
committerlethalman <lucabru@src.gnome.org>2015-03-23 10:03:12 +0100
commit3af17021d4f6379acb2d81cdb015435c202ffa12 (patch)
tree098b1594aa6cc72528bebdb6da0fadaa24166f58 /pkgs/top-level/all-packages.nix
parenta11078a78c246aa26ddeb8918e4975eb886b1047 (diff)
parent5a45003800d0aa9a2546ae0f3658eef1f1ceeccd (diff)
downloadnixpkgs-3af17021d4f6379acb2d81cdb015435c202ffa12.tar
nixpkgs-3af17021d4f6379acb2d81cdb015435c202ffa12.tar.gz
nixpkgs-3af17021d4f6379acb2d81cdb015435c202ffa12.tar.bz2
nixpkgs-3af17021d4f6379acb2d81cdb015435c202ffa12.tar.lz
nixpkgs-3af17021d4f6379acb2d81cdb015435c202ffa12.tar.xz
nixpkgs-3af17021d4f6379acb2d81cdb015435c202ffa12.tar.zst
nixpkgs-3af17021d4f6379acb2d81cdb015435c202ffa12.zip
Merge pull request #6867 from risicle/master
New packages for luabind, stxxl and osrm-backend
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf0f408b73f..979bc9e0e4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6612,6 +6612,8 @@ let
 
   libosip_3 = callPackage ../development/libraries/osip/3.nix {};
 
+  libosmpbf = callPackage ../development/libraries/libosmpbf {};
+
   libotr = callPackage ../development/libraries/libotr {
     libgcrypt = libgcrypt_1_6;
   };
@@ -6875,6 +6877,10 @@ let
 
   loudmouth = callPackage ../development/libraries/loudmouth { };
 
+  luabind = callPackage ../development/libraries/luabind { lua = lua5_1; };
+
+  luabind_luajit = callPackage ../development/libraries/luabind { lua = luajit; };
+
   lzo = callPackage ../development/libraries/lzo { };
 
   matio = callPackage ../development/libraries/matio { };
@@ -7460,6 +7466,8 @@ let
 
   srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { };
 
+  stxxl = callPackage ../development/libraries/stxxl { parallel = true; };
+
   sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
 
   sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; });
@@ -8263,6 +8271,10 @@ let
 
   opensmtpd = callPackage ../servers/mail/opensmtpd { };
 
+  osrm-backend = callPackage ../servers/osrm-backend { };
+
+  osrm-backend_luajit = callPackage ../servers/osrm-backend { luabind = luabind_luajit; };
+
   petidomo = callPackage ../servers/mail/petidomo { };
 
   popa3d = callPackage ../servers/mail/popa3d { };