Re: [Nix-dev] Why Nix-0.16 so hungry on ressources (mem + cpu) ?
Was using Nix-0.16. With it, I was able to: sudo nix-install-package --non-interactive --url http://hydra.nixos.org/build/1463174/nix/pkg/nix-1.0pre29920-i686-linux.nixpkg which is trunk nix. Or at least was not long ago. It also shows the 56k connection was not so bad: did download perl-5.10.1, gcc-4.5, etc. Nix trunk seems to be quite similar to Nix-0.16 in term of memory used, or the 'too much' nix-expressions evaluated. CPU would be used at only about 6%, but 'waiting' about 90% according to top. I guess this is caused by trashing due to the big 70% memory used. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30053 - nixpkgs/trunk/pkgs/os-specific/linux/udev
Author: viric
Date: Thu Oct 27 15:13:26 2011
New Revision: 30053
URL: https://nixos.org/websvn/nix/?rev=30053&sc=1
Log:
Adding an udev patch for kernels not having the accept4 call. armv5tel 3.0, for
example.
Added:
nixpkgs/trunk/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/udev/173.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/udev/173.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/udev/173.nix Thu Oct 27 06:39:45
2011(r30052)
+++ nixpkgs/trunk/pkgs/os-specific/linux/udev/173.nix Thu Oct 27 15:13:26
2011(r30053)
@@ -44,7 +44,8 @@
rm -frv $out/share/gtk-doc
'';
- patches = [ ./custom-rules.patch ];
+ patches = [ ./custom-rules.patch ] ++
+stdenv.lib.optional (stdenv.system == "armv5tel-linux")
./pre-accept4-kernel.patch;
meta = {
homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
Added: nixpkgs/trunk/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch Thu Oct
27 15:13:26 2011(r30053)
@@ -0,0 +1,43 @@
+From:
+https://github.com/archlinuxarm/PKGBUILDs/blob/master/core/udev-oxnas/pre-accept4-kernel.patch
+
+diff -urN a/udev/udev-ctrl.c b/udev/udev-ctrl.c
+--- a/udev/udev-ctrl.c 2011-10-09 17:10:32.0 -0600
b/udev/udev-ctrl.c 2011-10-25 15:11:09.0 -0600
+@@ -15,6 +15,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+@@ -182,6 +183,7 @@
+ struct ucred ucred;
+ socklen_t slen;
+ const int on = 1;
++ int flgs;
+
+ conn = calloc(1, sizeof(struct udev_ctrl_connection));
+ if (conn == NULL)
+@@ -189,13 +191,19 @@
+ conn->refcount = 1;
+ conn->uctrl = uctrl;
+
+- conn->sock = accept4(uctrl->sock, NULL, NULL,
SOCK_CLOEXEC|SOCK_NONBLOCK);
++//conn->sock = accept4(uctrl->sock, NULL, NULL,
SOCK_CLOEXEC|SOCK_NONBLOCK);
++ conn->sock = accept(uctrl->sock, NULL, NULL);
+ if (conn->sock < 0) {
+ if (errno != EINTR)
+ err(uctrl->udev, "unable to receive ctrl connection:
%m\n");
+ goto err;
+ }
+
++// Since we don't have accept4
++ flgs = fcntl(conn->sock, F_GETFL, NULL);
++ if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK);
++ fcntl(conn->sock, F_SETFD, FD_CLOEXEC);
++
+ /* check peer credential of connection */
+ slen = sizeof(ucred);
+ if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0)
{
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30054 - nixpkgs/trunk/pkgs/tools/virtualization/amazon-ec2-api-tools
Author: eelco
Date: Thu Oct 27 15:15:28 2011
New Revision: 30054
URL: https://nixos.org/websvn/nix/?rev=30054&sc=1
Log:
* ec2-api-tools updated to 1.4.4.2.
Modified:
nixpkgs/trunk/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
Modified:
nixpkgs/trunk/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
==
--- nixpkgs/trunk/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
Thu Oct 27 15:13:26 2011(r30053)
+++ nixpkgs/trunk/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
Thu Oct 27 15:15:28 2011(r30054)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip, makeWrapper, jre }:
stdenv.mkDerivation {
- name = "ec2-api-tools-1.4.2.2";
+ name = "ec2-api-tools-1.4.4.2";
src = fetchurl {
url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip;
-sha256 =
"1e0f183c1e6d90338dbf427697908167a61c66dc7761ae5a73bb849f39f701fe";
+sha256 = "03immxrrc7brbwm9nbp6dqw4bxpcb18l8rsj75nd6h2vanq2qlj4";
};
buildInputs = [ unzip makeWrapper ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30055 - in nixpkgs/branches/stdenv-updates/pkgs: development/interpreters/perl development/interpreters/perl-5.10 development/interpreters/perl-5.8 development/interpr
Author: eelco
Date: Thu Oct 27 15:35:43 2011
New Revision: 30055
URL: https://nixos.org/websvn/nix/?rev=30055&sc=1
Log:
* Move perl-5.8 and perl-5.10 into perl/ per the coding conventions.
Added:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/5.10/
- copied from r30052,
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl-5.10/
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/5.8/
- copied from r30052,
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl-5.8/
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl-5.10/
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl-5.8/
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Oct
27 15:15:28 2011(r30054)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Oct
27 15:35:43 2011(r30055)
@@ -2559,11 +2559,11 @@
# mercurial (hg) bleeding edge version
octaveHG = callPackage ../development/interpreters/octave/hg.nix { };
- perl58 = callPackage ../development/interpreters/perl-5.8 {
+ perl58 = callPackage ../development/interpreters/perl/5.8 {
impureLibcPath = if stdenv.isLinux then null else "/usr";
};
- perl510 = callPackage ../development/interpreters/perl-5.10 {
+ perl510 = callPackage ../development/interpreters/perl/5.10 {
fetchurl = fetchurlBoot;
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30056 - nixos/trunk/modules/services/x11/display-managers
Author: viric
Date: Thu Oct 27 15:43:13 2011
New Revision: 30056
URL: https://nixos.org/websvn/nix/?rev=30056&sc=1
Log:
Fixing the xserver.enableTCP for kdm.
Modified:
nixos/trunk/modules/services/x11/display-managers/kdm.nix
Modified: nixos/trunk/modules/services/x11/display-managers/kdm.nix
==
--- nixos/trunk/modules/services/x11/display-managers/kdm.nix Thu Oct 27
15:35:43 2011(r30055)
+++ nixos/trunk/modules/services/x11/display-managers/kdm.nix Thu Oct 27
15:43:13 2011(r30056)
@@ -50,7 +50,10 @@
buildCommand =
''
echo "$config" > $out
-cat ${kdebase_workspace}/share/config/kdm/kdmrc >> $out
+
+# The default kdmrc would add "-nolisten tcp", and we already
+# have that managed by nixos. Hence the grep.
+cat ${kdebase_workspace}/share/config/kdm/kdmrc | grep -v nolisten >>
$out
'';
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30057 - in nixpkgs/branches/stdenv-updates/pkgs: development/interpreters/perl/5.14 top-level
Author: eelco
Date: Thu Oct 27 15:58:25 2011
New Revision: 30057
URL: https://nixos.org/websvn/nix/?rev=30057&sc=1
Log:
* Added Perl 5.14.2.
Added:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/5.14/
- copied from r30055,
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/5.10/
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/5.14/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/5.14/default.nix
==
---
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/5.10/default.nix
Thu Oct 27 15:35:43 2011(r30055)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/5.14/default.nix
Thu Oct 27 15:58:25 2011(r30057)
@@ -7,11 +7,11 @@
in
stdenv.mkDerivation rec {
- name = "perl-5.10.1";
+ name = "perl-5.14.2";
src = fetchurl {
url = "mirror://cpan/src/${name}.tar.gz";
-sha256 = "0dagnhjgmslfx1jawz986nvc3jh1klk7mn2l8djdca1b9gm2czyb";
+sha256 = "1ls8cpbgnlaxfydyyqgr7pxj1hkxh9pzcdgr3dv42zdxffakb234";
};
patches =
@@ -53,7 +53,7 @@
preBuild = stdenv.lib.optionalString (!(stdenv ? gcc &&
stdenv.gcc.nativeTools))
''
# Make Cwd work on NixOS (where we don't have a /bin/pwd).
- substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
+ substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP
pwd)'"
'';
setupHook = ./setup-hook.sh;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch
==
---
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch
Thu Oct 27 15:35:43 2011(r30055)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch
Thu Oct 27 15:58:25 2011(r30057)
@@ -1,201 +1,134 @@
-diff -rc -x '*~' perl-5.10.1-orig/Configure perl-5.10.1/Configure
-*** perl-5.10.1-orig/Configure 2009-08-18 21:03:53.0 +0200
perl-5.10.1/Configure 2010-01-26 19:08:32.933792254 +0100
-***
-*** 103,117
- fi
-
- : Proper PATH setting
-! paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
-! paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
-! paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
-! paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
-! paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
-! paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin
/usr/ccs/bin"
-! paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
-! paths="$paths /sbin /usr/sbin /usr/libexec"
-! paths="$paths /system/gnu_library/bin"
-
- for p in $paths
- do
103,109
- fi
-
- : Proper PATH setting
-! paths=''
-
- for p in $paths
- do
-***
-*** 1301,1317
- archname=''
- libnames=''
- : change the next line if compiling for Xenix/286 on Xenix/386
-! xlibpth='/usr/lib/386 /lib/386'
- : Possible local library directories to search.
-! loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
-! loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
-
- : general looking path for locating libraries
-! glibpth="/lib /usr/lib $xlibpth"
-! glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
-! test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
-! test -f /shlib/libc.so && glibpth="/shlib $glibpth"
-! test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64
/usr/local/lib64"
-
- : Private path used by Configure to find libraries. Its value
- : is prepended to libpth. This variable takes care of special
1293,1304
- archname=''
- libnames=''
- : change the next line if compiling for Xenix/286 on Xenix/386
-! xlibpth=''
- : Possible local library directories to search.
-! loclibpth=""
-
- : general looking path for locating libraries
-! glibpth=""
-
- : Private path used by Configure to find libraries. Its value
- : is prepended to libpth. This variable takes care of special
-***
-*** 1329,1336
-
- : Possible local include directories to search.
- : Set locincpth to "" in a hint file to defeat local include searches.
-! locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
-! locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
- :
- : no include file wanted by default
- inclwanted=''
1316,1322
-
- : Possible local include directories to search.
- : Set locincpth to "" in a hint file to defeat local include searches.
-! locincpth=""
- :
- : no include file
[Nix-commits] SVN commit: nix - r30058 - nixpkgs/branches/stdenv-updates/pkgs/top-level
Author: eelco
Date: Thu Oct 27 16:09:22 2011
New Revision: 30058
URL: https://nixos.org/websvn/nix/?rev=30058&sc=1
Log:
* Make Perl 5.14 the default. Cross fingers.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Oct
27 15:58:25 2011(r30057)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Oct
27 16:09:22 2011(r30058)
@@ -2563,15 +2563,13 @@
impureLibcPath = if stdenv.isLinux then null else "/usr";
};
- perl510 = callPackage ../development/interpreters/perl/5.10 {
-fetchurl = fetchurlBoot;
- };
+ perl510 = callPackage ../development/interpreters/perl/5.10 { };
perl514 = callPackage ../development/interpreters/perl/5.14 {
fetchurl = fetchurlBoot;
};
- perl = if system != "i686-cygwin" then perl510 else sysPerl;
+ perl = if system != "i686-cygwin" then perl514 else sysPerl;
php = php5_3;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30059 - nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic
Author: eelco
Date: Thu Oct 27 16:32:46 2011
New Revision: 30059
URL: https://nixos.org/websvn/nix/?rev=30059&sc=1
Log:
* Only print "@ phase..." messages on demand since they're kind of
ugly and we already print phases (with start and end markers).
* Remove some stray tabs.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh
==
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.shThu Oct
27 16:09:22 2011(r30058)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.shThu Oct
27 16:32:46 2011(r30059)
@@ -453,8 +453,8 @@
case "$curSrc" in
*.tar | *.tar.* | *.tgz | *.tbz2)
- # GNU tar can automatically select the decompression method
- # (info "(tar) gzip").
+# GNU tar can automatically select the decompression method
+# (info "(tar) gzip").
tar xvf $curSrc
;;
*.zip)
@@ -834,9 +834,11 @@
if test "$curPhase" = installPhase -a -n "$dontInstall"; then
continue; fi
if test "$curPhase" = fixupPhase -a -n "$dontFixup"; then continue; fi
if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi
-
- echo
- echo "@ phase-started $out $curPhase"
+
+if [ -n "$tracePhases" ]; then
+echo
+echo "@ phase-started $out $curPhase"
+fi
showPhaseHeader "$curPhase"
dumpVars
@@ -849,8 +851,10 @@
cd "${sourceRoot:-.}"
fi
- echo
- echo "@ phase-succeeded $out $curPhase"
+if [ -n "$tracePhases" ]; then
+echo
+echo "@ phase-succeeded $out $curPhase"
+fi
stopNest
done
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30060 - nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6
Author: eelco Date: Thu Oct 27 16:42:51 2011 New Revision: 30060 URL: https://nixos.org/websvn/nix/?rev=30060&sc=1 Log: * Operator precendence kills :-) GCC was accidentally depending on X11 because of missing parentheses around a ‘++’. Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix == --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix Thu Oct 27 16:32:46 2011(r30059) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix Thu Oct 27 16:42:51 2011(r30060) @@ -209,7 +209,7 @@ ++ (optional (cloog != null) cloog) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) -++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs) +++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30061 - in nixpkgs/branches/stdenv-updates: maintainers/scripts pkgs/development/compilers/gcc-4.4 pkgs/development/compilers/gcc-4.5
Author: eelco
Date: Thu Oct 27 16:50:00 2011
New Revision: 30061
URL: https://nixos.org/websvn/nix/?rev=30061&sc=1
Log:
* Backport the GCC xlibs dependency fix.
Modified:
nixpkgs/branches/stdenv-updates/maintainers/scripts/eval-release.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Modified: nixpkgs/branches/stdenv-updates/maintainers/scripts/eval-release.nix
==
--- nixpkgs/branches/stdenv-updates/maintainers/scripts/eval-release.nix
Thu Oct 27 16:42:51 2011(r30060)
+++ nixpkgs/branches/stdenv-updates/maintainers/scripts/eval-release.nix
Thu Oct 27 16:50:00 2011(r30061)
@@ -16,7 +16,7 @@
call = attrs: lib.flip lib.mapAttrs attrs
(n: v: builtins.trace n (
- if builtins.isFunction v then maybe (v { system = "i686-linux"; })
+ if builtins.isFunction v then maybe (v { system = "x86_64-linux"; })
else if builtins.isAttrs v then call v
else null
));
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix
==
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix
Thu Oct 27 16:42:51 2011(r30060)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix
Thu Oct 27 16:50:00 2011(r30061)
@@ -132,7 +132,7 @@
++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc)
++ (optionals langJava [zip unzip])
-++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs)
+++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
==
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Thu Oct 27 16:42:51 2011(r30060)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Thu Oct 27 16:50:00 2011(r30061)
@@ -204,7 +204,7 @@
++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc)
++ (optionals langJava [zip unzip])
-++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs)
+++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30062 - nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6
Author: eelco
Date: Thu Oct 27 17:02:15 2011
New Revision: 30062
URL: https://nixos.org/websvn/nix/?rev=30062&sc=1
Log:
* GCC updated to 4.6.2.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/sources.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix
==
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix
Thu Oct 27 16:50:00 2011(r30061)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix
Thu Oct 27 17:02:15 2011(r30062)
@@ -44,7 +44,7 @@
with stdenv.lib;
with builtins;
-let version = "4.6.1";
+let version = "4.6.2";
javaEcj = fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
# `configure' time.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/sources.nix
==
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/sources.nix
Thu Oct 27 16:50:00 2011(r30061)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/sources.nix
Thu Oct 27 17:02:15 2011(r30062)
@@ -1,31 +1,31 @@
/* Automatically generated by `update-gcc.sh', do not edit.
- For GCC 4.6.1. */
+ For GCC 4.6.2. */
{ fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda,
langGo }:
-assert version == "4.6.1";
+assert version == "4.6.2";
optional /* langC */ true (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
- sha256 = "0bbb8f754a31f29013f6e9ad4c755d92bb0f154a665c4b623e86ae7174d98e33";
+ sha256 = "dcbf391f05277b7e09d14d54f3bdaba5515a3a8e7dd1d8af93af3f6f68455e10";
}) ++
optional langCC (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
- sha256 = "44a91149bf4608aceb03b22209e5ec14ffe0c4003b11e3a368d6cebe5a327901";
+ sha256 = "5470bea8093438cf5840fbbef3546b6dba7b0153ef6a16e142c1fba1fac6e598";
}) ++
optional langFortran (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
- sha256 = "a0069a4452572b46cc20f1a1b52dc839b69c1d25e19c147a782e439d6be0156b";
+ sha256 = "492becd732662349eaa5e7c4e458ac009df0ccb8904df54ae295d277c4d6be6f";
}) ++
optional langJava (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
- sha256 = "728462275a0532714063803282d1ea815e35b5fd91a96f65a1f0a14da355765f";
+ sha256 = "d021a16816daeb5db9a3280909d846b38cbdb4cc0d9aa47714c49b08a81d11f1";
}) ++
optional langAda (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";
- sha256 = "0e2958b7be2e7ec9d7847658262ce9276d6c75f91d53c48d7141848cfe3cd093";
+ sha256 = "9ac26821ad900d02ed251b62e6a0506ee12417b506a7bb9b02ec9f09e5d9c84f";
}) ++
optional langGo (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-go-${version}.tar.bz2";
- sha256 = "9512347a76c46528d25295cd762f262c8265e99cee497dc2d66caddf9c021198";
+ sha256 = "1cafbb254d70f60c39a62a39a3b236674e02c875a1775057ddd33ffafe0fd4e1";
}) ++
[]
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30063 - nixpkgs/trunk/pkgs/development/libraries/haskell/uu-parsinglib
Author: simons
Date: Thu Oct 27 17:05:49 2011
New Revision: 30063
URL: https://nixos.org/websvn/nix/?rev=30063&sc=1
Log:
haskell-uu-parsinglib: updated to version 2.7.2.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
Thu Oct 27 17:02:15 2011(r30062)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
Thu Oct 27 17:05:49 2011(r30063)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uu-parsinglib";
- version = "2.7.1.1";
- sha256 = "1qn3impl64cvbzyvhc73yxyibgak4dkgl1vkbrzxrxb770kb5r4p";
+ version = "2.7.2.1";
+ sha256 = "1dablvx1mrgwzm6fqsbgny3qf9bz3bilhip1b78b5gxrbssfpdyk";
buildDepends = [ ListLike time ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30064 - nixpkgs/trunk/pkgs/development/libraries/haskell/vacuum
Author: simons
Date: Thu Oct 27 17:05:53 2011
New Revision: 30064
URL: https://nixos.org/websvn/nix/?rev=30064&sc=1
Log:
haskell-vacuum: updated to version 1.0.0.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/vacuum/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/vacuum/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/vacuum/default.nix Thu Oct
27 17:05:49 2011(r30063)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/vacuum/default.nix Thu Oct
27 17:05:53 2011(r30064)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "vacuum";
- version = "1.0.0.1";
- sha256 = "172py7nvyv66hvqmhigfm59rjb328bfzv0z11q8qdpf5w1fpvmc5";
+ version = "1.0.0.2";
+ sha256 = "1amlzd89952fvw1sbajf9kv3f2s2i6xbqs1zjxw442achg465y7i";
extraLibraries = [ ghcPaths ];
meta = {
homepage =
"http://web.archive.org/web/20100410115820/http://moonpatio.com/vacuum/";;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30065 - nixos/trunk/modules/system/boot
Author: eelco Date: Thu Oct 27 17:34:16 2011 New Revision: 30065 URL: https://nixos.org/websvn/nix/?rev=30065&sc=1 Log: * Make the permissions on /run less liberal. Modified: nixos/trunk/modules/system/boot/stage-1-init.sh nixos/trunk/modules/system/boot/stage-2-init.sh Modified: nixos/trunk/modules/system/boot/stage-1-init.sh == --- nixos/trunk/modules/system/boot/stage-1-init.sh Thu Oct 27 17:05:53 2011(r30064) +++ nixos/trunk/modules/system/boot/stage-1-init.sh Thu Oct 27 17:34:16 2011(r30065) @@ -55,7 +55,7 @@ mount -t sysfs none /sys mount -t tmpfs -o "mode=0755,size=@devSize@" none /dev mkdir -p /run -mount -t tmpfs -o "mode=1777,size=@runSize@" none /run +mount -t tmpfs -o "mode=0755,size=@runSize@" none /run # Process the kernel command line. Modified: nixos/trunk/modules/system/boot/stage-2-init.sh == --- nixos/trunk/modules/system/boot/stage-2-init.sh Thu Oct 27 17:05:53 2011(r30064) +++ nixos/trunk/modules/system/boot/stage-2-init.sh Thu Oct 27 17:34:16 2011(r30065) @@ -126,7 +126,7 @@ if ! mountpoint -q /run; then rm -rf /run mkdir -m 0755 -p /run -mount -t tmpfs -o "mode=1777,size=@runSize@" none /run +mount -t tmpfs -o "mode=0755,size=@runSize@" none /run fi mkdir -m 0700 -p /run/lock ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30066 - in nixpkgs/trunk/pkgs: development/libraries/haskell/gamma top-level
Author: andres
Date: Thu Oct 27 17:39:42 2011
New Revision: 30066
URL: https://nixos.org/websvn/nix/?rev=30066&sc=1
Log:
Generally switching to haskell-vector-0.9.
The price is that gamma's current upper bound has to be patched.
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/gamma/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/gamma/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/gamma/default.nix Thu Oct
27 17:34:16 2011(r30065)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/gamma/default.nix Thu Oct
27 17:39:42 2011(r30066)
@@ -5,6 +5,9 @@
version = "0.7.0.1";
sha256 = "0728b5mrzmj9hkaqvikl45jyi2p9hnkl2p6l9yv7wnw557yb0gb2";
buildDepends = [ continuedFractions converge vector ];
+ preConfigure = ''
+sed -i 's|\(vector.*\) && < 0.8|\1|' ${self.pname}.cabal
+ '';
meta = {
homepage = "https://github.com/mokus0/gamma";;
description = "Gamma function and related functions";
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Oct 27 17:34:16
2011(r30065)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Oct 27 17:39:42
2011(r30066)
@@ -366,9 +366,7 @@
ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
- aeson = callPackage ../development/libraries/haskell/aeson {
-vector = self.vector_0_7_1;
- };
+ aeson = callPackage ../development/libraries/haskell/aeson {};
aesonNative = callPackage ../development/libraries/haskell/aeson-native {};
@@ -420,9 +418,7 @@
blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
- blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {
-vector = self.vector_0_7_1;
- };
+ blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {};
blazeTextualNative = callPackage
../development/libraries/haskell/blaze-textual-native {};
@@ -490,9 +486,7 @@
cprngAes = callPackage ../development/libraries/haskell/cprng-aes {};
- criterion = callPackage ../development/libraries/haskell/criterion {
-vector = self.vector_0_7_1;
- };
+ criterion = callPackage ../development/libraries/haskell/criterion {};
Crypto = callPackage ../development/libraries/haskell/Crypto {};
@@ -587,9 +581,7 @@
fingertree = callPackage ../development/libraries/haskell/fingertree {};
- gamma = callPackage ../development/libraries/haskell/gamma {
-vector = self.vector_0_7_1;
- };
+ gamma = callPackage ../development/libraries/haskell/gamma {};
gdiff = callPackage ../development/libraries/haskell/gdiff {};
@@ -882,10 +874,7 @@
murmurHash = callPackage ../development/libraries/haskell/murmur-hash {};
- mwcRandom = callPackage ../development/libraries/haskell/mwc-random {
-primitive = self.primitive_0_3_1;
-vector = self.vector_0_7_1;
- };
+ mwcRandom = callPackage ../development/libraries/haskell/mwc-random {};
NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
@@ -1006,9 +995,7 @@
random = null; # core package until ghc-7.2.1
random_newtime = self.random_1_0_0_2_newtime;
- randomFu = callPackage ../development/libraries/haskell/random-fu {
-vector = self.vector_0_7_1;
- };
+ randomFu = callPackage ../development/libraries/haskell/random-fu {};
randomSource = callPackage ../development/libraries/haskell/random-source {};
@@ -1082,22 +1069,15 @@
smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
- snapCore = callPackage ../development/libraries/haskell/snap/core.nix {
-vector = self.vector_0_7_1;
- };
+ snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
- snapServer = callPackage ../development/libraries/haskell/snap/server.nix {
-vector = self.vector_0_7_1;
- };
+ snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
stateref = callPackage ../development/libraries/haskell/stateref {};
StateVar = callPackage ../development/libraries/haskell/StateVar {};
- statistics = callPackage ../development/libraries/haskell/statistics {
-primitive = self.primitive_0_3_1;
-vector = self.vector_0_7_1;
- };
+ statistics = callPackage ../development/libraries/haskell/statistics {};
streamproc = callPackage ../development/libraries/haskell/streamproc {};
@@ -1216,9 +1196,7 @@
tls = callPackage ../development/libraries/haskell/tls {};
- tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
-vector = self.vector_0_7_1;
- };
+ tlsExtra = callPackage ../development/libraries/haskell/tls-extra {};
transformers_0_2_2_0 = callPackage
../development/libraries/haskell
[Nix-commits] SVN commit: nix - r30067 - nixos/trunk/modules/virtualisation
Author: eelco Date: Thu Oct 27 17:46:25 2011 New Revision: 30067 URL: https://nixos.org/websvn/nix/?rev=30067&sc=1 Log: * Recent kernels need some more modules in the initrd to be able to do CIFS mounts. Modified: nixos/trunk/modules/virtualisation/qemu-vm.nix Modified: nixos/trunk/modules/virtualisation/qemu-vm.nix == --- nixos/trunk/modules/virtualisation/qemu-vm.nix Thu Oct 27 17:39:42 2011(r30066) +++ nixos/trunk/modules/virtualisation/qemu-vm.nix Thu Oct 27 17:46:25 2011(r30067) @@ -240,7 +240,7 @@ # CIFS. Also use paravirtualised network and block devices for # performance. boot.initrd.availableKernelModules = -[ "cifs" "nls_utf8" "hmac" "md4" ] +[ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" ] ++ optional cfg.writableStore [ "aufs" ]; boot.extraModulePackages = ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30068 - nixos/trunk/modules/services/monitoring
Author: viric Date: Thu Oct 27 18:06:54 2011 New Revision: 30068 URL: https://nixos.org/websvn/nix/?rev=30068&sc=1 Log: Fixing systemhealth for kernels 3.x Modified: nixos/trunk/modules/services/monitoring/systemhealth.nix Modified: nixos/trunk/modules/services/monitoring/systemhealth.nix == --- nixos/trunk/modules/services/monitoring/systemhealth.nixThu Oct 27 17:46:25 2011(r30067) +++ nixos/trunk/modules/services/monitoring/systemhealth.nixThu Oct 27 18:06:54 2011(r30068) @@ -14,6 +14,8 @@ buildInputs = [ python ]; installPhase = '' ensureDir $out/bin + # Make it work for kernels 3.x, not so different than 2.6 + sed -i 's/2\.6/4.0/' system_health.py cp system_health.py $out/bin ''; }; ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30069 - in nixpkgs/branches/stdenv-updates/pkgs/development/libraries: glibc-2.13 glibc-2.14
Author: eelco
Date: Thu Oct 27 18:42:32 2011
New Revision: 30069
URL: https://nixos.org/websvn/nix/?rev=30069&sc=1
Log:
* Build Glibc with sysconfdir set to /etc. This causes it to look for
‘localtime’ (the default time zone definition) in /etc rather than
$out/etc, allowing us to override the time zone globally in NixOS.
Note that Glibc already looked in /etc for most other configuration
files (e.g., /etc/hosts).
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/common.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.14/common.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/common.nix
==
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/common.nix
Thu Oct 27 18:06:54 2011(r30068)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/common.nix
Thu Oct 27 18:42:32 2011(r30069)
@@ -90,6 +90,7 @@
configureFlags = [
"-C"
"--enable-add-ons"
+"--sysconfdir=/etc"
"--localedir=/var/run/current-system/sw/lib/locale"
(if kernelHeaders != null
then "--with-headers=${kernelHeaders}/include"
@@ -111,6 +112,8 @@
# so the glibc does not depend on its compiler store path
"libc_cv_as_needed=no"
];
+
+ installFlags = [ "sysconfdir=$(out)/etc" ];
buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
++ stdenv.lib.optional (mig != null) mig;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.14/common.nix
==
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.14/common.nix
Thu Oct 27 18:06:54 2011(r30068)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.14/common.nix
Thu Oct 27 18:42:32 2011(r30069)
@@ -90,6 +90,7 @@
configureFlags = [
"-C"
"--enable-add-ons"
+"--sysconfdir=/etc"
"--localedir=/var/run/current-system/sw/lib/locale"
(if kernelHeaders != null
then "--with-headers=${kernelHeaders}/include"
@@ -111,6 +112,8 @@
# so the glibc does not depend on its compiler store path
"libc_cv_as_needed=no"
];
+
+ installFlags = [ "sysconfdir=$(out)/etc" ];
buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
++ stdenv.lib.optional (mig != null) mig;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30070 - nix/trunk/src/libexpr
Author: eelco
Date: Thu Oct 27 19:06:23 2011
New Revision: 30070
URL: https://nixos.org/websvn/nix/?rev=30070&sc=1
Log:
* In printValueAsXML, handle the case where a "type" attribute is not
a string. This happens in the NixOS option system.
* Remove a bogus comparison of a unsigned integer with -1.
Modified:
nix/trunk/src/libexpr/eval.cc
Modified: nix/trunk/src/libexpr/eval.cc
==
--- nix/trunk/src/libexpr/eval.cc Thu Oct 27 18:42:32 2011(r30069)
+++ nix/trunk/src/libexpr/eval.cc Thu Oct 27 19:06:23 2011(r30070)
@@ -170,8 +170,8 @@
size_t size = 32 * 1024 * 1024;
#if HAVE_SYSCONF && defined(_SC_PAGESIZE) && defined(_SC_PHYS_PAGES)
long pageSize = sysconf(_SC_PAGESIZE);
-long pages = sysconf (_SC_PHYS_PAGES);
-if (pageSize != -1 && size != -1)
+long pages = sysconf(_SC_PHYS_PAGES);
+if (pageSize != -1)
size = (pageSize * pages) / 4; // 25% of RAM
if (size > maxSize) size = maxSize;
#endif
@@ -1108,7 +1108,10 @@
{
if (v.type != tAttrs) return false;
Bindings::iterator i = v.attrs->find(sType);
-return i != v.attrs->end() && forceStringNoCtx(*i->value) == "derivation";
+if (i == v.attrs->end()) return false;
+forceValue(*i->value);
+if (i->value->type != tString) return false;
+return forceStringNoCtx(*i->value) == "derivation";
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30071 - nixos/trunk/modules/config
Author: eelco
Date: Thu Oct 27 19:36:03 2011
New Revision: 30071
URL: https://nixos.org/websvn/nix/?rev=30071&sc=1
Log:
* Create /etc/localtime as a symlink to the right zoneinfo file.
However, this won't do anything until we merge the stdenv branch.
Modified:
nixos/trunk/modules/config/timezone.nix
Modified: nixos/trunk/modules/config/timezone.nix
==
--- nixos/trunk/modules/config/timezone.nix Thu Oct 27 19:06:23 2011
(r30070)
+++ nixos/trunk/modules/config/timezone.nix Thu Oct 27 19:36:03 2011
(r30071)
@@ -1,10 +1,11 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
-let
+with pkgs.lib;
+{
options = {
-time.timeZone = pkgs.lib.mkOption {
+time.timeZone = mkOption {
default = "CET";
example = "America/New_York";
description = "The time zone used when displaying times and dates.";
@@ -12,14 +13,19 @@
};
-in
-
-{
- require = [options];
+ config = {
- environment.shellInit =
-''
- export TZ=${config.time.timeZone}
- export TZDIR=${pkgs.glibc}/share/zoneinfo
-'';
+environment.shellInit =
+ ''
+export TZ=${config.time.timeZone}
+export TZDIR=${pkgs.glibc}/share/zoneinfo
+ '';
+
+environment.etc = singleton
+ { source = "${pkgs.glibc}/share/zoneinfo/${config.time.timeZone}";
+target = "localtime";
+ };
+
+ };
+
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30072 - in nixos/trunk/modules: . misc services/mail
Author: viric
Date: Thu Oct 27 19:43:20 2011
New Revision: 30072
URL: https://nixos.org/websvn/nix/?rev=30072&sc=1
Log:
Adding a module for dovecot2. I've not tried it much.
Added:
nixos/trunk/modules/services/mail/dovecot2.nix
- copied, changed from r30046,
nixos/trunk/modules/services/mail/dovecot.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.nixThu Oct 27 19:36:03 2011(r30071)
+++ nixos/trunk/modules/misc/ids.nixThu Oct 27 19:43:20 2011(r30072)
@@ -64,6 +64,8 @@
fourStoreEndpoint = 43;
virtuoso = 44;
rtkit = 45;
+dovecot2 = 46;
+dovenull2 = 47;
# When adding a uid, make sure it doesn't match an existing gid.
@@ -110,6 +112,7 @@
fourStore = 42;
fourStoreEndpoint = 43;
virtuoso = 44;
+dovecot2 = 45;
# 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 Thu Oct 27 19:36:03 2011(r30071)
+++ nixos/trunk/modules/module-list.nix Thu Oct 27 19:43:20 2011(r30072)
@@ -73,6 +73,7 @@
./services/logging/logrotate.nix
./services/logging/syslogd.nix
./services/mail/dovecot.nix
+ ./services/mail/dovecot2.nix
./services/mail/freepops.nix
./services/mail/mail.nix
./services/mail/postfix.nix
Copied and modified: nixos/trunk/modules/services/mail/dovecot2.nix (from
r30046, nixos/trunk/modules/services/mail/dovecot.nix)
==
--- nixos/trunk/modules/services/mail/dovecot.nix Wed Oct 26 19:37:47
2011(r30046, copy source)
+++ nixos/trunk/modules/services/mail/dovecot2.nix Thu Oct 27 19:43:20
2011(r30072)
@@ -6,13 +6,13 @@
startingDependency = if config.services.gw6c.enable then "gw6c" else
"network-interfaces";
- cfg = config.services.dovecot;
+ cfg = config.services.dovecot2;
dovecotConf =
''
- base_dir = /var/run/dovecot/
+ base_dir = /var/run/dovecot2/
- protocols = imap imaps pop3 pop3s
+ protocols = imap pop3
''
+ (if cfg.sslServerCert!="" then
''
@@ -20,32 +20,33 @@
ssl_key_file = ${cfg.sslServerKey}
ssl_ca_file = ${cfg.sslCACert}
'' else ''
- ssl_disable = yes
+ ssl = no
disable_plaintext_auth = no
'')
+ ''
- login_user = ${cfg.user}
- login_chroot = no
+ default_internal_user = ${cfg.user}
mail_location = maildir:/var/spool/mail/%u
maildir_copy_with_hardlinks = yes
- auth default {
-mechanisms = plain login
-userdb passwd {
-}
-passdb pam {
-}
+ auth_mechanisms = plain login
+ service auth {
user = root
}
+ userdb {
+driver=passwd
+ }
+ passdb {
+driver=pam
+ }
auth_debug = yes
auth_verbose = yes
pop3_uidl_format = %08Xv%08Xu
- log_path = /var/log/dovecot.log
+ log_path = /var/log/dovecot2.log
'';
confFile = pkgs.writeText "dovecot.conf" dovecotConf;
@@ -58,20 +59,20 @@
options = {
-services.dovecot = {
+services.dovecot2 = {
enable = mkOption {
default = false;
-description = "Whether to enable the Dovecot POP3/IMAP server.";
+description = "Whether to enable the Dovecot 2.x POP3/IMAP server.";
};
user = mkOption {
-default = "dovecot";
+default = "dovecot2";
description = "Dovecot user name.";
};
group = mkOption {
-default = "dovecot";
+default = "dovecot2";
description = "Dovecot group name.";
};
@@ -97,34 +98,40 @@
## implementation
- config = mkIf config.services.dovecot.enable {
+ config = mkIf config.services.dovecot2.enable {
-security.pam.services = [ { name = "dovecot"; } ];
+security.pam.services = [ { name = "dovecot2"; } ];
-users.extraUsers = singleton
+users.extraUsers = [
{ name = cfg.user;
-uid = config.ids.uids.dovecot;
+uid = config.ids.uids.dovecot2;
description = "Dovecot user";
group = cfg.group;
- };
+ }
+ { name = "dovenull";
+uid = config.ids.uids.dovenull2;
+description = "Dovecot user for untrusted logins";
+group = cfg.group;
+ }
+];
users.extraGroups = singleton
{ name = cfg.group;
-gid = config.ids.gids.dovecot;
+gid = config.ids.gids.dovecot2;
};
-jobs.dovecot =
+jobs.dovecot2 =
{ description = "Dovecot IMAP/POP3 server";
startOn = "started ${startingDependency}";
preSt
Re: [Nix-dev] [Nix-commits] SVN commit: nix - r29855 - nixos/trunk/modules/system/boot
Den 2011-10-26 21:11:50 skrev Eelco Dolstra : > Hi, > > On 10/15/2011 11:01 PM, Nicolas Pierron wrote: > >> +if [ "$fsType" = "nfs" ]; then >> + nfsmount "$device" "/mnt-root$mountPoint" && break >> +else >> + mount -t "$fsType" -o "$options" "$device" >> "/mnt-root$mountPoint" && break > > Why is a special program needed for doing NFS mounts? I was the one who submitted this patch to NixOS. I don't know why a special program is needed. I didn't manage to get it to work with a plain "mount -t nfs", and since nfsmount (from klibc) is used in the initrd of other distributions (like ArchLinux, and maybe Ubuntu?) I tried it and it worked fine. However, now that my environment is a bit more stable, I could try to investigate exactly why "mount" failed. / Rickard ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] [Nix-commits] SVN commit: nix - r29855 - nixos/trunk/modules/system/boot
On 10/27/2011 11:32 PM, Rickard Nilsson wrote: > I was the one who submitted this patch to NixOS. I don't know why a > special program is needed. I didn't manage to get it to work with a plain > "mount -t nfs", and since nfsmount (from klibc) is used in the initrd of > other distributions (like ArchLinux, and maybe Ubuntu?) I tried it and it > worked fine. However, now that my environment is a bit more stable, I > could try to investigate exactly why "mount" failed. Thinking about it a bit, mount probably needs the mount.nfs helper. -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] [Nix-commits] SVN commit: nix - r29855 - nixos/trunk/modules/system/boot
Den 2011-10-27 23:37:46 skrev Eelco Dolstra : > On 10/27/2011 11:32 PM, Rickard Nilsson wrote: > >> I was the one who submitted this patch to NixOS. I don't know why a >> special program is needed. I didn't manage to get it to work with a >> plain >> "mount -t nfs", and since nfsmount (from klibc) is used in the initrd of >> other distributions (like ArchLinux, and maybe Ubuntu?) I tried it and >> it >> worked fine. However, now that my environment is a bit more stable, I >> could try to investigate exactly why "mount" failed. > > Thinking about it a bit, mount probably needs the mount.nfs helper. Yes, I do think I tested to add that one, but I don't remember really. I will try it again when I get time. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] [PATCH] Some more options to ldap.conf
Hi, I needed to use some more options in ldap.conf, so I have extended modules/config/ldap.nix with three more options concerning connection timeouts and retries. A general question about patches like this one: When do you stop adding options the Nix way, and just throw in an "extraConfiguration" option? I don't have anything against adding proper options, but is there some guideline to follow? Best regards, Rickard Nilsson ldap.patch Description: Binary data ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30073 - in nixpkgs/trunk/pkgs: development/perl-modules top-level
Author: eelco
Date: Thu Oct 27 21:45:53 2011
New Revision: 30073
URL: https://nixos.org/websvn/nix/?rev=30073&sc=1
Log:
* Use a fork of Net::Amazon::EC2 that supports tags.
Modified:
nixpkgs/trunk/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
nixpkgs/trunk/pkgs/top-level/perl-packages.nix
Modified: nixpkgs/trunk/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
==
--- nixpkgs/trunk/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
Thu Oct 27 19:43:20 2011(r30072)
+++ nixpkgs/trunk/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
Thu Oct 27 21:45:53 2011(r30073)
@@ -1,8 +1,6 @@
-Support OpenStack's DescribeInstancesV6 API call.
-
-diff -ru -x '*~'
Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm
Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm
Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm
2010-01-24 02:12:50.0 +0100
-+++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm
2011-06-21 17:19:36.0 +0200
+diff -ru
stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2/RunningInstances.pm
stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2/RunningInstances.pm
+--- stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2/RunningInstances.pm
2011-06-13 19:45:30.0 -0400
stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2/RunningInstances.pm
2011-10-27 17:25:29.0 -0400
@@ -25,6 +25,10 @@
This element remains empty until the instance enters a
running state.
@@ -14,7 +12,7 @@
=item image_id (required)
The image id of the AMI currently running in this instance.
-@@ -126,6 +130,7 @@
+@@ -134,6 +138,7 @@
has 'ami_launch_index'=> ( is => 'ro', isa => 'Str', required => 0 );
has 'dns_name'=> ( is => 'ro', isa => 'Maybe[Str]', required
=> 0 );
@@ -22,10 +20,10 @@
has 'image_id'=> ( is => 'ro', isa => 'Str', required => 1 );
has 'kernel_id' => ( is => 'ro', isa => 'Maybe[Str]', required
=> 1 );
has 'ramdisk_id' => ( is => 'ro', isa => 'Maybe[Str]', required
=> 1 );
-diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm
Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm
Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm 2011-06-16
16:11:53.0 +0200
-+++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm 2011-10-20 20:13:12.585277245
+0200
-@@ -1542,6 +1542,7 @@
+diff -ru stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2.pm
stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2.pm
+--- stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2.pm 2011-06-13
19:45:30.0 -0400
stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2.pm 2011-10-27
17:25:29.0 -0400
+@@ -1691,6 +1691,7 @@
my $self = shift;
my %args = validate( @_, {
InstanceId => { type => SCALAR | ARRAYREF, optional => 1 },
@@ -33,8 +31,8 @@
});
# If we have a array ref of instances lets split them out into their
InstanceId.n format
-@@ -1556,7 +1557,8 @@
- $args{"InstanceId.1"} = delete $args{InstanceId};
+@@ -1703,7 +1704,8 @@
+ }
}
- my $xml = $self->_sign(Action => 'DescribeInstances', %args);
@@ -43,7 +41,7 @@
my $reservations;
if ( grep { defined && length } $xml->{Errors} ) {
-@@ -1635,6 +1637,7 @@
+@@ -1791,6 +1793,7 @@
my $running_instance =
Net::Amazon::EC2::RunningInstances->new(
ami_launch_index=>
$instance_elem->{amiLaunchIndex},
dns_name
=> $instance_elem->{dnsName},
@@ -51,10 +49,3 @@
image_id
=> $instance_elem->{imageId},
kernel_id
=> $instance_elem->{kernelId},
ramdisk_id
=> $instance_elem->{ramdiskId},
-@@ -3866,4 +3869,4 @@
-
- =head1 SEE ALSO
-
--Amazon EC2 API:
L
[Nix-commits] SVN commit: nix - r30074 - nixpkgs/trunk/pkgs/top-level
Author: eelco
Date: Thu Oct 27 21:52:03 2011
New Revision: 30074
URL: https://nixos.org/websvn/nix/?rev=30074&sc=1
Log:
* Added Data::UUID.
Modified:
nixpkgs/trunk/pkgs/top-level/perl-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/perl-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/perl-packages.nix Thu Oct 27 21:45:53
2011(r30073)
+++ nixpkgs/trunk/pkgs/top-level/perl-packages.nix Thu Oct 27 21:52:03
2011(r30074)
@@ -954,6 +954,14 @@
propagatedBuildInputs = [TestException ClassAccessorChained];
};
+ DataUUID = buildPerlPackage rec {
+name = "Data-UUID-1.217";
+src = fetchurl {
+ url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz";
+ sha256 = "0vgykclw1mn06a53d8y3g7s7vanks8078dh2j4jb84djk0cw9h0q";
+};
+ };
+
DataVisitor = buildPerlPackage rec {
name = "Data-Visitor-0.25";
src = fetchurl {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30075 - nixpkgs/trunk/pkgs/servers/mail/dovecot
Author: viric
Date: Thu Oct 27 22:03:41 2011
New Revision: 30075
URL: https://nixos.org/websvn/nix/?rev=30075&sc=1
Log:
Making dovecot2 not use $out/var for runtime files.
Modified:
nixpkgs/trunk/pkgs/servers/mail/dovecot/2.0.nix
Modified: nixpkgs/trunk/pkgs/servers/mail/dovecot/2.0.nix
==
--- nixpkgs/trunk/pkgs/servers/mail/dovecot/2.0.nix Thu Oct 27 21:52:03
2011(r30074)
+++ nixpkgs/trunk/pkgs/servers/mail/dovecot/2.0.nix Thu Oct 27 22:03:41
2011(r30075)
@@ -10,6 +10,10 @@
sha256 = "03byp6alxxk65qfjjnqp6kcncs5cdiqgskx90nk9kcnynl1h6r33";
};
+ # It will hardcode this for /var/lib/dovecot.
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
+ configureFlags = [ "--localstatedir=/var" ];
+
meta = {
homepage = http://dovecot.org/;
description = "Open source IMAP and POP3 email server written with
security primarily in mind";
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30076 - nixos/trunk/modules/services/mail
Author: viric
Date: Thu Oct 27 22:04:08 2011
New Revision: 30076
URL: https://nixos.org/websvn/nix/?rev=30076&sc=1
Log:
Making dovecot2 authentication work (wrong pam module)
Modified:
nixos/trunk/modules/services/mail/dovecot2.nix
Modified: nixos/trunk/modules/services/mail/dovecot2.nix
==
--- nixos/trunk/modules/services/mail/dovecot2.nix Thu Oct 27 22:03:41
2011(r30075)
+++ nixos/trunk/modules/services/mail/dovecot2.nix Thu Oct 27 22:04:08
2011(r30076)
@@ -36,13 +36,15 @@
user = root
}
userdb {
-driver=passwd
+driver = passwd
}
passdb {
-driver=pam
+driver = pam
+args = dovecot2
}
- auth_debug = yes
- auth_verbose = yes
+ #auth_debug = yes
+ #auth_verbose = yes
+ #debug_log_path = /tmp/dovecot2debug.log
pop3_uidl_format = %08Xv%08Xu
@@ -134,6 +136,8 @@
exec = "${pkgs.dovecot_2_0}/sbin/dovecot -F -c ${confFile}";
};
+environment.systemPackages = [ pkgs.dovecot_2_0 ];
+
};
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30077 - nixpkgs/trunk/pkgs/servers/mail/dovecot
Author: viric
Date: Thu Oct 27 22:07:39 2011
New Revision: 30077
URL: https://nixos.org/websvn/nix/?rev=30077&sc=1
Log:
dovecot 2 feels hapier with zlib and bzip2
Modified:
nixpkgs/trunk/pkgs/servers/mail/dovecot/2.0.nix
Modified: nixpkgs/trunk/pkgs/servers/mail/dovecot/2.0.nix
==
--- nixpkgs/trunk/pkgs/servers/mail/dovecot/2.0.nix Thu Oct 27 22:04:08
2011(r30076)
+++ nixpkgs/trunk/pkgs/servers/mail/dovecot/2.0.nix Thu Oct 27 22:07:39
2011(r30077)
@@ -1,9 +1,9 @@
-{stdenv, fetchurl, openssl, pam}:
+{stdenv, fetchurl, openssl, pam, bzip2, zlib}:
stdenv.mkDerivation {
name = "dovecot-2.0.15";
- buildInputs = [openssl pam];
+ buildInputs = [openssl pam bzip2 zlib];
src = fetchurl {
url = http://dovecot.org/releases/2.0/dovecot-2.0.15.tar.gz;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
