[Nix-commits] Hydra job nixpkgs:trunk:tarball on x86_64-linux, build 2609939: Failed with non-zero exit code

2012-05-11 Thread Hydra Build Daemon
Hi,

This is to let you know that Hydra build 2609939 of job nixpkgs:trunk:tarball 
has changed from 'Success' to 'Failed with non-zero exit code'.

Complete build information can be found on this page: 
http://hydra.nixos.org/build/2609939

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:  | 2609939
Nix name:  | nixpkgs-tarball-0pre34068
Short description: | Build of a source distribution from a checkout
Maintainer(s): | Nix Committers 
System:| x86_64-linux
Derivation store path: | 
/nix/store/s303dbp1zdz9jnlq4b9wbx3z3krzj96k-nixpkgs-tarball-0pre34068.drv
Output store path: | 
/nix/store/zfxpcrwavaryw44b9f0prf3nvr71gi2b-nixpkgs-tarball-0pre34068
Time added:| 2012-05-12 06:35:49
Build started: | 2012-05-12 06:32:23
Build finished:| 2012-05-12 06:35:49
Duration:  | 206s

The build inputs were:

Name| Type| Value
+-+
nixpkgs | svn | https://nixos.org/repos/nix/nixpkgs/trunk:34068
officialRelease | boolean | false

Regards,

The Hydra build daemon.

---
 Ok [158] [160] [161] [162] [163] [164] [165] [166] [167] [168] [169] [170]
[171] [172] [173] [174] [175] [176] [177] [178] [179] [180] [181] [182]
[183] [184] [185] [186] [187] [188])
(/nix/store/wzqpn1wm5r1aib1bgw0452rsf9af1yn7-tetex-3.0/share/texmf-dist/fonts/s
ource/jknappen/ec/exbraces.mf
 Ok [94] [126] [23] [40] [41] [60] [124] [62] [91] [93] [92] [123] [125]
[95] [127] [32])
(/nix/store/wzqpn1wm5r1aib1bgw0452rsf9af1yn7-tetex-3.0/share/texmf-dist/fonts/s
ource/jknappen/ec/expunct.mf
 Ok [14] [15] [19] [20] [13] [18] [33] [39] [42] [43] [44] [46] [47] [58]
[59] [61] [96] [189] [17] [45] [16] [21] [22])
(/nix/store/wzqpn1wm5r1aib1bgw0452rsf9af1yn7-tetex-3.0/share/texmf-dist/fonts/s
ource/jknappen/ec/exaccent.mf
 Ok [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12])
(/nix/store/wzqpn1wm5r1aib1bgw0452rsf9af1yn7-tetex-3.0/share/texmf-dist/fonts/s
ource/jknappen/ec/exsign.mf
 Ok [24] [34] [35] [36] [37] [64] [191] [159])
(/nix/store/wzqpn1wm5r1aib1bgw0452rsf9af1yn7-tetex-3.0/share/texmf-dist/fonts/s
ource/jknappen/ec/exrlig.mf
 Ok [25] [26] [28] [27] [29] [30] [31])
(/nix/store/wzqpn1wm5r1aib1bgw0452rsf9af1yn7-tetex-3.0/share/texmf-dist/fonts/s
ource/jknappen/ec/exromp.mf
 Ok [38] [63] [190])
(/nix/store/wzqpn1wm5r1aib1bgw0452rsf9af1yn7-tetex-3.0/share/texmf-dist/fonts/s
ource/jknappen/ec/exrulett.mf
 Ok [65] [66] [67] [68] [69] [70] [71] [72] [73] [74] [75] [76] [77] [78]
[79] [80] [81] [82] [83] [84] [85] [86] [87] [88] [89] [90])
(/nix/store/wzqpn1wm5r1aib1bgw0452rsf9af1yn7-tetex-3.0/share/texmf-dist/fonts/s
ource/jknappen/ec/exrllett.mf
 Ok [97] [98] [99] [100] [101] [102] [103] [104] [105] [106] [107] [108]
[109] [110] [111] [112] [113] [114] [115] [116] [117] [118] [119] [120]
[121] [122])
(/nix/store/wzqpn1wm5r1aib1bgw0452rsf9af1yn7-tetex-3.0/share/texmf-dist/fonts/s
ource/jknappen/ec/exrdigit.mf
 Ok [48] [49] [50] [51] [52] [53] [54] [55] [56] [57])
(/nix/store/wzqpn1wm5r1aib1bgw0452rsf9af1yn7-tetex-3.0/share/texmf-dist/fonts/s
ource/jknappen/ec/exrligtb.mf
 Ok) ) ) )
(some charht values had to be adjusted by as much as 0.06586pt)
Font metrics written on ecrm1000.tfm.
Output written on ecrm1000.600gf (256 characters, 51364 bytes).
Transcript written on ecrm1000.log.
mktextfm: 
/tmp/nix-build-s303dbp1zdz9jnlq4b9wbx3z3krzj96k-nixpkgs-tarball-0pre34068.drv-0/texfonts/tfm/jknappen/ec/ecrm1000.tfm:
 successfully generated.
'manual.pdf' successfully built
make: Leaving directory 
`/tmp/nix-build-s303dbp1zdz9jnlq4b9wbx3z3krzj96k-nixpkgs-tarball-0pre34068.drv-0/svn-export/doc'
running tests
error: cannot open SQLite database
build time elapsed:  0m0.030s 0m0.024s 0m11.009s 0m1.237s
builder for 
`/nix/store/s303dbp1zdz9jnlq4b9wbx3z3krzj96k-nixpkgs-tarball-0pre34068.drv' 
failed with exit code 1
error: build of 
`/nix/store/s303dbp1zdz9jnlq4b9wbx3z3krzj96k-nixpkgs-tarball-0pre34068.drv' 
failed
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r34069 - in homepage/trunk: . nix

2012-05-11 Thread Eelco Dolstra
Author: eelco
Date: Sat May 12 04:24:31 2012
New Revision: 34069
URL: https://nixos.org/websvn/nix/?rev=34069&sc=1

Log:
* Nix 1.0.

Modified:
   homepage/trunk/news.xml
   homepage/trunk/nix/download.tt

Modified: homepage/trunk/news.xml
==
--- homepage/trunk/news.xml Sat May 12 04:20:26 2012(r34068)
+++ homepage/trunk/news.xml Sat May 12 04:24:31 2012(r34069)
@@ -3,6 +3,24 @@
 
 
   
+2012
+5
+11
+
+  Nix 1.0 released
+
+
+  After almost two years of development, http://hydra.nixos.org/release/nix/nix-1.0";>Nix 1.0
+  has been released.  See the http://hydra.nixos.org/build/2609700/download/3/release-notes";>release
+  notes for an overview of the most important improvements.
+  For installation information, see the http://hydra.nixos.org/build/2609700/download/1/manual";>manual.
+  
+  
+
+  
 2011
 11
 7

Modified: homepage/trunk/nix/download.tt
==
--- homepage/trunk/nix/download.tt  Sat May 12 04:20:26 2012(r34068)
+++ homepage/trunk/nix/download.tt  Sat May 12 04:24:31 2012(r34069)
@@ -10,20 +10,20 @@
 
 Latest release
 
-The latest and recommended version of Nix is 0.16,
-released 17 August 2010.
+The latest and recommended version of Nix is 1.0,
+released 11 May 2012.
 
-[% manual = "http://hydra.nixos.org/build/565033/download/1/manual/"; %]
+[% manual = "http://hydra.nixos.org/build/2609700/download/1/manual"; %]
 
 
 
   http://hydra.nixos.org/release/nix/nix-0.16";>Download
+  href="http://hydra.nixos.org/release/nix/nix-1.0";>Download
   page, including the source tarball and RPMs and Debs
   for several platforms.
 
   http://hydra.nixos.org/build/565033/download/3/release-notes/";>Release
+  href="http://hydra.nixos.org/build/2609700/download/3/release-notes";>Release
   notes.
 
   Manual.  Please read the The following old releases of Nix are also available:
 
 
+  2012-05-11http://hydra.nixos.org/release/nix/nix-1.0";>Nix 1.0
   2010-08-17http://hydra.nixos.org/release/nix/nix-0.16";>Nix 0.16
   2010-03-17http://hydra.nixos.org/release/nix/nix-0.15";>Nix 0.15
   2010-02-04http://hydra.nixos.org/release/nix/nix-0.14";>Nix 0.14
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r34068 - in nixpkgs/trunk/pkgs: tools/package-management/nix top-level

2012-05-11 Thread Eelco Dolstra
Author: eelco
Date: Sat May 12 04:20:26 2012
New Revision: 34068
URL: https://nixos.org/websvn/nix/?rev=34068&sc=1

Log:
* Nix 1.0.

Replaced:
   nixpkgs/trunk/pkgs/tools/package-management/nix/default.nix
  - copied, changed from r34067, 
nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Copied and modified: 
nixpkgs/trunk/pkgs/tools/package-management/nix/default.nix (from r34067, 
nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix)
==
--- nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nixFri May 
11 23:42:18 2012(r34067, copy source)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/default.nix Sat May 12 
04:20:26 2012(r34068)
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre2668_46cdc6a";
+  name = "nix-1.0";
 
   src = fetchurl {
-url = "http://hydra.nixos.org/build/2492261/download/4/${name}.tar.bz2";;
-sha256 = 
"d9a1cfbee1670bc700593d81211c47eb8d7623aa9699d18a414ecaddccabfa1a";
+url = "http://hydra.nixos.org/build/2609700/download/4/${name}.tar.bz2";;
+sha256 = 
"27f1d4d2a5fb1951bfc9e706c0894a961aed1afe0d095e16eb8fbef94ee7ec17";
   };
 
   buildNativeInputs = [ perl pkgconfig ];

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Fri May 11 23:42:18 
2012(r34067)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Sat May 12 04:20:26 
2012(r34068)
@@ -8565,17 +8565,14 @@
 stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
   };
 
+  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
 storeDir = getConfig [ "nix" "storeDir" ] "/nix/store";
 stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
-stdenv =
-  if stdenv.isDarwin
-  # When building the Perl bindings, `-no-cpp-precomp' is used.
-  then overrideGCC stdenv gccApple
-  else stdenv;
   };
+  */
 
-  nixSqlite = nixUnstable;
+  nixUnstable = nixStable;
 
   nixCustomFun = src: preConfigure: enableScripts: configureFlags:
 import ../tools/package-management/nix/custom.nix {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nix] cac9eb: Bump version number

2012-05-11 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: cac9eb39fe36ab28519f0b59d880fbcdc705ba95
  
https://github.com/NixOS/nix/commit/cac9eb39fe36ab28519f0b59d880fbcdc705ba95
  Author: Eelco Dolstra 
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
M version

  Log Message:
  ---
  Bump version number



___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-dev] Nix 1.0 released

2012-05-11 Thread Eelco Dolstra
Hi,


I'm pleased to announce the availability of a new stable release of the
Nix package manager.  Release 1.0 can be found at

  http://hydra.nixos.org/release/nix/nix-1.0

A big thanks to everybody who contributed to this release.  The "1.0" version is
somewhat arbitrary, but I wanted to get rid of the dreaded "0.x" version number 
:-)

There have been numerous improvements and bug fixes since the previous release.
Here are the most significant:

  * Nix can now optionally use the Boehm garbage collector. This significantly
reduces the Nix evaluator's memory footprint, especially when evaluating
large NixOS system configurations. It can be enabled using the --enable-gc
configure option.

  * Nix now uses SQLite for its database. This is faster and more flexible than
the old ad hoc format. SQLite is also used to cache the manifests in /nix/
var/nix/manifests, resulting in a significant speedup.

  * Nix now has an search path for expressions. The search path is set using
the environment variable NIX_PATH and the -I command line option. In Nix
expressions, paths between angle brackets are used to specify files that
must be looked up in the search path. For instance, the expression  looks for a file nixpkgs/default.nix relative to every
element in the search path.

  * The new command nix-build --run-env builds all dependencies of a
derivation, then starts a shell in an environment containing all variables
from the derivation. This is useful for reproducing the environment of a
derivation for development.

  * The new command nix-store --verify-path verifies that the contents of a
store path have not changed.

  * The new command nix-store --print-env prints out the environment of a
derivation in a format that can be evaluated by a shell.

  * Attribute names can now be arbitrary strings. For instance, you can write {
"foo-1.2" = ?; "bla bla" = ?; }."bla bla".

  * Attribute selection can now provide a default value using the or operator.
For instance, the expression x.y.z or e evaluates to the attribute x.y.z if
it exists, and e otherwise.

  * The right-hand side of the ? operator can now be an attribute path, e.g.,
attrs ? a.b.c.

  * On Linux, Nix will now make files in the Nix store immutable on filesystems
that support it. This prevents accidental modification of files in the
store by the root user.

  * Nix has preliminary support for derivations with multiple outputs. This is
useful because it allows parts of a package to be deployed and
garbage-collected separately. For instance, development parts of a package
such as header files or static libraries would typically not be part of the
closure of an application, resulting in reduced disk usage and installation
time.

  * The Nix store garbage collector is faster and holds the global lock for a
shorter amount of time.

  * The option --timeout (corresponding to the configuration setting
build-timeout) allows you to set an absolute timeout on builds - if a build
runs for more than the given number of seconds, it is terminated. This is
useful for recovering automatically from builds that are stuck in an
infinite loop but keep producing output, and for which --max-silent-time is
ineffective.

  * Nix development has moved to GitHub (https://github.com/NixOS/nix).

-- 
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nix]

2012-05-11 Thread edolstra
  Branch: refs/tags/1.0
  Home:   https://github.com/NixOS/nix

___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nix] dfc6a4: Fix the install check

2012-05-11 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: dfc6a43b72e9f38dc58866c5a9e5900d0d0b66b4
  
https://github.com/NixOS/nix/commit/dfc6a43b72e9f38dc58866c5a9e5900d0d0b66b4
  Author: Eelco Dolstra 
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
M release.nix

  Log Message:
  ---
  Fix the install check



___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r34067 - nixos/trunk/doc/manual

2012-05-11 Thread Eelco Dolstra
Author: eelco
Date: Fri May 11 23:42:18 2012
New Revision: 34067
URL: https://nixos.org/websvn/nix/?rev=34067&sc=1

Log:
* Sync CSS.

Modified:
   nixos/trunk/doc/manual/style.css

Modified: nixos/trunk/doc/manual/style.css
==
--- nixos/trunk/doc/manual/style.cssFri May 11 23:14:05 2012(r34066)
+++ nixos/trunk/doc/manual/style.cssFri May 11 23:42:18 2012(r34067)
@@ -8,15 +8,14 @@
 
 body
 {
-font-family: sans-serif;
+font-family: "Nimbus Sans L", sans-serif;
 background: white;
 margin: 2em 1em 2em 1em;
 }
 
-h1,h2,h3
+h1, h2, h3, h4
 {
 color: #005aa0;
-text-align: left;
 }
 
 h1 /* title */
@@ -46,6 +45,11 @@
 font-size: 125%;
 }
 
+div.simplesect h2
+{
+font-size: 110%;
+}
+
 div.appendix h3
 {
 font-size: 150%;
@@ -70,11 +74,13 @@
 
 div.example
 {
-border: 1px solid #6185a0;
+border: 1px solid #b0b0b0;
 padding: 6px 6px;
 margin-left: 1.5em;
 margin-right: 1.5em;
 background: #f4f4f8;
+border-radius: 0.4em;
+box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 div.example p.title
@@ -82,6 +88,11 @@
 margin-top: 0em;
 }
 
+div.example pre
+{
+box-shadow: none;
+}
+
 
 /***
 Screen dumps:
@@ -89,14 +100,15 @@
 
 pre.screen, pre.programlisting
 {
-border: 1px solid #6185a0;
+border: 1px solid #b0b0b0;
 padding: 3px 3px;
 margin-left: 1.5em;
 margin-right: 1.5em;
 color: #60;
 background: #f4f4f8;
 font-family: monospace;
-/* font-size: 90%; */
+border-radius: 0.4em;
+box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 div.example pre.programlisting
@@ -113,13 +125,15 @@
 
 .note, .warning
 {
-border: 1px solid #6185a0;
+border: 1px solid #b0b0b0;
 padding: 3px 3px;
 margin-left: 1.5em;
 margin-right: 1.5em;
 margin-bottom: 1em;
 padding: 0.3em 0.3em 0.3em 0.3em;
 background: #f5;
+border-radius: 0.4em;
+box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 div.note, div.warning
@@ -131,7 +145,6 @@
 {
 color: red;
 font-size: 100%;
-//margin: 0 0 0 0;
 padding-right: 0.5em;
 display: inline;
 }
@@ -162,20 +175,26 @@
 Links colors and highlighting: 
  ***/
 
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
 a:link { color: #0048b3; }
 a:visited { color: #002a6a; }
-a:hover { background: #cd; }
 
 
 /***
   Table of contents:
  ***/
 
-.toc
+div.toc
 {
 font-size: 90%;
 }
 
+div.toc dl
+{
+margin-top: 0em;
+margin-bottom: 0em;
+}
 
 
 /***
@@ -208,81 +227,42 @@
 font-style: italic;
 }
 
-.default
-{
-font-style: italic;
-}
-
-.availability
-{
-font-style: italic;
-}
-
 .varname
 {
 color: #40;
 }
 
-
-div.informaltable table
-{
-  border: 1px solid #6185a0;
-  width: 100%;
-}
-
-div.informaltable td
+span.command strong
 {
-  border: 0;
-  padding: 5px;
-}
-
-div.informaltable td.default
-{
-  text-align: right;
+font-weight: normal;
+color: #40;
 }
 
-div.informaltable th
+div.calloutlist table
 {
-  text-align: left;
-  color: #005aa0;
-  border: 0;
-  padding: 5px;
-  background: #f5;
-  font-weight: normal;
-  font-style: italic;
+box-shadow: none;
 }
 
-td.varname, td.tagname, td.paramname
+table
 {
-  font-weight: bold;
-  vertical-align: top;
+border-collapse: collapse;
+box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
-div.epigraph
+table.simplelist
 {
+text-align: left;
+color: #005aa0;
+border: 0;
+padding: 5px;
+background: #f5;
+font-weight: normal;
 font-style: italic;
-text-align: right;
-}
-
-table.productionset table.productionset
-{
-font-family: monospace;
-}
-
-strong.command
-{
-//font-family: monospace;
-//font-style: italic;
-//font-weight: normal;
-color: #40;
-}
-
-div.calloutlist td
-{
-padding-bottom: 1em;
+box-shadow: none;
+margin-bottom: 1em;
 }
 
-table
+div.affiliation
 {
-margin-bottom: 1em;
-}
+font-style: italic;
+}
\ No newline at end of file
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r34066 - nixos/trunk/modules/services/web-servers/apache-httpd

2012-05-11 Thread Eelco Dolstra
Author: eelco
Date: Fri May 11 23:14:05 2012
New Revision: 34066
URL: https://nixos.org/websvn/nix/?rev=34066&sc=1

Log:
* Move logFormat to the per-vhost options.

Modified:
   nixos/trunk/modules/services/web-servers/apache-httpd/default.nix
   nixos/trunk/modules/services/web-servers/apache-httpd/per-server-options.nix

Modified: nixos/trunk/modules/services/web-servers/apache-httpd/default.nix
==
--- nixos/trunk/modules/services/web-servers/apache-httpd/default.nix   Fri May 
11 23:08:37 2012(r34065)
+++ nixos/trunk/modules/services/web-servers/apache-httpd/default.nix   Fri May 
11 23:14:05 2012(r34066)
@@ -220,7 +220,7 @@
 
 ${if !isMainServer && mainCfg.logPerVirtualHost then ''
   ErrorLog ${mainCfg.logDir}/error_log-${cfg.hostName}
-  CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} 
${mainCfg.logFormat}
+  CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} ${cfg.logFormat}
 '' else ""}
 
 ${robotsConf}
@@ -447,14 +447,6 @@
 ";
   };
 
-  logFormat = mkOption {
-default = "common";
-example = "combined";
-description = "
-  Log format for Apache's log files. Possible values are: combined, 
common, referer, agent.
-";
-  };
-
   stateDir = mkOption {
 default = "/var/run/httpd";
 description = "

Modified: 
nixos/trunk/modules/services/web-servers/apache-httpd/per-server-options.nix
==
--- 
nixos/trunk/modules/services/web-servers/apache-httpd/per-server-options.nix
Fri May 11 23:08:37 2012(r34065)
+++ 
nixos/trunk/modules/services/web-servers/apache-httpd/per-server-options.nix
Fri May 11 23:14:05 2012(r34066)
@@ -135,4 +135,12 @@
 ";
   };
 
+  logFormat = mkOption {
+default = "common";
+example = "combined";
+description = "
+  Log format for Apache's log files. Possible values are: combined, 
common, referer, agent.
+";
+  };
+
 }
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r34065 - nixos/trunk/modules/tasks/filesystems

2012-05-11 Thread Eelco Dolstra
Author: eelco
Date: Fri May 11 23:08:37 2012
New Revision: 34065
URL: https://nixos.org/websvn/nix/?rev=34065&sc=1

Log:
* Remove a bad definition of environment.etc.

Modified:
   nixos/trunk/modules/tasks/filesystems/nfs.nix

Modified: nixos/trunk/modules/tasks/filesystems/nfs.nix
==
--- nixos/trunk/modules/tasks/filesystems/nfs.nix   Fri May 11 23:06:35 
2012(r34064)
+++ nixos/trunk/modules/tasks/filesystems/nfs.nix   Fri May 11 23:08:37 
2012(r34065)
@@ -46,8 +46,6 @@
 cp -v ${pkgs.klibc}/lib/klibc/bin.static/nfsmount $out/bin
   '';
 
-environment.etc = singleton idmapdConfFile;
-
 # Ensure that statd and idmapd are started before mountall.
 jobs.mountall.preStart =
   ''
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r34064 - nixos/trunk/modules/system/etc

2012-05-11 Thread Eelco Dolstra
Author: eelco
Date: Fri May 11 23:06:35 2012
New Revision: 34064
URL: https://nixos.org/websvn/nix/?rev=34064&sc=1

Log:
* Use optionSet to check environment.etc.

Modified:
   nixos/trunk/modules/system/etc/etc.nix

Modified: nixos/trunk/modules/system/etc/etc.nix
==
--- nixos/trunk/modules/system/etc/etc.nix  Fri May 11 21:56:23 2012
(r34063)
+++ nixos/trunk/modules/system/etc/etc.nix  Fri May 11 23:06:35 2012
(r34064)
@@ -16,8 +16,26 @@
 }
   ];
   description = ''
-List of files that have to be linked in /etc.
+List of files that have to be linked in /etc.
   '';
+  type = types.listOf types.optionSet;
+  options = {
+source = mkOption {
+  description = "Source file.";
+};
+target = mkOption {
+  description = "Name of symlink (relative to 
/etc).";
+};
+mode = mkOption {
+  default = "symlink";
+  example = "0600";
+  description = ''
+If set to something else than symlink,
+the file is copied instead of symlinked, with the given
+file mode.
+  '';
+};
+  };
 };
   };
 in
@@ -35,7 +53,7 @@
 /* !!! Use toXML. */
 sources = map (x: x.source) config.environment.etc;
 targets = map (x: x.target) config.environment.etc;
-modes = map (x: if x ? mode then x.mode else "symlink") 
config.environment.etc;
+modes = map (x: x.mode) config.environment.etc;
   };
 
 in
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/hydra] 3e6b24: Sync with the CSS of the Nix manual

2012-05-11 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/hydra
  Commit: 3e6b24930c1f09759df5e29bdbda0322bd8f5865
  
https://github.com/NixOS/hydra/commit/3e6b24930c1f09759df5e29bdbda0322bd8f5865
  Author: Eelco Dolstra 
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
M doc/manual/style.css

  Log Message:
  ---
  Sync with the CSS of the Nix manual


  Commit: 770bc158485dae64486fae03cf891fe7216fd1db
  
https://github.com/NixOS/hydra/commit/770bc158485dae64486fae03cf891fe7216fd1db
  Author: Eelco Dolstra 
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
M doc/manual/Makefile.am

  Log Message:
  ---
  Number the sections


  Commit: 4ad8912aa3384e2fab1bf080814c40b81528f78b
  
https://github.com/NixOS/hydra/commit/4ad8912aa3384e2fab1bf080814c40b81528f78b
  Author: Eelco Dolstra 
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
M doc/manual/installation.xml
M doc/manual/projects.xml

  Log Message:
  ---
  Fix indentation


Compare: https://github.com/NixOS/hydra/compare/b591c44...4ad8912
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r34063 - in homepage/trunk: . css nixos

2012-05-11 Thread Eelco Dolstra
Author: eelco
Date: Fri May 11 21:56:23 2012
New Revision: 34063
URL: https://nixos.org/websvn/nix/?rev=34063&sc=1

Log:
* CSS tweaks.

Modified:
   homepage/trunk/css/nix-common.css
   homepage/trunk/css/nixos-site.css
   homepage/trunk/news.xml
   homepage/trunk/nixos/index.tt

Modified: homepage/trunk/css/nix-common.css
==
--- homepage/trunk/css/nix-common.css   Fri May 11 21:42:00 2012(r34062)
+++ homepage/trunk/css/nix-common.css   Fri May 11 21:56:23 2012(r34063)
@@ -51,14 +51,8 @@
 text-align: center;
 }
 
-a {
-text-decoration: none; 
-}
-
-a:hover, a:visited:hover {
-text-decoration: underline;
-}
-
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
 a:link { color: #0048b3; }
 a:visited { color: #002a6a; }
 a.no-hover:hover { background: none; }
@@ -82,6 +76,8 @@
 padding: 6px 6px;
 color: #60;
 background: #f4f4f8;
+border-radius: 0.4em;
+box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 /* Consistent font size for monospaced elements.  See

Modified: homepage/trunk/css/nixos-site.css
==
--- homepage/trunk/css/nixos-site.css   Fri May 11 21:42:00 2012(r34062)
+++ homepage/trunk/css/nixos-site.css   Fri May 11 21:56:23 2012(r34063)
@@ -1,5 +1,5 @@
 body {
-background-color: gray;
+background-color: #707070;
 margin: 0;
 }
 
@@ -13,10 +13,8 @@
 border: 1px solid black;
 padding: 1em;
 border-radius: 1em;
--moz-border-radius: 1em;
--webkit-border-radius: 1em;
--moz-box-shadow: #404040 0px 5px 50px;
--webkit-box-shadow: #404040 0px 5px 50px;
+border-radius: 1em;
+box-shadow: #404040 0px 5px 50px;
 }
 
 /* The header. */
@@ -133,7 +131,7 @@
 }
 
 /* Inline (floating) images. */
-img.inline, img.inlineNoBorder {
+img.inline {
 float: right;
 margin-left: 1em;
 margin-bottom: 1em;
@@ -160,3 +158,7 @@
 border: 0px;
 border-bottom: 1px dotted black;
 }
+
+table.screenshots img, img.screenshot {
+box-shadow: 0.4em 0.4em 0.5em #a0a0a0;
+}

Modified: homepage/trunk/news.xml
==
--- homepage/trunk/news.xml Fri May 11 21:42:00 2012(r34062)
+++ homepage/trunk/news.xml Fri May 11 21:56:23 2012(r34063)
@@ -24,7 +24,7 @@
 Hydra talk at Inria
 
   http://hydra.nixos.org/";>
-  
   
   Ludovic Courtès gave a talk on Moving to GitHub
 
   https://github.com/";>
-  https://assets.github.com/images/modules/about_page/octocat.png"; 
alt="GitHub
+  https://assets.github.com/images/modules/about_page/octocat.png"; 
alt="GitHub
   logo"/>
   
   The NixOS project is (slowly) migrating from Subversion to Git!
@@ -80,7 +80,7 @@
   FOSDEM talk about NixOS
 
 
-  http://fosdem.org/2011";>
+  http://fosdem.org/2011";>
   http://www.st.ewi.tudelft.nl/~sander/";>Sander van der
   Burg gave a talk about NixOS at the http://fosdem.org/2011/schedule/track/crossdistro_devroom";>CrossDistro
@@ -126,7 +126,7 @@
   Xfce in NixOS
 
 
-  http://www.xfce.org/";>
+  http://www.xfce.org/";>
   NixOS now supports http://www.xfce.org/";>Xfce, a
   modern, light-weight desktop environment.  It can be enabled by
   setting the NixOS configuration value
@@ -214,7 +214,7 @@
 
 
   
-   Long overdue, the Nix project finally has a logo!
   The logo was originally created by http://arbitrary.name/";>Simon Frankau for the 
   
 
@@ -307,7 +307,7 @@
 
   
 
@@ -338,7 +338,7 @@
 
 
   http://hydra.nixos.org/";>
-  
 
   
 
   http://www.icfpconference.org/icfp2008/";>http://www.icfpconference.org/icfp2008/icfplarge.gif";
   alt="ICFP logo" />
 
@@ -557,7 +557,7 @@
   
 
   
 
@@ -622,7 +622,7 @@
   
 
   
 
@@ -656,7 +656,7 @@
   
 
   
 
@@ -727,7 +727,7 @@
 
   
 
-  http://www.kde.org";>http://www.kde.org";>
 
@@ -759,7 +759,7 @@
 
   
 
@@ -818,7 +818,7 @@
 
http://www.flickr.com/photos/eelcovisser/367433201/";>http://farm1.static.flickr.com/185/367433201_9ee5ad0986_m.jpg";
alt="New build farm" />To quote Eelco Visser: new
hardware for buildfarm at Delft University of Technology has

Modified: homepage/trunk/nixos/index.tt
==
--- homepage/trunk/nixos/index.tt   Fri May 11 21:42:00 2012(r34062)
+++ homepage/trunk/nixos/index.tt   Fri May 11 21:56:23 2012(r34063)
@@ -3,7 +3,7 @@
 About NixOS
 
 
-NixOS is an experimental GNU/Linux distribution that aims to improve
 the state of the art in system configuration management.  In existing
@@ -88,7 +88,7 @@
 $ nixos-rebuild switch --rollba

[Nix-commits] SVN commit: nix - r34062 - nixpkgs/trunk/doc

2012-05-11 Thread Eelco Dolstra
Author: eelco
Date: Fri May 11 21:42:00 2012
New Revision: 34062
URL: https://nixos.org/websvn/nix/?rev=34062&sc=1

Log:
* Sync CSS with the Nix manual.

Modified:
   nixpkgs/trunk/doc/introduction.xml
   nixpkgs/trunk/doc/language-support.xml
   nixpkgs/trunk/doc/manual.xml
   nixpkgs/trunk/doc/package-notes.xml
   nixpkgs/trunk/doc/style.css

Modified: nixpkgs/trunk/doc/introduction.xml
==
--- nixpkgs/trunk/doc/introduction.xml  Fri May 11 13:41:24 2012(r34061)
+++ nixpkgs/trunk/doc/introduction.xml  Fri May 11 21:42:00 2012(r34062)
@@ -7,13 +7,13 @@
 This manual tells you how to write packages for the Nix Packages
 collection (Nixpkgs).  Thus it’s for packagers and developers who want
 to add packages to Nixpkgs.  End users are kindly referred to the
-http://nixos.org/releases/nix/unstable/manual/";>Nix
+http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual";>Nix
 manual.
 
 This manual does not describe the syntax and semantics of the
 Nix expression language, which are given in the Nix manual in the
 http://nixos.org/releases/nix/unstable/manual/#chap-writing-nix-expressions";>chapter
+xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions";>chapter
 on writing Nix expressions.  It only describes the facilities
 provided by Nixpkgs to make writing packages easier, such as the
 standard build environment (stdenv).

Modified: nixpkgs/trunk/doc/language-support.xml
==
--- nixpkgs/trunk/doc/language-support.xml  Fri May 11 13:41:24 2012
(r34061)
+++ nixpkgs/trunk/doc/language-support.xml  Fri May 11 21:42:00 2012
(r34062)
@@ -196,6 +196,7 @@
 
 
 
+
 
 
 

Modified: nixpkgs/trunk/doc/manual.xml
==
--- nixpkgs/trunk/doc/manual.xmlFri May 11 13:41:24 2012(r34061)
+++ nixpkgs/trunk/doc/manual.xmlFri May 11 21:42:00 2012(r34062)
@@ -14,14 +14,12 @@
 Dolstra
   
   
-Delft University of Technology
-Department of Software Technology
+LogicBlox
   
 
 
 
-  2008
-  2009
+  2008-2012
   Eelco Dolstra
 
 

Modified: nixpkgs/trunk/doc/package-notes.xml
==
--- nixpkgs/trunk/doc/package-notes.xml Fri May 11 13:41:24 2012(r34061)
+++ nixpkgs/trunk/doc/package-notes.xml Fri May 11 21:42:00 2012(r34062)
@@ -224,19 +224,23 @@
 
 
 
+
 
 
 
 
+
 
 
 

Modified: nixpkgs/trunk/doc/style.css
==
--- nixpkgs/trunk/doc/style.css Fri May 11 13:41:24 2012(r34061)
+++ nixpkgs/trunk/doc/style.css Fri May 11 21:42:00 2012(r34062)
@@ -8,15 +8,14 @@
 
 body
 {
-font-family: sans-serif;
+font-family: "Nimbus Sans L", sans-serif;
 background: white;
 margin: 2em 1em 2em 1em;
 }
 
-h1,h2,h3
+h1, h2, h3, h4
 {
 color: #005aa0;
-text-align: left;
 }
 
 h1 /* title */
@@ -46,6 +45,11 @@
 font-size: 125%;
 }
 
+div.simplesect h2
+{
+font-size: 110%;
+}
+
 div.appendix h3
 {
 font-size: 150%;
@@ -70,11 +74,13 @@
 
 div.example
 {
-border: 1px solid #6185a0;
+border: 1px solid #b0b0b0;
 padding: 6px 6px;
 margin-left: 1.5em;
 margin-right: 1.5em;
 background: #f4f4f8;
+border-radius: 0.4em;
+box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 div.example p.title
@@ -82,6 +88,11 @@
 margin-top: 0em;
 }
 
+div.example pre
+{
+box-shadow: none;
+}
+
 
 /***
 Screen dumps:
@@ -89,14 +100,15 @@
 
 pre.screen, pre.programlisting
 {
-border: 1px solid #6185a0;
+border: 1px solid #b0b0b0;
 padding: 3px 3px;
 margin-left: 1.5em;
 margin-right: 1.5em;
 color: #60;
 background: #f4f4f8;
 font-family: monospace;
-/* font-size: 90%; */
+border-radius: 0.4em;
+box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 div.example pre.programlisting
@@ -113,13 +125,15 @@
 
 .note, .warning
 {
-border: 1px solid #6185a0;
+border: 1px solid #b0b0b0;
 padding: 3px 3px;
 margin-left: 1.5em;
 margin-right: 1.5em;
 margin-bottom: 1em;
 padding: 0.3em 0.3em 0.3em 0.3em;
 background: #f5;
+border-radius: 0.4em;
+box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 div.note, div.warning
@@ -131,7 +145,6 @@
 {
 color: red;
 font-size: 100%;
-//margin: 0 0 0 0;
 padding-right: 0.5em;
 display: inline;
 }
@@ -162,20 +175,26 @@
 Links colors and highlighting: 
  ***/
 
+a { text-decorat

[Nix-commits] [NixOS/nix] 2b00e6: CSS tweaks

2012-05-11 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: 2b00e6990c7b6f7177bce76126c6c992f3f7a93e
  
https://github.com/NixOS/nix/commit/2b00e6990c7b6f7177bce76126c6c992f3f7a93e
  Author: Eelco Dolstra 
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
M doc/manual/style.css

  Log Message:
  ---
  CSS tweaks


  Commit: 8a08813d6c92e583d9ed6ccaffc80effe0dc9669
  
https://github.com/NixOS/nix/commit/8a08813d6c92e583d9ed6ccaffc80effe0dc9669
  Author: Eelco Dolstra 
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
M doc/manual/installation.xml
M doc/manual/introduction.xml
M doc/manual/manual.xml
M doc/manual/quick-start.xml
M doc/manual/style.css
M doc/manual/writing-nix-expressions.xml

  Log Message:
  ---
  Manual updates


  Commit: 587b408210ee3707df78c78cca9d6082e44e0233
  
https://github.com/NixOS/nix/commit/587b408210ee3707df78c78cca9d6082e44e0233
  Author: Eelco Dolstra 
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
M doc/manual/release-notes.xml

  Log Message:
  ---
  Set release date


Compare: https://github.com/NixOS/nix/compare/58d1de0...587b408
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] GHC 7.4.1 and Haskell Platform

2012-05-11 Thread Andres Loeh
Hi Peter.

I agree completely with your definitions of "supported" and
"experimental" and also with how you want to apply them for the
Haskell packages.

>  > So, as I said before, I'll make a extra set of defaults for 7.4.1 which
>  > is supposed to grow into the platform defaults, and you'll have a
>  > choice which of the two to use.
>
> Very nice, that solution allows us to eat our cake and have it too. :-)

I want to clean up the overall structure of that part of
haskell-packages.nix a bit, so give me a few days :)

Cheers,
  Andres
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] What kind of "install" do we have in freebsd stdenv?

2012-05-11 Thread James Cook
On 11 May 2012 13:11, Peter Simons  wrote:
> Hi James,
>
>  > FreeBSD has its own core software, with some differences from GNU
>  > coreutils: for example, tar by default writes to a tape drive instead
>  > of stdout, and the default /bin/sh is simpler than bash.
>
> thank you for the explanation. I guess, what I wonder is: should the feature
> set of the tools available in *stdenv* vary from one platform to the other?
> Wouldn't it be easier to write robust build scripts if 'install' would
> always understand -D? In other words, shouldn't coreutils be part of stdenv
> on FreeBSD?
>
> Take care,
> Peter

I'm not using FreeBSD at the moment; maybe someone who is can comment?

I remember from when I was using FreeBSD with nix that these
differences caused a lot of little problems; I'd often have to make
little changes to nixpkgs to get things working. Also, last I checked,
stdenv on FreeBSD just used standard paths like /usr/bin/sed (is this
considered an impurity?). So switching to GNU coreutils would increase
the size of stdenv on FreeBSD, but would result in more consistency
between systems.

One advantage to keeping FreeBSD's stdenv more BSD-ish is it would
check that things are portable and not GNU-specific. Probably not
realistic unless we've got some really active FreeBSD users though.

James
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] GHC 7.4.1 and Haskell Platform

2012-05-11 Thread Peter Simons
Hi Andres,

 > Our policy in the past has always been to support the latest Haskell
 > Platform version and treat everything beyond that as experimental.

it's probably worth defining the terms we're using to ensure we're both
talking about the same thing. I'll offer my interpretation of the terms
"supported" and "experimental" to get the discussion started.

When a certain Haskell environment in Nix is supported, it means that
people can expect that environment to install cleanly and function
properly. If that turns out not to be the case, then people can expect
that we remedy those problems quickly once they've been discovered.

When a certain Haskell environment in Nix is dubbed "experimental", then
it may or may not install cleanly and it may or may not work fine. When
problems are discovered, we may or may not try to fix them.

Now, using those meanings, I agree that only the latest Haskell Platform
environment is supported. When someone complains about a bug in an older
version, I may try to fix it if it's simple and straightforward, but if I
have better things to do, then I just won't. If the most recent HP
environment is broken, though, I'll be far more willing to fix it.

In other words, I too consider GHC 7.4.1 to be still experimental using
those meanings.

Nonetheless, I have a vested interest in GHC 7.4.1. Despite its
experimental nature that environment is in pretty good shape, and I'd
prefer not to break it unless there is substantial reason to do so.


 > So, as I said before, I'll make a extra set of defaults for 7.4.1 which
 > is supposed to grow into the platform defaults, and you'll have a
 > choice which of the two to use.

Very nice, that solution allows us to eat our cake and have it too. :-)

Take care,
Peter

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] What kind of "install" do we have in freebsd stdenv?

2012-05-11 Thread Peter Simons
Hi James,

 > FreeBSD has its own core software, with some differences from GNU
 > coreutils: for example, tar by default writes to a tape drive instead
 > of stdout, and the default /bin/sh is simpler than bash.

thank you for the explanation. I guess, what I wonder is: should the feature
set of the tools available in *stdenv* vary from one platform to the other?
Wouldn't it be easier to write robust build scripts if 'install' would
always understand -D? In other words, shouldn't coreutils be part of stdenv
on FreeBSD?

Take care,
Peter

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] What kind of "install" do we have in freebsd stdenv?

2012-05-11 Thread James Cook
On 11 May 2012 09:27, Peter Simons  wrote:
> Hi,
>
> I noticed that the 'install' program on FreeBSD doesn't know about the -D 
> option:
>
>  | building /nix/store/bnjpkv3k0r0p37845ikjasz75nbw3dpy-pigz-2.2.4
>  | unpacking sources
>  | unpacking source archive 
> /nix/store/s6f67xkj6cknghhm8r2x0wzz2sbzjl1k-pigz-2.2.4.tar.gz
>  | source root is pigz-2.2.4
>  | patching sources
>  | configuring
>  | no configure script, doing nothing
>  | building
>  | make flags:
>  | cc -O3 -Wall -Wextra   -c -o pigz.o pigz.c
>  | cc -O3 -Wall -Wextra   -c -o yarn.o yarn.c
>  | cc -o pigz pigz.o yarn.o -lpthread -lz
>  | ln -f pigz unpigz
>  | installing
>  | install: illegal option -- D
>  | usage: install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]
>  |                [-o owner] file1 file2
>  |        install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]
>  |                [-o owner] file1 ... fileN directory
>  |        install -d [-v] [-g group] [-m mode] [-o owner] directory ...
>  | builder for `/nix/store/86fx4xz3aaknkf1z2hm4k01yrl4x142z-pigz-2.2.4.drv' 
> failed with exit code 64
>  | error: build of 
> `/nix/store/86fx4xz3aaknkf1z2hm4k01yrl4x142z-pigz-2.2.4.drv' failed
>
> I am surprised! On Linux, 'install' is part of coreutils. Shouldn't that
> package be part of stdenv on other operating systems, too?
>
> Take care,
> Peter

FreeBSD has its own core software, with some differences from GNU
coreutils: for example, tar by default writes to a tape drive instead
of stdout, and the default /bin/sh is simpler than bash.  The man page
for FreeBSD's install is here:

http://www.freebsd.org/cgi/man.cgi?query=install&apropos=0&sektion=0&manpath=FreeBSD+9.0-RELEASE&arch=default&format=html

James
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] GHC 7.4.1 and Haskell Platform (was: [Nix-commits] SVN commit: nix - r34059 - nixpkgs/trunk/pkgs/top-level)

2012-05-11 Thread Andres Loeh
Hi.

>  > I don't think we've ever made a decision to "support" 7.4.1 already. You
>  > seem to see this differently.
>
> Yes, exactly. I've been supporting GHC 7.4.1 for quite a while. I use it
> myself, and I support it in the sense that I don't commit any updates
> without testing first how they affect the 7.4.1 environment. I use monad-par
> in several of my projects, and I also heavily depend on Pandoc. The mtl
> update breaks those two packages, leaving me with a non-functional working
> environment! That situation is very unpleasant for me.
>
> Given the fact that the new HP standard hasn't been released yet, I feel
> that having a usable system is more important than conformance. That
> judgment is probably going to change once a new HP release has been made,
> but until then I'd rather have a system that actually works.

Our policy in the past has always been to support the latest Haskell
Platform version and treat everything beyond that as experimental. I'm
ok if you want to change that, but this wasn't a conscious decision we
ever made. In the future, we should try to be more clear about that.

So, as I said before, I'll make a extra set of defaults for 7.4.1
which is supposed to grow into the platform defaults, and you'll have
a choice which of the two to use.

Cheers,
  Andres
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-dev] What kind of "install" do we have in freebsd stdenv?

2012-05-11 Thread Peter Simons
Hi,

I noticed that the 'install' program on FreeBSD doesn't know about the -D 
option:

 | building /nix/store/bnjpkv3k0r0p37845ikjasz75nbw3dpy-pigz-2.2.4
 | unpacking sources
 | unpacking source archive 
/nix/store/s6f67xkj6cknghhm8r2x0wzz2sbzjl1k-pigz-2.2.4.tar.gz
 | source root is pigz-2.2.4
 | patching sources
 | configuring
 | no configure script, doing nothing
 | building
 | make flags:
 | cc -O3 -Wall -Wextra   -c -o pigz.o pigz.c
 | cc -O3 -Wall -Wextra   -c -o yarn.o yarn.c
 | cc -o pigz pigz.o yarn.o -lpthread -lz
 | ln -f pigz unpigz
 | installing
 | install: illegal option -- D
 | usage: install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]
 |[-o owner] file1 file2
 |install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]
 |[-o owner] file1 ... fileN directory
 |install -d [-v] [-g group] [-m mode] [-o owner] directory ...
 | builder for `/nix/store/86fx4xz3aaknkf1z2hm4k01yrl4x142z-pigz-2.2.4.drv' 
failed with exit code 64
 | error: build of `/nix/store/86fx4xz3aaknkf1z2hm4k01yrl4x142z-pigz-2.2.4.drv' 
failed

I am surprised! On Linux, 'install' is part of coreutils. Shouldn't that
package be part of stdenv on other operating systems, too?

Take care,
Peter

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-dev] GHC 7.4.1 and Haskell Platform (was: [Nix-commits] SVN commit: nix - r34059 - nixpkgs/trunk/pkgs/top-level)

2012-05-11 Thread Peter Simons
Hi Andres,

 >> The new versions of mtl and transformers break many important packages,
 >> such as monad-par, graphviz, pandoc, and all other packages that depend
 >> on any of those. This situation causes serious problems for me, because
 >> I depend on some of those packages for my daily work. IMHO, it is an
 >> overreaction to have all those builds fail, because some day in the
 >> future a new version of Haskell Platform *may* be released that *may*
 >> recommend the latest versions of 'transformers' and 'mtl'.
 >
 > You make it sound like I'm inventing things. Sure, it hasn't been
 > released yet, and there's been some discussion about these packages in
 > particular. Nevertheless, it's very likely that it happens, and it's
 > likely that it happens this month.

obviously, there are plans to release a new version of Haskell Platform. I
don't doubt that -- all I meant to emphasize is that this release hasn't
happened yet.

Generally speaking, there is a strong interest to conform to HP, because it
provides stability and predictability. We deviate from HP only when there is
a very compelling reason to do so.

Another interest of ours, however, is that we want to provide a usable
system, i.e. a package database that people can actually install and use.

Those two interests conflict. The upcoming HP standard is probably going to
mandate use of mtl 2.x and transformers 3.x -- so we have an interest in
using those packages in haskellPlatformArgs_future. On the other hand,
configuring GHC 7.4.1 to use those packages right now breaks a lot of other
packages, some of which are extremely popular, like monad-par, graphviz,
Pandoc, and everything else that depends on those. This gives us an
incentive *not* to update mtl and transformers right now.

Now, in order to decide whether we should update mtl today or not, we have
to weigh Haskell Platform conformance against usability.


 > I don't think we've ever made a decision to "support" 7.4.1 already. You
 > seem to see this differently.

Yes, exactly. I've been supporting GHC 7.4.1 for quite a while. I use it
myself, and I support it in the sense that I don't commit any updates
without testing first how they affect the 7.4.1 environment. I use monad-par
in several of my projects, and I also heavily depend on Pandoc. The mtl
update breaks those two packages, leaving me with a non-functional working
environment! That situation is very unpleasant for me.

Given the fact that the new HP standard hasn't been released yet, I feel
that having a usable system is more important than conformance. That
judgment is probably going to change once a new HP release has been made,
but until then I'd rather have a system that actually works.

Take care,
Peter

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nix] 58d1de: Use perl.libPrefix to (hopefully) fix the Cygwin b...

2012-05-11 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: 58d1de08d9ec4ce1bfbfb65b0b74700f066af7d0
  
https://github.com/NixOS/nix/commit/58d1de08d9ec4ce1bfbfb65b0b74700f066af7d0
  Author: Eelco Dolstra 
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
M release.nix

  Log Message:
  ---
  Use perl.libPrefix to (hopefully) fix the Cygwin build

http://hydra.nixos.org/build/2602599



___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r34061 - in nixpkgs/trunk/pkgs/development/interpreters/perl: 5.10 5.14 5.8 sys-perl

2012-05-11 Thread Eelco Dolstra
Author: eelco
Date: Fri May 11 13:41:24 2012
New Revision: 34061
URL: https://nixos.org/websvn/nix/?rev=34061&sc=1

Log:
* Perl: set passthru.libPrefix to communicate the relative location of
  Perl packages for $PERL5LIB.

Modified:
   nixpkgs/trunk/pkgs/development/interpreters/perl/5.10/default.nix
   nixpkgs/trunk/pkgs/development/interpreters/perl/5.14/default.nix
   nixpkgs/trunk/pkgs/development/interpreters/perl/5.8/default.nix
   nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/default.nix
   nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh

Modified: nixpkgs/trunk/pkgs/development/interpreters/perl/5.10/default.nix
==
--- nixpkgs/trunk/pkgs/development/interpreters/perl/5.10/default.nix   Fri May 
11 13:04:35 2012(r34060)
+++ nixpkgs/trunk/pkgs/development/interpreters/perl/5.10/default.nix   Fri May 
11 13:41:24 2012(r34061)
@@ -57,4 +57,6 @@
 '';
 
   setupHook = ./setup-hook.sh;
+
+  passthru.libPrefix = "lib/perl5/site_perl";
 }

Modified: nixpkgs/trunk/pkgs/development/interpreters/perl/5.14/default.nix
==
--- nixpkgs/trunk/pkgs/development/interpreters/perl/5.14/default.nix   Fri May 
11 13:04:35 2012(r34060)
+++ nixpkgs/trunk/pkgs/development/interpreters/perl/5.14/default.nix   Fri May 
11 13:41:24 2012(r34061)
@@ -58,4 +58,6 @@
 '';
 
   setupHook = ./setup-hook.sh;
+
+  passthru.libPrefix = "lib/perl5/site_perl";
 }

Modified: nixpkgs/trunk/pkgs/development/interpreters/perl/5.8/default.nix
==
--- nixpkgs/trunk/pkgs/development/interpreters/perl/5.8/default.nixFri May 
11 13:04:35 2012(r34060)
+++ nixpkgs/trunk/pkgs/development/interpreters/perl/5.8/default.nixFri May 
11 13:41:24 2012(r34061)
@@ -62,4 +62,6 @@
   ];
 
   setupHook = ./setup-hook.sh;
+
+  passthru.libPrefix = "lib/perl5/site_perl";
 }

Modified: nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/default.nix
==
--- nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/default.nix   
Fri May 11 13:04:35 2012(r34060)
+++ nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/default.nix   
Fri May 11 13:41:24 2012(r34061)
@@ -1,6 +1,6 @@
 { stdenv }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "perl";
 
   unpackPhase = "true";
@@ -12,4 +12,8 @@
 '';
 
   setupHook = ./setup-hook.sh;
+
+  libPrefix = "lib/perl5/site_perl/5.10/i686-cygwin";
+
+  passthru.libPrefix = libPrefix;
 }

Modified: 
nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh
==
--- nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh 
Fri May 11 13:04:35 2012(r34060)
+++ nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh 
Fri May 11 13:41:24 2012(r34061)
@@ -1,5 +1,5 @@
 addPerlLibPath () {
-addToSearchPath PERL5LIB $1/lib/perl5/site_perl/5.10/i686-cygwin
+addToSearchPath PERL5LIB $1/@libPrefix@
 }
 
 envHooks=(${envHooks[@]} addPerlLibPath)
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] [Nix-commits] SVN commit: nix - r34059 - nixpkgs/trunk/pkgs/top-level

2012-05-11 Thread Andres Loeh
> The new versions of mtl and transformers break many important packages, such 
> as
> monad-par, graphviz, pandoc, and all other packages that depend on any of 
> those.
> This situation causes serious problems for me, because I depend on some of 
> those
> packages for my daily work. IMHO, it is an overreaction to have all those 
> builds
> fail, because some day in the future a new version of Haskell Platform *may* 
> be
> released that *may* recommend the latest versions of 'transformers' and 'mtl'.

You make it sound like I'm inventing things. Sure, it hasn't been
released yet, and there's been some discussion about these packages in
particular. Nevertheless, it's very likely that it happens, and it's
likely that it happens this month.

> As
> long as those changes have such profound negative effects on our packages, 
> those
> upgrades should be deferred. This approach seems consistent with the way we've
> handled these matters things in the past, too. For example, we happily break
> conformance with older versions of HP, when those changes are beneficial for
> users. In other words, we have usually valued usability over strict 
> conformance
> before, and IMHO that is a sensible policy.

While I think that's ok for old versions of GHC, I don't think we
should deviate from the "current" platform if at all possible.

> I agree that it's nice to test what kind of trouble these upgrades cause, but 
> I
> don't believe that 'trunk' is the right place to perform those tests. The 
> breakage
> these changes cause affect users who rely on Nixpkgs to provide a stable 
> working
> environment.

Well, the only reason ghc-7.4.1 is currently in nixpkgs is for
testing. It's clearly marked as low priority. If people are using it
already, it's at their own risk. I don't think we've ever made a
decision to "support" 7.4.1 already. You seem to see this differently.
I think the solution here is to create two separate sets of defaults,
one aimed at platform conformance, and one aimed at maximal
compatibility with existing packages.

Cheers,
  Andres
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] SVN commit: nix - r34060 - in nixpkgs/trunk/pkgs: development/libraries/haskell/MemoTrie development/libraries/haskell/WebBits development/libraries/haskell/haskell-src-exts development/

2012-05-11 Thread Peter Simons
Author: simons
Date: Fri May 11 13:04:35 2012
New Revision: 34060
URL: https://nixos.org/websvn/nix/?rev=34060&sc=1

Log:
Updated Haskell packages.

 - haskell-src-exts: updated to version 1.13.3
 - MemoTrie: updated to version 0.5
 - semigroups: updated to version 0.8.3.2
 - tagged: updated to version 0.4.2.1
 - vector-space: updated to version 0.8.1
 - WebBits: updated to version 2.2

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/2.2.nix
  - copied, changed from r34059, 
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/2.1.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.3.nix
  - copied, changed from r34059, 
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix
Deleted:
   nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/2.1.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix
Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/MemoTrie/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/semigroups/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/tagged/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/vector-space/default.nix
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/MemoTrie/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/MemoTrie/default.nix   
Fri May 11 13:04:28 2012(r34059)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/MemoTrie/default.nix   
Fri May 11 13:04:35 2012(r34060)
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MemoTrie";
-  version = "0.4.12";
-  sha256 = "0wjpfy1vlk3fjbdj924viv1wji28kx3w9hsaz7hd0gfs77y9vjza";
+  version = "0.5";
+  sha256 = "07knq5ccsyicznvr25vlbzadrgdw2aic71hhbv6v16wra1f17gbf";
   buildDepends = [ void ];
   meta = {
 homepage = "http://haskell.org/haskellwiki/MemoTrie";;

Copied and modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/2.2.nix (from r34059, 
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/2.1.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/2.1.nixFri May 
11 13:04:28 2012(r34059, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/2.2.nixFri May 
11 13:04:35 2012(r34060)
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "WebBits";
-  version = "2.1";
-  sha256 = "18m19fck9zb6jh8bfd47nja1q6ab1jmd0q5r3k8m5674i6273hyn";
+  version = "2.2";
+  sha256 = "1frmnjbpgm76dzs1p4766fb6isqc3pxv4dnj8sdhnfliv5j0xv2z";
   buildDepends = [ mtl parsec syb ];
   meta = {
-homepage = "http://www.cs.brown.edu/research/plt/";;
+homepage = "http://github.com/brownplt/webbits";;
 description = "JavaScript analysis tools";
 license = self.stdenv.lib.licenses.bsd3;
 platforms = self.ghc.meta.platforms;

Copied and modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.3.nix 
(from r34059, 
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix)
==
--- 
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix
Fri May 11 13:04:28 2012(r34059, copy source)
+++ 
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.3.nix
Fri May 11 13:04:35 2012(r34060)
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-exts";
-  version = "1.13.2";
-  sha256 = "1vq4qagbypm8lp4dr6zjd6mhgiv096a2cpyfvfs3yq06iqv5x602";
+  version = "1.13.3";
+  sha256 = "0z2vs6ji0dgm3c11jwcq5jcnjr8a6pawrkn3c8a3a5p612v8d495";
   buildDepends = [ cpphs ];
   buildTools = [ happy ];
   meta = {

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/semigroups/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/semigroups/default.nix 
Fri May 11 13:04:28 2012(r34059)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/semigroups/default.nix 
Fri May 11 13:04:35 2012(r34060)
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroups";
-  version = "0.8.3.1";
-  sha256 = "0gl2s6vd2cswb4qmkndfgnx9a747f4vhbx52lvixyq3sbgz1vain";
+  version = "0.8.3.2";
+  sha256 = "0g433l4rinc6r2yr91jnl6wh5b2kn5vsrp08cmznkgaz45lb7n7c";
   meta = {
 homepage = "http://github.com/ekmett/semigroups/";;
 description = "Haskell 98 semigroups";

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/tagged/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/tagged/default.nix Fri May 
11 13:04:28 2012(r34059)
+++ nixp

[Nix-commits] SVN commit: nix - r34059 - nixpkgs/trunk/pkgs/top-level

2012-05-11 Thread Peter Simons
Author: simons
Date: Fri May 11 13:04:28 2012
New Revision: 34059
URL: https://nixos.org/websvn/nix/?rev=34059&sc=1

Log:
haskell-packages: downgrade 'mtl' and 'transformers' in GHC 7.4.1 environment 
to fix build errors

The new versions of mtl and transformers break many important packages, such as
monad-par, graphviz, pandoc, and all other packages that depend on any of those.
This situation causes serious problems for me, because I depend on some of those
packages for my daily work. IMHO, it is an overreaction to have all those builds
fail, because some day in the future a new version of Haskell Platform *may* be
released that *may* recommend the latest versions of 'transformers' and 'mtl'. 
As
long as those changes have such profound negative effects on our packages, those
upgrades should be deferred. This approach seems consistent with the way we've
handled these matters things in the past, too. For example, we happily break
conformance with older versions of HP, when those changes are beneficial for
users. In other words, we have usually valued usability over strict conformance
before, and IMHO that is a sensible policy.

I agree that it's nice to test what kind of trouble these upgrades cause, but I
don't believe that 'trunk' is the right place to perform those tests. The 
breakage
these changes cause affect users who rely on Nixpkgs to provide a stable working
environment.

Modified:
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Fri May 11 12:16:09 
2012(r34058)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Fri May 11 13:04:28 
2012(r34059)
@@ -157,8 +157,8 @@
 zlib = self.zlib_0_5_3_3;   # 7.4.1 ok
 HTTP = self.HTTP_4000_2_3;  # 7.4.1 ok
 text = self.text_0_11_2_0;  # 7.4.1 ok
-transformers = self.transformers_0_3_0_0;   # 7.4.1 ok
-mtl  = self.mtl_2_1_1;  # 7.4.1 ok
+transformers = self.transformers_0_2_2_0;   # 7.4.1 ok
+mtl  = self.mtl_2_0_1_0;# 7.4.1 ok
 random   = self.random_1_0_1_1; # 7.4.1 ok
 cabalInstall = self.cabalInstall_0_14_0;# 7.4.1 ok
 alex = self.alex_3_0_1; # 7.4.1 ok
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r34058 - nixpkgs/trunk/pkgs/tools/compression/pigz

2012-05-11 Thread Peter Simons
Author: simons
Date: Fri May 11 12:16:09 2012
New Revision: 34058
URL: https://nixos.org/websvn/nix/?rev=34058&sc=1

Log:
pigz: updated to version 2.2.4

Modified:
   nixpkgs/trunk/pkgs/tools/compression/pigz/default.nix

Modified: nixpkgs/trunk/pkgs/tools/compression/pigz/default.nix
==
--- nixpkgs/trunk/pkgs/tools/compression/pigz/default.nix   Fri May 11 
09:31:37 2012(r34057)
+++ nixpkgs/trunk/pkgs/tools/compression/pigz/default.nix   Fri May 11 
12:16:09 2012(r34058)
@@ -1,18 +1,19 @@
-{stdenv, fetchurl, zlib}:
+{ stdenv, fetchurl, zlib, utillinux }:
 
 let name = "pigz";
-version = "2.1.6";
+version = "2.2.4";
 in
 stdenv.mkDerivation {
   name = name + "-" + version;
 
   src = fetchurl {
 url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz";;
-sha256 = 
"2ff1ba812407848787fe6719fde4436cb7c490e6d8c6e721f4e4309caa5f3640";
+sha256 = 
"7e7967c47f66c07be97cbfa25c8816b72f9d35258466ea31eddc7666c914160e";
   };
 
-  buildInputs = [zlib];
-  doCheck = false;  # The makefile is broken in 2.1.5. Should be fixed 
upstream.
+  buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux;
+
+  doCheck = stdenv.isLinux;
   checkTarget = "tests";
   installPhase =
   ''
@@ -24,7 +25,10 @@
   '';
 
   meta = {
-homepage = http://www.zlib.net/pigz/;
+homepage = "http://www.zlib.net/pigz/";;
 description = "A parallel implementation of gzip for multi-core machines";
+
+platforms = stdenv.lib.platforms.unix;
+maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] handling /usr/lib/foo-plugins

2012-05-11 Thread Marc Weber
The most simple way would be patching it to find its library in PATHs
relative to PATH. Then it would not matter where the .so libraries are
installed (system wide or user only).

However if the plugin versions don't match the viewer version you'll be
in trouble. That's why the alternative "wrapper" and env var could work
as well:

Eg I use this for gimp:
   (pkgs.gimpGit.withPlugins [ "ufraw" "lqrPlugin" "fourier" "resynthesizer" 
"waveletSharpen" /*"gmic"*/ ])

Then an env var or such within the wrapper could be used - or the
wrapper could be an experssion like profiles just symlinking the viewer
and plugins into an $out path.

The withPlugins name just assembles the wrapper.

Marc Weber
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/charon] 4cbb3f: Add us-east-1 NixOS EBS AMI.

2012-05-11 Thread Rob Vermaas
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/charon
  Commit: 4cbb3f4cc2f543094b1114e4514f028a832d4d55
  
https://github.com/NixOS/charon/commit/4cbb3f4cc2f543094b1114e4514f028a832d4d55
  Author: Rob Vermaas 
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
M nix/options.nix

  Log Message:
  ---
  Add us-east-1 NixOS EBS AMI.


  Commit: 1b9d0393382e4c6f9826b5455be80194665421b4
  
https://github.com/NixOS/charon/commit/1b9d0393382e4c6f9826b5455be80194665421b4
  Author: Rob Vermaas 
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
M charon/backends/ec2.py
M nix/options.nix

  Log Message:
  ---
  Merge branch 'master' of github.com:NixOS/charon


Compare: https://github.com/NixOS/charon/compare/e3597bc...1b9d039
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r34057 - nixpkgs/trunk/pkgs/development/tools/analysis/lcov

2012-05-11 Thread Ludovic Courtès
Author: ludo
Date: Fri May 11 09:31:37 2012
New Revision: 34057
URL: https://nixos.org/websvn/nix/?rev=34057&sc=1

Log:
LCOV: Fix FreeBSD patch.

Modified:
   nixpkgs/trunk/pkgs/development/tools/analysis/lcov/freebsd-install.patch

Modified: 
nixpkgs/trunk/pkgs/development/tools/analysis/lcov/freebsd-install.patch
==
--- nixpkgs/trunk/pkgs/development/tools/analysis/lcov/freebsd-install.patch
Fri May 11 03:36:13 2012(r34056)
+++ nixpkgs/trunk/pkgs/development/tools/analysis/lcov/freebsd-install.patch
Fri May 11 09:31:37 2012(r34057)
@@ -1,13 +1,13 @@
 FreeBSD's `install' doesn't support `-D'.  Thus, use GNU install instead,
 since `stdenv-native' assumes that `ginstall' is available.
 
 lcov-1.9/bin/install.sh2012-03-02 16:53:28.0 +0100
-+++ lcov-1.9/bin/install.sh2010-08-06 13:05:17.0 +0200
-@@ -34,7 +34,7 @@ do_install()
+--- lcov-1.9/bin/install.sh2010-08-06 13:05:17.0 +0200
 lcov-1.9/bin/install.sh2012-03-02 16:53:28.0 +0100
+@@ -34,6 +34,6 @@
local TARGET=$2
local PARAMS=$3
  
--  ginstall -p -D $PARAMS $SOURCE $TARGET
-+  install -p -D $PARAMS $SOURCE $TARGET
+-  install -p -D $PARAMS $SOURCE $TARGET
++  ginstall -p -D $PARAMS $SOURCE $TARGET
  }
  
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] What kills my xserver?

2012-05-11 Thread Arie Middelkoop
On 11/05/12 08:24, Michael Raskin wrote:
>> For me, I can still logout 90% of the time, loging out takes long (10
>> seconds or so) and it seems to crash the xserver at the end (display
>> flashing, second of text console visible), but then I'm back at the
>> kdm login screen where I can shutdown/reboot gracefully.
>
> I am not sure it is actually crashing X server. X server loves to run in
> the mode where it is shut down once the session dies.

Oh, I'm pretty sure that Mathijs and I have the same symptoms. I can 
also logout, but I'm too impatient to wait ten seconds ;-)

And yes, KDM is supposed to shutdown the X server (that's enabled in the 
kdmrc). However, the problem is that KDM notices that the server is 
already gone before it gets to that point, and subsequently sleeps 10 
seconds (there is a sleep(10) in the error handler) and then aborts the 
shutdown.

I'm used to shutting down my laptop, because I used to have a problem 
with skype after suspend (does not show up anymore lately), but also 
often cannot use my wireless until after I turned the machine off (cold 
restart). The latter still requires me to shutdown my machine rather 
regularly...

Arie
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] handling /usr/lib/foo-plugins

2012-05-11 Thread Yury G. Kudryashov
Sergey Mironov wrote:

> Hello list. I've tried to update zathura viewer
> (http://pwmt.org/projects/zathura/) from 0.01 to 0.1.2 but discovered
> that it is not that easy. Upstream developers decided to split the
> project into a GUI and a set of .so libraries (plugins for pdf- djvu-
> ps- etc). Those libraries are to be located in a shared dir
> (/usr/lib/zathura by default) and this is a problem.
Which algorithm does zathura use to locate plugins? ENV var? Hardcoded at 
compile time?
-- 
Yury G. Kudryashov,
mailto: ur...@mccme.ru

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/hydra] b591c4: Keep builds of disabled jobsets that are not hidde...

2012-05-11 Thread Rob Vermaas
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/hydra
  Commit: b591c443b0edf19c2f7fbdcfa2f69bd30807f1bf
  
https://github.com/NixOS/hydra/commit/b591c443b0edf19c2f7fbdcfa2f69bd30807f1bf
  Author: Rob Vermaas 
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
M src/script/hydra-update-gc-roots

  Log Message:
  ---
  Keep builds of disabled jobsets that are not hidden. Fixes #18.



___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits