[Nix-commits] SVN commit: nix - r30708 - nixpkgs/trunk/pkgs/data/misc/xkeyboard-config

2011-12-03 Thread Michael Raskin
Author: raskin
Date: Sat Dec  3 09:07:56 2011
New Revision: 30708
URL: https://nixos.org/websvn/nix/?rev=30708sc=1

Log:
Allow cross-builds

Modified:
   nixpkgs/trunk/pkgs/data/misc/xkeyboard-config/default.nix

Modified: nixpkgs/trunk/pkgs/data/misc/xkeyboard-config/default.nix
==
--- nixpkgs/trunk/pkgs/data/misc/xkeyboard-config/default.nix   Fri Dec  2 
23:14:09 2011(r30707)
+++ nixpkgs/trunk/pkgs/data/misc/xkeyboard-config/default.nix   Sat Dec  3 
09:07:56 2011(r30708)
@@ -8,7 +8,9 @@
 sha256 = 0x9hkb4iqz64gcabzkdcfy4p78sdhnpjwh54g8wx5bdgy9087vpr;
   };
 
-  buildInputs = [ perl perlXMLParser xkbcomp gettext intltool ];
+  buildInputs = [ gettext ];
+
+  buildNativeInputs = [ perl perlXMLParser intltool xkbcomp ];
 
   patches = [ ./eo.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 - r30710 - configurations/trunk/misc/raskin/lesser-expressions

2011-12-03 Thread Michael Raskin
Author: raskin
Date: Sat Dec  3 09:30:11 2011
New Revision: 30710
URL: https://nixos.org/websvn/nix/?rev=30710sc=1

Log:
Cross-built ARMv6 tigervnc... Will test

Modified:
   configurations/trunk/misc/raskin/lesser-expressions/pb.nix

Modified: configurations/trunk/misc/raskin/lesser-expressions/pb.nix
==
--- configurations/trunk/misc/raskin/lesser-expressions/pb.nix  Sat Dec  3 
09:29:38 2011(r30709)
+++ configurations/trunk/misc/raskin/lesser-expressions/pb.nix  Sat Dec  3 
09:30:11 2011(r30710)
@@ -67,14 +67,22 @@
]) 
   ++
   [
-(pkgs.gcc44.hostDrv)
+(pkgs.gcc45.hostDrv)
 (pkgs.lib.overrideDerivation
-  pkgs.tigervnc
+  pkgs.tigervnc.hostDrv
   (p : {
 buildPhase = ''
  make -C common
'' + p.postBuild;
 installPhase = p.postInstall;
+   propagatedBuildInputs = pkgs.lib.filter 
+ (x: ! (( x ? meta)  
+   ( x.meta ? homepage)  ( x.meta.homepage == 
http://www.gnu.org/software/gnutls/ )))
+ p.propagatedBuildInputs;
+   buildInputs = (pkgs.lib.filter 
+ (x: ! (( x ? meta)  
+   ( x.meta ? homepage)  ( x.meta.homepage == 
http://www.gnu.org/software/gnutls/ )))
+ p.buildInputs) ++ [ pkgs.openssl.hostDrv ];
   })
   )
   ]
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] nix-store --verify strange hashes

2011-12-03 Thread Lluís Batlle i Rossell
On Fri, Dec 02, 2011 at 02:31:33PM +0100, Lluís Batlle i Rossell wrote:
 On Fri, Dec 02, 2011 at 01:47:19PM +0100, Rickard Nilsson wrote:
  Hi,
  
  On my newly installed Sheevaplug NixOS system, I ran nix-store --verify  
  --check-contents. I then got a lot of output like this:
 
 I never run this before on the sheevaplug.
 
 Now I started it, and it starts saying some messages like this:
 ...
 updating size field on 
 `/nix/store/0kqb380a25xb7w4y09fx62dqxmvk7bi4-useradd.drv'
 to 1064
 ...

So, I don't get anything beyond those messages for lots of paths.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] SVN commit: nix - r30711 - nixpkgs/trunk/pkgs/applications/misc/eaglemode

2011-12-03 Thread Lluís Batlle
Author: viric
Date: Sat Dec  3 15:04:05 2011
New Revision: 30711
URL: https://nixos.org/websvn/nix/?rev=30711sc=1

Log:
Updating eaglemode

Modified:
   nixpkgs/trunk/pkgs/applications/misc/eaglemode/default.nix

Modified: nixpkgs/trunk/pkgs/applications/misc/eaglemode/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/eaglemode/default.nix  Sat Dec  3 
09:30:11 2011(r30710)
+++ nixpkgs/trunk/pkgs/applications/misc/eaglemode/default.nix  Sat Dec  3 
15:04:05 2011(r30711)
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, perl, libX11, xineLib, libjpeg, libpng, libtiff, pkgconfig,
-librsvg, glib, gtk, libXext, libXxf86vm }:
+librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
 
 stdenv.mkDerivation {
-  name = eaglemode-0.79.0;
+  name = eaglemode-0.83.0;
  
   src = fetchurl {
-url = mirror://sourceforge/eaglemode/eaglemode-0.79.0.tar.bz2;
-sha256 = 115jydig35dqkrwl3x7fv564bks13nw89vfb46bb5rlr3l4a084s;
+url = mirror://sourceforge/eaglemode/eaglemode-0.83.0.tar.bz2;
+sha256 = 0rlvi9ljf3ml2l4ydkcgjjja8wk9c7h5qlpdr4x4ghh6sqq0q2x3;
   };
  
   buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig 
-librsvg glib gtk libXxf86vm libXext ];
+librsvg glib gtk libXxf86vm libXext poppler ];
  
   # The program tries to dlopen both Xxf86vm and Xext, so we use the
   # trick on NIX_LDFLAGS and dontPatchELF to make it find them.
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-dev] [PATCH] flashplayer11

2011-12-03 Thread Eduard Carreras i Nadal
Hello,
I have done a new package for flashplayer11 wich I needed to build chromium
(with plugins). I'm not an expert nixos packager (I'm using nixos since 2
weeks ago).

Simply I have copied flashplayer10 to flashplayer11 and I have updated urls
and hashes.

Cheers,

-- 
Eduard Carreras i Nadal ecarre...@gmail.com


flashplayer11.diff
Description: Binary data
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] SVN commit: nix - r30712 - in nixpkgs/trunk/pkgs: applications/networking/browsers/mozilla-plugins/flashplayer-11 top-level

2011-12-03 Thread Lluís Batlle
Author: viric
Date: Sat Dec  3 15:16:17 2011
New Revision: 30712
URL: https://nixos.org/websvn/nix/?rev=30712sc=1

Log:
Adding flashplayer11. It builds fine for me on x86_64.

Patch by Eduard Carreras.

Added:
   
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/
   
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh
   
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Added: 
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ 
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh
   Sat Dec  3 15:16:17 2011(r30712)
@@ -0,0 +1,23 @@
+source $stdenv/setup
+
+dontStrip=1
+dontPatchELF=1
+sourceRoot=$TMPDIR
+
+unpackPhase() {
+tar xvzf $src;
+for a in *; do
+   if [ -d $a ]; then
+   cd $a
+   break
+   fi
+done
+}
+
+installPhase() {
+ensureDir $out/lib/mozilla/plugins
+cp -pv libflashplayer.so $out/lib/mozilla/plugins
+patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so
+}
+
+genericBuild

Added: 
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ 
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
  Sat Dec  3 15:16:17 2011(r30712)
@@ -0,0 +1,88 @@
+{ stdenv
+, fetchurl
+, zlib
+, alsaLib
+, curl
+, nss
+, nspr
+, fontconfig
+, freetype
+, expat
+, libX11
+, libXext
+, libXrender
+, libXt
+, gtk 
+, glib
+, pango
+, cairo
+, atk
+, gdk_pixbuf
+, debug ? false
+
+/* you have to add ~/mm.cfg :
+
+TraceOutputFileEnable=1
+ErrorReportingEnable=1
+MaxWarnings=1
+
+  in order to read the flash trace at 
~/.macromedia/Flash_Player/Logs/flashlog.txt
+  Then FlashBug (a FireFox plugin) shows the log as well
+*/
+
+}:
+
+let
+
+  src =
+if stdenv.system == x86_64-linux then
+  if debug then
+# no plans to provide a x86_64 version:
+# http://labs.adobe.com/technologies/flashplayer10/faq.html
+throw no x86_64 debugging version available
+  else {
+# - http://labs.adobe.com/downloads/flashplayer10.html
+version = 11.1.102.55;
+url = 
http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.x86_64.tar.gz;
+sha256 = 09swldv174z23pnixy9fxkw084qkl3bbrxfpf159fbjdgvwihn1l;
+  }
+else if stdenv.system == i686-linux then
+  if debug then {
+# The debug version also contains a player
+version = 11.1;
+url = 
http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
+sha256 = 1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk;
+  } else {
+version = 11.1.102.55;
+url = 
http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.i386.tar.gz;;
+sha256 = 08zdnl06lqyk2k3yq4lgphqd3ci2267448mghlv1p0hjrdq253k7;
+  }
+else throw Flash Player is not supported on this platform;
+
+in
+
+stdenv.mkDerivation {
+  name = flashplayer-${src.version};
+
+  builder = ./builder.sh;
+  
+  src = fetchurl { inherit (src) url sha256; };
+
+  inherit zlib alsaLib;
+
+  passthru = {
+mozillaPlugin = /lib/mozilla/plugins;
+  };
+
+  rpath = stdenv.lib.makeLibraryPath
+[ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
+  libXext libXrender libXt gtk glib pango atk cairo gdk_pixbuf
+];
+
+  buildPhase = :;
+
+  meta = {
+description = Adobe Flash Player browser plugin;
+homepage = http://www.adobe.com/products/flashplayer/;
+  };
+}

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Sat Dec  3 15:04:05 
2011(r30711)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Sat Dec  3 15:16:17 
2011(r30712)
@@ -6680,7 +6680,7 @@
 
   flac = callPackage ../applications/audio/flac { };
 
-  flashplayer = flashplayer10;
+  flashplayer = flashplayer11;
 
   flashplayer9 = callPackage 
../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
 inherit (gtkLibs) atk;
@@ -6690,6 +6690,11 @@
 inherit (gtkLibs) atk gdk_pixbuf;
 debug = getConfig [flashplayer debug] false;
   };
+
+  flashplayer11 = callPackage 
../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
+inherit (gtkLibs) atk gdk_pixbuf;
+debug = 

Re: [Nix-dev] [PATCH] flashplayer11

2011-12-03 Thread Lluís Batlle i Rossell
I committed it. Welcome!

On Sat, Dec 03, 2011 at 04:09:19PM +0100, Eduard Carreras i Nadal wrote:
 Hello,
 I have done a new package for flashplayer11 wich I needed to build chromium
 (with plugins). I'm not an expert nixos packager (I'm using nixos since 2
 weeks ago).
 
 Simply I have copied flashplayer10 to flashplayer11 and I have updated urls
 and hashes.
 
 Cheers,
 
 -- 
 Eduard Carreras i Nadal ecarre...@gmail.com


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

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


[Nix-commits] SVN commit: nix - r30713 - nixpkgs/trunk/pkgs/applications/misc/ikiwiki

2011-12-03 Thread Peter Simons
Author: simons
Date: Sat Dec  3 16:11:50 2011
New Revision: 30713
URL: https://nixos.org/websvn/nix/?rev=30713sc=1

Log:
ikiwiki: updated to version 3.2007

Modified:
   nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nix

Modified: nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nixSat Dec  3 
15:16:17 2011(r30712)
+++ nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nixSat Dec  3 
16:11:50 2011(r30713)
@@ -13,14 +13,14 @@
 
 let
   name = ikiwiki;
-  version = 3.20110715;
+  version = 3.2007;
 in
 stdenv.mkDerivation {
   name = ${name}-${version};
 
   src = fetchurl {
 url = 
http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz;;
-sha256 = 
ef9cbe5ddf484e6b75de05cc6a5b51dfdff1f5920b1c4c66309b1409266df9c7;
+sha256 = 
5b14370ec9c31138d4937eca4ba9c1f1a74515edd34071cefd0cefa37395565c;
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r30714 - nixpkgs/trunk/pkgs/applications/networking/sync/rsync

2011-12-03 Thread Peter Simons
Author: simons
Date: Sat Dec  3 16:11:54 2011
New Revision: 30714
URL: https://nixos.org/websvn/nix/?rev=30714sc=1

Log:
rsync: added meta.maintainers section

Modified:
   nixpkgs/trunk/pkgs/applications/networking/sync/rsync/default.nix

Modified: nixpkgs/trunk/pkgs/applications/networking/sync/rsync/default.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/sync/rsync/default.nix   Sat Dec 
 3 16:11:50 2011(r30713)
+++ nixpkgs/trunk/pkgs/applications/networking/sync/rsync/default.nix   Sat Dec 
 3 16:11:54 2011(r30714)
@@ -18,5 +18,8 @@
   meta = {
 homepage = http://samba.anu.edu.au/rsync/;
 description = A fast incremental file transfer utility;
+
+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


[Nix-commits] SVN commit: nix - r30715 - nixpkgs/trunk/pkgs/applications/networking/sync/rsync

2011-12-03 Thread Peter Simons
Author: simons
Date: Sat Dec  3 16:11:57 2011
New Revision: 30715
URL: https://nixos.org/websvn/nix/?rev=30715sc=1

Log:
rsync: stripped trailing whitespace

Modified:
   nixpkgs/trunk/pkgs/applications/networking/sync/rsync/default.nix

Modified: nixpkgs/trunk/pkgs/applications/networking/sync/rsync/default.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/sync/rsync/default.nix   Sat Dec 
 3 16:11:54 2011(r30714)
+++ nixpkgs/trunk/pkgs/applications/networking/sync/rsync/default.nix   Sat Dec 
 3 16:11:57 2011(r30715)
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation {
   name = rsync-3.0.9;
-  
+
   src = fetchurl {
 url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz;
 sha256 = 01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-dev] pppd is unable to open the /etc/ppp device

2011-12-03 Thread Peter Simons
Hi,

my attempts to run pppd (via wvdial) fail with the error message shown
in the Subject of this posting. When I 'mknod' that device manually,
everything works fine, but I wonder: isn't /etc/ppp supposed to be
created by udev?

Take care,
Peter

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


[Nix-commits] SVN commit: nix - r30718 - nixpkgs/trunk/pkgs/development/libraries/haskell/transformers-base

2011-12-03 Thread Peter Simons
Author: simons
Date: Sat Dec  3 16:33:53 2011
New Revision: 30718
URL: https://nixos.org/websvn/nix/?rev=30718sc=1

Log:
haskell-transformers-base: updated to version 0.4.0.1

Modified:
   
nixpkgs/trunk/pkgs/development/libraries/haskell/transformers-base/default.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/transformers-base/default.nix
==
--- 
nixpkgs/trunk/pkgs/development/libraries/haskell/transformers-base/default.nix  
Sat Dec  3 16:33:49 2011(r30717)
+++ 
nixpkgs/trunk/pkgs/development/libraries/haskell/transformers-base/default.nix  
Sat Dec  3 16:33:53 2011(r30718)
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = transformers-base;
-  version = 0.4;
-  sha256 = 1g6q1g0ddr3jjjir0h1g6bc0zpq5gxcyx4q93fidraxxz2pmfrs0;
+  version = 0.4.0.1;
+  sha256 = 0avnnxbxh59xgxzb8vldysrbw37sim9iaiiscgjhdlscxy6yasbb;
   buildDepends = [ transformers ];
   meta = {
 homepage = https://github.com/mvv/transformers-base;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] pppd is unable to open the /etc/ppp device

2011-12-03 Thread Paul Dufresne
I did not really test NixOS lately, but normaly /etc/ppp is rather
where to find configuration files. The device is usualy /dev/ttyS0
(for the first serial RS232-C connector) or /dev/ttyS1 (for the second
one). Or even /dev/ttyS2 or /dev/ttyS3 for the third and fourth in
some cases (mostly internal one).
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] pppd is unable to open the /dev/ppp device

2011-12-03 Thread Paul Dufresne
Well, serial lines are not PlugPlay like PCI bus.
So, AsFarAsIKnow, the Linux kernel does not generate any UDEV event
for serial lines. (Like it does for most other devices).

I guess, most people would use WinModems that necessitate to compile
their own modules, which in my experience, sometimes cares to create
/dev/ppp (by adding a UDEV rule I suppose). That said, I finaly get my
hand on some cheap external 56k modem which avoid me the painfull
process of module compilation... and I suspect it works less and less
because these modules would tend to not have any developers to update
them.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] SVN commit: nix - r30719 - nixpkgs/trunk/pkgs/lib

2011-12-03 Thread Shea Levy
Author: shlevy
Date: Sat Dec  3 22:05:21 2011
New Revision: 30719
URL: https://nixos.org/websvn/nix/?rev=30719sc=1

Log:
Add mornfall as a maintainer

Modified:
   nixpkgs/trunk/pkgs/lib/maintainers.nix

Modified: nixpkgs/trunk/pkgs/lib/maintainers.nix
==
--- nixpkgs/trunk/pkgs/lib/maintainers.nix  Sat Dec  3 16:33:53 2011
(r30718)
+++ nixpkgs/trunk/pkgs/lib/maintainers.nix  Sat Dec  3 22:05:21 2011
(r30719)
@@ -15,6 +15,7 @@
   kkallio = Karn Kallio tierplusplusli...@gmail.com;
   ludo = Ludovic Courtès l...@gnu.org;
   marcweber = Marc Weber marco-owe...@gmx.de;
+  mornfall = Petr Ročkai m...@mornfall.net;
   neznalek = Vladimír Čunát vcu...@gmail.com;
   phreedom = Evgeny Egorochkin phreedom.st...@gmail.com;
   pierron = Nicolas B. Pierron ni...@nbp.name;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r30720 - in nixpkgs/trunk/pkgs: applications/video/quvi top-level

2011-12-03 Thread Shea Levy
Author: shlevy
Date: Sat Dec  3 22:21:00 2011
New Revision: 30720
URL: https://nixos.org/websvn/nix/?rev=30720sc=1

Log:
Add quvi

Patch submitted by mornfall

Added:
   nixpkgs/trunk/pkgs/applications/video/quvi/
   nixpkgs/trunk/pkgs/applications/video/quvi/library.nix
   nixpkgs/trunk/pkgs/applications/video/quvi/scripts.nix
   nixpkgs/trunk/pkgs/applications/video/quvi/tool.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Added: nixpkgs/trunk/pkgs/applications/video/quvi/library.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/video/quvi/library.nix  Sat Dec  3 
22:21:00 2011(r30720)
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts}:
+
+stdenv.mkDerivation rec {
+  name = libquvi-${version};
+  version=0.4.0;
+
+  src = fetchurl {
+url = mirror://sourceforge/quvi/libquvi-${version}.tar.gz;
+sha256 = 15cm9j8dssn2zhplqvlw49piwfw511lia6b635byiwfniqf6dnwp;
+  };
+
+  buildInputs = [ pkgconfig lua5 curl quvi_scripts ];
+
+  meta = { 
+description = Quvi is a web video downloader.;
+homepage = http://quvi.sf.net;
+license = LGPLv2.1+;
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+  };
+}
+

Added: nixpkgs/trunk/pkgs/applications/video/quvi/scripts.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/video/quvi/scripts.nix  Sat Dec  3 
22:21:00 2011(r30720)
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  name = quvi-scripts-${version};
+  version=0.4.0;
+
+  src = fetchurl {
+url = mirror://sourceforge/quvi/libquvi-scripts-${version}.tar.gz;
+sha256 = 14p1sn7id4n35isaw3i3h8vsgfqlym09fih9k5xfqwsg6n7xdvq5;
+  };
+
+  buildInputs = [ pkgconfig ];
+
+  meta = { 
+description = Quvi is a web video downloader.;
+homepage = http://quvi.sf.net;
+license = LGPLv2.1+;
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+  };
+}
+

Added: nixpkgs/trunk/pkgs/applications/video/quvi/tool.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/video/quvi/tool.nix Sat Dec  3 22:21:00 
2011(r30720)
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi}:
+
+stdenv.mkDerivation rec {
+  name = quvi-${version};
+  version=0.4.0;
+
+  src = fetchurl {
+url = mirror://sourceforge/quvi/quvi-${version}.tar.gz;
+sha256 = 0qzyj55py4z7pg97794jjycq8nvrlr02072rgjzg8jgknw49hgfv;
+  };
+
+  buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi ];
+
+  meta = { 
+description = Quvi is a web video downloader.;
+homepage = http://quvi.sf.net;
+license = LGPLv2.1+;
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+  };
+}
+

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Sat Dec  3 22:05:21 
2011(r30719)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Sat Dec  3 22:21:00 
2011(r30720)
@@ -6751,6 +6751,12 @@
 
   qcad = callPackage ../applications/misc/qcad { };
 
+  libquvi = callPackage ../applications/video/quvi/library.nix { };
+
+  quvi = callPackage ../applications/video/quvi/tool.nix { };
+
+  quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
+
   qjackctl = callPackage ../applications/audio/qjackctl { };
 
   gkrellm = callPackage ../applications/misc/gkrellm { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


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

2011-12-03 Thread Shea Levy
Author: shlevy
Date: Sat Dec  3 22:23:57 2011
New Revision: 30721
URL: https://nixos.org/websvn/nix/?rev=30721sc=1

Log:
bluez: Wrap the test-input program


Apparently this is useful for bluetooth mice and other HID. Patch submitted by 
mornfall

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

Modified: nixpkgs/trunk/pkgs/os-specific/linux/bluez/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/bluez/default.nix  Sat Dec  3 
22:21:00 2011(r30720)
+++ nixpkgs/trunk/pkgs/os-specific/linux/bluez/default.nix  Sat Dec  3 
22:23:57 2011(r30721)
@@ -35,7 +35,7 @@
 depending on Python etc. */
   postInstall = ''
 pushd test
-for a in simple-agent test-adapter test-device; do
+for a in simple-agent test-adapter test-device test-input; do
   cp $a $out/bin/bluez-$a
   wrapProgram $out/bin/bluez-$a --prefix PYTHONPATH : ${pythonpath}
 done
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] pppd is unable to open the /dev/ppp device

2011-12-03 Thread Paul Dufresne
Well, I said the modem module was in my experience creating /dev/ppp
but now I remember it is rather /dev/modem.

Sure, /dev/ppp exist here, c type, major 108, minor 0. (using Arch
Linux right now)
But I don't know how it is created... oh wait:
Accordint to http://linmodems.technion.ac.il/archive-fourth/msg03622.html
it is created by the module ppp_generic.

I believe UDEV allows to give a specific name to the device, but that
the kernel would create it with default name, without any user mode
UDEV rules. Well, I have quite a fuzzy knowledge of UDEV, don't thrust
too much what I say.

So, if /dev/ppp is not there for you I would guess you don't have
ppp_generic listed in lsmod.

Now, I don't know how the module is suppose to be loaded under NixOS.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] pppd is unable to open the /dev/ppp device

2011-12-03 Thread Paul Dufresne
My wild guess would be that PPP is not activated in the Linux kernel
(networking devices section). Don't know it is by default... would not
be surprised if it would not be activated by default because most
people would use a router that would connect to the Internet, so that
most people would not have to use it.

2011/12/3, Paul Dufresne dufres...@gmail.com:
 Well, I said the modem module was in my experience creating /dev/ppp
 but now I remember it is rather /dev/modem.

 Sure, /dev/ppp exist here, c type, major 108, minor 0. (using Arch
 Linux right now)
 But I don't know how it is created... oh wait:
 Accordint to http://linmodems.technion.ac.il/archive-fourth/msg03622.html
 it is created by the module ppp_generic.

 I believe UDEV allows to give a specific name to the device, but that
 the kernel would create it with default name, without any user mode
 UDEV rules. Well, I have quite a fuzzy knowledge of UDEV, don't thrust
 too much what I say.

 So, if /dev/ppp is not there for you I would guess you don't have
 ppp_generic listed in lsmod.

 Now, I don't know how the module is suppose to be loaded under NixOS.

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


[Nix-commits] SVN commit: nix - r30722 - nixpkgs/trunk/pkgs/development/compilers/llvm

2011-12-03 Thread Shea Levy
Author: shlevy
Date: Sat Dec  3 23:47:59 2011
New Revision: 30722
URL: https://nixos.org/websvn/nix/?rev=30722sc=1

Log:
llvm 3.0

This probably breaks clang. I will be updating clang to 3.0 when I can

Modified:
   nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix

Modified: nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix   Sat Dec  3 
22:23:57 2011(r30721)
+++ nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix   Sat Dec  3 
23:47:59 2011(r30722)
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, groff, darwinSwVersUtility }:
 
-let version = 2.9; in
+let version = 3.0; in
 
 stdenv.mkDerivation {
   name = llvm-${version};
 
   src = fetchurl {
-url= http://llvm.org/releases/${version}/llvm-${version}.tgz;;
-sha256 = 0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6;
+url= http://llvm.org/releases/${version}/llvm-${version}.tar.gz;;
+sha256 = 0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji;
   };
 
   buildInputs = [ perl groff ] ++
@@ -19,6 +19,8 @@
   CXX=clang++
 ];
 
+  enableParallelBuilding = true;
+
   meta = {
 homepage = http://llvm.org/;
 description = Collection of modular and reusable compiler and toolchain 
technologies;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


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

2011-12-03 Thread Lluís Batlle
Author: viric
Date: Sun Dec  4 00:25:58 2011
New Revision: 30723
URL: https://nixos.org/websvn/nix/?rev=30723sc=1

Log:
Updating valgrind

Modified:
   nixpkgs/trunk/pkgs/development/tools/analysis/valgrind/default.nix

Modified: nixpkgs/trunk/pkgs/development/tools/analysis/valgrind/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/analysis/valgrind/default.nix  Sat Dec 
 3 23:47:59 2011(r30722)
+++ nixpkgs/trunk/pkgs/development/tools/analysis/valgrind/default.nix  Sun Dec 
 4 00:25:58 2011(r30723)
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gdb }:
 
 stdenv.mkDerivation (rec {
-  name = valgrind-3.6.1;
+  name = valgrind-3.7.0;
 
   src = fetchurl {
 url = http://valgrind.org/downloads/${name}.tar.bz2;;
-sha256 = 03kaf8q49r347diryc2p1q5hxsd6hyhxikqdbydh8q7hpi7wrga9;
+sha256 = 1xnb4jiimscwriw3jd1lkk0m9x4glqpijj9jb4ngx08l1wrw0qjx;
   };
 
   # Perl is needed for `cg_annotate'.
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-dev] (newbie) nix-env custom package installation

2011-12-03 Thread Иван Левашев
Hello!

I'm running in circles. I can't install a self-written derivation that I 
haven't written into all-packages.nix. Manual only has samples where a 
package is present in all-packages.nix. I don't want to touch this file yet.

So I have written rhash.nix:

{stdenv, fetchurl, openssl ? null}:

let
   version = 1.2.8;
in
stdenv.mkDerivation {
   name = rhash-${version};
   inherit openssl;

   makeFlags = if openssl != null then ADDCFLAGS=\-DUSE_OPENSSL 
-DOPENSSL_RUNTIME -rdynamic\ ADDLDFLAGS=\-ldl\ else ;
   src = fetchurl {
 url = 
mirror://sourceforge/rhash/${version}/rhash-${version}-src.tar.gz;
 md5 = 6b9db38cc322caa5cd0151abdc92a2b5;
   };

   buildinputs = if openssl != null then [openssl] else [];

   meta = {
 homepage = http://rhash.anz.ru/?l=en;;
 description = RHash (Recursive Hasher) is a console utility for 
computing and verifying hash sums of files;
   };
}


Now I'm trying to guess how to install it.

[OCTAGRAM@nixos:~]$ nix-env -E 'f: f // {rhash = import ./rhash.nix;}' 
-i rhash--dry-run
(dry run; not doing anything)
error: cannot auto-call a function that has an argument without a 
default value (`stdenv')

[OCTAGRAM@nixos:~]$ nix-env -E 'f: f // {rhash = callPackage ./rhash.nix 
{ stdenv = f.stdenv; fetchurl = f.fetchurl; openssl = f.openssl; } ;}' 
-i rhash --dry-run
(dry run; not doing anything)
error: undefined variable `callPackage', in `(string)'

[OCTAGRAM@nixos:~]$ nix-env -E 'f: f // {rhash = f.callPackage 
./rhash.nix { stdenv = f.stdenv; fetchurl = f.fetchurl; openssl = 
f.openssl; } ;}' -i rhash --dry-run
(dry run; not doing anything)
error: attribute `callPackage' missing

[OCTAGRAM@nixos:~]$ nix-env -E 'f: f // {rhash = import ./rhash.nix { 
stdenv = f.stdenv; fetchurl = f.fetchurl; openssl = f.openssl; } ;}' -i 
rhash --dry-run
(dry run; not doing anything)
error: attribute `stdenv' missing
(use `--show-trace' to show detailed location information)

[OCTAGRAM@nixos:~]$ nix-env -E 'f: f // {rhash = import ./rhash.nix f 
;}' -i rhash --dry-run   (dry run; not doing anything)
error: function at `/home/OCTAGRAM/rhash.nix:1:1' called without 
required argument `stdenv'

[OCTAGRAM@nixos:~]$ nix-env -E 'f: f // {rhash = import ./rhash.nix f {} 
;}' -i rhash --dry-run
(dry run; not doing anything)
error: function at `/home/OCTAGRAM/rhash.nix:1:1' called without 
required argument `stdenv'

[OCTAGRAM@nixos:~]$ nix-env -E 'f: f // {rhash = import ./rhash.nix (f 
{}) ;}' -i rhash --dry-run
(dry run; not doing anything)
error: attempt to call something which is neither a function nor a 
primop (built-in operation) but an attribute set

I believe it to be indeed possible, but I've ran out of ideas. IIUC I 
must construct something similar to what is defined in all-packages.nix, 
but all-packages is too long, I can't easily overlook it.

If that means something, I have NixOS installed inside VMWare Server 
(it's free, BTW).

Best regards,
Ivan Levashew

-- 
If you want to get to the top, you have to start at the bottom

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


[Nix-dev] (newbie) nix-env custom package installation

2011-12-03 Thread Michael Raskin
Hello!

I'm running in circles. I can't install a self-written derivation that I 
haven't written into all-packages.nix. Manual only has samples where a 
package is present in all-packages.nix. I don't want to touch this file yet.

most simple cases are handled by my script 
/etc/nixos/nixpkgs/maintainers/scripts/nix-call-package

So I have written rhash.nix:

{stdenv, fetchurl, openssl ? null}:


Yup, arguments seem to be auto-findable


If that means something, I have NixOS installed inside VMWare Server 
(it's free, BTW).

Currently free of charge, you mean? Yes, I guess most people here knows.



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