[Nix-commits] SVN commit: nix - r29309 - nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk
Author: simons
Date: Fri Sep 16 18:19:15 2011
New Revision: 29309
URL: https://ssl.nixos.org/websvn/nix/?rev=29309sc=1
Log:
haskell-Hipmunk: avoid build error in the haddock documentation
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Fri Sep 16 18:17:20 2011(r29308)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Fri Sep 16 18:19:15 2011(r29309)
@@ -5,6 +5,7 @@
version = 5.2.0.3;
sha256 = 1as00372hz0ngy6pc5l0w7qgw5flcyag07zk3dxkbj5kv24xk49m;
buildDepends = [ StateVar transformers ];
+ noHaddock = true;
meta = {
homepage = http://patch-tag.com/r/felipe/hipmunk/home;;
description = A Haskell binding for Chipmunk;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29311 - in nixpkgs/trunk/pkgs: development/compilers/helium top-level
Author: simons
Date: Fri Sep 16 18:29:32 2011
New Revision: 29311
URL: https://ssl.nixos.org/websvn/nix/?rev=29311sc=1
Log:
haskell-helium: the package has disappeared from the upstream web server
Deleted:
nixpkgs/trunk/pkgs/development/compilers/helium/
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Sep 16 18:25:23
2011(r29310)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Sep 16 18:29:32
2011(r29311)
@@ -1321,8 +1321,6 @@
flapjax = callPackage ../development/compilers/flapjax {};
- helium = callPackage ../development/compilers/helium {};
-
idris = callPackage ../development/compilers/idris {};
pakcs = callPackage ../development/compilers/pakcs {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] How to replace a standard kernel module with a newer version?
Hi guys,
I found a simple solution:
networking = {
localCommands = ''
${pkgs.module_init_tools}/sbin/insmod
${config.boot.kernelPackages.e1000e}/lib/modules/*/kernel/drivers/net/e1000e/e1000e.ko
'';
};
With that snippet enabled, the Ethernet card
00:19.0 Ethernet controller: Intel Corporation 82579LM Gigabit Network
Connection (rev 04)
works just fine.
Take care,
Peter
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29324 - nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix
Author: simons
Date: Sat Sep 17 13:45:06 2011
New Revision: 29324
URL: https://ssl.nixos.org/websvn/nix/?rev=29324sc=1
Log:
haskell-cabal2nix: updated to version 1.16
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 Sat Sep
17 13:42:38 2011(r29323)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix Sat Sep
17 13:45:06 2011(r29324)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = cabal2nix;
- version = 1.15;
- sha256 = 0v2xnr8fp0bpv4cmd4q01p293zz4zg9kvhd4sr9ar3amj9vjhsk7;
+ version = 1.16;
+ sha256 = 02gffdc6q7xfaglx4rf0vc7784zmdnfklh88si83qcrz15wzgp2k;
isLibrary = false;
isExecutable = true;
buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Modifying expressions generated by cabal2nix
Hi Alexander, How to modify expressions generated by cabal2nix and be sure that changes will be ported during following (automatic?) updates? please feel free to update, change, or improve any Haskell package as you see fit. After you have done so, please open an issue at http://github.com/haskell4nix/cabal2nix/issues to report the need for manual patching. We will then try to adapt cabal2nix so that it generates the expression correctly in the future. If you dislike bug trackers for some reason, you can post a quick note to this mailing list, too. What matters is just that Andres and I are aware of the change. In case you'd like to hack cabal2nix, you'll find that most changes can be accomplished through one of these modules: - http://github.com/haskell4nix/cabal2nix/blob/master/src/Cabal2Nix/Name.hs maps Cabal dependency names to Nix attributes, - http://github.com/haskell4nix/cabal2nix/blob/master/src/Cabal2Nix/Flags.hs configures non-standard Cabal flags that ought to be specified at build time (you'll find that xmonad-extras is already in there), - http://github.com/haskell4nix/cabal2nix/blob/master/src/Cabal2Nix/PostProcess.hs contains patches to the generated Nix expression, i.e. addition of undeclared dependencies, etc. I hope this helps! Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29351 - nixpkgs/trunk/pkgs/development/libraries/haskell/HaskellForMaths
Author: simons
Date: Mon Sep 19 16:38:22 2011
New Revision: 29351
URL: https://ssl.nixos.org/websvn/nix/?rev=29351sc=1
Log:
haskell-HaskellForMaths: updated to version 0.4.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
Mon Sep 19 16:38:16 2011(r29350)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
Mon Sep 19 16:38:22 2011(r29351)
@@ -1,10 +1,10 @@
-{ cabal, QuickCheck, random }:
+{ cabal, random }:
cabal.mkDerivation (self: {
pname = HaskellForMaths;
- version = 0.3.4;
- sha256 = 1cmhzcybv3kwvs058sjihdkqr72rygv2nmbcy8i485pk35yq31sm;
- buildDepends = [ QuickCheck random ];
+ version = 0.4.0;
+ sha256 = 1x6kac1im07cpb1014ci8v222q66w2g3gr1wdcv2yvdi5g24ymbp;
+ buildDepends = [ random ];
meta = {
homepage = http://haskellformaths.blogspot.com/;;
description = Combinatorics, group theory, commutative algebra,
non-commutative algebra;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29352 - nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator
Author: simons
Date: Mon Sep 19 16:38:28 2011
New Revision: 29352
URL: https://ssl.nixos.org/websvn/nix/?rev=29352sc=1
Log:
haskell-http-enumerator: updated to version 0.7.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Mon Sep 19 16:38:22 2011(r29351)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Mon Sep 19 16:38:28 2011(r29352)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = http-enumerator;
- version = 0.7.0;
- sha256 = 0hbr03zv8y9maf9dh35d08pgbgj5dlqbaq158m576d4fnirmcapz;
+ version = 0.7.1;
+ sha256 = 0d8zfgj41jdg6k9ny717xy1ca2jxnmr7aliqlq2arf4900lxjlwd;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29353 - nixpkgs/trunk/pkgs/games/LambdaHack
Author: simons
Date: Mon Sep 19 16:38:37 2011
New Revision: 29353
URL: https://ssl.nixos.org/websvn/nix/?rev=29353sc=1
Log:
haskell-LambdaHack: updated to version 0.1.20110918
Modified:
nixpkgs/trunk/pkgs/games/LambdaHack/default.nix
Modified: nixpkgs/trunk/pkgs/games/LambdaHack/default.nix
==
--- nixpkgs/trunk/pkgs/games/LambdaHack/default.nix Mon Sep 19 16:38:28
2011(r29352)
+++ nixpkgs/trunk/pkgs/games/LambdaHack/default.nix Mon Sep 19 16:38:37
2011(r29353)
@@ -1,17 +1,15 @@
-{cabal, binary, mtl, zlib, vty, ConfigFile, MissingH, filepath}:
+{ cabal, binary, ConfigFile, gtk, MissingH, mtl, random, zlib }:
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = LambdaHack;
- version = 0.1.20110117;
- name = self.fname;
- sha256 = 186ccl1yq0r84h9azzwj0zyy3kf905i3kjlnziyi52ysqd61qw90;
- propagatedBuildInputs =
-[binary mtl zlib vty ConfigFile MissingH filepath];
- preConfigure = ''
-sed -i 's|\(filepath.*\) 1.2|\1|' ${self.pname}.cabal
- '';
+ version = 0.1.20110918;
+ sha256 = 14zn650x7r65lb76hygz6yiwzbg2rbcyisi7kx2lszrbg0fp8pa9;
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ binary ConfigFile gtk MissingH mtl random zlib ];
meta = {
-description = a small roguelike game;
+homepage = http://github.com/kosmikus/LambdaHack;;
+description = A roguelike game engine in early development;
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29358 - nixpkgs/trunk/pkgs/tools/networking/nbd
Author: simons Date: Mon Sep 19 17:02:15 2011 New Revision: 29358 URL: https://ssl.nixos.org/websvn/nix/?rev=29358sc=1 Log: nbd: don't try to build this tool on Cygwin Modified: nixpkgs/trunk/pkgs/tools/networking/nbd/default.nix Modified: nixpkgs/trunk/pkgs/tools/networking/nbd/default.nix == --- nixpkgs/trunk/pkgs/tools/networking/nbd/default.nix Mon Sep 19 17:00:37 2011(r29357) +++ nixpkgs/trunk/pkgs/tools/networking/nbd/default.nix Mon Sep 19 17:02:15 2011(r29358) @@ -27,6 +27,6 @@ description = map arbitrary files as block devices over the network; license = GPLv2; maintainers = [ stdenv.lib.maintainers.simons ]; -platforms = stdenv.lib.platforms.all; +platforms = stdenv.lib.platforms.unix; }; } ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] [PATCH] Enable freetype support in xmobar using PostProcess.hs, Flags.hs
Hi Alexander,
your patch is applied in the latest version of cabal2nix (in a slightly
modified form):
--- a/src/Cabal2Nix/Flags.hs
+++ b/src/Cabal2Nix/Flags.hs
@@ -9,6 +9,7 @@ pkgConfigureFlags (PackageIdentifier (PackageName name) _)
| name == threadscope= ([], [--ghc-options=-rtsopts])
| name == X11-xft= ([],
[--extra-include-dirs=${freetype}/include/freetype2])
| name == xmonad-extras = ([disable with_hlist, disable
with_mpd], [])
+ | name == xmobar = ([], [--flags=with_xft])
| otherwise= ([],[])
The logic in that list is as follows: the first value of the tuple defines
Cabal flags that may be set or unset. The second value defines additional
parameters to be passed at configure time, such as --extra-include-dirs,
etc. The 'with_xft' flag can be set by adding 'enable with_xft' in the
first list. The difference between those two kinds of settings is that Cabal
flags modify the way the Cabal file is processed, whereas the second kind of
settings are relevant only for the actual build.
--- a/src/Cabal2Nix/PostProcess.hs
+++ b/src/Cabal2Nix/PostProcess.hs
@@ -34,4 +34,5 @@ postProcess deriv@(MkDerivation {..})
| pname == wxcore = deriv { extraLibs =
wxGTK:mesa:libX11:extraLibs }
| pname == X11 = deriv { extraLibs =
libXinerama:libXext:extraLibs }
| pname == X11-xft = deriv { extraLibs =
pkgconfig:freetype:fontconfig:extraLibs }
+ | pname == xmobar = deriv { buildDepends =
X11Xft:buildDepends }
| otherwise = deriv
Cabal2nix automatically picks up that additional dependency when the Cabal
flag is configured as described above.
Thank you very much for the patch!
Take care,
Peter
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29364 - nixpkgs/trunk/pkgs/top-level
Author: simons
Date: Mon Sep 19 20:20:17 2011
New Revision: 29364
URL: https://ssl.nixos.org/websvn/nix/?rev=29364sc=1
Log:
all-packages.nix: fixed evaluation error in the 'mumble' attribute
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 Mon Sep 19 19:01:40
2011(r29363)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 19 20:20:17
2011(r29364)
@@ -6951,7 +6951,7 @@
mumble = callPackage ../applications/networking/mumble {
avahi = avahi.override {
- withLibdnsCompat = true;
+ withLibdnssdCompat = true;
};
jackSupport = getConfig [ mumble jackSupport ] false;
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] deprecating KDE3
Hi guys, For me, kcachegrind is an important paackage. It wants qt3 and kde3.kdelibs. I also use qgit a lot, which seems to depend on qt3. Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29439 - nixpkgs/trunk/pkgs/development/libraries/haskell/skein
Author: simons Date: Thu Sep 22 15:25:21 2011 New Revision: 29439 URL: https://ssl.nixos.org/websvn/nix/?rev=29439sc=1 Log: haskell-skein: updated to version 0.1 Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/skein/default.nix Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/skein/default.nix == --- nixpkgs/trunk/pkgs/development/libraries/haskell/skein/default.nix Thu Sep 22 11:28:56 2011(r29438) +++ nixpkgs/trunk/pkgs/development/libraries/haskell/skein/default.nix Thu Sep 22 15:25:21 2011(r29439) @@ -9,5 +9,9 @@ description = Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; +maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons +]; }; }) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29440 - nixpkgs/trunk/pkgs/development/libraries/haskell/xml
Author: simons
Date: Thu Sep 22 15:25:29 2011
New Revision: 29440
URL: https://ssl.nixos.org/websvn/nix/?rev=29440sc=1
Log:
haskell-xml: updated to version 1.3.10
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/xml/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/xml/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/xml/default.nixThu Sep
22 15:25:21 2011(r29439)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/xml/default.nixThu Sep
22 15:25:29 2011(r29440)
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, text }:
cabal.mkDerivation (self: {
pname = xml;
- version = 1.3.9;
- sha256 = 1sx6k5dscpcy4aq09g7h0fz0sl4w2nrr4pnklgwrbrh6bf6kc6w2;
+ version = 1.3.10;
+ sha256 = 0mmibqzbbqmw4a8gc4f2yy144nx48gpfwj3iqq6dydvcikajxav2;
+ buildDepends = [ text ];
meta = {
homepage = http://code.galois.com;;
description = A simple XML library;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29443 - nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta
Author: simons
Date: Thu Sep 22 15:25:52 2011
New Revision: 29443
URL: https://ssl.nixos.org/websvn/nix/?rev=29443sc=1
Log:
haskell-happy-meta: updated to version 0.2.0.3
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta/default.nix Thu Sep
22 15:25:45 2011(r29442)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta/default.nix Thu Sep
22 15:25:52 2011(r29443)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = happy-meta;
- version = 0.2.0.2;
- sha256 = 1r9i01bnw0dz10balhpgiwcls5jwv5p09jafi8jl6hy0jwx7xydp;
+ version = 0.2.0.3;
+ sha256 = 0bvm4rbmd48vfpyjjfq476466s9hf7x3y0bgzdfkacm89xx080g9;
buildDepends = [ haskellSrcMeta mtl ];
meta = {
description = Quasi-quoter for Happy parsers;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29450 - nixpkgs/trunk/pkgs/tools/system/lxc
Author: simons
Date: Fri Sep 23 11:16:10 2011
New Revision: 29450
URL: https://ssl.nixos.org/websvn/nix/?rev=29450sc=1
Log:
lxc: added perl buildInput to fix the lxc-ps script
Also added myself as a maintainer, improved the meta section a little,
and stripped trailing whitespace.
Modified:
nixpkgs/trunk/pkgs/tools/system/lxc/default.nix
Modified: nixpkgs/trunk/pkgs/tools/system/lxc/default.nix
==
--- nixpkgs/trunk/pkgs/tools/system/lxc/default.nix Fri Sep 23 06:52:10
2011(r29449)
+++ nixpkgs/trunk/pkgs/tools/system/lxc/default.nix Fri Sep 23 11:16:10
2011(r29450)
@@ -1,31 +1,33 @@
-{stdenv, fetchurl, libcap}:
+{ stdenv, fetchurl, libcap, perl }:
-stdenv.mkDerivation rec{
+let
name = lxc-0.7.5;
+in
+stdenv.mkDerivation{
+ inherit name;
src = fetchurl {
url = http://lxc.sf.net/download/lxc/${name}.tar.gz;;
sha256 =
019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c;
};
- patchPhase = ''
-sed -i -e '/ldconfig/d' src/lxc/Makefile.in
- '';
+ buildInputs = [ libcap perl ];
+
+ patchPhase = sed -i -e 's|/sbin/ldconfig|:|' src/lxc/Makefile.in;
- configureFlags = [ --localstatedir=/var ];
+ configureFlags = --localstatedir=/var;
- postInstall = ''
+ postInstall = ''
cd $out/lib
lib=liblxc.so.?.*
ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/')
'';
- buildInputs = [ libcap ];
-
meta = {
homepage = http://lxc.sourceforge.net;
description = lxc Linux Containers userland tools;
-license = LGPLv2.1+;
+license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.simons ];
};
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29451 - nixos/trunk/modules/programs/bash
Author: simons
Date: Fri Sep 23 14:21:36 2011
New Revision: 29451
URL: https://ssl.nixos.org/websvn/nix/?rev=29451sc=1
Log:
modules/programs/bash: major clean-up and re-factoring of /etc/profile and
/etc/bashrc
* Moved bash-specific code from /etc/profile to /etc/bashrc.
* Moved general Bourne shell code from /etc/bashrc to /etc/profile.
* Added include guards to both files to ensure that they aren't sourced
multiple times (which would result in lots of redundancy in $PATH, etc.).
* Both files include each other to make sure that the correct system
environment is always defined.
* When the current user has installed the 'bash-completion' package in her
$HOME/.nix-profile, programmable completion is automatically enabled in
interactive shells.
* The /etc/skel/.bashrc we installed has been dropped because it is redundant.
Deleted:
nixos/trunk/modules/programs/bash/bashrc-user.sh
Modified:
nixos/trunk/modules/programs/bash/bash.nix
nixos/trunk/modules/programs/bash/bashrc.sh
nixos/trunk/modules/programs/bash/profile.sh
Modified: nixos/trunk/modules/programs/bash/bash.nix
==
--- nixos/trunk/modules/programs/bash/bash.nix Fri Sep 23 11:16:10 2011
(r29450)
+++ nixos/trunk/modules/programs/bash/bash.nix Fri Sep 23 14:21:36 2011
(r29451)
@@ -26,31 +26,21 @@
require = [options];
environment.etc =
-[ { # /etc/bashrc: script executed when the shell starts as a
-# non-login shell. /etc/profile also sources this file, so
-# most global configuration (such as environment variables)
-# should go into this script.
+[ { # Script executed when the shell starts as a login shell.
source = pkgs.substituteAll {
- src = ./bashrc.sh;
-
- bash = pkgs.bash;
+ src = ./profile.sh;
wrapperDir = config.security.wrapperDir;
modulesTree = config.system.modulesTree;
shellInit = config.environment.shellInit;
};
-target = bashrc;
- }
-
- { # Script executed when the shell starts as a login shell.
-source = ./profile.sh;
target = profile;
}
- { # Template for ~/.bashrc: script executed when the shell
-# starts as a non-login shell.
-source = ./bashrc-user.sh;
-target = skel/.bashrc;
-mode = 0644;
+ { # /etc/bashrc: executed every time a bash starts. Sources
+# /etc/profile to ensure that the system environment is
+# configured properly.
+ source = ./bashrc.sh;
+ target = bashrc;
}
{ # Configuration for readline in bash.
Modified: nixos/trunk/modules/programs/bash/bashrc.sh
==
--- nixos/trunk/modules/programs/bash/bashrc.sh Fri Sep 23 11:16:10 2011
(r29450)
+++ nixos/trunk/modules/programs/bash/bashrc.sh Fri Sep 23 14:21:36 2011
(r29451)
@@ -1,92 +1,40 @@
-if [ -n $NOSYSBASHRC ]; then
+# /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
+
+if [ \( -n ${SYSTEM_ETC_BASHRC_HAS_BEEN_SOURCED:-} \) -o \( -n
${NOSYSBASHRC:-} \) ]; then
return
+else
+SYSTEM_ETC_BASHRC_HAS_BEEN_SOURCED=1
fi
-# In interactive shells, check the window size after every command.
+. /etc/profile
+
+# If we are an interactive shell ...
if [ -n $PS1 ]; then
+# Check the window size after every command.
shopt -s checkwinsize
-fi
-
-# Initialise a bunch of environment variables.
-export
LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!!
only set if needed
-export MODULE_DIR=@modulesTree@/lib/modules
-export NIXPKGS_CONFIG=/nix/etc/config.nix
-export NIXPKGS_ALL=/etc/nixos/nixpkgs
-export
NIX_PATH=nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
-export PAGER=less -R
-export EDITOR=nano
-export LOCATE_PATH=/var/cache/locatedb
-
-
-# Include the various profiles in the appropriate environment variables.
-NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
-
-NIX_PROFILES=/var/run/current-system/sw /nix/var/nix/profiles/default
$HOME/.nix-profile
-
-unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB ALSA_PLUGIN_DIRS GST_PLUGIN_PATH
KDEDIRS
-unset QT_PLUGIN_PATH QTWEBKIT_PLUGIN_PATH STRIGI_PLUGIN_PATH XDG_CONFIG_DIRS
XDG_DATA_DIRS
-
-for i in $NIX_PROFILES; do # !!! reverse
-# We have to care not leaving an empty PATH element, because that means
'.' to Linux
-export PATH=$i/bin:$i/sbin:$i/lib/kde4/libexec${PATH:+:}$PATH
-export INFOPATH=$i/info:$i/share/info${INFOPATH:+:}$INFOPATH
-export
PKG_CONFIG_PATH=$i/lib/pkgconfig${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH
-
-# lib/site_perl is for backwards compatibility with packages
-# from Nixpkgs = 0.12.
-export
PERL5LIB=$i/lib/perl5/site_perl:$i/lib/site_perl${PERL5LIB:+:}$PERL5LIB
-
-#
[Nix-commits] SVN commit: nix - r29457 - in nixpkgs/trunk/pkgs: development/libraries/haskell/NumInstances top-level
Author: simons
Date: Fri Sep 23 16:08:52 2011
New Revision: 29457
URL: https://ssl.nixos.org/websvn/nix/?rev=29457sc=1
Log:
haskell-NumInstances: added version 1.0
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/NumInstances/
nixpkgs/trunk/pkgs/development/libraries/haskell/NumInstances/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/NumInstances/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/NumInstances/default.nix
Fri Sep 23 16:08:52 2011(r29457)
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = NumInstances;
+ version = 1.0;
+ sha256 = 1fmg3slwma5f88a2qxj54ny40s67qbdyvsyh506bkp11v54958fy;
+ meta = {
+description = Instances of numeric classes for functions and tuples;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Sep 23 15:37:15
2011(r29456)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Sep 23 16:08:52
2011(r29457)
@@ -884,6 +884,8 @@
numericPrelude = callPackage
../development/libraries/haskell/numeric-prelude {};
+ NumInstances = callPackage ../development/libraries/haskell/NumInstances {};
+
numtype = callPackage ../development/libraries/haskell/numtype {};
OneTuple = callPackage ../development/libraries/haskell/OneTuple {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29459 - nixpkgs/trunk/pkgs/development/libraries/haskell/neither
Author: simons
Date: Fri Sep 23 16:09:01 2011
New Revision: 29459
URL: https://ssl.nixos.org/websvn/nix/?rev=29459sc=1
Log:
haskell-neither: updated to version 0.3.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/neither/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/neither/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/neither/default.nix
Fri Sep 23 16:08:57 2011(r29458)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/neither/default.nix
Fri Sep 23 16:09:01 2011(r29459)
@@ -1,10 +1,10 @@
-{ cabal, failure, monadPeel, transformers }:
+{ cabal, failure, transformers }:
cabal.mkDerivation (self: {
pname = neither;
- version = 0.2.0;
- sha256 = 0a2lyx3dvgzj4g6p69x1fma4rmwxrykji3hc4diqgc4hx02p16jh;
- buildDepends = [ failure monadPeel transformers ];
+ version = 0.3.0;
+ sha256 = 0lak4y0k4cisr27vw2bnpd0pa1kkgv8r96z7vf19wg7brzarx71l;
+ buildDepends = [ failure transformers ];
meta = {
homepage = http://github.com/snoyberg/neither;;
description = Provide versions of Either with good monad and applicative
instances;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29460 - nixpkgs/trunk/pkgs/development/libraries/haskell/vector-space
Author: simons
Date: Fri Sep 23 16:09:05 2011
New Revision: 29460
URL: https://ssl.nixos.org/websvn/nix/?rev=29460sc=1
Log:
haskell-vector-space: updated to version 0.7.8
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 23 16:09:01 2011(r29459)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/vector-space/default.nix
Fri Sep 23 16:09:05 2011(r29460)
@@ -1,13 +1,13 @@
-{ cabal, Boolean, MemoTrie }:
+{ cabal, Boolean, MemoTrie, NumInstances }:
cabal.mkDerivation (self: {
pname = vector-space;
- version = 0.7.6;
- sha256 = 166493dnlgrm9bsyp8dvdnkz1s5503casamihs4d3rij4fqvw7vf;
- buildDepends = [ Boolean MemoTrie ];
+ version = 0.7.8;
+ sha256 = 195g9zsb73w4a0fcfz0kank6gyqajww0qiqivr4fy0bik2nsr6ry;
+ buildDepends = [ Boolean MemoTrie NumInstances ];
meta = {
homepage = http://haskell.org/haskellwiki/vector-space;;
-description = Vector affine spaces, linear maps, and derivatives
(requires ghc 6.9 or better);
+description = Vector affine spaces, linear maps, and derivatives;
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] SVN commit: nix - r29462 - in nixpkgs/trunk/pkgs: development/interpreters/python top-level
Hi Florian, python wrapper that sets PYTHONHOME to the profile it is in what exactly does PYTHONHOME accomplish? If it's useful in general, then we should add that setting to the python-wrapper expression that we have already: pkgs/development/interpreters/python/wrapper.nix Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] distutils2nix/python4nix
Hi Florian, first, I forgot nix-dev in Cc, if you agree, please include it in your reply. sure, I've added a Cc. The cabal2nix utility is written in Haskell, because the Cabal library allows developers to parse and access Cabal files easily, which is about 90% of the task at hand. For setup.py files, matters would be slightly more complicated, though. I reckon, it would probably make sense to write a distutils2nix utility in Python, rather than in Haskell. [I agree] that distutils2nix (I like the name) should be written in python, though I would enjoy finally to have a haskell project. There is Berp, http://hackage.haskell.org/package/berp-0.0.1, a Python compiler written in Haskell. Maybe that tool could be used to interpret setup.py in Haskell? Generally speaking, I'm not so sure whether choosing that kind of architecture would be wise, though. I mean, if you have to interpret Python, then using Python for that sounds like the most obvious choice. :-) From recent discussion on nix-dev, I understand: - nix has no resolver by design: one expression uses exact attributes, nix does not pick the best match for you. If one needs two versions available, one needs to create two attrs (one for each). Yes, exactly. In general, it's not even possible to determine the best match because we don't have the information we would need for that kind of choice. Haskell packages, for example, usually specify version ranges for their dependencies, but the version ranges people choose is typically a guess, at best. So you cannot rely on that information. I'm not sure what the situation in Python is, though. - nix expressions is the format to specify build instructions for a package and a user of nix installs nix expressions without knowledge of the tools that might be used to generate them. Yes. The expressions cabal2nix generates look almost exactly like those we wrote manually before we had the tool. Users of Nix don't need to know about cabal2nix. [I would write] for python: 1. distutils2nix 2. python4nix The set of nix expressions would take into account version constraints specified in setup.py's requirements. I am not clear on how to achieve that. distutils2nix would take a packages requirements and convert it to propagateBuildInputs. Without version constraints that's easy. In case of version constraints (eg odict1.4) it needs to know the name of an attribute that will always fulfill this constraint. In cabal2nix, we just don't care about the version constraints. The file haskell-packages.nix -- which puts everything together -- is maintained manually. The underlying assumption is that most packages build with the latest versions of their respective dependencies. Every now and then, we need to maintain multiple version of the same package to be able to build everything, but that is a rare case, fortunately. If that happens, I typically e-mail the authors of the packages involved and complain. :-) In python, packages can be grouped in namespaces separated by dots (eg. plone.app.deco). These need to be translated to name (eg. python-plone-app-deco-1.3) and attribute name (e.g. python27Packages.plone_app_deco_1_3 not sure about the nomenclature here. Is there a naming convetion already? In the case of Haskell, we spell names like abc-def as abcDef. abc-def-1.3 would become abcDef_1_3. Apart from generating a nix expression tree taking setup.py version requirements into account, we would need to be able to specify further, exact version constraints (and create trees) to deploy one specific application. Personally, I would start writing and using distutils2nix before I'd even worry about python4nix. If you can automate the task of generating a single expression, you've already achieved a lot. Based on that experience, the design of the second step is probably going to be clearer than it is now. One issue that you might want to consider is that the pythonPackages set needs to support several different versions of Python, i.e. the python interpreter needs to be an argument to that expression. Currently, we cannot build our python packages with Python 3.x, for example, which is really a shame. Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29466 - nixpkgs/trunk/pkgs/development/tools/haskell/uuagc
Author: simons
Date: Sat Sep 24 07:27:07 2011
New Revision: 29466
URL: https://ssl.nixos.org/websvn/nix/?rev=29466sc=1
Log:
haskell-uuagc-cabal: updated to version 1.0.0.7
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/cabal.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/cabal.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/cabal.nixSat Sep
24 02:49:04 2011(r29465)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/cabal.nixSat Sep
24 07:27:07 2011(r29466)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = uuagc-cabal;
- version = 1.0.0.6;
- sha256 = 1ij84n2pjhqyz10vsa9qxk4k227wg1c96rq5sylvcwdkzciww81d;
+ version = 1.0.0.7;
+ sha256 = 1ciypx0rrisjbwx8fc9bzkkv975646951ibqpvbxipxzvv5npy9y;
buildDepends = [ mtl uulib ];
meta = {
homepage = http://www.cs.uu.nl/wiki/HUT/WebHome;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29467 - nixpkgs/trunk/pkgs/shells/bash
Author: simons
Date: Sat Sep 24 07:58:19 2011
New Revision: 29467
URL: https://ssl.nixos.org/websvn/nix/?rev=29467sc=1
Log:
pkgs/shells/bash/default.nix: revert my earlier revision 29244
Including the bash-completion package in bash itself sounded like a good idea
at the time, but it wasn't. After having actually integrated completion support
into NixOS, it has become obvious that this property isn't required at all.
Keeping bash-completion separate from bash works just fine. Anyone who wants
completion support can just install that package.
Modified:
nixpkgs/trunk/pkgs/shells/bash/default.nix
Modified: nixpkgs/trunk/pkgs/shells/bash/default.nix
==
--- nixpkgs/trunk/pkgs/shells/bash/default.nix Sat Sep 24 07:27:07 2011
(r29466)
+++ nixpkgs/trunk/pkgs/shells/bash/default.nix Sat Sep 24 07:58:19 2011
(r29467)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null,
bison, bashCompletion ? null}:
+{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null,
bison }:
assert interactive - readline != null;
@@ -52,10 +52,7 @@
# Add an `sh' - `bash' symlink.
ln -s bash $out/bin/sh
- '' + (if interactive bashCompletion != null then ''
-ensureDir $out/etc
-echo $out/etc/bash_completion '.
${bashCompletion}/etc/bash_completion'
- '' else ''
+ '' + (if interactive then else ''
# Install the completion examples.
ensureDir $out/etc
cp -v examples/complete/bash_completion $out/etc
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] nix store: hardlink vs symlink
Hi Florian, If ./bin/python is a symlink, python will resolve it to find its home and set sys.prefix accordingly. it seems to me like Python is behaving perfectly reasonable. The prefix of Python is at /nix/store/vzpvrymynp4n93bznxha6hadj0ww68vx-python-2.7.1. The other paths, /tmp/cfl/bad or /tmp/cfl/good1, are not its prefix. Why would you want Python to believe that its prefix would be at one of those paths? Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29480 - nixpkgs/trunk/pkgs/development/libraries/haskell/numeric-prelude
Author: simons
Date: Sun Sep 25 17:11:23 2011
New Revision: 29480
URL: https://ssl.nixos.org/websvn/nix/?rev=29480sc=1
Log:
haskell-numeric-prelude: updated to version 0.2.2.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/numeric-prelude/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/numeric-prelude/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/numeric-prelude/default.nix
Sun Sep 25 09:04:24 2011(r29479)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/numeric-prelude/default.nix
Sun Sep 25 17:11:23 2011(r29480)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = numeric-prelude;
- version = 0.2.2;
- sha256 = bc6adb8c2f04e0e1f62e183e052974700143dc93b1a3cbafe3562aa1f7a649fd;
+ version = 0.2.2.1;
+ sha256 = 12b2h103f43rlrfk3zck6mzbvw6v4jf8g4kxz1k14v201lrvb2da;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29490 - nixpkgs/trunk/pkgs/tools/system/lxc
Author: simons
Date: Mon Sep 26 08:12:10 2011
New Revision: 29490
URL: https://ssl.nixos.org/websvn/nix/?rev=29490sc=1
Log:
lxc: fixed build to include the SGML documentation
Added:
nixpkgs/trunk/pkgs/tools/system/lxc/dont-run-ldconfig.patch
nixpkgs/trunk/pkgs/tools/system/lxc/fix-documentation-build.patch
nixpkgs/trunk/pkgs/tools/system/lxc/fix-sgml-documentation.patch
Modified:
nixpkgs/trunk/pkgs/tools/system/lxc/default.nix
Modified: nixpkgs/trunk/pkgs/tools/system/lxc/default.nix
==
--- nixpkgs/trunk/pkgs/tools/system/lxc/default.nix Mon Sep 26 04:48:35
2011(r29489)
+++ nixpkgs/trunk/pkgs/tools/system/lxc/default.nix Mon Sep 26 08:12:10
2011(r29490)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libcap, perl }:
+{ stdenv, fetchurl, libcap, perl, docbook2x, docbook_xml_dtd_45 }:
let
name = lxc-0.7.5;
@@ -11,9 +11,15 @@
sha256 =
019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c;
};
- buildInputs = [ libcap perl ];
+ buildInputs = [ libcap perl docbook2x ];
- patchPhase = sed -i -e 's|/sbin/ldconfig|:|' src/lxc/Makefile.in;
+ patches = [
+ ./dont-run-ldconfig.patch
+ ./fix-documentation-build.patch
+ ./fix-sgml-documentation.patch
+ ];
+
+ preConfigure = export
XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml;
configureFlags = --localstatedir=/var;
@@ -24,9 +30,19 @@
'';
meta = {
-homepage = http://lxc.sourceforge.net;
-description = lxc Linux Containers userland tools;
+homepage = http://lxc.sourceforge.net;;
+description = lightweight virtual system mechanism;
license = stdenv.lib.licenses.lgpl21Plus;
+
+longDescription = ''
+ LXC is the userspace control package for Linux Containers, a
+ lightweight virtual system mechanism sometimes described as
+ chroot on steroids. LXC builds up from chroot to implement
+ complete virtual systems, adding resource management and isolation
+ mechanisms to Linux’s existing process management infrastructure.
+'';
+
+
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
Added: nixpkgs/trunk/pkgs/tools/system/lxc/dont-run-ldconfig.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/system/lxc/dont-run-ldconfig.patch Mon Sep 26
08:12:10 2011(r29490)
@@ -0,0 +1,24 @@
+diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.am lxc-0.7.5/src/lxc/Makefile.am
+--- lxc-0.7.5-orig/src/lxc/Makefile.am 2011-07-25 00:27:10.0 +0200
lxc-0.7.5/src/lxc/Makefile.am 2011-09-26 09:58:03.479916848 +0200
+@@ -115,7 +115,7 @@
+
+ install-exec-local: install-soPROGRAMS
+ mv $(DESTDIR)$(libdir)/liblxc.so
$(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
+- /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
++ : /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
+ cd $(DESTDIR)$(libdir); \
+ ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so
+
+diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.in lxc-0.7.5/src/lxc/Makefile.in
+--- lxc-0.7.5-orig/src/lxc/Makefile.in 2011-08-11 19:02:19.0 +0200
lxc-0.7.5/src/lxc/Makefile.in 2011-09-26 09:58:18.812685181 +0200
+@@ -1322,7 +1322,7 @@
+
+ install-exec-local: install-soPROGRAMS
+ mv $(DESTDIR)$(libdir)/liblxc.so
$(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
+- /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
++ : /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
+ cd $(DESTDIR)$(libdir); \
+ ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so
+
Added: nixpkgs/trunk/pkgs/tools/system/lxc/fix-documentation-build.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/system/lxc/fix-documentation-build.patch Mon Sep
26 08:12:10 2011(r29490)
@@ -0,0 +1,40 @@
+diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.am
lxc-0.7.5/doc/Makefile.am
+--- lxc-0.7.5-orig/doc/Makefile.am 2011-02-14 09:14:07.0 +0100
lxc-0.7.5/doc/Makefile.am 2011-09-26 09:53:02.192817940 +0200
+@@ -30,13 +30,13 @@
+
+
+ %.1 : %.sgml
+- docbook2man -w all $
++ docbook2man $
+
+ %.5 : %.sgml
+- docbook2man -w all $
++ docbook2man $
+
+ %.7 : %.sgml
+- docbook2man -w all $
++ docbook2man $
+
+ lxc-%.sgml : common_options.sgml see_also.sgml
+
+diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.in
lxc-0.7.5/doc/Makefile.in
+--- lxc-0.7.5-orig/doc/Makefile.in 2011-08-11 19:02:18.0 +0200
lxc-0.7.5/doc/Makefile.in 2011-09-26 09:53:13.835401448 +0200
+@@ -786,13 +786,13 @@
+
+
+ @ENABLE_DOCBOOK_TRUE@%.1 : %.sgml
[Nix-commits] SVN commit: nix - r29491 - in nixpkgs/trunk/pkgs: applications/virtualization/lxc tools/system/lxc top-level
Author: simons
Date: Mon Sep 26 08:12:14 2011
New Revision: 29491
URL: https://ssl.nixos.org/websvn/nix/?rev=29491sc=1
Log:
lxc: moved package into the applications/virtualization category
Added:
nixpkgs/trunk/pkgs/applications/virtualization/lxc/
nixpkgs/trunk/pkgs/applications/virtualization/lxc/default.nix
- copied, changed from r29490,
nixpkgs/trunk/pkgs/tools/system/lxc/default.nix
nixpkgs/trunk/pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch
- copied, changed from r29490,
nixpkgs/trunk/pkgs/tools/system/lxc/dont-run-ldconfig.patch
nixpkgs/trunk/pkgs/applications/virtualization/lxc/fix-documentation-build.patch
- copied, changed from r29490,
nixpkgs/trunk/pkgs/tools/system/lxc/fix-documentation-build.patch
nixpkgs/trunk/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch
- copied, changed from r29490,
nixpkgs/trunk/pkgs/tools/system/lxc/fix-sgml-documentation.patch
Deleted:
nixpkgs/trunk/pkgs/tools/system/lxc/
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/applications/virtualization/lxc/default.nix (from r29490,
nixpkgs/trunk/pkgs/tools/system/lxc/default.nix)
==
Copied and modified:
nixpkgs/trunk/pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch
(from r29490, nixpkgs/trunk/pkgs/tools/system/lxc/dont-run-ldconfig.patch)
==
Copied and modified:
nixpkgs/trunk/pkgs/applications/virtualization/lxc/fix-documentation-build.patch
(from r29490,
nixpkgs/trunk/pkgs/tools/system/lxc/fix-documentation-build.patch)
==
Copied and modified:
nixpkgs/trunk/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch
(from r29490, nixpkgs/trunk/pkgs/tools/system/lxc/fix-sgml-documentation.patch)
==
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 26 08:12:10
2011(r29490)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 26 08:12:14
2011(r29491)
@@ -915,7 +915,7 @@
lshw = callPackage ../tools/system/lshw { };
- lxc = callPackage ../tools/system/lxc { };
+ lxc = callPackage ../applications/virtualization/lxc { };
lzma = xz;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29492 - nixpkgs/trunk/pkgs/top-level
Author: simons
Date: Mon Sep 26 08:12:18 2011
New Revision: 29492
URL: https://ssl.nixos.org/websvn/nix/?rev=29492sc=1
Log:
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 Mon Sep 26 08:12:14
2011(r29491)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 26 08:12:18
2011(r29492)
@@ -446,7 +446,7 @@
gui = true;
};
- bittornado = callPackage ../tools/networking/p2p/bit-tornado {
+ bittornado = callPackage ../tools/networking/p2p/bit-tornado {
inherit (pythonPackages) ssl;
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] SDL_image and libpng15
Hi Yury, would it be possible to contact the SDL_image maintainers and ask them whether they could release a new version? That solution would be beneficial for everyone. Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29499 - nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes
Author: simons
Date: Mon Sep 26 16:18:04 2011
New Revision: 29499
URL: https://ssl.nixos.org/websvn/nix/?rev=29499sc=1
Log:
haskell-web-routes: updated to version 0.25.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes/default.nix
Mon Sep 26 14:47:55 2011(r29498)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes/default.nix
Mon Sep 26 16:18:04 2011(r29499)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = web-routes;
- version = 0.25.2;
- sha256 = 0gspjvk5859zwg55q8fjyz4a0d2p6lf2qwa41b8s6kcqi38nnp08;
+ version = 0.25.3;
+ sha256 = 09bqz7vn2050jr67m3rrqi0krfxa9n1fxm9rgi3c837g522nb4kk;
buildDepends = [ mtl network parsec utf8String ];
meta = {
description = Library for maintaining correctness and composability of
URLs within an application;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29500 - nixpkgs/trunk/pkgs/development/tools/misc/cpphs
Author: simons
Date: Mon Sep 26 16:18:09 2011
New Revision: 29500
URL: https://ssl.nixos.org/websvn/nix/?rev=29500sc=1
Log:
haskell-cpphs: updated to version 1.13
Modified:
nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix Mon Sep 26
16:18:04 2011(r29499)
+++ nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix Mon Sep 26
16:18:09 2011(r29500)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = cpphs;
- version = 1.12;
- sha256 = 18c8yx8y54b2q086sqlp4vhslkb7mm1gry1f13mki43x93kd1vdj;
+ version = 1.13;
+ sha256 = 0igk4210vsskcx3zn97rx0q4prxd2ri3yl787dn4ladn0zm676iq;
isLibrary = true;
isExecutable = true;
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29501 - nixpkgs/trunk/pkgs/development/tools/misc/cpphs
Author: simons
Date: Mon Sep 26 16:33:15 2011
New Revision: 29501
URL: https://ssl.nixos.org/websvn/nix/?rev=29501sc=1
Log:
haskell-cpphs: revert update to version 1.13
The new version doesn't compile. I've reported the problem upstream.
Modified:
nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix Mon Sep 26
16:18:09 2011(r29500)
+++ nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix Mon Sep 26
16:33:15 2011(r29501)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = cpphs;
- version = 1.13;
- sha256 = 0igk4210vsskcx3zn97rx0q4prxd2ri3yl787dn4ladn0zm676iq;
+ version = 1.12;
+ sha256 = 18c8yx8y54b2q086sqlp4vhslkb7mm1gry1f13mki43x93kd1vdj;
isLibrary = true;
isExecutable = true;
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29503 - nixpkgs/trunk/pkgs/development/tools/misc/cpphs
Author: simons
Date: Mon Sep 26 19:30:36 2011
New Revision: 29503
URL: https://ssl.nixos.org/websvn/nix/?rev=29503sc=1
Log:
haskell-cpphs: updated to version 1.13.1
Modified:
nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix Mon Sep 26
17:05:27 2011(r29502)
+++ nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix Mon Sep 26
19:30:36 2011(r29503)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = cpphs;
- version = 1.12;
- sha256 = 18c8yx8y54b2q086sqlp4vhslkb7mm1gry1f13mki43x93kd1vdj;
+ version = 1.13.1;
+ sha256 = 0k5p9gqnalll3w1962dwydnygk25h777bic2gvdh8i8hhyz5fsx2;
isLibrary = true;
isExecutable = true;
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29508 - nixpkgs/trunk/pkgs/top-level
Author: simons
Date: Tue Sep 27 14:00:31 2011
New Revision: 29508
URL: https://ssl.nixos.org/websvn/nix/?rev=29508sc=1
Log:
python-matplotlib: move dependencies like numpy into the propagatedBuildInputs
section to ensure that these libraries are being found at run-time by the
python wrapper.
Modified:
nixpkgs/trunk/pkgs/top-level/python-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/python-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/python-packages.nixTue Sep 27 11:06:41
2011(r29507)
+++ nixpkgs/trunk/pkgs/top-level/python-packages.nixTue Sep 27 14:00:31
2011(r29508)
@@ -765,7 +765,7 @@
doCheck = false;
-buildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig
pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ];
+propagatedBuildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng
pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ];
meta = {
description = python plotting library, making publication quality
plots;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29509 - nixpkgs/trunk/pkgs/top-level
Author: simons
Date: Tue Sep 27 14:00:40 2011
New Revision: 29509
URL: https://ssl.nixos.org/websvn/nix/?rev=29509sc=1
Log:
python-matplotlib: enable Linux builds by Hydra
Modified:
nixpkgs/trunk/pkgs/top-level/python-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/python-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/python-packages.nixTue Sep 27 14:00:31
2011(r29508)
+++ nixpkgs/trunk/pkgs/top-level/python-packages.nixTue Sep 27 14:00:40
2011(r29509)
@@ -770,6 +770,8 @@
meta = {
description = python plotting library, making publication quality
plots;
homepage = http://matplotlib.sourceforge.net/;;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
};
});
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29510 - nixpkgs/trunk/pkgs/top-level
Author: simons
Date: Tue Sep 27 14:00:48 2011
New Revision: 29510
URL: https://ssl.nixos.org/websvn/nix/?rev=29510sc=1
Log:
python-packages.nix: strip trailing whitespace
Modified:
nixpkgs/trunk/pkgs/top-level/python-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/python-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/python-packages.nixTue Sep 27 14:00:40
2011(r29509)
+++ nixpkgs/trunk/pkgs/top-level/python-packages.nixTue Sep 27 14:00:48
2011(r29510)
@@ -1818,7 +1818,7 @@
md5 = 42c722d48e52d4888193965dd473adb5;
};
-propagatedBuildInputs = [docutils jinja2 pygments];
+propagatedBuildInputs = [docutils jinja2 pygments];
meta = {
description = Sphinx is a tool that makes it easy to create intelligent
and beautiful documentation for Python projects.;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29523 - in nixpkgs/trunk/pkgs: shells/bash top-level
Author: simons
Date: Wed Sep 28 14:37:03 2011
New Revision: 29523
URL: https://ssl.nixos.org/websvn/nix/?rev=29523sc=1
Log:
pkgs/shells/bash: updated interactive bash to version 4.2
The non-interactive variant, which is part of stdenv, remains unchanged.
Added:
nixpkgs/trunk/pkgs/shells/bash/4.1.nix
- copied, changed from r29522, nixpkgs/trunk/pkgs/shells/bash/default.nix
nixpkgs/trunk/pkgs/shells/bash/4.2.nix
- copied, changed from r29522, nixpkgs/trunk/pkgs/shells/bash/default.nix
nixpkgs/trunk/pkgs/shells/bash/bash-4.1-patches.nix
- copied, changed from r29522,
nixpkgs/trunk/pkgs/shells/bash/bash-patches.nix
nixpkgs/trunk/pkgs/shells/bash/bash-4.2-patches.nix
Deleted:
nixpkgs/trunk/pkgs/shells/bash/bash-patches.nix
nixpkgs/trunk/pkgs/shells/bash/default.nix
Modified:
nixpkgs/trunk/pkgs/shells/bash/update-patch-set.sh
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/shells/bash/4.1.nix (from r29522,
nixpkgs/trunk/pkgs/shells/bash/default.nix)
==
--- nixpkgs/trunk/pkgs/shells/bash/default.nix Wed Sep 28 14:23:47 2011
(r29522, copy source)
+++ nixpkgs/trunk/pkgs/shells/bash/4.1.nix Wed Sep 28 14:37:03 2011
(r29523)
@@ -34,7 +34,7 @@
inherit sha256;
};
in
- import ./bash-patches.nix patch;
+ import ./bash-4.1-patches.nix patch;
crossAttrs = {
configureFlags = baseConfigureFlags +
Copied and modified: nixpkgs/trunk/pkgs/shells/bash/4.2.nix (from r29522,
nixpkgs/trunk/pkgs/shells/bash/default.nix)
==
--- nixpkgs/trunk/pkgs/shells/bash/default.nix Wed Sep 28 14:23:47 2011
(r29522, copy source)
+++ nixpkgs/trunk/pkgs/shells/bash/4.2.nix Wed Sep 28 14:37:03 2011
(r29523)
@@ -3,7 +3,7 @@
assert interactive - readline != null;
let
- realName = bash-4.1;
+ realName = bash-4.2;
baseConfigureFlags = if interactive then --with-installed-readline else
--disable-readline;
in
@@ -12,7 +12,7 @@
src = fetchurl {
url = mirror://gnu/bash/${realName}.tar.gz;
-sha256 = 1np1ggp1lv8idwfx3mcxl9rhadqdf4h3x4isa3dk8v9wm0j72qiz;
+sha256 =
a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8;
};
NIX_CFLAGS_COMPILE = ''
@@ -30,11 +30,11 @@
let
patch = nr: sha256:
fetchurl {
- url = mirror://gnu/bash/bash-4.1-patches/bash41-${nr};
+ url = mirror://gnu/bash/bash-4.2-patches/bash42-${nr};
inherit sha256;
};
in
- import ./bash-patches.nix patch;
+ import ./bash-4.2-patches.nix patch;
crossAttrs = {
configureFlags = baseConfigureFlags +
@@ -51,15 +51,7 @@
postInstall = ''
# Add an `sh' - `bash' symlink.
ln -s bash $out/bin/sh
-
- '' + (if interactive then else ''
-# Install the completion examples.
-ensureDir $out/etc
-cp -v examples/complete/bash_completion $out/etc
-
-ensureDir $out/etc/bash_completion.d
-cp -v examples/complete/complete.gnu-longopt $out/etc/bash_completion.d
- '');
+ '';
meta = {
homepage = http://www.gnu.org/software/bash/;
Copied and modified: nixpkgs/trunk/pkgs/shells/bash/bash-4.1-patches.nix (from
r29522, nixpkgs/trunk/pkgs/shells/bash/bash-patches.nix)
==
Added: nixpkgs/trunk/pkgs/shells/bash/bash-4.2-patches.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/shells/bash/bash-4.2-patches.nix Wed Sep 28 14:37:03
2011(r29523)
@@ -0,0 +1,14 @@
+# Automatically generated by `update-patch-set.sh'; do not edit.
+
+patch: [
+(patch 001 0yml2b6yarrr0dzv7h45lz4126i228hvqbqacqzg4jkcawla0v4d)
+(patch 002 1yffzfxryvqns513yv3r46slkysa3nbqv40442xfxb4rw4kwkfpy)
+(patch 003 1kdl9hcpf1m7gz0ja3mvin3syprl2kmbxc3wm27391wc04apq2js)
+(patch 004 1ha0453cjqdgkns2xkdgpd2izj5b6xlsc9a2w5b3sn6j63wb0d2f)
+(patch 005 182r2iyk27l28b8kyppfavvzxhax6vn5n1zyy3yirf0463klj5x8)
+(patch 006 1labcciavnfmn0alncz1x92ydrsriikcimw24rwzmnidbaa4h4f9)
+(patch 007 15byzdqvavc3zg2lbzzdwpdy43kzdnvmr89nya211pa3yjn2cn20)
+(patch 008 0dr4p83m2xpxhvd61yny0gdlasq6r9mpyiz220998y0alq8hs213)
+(patch 009 086b9jkyjgf2zhwln72d7s5x759iskgg3r4hdrw6b5y1ni059vg7)
+(patch 010 1p23m9kssdmpnjfp96bjmmshzf25cdzlyjygdw8j6sayqa159z5c)
+]
Modified: nixpkgs/trunk/pkgs/shells/bash/update-patch-set.sh
==
--- nixpkgs/trunk/pkgs/shells/bash/update-patch-set.sh Wed Sep 28 14:23:47
2011(r29522)
+++ nixpkgs/trunk/pkgs/shells/bash/update-patch-set.sh Wed Sep 28 14:37:03
2011(r29523)
@@ -16,7 +16,7 @@
VERSION_CONDENSED=$(echo $VERSION | sed -es/\\.//g)
GPG=$(if $(type -P gpg2
[Nix-dev] bash updates
Hi guys, I would like merge the update to Bash version 4.2 into trunk. Right now, the changes are in 'stdenv-updates', but that branch contains a whole lot of changes that I don't know anything about, so I'd rather not be responsible for merging the entire branch. So my suggestion would be that I merge only a subset of 'stdenv-updates', i.e. trivial changes like the updates to bash, openssl, etc. I could probably do that over the course of the next week, so that the merge is ready next weekend, maybe on Sunday evening or so. Does anyone have a better solution? Or is anyone aware of any reason why those updates should not be merged into trunk at that time? Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] bash updates
Hi Shea, Is there any reason we can't just do a full merge? who is we? I, for one, don't want to be responsible for that task. I'll happily merge those parts of the branch that I know and that I can test, but I don't want to debug code that I don't use and that I don't know anything about, i.e. all of KDE. Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29528 - nixpkgs/trunk/pkgs/development/libraries/haskell/criterion
Author: simons
Date: Wed Sep 28 16:48:06 2011
New Revision: 29528
URL: https://ssl.nixos.org/websvn/nix/?rev=29528sc=1
Log:
haskell-criterion: updated to version 0.5.1.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/criterion/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/criterion/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/criterion/default.nix
Wed Sep 28 15:23:28 2011(r29527)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/criterion/default.nix
Wed Sep 28 16:48:06 2011(r29528)
@@ -1,13 +1,13 @@
-{ cabal, deepseq, mtl, mwcRandom, parsec, statistics, time, vector
-, vectorAlgorithms
+{ cabal, aeson, deepseq, mtl, mwcRandom, parsec, statistics, time
+, vector, vectorAlgorithms
}:
cabal.mkDerivation (self: {
pname = criterion;
- version = 0.5.0.10;
- sha256 = 0sd289s7wnyg0p37j327hv55aw4a18bdv56z26v4qi3j8p2fbpbj;
+ version = 0.5.1.0;
+ sha256 = 0v43dm1d84zvn32q89dq0nh4dvqr4r6fjdzwcjac0mjics3iy29d;
buildDepends = [
-deepseq mtl mwcRandom parsec statistics time vector
+aeson deepseq mtl mwcRandom parsec statistics time vector
vectorAlgorithms
];
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29529 - nixpkgs/trunk/pkgs/development/libraries/haskell/happstack
Author: simons
Date: Wed Sep 28 16:48:13 2011
New Revision: 29529
URL: https://ssl.nixos.org/websvn/nix/?rev=29529sc=1
Log:
haskell-happstack-util: updated to version 6.0.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-util.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-util.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-util.nix
Wed Sep 28 16:48:06 2011(r29528)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-util.nix
Wed Sep 28 16:48:13 2011(r29529)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = happstack-util;
- version = 6.0.0;
- sha256 = 06qla74kb58q0rvlfa9k16s4crnylq99hm80xx4phlddyzn0cy4z;
+ version = 6.0.2;
+ sha256 = 03qlnclpg72iflry1xlkd0sxqm6nybvx113la9r0cmsnz17y546a;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29530 - nixpkgs/trunk/pkgs/development/tools/haskell/hlint
Author: simons
Date: Wed Sep 28 16:48:17 2011
New Revision: 29530
URL: https://ssl.nixos.org/websvn/nix/?rev=29530sc=1
Log:
haskell-hlint: updated to version 1.8.16
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix Wed Sep
28 16:48:13 2011(r29529)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix Wed Sep
28 16:48:17 2011(r29530)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = hlint;
- version = 1.8.15;
- sha256 = 1hi2qapi8lb7cawjzvpknp8qvsnfw3glxyyd5m2lbp3rvkx0d6kr;
+ version = 1.8.16;
+ sha256 = 0crahq7fvhf0qvjcpjnmv5yh29l52cv7rgfwrc6ka4q0dm9r49vb;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] bash updates
Hi Shea, [stdenv-updates merging procedure] yes, the procedure you described is pretty much how it's going go to. All interested parties are hereby encouraged to examine the state of the stdenv-updates branch, and fix all problems that they run into. If in doubt, please speak up! Over the course of the next week or two, we'll have the chance to get everything into great shape, and then we (meaning: *I*, unless someone else wants that job) am going to merge stdenv-updates into trunk, possibly omitting any patches that cause problems or look outright weird. As I've said, my personal interest in this matter is in bash, openssl, and some other base packages. If other people have other interests, then please contribute to the effort to make sure they are represented. Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29531 - in nixpkgs/branches/stdenv-updates: . pkgs/applications/graphics/xscreensaver pkgs/applications/misc/xneur pkgs/applications/networking/browsers/icecat-4 pkgs/
Author: simons Date: Wed Sep 28 19:26:00 2011 New Revision: 29531 URL: https://ssl.nixos.org/websvn/nix/?rev=29531sc=1 Log: synchronize with trunk Deleted: nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/opera/builder.sh Modified: nixpkgs/branches/stdenv-updates/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xscreensaver/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/misc/xneur/0.8.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/icecat-4/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/opera/default.nix nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/debian-build.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/nix-build.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/rpm-build.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/source-tarball.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.1.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.2.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.2.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.3.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/aterm/2.8.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/fltk/fltk11.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.9/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/goocanvas/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/criterion/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/happstack/happstack-util.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/icu/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/readline/readline6.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/tools/haskell/hlint/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/autoconf/2.13.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gnum4/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/1.x.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/2.x.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/atheros/r3867.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.25.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.27.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.28.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.29.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.33.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/qemu-kvm/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux-ng/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/servers/mail/dovecot/1.1.1.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh (props changed) nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/tools/networking/wget/default.nix (props changed)
[Nix-commits] SVN commit: nix - r29571 - nixpkgs/trunk/pkgs/development/tools/documentation/haddock
Author: simons
Date: Sun Oct 2 20:13:54 2011
New Revision: 29571
URL: https://ssl.nixos.org/websvn/nix/?rev=29571sc=1
Log:
haddock-2.4.2: added 'happy' build input
Modified:
nixpkgs/trunk/pkgs/development/tools/documentation/haddock/2.4.2.nix
Modified: nixpkgs/trunk/pkgs/development/tools/documentation/haddock/2.4.2.nix
==
--- nixpkgs/trunk/pkgs/development/tools/documentation/haddock/2.4.2.nix
Sun Oct 2 20:12:07 2011(r29570)
+++ nixpkgs/trunk/pkgs/development/tools/documentation/haddock/2.4.2.nix
Sun Oct 2 20:13:54 2011(r29571)
@@ -1,4 +1,4 @@
-{ cabal, alex, ghcPaths }:
+{ cabal, alex, ghcPaths, happy }:
cabal.mkDerivation (self: {
pname = haddock;
@@ -7,7 +7,7 @@
isLibrary = true;
isExecutable = true;
buildDepends = [ ghcPaths ];
- buildTools = [ alex ];
+ buildTools = [ alex happy ];
meta = {
homepage = http://www.haskell.org/haddock/;;
description = A documentation-generation tool for Haskell libraries;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29570 - nixpkgs/trunk/pkgs/development/tools/documentation/haddock
Author: simons
Date: Sun Oct 2 20:12:07 2011
New Revision: 29570
URL: https://ssl.nixos.org/websvn/nix/?rev=29570sc=1
Log:
haddock-2.4.2: added 'alex' build input
Modified:
nixpkgs/trunk/pkgs/development/tools/documentation/haddock/2.4.2.nix
Modified: nixpkgs/trunk/pkgs/development/tools/documentation/haddock/2.4.2.nix
==
--- nixpkgs/trunk/pkgs/development/tools/documentation/haddock/2.4.2.nix
Sun Oct 2 19:53:20 2011(r29569)
+++ nixpkgs/trunk/pkgs/development/tools/documentation/haddock/2.4.2.nix
Sun Oct 2 20:12:07 2011(r29570)
@@ -1,4 +1,4 @@
-{ cabal, ghcPaths }:
+{ cabal, alex, ghcPaths }:
cabal.mkDerivation (self: {
pname = haddock;
@@ -7,6 +7,7 @@
isLibrary = true;
isExecutable = true;
buildDepends = [ ghcPaths ];
+ buildTools = [ alex ];
meta = {
homepage = http://www.haskell.org/haddock/;;
description = A documentation-generation tool for Haskell libraries;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29573 - nixpkgs/trunk/pkgs/development/libraries/haskell/X11-xft
Author: simons
Date: Sun Oct 2 20:27:25 2011
New Revision: 29573
URL: https://ssl.nixos.org/websvn/nix/?rev=29573sc=1
Log:
haskell-X11-xft: updated to version 0.3.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/X11-xft/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/X11-xft/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/X11-xft/default.nix
Sun Oct 2 20:27:20 2011(r29572)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/X11-xft/default.nix
Sun Oct 2 20:27:25 2011(r29573)
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = X11-xft;
- version = 0.3;
- sha256 = 48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d;
+ version = 0.3.1;
+ sha256 = 1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf;
buildDepends = [ utf8String X11 ];
extraLibraries = [ fontconfig freetype pkgconfig ];
pkgconfigDepends = [ libXft ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29574 - nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html
Author: simons
Date: Sun Oct 2 20:27:29 2011
New Revision: 29574
URL: https://ssl.nixos.org/websvn/nix/?rev=29574sc=1
Log:
haskell-blaze-html: updated to version 0.4.2.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html/default.nix
Sun Oct 2 20:27:25 2011(r29573)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html/default.nix
Sun Oct 2 20:27:29 2011(r29574)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = blaze-html;
- version = 0.4.1.7;
- sha256 = 0hfnfwbw8gshcv15i8jb6636rh3dl4zwwp6l21yjbrblh3825k0y;
+ version = 0.4.2.0;
+ sha256 = 098y9mzq6jr73lavv7ky58bl3aajvdg72y12varpf3v3rr4l0lb2;
buildDepends = [ blazeBuilder text ];
meta = {
homepage = http://jaspervdj.be/blaze;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29576 - nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-lib
Author: simons
Date: Sun Oct 2 20:27:37 2011
New Revision: 29576
URL: https://ssl.nixos.org/websvn/nix/?rev=29576sc=1
Log:
haskell-hledger-lib: updated to version 0.16
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
Sun Oct 2 20:27:33 2011(r29575)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-lib/default.nix
Sun Oct 2 20:27:37 2011(r29576)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = hledger-lib;
- version = 0.15.2;
- sha256 = 1if20197nyg1as6v1c4a0js694zg213nf7rhfhv2a46af58n0bgq;
+ version = 0.16;
+ sha256 = 095hghg7b6x355yfd3xcp8cngl94k8qbl5x7qm12ncin9dsmz8h8;
buildDepends = [
cmdargs HUnit mtl parsec regexpr safe split time utf8String
];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29578 - nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-web
Author: simons
Date: Sun Oct 2 20:27:46 2011
New Revision: 29578
URL: https://ssl.nixos.org/websvn/nix/?rev=29578sc=1
Log:
haskell-hledger-web: updated to version 0.16
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-web/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-web/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-web/default.nix
Sun Oct 2 20:27:42 2011(r29577)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-web/default.nix
Sun Oct 2 20:27:46 2011(r29578)
@@ -1,19 +1,23 @@
-{ cabal, aeson, cmdargs, failure, fileEmbed, hamlet, hledger
-, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe, text, time
-, transformers, wai, waiExtra, warp, yesodCore, yesodForm
-, yesodJson, yesodStatic
+{ cabal, aesonNative, blazeHtml, clientsession, cmdargs, dataObject
+, dataObjectYaml, failure, fileEmbed, hamlet, hledger, hledgerLib
+, HUnit, ioStorage, parsec, regexpr, safe, shakespeareCss
+, shakespeareJs, shakespeareText, text, time, transformers, wai
+, waiExtra, warp, yesod, yesodCore, yesodForm, yesodJson
+, yesodStatic
}:
cabal.mkDerivation (self: {
pname = hledger-web;
- version = 0.15.3;
- sha256 = 1z2pimxz2ykfb89qwp6cil4nljn8pcz8n7pjhvk948zsd96n2i6f;
+ version = 0.16;
+ sha256 = 1564w1619s08q5c1zx8i8z488zis13a8d6n4cnyha9ci95p1c89j;
isLibrary = true;
isExecutable = true;
buildDepends = [
-aeson cmdargs failure fileEmbed hamlet hledger hledgerLib HUnit
-ioStorage parsec regexpr safe text time transformers wai waiExtra
-warp yesodCore yesodForm yesodJson yesodStatic
+aesonNative blazeHtml clientsession cmdargs dataObject
+dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit
+ioStorage parsec regexpr safe shakespeareCss shakespeareJs
+shakespeareText text time transformers wai waiExtra warp yesod
+yesodCore yesodForm yesodJson yesodStatic
];
meta = {
homepage = http://hledger.org;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29579 - nixpkgs/trunk/pkgs/development/libraries/haskell/hledger
Author: simons
Date: Sun Oct 2 20:27:50 2011
New Revision: 29579
URL: https://ssl.nixos.org/websvn/nix/?rev=29579sc=1
Log:
haskell-hledger: updated to version 0.16
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
Sun Oct 2 20:27:46 2011(r29578)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hledger/default.nix
Sun Oct 2 20:27:50 2011(r29579)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = hledger;
- version = 0.15.2;
- sha256 = 0gja0jvr8v9s1608w45rg1dwhj48yls59shqcs4z936xdg69l42w;
+ version = 0.16;
+ sha256 = 0wz4g67ilxj741j8d7amssa6dr0xrdfghwmhzwlcp1fj4a5a44c8;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29580 - nixpkgs/trunk/pkgs/development/tools/haskell/hlint
Author: simons
Date: Sun Oct 2 20:27:55 2011
New Revision: 29580
URL: https://ssl.nixos.org/websvn/nix/?rev=29580sc=1
Log:
haskell-hlint: updated to version 1.8.17
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix Sun Oct
2 20:27:50 2011(r29579)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix Sun Oct
2 20:27:55 2011(r29580)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = hlint;
- version = 1.8.16;
- sha256 = 0crahq7fvhf0qvjcpjnmv5yh29l52cv7rgfwrc6ka4q0dm9r49vb;
+ version = 1.8.17;
+ sha256 = 0p2sd24zi4a9fynib03dll8jbcc7izbmknfxv80v9j3lb2p8qj5h;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29581 - in nixpkgs/trunk/pkgs: development/libraries/haskell/network top-level
Author: simons
Date: Sun Oct 2 20:28:00 2011
New Revision: 29581
URL: https://ssl.nixos.org/websvn/nix/?rev=29581sc=1
Log:
haskell-network: added version 2.3.0.6
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/network/2.3.0.6.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/network/2.3.0.6.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/network/2.3.0.6.nix
Sun Oct 2 20:28:00 2011(r29581)
@@ -0,0 +1,18 @@
+{ cabal, parsec }:
+
+cabal.mkDerivation (self: {
+ pname = network;
+ version = 2.3.0.6;
+ sha256 = 0xdqcf7zfxpa7qmvwzxf11y61b6xn4v2jjrqpibr2pfqqr0p3gkw;
+ buildDepends = [ parsec ];
+ meta = {
+homepage = http://github.com/haskell/network;;
+description = Low-level networking interface;
+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 Sun Oct 2 20:27:55
2011(r29580)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Oct 2 20:28:00
2011(r29581)
@@ -878,7 +878,8 @@
network_2_2_1_7 = callPackage
../development/libraries/haskell/network/2.2.1.7.nix {};
network_2_3_0_2 = callPackage
../development/libraries/haskell/network/2.3.0.2.nix {};
network_2_3_0_5 = callPackage
../development/libraries/haskell/network/2.3.0.5.nix {};
- network = self.network_2_2_1_4;
+ network_2_3_0_6 = callPackage
../development/libraries/haskell/network/2.3.0.6.nix {};
+ network = self.network_2_3_0_6;
nixosTypes = callPackage ../development/libraries/haskell/nixos-types {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29582 - in nixpkgs/trunk/pkgs: development/libraries/haskell/yaml top-level
Author: simons
Date: Sun Oct 2 20:28:04 2011
New Revision: 29582
URL: https://ssl.nixos.org/websvn/nix/?rev=29582sc=1
Log:
haskell-yaml: added version 0.4.1.1
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/yaml/
nixpkgs/trunk/pkgs/development/libraries/haskell/yaml/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/yaml/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yaml/default.nix Sun Oct
2 20:28:04 2011(r29582)
@@ -0,0 +1,20 @@
+{ cabal, enumerator, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = yaml;
+ version = 0.4.1.1;
+ sha256 = 0qm7kfvi99m80m2lsmn98ssr2sfsw1rbbmzyjlg7bmvbaxsyw0b9;
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ enumerator transformers ];
+ meta = {
+homepage = http://github.com/snoyberg/yaml/;;
+description = Low-level binding to the libyaml C library;
+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 Sun Oct 2 20:28:00
2011(r29581)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Oct 2 20:28:04
2011(r29582)
@@ -1293,6 +1293,8 @@
xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};
+ yaml = callPackage ../development/libraries/haskell/yaml {};
+
yap = callPackage ../development/libraries/haskell/yap {};
yesod = callPackage ../development/libraries/haskell/yesod {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29584 - nixpkgs/trunk/pkgs/development/libraries/haskell/data-object-yaml
Author: simons
Date: Sun Oct 2 20:28:14 2011
New Revision: 29584
URL: https://ssl.nixos.org/websvn/nix/?rev=29584sc=1
Log:
haskell-data-object-yaml: added version 0.3.3.5
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/data-object-yaml/
nixpkgs/trunk/pkgs/development/libraries/haskell/data-object-yaml/default.nix
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/data-object-yaml/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/data-object-yaml/default.nix
Sun Oct 2 20:28:14 2011(r29584)
@@ -0,0 +1,25 @@
+{ cabal, convertibleText, dataObject, enumerator, failure, text
+, transformers, yaml
+}:
+
+cabal.mkDerivation (self: {
+ pname = data-object-yaml;
+ version = 0.3.3.5;
+ sha256 = 0ag0rac9j4ipfg9haa63s73sn7zckrpwybcfk2nbg84ix56nv36w;
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [
+convertibleText dataObject enumerator failure text transformers
+yaml
+ ];
+ meta = {
+homepage = http://github.com/snoyberg/data-object-yaml;;
+description = Serialize data to and from Yaml files;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29585 - in nixpkgs/trunk/pkgs: development/libraries/haskell/convertible-text top-level
Author: simons
Date: Sun Oct 2 20:28:19 2011
New Revision: 29585
URL: https://ssl.nixos.org/websvn/nix/?rev=29585sc=1
Log:
haskell-convertible-text: added version 0.3.0.10
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/convertible-text/
nixpkgs/trunk/pkgs/development/libraries/haskell/convertible-text/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/convertible-text/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/convertible-text/default.nix
Sun Oct 2 20:28:19 2011(r29585)
@@ -0,0 +1,20 @@
+{ cabal, attempt, text, time }:
+
+cabal.mkDerivation (self: {
+ pname = convertible-text;
+ version = 0.3.0.10;
+ sha256 = 1hi7rqijay37b5msyzqqgvkvrsdpj9p96ajxmyk4vm7nnk5dfhbp;
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ attempt text time ];
+ meta = {
+homepage = http://github.com/snoyberg/convertible/tree/text;;
+description = Typeclasses and instances for converting between types;
+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 Sun Oct 2 20:28:14
2011(r29584)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Oct 2 20:28:19
2011(r29585)
@@ -474,6 +474,8 @@
time = self.time_1_1_3;
};
+ convertibleText = callPackage
../development/libraries/haskell/convertible-text {};
+
continuedFractions = callPackage
../development/libraries/haskell/continued-fractions {};
converge = callPackage ../development/libraries/haskell/converge {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] comments on: -r29543 Use ruby 1.9 as the default - renaming files
Hi Marc,
- ruby18 = callPackage ../development/interpreters/ruby { };
- ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
- ruby = ruby18;
+ ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
+ ruby19 = callPackage ../development/interpreters/ruby { };
+ ruby = ruby19
Don't rename files for the sake of renaming unless there is a strong
reason. If you want to read history or if you have local changes
applied to those files this kind of renaming is causing a lot of
additional work for no extra value. So just *don't* do it.
your criticism of Shea's commit is too strong. He changed the default
version of ruby, and the way he renamed those files kept the currently
used naming convention for that expression intact. That is a very
sensible thing to do.
Personally, I would use the file default.nix only when there is
exactly one expression of that package. If there are two distinct
versions, then I'd call them 1.8.nix and 1.9.nix, and avoid having
default.nix altogether. I don't feel strongly about that policy, though.
It's a matter of taste, and some packages in Nix use a different scheme.
Take care,
Peter
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] please activate stdenv-updates builds on hydra (was: bash updates)
Hi Lluís, First, we have to tell hydra to build the branch. Yes, you are right. We need the branch built by Hydra to stabilize it. Unfortunately, I have no means of making that change. Can anyone else with sufficient administrative powers on the infrastructure please enable Hydra builds of stdenv-updates? (On Hydra, the corresponding project seems to be called just stdenv? Why is that, by the way? Not that it matters much, I'm just curious.) Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] comments on: -r29543 Use ruby 1.9 as the default - renaming files
Hi Marc, There are two important properties the name can tell about - name - version default.nix tells I'm the default version, but does no longer tell which version it is 19.nix tells I'm version 1.9, but does no longer tell that its the default version - so neither is perfect. yes, that is true. Using sensible names is good habit always. That's why I even proposed default-19.nix (which was kind of joke just to illustrate that both solutions could be accepted). Yes, indeed, that choice would convey the maximum amount of information. Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29597 - nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll
Author: simons
Date: Mon Oct 3 09:01:28 2011
New Revision: 29597
URL: https://ssl.nixos.org/websvn/nix/?rev=29597sc=1
Log:
haskell-hakyll: updated to version 3.2.0.8
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix Sun Oct
2 21:15:36 2011(r29596)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix Mon Oct
3 09:01:28 2011(r29597)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = hakyll;
- version = 3.2.0.7;
- sha256 = 1p06596yfsa0lk5ipdxm1b8j81aph2k30pm2g6ghw6k7fglklyl5;
+ version = 3.2.0.8;
+ sha256 = 1yp01g7wzr9qkx3vz7v791gglmr0pg5c6jj076rv118kw0l8n61l;
buildDepends = [
binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase
regexPcre snapCore snapServer tagsoup time
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] bash updates
Hi Ludovic, Lluís Batlle i Rossell virik...@gmail.com skribis: First, we have to tell hydra to build the branch. It’s actually being built, but it uses release-small.nix instead of release.nix. apparently, you disabled most builds in stdenv-updates with commit 26578. I agree that this was a good idea at the time, because the branch was in a sort-of wild state back then. Today, however, the situation has changed. We are working actively to stabilize the branch, and we need those builds performed. Since you clearly know most about this subject, could you please undo those changes to help us asses the current state of affairs on Hydra? Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Stablilizing stdenv-updates
Hi Ludovic, I completely agree that we should not waste a precious resource like Hydra for hundreds of unnecessary builds. stdenv-updates doesn't need to build all of release.nix just to be useful for testing, and we shouldn't enable all those builds right now. It is sufficient to build CUPS itself to allow us to work on that update. Once both CUPS and glibc are up-to-date, it should be possible to build a bigger package set. Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] pkgs/os-specific/linux/firmware/rt73 download has disappeared
Hi Lluís, The option 'networking.enableRT73Firmware' has a default value of false. Haven't you set it to true, because you needed it? no, I don't assign enableRT73Firmware a value anywhere in my configuration.nix (and I don't use the firmware). On my system, it is required by default. Maybe the reason is that the firmware is referred to in modules/installer a few times? Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29607 - in nixpkgs/trunk/pkgs: development/libraries/haskell/hamlet top-level
Author: simons
Date: Mon Oct 3 20:20:58 2011
New Revision: 29607
URL: https://ssl.nixos.org/websvn/nix/?rev=29607sc=1
Log:
haskell-hamlet: updated to version 0.10.2
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.2.nix
- copied, changed from r29602,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.1.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.1.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.2.nix (from
r29602, nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.1.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.1.nix Mon Oct
3 16:55:33 2011(r29602, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.2.nix Mon Oct
3 20:20:58 2011(r29607)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = hamlet;
- version = 0.10.1;
- sha256 = 1n68nz2s61j8yfwjpgp9bjl0mc7gcpc5ysmx0vgggqxz2r3gayf6;
+ version = 0.10.2;
+ sha256 = 1p4dz1h640ryhj7prks7qazqyx0l79hi7130ksfchlb5mprz6wq2;
buildDepends = [
blazeBuilder blazeHtml failure parsec shakespeare text
];
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Oct 3 19:27:10
2011(r29606)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Oct 3 20:20:58
2011(r29607)
@@ -651,8 +651,8 @@
};
hamlet_0_8_2_1 = callPackage
../development/libraries/haskell/hamlet/0.8.2.1.nix {};
- hamlet_0_10_1 = callPackage
../development/libraries/haskell/hamlet/0.10.1.nix {};
- hamlet = self.hamlet_0_10_1;
+ hamlet_0_10_2 = callPackage
../development/libraries/haskell/hamlet/0.10.2.nix {};
+ hamlet = self.hamlet_0_10_2;
happstackData = callPackage
../development/libraries/haskell/happstack/happstack-data.nix {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29608 - nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession
Author: simons
Date: Mon Oct 3 20:21:03 2011
New Revision: 29608
URL: https://ssl.nixos.org/websvn/nix/?rev=29608sc=1
Log:
haskell-clientsession: updated to version 0.7.3.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession/default.nix
Mon Oct 3 20:20:58 2011(r29607)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession/default.nix
Mon Oct 3 20:21:03 2011(r29608)
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = clientsession;
- version = 0.7.3;
- sha256 = 1f5ri7h8l3v60bj6ywhn2v3kih5lclk76qx7y6jc7nyf9499aja5;
+ version = 0.7.3.1;
+ sha256 = 0q16brla4m5g7dmgln3awx964ms7pi1s2r21idmc0mk4rnw2rpi7;
buildDepends = [
base64Bytestring cereal cryptoApi cryptocipher skein
];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29609 - nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template
Author: simons
Date: Mon Oct 3 20:21:07 2011
New Revision: 29609
URL: https://ssl.nixos.org/websvn/nix/?rev=29609sc=1
Log:
haskell-persistent-template: updated to version 0.6.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template/default.nix
Mon Oct 3 20:21:03 2011(r29608)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-template/default.nix
Mon Oct 3 20:21:07 2011(r29609)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = persistent-template;
- version = 0.6.2;
- sha256 = 1gnqryn701b97fwzjhkk4x4k7p1w5w8cdn5x9hz8sb68vkgrplfx;
+ version = 0.6.3;
+ sha256 = 1vcjvfjxmv9c0wg7pbx0lw73128f5y0r4sfdsyq3jrkkiq1bgsxa;
buildDepends = [ monadControl persistent text ];
meta = {
homepage = http://www.yesodweb.com/book/persistent;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29610 - nixpkgs/trunk/pkgs/development/libraries/haskell/persistent
Author: simons
Date: Mon Oct 3 20:21:11 2011
New Revision: 29610
URL: https://ssl.nixos.org/websvn/nix/?rev=29610sc=1
Log:
haskell-persistent: updated to version 0.6.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Mon Oct 3 20:21:07 2011(r29609)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Mon Oct 3 20:21:11 2011(r29610)
@@ -1,14 +1,14 @@
-{ cabal, blazeHtml, enumerator, monadControl, mtl, pathPieces, pool
-, sqlite, text, time, transformers
+{ cabal, blazeHtml, dataObject, enumerator, monadControl, mtl
+, pathPieces, pool, sqlite, text, time, transformers
}:
cabal.mkDerivation (self: {
pname = persistent;
- version = 0.6.2;
- sha256 = 1bzv3wqqy32z20xbda8kr4m1fybnziv0gp6m8v3w0brrvmns20g2;
+ version = 0.6.3;
+ sha256 = 0m50z9k941bhh05jjz1268sn1bi7w8i6jzccldgnbjjvsw2xaisx;
buildDepends = [
-blazeHtml enumerator monadControl mtl pathPieces pool text time
-transformers
+blazeHtml dataObject enumerator monadControl mtl pathPieces pool
+text time transformers
];
extraLibraries = [ sqlite ];
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29611 - nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css
Author: simons
Date: Mon Oct 3 20:21:15 2011
New Revision: 29611
URL: https://ssl.nixos.org/websvn/nix/?rev=29611sc=1
Log:
haskell-shakespeare-css: updated to version 0.10.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Mon Oct 3 20:21:11 2011(r29610)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Mon Oct 3 20:21:15 2011(r29611)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = shakespeare-css;
- version = 0.10.1;
- sha256 = 1qdql6qcm7jzb5r1fvrmpyighn1ykrjgs9za1n9m2r47y0n03hsg;
+ version = 0.10.2;
+ sha256 = 181bknfws2s7jygy527w93v07i04xf1pwyfmylva59p0z45adlb4;
buildDepends = [ parsec shakespeare text ];
meta = {
homepage = http://www.yesodweb.com/book/templates;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] SVN commit: nix - r29606 - nixpkgs/branches/stdenv-updates/pkgs/development/libraries/readline
Hi Ludo,
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/readline/readline6.nix
Mon Oct 3 19:11:09 2011(r29605)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/readline/readline6.nix
Mon Oct 3 19:27:10 2011(r29606)
@@ -17,7 +17,7 @@
(let
patch = nr: sha256:
fetchurl {
- url = mirror://gnu/readline/${name}-patches/readline61-${nr};
+ url = mirror://gnu/readline/${name}-patches/readline62-${nr};
inherit sha256;
};
in
after this change, I am getting checksum errors trying to build this
expression. Apparently, the hash of the patch file is now wrong?
http://hydra.nixos.org/build/1432632
Take care,
Peter
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29665 - nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart
Author: simons
Date: Wed Oct 5 17:08:58 2011
New Revision: 29665
URL: http://nixos.org/websvn/nix/?rev=29665sc=1
Log:
haskell-hledger-chart: updated to version 0.16.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
Wed Oct 5 15:31:11 2011(r29664)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix
Wed Oct 5 17:08:58 2011(r29665)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = hledger-chart;
- version = 0.16;
- sha256 = 05njn30xxnjxigvz6sjhm1ks595f9y7ndw3il1grh09rhvgp42f7;
+ version = 0.16.1;
+ sha256 = 1yk563032ir98gqdvxazjjl1alg6q1pflzawh11pr3zrdnriracn;
isLibrary = false;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29673 - nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator
Author: simons
Date: Wed Oct 5 17:14:14 2011
New Revision: 29673
URL: http://nixos.org/websvn/nix/?rev=29673sc=1
Log:
haskell-xml-enumerator: updated to version 0.4.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator/default.nix
Wed Oct 5 17:10:00 2011(r29672)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator/default.nix
Wed Oct 5 17:14:14 2011(r29673)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = xml-enumerator;
- version = 0.4.1;
- sha256 = 081avccvkakcbf2m22xdda63jhwykqxxclmlhj6msawkyyqniadj;
+ version = 0.4.2;
+ sha256 = 05n8cm28bqjgrgf94xwf65isrd7v0nvnzmvlqmdq95zxdw4s0ps9;
buildDepends = [
attoparsecText attoparsecTextEnumerator blazeBuilder
blazeBuilderEnumerator dataDefault enumerator failure text
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29674 - nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator
Author: simons
Date: Wed Oct 5 17:23:21 2011
New Revision: 29674
URL: http://nixos.org/websvn/nix/?rev=29674sc=1
Log:
haskell-xml-enumerator: updated to version 0.4.2.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator/default.nix
Wed Oct 5 17:14:14 2011(r29673)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator/default.nix
Wed Oct 5 17:23:21 2011(r29674)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = xml-enumerator;
- version = 0.4.2;
- sha256 = 05n8cm28bqjgrgf94xwf65isrd7v0nvnzmvlqmdq95zxdw4s0ps9;
+ version = 0.4.2.1;
+ sha256 = 0xz0a4dk94zg0sm0gy90ymmhzrsdvmqvl3qw2xycys6pzmg51im7;
buildDepends = [
attoparsecText attoparsecTextEnumerator blazeBuilder
blazeBuilderEnumerator dataDefault enumerator failure text
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29681 - nixpkgs/branches/stdenv-updates/pkgs/misc/cups
Author: simons
Date: Thu Oct 6 09:57:32 2011
New Revision: 29681
URL: http://nixos.org/websvn/nix/?rev=29681sc=1
Log:
cups: updated to version 1.5.0
Modified:
nixpkgs/branches/stdenv-updates/pkgs/misc/cups/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/misc/cups/default.nix
==
--- nixpkgs/branches/stdenv-updates/pkgs/misc/cups/default.nix Thu Oct 6
09:37:22 2011(r29680)
+++ nixpkgs/branches/stdenv-updates/pkgs/misc/cups/default.nix Thu Oct 6
09:57:32 2011(r29681)
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
, dbus, libusb, acl }:
-let version = 1.4.7; in
+let version = 1.5.0; in
stdenv.mkDerivation {
name = cups-${version};
@@ -10,7 +10,7 @@
src = fetchurl {
url =
http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2;;
-sha256 = 1xlnkdqldq81pdqgisqbyh92k249bzz35m1f5bp4la06p00ksvjf;
+sha256 = 0czc0bmrm31jy03inm6w2mbr5s9q9xk6s1x5x4kddx2qlml9pyf6;
};
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb acl ];
@@ -40,7 +40,7 @@
meta = {
homepage = http://www.cups.org/;
description = A standards-based printing system for UNIX;
-license = GPLv2; # actually LGPL for the library and GPL for the rest
+license = stdenv.lib.licenses.gpl2; # actually LGPL for the library and
GPL for the rest
maintainers = [ stdenv.lib.maintainers.urkud stdenv.lib.maintainers.simons
];
platforms = stdenv.lib.platforms.linux;
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29682 - in nixpkgs/trunk/pkgs: development/libraries/cppunit top-level
Author: simons
Date: Thu Oct 6 10:23:23 2011
New Revision: 29682
URL: http://nixos.org/websvn/nix/?rev=29682sc=1
Log:
cppunit: dropped obsolete version 1.10
Deleted:
nixpkgs/trunk/pkgs/development/libraries/cppunit/1.10.nix
nixpkgs/trunk/pkgs/development/libraries/cppunit/include-cstdlib.patch
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Oct 6 09:57:32
2011(r29681)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Oct 6 10:23:23
2011(r29682)
@@ -3168,7 +3168,6 @@
ctl = callPackage ../development/libraries/ctl { };
cppunit = callPackage ../development/libraries/cppunit { };
- cppunit_1_10 = callPackage ../development/libraries/cppunit/1.10.nix { };
cracklib = callPackage ../development/libraries/cracklib { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29683 - nixpkgs/trunk/pkgs/development/libraries/cppunit
Author: simons
Date: Thu Oct 6 10:23:27 2011
New Revision: 29683
URL: http://nixos.org/websvn/nix/?rev=29683sc=1
Log:
cppunit: improved meta section
Modified:
nixpkgs/trunk/pkgs/development/libraries/cppunit/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/cppunit/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/cppunit/default.nixThu Oct
6 10:23:23 2011(r29682)
+++ nixpkgs/trunk/pkgs/development/libraries/cppunit/default.nixThu Oct
6 10:23:27 2011(r29683)
@@ -2,9 +2,16 @@
stdenv.mkDerivation {
name = cppunit-1.12.0;
-
+
src = fetchurl {
url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz;
sha256 = 07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq;
};
+
+ meta = {
+homepage = http://sourceforge.net/apps/mediawiki/cppunit/;;
+description = C++ unit testing framework;
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.simons ];
+ };
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29685 - in nixpkgs/branches/stdenv-updates: . pkgs/applications/graphics/xscreensaver pkgs/applications/misc/xneur pkgs/applications/networking/browsers/icecat-4 pkgs/
Author: simons Date: Thu Oct 6 10:27:33 2011 New Revision: 29685 URL: http://nixos.org/websvn/nix/?rev=29685sc=1 Log: synchronize with trunk Deleted: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/cppunit/1.10.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/cppunit/include-cstdlib.patch Modified: nixpkgs/branches/stdenv-updates/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xscreensaver/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/misc/xneur/0.8.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/icecat-4/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/debian-build.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/nix-build.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/rpm-build.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/source-tarball.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.1.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.2.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.2.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.3.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/aterm/2.8.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/cppunit/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/fltk/fltk11.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.9/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/goocanvas/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/readline/readline6.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/autoconf/2.13.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gnum4/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/1.x.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/2.x.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/atheros/r3867.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.25.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.27.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.28.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.29.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.33.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/libsmbios/default.nix nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/qemu-kvm/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux-ng/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/servers/mail/dovecot/1.1.1.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh (props changed) nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/tools/networking/wget/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/cppunit/default.nix
[Nix-commits] SVN commit: nix - r29686 - nixpkgs/branches/stdenv-updates/pkgs/top-level
Author: simons Date: Thu Oct 6 10:29:56 2011 New Revision: 29686 URL: http://nixos.org/websvn/nix/?rev=29686sc=1 Log: release-small.nix: dropped obsolete 'aterm242fixes' package Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/release-small.nix Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/release-small.nix == --- nixpkgs/branches/stdenv-updates/pkgs/top-level/release-small.nixThu Oct 6 10:27:33 2011(r29685) +++ nixpkgs/branches/stdenv-updates/pkgs/top-level/release-small.nixThu Oct 6 10:29:56 2011(r29686) @@ -19,7 +19,6 @@ aspell = all; at = linux; - aterm242fixes = all; aterm25 = all; aterm28 = all; autoconf = all; ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29693 - nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs
Author: simons Date: Thu Oct 6 13:15:02 2011 New Revision: 29693 URL: https://nixos.org/websvn/nix/?rev=29693sc=1 Log: btrfsprogs: override -Werror option in CFLAGS to fix build errors with GCC 4.6.1 Modified: nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs/default.nix Modified: nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs/default.nix == --- nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs/default.nix Thu Oct 6 11:56:18 2011(r29692) +++ nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs/default.nix Thu Oct 6 13:15:02 2011(r29693) @@ -18,7 +18,7 @@ inherit buildInputs; configureFlags = []; - makeFlags = [prefix=$out]; + makeFlags = [prefix=$out CFLAGS=-Os]; patches = [ ./glibc212.patch ]; phaseNames = [doPatch doEnsureBtrfsImage doMakeInstall]; ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29695 - in nixpkgs/trunk/pkgs: os-specific/linux/mdadm tools/filesystems/btrfsprogs
Author: simons
Date: Thu Oct 6 13:15:09 2011
New Revision: 29695
URL: https://nixos.org/websvn/nix/?rev=29695sc=1
Log:
strip trailing whitespace
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/mdadm/default.nix
nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/mdadm/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/mdadm/default.nix Thu Oct 6
13:15:05 2011(r29694)
+++ nixpkgs/trunk/pkgs/os-specific/linux/mdadm/default.nix Thu Oct 6
13:15:09 2011(r29695)
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = mdadm-3.1.2;
-
+
src = fetchurl {
url = mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2;
sha256 = 0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz;
Modified: nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs/default.nix
==
--- nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs/default.nix Thu Oct 6
13:15:05 2011(r29694)
+++ nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs/default.nix Thu Oct 6
13:15:09 2011(r29695)
@@ -1,10 +1,10 @@
-a :
-let
+a :
+let
fetchurl = a.fetchurl;
- version = a.lib.attrByPath [version] 0.19 a;
+ version = a.lib.attrByPath [version] 0.19 a;
buildInputs = with a; [
-zlib libuuid acl
+zlib libuuid acl
];
in
@@ -22,9 +22,9 @@
patches = [ ./glibc212.patch ];
phaseNames = [doPatch doEnsureBtrfsImage doMakeInstall];
-
+
doEnsureBtrfsImage = a.fullDepEntry (''
-if ! grep 'progs = ' Makefile | grep btrfs-image; then
+if ! grep 'progs = ' Makefile | grep btrfs-image; then
sed -e 's/progs = .*/ btrfs-image/' -i Makefile
fi
'') [minInit doUnpack];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29696 - in nixpkgs/branches/stdenv-updates: . pkgs/applications/graphics/xscreensaver pkgs/applications/misc/xneur pkgs/applications/networking/browsers/firefox pkgs/a
Author: simons Date: Thu Oct 6 13:16:47 2011 New Revision: 29696 URL: https://nixos.org/websvn/nix/?rev=29696sc=1 Log: synchronize with trunk Modified: nixpkgs/branches/stdenv-updates/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xscreensaver/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/misc/xneur/0.8.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/7.0.nix nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/icecat-4/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/debian-build.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/nix-build.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/rpm-build.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/source-tarball.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/default.nix nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.1.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.2.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.2.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.3.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/aterm/2.8.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/fltk/fltk11.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.9/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/goocanvas/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/readline/readline6.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/autoconf/2.13.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gnum4/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/1.x.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/2.x.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/atheros/r3867.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.25.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.27.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.28.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.29.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.33.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/mdadm/default.nix nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nvidia-x11/default.nix nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/qemu-kvm/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux-ng/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/servers/mail/dovecot/1.1.1.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh (props changed) nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/tools/filesystems/btrfsprogs/default.nix nixpkgs/branches/stdenv-updates/pkgs/tools/networking/wget/default.nix (props changed)
[Nix-dev] libbonobo broken (was: SVN commit: nix - r29724 - in nixpkgs/trunk/pkgs/desktops/gnome-2/platform: ORBit2 libbonobo libgnomecanvas)
Hi Yury,
Update a few gnome packages [...]
Modified: nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
Sat Oct 8 19:12:24 2011(r29723)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
Sun Oct 9 07:11:28 2011(r29724)
@@ -1,13 +1,17 @@
-{stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt,
intltool, ORBit2}:
+{ stdenv, fetchurl_gnome, flex, bison, pkgconfig, glib, dbus_glib, libxml2,
popt
+, intltool, ORBit2, procps }:
[...]
the updated version doesn't seem to compile:
http://hydra.nixos.org/build/1444162/nixlog/1
Take care,
Peter
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29728 - in nixpkgs/trunk/pkgs: development/libraries/haskell/parsec top-level
Author: simons
Date: Sun Oct 9 15:29:59 2011
New Revision: 29728
URL: https://nixos.org/websvn/nix/?rev=29728sc=1
Log:
haskell-parsec: added version 3.1.2
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/parsec/3.1.2.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/parsec/3.1.2.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/parsec/3.1.2.nix Sun Oct
9 15:29:59 2011(r29728)
@@ -0,0 +1,18 @@
+{ cabal, mtl, text }:
+
+cabal.mkDerivation (self: {
+ pname = parsec;
+ version = 3.1.2;
+ sha256 = 0lhn9j2j5jlh7g0qx9f6ms63n9x1xlxg9isdvm6z0ksy3ywj9wch;
+ buildDepends = [ mtl text ];
+ meta = {
+homepage = http://www.cs.uu.nl/~daan/parsec.html;;
+description = Monadic parser combinators;
+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 Sun Oct 9 15:29:52
2011(r29727)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Oct 9 15:29:59
2011(r29728)
@@ -927,8 +927,9 @@
parsec_2_1_0_1 = callPackage
../development/libraries/haskell/parsec/2.1.0.1.nix {};
parsec_3_1_1 = callPackage
../development/libraries/haskell/parsec/3.1.1.nix {};
+ parsec_3_1_2 = callPackage
../development/libraries/haskell/parsec/3.1.2.nix {};
parsec2 = self.parsec_2_1_0_1;
- parsec3 = self.parsec_3_1_1;
+ parsec3 = self.parsec_3_1_2;
parsec = self.parsec2;
parsimony = callPackage ../development/libraries/haskell/parsimony {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29733 - in nixpkgs/trunk/pkgs: development/libraries/haskell/thespian top-level
Author: simons
Date: Sun Oct 9 17:47:04 2011
New Revision: 29733
URL: https://nixos.org/websvn/nix/?rev=29733sc=1
Log:
haskell-thespian: added version 0.999
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/thespian/
nixpkgs/trunk/pkgs/development/libraries/haskell/thespian/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/thespian/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/thespian/default.nix
Sun Oct 9 17:47:04 2011(r29733)
@@ -0,0 +1,18 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+ pname = thespian;
+ version = 0.999;
+ sha256 = 0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn;
+ buildDepends = [ mtl ];
+ meta = {
+homepage = http://bitbucket.org/alinabi/thespian;;
+description = Lightweight Erlang-style actors for Haskell;
+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 Sun Oct 9 17:23:54
2011(r29732)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Oct 9 17:47:04
2011(r29733)
@@ -1177,6 +1177,8 @@
text_0_11_1_5 = callPackage
../development/libraries/haskell/text/0.11.1.5.nix {};
text = self.text_0_11_1_5;
+ thespian = callPackage ../development/libraries/haskell/thespian {};
+
thLift = callPackage ../development/libraries/haskell/th-lift {};
threadmanager = callPackage ../development/libraries/haskell/threadmanager
{};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29764 - nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data
Author: simons
Date: Tue Oct 11 16:47:56 2011
New Revision: 29764
URL: https://nixos.org/websvn/nix/?rev=29764sc=1
Log:
haskell-asn1-data: updated to version 0.6.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data/default.nix
Tue Oct 11 15:41:13 2011(r29763)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data/default.nix
Tue Oct 11 16:47:56 2011(r29764)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = asn1-data;
- version = 0.5.1;
- sha256 = 10ci77pf0y8g7i1fwksv5na32jsy3brfdv6nzrnwih1brq6l5fn4;
+ version = 0.6.0;
+ sha256 = 0gk34x2frkk2s7d0i7ahwnjv9jcqdgx2sd1kp3d854548k171z3f;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29769 - nixpkgs/trunk/pkgs/development/libraries/haskell/tls
Author: simons
Date: Tue Oct 11 16:48:19 2011
New Revision: 29769
URL: https://nixos.org/websvn/nix/?rev=29769sc=1
Log:
haskell-tls: updated to version 0.8.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nixTue Oct
11 16:48:15 2011(r29768)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nixTue Oct
11 16:48:19 2011(r29769)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = tls;
- version = 0.7.2;
- sha256 = 0x24jf83sfsnpvfm645lng5bc21zsbv6mbagr6q1q71zhfzfyb74;
+ version = 0.8.0;
+ sha256 = 05c7bizwkwcp83idsa5cjb53lvm9f44iaypp9yiqv4ly9q3h315q;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29771 - nixpkgs/trunk/pkgs/development/libraries/haskell/vacuum
Author: simons
Date: Tue Oct 11 16:48:28 2011
New Revision: 29771
URL: https://nixos.org/websvn/nix/?rev=29771sc=1
Log:
haskell-vacuum: updated to version 1.0.0.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/vacuum/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/vacuum/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/vacuum/default.nix Tue Oct
11 16:48:24 2011(r29770)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/vacuum/default.nix Tue Oct
11 16:48:28 2011(r29771)
@@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = vacuum;
- version = 1.0.0;
- sha256 = 2229948ce801052c5ffb70ffc07e301d87d60740b053df8a7b7851ad02c01d9f;
+ version = 1.0.0.1;
+ sha256 = 172py7nvyv66hvqmhigfm59rjb328bfzv0z11q8qdpf5w1fpvmc5;
extraLibraries = [ ghcPaths ];
meta = {
-homepage = http://moonpatio.com/vacuum/;;
+homepage =
http://web.archive.org/web/20100410115820/http://moonpatio.com/vacuum/;;
description = Extract graph representations of ghc heap values;
license = LGPL;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29803 - in nixpkgs/trunk/pkgs: tools/graphics/mscgen top-level
Author: simons
Date: Thu Oct 13 07:38:44 2011
New Revision: 29803
URL: https://nixos.org/websvn/nix/?rev=29803sc=1
Log:
mscgen: added version 0.20
Added:
nixpkgs/trunk/pkgs/tools/graphics/mscgen/
nixpkgs/trunk/pkgs/tools/graphics/mscgen/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/tools/graphics/mscgen/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/graphics/mscgen/default.nixThu Oct 13
07:38:44 2011(r29803)
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, flex, bison, gd, libpng, freetype, zlib }:
+
+let
+ version = 0.20;
+in
+stdenv.mkDerivation {
+ name = mscgen-${version};
+
+ src = fetchurl {
+url = www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz;
+sha256 =
3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23;
+ };
+
+ buildInputs = [ flex bison gd libpng freetype zlib ];
+
+ doCheck = true;
+ preCheck = ''
+sed -i -e s|#!/bin/bash|#!${stdenv.shell}| test/renderercheck.sh
+ '';
+
+ meta = {
+homepage = http://www.mcternan.me.uk/mscgen/;;
+description = convert Message Sequence Chart descriptions into PNG, SVG,
or EPS images;
+license = GPLv2;
+
+longDescription = ''
+ Mscgen is a small program that parses Message Sequence Chart
+ descriptions and produces PNG, SVG, EPS or server side image maps
+ (ismaps) as the output. Message Sequence Charts (MSCs) are a way
+ of representing entities and interactions over some time period
+ and are often used in combination with SDL. MSCs are popular in
+ Telecoms to specify how protocols operate although MSCs need not
+ be complicated to create or use. Mscgen aims to provide a simple
+ text language that is clear to create, edit and understand, which
+ can also be transformed into common image formats for display or
+ printing.
+'';
+
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.simons ];
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Oct 13 07:26:44
2011(r29802)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Oct 13 07:38:44
2011(r29803)
@@ -969,6 +969,8 @@
mpage = callPackage ../tools/text/mpage { };
+ mscgen = callPackage ../tools/graphics/mscgen { };
+
msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) {
inherit ruby makeWrapper;
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29829 - nixpkgs/trunk/pkgs/tools/networking/nbd
Author: simons
Date: Thu Oct 13 17:00:46 2011
New Revision: 29829
URL: https://nixos.org/websvn/nix/?rev=29829sc=1
Log:
nbd: updated to version 2.9.24
Modified:
nixpkgs/trunk/pkgs/tools/networking/nbd/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/nbd/default.nix
==
--- nixpkgs/trunk/pkgs/tools/networking/nbd/default.nix Thu Oct 13 15:01:44
2011(r29828)
+++ nixpkgs/trunk/pkgs/tools/networking/nbd/default.nix Thu Oct 13 17:00:46
2011(r29829)
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, glib }:
let
- name = nbd-2.9.23;
+ name = nbd-2.9.24;
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = mirror://sourceforge/nbd/${name}.tar.bz2;
-sha256 =
0ab44fe9e80c3f41bb1025ecda351a874affd46bf56ba4033ea03700c3b83803;
+sha256 = 025cqsx6cwbr62javdvm5vx675ai0b1absbx4if1v5pp9hzrpxmq;
};
buildInputs = [pkgconfig glib];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29839 - nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk
Author: simons
Date: Fri Oct 14 17:26:12 2011
New Revision: 29839
URL: https://nixos.org/websvn/nix/?rev=29839sc=1
Log:
haskell-Hipmunk: updated to version 5.2.0.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Fri Oct 14 14:14:36 2011(r29838)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Fri Oct 14 17:26:12 2011(r29839)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = Hipmunk;
- version = 5.2.0.3;
- sha256 = 1as00372hz0ngy6pc5l0w7qgw5flcyag07zk3dxkbj5kv24xk49m;
+ version = 5.2.0.4;
+ sha256 = 0sa0a4hg0xp8l64dy8hnfkhvy2miv79b5550v8gkvrbqcci0qfay;
buildDepends = [ StateVar transformers ];
noHaddock = true;
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29840 - nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data
Author: simons
Date: Fri Oct 14 17:26:16 2011
New Revision: 29840
URL: https://nixos.org/websvn/nix/?rev=29840sc=1
Log:
haskell-asn1-data: updated to version 0.6.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data/default.nix
Fri Oct 14 17:26:12 2011(r29839)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/asn1-data/default.nix
Fri Oct 14 17:26:16 2011(r29840)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = asn1-data;
- version = 0.6.0;
- sha256 = 0gk34x2frkk2s7d0i7ahwnjv9jcqdgx2sd1kp3d854548k171z3f;
+ version = 0.6.1;
+ sha256 = 1kj1h1z4ix8kdxq5838xk70sgz9rq0vdii5nli1rcycx3y2ipi84;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29843 - nixpkgs/trunk/pkgs/development/libraries/haskell/tls
Author: simons
Date: Fri Oct 14 17:26:32 2011
New Revision: 29843
URL: https://nixos.org/websvn/nix/?rev=29843sc=1
Log:
haskell-tls: updated to version 0.8.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nixFri Oct
14 17:26:27 2011(r29842)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nixFri Oct
14 17:26:32 2011(r29843)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = tls;
- version = 0.8.0;
- sha256 = 05c7bizwkwcp83idsa5cjb53lvm9f44iaypp9yiqv4ly9q3h315q;
+ version = 0.8.1;
+ sha256 = 1qgjzsp9f0mrkwrqzs69279q1dkz72hpazq6qp49p2xfsfzdp7dj;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29844 - nixpkgs/trunk/pkgs/development/tools/misc/cpphs
Author: simons
Date: Fri Oct 14 17:26:38 2011
New Revision: 29844
URL: https://nixos.org/websvn/nix/?rev=29844sc=1
Log:
haskell-cpphs: updated to version 1.13.2
Modified:
nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix Fri Oct 14
17:26:32 2011(r29843)
+++ nixpkgs/trunk/pkgs/development/tools/misc/cpphs/default.nix Fri Oct 14
17:26:38 2011(r29844)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = cpphs;
- version = 1.13.1;
- sha256 = 0k5p9gqnalll3w1962dwydnygk25h777bic2gvdh8i8hhyz5fsx2;
+ version = 1.13.2;
+ sha256 = 1q3pzfcgrl9nka1gdl84c4fqc1ql83idlbb8fghqsjp0ijzcxk3s;
isLibrary = true;
isExecutable = true;
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] python-x.y.z-wrapper vs python-x.y.z-full
Hi Florian, the attribute name for pythonXYFull is python-X.Y.Z-wrapper. I'd consider python-X.Y.Z-full to be more intuitive. Anything against renaming? use of the suffix -wrapper is very common in Nix. GCC follows the same naming scheme, and so does GHC. I don't see what we would gain from having a different suffix for Python's wrapper script. Besides, the suffix -full would be misleading for all other uses of python/wrapper.nix. Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29859 - nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta
Author: simons
Date: Sun Oct 16 18:22:30 2011
New Revision: 29859
URL: https://nixos.org/websvn/nix/?rev=29859sc=1
Log:
haskell-haskell-src-meta: updated to version 0.5.0.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
Sun Oct 16 12:46:47 2011(r29858)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
Sun Oct 16 18:22:30 2011(r29859)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = haskell-src-meta;
- version = 0.5;
- sha256 = 0403j2ks2as61rfl049v4h43xpgx06bm739y80vada6jc85rfinr;
+ version = 0.5.0.2;
+ sha256 = 059zvr91bnajql19c76vwivvy6sbca83ky8ja91bf8xv1p3jfz3w;
buildDepends = [ haskellSrcExts syb thLift ];
meta = {
description = Parse source to template-haskell abstract syntax;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29860 - nixpkgs/trunk/pkgs/development/libraries/haskell/snap
Author: simons
Date: Sun Oct 16 18:22:36 2011
New Revision: 29860
URL: https://nixos.org/websvn/nix/?rev=29860sc=1
Log:
haskell-snap-core: updated to version 0.5.5
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix Sun Oct
16 18:22:30 2011(r29859)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix Sun Oct
16 18:22:36 2011(r29860)
@@ -1,18 +1,19 @@
{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
-, bytestringMmap, bytestringNums, caseInsensitive, deepseq, dlist
-, enumerator, MonadCatchIOTransformers, mtl, text, time
-, transformers, unixCompat, vector, zlib
+, blazeBuilderEnumerator, bytestringMmap, bytestringNums
+, caseInsensitive, deepseq, dlist, enumerator
+, MonadCatchIOTransformers, mtl, text, time, transformers
+, unixCompat, vector, zlibEnum
}:
cabal.mkDerivation (self: {
pname = snap-core;
- version = 0.5.4;
- sha256 = 0v6lsb60s3w96rqpp9ky8nd660zja8asw02vx1562nvd19k65jbb;
+ version = 0.5.5;
+ sha256 = 1md9n3f11ki87774fh3p7d6bykfdwcqz6b2yrjci4mwf1b1xppkj;
buildDepends = [
-attoparsec attoparsecEnumerator blazeBuilder bytestringMmap
-bytestringNums caseInsensitive deepseq dlist enumerator
-MonadCatchIOTransformers mtl text time transformers unixCompat
-vector zlib
+attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
+bytestringMmap bytestringNums caseInsensitive deepseq dlist
+enumerator MonadCatchIOTransformers mtl text time transformers
+unixCompat vector zlibEnum
];
meta = {
homepage = http://snapframework.com/;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29884 - in nixpkgs/branches/stdenv-updates: . pkgs/applications/graphics/xscreensaver pkgs/applications/misc/xneur pkgs/applications/networking/browsers/icecat-4 pkgs/
Author: simons Date: Wed Oct 19 08:50:00 2011 New Revision: 29884 URL: https://nixos.org/websvn/nix/?rev=29884sc=1 Log: synchronize with trunk Added: nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/ (props changed) - copied from r29883, nixpkgs/trunk/pkgs/build-support/clang-wrapper/ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/llvm/clang-ld-flags.patch - copied unchanged from r29883, nixpkgs/trunk/pkgs/development/compilers/llvm/clang-ld-flags.patch Replaced: nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/add-flags - copied unchanged from r29883, nixpkgs/trunk/pkgs/build-support/clang-wrapper/add-flags nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/builder.sh - copied unchanged from r29883, nixpkgs/trunk/pkgs/build-support/clang-wrapper/builder.sh nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/clang-wrapper.sh - copied unchanged from r29883, nixpkgs/trunk/pkgs/build-support/clang-wrapper/clang-wrapper.sh nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/default.nix - copied unchanged from r29883, nixpkgs/trunk/pkgs/build-support/clang-wrapper/default.nix nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/ld-wrapper.sh - copied unchanged from r29883, nixpkgs/trunk/pkgs/build-support/clang-wrapper/ld-wrapper.sh nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/setup-hook.sh - copied unchanged from r29883, nixpkgs/trunk/pkgs/build-support/clang-wrapper/setup-hook.sh nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/utils.sh - copied unchanged from r29883, nixpkgs/trunk/pkgs/build-support/clang-wrapper/utils.sh Modified: nixpkgs/branches/stdenv-updates/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xscreensaver/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/misc/xneur/0.8.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/icecat-4/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/debian-build.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/nix-build.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/rpm-build.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/build-support/release/source-tarball.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.1.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.2.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.2.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.3.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/compilers/llvm/clang-include-paths.patch nixpkgs/branches/stdenv-updates/pkgs/development/compilers/llvm/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/aterm/2.8.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/fltk/fltk11.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.9/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/goocanvas/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/libraries/readline/readline6.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/autoconf/2.13.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gnum4/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/1.x.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/2.x.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/atheros/r3867.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix (props changed) nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.25.nix (props changed)
[Nix-commits] SVN commit: nix - r29886 - nixpkgs/trunk/pkgs/top-level
Author: simons
Date: Wed Oct 19 10:27:57 2011
New Revision: 29886
URL: https://nixos.org/websvn/nix/?rev=29886sc=1
Log:
python-ldap: added version 2.4.3
Modified:
nixpkgs/trunk/pkgs/top-level/python-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/python-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/python-packages.nixWed Oct 19 10:01:14
2011(r29885)
+++ nixpkgs/trunk/pkgs/top-level/python-packages.nixWed Oct 19 10:27:57
2011(r29886)
@@ -1358,6 +1358,17 @@
};
};
+ ldap = buildPythonPackage rec {
+name = python-ldap-2.4.3;
+
+src = fetchurl {
+ url =
http://pypi.python.org/packages/source/p/python-ldap/${name}.tar.gz;;
+ sha256 = 17aysa9b4zjw00ikjirf4m37xbp2ifj1g0zjs14xzqqib3nh1yw8;
+};
+
+NIX_CFLAGS_COMPILE = -I${pkgs.cyrus_sasl}/include/sasl;
+propagatedBuildInputs = [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl];
+ };
pylint = buildPythonPackage rec {
name = pylint-0.23.0;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29898 - nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder-enumerator
Author: simons
Date: Wed Oct 19 16:36:57 2011
New Revision: 29898
URL: https://nixos.org/websvn/nix/?rev=29898sc=1
Log:
haskell-blaze-builder-enumerator: updated to version 0.2.0.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
Wed Oct 19 16:36:51 2011(r29897)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
Wed Oct 19 16:36:57 2011(r29898)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = blaze-builder-enumerator;
- version = 0.2.0.2;
- sha256 = 0as4mjh695jpxp9qfhpsxyr1448l0pk94sh5kk8sgxv5hfiy41k9;
+ version = 0.2.0.3;
+ sha256 = 00a9rly27sh49gi5askg7z3ji8ig9llxk4qcznsag01d1z0kb97n;
buildDepends = [ blazeBuilder enumerator transformers ];
meta = {
homepage = https://github.com/meiersi/blaze-builder-enumerator;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29899 - nixpkgs/trunk/pkgs/development/libraries/haskell/hp2any-core
Author: simons
Date: Wed Oct 19 16:37:01 2011
New Revision: 29899
URL: https://nixos.org/websvn/nix/?rev=29899sc=1
Log:
haskell-hp2any-core: updated to version 0.11.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hp2any-core/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hp2any-core/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hp2any-core/default.nix
Wed Oct 19 16:36:57 2011(r29898)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hp2any-core/default.nix
Wed Oct 19 16:37:01 2011(r29899)
@@ -1,10 +1,10 @@
-{ cabal, bytestringTrie, network, time }:
+{ cabal, attoparsec, network, time }:
cabal.mkDerivation (self: {
pname = hp2any-core;
- version = 0.10.1;
- sha256 = 1qblsvlj4x22ml3k5mlr28r5xk9rmi7lpipd369dbvdzm0rflf03;
- buildDepends = [ bytestringTrie network time ];
+ version = 0.11.1;
+ sha256 = 146bigmch7dawyyakj0w55p0jdpnxkj8q5izjsswqqk0pdxia546;
+ buildDepends = [ attoparsec network time ];
meta = {
homepage = http://www.haskell.org/haskellwiki/Hp2any;;
description = Heap profiling helper library;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
