[Nix-commits] SVN commit: nix - r28969 - in nixpkgs/trunk/pkgs: development/interpreters/regina top-level

2011-09-02 Thread Michael Raskin 
Author: raskin
Date: Fri Sep  2 08:05:51 2011
New Revision: 28969
URL: https://svn.nixos.org/websvn/nix/?rev=28969&sc=1

Log:
Adding Regina-REXX interpreter

Added:
   nixpkgs/trunk/pkgs/development/interpreters/regina/
   nixpkgs/trunk/pkgs/development/interpreters/regina/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Added: nixpkgs/trunk/pkgs/development/interpreters/regina/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/interpreters/regina/default.nix  Fri Sep 
 2 08:05:51 2011(r28969)
@@ -0,0 +1,53 @@
+x@{builderDefsPackage
+  , ncurses
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+[];
+
+  buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+baseName="Regina-REXX";
+pname="regina-rexx";
+version="3.5";
+name="${baseName}-${version}";
+url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
+hash="0gh0k6lbhfixs44adha7lxirl3a08jabdylzr6m7mh5q5fhzv5f8";
+  };
+in
+rec {
+  src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+
+  configureFlags = [
+"--libdir=$out/lib"
+  ];
+  
+  meta = {
+description = "REXX interpreter";
+maintainers = with a.lib.maintainers;
+[
+  raskin
+];
+platforms = with a.lib.platforms;
+  linux;
+license = a.lib.licenses.lgpl2;
+  };
+  passthru = {
+updateInfo = {
+  downloadPage = 
"http://sourceforge.net/projects/regina-rexx/files/regina-rexx/";;
+};
+  };
+}) x
+

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Thu Sep  1 21:03:18 
2011(r28968)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Fri Sep  2 08:05:51 
2011(r28969)
@@ -2576,6 +2576,8 @@
 inherit (gtkLibs) pango glib gtk;
   };
 
+  regina = callPackage ../development/interpreters/regina {};
+
   ruby18 = callPackage ../development/interpreters/ruby { };
   #ruby19 = import ../development/interpreters/ruby/ruby-19.nix { inherit 
ruby18 fetchurl; };
   ruby = ruby18;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] disabling pulseaudio in kde

2011-09-02 Thread Nicolas Pierron 
Hi,

On Fri, Sep 2, 2011 at 08:44, Eelco Dolstra  wrote:
> On 09/02/2011 01:57 AM, rocon...@theorem.ca wrote:
>> Is there some way to disable pulseaudio in kde-4.5.5?
>
> Just set "hardware.pulseaudio.enable = false;" in configuration.nix (which
> happens to be the default).

To know the current value of this option, you can run

nixos-option hardware.pulseaudio.enable

and if it is set to "true", then run

nixos-option -l hardware.pulseaudio.enable

To get the list of modules which are defining it.

-- 
Nicolas Pierron
http://www.linkedin.com/in/nicolasbpierron - http://nbp.name/
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

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

2011-09-02 Thread Lluís Batlle 
Author: viric
Date: Fri Sep  2 08:57:12 2011
New Revision: 28970
URL: https://svn.nixos.org/websvn/nix/?rev=28970&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  Fri Sep  2 08:05:51 
2011(r28969)
+++ nixpkgs/trunk/pkgs/tools/system/ts/default.nix  Fri Sep  2 08:57:12 
2011(r28970)
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
 
-  name = "ts-0.6.6";
+  name = "ts-0.7.0";
 
   installPhase=''make install "PREFIX=$out"'';
 
@@ -11,8 +11,8 @@
   };
 
   src = fetchurl {
-url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.6.6.tar.gz;
-sha256 = "0mdg123ppq8ibf4315l4qi0w3n7wlj4x8dq5gx8f680v4bjvc30g";
+url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.0.tar.gz;
+sha256 = "1m9nf0299idkh355afk2c9v9qqpxm4ram3gyf8a9qv4f9gg6hprp";
   };
 
   meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] Re: Planned Changes for Darwin Users

2011-09-02 Thread Ludovic Courtès 
Shea Levy  skribis:

> GNU binutils doesn't support as or ld for mach-o, so we'll need the
> Apple versions of those until it does.

Oh, right.

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

[Nix-dev] Disaster recovery / re-deployment

2011-09-02 Thread Rickard Nilsson 

Hi,

I am interested in what a more or less automatic NixOS backup/restore 
system would look like. What is the simplest way of re-building a 
complete NixOS system given you have copies of the original 
configuration.nix, /nix/store and the nixos and nixpkgs repositories?


I have looked at the nixos-install-archive tools, but they seem to be 
doing more than I want, like checking out repositories etc. Essentially 
what I want is to be able to do the following:


On a computer running some Linux that might be NixOS or something else:

1. Prepare an empty file system, /path/to/newroot.

2. Make sure /nix/store is copied or mounted to it, likewise with 
/etc/nixos/configuration.nix, /etc/nixos/nixos and /etc/nixos/nixpkgs. 
Mount anything else, for example /boot if that should be on a separate 
file system.


3. Run nixos-repair /path/to/newroot

Now you have a system that should be identical to how it was before, 
maybe except for the boot loader that probably must be setup manually 
before the first boot.


Do you have any hints on how I can write the nixos-repair utility? Or 
does it already exist? This is also a bit related to 
http://mail.cs.uu.nl/pipermail/nix-dev/2011-August/006667.html , since 
such a utility also could be used to populate a RAM-disk root, if it was 
executed during init stage 1.



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

[Nix-commits] SVN commit: nix - r28971 - nixpkgs/trunk/pkgs/applications/networking/p2p/tribler

2011-09-02 Thread Eelco Dolstra 
Author: eelco
Date: Fri Sep  2 11:11:48 2011
New Revision: 28971
URL: https://svn.nixos.org/websvn/nix/?rev=28971&sc=1

Log:
* The latest and greatest Tribler.

Modified:
   nixpkgs/trunk/pkgs/applications/networking/p2p/tribler/default.nix

Modified: nixpkgs/trunk/pkgs/applications/networking/p2p/tribler/default.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/p2p/tribler/default.nix  Fri Sep 
 2 08:57:12 2011(r28970)
+++ nixpkgs/trunk/pkgs/applications/networking/p2p/tribler/default.nix  Fri Sep 
 2 11:11:48 2011(r28971)
@@ -1,12 +1,14 @@
 { stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }:
 
+let rev = "22245"; in
+
 stdenv.mkDerivation {
-  name = "tribler-5.3.9-pre21071";
+  name = "tribler-5.4.2-pre${rev}";
 
   src = fetchsvn {
-url = http://svn.tribler.org/abc/branches/release-5.3.x;
-rev = 21071;
-sha256 = "0plzw5m9rligz66rbq8qr9sj0fiqx8gwmchdw3p4mwlwfx72gixm";
+url = http://svn.tribler.org/abc/branches/release-5.4.x;
+inherit rev;
+sha256 = "09b3iz3yy1dpl30cd2iningzhm1grz6qjgv0qb3wk0v1vxkacddz";
   };
 
   buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper 
];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] NixOS - Issue 142

2011-09-02 Thread noreply 
NixOS #142 (2 Sep)By Nicolas PierronDocument nixos-install-archiveI search the sources for both bootstrap & archive, I've no idea what this does nor where to find it. 
 Please document what it does in the NixOS manual. -- Issue on YellowGrass -- http://yellowgrass.org -- 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] NixOS - Issue 143

2011-09-02 Thread noreply 
NixOS #143 (2 Sep)By Nicolas PierronFix nixos-install-archive (does not include all modules)Based on the code, nixos-install-archive only cares about configuration.nix and nixos/nixpkgs sources. To be safe it should use the generated closure of modules, filtered out nixos repository modules, and include extra modules such as hardware-configuration.nix which is generated by "nixos-option --install" as suggested in NixOS manual. -- Issue on YellowGrass -- http://yellowgrass.org -- 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28972 - nixos/trunk/modules/system/boot

2011-09-02 Thread Eelco Dolstra 
Author: eelco
Date: Fri Sep  2 13:19:45 2011
New Revision: 28972
URL: https://svn.nixos.org/websvn/nix/?rev=28972&sc=1

Log:
* Use the CFQ I/O scheduler, rather than the ‘none’ scheduler.  This
  was already the case on Linux 2.6.32, but in newer kernels the CFQ
  scheduler is built as a module, so all block devices got the ‘none’
  scheduler instead.

Modified:
   nixos/trunk/modules/system/boot/kernel.nix

Modified: nixos/trunk/modules/system/boot/kernel.nix
==
--- nixos/trunk/modules/system/boot/kernel.nix  Fri Sep  2 11:11:48 2011
(r28971)
+++ nixos/trunk/modules/system/boot/kernel.nix  Fri Sep  2 13:19:45 2011
(r28972)
@@ -49,7 +49,7 @@
   default = true;
   example = false;
   description = ''
-Whether to activate VESA video mode on boot
+Whether to activate VESA video mode on boot.
   '';
 };
 
@@ -91,8 +91,7 @@
 };
 
 boot.initrd.kernelModules = mkOption {
-  default = [
-  ];
+  default = [];
   description = "List of modules that are always loaded by the initrd.";
 };
 
@@ -121,7 +120,10 @@
 system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
 boot.kernelParams =
-  [ "splash=verbose" ] ++ 
+  [ "splash=verbose"
+# Force the Completely Fair Scheduler to be used by default.
+"elevator=cfq"
+  ] ++ 
   optional config.boot.vesa "vga=0x317";
   
 boot.kernelModules = [ "loop" ];
@@ -162,6 +164,9 @@
 
 # Unix domain sockets (needed by udev).
 "unix"
+
+# Provide the CFQ scheduler in the initrd.
+"cfq_iosched"
 
 # Misc. stuff.
 "pcips2" "serio" "atkbd" "xtkbd"
@@ -170,8 +175,9 @@
 boot.initrd.kernelModules =
   [ # For LVM.
 "dm_mod"
-# For usual AT keyboards
-"i8042" 
+
+# For usual AT keyboards.
+"i8042"
   ];
 
 # The Linux kernel >= 2.6.27 provides firmware.
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28973 - nixos/trunk/modules/profiles

2011-09-02 Thread Eelco Dolstra 
Author: eelco
Date: Fri Sep  2 13:20:05 2011
New Revision: 28973
URL: https://svn.nixos.org/websvn/nix/?rev=28973&sc=1

Log:
* Use boot.initrd.availableKernelModules for the QEMU modules.

Modified:
   nixos/trunk/modules/profiles/qemu-guest.nix

Modified: nixos/trunk/modules/profiles/qemu-guest.nix
==
--- nixos/trunk/modules/profiles/qemu-guest.nix Fri Sep  2 13:19:45 2011
(r28972)
+++ nixos/trunk/modules/profiles/qemu-guest.nix Fri Sep  2 13:20:05 2011
(r28973)
@@ -4,5 +4,6 @@
 { config, pkgs, ... }:
 
 {
-  boot.initrd.kernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" 
"virtio_balloon" "virtio_console" ];
+  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" 
"virtio_blk" "virtio_balloon" "virtio_console" ];
+  boot.initrd.kernelModules = [ "virtio_balloon" ];
 }
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28974 - in nixpkgs/trunk/pkgs: os-specific/linux/kernel top-level

2011-09-02 Thread Eelco Dolstra 
Author: eelco
Date: Fri Sep  2 13:41:38 2011
New Revision: 28974
URL: https://svn.nixos.org/websvn/nix/?rev=28974&sc=1

Log:
* Re-enable the fbcondecor patch for Linux 2.6.35, seems to work fine.

Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.35.nixFri Sep 
 2 13:20:05 2011(r28973)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.35.nixFri Sep 
 2 13:41:38 2011(r28974)
@@ -1,8 +1,7 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
-, ... }:
+{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
 
 let
-  configWithPlatform = kernelPlatform :
+  configWithPlatform = kernelPlatform:
 ''
   # Don't include any debug features.
   DEBUG_KERNEL n

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Fri Sep  2 13:20:05 
2011(r28973)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Fri Sep  2 13:41:38 
2011(r28974)
@@ -5392,7 +5392,7 @@
   linux_2_6_35 = makeOverridable (import 
../os-specific/linux/kernel/linux-2.6.35.nix) {
 inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
 kernelPatches =
-  [ #kernelPatches.fbcondecor_2_6_35
+  [ kernelPatches.fbcondecor_2_6_35
 kernelPatches.sec_perm_2_6_24
 kernelPatches.aufs2_2_6_35
 kernelPatches.cifs_timeout_2_6_35
@@ -5659,7 +5659,7 @@
   linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor 
linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
 
   # The current default kernel / kernel modules.
-  linux = linux_2_6_32;
+  linux = linuxPackages.kernel;
   linuxPackages = linuxPackages_2_6_32;
 
   keyutils = callPackage ../os-specific/linux/keyutils { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] disabling pulseaudio in kde

2011-09-02 Thread roconnor 

# nixos-option hardware.pulseaudio.enable
false

I was under the impression that hardware.pulseaudio.enable was for 
enabling root managed pulseaudio (which I understand that pulseaudio does 
*not* recommend).


As I understand this nasty instance of pulseaudio is coming from kde 
somewhere.  Last time, when I was running KDE 4.4, I removed pulseaudio 
from the build inputs of phonon (see nixpkgs revision 24027), but now 
under KDE 4.5, pulseaudio doesn't appear to be in the build inputs to 
phonon.


Although now that I think about it, phonon could get it by the propogated 
build inputs of qt, and indeed this appears to be the case.


Maybe I can just add some sort of build flag to phonon to disable 
pulseaudio...


On Fri, 2 Sep 2011, Nicolas Pierron wrote:


Hi,

On Fri, Sep 2, 2011 at 08:44, Eelco Dolstra  wrote:

On 09/02/2011 01:57 AM, rocon...@theorem.ca wrote:

Is there some way to disable pulseaudio in kde-4.5.5?


Just set "hardware.pulseaudio.enable = false;" in configuration.nix (which
happens to be the default).


To know the current value of this option, you can run

nixos-option hardware.pulseaudio.enable

and if it is set to "true", then run

nixos-option -l hardware.pulseaudio.enable

To get the list of modules which are defining it.




--
Russell O'Connor  
``All talk about `theft,''' the general counsel of the American Graphophone
Company wrote, ``is the merest claptrap, for there exists no property in
ideas musical, literary or artistic, except as defined by statute.''
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] disabling pulseaudio in kde

2011-09-02 Thread Nicolas Pierron 
Hi,

If you want to know which packages depends on inside your NixOS
current system, run:

nix-store -q -R --tree /var/run/current-system/ | less

then look at all parents of pulseaudio.  On my system qt depends on pulseaudio.

On Fri, Sep 2, 2011 at 16:13,   wrote:
> # nixos-option hardware.pulseaudio.enable
> false
>
> I was under the impression that hardware.pulseaudio.enable was for enabling
> root managed pulseaudio (which I understand that pulseaudio does *not*
> recommend).
>
> As I understand this nasty instance of pulseaudio is coming from kde
> somewhere.  Last time, when I was running KDE 4.4, I removed pulseaudio from
> the build inputs of phonon (see nixpkgs revision 24027), but now under KDE
> 4.5, pulseaudio doesn't appear to be in the build inputs to phonon.
>
> Although now that I think about it, phonon could get it by the propogated
> build inputs of qt, and indeed this appears to be the case.
>
> Maybe I can just add some sort of build flag to phonon to disable
> pulseaudio...
>
> On Fri, 2 Sep 2011, Nicolas Pierron wrote:
>
>> Hi,
>>
>> On Fri, Sep 2, 2011 at 08:44, Eelco Dolstra  wrote:
>>>
>>> On 09/02/2011 01:57 AM, rocon...@theorem.ca wrote:

 Is there some way to disable pulseaudio in kde-4.5.5?
>>>
>>> Just set "hardware.pulseaudio.enable = false;" in configuration.nix
>>> (which
>>> happens to be the default).
>>
>> To know the current value of this option, you can run
>>
>> nixos-option hardware.pulseaudio.enable
>>
>> and if it is set to "true", then run
>>
>> nixos-option -l hardware.pulseaudio.enable
>>
>> To get the list of modules which are defining it.
>>
>>
>
> --
> Russell O'Connor                                      
> ``All talk about `theft,''' the general counsel of the American Graphophone
> Company wrote, ``is the merest claptrap, for there exists no property in
> ideas musical, literary or artistic, except as defined by statute.''
>



-- 
Nicolas Pierron
http://www.linkedin.com/in/nicolasbpierron - http://nbp.name/
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] Disaster recovery / re-deployment

2011-09-02 Thread Marc Weber 
Hi Rickard Nilsson,

I'v git repos which provide a minimal bootstrap archive containing
enough to run nixos-rebuild only.

Of course you must have nixos and nixpkgs an configuration.nix in place.

It tries to modularize nixos-install from cd: you have a run-in-chroot
command, you have one checking out sources and a minimal store.

Ironically I would have needed such very urgently. 

Contact me on irc and I'll give you access to code and a system which
can build those minimal archives for you (i686 only right now).

I'm interested in helping getting this done.

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

Re: [Nix-dev] disabling pulseaudio in kde

2011-09-02 Thread Eelco Dolstra 

Hi,

On 09/02/2011 04:13 PM, rocon...@theorem.ca wrote:


# nixos-option hardware.pulseaudio.enable
false

I was under the impression that hardware.pulseaudio.enable was for enabling root
managed pulseaudio (which I understand that pulseaudio does *not* recommend).


That's another option (services.pulseaudio.enable).


As I understand this nasty instance of pulseaudio is coming from kde somewhere.
Last time, when I was running KDE 4.4, I removed pulseaudio from the build
inputs of phonon (see nixpkgs revision 24027), but now under KDE 4.5, pulseaudio
doesn't appear to be in the build inputs to phonon.


Removing pulseaudio from the dependencies should no longer be necessary, because 
the "autospawn=no" flag in /etc/pulse/client.conf should prevent it from being 
started.


Note that this didn't work prior to r28147 because PulseAudio used $prefix/etc 
for its configuration.  Is it possible that you have a binary somewhere (maybe 
in your profile) that links against an old PulseAudio?


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

[Nix-commits] SVN commit: nix - r28975 - in nixpkgs/trunk/pkgs: development/libraries/haskell/HDBC top-level

2011-09-02 Thread Andres Loeh 
Author: andres
Date: Fri Sep  2 15:11:52 2011
New Revision: 28975
URL: https://svn.nixos.org/websvn/nix/?rev=28975&sc=1

Log:
Added HDBC-odbc.

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Added: nixpkgs/trunk/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix Fri Sep 
 2 15:11:52 2011(r28975)
@@ -0,0 +1,22 @@
+{ cabal, HDBC, mtl, odbc, time, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "HDBC-odbc";
+  version = "2.3.1.0";
+  sha256 = "0vza38ggs863wjh25xnwslwlin68166ywws72bs766rl0rq7fkf4";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ HDBC mtl time utf8String ];
+  extraLibraries = [ odbc ];
+  noHaddock = true;
+  meta = {
+homepage = "http://software.complete.org/hdbc-odbc";;
+description = "ODBC driver for HDBC";
+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   Fri Sep  2 13:41:38 
2011(r28974)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Fri Sep  2 15:11:52 
2011(r28975)
@@ -700,6 +700,10 @@
 
   HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {};
 
+  HDBCOdbc = callPackage ../development/libraries/haskell/HDBC/HDBC-odbc.nix {
+odbc = pkgs.unixODBC;
+  };
+
   HDBCPostgresql = callPackage 
../development/libraries/haskell/HDBC/HDBC-postgresql.nix {
 inherit (pkgs) postgresql;
   };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] disabling pulseaudio in kde

2011-09-02 Thread roconnor 

On Fri, 2 Sep 2011, Eelco Dolstra wrote:

Removing pulseaudio from the dependencies should no longer be necessary, 
because the "autospawn=no" flag in /etc/pulse/client.conf should prevent it 
from being started.


Note that this didn't work prior to r28147 because PulseAudio used 
$prefix/etc for its configuration.  Is it possible that you have a binary 
somewhere (maybe in your profile) that links against an old PulseAudio?


Very possible.  KDE autostarts programs when I reboot my system. Even 
after upgrading my system or my user profile I could still be running lots 
of old programs.  It is difficult to tell.


--
Russell O'Connor  
``All talk about `theft,''' the general counsel of the American Graphophone
Company wrote, ``is the merest claptrap, for there exists no property in
ideas musical, literary or artistic, except as defined by statute.''
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] SVN commit: nix - r28976 - nixpkgs/trunk/pkgs/servers/http/apache-httpd

2011-09-02 Thread Eelco Dolstra 
Author: eelco
Date: Fri Sep  2 15:59:12 2011
New Revision: 28976
URL: https://svn.nixos.org/websvn/nix/?rev=28976&sc=1

Log:
* Apache httpd updated to 2.2.20, with a fix for CVE-2011-3192.

Modified:
   nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nix

Modified: nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nix
==
--- nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nixFri Sep  2 
15:11:52 2011(r28975)
+++ nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nixFri Sep  2 
15:59:12 2011(r28976)
@@ -8,12 +8,12 @@
 assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 
 stdenv.mkDerivation rec {
-  version = "2.2.19";
+  version = "2.2.20";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
 url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-sha1 = "5676da63f3203129287d7c09a16cf523c00ec6cf";
+sha1 = "c8f00a505af6ed3f89f45b640217c388f5cd32b0";
   };
 
   buildInputs = [perl apr aprutil pcre] ++
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28977 - nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 18:02:10 2011
New Revision: 28977
URL: https://svn.nixos.org/websvn/nix/?rev=28977&sc=1

Log:
haskell-hledger-chart: updated to version 0.15

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix  
Fri Sep  2 15:59:12 2011(r28976)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix  
Fri Sep  2 18:02:10 2011(r28977)
@@ -1,15 +1,19 @@
-{ cabal, Chart, colour, hledger, hledgerLib, safe }:
+{ cabal, Chart, cmdargs, colour, hledger, hledgerLib, HUnit, safe
+, time
+}:
 
 cabal.mkDerivation (self: {
   pname = "hledger-chart";
-  version = "0.14";
-  sha256 = "fe321e4e31c72aef22945080323992a0033ae8fb48213ad7b708f86f9e2f6462";
+  version = "0.15";
+  sha256 = "03i09fsf1h7w62as6d3q4f7fadjykbhbi95jbv0scb67rb0g9cw1";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ Chart colour hledger hledgerLib safe ];
+  buildDepends = [
+Chart cmdargs colour hledger hledgerLib HUnit safe time
+  ];
   meta = {
 homepage = "http://hledger.org";;
-description = "A pie chart generator for the hledger accounting tool";
+description = "A pie chart image generator for the hledger accounting 
tool";
 license = "GPL";
 platforms = self.stdenv.lib.platforms.linux;
 maintainers = [
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28978 - nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-lib

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 18:02:16 2011
New Revision: 28978
URL: https://svn.nixos.org/websvn/nix/?rev=28978&sc=1

Log:
haskell-hledger-lib: updated to version 0.15

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-lib/default.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-lib/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-lib/default.nix
Fri Sep  2 18:02:10 2011(r28977)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-lib/default.nix
Fri Sep  2 18:02:16 2011(r28978)
@@ -1,16 +1,17 @@
-{ cabal, HUnit, mtl, parsec, regexpr, safe, split, time, utf8String
+{ cabal, cmdargs, HUnit, mtl, parsec, regexpr, safe, split, time
+, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.14";
-  sha256 = "9a6d6ab4383800279e135e9bbcd886e95cea45232d093202c5d43e6edd1f927c";
+  version = "0.15";
+  sha256 = "1bsn02pgz38ivk6z24niwab2ibmysngc1hghw5d5n2xa862ffrgb";
   buildDepends = [
-HUnit mtl parsec regexpr safe split time utf8String
+cmdargs HUnit mtl parsec regexpr safe split time utf8String
   ];
   meta = {
 homepage = "http://hledger.org";;
-description = "Reusable types and utilities for the hledger accounting 
tool and financial apps in general";
+description = "Core data types, parsers and utilities for the hledger 
accounting tool";
 license = "GPL";
 platforms = self.ghc.meta.platforms;
 maintainers = [
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28979 - nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-vty

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 18:02:20 2011
New Revision: 28979
URL: https://svn.nixos.org/websvn/nix/?rev=28979&sc=1

Log:
haskell-hledger-vty: updated to version 0.15

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-vty/default.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-vty/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-vty/default.nix
Fri Sep  2 18:02:16 2011(r28978)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-vty/default.nix
Fri Sep  2 18:02:20 2011(r28979)
@@ -1,15 +1,15 @@
-{ cabal, hledger, hledgerLib, safe, vty }:
+{ cabal, cmdargs, hledger, hledgerLib, HUnit, safe, time, vty }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-vty";
-  version = "0.14";
-  sha256 = "3d9972430053548a65bfe5fb39ba374d1c930c6e0cfc704be5c59de742a4287e";
+  version = "0.15";
+  sha256 = "185j09chw34jjb0zayv526cs4rzgaygclzifmpwjk5bnrbx9b925";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ hledger hledgerLib safe vty ];
+  buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ];
   meta = {
 homepage = "http://hledger.org";;
-description = "A curses-style interface for the hledger accounting tool";
+description = "A curses-style console interface for the hledger accounting 
tool";
 license = "GPL";
 platforms = self.ghc.meta.platforms;
 maintainers = [
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

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

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 18:02:24 2011
New Revision: 28980
URL: https://svn.nixos.org/websvn/nix/?rev=28980&sc=1

Log:
haskell-hledger: updated to version 0.15

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

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hledger/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hledger/default.nix
Fri Sep  2 18:02:20 2011(r28979)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hledger/default.nix
Fri Sep  2 18:02:24 2011(r28980)
@@ -1,20 +1,20 @@
-{ cabal, csv, haskeline, hledgerLib, HUnit, mtl, parsec, regexpr
-, safe, split, time, utf8String
+{ cabal, cmdargs, csv, haskeline, hledgerLib, HUnit, mtl, parsec
+, regexpr, safe, split, time, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.14";
-  sha256 = "1bfcb1dcc88d8cec924afbf7aefd1ccf88b7be785b522c1595b75b91f8c82d35";
+  version = "0.15";
+  sha256 = "0pb5qm22x8wbw43199jn67qc6q5sbbwc3vrpxl1k9blxdnj4min0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-csv haskeline hledgerLib HUnit mtl parsec regexpr safe split time
-utf8String
+cmdargs csv haskeline hledgerLib HUnit mtl parsec regexpr safe
+split time utf8String
   ];
   meta = {
 homepage = "http://hledger.org";;
-description = "A robust command-line accounting tool with a simple 
human-editable data format, similar to ledger";
+description = "The main command-line interface for the hledger accounting 
tool";
 license = "GPL";
 platforms = self.ghc.meta.platforms;
 maintainers = [
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

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

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 18:02:28 2011
New Revision: 28981
URL: https://svn.nixos.org/websvn/nix/?rev=28981&sc=1

Log:
haskell-hmatrix: updated to version 0.12.0.0

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

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
Fri Sep  2 18:02:24 2011(r28980)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
Fri Sep  2 18:02:28 2011(r28981)
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.11.1.0";
-  sha256 = "19915xmf6m2092s1rzwirxy0rwjcr6482y5wg4bil0afm0xjnb9n";
+  version = "0.12.0.0";
+  sha256 = "1j4c3my6i3xz6b4pyy98722zmgky27ls7a7w13ilwmnhb7pvq9al";
   buildDepends = [
 binary HUnit QuickCheck random storableComplex vector
   ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28982 - nixpkgs/trunk/pkgs/applications/office/hledger-interest

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 18:12:31 2011
New Revision: 28982
URL: https://svn.nixos.org/websvn/nix/?rev=28982&sc=1

Log:
haskell-hledger-interest: updated to version 1.3

Modified:
   nixpkgs/trunk/pkgs/applications/office/hledger-interest/default.nix

Modified: nixpkgs/trunk/pkgs/applications/office/hledger-interest/default.nix
==
--- nixpkgs/trunk/pkgs/applications/office/hledger-interest/default.nix Fri Sep 
 2 18:02:28 2011(r28981)
+++ nixpkgs/trunk/pkgs/applications/office/hledger-interest/default.nix Fri Sep 
 2 18:12:31 2011(r28982)
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-interest";
-  version = "1.2";
-  sha256 = "1r5x6z0k33fpvqba6zlkhpm7b0rwwnli4q100psms89x0rrj7y2d";
+  version = "1.3";
+  sha256 = "1sgnl3vv38cmgxv3xag3c78j1955xxwdmr5xr3f8rc78np6d0wnz";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ hledgerLib mtl time ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28983 - in nixpkgs/trunk/pkgs: development/libraries/haskell/HaskellForMaths top-level

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 18:20:35 2011
New Revision: 28983
URL: https://svn.nixos.org/websvn/nix/?rev=28983&sc=1

Log:
haskell-HaskellForMaths: added version 0.3.4

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

Added: 
nixpkgs/trunk/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ 
nixpkgs/trunk/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
Fri Sep  2 18:20:35 2011(r28983)
@@ -0,0 +1,18 @@
+{ cabal, QuickCheck, random }:
+
+cabal.mkDerivation (self: {
+  pname = "HaskellForMaths";
+  version = "0.3.4";
+  sha256 = "1cmhzcybv3kwvs058sjihdkqr72rygv2nmbcy8i485pk35yq31sm";
+  buildDepends = [ QuickCheck random ];
+  meta = {
+homepage = "http://haskellformaths.blogspot.com/";;
+description = "Combinatorics, group theory, commutative algebra, 
non-commutative algebra";
+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   Fri Sep  2 18:12:31 
2011(r28982)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Fri Sep  2 18:20:35 
2011(r28983)
@@ -692,6 +692,8 @@
 
   hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
 
+  haskellForMaths = callPackage 
../development/libraries/haskell/HaskellForMaths {};
+
   haxr = callPackage ../development/libraries/haskell/haxr {};
 
   haxr_th = callPackage ../development/libraries/haskell/haxr-th {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28984 - in nixpkgs/trunk/pkgs: development/libraries/haskell/unix-compat top-level

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 18:24:27 2011
New Revision: 28984
URL: https://svn.nixos.org/websvn/nix/?rev=28984&sc=1

Log:
haskell-unix-compat: added version 0.3

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix
  - copied, changed from r28983, 
nixpkgs/trunk/pkgs/development/libraries/haskell/unix-compat/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/unix-compat/0.3.nix
  - copied, changed from r28983, 
nixpkgs/trunk/pkgs/development/libraries/haskell/unix-compat/default.nix
Deleted:
   nixpkgs/trunk/pkgs/development/libraries/haskell/unix-compat/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Copied and modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix (from 
r28983, 
nixpkgs/trunk/pkgs/development/libraries/haskell/unix-compat/default.nix)
==

Copied and modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/unix-compat/0.3.nix (from 
r28983, 
nixpkgs/trunk/pkgs/development/libraries/haskell/unix-compat/default.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/unix-compat/default.nix
Fri Sep  2 18:20:35 2011(r28983, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/unix-compat/0.3.nix
Fri Sep  2 18:24:27 2011(r28984)
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-compat";
-  version = "0.2.2.1";
-  sha256 = "009dg6mxjmdkcmr2d1qq9r3f4qfx4d362lyxj9vvgwrzcdnsgzqi";
+  version = "0.3";
+  sha256 = "0zgz9s5z2kca37sgnf4dyfdw90435h20bznx485y1ggvh377jan7";
   meta = {
 homepage = "http://github.com/jystic/unix-compat";;
 description = "Portable POSIX-compatibility layer";

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Fri Sep  2 18:20:35 
2011(r28983)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Fri Sep  2 18:24:27 
2011(r28984)
@@ -1201,7 +1201,9 @@
 
   uniqueid = callPackage ../development/libraries/haskell/uniqueid {};
 
-  unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
+  unixCompat_0_2_2_1 = callPackage 
../development/libraries/haskell/unix-compat/0.2.2.1.nix {};
+  unixCompat_0_3 = callPackage 
../development/libraries/haskell/unix-compat/0.3.nix {};
+  unixCompat = self.unixCompat_0_2_2_1;
 
   unorderedContainers = callPackage 
../development/libraries/haskell/unordered-containers {};
 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28985 - in nixpkgs/trunk/pkgs: development/libraries/haskell/vector-algorithms top-level

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 18:31:44 2011
New Revision: 28985
URL: https://svn.nixos.org/websvn/nix/?rev=28985&sc=1

Log:
haskell-vector-algorithms: updated to version 0.5.3

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/0.5.3.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Added: 
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/0.5.3.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ 
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/0.5.3.nix
Fri Sep  2 18:31:44 2011(r28985)
@@ -0,0 +1,18 @@
+{ cabal, primitive, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "vector-algorithms";
+  version = "0.5.3";
+  sha256 = "14h2x3yrb4fji8bf84xbfp84pax6lzr8njc0c4061xpwcmair36j";
+  buildDepends = [ primitive vector ];
+  meta = {
+homepage = "http://code.haskell.org/~dolio/";;
+description = "Efficient algorithms for vector arrays";
+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   Fri Sep  2 18:24:27 
2011(r28984)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Fri Sep  2 18:31:44 
2011(r28985)
@@ -1230,8 +1230,8 @@
   vector = callPackage ../development/libraries/haskell/vector {};
 
   vectorAlgorithms_0_4 = callPackage 
../development/libraries/haskell/vector-algorithms/0.4.nix {};
-  vectorAlgorithms_0_5_2 = callPackage 
../development/libraries/haskell/vector-algorithms/0.5.2.nix {};
-  vectorAlgorithms = self.vectorAlgorithms_0_5_2;
+  vectorAlgorithms_0_5_3 = callPackage 
../development/libraries/haskell/vector-algorithms/0.5.3.nix {};
+  vectorAlgorithms = self.vectorAlgorithms_0_5_3;
 
   vectorSpace = callPackage ../development/libraries/haskell/vector-space {};
 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28986 - nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 18:33:04 2011
New Revision: 28986
URL: https://svn.nixos.org/websvn/nix/?rev=28986&sc=1

Log:
Oops, forgot to delete the old file.

Deleted:
   nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/0.5.2.nix
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28987 - nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10

2011-09-02 Thread Russell O'Connor 
Author: roconnor
Date: Fri Sep  2 19:25:46 2011
New Revision: 28987
URL: https://svn.nixos.org/websvn/nix/?rev=28987&sc=1

Log:
upgrading 32-bit flashplayer to version 10.3.183.7

Modified:
   
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix

Modified: 
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
==
--- 
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
  Fri Sep  2 18:33:04 2011(r28986)
+++ 
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
  Fri Sep  2 19:25:46 2011(r28987)
@@ -53,9 +53,9 @@
 url = 
http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz;
 sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc";
   } else {
-version = "10.3.183.5";
+version = "10.3.183.7";
 url = 
http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
-sha256 = "1kv7szpadgv0wwmi46vc05723qzsgclz68rij6x49l61sngzmw0x";
+sha256 = "166ipldmd03psy68xxirmdd4p591vjnffpv2l97yg1bbkn5h2pj6";
   }
 else throw "Flash Player is not supported on this platform";
 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

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

2011-09-02 Thread Russell O'Connor 
Author: roconnor
Date: Fri Sep  2 20:19:42 2011
New Revision: 28988
URL: https://svn.nixos.org/websvn/nix/?rev=28988&sc=1

Log:
bitcoin cannot use the recent versions of boost.

setting boost dependency to 1.44

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   Fri Sep  2 19:25:46 
2011(r28987)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Fri Sep  2 20:19:42 
2011(r28988)
@@ -6186,6 +6186,7 @@
   bibletime = callPackage ../applications/misc/bibletime { };
 
   bitcoin = callPackage ../applications/misc/bitcoin {
+boost = boost144;
 wxGTK = wxGTK290;
 db4 = db47;
 inherit (xlibs) libSM;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28989 - nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 21:48:57 2011
New Revision: 28989
URL: https://svn.nixos.org/websvn/nix/?rev=28989&sc=1

Log:
haskell-hledger-chart: updated to version 0.15.1

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix  
Fri Sep  2 20:19:42 2011(r28988)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix  
Fri Sep  2 21:48:57 2011(r28989)
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-chart";
-  version = "0.15";
-  sha256 = "03i09fsf1h7w62as6d3q4f7fadjykbhbi95jbv0scb67rb0g9cw1";
+  version = "0.15.1";
+  sha256 = "1sb48ajc4fg2xin7nd35kwd3rqg4zg2318mgwqld8l0xv77jv5fh";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28990 - nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-vty

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 21:49:02 2011
New Revision: 28990
URL: https://svn.nixos.org/websvn/nix/?rev=28990&sc=1

Log:
haskell-hledger-vty: updated to version 0.15.1

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-vty/default.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-vty/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-vty/default.nix
Fri Sep  2 21:48:57 2011(r28989)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-vty/default.nix
Fri Sep  2 21:49:02 2011(r28990)
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-vty";
-  version = "0.15";
-  sha256 = "185j09chw34jjb0zayv526cs4rzgaygclzifmpwjk5bnrbx9b925";
+  version = "0.15.1";
+  sha256 = "069wzk4azc4rnf292809g0lsi07p1m9gjmrvwn0cy2bij2vrhi6n";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

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

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 21:49:08 2011
New Revision: 28991
URL: https://svn.nixos.org/websvn/nix/?rev=28991&sc=1

Log:
haskell-hledger: updated to version 0.15.1

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

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hledger/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hledger/default.nix
Fri Sep  2 21:49:02 2011(r28990)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hledger/default.nix
Fri Sep  2 21:49:08 2011(r28991)
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.15";
-  sha256 = "0pb5qm22x8wbw43199jn67qc6q5sbbwc3vrpxl1k9blxdnj4min0";
+  version = "0.15.1";
+  sha256 = "0lm7w0r1pcv6jqpl2h1jcn77bqc6ld1z35zh30vbwgyj7mv02bdb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28992 - nixpkgs/trunk/pkgs/development/libraries/haskell/vector-space

2011-09-02 Thread Peter Simons 
Author: simons
Date: Fri Sep  2 21:49:13 2011
New Revision: 28992
URL: https://svn.nixos.org/websvn/nix/?rev=28992&sc=1

Log:
haskell-vector-space: updated to version 0.7.6

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/vector-space/default.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-space/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/vector-space/default.nix   
Fri Sep  2 21:49:08 2011(r28991)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/vector-space/default.nix   
Fri Sep  2 21:49:13 2011(r28992)
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vector-space";
-  version = "0.7.3";
-  sha256 = "00lzhml1pc328iw9cip9yh54n0yqkwz1mxkv4gq2wlb7bzpfq1fx";
+  version = "0.7.6";
+  sha256 = "166493dnlgrm9bsyp8dvdnkz1s5503casamihs4d3rij4fqvw7vf";
   buildDepends = [ Boolean MemoTrie ];
   meta = {
 homepage = "http://haskell.org/haskellwiki/vector-space";;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits