[Nix-commits] SVN commit: nix - r31082 - nixpkgs/trunk/pkgs/top-level
Author: viric
Date: Mon Dec 26 10:13:55 2011
New Revision: 31082
URL: https://nixos.org/websvn/nix/?rev=31082sc=1
Log:
Trying to make digikam build with boost 1.47
(http://trac.macports.org/ticket/32524),
as it fails with 1.48.
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 Dec 26 04:20:15
2011(r31081)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Dec 26 10:13:55
2011(r31082)
@@ -8040,7 +8040,9 @@
bluedevil = callPackage ../tools/bluetooth/bluedevil { };
- digikam = callPackage ../applications/graphics/digikam { };
+ digikam = callPackage ../applications/graphics/digikam {
+boost = boost147;
+ };
k3b = callPackage ../applications/misc/k3b { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31083 - in nixpkgs/trunk/pkgs: development/libraries/haskell/HTTP top-level
Author: simons
Date: Mon Dec 26 15:35:30 2011
New Revision: 31083
URL: https://nixos.org/websvn/nix/?rev=31083sc=1
Log:
haskell-HTTP: added version 4000.2.2
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix Mon Dec
26 15:35:30 2011(r31083)
@@ -0,0 +1,18 @@
+{ cabal, mtl, network, parsec }:
+
+cabal.mkDerivation (self: {
+ pname = HTTP;
+ version = 4000.2.2;
+ sha256 = 0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh;
+ buildDepends = [ mtl network parsec ];
+ meta = {
+homepage = https://github.com/haskell/HTTP;;
+description = A library for client-side HTTP;
+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 Mon Dec 26 10:13:55
2011(r31082)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Dec 26 15:35:30
2011(r31083)
@@ -152,7 +152,7 @@
syb = self.syb_0_3_6; # 7.2 ok, 7.3 ok
xhtml= self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok
zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok
-HTTP = self.HTTP_4000_2_1; # 7.2 ok, 7.3 ok
+HTTP = self.HTTP_4000_2_2; # 7.2 ok, 7.3 ok
deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok
text = self.text_0_11_1_12; # 7.2 ok, 7.3 ok
transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok
@@ -759,7 +759,8 @@
HTTP_4000_1_1 = callPackage
../development/libraries/haskell/HTTP/4000.1.1.nix {};
HTTP_4000_1_2 = callPackage
../development/libraries/haskell/HTTP/4000.1.2.nix {};
HTTP_4000_2_1 = callPackage
../development/libraries/haskell/HTTP/4000.2.1.nix {};
- HTTP = self.HTTP_4000_2_1;
+ HTTP_4000_2_2 = callPackage
../development/libraries/haskell/HTTP/4000.2.2.nix {};
+ HTTP = self.HTTP_4000_2_2;
hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31084 - in nixpkgs/trunk/pkgs: development/libraries/haskell/byteorder top-level
Author: simons
Date: Mon Dec 26 15:35:33 2011
New Revision: 31084
URL: https://nixos.org/websvn/nix/?rev=31084sc=1
Log:
haskell-byteorder: added version 1.0.3
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/byteorder/
nixpkgs/trunk/pkgs/development/libraries/haskell/byteorder/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/byteorder/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/byteorder/default.nix
Mon Dec 26 15:35:33 2011(r31084)
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = byteorder;
+ version = 1.0.3;
+ sha256 = 056jb47r4pkimi6z2z49prnsmjnhnijk57zm0divl1k55igi5way;
+ meta = {
+homepage = http://community.haskell.org/~aslatter/code/byteorder;;
+description = Exposes the native endianness or byte ordering of the
system;
+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 Mon Dec 26 15:35:30
2011(r31083)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Dec 26 15:35:33
2011(r31084)
@@ -481,6 +481,8 @@
bson = callPackage ../development/libraries/haskell/bson {};
+ byteorder = callPackage ../development/libraries/haskell/byteorder {};
+
bytestringNums = callPackage
../development/libraries/haskell/bytestring-nums {};
bytestringLexing = callPackage
../development/libraries/haskell/bytestring-lexing {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31085 - in nixpkgs/trunk/pkgs: development/libraries/haskell/fast-logger top-level
Author: simons
Date: Mon Dec 26 15:35:37 2011
New Revision: 31085
URL: https://nixos.org/websvn/nix/?rev=31085sc=1
Log:
haskell-fast-logger: added version 0.0.1
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/fast-logger/
nixpkgs/trunk/pkgs/development/libraries/haskell/fast-logger/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/fast-logger/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/fast-logger/default.nix
Mon Dec 26 15:35:37 2011(r31085)
@@ -0,0 +1,17 @@
+{ cabal, blazeBuilder }:
+
+cabal.mkDerivation (self: {
+ pname = fast-logger;
+ version = 0.0.1;
+ sha256 = 19ff2dhkh62i1ljsl90wnsblzk30dz0yx4kw5gk1hb22md7hakim;
+ buildDepends = [ blazeBuilder ];
+ meta = {
+description = A fast logging system;
+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 Mon Dec 26 15:35:33
2011(r31084)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Dec 26 15:35:37
2011(r31085)
@@ -635,6 +635,8 @@
failure = callPackage ../development/libraries/haskell/failure {};
+ fastLogger = callPackage ../development/libraries/haskell/fast-logger {};
+
fclabels = callPackage ../development/libraries/haskell/fclabels {};
funcmp = callPackage ../development/libraries/haskell/funcmp {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31086 - in nixpkgs/trunk/pkgs: development/libraries/haskell/wai-logger top-level
Author: simons
Date: Mon Dec 26 15:35:42 2011
New Revision: 31086
URL: https://nixos.org/websvn/nix/?rev=31086sc=1
Log:
haskell-wai-logger: added version 0.1.1
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/wai-logger/
nixpkgs/trunk/pkgs/development/libraries/haskell/wai-logger/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/wai-logger/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wai-logger/default.nix
Mon Dec 26 15:35:42 2011(r31086)
@@ -0,0 +1,18 @@
+{ cabal, blazeBuilder, byteorder, caseInsensitive, fastLogger
+, httpTypes, network, time, wai
+}:
+
+cabal.mkDerivation (self: {
+ pname = wai-logger;
+ version = 0.1.1;
+ sha256 = 02354n4j1wj2n2vn4hza7ng2gqbf6ibvr4gfnv7maisivgqjy694;
+ buildDepends = [
+blazeBuilder byteorder caseInsensitive fastLogger httpTypes network
+time wai
+ ];
+ meta = {
+description = A logging system for WAI;
+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 Mon Dec 26 15:35:37
2011(r31085)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Dec 26 15:35:42
2011(r31086)
@@ -1347,6 +1347,8 @@
waiExtra = callPackage ../development/libraries/haskell/wai-extra {};
+ waiLogger = callPackage ../development/libraries/haskell/wai-logger {};
+
warp = callPackage ../development/libraries/haskell/warp {};
WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.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 - r31089 - nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix
Author: simons
Date: Mon Dec 26 15:35:57 2011
New Revision: 31089
URL: https://nixos.org/websvn/nix/?rev=31089sc=1
Log:
haskell-hmatrix: updated to version 0.13.0.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
Mon Dec 26 15:35:53 2011(r31088)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
Mon Dec 26 15:35:57 2011(r31089)
@@ -1,14 +1,10 @@
-{ cabal, binary, blas, gsl, HUnit, liblapack, QuickCheck, random
-, storableComplex, vector
-}:
+{ cabal, binary, blas, gsl, liblapack, storableComplex, vector }:
cabal.mkDerivation (self: {
pname = hmatrix;
- version = 0.12.0.2;
- sha256 = 08i3vi0vs6wpyvjsjpqrxp8lw0f89cgzwv1j27y7i2yfp4xmrw8d;
- buildDepends = [
-binary HUnit QuickCheck random storableComplex vector
- ];
+ version = 0.13.0.0;
+ sha256 = 1jlibgg2nrgajw2ny0dq88f5mhrffi7kda9bb8sp9szf4a0kd4wd;
+ buildDepends = [ binary storableComplex vector ];
extraLibraries = [ blas gsl liblapack ];
configureFlags = -fvector;
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 - r31090 - nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator
Author: simons
Date: Mon Dec 26 15:36:02 2011
New Revision: 31090
URL: https://nixos.org/websvn/nix/?rev=31090sc=1
Log:
haskell-http-enumerator: updated to version 0.7.2.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 Dec 26 15:35:57 2011(r31089)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Mon Dec 26 15:36:02 2011(r31090)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = http-enumerator;
- version = 0.7.2;
- sha256 = 096rwnfm8bqn0pq9cs4i2kr1ljmawk2l17afw301zqfg79q97crc;
+ version = 0.7.2.1;
+ sha256 = 1qbarxi9268yzb3phnfgvnszbkzs6r63gqzy63h69kpi0k0wl84i;
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 - r31091 - nixpkgs/trunk/pkgs/development/libraries/haskell/multirec
Author: simons
Date: Mon Dec 26 15:36:07 2011
New Revision: 31091
URL: https://nixos.org/websvn/nix/?rev=31091sc=1
Log:
haskell-multirec: updated to version 0.7.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/default.nix
Mon Dec 26 15:36:02 2011(r31090)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/default.nix
Mon Dec 26 15:36:07 2011(r31091)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = multirec;
- version = 0.7;
- sha256 = 1n196qqggfnk8fa1x296rdbyb77a6ykhy01z8x2glgdimzpxsiay;
+ version = 0.7.1;
+ sha256 = 1a3snlv6lr9mi4nrl4cyc5ilk6flbdn0ck2sqla6dyb2zdlgf5ph;
noHaddock = true;
meta = {
homepage = http://www.cs.uu.nl/wiki/GenericProgramming/Multirec;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31092 - nixpkgs/trunk/pkgs/development/libraries/haskell/regular
Author: simons
Date: Mon Dec 26 15:36:12 2011
New Revision: 31092
URL: https://nixos.org/websvn/nix/?rev=31092sc=1
Log:
haskell-regular: updated to version 0.3.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/regular/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/regular/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/regular/default.nix
Mon Dec 26 15:36:07 2011(r31091)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/regular/default.nix
Mon Dec 26 15:36:12 2011(r31092)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = regular;
- version = 0.3.3;
- sha256 = 1xlpp60nvdiqkcn66dnpww72hcawyc1w7cd9zk9kk88x574kqzf7;
+ version = 0.3.4;
+ sha256 = 10gfid99xcqv3i9rp4x8hykk91qq3h7b7lxzsl7ii58vmifa4kgq;
meta = {
description = Generic programming library for regular datatypes;
license = self.stdenv.lib.licenses.bsd3;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31093 - nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css
Author: simons
Date: Mon Dec 26 15:36:18 2011
New Revision: 31093
URL: https://nixos.org/websvn/nix/?rev=31093sc=1
Log:
haskell-shakespeare-css: updated to version 0.10.5
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 Dec 26 15:36:12 2011(r31092)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-css/default.nix
Mon Dec 26 15:36:18 2011(r31093)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = shakespeare-css;
- version = 0.10.4;
- sha256 = 006ndbhzxkr2zw6gs13bm5pfq7i301bbg6nhagm3h9nnzp155snz;
+ version = 0.10.5;
+ sha256 = 1cnv9qgp1llrrvcqp64mq207wdsxpqza9yq5nzlsgrh6qlzvm4hs;
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
[Nix-commits] SVN commit: nix - r31094 - nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js
Author: simons
Date: Mon Dec 26 15:36:23 2011
New Revision: 31094
URL: https://nixos.org/websvn/nix/?rev=31094sc=1
Log:
haskell-shakespeare-js: updated to version 0.10.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js/default.nix
Mon Dec 26 15:36:18 2011(r31093)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/shakespeare-js/default.nix
Mon Dec 26 15:36:23 2011(r31094)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = shakespeare-js;
- version = 0.10.3;
- sha256 = 1xz4jf91dfz60dji31d3hyy1k01hk0v41pb8qmi598jylk9iz1r2;
+ version = 0.10.4;
+ sha256 = 15mh93d38qpqnrgxvaq659zwl2mks9xhkynhlpjrf8zb234knxjw;
buildDepends = [ 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
[Nix-commits] SVN commit: nix - r31095 - nixpkgs/trunk/pkgs/development/libraries/haskell/simple-sendfile
Author: simons
Date: Mon Dec 26 15:36:27 2011
New Revision: 31095
URL: https://nixos.org/websvn/nix/?rev=31095sc=1
Log:
haskell-simple-sendfile: updated to version 0.2.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/simple-sendfile/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/simple-sendfile/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/simple-sendfile/default.nix
Mon Dec 26 15:36:23 2011(r31094)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/simple-sendfile/default.nix
Mon Dec 26 15:36:27 2011(r31095)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = simple-sendfile;
- version = 0.1.3;
- sha256 = 0n78d6bn2hsm3p6r2kc2cr5nf9v1vqs6v5i9x71f910r3kk2grm8;
+ version = 0.2.0;
+ sha256 = 1rsbmlnks4q8gsfzwqwcj901b8hzcrfb85z7wy3szj4h0axw4264;
buildDepends = [ network ];
meta = {
description = Cross platform library for the sendfile system call;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31096 - nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra
Author: simons
Date: Mon Dec 26 15:36:32 2011
New Revision: 31096
URL: https://nixos.org/websvn/nix/?rev=31096sc=1
Log:
haskell-wai-extra: updated to version 0.4.6
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
Mon Dec 26 15:36:27 2011(r31095)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
Mon Dec 26 15:36:32 2011(r31096)
@@ -1,15 +1,15 @@
{ cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive
-, dataDefault, enumerator, httpTypes, network, text, time
-, transformers, wai, zlibBindings, zlibEnum
+, dataDefault, enumerator, fastLogger, httpTypes, network, text
+, time, transformers, wai, zlibBindings, zlibEnum
}:
cabal.mkDerivation (self: {
pname = wai-extra;
- version = 0.4.5.2;
- sha256 = 05gq22il1jnvw5rcqr6gassxj29f8l4536zm6bpgk1kff8cxa3g1;
+ version = 0.4.6;
+ sha256 = 1wpdfzw5qzbd33iypgppp4822vn7vhja6y26dnkb17n08r83vvhv;
buildDepends = [
blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault
-enumerator httpTypes network text time transformers wai
+enumerator fastLogger httpTypes network text time transformers wai
zlibBindings zlibEnum
];
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 - r31097 - nixpkgs/trunk/pkgs/development/libraries/haskell/warp
Author: simons
Date: Mon Dec 26 15:36:37 2011
New Revision: 31097
URL: https://nixos.org/websvn/nix/?rev=31097sc=1
Log:
haskell-warp: updated to version 0.4.6.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/warp/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/warp/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/warp/default.nix Mon Dec
26 15:36:32 2011(r31096)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/warp/default.nix Mon Dec
26 15:36:37 2011(r31097)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = warp;
- version = 0.4.6.2;
- sha256 = 1ja9w3440j69w7638wrjd6067svqcsaqdl1zklr6jx20zyadww94;
+ version = 0.4.6.3;
+ sha256 = 1gfjhp1s42ynpi3kh8fr6fp5nwirxz0gasr7zs7q2qwwvlq9pzm6;
buildDepends = [
blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
httpTypes network simpleSendfile transformers unixCompat wai
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31098 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core
Author: simons
Date: Mon Dec 26 15:36:42 2011
New Revision: 31098
URL: https://nixos.org/websvn/nix/?rev=31098sc=1
Log:
haskell-yesod-core: updated to version 0.9.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Mon Dec 26 15:36:37 2011(r31097)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Mon Dec 26 15:36:42 2011(r31098)
@@ -1,21 +1,21 @@
{ cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal
, clientsession, cookie, dataObject, dataObjectYaml, enumerator
-, failure, hamlet, httpTypes, monadControl, parsec, pathPieces
-, random, shakespeare, shakespeareCss, shakespeareJs
-, strictConcurrency, text, time, transformers, transformersBase
-, vector, wai, waiExtra
+, failure, fastLogger, hamlet, httpTypes, monadControl, parsec
+, pathPieces, random, shakespeare, shakespeareCss, shakespeareI18n
+, shakespeareJs, text, time, transformers, transformersBase, vector
+, wai, waiExtra, waiLogger
}:
cabal.mkDerivation (self: {
pname = yesod-core;
- version = 0.9.3.6;
- sha256 = 00h1ylrr5wrid9vn3jhspibprx0175j9rcwdb1hd7ya5gwmzlhjs;
+ version = 0.9.4;
+ sha256 = 1m9cxm3pngg4pq7j3p1sh7lrjp5gslnn6zcimc5ln8yldxx01c6g;
buildDepends = [
aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
-cookie dataObject dataObjectYaml enumerator failure hamlet
-httpTypes monadControl parsec pathPieces random shakespeare
-shakespeareCss shakespeareJs strictConcurrency text time
-transformers transformersBase vector wai waiExtra
+cookie dataObject dataObjectYaml enumerator failure fastLogger
+hamlet httpTypes monadControl parsec pathPieces random shakespeare
+shakespeareCss shakespeareI18n shakespeareJs text time transformers
+transformersBase vector wai waiExtra waiLogger
];
meta = {
homepage = http://www.yesodweb.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 - r31099 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form
Author: simons
Date: Mon Dec 26 15:36:46 2011
New Revision: 31099
URL: https://nixos.org/websvn/nix/?rev=31099sc=1
Log:
haskell-yesod-form: updated to version 0.3.4.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
Mon Dec 26 15:36:42 2011(r31098)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
Mon Dec 26 15:36:46 2011(r31099)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = yesod-form;
- version = 0.3.4.1;
- sha256 = 0khkc4bpqfgfs0zl753x4l5qpkfr8hv0kwzz6qpry5skxa326q6i;
+ version = 0.3.4.2;
+ sha256 = 1ahkbycxvjh1yvxfbf8wg6mlklmwm8hmy15x0b07g2xq7h1jmc5i;
buildDepends = [
blazeBuilder blazeHtml dataDefault emailValidate hamlet network
persistent shakespeareCss shakespeareJs text time transformers wai
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31101 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-static
Author: simons
Date: Mon Dec 26 15:36:58 2011
New Revision: 31101
URL: https://nixos.org/websvn/nix/?rev=31101sc=1
Log:
haskell-yesod-static: updated to version 0.3.2.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-static/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-static/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-static/default.nix
Mon Dec 26 15:36:52 2011(r31100)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-static/default.nix
Mon Dec 26 15:36:58 2011(r31101)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = yesod-static;
- version = 0.3.2;
- sha256 = 0m0fws0bwhf1cyw1a3cg85mhdjr9pv35a39671jsqkkvmmxiixlf;
+ version = 0.3.2.1;
+ sha256 = 0gggavj5bxb12axlfl8kmqizgg55nmcrr6z5za60n3bp70sq4vn4;
buildDepends = [
base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text
transformers unixCompat wai waiAppStatic yesodCore
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31102 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod
Author: simons
Date: Mon Dec 26 15:37:02 2011
New Revision: 31102
URL: https://nixos.org/websvn/nix/?rev=31102sc=1
Log:
haskell-yesod: updated to version 0.9.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix Mon Dec
26 15:36:58 2011(r31101)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix Mon Dec
26 15:37:02 2011(r31102)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = yesod;
- version = 0.9.3.4;
- sha256 = 1iw6qf1dywss8w4ig3dr04cyi01jq9frvmkbqgj5jq8v11y55x6v;
+ version = 0.9.4;
+ sha256 = 0kb25ilx0hf51x8i6kr94lhald4bfy08c1wrx3k9gnqgv2dk6vlp;
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 - r31103 - nixos/trunk/modules/services/network-filesystems
Author: viric
Date: Mon Dec 26 16:06:20 2011
New Revision: 31103
URL: https://nixos.org/websvn/nix/?rev=31103sc=1
Log:
I reworked the nfs upstart jobs, so they work better on the events of interest
of nixos.
Related to http://yellowgrass.org/issue/NixOS/109 .
Modified:
nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix
Modified: nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix
==
--- nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix Mon Dec
26 15:37:02 2011(r31102)
+++ nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix Mon Dec
26 16:06:20 2011(r31103)
@@ -10,6 +10,31 @@
exports = pkgs.writeText exports cfg.server.exports;
+/*
+ Description at http://nfs.sourceforge.net/nfs-howto/ar01s03.html :
+
+ If your distribution does not include them in the startup scripts, then then
+ you should add them, configured to start in the following order:
+
+ rpc.portmap
+ rpc.mountd, rpc.nfsd
+ rpc.statd, rpc.lockd (if necessary), and
+ rpc.rquotad
+
+ I tried to mimic that with upstart, playing with
stopping/stopped/started/starting
+ events.
+
+ I consider two scenarios:
+- Starting at boot. Then, portmap will emit a started event.
+- restart nfs-kernel-exports. Then, portmap will not emit anything. Due
+ to the comment in postStart, this will happen on nixos-rebuild if
+ the exportfs file changed.
+
+ From these scenarios, I came up with the startOn and stopOn at the time of
commiting
+ this comment.
+*/
+
+
in
{
@@ -94,28 +119,10 @@
description = Kernel NFS server;
-startOn = started network-interfaces;
+startOn = started network-interfaces and started portmap;
-preStart =
+postStart =
''
-export PATH=${pkgs.nfsUtils}/sbin:$PATH
-mkdir -p /var/lib/nfs
-
-${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
-
-${pkgs.sysvtools}/bin/mountpoint -q /proc/fs/nfsd \
-|| ${config.system.sbin.mount}/bin/mount -t nfsd none
/proc/fs/nfsd
-
-${optionalString cfg.server.createMountPoints
- ''
-# create export directories:
-# skip comments, take first col which may either be a
quoted
-# foo bar or just foo (- man export)
-sed '/^#.*/d;s/^\([^]*\).*/\1/;t;s/[ ].*//' ${exports} \
-| xargs -d '\n' mkdir -p
- ''
-}
-
# exports file is ${exports}
# keep this comment so that this job is restarted whenever
exports changes!
exportfs -ra
@@ -129,14 +136,33 @@
description = Kernel NFS server;
-startOn = started nfs-kernel-exports and started
nfs-kernel-mountd and started nfs-kernel-statd and started portmap;
-stopOn = stopping nfs-kernel-exports;
+startOn = starting nfs-kernel-exports or started portmap;
+stopOn = stopped nfs-kernel-statd or stopping portmap;
preStart =
''
+export PATH=${pkgs.nfsUtils}/sbin:$PATH
+mkdir -p /var/lib/nfs
+
# Create a state directory required by NFSv4.
mkdir -p /var/lib/nfs/v4recovery
+# rpc.nfsd needs the kernel support
+${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
+
+${pkgs.sysvtools}/bin/mountpoint -q /proc/fs/nfsd \
+|| ${config.system.sbin.mount}/bin/mount -t nfsd none
/proc/fs/nfsd
+
+${optionalString cfg.server.createMountPoints
+ ''
+# create export directories:
+# skip comments, take first col which may either be a
quoted
+# foo bar or just foo (- man export)
+sed '/^#.*/d;s/^\([^]*\).*/\1/;t;s/[ ].*//' ${exports} \
+| xargs -d '\n' mkdir -p
+ ''
+}
+
${pkgs.nfsUtils}/sbin/rpc.nfsd \
${if cfg.server.hostName != null then -H
${cfg.server.hostName} else } \
${builtins.toString cfg.server.nproc}
@@ -152,8 +178,8 @@
description = Kernel NFS server - mount daemon;
-startOn = started portmap and started nfs-kernel-exports;
-stopOn = stopped nfs-kernel-nfsd;
+startOn = starting nfs-kernel-exports or started portmap;
+stopOn = stopped nfs-kernel-statd;
daemonType = fork;
@@ -167,8 +193,8 @@
description = Kernel NFS server - Network Status Monitor;
-startOn = started portmap;
-stopOn = never;
+startOn = started nfs-kernel-mountd and
[Nix-commits] NixOS - Issue 109
NixOS #109 (25 Nov '10)NFS Upstart triggers brokenLluís Batlle i Rossell commented:I hope the svn change r31103 fixed this. -- Issue on YellowGrass -- http://yellowgrass.org -- ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31104 - nixos/trunk/modules/system/upstart-events
Author: viric Date: Mon Dec 26 16:40:13 2011 New Revision: 31104 URL: https://nixos.org/websvn/nix/?rev=31104sc=1 Log: Asking for an interactive shell in case of error umounting filesystems. I've not tested it; sometimes I hit the trouble, but not always. Modified: nixos/trunk/modules/system/upstart-events/shutdown.nix Modified: nixos/trunk/modules/system/upstart-events/shutdown.nix == --- nixos/trunk/modules/system/upstart-events/shutdown.nix Mon Dec 26 16:06:20 2011(r31103) +++ nixos/trunk/modules/system/upstart-events/shutdown.nix Mon Dec 26 16:40:13 2011(r31104) @@ -133,6 +133,11 @@ if [ -n $failed ]; then echo [1;31mwarning:[0m the following filesystems could not be unmounted: for mp in $failed; do echo $mp; done + echo Enter 'i' to launch a shell, or wait 10 seconds to continue. + read -t 10 A + if [ $A == i ]; then +bash -i /dev/console /dev/console + fi sleep 5 fi ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] NFS servers
Hello, I updated a bit the logic on starting the NFS server daemons on nixos trunk. If anyone feels that the change breaks something, feel free to revert it, and then we can talk about the change. In my tests, it worked better than before. Regards, Lluís. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] nix-copy-closure error
On Sun, Dec 25, 2011 at 10:46:04PM +0100, Rickard Nilsson wrote: I have run nix-store --verify --check-contents on both hosts, without any errors. I get the hash-error each time I try to copy the path above. I can copy other paths, though. How can I debug this? Quite a strange situation, yes. Read the nix-copy-closure script; you can check the raw steps --import and --export of nix-store manually, checking what happens. Maybe you have a bashrc that outputs some text, and that gets into the ssh transfer? ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Relocation of svn repos, and git-svn
Hello, how did you update your git-svn repositories for them to work with the new svn URLs? Regards, Lluís. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Relocation of svn repos, and git-svn
Hi Lluís, how did you update your git-svn repositories for them to work with the new svn URLs? that's probably not the response you've been hoping for, but I re-imported everything from scratch. In theory, it's possible to adapt svn-remote.name.url and svn-remote.name.rewriteRoot, but I didn't bother because that approach would have meant that the generated metadata advertises an obsolete URL. 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] Relocation of svn repos, and git-svn
On Mon, Dec 26, 2011 at 09:31:58PM +0100, Peter Simons wrote: Hi Lluís, how did you update your git-svn repositories for them to work with the new svn URLs? that's probably not the response you've been hoping for, but I re-imported everything from scratch. In theory, it's possible to adapt svn-remote.name.url and svn-remote.name.rewriteRoot, but I didn't bother because that approach would have meant that the generated metadata advertises an obsolete URL. And then, what about local branches? Did you have any? What to do with them? I'm not any git master; maybe there is an operation that solves all that. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Relocation of svn repos, and git-svn
Excerpts from Lluís Batlle i Rossell's message of Mon Dec 26 18:29:50 +0100 2011: how did you update your git-svn repositories for them to work with the new svn URLs? I opened the .git/config file and changed it. Marc Weber ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r31107 - nixpkgs/trunk/pkgs/development/compilers/clean
Author: kkallio
Date: Tue Dec 27 01:48:57 2011
New Revision: 31107
URL: https://nixos.org/websvn/nix/?rev=31107sc=1
Log:
Clean version 2.4
Modified:
nixpkgs/trunk/pkgs/development/compilers/clean/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/clean/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/clean/default.nix Mon Dec 26
20:24:59 2011(r31106)
+++ nixpkgs/trunk/pkgs/development/compilers/clean/default.nix Tue Dec 27
01:48:57 2011(r31107)
@@ -1,16 +1,16 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = clean-2.3;
+ name = clean-2.4;
src =
if stdenv.system == i686-linux then (fetchurl {
- url =
http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_boot.tar.gz;;
- sha256 = 0rrjpqdbqwbx7n8v35wi3wpm6lpv9zd1n5q50byb2h0ljqw31j9h;
+ url =
http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_boot.tar.gz;;
+ sha256 = 1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5;
})
else if stdenv.system == x86_64-linux then (fetchurl {
-url =
http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_64_boot.tar.gz;;
-sha256 = 0bvkaiwcaa1p6h1bl4bgnia1yd0j8nq6sb1yiwar74y2m1wwmjqj;
+url =
http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz;;
+sha256 = 08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r;
})
else throw Architecture not supported;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
