[Nix-commits] SVN commit: nix - r29261 - nixpkgs/branches/syscall-tracing/pkgs/top-level
Author: eelco
Date: Tue Sep 13 22:09:22 2011
New Revision: 29261
URL: https://ssl.nixos.org/websvn/nix/?rev=29261&sc=1
Log:
Modified:
nixpkgs/branches/syscall-tracing/pkgs/top-level/release-lib.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/top-level/release-lib.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/top-level/release-lib.nix Tue Sep
13 21:07:08 2011(r29260)
+++ nixpkgs/branches/syscall-tracing/pkgs/top-level/release-lib.nix Tue Sep
13 22:09:22 2011(r29261)
@@ -35,7 +35,7 @@
prio = level: job: toJob job // { schedulingPriority = level; };
toJob = x: if builtins.isAttrs x then x else
-{ type = "job"; systems = x; schedulingPriority = 5; };
+{ type = "job"; systems = x; schedulingPriority = 1; };
/* Perform a job on the given set of platforms. The function `f' is
called by Hydra for each platform, and should return some job
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29238 - configurations/trunk/tud
Author: eelco Date: Tue Sep 13 14:57:18 2011 New Revision: 29238 URL: https://ssl.nixos.org/websvn/nix/?rev=29238&sc=1 Log: * Enable KSM. Modified: configurations/trunk/tud/build-machines-common.nix Modified: configurations/trunk/tud/build-machines-common.nix == --- configurations/trunk/tud/build-machines-common.nix Tue Sep 13 13:57:46 2011(r29237) +++ configurations/trunk/tud/build-machines-common.nix Tue Sep 13 14:57:18 2011(r29238) @@ -48,4 +48,11 @@ chown -R buildfarm.users /home/buildfarm/.ssh ''; + jobs.udevtrigger.postStop = +'' + # Enable Kernel Samepage Merging (reduces memory footprint of + # VMs). + echo 1 > /sys/kernel/mm/ksm/run +''; + } ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29234 - hydra-config/tribler/trunk
Author: eelco
Date: Tue Sep 13 11:00:31 2011
New Revision: 29234
URL: https://ssl.nixos.org/websvn/nix/?rev=29234&sc=1
Log:
* Make the test more robust.
Modified:
hydra-config/tribler/trunk/release.nix
Modified: hydra-config/tribler/trunk/release.nix
==
--- hydra-config/tribler/trunk/release.nix Tue Sep 13 08:52:06 2011
(r29233)
+++ hydra-config/tribler/trunk/release.nix Tue Sep 13 11:00:31 2011
(r29234)
@@ -157,6 +157,8 @@
my $pid = $tracker->succeed("transmission-cli /tmp/test.torrent -M
-w /tmp/data >&2 & echo \$!");
# Download the torrent file on the client.
+ $tracker->waitForJob("httpd");
+ $client->waitForJob("network-interfaces");
$client->succeed("curl http://tracker/test.torrent >
/tmp/test.torrent");
# Start Tribler to download the file.
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29233 - nixpkgs/branches/syscall-tracing/pkgs/stdenv
Author: eelco
Date: Tue Sep 13 08:52:06 2011
New Revision: 29233
URL: https://ssl.nixos.org/websvn/nix/?rev=29233&sc=1
Log:
* Doh.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Mon Sep 12
21:30:04 2011(r29232)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Tue Sep 13
08:52:06 2011(r29233)
@@ -358,13 +358,12 @@
echo tracing: $builder $realArgs
set +o posix
${pkgs.coreutils}/bin/mkdir -p $out/.trace $out/.build
- cd $out/.build
# Compress the strace output on the fly. The builder's stderr
# also goes to the log so that the trace processor can see stuff
# like Make trace messages.
exec 4> >(${pkgs.bzip2}/bin/bzip2 > $out/.trace/log.bz2)
exec 5> >(${pkgs.coreutils}/bin/tee /dev/fd/4)
- ${pkgs.strace}/bin/strace -e trace=file,process,dup,dup2,close,pipe -v
-q -f -s 512 -o /dev/fd/4 ${pkgs.stdenv.shell} -c '(cd $TMPDIR && $builder
$realArgs)' 2>&5
+ ${pkgs.strace}/bin/strace -e trace=file,process,dup,dup2,close,pipe -v
-q -f -s 512 -o /dev/fd/4 ${pkgs.stdenv.shell} -c 'cd $out/.build; exec
$builder $realArgs' 2>&5
(cd $out && ${pkgs.gnutar}/bin/tar c .build | ${pkgs.bzip2}/bin/bzip2 >
.build.tar.bz2 && ${pkgs.coreutils}/bin/chmod -R u+w .build &&
${pkgs.coreutils}/bin/rm -rf .build)
'';
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29232 - in nixpkgs/branches/syscall-tracing/pkgs/stdenv: . linux
Author: eelco
Date: Mon Sep 12 21:30:04 2011
New Revision: 29232
URL: https://ssl.nixos.org/websvn/nix/?rev=29232&sc=1
Log:
* keepBuildTree doesn't always work properly.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Mon Sep 12
20:50:32 2011(r29231)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Mon Sep 12
21:30:04 2011(r29232)
@@ -357,7 +357,8 @@
#! ${pkgs.bash}/bin/bash
echo tracing: $builder $realArgs
set +o posix
- ${pkgs.coreutils}/bin/mkdir -p $out/.trace
+ ${pkgs.coreutils}/bin/mkdir -p $out/.trace $out/.build
+ cd $out/.build
# Compress the strace output on the fly. The builder's stderr
# also goes to the log so that the trace processor can see stuff
# like Make trace messages.
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix Mon Sep
12 20:50:32 2011(r29231)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix Mon Sep
12 21:30:04 2011(r29232)
@@ -145,14 +145,14 @@
# Create the first "real" standard environment. This one consists
# of bootstrap tools only, and a minimal Glibc to keep the GCC
# configure script happy.
- stdenvLinuxBoot1 = traceSyscalls (keepBuildTree (stdenvBootFun {
+ stdenvLinuxBoot1 = traceSyscalls (stdenvBootFun {
gcc = wrapGCC {
libc = bootstrapGlibc;
binutils = bootstrapTools;
coreutils = bootstrapTools;
};
inherit fetchurl;
- }));
+ });
# 2) These are the packages that we can build with the first
@@ -168,14 +168,14 @@
# 3) 2nd stdenv that we will use to build only the glibc.
- stdenvLinuxBoot2 = traceSyscalls (keepBuildTree (stdenvBootFun {
+ stdenvLinuxBoot2 = traceSyscalls (stdenvBootFun {
gcc = wrapGCC {
libc = bootstrapGlibc;
binutils = firstBinutils;
coreutils = bootstrapTools;
};
inherit fetchurl;
- }));
+ });
# 4) These are the packages that we can build with the 2nd
@@ -194,7 +194,7 @@
# 6) Construct a third stdenv identical to the 2nd, except that
#this one uses the Glibc built in step 3. It still uses
#the recent binutils and rest of the bootstrap tools, including GCC.
- stdenvLinuxBoot3 = traceSyscalls (keepBuildTree (stdenvBootFun {
+ stdenvLinuxBoot3 = traceSyscalls (stdenvBootFun {
gcc = wrapGCC {
binutils = stdenvLinuxBoot1Pkgs.binutils;
coreutils = bootstrapTools;
@@ -205,7 +205,7 @@
inherit (stdenvLinuxBoot1Pkgs) perl;
};
inherit fetchurl;
- }));
+ });
# 7) The packages that can be built using the third stdenv.
@@ -232,7 +232,7 @@
#this one uses the dynamically linked GCC and Binutils from step
#5. The other tools (e.g. coreutils) are still from the
#bootstrap tools.
- stdenvLinuxBoot4 = traceSyscalls (keepBuildTree (stdenvBootFun {
+ stdenvLinuxBoot4 = traceSyscalls (stdenvBootFun {
gcc = wrapGCC rec {
inherit (stdenvLinuxBoot3Pkgs) binutils;
coreutils = bootstrapTools;
@@ -244,7 +244,7 @@
inherit (stdenvLinuxBoot1Pkgs) perl;
};
inherit fetchurl;
- }));
+ });
# 9) The packages that can be built using the fourth stdenv.
@@ -261,7 +261,7 @@
# When updating stdenvLinux, make sure that the result has no
# dependency (`nix-store -qR') on bootstrapTools or the
# first binutils built.
- stdenvLinux = traceSyscalls (keepBuildTree (import ../generic rec {
+ stdenvLinux = traceSyscalls (import ../generic rec {
name = "stdenv-linux";
inherit system;
@@ -298,6 +298,6 @@
gnumake gnused gnutar gnugrep gnupatch patchelf
attr acl;
};
- }));
+ });
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29225 - nixos/trunk/modules/security
Author: eelco Date: Mon Sep 12 17:01:43 2011 New Revision: 29225 URL: https://ssl.nixos.org/websvn/nix/?rev=29225&sc=1 Log: * Set OPENSSL_X509_CERT_FILE. Modified: nixos/trunk/modules/security/ca.nix Modified: nixos/trunk/modules/security/ca.nix == --- nixos/trunk/modules/security/ca.nix Mon Sep 12 16:57:34 2011(r29224) +++ nixos/trunk/modules/security/ca.nix Mon Sep 12 17:01:43 2011(r29225) @@ -19,6 +19,9 @@ environment.shellInit = '' +export OPENSSL_X509_CERT_FILE=/etc/ssl/certs/ca-bundle.crt + +# !!! Remove the following as soon as OpenSSL 1.0.0e is the default. export CURL_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt export GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt ''; ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29224 - nixpkgs/trunk/pkgs/development/libraries/openssl
Author: eelco
Date: Mon Sep 12 16:57:34 2011
New Revision: 29224
URL: https://ssl.nixos.org/websvn/nix/?rev=29224&sc=1
Log:
* OpenSSL: Allow the location of the X509 certificate file (the CA
bundle) to be set through the environment variable
‘OPENSSL_X509_CERT_FILE’. This is necessary because the default
location ($out/ssl/cert.pem) doesn't exist, and hardcoding something
like /etc/ssl/cert.pem is impure and cannot be overriden
per-process. For security, the environment variable is ignored for
setuid binaries.
Added:
nixpkgs/trunk/pkgs/development/libraries/openssl/cert-file.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix Mon Sep 12
16:46:14 2011(r29223)
+++ nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix Mon Sep 12
16:57:34 2011(r29224)
@@ -14,7 +14,17 @@
sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3";
};
- patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
+ patches =
+[ # Allow the location of the X509 certificate file (the CA
+ # bundle) to be set through the environment variable
+ # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the
+ # default location ($out/ssl/cert.pem) doesn't exist, and
+ # hardcoding something like /etc/ssl/cert.pem is impure and
+ # cannot be overriden per-process. For security, the
+ # environment variable is ignored for setuid binaries.
+ ./cert-file.patch
+]
+++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
buildNativeInputs = [ perl ];
Added: nixpkgs/trunk/pkgs/development/libraries/openssl/cert-file.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/openssl/cert-file.patchMon Sep
12 16:57:34 2011(r29224)
@@ -0,0 +1,35 @@
+diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c
openssl-1.0.0e/crypto/x509/x509_def.c
+--- openssl-1.0.0e-orig/crypto/x509/x509_def.c 1999-09-11 19:54:11.0
+0200
openssl-1.0.0e/crypto/x509/x509_def.c 2011-09-12 18:30:59.386501609
+0200
+@@ -57,6 +57,10 @@
+ */
+
+ #include
++#include
++#include
++#include
++#include
+ #include "cryptlib.h"
+ #include
+ #include
+@@ -71,7 +75,19 @@
+ { return(X509_CERT_DIR); }
+
+ const char *X509_get_default_cert_file(void)
+- { return(X509_CERT_FILE); }
++ {
++ static char buf[PATH_MAX] = X509_CERT_FILE;
++ static int init = 0;
++ if (!init) {
++ init = 1;
++ char * s = getenv("OPENSSL_X509_CERT_FILE");
++ if (s && getuid() == geteuid()) {
++ strncpy(buf, s, sizeof(buf));
++ buf[sizeof(buf) - 1] = 0;
++ }
++ }
++ return buf;
++ }
+
+ const char *X509_get_default_cert_dir_env(void)
+ { return(X509_CERT_DIR_EVP); }
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29208 - in nixpkgs/trunk/pkgs: development/libraries/openssl top-level
Author: eelco
Date: Mon Sep 12 16:09:00 2011
New Revision: 29208
URL: https://ssl.nixos.org/websvn/nix/?rev=29208&sc=1
Log:
* Added OpenSSL 1.0.0e (not updating the default yet because a lot
depends on it). Also, install the manpages in $out/share/man rather
than $out/ssl/man.
Added:
nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix
- copied, changed from r29119,
nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix (from r29119,
nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/openssl/default.nixFri Sep
9 09:03:37 2011(r29119, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix Mon Sep 12
16:09:00 2011(r29208)
@@ -7,11 +7,11 @@
in
stdenv.mkDerivation rec {
- name = "openssl-1.0.0d";
+ name = "openssl-1.0.0e";
src = fetchurl {
url = "http://www.openssl.org/source/${name}.tar.gz";;
-sha256 = "1nr0cf6pf8i4qsnx31kqhiqv402xgn76yhjhlbdri8ma1hgislcj";
+sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3";
};
patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
@@ -25,6 +25,8 @@
configureFlags = "shared --libdir=lib";
+ makeFlags = "MANDIR=$(out)/share/man";
+
postInstall =
''
# If we're building dynamic libraries, then don't install static
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 12 13:02:54
2011(r29207)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 12 16:09:00
2011(r29208)
@@ -4253,6 +4253,8 @@
fetchurl = fetchurlBoot;
};
+ opensslNew = callPackage ../development/libraries/openssl/1.0.0e.nix { };
+
ortp = callPackage ../development/libraries/ortp { };
pangoxsl = callPackage ../development/libraries/pangoxsl {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29207 - nixpkgs/trunk/pkgs/development/compilers/adobe-flex-sdk
Author: eelco
Date: Mon Sep 12 13:02:54 2011
New Revision: 29207
URL: https://ssl.nixos.org/websvn/nix/?rev=29207&sc=1
Log:
* Better description.
Modified:
nixpkgs/trunk/pkgs/development/compilers/adobe-flex-sdk/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/adobe-flex-sdk/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/adobe-flex-sdk/default.nix Mon Sep
12 12:45:59 2011(r29206)
+++ nixpkgs/trunk/pkgs/development/compilers/adobe-flex-sdk/default.nix Mon Sep
12 13:02:54 2011(r29207)
@@ -33,7 +33,7 @@
'';
meta = {
-description = "flex sdk flash / action script developement kit";
+description = "Flex SDK for Adobe Flash / ActionScript";
homepage =
"http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation";;
license = "MPLv1.1"; # Mozilla Public License Version 1.1
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29206 - nixpkgs/trunk/pkgs/desktops/kde-4.7
Author: eelco
Date: Mon Sep 12 12:45:59 2011
New Revision: 29206
URL: https://ssl.nixos.org/websvn/nix/?rev=29206&sc=1
Log:
* Remove the kde_baseapps wrapper because
1) It broke the Gwenview build (it ended up depending on the
wrapper).
2) It's confusing to have two identically named packages.
3) If upstream's kde_baseapps doesn't include Konsole and Kate, then
why should ours?
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Mon Sep 12 12:40:58
2011(r29205)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Mon Sep 12 12:45:59
2011(r29206)
@@ -49,11 +49,6 @@
kdebase_workspace = kde.modules.kde_workspace;
- kde_baseapps = kde.modules.kde_baseapps // {
-inherit (kde.individual) kate konsole;
-propagatedUserEnvPackages = [ kde.individual.kate kde.individual.konsole ];
- };
-
inherit release;
full = stdenv.lib.attrValues kde.modules;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29205 - nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package
Author: eelco Date: Mon Sep 12 12:40:58 2011 New Revision: 29205 URL: https://ssl.nixos.org/websvn/nix/?rev=29205&sc=1 Log: * Remove obsolete file. Deleted: nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/4.7.0.nix ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29204 - nixpkgs/trunk/pkgs/desktops/kde-4.7
Author: eelco
Date: Mon Sep 12 12:34:06 2011
New Revision: 29204
URL: https://ssl.nixos.org/websvn/nix/?rev=29204&sc=1
Log:
* Update the oxygen-icons output hash.
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/oxygen-icons.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/oxygen-icons.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/oxygen-icons.nixMon Sep 12
10:02:03 2011(r29203)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/oxygen-icons.nixMon Sep 12
12:34:06 2011(r29204)
@@ -3,7 +3,7 @@
kde {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash =
"7d7f352f574f5747f16ac517cbe19d0b011adb74e7a0b791705afb3addac1e96";
+ outputHash =
"87010a208f6860429d78c0d518a4f70c450b9c199900076d0aa232de8ae6452e";
buildNativeInputs = [ cmake ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29203 - nixpkgs/trunk/pkgs/tools/package-management/nix
Author: eelco
Date: Mon Sep 12 10:02:03 2011
New Revision: 29203
URL: https://ssl.nixos.org/websvn/nix/?rev=29203&sc=1
Log:
* Updated nixUnstable.
Modified:
nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
Modified: nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
==
--- nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nixMon Sep
12 09:11:18 2011(r29202)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nixMon Sep
12 10:02:03 2011(r29203)
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "nix-1.0pre29060";
+ name = "nix-1.0pre29200";
src = fetchurl {
-url = "http://hydra.nixos.org/build/1301810/download/4/${name}.tar.bz2";;
-sha256 =
"f403213b56acfb2e74ae1e6fd136f3726940f098220d2ae8b46fa54c08f1aad0";
+url = "http://hydra.nixos.org/build/1320284/download/4/${name}.tar.bz2";;
+sha256 =
"a10f65b52bcf72b9ec7bf5610e16de2d49c1cc4c008bf0a93281e8e2233fa1b1";
};
buildNativeInputs = [ perl pkgconfig ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29202 - nixpkgs/branches/syscall-tracing/pkgs/stdenv
Author: eelco
Date: Mon Sep 12 09:11:18 2011
New Revision: 29202
URL: https://ssl.nixos.org/websvn/nix/?rev=29202&sc=1
Log:
* "rm -rf" doesn't work if some directories are read-only.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Mon Sep 12
09:08:31 2011(r29201)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Mon Sep 12
09:11:18 2011(r29202)
@@ -364,7 +364,7 @@
exec 4> >(${pkgs.bzip2}/bin/bzip2 > $out/.trace/log.bz2)
exec 5> >(${pkgs.coreutils}/bin/tee /dev/fd/4)
${pkgs.strace}/bin/strace -e trace=file,process,dup,dup2,close,pipe -v
-q -f -s 512 -o /dev/fd/4 ${pkgs.stdenv.shell} -c '(cd $TMPDIR && $builder
$realArgs)' 2>&5
- (cd $out && ${pkgs.gnutar}/bin/tar c .build | ${pkgs.bzip2}/bin/bzip2 >
.build.tar.bz2 && ${pkgs.coreutils}/bin/rm -rf .build)
+ (cd $out && ${pkgs.gnutar}/bin/tar c .build | ${pkgs.bzip2}/bin/bzip2 >
.build.tar.bz2 && ${pkgs.coreutils}/bin/chmod -R u+w .build &&
${pkgs.coreutils}/bin/rm -rf .build)
'';
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29201 - configurations/trunk/tud
Author: eelco
Date: Mon Sep 12 09:08:31 2011
New Revision: 29201
URL: https://ssl.nixos.org/websvn/nix/?rev=29201&sc=1
Log:
* ‘hydra’ is now an ordinary build machine.
Modified:
configurations/trunk/tud/hydra.nix
Modified: configurations/trunk/tud/hydra.nix
==
--- configurations/trunk/tud/hydra.nix Mon Sep 12 09:07:43 2011(r29200)
+++ configurations/trunk/tud/hydra.nix Mon Sep 12 09:08:31 2011(r29201)
@@ -1,37 +1,5 @@
{ config, pkgs, ... }:
{
- require = [ ./common.nix ];
-
- nixpkgs.system = "x86_64-linux";
-
- boot = {
-initrd.kernelModules = [ "mptsas" "ext4" ];
-kernelModules = [ "acpi-cpufreq" "kvm-intel" ];
-loader.grub.device = "/dev/sda";
-loader.grub.copyKernels = true;
- };
-
- fileSystems =
-[ { mountPoint = "/";
-label = "nixos";
-options = "noatime,barrier=0,data=ordered";
- }
-];
-
- #swapDevices = [ { label = "swap" ; } ];
-
- nix.maxJobs = 8;
-
- networking = {
-hostName = "hydra";
-domain = "buildfarm";
- };
-
- services.cron.systemCronJobs =
-[
- # Make sure that at least 200 GiB of disk space is available.
- "15 3 * * * root nix-store --gc --max-freed \"$((200 * 1024**3 - 1024 *
$(df /nix/store | tail -n 1 | awk '{ print $4 }')))\" > /var/log/gc.log 2>&1"
-];
-
+ require = [ ./build-machines-dell-1950.nix ];
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29200 - nix/trunk/src/libstore
Author: eelco
Date: Mon Sep 12 09:07:43 2011
New Revision: 29200
URL: https://ssl.nixos.org/websvn/nix/?rev=29200&sc=1
Log:
* Ouch. A store upgrade could cause a substituter to be triggered,
causing a deadlock.
Modified:
nix/trunk/src/libstore/derivations.cc
nix/trunk/src/libstore/local-store.cc
nix/trunk/src/libstore/local-store.hh
Modified: nix/trunk/src/libstore/derivations.cc
==
--- nix/trunk/src/libstore/derivations.cc Mon Sep 12 09:06:44 2011
(r29199)
+++ nix/trunk/src/libstore/derivations.cc Mon Sep 12 09:07:43 2011
(r29200)
@@ -239,7 +239,8 @@
foreach (DerivationInputs::const_iterator, i, drv.inputDrvs) {
Hash h = drvHashes[i->first];
if (h.type == htUnknown) {
-Derivation drv2 = derivationFromPath(store, i->first);
+assert(store.isValidPath(i->first));
+Derivation drv2 = parseDerivation(readFile(i->first));
h = hashDerivationModulo(store, drv2);
drvHashes[i->first] = h;
}
Modified: nix/trunk/src/libstore/local-store.cc
==
--- nix/trunk/src/libstore/local-store.cc Mon Sep 12 09:06:44 2011
(r29199)
+++ nix/trunk/src/libstore/local-store.cc Mon Sep 12 09:07:43 2011
(r29200)
@@ -510,7 +510,7 @@
}
-unsigned long long LocalStore::addValidPath(const ValidPathInfo & info)
+unsigned long long LocalStore::addValidPath(const ValidPathInfo & info, bool
checkOutputs)
{
SQLiteStmtUse use(stmtRegisterValidPath);
stmtRegisterValidPath.bind(info.path);
@@ -540,7 +540,7 @@
derivations). Note that if this throws an error, then the
DB transaction is rolled back, so the path validity
registration above is undone. */
-checkDerivationOutputs(info.path, drv);
+if (checkOutputs) checkDerivationOutputs(info.path, drv);
foreach (DerivationOutputs::iterator, i, drv.outputs) {
SQLiteStmtUse use(stmtAddDerivationOutput);
@@ -1521,7 +1521,7 @@
SQLiteTxn txn(db);
foreach (PathSet::iterator, i, validPaths) {
-addValidPath(queryPathInfoOld(*i));
+addValidPath(queryPathInfoOld(*i), false);
std::cerr << ".";
}
Modified: nix/trunk/src/libstore/local-store.hh
==
--- nix/trunk/src/libstore/local-store.hh Mon Sep 12 09:06:44 2011
(r29199)
+++ nix/trunk/src/libstore/local-store.hh Mon Sep 12 09:07:43 2011
(r29200)
@@ -226,7 +226,7 @@
unsigned long long queryValidPathId(const Path & path);
-unsigned long long addValidPath(const ValidPathInfo & info);
+unsigned long long addValidPath(const ValidPathInfo & info, bool
checkOutputs = true);
void addReference(unsigned long long referrer, unsigned long long
reference);
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29199 - configurations/trunk/tud
Author: eelco
Date: Mon Sep 12 09:06:44 2011
New Revision: 29199
URL: https://ssl.nixos.org/websvn/nix/?rev=29199&sc=1
Log:
* Run the garbage collector 4 times a day on the build machines.
A Nixpkgs rebuild can easily fill up > 100 GB in a day.
Modified:
configurations/trunk/tud/build-machines-common.nix
Modified: configurations/trunk/tud/build-machines-common.nix
==
--- configurations/trunk/tud/build-machines-common.nix Mon Sep 12 03:38:12
2011(r29198)
+++ configurations/trunk/tud/build-machines-common.nix Mon Sep 12 09:06:44
2011(r29199)
@@ -24,7 +24,7 @@
services.cron.systemCronJobs =
[ # Make sure that at least 100 GiB of disk space is available.
- "15 03 * * * root nix-store --gc --max-freed \"$((100 * 1024**3 - 1024
* $(df /nix/store | tail -n 1 | awk '{ print $4 }')))\" > /var/log/gc.log 2>&1"
+ "15 03,09,15,21 * * * root nix-store --gc --max-freed \"$((100 *
1024**3 - 1024 * $(df /nix/store | tail -n 1 | awk '{ print $4 }')))\" >
/var/log/gc.log 2>&1"
];
networking.hostName = ""; # obtain from DHCP server
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29197 - in nixpkgs/trunk/pkgs: applications/networking/browsers/chromium development/tools/misc/patchelf
Author: eelco
Date: Sun Sep 11 20:48:02 2011
New Revision: 29197
URL: https://ssl.nixos.org/websvn/nix/?rev=29197&sc=1
Log:
* Chromium updated to the latest version. Because Chromium now used
Gold, this requires a new patchelf.
* Changed the package name from ‘chrome’ to ‘chromium’.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix
nixpkgs/trunk/pkgs/development/tools/misc/patchelf/0.6.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix
Sun Sep 11 20:37:16 2011(r29196)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix
Sun Sep 11 20:48:02 2011(r29197)
@@ -2,23 +2,28 @@
, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11
, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
, libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
-, stdenv, unzip, zlib, pam }:
+, stdenv, unzip, zlib, pam, pcre }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
stdenv.mkDerivation rec {
- name = "chrome-${version}";
- version = "88807";
+ name = "chromium-16.0.879.0-pre${version}";
+
+ # To determine the latest revision, get
+ #
‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’.
+ # For the version number, see ‘about:config’.
+ version = "100626";
+
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url =
"http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip";;
-sha256 =
"c158f58fa8220782ec8dec4170f90c564b978d1c6ead298cc2f67e84613f17b1";
+sha256 = "1dymz7h9v5hkivn6qn26bnj1waw60z3mngh8g46yvvc5xn4npc3l";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url =
"http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip";;
-sha256 = "01sr882c7hr53001p8bnk5vyj8zfjm6r3i4a6wxzxd17xjh1bcxb";
+sha256 = "0zqaj90lfzdddbs6sjygmyxlh8nw3xfr9xw450g9cabg6a2sh7ca";
}
else throw "Chromium is not supported on this platform.";
@@ -31,7 +36,7 @@
[ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat
ffmpeg fontconfig freetype libX11 libXScrnSaver
libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
- libpng nspr nss stdenv.gcc.gcc zlib stdenv.gcc.libc
+ libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc
gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango
pam
];
@@ -41,6 +46,8 @@
ensureDir $out/libexec/chrome
cp -R * $out/libexec/chrome
+
+strip $out/libexec/chrome/chrome
${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
@@ -48,7 +55,7 @@
$out/libexec/chrome/chrome
makeWrapper $out/libexec/chrome/chrome $out/bin/chrome \
- --prefix LD_LIBRARY_PATH : "${nss}/lib"
+ --prefix LD_LIBRARY_PATH : "${pcre}/lib:${nss}/lib"
'';
meta = with stdenv.lib; {
Modified: nixpkgs/trunk/pkgs/development/tools/misc/patchelf/0.6.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/patchelf/0.6.nix Sun Sep 11
20:37:16 2011(r29196)
+++ nixpkgs/trunk/pkgs/development/tools/misc/patchelf/0.6.nix Sun Sep 11
20:48:02 2011(r29197)
@@ -1,11 +1,11 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "patchelf-0.6pre23458";
-
+ name = "patchelf-0.6pre29192";
+
src = fetchurl {
-url =
"http://hydra.nixos.org/build/838169/download/2/patchelf-0.6pre23458.tar.bz2";;
-sha256 = "18d74n14s4xh8aqwisvz63gx9j4d5b9bzb8k1jnp8whvvwzasdq5";
+url = "http://hydra.nixos.org/build/1319933/download/2/${name}.tar.bz2";;
+sha256 =
"1873d76994c112355f53d1ac6233ce334d0852ce67cae6b21f492b9b8e0b48b5";
};
meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29196 - homepage/trunk/css
Author: eelco
Date: Sun Sep 11 20:37:16 2011
New Revision: 29196
URL: https://ssl.nixos.org/websvn/nix/?rev=29196&sc=1
Log:
Modified:
homepage/trunk/css/nix-common.css
Modified: homepage/trunk/css/nix-common.css
==
--- homepage/trunk/css/nix-common.css Sun Sep 11 20:17:59 2011(r29195)
+++ homepage/trunk/css/nix-common.css Sun Sep 11 20:37:16 2011(r29196)
@@ -1,5 +1,5 @@
body {
-font-family: sans-serif;
+font-family: "Nimbus Sans L", sans-serif;
background: white;
margin: 2em 1em 2em 1em;
}
@@ -83,3 +83,10 @@
color: #60;
background: #f4f4f8;
}
+
+/* Consistent font size for monospaced elements. See
+ http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */
+tt, code, pre {
+font-family: monospace, sans-serif;
+font-size: 95%;
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29195 - hydra/trunk/src/root/static/css
Author: eelco Date: Sun Sep 11 20:17:59 2011 New Revision: 29195 URL: https://ssl.nixos.org/websvn/nix/?rev=29195&sc=1 Log: * Remove empty file. Deleted: hydra/trunk/src/root/static/css/nix-common.css ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29194 - homepage/trunk/css
Author: eelco
Date: Sun Sep 11 20:17:32 2011
New Revision: 29194
URL: https://ssl.nixos.org/websvn/nix/?rev=29194&sc=1
Log:
* The Nix homepage used to use nix-common.css from Hydra, but that one
got replaced by an empty file for some reason.
Added:
homepage/trunk/css/nix-common.css
- copied unchanged from r18751,
hydra/trunk/src/root/static/css/nix-common.css
Copied: homepage/trunk/css/nix-common.css (from r18751,
hydra/trunk/src/root/static/css/nix-common.css)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ homepage/trunk/css/nix-common.css Sun Sep 11 20:17:32 2011
(r29194, copy of r18751, hydra/trunk/src/root/static/css/nix-common.css)
@@ -0,0 +1,85 @@
+body {
+font-family: sans-serif;
+background: white;
+margin: 2em 1em 2em 1em;
+}
+
+h1, h2, h3 {
+font-weight: bold;
+color: #005aa0;
+}
+
+h1 {
+font-size: 180%;
+}
+
+h2 {
+font-size: 130%;
+margin-top: 1em;
+}
+
+h3 {
+font-size: 100%;
+}
+
+table {
+empty-cells: show;
+border-collapse: collapse;
+border-spacing: 0px;
+}
+
+tr.odd {
+background: #f4f4ff;
+}
+
+th {
+text-align: center;
+font-weight: bold;
+background: #c0;
+}
+
+td, th {
+padding: 2px 5px;
+border: solid black 1px;
+}
+
+td {
+vertical-align: top;
+}
+
+td.centered {
+text-align: center;
+}
+
+a {
+text-decoration: none;
+}
+
+a:hover, a:visited:hover {
+text-decoration: underline;
+}
+
+a:link { color: #0048b3; }
+a:visited { color: #002a6a; }
+a.no-hover:hover { background: none; }
+
+img {
+border-style: none;
+}
+
+li {
+margin-top: 0.5em;
+margin-bottom: 0.5em;
+}
+
+pre {
+margin-left: 1.5em;
+margin-right: 1.5em;
+}
+
+pre.code {
+border: 1px solid #6185a0;
+padding: 6px 6px;
+color: #60;
+background: #f4f4f8;
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29193 - homepage/trunk/css
Author: eelco
Date: Sun Sep 11 20:16:33 2011
New Revision: 29193
URL: https://ssl.nixos.org/websvn/nix/?rev=29193&sc=1
Log:
Modified:
homepage/trunk/css/nixos-site.css
Modified: homepage/trunk/css/nixos-site.css
==
--- homepage/trunk/css/nixos-site.css Sun Sep 11 20:10:14 2011(r29192)
+++ homepage/trunk/css/nixos-site.css Sun Sep 11 20:16:33 2011(r29193)
@@ -5,7 +5,7 @@
/* The main container element. */
div#page {
-max-width: 55em;
+max-width: 80%;
margin: 1em auto;
background-color: white;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29192 - patchelf/trunk/src
Author: eelco
Date: Sun Sep 11 20:10:14 2011
New Revision: 29192
URL: https://ssl.nixos.org/websvn/nix/?rev=29192&sc=1
Log:
* Support executables created by the Gold linker (NixOS/140). These
are marked as ET_DYN (not ET_EXEC) and have a starting virtual
address of 0 so they cannot grow downwards. In order not to run
into a Linux kernel bug, the virtual address and the offset of the
new PT_LOAD segment have to be equal; otherwise ld-linux segfaults.
To ensure this, it may be necessary to add some padding to the
executable (potentially a lot of padding, if the executable has a
large uninitialised data segment).
* Use size_t rather than off_t in some places.
Modified:
patchelf/trunk/src/patchelf.cc
Modified: patchelf/trunk/src/patchelf.cc
==
--- patchelf/trunk/src/patchelf.cc Sun Sep 11 18:58:24 2011(r29191)
+++ patchelf/trunk/src/patchelf.cc Sun Sep 11 20:10:14 2011(r29192)
@@ -55,6 +55,8 @@
bool changed;
+bool isExecutable;
+
typedef string SectionName;
typedef map ReplacedSections;
@@ -245,6 +247,8 @@
template
void ElfFile::parse()
{
+isExecutable = false;
+
/* Check the ELF header for basic validity. */
if (fileSize < (off_t) sizeof(Elf_Ehdr)) error("missing ELF header");
@@ -268,8 +272,10 @@
error("program headers have wrong size");
/* Copy the program and section headers. */
-for (int i = 0; i < rdi(hdr->e_phnum); ++i)
+for (int i = 0; i < rdi(hdr->e_phnum); ++i) {
phdrs.push_back(* ((Elf_Phdr *) (contents + rdi(hdr->e_phoff)) + i));
+if (rdi(phdrs[i].p_type) == PT_INTERP) isExecutable = true;
+}
for (int i = 0; i < rdi(hdr->e_shnum); ++i)
shdrs.push_back(* ((Elf_Shdr *) (contents + rdi(hdr->e_shoff)) + i));
@@ -486,7 +492,7 @@
{
string sectionName = i->first;
Elf_Shdr & shdr = findSection(sectionName);
-debug("rewriting section `%s' from offset %d (size %d) to offset %d
(size %d)\n",
+debug("rewriting section `%s' from offset 0x%x (size %d) to offset
0x%x (size %d)\n",
sectionName.c_str(), rdi(shdr.sh_offset), rdi(shdr.sh_size),
curOff, i->second.size());
memcpy(contents + curOff, (unsigned char *) i->second.c_str(),
@@ -552,11 +558,40 @@
debug("needed space is %d\n", neededSpace);
-off_t startOffset = roundUp(fileSize, pageSize);
+size_t startOffset = roundUp(fileSize, pageSize);
growFile(startOffset + neededSpace);
+/* Even though this file is of type ET_DYN, it could actually be
+ an executable. For instance, Gold produces executables marked
+ ET_DYN. In that case we can still hit the kernel bug that
+ necessitated rewriteSectionsExecutable(). However, such
+ executables also tend to start at virtual address 0, so
+ rewriteSectionsExecutable() won't work because it doesn't have
+ any virtual address space to grow downwards into. As a
+ workaround, make sure that the virtual address of our new
+ PT_LOAD segment relative to the first PT_LOAD segment is equal
+ to its offset; otherwise we hit the kernel bug. This may
+ require creating a hole in the executable. The bigger the size
+ of the uninitialised data segment, the bigger the hole. */
+if (isExecutable) {
+if (startOffset >= startPage) {
+debug("shifting new PT_LOAD segment by %d bytes to work around a
Linux kernel bug\n", startOffset - startPage);
+} else {
+size_t hole = startPage - startOffset;
+/* Print a warning, because the hole could be very big. */
+fprintf(stderr, "warning: working around a Linux kernel bug by
creating a hole of %zu bytes in ‘%s’\n", hole, fileName.c_str());
+assert(hole % pageSize == 0);
+/* !!! We could create an actual hole in the file here,
+ but it's probably not worth the effort. */
+growFile(fileSize + hole);
+startOffset += hole;
+}
+startPage = startOffset;
+}
+
+
/* Add a segment that maps the replaced sections and program
headers into memory. */
phdrs.resize(rdi(hdr->e_phnum) + 1);
@@ -610,7 +645,7 @@
SHT_PROGBITS). These cannot be moved in virtual address space
since that would invalidate absolute references to them. */
assert(lastReplaced + 1 < shdrs.size()); /* !!! I'm lazy. */
-off_t startOffset = rdi(shdrs[lastReplaced + 1].sh_offset);
+size_t startOffset = rdi(shdrs[lastReplaced + 1].sh_offset);
Elf_Addr startAddr = rdi(shdrs[lastReplaced + 1].sh_addr);
string prevSection;
for (unsigned int i = 1; i <= lastReplaced; ++i) {
@@ -651,7 +686,7 @@
/* Compute the total space needed for the replaced sections, the
ELF header, and the program headers. */
-off_t neededSpace =
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29189 - nixpkgs/trunk/pkgs/top-level
Hi,
On 09/11/2011 08:28 PM, Shea Levy wrote:
cairo = callPackage ../development/libraries/haskell/cairo {
inherit (pkgs) cairo zlib;
+glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
A better approach is to have cairo use the stdenv.gcc.libc attribute,
which is null on "impure" platforms such as Darwin.
--
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] BuilderDefs
Hi,
On 09/11/2011 06:45 PM, Michael Raskin wrote:
+x@{builderDefsPackage
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+[];
(snip)
Could you stick to the standard way of writing packages? That is,
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "libmodplug-0.8.8.4";
src = fetchurl { ... };
meta = ...;
}
That style is easier to read, shorter, uses fewer strange idioms
(‘helperArgNames’?), is better documented, and easier to maintain by
others (because it is the standard notation).
The purported advantage of builderDefs (making it easier to customise
build phases etc.) I haven't really seen in practice — stdenv's
setup.sh has plenty of customisation mechanisms.
--
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29185 - nixos/trunk/modules/services/monitoring
Author: eelco
Date: Sun Sep 11 15:55:43 2011
New Revision: 29185
URL: https://ssl.nixos.org/websvn/nix/?rev=29185&sc=1
Log:
* Zabbix: only enable PostgreSQL if it's on the same machine.
Modified:
nixos/trunk/modules/services/monitoring/zabbix-server.nix
Modified: nixos/trunk/modules/services/monitoring/zabbix-server.nix
==
--- nixos/trunk/modules/services/monitoring/zabbix-server.nix Sun Sep 11
15:54:18 2011(r29184)
+++ nixos/trunk/modules/services/monitoring/zabbix-server.nix Sun Sep 11
15:55:43 2011(r29185)
@@ -63,7 +63,7 @@
config = mkIf cfg.enable {
-services.postgresql.enable = true;
+services.postgresql.enable = cfg.dbServer == "localhost";
users.extraUsers = singleton
{ name = "zabbix";
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29184 - configurations/trunk/tud
Author: eelco
Date: Sun Sep 11 15:54:18 2011
New Revision: 29184
URL: https://ssl.nixos.org/websvn/nix/?rev=29184&sc=1
Log:
* Lucifer no longer needs a PostgreSQL server.
Modified:
configurations/trunk/tud/lucifer.nix
Modified: configurations/trunk/tud/lucifer.nix
==
--- configurations/trunk/tud/lucifer.nixSun Sep 11 15:18:53 2011
(r29183)
+++ configurations/trunk/tud/lucifer.nixSun Sep 11 15:54:18 2011
(r29184)
@@ -64,20 +64,6 @@
services.hydraChannelMirror.period = "0-59/15 * * * *";
services.hydraChannelMirror.dataDir = "/data/releases";
- services.postgresql = {
-enable = true;
-enableTCPIP = true;
-dataDir = "/data/postgresql";
-authentication =
- ''
-local all mediawikiident mediawiki-users
-local all all ident sameuser
-host all all 127.0.0.1/32 md5
-host all all ::1/128 md5
-host all all 192.168.1.0/24 md5
- '';
- };
-
services.tomcat = {
enable = true;
baseDir = "/data/tomcat";
@@ -87,7 +73,6 @@
+ "-XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/data/tomcat/logs/java_pid.hprof";
};
-
services.cron.systemCronJobs =
[ "*/5 * * * * hydra-mirror flock -x /data/releases/.lock -c
/home/hydra-mirror/release/mirror/mirror-nixos-isos.sh >>
/home/hydra-mirror/nixos-mirror.log 2>&1" ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29182 - configurations/trunk/tud
Author: eelco
Date: Sun Sep 11 14:18:39 2011
New Revision: 29182
URL: https://ssl.nixos.org/websvn/nix/?rev=29182&sc=1
Log:
* Move the JIRA DB to webdsl.org.
Modified:
configurations/trunk/tud/mrkitty.nix
configurations/trunk/tud/network.nix
Modified: configurations/trunk/tud/mrkitty.nix
==
--- configurations/trunk/tud/mrkitty.nixSun Sep 11 12:44:54 2011
(r29181)
+++ configurations/trunk/tud/mrkitty.nixSun Sep 11 14:18:39 2011
(r29182)
@@ -8,7 +8,7 @@
jiraJetty = (import ../../services/jira/jira-instance.nix {
inherit pkgs;
-dbHost = "192.168.1.25";
+dbHost = "130.161.159.114"; # webdsl.org
dbPassword = import ./jira-password.nix;
}).jetty;
Modified: configurations/trunk/tud/network.nix
==
--- configurations/trunk/tud/network.nixSun Sep 11 12:44:54 2011
(r29181)
+++ configurations/trunk/tud/network.nixSun Sep 11 14:18:39 2011
(r29182)
@@ -8,6 +8,6 @@
wendy = import ./wendy.nix;
ike = import ./build-machines-dell-r815.nix;
shelley = import ./build-machines-dell-r815.nix;
- #mrkitty = import ./mrkitty.nix;
+ mrkitty = import ./mrkitty.nix;
#mrhankey = import ./mrhankey.nix;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29159 - nixpkgs/branches/syscall-tracing/pkgs/stdenv
Author: eelco
Date: Sat Sep 10 18:31:43 2011
New Revision: 29159
URL: https://ssl.nixos.org/websvn/nix/?rev=29159&sc=1
Log:
* Compress the log on the fly, compress .build, and tee stdout/stderr
to prevent the builder from being killed after an hour.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Sat Sep 10
14:18:18 2011(r29158)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Sat Sep 10
18:31:43 2011(r29159)
@@ -354,10 +354,17 @@
traceScript = pkgs.writeScript "builder.sh"
''
+ #! ${pkgs.bash}/bin/bash
echo tracing: $builder $realArgs
+ set +o posix
${pkgs.coreutils}/bin/mkdir -p $out/.trace
- ${pkgs.strace}/bin/strace -e trace=file,process,dup,dup2,close,pipe -v
-q -f -s 512 ${pkgs.stdenv.shell} -c '(cd $TMPDIR && $builder $realArgs)' >
$out/.trace/log 2>&1
- ${pkgs.bzip2}/bin/bzip2 $out/.trace/log
+ # Compress the strace output on the fly. The builder's stderr
+ # also goes to the log so that the trace processor can see stuff
+ # like Make trace messages.
+ exec 4> >(${pkgs.bzip2}/bin/bzip2 > $out/.trace/log.bz2)
+ exec 5> >(${pkgs.coreutils}/bin/tee /dev/fd/4)
+ ${pkgs.strace}/bin/strace -e trace=file,process,dup,dup2,close,pipe -v
-q -f -s 512 -o /dev/fd/4 ${pkgs.stdenv.shell} -c '(cd $TMPDIR && $builder
$realArgs)' 2>&5
+ (cd $out && ${pkgs.gnutar}/bin/tar c .build | ${pkgs.bzip2}/bin/bzip2 >
.build.tar.bz2 && ${pkgs.coreutils}/bin/rm -rf .build)
'';
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29158 - nixpkgs/branches/syscall-tracing/pkgs/stdenv
Author: eelco
Date: Sat Sep 10 14:18:18 2011
New Revision: 29158
URL: https://ssl.nixos.org/websvn/nix/?rev=29158&sc=1
Log:
Modified:
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Sat Sep 10
13:28:18 2011(r29157)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Sat Sep 10
14:18:18 2011(r29158)
@@ -4,6 +4,7 @@
{ dietlibc, fetchurl, runCommand }:
+let pkgs = import /etc/nixos/nixpkgs { }; in
rec {
@@ -351,8 +352,6 @@
};
- pkgs = import /etc/nixos/nixpkgs { };
-
traceScript = pkgs.writeScript "builder.sh"
''
echo tracing: $builder $realArgs
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29157 - nixpkgs/branches/syscall-tracing/pkgs/top-level
Author: eelco
Date: Sat Sep 10 13:28:18 2011
New Revision: 29157
URL: https://ssl.nixos.org/websvn/nix/?rev=29157&sc=1
Log:
* Weird infinite recursion in kde47, so turn it off.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/top-level/all-packages.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/top-level/all-packages.nixSat Sep
10 13:26:19 2011(r29156)
+++ nixpkgs/branches/syscall-tracing/pkgs/top-level/all-packages.nixSat Sep
10 13:28:18 2011(r29157)
@@ -1507,6 +1507,7 @@
x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { };
+ /*
xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools {
inherit stdenv fetchgit autoconf automake libusb confuse;
# It needs a cross compiler for mipsel to build the firmware it will
@@ -1539,6 +1540,7 @@
in
pkgsCross.gccCrossStageStatic;
};
+ */
xclip = callPackage ../tools/misc/xclip { };
@@ -7850,7 +7852,7 @@
# TODO: merge with branches/drop-kde4.5 if you want to remove KDE SC 4.5
# This branch removes kde45 and quite a few compatibility hacks
kde45 = kdePackagesFor pkgs.kde45 "4.5";
- kde47 = kdePackagesFor pkgs.kde47 "4.7";
+ #kde47 = kdePackagesFor pkgs.kde47 "4.7";
kdePackagesFor = self: version:
let callPackageOrig = callPackage; in
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29156 - in nixpkgs/branches/syscall-tracing/pkgs: lib stdenv/generic
Author: eelco
Date: Sat Sep 10 13:26:19 2011
New Revision: 29156
URL: https://ssl.nixos.org/websvn/nix/?rev=29156&sc=1
Log:
* In overrideDerivation, handle derivations with a passthru
attribute properly.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/lib/customisation.nix
nixpkgs/branches/syscall-tracing/pkgs/stdenv/generic/default.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/lib/customisation.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/lib/customisation.nix Sat Sep 10
13:25:44 2011(r29155)
+++ nixpkgs/branches/syscall-tracing/pkgs/lib/customisation.nix Sat Sep 10
13:26:19 2011(r29156)
@@ -36,13 +36,13 @@
# Filter out special attributes.
drop = ["meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv"
"type" "override" "deepOverride" "origArgs"]
# also drop functions such as .merge .override etc
- ++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv);
+ ++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv)
+ ++ lib.optionals (drv ? passthru) (attrNames drv.passthru);
attrs = removeAttrs drv drop;
newDrv = derivation (attrs // (f drv));
-in newDrv //
- { meta = if drv ? meta then drv.meta else {};
-passthru = if drv ? passthru then drv.passthru else {};
- };
+in newDrv
+ // { meta = if drv ? meta then drv.meta else {}; }
+ // (if drv ? passthru then drv.passthru // { passthru = drv.passthru; }
else {});
# usage: (you can use override multiple times)
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/generic/default.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/generic/default.nixSat Sep
10 13:25:44 2011(r29155)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/generic/default.nixSat Sep
10 13:26:19 2011(r29156)
@@ -87,7 +87,8 @@
# should be made available to Nix expressions using the
# derivation (e.g., in assertions).
//
- (if attrs ? passthru then attrs.passthru else {});
+ lib.optionalAttrs (attrs ? passthru)
+(attrs.passthru // { passthru = attrs.passthru; });
# Utility flags to test the type of platform.
isDarwin = result.system == "i686-darwin"
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29155 - nixpkgs/branches/syscall-tracing/pkgs/stdenv
Author: eelco
Date: Sat Sep 10 13:25:44 2011
New Revision: 29155
URL: https://ssl.nixos.org/websvn/nix/?rev=29155&sc=1
Log:
* Use stdenv.lib.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Sat Sep 10
13:25:18 2011(r29154)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Sat Sep 10
13:25:44 2011(r29155)
@@ -2,8 +2,8 @@
a new stdenv with different behaviour, e.g. using a different C
compiler. */
-{dietlibc, fetchurl, runCommand}:
-
+{ dietlibc, fetchurl, runCommand }:
+
rec {
@@ -363,7 +363,7 @@
traceSyscalls = stdenv: stdenv //
-{ mkDerivation = args: pkgs.lib.overrideDerivation (stdenv.mkDerivation
args)
+{ mkDerivation = args: stdenv.lib.overrideDerivation (stdenv.mkDerivation
args)
(args2: if args2 ? dontTrace then { } else {
realArgs = args2.args;
args = [ "-e" traceScript ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29154 - in nixpkgs/branches/syscall-tracing/pkgs: build-support/builder-defs lib
Author: eelco
Date: Sat Sep 10 13:25:18 2011
New Revision: 29154
URL: https://ssl.nixos.org/websvn/nix/?rev=29154&sc=1
Log:
* Disable all packages using builderDefs or composableDerivation.
They give evaluation errors when the tracing stdenv adapter is
applied.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/build-support/builder-defs/builder-defs.nix
nixpkgs/branches/syscall-tracing/pkgs/lib/composable-derivation.nix
Modified:
nixpkgs/branches/syscall-tracing/pkgs/build-support/builder-defs/builder-defs.nix
==
---
nixpkgs/branches/syscall-tracing/pkgs/build-support/builder-defs/builder-defs.nix
Sat Sep 10 13:02:24 2011(r29153)
+++
nixpkgs/branches/syscall-tracing/pkgs/build-support/builder-defs/builder-defs.nix
Sat Sep 10 13:25:18 2011(r29154)
@@ -1,4 +1,5 @@
args: with args; with stringsWithDeps; with lib;
+assert false;
let inherit (builtins) head tail trace; in
(rec
{
Modified: nixpkgs/branches/syscall-tracing/pkgs/lib/composable-derivation.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/lib/composable-derivation.nix Sat Sep
10 13:02:24 2011(r29153)
+++ nixpkgs/branches/syscall-tracing/pkgs/lib/composable-derivation.nix Sat Sep
10 13:25:18 2011(r29154)
@@ -20,7 +20,7 @@
# consider adding addtional elements by derivation.merge { removeAttrs
= ["elem"]; };
removeAttrs ? ["cfg" "flags"]
- }: (lib.defaultOverridableDelayableArgs ( a: mkDerivation a)
+ }: assert false; (lib.defaultOverridableDelayableArgs ( a: mkDerivation
a)
{
inherit applyPreTidy removeAttrs;
}).merge;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29153 - nixpkgs/branches/syscall-tracing/pkgs/development/libraries/fftw
Author: eelco
Date: Sat Sep 10 13:02:24 2011
New Revision: 29153
URL: https://ssl.nixos.org/websvn/nix/?rev=29153&sc=1
Log:
* fftw updated to 3.3, and follow the coding guidelines.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/development/libraries/fftw/default.nix
Modified:
nixpkgs/branches/syscall-tracing/pkgs/development/libraries/fftw/default.nix
==
---
nixpkgs/branches/syscall-tracing/pkgs/development/libraries/fftw/default.nix
Sat Sep 10 11:27:13 2011(r29152)
+++
nixpkgs/branches/syscall-tracing/pkgs/development/libraries/fftw/default.nix
Sat Sep 10 13:02:24 2011(r29153)
@@ -1,31 +1,29 @@
-{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false}:
-let localDefs = builderDefs.passthru.function {
- src =
-fetchurl {
- url = ftp://ftp.fftw.org/pub/fftw/fftw-3.2.2.tar.gz;
- sha256 = "13vnglardq413q2518zi4a8pam3znydrz28m9w09kss9xrjsx9va";
-};
- buildInputs = [];
- configureFlags = ["--enable-shared" "--enable-openmp"]
-# some distros seem to be shipping both versions
within the same package?
-# why does --enable-float still result in ..3f.so
instead of ..3.so?
- ++ (if singlePrecision then [ "--enable-single" ] else [ ])
-# I think all i686 has sse
- ++ (if (stdenv.isi686 || stdenv.isx86_64) &&
singlePrecision then [ "--enable-sse" ] else [ ])
-# I think all x86_64 has sse2
- ++ (if stdenv.isx86_64 && ! singlePrecision then [
"--enable-sse2" ] else [ ]);
-
+{ fetchurl, stdenv, singlePrecision ? false }:
+
+with stdenv.lib;
+
+let version = "3.3"; in
+
+stdenv.mkDerivation rec {
+ name = "fftw-${version}" + (if singlePrecision then "-single" else
"-double");
+
+ src = fetchurl {
+url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";;
+sha256 = "1skakcijq5rds6mmj7jffqk5i4fw7p81k4z1iikkx4qk3999hnnj";
};
-in with localDefs;
-stdenv.mkDerivation {
- name = "fftw-3.2.2" + ( if singlePrecision then "-single" else "-double" );
- builder = writeScript "fftw-3.2.1-builder"
-(textClosure localDefs [doConfigure doMakeInstall doForceShare]);
+
+ configureFlags =
+[ "--enable-shared" "--enable-openmp" ]
+# some distros seem to be shipping both versions within the same package?
+# why does --enable-float still result in ..3f.so instead of ..3.so?
+++ optional singlePrecision "--enable-single"
+# I think all i686 has sse
+++ optional ((stdenv.isi686 || stdenv.isx86_64) && singlePrecision)
"--enable-sse"
+# I think all x86_64 has sse2
+++ optional (stdenv.isx86_64 && !singlePrecision) "--enable-sse2";
+
meta = {
-description = "Fastest Fourier Transform in the West library";
- };
- passthru = {
-# Allow instantiating "-A fftw.src"
-inherit src;
+homepage = http://www.fftw.org/;
+description = "A C subroutine library for computing the discrete Fourier
transform";
};
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29131 - configurations/trunk/tud
Author: eelco Date: Fri Sep 9 14:18:59 2011 New Revision: 29131 URL: https://ssl.nixos.org/websvn/nix/?rev=29131&sc=1 Log: * Obsoleted by nixos-deploy-network. Deleted: configurations/trunk/tud/mass-update.sh ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29130 - configurations/trunk/tud
Author: eelco
Date: Fri Sep 9 14:18:25 2011
New Revision: 29130
URL: https://ssl.nixos.org/websvn/nix/?rev=29130&sc=1
Log:
* Clean up administration.
Deleted:
configurations/trunk/tud/build-machines-hps.nix
Modified:
configurations/trunk/tud/machines.nix
configurations/trunk/tud/network.nix
Modified: configurations/trunk/tud/machines.nix
==
--- configurations/trunk/tud/machines.nix Fri Sep 9 13:51:17 2011
(r29129)
+++ configurations/trunk/tud/machines.nix Fri Sep 9 14:18:25 2011
(r29130)
@@ -1,7 +1,7 @@
lib: with lib;
[
- {
+ { # Web frontend.
hostName = "cartman";
ipAddress = "192.168.1.5";
system = "i686-linux";
@@ -9,7 +9,7 @@
maxJobs = 2;
}
- {
+ { # 8-core NixOS build machine.
hostName = "kenny";
ipAddress = "192.168.1.19";
ethernetAddress = "00:22:19:55:cc:0d";
@@ -19,7 +19,7 @@
buildUser = "buildfarm";
}
- {
+ { # 8-core NixOS build machine.
hostName = "stan";
ipAddress = "192.168.1.20";
ethernetAddress = "00:22:19:55:bf:2e";
@@ -29,7 +29,7 @@
buildUser = "buildfarm";
}
- {
+ { # 8-core NixOS build machine.
hostName = "kyle";
ipAddress = "192.168.1.21";
ethernetAddress = "00:22:19:55:c1:18";
@@ -39,7 +39,7 @@
buildUser = "buildfarm";
}
- {
+ { # Windows XP build machine.
hostName = "garrison";
ipAddress = "192.168.1.11";
ethernetAddress = "00:19:d1:10:37:54";
@@ -50,16 +50,6 @@
}
{
-hostName = "terrance";
-ipAddress = "192.168.1.12";
-ethernetAddress = "00:19:d1:10:37:49";
-system = "i686-openbsd";
-aliases = ["openbsd-1"];
-maxJobs = 2;
-buildUser = "buildfarm";
- }
-
- {
hostName = "phillip";
ipAddress = "192.168.1.13";
ethernetAddress = "00:19:d1:19:2a:31";
@@ -69,47 +59,7 @@
buildUser = "buildfarm";
}
- {
-hostName = "jimmy";
-ipAddress = "192.168.1.14";
-ethernetAddress = "00:16:76:9a:32:1d";
-system = "i686-linux";
-aliases = ["linux32-1" "linux32" "linux"];
-maxJobs = 2;
-#buildUser = "buildfarm";
- }
-
- {
-hostName = "timmy";
-ipAddress = "192.168.1.15";
-ethernetAddress = "00:19:d1:1d:c4:9a";
-system = "i686-linux";
-aliases = ["linux32-2"];
-maxJobs = 2;
-#buildUser = "buildfarm";
- }
-
- {
-hostName = "token";
-ipAddress = "192.168.1.16";
-ethernetAddress = "00:16:cb:a6:13:28";
-system = "i686-darwin";
-aliases = ["mac86-1" "mac"];
-maxJobs = 2;
-buildUser = "nix";
- }
-
- {
-hostName = "black";
-ipAddress = "192.168.1.17";
-ethernetAddress = "00:16:cb:a6:13:d7";
-system = "i686-darwin";
-aliases = ["mac86-2"];
-maxJobs = 2;
-buildUser = "nix";
- }
-
- {
+ { # 64-bit Mac OS X build machine.
hostName = "butters";
ipAddress = "192.168.1.23";
ethernetAddress = "00:24:36:f3:cd:c0";
@@ -119,25 +69,19 @@
buildUser = "nix";
}
- {
+ { # Old Hydra server.
hostName = "hydra";
ipAddress = "192.168.1.18";
ethernetAddress = "00:22:19:55:bf:24";
}
- {
-hostName = "chef";
-ipAddress = "192.168.1.22";
-ethernetAddress = "00:26:b9:35:bb:ca";
- }
-
- {
+ { # Xen machine.
hostName = "mrhankey";
ipAddress = "192.168.1.24";
ethernetAddress = "00:1D:09:0E:09:E5";
}
- {
+ { # New Hydra server.
hostName = "lucifer";
ipAddress = "192.168.1.25";
ethernetAddress = "84:2B:2B:0B:98:F0";
Modified: configurations/trunk/tud/network.nix
==
--- configurations/trunk/tud/network.nixFri Sep 9 13:51:17 2011
(r29129)
+++ configurations/trunk/tud/network.nixFri Sep 9 14:18:25 2011
(r29130)
@@ -1,12 +1,13 @@
{
- jimmy = import ./build-machines-hps.nix;
- timmy = import ./build-machines-hps.nix;
kenny = import ./build-machines-dell-1950.nix;
kyle = import ./build-machines-dell-1950.nix;
stan = import ./stan.nix;
cartman = import ./cartman.nix;
hydra = import ./hydra.nix;
lucifer = import ./lucifer.nix;
+ wendy = import ./wendy.nix;
+ ike = import ./build-machines-dell-r815.nix;
+ shelley = import ./build-machines-dell-r815.nix;
#mrkitty = import ./mrkitty.nix;
#mrhankey = import ./mrhankey.nix;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29129 - configurations/trunk/tud
Author: eelco
Date: Fri Sep 9 13:51:17 2011
New Revision: 29129
URL: https://ssl.nixos.org/websvn/nix/?rev=29129&sc=1
Log:
* Measure the temperature of AMD CPUs.
Modified:
configurations/trunk/tud/common.nix
Modified: configurations/trunk/tud/common.nix
==
--- configurations/trunk/tud/common.nix Fri Sep 9 13:38:21 2011(r29128)
+++ configurations/trunk/tud/common.nix Fri Sep 9 13:51:17 2011(r29129)
@@ -33,7 +33,7 @@
services.zabbixAgent.server = "192.168.1.5,127.0.0.1,130.161.158.181";
services.zabbixAgent.extraConfig =
''
- UserParameter=hardware.temp.cpu.average,cat
/sys/devices/platform/coretemp.*/temp1_input | ${pkgs.perl}/bin/perl -e 'while
(<>) { $n++; $sum += $_; }; print $sum / $n / 1000;'
+ UserParameter=hardware.temp.cpu.average,shopt -s nullglob; cat
/sys/devices/platform/coretemp.*/temp1_input
/sys/bus/pci/drivers/k10temp/*/temp1_input < /dev/null | ${pkgs.perl}/bin/perl
-e 'while (<>) { $n++; $sum += $_; }; print $sum / $n / 1000;'
UserParameter=vm.memory.dirty,echo $((1024 * $(cat /proc/meminfo | sed
's/Dirty: *\([0-9]\+\) kB/\1/; t; d')))
'';
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29127 - configurations/trunk/tud
Author: eelco
Date: Fri Sep 9 13:25:07 2011
New Revision: 29127
URL: https://ssl.nixos.org/websvn/nix/?rev=29127&sc=1
Log:
* Fix the start condition for hydra-queue-runner and hydra-server.
Modified:
configurations/trunk/tud/hydra-module.nix
Modified: configurations/trunk/tud/hydra-module.nix
==
--- configurations/trunk/tud/hydra-module.nix Fri Sep 9 13:16:35 2011
(r29126)
+++ configurations/trunk/tud/hydra-module.nix Fri Sep 9 13:25:07 2011
(r29127)
@@ -133,7 +133,7 @@
'';
jobs.hydra_init =
- { description = "hydra-init";
+ { name = "hydra-init";
startOn = "started network-interfaces";
preStart = ''
mkdir -p ${cfg.baseDir}/data
@@ -146,16 +146,16 @@
};
jobs.hydra_server =
- { description = "hydra-server";
-startOn = "started network-interfaces hydra-init";
+ { name = "hydra-server";
+startOn = "started network-interfaces and started hydra-init";
exec = ''
${pkgs.su}/bin/su - ${cfg.user} -c '${server_env} hydra_server.pl >
${cfg.baseDir}/data/server.log 2>&1'
'';
};
jobs.hydra_queue_runner =
- { description = "hydra-queue-runner";
-startOn = "started network-interfaces hydra-init";
+ { name = "hydra-queue-runner";
+startOn = "started network-interfaces and started hydra-init";
preStart = "${pkgs.su}/bin/su - ${cfg.user} -c 'hydra_queue_runner.pl
--unlock'";
exec = ''
${pkgs.su}/bin/su - ${cfg.user} -c 'nice -n 8 hydra_queue_runner.pl
> ${cfg.baseDir}/data/queue_runner.log 2>&1'
@@ -163,7 +163,7 @@
};
jobs.hydra_evaluator =
- { description = "hydra-evaluator";
+ { name = "hydra-evaluator";
startOn = "started network-interfaces";
exec = ''
${pkgs.su}/bin/su - ${cfg.user} -c '${env} nice -n 5
hydra_evaluator.pl > ${cfg.baseDir}/data/evaluator.log 2>&1'
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29126 - nixpkgs/trunk/pkgs/tools/networking/radvd
Author: eelco
Date: Fri Sep 9 13:16:35 2011
New Revision: 29126
URL: https://ssl.nixos.org/websvn/nix/?rev=29126&sc=1
Log:
* radvd updated to 1.8.1.
Modified:
nixpkgs/trunk/pkgs/tools/networking/radvd/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/radvd/default.nix
==
--- nixpkgs/trunk/pkgs/tools/networking/radvd/default.nix Fri Sep 9
12:59:45 2011(r29125)
+++ nixpkgs/trunk/pkgs/tools/networking/radvd/default.nix Fri Sep 9
13:16:35 2011(r29126)
@@ -1,15 +1,16 @@
{ stdenv, fetchurl, bison, flex }:
stdenv.mkDerivation rec {
- name = "radvd-1.7";
+ name = "radvd-1.8.1";
src = fetchurl {
url = "http://www.litech.org/radvd/dist/${name}.tar.gz";;
-sha256 = "04rlz5fhparridjm32wcq9h1s3vxyiac7d3l6cvfgrlxixikgrzq";
+sha256 = "1sg3halppbz3vwr88lbcdv7mndzwl4nkqnrafkyf2a248wwz2cbc";
};
buildInputs = [ bison flex ];
meta.homepage = http://www.litech.org/radvd/;
meta.description = "IPv6 Router Advertisement Daemon";
+ meta.platforms = stdenv.lib.platforms.linux;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29125 - configurations/trunk/tud
Author: eelco
Date: Fri Sep 9 12:59:45 2011
New Revision: 29125
URL: https://ssl.nixos.org/websvn/nix/?rev=29125&sc=1
Log:
* Use Linux 2.6.35.
Modified:
configurations/trunk/tud/common.nix
Modified: configurations/trunk/tud/common.nix
==
--- configurations/trunk/tud/common.nix Fri Sep 9 11:06:28 2011(r29124)
+++ configurations/trunk/tud/common.nix Fri Sep 9 12:59:45 2011(r29125)
@@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{
+ boot.kernelPackages = pkgs.linuxPackages_2_6_35;
+
boot.kernelModules = [ "coretemp" ];
boot.initrd.kernelModules = [ "ext4" ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29124 - in homepage/trunk: nix nixos
Author: eelco Date: Fri Sep 9 11:06:28 2011 New Revision: 29124 URL: https://ssl.nixos.org/websvn/nix/?rev=29124&sc=1 Log: Modified: homepage/trunk/nix/index.tt homepage/trunk/nixos/index.tt Modified: homepage/trunk/nix/index.tt == --- homepage/trunk/nix/index.tt Fri Sep 9 09:55:49 2011(r29123) +++ homepage/trunk/nix/index.tt Fri Sep 9 11:06:28 2011(r29124) @@ -2,11 +2,7 @@ About Nix -Nix is a purely functional package manager, released under - the terms of - the http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html";>GNU -LGPLv2.1 or (at your option) any later version. Purely - functional means +Nix is a purely functional package manager. This means that it treats packages like values in purely functional programming languages such as Haskell — they are built by functions that don’t have side-effects, and they never change after they have been built. @@ -218,4 +214,11 @@ more… +License + +Nix is released under the terms of the http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html";>GNU +LGPLv2.1 or (at your option) any later version. + + [% END %] Modified: homepage/trunk/nixos/index.tt == --- homepage/trunk/nixos/index.tt Fri Sep 9 09:55:49 2011(r29123) +++ homepage/trunk/nixos/index.tt Fri Sep 9 11:06:28 2011(r29124) @@ -5,9 +5,7 @@ NixOS is an experimental GNU/Linux distribution released under a - http://svn.nixos.org/repos/nix/nixos/trunk/COPYING";>permissive -MIT/X11 license. NixOS aims to improve +/>NixOS is an experimental GNU/Linux distribution that aims to improve the state of the art in system configuration management. In existing distributions, actions such as upgrades are dangerous: upgrading a package can cause other packages to break, upgrading an entire system @@ -257,5 +255,9 @@ +NixOS is released under a http://svn.nixos.org/repos/nix/nixos/trunk/COPYING";>permissive +MIT/X11 license. + [% END %] ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29123 - nixpkgs/trunk/pkgs/os-specific/linux/bridge-utils
Author: eelco Date: Fri Sep 9 09:55:49 2011 New Revision: 29123 URL: https://svn.nixos.org/websvn/nix/?rev=29123&sc=1 Log: * Add bridge-utils to the channel. Modified: nixpkgs/trunk/pkgs/os-specific/linux/bridge-utils/default.nix Modified: nixpkgs/trunk/pkgs/os-specific/linux/bridge-utils/default.nix == --- nixpkgs/trunk/pkgs/os-specific/linux/bridge-utils/default.nix Fri Sep 9 09:39:43 2011(r29122) +++ nixpkgs/trunk/pkgs/os-specific/linux/bridge-utils/default.nix Fri Sep 9 09:55:49 2011(r29123) @@ -16,5 +16,6 @@ description = "http://sourceforge.net/projects/bridge/";; homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/"; "http://sourceforge.net/projects/bridge/"; ]; license = "GPL"; +platforms = stdenv.lib.platforms.linux; }; } ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29122 - nixpkgs/trunk/pkgs/servers/monitoring/zabbix
Author: eelco
Date: Fri Sep 9 09:39:43 2011
New Revision: 29122
URL: https://svn.nixos.org/websvn/nix/?rev=29122&sc=1
Log:
* Zabbix updated to 1.8.7.
Modified:
nixpkgs/trunk/pkgs/servers/monitoring/zabbix/default.nix
Modified: nixpkgs/trunk/pkgs/servers/monitoring/zabbix/default.nix
==
--- nixpkgs/trunk/pkgs/servers/monitoring/zabbix/default.nixFri Sep 9
09:24:44 2011(r29121)
+++ nixpkgs/trunk/pkgs/servers/monitoring/zabbix/default.nixFri Sep 9
09:39:43 2011(r29122)
@@ -2,11 +2,11 @@
let
- version = "1.8.4";
+ version = "1.8.7";
src = fetchurl {
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-sha256 = "0fhn4gw8r96dy0z227k5bl144zpmgsk1jkwzhi61qqr44mz27fqc";
+sha256 = "1727y9yphff7ad9n843yls7rp9lh86m83jmrj6xr0ah45f02ja9d";
};
preConfigure =
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29121 - configurations/trunk/tud
Author: eelco
Date: Fri Sep 9 09:24:44 2011
New Revision: 29121
URL: https://svn.nixos.org/websvn/nix/?rev=29121&sc=1
Log:
Deleted:
configurations/trunk/tud/ike.nix
Modified:
configurations/trunk/tud/build-machines-dell-r815.nix
Modified: configurations/trunk/tud/build-machines-dell-r815.nix
==
--- configurations/trunk/tud/build-machines-dell-r815.nix Fri Sep 9
09:14:41 2011(r29120)
+++ configurations/trunk/tud/build-machines-dell-r815.nix Fri Sep 9
09:24:44 2011(r29121)
@@ -10,7 +10,7 @@
nix.maxJobs = 48;
- fileSystems = [
-{ device = "none"; fsType = "tmpfs"; mountPoint = "/tmp"; options =
"size=16G"; neededForBoot=true; }
- ];
+ fileSystems =
+[ { device = "none"; fsType = "tmpfs"; mountPoint = "/tmp"; options =
"size=16G"; neededForBoot = true; }
+];
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29120 - services/trunk/subversion
Author: eelco Date: Fri Sep 9 09:14:41 2011 New Revision: 29120 URL: https://svn.nixos.org/websvn/nix/?rev=29120&sc=1 Log: * Fix name. Modified: services/trunk/subversion/default.nix Modified: services/trunk/subversion/default.nix == --- services/trunk/subversion/default.nix Fri Sep 9 09:03:37 2011 (r29119) +++ services/trunk/subversion/default.nix Fri Sep 9 09:14:41 2011 (r29120) @@ -57,7 +57,7 @@ pkgs.perlPackages.BerkeleyDB pkgs.perlPackages.EmailSend pkgs.perlPackages.EmailSimple pkgs.perlPackages.ModulePluggable pkgs.perlPackages.ReturnValue pkgs.perlPackages.EmailAddress - pkgs.perlPackages.CryptPasswordMD5 + pkgs.perlPackages.CryptPasswdMD5 pkgs.perlPackages.StringMkPasswd ]; ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29118 - configurations/trunk/tud
Author: eelco
Date: Fri Sep 9 08:47:00 2011
New Revision: 29118
URL: https://svn.nixos.org/websvn/nix/?rev=29118&sc=1
Log:
Modified:
configurations/trunk/tud/hydra-mirror.nix
Modified: configurations/trunk/tud/hydra-mirror.nix
==
--- configurations/trunk/tud/hydra-mirror.nix Thu Sep 8 22:48:38 2011
(r29117)
+++ configurations/trunk/tud/hydra-mirror.nix Fri Sep 9 08:47:00 2011
(r29118)
@@ -8,8 +8,8 @@
mirrorChannel = pkgs.fetchsvn {
url =
https://svn.nixos.org/repos/nix/release/trunk/channels/mirror-channel.pl;
-rev = 25210;
-sha256 = "0gspqid1rpsj1z1mr29nakh7di278nlv6v2knafvmm3g8ah3yxgz";
+rev = 28026;
+sha256 = "0f76rfhxqap80qsq5gk7zbwv44sz8ci4czfxby6c0dqn0lzf1b41";
};
cronjob = jobset:
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29116 - in nixpkgs/trunk/pkgs: tools/video/flvtool2 top-level
Author: eelco
Date: Thu Sep 8 21:48:10 2011
New Revision: 29116
URL: https://svn.nixos.org/websvn/nix/?rev=29116&sc=1
Log:
* Added flvtool2.
Added:
nixpkgs/trunk/pkgs/tools/video/flvtool2/
nixpkgs/trunk/pkgs/tools/video/flvtool2/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/tools/video/flvtool2/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/video/flvtool2/default.nix Thu Sep 8 21:48:10
2011(r29116)
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, ruby }:
+
+stdenv.mkDerivation rec {
+ name = "flvtool2-1.0.6";
+
+ src = fetchurl {
+url = "http://rubyforge.org/frs/download.php/17497/${name}.tgz";;
+sha256 = "1pbsf0fvqrs6xzfkqal020bplb68dfiz6c5sfcz36k255v7c5w9a";
+ };
+
+ buildInputs = [ ruby ];
+
+ configurePhase =
+''
+ substituteInPlace bin/flvtool2 --replace "/usr/bin/env ruby" "ruby
-I$out/lib/ruby/site_ruby/1.8"
+ ruby setup.rb config --prefix=$out
--siterubyver=$out/lib/ruby/site_ruby/1.8
+'';
+
+ installPhase =
+''
+ ruby setup.rb install
+'';
+
+ meta = {
+homepage = http://www.inlet-media.de/flvtool2/;
+description = "A tool to manipulate Macromedia Flash Video files";
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Sep 8 19:06:59
2011(r29115)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Sep 8 21:48:10
2011(r29116)
@@ -651,6 +651,8 @@
flvstreamer = callPackage ../tools/networking/flvstreamer { };
+ flvtool2 = callPackage ../tools/video/flvtool2 { };
+
fontforge = callPackage ../tools/misc/fontforge { };
fontforgeX = callPackage ../tools/misc/fontforge {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] gnome does not build and kde4 blank screen
Hi, On 09/05/2011 09:24 PM, j@online.de wrote: after installing nixos-graphical-0.1pre28113-x86_64-linux.iso on fujitui lifebook i was not able to use kde4 desktopManager and could not build gnome environment. xterm (default), and xfce desktopManager did worked OK. for kde4 i got the screen with the harddisk and then the scren went blank and stayed that way. This could be caused by KDE turning on compositing. Try pressing alt-shift-f12 after the screen turns black to disable compositing. -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Re: [Nix-commits] SVN commit: nix - r29102 - in nixpkgs/trunk/pkgs/applications/version-management/git-and-tools: . git
Hi,
On 09/08/2011 01:33 AM, Yury G. Kudryashov wrote:
On 09/08/2011 12:52 AM, Yury G. Kudryashov wrote:
+ svn = subversionClient.override { perlBindings = true; };
Why do we need to use a separate build of Subversion here?
Doesn't this just cause all KDE users to have two (or more) copies of
Subversion in their closures?
Why a KDE user would need the server part of subversion in the closure?
The "subversion" attribute in Nixpkgs is part of the NixOS base system
(and does *not* include the Apache module, btw).
--
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29103 - nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano
On 09/08/2011 12:53 AM, Yury G. Kudryashov wrote: Author: urkud Date: Wed Sep 7 22:53:11 2011 New Revision: 29103 URL: https://svn.nixos.org/websvn/nix/?rev=29103&sc=1 Log: soprano: find virtuoso without LD_LIBRARY_PATH hack Heh. I actually patched Soprano as well, then threw the patch away since I figured it's much easier to just add it to the appropriate environment variables. -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29102 - in nixpkgs/trunk/pkgs/applications/version-management/git-and-tools: . git
On 09/08/2011 12:52 AM, Yury G. Kudryashov wrote:
+ svn = subversionClient.override { perlBindings = true; };
Why do we need to use a separate build of Subversion here?
Doesn't this just cause all KDE users to have two (or more) copies of
Subversion in their closures?
--
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29098 - nixpkgs/trunk/pkgs/development/libraries/neon
Author: eelco
Date: Wed Sep 7 18:08:59 2011
New Revision: 29098
URL: https://svn.nixos.org/websvn/nix/?rev=29098&sc=1
Log:
* Updated neon to 0.29.6.
Modified:
nixpkgs/trunk/pkgs/development/libraries/neon/0.29.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/neon/0.29.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/neon/0.29.nix Wed Sep 7
17:41:00 2011(r29097)
+++ nixpkgs/trunk/pkgs/development/libraries/neon/0.29.nix Wed Sep 7
18:08:59 2011(r29098)
@@ -10,11 +10,11 @@
assert static || shared;
stdenv.mkDerivation rec {
- name = "neon-0.29.3";
+ name = "neon-0.29.6";
src = fetchurl {
url = "http://www.webdav.org/neon/${name}.tar.gz";;
-sha256 = "1d1c6zhr00yvg0fbhpkq8kmsq9cchr112ii9rl39gdybyflh9444";
+sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w";
};
buildInputs = [libxml2 pkgconfig openssl]
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29088 - nixos/trunk/tests
Author: eelco
Date: Wed Sep 7 17:25:16 2011
New Revision: 29088
URL: https://svn.nixos.org/websvn/nix/?rev=29088&sc=1
Log:
* Make yet another test more reliable.
Modified:
nixos/trunk/tests/openssh.nix
Modified: nixos/trunk/tests/openssh.nix
==
--- nixos/trunk/tests/openssh.nix Wed Sep 7 16:53:30 2011(r29087)
+++ nixos/trunk/tests/openssh.nix Wed Sep 7 17:25:16 2011(r29088)
@@ -29,6 +29,7 @@
$client->copyFileFromHost("key", "/root/.ssh/id_dsa");
$client->mustSucceed("chmod 600 /root/.ssh/id_dsa");
+$client->waitForJob("network-interfaces");
$client->mustSucceed("ssh -o UserKnownHostsFile=/dev/null -o
StrictHostKeyChecking=no server 'echo hello world'");
'';
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29083 - nix-perl/trunk
Author: eelco
Date: Wed Sep 7 16:36:02 2011
New Revision: 29083
URL: https://svn.nixos.org/websvn/nix/?rev=29083&sc=1
Log:
* Fix the Perl bindings.
Modified:
nix-perl/trunk/Nix.xs
Modified: nix-perl/trunk/Nix.xs
==
--- nix-perl/trunk/Nix.xs Wed Sep 7 16:14:42 2011(r29082)
+++ nix-perl/trunk/Nix.xs Wed Sep 7 16:36:02 2011(r29083)
@@ -121,7 +121,7 @@
doInit();
PathSet paths;
for (int n = 2; n < items; ++n)
-computeFSClosure(SvPV_nolen(ST(n)), paths, flipDirection,
includeOutputs);
+computeFSClosure(*store, SvPV_nolen(ST(n)), paths,
flipDirection, includeOutputs);
for (PathSet::iterator i = paths.begin(); i != paths.end(); ++i)
XPUSHs(sv_2mortal(newSVpv(i->c_str(), 0)));
} catch (Error & e) {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29082 - nixpkgs/trunk/pkgs/tools/package-management/nix
Author: eelco
Date: Wed Sep 7 16:14:42 2011
New Revision: 29082
URL: https://svn.nixos.org/websvn/nix/?rev=29082&sc=1
Log:
* Bump nixUnstable.
Modified:
nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
Modified: nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
==
--- nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nixWed Sep
7 15:15:37 2011(r29081)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nixWed Sep
7 16:14:42 2011(r29082)
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "nix-1.0pre28391";
+ name = "nix-1.0pre29060";
src = fetchurl {
-url = "http://hydra.nixos.org/build/1232663/download/4/${name}.tar.bz2";;
-sha256 =
"c990f0ad564960b1d82fdbed32bee0db64c26b57400f027f01434237edd1be0f";
+url = "http://hydra.nixos.org/build/1301810/download/4/${name}.tar.bz2";;
+sha256 =
"f403213b56acfb2e74ae1e6fd136f3726940f098220d2ae8b46fa54c08f1aad0";
};
buildNativeInputs = [ perl pkgconfig ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29081 - in nixpkgs/branches/syscall-tracing/pkgs: build-support/fetchurl stdenv
Author: eelco
Date: Wed Sep 7 15:15:37 2011
New Revision: 29081
URL: https://svn.nixos.org/websvn/nix/?rev=29081&sc=1
Log:
* Hacky: don't do tracing on derivations that produce
a single regular file. Those fail because the tracer
creates $out/.build and $out/.trace.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/build-support/fetchurl/default.nix
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
Modified:
nixpkgs/branches/syscall-tracing/pkgs/build-support/fetchurl/default.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/build-support/fetchurl/default.nix
Wed Sep 7 15:14:17 2011(r29080)
+++ nixpkgs/branches/syscall-tracing/pkgs/build-support/fetchurl/default.nix
Wed Sep 7 15:15:37 2011(r29081)
@@ -13,6 +13,7 @@
stdenv.mkDerivation ({
name = "mirrors-list";
builder = ./write-mirror-list.sh;
+ dontTrace = true;
} // mirrors);
# Names of the master sites that are mirrored (i.e., "sourceforge",
@@ -64,6 +65,8 @@
if showURLs then "urls"
else if name != "" then name
else baseNameOf (toString (builtins.head urls_));
+
+ dontTrace = true;
builder = ./builder.sh;
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Wed Sep 7
15:14:17 2011(r29080)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Wed Sep 7
15:15:37 2011(r29081)
@@ -364,7 +364,7 @@
traceSyscalls = stdenv: stdenv //
{ mkDerivation = args: pkgs.lib.overrideDerivation (stdenv.mkDerivation
args)
-(args2: {
+(args2: if args2 ? dontTrace then { } else {
realArgs = args2.args;
args = [ "-e" traceScript ];
enableParallelBuilding = false;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29080 - in nixpkgs/branches/syscall-tracing/pkgs/stdenv: . generic linux
Author: eelco
Date: Wed Sep 7 15:14:17 2011
New Revision: 29080
URL: https://svn.nixos.org/websvn/nix/?rev=29080&sc=1
Log:
* Apply the syscall tracer stdenv adapter globally.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
nixpkgs/branches/syscall-tracing/pkgs/stdenv/generic/setup.sh
nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Wed Sep 7
15:13:00 2011(r29079)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Wed Sep 7
15:14:17 2011(r29080)
@@ -349,4 +349,30 @@
drvPath = validate pkg.drvPath;
};
};
+
+
+ pkgs = import /etc/nixos/nixpkgs { };
+
+ traceScript = pkgs.writeScript "builder.sh"
+''
+ echo tracing: $builder $realArgs
+ ${pkgs.coreutils}/bin/mkdir -p $out/.trace
+ ${pkgs.strace}/bin/strace -e trace=file,process,dup,dup2,close,pipe -v
-q -f -s 512 ${pkgs.stdenv.shell} -c '(cd $TMPDIR && $builder $realArgs)' >
$out/.trace/log 2>&1
+ ${pkgs.bzip2}/bin/bzip2 $out/.trace/log
+'';
+
+
+ traceSyscalls = stdenv: stdenv //
+{ mkDerivation = args: pkgs.lib.overrideDerivation (stdenv.mkDerivation
args)
+(args2: {
+ realArgs = args2.args;
+ args = [ "-e" traceScript ];
+ enableParallelBuilding = false;
+ # Don't run the patchelf phase in stdenv since I don't want
+ # Nixpkgs-specific stuff polluting our pictures :-)
+ dontPatchELF = true;
+});
+};
+
+
}
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/generic/setup.sh
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/generic/setup.sh Wed Sep
7 15:13:00 2011(r29079)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/generic/setup.sh Wed Sep
7 15:14:17 2011(r29080)
@@ -307,7 +307,7 @@
if test -n "${dirs}"; then
header "stripping (with flags $stripFlags) in $dirs"
-find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip
$stripFlags || true
+find $dirs \( -name '.build' -prune \) -type f -print0 | xargs -0
${xargsFlags:--r} strip $stripFlags || true
stopNest
fi
}
@@ -665,7 +665,7 @@
header "patching script interpreter paths"
local dir="$1"
local f
-for f in $(find "$dir" -type f -perm +0100); do
+for f in $(find "$dir" \( -name '.build' -prune \) -type f -perm +0100); do
local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")
if test -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE";
then
local newPath=$(type -P $(basename $oldPath) || true)
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix Wed Sep
7 15:13:00 2011(r29079)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix Wed Sep
7 15:14:17 2011(r29080)
@@ -7,6 +7,8 @@
# The function defaults are for easy testing.
{system ? "i686-linux", allPackages ? import ../../top-level/all-packages.nix,
platform}:
+with import ../adapters.nix { dietlibc = null; fetchurl = null; runCommand =
null; };
+
rec {
bootstrapFiles =
@@ -143,14 +145,14 @@
# Create the first "real" standard environment. This one consists
# of bootstrap tools only, and a minimal Glibc to keep the GCC
# configure script happy.
- stdenvLinuxBoot1 = stdenvBootFun {
+ stdenvLinuxBoot1 = traceSyscalls (keepBuildTree (stdenvBootFun {
gcc = wrapGCC {
libc = bootstrapGlibc;
binutils = bootstrapTools;
coreutils = bootstrapTools;
};
inherit fetchurl;
- };
+ }));
# 2) These are the packages that we can build with the first
@@ -163,16 +165,17 @@
};
firstBinutils = stdenvLinuxBoot1Pkgs.binutils;
+
# 3) 2nd stdenv that we will use to build only the glibc.
- stdenvLinuxBoot2 = stdenvBootFun {
+ stdenvLinuxBoot2 = traceSyscalls (keepBuildTree (stdenvBootFun {
gcc = wrapGCC {
libc = bootstrapGlibc;
binutils = firstBinutils;
coreutils = bootstrapTools;
};
inherit fetchurl;
- };
+ }));
# 4) These are the packages that we can build with the 2nd
@@ -191,7 +194,7 @@
# 6) Construct a third stdenv identical to the 2nd, except that
#this one uses the Glibc built in step 3. It still uses
#the recent binutils and rest of the bootstrap tools, including GCC.
- stdenvLinuxBoot3 = stdenvBootFun {
+ stdenvLinuxBoot3 = traceSyscalls (keepBuildTree (stdenvBootFun {
gcc = wrapGCC {
binutils = stdenvLinuxBoot1Pkgs.binutils;
coreutils = bo
[Nix-commits] SVN commit: nix - r29079 - nixpkgs/trunk/pkgs/applications/networking/browsers/firefox
Author: eelco
Date: Wed Sep 7 15:13:00 2011
New Revision: 29079
URL: https://svn.nixos.org/websvn/nix/?rev=29079&sc=1
Log:
* Firefox 6.0.2.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix Wed Sep
7 15:11:33 2011(r29078)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix Wed Sep
7 15:13:00 2011(r29079)
@@ -15,14 +15,14 @@
rec {
- firefoxVersion = "6.0.1";
+ firefoxVersion = "6.0.2";
- xulVersion = "6.0.1"; # this attribute is used by other packages
+ xulVersion = "6.0.2"; # this attribute is used by other packages
src = fetchurl {
url =
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";;
-sha256 = "08pklavbb6miaav07a8liw17k8nnh3i97plz8l9pdclan4aczb3i";
+sha1 = "074eb9c1df4de0fe0a4bb9226ca3c2822c334cd6";
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29078 - nixpkgs/branches/syscall-tracing
Author: eelco Date: Wed Sep 7 15:11:33 2011 New Revision: 29078 URL: https://svn.nixos.org/websvn/nix/?rev=29078&sc=1 Log: * Branch for the system call tracing experiment. Added: nixpkgs/branches/syscall-tracing/ (props changed) - copied from r29077, nixpkgs/trunk/ ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29061 - nixos/trunk/modules/system/etc
Author: eelco
Date: Tue Sep 6 12:32:07 2011
New Revision: 29061
URL: https://svn.nixos.org/websvn/nix/?rev=29061&sc=1
Log:
* Handle the case where a symlink in /etc needs to change into a
directory. This happened with /etc/polkit-1, which used to be a
symlink to /etc/static/polkit-1, which was itself a symlink but now
is a directory. Not handling this correctly led to /etc/static
being clobbered with symlinks pointing to themselves.
Modified:
nixos/trunk/modules/system/etc/make-etc.sh
nixos/trunk/modules/system/etc/setup-etc.pl
Modified: nixos/trunk/modules/system/etc/make-etc.sh
==
--- nixos/trunk/modules/system/etc/make-etc.sh Tue Sep 6 12:11:05 2011
(r29060)
+++ nixos/trunk/modules/system/etc/make-etc.sh Tue Sep 6 12:32:07 2011
(r29061)
@@ -20,3 +20,4 @@
echo "${modes_[$i]}" > $out/etc/${targets_[$i]}.mode
fi
done
+
Modified: nixos/trunk/modules/system/etc/setup-etc.pl
==
--- nixos/trunk/modules/system/etc/setup-etc.pl Tue Sep 6 12:11:05 2011
(r29060)
+++ nixos/trunk/modules/system/etc/setup-etc.pl Tue Sep 6 12:32:07 2011
(r29061)
@@ -22,6 +22,30 @@
atomicSymlink $etc, $static or die;
+# Remove dangling symlinks that point to /etc/static. These are
+# configuration files that existed in a previous configuration but not
+# in the current one. For efficiency, don't look under /etc/nixos
+# (where all the NixOS sources live).
+sub cleanup {
+if ($File::Find::name eq "/etc/nixos") {
+$File::Find::prune = 1;
+return;
+}
+if (-l $_) {
+my $target = readlink $_;
+if (substr($target, 0, length $static) eq $static) {
+my $x = "/etc/static/" . substr($File::Find::name, length "/etc/");
+unless (-l $x) {
+print STDERR "removing obsolete symlink
‘$File::Find::name’...\n";
+unlink "$_";
+}
+}
+}
+}
+
+find(\&cleanup, "/etc");
+
+
# For every file in the etc tree, create a corresponding symlink in
# /etc to /etc/static. The indirection through /etc/static is to make
# switching to a new configuration somewhat more atomic.
@@ -42,24 +66,3 @@
}
find(\&link, $etc);
-
-
-# Remove dangling symlinks that point to /etc/static. These are
-# configuration files that existed in a previous configuration but not
-# in the current one. For efficiency, don't look under /etc/nixos
-# (where all the NixOS sources live).
-sub cleanup {
-if ($File::Find::name eq "/etc/nixos") {
-$File::Find::prune = 1;
-return;
-}
-if (-l $_) {
-my $target = readlink $_;
-if (substr($target, 0, length $static) eq $static) {
-my $x = "/etc/static/" . substr($File::Find::name, length "/etc/");
-unlink "$_" unless -e "$x";
-}
-}
-}
-
-find(\&cleanup, "/etc");
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29059 - in nix/trunk: doc/manual src/libmain src/nix-store
Author: eelco Date: Tue Sep 6 12:06:30 2011 New Revision: 29059 URL: https://svn.nixos.org/websvn/nix/?rev=29059&sc=1 Log: * Added a command ‘nix-store --verify-paths PATHS’ to check whether the contents of any of the given store paths have been modified. E.g. $ nix-store --verify-path $(nix-store -qR /var/run/current-system) path `/nix/store/m2smyiwbxidlprfxfz4rjlvz2c3mg58y-etc' was modified! expected hash `fc87e271c5fdf179b47939b08ad13440493805584b35e3014109d04d8436e7b8', got `20f1a47281b3c0cbe299ce47ad5ca7340b20ab34246426915fce0ee9116483aa' All paths are checked; the exit code is 1 if any path has been modified, 0 otherwise. Modified: nix/trunk/doc/manual/release-notes.xml nix/trunk/src/libmain/shared.cc nix/trunk/src/libmain/shared.hh nix/trunk/src/nix-store/help.txt nix/trunk/src/nix-store/nix-store.cc Modified: nix/trunk/doc/manual/release-notes.xml == --- nix/trunk/doc/manual/release-notes.xml Tue Sep 6 12:00:11 2011 (r29058) +++ nix/trunk/doc/manual/release-notes.xml Tue Sep 6 12:06:30 2011 (r29059) @@ -40,6 +40,10 @@ TODO: Nix expression search path (import). + +TODO: nix-store --verify-path command. + + Modified: nix/trunk/src/libmain/shared.cc == --- nix/trunk/src/libmain/shared.cc Tue Sep 6 12:00:11 2011(r29058) +++ nix/trunk/src/libmain/shared.cc Tue Sep 6 12:06:30 2011(r29059) @@ -187,12 +187,11 @@ ignore options for the ATerm library. */ for (Strings::iterator i = args.begin(); i != args.end(); ++i) { string arg = *i; -if (string(arg, 0, 4) == "-at-") ; -else if (arg.length() > 2 && arg[0] == '-' && arg[1] != '-' && !isdigit(arg[1])) { +if (arg.length() > 2 && arg[0] == '-' && arg[1] != '-' && !isdigit(arg[1])) { for (unsigned int j = 1; j < arg.length(); j++) if (isalpha(arg[j])) remaining.push_back((string) "-" + arg[j]); -else { +else { remaining.push_back(string(arg, j)); break; } @@ -332,6 +331,9 @@ } +int exitCode = 0; + + } @@ -390,7 +392,5 @@ return 1; } -return 0; +return exitCode; } - - Modified: nix/trunk/src/libmain/shared.hh == --- nix/trunk/src/libmain/shared.hh Tue Sep 6 12:00:11 2011(r29058) +++ nix/trunk/src/libmain/shared.hh Tue Sep 6 12:06:30 2011(r29059) @@ -53,6 +53,9 @@ ~RemoveTempRoots(); }; +/* Exit code of the program. */ +extern int exitCode; + } Modified: nix/trunk/src/nix-store/help.txt == --- nix/trunk/src/nix-store/help.txtTue Sep 6 12:00:11 2011(r29058) +++ nix/trunk/src/nix-store/help.txtTue Sep 6 12:06:30 2011(r29059) @@ -25,6 +25,7 @@ valid --verify: verify Nix structures + --verify-path: verify whether the given store paths haven't been modified --optimise: optimise the Nix store by hard-linking identical files --query-failed-paths: list paths that failed to build (if enabled) Modified: nix/trunk/src/nix-store/nix-store.cc == --- nix/trunk/src/nix-store/nix-store.ccTue Sep 6 12:00:11 2011 (r29058) +++ nix/trunk/src/nix-store/nix-store.ccTue Sep 6 12:06:30 2011 (r29059) @@ -466,11 +466,12 @@ i != opArgs.end(); ++i) { Path path = followLinksToStorePath(*i); -if (!store->isValidPath(path)) +if (!store->isValidPath(path)) { if (printInvalid) cout << format("%1%\n") % path; else throw Error(format("path `%1%' is not valid") % path); +} } } @@ -648,6 +649,27 @@ } +/* Verify whether the contents of the given store path have not changed. */ +static void opVerifyPath(Strings opFlags, Strings opArgs) +{ +if (!opFlags.empty()) +throw UsageError("no flags expected"); + +foreach (Strings::iterator, i, opArgs) { +Path path = followLinksToStorePath(*i); +printMsg(lvlTalkative, format("checking path `%1%'...") % path); +ValidPathInfo info = store->queryPathInfo(path); +HashResult current = hashPath(info.hash.type, path); +if (current.first != info.hash) { +printMsg(lvlError, +format("path `%1%' was modified! expected hash `%2%', got `%3%'") +% path % printHash(info.hash) % printHash(current.first)); +exitCode = 1; +} +} +} + + static void showOptimiseStats(OptimiseStats & sta
[Nix-commits] SVN commit: nix - r29058 - nix/trunk
Author: eelco Date: Tue Sep 6 12:00:11 2011 New Revision: 29058 URL: https://svn.nixos.org/websvn/nix/?rev=29058&sc=1 Log: * Add some -f flags, never hurts. Modified: nix/trunk/bootstrap.sh Modified: nix/trunk/bootstrap.sh == --- nix/trunk/bootstrap.sh Tue Sep 6 11:18:36 2011(r29057) +++ nix/trunk/bootstrap.sh Tue Sep 6 12:00:11 2011(r29058) @@ -1,8 +1,8 @@ #! /bin/sh -e rm -f aclocal.m4 mkdir -p config -libtoolize --copy +libtoolize --copy -f aclocal -autoheader -automake --add-missing --copy -autoconf +autoheader -f +automake --add-missing --copy -f +autoconf -f ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29057 - nixos/trunk/modules/services/hardware
Author: eelco Date: Tue Sep 6 11:18:36 2011 New Revision: 29057 URL: https://svn.nixos.org/websvn/nix/?rev=29057&sc=1 Log: * Create /var/lib/upower, where upowerd keeps historical battery data. Modified: nixos/trunk/modules/services/hardware/upower.nix Modified: nixos/trunk/modules/services/hardware/upower.nix == --- nixos/trunk/modules/services/hardware/upower.nixTue Sep 6 09:50:20 2011(r29056) +++ nixos/trunk/modules/services/hardware/upower.nixTue Sep 6 11:18:36 2011(r29057) @@ -35,6 +35,11 @@ services.udev.packages = [ pkgs.upower ]; +system.activationScripts.upower = + '' +mkdir -m 0755 -p /var/lib/upower + ''; + }; } ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29056 - nixpkgs/trunk/pkgs/os-specific/linux/upower
Author: eelco
Date: Tue Sep 6 09:50:20 2011
New Revision: 29056
URL: https://svn.nixos.org/websvn/nix/?rev=29056&sc=1
Log:
* upower updated to 0.9.13.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/upower/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/upower/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/upower/default.nix Tue Sep 6
05:37:59 2011(r29055)
+++ nixpkgs/trunk/pkgs/os-specific/linux/upower/default.nix Tue Sep 6
09:50:20 2011(r29056)
@@ -4,11 +4,11 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
- name = "upower-0.9.12";
+ name = "upower-0.9.13";
src = fetchurl {
url = "http://upower.freedesktop.org/releases/${name}.tar.xz";;
-sha256 = "1c2b2f74vxx1y7vkwbrx5z4j5pdgvsw00l6cldvy7a4k7hrbprq6";
+sha256 = "08jasjkp44ydvsnk020xghrshi0jspp5078id26n5nhidp1d4z9c";
};
buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29054 - in nixpkgs/trunk/pkgs/desktops/xfce-4.8: . support
Author: eelco
Date: Tue Sep 6 01:00:23 2011
New Revision: 29054
URL: https://svn.nixos.org/websvn/nix/?rev=29054&sc=1
Log:
* Add libgdu as a dependency to gvfs to enable mounting of volumes
(through udisks) in Xfce. Libgdu is part of gnome-disk-utility,
which would pull in lots of Gnome dependencies, so some hackery is
necessary to build only the useful part.
Added:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/libgdu-only.patch
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/libgdu.nix
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nixMon Sep 5 23:33:29
2011(r29053)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nixTue Sep 6 01:00:23
2011(r29054)
@@ -5,7 +5,7 @@
SUPPORT
- #gnome_disk_utility = callPackage ./support/gnome-disk-utility.nix { };
+ libgdu = callPackage ./support/libgdu.nix { };
# Gvfs is required by Thunar for the trash feature and for volume
# mounting. Should use the one from Gnome, but I don't want to mess
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Mon Sep 5
23:33:29 2011(r29053)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Tue Sep 6
01:00:23 2011(r29054)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev }:
+{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu }:
stdenv.mkDerivation rec {
name = "gvfs-1.8.2";
@@ -8,7 +8,7 @@
sha256 =
"0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345";
};
- buildInputs = [ pkgconfig glib dbus.libs intltool udev ];
+ buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu ];
meta = {
description = "Virtual Filesystem support library (for Xfce)";
Added: nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/libgdu-only.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/libgdu-only.patch Tue Sep
6 01:00:23 2011(r29054)
@@ -0,0 +1,144 @@
+diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/configure.ac
gnome-disk-utility-2.30.1/configure.ac
+--- gnome-disk-utility-2.30.1-orig/configure.ac2010-03-22
16:54:09.0 +0100
gnome-disk-utility-2.30.1/configure.ac 2011-09-06 02:52:09.0
+0200
+@@ -106,17 +106,6 @@
+ # GNOME
+ # *
+
+-GNOME_COMMON_INIT
+-GNOME_DOC_INIT
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+-AC_ARG_ENABLE(gtk-doc, AS_HELP_STRING([--enable-gtk-doc],
+- [use gtk-doc to build documentation [default=yes]]),,
+- enable_gtk_doc=yes)
+-GTK_DOC_CHECK([1.3])
+-
+ # ***
+ # Check for required packages
+ # ***
+@@ -130,7 +119,6 @@
+ UNIQUE_REQUIRED=1.0
+ LIBNOTIFY_REQUIRED=0.3.0
+ NAUTILUS_REQUIRED=2.24.0
+-AVAHI_UI_REQUIRED=0.6.25
+
+ UDISKS_REQUIRED=1.0.0
+ UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0
+@@ -144,13 +132,7 @@
+ PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED])
+ PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED])
+ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
+-PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= $GTK2_REQUIRED])
+-PKG_CHECK_MODULES(UNIQUE, [unique-1.0 >= $UNIQUE_REQUIRED])
+-PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED])
+ PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks <
$UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION])
+-PKG_CHECK_MODULES(X11, [x11])
+-PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
+-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED])
+
+ # *
+ # Remote Access
+@@ -183,21 +165,10 @@
+ AC_SUBST(GNOME_KEYRING_CFLAGS)
+ AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"])
+
+-# *
+-# Documentation
+-# *
+-
+-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
+-if test x$SCROLLKEEPER_CONFIG = xno; then
+- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the
scrollkeeper package)
+-fi
+-
+ #
+ # Internationalization
+ #
+
+-IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED])
+-
+ GETTEXT_PACKAGE=gnome-disk-utility
+ AC_SUBST([GETTEXT_PACKAGE])
+ AM_GLIB_GNU_GETTEXT
+diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/doc/Makefile.am
gnome-disk-utility-2.30.1/doc/Makefile.am
+--- gnome-disk-utility-2.30.1-orig/doc/Makefile.am 2009-12-02
20:52:38.0 +0100
gnome-disk-utility-2.30.1/doc/Makefile.am 2011-09-06 02:17:15.0
[Nix-commits] SVN commit: nix - r29053 - nixos/trunk/modules/services/misc
Author: eelco
Date: Mon Sep 5 23:33:29 2011
New Revision: 29053
URL: https://svn.nixos.org/websvn/nix/?rev=29053&sc=1
Log:
Modified:
nixos/trunk/modules/services/misc/autofs.nix
Modified: nixos/trunk/modules/services/misc/autofs.nix
==
--- nixos/trunk/modules/services/misc/autofs.nixMon Sep 5 23:31:04
2011(r29052)
+++ nixos/trunk/modules/services/misc/autofs.nixMon Sep 5 23:33:29
2011(r29053)
@@ -29,7 +29,7 @@
};
autoMaster = mkOption {
-example = ''
+example = literalExample ''
autoMaster = let
mapConf = pkgs.writeText "auto" '''
kernel-ro,soft,intr ftp.kernel.org:/pub/linux
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29052 - nixpkgs/trunk/pkgs/desktops/xfce-4.8/support
Author: eelco Date: Mon Sep 5 23:31:04 2011 New Revision: 29052 URL: https://svn.nixos.org/websvn/nix/?rev=29052&sc=1 Log: * Urgh. Should test first. Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix == --- nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Mon Sep 5 23:30:42 2011(r29051) +++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Mon Sep 5 23:31:04 2011(r29052) @@ -14,5 +14,5 @@ description = "Virtual Filesystem support library (for Xfce)"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; - } + }; } ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29051 - nixpkgs/trunk/pkgs/desktops/xfce-4.8/support
Author: eelco
Date: Mon Sep 5 23:30:42 2011
New Revision: 29051
URL: https://svn.nixos.org/websvn/nix/?rev=29051&sc=1
Log:
* Oops.
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Mon Sep 5
23:30:26 2011(r29050)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Mon Sep 5
23:30:42 2011(r29051)
@@ -11,7 +11,7 @@
buildInputs = [ pkgconfig glib dbus.libs intltool udev ];
meta = {
-description = "Virtual Filesystem support library (for Xfce)"
+description = "Virtual Filesystem support library (for Xfce)";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29050 - in nixpkgs/trunk/pkgs/desktops/xfce-4.8: applications art core support
Author: eelco
Date: Mon Sep 5 23:30:26 2011
New Revision: 29050
URL: https://svn.nixos.org/websvn/nix/?rev=29050&sc=1
Log:
* Add Xfce 4.8 to the channel.
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/mousepad.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar-volman.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfwm4.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/mousepad.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/mousepad.nix Mon Sep
5 23:26:06 2011(r29049)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/mousepad.nix Mon Sep
5 23:30:26 2011(r29050)
@@ -14,5 +14,7 @@
homepage = http://www.xfce.org/projects/mousepad/;
description = "A simple text editor for Xfce";
license = "GPLv2+";
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix Mon Sep
5 23:26:06 2011(r29049)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix Mon Sep
5 23:30:26 2011(r29050)
@@ -20,5 +20,7 @@
homepage = http://goodies.xfce.org/projects/applications/ristretto;
description = "A fast and lightweight picture-viewer for the Xfce desktop
environment";
license = "GPLv2+";
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix Mon Sep
5 23:26:06 2011(r29049)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix Mon Sep
5 23:30:26 2011(r29050)
@@ -19,5 +19,7 @@
homepage = http://www.xfce.org/projects/terminal;
description = "A modern terminal emulator primarily for the Xfce desktop
environment";
license = "GPLv2+";
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix Mon Sep
5 23:26:06 2011(r29049)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix Mon Sep
5 23:30:26 2011(r29050)
@@ -34,5 +34,7 @@
homepage = http://www.xfce.org/projects/xfce4-mixer;
description = "A volume control application for the Xfce desktop
environment";
license = "GPLv2+";
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
Mon Sep 5 23:26:06 2011(r29049)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
Mon Sep 5 23:30:26 2011(r29050)
@@ -18,5 +18,7 @@
homepage =
http://goodies.xfce.org/projects/applications/xfce4-power-manager;
description = "A power manager for the Xfce Desktop Environment";
license = "GPLv2+";
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix Mon Sep
5 23:26:06 2011(r29049)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix Mon Sep
5 23:30:26 2011(r29050)
@@ -13,5 +13,7 @@
meta = {
[Nix-commits] SVN commit: nix - r29049 - nixpkgs/trunk/pkgs/development/libraries/strigi
Author: eelco Date: Mon Sep 5 23:26:06 2011 New Revision: 29049 URL: https://svn.nixos.org/websvn/nix/?rev=29049&sc=1 Log: * Layout. Modified: nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix Modified: nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix == --- nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix Mon Sep 5 21:02:21 2011(r29048) +++ nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix Mon Sep 5 23:26:06 2011(r29049) @@ -11,7 +11,7 @@ sha256 = "16qqnlh0dy3r92shzm2q36h5qi3m06pihr4h5cq944hpvqz5w7qi"; }; - includeAllQtDirs=true; + includeAllQtDirs = true; CLUCENE_HOME = clucene_core; ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29048 - in nixpkgs/trunk/pkgs: desktops/kde-4.7 desktops/kde-4.7/kdebase desktops/kde-4.7/support/soprano servers/sql/virtuoso
Author: eelco
Date: Mon Sep 5 21:02:21 2011
New Revision: 29048
URL: https://svn.nixos.org/websvn/nix/?rev=29048&sc=1
Log:
* Style fixes.
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepim.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepimlibs.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix
nixpkgs/trunk/pkgs/servers/sql/virtuoso/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix Mon Sep 5
20:54:53 2011(r29047)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix Mon Sep 5
21:02:21 2011(r29048)
@@ -1,5 +1,5 @@
-{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica,
- libcanberra, virtuoso, makeWrapper, samba
+{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
+, libcanberra, virtuoso, makeWrapper, samba
}:
# TODO: Re-enable ntrack once it is fixed upstream
@@ -10,12 +10,6 @@
makeWrapper samba (libcanberra.override { gtk = null; })
];
-# Copied from kde45, Nepomuk needs it.
- postInstall = ''
-wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH :
"${virtuoso}/lib" \
---prefix PATH : "${virtuoso}/bin"
- '';
-
meta = {
license = "LGPL";
};
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepim.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepim.nix Mon Sep 5 20:54:53
2011(r29047)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepim.nix Mon Sep 5 21:02:21
2011(r29048)
@@ -3,8 +3,10 @@
kde {
- buildInputs = [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
-libxslt cyrus_sasl gpgme libassuan grantlee ];
+ buildInputs =
+[ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
+ libxslt cyrus_sasl gpgme libassuan grantlee
+];
passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepimlibs.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepimlibs.nix Mon Sep 5 20:54:53
2011(r29047)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepimlibs.nix Mon Sep 5 21:02:21
2011(r29048)
@@ -2,8 +2,10 @@
, kdelibs, akonadi, shared_desktop_ontologies, libxml2, libxslt, prison }:
kde {
- buildInputs = [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
-openldap cyrus_sasl akonadi prison ];
+ buildInputs =
+[ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
+ openldap cyrus_sasl akonadi prison
+];
propagatedBuildInputs = [ kdelibs ];
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix Mon Sep
5 20:54:53 2011(r29047)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix Mon Sep
5 21:02:21 2011(r29048)
@@ -8,11 +8,13 @@
sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z";
};
- patches = [ (fetchurl {
-url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
-name = "soprano-virtuoso-restart.patch";
-sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
- })];
+ patches =
+[ (fetchurl {
+url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
+name = "soprano-virtuoso-restart.patch";
+sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
+ })
+];
# We disable the Java backend, since we do not need them and they make the
closure size much bigger
buildInputs = [ cmake qt4 clucene_core librdf_redland libiodbc ];
Modified: nixpkgs/trunk/pkgs/servers/sql/virtuoso/default.nix
==
--- nixpkgs/trunk/pkgs/servers/sql/virtuoso/default.nix Mon Sep 5 20:54:53
2011(r29047)
+++ nixpkgs/trunk/pkgs/servers/sql/virtuoso/default.nix Mon Sep 5 21:02:21
2011(r29048)
@@ -4,15 +4,15 @@
name = "virtuoso-opensource-6.1.3";
src = fetchurl {
-url = "mirror://sf/virtuoso/${name}.tar.gz";
+url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
sha256 = "0rj629qjsibpllazngbhzhsh90x6nidpn292qz1xdvirwvb2h3s2";
};
buildInputs = [ libxml2 openssl readline gawk ];
- CPP="${stdenv.gcc}/bin/gcc -E";
+ CPP = "${stdenv.gcc}/bin/gcc -E";
- configureFlags="
+ configureFlags = "
--enable-shared --disable-all-vads --with-readline=${readline}
--disable-hslookup --disable-wbxml2 --without-iodbc
--enable-openssl=${openssl}
__
Re: [Nix-dev] Current stdenv is Broken in Absence of Substitutors
Hi, On 09/05/2011 09:27 PM, Shea Levy wrote: Due to a license issue, the GNU mirrors no longer contain binutils-2.21.tar.bz2 (http://sourceware.org/ml/binutils/2011-08/msg00198.html). Therefore, building stdenv fails in a non-standard nix store location or if substitutors are not used. I can think of two ways to fix this: Upload the tarball somewhere and update the expression in trunk Done. -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29047 - nixpkgs/trunk/pkgs/development/tools/misc/binutils
Author: eelco
Date: Mon Sep 5 20:54:53 2011
New Revision: 29047
URL: https://svn.nixos.org/websvn/nix/?rev=29047&sc=1
Log:
* Fix the binutils URL.
Modified:
nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix Mon Sep
5 20:50:15 2011(r29046)
+++ nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix Mon Sep
5 20:54:53 2011(r29047)
@@ -7,7 +7,7 @@
name = basename + stdenv.lib.optionalString (cross != null)
"-${cross.config}";
src = fetchurl {
-url = "mirror://gnu/binutils/${basename}.tar.bz2";
+url = "http://nixos.org/tarballs/${basename}.tar.bz2";;
sha256 = "1iyhc42zfa0j2gaxy4zvpk47sdqj4rqvib0mb8597ss8yidyrav0";
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29046 - nixos/trunk/modules/services/x11/desktop-managers
Author: eelco
Date: Mon Sep 5 20:50:15 2011
New Revision: 29046
URL: https://svn.nixos.org/websvn/nix/?rev=29046&sc=1
Log:
* Xfce 4.6 fix.
Modified:
nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
Modified: nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
==
--- nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Sep 5
20:49:41 2011(r29045)
+++ nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Sep 5
20:50:15 2011(r29046)
@@ -82,7 +82,7 @@
environment.pathsToLink =
[ "/share/xfce4" "/share/themes" "/share/mime"
"/share/desktop-directories" ];
-environment.shellInit =
+environment.shellInit = optionalString isXfce48
''
export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules
'';
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29044 - nixos/trunk/modules/services/x11/desktop-managers
Author: eelco
Date: Mon Sep 5 20:37:06 2011
New Revision: 29044
URL: https://svn.nixos.org/websvn/nix/?rev=29044&sc=1
Log:
* Enable gvfs in Xfce.
Modified:
nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
Modified: nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
==
--- nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Sep 5
20:36:37 2011(r29043)
+++ nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Sep 5
20:37:06 2011(r29044)
@@ -74,11 +74,18 @@
++ optionals isXfce48 [
pkgs.xfce.libxfce4ui
pkgs.xfce.garcon
+pkgs.xfce.thunar_volman
+pkgs.xfce.gvfs
]
++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
environment.pathsToLink =
[ "/share/xfce4" "/share/themes" "/share/mime"
"/share/desktop-directories" ];
+
+environment.shellInit =
+ ''
+export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules
+ '';
# Enable helpful DBus services.
services.hal = mkIf (!isXfce48) { enable = true; };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29043 - in nixpkgs/trunk/pkgs/desktops/xfce-4.8: . core support
Author: eelco
Date: Mon Sep 5 20:36:37 2011
New Revision: 29043
URL: https://svn.nixos.org/websvn/nix/?rev=29043&sc=1
Log:
* Add thunar-volman and gvfs.
Added:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar-volman.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nix
Added: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar-volman.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar-volman.nix Mon Sep 5
20:36:37 2011(r29043)
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
+, xfconf, udev, libnotify }:
+
+stdenv.mkDerivation rec {
+ name = "thunar-volman-0.6.0";
+
+ src = fetchurl {
+url = "http://archive.xfce.org/src/xfce/thunar-volman/0.6/${name}.tar.bz2";;
+sha1 = "dcda936948623b342b290a78c294f71c038e832e";
+ };
+
+ buildInputs =
+[ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util
+ xfconf libnotify
+];
+
+ enableParallelBuilding = true;
+
+ meta = {
+homepage = http://thunar.xfce.org/;
+description = "Thunar extension for automatic management of removable
drives and media";
+license = "GPLv2+";
+ };
+}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nixMon Sep 5 19:45:49
2011(r29042)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nixMon Sep 5 20:36:37
2011(r29043)
@@ -3,6 +3,16 @@
rec {
inherit (pkgs.gtkLibs) gtk glib;
+ SUPPORT
+
+ #gnome_disk_utility = callPackage ./support/gnome-disk-utility.nix { };
+
+ # Gvfs is required by Thunar for the trash feature and for volume
+ # mounting. Should use the one from Gnome, but I don't want to mess
+ # with the Gnome packages (or pull in a zillion Gnome dependencies).
+ gvfs = callPackage ./support/gvfs.nix { };
+
+
CORE
libxfce4util = callPackage ./core/libxfce4util.nix { };
@@ -43,10 +53,13 @@
thunar = callPackage ./core/thunar.nix { };
+ thunar_volman = callPackage ./core/thunar-volman.nix { };
+
gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
# !!! Add xfce4-appfinder
+
APPLICATIONS
terminal = callPackage ./applications/terminal.nix {
@@ -61,6 +74,7 @@
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
+
ART
xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
Added: nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Mon Sep 5
20:36:37 2011(r29043)
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev }:
+
+stdenv.mkDerivation rec {
+ name = "gvfs-1.8.2";
+
+ src = fetchurl {
+url = "mirror://gnome/sources/gvfs/1.8/${name}.tar.bz2";
+sha256 =
"0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345";
+ };
+
+ buildInputs = [ pkgconfig glib dbus.libs intltool udev ];
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29035 - nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package
Author: eelco
Date: Mon Sep 5 19:23:06 2011
New Revision: 29035
URL: https://svn.nixos.org/websvn/nix/?rev=29035&sc=1
Log:
* Turn parallel building support on again (got lost somewhere...).
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix Mon Sep 5
18:25:59 2011(r29034)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix Mon Sep 5
19:23:06 2011(r29035)
@@ -27,10 +27,11 @@
# released as individual tarballs
kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
stdenv.mkDerivation ({
-name = "${name}-${release}";
-src = kdesrc name;
-meta = defMeta // meta;
- } // (removeAttrs a [ "meta" "name" ]));
+ name = "${name}-${release}";
+ src = kdesrc name;
+ meta = defMeta // meta;
+ enableParallelBuilding = true;
+} // (removeAttrs a [ "meta" "name" ]));
# kdeMonoPkg wrapper for modules splitted upstream. Used in TODO
kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
@@ -43,9 +44,13 @@
stdenv.mkDerivation ({
name = "${name}-${release}";
src = kdesrc module;
- cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
- "-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags;
+ cmakeFlags =
+[ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
+ "-DBUILD_doc=TRUE"
+ "-DBUILD_${subdir}=TRUE"
+] ++ cmakeFlags;
meta = defMeta // meta;
+ enableParallelBuilding = true;
} // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
# A KDE monolithic module
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29033 - in nixos/trunk/modules: programs/bash services/x11/desktop-managers
Author: eelco
Date: Mon Sep 5 17:55:53 2011
New Revision: 29033
URL: https://svn.nixos.org/websvn/nix/?rev=29033&sc=1
Log:
* Get the Virtuoso backend in Soprano/Nepomuk to work. Soprano tries
to find virtodbc_r.so in QT_PLUGIN_PATH (among other locations), so
make sure that Virtuoso can be found there.
Modified:
nixos/trunk/modules/programs/bash/bashrc.sh
nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
Modified: nixos/trunk/modules/programs/bash/bashrc.sh
==
--- nixos/trunk/modules/programs/bash/bashrc.sh Mon Sep 5 17:29:45 2011
(r29032)
+++ nixos/trunk/modules/programs/bash/bashrc.sh Mon Sep 5 17:55:53 2011
(r29033)
@@ -45,7 +45,7 @@
# KDE/Gnome stuff.
export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
export
STRIGI_PLUGIN_PATH=$i/lib/strigi/${STRIGI_PLUGIN_PATH:+:}$STRIGI_PLUGIN_PATH
-export
QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
+export
QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}:$i/lib:$QT_PLUGIN_PATH
export
QTWEBKIT_PLUGIN_PATH=$i/lib/mozilla/plugins/${QTWEBKIT_PLUGIN_PATH:+:}$QTWEBKIT_PLUGIN_PATH
export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
Modified: nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
==
--- nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Mon Sep 5
17:29:45 2011(r29032)
+++ nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Mon Sep 5
17:55:53 2011(r29033)
@@ -109,6 +109,7 @@
pkgs.kde4.kdebase # contains kde-workspace etc.
pkgs.kde4.kde_wallpapers # contains kdm's default background
pkgs.kde4.oxygen_icons
+ pkgs.virtuoso # to enable Nepomuk to find Virtuoso
# Starts KDE's Polkit authentication agent.
pkgs.kde4.polkit_kde_agent
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] CFQ I/O scheduler can't boot my system
Hi, On 09/03/2011 02:41 PM, Peter Simons wrote: this commit * Use the CFQ I/O scheduler, rather than the ‘none’ scheduler. This was already the case on Linux 2.6.32, but in newer kernels the CFQ scheduler is built as a module, so all block devices got the ‘none’ scheduler instead. breaks my boot process. The linuxPackages_2_6_38_ati kernel hangs after probing the ata devices. I've reverted to an older version for now, but maybe I'm not the only one who's going to have that problem? This should be fixed now (r29027, tested with Linux 2.6.35). -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29027 - nixos/trunk/modules/system/boot
Author: eelco Date: Mon Sep 5 14:58:26 2011 New Revision: 29027 URL: https://svn.nixos.org/websvn/nix/?rev=29027&sc=1 Log: * Force loading of the CFQ module, i.e. don't do it on demand — that seems to cause weird modprobe hangs. Modified: nixos/trunk/modules/system/boot/kernel.nix Modified: nixos/trunk/modules/system/boot/kernel.nix == --- nixos/trunk/modules/system/boot/kernel.nix Mon Sep 5 13:29:33 2011 (r29026) +++ nixos/trunk/modules/system/boot/kernel.nix Mon Sep 5 14:58:26 2011 (r29027) @@ -165,9 +165,6 @@ # Unix domain sockets (needed by udev). "unix" -# Provide the CFQ scheduler in the initrd. -"cfq_iosched" - # Misc. stuff. "pcips2" "serio" "atkbd" "xtkbd" ]; @@ -177,7 +174,10 @@ "dm_mod" # For usual AT keyboards. -"i8042" +"i8042" + +# Provide the CFQ scheduler in the initrd. +"cfq_iosched" ]; # The Linux kernel >= 2.6.27 provides firmware. ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29025 - in nixos/trunk: doc/manual modules/misc
Author: eelco
Date: Mon Sep 5 10:14:42 2011
New Revision: 29025
URL: https://svn.nixos.org/websvn/nix/?rev=29025&sc=1
Log:
* Allow literal examples to be included in the manual.
Modified:
nixos/trunk/doc/manual/options-to-docbook.xsl
nixos/trunk/modules/misc/nixpkgs.nix
Modified: nixos/trunk/doc/manual/options-to-docbook.xsl
==
--- nixos/trunk/doc/manual/options-to-docbook.xsl Mon Sep 5 10:14:24
2011(r29024)
+++ nixos/trunk/doc/manual/options-to-docbook.xsl Mon Sep 5 10:14:42
2011(r29025)
@@ -52,12 +52,20 @@
+
Example:
-
-
-
+
+
+
+
+
+
+
+
+
+
Modified: nixos/trunk/modules/misc/nixpkgs.nix
==
--- nixos/trunk/modules/misc/nixpkgs.nixMon Sep 5 10:14:24 2011
(r29024)
+++ nixos/trunk/modules/misc/nixpkgs.nixMon Sep 5 10:14:42 2011
(r29025)
@@ -30,9 +30,9 @@
{
options = {
-nixpkgs.config = pkgs.lib.mkOption {
+nixpkgs.config = mkOption {
default = {};
- example =
+ example = literalExample
''
{ firefox.enableGeckoMediaPlayer = true;
packageOverrides = pkgs: {
@@ -54,7 +54,7 @@
'';
};
-nixpkgs.system = pkgs.lib.mkOption {
+nixpkgs.system = mkOption {
default = "";
description = ''
Specifies the Nix platform type for which NixOS should be built.
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29024 - nixpkgs/trunk/pkgs/lib
Author: eelco
Date: Mon Sep 5 10:14:24 2011
New Revision: 29024
URL: https://svn.nixos.org/websvn/nix/?rev=29024&sc=1
Log:
* Allow literal examples to be included in the manual.
Modified:
nixpkgs/trunk/pkgs/lib/options.nix
Modified: nixpkgs/trunk/pkgs/lib/options.nix
==
--- nixpkgs/trunk/pkgs/lib/options.nix Mon Sep 5 09:52:34 2011(r29023)
+++ nixpkgs/trunk/pkgs/lib/options.nix Mon Sep 5 10:14:24 2011(r29024)
@@ -287,5 +287,12 @@
else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x
["_args"])
else x;
-
+
+ /* For use in the ‘example’ option attribute. It causes the given
+ text to be included verbatim in documentation. This is necessary
+ for example values that are not simple values, e.g.,
+ functions. */
+ literalExample = text: { _type = "literalExample"; inherit text; };
+
+
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29022 - nixos/trunk/modules/misc
Author: eelco
Date: Mon Sep 5 09:46:14 2011
New Revision: 29022
URL: https://svn.nixos.org/websvn/nix/?rev=29022&sc=1
Log:
* Fix description.
Modified:
nixos/trunk/modules/misc/nixpkgs.nix
Modified: nixos/trunk/modules/misc/nixpkgs.nix
==
--- nixos/trunk/modules/misc/nixpkgs.nixMon Sep 5 09:19:59 2011
(r29021)
+++ nixos/trunk/modules/misc/nixpkgs.nixMon Sep 5 09:46:14 2011
(r29022)
@@ -32,20 +32,25 @@
nixpkgs.config = pkgs.lib.mkOption {
default = {};
- example = {
-firefox.enableGeckoMediaPlayer = true;
- };
+ example =
+''
+ { firefox.enableGeckoMediaPlayer = true;
+packageOverrides = pkgs: {
+ firefox60Pkgs = pkgs.firefox60Pkgs.override {
+enableOfficialBranding = true;
+ };
+};
+ }
+'';
type = configType;
description = ''
-The configuration of the Nix Packages collection. This expression
-defines default value of attributes and allow packages to be
-overriden globally via the `packageOverrides'.
-
-the `packageOverrides' configuration option must be a set of new or
-overriden packages. Any occurence of `pkgs' inside this attribute
-set refers to the *original* (un-overriden) set of packages,
-allowing packageOverrides attributes to refer to the original
-attributes (e.g. "packageOverrides.foo = ... pkgs.foo ...").
+The configuration of the Nix Packages collection. (For
+details, see the Nixpkgs documentation.) It allows you to set
+package configuration options, and to override packages
+globally through the packageOverrides
+option. The latter is a function that takes as an argument
+the original Nixpkgs, and must evaluate
+to a set of new or overriden packages.
'';
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29021 - nixos/trunk/modules/misc
Hi, On 09/05/2011 11:19 AM, Nicolas Pierron wrote: + optCall = f: x: +if builtins.isFunction f +then f x +else f; Attributes that can be both functions or not are a bad habit that we shouldn't propagate further :-) It also makes behaviour of nixpkgs.config inconsistent with the semantics of the ~/.nixpkgs/config.nix. Is there a good reason for this? -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29007 - cloud/trunk/src
Author: eelco
Date: Sun Sep 4 18:04:47 2011
New Revision: 29007
URL: https://svn.nixos.org/websvn/nix/?rev=29007&sc=1
Log:
* In /etc/hosts, use the internal IPv4 address if available. This is
necessary in EC2 deployments (where the external address might be
blocked by firewall rules).
Modified:
cloud/trunk/src/nixos-deploy-network.pl
Modified: cloud/trunk/src/nixos-deploy-network.pl
==
--- cloud/trunk/src/nixos-deploy-network.pl Sun Sep 4 18:03:24 2011
(r29006)
+++ cloud/trunk/src/nixos-deploy-network.pl Sun Sep 4 18:04:47 2011
(r29007)
@@ -191,7 +191,7 @@
sub evalMachineInfo {
my $machineInfoXML =
-`nix-instantiate --eval-only --xml --strict --show-trace
$myDir/eval-machine-info.nix --arg networkExprs '[ @networkExprs ]' -A
machineInfo`;
+`nix-instantiate --eval-only --show-trace --xml --strict --show-trace
$myDir/eval-machine-info.nix --arg networkExprs '[ @networkExprs ]' -A
machineInfo`;
die "evaluation of @networkExprs failed" unless $? == 0;
#print $machineInfoXML, "\n";
@@ -473,7 +473,11 @@
foreach my $name (keys %{$spec->{machines}}) {
my $machine = $state->{machines}->{$name};
$hosts .= "$machine->{ipv6} $name\\n" if $machine->{ipv6};
-$hosts .= "$machine->{ipv4} $name\\n" if $machine->{ipv4};
+if (defined $machine->{privateIpv4}) {
+$hosts .= "$machine->{privateIpv4} $name\\n";
+} else {
+$hosts .= "$machine->{ipv4} $name\\n" if $machine->{ipv4};
+}
}
open STATE, ">physical.nix" or die;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29006 - cloud/trunk/examples
Author: eelco
Date: Sun Sep 4 18:03:24 2011
New Revision: 29006
URL: https://svn.nixos.org/websvn/nix/?rev=29006&sc=1
Log:
* Committed Sander's WebDSL load balancer example (plus EC2 physical network
spec).
Added:
cloud/trunk/examples/webdslorg-lb-ec2.nix
cloud/trunk/examples/webdslorg-lb.nix
Added: cloud/trunk/examples/webdslorg-lb-ec2.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ cloud/trunk/examples/webdslorg-lb-ec2.nix Sun Sep 4 18:03:24 2011
(r29006)
@@ -0,0 +1,17 @@
+let
+
+ config =
+{ deployment.targetEnv = "ec2";
+ deployment.ec2.controller = https://ec2.eu-west-1.amazonaws.com:443/;
+ deployment.ec2.ami = "ami-ecb49e98";
+ deployment.ec2.instanceType = "m1.large";
+ deployment.ec2.keyPair = "gsg-keypair";
+};
+
+in
+
+{
+ test0 = config;
+ test1 = config;
+ test2 = config;
+}
Added: cloud/trunk/examples/webdslorg-lb.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ cloud/trunk/examples/webdslorg-lb.nix Sun Sep 4 18:03:24 2011
(r29006)
@@ -0,0 +1,62 @@
+import ./webdsldeploy/generate-network.nix {
+ adminAddr = "f...@bar.com";
+ databasePassword = "admin";
+
+ applications = [
+{ name = "webdslorg";
+ src = ./webdslorg;
+ rootapp = true;
+}
+ ];
+
+ distribution = {
+test0 = {
+ proxy = true;
+};
+
+test1 = {
+ tomcat = true;
+ httpd = true;
+ mysqlMaster = true;
+};
+
+test2 = {
+ tomcat = true;
+ httpd = true;
+ mysqlSlave = 2;
+};
+ };
+} //
+{
+ /*test3 = {pkgs, ...}:
+ {
+services = {
+ xserver = {
+enable = true;
+
+displayManager = {
+ slim.enable = false;
+ auto.enable = true;
+};
+
+windowManager = {
+ default = "icewm";
+ icewm = {
+ enable = true;
+ };
+};
+
+desktopManager.default = "none";
+ };
+};
+
+environment = {
+ systemPackages = [
+pkgs.mc
+pkgs.subversion
+pkgs.lynx
+pkgs.firefox
+ ];
+};
+ };*/
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28976 - nixpkgs/trunk/pkgs/servers/http/apache-httpd
Author: eelco
Date: Fri Sep 2 15:59:12 2011
New Revision: 28976
URL: https://svn.nixos.org/websvn/nix/?rev=28976&sc=1
Log:
* Apache httpd updated to 2.2.20, with a fix for CVE-2011-3192.
Modified:
nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nix
Modified: nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nix
==
--- nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nixFri Sep 2
15:11:52 2011(r28975)
+++ nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nixFri Sep 2
15:59:12 2011(r28976)
@@ -8,12 +8,12 @@
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
stdenv.mkDerivation rec {
- version = "2.2.19";
+ version = "2.2.20";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-sha1 = "5676da63f3203129287d7c09a16cf523c00ec6cf";
+sha1 = "c8f00a505af6ed3f89f45b640217c388f5cd32b0";
};
buildInputs = [perl apr aprutil pcre] ++
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] disabling pulseaudio in kde
Hi, On 09/02/2011 04:13 PM, rocon...@theorem.ca wrote: # nixos-option hardware.pulseaudio.enable false I was under the impression that hardware.pulseaudio.enable was for enabling root managed pulseaudio (which I understand that pulseaudio does *not* recommend). That's another option (services.pulseaudio.enable). As I understand this nasty instance of pulseaudio is coming from kde somewhere. Last time, when I was running KDE 4.4, I removed pulseaudio from the build inputs of phonon (see nixpkgs revision 24027), but now under KDE 4.5, pulseaudio doesn't appear to be in the build inputs to phonon. Removing pulseaudio from the dependencies should no longer be necessary, because the "autospawn=no" flag in /etc/pulse/client.conf should prevent it from being started. Note that this didn't work prior to r28147 because PulseAudio used $prefix/etc for its configuration. Is it possible that you have a binary somewhere (maybe in your profile) that links against an old PulseAudio? -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28974 - in nixpkgs/trunk/pkgs: os-specific/linux/kernel top-level
Author: eelco
Date: Fri Sep 2 13:41:38 2011
New Revision: 28974
URL: https://svn.nixos.org/websvn/nix/?rev=28974&sc=1
Log:
* Re-enable the fbcondecor patch for Linux 2.6.35, seems to work fine.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.35.nixFri Sep
2 13:20:05 2011(r28973)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.35.nixFri Sep
2 13:41:38 2011(r28974)
@@ -1,8 +1,7 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
-, ... }:
+{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
let
- configWithPlatform = kernelPlatform :
+ configWithPlatform = kernelPlatform:
''
# Don't include any debug features.
DEBUG_KERNEL n
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Sep 2 13:20:05
2011(r28973)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Sep 2 13:41:38
2011(r28974)
@@ -5392,7 +5392,7 @@
linux_2_6_35 = makeOverridable (import
../os-specific/linux/kernel/linux-2.6.35.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
- [ #kernelPatches.fbcondecor_2_6_35
+ [ kernelPatches.fbcondecor_2_6_35
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs2_2_6_35
kernelPatches.cifs_timeout_2_6_35
@@ -5659,7 +5659,7 @@
linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor
linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
# The current default kernel / kernel modules.
- linux = linux_2_6_32;
+ linux = linuxPackages.kernel;
linuxPackages = linuxPackages_2_6_32;
keyutils = callPackage ../os-specific/linux/keyutils { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28973 - nixos/trunk/modules/profiles
Author: eelco
Date: Fri Sep 2 13:20:05 2011
New Revision: 28973
URL: https://svn.nixos.org/websvn/nix/?rev=28973&sc=1
Log:
* Use boot.initrd.availableKernelModules for the QEMU modules.
Modified:
nixos/trunk/modules/profiles/qemu-guest.nix
Modified: nixos/trunk/modules/profiles/qemu-guest.nix
==
--- nixos/trunk/modules/profiles/qemu-guest.nix Fri Sep 2 13:19:45 2011
(r28972)
+++ nixos/trunk/modules/profiles/qemu-guest.nix Fri Sep 2 13:20:05 2011
(r28973)
@@ -4,5 +4,6 @@
{ config, pkgs, ... }:
{
- boot.initrd.kernelModules = [ "virtio_net" "virtio_pci" "virtio_blk"
"virtio_balloon" "virtio_console" ];
+ boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci"
"virtio_blk" "virtio_balloon" "virtio_console" ];
+ boot.initrd.kernelModules = [ "virtio_balloon" ];
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28972 - nixos/trunk/modules/system/boot
Author: eelco
Date: Fri Sep 2 13:19:45 2011
New Revision: 28972
URL: https://svn.nixos.org/websvn/nix/?rev=28972&sc=1
Log:
* Use the CFQ I/O scheduler, rather than the ‘none’ scheduler. This
was already the case on Linux 2.6.32, but in newer kernels the CFQ
scheduler is built as a module, so all block devices got the ‘none’
scheduler instead.
Modified:
nixos/trunk/modules/system/boot/kernel.nix
Modified: nixos/trunk/modules/system/boot/kernel.nix
==
--- nixos/trunk/modules/system/boot/kernel.nix Fri Sep 2 11:11:48 2011
(r28971)
+++ nixos/trunk/modules/system/boot/kernel.nix Fri Sep 2 13:19:45 2011
(r28972)
@@ -49,7 +49,7 @@
default = true;
example = false;
description = ''
-Whether to activate VESA video mode on boot
+Whether to activate VESA video mode on boot.
'';
};
@@ -91,8 +91,7 @@
};
boot.initrd.kernelModules = mkOption {
- default = [
- ];
+ default = [];
description = "List of modules that are always loaded by the initrd.";
};
@@ -121,7 +120,10 @@
system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
boot.kernelParams =
- [ "splash=verbose" ] ++
+ [ "splash=verbose"
+# Force the Completely Fair Scheduler to be used by default.
+"elevator=cfq"
+ ] ++
optional config.boot.vesa "vga=0x317";
boot.kernelModules = [ "loop" ];
@@ -162,6 +164,9 @@
# Unix domain sockets (needed by udev).
"unix"
+
+# Provide the CFQ scheduler in the initrd.
+"cfq_iosched"
# Misc. stuff.
"pcips2" "serio" "atkbd" "xtkbd"
@@ -170,8 +175,9 @@
boot.initrd.kernelModules =
[ # For LVM.
"dm_mod"
-# For usual AT keyboards
-"i8042"
+
+# For usual AT keyboards.
+"i8042"
];
# The Linux kernel >= 2.6.27 provides firmware.
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28971 - nixpkgs/trunk/pkgs/applications/networking/p2p/tribler
Author: eelco
Date: Fri Sep 2 11:11:48 2011
New Revision: 28971
URL: https://svn.nixos.org/websvn/nix/?rev=28971&sc=1
Log:
* The latest and greatest Tribler.
Modified:
nixpkgs/trunk/pkgs/applications/networking/p2p/tribler/default.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/p2p/tribler/default.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/p2p/tribler/default.nix Fri Sep
2 08:57:12 2011(r28970)
+++ nixpkgs/trunk/pkgs/applications/networking/p2p/tribler/default.nix Fri Sep
2 11:11:48 2011(r28971)
@@ -1,12 +1,14 @@
{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }:
+let rev = "22245"; in
+
stdenv.mkDerivation {
- name = "tribler-5.3.9-pre21071";
+ name = "tribler-5.4.2-pre${rev}";
src = fetchsvn {
-url = http://svn.tribler.org/abc/branches/release-5.3.x;
-rev = 21071;
-sha256 = "0plzw5m9rligz66rbq8qr9sj0fiqx8gwmchdw3p4mwlwfx72gixm";
+url = http://svn.tribler.org/abc/branches/release-5.4.x;
+inherit rev;
+sha256 = "09b3iz3yy1dpl30cd2iningzhm1grz6qjgv0qb3wk0v1vxkacddz";
};
buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper
];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] disabling pulseaudio in kde
Hi, On 09/02/2011 01:57 AM, rocon...@theorem.ca wrote: Is there some way to disable pulseaudio in kde-4.5.5? Just set "hardware.pulseaudio.enable = false;" in configuration.nix (which happens to be the default). This should cause /etc/pulse/client.conf to contain the line "autospawn=no", preventing the Pulse daemon from starting. -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28946 - in nix/trunk/src: libexpr libmain libstore nix-env nix-instantiate nix-store
Author: eelco
Date: Wed Aug 31 21:11:50 2011
New Revision: 28946
URL: https://svn.nixos.org/websvn/nix/?rev=28946&sc=1
Log:
* Eliminate all uses of the global variable ‘store’ from libstore.
This should also fix:
nix-instantiate: ./../boost/shared_ptr.hpp:254: T*
boost::shared_ptr::operator->() const [with T = nix::StoreAPI]: Assertion
`px != 0' failed.
which was caused by hashDerivationModulo() calling the ‘store’
object (during store upgrades) before openStore() assigned it.
Modified:
nix/trunk/src/libexpr/primops.cc
nix/trunk/src/libmain/shared.cc
nix/trunk/src/libmain/shared.hh
nix/trunk/src/libstore/build.cc
nix/trunk/src/libstore/derivations.cc
nix/trunk/src/libstore/derivations.hh
nix/trunk/src/libstore/gc.cc
nix/trunk/src/libstore/local-store.cc
nix/trunk/src/libstore/misc.cc
nix/trunk/src/libstore/misc.hh
nix/trunk/src/libstore/store-api.hh
nix/trunk/src/nix-env/nix-env.cc
nix/trunk/src/nix-env/profiles.cc
nix/trunk/src/nix-instantiate/nix-instantiate.cc
nix/trunk/src/nix-store/nix-store.cc
Modified: nix/trunk/src/libexpr/primops.cc
==
--- nix/trunk/src/libexpr/primops.ccWed Aug 31 19:05:10 2011(r28945)
+++ nix/trunk/src/libexpr/primops.ccWed Aug 31 21:11:50 2011(r28946)
@@ -357,7 +357,7 @@
runs. */
if (path.at(0) == '=') {
path = string(path, 1);
-PathSet refs; computeFSClosure(path, refs);
+PathSet refs; computeFSClosure(*store, path, refs);
foreach (PathSet::iterator, j, refs) {
drv.inputSrcs.insert(*j);
if (isDerivation(*j))
@@ -433,7 +433,7 @@
/* Use the masked derivation expression to compute the output
path. */
-Hash h = hashDerivationModulo(drv);
+Hash h = hashDerivationModulo(*store, drv);
foreach (DerivationOutputs::iterator, i, drv.outputs)
if (i->second.path == "") {
@@ -444,7 +444,7 @@
}
/* Write the resulting term into the Nix store directory. */
-Path drvPath = writeDerivation(drv, drvName);
+Path drvPath = writeDerivation(*store, drv, drvName);
printMsg(lvlChatty, format("instantiated `%1%' -> `%2%'")
% drvName % drvPath);
@@ -452,7 +452,7 @@
/* Optimisation, but required in read-only mode! because in that
case we don't actually write store derivations, so we can't
read them later. */
-drvHashes[drvPath] = hashDerivationModulo(drv);
+drvHashes[drvPath] = hashDerivationModulo(*store, drv);
state.mkAttrs(v, 1 + drv.outputs.size());
mkString(*state.allocAttr(v, state.sDrvPath), drvPath,
singleton("=" + drvPath));
Modified: nix/trunk/src/libmain/shared.cc
==
--- nix/trunk/src/libmain/shared.cc Wed Aug 31 19:05:10 2011(r28945)
+++ nix/trunk/src/libmain/shared.cc Wed Aug 31 21:11:50 2011(r28946)
@@ -52,11 +52,11 @@
}
-void printMissing(const PathSet & paths)
+void printMissing(StoreAPI & store, const PathSet & paths)
{
unsigned long long downloadSize, narSize;
PathSet willBuild, willSubstitute, unknown;
-queryMissing(paths, willBuild, willSubstitute, unknown, downloadSize,
narSize);
+queryMissing(store, paths, willBuild, willSubstitute, unknown,
downloadSize, narSize);
if (!willBuild.empty()) {
printMsg(lvlInfo, format("these derivations will be built:"));
Modified: nix/trunk/src/libmain/shared.hh
==
--- nix/trunk/src/libmain/shared.hh Wed Aug 31 19:05:10 2011(r28945)
+++ nix/trunk/src/libmain/shared.hh Wed Aug 31 21:11:50 2011(r28946)
@@ -24,11 +24,13 @@
MakeError(UsageError, nix::Error);
+class StoreAPI;
+
/* Ugh. No better place to put this. */
Path makeRootName(const Path & gcRoot, int & counter);
void printGCWarning();
-void printMissing(const PathSet & paths);
+void printMissing(StoreAPI & store, const PathSet & paths);
template N getIntArg(const string & opt,
Strings::iterator & i, const Strings::iterator & end)
Modified: nix/trunk/src/libstore/build.cc
==
--- nix/trunk/src/libstore/build.cc Wed Aug 31 19:05:10 2011(r28945)
+++ nix/trunk/src/libstore/build.cc Wed Aug 31 21:11:50 2011(r28946)
@@ -934,7 +934,7 @@
assert(worker.store.isValidPath(drvPath));
/* Get the derivation. */
-drv = derivationFromPath(drvPath);
+drv = derivationFromPath(worker.store, drvPath);
foreach (DerivationOutputs::iterator, i, drv.outputs)
worker.store.addTempRoot(i->second.path);
@@ -1030,10 +1030,10 @@
`*i' as input paths. Only add the closures of output paths
that are specifie
[Nix-commits] SVN commit: nix - r28937 - nixpkgs/trunk/pkgs/applications/networking/browsers/firefox
Author: eelco
Date: Wed Aug 31 09:12:56 2011
New Revision: 28937
URL: https://svn.nixos.org/websvn/nix/?rev=28937&sc=1
Log:
* Firefox 6.0.1, 3.6.21.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/3.6.nix
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/3.6.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/3.6.nix Tue Aug
30 19:57:29 2011(r28936)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/3.6.nix Wed Aug
31 09:12:56 2011(r28937)
@@ -12,14 +12,14 @@
rec {
- firefoxVersion = "3.6.16";
+ firefoxVersion = "3.6.21";
- xulVersion = "1.9.2.16"; # this attribute is used by other packages
+ xulVersion = "1.9.2.21"; # this attribute is used by other packages
src = fetchurl {
url =
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";;
-sha1 = "38124597440b7d60aa568adeef23659575841e92";
+sha1 = "3c1f001ad22d93b48e191999f548b4382db3d36c";
};
Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix Tue Aug
30 19:57:29 2011(r28936)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix Wed Aug
31 09:12:56 2011(r28937)
@@ -15,14 +15,14 @@
rec {
- firefoxVersion = "6.0";
+ firefoxVersion = "6.0.1";
- xulVersion = "6.0"; # this attribute is used by other packages
+ xulVersion = "6.0.1"; # this attribute is used by other packages
src = fetchurl {
url =
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";;
-sha256 = "0ws96gc1mkmilgsikirhmqc6s7m0bcyh58820l08wd82r9abagyc";
+sha256 = "08pklavbb6miaav07a8liw17k8nnh3i97plz8l9pdclan4aczb3i";
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28934 - nixos/trunk/modules/tasks
Author: eelco Date: Tue Aug 30 18:25:54 2011 New Revision: 28934 URL: https://svn.nixos.org/websvn/nix/?rev=28934&sc=1 Log: * Add fsck.vfat etc. to the default install. Useful for USB sticks and stuff like that. Modified: nixos/trunk/modules/tasks/filesystems.nix Modified: nixos/trunk/modules/tasks/filesystems.nix == --- nixos/trunk/modules/tasks/filesystems.nix Tue Aug 30 18:25:07 2011 (r28933) +++ nixos/trunk/modules/tasks/filesystems.nix Tue Aug 30 18:25:54 2011 (r28934) @@ -5,7 +5,7 @@ let # Packages that provide fsck backends. - fsPackages = [ pkgs.e2fsprogs pkgs.reiserfsprogs ]; + fsPackages = [ pkgs.e2fsprogs pkgs.reiserfsprogs pkgs.dosfstools ]; in ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28933 - nixpkgs/trunk/pkgs/tools/filesystems/dosfstools
Author: eelco
Date: Tue Aug 30 18:25:07 2011
New Revision: 28933
URL: https://svn.nixos.org/websvn/nix/?rev=28933&sc=1
Log:
* dosfstools updated to 3.0.11.
Modified:
nixpkgs/trunk/pkgs/tools/filesystems/dosfstools/default.nix
Modified: nixpkgs/trunk/pkgs/tools/filesystems/dosfstools/default.nix
==
--- nixpkgs/trunk/pkgs/tools/filesystems/dosfstools/default.nix Tue Aug 30
14:55:36 2011(r28932)
+++ nixpkgs/trunk/pkgs/tools/filesystems/dosfstools/default.nix Tue Aug 30
18:25:07 2011(r28933)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "dosfstools-3.0.9";
+ name = "dosfstools-3.0.11";
src = fetchurl {
url = "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2";;
-sha256 = "13s5s0hvhmn7r4ppqmw8nqgdm5v5vc6r5j44kn87wl5cmrpnfqrz";
+sha256 = "1a6rzjy82f6579ywaln33g1wc7k8gbgjdss9q2q8daplac7pmcll";
};
makeFlags = "PREFIX=$(out)";
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] We are on Hackage
Hi, On 08/30/2011 10:44 AM, Peter Simons wrote: the Hackage site shows for every package which versions of that package are available in which distribution, and NixOS is now part of the distributions that are being tracked. For example: http://hackage.haskell.org/package/pandoc Nice :-) -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28877 - nixos/trunk/tests
Author: eelco
Date: Mon Aug 29 14:23:26 2011
New Revision: 28877
URL: https://svn.nixos.org/websvn/nix/?rev=28877&sc=1
Log:
* Make some tests more robust. In particular, tests should make sure
that the network-interfaces job is up before accessing the network.
Modified:
nixos/trunk/tests/firewall.nix
nixos/trunk/tests/login.nix
nixos/trunk/tests/nat.nix
nixos/trunk/tests/tomcat.nix
Modified: nixos/trunk/tests/firewall.nix
==
--- nixos/trunk/tests/firewall.nix Mon Aug 29 13:39:25 2011(r28876)
+++ nixos/trunk/tests/firewall.nix Mon Aug 29 14:23:26 2011(r28877)
@@ -27,6 +27,7 @@
$walled->waitForJob("firewall");
$walled->waitForJob("httpd");
+ $attacker->waitForJob("network-interfaces");
# Local connections should still work.
$walled->succeed("curl -v http://localhost/ >&2");
Modified: nixos/trunk/tests/login.nix
==
--- nixos/trunk/tests/login.nix Mon Aug 29 13:39:25 2011(r28876)
+++ nixos/trunk/tests/login.nix Mon Aug 29 14:23:26 2011(r28877)
@@ -35,11 +35,11 @@
# Check whether ConsoleKit/udev gives and removes device
# ownership as needed.
subtest "device permissions", sub {
+ $machine->fail("getfacl /dev/snd/timer | grep -q alice");
$machine->succeed("chvt 1");
- $machine->sleep(1); # urgh
- $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
+ $machine->waitUntilSucceeds("getfacl /dev/snd/timer | grep -q
alice");
$machine->succeed("chvt 2");
- $machine->sleep(1); # urgh
+ $machine->sleep(2); # urgh
$machine->fail("getfacl /dev/snd/timer | grep -q alice");
};
Modified: nixos/trunk/tests/nat.nix
==
--- nixos/trunk/tests/nat.nix Mon Aug 29 13:39:25 2011(r28876)
+++ nixos/trunk/tests/nat.nix Mon Aug 29 14:23:26 2011(r28877)
@@ -41,10 +41,12 @@
# The router should have access to the server.
$server->waitForJob("httpd");
+ $router->waitForJob("network-interfaces");
$router->succeed("curl --fail http://server/ >&2");
# The client should be also able to connect via the NAT router.
$router->waitForJob("nat");
+ $client->waitForJob("network-interfaces");
$client->succeed("curl --fail http://server/ >&2");
$client->succeed("ping -c 1 server >&2");
Modified: nixos/trunk/tests/tomcat.nix
==
--- nixos/trunk/tests/tomcat.nixMon Aug 29 13:39:25 2011(r28876)
+++ nixos/trunk/tests/tomcat.nixMon Aug 29 14:23:26 2011(r28877)
@@ -25,7 +25,8 @@
$server->waitForJob("tomcat");
$server->sleep(30); # Dirty, but it takes a while before Tomcat handles to
requests properly
-$client->mustSucceed("curl --fail
http://server/examples/servlets/servlet/HelloWorldExample";);
-$client->mustSucceed("curl --fail
http://server/examples/jsp/jsp2/simpletag/hello.jsp";);
+$client->waitForJob("network-interfaces");
+$client->succeed("curl --fail
http://server/examples/servlets/servlet/HelloWorldExample";);
+$client->succeed("curl --fail
http://server/examples/jsp/jsp2/simpletag/hello.jsp";);
'';
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
