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

2011-10-13 Thread Peter Simons 
Author: simons
Date: Thu Oct 13 07:26:44 2011
New Revision: 29802
URL: https://nixos.org/websvn/nix/?rev=29802&sc=1

Log:
nbd: we don't generate statically linked binaries for that package
anymore, so it's no longer necessary to pass a special version of glib
to the expression.

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

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Wed Oct 12 21:59:36 
2011(r29801)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 07:26:44 
2011(r29802)
@@ -1003,11 +1003,7 @@
 
   namazu = callPackage ../tools/text/namazu { };
 
-  nbd = callPackage ../tools/networking/nbd {
-glib = gtkLibs.glib.override {
-  stdenv = makeStaticBinaries stdenv;
-};
-  };
+  nbd = callPackage ../tools/networking/nbd { };
 
   netcdf = callPackage ../development/libraries/netcdf { };
 
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29803 - in nixpkgs/trunk/pkgs: tools/graphics/mscgen top-level

2011-10-13 Thread Peter Simons 
Author: simons
Date: Thu Oct 13 07:38:44 2011
New Revision: 29803
URL: https://nixos.org/websvn/nix/?rev=29803&sc=1

Log:
mscgen: added version 0.20

Added:
   nixpkgs/trunk/pkgs/tools/graphics/mscgen/
   nixpkgs/trunk/pkgs/tools/graphics/mscgen/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Added: nixpkgs/trunk/pkgs/tools/graphics/mscgen/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/graphics/mscgen/default.nixThu Oct 13 
07:38:44 2011(r29803)
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, flex, bison, gd, libpng, freetype, zlib }:
+
+let
+  version = "0.20";
+in
+stdenv.mkDerivation {
+  name = "mscgen-${version}";
+
+  src = fetchurl {
+url = "www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz";
+sha256 = 
"3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23";
+  };
+
+  buildInputs = [ flex bison gd libpng freetype zlib ];
+
+  doCheck = true;
+  preCheck = ''
+sed -i -e "s|#!/bin/bash|#!${stdenv.shell}|" test/renderercheck.sh
+  '';
+
+  meta = {
+homepage = "http://www.mcternan.me.uk/mscgen/";;
+description = "convert Message Sequence Chart descriptions into PNG, SVG, 
or EPS images";
+license = "GPLv2";
+
+longDescription = ''
+  Mscgen is a small program that parses Message Sequence Chart
+  descriptions and produces PNG, SVG, EPS or server side image maps
+  (ismaps) as the output. Message Sequence Charts (MSCs) are a way
+  of representing entities and interactions over some time period
+  and are often used in combination with SDL. MSCs are popular in
+  Telecoms to specify how protocols operate although MSCs need not
+  be complicated to create or use. Mscgen aims to provide a simple
+  text language that is clear to create, edit and understand, which
+  can also be transformed into common image formats for display or
+  printing.
+'';
+
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 07:26:44 
2011(r29802)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 07:38:44 
2011(r29803)
@@ -969,6 +969,8 @@
 
   mpage = callPackage ../tools/text/mpage { };
 
+  mscgen = callPackage ../tools/graphics/mscgen { };
+
   msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) {
 inherit ruby makeWrapper;
   };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29804 - in configurations/trunk/misc/raskin: . lesser-expressions

2011-10-13 Thread Michael Raskin 
Author: raskin
Date: Thu Oct 13 08:21:57 2011
New Revision: 29804
URL: https://nixos.org/websvn/nix/?rev=29804&sc=1

Log:
Routine update

Modified:
   configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
   configurations/trunk/misc/raskin/package-groups.nix
   configurations/trunk/misc/raskin/raskin-asus-n53j.nix

Modified: configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
==
--- configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Thu Oct 
13 07:38:44 2011(r29803)
+++ configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Thu Oct 
13 08:21:57 2011(r29804)
@@ -27,7 +27,8 @@
{name="uzbl"; path=uzbl.passthru.function { src = ("" + 
/var/repos/uzbl + "/"); };}
{name="ant+jdk-1.5"; path=symlinkJoin "ant+jdk-1.5" [jdk5 
(apacheAnt.override {jdk=jdk5;})];}
] ++ (map justUse ["mesa" "freeglut" "cairo" "nss" "gsl"
-   "libev" "libuuid" "pyxml" "libxml2" "zlib" "rubygems" 
+   "libev" "libuuid" "pyxml" "libxml2" "zlib" 
+   "libxslt"
"gmp" "mpfr" "libpng" "libtiff" "fuse" "sbcl" "sqlite"
"ncurses" "glibcLocales" "libffi"
"openoffice" "allegro" "cgui"
@@ -38,7 +39,7 @@
"dejavu_fonts" "e2fsprogs" "dmtx" "qt4"
#"empathy" 
"hicolor_icon_theme" "libfixposix" "plan9port"
-   "pygtk" "pygobject" "pycairo"
+   "pygtk" "pygobject" "pycairo" "ruby18"
])
++ 
[
@@ -53,5 +54,20 @@
   #empathy.pkgs.gnome28.gnome_keyring 
empathy.pkgs.telepathy_logger
  ]);
}
+   {name="ruby-gems"; path=(symlinkJoin "ruby-gems" 
+ (with rubyLibs.merge {
+   generated=(import "${builtins.getEnv 
"HOME"}/.nix-personal/ruby-gems/generated.nix");}; 
+ lib.closePropagation [
+   nix rubygems rake bundle bundler
+
+   # Wagn
+   rails rack rake htmlentities macaddr uuid json sqlite3_ruby
+   image_science RubyInline hoptoad_notifier
+   newrelic_rpm rdoc term_ansicolor nokogiri
+   timecop spork assert2 webrat rspec rspec_rails email_spec
+   gherkin cucumber cucumber_rails database_cleaner 
+   builder postgresql
+ ]));
+   }
#{name="eql-env"; path=(symlinkJoin "eql-env" [eql ecl gmp mpfr 
gcc glibc]);}
])

Modified: configurations/trunk/misc/raskin/package-groups.nix
==
--- configurations/trunk/misc/raskin/package-groups.nix Thu Oct 13 07:38:44 
2011(r29803)
+++ configurations/trunk/misc/raskin/package-groups.nix Thu Oct 13 08:21:57 
2011(r29804)
@@ -26,7 +26,7 @@
coq eprover /*isabelle*/ leo2 cvc3
matita picolisp pure hol tptp
pythonPackages.setuptools satallax
-   avrgcclibc clojure
+   avrgcclibc clojure rLang
];
 
nonNative = [ wine dosbox (hiPrio qemu_kvm) (lowPrio qemu)];
@@ -98,8 +98,8 @@
  opera chromeWrapper
  mozplugger
  
- (wrapFirefox firefox70Pkgs.firefox "firefox" "7")
- (wrapFirefox firefox80bPkgs.firefox "firefox" "")
+  (wrapFirefox { browser = firefox70Pkgs.firefox; nameSuffix="7"; })
+  (wrapFirefox { browser = firefox80bPkgs.firefox; nameSuffix=""; })
];
 
graphicEdit = [
@@ -112,7 +112,7 @@
 
fatXApps 
=  [
-   thunderbird3 openoffice
+   openoffice
wireshark gnash
/*abiword*/ fontforgeX xchm 
/*scribus*/ lyx taskjuggler
@@ -311,16 +311,17 @@
 
libraries = [
  freeglut cairo pango gtkLibs.glib gtkLibs.gtk gtkLibs.atk
-  gnome28.gtkglext qt4 libev
+  gnome2.gtkglext qt4 libev
  xorg.libX11 xorg.libXext xorg.libXcomposite xorg.libXrandr
  xorg.libXrender xorg.libXfixes xorg.libXt xorg.libxcb
  xorg.libXdamage xorg.libXi xorg.libSM xorg.inputproto
  xorg.damageproto xorg.xproto xorg.pixman xorg.xextproto
- xorg.fixesproto xorg.compositeproto
- xorg.libICE xorg.renderproto xorg.randrproto
+ xorg.fixesproto xorg.compositeproto xorg.libXtst 
+ xorg.libXp xorg.libXmu
+ xorg.libICE xorg.renderproto xorg.randrproto xorg.libXpm
  confuse libxdg_basedir
  freetype fontconfig
- dbus dbus_glib gnome28.glib_networking
+ dbus dbus_glib gnome2.glib_networking
  pe

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

2011-10-13 Thread Florian Friesdorf 
Author: chaoflow
Date: Thu Oct 13 08:47:49 2011
New Revision: 29805
URL: https://nixos.org/websvn/nix/?rev=29805&sc=1

Log:
linux_2_6_39_powertop

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

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 08:21:57 
2011(r29804)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 08:47:49 
2011(r29805)
@@ -5537,6 +5537,7 @@
 
   linux_2_6_38_ati = linux_2_6_38.override { extraConfig="DRM_RADEON_KMS y"; };
 
+  # Please keep in sync with linux_2_6_39_powertop, except for extraConfig
   linux_2_6_39 = makeOverridable (import 
../os-specific/linux/kernel/linux-2.6.39.nix) {
 inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
 kernelPatches =
@@ -5547,6 +5548,30 @@
   ];
   };
 
+  # Please keep in sync with linux_2_6_39, except for extraConfig
+  linux_2_6_39_powertop = makeOverridable (import 
../os-specific/linux/kernel/linux-2.6.39.nix) {
+inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+extraConfig = ''
+CPU_FREQ_GOV_ONDEMAND y
+CPU_FREQ_STAT y
+DEBUG_KERNEL y
+HIGH_RES_TIMERS y
+HPET_TIMER y
+NO_HZ y
+PM_ADVANCED_DEBUG y
+PM_RUNTIME y
+SND_AC97_POWER_SAVE y
+TIMER_STATS y
+USB_SUSPEND y
+'';
+kernelPatches =
+  [ #kernelPatches.fbcondecor_2_6_38
+kernelPatches.sec_perm_2_6_24
+kernelPatches.aufs2_1_2_6_39
+#kernelPatches.mips_restart_2_6_36
+  ];
+  };
+
   linux_3_0 = makeOverridable (import 
../os-specific/linux/kernel/linux-3.0.nix) {
 inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
 kernelPatches =
@@ -5713,6 +5738,7 @@
   linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 
pkgs.linuxPackages_2_6_38);
   linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor 
linux_2_6_38_ati pkgs.linuxPackages_2_6_38);
   linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 
pkgs.linuxPackages_2_6_39);
+  linuxPackages_2_6_39_powertop = recurseIntoAttrs (linuxPackagesFor 
linux_2_6_39_powertop pkgs.linuxPackages_2_6_39_powertop);
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 
pkgs.linuxPackages_3_0);
   linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 
pkgs.linuxPackages_3_1);
   linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor 
linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29806 - nixpkgs/trunk/pkgs/os-specific/linux/powertop

2011-10-13 Thread Florian Friesdorf 
Author: chaoflow
Date: Thu Oct 13 08:47:58 2011
New Revision: 29806
URL: https://nixos.org/websvn/nix/?rev=29806&sc=1

Log:
fix powertop-1.13.patch

Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/powertop/powertop-1.13.patch

Modified: nixpkgs/trunk/pkgs/os-specific/linux/powertop/powertop-1.13.patch
==
--- nixpkgs/trunk/pkgs/os-specific/linux/powertop/powertop-1.13.patch   Thu Oct 
13 08:47:49 2011(r29805)
+++ nixpkgs/trunk/pkgs/os-specific/linux/powertop/powertop-1.13.patch   Thu Oct 
13 08:47:58 2011(r29806)
@@ -1,7 +1,7 @@
 diff -ru powertop-1.13/Makefile powertop-1.13.new/Makefile
 --- powertop-1.13/Makefile
 +++ powertop-1.13.new/Makefile
-@@ -1,6 +1,6 @@
+@@ -1,8 +1,8 @@
  VERSION = 1.13
  
 -BINDIR=/usr/bin
@@ -10,6 +10,6 @@
 +BINDIR=${out}/bin
 +LOCALESDIR=${out}/share/locale
 +MANDIR=${out}/share/man/man8
- WARNFLAGS=-Wall  -W -Wshadow -W -Wformat -Wimplicit-function-declaration 
-Wimplicit-int
+ WARNFLAGS=-Wall -Wshadow -W -Wformat -Wimplicit-function-declaration 
-Wimplicit-int
  CFLAGS?=-Os -g ${WARNFLAGS}
  CC?=gcc
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29807 - nixpkgs/trunk/pkgs/os-specific/linux/powertop

2011-10-13 Thread Florian Friesdorf 
Author: chaoflow
Date: Thu Oct 13 08:53:47 2011
New Revision: 29807
URL: https://nixos.org/websvn/nix/?rev=29807&sc=1

Log:
powertop meta info

Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix   Thu Oct 13 
08:47:58 2011(r29806)
+++ nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix   Thu Oct 13 
08:53:47 2011(r29807)
@@ -8,4 +8,10 @@
   };
   patches = [./powertop-1.13.patch];
   buildInputs = [ncurses gettext];
+  meta = {
+description = "Analyze power consumption on Intel-based laptops";
+license = "GPLv2";
+maintainers = [ stdenv.lib.maintainers.chaoflow ];
+platforms = stdenv.lib.platforms.linux;
+  };
 }
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29808 - nixpkgs/trunk/pkgs/applications/science/misc/boinc

2011-10-13 Thread Lluís Batlle 
Author: viric
Date: Thu Oct 13 08:58:45 2011
New Revision: 29808
URL: https://nixos.org/websvn/nix/?rev=29808&sc=1

Log:
Downgrading boinc to the last stable version.

Modified:
   nixpkgs/trunk/pkgs/applications/science/misc/boinc/default.nix

Modified: nixpkgs/trunk/pkgs/applications/science/misc/boinc/default.nix
==
--- nixpkgs/trunk/pkgs/applications/science/misc/boinc/default.nix  Thu Oct 
13 08:53:47 2011(r29807)
+++ nixpkgs/trunk/pkgs/applications/science/misc/boinc/default.nix  Thu Oct 
13 08:58:45 2011(r29808)
@@ -3,12 +3,12 @@
 sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "boinc-6.13.6";
+  name = "boinc-6.12.39";
 
   src = fetchsvn {
-url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_13_6";;
+url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_12_39";;
 rev = 24341;
-sha256 = "17312g4mhxigka1rafxxw46a4mbdlfj1wh1nlp1cbg43hv2rf7bq";
+sha256 = "158fkm4mr7wljsy8gav20km8jamf00mxjk1wsiqw6kx62bih37yb";
   };
 
   buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29809 - nixpkgs/trunk/pkgs/tools/system/ts

2011-10-13 Thread Lluís Batlle 
Author: viric
Date: Thu Oct 13 08:59:56 2011
New Revision: 29809
URL: https://nixos.org/websvn/nix/?rev=29809&sc=1

Log:
Updating task spooler

Modified:
   nixpkgs/trunk/pkgs/tools/system/ts/default.nix

Modified: nixpkgs/trunk/pkgs/tools/system/ts/default.nix
==
--- nixpkgs/trunk/pkgs/tools/system/ts/default.nix  Thu Oct 13 08:58:45 
2011(r29808)
+++ nixpkgs/trunk/pkgs/tools/system/ts/default.nix  Thu Oct 13 08:59:56 
2011(r29809)
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
 
-  name = "ts-0.7.0";
+  name = "ts-0.7.1";
 
   installPhase=''make install "PREFIX=$out"'';
 
@@ -11,8 +11,8 @@
   };
 
   src = fetchurl {
-url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.0.tar.gz;
-sha256 = "1m9nf0299idkh355afk2c9v9qqpxm4ram3gyf8a9qv4f9gg6hprp";
+url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.1.tar.gz;
+sha256 = "0s1hrgw99jn6ar01lcvhdgqsw0jzfnbpdayp0pydr6ikx1zwz70v";
   };
 
   meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29810 - nixpkgs/trunk/pkgs/os-specific/linux/powertop

2011-10-13 Thread Florian Friesdorf 
Author: chaoflow
Date: Thu Oct 13 09:06:52 2011
New Revision: 29810
URL: https://nixos.org/websvn/nix/?rev=29810&sc=1

Log:
fix powertop INOTIFY suggestion

INOTIFY_USER exists since 2.6.18

Added:
   
nixpkgs/trunk/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch
Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix

Added: 
nixpkgs/trunk/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ 
nixpkgs/trunk/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch
  Thu Oct 13 09:06:52 2011(r29810)
@@ -0,0 +1,28 @@
+From 89e46f3270e3b6d704959c4d0f44ae6bab8f7616 Mon Sep 17 00:00:00 2001
+From: Florian Friesdorf 
+Date: Thu, 13 Oct 2011 10:14:34 +0200
+Subject: [PATCH] CONFIG_INOTIFY_USER instead of CONFIG_INOTIFY
+
+since 2.6.36 the former fully replaced the latter
+---
+ powertop.c |4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/powertop.c b/powertop.c
+index 74eb328..8df3652 100644
+--- a/powertop.c
 b/powertop.c
+@@ -1191,8 +1191,8 @@ int main(int argc, char **argv)
+   suggest_kernel_config("CONFIG_CPU_FREQ_STAT", 1,
+   _("Suggestion: Enable the 
CONFIG_CPU_FREQ_STAT kernel configuration option.\n"
+ "This option allows PowerTOP to show 
P-state percentages \n" "P-states correspond to CPU frequencies."), 2);
+-  suggest_kernel_config("CONFIG_INOTIFY", 1,
+-  _("Suggestion: Enable the CONFIG_INOTIFY 
kernel configuration option.\n"
++  suggest_kernel_config("CONFIG_INOTIFY_USER", 1,
++  _("Suggestion: Enable the 
CONFIG_INOTIFY_USER kernel configuration option.\n"
+ "This option allows programs to wait for 
changes in files and directories\n"
+ "instead of having to poll for these 
changes"), 5);
+ 
+-- 
+1.7.6
+

Modified: nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix   Thu Oct 13 
08:59:56 2011(r29809)
+++ nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix   Thu Oct 13 
09:06:52 2011(r29810)
@@ -6,7 +6,10 @@
 url = 
http://www.lesswatts.org/projects/powertop/download/powertop-1.13.tar.gz;
 sha256 = "164dqp6msdaxpi2bmvwawasyrf1sfvanlc9ddp97v1wnjh46dj1b";
   };
-  patches = [./powertop-1.13.patch];
+  patches = [
+./powertop-1.13.patch
+./0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch
+  ];
   buildInputs = [ncurses gettext];
   meta = {
 description = "Analyze power consumption on Intel-based laptops";
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29811 - nixpkgs/trunk/pkgs/os-specific/linux/kernel

2011-10-13 Thread Florian Friesdorf 
Author: chaoflow
Date: Thu Oct 13 09:23:22 2011
New Revision: 29811
URL: https://nixos.org/websvn/nix/?rev=29811&sc=1

Log:
linux/kernel - added myself to maintainers

Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix Thu Oct 13 
09:06:52 2011(r29810)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix Thu Oct 13 
09:23:22 2011(r29811)
@@ -139,7 +139,10 @@
 + ")");
 license = "GPLv2";
 homepage = http://www.kernel.org/;
-maintainers = [ lib.maintainers.eelco ];
+maintainers = [
+  lib.maintainers.eelco
+  lib.maintainers.chaoflow
+];
 platforms = lib.platforms.linux;
   } // extraMeta;
 }
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] SVN commit 15740

2011-10-13 Thread Eelco Dolstra 
Hi,

On 10/12/2011 08:43 PM, Vladimír Čunát wrote:

> 2011/10/12 Lluís Batlle i Rossell :
>> A way to distinguish whether you try to run 'nixos-rebuild' in nixos, or in
>> non-nixos.
>>
>> If you are in nixos, run 'touch /etc/NIXOS' simply. If not, what are you
>> trying to do?
> 
> Thanks, I just wondered if something more important has changed.

FWIW, that file and the check have been around since forever :-)

-- 
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] SVN commit: nix - r29812 - in disnix/disnix/trunk: . data doc/manual

2011-10-13 Thread Sander van der Burg 
Author: sandervanderburg
Date: Thu Oct 13 10:57:25 2011
New Revision: 29812
URL: https://nixos.org/websvn/nix/?rev=29812&sc=1

Log:
Replaced all occurences of NIXPKGS_ALL to NIX_PATH

Modified:
   disnix/disnix/trunk/README
   disnix/disnix/trunk/configure.ac
   disnix/disnix/trunk/data/gendist-roundrobin.nix
   disnix/disnix/trunk/data/instantiate.nix
   disnix/disnix/trunk/data/manifest.nix
   disnix/disnix/trunk/doc/manual/installation.xml
   disnix/disnix/trunk/release.nix

Modified: disnix/disnix/trunk/README
==
--- disnix/disnix/trunk/README  Thu Oct 13 09:23:22 2011(r29811)
+++ disnix/disnix/trunk/README  Thu Oct 13 10:57:25 2011(r29812)
@@ -58,9 +58,12 @@
 disnix-service manual page or refer to the Disnix manual.
 
 On every client machine, a Nix installation is required and a copy of Nixpkgs.
-In order to find the location of Nixpkgs, the environment variable NIXPKGS_ALL
+In order to find the location of Nixpkgs, the environment variable NIX_PATH
 has to be set which points to the pkgs/top-level/all-packages.nix file included
 in the Nixpkgs tarball (this is already done automatically on NixOS).
+This can be done by the following command-line instruction:
+
+$ export NIX_PATH="nixpkgs=/path/to/nixpkgs"
 
 In order to deploy a distributed system a developer has to write a Nix
 expression that captures the services of a distributed machine, the network

Modified: disnix/disnix/trunk/configure.ac
==
--- disnix/disnix/trunk/configure.acThu Oct 13 09:23:22 2011(r29811)
+++ disnix/disnix/trunk/configure.acThu Oct 13 10:57:25 2011(r29812)
@@ -40,9 +40,6 @@
 AC_SUBST(LIBXSLT_CFLAGS)
 AC_SUBST(LIBXSLT_LIBS) 
 
-# Checks for Nixpkgs
-AC_SUBST(NIXPKGS_ALL)
-
 # Checks for Docbook stuff
 AC_ARG_WITH(docbook-rng, AC_HELP_STRING([--with-docbook-rng=PATH],
   [path of the DocBook RelaxNG schema]),

Modified: disnix/disnix/trunk/data/gendist-roundrobin.nix
==
--- disnix/disnix/trunk/data/gendist-roundrobin.nix Thu Oct 13 09:23:22 
2011(r29811)
+++ disnix/disnix/trunk/data/gendist-roundrobin.nix Thu Oct 13 10:57:25 
2011(r29812)
@@ -1,6 +1,6 @@
 { servicesFile
 , infrastructureFile
-, nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
+, nixpkgs ? 
 }:
 
 let 

Modified: disnix/disnix/trunk/data/instantiate.nix
==
--- disnix/disnix/trunk/data/instantiate.nixThu Oct 13 09:23:22 2011
(r29811)
+++ disnix/disnix/trunk/data/instantiate.nixThu Oct 13 10:57:25 2011
(r29812)
@@ -2,7 +2,7 @@
 , infrastructureFile
 , distributionFile
 , targetProperty
-, nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
+, nixpkgs ? 
 }:
 
 let 

Modified: disnix/disnix/trunk/data/manifest.nix
==
--- disnix/disnix/trunk/data/manifest.nix   Thu Oct 13 09:23:22 2011
(r29811)
+++ disnix/disnix/trunk/data/manifest.nix   Thu Oct 13 10:57:25 2011
(r29812)
@@ -2,7 +2,7 @@
 , infrastructureFile
 , distributionFile
 , targetProperty
-, nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
+, nixpkgs ? 
 }:
 
 let 

Modified: disnix/disnix/trunk/doc/manual/installation.xml
==
--- disnix/disnix/trunk/doc/manual/installation.xml Thu Oct 13 09:23:22 
2011(r29811)
+++ disnix/disnix/trunk/doc/manual/installation.xml Thu Oct 13 10:57:25 
2011(r29812)
@@ -110,7 +110,7 @@

A copy of
http://nixos.org/nixpkgs";>Nixpkgs is required
-   and an environment variable NIXPKGS_ALL 
must point to the path where
+   and an environment variable NIX_PATH must 
point to the path where
it is installed, so that Disnix is able to find it. In 
NixOS, a copy is 
already present and this environment variable has 
already been configured.
On other systems this variable can be configured by 
adding the following lines to your
@@ -122,8 +122,8 @@
 $ cat >> ~/.bash_profile <

[Nix-commits] SVN commit: nix - r29813 - in disnix/disnixos/trunk: data doc/manual

2011-10-13 Thread Sander van der Burg 
Author: sandervanderburg
Date: Thu Oct 13 11:03:00 2011
New Revision: 29813
URL: https://nixos.org/websvn/nix/?rev=29813&sc=1

Log:
Replaced occurences of NIXPKGS_ALL to NIX_PATH

Modified:
   disnix/disnixos/trunk/data/generate-infrastructure.nix.in
   disnix/disnixos/trunk/data/generate-services.nix.in
   disnix/disnixos/trunk/data/generate-tests.nix.in
   disnix/disnixos/trunk/data/testing.nix.in
   disnix/disnixos/trunk/doc/manual/installation.xml

Modified: disnix/disnixos/trunk/data/generate-infrastructure.nix.in
==
--- disnix/disnixos/trunk/data/generate-infrastructure.nix.in   Thu Oct 13 
10:57:25 2011(r29812)
+++ disnix/disnixos/trunk/data/generate-infrastructure.nix.in   Thu Oct 13 
11:03:00 2011(r29813)
@@ -1,7 +1,7 @@
 { networkFile
 , useBackdoor ? false
-, nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
-, nixos ? builtins.getEnv "NIXOS"
+, nixpkgs ? 
+, nixos ? 
 }:
 
 let

Modified: disnix/disnixos/trunk/data/generate-services.nix.in
==
--- disnix/disnixos/trunk/data/generate-services.nix.in Thu Oct 13 10:57:25 
2011(r29812)
+++ disnix/disnixos/trunk/data/generate-services.nix.in Thu Oct 13 11:03:00 
2011(r29813)
@@ -1,6 +1,6 @@
 { networkFile
-, nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
-, nixos ? builtins.getEnv "NIXOS"
+, nixpkgs ? 
+, nixos ? 
 }:
 
 let

Modified: disnix/disnixos/trunk/data/generate-tests.nix.in
==
--- disnix/disnixos/trunk/data/generate-tests.nix.inThu Oct 13 10:57:25 
2011(r29812)
+++ disnix/disnixos/trunk/data/generate-tests.nix.inThu Oct 13 11:03:00 
2011(r29813)
@@ -1,6 +1,6 @@
 { networkFile
 , manifestFile
-, nixpkgs ? builtins.getEnv("NIXPKGS_ALL")
+, nixpkgs ? 
 , disnix ? @DISNIX_PREFIX@
 , disnixos ? @prefix@
 }:

Modified: disnix/disnixos/trunk/data/testing.nix.in
==
--- disnix/disnixos/trunk/data/testing.nix.in   Thu Oct 13 10:57:25 2011
(r29812)
+++ disnix/disnixos/trunk/data/testing.nix.in   Thu Oct 13 11:03:00 2011
(r29813)
@@ -1,5 +1,5 @@
-{ nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
-, nixos ? builtins.getEnv "NIXOS"
+{ nixpkgs ? 
+, nixos ? 
 , system ? builtins.currentSystem
 , disnix ? @DISNIX_PREFIX@
 , disnixos ? @prefix@

Modified: disnix/disnixos/trunk/doc/manual/installation.xml
==
--- disnix/disnixos/trunk/doc/manual/installation.xml   Thu Oct 13 10:57:25 
2011(r29812)
+++ disnix/disnixos/trunk/doc/manual/installation.xml   Thu Oct 13 11:03:00 
2011(r29813)
@@ -94,7 +94,7 @@

A copy of
http://nixos.org/nixpkgs";>Nixpkgs is required
-   and an environment variable NIXPKGS_ALL 
must point to the path where
+   and an environment variable NIX_PATH must 
point to the path where
it is installed, so that Disnix is able to find it. In 
NixOS, a copy is 
already present and this environment variable has 
already been configured.
On other systems this variable can be configured by 
adding the following lines to your
@@ -106,8 +106,8 @@
 $ cat >> ~/.bash_profile <

[Nix-commits] SVN commit: nix - r29814 - in disnix/dydisnix/trunk: . data

2011-10-13 Thread Sander van der Burg 
Author: sandervanderburg
Date: Thu Oct 13 11:09:04 2011
New Revision: 29814
URL: https://nixos.org/websvn/nix/?rev=29814&sc=1

Log:
Replaced occurences of NIXPKGS_ALL to NIX_PATH

Modified:
   disnix/dydisnix/trunk/configure.ac
   disnix/dydisnix/trunk/data/augment-infra.nix
   disnix/dydisnix/trunk/data/gendist.nix
   disnix/dydisnix/trunk/data/try-build.nix.in
   disnix/dydisnix/trunk/release.nix

Modified: disnix/dydisnix/trunk/configure.ac
==
--- disnix/dydisnix/trunk/configure.ac  Thu Oct 13 11:03:00 2011(r29813)
+++ disnix/dydisnix/trunk/configure.ac  Thu Oct 13 11:09:04 2011(r29814)
@@ -41,9 +41,6 @@
 AC_SUBST(DISNIX_CFLAGS)
 AC_SUBST(DISNIX_LIBS)
 
-# Checks for Nixpkgs
-AC_SUBST(NIXPKGS_ALL)
-
 # State should be stored in /nix/var, unless the user overrides it explicitly.
 test "$localstatedir" = '${prefix}/var' && localstatedir=/nix/var
 

Modified: disnix/dydisnix/trunk/data/augment-infra.nix
==
--- disnix/dydisnix/trunk/data/augment-infra.nixThu Oct 13 11:03:00 
2011(r29813)
+++ disnix/dydisnix/trunk/data/augment-infra.nixThu Oct 13 11:09:04 
2011(r29814)
@@ -1,5 +1,5 @@
 {infrastructure, augmentFun}:
 
-let pkgs = import (builtins.getEnv "NIXPKGS_ALL") {};
+let pkgs = import  {};
 in
 augmentFun { inherit infrastructure; inherit (pkgs) lib; }

Modified: disnix/dydisnix/trunk/data/gendist.nix
==
--- disnix/dydisnix/trunk/data/gendist.nix  Thu Oct 13 11:03:00 2011
(r29813)
+++ disnix/dydisnix/trunk/data/gendist.nix  Thu Oct 13 11:09:04 2011
(r29814)
@@ -3,7 +3,7 @@
 , distributionFile ? null
 , qosFile ? null
 , outputExpr ? true
-, nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
+, nixpkgs ? 
 , coordinatorProfile ? null
 }:
 

Modified: disnix/dydisnix/trunk/data/try-build.nix.in
==
--- disnix/dydisnix/trunk/data/try-build.nix.in Thu Oct 13 11:03:00 2011
(r29813)
+++ disnix/dydisnix/trunk/data/try-build.nix.in Thu Oct 13 11:09:04 2011
(r29814)
@@ -1,5 +1,5 @@
 { servicesFile, infrastructureFile, distributionFile, serviceName, targetName
-, nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
+, nixpkgs ? 
 }:
 
 let

Modified: disnix/dydisnix/trunk/release.nix
==
--- disnix/dydisnix/trunk/release.nix   Thu Oct 13 11:03:00 2011(r29813)
+++ disnix/dydisnix/trunk/release.nix   Thu Oct 13 11:09:04 2011(r29814)
@@ -63,14 +63,14 @@
# we add the attribute: augment = "augment". This test should
# succeed.
  
-   my $result = 
$machine->mustSucceed("NIXPKGS_ALL=${nixpkgs}/pkgs/top-level/all-packages.nix 
dydisnix-augment-infra -i ${tests}/infrastructure.nix -a ${tests}/augment.nix");
-   $machine->mustSucceed("[ 
\"\$((NIXPKGS_ALL=${nixpkgs}/pkgs/top-level/all-packages.nix nix-instantiate 
--eval-only --xml --strict $result) | grep 'augment')\" != \"\" ]");
+   my $result = $machine->mustSucceed("NIX_PATH='nixpkgs=${nixpkgs}' 
dydisnix-augment-infra -i ${tests}/infrastructure.nix -a ${tests}/augment.nix");
+   $machine->mustSucceed("[ \"\$((NIX_PATH='nixpkgs=${nixpkgs}' 
nix-instantiate --eval-only --xml --strict $result) | grep 'augment')\" != \"\" 
]");

# Execute filter buildable. In this situation no build exceptions
# occur, so all machines in the network are valid candidate hosts.
# This test should succeed.

-   my $result = 
$machine->mustSucceed("NIXPKGS_ALL=${nixpkgs}/pkgs/top-level/all-packages.nix 
dydisnix-gendist --filter-buildable -s ${tests}/services.nix -i 
${tests}/infrastructure.nix");
+   my $result = $machine->mustSucceed("NIX_PATH='nixpkgs=${nixpkgs}' 
dydisnix-gendist --filter-buildable -s ${tests}/services.nix -i 
${tests}/infrastructure.nix");
my @distribution = split('\n', $machine->mustSucceed("cat 
$result"));
  
if(@distribution[7] =~ /testtarget1/) {
@@ -113,7 +113,7 @@
# thrown for testService1B rendering it undeployable.
# This test should succeed.

-   my $result = 
$machine->mustSucceed("NIXPKGS_ALL=${nixpkgs}/pkgs/top-level/all-packages.nix 
dydisnix-gendist --filter-buildable -s ${tests}/services-error.nix -i 
${tests}/infrastructure.nix");
+   my $result = $machine->mustSucceed("NIX_PATH='nixpkgs=${nixpkgs}' 
dydisnix-gendist --filter-buildable -s ${tests}/services-error.nix -i 
${tests}/infrastructure.nix");
my @distribution = split('\n', $machine->mustSucceed("cat 
$result"));
  
if(@distribution[7] =~ /testtarget1/) {
@@ -127,7 +127,7 @@
# testSe

[Nix-commits] SVN commit: nix - r29815 - disnix/DisnixWebService/trunk

2011-10-13 Thread Sander van der Burg 
Author: sandervanderburg
Date: Thu Oct 13 11:13:40 2011
New Revision: 29815
URL: https://nixos.org/websvn/nix/?rev=29815&sc=1

Log:
Replaced occurences of NIXPKGS_ALL to NIX_PATH

Modified:
   disnix/DisnixWebService/trunk/release.nix

Modified: disnix/DisnixWebService/trunk/release.nix
==
--- disnix/DisnixWebService/trunk/release.nix   Thu Oct 13 11:09:04 2011
(r29814)
+++ disnix/DisnixWebService/trunk/release.nix   Thu Oct 13 11:13:40 2011
(r29815)
@@ -185,7 +185,7 @@
  # closure into the Nix store of the server. This test should
  # succeed.
  
- my $result = $client->mustSucceed("NIXPKGS_ALL=${nixpkgs} 
disnix-manifest --target-property targetEPR -s ${tests}/services.nix -i 
${tests}/infrastructure.nix -d ${tests}/distribution.nix");
+ my $result = $client->mustSucceed("NIX_PATH='nixpkgs=${nixpkgs}' 
disnix-manifest --target-property targetEPR -s ${tests}/services.nix -i 
${tests}/infrastructure.nix -d ${tests}/distribution.nix");
  my @manifestClosure = split('\n', $client->mustSucceed("nix-store 
-qR $result"));
  my @target2Profile = grep(/\-testTarget2/, @manifestClosure);
  
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29816 - disnix/disnix/trunk

2011-10-13 Thread Sander van der Burg 
Author: sandervanderburg
Date: Thu Oct 13 11:14:09 2011
New Revision: 29816
URL: https://nixos.org/websvn/nix/?rev=29816&sc=1

Log:
Fixed the roundrobin generator testcase

Modified:
   disnix/disnix/trunk/release.nix

Modified: disnix/disnix/trunk/release.nix
==
--- disnix/disnix/trunk/release.nix Thu Oct 13 11:13:40 2011(r29815)
+++ disnix/disnix/trunk/release.nix Thu Oct 13 11:14:09 2011(r29816)
@@ -491,7 +491,7 @@
  # generated distribution model to build the system.
  # This test should succeed.
  
- my $result = $client->mustSucceed("disnix-gendist-roundrobin -s 
${manifestTests}/services-complete.nix -i ${manifestTests}/infrastructure.nix");
+ my $result = $client->mustSucceed("NIX_PATH='nixpkgs=${nixpkgs}' 
disnix-gendist-roundrobin -s ${manifestTests}/services-complete.nix -i 
${manifestTests}/infrastructure.nix");
  my $result = $client->mustSucceed("NIX_PATH='nixpkgs=${nixpkgs}' 
disnix-manifest -s ${manifestTests}/services-complete.nix -i 
${manifestTests}/infrastructure.nix -d $result");
  
   Test disnix-visualize
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29817 - disnix/disnixos/trunk/scripts

2011-10-13 Thread Sander van der Burg 
Author: sandervanderburg
Date: Thu Oct 13 11:28:05 2011
New Revision: 29817
URL: https://nixos.org/websvn/nix/?rev=29817&sc=1

Log:
Removed occurences to the NIXOS environment variable as it's no longer needed

Modified:
   disnix/disnixos/trunk/scripts/disnixos-geninfra.in
   disnix/disnixos/trunk/scripts/disnixos-genservices.in

Modified: disnix/disnixos/trunk/scripts/disnixos-geninfra.in
==
--- disnix/disnixos/trunk/scripts/disnixos-geninfra.in  Thu Oct 13 11:14:09 
2011(r29816)
+++ disnix/disnixos/trunk/scripts/disnixos-geninfra.in  Thu Oct 13 11:28:05 
2011(r29817)
@@ -82,11 +82,6 @@
 useBackdoorArg="--arg useBackdoor true"
 fi
 
-if [ "$NIXOS" = "" ]
-then
-export NIXOS=/etc/nixos/nixos
-fi
-
 if [ "$@" = "" ]
 then
 echo "ERROR: A network expression must be specified!" >&2

Modified: disnix/disnixos/trunk/scripts/disnixos-genservices.in
==
--- disnix/disnixos/trunk/scripts/disnixos-genservices.in   Thu Oct 13 
11:14:09 2011(r29816)
+++ disnix/disnixos/trunk/scripts/disnixos-genservices.in   Thu Oct 13 
11:28:05 2011(r29817)
@@ -73,11 +73,6 @@
 checkNoOutLink
 checkShowTrace
 
-if [ "$NIXOS" = "" ]
-then
-export NIXOS=/etc/nixos/nixos
-fi
-
 if [ "$@" = "" ]
 then
 echo "ERROR: A network expression must be specified!" >&2
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29818 - disnix/disnixos/trunk/doc/manual

2011-10-13 Thread Sander van der Burg 
Author: sandervanderburg
Date: Thu Oct 13 11:34:02 2011
New Revision: 29818
URL: https://nixos.org/websvn/nix/?rev=29818&sc=1

Log:
Also explain that we must configure the NixOS location on regular Linux distros

Modified:
   disnix/disnixos/trunk/doc/manual/installation.xml

Modified: disnix/disnixos/trunk/doc/manual/installation.xml
==
--- disnix/disnixos/trunk/doc/manual/installation.xml   Thu Oct 13 11:28:05 
2011(r29817)
+++ disnix/disnixos/trunk/doc/manual/installation.xml   Thu Oct 13 11:34:02 
2011(r29818)
@@ -127,7 +127,27 @@



-   Moreover, you need a system capable of running
+   DisnixOS also needs to know where to find the NixOS 
source code, provided by the
+   NIX_PATH environment variable. On other 
Linux systems, this environment variable must
+   point to the path where the NixOS source is stored.
+   This variable can be configured by adding the following 
lines to your
+   ~/.bash_profile configuration (or 
another configuration
+   file, if you use a different shell):
+   
+   
+
+$ cat >> ~/.bash_profile <KVM, 
check your host Linux
distribution for more instructions.

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

[Nix-commits] SVN commit: nix - r29819 - in nixpkgs/trunk/pkgs: lib servers/openafs-client

2011-10-13 Thread Marco Maggesi 
Author: maggesi
Date: Thu Oct 13 12:37:15 2011
New Revision: 29819
URL: https://nixos.org/websvn/nix/?rev=29819&sc=1

Log:
Update OpenAFS client to version 1.6.0.  Also enable Hydra build.

Deleted:
   nixpkgs/trunk/pkgs/servers/openafs-client/replace-usrbinenv
   nixpkgs/trunk/pkgs/servers/openafs-client/replace-usrbinperl
   nixpkgs/trunk/pkgs/servers/openafs-client/replace-usrinclude
   nixpkgs/trunk/pkgs/servers/openafs-client/replace-usrsrc
Modified:
   nixpkgs/trunk/pkgs/lib/licenses.nix
   nixpkgs/trunk/pkgs/servers/openafs-client/default.nix

Modified: nixpkgs/trunk/pkgs/lib/licenses.nix
==
--- nixpkgs/trunk/pkgs/lib/licenses.nix Thu Oct 13 11:34:02 2011(r29818)
+++ nixpkgs/trunk/pkgs/lib/licenses.nix Thu Oct 13 12:37:15 2011(r29819)
@@ -82,6 +82,12 @@
 url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
   };
 
+  ipl10 = {
+shortName = "IPL 1.0";
+fullName = "IBM Public License Version 1.0";
+url = 
http://www.ibm.com/developerworks/opensource/library/os-i18n2/os-ipl.html;
+  };
+
   ijg = {
 shortName = "IJG";
 fullName = "Independent JPEG Group License";

Modified: nixpkgs/trunk/pkgs/servers/openafs-client/default.nix
==
--- nixpkgs/trunk/pkgs/servers/openafs-client/default.nix   Thu Oct 13 
11:34:02 2011(r29818)
+++ nixpkgs/trunk/pkgs/servers/openafs-client/default.nix   Thu Oct 13 
12:37:15 2011(r29819)
@@ -1,63 +1,47 @@
-{ stdenv, fetchurl, autoconf, automake, flex, yacc,
+{ stdenv, fetchurl, which, autoconf, automake, flex, yacc,
   kernel, glibc, ncurses, perl, krb5 }:
 
 assert stdenv.isLinux;
 
-let
-  pname = "openafs";
-  version = "1.4.11";
-  name = "${pname}-${version}-${kernel.version}";
-  webpage = http://www.openafs.org;
-in
-
-stdenv.mkDerivation rec {
-  inherit name;
+stdenv.mkDerivation {
+  name = "openafs-1.6.0-${kernel.version}";
 
   src = fetchurl {
-url = "${webpage}/dl/${pname}/${version}/${pname}-${version}-src.tar.gz";
-sha256 = 
"ea5377119fd7b5317428644fa427066b9edbde395d997943a448426742d2c5c9";
+url = http://www.openafs.org/dl/openafs/1.6.0/openafs-1.6.0-src.tar.bz2;
+sha256 = "1rj40qp30hswr08p69jigya78ggbn4dc7qnnw2sfjpv52ywa68p7";
   };
 
-  buildInputs = [ autoconf automake flex yacc ncurses perl ];
-
-  replace_usrbinenv = ./replace-usrbinenv;
-  replace_usrinclude = ./replace-usrinclude;
-  replace_usrbinperl = ./replace-usrbinperl;
-  replace_usrsrc = ./replace-usrsrc;
+  buildInputs = [ autoconf automake flex yacc ncurses perl which ];
 
-  configurePhase = ''
+  preConfigure = ''
 ln -s ${kernel}/lib/modules/*/build $TMP/linux
 
-echo "Replace ..."
-for i in `cat ${replace_usrbinenv}`; do
-  substituteInPlace $i --replace "/usr/bin/env" $(type -tp env)
-done
-for i in `cat ${replace_usrinclude}`; do
-  substituteInPlace $i --replace "/usr/include" "${glibc}/include"
-done
-for i in `cat ${replace_usrbinperl}`; do
-  substituteInPlace $i --replace "/usr/bin/perl" $(type -tp perl)
-done
-for i in `cat ${replace_usrsrc}`; do
-  substituteInPlace $i --replace "/usr/src" "$TMP"
+patchShebangs .
+for i in `grep -l -R '/usr/\(include\|src\)' .`; do
+  echo "Patch /usr/include and /usr/src in $i"
+  substituteInPlace $i \
+--replace "/usr/include" "${glibc}/include" \
+--replace "/usr/src" "$TMP"
 done
-echo "... done"
 
 ./regen.sh
 
-./configure \
-   --prefix=$out \
-   --with-linux-kernel-build=$TMP/linux \
-   --with-krb5-conf=${krb5}/bin/krb5-config \
-   --sysconfdir=/etc/static
-   #--with-afs-sysname=amd64_linux26 \
+export KRB5_CONFIG=${krb5}/bin/krb5-config
 
-substituteInPlace src/pinstall/install.c --replace "/bin/cp" $(type -tp cp)
+configureFlagsArray=(
+  "--with-linux-kernel-build=$TMP/linux"
+  "--with-krb5"
+  "--sysconfdir=/etc/static"
+)
   '';
 
   meta = {
-  description = "Open AFS client for Linux";
-  homepage = webpage;
-  license = "IPL";
+description = "Open AFS client";
+homepage = http://www.openafs.org;
+license = stdenv.lib.licenses.ipl10;
+platforms = stdenv.lib.platforms.linux;
+maintainers = with stdenv.lib.maintainers; [
+  z77z
+];
   };
 }
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

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

2011-10-13 Thread Florian Friesdorf 
Author: chaoflow
Date: Thu Oct 13 13:04:45 2011
New Revision: 29820
URL: https://nixos.org/websvn/nix/?rev=29820&sc=1

Log:
linux_3_0_powertop

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

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 12:37:15 
2011(r29819)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 13:04:45 
2011(r29820)
@@ -5572,6 +5572,7 @@
   ];
   };
 
+  # Please keep in sync with linux_3_0_powertop, except for extraConfig
   linux_3_0 = makeOverridable (import 
../os-specific/linux/kernel/linux-3.0.nix) {
 inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
 kernelPatches =
@@ -5583,6 +5584,31 @@
   ];
   };
 
+  # Please keep in sync with linux_3_0, except for extraConfig
+  linux_3_0_powertop = makeOverridable (import 
../os-specific/linux/kernel/linux-3.0.nix) {
+inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+extraConfig = ''
+CPU_FREQ_GOV_ONDEMAND y
+CPU_FREQ_STAT y
+DEBUG_KERNEL y
+HIGH_RES_TIMERS y
+HPET_TIMER y
+NO_HZ y
+PM_ADVANCED_DEBUG y
+PM_RUNTIME y
+SND_AC97_POWER_SAVE y
+TIMER_STATS y
+USB_SUSPEND y
+'';
+kernelPatches =
+  [ #kernelPatches.fbcondecor_2_6_38
+kernelPatches.sec_perm_2_6_24
+kernelPatches.aufs3_0
+#kernelPatches.aufs2_1_3_0
+#kernelPatches.mips_restart_2_6_36
+  ];
+  };
+
   linux_3_1 = makeOverridable (import 
../os-specific/linux/kernel/linux-3.1.nix) {
 inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
 kernelPatches =
@@ -5740,6 +5766,7 @@
   linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 
pkgs.linuxPackages_2_6_39);
   linuxPackages_2_6_39_powertop = recurseIntoAttrs (linuxPackagesFor 
linux_2_6_39_powertop pkgs.linuxPackages_2_6_39_powertop);
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 
pkgs.linuxPackages_3_0);
+  linuxPackages_3_0_powertop = recurseIntoAttrs (linuxPackagesFor 
linux_3_0_powertop pkgs.linuxPackages_3_0_powertop);
   linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 
pkgs.linuxPackages_3_1);
   linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor 
linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
   linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor 
linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29821 - nixpkgs/trunk/pkgs/os-specific/linux/powertop

2011-10-13 Thread Florian Friesdorf 
Author: chaoflow
Date: Thu Oct 13 13:05:22 2011
New Revision: 29821
URL: https://nixos.org/websvn/nix/?rev=29821&sc=1

Log:
powertop: renamed inotify patch

Added:
   nixpkgs/trunk/pkgs/os-specific/linux/powertop/inotify_user.patch
  - copied, changed from r29820, 
nixpkgs/trunk/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch
Deleted:
   
nixpkgs/trunk/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch
Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix   Thu Oct 13 
13:04:45 2011(r29820)
+++ nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix   Thu Oct 13 
13:05:22 2011(r29821)
@@ -8,7 +8,7 @@
   };
   patches = [
 ./powertop-1.13.patch
-./0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch
+./inotify_user.patch
   ];
   buildInputs = [ncurses gettext];
   meta = {

Copied and modified: 
nixpkgs/trunk/pkgs/os-specific/linux/powertop/inotify_user.patch (from r29820, 
nixpkgs/trunk/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch)
==
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29822 - nixpkgs/trunk/pkgs/os-specific/linux/powertop

2011-10-13 Thread Florian Friesdorf 
Author: chaoflow
Date: Thu Oct 13 13:05:58 2011
New Revision: 29822
URL: https://nixos.org/websvn/nix/?rev=29822&sc=1

Log:
powertop: modprobe configs if /proc/config.gz is missing

Added:
   nixpkgs/trunk/pkgs/os-specific/linux/powertop/modprobe_configs.patch
Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix   Thu Oct 13 
13:05:22 2011(r29821)
+++ nixpkgs/trunk/pkgs/os-specific/linux/powertop/default.nix   Thu Oct 13 
13:05:58 2011(r29822)
@@ -9,6 +9,7 @@
   patches = [
 ./powertop-1.13.patch
 ./inotify_user.patch
+./modprobe_configs.patch
   ];
   buildInputs = [ncurses gettext];
   meta = {

Added: nixpkgs/trunk/pkgs/os-specific/linux/powertop/modprobe_configs.patch
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/powertop/modprobe_configs.patch
Thu Oct 13 13:05:58 2011(r29822)
@@ -0,0 +1,28 @@
+From 0002a70b83221a8a831d776836d13105ac886323 Mon Sep 17 00:00:00 2001
+From: Florian Friesdorf 
+Date: Thu, 13 Oct 2011 14:57:02 +0200
+Subject: [PATCH] powertop tries to load configs, if /proc/config.gz is
+ missing
+
+---
+ config.c |4 
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/config.c b/config.c
+index b2567f2..62ac978 100644
+--- a/config.c
 b/config.c
+@@ -44,6 +44,10 @@ static void read_kernel_config(void)
+   char filename[100];
+   if (configcount)
+   return;
++  if (access("/proc/config.gz", R_OK) != 0) {
++  file = popen("modprobe configs >/dev/null 2>&1", "r");
++  pclose(file);
++  }
+   if (access("/proc/config.gz", R_OK) == 0) {
+   file = popen("zcat /proc/config.gz 2> /dev/null", "r");
+   while (file && !feof(file)) {
+-- 
+1.7.6
+
___
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 - r29820 - nixpkgs/trunk/pkgs/top-level

2011-10-13 Thread Eelco Dolstra 
Hi,

On 10/13/2011 03:04 PM, Florian Friesdorf wrote:

> Author: chaoflow

> +  # Please keep in sync with linux_3_0_powertop, except for extraConfig
>linux_3_0 = makeOverridable (import 
> ../os-specific/linux/kernel/linux-3.0.nix) {
...
> +  # Please keep in sync with linux_3_0, except for extraConfig
> +  linux_3_0_powertop = makeOverridable (import 
> ../os-specific/linux/kernel/linux-3.0.nix) {
> +inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
> +extraConfig = ''
> +CPU_FREQ_GOV_ONDEMAND y

Assuming that there is no significant runtime cost, why not just put this in the
default kernel?  It's not a good idea to have a separate kernel for every little
feature.  We have too many kernels already (creating a potential maintenance
problem).

BTW, as far as I can tell from my 2.6.35 kernel, some of these options are
already enabled (e.g., HIGH_RES_TIMERS, HPET_TIMER, NO_HZ).

CPU_FREQ_GOV_ONDEMAND should be "m" instead of "y".

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

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

2011-10-13 Thread Michael Raskin 
>Assuming that there is no significant runtime cost, why not just put this in 
>the
>default kernel?  It's not a good idea to have a separate kernel for every 
>little
>feature.  We have too many kernels already (creating a potential maintenance
>problem).

I guess that to be sure we need multiple people trying it.



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

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

2011-10-13 Thread Florian Friesdorf 
Author: chaoflow
Date: Thu Oct 13 13:51:33 2011
New Revision: 29823
URL: https://nixos.org/websvn/nix/?rev=29823&sc=1

Log:
linux_3_1_powertop

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

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 13:05:58 
2011(r29822)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 13:51:33 
2011(r29823)
@@ -5620,6 +5620,30 @@
   ];
   };
 
+  linux_3_1_powertop = makeOverridable (import 
../os-specific/linux/kernel/linux-3.1.nix) {
+inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+extraConfig = ''
+CPU_FREQ_GOV_ONDEMAND y
+CPU_FREQ_STAT y
+DEBUG_KERNEL y
+HIGH_RES_TIMERS y
+HPET_TIMER y
+NO_HZ y
+PM_ADVANCED_DEBUG y
+PM_RUNTIME y
+SND_AC97_POWER_SAVE y
+TIMER_STATS y
+USB_SUSPEND y
+'';
+kernelPatches =
+  [ #kernelPatches.fbcondecor_2_6_38
+kernelPatches.sec_perm_2_6_24
+kernelPatches.efi_stub
+#kernelPatches.aufs2_1_2_6_38
+#kernelPatches.mips_restart_2_6_36
+  ];
+  };
+
   /* Linux kernel modules are inherently tied to a specific kernel.  So
  rather than provide specific instances of those packages for a
  specific kernel, we have a function that builds those packages
@@ -5768,6 +5792,7 @@
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 
pkgs.linuxPackages_3_0);
   linuxPackages_3_0_powertop = recurseIntoAttrs (linuxPackagesFor 
linux_3_0_powertop pkgs.linuxPackages_3_0_powertop);
   linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 
pkgs.linuxPackages_3_1);
+  linuxPackages_3_1_powertop = recurseIntoAttrs (linuxPackagesFor 
linux_3_1_powertop pkgs.linuxPackages_3_1_powertop);
   linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor 
linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
   linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor 
linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
   linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor 
linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

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

2011-10-13 Thread Florian Friesdorf 
Author: chaoflow
Date: Thu Oct 13 13:51:39 2011
New Revision: 29824
URL: https://nixos.org/websvn/nix/?rev=29824&sc=1

Log:
use override for powertop kernels

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

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 13:51:33 
2011(r29823)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 13:51:39 
2011(r29824)
@@ -5537,7 +5537,6 @@
 
   linux_2_6_38_ati = linux_2_6_38.override { extraConfig="DRM_RADEON_KMS y"; };
 
-  # Please keep in sync with linux_2_6_39_powertop, except for extraConfig
   linux_2_6_39 = makeOverridable (import 
../os-specific/linux/kernel/linux-2.6.39.nix) {
 inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
 kernelPatches =
@@ -5548,9 +5547,7 @@
   ];
   };
 
-  # Please keep in sync with linux_2_6_39, except for extraConfig
-  linux_2_6_39_powertop = makeOverridable (import 
../os-specific/linux/kernel/linux-2.6.39.nix) {
-inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+  linux_2_6_39_powertop = linux_2_6_39.override {
 extraConfig = ''
 CPU_FREQ_GOV_ONDEMAND y
 CPU_FREQ_STAT y
@@ -5564,15 +5561,8 @@
 TIMER_STATS y
 USB_SUSPEND y
 '';
-kernelPatches =
-  [ #kernelPatches.fbcondecor_2_6_38
-kernelPatches.sec_perm_2_6_24
-kernelPatches.aufs2_1_2_6_39
-#kernelPatches.mips_restart_2_6_36
-  ];
   };
 
-  # Please keep in sync with linux_3_0_powertop, except for extraConfig
   linux_3_0 = makeOverridable (import 
../os-specific/linux/kernel/linux-3.0.nix) {
 inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
 kernelPatches =
@@ -5584,9 +5574,7 @@
   ];
   };
 
-  # Please keep in sync with linux_3_0, except for extraConfig
-  linux_3_0_powertop = makeOverridable (import 
../os-specific/linux/kernel/linux-3.0.nix) {
-inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+  linux_3_0_powertop = linux_3_0.override {
 extraConfig = ''
 CPU_FREQ_GOV_ONDEMAND y
 CPU_FREQ_STAT y
@@ -5600,13 +5588,6 @@
 TIMER_STATS y
 USB_SUSPEND y
 '';
-kernelPatches =
-  [ #kernelPatches.fbcondecor_2_6_38
-kernelPatches.sec_perm_2_6_24
-kernelPatches.aufs3_0
-#kernelPatches.aufs2_1_3_0
-#kernelPatches.mips_restart_2_6_36
-  ];
   };
 
   linux_3_1 = makeOverridable (import 
../os-specific/linux/kernel/linux-3.1.nix) {
@@ -5620,8 +5601,7 @@
   ];
   };
 
-  linux_3_1_powertop = makeOverridable (import 
../os-specific/linux/kernel/linux-3.1.nix) {
-inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+  linux_3_1_powertop = linux_3_1.override {
 extraConfig = ''
 CPU_FREQ_GOV_ONDEMAND y
 CPU_FREQ_STAT y
@@ -5635,13 +5615,6 @@
 TIMER_STATS y
 USB_SUSPEND y
 '';
-kernelPatches =
-  [ #kernelPatches.fbcondecor_2_6_38
-kernelPatches.sec_perm_2_6_24
-kernelPatches.efi_stub
-#kernelPatches.aufs2_1_2_6_38
-#kernelPatches.mips_restart_2_6_36
-  ];
   };
 
   /* Linux kernel modules are inherently tied to a specific kernel.  So
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

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

2011-10-13 Thread Florian Friesdorf 
Author: chaoflow
Date: Thu Oct 13 13:51:46 2011
New Revision: 29825
URL: https://nixos.org/websvn/nix/?rev=29825&sc=1

Log:
remove redundant/conflicting config (y vs m) from powertop kernels

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

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 13:51:39 
2011(r29824)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 13:51:46 
2011(r29825)
@@ -5549,15 +5549,9 @@
 
   linux_2_6_39_powertop = linux_2_6_39.override {
 extraConfig = ''
-CPU_FREQ_GOV_ONDEMAND y
-CPU_FREQ_STAT y
 DEBUG_KERNEL y
-HIGH_RES_TIMERS y
-HPET_TIMER y
-NO_HZ y
 PM_ADVANCED_DEBUG y
 PM_RUNTIME y
-SND_AC97_POWER_SAVE y
 TIMER_STATS y
 USB_SUSPEND y
 '';
@@ -5576,15 +5570,9 @@
 
   linux_3_0_powertop = linux_3_0.override {
 extraConfig = ''
-CPU_FREQ_GOV_ONDEMAND y
-CPU_FREQ_STAT y
 DEBUG_KERNEL y
-HIGH_RES_TIMERS y
-HPET_TIMER y
-NO_HZ y
 PM_ADVANCED_DEBUG y
 PM_RUNTIME y
-SND_AC97_POWER_SAVE y
 TIMER_STATS y
 USB_SUSPEND y
 '';
@@ -5603,15 +5591,9 @@
 
   linux_3_1_powertop = linux_3_1.override {
 extraConfig = ''
-CPU_FREQ_GOV_ONDEMAND y
-CPU_FREQ_STAT y
 DEBUG_KERNEL y
-HIGH_RES_TIMERS y
-HPET_TIMER y
-NO_HZ y
 PM_ADVANCED_DEBUG y
 PM_RUNTIME y
-SND_AC97_POWER_SAVE y
 TIMER_STATS y
 USB_SUSPEND y
 '';
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29826 - nixos/trunk/tests

2011-10-13 Thread Eelco Dolstra 
Author: eelco
Date: Thu Oct 13 14:08:00 2011
New Revision: 29826
URL: https://nixos.org/websvn/nix/?rev=29826&sc=1

Log:
* Test whether restarting Upstart jobs works properly if there are
  dependent jobs with multiple dependencies (such as "started portmap
  and started nfs-kernel-exports").  This currently *doesn't* work
  (and frequently breaks the NFS server in the build farm :-) ).

Modified:
   nixos/trunk/tests/nfs.nix

Modified: nixos/trunk/tests/nfs.nix
==
--- nixos/trunk/tests/nfs.nix   Thu Oct 13 13:51:46 2011(r29825)
+++ nixos/trunk/tests/nfs.nix   Thu Oct 13 14:08:00 2011(r29826)
@@ -48,6 +48,12 @@
   $client2->succeed("echo bla > /data/bar");
   $server->succeed("test -e /data/bar");
 
+  # Test whether restarting the ‘nfs-kernel-exports’ job works
+  # correctly.  In Upstart 0.6.7 this fails because the jobs that
+  # depend on ‘nfs-kernel-exports’ are stopped but not restarted.
+  $server->succeed("restart nfs-kernel-exports");
+  $client2->succeed("echo bla >> /data/bar");
+
   # Test whether we can get a lock.  !!! This step takes about 90
   # seconds because the NFS server waits that long after booting
   # before accepting new locks.
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29827 - in disnix/disnixos/trunk: . data doc/manual scripts

2011-10-13 Thread Sander van der Burg 
Author: sandervanderburg
Date: Thu Oct 13 14:47:55 2011
New Revision: 29827
URL: https://nixos.org/websvn/nix/?rev=29827&sc=1

Log:
Implemented support for multiple network models

Modified:
   disnix/disnixos/trunk/NEWS
   disnix/disnixos/trunk/data/generate-infrastructure.nix.in
   disnix/disnixos/trunk/data/generate-services.nix.in
   disnix/disnixos/trunk/data/generate-tests.nix.in
   disnix/disnixos/trunk/data/infrastructure.nix.in
   disnix/disnixos/trunk/data/services.nix.in
   disnix/disnixos/trunk/doc/manual/disnixos-deploy-network.xml
   disnix/disnixos/trunk/doc/manual/disnixos-env.xml
   disnix/disnixos/trunk/doc/manual/disnixos-geninfra.xml
   disnix/disnixos/trunk/doc/manual/disnixos-genservices.xml
   disnix/disnixos/trunk/doc/manual/disnixos-gentests.xml
   disnix/disnixos/trunk/doc/manual/disnixos-vm-env.xml
   disnix/disnixos/trunk/release.nix
   disnix/disnixos/trunk/scripts/checks
   disnix/disnixos/trunk/scripts/disnixos-deploy-network.in
   disnix/disnixos/trunk/scripts/disnixos-env.in
   disnix/disnixos/trunk/scripts/disnixos-geninfra.in
   disnix/disnixos/trunk/scripts/disnixos-genservices.in
   disnix/disnixos/trunk/scripts/disnixos-gentests.in
   disnix/disnixos/trunk/scripts/disnixos-vm-env.in

Modified: disnix/disnixos/trunk/NEWS
==
--- disnix/disnixos/trunk/NEWS  Thu Oct 13 14:08:00 2011(r29826)
+++ disnix/disnixos/trunk/NEWS  Thu Oct 13 14:47:55 2011(r29827)
@@ -0,0 +1,8 @@
+Version 0.2
+===
+
+- Machines in the network model can refer to each other through the 'node' 
parameter
+
+- Multiple network models are also supported, so you can capture concerns 
separately
+
+- Various bug fixes

Modified: disnix/disnixos/trunk/data/generate-infrastructure.nix.in
==
--- disnix/disnixos/trunk/data/generate-infrastructure.nix.in   Thu Oct 13 
14:08:00 2011(r29826)
+++ disnix/disnixos/trunk/data/generate-infrastructure.nix.in   Thu Oct 13 
14:47:55 2011(r29827)
@@ -1,4 +1,4 @@
-{ networkFile
+{ networkFiles
 , useBackdoor ? false
 , nixpkgs ? 
 , nixos ? 
@@ -11,7 +11,7 @@
 pkgs.stdenv.mkDerivation {
   name = "infrastructure.nix";
   buildCommand = ''
-sed -e "s|@networkFile@|${networkFile}|" \
+sed -e "s|@networkFiles@|${toString networkFiles}|" \
 -e "s|@nixpkgs@|${nixpkgs}|" \
-e "s|@nixos@|${nixos}|" \
-e "s|@useBackdoor@|${if useBackdoor then "true" else "false"}|" 
${infrastructureNix} > $out

Modified: disnix/disnixos/trunk/data/generate-services.nix.in
==
--- disnix/disnixos/trunk/data/generate-services.nix.in Thu Oct 13 14:08:00 
2011(r29826)
+++ disnix/disnixos/trunk/data/generate-services.nix.in Thu Oct 13 14:47:55 
2011(r29827)
@@ -1,4 +1,4 @@
-{ networkFile
+{ networkFiles
 , nixpkgs ? 
 , nixos ? 
 }:
@@ -10,7 +10,8 @@
 pkgs.stdenv.mkDerivation {
   name = "services.nix";
   buildCommand = ''
-sed -e "s|@networkFile@|${networkFile}|" \
+sed -e "s|@networkFiles@|${toString networkFiles}|" \
+-e "s|@nixpkgs@|${nixpkgs}|" \
-e "s|@nixos@|${nixos}|" ${servicesNix} > $out
   '';
 }

Modified: disnix/disnixos/trunk/data/generate-tests.nix.in
==
--- disnix/disnixos/trunk/data/generate-tests.nix.inThu Oct 13 14:08:00 
2011(r29826)
+++ disnix/disnixos/trunk/data/generate-tests.nix.inThu Oct 13 14:47:55 
2011(r29827)
@@ -1,4 +1,4 @@
-{ networkFile
+{ networkFiles
 , manifestFile
 , nixpkgs ? 
 , disnix ? @DISNIX_PREFIX@
@@ -6,9 +6,12 @@
 }:
 
 let
-  network = import networkFile;
   pkgs = import nixpkgs {};
   
+  networks = map (networkFile: import networkFile) networkFiles;
+  
+  network = pkgs.lib.zipAttrs networks;
+  
   testScript = ''
 startAll;
 

Modified: disnix/disnixos/trunk/data/infrastructure.nix.in
==
--- disnix/disnixos/trunk/data/infrastructure.nix.inThu Oct 13 14:08:00 
2011(r29826)
+++ disnix/disnixos/trunk/data/infrastructure.nix.inThu Oct 13 14:47:55 
2011(r29827)
@@ -1,19 +1,20 @@
 let
-  networkFile = @networkFile@;
+  networkFiles = [ @networkFiles@ ];
   nixpkgs = "@nixpkgs@";
   nixos = "@nixos@";
   useBackdoor = @useBackdoor@;
 
   pkgs = import nixpkgs {};
-  network = import networkFile;
+  
+  networks = map (networkFile: import networkFile) networkFiles;
+
+  network = pkgs.lib.zipAttrs networks;
 
   configurations = pkgs.lib.mapAttrs (targetName: configuration: 
 (import "${nixos}/lib/eval-config.nix" {
   inherit nixpkgs;
   
-  modules = [
-configuration
-  ]
+  modules = configuration
   ++ [ 
 { key = "publish-infrastructure";
  services.disnix.publishIn

[Nix-commits] SVN commit: nix - r29828 - nixpkgs/trunk/pkgs/os-specific/linux/upstart

2011-10-13 Thread Eelco Dolstra 
Author: eelco
Date: Thu Oct 13 15:01:44 2011
New Revision: 29828
URL: https://nixos.org/websvn/nix/?rev=29828&sc=1

Log:
* Upstart updated to 1.3.

Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/upstart/default.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/upstart/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/upstart/default.nixThu Oct 13 
14:47:55 2011(r29827)
+++ nixpkgs/trunk/pkgs/os-specific/linux/upstart/default.nixThu Oct 13 
15:01:44 2011(r29828)
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus, libnih }:
 
 stdenv.mkDerivation rec {
-  name = "upstart-0.6.7";
+  name = "upstart-1.3";
   
   src = fetchurl {
-url = "http://upstart.ubuntu.com/download/0.6/${name}.tar.gz";;
-sha256 = "1f1pds27cadi6ycii1fkn5bbs1brjqxa2b45wfn03ikc2azqxlr9";
+url = "http://upstart.ubuntu.com/download/1.3/${name}.tar.gz";;
+md5 = "7820797b64878c27115fff6a7398a6a9";
   };
 
   buildInputs = [ pkgconfig dbus libnih ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r29829 - nixpkgs/trunk/pkgs/tools/networking/nbd

2011-10-13 Thread Peter Simons 
Author: simons
Date: Thu Oct 13 17:00:46 2011
New Revision: 29829
URL: https://nixos.org/websvn/nix/?rev=29829&sc=1

Log:
nbd: updated to version 2.9.24

Modified:
   nixpkgs/trunk/pkgs/tools/networking/nbd/default.nix

Modified: nixpkgs/trunk/pkgs/tools/networking/nbd/default.nix
==
--- nixpkgs/trunk/pkgs/tools/networking/nbd/default.nix Thu Oct 13 15:01:44 
2011(r29828)
+++ nixpkgs/trunk/pkgs/tools/networking/nbd/default.nix Thu Oct 13 17:00:46 
2011(r29829)
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 let
-  name = "nbd-2.9.23";
+  name = "nbd-2.9.24";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
 url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-sha256 = 
"0ab44fe9e80c3f41bb1025ecda351a874affd46bf56ba4033ea03700c3b83803";
+sha256 = "025cqsx6cwbr62javdvm5vx675ai0b1absbx4if1v5pp9hzrpxmq";
   };
 
   buildInputs = [pkgconfig glib];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

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

2011-10-13 Thread Florian Friesdorf 
Author: chaoflow
Date: Thu Oct 13 18:30:55 2011
New Revision: 29830
URL: https://nixos.org/websvn/nix/?rev=29830&sc=1

Log:
powertop kernels: re-disable debug flags enabled by default

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

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 17:00:46 
2011(r29829)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Oct 13 18:30:55 
2011(r29830)
@@ -5554,6 +5554,14 @@
 PM_RUNTIME y
 TIMER_STATS y
 USB_SUSPEND y
+BACKTRACE_SELF_TEST n
+CPU_NOTIFIER_ERROR_INJECT n
+DEBUG_DEVRES n
+DEBUG_NX_TEST n
+DEBUG_STACK_USAGE n
+DEBUG_STACKOVERFLOW n
+RCU_TORTURE_TEST n
+SCHEDSTATS n
 '';
   };
 
@@ -5575,6 +5583,14 @@
 PM_RUNTIME y
 TIMER_STATS y
 USB_SUSPEND y
+BACKTRACE_SELF_TEST n
+CPU_NOTIFIER_ERROR_INJECT n
+DEBUG_DEVRES n
+DEBUG_NX_TEST n
+DEBUG_STACK_USAGE n
+DEBUG_STACKOVERFLOW n
+RCU_TORTURE_TEST n
+SCHEDSTATS n
 '';
   };
 
@@ -5596,6 +5612,14 @@
 PM_RUNTIME y
 TIMER_STATS y
 USB_SUSPEND y
+BACKTRACE_SELF_TEST n
+CPU_NOTIFIER_ERROR_INJECT n
+DEBUG_DEVRES n
+DEBUG_NX_TEST n
+DEBUG_STACK_USAGE n
+DEBUG_STACKOVERFLOW n
+RCU_TORTURE_TEST n
+SCHEDSTATS n
 '';
   };
 
___
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 - r29820 - nixpkgs/trunk/pkgs/top-level

2011-10-13 Thread Florian Friesdorf 
On Thu, 13 Oct 2011 15:10:48 +0200, Eelco Dolstra  wrote:
> Hi,
> 
> On 10/13/2011 03:04 PM, Florian Friesdorf wrote:
> 
> > Author: chaoflow
> 
> > +  # Please keep in sync with linux_3_0_powertop, except for extraConfig
> >linux_3_0 = makeOverridable (import 
> > ../os-specific/linux/kernel/linux-3.0.nix) {
> ...
> > +  # Please keep in sync with linux_3_0, except for extraConfig
> > +  linux_3_0_powertop = makeOverridable (import 
> > ../os-specific/linux/kernel/linux-3.0.nix) {
> > +inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
> > +extraConfig = ''
> > +CPU_FREQ_GOV_ONDEMAND y
> 
> Assuming that there is no significant runtime cost, why not just put this in 
> the
> default kernel?  It's not a good idea to have a separate kernel for every 
> little
> feature.  We have too many kernels already (creating a potential maintenance
> problem).
> 
> BTW, as far as I can tell from my 2.6.35 kernel, some of these options are
> already enabled (e.g., HIGH_RES_TIMERS, HPET_TIMER, NO_HZ).
> 
> CPU_FREQ_GOV_ONDEMAND should be "m" instead of "y".

I fixed the colliding (y vs m) options and disabled unnecessary debug
options. Attached is the effective (full) config diff between default
3_0 and 3_0_powertop.

Here the summary:
# Wanted by powertop:
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_ADVANCED_DEBUG=y
+CONFIG_USB_SUSPEND=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_TIMER_STATS=y
# Does not show up in menuconfig, assumed to be implicitly enabled
+CONFIG_PCIE_PME=y
# Recommend in case DEBUG is enabled
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_BOOT_PARAMS=y

I'm now using 3_0_powertop on a daily base on my laptop.

--- 3_0/config	1970-01-01 01:00:01.0 +0100
+++ 3_0_powertop/config	1970-01-01 01:00:01.0 +0100
@@ -158,6 +158,7 @@
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -179,6 +180,7 @@
 #
 CONFIG_PERF_EVENTS=y
 # CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
 CONFIG_SLUB_DEBUG=y
@@ -297,6 +299,7 @@
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_SPINLOCKS is not set
 CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_NO_BOOTMEM=y
 CONFIG_MEMTEST=y
 # CONFIG_MK8 is not set
@@ -329,6 +332,7 @@
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_IOMMU_API=y
+# CONFIG_MAXSMP is not set
 CONFIG_NR_CPUS=64
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -425,10 +429,10 @@
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_RUNTIME is not set
+CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_CAN_PM_TRACE=y
 # CONFIG_PM_TRACE_RTC is not set
@@ -521,8 +525,10 @@
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIE_PME=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_STUB=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_HT_IRQ=y
@@ -913,6 +919,11 @@
 #
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
 # CONFIG_IP_DCCP_CCID3 is not set
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
@@ -1237,6 +1248,8 @@
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
@@ -2749,6 +2762,7 @@
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_MASTER=y
 
 #
@@ -2800,6 +2814,7 @@
 #
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_MAX730X=m
 
@@ -4178,6 +4193,8 @@
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_DEVICE_CLASS is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4350,6 +4367,7 @@
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
 CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
@@ -5023,18 +5041,56 @@
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
-# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is

[Nix-dev] kernel oops [aufs + squashfs] on nixos-graphical-0.1pre29826-i686-linux.iso

2011-10-13 Thread Paul Dufresne 
I burnt and verify (twice) my image (more if you count the one that were bad):
paul@paul-P5GZ-MX:~$ md5sum nixos-graphical-0.1pre29826-i686-linux.iso
164774618b05c3633124bf6ef793d5e8  nixos-graphical-0.1pre29826-i686-linux.iso

When I boot, it basically goes up to the login prompt.
But just before, about 3 cascade oops happens.
They are linked to aufs and squashfs.
Sometimes, a message say that kernel was fixing from recursive (oops)
but need to reboot.

I still can change console with Alt-F[1-6], but after entering root, I
get some other oops,
and nothing happens.

This is my first contact with NixOS.

I seems to see that an other image have got out since this one.
I would be surprised it will help... but I may try to download it eventually.

aufs... need to search this filesystem because I don't know it.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] kernel oops [aufs + squashfs] on nixos-graphical-0.1pre29826-i686-linux.iso

2011-10-13 Thread Marc Weber 
Hi Paul Dufresne,

I'm sorry that you've experienced some trouble.
Its hard to understand that there are such issues because automatic
tests do exist.

- So what can you do?
find an older version here:
http://hydra.nixos.org/job/nixos/trunk/iso_graphical/all

- Or try the non graphical version.

- use virtualization instead

- try the minimal install archive I maintain for installing. Then you
  can use any arbitrary live cd providing a chroot to install nixos
  linux. The minimal archive contains enough to bootstrap the system by
  configuration file.

> This is my first contact with NixOS.
You're welcome.

Maybe someone else has some more experience with the current version of
the install cd?

So wait a couple of hours before you spend much additional time - there
might be an easier solution provided by others.

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