[Nix-commits] SVN commit: nix - r28993 - nixpkgs/trunk/pkgs/applications/version-management/veracity
Author: raskin
Date: Sat Sep 3 10:21:55 2011
New Revision: 28993
URL: https://svn.nixos.org/websvn/nix/?rev=28993sc=1
Log:
Attempting to fix tests a bit..
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
==
--- nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Fri Sep 2 21:49:13 2011(r28992)
+++ nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Sat Sep 3 10:21:55 2011(r28993)
@@ -2,6 +2,7 @@
, cmake, curl, patch, zlib, icu, sqlite, libuuid
, readline, openssl, spidermonkey_1_8_0rc1
, nspr, nss
+ , unzip, glibcLocales
, runTests ? false
, ...}:
builderDefsPackage
@@ -20,16 +21,17 @@
inherit (s) name;
inherit buildInputs;
- phaseNames = [prepare_sgneeds dump0 prepareMakefiles doMake doTest
doDeploy];
+ phaseNames = [prepare_sgneeds dump0 prepareMakefiles fixPaths
doMake doTest doDeploy];
dump0 = (a.doDump 0);
runTests = a.stdenv.lib.attrByPath [runTests] false a;
doTest = a.fullDepEntry (if runTests then ''
-sed -e s@/bin/bash@${a.stdenv.shell}@ -i $(find .. -type f)
mkdir pseudo-home
export HOME=$PWD/pseudo-home
+export LC_ALL=en_US.UTF-8
+${if a.stdenv.isLinux then export
LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale-archive; else }
make test || true
'' else ) [doMake minInit];
@@ -73,6 +75,13 @@
cmake -G Unix Makefiles -D SGNEEDS_DIR=$SGNEEDS_DIR -D
VVTHIRDPARTY=$VVTHIRDPARTY -D
SPIDERMONKEY_INCDIR=${a.spidermonkey_1_8_0rc1}/include -D
SPIDERMONKEY_LIB=${a.spidermonkey_1_8_0rc1}/lib/libjs.so ../veracity*
'' [minInit addInputs doUnpack];
+ fixPaths = a.fullDepEntry ''
+sed -e s@/bin/bash@${a.stdenv.shell}@ -i $(find .. -type f)
+sed -e 's@/bin/ln@#{a.coreutils}/bin/ln@g' -i ../veracity/src/js_tests/*.js
+sed -e 's@/usr/bin/gdb@#{a.gdb}/bin/gdb@g' -i
../veracity/testsuite/c_test.sh
+sed -e 's@/bin/@@g' -i ../veracity/testsuite/u*.c
+ '' [minInit];
+
doDeploy = a.fullDepEntry ''
ensureDir $out/bin $out/share/veracity/
cp -r .. $out/share/veracity/build-dir
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] CFQ I/O scheduler can't boot my system
Hi Eelco, this commit * Use the CFQ I/O scheduler, rather than the ‘none’ scheduler. This was already the case on Linux 2.6.32, but in newer kernels the CFQ scheduler is built as a module, so all block devices got the ‘none’ scheduler instead. breaks my boot process. The linuxPackages_2_6_38_ati kernel hangs after probing the ata devices. I've reverted to an older version for now, but maybe I'm not the only one who's going to have that problem? Take care, Peter ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28994 - in nixpkgs/trunk/pkgs: development/libraries/haskell/hS3 top-level
Author: simons
Date: Sat Sep 3 13:17:23 2011
New Revision: 28994
URL: https://svn.nixos.org/websvn/nix/?rev=28994sc=1
Log:
haskell-hS3: added version 0.5.6
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/hS3/
nixpkgs/trunk/pkgs/development/libraries/haskell/hS3/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/hS3/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hS3/default.nixSat Sep
3 13:17:23 2011(r28994)
@@ -0,0 +1,25 @@
+{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, random
+, regexCompat, utf8String
+}:
+
+cabal.mkDerivation (self: {
+ pname = hS3;
+ version = 0.5.6;
+ sha256 = 1cd6dzvhfkfp0lzw8lwfcr0wn8wqi2hm8pgb5idp4vg4z00yf2zc;
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [
+Crypto dataenc HTTP hxt MissingH network random regexCompat
+utf8String
+ ];
+ meta = {
+homepage = http://gregheartsfield.com/hS3/;;
+description = Interface to Amazon's Simple Storage Service (S3);
+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 Sat Sep 3 10:21:55
2011(r28993)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Sep 3 13:17:23
2011(r28994)
@@ -754,6 +754,8 @@
glut = pkgs.freeglut;
};
+ hS3 = callPackage ../development/libraries/haskell/hS3 {};
+
hsBibutils = callPackage ../development/libraries/haskell/hs-bibutils {};
hscolour = callPackage ../development/libraries/haskell/hscolour {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28995 - in nixpkgs/trunk/pkgs: development/libraries/haskell/hxt development/libraries/haskell/hxt-charproperties development/libraries/haskell/hxt-regex-xmlschema dev
Author: simons
Date: Sat Sep 3 13:17:29 2011
New Revision: 28995
URL: https://svn.nixos.org/websvn/nix/?rev=28995sc=1
Log:
haskell-hxt: added version 9.1.4
haskell-hxt-charproperties: added version 9.1.0
haskell-hxt-regex-xmlschema: added version 9.0.1
haskell-hxt-unicode: added version 9.0.1
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/hxt/
nixpkgs/trunk/pkgs/development/libraries/haskell/hxt-charproperties/
nixpkgs/trunk/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hxt-regex-xmlschema/
nixpkgs/trunk/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hxt-unicode/
nixpkgs/trunk/pkgs/development/libraries/haskell/hxt-unicode/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hxt/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
Sat Sep 3 13:17:29 2011(r28995)
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = hxt-charproperties;
+ version = 9.1.0;
+ sha256 = 1a227czzbbw8pigc2dk5fyyc4x1rpx82mb5c4hpjjz97l0sdlc23;
+ meta = {
+homepage = http://www.fh-wedel.de/~si/HXmlToolbox/index.html;;
+description = Character properties and classes for XML and Unicode;
+license = unknown;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
Sat Sep 3 13:17:29 2011(r28995)
@@ -0,0 +1,18 @@
+{ cabal, hxtCharproperties, parsec }:
+
+cabal.mkDerivation (self: {
+ pname = hxt-regex-xmlschema;
+ version = 9.0.1;
+ sha256 = 1mg22fa0f0cbj9gkl5zaq0xh94ljkmzrc019h3cxv728chpgby0c;
+ buildDepends = [ hxtCharproperties parsec ];
+ meta = {
+homepage =
http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema;;
+description = A regular expression library for W3C XML Schema regular
expressions;
+license = self.stdenv.lib.licenses.mit;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/hxt-unicode/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hxt-unicode/default.nix
Sat Sep 3 13:17:29 2011(r28995)
@@ -0,0 +1,18 @@
+{ cabal, hxtCharproperties }:
+
+cabal.mkDerivation (self: {
+ pname = hxt-unicode;
+ version = 9.0.1;
+ sha256 = 0g8qz7waip7zsdi35idj9db6qd7lqbv88l0c4rz8q7nh85jsp6ym;
+ buildDepends = [ hxtCharproperties ];
+ meta = {
+homepage = http://www.fh-wedel.de/~si/HXmlToolbox/index.html;;
+description = Unicode en-/decoding functions for utf8, iso-latin-* and
other encodings;
+license = unknown;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/hxt/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hxt/default.nixSat Sep
3 13:17:29 2011(r28995)
@@ -0,0 +1,23 @@
+{ cabal, binary, deepseq, HUnit, hxtCharproperties
+, hxtRegexXmlschema, hxtUnicode, network, parsec
+}:
+
+cabal.mkDerivation (self: {
+ pname = hxt;
+ version = 9.1.4;
+ sha256 = 1dqnxb1dikw74l02sb6q193ipk9qfwqlgvcd362705mdqzai124c;
+ buildDepends = [
+binary deepseq HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode
+network parsec
+ ];
+ meta = {
+homepage = http://www.fh-wedel.de/~si/HXmlToolbox/index.html;;
+description = A collection of tools for processing XML with Haskell;
+license = self.stdenv.lib.licenses.mit;
+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
[Nix-commits] SVN commit: nix - r28996 - in nixpkgs/trunk/pkgs/applications/version-management/git-and-tools: . git-annex
Author: simons
Date: Sat Sep 3 13:17:36 2011
New Revision: 28996
URL: https://svn.nixos.org/websvn/nix/?rev=28996sc=1
Log:
git-annex: updated to version 3.20110902
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
==
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Sat Sep 3 13:17:29 2011(r28995)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Sat Sep 3 13:17:36 2011(r28996)
@@ -48,7 +48,7 @@
gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki
which;
inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
- HTTP testpack monadControl;
+ HTTP testpack monadControl hS3 mtl network hslogger hxt json;
QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
};
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
==
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Sat Sep 3 13:17:29 2011(r28995)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Sat Sep 3 13:17:36 2011(r28996)
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH,
utf8String
-, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which
-, monadControl }:
+{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP,
hxt
+, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
+, QuickCheck2, rsync, SHA, testpack, utf8String, which
+}:
let
- version = 3.20110819;
+ version = 3.20110902;
in
stdenv.mkDerivation {
name = git-annex-${version};
src = fetchurl {
url =
http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz;;
-sha256 =
1442ba4ff35ec8f92f336a5f1055d7ad8306348871a9697262f4f2af3b3c0943;
+sha256 = 1flw3472g19v6ins1nv66m51w15131013077yvfh2blywm0pqrl0;
};
- buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String
QuickCheck2 pcreLight
-SHA dataenc HTTP testpack git ikiwiki which monadControl];
+ buildInputs = [
+curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
+libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
+rsync SHA testpack utf8String which
+ ];
checkTarget = test;
doCheck = true;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] CFQ I/O scheduler can't boot my system
this commit * Use the CFQ I/O scheduler, rather than the ‘none’ scheduler. This was already the case on Linux 2.6.32, but in newer kernels the CFQ scheduler is built as a module, so all block devices got the ‘none’ scheduler instead. breaks my boot process. The linuxPackages_2_6_38_ati kernel hangs after probing the ata devices. I've reverted to an older version for now, but maybe I'm not the only one who's going to have that problem? I also see a booting problem starting with the time of the commit, so I confirm the problem. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28997 - nixpkgs/trunk/pkgs/applications/graphics/gimp/plugins
Author: ludo
Date: Sat Sep 3 17:31:10 2011
New Revision: 28997
URL: https://svn.nixos.org/websvn/nix/?rev=28997sc=1
Log:
Add GimpLensfun.
Modified:
nixpkgs/trunk/pkgs/applications/graphics/gimp/plugins/default.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/gimp/plugins/default.nix
==
--- nixpkgs/trunk/pkgs/applications/graphics/gimp/plugins/default.nix Sat Sep
3 13:17:36 2011(r28996)
+++ nixpkgs/trunk/pkgs/applications/graphics/gimp/plugins/default.nix Sat Sep
3 17:31:10 2011(r28997)
@@ -195,6 +195,35 @@
;
};
+ gimplensfun = pluginDerivation rec {
+name = gimplensfun-0.1.1;
+
+src = fetchurl {
+ url = http://lensfun.sebastiankraft.net/${name}.tar.gz;;
+ sha256 = 0kr296n4k7gsjqg1abmvpysxi88iq5wrzdpcg7vm7l1ifvbs972q;
+};
+
+patchPhase = '' sed -i Makefile -e's|/usr/bin/g++|g++|' '';
+
+buildInputs = [ gimp pkgconfig glib gimp.gtk pkgs.lensfun pkgs.exiv2 ];
+
+installPhase =
+ installPlugins gimplensfun
+ ensureDir $out/bin
+ cp gimplensfun $out/bin
+;
+
+meta = {
+ description = GIMP plugin to correct lens distortion using the lensfun
library and database;
+
+ homepage = http://lensfun.sebastiankraft.net/;
+
+ license = GPLv3+;
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ platforms = stdenv.lib.platforms.gnu;
+};
+ };
+
/* === simple script files */
# also have a look at enblendenfuse in all-packages.nix
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28998 - nixpkgs/trunk/pkgs/development/libraries/sphinxbase
Author: shlevy
Date: Sat Sep 3 20:00:58 2011
New Revision: 28998
URL: https://svn.nixos.org/websvn/nix/?rev=28998sc=1
Log:
sphinxbase: The source tarball hash changed for some reason. That's
disconcerting...
Modified:
nixpkgs/trunk/pkgs/development/libraries/sphinxbase/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/sphinxbase/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/sphinxbase/default.nix Sat Sep
3 17:31:10 2011(r28997)
+++ nixpkgs/trunk/pkgs/development/libraries/sphinxbase/default.nix Sat Sep
3 20:00:58 2011(r28998)
@@ -5,7 +5,7 @@
src = fetchurl {
url = mirror://sourceforge/cmusphinx/${name}.tar.gz;
-sha256 = 0xab4ph9215rw5865gihmahbbnbi58klll5xg0il9ifld4wdjacq;
+sha256 = 1v3kfzw42ahxmr002i6wqigs832958vgghrv5dd62zazajdbk71q;
};
buildInputs = [ pkgconfig bison ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28999 - nixpkgs/trunk/pkgs/development/libraries/sphinxbase
Author: shlevy
Date: Sat Sep 3 20:01:06 2011
New Revision: 28999
URL: https://svn.nixos.org/websvn/nix/?rev=28999sc=1
Log:
sphinxbase: Add flag to play with multiple outputs
Modified:
nixpkgs/trunk/pkgs/development/libraries/sphinxbase/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/sphinxbase/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/sphinxbase/default.nix Sat Sep
3 20:00:58 2011(r28998)
+++ nixpkgs/trunk/pkgs/development/libraries/sphinxbase/default.nix Sat Sep
3 20:01:06 2011(r28999)
@@ -1,6 +1,11 @@
-{ stdenv, fetchurl, bison, pkgconfig }:
+{ stdenv
+, fetchurl
+, bison
+, pkgconfig
+, multipleOutputs ? false #Uses incomplete features of nix!
+}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
name = sphinxbase-0.7;
src = fetchurl {
@@ -16,4 +21,15 @@
license = free-non-copyleft;
maintainers = [ stdenv.lib.maintainers.shlevy ];
};
-}
+} // (stdenv.lib.optionalAttrs multipleOutputs {
+ outputs = [ out lib headers ];
+
+ postInstall = ''
+ensureDir $lib
+cp -av $out/lib* $lib
+
+ensureDir $headers
+cp -av $out/include $headers
+ '';
+}))
+
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
