Re: [Nix-dev] python-x.y.z-wrapper vs python-x.y.z-full
On Fri, 14 Oct 2011 22:13:33 +0200, l...@gnu.org (Ludovic =?iso-8859-1?Q?Court=E8s?=) wrote: > Hi, > > Florian Friesdorf skribis: > > > the attribute name for pythonXYFull is python-X.Y.Z-wrapper. I'd > > consider python-X.Y.Z-full to be more intuitive. Anything against > > renaming? > > I don’t have a strong opinion, but I think “python-X.Y.Z” alone is even > more intuitive. In general adding something after the version number > looks odd to me, and it breaks strverscmp(3) and such like. Without opinion whether this is good: Without suffix is currently used by pythonXY, a python without internal modules that have external dependencies. -- Florian Friesdorf GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 Jabber/XMPP: f...@chaoflow.net IRC: chaoflow on freenode,ircnet,blafasel,OFTC pgpAgWSTxuhC0.pgp Description: PGP signature ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29850 - nixpkgs/trunk/pkgs/top-level
Author: simons
Date: Fri Oct 14 22:04:10 2011
New Revision: 29850
URL: https://nixos.org/websvn/nix/?rev=29850&sc=1
Log:
haskell-packages.nix: use blanks instead of tabs
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Oct 14 21:56:21
2011(r29849)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Oct 14 22:04:10
2011(r29850)
@@ -194,7 +194,7 @@
haskellPlatform = self.haskellPlatform_2011_2_0_1;
mtl1 = self.mtl_1_1_1_1;
text = self.text_0_11_1_5;
- repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
};
haskellPlatform_2011_2_0_1 =
@@ -236,7 +236,7 @@
self : self.haskellPlatformArgs_2011_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2011_2_0_0;
mtl1 = self.mtl_1_1_1_1;
- repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
};
haskellPlatform_2011_2_0_0 =
@@ -274,7 +274,7 @@
haskellPlatformDefaults_2010_2_0_0 =
self : self.haskellPlatformArgs_2010_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2010_2_0_0;
- repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
};
haskellPlatform_2010_2_0_0 =
@@ -311,7 +311,7 @@
self : self.haskellPlatformArgs_2010_1_0_0 self // {
haskellPlatform = self.haskellPlatform_2010_1_0_0;
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
- repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
};
haskellPlatform_2010_1_0_0 =
@@ -349,7 +349,7 @@
self : self.haskellPlatformArgs_2009_2_0_2 self // {
haskellPlatform = self.haskellPlatform_2009_2_0_2;
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
- repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
};
haskellPlatform_2009_2_0_2 =
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29849 - nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mpfr
Author: ludo
Date: Fri Oct 14 21:56:21 2011
New Revision: 29849
URL: https://nixos.org/websvn/nix/?rev=29849&sc=1
Log:
GNU MPFR 3.1.0.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mpfr/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mpfr/default.nix
==
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mpfr/default.nix
Fri Oct 14 21:56:16 2011(r29848)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mpfr/default.nix
Fri Oct 14 21:56:21 2011(r29849)
@@ -1,11 +1,11 @@
{stdenv, fetchurl, gmp}:
stdenv.mkDerivation rec {
- name = "mpfr-3.0.1";
+ name = "mpfr-3.1.0";
src = fetchurl {
url = "mirror://gnu/mpfr/${name}.tar.bz2";
-sha256 = "0zwfwc9rn2sl3kpnr72fi1b8lh8c0mcmgy61y301jhs9pfcp15z1";
+sha256 = "105nx8qqx5x8f4rlplr2wk4cyv61iw5j3jgi2k21rpb8s6xbp9vl";
};
buildInputs = [ gmp ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29848 - nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils
Author: ludo
Date: Fri Oct 14 21:56:16 2011
New Revision: 29848
URL: https://nixos.org/websvn/nix/?rev=29848&sc=1
Log:
GNU Coreutils 8.14.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix
==
--- nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix
Fri Oct 14 21:56:11 2011(r29847)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix
Fri Oct 14 21:56:16 2011(r29848)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, xz, gmp ? null
+{ stdenv, fetchurl, perl, gmp ? null
, aclSupport ? false, acl ? null
, selinuxSupport? false, libselinux ? null, libsepol ? null }:
@@ -6,14 +6,14 @@
assert selinuxSupport -> ( (libselinux != null) && (libsepol != null) );
stdenv.mkDerivation (rec {
- name = "coreutils-8.13";
+ name = "coreutils-8.14";
src = fetchurl {
url = "mirror://gnu/coreutils/${name}.tar.xz";
-sha256 = "06xc4jfkr5h8pc6wq14ncihapf5chcwvvcjvpwkby1ngw0xbxz8b";
+sha256 = "0bdh31fvd0ng2sqrrbz0a4yy084hmj76pbljksqyv4ljq4bhh4hd";
};
- buildNativeInputs = [ perl xz ];
+ buildNativeInputs = [ perl ];
buildInputs = [ gmp ]
++ stdenv.lib.optional aclSupport acl
++ stdenv.lib.optional selinuxSupport libselinux
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29847 - nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux
Author: ludo Date: Fri Oct 14 21:56:11 2011 New Revision: 29847 URL: https://nixos.org/websvn/nix/?rev=29847&sc=1 Log: Add XZ to stdenv. Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix == --- nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Fri Oct 14 21:56:07 2011(r29846) +++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Fri Oct 14 21:56:11 2011(r29847) @@ -293,7 +293,7 @@ inherit gcc; inherit (stdenvLinuxBoot3Pkgs) binutils glibc; inherit (stdenvLinuxBoot4Pkgs) -gzip bzip2 bash coreutils diffutils findutils gawk +gzip bzip2 xz bash coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf attr acl; }; ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29846 - nixpkgs/branches/stdenv-updates/pkgs/tools/compression/xz
Author: ludo
Date: Fri Oct 14 21:56:07 2011
New Revision: 29846
URL: https://nixos.org/websvn/nix/?rev=29846&sc=1
Log:
XZ Utils 5.0.3.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/compression/xz/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/compression/xz/default.nix
==
--- nixpkgs/branches/stdenv-updates/pkgs/tools/compression/xz/default.nix
Fri Oct 14 18:04:34 2011(r29845)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/compression/xz/default.nix
Fri Oct 14 21:56:07 2011(r29846)
@@ -1,25 +1,35 @@
-{stdenv, fetchurl, lib}:
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "xz-5.0.3";
-stdenv.mkDerivation ({
- name = "xz-5.0.0";
-
src = fetchurl {
-url = http://tukaani.org/xz/xz-5.0.0.tar.bz2;
-sha256 = "1n2nc00d83di0jl5d9qwpngkmlk3wqhs4w9q2ah680v9qijrxa27";
+url = "http://tukaani.org/xz/${name}.tar.bz2";;
+sha256 = "1sgaq4gdh8llz3gnlgvd65x610fwc8h4m32skhqn5npwgghvj4as";
};
+ doCheck = true;
+
meta = {
homepage = http://tukaani.org/xz/;
-description = "Successor of the LZMA Utils package";
-license = "GPL/LGPL";
-maintainers = [ lib.maintainers.sander ];
- };
-}
+description = "XZ, general-purpose data compression software, successor of
LZMA";
-//
+longDescription =
+ '' XZ Utils is free general-purpose data compression software with high
+ compression ratio. XZ Utils were written for POSIX-like systems,
+ but also work on some not-so-POSIX systems. XZ Utils are the
+ successor to LZMA Utils.
-(if stdenv.system == "x86_64-darwin"
- # Work around assembler misconfiguration as `x86'. This appears to be fixed
- # by commit b9b5c54cd438b3ae47b44cc211b71f3bc53e35ef (Nov 22 12:00:30 2009 #
+0200).
- then { configureFlags = "--enable-assembler=x86_64"; }
- else {}))
+ The core of the XZ Utils compression code is based on LZMA SDK, but
+ it has been modified quite a lot to be suitable for XZ Utils. The
+ primary compression algorithm is currently LZMA2, which is used
+ inside the .xz container format. With typical files, XZ Utils
+ create 30 % smaller output than gzip and 15 % smaller output than
+ bzip2.
+ '';
+
+licenses = [ "GPLv2+" "LGPLv2.1+" ];
+maintainers = with stdenv.lib.maintainers; [ sander ludo ];
+platforms = stdenv.lib.platforms.all;
+ };
+}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] python-x.y.z-wrapper vs python-x.y.z-full
Hi, Florian Friesdorf skribis: > the attribute name for pythonXYFull is python-X.Y.Z-wrapper. I'd > consider python-X.Y.Z-full to be more intuitive. Anything against > renaming? I don’t have a strong opinion, but I think “python-X.Y.Z” alone is even more intuitive. In general adding something after the version number looks odd to me, and it breaks strverscmp(3) and such like. Thanks, Ludo’. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29845 - in nixpkgs/trunk/pkgs: tools/misc/disper top-level
Author: rob
Date: Fri Oct 14 18:04:34 2011
New Revision: 29845
URL: https://nixos.org/websvn/nix/?rev=29845&sc=1
Log:
add disper
Added:
nixpkgs/trunk/pkgs/tools/misc/disper/
nixpkgs/trunk/pkgs/tools/misc/disper/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/tools/misc/disper/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/misc/disper/default.nixFri Oct 14 18:04:34
2011(r29845)
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, python}:
+
+stdenv.mkDerivation rec {
+ name = "disper-0.3.0";
+
+ buildInputs = [python];
+
+ preConfigure = ''
+export makeFlags="PREFIX=$out"
+ '';
+
+ src = fetchurl {
+url =
http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.0.tar.gz;
+sha256 = "1mfqidm5c89nknzksabqgjygdp57xpszz7hy2dxh39hpgrsk3l58";
+ };
+
+ meta = {
+description = "Disper is an on-the-fly display switch utility.";
+homepage = http://willem.engen.nl/projects/disper/;
+ };
+
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Oct 14 17:26:38
2011(r29844)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Oct 14 18:04:34
2011(r29845)
@@ -581,6 +581,8 @@
dirmngr = callPackage ../tools/security/dirmngr { };
+ disper = callPackage ../tools/misc/disper { };
+
dmg2img = callPackage ../tools/misc/dmg2img { };
docbook2x = callPackage ../tools/typesetting/docbook2x {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] builderDefs, composedArgsAndFun
>Hi, > >there are some functions in nixpkgs that I always avoided to use and >understand. >A couple of them are builderDefs and composedArgsAndFun. >I'm reading their implementation right now but they don't look straightforward >to me. >Can someone give me a hint on what they do or point me to some documentation? builderDefs compose build process out of phases instead of running always the same functions, although some of executions of some of the functions do nothing. It was written before there was any reasonable overriding in Nixpkgs to provide overriding (sometimes changing preConfigure with overrides is still hard). Also, it doesn't require additional tricks for passing $out in configureFlags and it is possible to add a new archive format support in trunk with out a rebuild (and overall it controls more of the build choices on Nix-language level, instead of in the bash script). >In particular, i would like to update the expression for the Io language which >is now old (2008) which employ builderDefs. If it is a complete rewrite because Io's build system is now rewritten upstream, there is no reason to care about my old expression. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29844 - nixpkgs/trunk/pkgs/development/tools/misc/cpphs
Author: simons
Date: Fri Oct 14 17:26:38 2011
New Revision: 29844
URL: https://nixos.org/websvn/nix/?rev=29844&sc=1
Log:
haskell-cpphs: updated to version 1.13.2
Modified:
nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix Fri Oct 14
17:26:32 2011(r29843)
+++ nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix Fri Oct 14
17:26:38 2011(r29844)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cpphs";
- version = "1.13.1";
- sha256 = "0k5p9gqnalll3w1962dwydnygk25h777bic2gvdh8i8hhyz5fsx2";
+ version = "1.13.2";
+ sha256 = "1q3pzfcgrl9nka1gdl84c4fqc1ql83idlbb8fghqsjp0ijzcxk3s";
isLibrary = true;
isExecutable = true;
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29843 - nixpkgs/trunk/pkgs/development/libraries/haskell/tls
Author: simons
Date: Fri Oct 14 17:26:32 2011
New Revision: 29843
URL: https://nixos.org/websvn/nix/?rev=29843&sc=1
Log:
haskell-tls: updated to version 0.8.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nixFri Oct
14 17:26:27 2011(r29842)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nixFri Oct
14 17:26:32 2011(r29843)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "tls";
- version = "0.8.0";
- sha256 = "05c7bizwkwcp83idsa5cjb53lvm9f44iaypp9yiqv4ly9q3h315q";
+ version = "0.8.1";
+ sha256 = "1qgjzsp9f0mrkwrqzs69279q1dkz72hpazq6qp49p2xfsfzdp7dj";
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29842 - nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator
Author: simons
Date: Fri Oct 14 17:26:27 2011
New Revision: 29842
URL: https://nixos.org/websvn/nix/?rev=29842&sc=1
Log:
haskell-http-enumerator: updated to version 0.7.1.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Fri Oct 14 17:26:22 2011(r29841)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Fri Oct 14 17:26:27 2011(r29842)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "http-enumerator";
- version = "0.7.1.1";
- sha256 = "0b26gvwpnv851x1v5qix7mp0wliff9klqc2pfp2ig54l77s15y36";
+ version = "0.7.1.2";
+ sha256 = "1jxy017vhmzwq4480r6g45mg3x1d48zckbcyqhsk40bw5i32dfmv";
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29841 - nixpkgs/trunk/pkgs/development/libraries/haskell/certificate
Author: simons
Date: Fri Oct 14 17:26:22 2011
New Revision: 29841
URL: https://nixos.org/websvn/nix/?rev=29841&sc=1
Log:
haskell-certificate: updated to version 0.9.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/certificate/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/certificate/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/certificate/default.nix
Fri Oct 14 17:26:16 2011(r29840)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/certificate/default.nix
Fri Oct 14 17:26:22 2011(r29841)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "certificate";
- version = "0.9.3";
- sha256 = "1gg26d1arf588zjhdzs8r26k40v6m679l8k2vw28l8j3q5m11p71";
+ version = "0.9.4";
+ sha256 = "0apv2paxlp12ksn28bn4lb1mg05cs7sjygfarxacwmz43jy6ld9v";
isLibrary = true;
isExecutable = true;
buildDepends = [ asn1Data base64Bytestring mtl time ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29840 - nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data
Author: simons
Date: Fri Oct 14 17:26:16 2011
New Revision: 29840
URL: https://nixos.org/websvn/nix/?rev=29840&sc=1
Log:
haskell-asn1-data: updated to version 0.6.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data/default.nix
Fri Oct 14 17:26:12 2011(r29839)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data/default.nix
Fri Oct 14 17:26:16 2011(r29840)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "asn1-data";
- version = "0.6.0";
- sha256 = "0gk34x2frkk2s7d0i7ahwnjv9jcqdgx2sd1kp3d854548k171z3f";
+ version = "0.6.1";
+ sha256 = "1kj1h1z4ix8kdxq5838xk70sgz9rq0vdii5nli1rcycx3y2ipi84";
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29839 - nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk
Author: simons
Date: Fri Oct 14 17:26:12 2011
New Revision: 29839
URL: https://nixos.org/websvn/nix/?rev=29839&sc=1
Log:
haskell-Hipmunk: updated to version 5.2.0.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Fri Oct 14 14:14:36 2011(r29838)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Fri Oct 14 17:26:12 2011(r29839)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Hipmunk";
- version = "5.2.0.3";
- sha256 = "1as00372hz0ngy6pc5l0w7qgw5flcyag07zk3dxkbj5kv24xk49m";
+ version = "5.2.0.4";
+ sha256 = "0sa0a4hg0xp8l64dy8hnfkhvy2miv79b5550v8gkvrbqcci0qfay";
buildDepends = [ StateVar transformers ];
noHaddock = true;
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29838 - nixpkgs/trunk/pkgs/development/libraries/yajl
Author: maggesi Date: Fri Oct 14 14:14:36 2011 New Revision: 29838 URL: https://nixos.org/websvn/nix/?rev=29838&sc=1 Log: yajl: enable Hydra build Modified: nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix Modified: nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix == --- nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix Fri Oct 14 14:00:50 2011(r29837) +++ nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix Fri Oct 14 14:14:36 2011(r29838) @@ -19,5 +19,9 @@ ''; homepage = http://lloyd.github.com/yajl/; license = stdenv.lib.license.isc; +platforms = stdenv.lib.platforms.linux; +maintainers = with stdenv.lib.maintainers; [ + z77z +]; }; } ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29837 - in nixpkgs/trunk/pkgs: development/libraries/yajl lib top-level
Author: maggesi
Date: Fri Oct 14 14:00:50 2011
New Revision: 29837
URL: https://nixos.org/websvn/nix/?rev=29837&sc=1
Log:
Add yaml - Yet Another JSON Library
Added:
nixpkgs/trunk/pkgs/development/libraries/yajl/
nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix
Modified:
nixpkgs/trunk/pkgs/lib/licenses.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix Fri Oct 14
14:00:50 2011(r29837)
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, cmake, ruby}:
+
+stdenv.mkDerivation {
+ name = "yajl-2.0.1";
+
+ src = fetchurl {
+url = http://github.com/lloyd/yajl/tarball/2.0.1;
+name = "yajl-2.0.1.tar.gz";
+sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2";
+ };
+
+ buildInputs = [ cmake ruby ];
+
+ meta = {
+description = "Yet Another JSON Library";
+longDescription = ''
+ YAJL is a small event-driven (SAX-style) JSON parser written in ANSI
+ C, and a small validating JSON generator.
+'';
+homepage = http://lloyd.github.com/yajl/;
+license = stdenv.lib.license.isc;
+ };
+}
Modified: nixpkgs/trunk/pkgs/lib/licenses.nix
==
--- nixpkgs/trunk/pkgs/lib/licenses.nix Fri Oct 14 13:24:55 2011(r29836)
+++ nixpkgs/trunk/pkgs/lib/licenses.nix Fri Oct 14 14:00:50 2011(r29837)
@@ -82,6 +82,12 @@
url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
};
+ isc = {
+shortName = "ISC";
+fullName = "Internet Systems Consortium License";
+url = http://www.opensource.org/licenses/ISC;
+ };
+
ipl10 = {
shortName = "IPL 1.0";
fullName = "IBM Public License Version 1.0";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Oct 14 13:24:55
2011(r29836)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Oct 14 14:00:50
2011(r29837)
@@ -4640,6 +4640,8 @@
xvidcore = callPackage ../development/libraries/xvidcore { };
+ yajl = callPackage ../development/libraries/yajl { };
+
zangband = builderDefsPackage (import ../games/zangband) {
inherit ncurses flex bison autoconf automake m4 coreutils;
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29836 - nixpkgs/trunk/pkgs/servers/http/tomcat/axis2
Author: sandervanderburg
Date: Fri Oct 14 13:24:55 2011
New Revision: 29836
URL: https://nixos.org/websvn/nix/?rev=29836&sc=1
Log:
Updated Axis2 to version 1.6.1
Modified:
nixpkgs/trunk/pkgs/servers/http/tomcat/axis2/default.nix
Modified: nixpkgs/trunk/pkgs/servers/http/tomcat/axis2/default.nix
==
--- nixpkgs/trunk/pkgs/servers/http/tomcat/axis2/default.nixFri Oct 14
12:38:46 2011(r29835)
+++ nixpkgs/trunk/pkgs/servers/http/tomcat/axis2/default.nixFri Oct 14
13:24:55 2011(r29836)
@@ -1,11 +1,11 @@
{stdenv, fetchurl, apacheAnt, jdk, unzip}:
stdenv.mkDerivation {
- name = "axis2-1.5.4";
+ name = "axis2-1.6.1";
src = fetchurl {
-url =
http://apache.mirror.easycolocate.nl/axis/axis2/java/core/1.5.4/axis2-1.5.4-bin.zip;
-sha256 = "0mqnsj14g8aqmh3gjxgys6kwa7q8jkjgczb0hlcr4v2par0hdfng";
+url =
http://apache.mirror.versatel.nl//axis/axis2/java/core/1.6.1/axis2-1.6.1-bin.zip;
+sha256 = "1a0p85qh9924dv3y7zivf62hy1jzdaxnndqh93g6lndmacfhkk64";
};
buildInputs = [ unzip apacheAnt jdk ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29835 - nixpkgs/branches/pure-python
Author: chaoflow Date: Fri Oct 14 12:38:46 2011 New Revision: 29835 URL: https://nixos.org/websvn/nix/?rev=29835&sc=1 Log: Create branch pure-python Added: nixpkgs/branches/pure-python/ (props changed) - copied from r29834, nixpkgs/trunk/ ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] builderDefs, composedArgsAndFun
Hi, there are some functions in nixpkgs that I always avoided to use and understand. A couple of them are builderDefs and composedArgsAndFun. I'm reading their implementation right now but they don't look straightforward to me. Can someone give me a hint on what they do or point me to some documentation? In particular, i would like to update the expression for the Io language which is now old (2008) which employ builderDefs. Thanks, Marco ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] kernel oops [aufs + squashfs] on nixos-graphical-0.1pre29826-i686-linux.iso
paul@paul-P5GZ-MX:~$ dd if=/dev/cdrom | md5sum 164774618b05c3633124bf6ef793d5e8 - What a nice trick to test if the image is burned ok! It seems so, because I had: paul@paul-P5GZ-MX:~$ md5sum testNix/nixos-graphical-0.1pre29826-i686-linux.iso 164774618b05c3633124bf6ef793d5e8 testNix/nixos-graphical-0.1pre29826-i686-linux.iso Now, I tested it under qemu. Painfully slow because my Celeron D 2.66 GHz does not have VT flag, so it goes without KVM. But it did work! I was able to log in, and after that to start xserver, and after waiting a long time, I had ever seen the first icon of KDE loading: the disk. But while booting under QEMU, some message told me it was running over QEMU, and so was accessing data a bit differently. So somehow, that it run under QEMU does not means it is fine. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29834 - nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch
Author: chaoflow
Date: Fri Oct 14 10:30:14 2011
New Revision: 29834
URL: https://nixos.org/websvn/nix/?rev=29834&sc=1
Log:
notmuch - simplify expression
Modified:
nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch/default.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch/default.nix
Fri Oct 14 09:47:30 2011(r29833)
+++ nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch/default.nix
Fri Oct 14 10:30:14 2011(r29834)
@@ -10,66 +10,40 @@
buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian
];
- # XXX: Make me a loop
patchPhase = ''
-# substituteInPlace "test/atomicity" \
-# --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/aggregate-results.sh" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/author-order" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/basic" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/crypto" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/dump-restore" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/emacs" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/emacs-large-search-buffer" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/encoding" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/from-guessing" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/json" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/long-id" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/maildir-sync" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/new" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/notmuch-test" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/raw" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/reply" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/search" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/search-by-folder" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/search-insufficient-from-quoting" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/search-folder-coherence" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/search-output" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/search-position-overlap-bug" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/symbol-hiding" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/test-lib.sh" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/test-verbose" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/thread-naming" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/thread-order" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-substituteInPlace "test/uuencode" \
- --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+(cd test && for prg in \
+aggregate-results.sh \
+author-order \
+basic \
+crypto \
+dump-restore \
+emacs \
+emacs-large-search-buffer \
+encoding \
+from-guessing \
+json \
+long-id \
+maildir-sync \
+new \
+notmuch-test \
+raw \
+reply \
+search \
+search-by-folder \
+search-insufficient-from-quoting \
+search-folder-coherence \
+search-output \
+search-position-overlap-bug \
+symbol-hiding \
+test-lib.sh \
+test-verbose \
+thread-naming \
+thread-order \
+uuencode \
+;do
+ substituteInPlace "$prg" \
+--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+done)
'';
postBuild = ''
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] python-x.y.z-wrapper vs python-x.y.z-full
Hi, the attribute name for pythonXYFull is python-X.Y.Z-wrapper. I'd consider python-X.Y.Z-full to be more intuitive. Anything against renaming? regards -- Florian Friesdorf GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 Jabber/XMPP: f...@chaoflow.net IRC: chaoflow on freenode,ircnet,blafasel,OFTC pgpxBwBo0DSWt.pgp Description: PGP signature ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] attribute "hiding"
Hi, in all-packages there are (now): python = python27 pythonFull = python27Full python26 = ... python27 = ... python26Full = ... python27Full = ... When querying (nix-env -qaP \* |grep python) pythonFull and python27 are missing. I wonder why one time the lhs hides the right (python27) and the other time the rhs hides the left (pythonFull). regards -- Florian Friesdorf GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 Jabber/XMPP: f...@chaoflow.net IRC: chaoflow on freenode,ircnet,blafasel,OFTC pgpfT4okAbjWn.pgp Description: PGP signature ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29833 - nixpkgs/trunk/pkgs/top-level
Author: chaoflow
Date: Fri Oct 14 09:47:30 2011
New Revision: 29833
URL: https://nixos.org/websvn/nix/?rev=29833&sc=1
Log:
python26Full and explicit python27Full
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Oct 14 07:55:02
2011(r29832)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Oct 14 09:47:30
2011(r29833)
@@ -2586,8 +2586,16 @@
sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
};
- pythonFull = callPackage ../development/interpreters/python/wrapper.nix {
-extraLibs = lib.attrValues python.modules;
+ pythonFull = python27Full;
+
+ python26Full = callPackage ../development/interpreters/python/wrapper.nix {
+extraLibs = lib.attrValues python26.modules;
+python = python26;
+ };
+
+ python27Full = callPackage ../development/interpreters/python/wrapper.nix {
+extraLibs = lib.attrValues python27.modules;
+python = python27;
};
pythonhomeWrapper = callPackage
../development/interpreters/python/pythonhome-wrapper.nix { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29832 - nixpkgs/trunk/pkgs/applications/misc/dmenu
Author: viric
Date: Fri Oct 14 07:55:02 2011
New Revision: 29832
URL: https://nixos.org/websvn/nix/?rev=29832&sc=1
Log:
Updating dmenu
Modified:
nixpkgs/trunk/pkgs/applications/misc/dmenu/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/dmenu/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/dmenu/default.nix Fri Oct 14
07:47:20 2011(r29831)
+++ nixpkgs/trunk/pkgs/applications/misc/dmenu/default.nix Fri Oct 14
07:55:02 2011(r29832)
@@ -1,11 +1,11 @@
{stdenv, fetchurl, libX11, libXinerama}:
stdenv.mkDerivation rec {
- name = "dmenu-4.4";
+ name = "dmenu-4.4.1";
src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";;
-sha256 = "016hfnmk4kb2n3slxrg4z27p2l8x1awqsig961syssw4p1zybpav";
+sha256 = "0l25vdnzlslk0r4m6hjkzxdygh3wpq04b9mr8zc9h3b1md2icr3d";
};
buildInputs = [ libX11 libXinerama ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29831 - in nixpkgs/trunk/pkgs: development/tools/misc/cbrowser top-level
Author: viric
Date: Fri Oct 14 07:47:20 2011
New Revision: 29831
URL: https://nixos.org/websvn/nix/?rev=29831&sc=1
Log:
Adding cbrowser. Have cscope on the path to use it (which you should already
have, because otherwise how would you have created the database for cbrowser?)
Added:
nixpkgs/trunk/pkgs/development/tools/misc/cbrowser/
nixpkgs/trunk/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
nixpkgs/trunk/pkgs/development/tools/misc/cbrowser/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added:
nixpkgs/trunk/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
Fri Oct 14 07:47:20 2011(r29831)
@@ -0,0 +1,49 @@
+Based on this:
+http://sourceforge.net/tracker/?func=detail&aid=1493886&group_id=5152&atid=305152
+fix the infinite loops in quote highlight - ID: 1493886
+
+--- cbrowser-0.8-2/ftcllib.tcl 2000-07-04 01:17:43.0 +0200
cbrowser-0.8/ftcllib.tcl 2006-05-24 00:39:18.833762522 +0200
+@@ -1290,13 +1290,39 @@
+ foreach {start end} [concat 1.0 [$widget tag ranges comment] end] {
+
+ while {[set temp [$widget search -regexp -- $pattern $start $end]] != ""}
{
++ set startquote [$widget index "$temp + 1chars"]
+
+- set endquote [$widget search -regexp -- {[^\\]\"} "$temp + 1chars" $end]
++ set temp [$widget index "$startquote + 1chars"]
++ while {1==1} {
++set endquote [$widget search -regexp -- {\"} $temp $end]
++
++ # The program will not break if a /*C comment*/ is between C quotes.
++ if { $endquote == "" } {
++set endquote $startquote
++break
++ }
++
++# look for double backslashes
++ if {[set temp2 [$widget search -regexp -- {} $temp $endquote]] !=
""} {
++set temp "$temp2 + 2chars"
++continue
++ }
++
++# look for \"
++ if {[set temp2 [$widget search -regexp -- {\\\"} $temp $endquote]] !=
""} {
++set temp "$temp2 + 2chars"
++continue
++ }
++
++ break
++ }
+
+ if {[strlen $endquote] > 0} {
+-set start [$widget index "$endquote + 2chars"]
++set start [$widget index "$endquote + 1chars"]
+
+-$widget tag add quote "$temp + 1chars" $start
++$widget tag add quote $startquote $start
++ } else {
++set start [$widget index "$start + 1chars"]
+ }
+ }
+ }
Added: nixpkgs/trunk/pkgs/development/tools/misc/cbrowser/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/misc/cbrowser/default.nix Fri Oct
14 07:47:20 2011(r29831)
@@ -0,0 +1,34 @@
+{ fetchurl, stdenv, cscope, tk, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "cbrowser-0.8";
+
+ src = fetchurl {
+url = "mirror://sourceforge/cbrowser/cbrowser-0.8.tar.gz";
+sha256 = "1050mirjab23qsnq3lp3a9vwcbavmh9kznzjm7dr5vkx8b7ffcji";
+ };
+
+ patches = [ ./backslashes-quotes.diff ];
+
+ buildInputs = [ tk makeWrapper ];
+
+ installPhase = ''
+ensureDir $out/bin $out/share/${name}
+cp -R * $out/share/${name}/
+
+makeWrapper $out/share/${name}/cbrowser $out/bin/cbrowser \
+ --prefix PATH : ${tk}/bin
+ '';
+
+ meta = {
+description = "Tcl/Tk GUI front-end to cscope";
+
+license = "GPLv2+";
+
+homepage = http://sourceforge.net/projects/cbrowser/;
+
+maintainers = with stdenv.lib.maintainers; [viric];
+
+platforms = with stdenv.lib.platforms; linux;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Oct 13 18:30:55
2011(r29830)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Oct 14 07:47:20
2011(r29831)
@@ -2764,6 +2764,8 @@
byacc = callPackage ../development/tools/parsing/byacc { };
+ cbrowser = callPackage ../development/tools/misc/cbrowser { };
+
ccache = callPackage ../development/tools/misc/ccache { };
complexity = callPackage ../development/tools/misc/complexity { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Sharing the Nix store between systems
Hi,
I decided to solve the problem of store-sharing by
letting the nix-worker on localhost forward everything
to the nix-worker on another host. This way, I can
let a "client host" mount the store read-only, but
it is still possible to perform builds and installation,
since it is really the master host that does all
writing to the shared store. This is in my opinion
a very nice solution for thin disk-less clients.
One thing to note about this solution is that the
master of course don't add any gcroots for the new
builds, so the builds might be garbage collected
by the Nix master even though a client host uses
them. I intend to solve this by sharing some
subdirectory of /nix/var/nix/profiles on the master
to the hosts. That is orthogonal to the nix-worker
forwarding, though.
The forwarding was done like this:
jobs.nixRemoteDaemon = {
name = "nix-remote-daemon";
startOn = "startup";
script = ''
export
PATH=${pkgs.openssh}/bin:${pkgs.socat}/bin:${pkgs.coreutils}/bin
NIX_SOCKET=/nix/var/nix/daemon-socket/socket
NIX_REMOTE_SSHKEY=/etc/secrets/nix-remote-daemon.id_dsa
NIX_REMOTE_USER=nixremote
NIX_REMOTE_HOST=mynixmaster
mkdir -p $(dirname "$NIX_SOCKET")
rm -f "$NIX_SOCKET"
exec socat UNIX-LISTEN:$NIX_SOCKET,fork EXEC:"ssh -i
$NIX_REMOTE_SSHKEY $NIX_REMOTE_USER@$NIX_REMOTE_HOST socat -
UNIX-CONNECT\:$NIX_SOCKET"
'';
};
I simply define a new job that listens on the nix-worker
socket and forwards everything via ssh to the nix-worker
socket on the master. This works flawlessly for me.
I want to ask for recommendations on how to package this
and submit it to Nix/NixOS. I my opinion, this should really
be a feature of nix-worker itself, maybe something like this:
nix-worker --remote --remote-host ... --remote-user .. --remote-key ..
The simplest implementation of this is to just write a bash
wrapper around the existing nix-worker that uses socat and
ssh like above.
Is this a good idea, or should it rather be packaged as a separate
nix-remote-worker daemon?
Best regards,
Rickard Nilsson
Den 2011-09-30 08:50:32 skrev Marc Weber :
> Excerpts from Rickard Nilsson's message of Thu Sep 29 23:30:31 +0200
> 2011:
>> * How can I in NixOS specify which user that should do the builds? I
>> would
>> like to use users and groups defined in a central LDAP catalog, and not
>> let NixOS create any local build users/groups.
> grep in nix source for nixbldX
>
>> * How would I stop Nix on one host from removing contents from the store
>> that is used by other hosts?
> patch nix or put references in /nix/var/nix/gcroots/..
>
>> * Is there a way to also throw a build server into the picture, so that
>> NixOS computers can ask the build server to build store paths, which
>> would
>> then be put on the NFS share directly by the build server?
> If you have a client server setup there are remote builders. That's what
> currently works. See manual and nix.buildMachines.
> If you want to share the store so that you don't have to copy store
> paths first before building I don't know about existing solutions yet -
> but I'm interested in finding one as well.
>
> Marc Weber
> ___
> nix-dev mailing list
> nix-dev@lists.science.uu.nl
> http://lists.science.uu.nl/mailman/listinfo/nix-dev
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
