Re: [Nix-dev] Re: ZeroMQ package.
Updated patch.
Arthur
On 5/31/11 3:26 PM, Yury G. Kudryashov wrote:
Arthur Smyles wrote:
I created a Nix expression for installing zeromq. See attached
See a few comments below.
+ version = "2.1.7";
+ name = "zeromq";
This results in /nix/store/HASH-zeromq instead of /nix/store/HASH-
zeromq-2.1.7.
You should use something like:
version = "2.1.7";
pname = "zeromq";
name = "${pname}-${version}";
Or just
name = "zeromq-2.1.7";
since you don't need ${version} without ${name}.
+ license = "lgpl3";
Try using stdenv.lib.licenses.
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Index: pkgs/development/libraries/zeromq/default.nix
===
--- pkgs/development/libraries/zeromq/default.nix (revision 0)
+++ pkgs/development/libraries/zeromq/default.nix (revision 0)
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, libuuid}:
+
+stdenv.mkDerivation rec {
+ name = "zeromq-2.1.7";
+ src = fetchurl {
+ url = "http://download.zeromq.org/${name}.tar.gz";;
+ sha256 =
"2a1416d0a3ea55ae17d43417fd9bd193412cc9101e144bc8d3bd19fe36816e0d";
+ };
+
+ buildInputs = [ libuuid ];
+
+ meta = {
+ description = "ZeroMQ is a brokerless messaging kernel with
extremely high performance.";
+ homepage = http://www.zeromq.org ;
+ license = stdenv.lib.licenses.lgpl3;
+
+ };
+}
Index: pkgs/top-level/all-packages.nix
===
--- pkgs/top-level/all-packages.nix (revision 27316)
+++ pkgs/top-level/all-packages.nix (working copy)
@@ -4404,6 +4404,8 @@
inherit ncurses flex bison autoconf automake m4 coreutils;
};
+ zeromq = callPackage ../development/libraries/zeromq { };
+
zlib = callPackage ../development/libraries/zlib {
fetchurl = fetchurlBoot;
};
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r27340 - nixpkgs/trunk/pkgs/games/xconq
Author: raskin
Date: Tue May 31 20:18:40 2011
New Revision: 27340
URL: https://svn.nixos.org/websvn/nix/?rev=27340&sc=1
Log:
MediumBlue is currently too dark to be background for black checkmark, correct
to Light
Modified:
nixpkgs/trunk/pkgs/games/xconq/default.nix
Modified: nixpkgs/trunk/pkgs/games/xconq/default.nix
==
--- nixpkgs/trunk/pkgs/games/xconq/default.nix Tue May 31 19:34:06 2011
(r27339)
+++ nixpkgs/trunk/pkgs/games/xconq/default.nix Tue May 31 20:18:40 2011
(r27340)
@@ -30,8 +30,8 @@
inherit buildInputs;
/* doConfigure should be removed if not needed */
- phaseNames = ["addInputs" "doUnpack" "fixMakefiles" "fixCfiles" "doConfigure"
-"doMakeInstall" "doWrap"];
+ phaseNames = ["addInputs" "doUnpack" "fixMakefiles" "fixCfiles"
"fixTCLfiles"
+"doConfigure" "doMakeInstall" "doWrap"];
doWrap = a.makeManyWrappers ''$out/bin/*'' ''--prefix TCLLIBPATH :
"${tk}/lib"'';
@@ -46,6 +46,10 @@
sed -re '/unitp = view_unit[(]uview[)]/aelse *unitp = NULL\;' -i
tcltk/tkmap.c
'' ["minInit" "doUnpack"];
+ fixTCLfiles = a.fullDepEntry ''
+sed -re 's@MediumBlue@LightBlue@g' -i tcltk/tkconq.tcl
+ '' ["minInit" "doUnpack"];
+
configureFlags = [
"--enable-alternate-scoresdir=scores"
"--with-tclconfig=${tcl}/lib"
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27339 - nixpkgs/trunk/pkgs/games/xconq
Author: raskin Date: Tue May 31 19:34:06 2011 New Revision: 27339 URL: https://svn.nixos.org/websvn/nix/?rev=27339&sc=1 Log: Fix for an annoying crash Modified: nixpkgs/trunk/pkgs/games/xconq/default.nix Modified: nixpkgs/trunk/pkgs/games/xconq/default.nix == --- nixpkgs/trunk/pkgs/games/xconq/default.nix Tue May 31 19:30:10 2011 (r27338) +++ nixpkgs/trunk/pkgs/games/xconq/default.nix Tue May 31 19:34:06 2011 (r27339) @@ -43,6 +43,7 @@ fixCfiles = a.fullDepEntry '' sed -re 's@[(]int[)]color@(long)color@' -i tcltk/tkmap.c +sed -re '/unitp = view_unit[(]uview[)]/aelse *unitp = NULL\;' -i tcltk/tkmap.c '' ["minInit" "doUnpack"]; configureFlags = [ ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27338 - nixpkgs/trunk/pkgs/build-support/builder-defs
Author: raskin
Date: Tue May 31 19:30:10 2011
New Revision: 27338
URL: https://svn.nixos.org/websvn/nix/?rev=27338&sc=1
Log:
A phase that simply saves current exported vars for debugging use
Modified:
nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
Modified: nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
==
--- nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Tue May
31 15:09:56 2011(r27337)
+++ nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Tue May
31 19:30:10 2011(r27338)
@@ -335,6 +335,8 @@
doDump = n: noDepEntry "echo Dump number ${n}; set";
+ saveEnv = noDepEntry ''export > $TMP/env-vars'';
+
doDumpBuildInputs = noDepEntry (''
echo "${toString realBuildInputs}"
'');
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: ZeroMQ package.
Arthur Smyles wrote:
> I created a Nix expression for installing zeromq. See attached
See a few comments below.
>
> + version = "2.1.7";
> + name = "zeromq";
This results in /nix/store/HASH-zeromq instead of /nix/store/HASH-
zeromq-2.1.7.
You should use something like:
version = "2.1.7";
pname = "zeromq";
name = "${pname}-${version}";
Or just
name = "zeromq-2.1.7";
since you don't need ${version} without ${name}.
> + license = "lgpl3";
Try using stdenv.lib.licenses.
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r27337 - nixos/trunk/tests
Author: ludo
Date: Tue May 31 15:09:56 2011
New Revision: 27337
URL: https://svn.nixos.org/websvn/nix/?rev=27337&sc=1
Log:
Add missing file for the MPI test.
Added:
nixos/trunk/tests/mpich-example.c
Added: nixos/trunk/tests/mpich-example.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/tests/mpich-example.c Tue May 31 15:09:56 2011(r27337)
@@ -0,0 +1,21 @@
+#include
+#include
+#include
+
+int
+main (int argc, char *argv[])
+{
+ int rank, size, length;
+ char name[BUFSIZ];
+
+ MPI_Init (&argc, &argv);
+ MPI_Comm_rank (MPI_COMM_WORLD, &rank);
+ MPI_Comm_size (MPI_COMM_WORLD, &size);
+ MPI_Get_processor_name (name, &length);
+
+ printf ("%s: hello world from process %d of %d\n", name, rank, size);
+
+ MPI_Finalize ();
+
+ return EXIT_SUCCESS;
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27336 - nixos/trunk/modules/services/databases
Author: egorochkin
Date: Tue May 31 14:56:56 2011
New Revision: 27336
URL: https://svn.nixos.org/websvn/nix/?rev=27336&sc=1
Log:
Virtuoso: add dirsAllowed option, minor cleanup
Modified:
nixos/trunk/modules/services/databases/virtuoso.nix
Modified: nixos/trunk/modules/services/databases/virtuoso.nix
==
--- nixos/trunk/modules/services/databases/virtuoso.nix Tue May 31 10:21:37
2011(r27335)
+++ nixos/trunk/modules/services/databases/virtuoso.nix Tue May 31 14:56:56
2011(r27336)
@@ -20,7 +20,7 @@
config = mkOption {
default = "";
-description = "Extra options to put into virtuoso configuration file.";
+description = "Extra options to put into Virtuoso configuration file.";
};
listenAddress = mkOption {
@@ -32,9 +32,14 @@
httpListenAddress = mkOption {
default = null;
example = "myserver:8080";
-description = "ip:port or port for virtuoso HTTP server to listen on.";
+description = "ip:port or port for Virtuoso HTTP server to listen on.";
};
+ dirsAllowed = mkOption {
+ default = null;
+ example = "/www, /home/";
+description = "A list of directories Virtuoso is allowed to access";
+ };
};
};
@@ -76,6 +81,7 @@
[Parameters]
ServerPort=${cfg.listenAddress}
RunAs=${virtuosoUser}
+ ${optionalString (cfg.dirsAllowed != null)
"DirsAllowed=${cfg.dirsAllowed}"}
[HTTPServer]
${optionalString (cfg.httpListenAddress != null)
"ServerPort=${cfg.httpListenAddress}"}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27335 - nixos/trunk/tests
Author: ludo
Date: Tue May 31 10:21:37 2011
New Revision: 27335
URL: https://svn.nixos.org/websvn/nix/?rev=27335&sc=1
Log:
Add an MPI test using two nodes.
Added:
nixos/trunk/tests/mpich.nix
Modified:
nixos/trunk/tests/default.nix
Modified: nixos/trunk/tests/default.nix
==
--- nixos/trunk/tests/default.nix Tue May 31 09:56:55 2011(r27334)
+++ nixos/trunk/tests/default.nix Tue May 31 10:21:37 2011(r27335)
@@ -13,6 +13,7 @@
ipv6 = makeTest (import ./ipv6.nix);
kde4 = makeTest (import ./kde4.nix);
login = makeTest (import ./login.nix);
+ mpich = makeTest (import ./mpich.nix);
nat = makeTest (import ./nat.nix);
nfs = makeTest (import ./nfs.nix);
openssh = makeTest (import ./openssh.nix);
Added: nixos/trunk/tests/mpich.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/tests/mpich.nix Tue May 31 10:21:37 2011(r27335)
@@ -0,0 +1,40 @@
+# Simple example to showcase distributed tests using NixOS VMs.
+
+{ pkgs, ... }:
+
+with pkgs;
+
+{
+ nodes = {
+master =
+ { config, pkgs, ... }: {
+environment.systemPackages = [ gcc mpich2 ];
+#boot.kernelPackages = pkgs.kernelPackages_2_6_29;
+ };
+
+slave =
+ { config, pkgs, ... }: {
+environment.systemPackages = [ gcc mpich2 ];
+ };
+ };
+
+ # Start master/slave MPI daemons and compile/run a program that uses both
+ # nodes.
+ testScript =
+''
+ startAll;
+
+ $master->mustSucceed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf");
+ $master->mustSucceed("chmod 600 /etc/mpd.conf");
+ $master->mustSucceed("mpd --daemon --ifhn=master --listenport=");
+
+ $slave->mustSucceed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf");
+ $slave->mustSucceed("chmod 600 /etc/mpd.conf");
+ $slave->mustSucceed("mpd --daemon --host=master --port=");
+
+ $master->mustSucceed("mpicc -o example -Wall ${./mpich-example.c}");
+ $slave->mustSucceed("mpicc -o example -Wall ${./mpich-example.c}");
+
+ $master->mustSucceed("mpiexec -n 2 ./example >&2");
+'';
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27334 - nixos/trunk/modules/services/databases
Author: egorochkin
Date: Tue May 31 09:56:55 2011
New Revision: 27334
URL: https://svn.nixos.org/websvn/nix/?rev=27334&sc=1
Log:
Make virtuoso drop root privileges
Modified:
nixos/trunk/modules/services/databases/virtuoso.nix
Modified: nixos/trunk/modules/services/databases/virtuoso.nix
==
--- nixos/trunk/modules/services/databases/virtuoso.nix Tue May 31 09:09:35
2011(r27333)
+++ nixos/trunk/modules/services/databases/virtuoso.nix Tue May 31 09:56:55
2011(r27334)
@@ -75,6 +75,7 @@
[Parameters]
ServerPort=${cfg.listenAddress}
+ RunAs=${virtuosoUser}
[HTTPServer]
${optionalString (cfg.httpListenAddress != null)
"ServerPort=${cfg.httpListenAddress}"}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27333 - in nixpkgs/trunk/pkgs: development/libraries/ccrtp development/libraries/libzrtpcpp top-level
Author: raskin
Date: Tue May 31 09:09:35 2011
New Revision: 27333
URL: https://svn.nixos.org/websvn/nix/?rev=27333&sc=1
Log:
Twinkle needs an older version of ccrtp
Added:
nixpkgs/trunk/pkgs/development/libraries/ccrtp/1.8.nix
nixpkgs/trunk/pkgs/development/libraries/libzrtpcpp/1.6.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/ccrtp/1.8.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/ccrtp/1.8.nix Tue May 31
09:09:35 2011(r27333)
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, commoncpp2 }:
+
+stdenv.mkDerivation {
+ name = "ccrtp-1.8.0";
+
+ src = fetchurl {
+url = mirror://gnu/ccrtp/ccrtp-1.8.0.tar.gz;
+sha256 = "0wr4dandlfajhmg90nqyvwv61ikn9vdycji001310y3c4zfysprn";
+ };
+
+ buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ];
+
+ meta = {
+description = "GNU ccRTP is an implementation of RTP, the real-time
transport protocol from the IETF";
+homepage = "http://www.gnu.org/software/ccrtp/";;
+license = "GPLv2";
+maintainers = [ stdenv.lib.maintainers.marcweber ];
+platforms = stdenv.lib.platforms.linux;
+ };
+}
Added: nixpkgs/trunk/pkgs/development/libraries/libzrtpcpp/1.6.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/libzrtpcpp/1.6.nix Tue May 31
09:09:35 2011(r27333)
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, commoncpp2, openssl, pkgconfig, ccrtp }:
+
+stdenv.mkDerivation rec {
+ name = "libzrtpcpp-1.6.0";
+
+ src = fetchurl {
+url = "mirror://gnu/ccrtp/${name}.tar.gz";
+sha256 = "17aayr4f27rp4fvminxn6jx7kq56kkk341l7ypqb9h0k6kns27kb";
+ };
+
+ buildInputs = [ commoncpp2 openssl pkgconfig ccrtp ];
+
+ meta = {
+description = "GNU RTP stack for the zrtp protocol developed by Phil
Zimmermann";
+homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP";;
+license = "GPLv2";
+maintainers = [ stdenv.lib.maintainers.marcweber ];
+platforms = stdenv.lib.platforms.linux;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 31 07:44:17
2011(r27332)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 31 09:09:35
2011(r27333)
@@ -2902,6 +2902,7 @@
scmccid = callPackage ../development/libraries/scmccid { };
ccrtp = callPackage ../development/libraries/ccrtp { };
+ ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { };
cgui = callPackage ../development/libraries/cgui {};
@@ -3881,6 +3882,9 @@
libzip = callPackage ../development/libraries/libzip { };
libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { };
+ libzrtpcpp_1_6 = callPackage ../development/libraries/libzrtpcpp/1.6.nix {
+ccrtp = ccrtp_1_8;
+ };
lightning = callPackage ../development/libraries/lightning { };
@@ -6976,6 +6980,8 @@
twinkle = callPackage ../applications/networking/twinkle {
qt = qt3;
boost = boostFull;
+ccrtp = ccrtp_1_8;
+libzrtpcpp = libzrtpcpp_1_6;
};
unison = callPackage ../applications/networking/sync/unison {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27332 - in nixos/trunk/modules: . misc services/databases
Author: egorochkin
Date: Tue May 31 07:44:17 2011
New Revision: 27332
URL: https://svn.nixos.org/websvn/nix/?rev=27332&sc=1
Log:
Virtuoso database service: packaged
Added:
nixos/trunk/modules/services/databases/virtuoso.nix
Modified:
nixos/trunk/modules/misc/ids.nix
nixos/trunk/modules/module-list.nix
Modified: nixos/trunk/modules/misc/ids.nix
==
--- nixos/trunk/modules/misc/ids.nixMon May 30 21:50:01 2011(r27331)
+++ nixos/trunk/modules/misc/ids.nixTue May 31 07:44:17 2011(r27332)
@@ -62,6 +62,7 @@
git = 41;
fourStore = 42;
fourStoreEndpoint = 43;
+virtuoso = 44;
# When adding a uid, make sure it doesn't match an existing gid.
@@ -107,6 +108,7 @@
git = 41;
fourStore = 42;
fourStoreEndpoint = 43;
+virtuoso = 44;
# When adding a gid, make sure it doesn't match an existing uid.
Modified: nixos/trunk/modules/module-list.nix
==
--- nixos/trunk/modules/module-list.nix Mon May 30 21:50:01 2011(r27331)
+++ nixos/trunk/modules/module-list.nix Tue May 31 07:44:17 2011(r27332)
@@ -56,6 +56,7 @@
./services/databases/mysql.nix
./services/databases/openldap.nix
./services/databases/postgresql.nix
+ ./services/databases/virtuoso.nix
./services/games/ghost-one.nix
./services/hardware/acpid.nix
./services/hardware/bluetooth.nix
Added: nixos/trunk/modules/services/databases/virtuoso.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/modules/services/databases/virtuoso.nix Tue May 31 07:44:17
2011(r27332)
@@ -0,0 +1,85 @@
+{ config, pkgs, ... }:
+let
+ cfg = config.services.virtuoso;
+ virtuosoUser = "virtuoso";
+ stateDir = "/var/lib/virtuoso";
+in
+with pkgs.lib;
+{
+
+ ## interface
+
+ options = {
+
+services.virtuoso = {
+
+ enable = mkOption {
+default = false;
+description = "Whether to enable Virtuoso Opensource database server.";
+ };
+
+ config = mkOption {
+default = "";
+description = "Extra options to put into virtuoso configuration file.";
+ };
+
+ listenAddress = mkOption {
+ default = "";
+ example = "myserver:1323";
+description = "ip:port or port to listen on.";
+ };
+
+ httpListenAddress = mkOption {
+ default = null;
+ example = "myserver:8080";
+description = "ip:port or port for virtuoso HTTP server to listen on.";
+ };
+
+};
+
+ };
+
+
+ ## implementation
+
+ config = mkIf cfg.enable {
+
+users.extraUsers = singleton
+ { name = virtuosoUser;
+uid = config.ids.uids.virtuoso;
+description = "virtuoso user";
+home = stateDir;
+ };
+
+jobs.virtuoso = {
+ name = "virtuoso";
+ startOn = "filesystem";
+
+ preStart = ''
+ mkdir -p ${stateDir}
+ chown ${virtuosoUser} ${stateDir}
+ '';
+
+ script = ''
+ cd ${stateDir}
+ ${pkgs.virtuoso}/bin/virtuoso-t +foreground +configfile
${pkgs.writeText "virtuoso.ini" cfg.config}
+ '';
+};
+
+services.virtuoso.config = ''
+ [Database]
+ DatabaseFile=${stateDir}/x-virtuoso.db
+ TransactionFile=${stateDir}/x-virtuoso.trx
+ ErrorLogFile=${stateDir}/x-virtuoso.log
+ xa_persistent_file=${stateDir}/x-virtuoso.pxa
+
+ [Parameters]
+ ServerPort=${cfg.listenAddress}
+
+ [HTTPServer]
+ ${optionalString (cfg.httpListenAddress != null)
"ServerPort=${cfg.httpListenAddress}"}
+'';
+
+ };
+
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
