[Nix-commits] SVN commit: nix - r28767 - in nixpkgs/trunk/pkgs: development/misc/avr-gcc-with-avr-libc top-level

2011-08-23 Thread Michael Raskin 
Author: raskin
Date: Tue Aug 23 07:56:34 2011
New Revision: 28767
URL: https://svn.nixos.org/websvn/nix/?rev=28767sc=1

Log:
Updating avr-gcc and avr-libc (old link is inaccessible)

Added:
   
nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/avr-libc-fix-gcc-4.6.0.patch
Modified:
   nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Added: 
nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/avr-libc-fix-gcc-4.6.0.patch
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ 
nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/avr-libc-fix-gcc-4.6.0.patch
  Tue Aug 23 07:56:34 2011(r28767)
@@ -0,0 +1,29 @@
+# Patch from Gentoo
+
+diff -ur 1/include/avr/pgmspace.h 2/include/avr/pgmspace.h
+--- 1/include/avr/pgmspace.h   2011-05-31 18:19:44.524000823 +0200
 2/include/avr/pgmspace.h   2011-05-31 18:20:27.576000824 +0200
+@@ -252,7 +252,7 @@
+ # define PSTR(s) ((const PROGMEM char *)(s))
+ #else  /* !DOXYGEN */
+ /* The real thing. */
+-# define PSTR(s) (__extension__({static char __c[] PROGMEM = (s); __c[0];}))
++# define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); 
__c[0];}))
+ #endif /* DOXYGEN */
+ 
+ #define __LPM_classic__(addr)   \
+diff -ur 1/libc/stdlib/dtostre.c 2/libc/stdlib/dtostre.c
+--- 1/libc/stdlib/dtostre.c2011-05-31 18:19:44.639000823 +0200
 2/libc/stdlib/dtostre.c2011-05-31 18:20:27.639000824 +0200
+@@ -37,9 +37,9 @@
+ char *
+ dtostre (double val, char *sbeg, unsigned char prec, unsigned char flags)
+ {
+-__attribute__((progmem)) static char str_nan[2][4] =
++__attribute__((progmem)) static const char str_nan[2][4] =
+   {nan, NAN};
+-__attribute__((progmem)) static char str_inf[2][sizeof(str_nan[0])] =
++__attribute__((progmem)) static const char str_inf[2][sizeof(str_nan[0])] 
=
+   {inf, INF};
+ char *d;  /* dst  */
+ char *s;  /* src  */

Modified: nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
==
--- nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix   
Tue Aug 23 03:23:34 2011(r28766)
+++ nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix   
Tue Aug 23 07:56:34 2011(r28767)
@@ -1,21 +1,23 @@
-{ stdenv, fetchurl, writeTextFile, coreutils, gnumake, gcc, gnutar, bzip2, 
gnugrep, gnused, gawk }:
+{ stdenv, fetchurl, writeTextFile, coreutils, gnumake, gcc, gnutar, bzip2
+  , gnugrep, gnused, gawk, diffutils, patch
+  , gmp, mpfr, mpc }:
 
 stdenv.mkDerivation {
   name = avr-gcc-libc;
 
   srcBinutils = fetchurl {
-url = ftp://ftp.gnu.org/gnu/binutils/binutils-2.17.tar.bz2;
-sha256 = 0pm20n2l9ddgdpgzk3zhnbb8nbyb4rb2kvcw21pkd6iwybk3rhz2;
+url = mirror://gnu/binutils/binutils-2.21.tar.bz2;
+sha256 = 1iyhc42zfa0j2gaxy4zvpk47sdqj4rqvib0mb8597ss8yidyrav0;
   };
 
   srcGCC = fetchurl {
-url = ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.2/gcc-core-4.1.2.tar.bz2;
-sha256 = 07binc1hqlr0g387zrg5sp57i12yzd5ja2lgjb83bbh0h3gwbsbv;
+url = mirror://gcc/releases/gcc-4.6.1/gcc-core-4.6.1.tar.bz2;
+sha256 = 
0bbb8f754a31f29013f6e9ad4c755d92bb0f154a665c4b623e86ae7174d98e33;
   };
 
   srcAVRLibc = fetchurl {
-url = 
http://www.very-clever.com/download/nongnu/avr-libc/avr-libc-1.4.5.tar.bz2;
-sha256 = 058iv3vs6syy01pfkd5894xap9zakjx8ki1bpjdnihn6vk6fr80l;
+url = 
http://download.savannah.gnu.org/releases/avr-libc/avr-libc-1.7.1.tar.bz2;
+sha256 = 1b1s4cf787izlm3r094vvkzrzb3w3bg6bwiz2wz71cg7q07kzzn6;
   };
 
   phases = doAll;
@@ -24,7 +26,7 @@
   builder = writeTextFile {
 name = avrbinutilsgccavrlibc-builder-script;
 text =  ''
-
PATH=${coreutils}/bin:${gnumake}/bin:${gcc}/bin:${gnutar}/bin:${bzip2}/bin:${gnugrep}/bin:${gnused}/bin:${gawk}/bin
+
PATH=${coreutils}/bin:${gnumake}/bin:${gcc}/bin:${gnutar}/bin:${bzip2}/bin:${gnugrep}/bin:${gnused}/bin:${gawk}/bin:${diffutils}/bin:${patch}/bin
 # that's all a bit too hacky...!
 for i in `cat ${gcc}/nix-support/propagated-user-env-packages`; do
   echo adding $i
@@ -33,6 +35,11 @@
 mkdir -p $out
 export  env-vars
 
+for i in ${gmp} ${mpfr} ${mpc}; do
+  export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE -I$i/include 
+  export NIX_LDFLAGS=$NIX_LDFLAGS -L$i/lib 
+done
+
 # important, without this gcc won't find the binutils executables
 PATH=$PATH:$out/bin
 
@@ -51,13 +58,14 @@
   cd gcc-*
   mkdir obj-avr
   cd obj-avr
-  ../configure --target=avr --prefix=$prefix --disable-nls 
--enable-languages=c --disable-libssp
+  ../configure --target=avr --prefix=$prefix --disable-nls 
--enable-languages=c --disable-libssp --with-dwarf2
   make $MAKE_FLAGS
   make install
 
 cd $TMP
   tar jxf $srcAVRLibc

Re: [Nix-dev] Blacklisting snd_pcsp by default

2011-08-23 Thread Marc Weber 
Excerpts from Eelco Dolstra's message of Tue Aug 23 09:48:04 +0200 2011:
  The snd_pcsp module is known to cause issues with the default ALSA audio
  device, and as far as I know is not really that useful on modern
  machines. Would anyone mind if snd_pcsp was blacklisted when ALSA is
  enabled?
Consider doing it always. Then nixos-rebuild test does work as well.

You'll find many howtos in the internet telling how to physically remove
speakers because ensuring that your pc does not beep is much more work
(or has been in the past).

You can wait two days to see if anybody objects proofing me wrong.

Marc Weber
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] SVN commit: nix - r28768 - nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git2cl

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 08:44:59 2011
New Revision: 28768
URL: https://svn.nixos.org/websvn/nix/?rev=28768sc=1

Log:
git2cl: added meta data for the package and updated the build to take
advantage of stdenv features such as automatic updating of the shebang
path to perl, etc.

Modified:
   
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git2cl/default.nix

Modified: 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
==
--- 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
 Tue Aug 23 07:56:34 2011(r28767)
+++ 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
 Tue Aug 23 08:44:59 2011(r28768)
@@ -1,19 +1,22 @@
-{ fetchgit
-, stdenv
-, perl
-}:
-stdenv.mkDerivation rec {
+{ fetchgit, stdenv, perl }:
+
+stdenv.mkDerivation {
   name = git2cl;
 
   src = fetchgit {
-url = git://git.sv.gnu.org/git2cl.git;
+url = git://repo.or.cz/git2cl.git;
 rev = 8373c9f74993e218a08819cbcdbab3f3564bbeba;
 sha256 = 
b0d39379640c8a12821442431e2121f7908ce1cc88ec8ec6bede218ea8c21f2f;
   };
 
-  buildCommand = ''
-ensureDir $out/bin
-cp ${src}/git2cl $out/bin
-sed -i 's|/usr/bin/perl|${perl}/bin/perl|' $out/bin/git2cl
+  buildInputs = [ perl ];
+  installPhase = ''
+install -D -m755 git2cl $out/bin/git2cl
+install -D -m644 README $out/share/doc/git2cl/README
   '';
+
+  meta = {
+homepage = http://josefsson.org/git2cl/;;
+description = convert git logs to GNU style ChangeLog files;
+  };
 }
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28769 - nixpkgs/trunk/pkgs/development/libraries/haskell/cmdlib

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 08:45:04 2011
New Revision: 28769
URL: https://svn.nixos.org/websvn/nix/?rev=28769sc=1

Log:
haskell-cmdlib: updated to version 0.3.3

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/cmdlib/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/cmdlib/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/cmdlib/default.nix Tue Aug 
23 08:44:59 2011(r28768)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cmdlib/default.nix Tue Aug 
23 08:45:04 2011(r28769)
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = cmdlib;
-  version = 0.3.2.1;
-  sha256 = 0p8jpwngc8nbpl6v0i8hqhm1nsm2c51pswi6nym6dkwkilaxbvs4;
+  version = 0.3.3;
+  sha256 = 0gryz70d69r9pscwxmn5yr02r0zvvgj1vwc3g9klgbkipbsa7xvk;
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl split syb ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28770 - nixpkgs/trunk/pkgs/development/libraries/haskell/enumerator

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 08:45:08 2011
New Revision: 28770
URL: https://svn.nixos.org/websvn/nix/?rev=28770sc=1

Log:
haskell-enumerator: updated to version 0.4.14

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/enumerator/default.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/enumerator/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/enumerator/default.nix 
Tue Aug 23 08:45:04 2011(r28769)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/enumerator/default.nix 
Tue Aug 23 08:45:08 2011(r28770)
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = enumerator;
-  version = 0.4.13.1;
-  sha256 = 5fcafe316444adfb66c213ffb71359560f48eafe03bb2df99bfba17d2e3153c8;
+  version = 0.4.14;
+  sha256 = 06bvrr76y12r3i1xi1s98fc1v6mcmn8nzhbp80wgyi743ksqcr1d;
   buildDepends = [ text transformers ];
   meta = {
-homepage = http://john-millikin.com/software/enumerator/;;
+homepage = https://john-millikin.com/software/enumerator/;;
 description = Reliable, high-performance processing with left-fold 
enumerators;
 license = self.stdenv.lib.licenses.mit;
 platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-dev] Re: SVN commit: nix - r28761 - in nixpkgs/trunk/pkgs: desktops/xfce-4.8 desktops/xfce-4.8/applications desktops/xfce-4.8/core top-level

2011-08-23 Thread Peter Simons 
Hi Eelco,

  +  garcon = callPackage ./core/garcon.nix { };

the file garcon.nix doesn't seem to exist.

Take care,
Peter

___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] SVN commit: nix - r28771 - nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 08:52:06 2011
New Revision: 28771
URL: https://svn.nixos.org/websvn/nix/?rev=28771sc=1

Log:
git-annex: updated to version 3.20110819

Modified:
   
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix

Modified: 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
==
--- 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
  Tue Aug 23 08:45:08 2011(r28770)
+++ 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
  Tue Aug 23 08:52:06 2011(r28771)
@@ -3,14 +3,14 @@
 , monadControl }:
 
 let
-  version = 3.20110719;
+  version = 3.20110819;
 in
 stdenv.mkDerivation {
   name = git-annex-${version};
 
   src = fetchurl {
 url = 
http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz;;
-sha256 = 0wkfm6sc3rnprigi8xxw1h0d1bs3lwzzzwgqfzlcbsh44rdlnz54;
+sha256 = 
1442ba4ff35ec8f92f336a5f1055d7ad8306348871a9697262f4f2af3b3c0943;
   };
 
   buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String 
QuickCheck2 pcreLight
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] Nix on ubuntu 11.04

2011-08-23 Thread Eelco Dolstra 

Hi,

On 08/17/2011 03:53 PM, Eelco Dolstra wrote:


Also the link
http://hydra.nixos.org/view/nix/trunk/latest
which is referenced from
http://nixos.org/nix/download.html
gives 404 page not found :(


I think this is caused by the Hydra view feature being insanely slow. Should
look into that...


This has been fixed now.  There was some weird PostgreSQL problem that caused 
queries to be 1000x slower when using prepared statements, or something like that.


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

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

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 10:35:53 2011
New Revision: 28773
URL: https://svn.nixos.org/websvn/nix/?rev=28773sc=1

Log:
pkgs/top-level/all-packages.nix: strip trailing whitespace

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   Tue Aug 23 10:35:49 
2011(r28772)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Tue Aug 23 10:35:53 
2011(r28773)
@@ -6500,7 +6500,7 @@
   };
 
   firefox70b1Wrapper = lowPrio (wrapFirefox firefox70b1Pkgs.firefox firefox 
);
-  
+
   flac = callPackage ../applications/audio/flac { };
 
   flashplayer = flashplayer10;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28772 - in nixpkgs/trunk/pkgs: development/compilers/epic development/compilers/idris development/libraries/haskell/GLUT development/libraries/haskell/OpenAL developme

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 10:35:49 2011
New Revision: 28772
URL: https://svn.nixos.org/websvn/nix/?rev=28772sc=1

Log:
Updated build expressions for the current version of cabal.nix.

Modified:
   nixpkgs/trunk/pkgs/development/compilers/epic/default.nix
   nixpkgs/trunk/pkgs/development/compilers/idris/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/OpenAL/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/SDL-image/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/SDL-mixer/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/SDL-ttf/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/editline/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/glade/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/hp2any-graph/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/repa-examples/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/svgcairo/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/vacuum/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
   nixpkgs/trunk/pkgs/development/tools/documentation/haddock/2.4.2.nix
   nixpkgs/trunk/pkgs/development/tools/parsing/alex/2.3.1.nix
   nixpkgs/trunk/pkgs/development/tools/parsing/alex/2.3.2.nix
   nixpkgs/trunk/pkgs/development/tools/parsing/alex/2.3.3.nix
   nixpkgs/trunk/pkgs/development/tools/parsing/alex/2.3.5.nix
   nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.1.nix
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Modified: nixpkgs/trunk/pkgs/development/compilers/epic/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/epic/default.nix   Tue Aug 23 
08:52:06 2011(r28771)
+++ nixpkgs/trunk/pkgs/development/compilers/epic/default.nix   Tue Aug 23 
10:35:49 2011(r28772)
@@ -1,4 +1,4 @@
-{ cabal, mtl, happy, gmp, boehmgc }:
+{ cabal, boehmgc, gmp, happy, mtl }:
 
 cabal.mkDerivation (self: {
   pname = epic;
@@ -7,9 +7,9 @@
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl ];
+  buildTools = [ happy ];
   extraLibraries = [ gmp boehmgc ];
   noHaddock = true;
-  buildTools = [ happy ];
   meta = {
 homepage = http://www.dcs.st-and.ac.uk/~eb/epic.php;;
 description = Compiler for a simple functional language;

Modified: nixpkgs/trunk/pkgs/development/compilers/idris/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/idris/default.nix  Tue Aug 23 
08:52:06 2011(r28771)
+++ nixpkgs/trunk/pkgs/development/compilers/idris/default.nix  Tue Aug 23 
10:35:49 2011(r28772)
@@ -1,4 +1,4 @@
-{ cabal, binary, epic, ivor, mtl, parsec, readline, happy }:
+{ cabal, binary, epic, happy, ivor, mtl, parsec, readline }:
 
 cabal.mkDerivation (self: {
   pname = idris;

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix   Tue Aug 
23 08:52:06 2011(r28771)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix   Tue Aug 
23 10:35:49 2011(r28772)
@@ -1,10 +1,11 @@
-{cabal, OpenGL, glut, libSM, libICE, libXmu, libXi, mesa}:
+{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
 
 cabal.mkDerivation (self: {
   pname = GLUT;
-  version = 2.1.1.2; # Haskell Platform 2009.0.0
+  version = 2.1.1.2;
   sha256 = d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb;
-  propagatedBuildInputs = [OpenGL glut libSM libICE libXmu libXi mesa];
+  buildDepends = [ OpenGL ];
+  extraLibraries = [ glut libSM libICE libXmu libXi mesa ];
   meta = {
 homepage = http://www.haskell.org/HOpenGL/;;
 description = A binding for the OpenGL Utility Toolkit;

Modified:

[Nix-commits] SVN commit: nix - r28774 - in nixpkgs/trunk/pkgs/development: compilers/epic libraries/haskell/GLUT libraries/haskell/OpenGL libraries/haskell/cairo libraries/haskell/glade libraries/has

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 11:00:05 2011
New Revision: 28774
URL: https://svn.nixos.org/websvn/nix/?rev=28774sc=1

Log:
haskell-packages: normalize all lists to state their elements in alphabetical 
order

Modified:
   nixpkgs/trunk/pkgs/development/compilers/epic/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/glade/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix

Modified: nixpkgs/trunk/pkgs/development/compilers/epic/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/epic/default.nix   Tue Aug 23 
10:35:53 2011(r28773)
+++ nixpkgs/trunk/pkgs/development/compilers/epic/default.nix   Tue Aug 23 
11:00:05 2011(r28774)
@@ -8,7 +8,7 @@
   isExecutable = true;
   buildDepends = [ mtl ];
   buildTools = [ happy ];
-  extraLibraries = [ gmp boehmgc ];
+  extraLibraries = [ boehmgc gmp ];
   noHaddock = true;
   meta = {
 homepage = http://www.dcs.st-and.ac.uk/~eb/epic.php;;

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix   Tue Aug 
23 10:35:53 2011(r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix   Tue Aug 
23 11:00:05 2011(r28774)
@@ -5,7 +5,7 @@
   version = 2.1.1.2;
   sha256 = d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb;
   buildDepends = [ OpenGL ];
-  extraLibraries = [ glut libSM libICE libXmu libXi mesa ];
+  extraLibraries = [ glut libICE libSM libXi libXmu mesa ];
   meta = {
 homepage = http://www.haskell.org/HOpenGL/;;
 description = A binding for the OpenGL Utility Toolkit;

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix   Tue Aug 
23 10:35:53 2011(r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix   Tue Aug 
23 11:00:05 2011(r28774)
@@ -5,7 +5,7 @@
   version = 2.1.2.1;
   sha256 = 0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02;
   buildDepends = [ OpenGL ];
-  extraLibraries = [ glut libSM libICE libXmu libXi mesa ];
+  extraLibraries = [ glut libICE libSM libXi libXmu mesa ];
   meta = {
 homepage = http://www.haskell.org/HOpenGL/;;
 description = A binding for the OpenGL Utility Toolkit;

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix   Tue Aug 
23 10:35:53 2011(r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix   Tue Aug 
23 11:00:05 2011(r28774)
@@ -7,7 +7,7 @@
   version = 2.2.2.0;
   sha256 = 0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx;
   buildDepends = [ OpenGL StateVar Tensor ];
-  extraLibraries = [ glut libSM libICE libXmu libXi mesa glut ];
+  extraLibraries = [ glut libICE libSM libXi libXmu mesa ];
   meta = {
 homepage = http://www.haskell.org/HOpenGL/;;
 description = A binding for the OpenGL Utility Toolkit;

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix Tue Aug 
23 10:35:53 2011(r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix Tue Aug 
23 11:00:05 2011(r28774)
@@ -4,7 +4,7 @@
   pname = OpenGL;
   version = 2.2.1.1;
   sha256 = 926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792;
-  extraLibraries = [ mesa libX11 ];
+  extraLibraries = [ libX11 mesa ];
   meta = {
 homepage = http://www.haskell.org/HOpenGL/;;
 description = A binding for the OpenGL graphics system;

Modified:

[Nix-commits] SVN commit: nix - r28775 - nixpkgs/trunk/pkgs/tools/misc/fdupes

2011-08-23 Thread Marco Maggesi 
Author: maggesi
Date: Tue Aug 23 11:52:38 2011
New Revision: 28775
URL: https://svn.nixos.org/websvn/nix/?rev=28775sc=1

Log:
Update fdupes to version 1.50-RC2

Modified:
   nixpkgs/trunk/pkgs/tools/misc/fdupes/default.nix

Modified: nixpkgs/trunk/pkgs/tools/misc/fdupes/default.nix
==
--- nixpkgs/trunk/pkgs/tools/misc/fdupes/default.nixTue Aug 23 11:00:05 
2011(r28774)
+++ nixpkgs/trunk/pkgs/tools/misc/fdupes/default.nixTue Aug 23 11:52:38 
2011(r28775)
@@ -1,16 +1,18 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = fdupes-1.40;
+  name = fdupes-1.50-PR2;
   src = fetchurl {
-url = http://premium.caribe.net/~adrian2/programs/fdupes-1.40.tar.gz;
-sha256 = 1ryxpckgrmqa4y7nx9a9xpg4z1r00k11kc1cm7lqv87l9g293vg1;
+url = http://fdupes.googlecode.com/files/fdupes-1.50-PR2.tar.gz;
+sha256 = 068nxcn3xilaphq53sywli9ndydy4gijfi2mz7h45kpy0q9cgwjs;
   };
 
-  installPhase =  ''
-mkdir -p $out/{bin,man/man1}
-make INSTALLDIR=$out/bin MANPAGEDIR=$out/man install
-  '';
+  # workaround: otherwise make install fails (should be fixed in trunk)
+  preInstall = ensureDir $out/bin $out/man/man1;
+
+  makeFlags = PREFIX=\${out};
+
+  preBuild = type -p make;
 
   meta = {
 description = identifies duplicate files residing within specified 
directories.;
@@ -18,7 +20,11 @@
   FDUPES uses md5sums and then a byte by byte comparison to finde duplicate
   files within a set of directories.
 '';
-homepage = http://premium.caribe.net/~adrian2/fdupes.html;
+homepage = http://code.google.com/p/fdupes/;
 license = MIT;
+platforms = stdenv.lib.platforms.all;
+maintainers = [
+  stdenv.lib.maintainers.z77z
+];
   };
 }
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28776 - nixpkgs/trunk/pkgs/tools/misc/fdupes

2011-08-23 Thread Marco Maggesi 
Author: maggesi
Date: Tue Aug 23 11:59:31 2011
New Revision: 28776
URL: https://svn.nixos.org/websvn/nix/?rev=28776sc=1

Log:
(Ooops!) Remove debug instruction in fdupes derivation

Modified:
   nixpkgs/trunk/pkgs/tools/misc/fdupes/default.nix

Modified: nixpkgs/trunk/pkgs/tools/misc/fdupes/default.nix
==
--- nixpkgs/trunk/pkgs/tools/misc/fdupes/default.nixTue Aug 23 11:52:38 
2011(r28775)
+++ nixpkgs/trunk/pkgs/tools/misc/fdupes/default.nixTue Aug 23 11:59:31 
2011(r28776)
@@ -12,8 +12,6 @@
 
   makeFlags = PREFIX=\${out};
 
-  preBuild = type -p make;
-
   meta = {
 description = identifies duplicate files residing within specified 
directories.;
 longDescription = ''
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28777 - nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 12:04:29 2011
New Revision: 28777
URL: https://svn.nixos.org/websvn/nix/?rev=28777sc=1

Log:
haskell-pandoc: enable highlighting support

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix Tue Aug 
23 11:59:31 2011(r28776)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix Tue Aug 
23 12:04:29 2011(r28777)
@@ -1,6 +1,6 @@
 { cabal, base64Bytestring, citeprocHs, dlist, extensibleExceptions
-, HTTP, json, mtl, network, pandocTypes, parsec, random, syb
-, tagsoup, texmath, utf8String, xhtml, xml, zipArchive
+, highlightingKate, HTTP, json, mtl, network, pandocTypes, parsec
+, random, syb, tagsoup, texmath, utf8String, xhtml, xml, zipArchive
 }:
 
 cabal.mkDerivation (self: {
@@ -10,9 +10,9 @@
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-base64Bytestring citeprocHs dlist extensibleExceptions HTTP json
-mtl network pandocTypes parsec random syb tagsoup texmath
-utf8String xhtml xml zipArchive
+base64Bytestring citeprocHs dlist extensibleExceptions
+highlightingKate HTTP json mtl network pandocTypes parsec random
+syb tagsoup texmath utf8String xhtml xml zipArchive
   ];
   meta = {
 homepage = http://johnmacfarlane.net/pandoc;;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28778 - nixpkgs/trunk/pkgs/desktops/xfce-4.8/core

2011-08-23 Thread Eelco Dolstra 
Author: eelco
Date: Tue Aug 23 12:08:21 2011
New Revision: 28778
URL: https://svn.nixos.org/websvn/nix/?rev=28778sc=1

Log:
* Forgot to commit.

Added:
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/garcon.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix

Added: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/garcon.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/garcon.nixTue Aug 23 
12:08:21 2011(r28778)
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib }:
+
+stdenv.mkDerivation rec {
+  name = garcon-0.1.8;
+  
+  src = fetchurl {
+url = http://archive.xfce.org/src/xfce/garcon/0.1/${name}.tar.bz2;;
+sha1 = e5eac6a13208c81ccad0941656c01e7a69530f03;
+  };
+
+  buildInputs = [ pkgconfig intltool glib ];
+
+  meta = {
+homepage = http://www.xfce.org/;
+description = Xfce panel;
+license = GPLv2+;
+  };
+}

Added: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfce4ui.nixTue Aug 23 
12:08:21 2011(r28778)
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf
+, libstartup_notification }:
+
+stdenv.mkDerivation rec {
+  name = libxfce4ui-4.8.0;
+  
+  src = fetchurl {
+url = http://archive.xfce.org/src/xfce/libxfce4ui/4.8/${name}.tar.bz2;;
+sha1 = 107f9d8e3e583f3cf5330074e89ea72eb2a82888;
+  };
+
+  buildInputs =
+[ pkgconfig intltool gtk libxfce4util xfconf
+  libstartup_notification
+];
+
+  enableParallelBuilding = true;
+
+  meta = {
+homepage = http://www.xfce.org/;
+description = Basic GUI library for Xfce;
+license = LGPLv2+;
+  };
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28779 - nixpkgs/trunk/pkgs/desktops/xfce-4.8/core

2011-08-23 Thread Eelco Dolstra 
Author: eelco
Date: Tue Aug 23 12:10:08 2011
New Revision: 28779
URL: https://svn.nixos.org/websvn/nix/?rev=28779sc=1

Log:
* Fix description.

Modified:
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/garcon.nix

Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/garcon.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/garcon.nixTue Aug 23 
12:08:21 2011(r28778)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/garcon.nixTue Aug 23 
12:10:08 2011(r28779)
@@ -12,7 +12,7 @@
 
   meta = {
 homepage = http://www.xfce.org/;
-description = Xfce panel;
+description = Xfce menu support library;
 license = GPLv2+;
   };
 }
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

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

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 12:15:04 2011
New Revision: 28780
URL: https://svn.nixos.org/websvn/nix/?rev=28780sc=1

Log:
all-packages.nix: added radeon-juniper-pfp firmware for ATI cards

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   Tue Aug 23 12:10:08 
2011(r28779)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Tue Aug 23 12:15:04 
2011(r28780)
@@ -5781,6 +5781,7 @@
 
   radeonR700 = callPackage ../os-specific/linux/firmware/radeon-r700 { };
   radeonR600 = callPackage ../os-specific/linux/firmware/radeon-r600 { };
+  radeonJuniperPfp = callPackage 
../os-specific/linux/firmware/radeon-juniper-pfp { };
 
   rfkill = callPackage ../os-specific/linux/rfkill { };
 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28781 - nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper-pfp

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 12:16:41 2011
New Revision: 28781
URL: https://svn.nixos.org/websvn/nix/?rev=28781sc=1

Log:
Ooops, forgot to add this file prior to committing.

Added:
   nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper-pfp/
   nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper-pfp/default.nix

Added: 
nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper-pfp/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ 
nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper-pfp/default.nix
Tue Aug 23 12:16:41 2011(r28781)
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = radeon-juniper-pfp-firmware-2010-04-08;
+
+  src = fetchurl {
+url = http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_pfp.bin;;
+sha256 = 1qm910p7qjs6n528q22gkwpprzdh39vbihdliykbpfs1pphrhkjz;
+  };
+
+  unpackPhase = true;
+  installPhase = install -D $src $out/radeon/JUNIPER_pfp.bin;
+
+  meta = {
+description = Juniper-pfp firmware for the RADEON chipset;
+homepage = http://people.freedesktop.org/~agd5f/radeon_ucode;;
+license = GPL;
+  };
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28782 - in nixpkgs/trunk/pkgs/os-specific/linux/firmware: radeon-juniper-pfp radeon-r600 radeon-r700

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 12:25:31 2011
New Revision: 28782
URL: https://svn.nixos.org/websvn/nix/?rev=28782sc=1

Log:
pkgs/os-specific/linux/firmware/radeon-*/default.nix: these derivations don't 
need to be recursive

Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper-pfp/default.nix
   nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-r600/default.nix
   nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-r700/default.nix

Modified: 
nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper-pfp/default.nix
==
--- 
nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper-pfp/default.nix
Tue Aug 23 12:16:41 2011(r28781)
+++ 
nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper-pfp/default.nix
Tue Aug 23 12:25:31 2011(r28782)
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = radeon-juniper-pfp-firmware-2010-04-08;
 
   src = fetchurl {

Modified: nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-r600/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-r600/default.nix   
Tue Aug 23 12:16:41 2011(r28781)
+++ nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-r600/default.nix   
Tue Aug 23 12:25:31 2011(r28782)
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = radeon-r600-firmware-2009-12-09;
 
   src = fetchurl {

Modified: nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-r700/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-r700/default.nix   
Tue Aug 23 12:16:41 2011(r28781)
+++ nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-r700/default.nix   
Tue Aug 23 12:25:31 2011(r28782)
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = radeon-r700-firmware-2009-12-09;
 
   src = fetchurl {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-dev] WIKI question misc.collection, multiple ghc in PATH, bit of problem,

2011-08-23 Thread Marc Weber 
Hi Peter Simon,

If you have $out_1/bin/ghc and $out_2/bin/ghc of course there will be a
problem (which is not that huge cause all ghcs have symlinks to
ghc-version anyway).

So in which way is going to talk about a potential problem going to help
anybody? I see the following solutions: Which one do you like most?
Then we can document it and drop the potential issue.

solutions 1:

  Replace it by a request on nixpkgs:

  What about providing run-haskell-$VERSION  symlinks the way its done for
  ghc and ghci?

solution 2:

  Manage multiple environments (and this is unrelated to misc.collection)
  or its intended usage:

  nix-env -p ~/ghc-7-profile -iA yourGHC7Collection
  nix-env -p ~/ghc-6-profile -iA yourGHC6Collection

  Then add either ~/ghc-6-profile/bin to PATH or use my bash zshrc patch for 
nixos
  introducing a useful function:

  nix_add_profile_vars ~/ghc-7-profile --suffix or --prefix

  which should get the job done. It may be overkill in this simple case
  because ghc only reads PATH, no PYTHONPATH or such.

solution 3:

  install this instead: ( ghc6Collection being misc.collection)

  myLodableEnv = runCommand loadable-env-ghc {} mkdir -p $out/envs; ln -s 
${ghc6Collection} $out/envs/ghc6;

  then use this (bashrc)
  loadEnv(){ PATH=~/.nix-profile/envs/$1/bin:$PATH; }

  and in shell:
  loadEnv ghc6

Marc Weber
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] SVN commit: nix - r28783 - in nixpkgs/trunk/pkgs: development/libraries/haskell/nixos-types top-level

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 13:18:28 2011
New Revision: 28783
URL: https://svn.nixos.org/websvn/nix/?rev=28783sc=1

Log:
haskell-nixos-types: added version 1.0

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/nixos-types/
   nixpkgs/trunk/pkgs/development/libraries/haskell/nixos-types/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Added: nixpkgs/trunk/pkgs/development/libraries/haskell/nixos-types/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/nixos-types/default.nix
Tue Aug 23 13:18:28 2011(r28783)
@@ -0,0 +1,18 @@
+{ cabal, regexPosix }:
+
+cabal.mkDerivation (self: {
+  pname = nixos-types;
+  version = 1.0;
+  sha256 = 0zg2vz790cacl1hlhzbfpb8zw5k19v4p43ynz1wdgg6sfzvwk43s;
+  buildDepends = [ regexPosix ];
+  meta = {
+homepage = http://github.com/haskell4nix/nixos-types;;
+description = Data types representing the Nix language;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+  self.stdenv.lib.maintainers.andres
+  self.stdenv.lib.maintainers.simons
+];
+  };
+})

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Tue Aug 23 12:25:31 
2011(r28782)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Tue Aug 23 13:18:28 
2011(r28783)
@@ -881,6 +881,8 @@
   network_2_3_0_5 = callPackage 
../development/libraries/haskell/network/2.3.0.5.nix {};
   network = self.network_2_2_1_4;
 
+  nixosTypes = callPackage ../development/libraries/haskell/nixos-types {};
+
   nonNegative = callPackage ../development/libraries/haskell/non-negative {};
 
   numericPrelude = callPackage 
../development/libraries/haskell/numeric-prelude {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28784 - nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 13:18:32 2011
New Revision: 28784
URL: https://svn.nixos.org/websvn/nix/?rev=28784sc=1

Log:
haskell-cabal2nix: updated to version 1.12

Modified:
   nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix

Modified: nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix  Tue Aug 
23 13:18:28 2011(r28783)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix  Tue Aug 
23 13:18:32 2011(r28784)
@@ -1,12 +1,12 @@
-{ cabal, HTTP, mtl, regexPosix }:
+{ cabal, HTTP, mtl, nixosTypes, regexPosix }:
 
 cabal.mkDerivation (self: {
   pname = cabal2nix;
-  version = 1.11;
-  sha256 = 1df6bxgdzd3jfxfs3qg8qw6pmsfbd5l32krx9xdfkiqvfxa6vpy9;
-  isLibrary = true;
+  version = 1.12;
+  sha256 = 14bijci07hkm3ksbqpzbnmwiysy5s3ll89r2iqkr1rbmj7bqxdwy;
+  isLibrary = false;
   isExecutable = true;
-  buildDepends = [ HTTP mtl regexPosix ];
+  buildDepends = [ HTTP mtl nixosTypes regexPosix ];
   meta = {
 homepage = http://github.com/haskell4nix/cabal2nix;;
 description = Convert Cabal files into Nix build instructions;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28785 - in nixpkgs/trunk/pkgs: os-specific/linux/firmware/radeon-juniper os-specific/linux/firmware/radeon-juniper-pfp top-level

2011-08-23 Thread Peter Simons 
Author: simons
Date: Tue Aug 23 13:24:44 2011
New Revision: 28785
URL: https://svn.nixos.org/websvn/nix/?rev=28785sc=1

Log:
Renamed 'radeonJuniperPfp' to 'radeonJuniper' and added all related blobs into 
one expression.

Added:
   nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper/
   nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix
Deleted:
   nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper-pfp/
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Added: nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix
Tue Aug 23 13:24:44 2011(r28785)
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = radeon-juniper-firmware-2010-04-08;
+
+  srcPfp = fetchurl {
+url = http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_pfp.bin;;
+sha256 = 1qm910p7qjs6n528q22gkwpprzdh39vbihdliykbpfs1pphrhkjz;
+  };
+  srcMe = fetchurl {
+url = http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_me.bin;;
+sha256 = 1869dhay3f75hhnsvdjhlrjd4fhdi8d6c3lhk45vp7fhjiw4741q;
+  };
+  srcRlc = fetchurl {
+url = http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_rlc.bin;;
+sha256 = 1y3xr7qc7cvszgw0bh66vzy36pn4m1sj17bzy5dc9kfw01kq3n0y;
+  };
+
+  unpackPhase = true;
+  installPhase = ''
+install -D $srcPfp $out/radeon/JUNIPER_pfp.bin
+install -D $srcMe $out/radeon/JUNIPER_me.bin
+install -D $srcRlc $out/radeon/JUNIPER_rlc.bin
+  '';
+
+  meta = {
+description = Juniper firmware for the RADEON chipset;
+homepage = http://people.freedesktop.org/~agd5f/radeon_ucode;;
+license = GPL;
+  };
+}

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Tue Aug 23 13:18:32 
2011(r28784)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Tue Aug 23 13:24:44 
2011(r28785)
@@ -5781,7 +5781,7 @@
 
   radeonR700 = callPackage ../os-specific/linux/firmware/radeon-r700 { };
   radeonR600 = callPackage ../os-specific/linux/firmware/radeon-r600 { };
-  radeonJuniperPfp = callPackage 
../os-specific/linux/firmware/radeon-juniper-pfp { };
+  radeonJuniper = callPackage ../os-specific/linux/firmware/radeon-juniper { };
 
   rfkill = callPackage ../os-specific/linux/rfkill { };
 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-dev] Re: WIKI question misc.collection, multiple ghc in PATH, bit of problem,

2011-08-23 Thread Peter Simons 
Hi Marc,

  If you have $out_1/bin/ghc and $out_2/bin/ghc of course there will be
  a problem [...].

yes, but that is not issue I'm concerned about. The problem I see is
that this collision will not be detected.

Take care,
Peter

___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] Re: WIKI question misc.collection, multiple ghc in PATH, bit of problem,

2011-08-23 Thread Marc Weber 
Excerpts from Peter Simons's message of Tue Aug 23 15:35:48 +0200 2011:
 yes, but that is not issue I'm concerned about. The problem I see is
 that this collision will not be detected.

There are two possible collisions:
1) misc.collection and any other package you've installed
2) packages within one misc.collection.

Neither is detected cause the additional packages to be installed are
considered lasts by env builder.

nixpkgs contains top level attr buildEnv which could be used instead.
This would fix 1) and 2). However in the case having different ghc's
you should eventually create one collection (based on buildEnv) for each
version. Then nix-env -iA should report collisions and let you choose
(untested).

Marc Weber
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

[Nix-dev] Re: WIKI question misc.collection, multiple ghc in PATH, bit of problem,

2011-08-23 Thread Peter Simons 
Hi Marc,

  There are two possible collisions:
  1) misc.collection and any other package you've installed
  2) packages within one misc.collection.
 
  Neither is detected cause the additional packages to be installed are
  considered lasts by env builder.
 
  nixpkgs contains top level attr buildEnv which could be used instead.
  This would fix 1) and 2).

yes, indeed, it appears that buildEnv is superior to misc.collection in
that regard. Maybe that function should generally be preferred? Why does
the Wiki page recommend collection?

Take care,
Peter

___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] Re: WIKI question misc.collection, multiple ghc in PATH, bit of problem,

2011-08-23 Thread Marc Weber 
Excerpts from Peter Simons's message of Tue Aug 23 17:39:36 +0200 2011:
 yes, indeed, it appears that buildEnv is superior to misc.collection in
 that regard. Maybe that function should generally be preferred? Why does
 the Wiki page recommend collection?
Because the wiki page was meant to talk about the idea creating
collections. The implementation is a minor detail which happened to work
for me all the time.

So if you want to fix it change the implementation and commit. I'll be
fine with that.

Marc Weber
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

[Nix-dev] Re: WIKI question misc.collection, multiple ghc in PATH, bit of problem,

2011-08-23 Thread Peter Simons 
Hi Marc,

  So if you want to fix it change the implementation and commit. I'll
  be fine with that.

personally, I am not particularly happy about that Wiki page.

The title promises to explain How to keep multiple packages up to date
at once. The mechanism of choice for that task is a nix-env profile,
which can be updated with nix-env -u \*. However, the article doesn't
even mention that mechanism. Instead, it directs users to an alternative
mechanism -- collections --, which is kind of interesting, too, and it's
certainly worth being discussed, but it should be discussed in the
context of profiles, i.e. the page should address the respective
advantages and disadvantages, etc. As it is now, it doesn't do that, so
I believe the contents of this page does more harm than good to new
users.

The claim that collections are the way users ought to choose to keep
multiple packages up-to-date is certainly misleading.

Take care,
Peter

___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] SVN commit: nix - r28786 - in nixpkgs/trunk/pkgs: build-support/fetchmtn top-level

2011-08-23 Thread Yury G. Kudryashov 
Author: urkud
Date: Tue Aug 23 17:45:40 2011
New Revision: 28786
URL: https://svn.nixos.org/websvn/nix/?rev=28786sc=1

Log:
fetchmtn: move logic to default args

Modified:
   nixpkgs/trunk/pkgs/build-support/fetchmtn/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/build-support/fetchmtn/default.nix
==
--- nixpkgs/trunk/pkgs/build-support/fetchmtn/default.nix   Tue Aug 23 
13:24:44 2011(r28785)
+++ nixpkgs/trunk/pkgs/build-support/fetchmtn/default.nix   Tue Aug 23 
17:45:40 2011(r28786)
@@ -1,25 +1,23 @@
 # You can specify some extra mirrors and a cache DB via options
-{stdenv, monotone, defaultDBMirrors ? [], cacheDB ? }:
+{stdenv, monotone, defaultDBMirrors ? [], cacheDB ? ./mtn-checkout.db}:
 # dbs is a list of strings
 # each is an url for sync
 
 # selector is mtn selector, like h:org.example.branch
 # 
-{name ? , dbs ? [], selector ? , branch, md5 ? , sha1 ? , sha256 ? }:
+{name ? mtn-checkout, dbs ? [], sha256
+, selector ? h: + branch, branch}:
 
 stdenv.mkDerivation {
-  name = if name !=  then name else mtn-checkout;
   builder = ./builder.sh;
-  buildInputs = [monotone];
+  buildNativeInputs = [monotone];
 
-  outputHashAlgo = if sha256 ==  then (if sha1 ==  then md5 else sha1) 
else sha256;
+  outputHashAlgo = sha256;
   outputHashMode = recursive;
-  outputHash = if sha256 ==  then (if sha1 ==  then md5 else sha1) else 
sha256;
+  outputHash = sha256;
 
   dbs = defaultDBMirrors ++ dbs;
-  cacheDB = if cacheDB !=  then cacheDB else ./mtn-checkout.db;
-  selector = if selector !=  then selector else h: + branch;
-  inherit branch;
+  inherit branch cacheDB name selector;
 
   impureEnvVars = [
 # We borrow these environment variables from the caller to allow

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Tue Aug 23 13:24:44 
2011(r28785)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Tue Aug 23 17:45:40 
2011(r28786)
@@ -266,11 +266,7 @@
 
   fetchgitrevision = import ../build-support/fetchgitrevision runCommand git;
 
-  fetchmtn = import ../build-support/fetchmtn {
-inherit monotone stdenv;
-cacheDB = getConfig [fetchmtn cacheDB] ;
-defaultDBMirrors = getConfig [fetchmtn defaultDBMirrors] [];
-  };
+  fetchmtn = callPackage ../build-support/fetchmtn (getConfig [fetchmtn] {});
 
   fetchsvn = import ../build-support/fetchsvn {
 inherit stdenv subversion openssh;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28787 - nixpkgs/trunk/pkgs/tools/X11/xmacro

2011-08-23 Thread Michael Raskin 
Author: raskin
Date: Tue Aug 23 17:52:05 2011
New Revision: 28787
URL: https://svn.nixos.org/websvn/nix/?rev=28787sc=1

Log:
Fix xmacro build

Modified:
   nixpkgs/trunk/pkgs/tools/X11/xmacro/default.nix

Modified: nixpkgs/trunk/pkgs/tools/X11/xmacro/default.nix
==
--- nixpkgs/trunk/pkgs/tools/X11/xmacro/default.nix Tue Aug 23 17:45:40 
2011(r28786)
+++ nixpkgs/trunk/pkgs/tools/X11/xmacro/default.nix Tue Aug 23 17:52:05 
2011(r28787)
@@ -8,7 +8,12 @@
 md5 = d2956b82f3d5380e58a75ccc721fb746;
   };
 
-  preBuild =  sed -e 's/-pedantic//g' -i Makefile ;
+  preBuild = ''
+sed -e 's/-pedantic//g' -i Makefile
+sed -e 's/iostream[.]h/iostream/' -i *.cpp
+sed -e 's/iomanip[.]h/iomanip/' -i *.cpp
+sed -e '1iusing namespace std;' -i *.cpp
+  '';
 
   preInstall = echo -e 'install:\nmkdir \${out}/bin;\ncp xmacrorec 
xmacrorec2 xmacroplay \${out}/bin;' Makefile; ;
 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] Re: WIKI question misc.collection, multiple ghc in PATH, bit of problem,

2011-08-23 Thread Marc Weber 
Excerpts from Peter Simons's message of Tue Aug 23 19:29:54 +0200 2011:
 The title promises to explain How to keep multiple packages up to date
 at once. The mechanism of choice for that task is a nix-env profile,
 which can be updated with nix-env -u \*.
All right. We can discuss making it perfect. By keeping up to date
I mean keeping package up to date - and keeping yourself up to date
about removal of packages.

If you have Vim in your env and if Vim was dropped nix-env -i \* would
not tell you. using a collection still tries evaluating attr vim and
fails.

That's why I don't consider the -u being an alternative.


Also using collections enforce consistent snapshots: You always update
ghc and packages. You never update ghc-haskell-posix-regex only causing
ghc and library mismatches. Thus you eliminate potential problems.


The second thing is that I wrote the wiki so that I can tell people
try this way to do it once only. I haven't thought about adding all
possibilities.

That's why the page exist. I totally agree that it may not be perfect.
However it fails early. Thus I can always reinstall a collection and
know that all packages still exist and can be evaluated. No other
nix-env command provides this information. Its that important to me that
I use 5 collections and no single packages at all (only temporarily).

So do you suggest changing the scope of the article to 
various ways by example to update packages and their pros and cons?

1) nix-env -u\* (drawbacks see above)
2) use collections (..)

So maybe its my inability to find a proper heading. My it should be
changed to how to atomically update many derivations which should be
updated at the same time (eg whose versions should match, such as python
and its libs or haskell and its libs or gimp and its plugins ...)

But that would have been little too long.

Marc Weber
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

[Nix-dev] Re: WIKI question misc.collection, multiple ghc in PATH, bit of problem,

2011-08-23 Thread Peter Simons 
Hi Marc,

I have edited the page

  http://wiki.nixos.org/wiki/Howto_keep_multiple_packages_up_to_date_at_once

a bit, so that it mentions nix-env -u. There's more to say about the
subject, of course, but as always time is limited.


  If you have Vim in your env and if Vim was dropped nix-env -i \* would
  not tell you. Using a collection still tries evaluating attr vim and
  fails.

Yes, that is true. Also, packages sometimes change their name, and
you'll never know. I frequently run

  nix-env -i $(nix-env -q \*) --dry-run

to ensure that I notice that kind of thing. Referring to packages by
attribute is nicer in that regard, because it's more robust. Collections
are good for that. The downside is, of course, that collections hide
their contents; nix-env -q \* doesn't show all individual packages.


  That's why I don't consider the -u being an alternative.

I like nix-env -u \* --always a lot, and I wouldn't want to do without
it. Anyway, 'buildEnv' seems like a perfectly good way build collections
in a way that doesn't exclude using nix-env -u, so it's possible to use
both mechanisms.


  Also using collections enforce consistent snapshots: You always update
  ghc and packages. You never update ghc-haskell-posix-regex only causing
  ghc and library mismatches.

I'm not sure what you mean. nix-env -u \* never updates a Haskell
library to a version that's built with a different compiler; it only
updates to a later version that has been built with the same compiler.

Unfortunately, the same is not true for ghc-x.y.z-wrapper or ghc-x.y.z,
which may be updated a different version (without updating the other
installed libraries). However, GHC updates are somewhat rare, and they
hardly ever occur without me noticing, so this has been a minor issue
for me.

A major issue is that I cannot run nix-env -u \* on a profile that
contains an old version of GHC without nix trying to update it. That is
really annoying.


  So do you suggest changing the scope of the article to various ways
  by example to update packages and their pros and cons?

Yes, that would be great. Managing several profiles is by no means easy,
and it would be nice if there were a hands-on tutorial for new users
that explains all the different strategies that people have come up with
over the years.

Take care,
Peter

___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] Re: WIKI question misc.collection, multiple ghc in PATH, bit of problem,

2011-08-23 Thread Marc Weber 
Excerpts from Peter Simons's message of Tue Aug 23 20:26:59 +0200 2011:
 their contents; nix-env -q \* doesn't show all individual packages.
I've made some additional changes highlighting the pitfalls.

I hope its much better than it was yesterday now. I like it. Hope you
still do so as well.

Marc Weber
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev