[Nix-dev] Re: binutils-2.20.1a replaced by 2.20.1 and so 2.21.1a?
The FSF is going to formally forgive the inadvertent GPL violations that may have been caused by our mistake. -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! That's nonfree (freedom-denying) software. Use free telephony http://directory.fsf.org/category/tel/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29075 - nixpkgs/trunk/pkgs/build-support/fetchgit
Author: NicolasPierron Date: Wed Sep 7 10:02:12 2011 New Revision: 29075 URL: https://svn.nixos.org/websvn/nix/?rev=29075sc=1 Log: nix-prefetch-git: Remove missleading option name. Modified: nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Modified: nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git == --- nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Wed Sep 7 04:11:33 2011(r29074) +++ nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Wed Sep 7 10:02:12 2011(r29075) @@ -33,7 +33,6 @@ --deepClone) deepClone=true;; --no-deepClone) deepClone=false;; --leave-dotGit) leaveDotGit=true;; - --keep-dotGit) leaveDotGit=;; --builder) builder=true;; *) argi=$(($argi + 1)) ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29076 - nixpkgs/trunk/pkgs/build-support/fetchgit
Author: NicolasPierron
Date: Wed Sep 7 10:02:14 2011
New Revision: 29076
URL: https://svn.nixos.org/websvn/nix/?rev=29076sc=1
Log:
nix-prefetch-git: Display usage message if missing builder arguments are
missing.
Modified:
nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git
Modified: nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git
==
--- nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Wed Sep 7
10:02:12 2011(r29075)
+++ nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Wed Sep 7
10:02:14 2011(r29076)
@@ -55,9 +55,24 @@
fi
done
-if test -z $url; then
-echo syntax: nix-prefetch-git URL [REVISION [EXPECTED-HASH]] 2
+usage(){
+echo 2 syntax: nix-prefetch-git [options] [URL [REVISION
[EXPECTED-HASH]]]
+
+Options:
+ --out path Path where the output would be stored.
+ --url url Any url understand by 'git clone'.
+ --rev ref Any sha1 or references (such as refs/heads/master)
+ --hash hExpected hash.
+ --deepClone Clone submodules recursively.
+ --no-deepClone Do not clone submodules.
+ --leave-dotGit Keep the .git directories.
+ --builder Clone as fetchgit does, but url, rev, and out option are
mandatory.
+
exit 1
+}
+
+if test -z $url; then
+ usage
fi
@@ -200,8 +215,9 @@
}
if test -n $builder; then
-mkdir $out
-clone_user_rev $out $url $rev
+ test -n $out -a -n $url -a -n $rev || usage
+ mkdir $out
+ clone_user_rev $out $url $rev
else
if test -z $hashType; then
hashType=sha256
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29077 - nixpkgs/trunk/pkgs/build-support/fetchgit
Author: NicolasPierron Date: Wed Sep 7 10:02:17 2011 New Revision: 29077 URL: https://svn.nixos.org/websvn/nix/?rev=29077sc=1 Log: nix-prefetch-git: remove .git in the cloned directory. (Fix issue 116) Modified: nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Modified: nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git == --- nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Wed Sep 7 10:02:14 2011(r29076) +++ nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Wed Sep 7 10:02:17 2011(r29077) @@ -210,7 +210,7 @@ eval $NIX_PREFETCH_GIT_CHECKOUT_HOOK if test -z $leaveDotGit; then echo removing \`.git'... 2 -find $out -name .git\* | xargs rm -rf +find $dir -name .git\* | xargs rm -rf fi } ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] Nixpkgs - Issue 116
Nixpkgs #116 (7 Sep)nix-prefetch-git deletes .git in working directory!Issue has been closed by Nicolas Pierron, saying:Bug fixed at revision r29077. -- Issue on YellowGrass -- http://yellowgrass.org -- ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] CFQ I/O scheduler can't boot my system
On Mon, Sep 5, 2011 at 6:25 PM, Shea Levy s...@shealevy.com wrote: On 09/05/2011 10:59 AM, Eelco Dolstra wrote: Hi, On 09/03/2011 02:41 PM, Peter Simons wrote: 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? This should be fixed now (r29027, tested with Linux 2.6.35). I still get this hang unless I set elevator=noop at boot. Using linuxPackages_2_6_39. I also ran into this issue today with both linuxPackages_2_6_39 and linuxPackages_2_6_38_ati ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29078 - nixpkgs/branches/syscall-tracing
Author: eelco Date: Wed Sep 7 15:11:33 2011 New Revision: 29078 URL: https://svn.nixos.org/websvn/nix/?rev=29078sc=1 Log: * Branch for the system call tracing experiment. Added: nixpkgs/branches/syscall-tracing/ (props changed) - copied from r29077, nixpkgs/trunk/ ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29079 - nixpkgs/trunk/pkgs/applications/networking/browsers/firefox
Author: eelco
Date: Wed Sep 7 15:13:00 2011
New Revision: 29079
URL: https://svn.nixos.org/websvn/nix/?rev=29079sc=1
Log:
* Firefox 6.0.2.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix Wed Sep
7 15:11:33 2011(r29078)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix Wed Sep
7 15:13:00 2011(r29079)
@@ -15,14 +15,14 @@
rec {
- firefoxVersion = 6.0.1;
+ firefoxVersion = 6.0.2;
- xulVersion = 6.0.1; # this attribute is used by other packages
+ xulVersion = 6.0.2; # this attribute is used by other packages
src = fetchurl {
url =
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2;;
-sha256 = 08pklavbb6miaav07a8liw17k8nnh3i97plz8l9pdclan4aczb3i;
+sha1 = 074eb9c1df4de0fe0a4bb9226ca3c2822c334cd6;
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29080 - in nixpkgs/branches/syscall-tracing/pkgs/stdenv: . generic linux
Author: eelco
Date: Wed Sep 7 15:14:17 2011
New Revision: 29080
URL: https://svn.nixos.org/websvn/nix/?rev=29080sc=1
Log:
* Apply the syscall tracer stdenv adapter globally.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
nixpkgs/branches/syscall-tracing/pkgs/stdenv/generic/setup.sh
nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Wed Sep 7
15:13:00 2011(r29079)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Wed Sep 7
15:14:17 2011(r29080)
@@ -349,4 +349,30 @@
drvPath = validate pkg.drvPath;
};
};
+
+
+ pkgs = import /etc/nixos/nixpkgs { };
+
+ traceScript = pkgs.writeScript builder.sh
+''
+ echo tracing: $builder $realArgs
+ ${pkgs.coreutils}/bin/mkdir -p $out/.trace
+ ${pkgs.strace}/bin/strace -e trace=file,process,dup,dup2,close,pipe -v
-q -f -s 512 ${pkgs.stdenv.shell} -c '(cd $TMPDIR $builder $realArgs)'
$out/.trace/log 21
+ ${pkgs.bzip2}/bin/bzip2 $out/.trace/log
+'';
+
+
+ traceSyscalls = stdenv: stdenv //
+{ mkDerivation = args: pkgs.lib.overrideDerivation (stdenv.mkDerivation
args)
+(args2: {
+ realArgs = args2.args;
+ args = [ -e traceScript ];
+ enableParallelBuilding = false;
+ # Don't run the patchelf phase in stdenv since I don't want
+ # Nixpkgs-specific stuff polluting our pictures :-)
+ dontPatchELF = true;
+});
+};
+
+
}
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/generic/setup.sh
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/generic/setup.sh Wed Sep
7 15:13:00 2011(r29079)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/generic/setup.sh Wed Sep
7 15:14:17 2011(r29080)
@@ -307,7 +307,7 @@
if test -n ${dirs}; then
header stripping (with flags $stripFlags) in $dirs
-find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip
$stripFlags || true
+find $dirs \( -name '.build' -prune \) -type f -print0 | xargs -0
${xargsFlags:--r} strip $stripFlags || true
stopNest
fi
}
@@ -665,7 +665,7 @@
header patching script interpreter paths
local dir=$1
local f
-for f in $(find $dir -type f -perm +0100); do
+for f in $(find $dir \( -name '.build' -prune \) -type f -perm +0100); do
local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' $f)
if test -n $oldPath -a ${oldPath:0:${#NIX_STORE}} != $NIX_STORE;
then
local newPath=$(type -P $(basename $oldPath) || true)
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix Wed Sep
7 15:13:00 2011(r29079)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix Wed Sep
7 15:14:17 2011(r29080)
@@ -7,6 +7,8 @@
# The function defaults are for easy testing.
{system ? i686-linux, allPackages ? import ../../top-level/all-packages.nix,
platform}:
+with import ../adapters.nix { dietlibc = null; fetchurl = null; runCommand =
null; };
+
rec {
bootstrapFiles =
@@ -143,14 +145,14 @@
# Create the first real standard environment. This one consists
# of bootstrap tools only, and a minimal Glibc to keep the GCC
# configure script happy.
- stdenvLinuxBoot1 = stdenvBootFun {
+ stdenvLinuxBoot1 = traceSyscalls (keepBuildTree (stdenvBootFun {
gcc = wrapGCC {
libc = bootstrapGlibc;
binutils = bootstrapTools;
coreutils = bootstrapTools;
};
inherit fetchurl;
- };
+ }));
# 2) These are the packages that we can build with the first
@@ -163,16 +165,17 @@
};
firstBinutils = stdenvLinuxBoot1Pkgs.binutils;
+
# 3) 2nd stdenv that we will use to build only the glibc.
- stdenvLinuxBoot2 = stdenvBootFun {
+ stdenvLinuxBoot2 = traceSyscalls (keepBuildTree (stdenvBootFun {
gcc = wrapGCC {
libc = bootstrapGlibc;
binutils = firstBinutils;
coreutils = bootstrapTools;
};
inherit fetchurl;
- };
+ }));
# 4) These are the packages that we can build with the 2nd
@@ -191,7 +194,7 @@
# 6) Construct a third stdenv identical to the 2nd, except that
#this one uses the Glibc built in step 3. It still uses
#the recent binutils and rest of the bootstrap tools, including GCC.
- stdenvLinuxBoot3 = stdenvBootFun {
+ stdenvLinuxBoot3 = traceSyscalls (keepBuildTree (stdenvBootFun {
gcc = wrapGCC {
binutils = stdenvLinuxBoot1Pkgs.binutils;
coreutils = bootstrapTools;
@@ -202,7 +205,7 @@
[Nix-commits] SVN commit: nix - r29081 - in nixpkgs/branches/syscall-tracing/pkgs: build-support/fetchurl stdenv
Author: eelco
Date: Wed Sep 7 15:15:37 2011
New Revision: 29081
URL: https://svn.nixos.org/websvn/nix/?rev=29081sc=1
Log:
* Hacky: don't do tracing on derivations that produce
a single regular file. Those fail because the tracer
creates $out/.build and $out/.trace.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/build-support/fetchurl/default.nix
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
Modified:
nixpkgs/branches/syscall-tracing/pkgs/build-support/fetchurl/default.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/build-support/fetchurl/default.nix
Wed Sep 7 15:14:17 2011(r29080)
+++ nixpkgs/branches/syscall-tracing/pkgs/build-support/fetchurl/default.nix
Wed Sep 7 15:15:37 2011(r29081)
@@ -13,6 +13,7 @@
stdenv.mkDerivation ({
name = mirrors-list;
builder = ./write-mirror-list.sh;
+ dontTrace = true;
} // mirrors);
# Names of the master sites that are mirrored (i.e., sourceforge,
@@ -64,6 +65,8 @@
if showURLs then urls
else if name != then name
else baseNameOf (toString (builtins.head urls_));
+
+ dontTrace = true;
builder = ./builder.sh;
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Wed Sep 7
15:14:17 2011(r29080)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Wed Sep 7
15:15:37 2011(r29081)
@@ -364,7 +364,7 @@
traceSyscalls = stdenv: stdenv //
{ mkDerivation = args: pkgs.lib.overrideDerivation (stdenv.mkDerivation
args)
-(args2: {
+(args2: if args2 ? dontTrace then { } else {
realArgs = args2.args;
args = [ -e traceScript ];
enableParallelBuilding = false;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29082 - nixpkgs/trunk/pkgs/tools/package-management/nix
Author: eelco
Date: Wed Sep 7 16:14:42 2011
New Revision: 29082
URL: https://svn.nixos.org/websvn/nix/?rev=29082sc=1
Log:
* Bump nixUnstable.
Modified:
nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
Modified: nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
==
--- nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nixWed Sep
7 15:15:37 2011(r29081)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nixWed Sep
7 16:14:42 2011(r29082)
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = nix-1.0pre28391;
+ name = nix-1.0pre29060;
src = fetchurl {
-url = http://hydra.nixos.org/build/1232663/download/4/${name}.tar.bz2;;
-sha256 =
c990f0ad564960b1d82fdbed32bee0db64c26b57400f027f01434237edd1be0f;
+url = http://hydra.nixos.org/build/1301810/download/4/${name}.tar.bz2;;
+sha256 =
f403213b56acfb2e74ae1e6fd136f3726940f098220d2ae8b46fa54c08f1aad0;
};
buildNativeInputs = [ perl pkgconfig ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: CFQ I/O scheduler can't boot my system
Hi guys, This should be fixed now (r29027, tested with Linux 2.6.35). I still get this hang unless I set elevator=noop at boot. Using linuxPackages_2_6_39. I also ran into this issue today with both linuxPackages_2_6_39 and linuxPackages_2_6_38_ati same here ... my system doesn't boot using the latest configuration. 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 - r29083 - nix-perl/trunk
Author: eelco
Date: Wed Sep 7 16:36:02 2011
New Revision: 29083
URL: https://svn.nixos.org/websvn/nix/?rev=29083sc=1
Log:
* Fix the Perl bindings.
Modified:
nix-perl/trunk/Nix.xs
Modified: nix-perl/trunk/Nix.xs
==
--- nix-perl/trunk/Nix.xs Wed Sep 7 16:14:42 2011(r29082)
+++ nix-perl/trunk/Nix.xs Wed Sep 7 16:36:02 2011(r29083)
@@ -121,7 +121,7 @@
doInit();
PathSet paths;
for (int n = 2; n items; ++n)
-computeFSClosure(SvPV_nolen(ST(n)), paths, flipDirection,
includeOutputs);
+computeFSClosure(*store, SvPV_nolen(ST(n)), paths,
flipDirection, includeOutputs);
for (PathSet::iterator i = paths.begin(); i != paths.end(); ++i)
XPUSHs(sv_2mortal(newSVpv(i-c_str(), 0)));
} catch (Error e) {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29084 - nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll
Author: simons
Date: Wed Sep 7 16:53:15 2011
New Revision: 29084
URL: https://svn.nixos.org/websvn/nix/?rev=29084sc=1
Log:
haskell-hakyll: updated to version 3.2.0.6
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 Wed Sep
7 16:36:02 2011(r29083)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix Wed Sep
7 16:53:15 2011(r29084)
@@ -1,13 +1,13 @@
-{ cabal, binary, blazeHtml, hamlet, hopenssl, mtl, pandoc, parsec
+{ cabal, binary, blazeHtml, cryptohash, hamlet, mtl, pandoc, parsec
, regexBase, regexPcre, snapCore, snapServer, tagsoup, time
}:
cabal.mkDerivation (self: {
pname = hakyll;
- version = 3.2.0.5;
- sha256 = 1rwmdkzwshhi6b27zff42gg65vds866l68h33p4kn6pq1rns3bz4;
+ version = 3.2.0.6;
+ sha256 = 11jdajciswswv9ciyd6hk7qc39l09y9s528vazxq0k6z5mwvwrbp;
buildDepends = [
-binary blazeHtml hamlet hopenssl mtl pandoc parsec regexBase
+binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase
regexPcre snapCore snapServer tagsoup time
];
meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29085 - in nixpkgs/trunk/pkgs: development/libraries/haskell/primitive top-level
Author: simons
Date: Wed Sep 7 16:53:20 2011
New Revision: 29085
URL: https://svn.nixos.org/websvn/nix/?rev=29085sc=1
Log:
haskell-primitive: added version 0.4.0.1
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/0.3.1.nix
- copied, changed from r29084,
nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix
- copied, changed from r29084,
nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/0.3.1.nix (from
r29084, nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/default.nix)
==
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix (from
r29084, nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/default.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/default.nix
Wed Sep 7 16:53:15 2011(r29084, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix
Wed Sep 7 16:53:20 2011(r29085)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = primitive;
- version = 0.3.1;
- sha256 = 1903hx88ax4dgyyx00a0k86jy4mkqrprpn7arfy19dqqyfpb2ikj;
+ version = 0.4.0.1;
+ sha256 = 08j7js5y2vk3ywfhs260fxngd725xkvhrp20dcwb67fk8qgxh4bz;
meta = {
homepage = http://code.haskell.org/primitive;;
description = Wrappers for primitive operations;
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Sep 7 16:53:15
2011(r29084)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Sep 7 16:53:20
2011(r29085)
@@ -909,7 +909,9 @@
prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
- primitive = callPackage ../development/libraries/haskell/primitive {};
+ primitive_0_3_1 = callPackage
../development/libraries/haskell/primitive/0.3.1.nix {};
+ primitive_0_4_0_1 = callPackage
../development/libraries/haskell/primitive/0.4.0.1.nix {};
+ primitive = self.primitive_0_3_1;
processLeksah = callPackage
../development/libraries/haskell/leksah/process-leksah.nix {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29086 - in nixpkgs/trunk/pkgs: development/libraries/haskell/vector top-level
Author: simons
Date: Wed Sep 7 16:53:27 2011
New Revision: 29086
URL: https://svn.nixos.org/websvn/nix/?rev=29086sc=1
Log:
haskell-vector: added version 0.9
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/vector/0.7.1.nix
- copied, changed from r29085,
nixpkgs/trunk/pkgs/development/libraries/haskell/vector/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/vector/0.9.nix
- copied, changed from r29085,
nixpkgs/trunk/pkgs/development/libraries/haskell/vector/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/vector/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/vector/0.7.1.nix (from r29085,
nixpkgs/trunk/pkgs/development/libraries/haskell/vector/default.nix)
==
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/vector/0.9.nix (from r29085,
nixpkgs/trunk/pkgs/development/libraries/haskell/vector/default.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/vector/default.nix Wed Sep
7 16:53:20 2011(r29085, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/vector/0.9.nix Wed Sep
7 16:53:27 2011(r29086)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = vector;
- version = 0.7.1;
- sha256 = 1cdbkabw49pgc1j5h96inpmhn8ly230885d22smmynrq369pmg07;
+ version = 0.9;
+ sha256 = 0m8sfp924sw5dwr9a63jgsbj98qm9nyy903842x6ii4ljb1cpynz;
buildDepends = [ primitive ];
meta = {
homepage = http://code.haskell.org/vector;;
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Sep 7 16:53:20
2011(r29085)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Sep 7 16:53:27
2011(r29086)
@@ -1168,7 +1168,11 @@
Vec = callPackage ../development/libraries/haskell/Vec {};
- vector = callPackage ../development/libraries/haskell/vector {};
+ vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix
{};
+ vector_0_9 = callPackage ../development/libraries/haskell/vector/0.9.nix {
+primitive = self.primitive_0_4_0_1;
+ };
+ vector = self.vector_0_7_1;
vectorAlgorithms_0_4 = callPackage
../development/libraries/haskell/vector-algorithms/0.4.nix {};
vectorAlgorithms_0_5_3 = callPackage
../development/libraries/haskell/vector-algorithms/0.5.3.nix {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29087 - nixpkgs/trunk/pkgs/tools/text/wdiff
Author: simons
Date: Wed Sep 7 16:53:30 2011
New Revision: 29087
URL: https://svn.nixos.org/websvn/nix/?rev=29087sc=1
Log:
wdiff: updated to version 1.0.0
Modified:
nixpkgs/trunk/pkgs/tools/text/wdiff/default.nix
Modified: nixpkgs/trunk/pkgs/tools/text/wdiff/default.nix
==
--- nixpkgs/trunk/pkgs/tools/text/wdiff/default.nix Wed Sep 7 16:53:27
2011(r29086)
+++ nixpkgs/trunk/pkgs/tools/text/wdiff/default.nix Wed Sep 7 16:53:30
2011(r29087)
@@ -1,13 +1,19 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, which, screen }:
-stdenv.mkDerivation rec {
- name = wdiff-0.6.5;
+let
+ name = wdiff-1.0.0;
+in
+stdenv.mkDerivation {
+ inherit name;
src = fetchurl {
url = mirror://gnu/wdiff/${name}.tar.gz;
-sha256 = 1fij74hni4mi1zipf5is8kr1i9cssyyq5kqqhcxi0j7mynb5d1sm;
+sha256 = 00p0yww8dfszzhbwkfl4v5l9r55v9qznx3p089l2m2drjb1ahp3v;
};
+ # Required for the compile-time for the test suite.
+ buildInputs = [ which screen ];
+
doCheck = true;
meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29088 - nixos/trunk/tests
Author: eelco Date: Wed Sep 7 17:25:16 2011 New Revision: 29088 URL: https://svn.nixos.org/websvn/nix/?rev=29088sc=1 Log: * Make yet another test more reliable. Modified: nixos/trunk/tests/openssh.nix Modified: nixos/trunk/tests/openssh.nix == --- nixos/trunk/tests/openssh.nix Wed Sep 7 16:53:30 2011(r29087) +++ nixos/trunk/tests/openssh.nix Wed Sep 7 17:25:16 2011(r29088) @@ -29,6 +29,7 @@ $client-copyFileFromHost(key, /root/.ssh/id_dsa); $client-mustSucceed(chmod 600 /root/.ssh/id_dsa); +$client-waitForJob(network-interfaces); $client-mustSucceed(ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world'); ''; } ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29089 - in nixpkgs/trunk/pkgs: development/libraries/haskell/repa top-level
Author: simons
Date: Wed Sep 7 17:29:38 2011
New Revision: 29089
URL: https://svn.nixos.org/websvn/nix/?rev=29089sc=1
Log:
haskell-repa: updated to version 2.2.0.1
Note that the latest version requires GHC 7.2.1 or later; older GHC
versions are no longer supported.
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/repa/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/repa/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/repa/default.nix Wed Sep
7 17:25:16 2011(r29088)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/repa/default.nix Wed Sep
7 17:29:38 2011(r29089)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = repa;
- version = 2.1.1.5;
- sha256 = 14lq6nsifxsap98c1hpxsyv4g973vyzjn2s94b3vfzkbq8vd7695;
+ version = 2.2.0.1;
+ sha256 = 016cigxivjd17g0hysf76b3lznjpk478q0hg9hsy154ms7xap3dy;
buildDepends = [ QuickCheck vector ];
meta = {
homepage = http://repa.ouroborus.net;;
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Sep 7 17:25:16
2011(r29088)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Sep 7 17:29:38
2011(r29089)
@@ -989,7 +989,9 @@
regular = callPackage ../development/libraries/haskell/regular {};
- repa = callPackage ../development/libraries/haskell/repa {};
+ repa = callPackage ../development/libraries/haskell/repa {
+vector = self.vector_0_9;
+ };
repaAlgorithms = callPackage
../development/libraries/haskell/repa-algorithms {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29090 - nixpkgs/trunk/pkgs/development/libraries/haskell/repa-algorithms
Author: simons
Date: Wed Sep 7 17:29:42 2011
New Revision: 29090
URL: https://svn.nixos.org/websvn/nix/?rev=29090sc=1
Log:
haskell-repa-algorithms: updated to version 2.2.0.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/repa-algorithms/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/repa-algorithms/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/repa-algorithms/default.nix
Wed Sep 7 17:29:38 2011(r29089)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/repa-algorithms/default.nix
Wed Sep 7 17:29:42 2011(r29090)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = repa-algorithms;
- version = 2.1.0.1;
- sha256 = 101j18s2vqaxls87jzrlhzy2hlhqvgs27cs89j187c1s8z5vvjjg;
+ version = 2.2.0.1;
+ sha256 = 1ggxa2h2swgf7621nrzlqmmyi3h2v526w69zcwvms84kyd257p4p;
buildDepends = [ repa vector ];
meta = {
homepage = http://repa.ouroborus.net;;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29091 - nixpkgs/trunk/pkgs/development/libraries/haskell/repa-bytestring
Author: simons
Date: Wed Sep 7 17:29:46 2011
New Revision: 29091
URL: https://svn.nixos.org/websvn/nix/?rev=29091sc=1
Log:
haskell-repa-bytestring: updated to version 2.2.0.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/repa-bytestring/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/repa-bytestring/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/repa-bytestring/default.nix
Wed Sep 7 17:29:42 2011(r29090)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/repa-bytestring/default.nix
Wed Sep 7 17:29:46 2011(r29091)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = repa-bytestring;
- version = 2.1.0.1;
- sha256 = 01kvbd1kn0irldnfihhxa2jrz8fy1x9g7vz60ffgagj6yzp4bsnq;
+ version = 2.2.0.1;
+ sha256 = 0yc814wyiy5cb9j04515rv24mm4qd5xqyz2dxsmg1p46qb69hvsg;
buildDepends = [ repa vector ];
meta = {
homepage = http://repa.ouroborus.net;;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29092 - nixpkgs/trunk/pkgs/development/libraries/haskell/repa-examples
Author: simons
Date: Wed Sep 7 17:29:50 2011
New Revision: 29092
URL: https://svn.nixos.org/websvn/nix/?rev=29092sc=1
Log:
haskell-repa-examples: updated to version 2.2.0.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/repa-examples/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/repa-examples/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/repa-examples/default.nix
Wed Sep 7 17:29:46 2011(r29091)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/repa-examples/default.nix
Wed Sep 7 17:29:50 2011(r29092)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = repa-examples;
- version = 2.1.0.2;
- sha256 = 056y2x8kada4d6a89sni2469c736z3d9ldp188n3i58h4kjqqfq7;
+ version = 2.2.0.1;
+ sha256 = 0rqpq4v2ir86x9z0aw8pcz929imcw9lf415j88kg12x2rk451mm0;
isLibrary = false;
isExecutable = true;
buildDepends = [ random repa repaAlgorithms repaIo vector ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29093 - nixpkgs/trunk/pkgs/development/libraries/haskell/repa-io
Author: simons
Date: Wed Sep 7 17:29:54 2011
New Revision: 29093
URL: https://svn.nixos.org/websvn/nix/?rev=29093sc=1
Log:
haskell-repa-io: updated to version 2.2.0.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/repa-io/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/repa-io/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/repa-io/default.nix
Wed Sep 7 17:29:50 2011(r29092)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/repa-io/default.nix
Wed Sep 7 17:29:54 2011(r29093)
@@ -1,10 +1,10 @@
-{ cabal, bmp, repa, repaBytestring }:
+{ cabal, binary, bmp, repa, repaBytestring, vector }:
cabal.mkDerivation (self: {
pname = repa-io;
- version = 2.1.0.1;
- sha256 = 1mjv90rr1vymrnv5kz8i4kvjal6mwhb2042ylbdggvv8hjsc8awq;
- buildDepends = [ bmp repa repaBytestring ];
+ version = 2.2.0.1;
+ sha256 = 1akp6xkfvbc7jmnzlrz4y5fncqrv9d06y981dndcv6lgxz4hv4j1;
+ buildDepends = [ binary bmp repa repaBytestring vector ];
meta = {
homepage = http://repa.ouroborus.net;;
description = Read and write Repa arrays in various formats;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29094 - nixpkgs/trunk/pkgs/top-level
Author: simons
Date: Wed Sep 7 17:29:59 2011
New Revision: 29094
URL: https://svn.nixos.org/websvn/nix/?rev=29094sc=1
Log:
haskell-packages.nix: disable repaExamples in all instances of haskellPackages
older than GHC 7.2
Without this hack, nix-env -u * would update repa-examples to the GHC 7.0.4
version, because the package isn't tagged with the version of the compiler.
Repa and friends don't build with older GHCs anymore, though.
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 Wed Sep 7 17:29:54
2011(r29093)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Sep 7 17:29:59
2011(r29094)
@@ -194,6 +194,7 @@
haskellPlatform = self.haskellPlatform_2011_2_0_1;
mtl1 = self.mtl_1_1_1_1;
text = self.text_0_11_1_5;
+ repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
};
haskellPlatform_2011_2_0_1 =
@@ -235,6 +236,7 @@
self : self.haskellPlatformArgs_2011_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2011_2_0_0;
mtl1 = self.mtl_1_1_1_1;
+ repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
};
haskellPlatform_2011_2_0_0 =
@@ -272,6 +274,7 @@
haskellPlatformDefaults_2010_2_0_0 =
self : self.haskellPlatformArgs_2010_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2010_2_0_0;
+ repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
};
haskellPlatform_2010_2_0_0 =
@@ -308,6 +311,7 @@
self : self.haskellPlatformArgs_2010_1_0_0 self // {
haskellPlatform = self.haskellPlatform_2010_1_0_0;
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
+ repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
};
haskellPlatform_2010_1_0_0 =
@@ -345,6 +349,7 @@
self : self.haskellPlatformArgs_2009_2_0_2 self // {
haskellPlatform = self.haskellPlatform_2009_2_0_2;
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
+ repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
};
haskellPlatform_2009_2_0_2 =
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29095 - nixpkgs/trunk/pkgs/top-level
Author: simons
Date: Wed Sep 7 17:30:02 2011
New Revision: 29095
URL: https://svn.nixos.org/websvn/nix/?rev=29095sc=1
Log:
haskell-flapjax: build this package with the latest version of WebBits
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 Wed Sep 7 17:29:59
2011(r29094)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Sep 7 17:30:02
2011(r29095)
@@ -1288,9 +1288,7 @@
epic = callPackage ../development/compilers/epic {};
- flapjax = callPackage ../development/compilers/flapjax {
-WebBits = self.WebBits_1_0;
- };
+ flapjax = callPackage ../development/compilers/flapjax {};
helium = callPackage ../development/compilers/helium {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29096 - in nixpkgs/trunk/pkgs: development/libraries/haskell/WebBits-Html top-level
Author: simons
Date: Wed Sep 7 17:30:07 2011
New Revision: 29096
URL: https://svn.nixos.org/websvn/nix/?rev=29096sc=1
Log:
haskell-WebBits-Html: added version 1.0.2
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
- copied, changed from r29095,
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits-Html/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
- copied, changed from r29095,
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits-Html/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits-Html/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix (from
r29095,
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits-Html/default.nix)
==
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix (from
r29095,
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits-Html/default.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits-Html/default.nix
Wed Sep 7 17:30:02 2011(r29095, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
Wed Sep 7 17:30:07 2011(r29096)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = WebBits-Html;
- version = 1.0.1;
- sha256 = 134rmm5ccfsjdr0pdwn2mf81l81rgxapa3wjjfjkxrkxq6hav35n;
+ version = 1.0.2;
+ sha256 = 18dd52970cd27kra4l89vvrx2mrdbqd4w4f76xrq3142daxsagal;
buildDepends = [ mtl parsec syb WebBits ];
meta = {
homepage = http://www.cs.brown.edu/research/plt/;;
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Sep 7 17:30:02
2011(r29095)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Sep 7 17:30:07
2011(r29096)
@@ -771,6 +771,7 @@
JsContracts = callPackage ../development/libraries/haskell/JsContracts {
WebBits = self.WebBits_1_0;
+WebBitsHtml = self.WebBitsHtml_1_0_1;
};
json = callPackage ../development/libraries/haskell/json/default.nix {};
@@ -1207,7 +1208,9 @@
};
WebBits = self.WebBits_2_0;
- WebBitsHtml = callPackage ../development/libraries/haskell/WebBits-Html {};
+ WebBitsHtml_1_0_1 = callPackage
../development/libraries/haskell/WebBits-Html/1.0.1.nix {};
+ WebBitsHtml_1_0_2 = callPackage
../development/libraries/haskell/WebBits-Html/1.0.2.nix {};
+ WebBitsHtml = self.WebBitsHtml_1_0_2;
webRoutes = callPackage ../development/libraries/haskell/web-routes {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29097 - nixpkgs/trunk/pkgs/development/libraries/haskell/MissingH
Author: simons
Date: Wed Sep 7 17:41:00 2011
New Revision: 29097
URL: https://svn.nixos.org/websvn/nix/?rev=29097sc=1
Log:
haskell-MissingH: updated to version 1.1.1.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/MissingH/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/MissingH/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/MissingH/default.nix
Wed Sep 7 17:30:07 2011(r29096)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/MissingH/default.nix
Wed Sep 7 17:41:00 2011(r29097)
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = MissingH;
- version = 1.1.0.3;
- sha256 = 2d566511e8a347189cf864188d97f8406c6958c6f0a6fcf8cb1593c6bae13dbf;
+ version = 1.1.1.0;
+ sha256 = 1i2fdr6p0jnn9w865ngjcchbsamrvnvdf9c4vzhjhzy500z2k1ry;
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -13,7 +13,7 @@
meta = {
homepage = http://software.complete.org/missingh;;
description = Large utility library;
-license = GPL;
+license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29098 - nixpkgs/trunk/pkgs/development/libraries/neon
Author: eelco
Date: Wed Sep 7 18:08:59 2011
New Revision: 29098
URL: https://svn.nixos.org/websvn/nix/?rev=29098sc=1
Log:
* Updated neon to 0.29.6.
Modified:
nixpkgs/trunk/pkgs/development/libraries/neon/0.29.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/neon/0.29.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/neon/0.29.nix Wed Sep 7
17:41:00 2011(r29097)
+++ nixpkgs/trunk/pkgs/development/libraries/neon/0.29.nix Wed Sep 7
18:08:59 2011(r29098)
@@ -10,11 +10,11 @@
assert static || shared;
stdenv.mkDerivation rec {
- name = neon-0.29.3;
+ name = neon-0.29.6;
src = fetchurl {
url = http://www.webdav.org/neon/${name}.tar.gz;;
-sha256 = 1d1c6zhr00yvg0fbhpkq8kmsq9cchr112ii9rl39gdybyflh9444;
+sha256 = 0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w;
};
buildInputs = [libxml2 pkgconfig openssl]
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] CFQ I/O scheduler can't boot my system
4e64f7f0.5060...@shealevy.com) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 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? This should be fixed now (r29027, tested with Linux 2.6.35). I still get this hang unless I set elevator=noop at boot. Using linuxPackages_2_6_39. I also ran into this issue today with both linuxPackages_2_6_39 and linuxPackages_2_6_38_ati My data point: Linux 3.0.4, broken before the fix, works now. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29099 - nixpkgs/trunk/pkgs/os-specific/linux/cpufrequtils
Author: cillian
Date: Wed Sep 7 19:52:33 2011
New Revision: 29099
URL: https://svn.nixos.org/websvn/nix/?rev=29099sc=1
Log:
The hash for cpufrequtils 005 has changed, updating to 008
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/cpufrequtils/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/cpufrequtils/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/cpufrequtils/default.nix Wed Sep
7 18:08:59 2011(r29098)
+++ nixpkgs/trunk/pkgs/os-specific/linux/cpufrequtils/default.nix Wed Sep
7 19:52:33 2011(r29099)
@@ -3,11 +3,11 @@
assert stdenv.isLinux stdenv.system != powerpc-linux;
stdenv.mkDerivation {
- name = cpufrequtils-005;
+ name = cpufrequtils-008;
src = fetchurl {
-url =
http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-005.tar.gz;
-md5 = 100a8220a546ce61ce943d4107e67db9;
+url =
http://kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz;
+md5 = 52d3e09e47ffef634833f7fab168eccf;
};
patchPhase = ''
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] disabling pulseaudio in kde
It appears to me that flashplayer 10 is causing pulseaudio to startup. Why would that happen? -- Russell O'Connor http://r6.ca/ ``All talk about `theft,''' the general counsel of the American Graphophone Company wrote, ``is the merest claptrap, for there exists no property in ideas musical, literary or artistic, except as defined by statute.'' ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29100 - in nixpkgs/trunk/pkgs: development/libraries/haskell/system-fileio development/libraries/haskell/system-filepath top-level
Author: simons
Date: Wed Sep 7 20:21:01 2011
New Revision: 29100
URL: https://svn.nixos.org/websvn/nix/?rev=29100sc=1
Log:
haskell-system-filepath: added version 0.4.1
haskell-system-fileio: added version 0.3.2
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/system-fileio/
nixpkgs/trunk/pkgs/development/libraries/haskell/system-fileio/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/system-filepath/
nixpkgs/trunk/pkgs/development/libraries/haskell/system-filepath/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/system-fileio/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/system-fileio/default.nix
Wed Sep 7 20:21:01 2011(r29100)
@@ -0,0 +1,18 @@
+{ cabal, systemFilepath, text, time }:
+
+cabal.mkDerivation (self: {
+ pname = system-fileio;
+ version = 0.3.2;
+ sha256 = 10s0mih3mhpm0mh424kk330680qplwaddffr4rm4cf1bi7gbzrcq;
+ buildDepends = [ systemFilepath text time ];
+ meta = {
+homepage = https://john-millikin.com/software/hs-fileio/;;
+description = High-level filesystem interaction;
+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/system-filepath/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/system-filepath/default.nix
Wed Sep 7 20:21:01 2011(r29100)
@@ -0,0 +1,18 @@
+{ cabal, text }:
+
+cabal.mkDerivation (self: {
+ pname = system-filepath;
+ version = 0.4.1;
+ sha256 = 0jb32516xiwgbvr68yrf142fnzxfhn2dwh48nfr06gz65l7y4fcx;
+ buildDepends = [ text ];
+ meta = {
+homepage = https://john-millikin.com/software/hs-filepath/;;
+description = High-level, byte-based file and directory path
manipulations;
+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
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Sep 7 19:52:33
2011(r29099)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Sep 7 20:21:01
2011(r29100)
@@ -1093,6 +1093,10 @@
svgcairo = callPackage ../development/libraries/haskell/svgcairo {};
+ systemFilepath = callPackage
../development/libraries/haskell/system-filepath {};
+
+ systemFileio = callPackage ../development/libraries/haskell/system-fileio {};
+
tabular = callPackage ../development/libraries/haskell/tabular {};
tagged = callPackage ../development/libraries/haskell/tagged {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29101 - nixos/trunk/modules/system/boot
Author: simons
Date: Wed Sep 7 20:36:13 2011
New Revision: 29101
URL: https://svn.nixos.org/websvn/nix/?rev=29101sc=1
Log:
modules/system/boot/kernel.nix: stripped trailing whitespace
Modified:
nixos/trunk/modules/system/boot/kernel.nix
Modified: nixos/trunk/modules/system/boot/kernel.nix
==
--- nixos/trunk/modules/system/boot/kernel.nix Wed Sep 7 20:21:01 2011
(r29100)
+++ nixos/trunk/modules/system/boot/kernel.nix Wed Sep 7 20:36:13 2011
(r29101)
@@ -9,7 +9,7 @@
## interface
options = {
-
+
boot.kernelPackages = mkOption {
default = pkgs.linuxPackages;
# We don't want to evaluate all of linuxPackages for the manual
@@ -89,7 +89,7 @@
include it in optionboot.initrd.kernelModules/option.
'';
};
-
+
boot.initrd.kernelModules = mkOption {
default = [];
description = List of modules that are always loaded by the initrd.;
@@ -116,16 +116,16 @@
config = {
system.build = { inherit kernel; };
-
+
system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
boot.kernelParams =
[ splash=verbose
# Force the Completely Fair Scheduler to be used by default.
elevator=cfq
- ] ++
+ ] ++
optional config.boot.vesa vga=0x317;
-
+
boot.kernelModules = [ loop ];
boot.initrd.availableKernelModules =
@@ -134,7 +134,7 @@
# detects them, but I'm keeping them for now for backwards
# compatibility.
-# Some SATA/PATA stuff.
+# Some SATA/PATA stuff.
ahci
sata_nv
sata_via
@@ -168,11 +168,11 @@
# Misc. stuff.
pcips2 serio atkbd xtkbd
];
-
+
boot.initrd.kernelModules =
[ # For LVM.
dm_mod
-
+
# For usual AT keyboards.
i8042
@@ -184,5 +184,5 @@
hardware.firmware = [ ${kernel}/lib/firmware ];
};
-
+
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] CFQ I/O scheduler can't boot my system
On Wed, Sep 07, 2011 at 10:46:43PM +0400, Michael Raskin wrote: 4e64f7f0.5060...@shealevy.com) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 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? This should be fixed now (r29027, tested with Linux 2.6.35). I still get this hang unless I set elevator=noop at boot. Using linuxPackages_2_6_39. I also ran into this issue today with both linuxPackages_2_6_39 and linuxPackages_2_6_38_ati My data point: Linux 3.0.4, broken before the fix, works now. I imagine that putting that CFQ into the kernel will make all work. Isn't that an acceptable option? ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29102 - in nixpkgs/trunk/pkgs/applications/version-management/git-and-tools: . git
Author: urkud
Date: Wed Sep 7 22:52:52 2011
New Revision: 29102
URL: https://svn.nixos.org/websvn/nix/?rev=29102sc=1
Log:
git doesn't need subversion server
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/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
Wed Sep 7 20:36:13 2011(r29101)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Wed Sep 7 22:52:52 2011(r29102)
@@ -10,7 +10,7 @@
git = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
- cpio tcl tk makeWrapper subversion;
+ cpio tcl tk makeWrapper subversionClient;
svnSupport = false;# for git-svn support
guiSupport = false;# requires tcl/tk
sendEmailSupport = false; # requires plenty of perl libraries
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
==
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Wed Sep 7 20:36:13 2011(r29101)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Wed Sep 7 22:52:52 2011(r29102)
@@ -1,14 +1,14 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio,
gnugrep
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper
-, svnSupport, subversion, perlLibs, smtpPerlLibs
+, svnSupport, subversionClient, perlLibs, smtpPerlLibs
, guiSupport
, pythonSupport ? true
, sendEmailSupport
}:
let
- svn = subversion.override { perlBindings = true; };
+ svn = subversionClient.override { perlBindings = true; };
in
stdenv.mkDerivation rec {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29103 - nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano
Author: urkud
Date: Wed Sep 7 22:53:11 2011
New Revision: 29103
URL: https://svn.nixos.org/websvn/nix/?rev=29103sc=1
Log:
soprano: find virtuoso without LD_LIBRARY_PATH hack
Now it finds virtuoso driver provided that virtuoso-t binary is in PATH.
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix Wed Sep
7 22:52:52 2011(r29102)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix Wed Sep
7 22:53:11 2011(r29103)
@@ -14,6 +14,7 @@
name = soprano-virtuoso-restart.patch;
sha256 = 0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y;
})
+ ./find-virtuoso.patch
];
# We disable the Java backend, since we do not need them and they make the
closure size much bigger
Added: nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch
Wed Sep 7 22:53:11 2011(r29103)
@@ -0,0 +1,77 @@
+From: Yury G. Kudryashov urkud.ur...@gmail.com
+Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH
+
+---
+ backends/virtuoso/virtuosobackend.cpp | 29 -
+ backends/virtuoso/virtuosobackend.h |2 +-
+ 2 files changed, 21 insertions(+), 10 deletions(-)
+
+diff --git a/backends/virtuoso/virtuosobackend.cpp
b/backends/virtuoso/virtuosobackend.cpp
+index c83605d..c24854e 100644
+--- a/backends/virtuoso/virtuosobackend.cpp
b/backends/virtuoso/virtuosobackend.cpp
+@@ -188,19 +188,19 @@ namespace {
+
+ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const
+ {
+-#ifndef Q_OS_WIN
+-if ( findVirtuosoDriver().isEmpty() ) {
+-qDebug() Q_FUNC_INFO could not find Virtuoso ODBC driver;
+-return false;
+-}
+-#endif
+-
+ QString virtuosoBin = VirtuosoController::locateVirtuosoBinary();
+ if ( virtuosoBin.isEmpty() ) {
+ qDebug() Q_FUNC_INFO could not find virtuoso-t binary;
+ return false;
+ }
+
++#ifndef Q_OS_WIN
++if ( findVirtuosoDriver(virtuosoBin).isEmpty() ) {
++qDebug() Q_FUNC_INFO could not find Virtuoso ODBC driver;
++return false;
++}
++#endif
++
+ QString vs = determineVirtuosoVersion( virtuosoBin );
+ if ( vs.isEmpty() ) {
+ qDebug() Q_FUNC_INFO Failed to determine version of the
Virtuoso server at virtuosoBin;
+@@ -217,9 +217,20 @@ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const
+
+
+ #ifndef Q_OS_WIN
+-QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() const
++QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString
virtuosoBinHint ) const
+ {
+-return Soprano::findLibraryPath( virtodbc_r, QStringList(),
QStringList() QLatin1String( virtuoso/plugins/ ) QLatin1String( odbc/
) );
++QString virtuosoBin;
++if (virtuosoBinHint.isEmpty())
++virtuosoBin = VirtuosoController::locateVirtuosoBinary();
++else
++virtuosoBin = virtuosoBinHint;
++
++QDir virtuosoBinDir = QFileInfo(virtuosoBin).absoluteDir();
++return Soprano::findLibraryPath( virtodbc_r,
++QStringList() virtuosoBinDir.absolutePath()
++ virtuosoBinDir.absoluteFilePath(../lib),
++QStringList() QLatin1String( virtuoso/plugins/ )
++QLatin1String( odbc/ ) );
+ }
+ #endif
+
+diff --git a/backends/virtuoso/virtuosobackend.h
b/backends/virtuoso/virtuosobackend.h
+index 3971b83..0807e5d 100644
+--- a/backends/virtuoso/virtuosobackend.h
b/backends/virtuoso/virtuosobackend.h
+@@ -50,7 +50,7 @@ namespace Soprano {
+
+ #ifndef Q_OS_WIN
+ private:
+-QString findVirtuosoDriver() const;
++QString findVirtuosoDriver(const QString virtuosoBinHint =
QString()) const;
+ #endif
+ };
+ }
+--
+tg: (432b73f..) t/find-virtuoso (depends on: master)
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29104 - nixpkgs/trunk/pkgs/desktops/kde-4.7/kdesdk
Author: urkud
Date: Wed Sep 7 22:53:20 2011
New Revision: 29104
URL: https://svn.nixos.org/websvn/nix/?rev=29104sc=1
Log:
kioslave-svn does not need subversion server
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix Wed Sep 7
22:53:11 2011(r29103)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix Wed Sep 7
22:53:20 2011(r29104)
@@ -1,7 +1,7 @@
-{ kde, kdelibs, subversion, apr, aprutil }:
+{ kde, kdelibs, subversionClient, apr, aprutil }:
kde {
- buildInputs = [ kdelibs subversion apr aprutil ];
+ buildInputs = [ kdelibs subversionClient apr aprutil ];
patches = [ ./find-svn.patch ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29105 - nixpkgs/trunk/pkgs/development/libraries/ntrack
Author: urkud
Date: Wed Sep 7 22:53:31 2011
New Revision: 29105
URL: https://svn.nixos.org/websvn/nix/?rev=29105sc=1
Log:
Apply upstream patches to ntrack\n\nProbably fixes 100% CPU problem in kded
module
Modified:
nixpkgs/trunk/pkgs/development/libraries/ntrack/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/ntrack/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/ntrack/default.nix Wed Sep 7
22:53:20 2011(r29104)
+++ nixpkgs/trunk/pkgs/development/libraries/ntrack/default.nix Wed Sep 7
22:53:31 2011(r29105)
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python }:
+{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python, automake
+, autoconf }:
let
version = 014;
@@ -14,11 +15,27 @@
buildInputs = [ libnl qt4 ];
- buildNativeInputs = [ pkgconfig python ];
+ buildNativeInputs = [ pkgconfig python automake autoconf ];
configureFlags = --without-gobject CFLAGS=--std=gnu99;
- postPatch = ''
-sed -e s@/usr\(/lib/ntrack/modules/\)@$out@ -i common/ntrack.c
+ patchP0 = fetchurl {
+url = http://bazaar.launchpad.net/~asac/ntrack/main/diff/312/309;
+name = ntrack-bzr-309-to-312.patch;
+sha256 = 1bpjpikln2i7nsmd2gl82g08yzaqac311sgsva7z7pqccxz0vsj5;
+ };
+
+ patchP1 = fetchurl {
+url =
https://bugs.launchpad.net/ntrack/+bug/750554/+attachment/2291609/+files/ntrack_libnl_link.diff;;
+sha256 = 1al6wfjph7nmck1q2q2z98cnzcrwpln2wwh45xynsxr6wgczwck6;
+ };
+
+ patchPhase =
+''
+ patch -p0 ${patchP0}
+ patch -p1 ${patchP1}
+ sed -e s@/usr\(/lib/ntrack/modules/\)@$out@ -i common/ntrack.c
'';
+
+ preConfigure = automake; # The second patch changes Makefile.am files
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29102 - in nixpkgs/trunk/pkgs/applications/version-management/git-and-tools: . git
On 09/08/2011 12:52 AM, Yury G. Kudryashov wrote:
+ svn = subversionClient.override { perlBindings = true; };
Why do we need to use a separate build of Subversion here?
Doesn't this just cause all KDE users to have two (or more) copies of
Subversion in their closures?
--
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29107 - nixos/trunk/modules/programs/bash
Author: urkud
Date: Wed Sep 7 23:11:04 2011
New Revision: 29107
URL: https://svn.nixos.org/websvn/nix/?rev=29107sc=1
Log:
Partially revert r2903
The nepomukvirtuoso problem is solved without polutting $QT_PLUGIN_PATH and/or
$LD_LIBRARY_PATH by patching soprano.
Modified:
nixos/trunk/modules/programs/bash/bashrc.sh
Modified: nixos/trunk/modules/programs/bash/bashrc.sh
==
--- nixos/trunk/modules/programs/bash/bashrc.sh Wed Sep 7 23:07:05 2011
(r29106)
+++ nixos/trunk/modules/programs/bash/bashrc.sh Wed Sep 7 23:11:04 2011
(r29107)
@@ -45,7 +45,7 @@
# KDE/Gnome stuff.
export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
export
STRIGI_PLUGIN_PATH=$i/lib/strigi/${STRIGI_PLUGIN_PATH:+:}$STRIGI_PLUGIN_PATH
-export
QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}:$i/lib:$QT_PLUGIN_PATH
+export
QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}:$QT_PLUGIN_PATH
export
QTWEBKIT_PLUGIN_PATH=$i/lib/mozilla/plugins/${QTWEBKIT_PLUGIN_PATH:+:}$QTWEBKIT_PLUGIN_PATH
export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] disabling pulseaudio in kde
On Wed, 7 Sep 2011, rocon...@theorem.ca wrote: It appears to me that flashplayer 10 is causing pulseaudio to startup. Why would that happen? Turns out deleteing my ~/.asoundrc file was the key to fixing my woes. -- Russell O'Connor http://r6.ca/ ``All talk about `theft,''' the general counsel of the American Graphophone Company wrote, ``is the merest claptrap, for there exists no property in ideas musical, literary or artistic, except as defined by statute.'' ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29103 - nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano
On 09/08/2011 12:53 AM, Yury G. Kudryashov wrote: Author: urkud Date: Wed Sep 7 22:53:11 2011 New Revision: 29103 URL: https://svn.nixos.org/websvn/nix/?rev=29103sc=1 Log: soprano: find virtuoso without LD_LIBRARY_PATH hack Heh. I actually patched Soprano as well, then threw the patch away since I figured it's much easier to just add it to the appropriate environment variables. -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29102 - in nixpkgs/trunk/pkgs/applications/version-management/git-and-tools: . git
Eelco Dolstra wrote:
On 09/08/2011 12:52 AM, Yury G. Kudryashov wrote:
+ svn = subversionClient.override { perlBindings = true; };
Why do we need to use a separate build of Subversion here?
Doesn't this just cause all KDE users to have two (or more) copies of
Subversion in their closures?
Why a KDE user would need the server part of subversion in the closure? I
think that only svn daemon needs the server part. Correct me if I'm wrong.
--
Yury G. Kudryashov,
mailto: ur...@mccme.ru
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Re: [Nix-commits] SVN commit: nix - r29102 - in nixpkgs/trunk/pkgs/applications/version-management/git-and-tools: . git
Hi,
On 09/08/2011 01:33 AM, Yury G. Kudryashov wrote:
On 09/08/2011 12:52 AM, Yury G. Kudryashov wrote:
+ svn = subversionClient.override { perlBindings = true; };
Why do we need to use a separate build of Subversion here?
Doesn't this just cause all KDE users to have two (or more) copies of
Subversion in their closures?
Why a KDE user would need the server part of subversion in the closure?
The subversion attribute in Nixpkgs is part of the NixOS base system
(and does *not* include the Apache module, btw).
--
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29021 - nixos/trunk/modules/misc
Nicolas Pierron wrote: Hi, I have 3 reasons to (...) give a separate syntax from ~/.nixpkgs/config.nix. I'm used to have nixpkgs.config = import /home/urkud/.nixpkgs/config.nix; in my configuration.nix. This simplifies maintaining nixpkgs options a lot. BTW, why do you think that packageOverrides is the only useful nixpkgs option? I use config.gems as well. Of couse, I can rewrite rubygems-nix magic to use packageOverrides but I'd prefer to have some time for this... So, _please_, notify about such incompatible changes in advance. -- Yury G. Kudryashov, mailto: ur...@mccme.ru ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: Re: [Nix-commits] SVN commit: nix - r29102 - in nixpkgs/trunk/pkgs/applications/version-management/git-and-tools: . git
Eelco Dolstra wrote:
Hi,
On 09/08/2011 01:33 AM, Yury G. Kudryashov wrote:
On 09/08/2011 12:52 AM, Yury G. Kudryashov wrote:
+ svn = subversionClient.override { perlBindings = true; };
Why do we need to use a separate build of Subversion here?
Doesn't this just cause all KDE users to have two (or more) copies of
Subversion in their closures?
Why a KDE user would need the server part of subversion in the closure?
The subversion attribute in Nixpkgs is part of the NixOS base system
(and does *not* include the Apache module, btw).
It seems that I made a mistake... Could you please explain the difference
between subversion and subversionClient in more details? Do we need
subversion (not svnClient) in the base system?
--
Yury G. Kudryashov,
mailto: ur...@mccme.ru
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29103 - nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano
Eelco Dolstra wrote: On 09/08/2011 12:53 AM, Yury G. Kudryashov wrote: Author: urkud Date: Wed Sep 7 22:53:11 2011 New Revision: 29103 URL: https://svn.nixos.org/websvn/nix/?rev=29103sc=1 Log: soprano: find virtuoso without LD_LIBRARY_PATH hack Heh. I actually patched Soprano as well, then threw the patch away since I figured it's much easier to just add it to the appropriate environment variables. The problem is that it is not really 'appropriate'. It is a bad idea to look for a file normally located in /usr/lib in /usr/lib/qt4/plugins... I'm going to push some changes upstream when I'll have time to write the code... -- Yury G. Kudryashov, mailto: ur...@mccme.ru ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
