from:"Yury G. Kudryashov"

Ludovic Courtès wrote:

 Hi Yury,
 If nobody will report that he needs pkgs.synaptics, I'll remove it.
 
 Ahem, I don’t think you can expect every user to be reading your message
 and answering it shortly.  So, if in doubt, better leave it.
From old Eelco's reply:
  The policy is to only keep the latest version unless there is a specific
  reason to keep older ones

synaptics is an old version of xf86inputsynaptics. sypantics does not work 
with xorg 7.5. Will remove unless someone has a specific reason to keep.

___
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 - 21100 - urkud - nixos/trunk/modules/services/x11/display-managers

Eelco Dolstra wrote:

 Hi,
 
 Yury G Kudryashov wrote:
 
 Log:
 Start ssh-agent or gpg-agent even if called by kdm
 ...
 -  # Handle being called by kdm.
 -  if test ''${1:0:1} = /; then eval exec $1; fi
 -
 ...
 +  # Handle being called by kdm.
 +  if test ''${1:0:1} = /; then eval exec $1; fi
 +
 
 Are you sure that this is correct / needed?  I use kdm and ssh-agent
 starts fine.
I use kdm and gpg-agent didn't start. Probably, you have ssh-agent somewhere 
in your autostart programs independently from Nix.

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

[Nix-dev] Re: Re: udev 151

Hi!

First of all, I talked upstream, and they don't want to search in 
getenv(something). OTOH, they will accept a patch that will add configure-
time option --with-firmware-path.

My proposal:
1. write this patch (will do).
2. set --with-firmware-path=/var/lib/udev/firmware
3. nix system expression creates /nix/store/hash-firmware with all needed 
firmware files.
4. udev job creates symlinks /nix/store/hash-firmware into 
/var/lib/udev/firmware.


Tony White wrote:
 2010/4/14 Lluís Batlle i Rossell virik...@gmail.com:
 Yeah, I agree with Lluís. /root/test-firmware is meant to be an impure
 path used for testing firmware without any need for a rebuild. That
 was my concern. Preserving the functionality.
Do you want to write a patch and maintain it forever?
 Please preserve the location and functionality if you can. There are
 plenty of kernel modules out there which do require firmware but there
 exists no nix expression in nixpkgs for. Many wireless adapters for
 example.
If you need some impure path, we can add ONE standard impure path 
(/root/test-firmware or /lib/firmware) to --with-firmware-path argument. 
Note that adding another argument will require full rebuild of all packages 
that depend on udev (for example, xorgserver).
 It also makes no sense for certain firmware blobs to have an
 expression in nixpkgs because of proprietary licensing terms. So it
 needs to be as easy as possible for someone new to nix to just get on
 line and build their own firmware derivations. Then they can use the
 purity provided by the nix store and remove their required firmware
 blob from the impure path.
It is easy to make firmwareDirs = [ /another/impure/path ] option work (just 
copy them into /nix/store). And this will give you easy rollback.

___
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 - 21101 - urkud - nixos/trunk/modules/config

Nicolas Pierron wrote:

 Hi Yury,
 
 inside a config attribute you should define
   pathsToLink = mkDefaultValue [/bin /sbin /lib /share/man
 /share/info /man /info];
Thanks, will fix today.
 In the case of pathsToLink, this could be debated to whatever we want
 to add a lower priority to it or just drop the mkDefaultValue.
I vote for dropping mkDefaultValue because these paths really needed.


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

[Nix-dev] Re: Re: Re: udev 151

2010-04-16 Thread Yury G. Kudryashov

Tony White wrote:

 On 15 April 2010 18:59, Yury G. Kudryashov urkud+...@ya.ru wrote:
 Hi!

 First of all, I talked upstream, and they don't want to search in
 getenv(something). OTOH, they will accept a patch that will add
 configure- time option --with-firmware-path.

 My proposal:
 1. write this patch (will do).
 2. set --with-firmware-path=/var/lib/udev/firmware
 3. nix system expression creates /nix/store/hash-firmware with all needed
 firmware files.
 4. udev job creates symlinks /nix/store/hash-firmware into
 /var/lib/udev/firmware.


 Hi all,
 Sigh.
 Do you want to write a patch and maintain it forever?
 No. I would kindly like to request that you maintain the current
 functionality if at all possible.
This was possible only because it was simple to patch old firmware.sh to add 
this functionality. This was never supported upstream.
 If you need some impure path, we can add ONE standard impure path
 (/root/test-firmware or /lib/firmware) to --with-firmware-path argument.
 Note that adding another argument will require full rebuild of all
 packages that depend on udev (for example, xorgserver).
 There you go. You've answered the question and my concern.
 Also, so what if it issues a rebuild. It is a big change, it's
 upstream's fault If anything and you have volunteered to do the work
 that will smash the bug that they have created when they have chose to
 ignore the good programming practice of using pure paths.
They were never use pure paths. And now they're ready to use pure path. 
They just want to hardcode them at build time. We can use /roote/test-
firmware:/var/lib/udev/firmware and symlink /var/lib/udev/firmware to 
/nix/store/hash-firmware at job start.

 At least they are willing to take a patch, many wouldn't and the
 maintain it forever Nonsense could still have happened (Maybe.) They
 still have to accept your patch and you still have to write it but I
 do have every confidence that you can make it work.
It is already written. I will fix a few typos in the patch, and they'll 
accept it.

 The low level stuff that is replacing hal is going to be need to be
 added to NixOS by someone in the future if we would like to use
 xserver 1.8 (Something called upower and udisk or something) And that
 will definitely trigger a big rebuild.
I have some ideas wrt xserver 1.8. Will write them later. It is not ready 
yet.
 So why not two paths, if possible, it goes in stdenv updates and gets
 merged when everyone is fully aware that a big rebuild will take
 place, so then there isn't a problem with it causing a fuss.
When udev-152 will be out with my patches, I'll add it as udev152.
 Have I missed something or is stenv updates not being used for exactly
 that purpose?


___
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 - 21131 - MarcWeber - in nixpkgs/trunk/pkgs: development/libraries development/libraries/wvstreams development/tools/misc development/tools/misc/usb-mod

2010-04-19 Thread Yury G. Kudryashov

Marc Weber wrote:

 yes, please do. That would be very much appreciated.
 So tell me how to rewrite the given example without duplicating text.
Look at another style proposal thread. My initial proposal is bad but 
Eelco Dolstra have proposed a nice syntax.

Eelco, may we start using this syntax in nixpgs?


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

[Nix-dev] Re: Re: Python packages in peril

2010-04-20 Thread Yury G. Kudryashov

Marc Weber wrote:
 
 b') switch to git and use b) style of development.
+1. Any other dvcs is also OK for me.
 I'd prefer b') because it would be fastest for everyone. Eg github
 nowadays even supports checking out and comitting using subversion !
I don't like github because it is not opensource. Why not gitorious?
 github nowadays even lets you comment commits. So when deciding which
 commits to move into a stable branch can be done fast because
 everybody has a chance to comment them.
So as gitorious.

___
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 - 21192 - urkud - in nixpkgs/branches/mass-update-01/pkgs: development/libraries/gpgme tools/security tools/security/gnupg tools/security/gnupg1 tools/s

2010-04-21 Thread Yury G. Kudryashov

Michael Raskin wrote:

 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA1
 
 On 04/21/2010 02:32 AM, Ludovic Courtès wrote:
 I think we shouldn’t make that symlink, because it’s a decision up to
 the GnuPG developers and there must be a good reason why they didn’t do
 it.
 
 The obvious reason not to make such symbolic links is to allow easier
 simultaneous installation of GnuPG 1 and GnuPG 2. If you have a package
 that cannot use GnuPG 2,
Any example?
 lack of such symlinks makes your life easier.
 In Nix this package will probably just get GnuPG 1 privately with no
 need to ever have GnuPG 1 and GnuPG 2 in PATH at once.
 
 On the other hand, if we want to replace obsolete GnuPG 1 with GnuPG 2
 (or try doing this), it is easier to do with such a symlink in place.
That was my intention. Other solution would be to create gnupg1compat 
package that just contains two symlinks. In this case the user will be able 
to choose between GnuPG 1 and GnuPG 2 with 1.x compatibility.
 How about removing these and optionally submitting the suggestion
 upstream?
 Asking upstream is a good idea; removing the symlinks immediately is
 probably not.
First, I'll look what other distros do. Will write about this later.

___
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 - 21235 - urkud - nixpkgs/branches/mass-update-01/pkgs/tools/security/gnupg

Ludovic Courtès wrote:

 Hi,
 
 Yury G Kudryashov ur...@mccme.ru writes:
 GnuPG tests fail without running gpg-agent
 
 Then it looks like a regression compared to 2.0.12.  For GNU programs
 “make check” alone should do the right thing, including starting
 auxiliary programs if needed.  Could you report it upstream?
Already written to gnupg-devel mailing list.
patchPhase = ''
 -find tests -type f | xargs sed -e 's@/bin/p...@pwd@g' -i
 +find tests -type f | xargs sed -e
 's@/bin/p...@${stdenv.coreutils}@g' -i
 Why is that necessary?
They write that they need pwd from coreutils, not shell builtin. That was 
the reason for hardcoding /bin/pwd. I'm trying to follow upstream as close 
as possible.

___
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 - 21235 - urkud - nixpkgs/branches/mass-update-01/pkgs/tools/security/gnupg

Ludovic Courtès wrote:

 Hi,
 
 Yury G. Kudryashov urkud+...@ya.ru writes:
 
 Yury G Kudryashov ur...@mccme.ru writes:
 GnuPG tests fail without running gpg-agent
 
 Then it looks like a regression compared to 2.0.12.  For GNU programs
 “make check” alone should do the right thing, including starting
 auxiliary programs if needed.  Could you report it upstream?
 Already written to gnupg-devel mailing list.
 
 Cool, thanks.  In that case, for packages I (co-)maintain at least, I
 prefer if there’s a link to the discussion so we don’t lose track of
 what’s going on.
http://lists.gnupg.org/pipermail/gnupg-devel/2010-April/025576.html
Sorry that I haven't disscussed my changes with you before commiting them.

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

[Nix-dev] udev-153

Hi!

Udev 153 released. New release does not allow us to rewrite firmware search 
path at runtime, but it allows us to specify --with-firmware-
path=path1:path2:... configure option.

I propose to use /var/run/firmware:/root/test-firmware path, and symlink 
/var/run/firmware to /nix/store/hash-firmware. /nix/store/hash-firmware will 
contain symlinks to all files in hardware.firmware directory. This will not 
allow us to modify the set of firmware files symlinked to /var/run/firmware 
after the system is built, but for emergency case we'll have impure 
/root/test-firmware path.

Any objections?

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

[Nix-dev] multiple-output derivations

Hi!

Today we've disscussed multiple-output derivations on IRC, and found out 
quite a few problems. I'll try to sum it up. The intention of my answers is 
to obtain some minimal usable configuration. In this configuration 
splitting will be used only for big projects, or for non-essential parts 
like documentation. Splitting into shared libs, binaries and 
development files would be more tricky.

Q: What should nix do if one of the outputs already exists (say, I've pulled 
this output as a dependency, or other were garbage-collected)?

A: We can use chroot builds, and ignore already existing paths.

Q: nix-language API

A: For example, derivation primop can take outputs array argument, and add 
outs = { out = out; outputs[0] = ...; ...} attribute to the result. Each 
output should be marked as a derivation.

Q: How should nix guess that .dev output needs .lib output?

A: nix-expr author should specify it manually for now. Probably, we should 
change the syntax from the previous question into the following:

derivation {
outs = rec {
bin = { depends = [ lib ]; };
lib = {};
dev = { depends = [ bin lib ]; };
};
}

Of course, circular dependencies must be avoided in this case.

Q: What should we add when someone says buildInputs = [ somelib ]?

A: Only main output.

Q: Should stdenv.mkDerivation automatically split every single package into 
bin+include+lib+doc?

A: I think that we should first test the feature with a few splitted 
packages.

I'm nearly sure that I've missed something. Comments are welcome.

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

[Nix-dev] distributed version control system

Hi!

I propose to move nix development to some dvcs. I hope that the advantages 
of such move are rather obvious. For example, it does not require 
contributor to have svn account.

1. Are there any objections?

2. Which dvcs system will we use? I use git but I have no strong 
preferences. I know that Michael Raskin doesn't like git.

3. Which hosting to use? If using git, I propose gitorious.org.

After discussing the previous questions, we'll need some migration plan.

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

[Nix-dev] Re: distributed version control system

Michael Raskin wrote:

 On 04/23/2010 10:27 AM, Yury G. Kudryashov wrote:
 1. Are there any objections?
 
 Well, there are some features that SVN has and many DVCS lack.
 a) checking out only a subdirectory. Most VCSes have branch granularity
 for checkouts.
If someone wants to commit to, say, nixpgs, he will need the whole nixpkgs 
tree to test his changes. So, I don't think that branch granularity is a 
problem.
 b) checking out only a specified revision.
 The question here is also about being able to commit after such partial
 checkouts..
If someone wants to commit, he will need head revision. I know that git 
support shallow clones with possibility to commit. Don't know about other 
dvcs.

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

[Nix-dev] Re: udev-153

Eelco Dolstra wrote:

 Hi,
 
 I propose to use /var/run/firmware:/root/test-firmware path, and symlink
 /var/run/firmware to /nix/store/hash-firmware. /nix/store/hash-firmware
 will contain symlinks to all files in hardware.firmware directory. This
 will not allow us to modify the set of firmware files symlinked to
 /var/run/firmware after the system is built, but for emergency case we'll
 have impure /root/test-firmware path.
 
 Sounds good, but to improve the atomicity of switching to a new
 configuration, you could use /var/run/current-system/firmware instead of
 /var/run/firmware (and then create a firmware symlink in the system
 derivation).
Actually, I've commited /etc/firmware yesterday. Of course, /etc/firmware 
will be symlinked to /etc/static/firmware.

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

[Nix-dev] Re: pkgs.synaptics

Marc Weber wrote:

 What is it used for ?
 It does no longer build.
I've already written about pkgs.synaptics a week ago. Sorry, forgotten to 
actually remove it. Will do in a few minutes.


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

[Nix-dev] Use, Support, etc.

2010-04-26 Thread Yury G. Kudryashov

Hi!

There are quite a few styles: guiSupport, perlBindings, useQt4, etc. What do 
you think about unifying the names? In the future this will allow us to have 
something like global use flags (I mean, nixpkgs.config.uses.useQt4 can 
pass useQt4 to all packages that request it).

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

[Nix-dev] Re: Re: udev-153

2010-04-26 Thread Yury G. Kudryashov

Lluís Batlle i Rossell wrote:

 On Mon, Apr 26, 2010 at 10:08:21AM +0200, Ludovic Courtès wrote:
 This sounds wrong to me.  And it seems wrong to expects things from
 outside the Nix store and outside /var/run/current-system.
 
 /root/test-firmware should be looked at only at run time, never at build
 time.
I hope that it is fixed now.
 
 Besides, what’s that directory supposed to contain?  It is suppose to
 host “test firmwares”, or to allow users to test firmwares, or what?
 It is mentioned in the udev firmware load path for the current udev
 version. This directory helped on some tricky situations when a user
 wanted to get a wireless lan adapter up manually having booted a nixos cd,
 or aircracking (some cards need special firmwares for that).


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

[Nix-dev] Re: Re: optionally copying configuration.nix into system derivation

2010-04-27 Thread Yury G. Kudryashov

Marc Weber wrote:

 Hi Ludovic Courtès,
 
 extraSystemBuilderCmds) b) extraSystemBuilderCmds
I vote for post* name.
   commit ac78f8935877f7a2aed194bf9398b54faa4952a1
   Author: Marc Weber marco-owe...@gmx.de
   Date:   Tue Apr 27 03:40:54 2010 +0200
 
   adding two new options:
   - system.copySystemConfiguration (requested by Ludovic Courtès)
   - system.extraSystemBuilderCmds
 
   diff --git a/lib/from-env.nix b/lib/from-env.nix
   index a7a339b..6bd71e4 100644
   --- a/lib/from-env.nix
   +++ b/lib/from-env.nix
   @@ -1,3 +1,4 @@
   +# TODO: remove this file. There is lib.maybeEnv now
name: default:
let value = builtins.getEnv name; in
if value ==  then default else value
   diff --git a/modules/services/x11/xserver.nix
   b/modules/services/x11/xserver.nix index e408000..68bfed8 100644
   --- a/modules/services/x11/xserver.nix
   +++ b/modules/services/x11/xserver.nix
   @@ -155,7 +155,7 @@ in

  modules = mkOption {
default = [];
   -example = [ pkgs.linuxwacom ];
   +example = [ pkgs.xorg.xf86inputsynaptics ];
Please, do not change unrelated examples in the same commit. BTW, why not 
mention both packages here?

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

[Nix-dev] [SPAM] git-svn, e-mails

2010-04-29 Thread Yury G. Kudryashov

Hi!

I plan to create a proper git-svn clone of nixpkgs. Then I'll push it to 
gitorious, and will use git branches for testing.

As you may know, git requires e-mails instead of logins. I took most of the 
e-mails from the recent ML history. Therefore, two questions:

1. I haven't found the e-mails of the following commiters (though I haven't 
spent too much time on searching):

LennartKats
amiddelk
andres
armijn
astsmtl
bdumitriu
cddouma
maggesi
mbravenboer
merijn
pjotrp
rbroek
root
skolthof
thammers
valentin
visser
wbreejen

Could you please tell me their e-mails? Else I'll use some dummy e-mails 
like lo...@nixos.org.

2. If you prefer me to use another e-mail (not the e-mail used in ML), tell 
me, please.

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

[Nix-dev] Re: git-svn, e-mails

2010-04-29 Thread Yury G. Kudryashov

Andres Loeh wrote:

 Hi.
 
 andres
 I wasn't aware that my email is difficult to find. I'm committing
 regularly. I'm writing to the ML regularly. I'm also in
 maintainers.nix.
Sorry.

After better seach I haven't found only the following e-mails:

LennartKats
bdumitriu
rbroek
root
skolthof
thammers
valentin

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

[Nix-dev] Re: reason for changing default of system.copySystemConfiguration to false

2010-04-30 Thread Yury G. Kudryashov

Marc Weber wrote:

 
 Minimal test case illustrating the issue:
 let pkgs = import /etc/nixos/nixpkgs {};
 in
 pkgs.stdenv.mkDerivation {
   name = test;
   unpackPhase = ''for x in config{1,2,3}; do echo $x ''${!x}; done; exit
   1''; config1 = /etc/.. + (builtins.substring 1  (pkgs.lib.maybeEnv
   NIXOS_CONFIG /etc/nixos/configuration.nix)); config2 =
   pkgs.lib.maybeEnv NIXOS_CONFIG /etc/nixos/configuration.nix; config3
   = builtins.toPath (pkgs.lib.maybeEnv NIXOS_CONFIG
   /etc/nixos/configuration.nix);
 }
More minimal example:

with (import /etc/nixos/nixpkgs {});

stdenv.mkDerivation {
  name = test;
  unpackPhase = ''
echo ${/etc/nixos/configuration.nix}
echo ${builtins.toPath /etc/nixos/configuration.nix}
  '';
}
results in:
/nix/store/hash-configuration.nix
/etc/nixos/configuration.nix

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

[Nix-dev] Re: Trying to understand multiple versions

2010-04-30 Thread Yury G. Kudryashov

Josh wrote:
 It appears that package dependencies are specified just by package,
 and not version; is this correct?
Not really. In package's default.nix we just list dependencies by their 
names, but in top-level/all-packages.nix all the dependencies are passed to 
the function defined in default.nix. Usually they're just passed by name 
which means pass default version but sometimes we pass specific versions 
(see gtkLibs* in pkgs/top-level/all-packages.nix).

 Consider the following scenario:
In the following answers I assume that you're installing packages using nix-
env -i, not using NixOS.
 1. I install package Foo-1.0, which depends on FunnyLib. The latest
 version of FunnyLib happens to be 1.0. Assumption: Package
 FunnyLib-1.0 will automatically be installed as well.
You should replace the latest version with the default version. Package 
FunnyLib will be automatically built but will not added to your nix 
environment unless Foo puts it into propagated env packages.
 2. The FunnyLib-1.1 package is released. I upgrade FunnyLib to version
 1.1. Assumption: Foo will continue to use FunnyLib-1.0, and I'll have
 2 versions of FunnyLib installed.
Foo will continue to use FunnyLib-1.0 unless you're using some LD_* magic.
 3. I install package Bar-1.0, which also uses FunnyLib. Assumption:
 Nix sees that FunnyLib-1.1 is installed, and will use that.
Nix will use the version of FunnyLib specified as build dependency of 
Bar-1.0. If Bar just use FunnyLib (without specific version), it will use 
default version of FunnyLib. The default version depends on nixpkgs state, 
not on your environment.
 4. I run garbage collection. Assumption: nothing happens, since both
 versions of FunnyLib are currently in use.
Yes, you're right.
 5. I upgrade Foo-1.0, even though there are no new versions
 available, to its already installed version. Assumption: it gets
 re-linked against FunnyLib-1.1; now, FunnyLib-1.0 is eligible for
 garbage collection.
That's true if in the new nixpkgs collection FunnyLib-1.1 is passed to Foo, 
not FunnyLib-1.0.
 Are my assumptions correct? Is there anything I'm missing above?
 
 Suppose I never upgraded FunnyLib in step 2, but the updated package
 was available. Then I installed Bar as in step 3. Would Bar use the
 already installed, version of FunnyLib, or would it download and
 install the latest version? I would assume the latter.
Bar would download and install the version of FunnyLib passed to Bar in all-
packages.nix. Normally we just use inherit FunnyLib which means default 
version. If default version have changed, Bar will download, install and 
use the new default version.
 Now, suppose that Foo uses some deprecated features of FunnyLib, and
 so requires a particular version, or any version in some specified
 range. How can this be handled?
funnyLib = import ../development/libraries/FunnyLib { ... };
funnyLib10 = import ../development/libraries/FunnyLib/1.0.nix { ... };
foo = import ../foo {
funnyLib = funnyLib10;
}
 A lot of software looks for a config or settings file in some standard
 directory like etc, as well as looking in the user's directory. I
 assume that under the Nix way of doing things, this file is inside the
 Nix store, in the directory for that program, yes? (I understand that
 Nix has built-in support for managing the configs of some programs; my
 concern is with everything else.)
That's true unless we need to change the configuration after package is 
installed. If we need this, we create an additional package foo-config, 
and foo-wrapper which tells foo to use foo-config configuration. Sometimes 
we decide that foo is definitely system-wide service, and tell it to use 
/etc instead of $out/etc. In these cases we symlink needed foo-config/etc to 
/etc (at least in NixOS).
 Assumption: every version of a
 program will have its own config file, unless I hardlink them
 together; and so every time a package is upgraded its configuration
 gets reset to the defaults... Am I correct?
Yes, with one additional remark: you must not change the files in /nix/store 
after the package is installed. In particular, /etc files.

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

[Nix-dev] restricted downloads

2010-04-30 Thread Yury G. Kudryashov

Hi!

I've just commited support for restricted downloads in fetchurl. The idea 
is that you can write
src = fetchurl {
  url = http://restricted.noltd/download.html;;
  name = my_restricted_src.zip;
  restricted = true;
  sha256 = myhash;
};

When a user will try to build this package, fetchurl will show message like 
go to ${url}, download ${name} and add it using nix-store --add-fixed 
sha256.

I hope that this commit breaks nothing. If not, please ping me before 
reverting. I will be on-line most time tomorrow.

P.S.: What do you think about printing this message in bold or in red?

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

[Nix-dev] nix, doxygen

2010-05-01 Thread Yury G. Kudryashov

Hi!

I've just noticed that nix doesn't use doxygen-style comments in the source 
code. Eelco, could I start converting comments to doxygen style?

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

[Nix-dev] mass-update-01

2010-05-01 Thread Yury G. Kudryashov

Hi!

I don't want to maintain long-standing branches, that's why I close mass-
update-01 for feature commits tomorrow (Sunday, 05/02/2010) in the evening.

Please, commit everything you want to go into mass-update-01 before this 
date. After that only bug fixes will be accepted, anything else will be 
reverted (of course, that doesn't stop you from creating your own branch).

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

[Nix-dev] Re: restricted downloads

2010-05-01 Thread Yury G. Kudryashov

Ludovic Courtès wrote:

 Hi Yury,
 
 When a user will try to build this package, fetchurl will show message
 like go to ${url}, download ${name} and add it using nix-store
 --add-fixed sha256.
 
 What’s the rationale?
Some files cannot be fetched automatically. For example, sometimes user must 
sign license agreement online before downloading file (e.g. old sun-jre, 
pkgs.wtk), or even buy non-free CD/DVD (games etc.).
Using restricted = true; feature, we can write .nix packages for these 
non-free programs.

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

[Nix-dev] Re: restricted downloads

2010-05-02 Thread Yury G. Kudryashov

Ludovic Courtès wrote:

 Hi,
 
 Some files cannot be fetched automatically. For example, sometimes user
 must sign license agreement online before downloading file (e.g. old
 sun-jre, pkgs.wtk), or even buy non-free CD/DVD (games etc.).
 Using restricted = true; feature, we can write .nix packages for these
 non-free programs.
 
 OK, thanks for explaining.
 
 For the time being, I can safely assume that any package using this
 feature is non-free, right?
It can be free as a bear, but it is definitely not free as a freedom, right.

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

[Nix-dev] Re: restricted downloads

2010-05-03 Thread Yury G. Kudryashov

Eelco Dolstra wrote:

 Hi,
 
 On 04/30/2010 10:47 PM, Yury G. Kudryashov wrote:
 
 I've just commited support for restricted downloads in fetchurl. The
 idea is that you can write
 src = fetchurl {
   url = http://restricted.noltd/download.html;;
   name = my_restricted_src.zip;
   restricted = true;
   sha256 = myhash;
 };
 
 This is an abuse of fetchurl.  You should have a different fixed-output
 derivation function that always fails (say, `requireFile { name = ...;
 sha256 =
 ...; errorMessage = ...; }')  - there is no need to use fetchurl for this
 purpose.
Thanks, moved to requireFile in trivial-builders.nix (r21575).


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

[Nix-dev] Re: NixOS license

2010-05-07 Thread Yury G. Kudryashov

Eelco Dolstra wrote:

 Hi all,
 
 Comments?
OK.

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

[Nix-dev] Re: gitorious mirror

2010-05-10 Thread Yury G. Kudryashov

David Brown wrote:

 On Sun, May 09, 2010 at 01:06:05PM +0400, Yury G. Kudryashov wrote:
 
I've created gitorious mirror of nix packages,
http://gitorious.org/nixpkgs

If someone wants to collaborate on gitorious, let me know: we can create
nixos group, and I shall move the ownership to this group.
 
 I would be interested in collaboration.  I live and breathe git during
 my day job, so this is very natural for me to use.
 
 I had created my own shallow clone of nixpkgs, so it's nice to have
 one with full history, and a proper id map.
Sorry, i have a flight tomorrow, so have no time till Wednesday. Will write 
some how-to Wednesday evening.
 
 I'm 'd3z' on gitorious.
 
 Any interest in also mirroring nixos?
 
 David


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

[Nix-dev] Re: Building an old GHC for a new Cabal...

2010-05-12 Thread Yury G. Kudryashov

Jason Dusek wrote:

   I managed to build GHC 6.12 in Nix on Ubuntu after some help
   in an earlier discussion on this list. Now, my old Cabal
   (built through Nix) complains about an invalid package format;
   this is to be expected if it shells out to `ghc-pkg' to read
   the package list.
 
   When I try to rebuild Cabal, it tries to build it against GHC
   6.10 instead of 6.12:
   I do have GHC 6.10 still installed; but why does it not build
   against the new GHC? Should I delete the `.drv' files? Perhaps
   these cache something about which GHC to build against?
Deleting .drv files cannot help as new packages do not depend on the old 
state of your ~/.nix-profile etc.

The key warning is warning: there are multiple derivations named
`cabal-install-0.8.0'; using the first one.

You should use nix-env -i -A ... to select the needed cabal.

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

[Nix-dev] Re: Building an old GHC for a new Cabal...

2010-05-12 Thread Yury G. Kudryashov

Marc Weber wrote:

   I do have GHC 6.10 still installed; but why does it not build
   against the new GHC?
 
 Because of a design decision Andres Loeh once made:
 
 try cat `which ghc`. You'll see that ghc finds the packages containing
 ghc libraries by iterating over $PATH.
Marc, did you see the command in the original message? It was `nix-env --
install cabal-install-0.8.0`, and the real question was why nix-env -i 
cabal-install pulls cabal-install from ghc-6.10 packages?

The answer is: because of haskellPackages_ghc6122 = lowPrio in all-
packages.nix. You need to select haskellPackages_ghc6122.cabalInstall 
manually.

And, as Marc said, it is not usefull to have two ghc versions in the same 
environment (at least, in the current setup).

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

[Nix-dev] mdadm problem

Hi!

After upgrade, I have mdadm printing annoying no arrays found in config 
file message nearly every second. It seems that the last person who touched 
mdadm stuff was Nicolas Pierron. Could you please either fix it, or add an 
option do disable raid?

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

[Nix-dev] udev-153

Hi!

I'm going to merge topic/udev-153 branch of git://gitorious.org/+nix-
developers/nixpkgs/nixpkgs.git into svn trunk. I had to upgrade polkit and 
consolekit as well. The current patch is attached.

Could you please review the patch and/or test it?

P.S. udev-154 came out while I was working on this upgrade, so actually it 
should be named udev-154.diff --git a/pkgs/development/libraries/consolekit/default.nix b/pkgs/development/libraries/consolekit/default.nix
index f41e8c6..06b48b3 100644
--- a/pkgs/development/libraries/consolekit/default.nix
+++ b/pkgs/development/libraries/consolekit/default.nix
@@ -1,21 +1,18 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, 
-  libX11, policykit, expat, ... }:
+  libX11, polkit, expat }:
 
 stdenv.mkDerivation rec {
-  name = consolekit-0.2.10;
+  name = consolekit-0.4.1;
   
   src = fetchurl {
-url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.2.10.tar.gz;
-sha256 = 1jrv33shrmc1klwpgp02pycmbk9lfaxkd5q7bqxb6v95cl7m3f82;
+url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.1.tar.bz2;
+sha256 = 0gj0airrgyi14a06w3d4407g62bs5a1cam2h64s50x3d2k3ascph;
   };
   
-  buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 policykit expat ];
+  buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ];
 
   configureFlags = --enable-pam-module --with-pam-module-dir=$(out)/lib/security --localstatedir=/var --sysconfdir=/etc;
 
-  # Needed for pthread_cancel().
-  NIX_LDFLAGS = -lgcc_s;
-
   installFlags = sysconfdir=$(out)/etc DBUS_SYS_DIR=$(out)/etc/dbus-1/system.d; # keep `make install' happy
   
   meta = {
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index d3b2c67..81d35a6 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,32 +1,45 @@
-{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext }:
+{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext,
+  gobjectIntrospection }:
+
+let
+  system=/var/run/current-system/sw;
+  foolVars = {
+LOCALSTATE = /var;
+SYSCONF = /etc;
+LIBEXEC = ${system}/libexec;
+LIB = ${system}/lib;
+DATA = ${system}/share;
+  };
+in
 
 stdenv.mkDerivation rec {
-  name = policy-kit-0.92;
-  
+  name = polkit-0.96;
+
   src = fetchurl {
-url = http://hal.freedesktop.org/releases/polkit-0.92.tar.gz;
-sha256 = 18x4xp4m14fm4aayra4njh82g2jzf6ccln40yybmhxqpb5a3nii8;
+url = http://hal.freedesktop.org/releases/${name}.tar.gz;;
+sha256 = 0jh5v0dhf9msvmfmr9d67563m64gq5l96m9jax9abchhfa8wl9il;
   };
-  
-  buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext ];
 
-  configureFlags = --localstatedir=/var;
+  buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext
+gobjectIntrospection ];
+
+  # Ugly hack to overwrite hardcoded directories
+  # TODO: investigate a proper patch which will be accepted upstream
+  CFLAGS = stdenv.lib.concatStringsSep  
+( map (var: ''-DPACKAGE_${var}_DIR=\${builtins.getAttr var foolVars}\'')
+(builtins.attrNames foolVars) );
 
-  installFlags = localstatedir=$(TMPDIR)/var; # keep `make install' happy
-  
   postInstall =
 ''
   # Allow some files with paranoid permissions to be stripped in
   # the fixup phase.
   chmod a+rX -R $out
-
-  # Fix the pathname in the frobnicate example.
-  substituteInPlace $out/share/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy \
-  --replace /usr/bin/pk-example-frobnicate $out/bin/pk-example-frobnicate
 '';
 
-  meta = {
+  meta = with stdenv.lib; {
 homepage = http://www.freedesktop.org/wiki/Software/PolicyKit;
 description = A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes;
+platforms = platforms.linux;
+maintainers = [ maintainers.urkud ];
   };
 }
diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix
index 3811d7e..97031a5 100644
--- a/pkgs/development/tools/misc/eggdbus/default.nix
+++ b/pkgs/development/tools/misc/eggdbus/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }:
 
 stdenv.mkDerivation rec {
-  name = eggdbus-0.5;
+  name = eggdbus-0.6;
   
   src = fetchurl {
 url = http://hal.freedesktop.org/releases/${name}.tar.gz;;
-sha256 = 0g1s9nzfyjyhnmv4hzll3izayh4c4pjy3i51ihwgkz3wmd1xaq9j;
+sha256 = 118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4;
   };
   
   buildInputs = [ pkgconfig glib dbus.libs dbus_glib ];
diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix
index 988d0a3..d6007c9 100644
--- a/pkgs/os-specific/linux/udev/default.nix
+++ b/pkgs/os-specific/linux/udev/default.nix
@@ -4,29 +4,23 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  name = udev-145;
+  name

[Nix-dev] setuid-wrappers

Hi!

It seems that I found a nice way to fool packages about suid wrappers.

The problem: some packages hardcode paths to their $out/libexec/* suid 
helpers.

My solution:

In post-install:
mv $out/libexec/helper $out/libexec/.helper.orig
echo exec /var/setuid-wrappers/helper  $out/libexec/helper
chmod +x $out/libexec/helper

Probably, we should use something like if [[ -x /var/setuid-wrappers/helper 
]]; then exec it, else exec .helper.orig.

In NixOS module:

setuidOwners = [ { source = ${package}/libexec/.helper.orig; program = 
helper; ... } ];

Any comments?

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

[Nix-dev] nix extension proposal

Hi!

AFAICS, nix supports any string as a key in attr set, but { name = value; } 
syntax only supports simple strings.

What do you think about the following:

x = {
  'very strange.name' = value;
  '0.2' = another value;
}

builtins.attrNames x == [ very strange.name 0.2 ]

I know that the same currently can be achieved using listToAttrs.

Of course, there are two questions: (1) do you want this feature; (2) would 
it be hard to implement?

___
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 - 21781 - urkud - nixpkgs/trunk/pkgs/os-specific/linux/udev

2010-05-15 Thread Yury G. Kudryashov

Nicolas Pierron wrote:

 On Sat, May 15, 2010 at 11:54, Yury G Kudryashov ur...@mccme.ru wrote:
 -  for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules
 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do
 -  cp rules/packages/$i $out/libexec/rules.d/
 -  done
 +  cp rules/packages/40-pilot-links.rules $out/libexec/rules.d/
 
 NixOS need these files and I am trying to fix your issue by fixing a
 bug in NixOS.  This bug fix rely on 64-md-raid.rules, in addition I
 need the device mapper for ciphered partitions.
udev doesn't contain these files anymore. You can take them from old udev 
release, and add to mdadm job. If you'll do this, could you please ask udev 
guys why they removed these files? Probably, they have some new proposed way 
to go.

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

[Nix-dev] Re: Re: [PATCH] Fix git-send-email.

2010-05-15 Thread Yury G. Kudryashov

David Brown wrote:

 On Sat, May 15, 2010 at 04:55:57PM +0200, Peter Simons wrote:
 
unfortunately, two of the Perl packages that were added in order to
support git send-email don't build on the build farm:

  http://hydra.nixos.org/build/409377

It appears that the build phase works fine, but the regression test
suites don't. Do you happen to have an idea what might be causing this
problem?
 
 Does Hydra do something to prevent network tests?  Both of these
 packages are network libraries, so if that's the case, the tests will
 probably need to be disabled.  I can send another patch for that.
AFAIK, no. But it builds in chroot, and not all the information is available 
in chroot.

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

[Nix-dev] Re: [PATCH] Disable network tests on Perl libs.

2010-05-15 Thread Yury G. Kudryashov

David Brown wrote:

 ---
 +# Tests perform network access.
 +doCheck = false;
 +# Tests perform network access.
 +doCheck = false;
It would be better to investigate the real reason for test failures, and 
disable only offending tests. OTOH, if you have no time for this, let's 
disable them.

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

[Nix-dev] drop config.security.wrapperDir?

2010-05-17 Thread Yury G. Kudryashov

Hi!

We have a few packages with /var/setuid-wrappers path hardcoded (nagios, 
fcron). Should we drop config.security.wrapperDir (hardcoding this in NixOS 
as well), or make it accessible for nixpkgs?

-- 
Yury G. Kudryashov

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

[Nix-dev] Re: drop config.security.wrapperDir?

2010-05-19 Thread Yury G. Kudryashov

Eelco Dolstra wrote:

 Hi,
 
 On 05/18/2010 11:19 PM, Lluís Batlle i Rossell wrote:
 
 We have a few packages with /var/setuid-wrappers path hardcoded (nagios,
 fcron). Should we drop config.security.wrapperDir (hardcoding this in
 NixOS as well), or make it accessible for nixpkgs?
 
 I vote for hardcoding (just to break the silence on this question)
 
 I'm somewhat in favour of moving it to /var/run/setuid-wrappers, which
 would be the proper FHS location.
Move and hardcode, or move default and tell nixpkgs about new location?


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

[Nix-dev] Re: gnupg2

2010-05-19 Thread Yury G. Kudryashov

Marc Weber wrote:

 Hi Yury,
 
 Excerpts from Yury G. Kudryashov's message of Wed May 19 22:35:46 +0200
 2010:
 As udev-154 merge seems to be finished, I'm starting to work on gnupg2
 part of mass-update-01. I'm going to rename gnupg2 to gnupg, and
 gnupg to gnupg1orig. I'll also add gnupg1compat package with a few
 symlinks making gpg2 nearly compatible with gpg1.
 
 It would be nice to hear someone who knows the difference.
 
 All I do remember is that somoone has had some very files being
 encrypted with old gpg1. That's why it is still alive in nixpkgs.
 Maybe it was even Eelco Dolstra?
You mean, IDEA support?
 Naming? It'll affect only a minority so I don't think it will matter
 as long as gpg1 can still be installed.
OK.
 What's the reason you're working on this? You're missing those compat
 links, correct? Why not just add them to gpg2 and be done?
 You can still use priorities if you want to install both.
The real reason is gnupg2 upgrade. Renaming is a side effect to make gnupg2 
default for those who don't care.

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

[Nix-dev] Re: Suspend in KDE broken

2010-05-20 Thread Yury G. Kudryashov

Eelco Dolstra wrote:

Hi,

On 05/20/2010 01:56 PM, Tony White wrote:

http://hal.freedesktop.org/docs/PolicyKit/tools-fileformats.html
And it's called PolicyKit this week :)
http://www.freedesktop.org/wiki/Software/PolicyKit
polkit should go or be renamed. It is confusing.

Right :-)
No. Policykit is deprecated by upstream, as well as HAL. Polkit is new
flavour of policykit, and they are designed such that it should be possible
to install both of them. HAL should look at policykit. Next KDE release will
rely on polkit for many admin actions.
According to this thread :

http://forum.kde.org/viewtopic.php?f=66t=18837sid=201c14dea4d0e73f6e084170607986e3start=10

It looks like two things are required :
The user account to be a member of the power User group (Because
that's what the hardware abstraction layer looks for.)
uswsusp (It's user land tools) Must be available in the user's
environment to interact with the kernel in order to make it suspend :
http://suspend.sourceforge.net/
(The nix KDE 4.x desktop expression should take uswsusp as a depend.)

I don't think that's the case for us. HAL does the suspend on behalf of
KDE by
calling pm-suspend. HAL asks PolicyKit whether the calling user is
allowed to
suspend, which is in turn determined by its policy files. The policy
should say
that the active user (as determined by ConsoleKit) is allowed to
suspend. It did in the polkit configuration, but we probably lack the
corresponding PolicyKit configuration.

(To be clear: suspend worked in KDE until a few days ago.)
I think that I have broken it. I will look at the problem tonight.

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

[Nix-dev] Re: Suspend in KDE broken

2010-05-24 Thread Yury G. Kudryashov

Eelco Dolstra wrote:

 Hi,
 
 I noticed that sleep / suspend-to-RAM in KDE is broken.  Running
 pm-suspend as
 root does work.  This may be a PolicyKit/polkit (whatever it's called this
 week) problem, since dbus-send gives this error:
 
 [ee...@dutibo:~]$ dbus-send --system --print-reply \
   --dest=org.freedesktop.Hal /org/freedesktop/Hal/devices/computer \
   org.freedesktop.Hal.Device.SystemPowerManagement.Suspend int32:0
 Error org.freedesktop.Hal.Device.UnknownError: error:
 org.freedesktop.Hal.Error: Could not determine whether caller is
 privileged
  org.freedesktop.Hal.Device.Error
I found that the same issue had appeared in all major distros before. 
Restarting HAL helps but introduces another problems (i.e. kde stops 
receiving HAL events). I will look how other distros solved the problem.

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

[Nix-dev] remove kde3 desktop. Review, please

2010-05-25 Thread Yury G. Kudryashov

Hi!

KDE3 desktop was broken for a while, and nobody noticed. I propose to remove 
it. The proposed patch is attached.
If someone objects, reply in 50h, please, otherwise I'll commit it.From d55491b05d1662dee177d16e9a9041ae002e54bc Mon Sep 17 00:00:00 2001
From: Yury G. Kudryashov urkud.ur...@gmail.com
Date: Tue, 25 May 2010 10:49:31 +0400
Subject: [PATCH] Remove KDE3 desktop

We have no full KDE3 desktop anyway. KDE3 desktop was broken for a while, and nobody noticed.
---
 modules/module-list.nix|2 -
 modules/services/x11/desktop-managers/default.nix  |1 -
 .../x11/desktop-managers/kde-environment.nix   |   35 -
 modules/services/x11/desktop-managers/kde.nix  |   73 
 modules/services/x11/desktop-managers/kde4.nix |   33 ++
 5 files changed, 20 insertions(+), 124 deletions(-)
 delete mode 100644 modules/services/x11/desktop-managers/kde-environment.nix
 delete mode 100644 modules/services/x11/desktop-managers/kde.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 5ba6fe6..8c22e92 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -114,8 +114,6 @@
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
   ./services/x11/desktop-managers/gnome.nix
-  ./services/x11/desktop-managers/kde-environment.nix
-  ./services/x11/desktop-managers/kde.nix
   ./services/x11/desktop-managers/kde4.nix
   ./services/x11/desktop-managers/none.nix
   ./services/x11/desktop-managers/xterm.nix
diff --git a/modules/services/x11/desktop-managers/default.nix b/modules/services/x11/desktop-managers/default.nix
index a775684..d8303d4 100644
--- a/modules/services/x11/desktop-managers/default.nix
+++ b/modules/services/x11/desktop-managers/default.nix
@@ -12,7 +12,6 @@ in
 
 {
   imports = [
-./kde.nix
 ./kde4.nix
 ./gnome.nix
 ./xterm.nix
diff --git a/modules/services/x11/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
deleted file mode 100644
index bb0f82b..000
--- a/modules/services/x11/desktop-managers/kde-environment.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{pkgs, config, ...}:
-
-let
-  inherit (pkgs.lib) mkDefaultValue mkOption mkIf types;
-  kdePackages = config.environment.kdePackages;
-
-  options = {
-
-environment = {
-
-  kdePackages = mkOption {
-default = [];
-example = [ pkgs.kde4.kdegames ];
-type = types.list types.package;
-description = ''
-  Additional KDE packages to be used when you use KDE as a desktop
-  manager.  By default, you only get the KDE base packages.
-  Just adds packages to systemPackages and x11Packages. Will be removed
-  in the future.
-'';
-  };
-
-};
-  };
-in
-
-mkIf (kdePackages != []  config.services.xserver.enable) {
-  require = options;
-
-  environment = {
-x11Packages = kdePackages;
-systemPackages = kdePackages;
-pathsToLink = [ /etc/xdg /etc/dbus-1 /share /plugins ];
-  };
-}
diff --git a/modules/services/x11/desktop-managers/kde.nix b/modules/services/x11/desktop-managers/kde.nix
deleted file mode 100644
index 442a79f..000
--- a/modules/services/x11/desktop-managers/kde.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{pkgs, config, ...}:
-
-let
-  inherit (pkgs.lib) mkOption mkIf;
-  xcfg = config.services.xserver;
-  cfg = xcfg.desktopManager.kde;
-  xorg = xcfg.package;
-
-  options = { services = { xserver = { desktopManager = {
-
-kde = {
-  enable = mkOption {
-default = false;
-example = true;
-description = Enable the kde desktop manager.;
-  };
-};
-
-  }; }; }; };
-in
-
-mkIf (xcfg.enable  cfg.enable) {
-  require = [
-options
-
-# environment.kdePackages
-./kde-environment.nix
-  ];
-
-  services = {
-xserver = {
-
-  desktopManager = {
-session = [{
-  name = kde;
-  start = ''
-# A quick hack to make KDE screen locking work.  It calls
-# kcheckpass, which needs to be setuid in order to read the
-# shadow password file.  We have a setuid wrapper around
-# kcheckpass.  However, startkde adds $kdebase/bin to the start
-# of $PATH if it's not already in $PATH, thus overriding the
-# setuid wrapper directory.  So here we add $kdebase/bin to the
-# end of $PATH to keep startkde from doing that.
-export PATH=$PATH:${pkgs.kdebase}/bin
-
-# Start KDE.
-exec ${pkgs.kdebase}/bin/startkde
-  '';
-}];
-  };
-
-};
-  };
-
-  security.setuidPrograms = [ kcheckpass ];
-
-  environment = {
-kdePackages = [
-  pkgs.kdelibs
-  pkgs.kdebase
-];
-
-x11Packages = [
-  xorg.xset # used by startkde, non-essential
-];
-
-etc = [
-  { source = ${pkgs.xkeyboard_config}/etc/X11/xkb;
-target = X11/xkb

[Nix-dev] Re: git-gui: require not using ttk

Marc Weber wrote:

 Probably the reason is that git gui no longer likes being wrapped.
Actually, the main problem with git-gui is that it wants to be called as 
git-gui, not .git-gui-wrapped.
This can be fixed by moving wrappers to .orig/ subdir, and calling 
.orig/git-gui instead of .git-gui-wrapped. Feel free to fix it in the 
repo.

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

[Nix-dev] Re: Re: git-gui: require not using ttk

Marc Weber wrote:

 Anyway, this patch fixes it, git was not wrapped before.
 It wraps git instead of git-gui
   -   for prog in bin/gitk libexec/git-core/git-gui
   +   for prog in bin/gitk bin/git
   do
 wrapProgram $out/$prog   \
 --set TK_LIBRARY ${tk}/lib/tk8.4 \
 
 If there are no objections against this solution I'll commit soon.
I'd propose to change wrapProgram globally to move original program to 
.orig/originalName instead of .original-name-wrapped. In this case we shall 
not have such problems (progs assert that they know $0) in the future.

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

[Nix-dev] Re: Re: Re: git-gui: require not using ttk

Marc Weber wrote:

 Excerpts from Yury G. Kudryashov's message of Wed May 26 19:35:22 +0200
 2010:
 I'd propose to change wrapProgram globally to move original program to
 .orig/originalName instead of .original-name-wrapped. In this case we
 shall not have such problems (progs assert that they know $0) in the
 future.
 
 
 Which will not work for all cases because some apss might be using
 something like this: Calling apps relative to current bin directory:
 
 exec $(dirname $0)/other-app
 
 So you may fix git-gui but you may break others.
 So should an option be created eg:
 
   wrap --keep-name # use .orig/name
   wrap --keep-path # use .name-wrapped
OK for me
 
 ?
 
 Marc Weber


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

[Nix-dev] Re: nix-prefetch-url curl args

Lluís Batlle i Rossell wrote:

 On Wed, May 26, 2010 at 09:56:57PM +0400, Yury G. Kudryashov wrote:
 Hi!
 
 What do you think about adding something like --speed-limit 20
 --speed-time 30 --connect-timeout 15 --retry 5 to curl arguments?
 That would save us from some 'ikwildwrepper, can you requeue the failed
 downloads?' :)
This will solve another my problem as well. Sometimes the download speed 
falls to zero (probably, ISP issue). This will resume download after 30 
seconds of zero speed instead of waiting untill I'll stop it, and restarting 
from the beginning.
 
 I'm for it.


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

[Nix-dev] Re: Re: nix-prefetch-url curl args

Lluís Batlle i Rossell wrote:

 On Thu, May 27, 2010 at 12:28:28AM +0400, Yury G. Kudryashov wrote:
 Lluís Batlle i Rossell wrote:
 
  On Wed, May 26, 2010 at 09:56:57PM +0400, Yury G. Kudryashov wrote:
  Hi!
  
  What do you think about adding something like --speed-limit 20
  --speed-time 30 --connect-timeout 15 --retry 5 to curl arguments?
  That would save us from some 'ikwildwrepper, can you requeue the failed
  downloads?' :)
 This will solve another my problem as well. Sometimes the download speed
 falls to zero (probably, ISP issue). This will resume download after 30
 seconds of zero speed instead of waiting untill I'll stop it, and
 restarting from the beginning.
  
  I'm for it.
 Notice that I mostly meant 'fetchurl', while you wrote nix-prefetch-url.
I vote for adding both to fetchurl, and nix-prefetch-url. The second one is 
used by download-using-manifests.pl.


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

[Nix-dev] /etc/pam.d/chfn

2010-05-28 Thread Yury G. Kudryashov

Hi!

Could somebody who understands PAM configuration add /etc/pam.d/chfn, 
please?

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

[Nix-dev] Re: the trunk doesn't respect --prefix

2010-06-14 Thread Yury G. Kudryashov

Alexy Khrabrov wrote:

 I've checked out nix from svn, did bootstrap.sh and configure
 --prefix=/opt/nix
You need something like --with-store as well (see configure --help).
 
 First of all, it failed to build doc as I didn't have the /docbook dirs; I
 didn't want doc and deleted doc from the SUBDIRS.  Then nix-channel
 --update failed as it wanted to create /nix, not /opt/nix, anyways.  I
 manually changed /nix... in it to /opt/nix..., but that was not
 enough.  When I created /nix just to satisfy it, it put a log and var in
 it.  nix-env -i ghc then proceeded to build everything and failed very
 quickly...
 
 Should I stick with a tarball?
 Thanks,
 Alexy


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

[Nix-dev] Re: ghc build on CentOS fails

2010-06-14 Thread Yury G. Kudryashov

Alexy Khrabrov wrote:

First of all, don't answer a message just because you want to write to a 
given mail address. Such answer creates a thread with absolutely unrelated 
topics (see In-Reply-To header).

 Tried building ghc on CentOS yesterday, got breakage as patch was not
 satisfied; it also tried to build perl.  I have a prefix portage (gentoo
 prefix) there already; does it confuse nix when determining binary
 packages?
Could you please send more information, including exact commands and log 
messages?

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

[Nix-dev] Re: Re: ghc build on CentOS fails

2010-06-15 Thread Yury G. Kudryashov

Alexy Khrabrov wrote:

A: No.
Q: Should I use top-posting?

 Tried building ghc on CentOS yesterday, got breakage as patch was not
 satisfied; it also tried to build perl.  I have a prefix portage (gentoo
 prefix) there already; does it confuse nix when determining binary
 packages?
 Could you please send more information, including exact commands and log
 messages?
 Sorry for messing up your threads! :)  The console log is in
 
 http://paste.pocoo.org/show/225495/
 
 I've reinstalled with default ./configure and use unstable packages per
 Quick Start.  I run from /opt/portage/startprefix, so it's not detecting
 CentOS I guess.  How does it know to load a binary?

Which binary? It failed to download patch-*.tar.gz because it have been 
removed from alpha.gnu.org?. Have you added nixpkgs-unstable channel? It 
shouldn't try to build so much.

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

[Nix-commits] SVN commit: nix - 22360 - urkud - in nixpkgs/trunk/pkgs: applications/misc/merkaartor development/libraries/qt-4.x/4.5 development/libraries/qt-4.x/4.6 development/libraries/qt-4.x/4.7 t

2010-06-21 Thread Yury G Kudryashov

Author: urkud
Date: 2010-06-21 17:06:08 + (Mon, 21 Jun 2010)
New Revision: 22360

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22360view=rev

Modified:
   nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix
   nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.5/default.nix
   nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.6/default.nix
   nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix
   nixpkgs/trunk/pkgs/top-level/release.nix

Log:
Add meta.platforms to qt4 and merkaartor

Should fix one of hydra evaluation errors

Changes:

Modified: nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix
===
--- nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix 2010-06-21 
16:06:18 UTC (rev 22359)
+++ nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix 2010-06-21 
17:06:08 UTC (rev 22360)
@@ -18,6 +18,6 @@
 homepage = http://merkaartor.org/;
 license = GPLv2+;
 maintainers = with stdenv.lib.maintainers; [viric];
-platforms = with stdenv.lib.platforms; all;
+platforms = qt.meta.platforms;
   };
 }

Modified: nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.5/default.nix
===
--- nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.5/default.nix 
2010-06-21 16:06:18 UTC (rev 22359)
+++ nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.5/default.nix 
2010-06-21 17:06:08 UTC (rev 22360)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib
+{ stdenv, fetchurl
 , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, 
libXcursor, libXmu
 , libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig
 , zlib, libjpeg, mysql, libpng, which, mesa, openssl, dbus, cups, pkgconfig, 
libtiff, glib
@@ -78,6 +78,7 @@
 homepage = 
http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp;
 description = A cross-platform application framework for C++;
 license = GPL/LGPL;
-maintainers = [ lib.maintainers.sander ];
+maintainers = [ stdenv.lib.maintainers.sander ];
+platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }

Modified: nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.6/default.nix
===
--- nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.6/default.nix 
2010-06-21 16:06:18 UTC (rev 22359)
+++ nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.6/default.nix 
2010-06-21 17:06:08 UTC (rev 22360)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib
+{ stdenv, fetchurl
 , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, 
libXcursor, libXmu
 , libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig
 , zlib, libjpeg, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, 
glib
@@ -93,6 +93,7 @@
 homepage = http://qt.nokia.com/products;
 description = A cross-platform application framework for C++;
 license = GPL/LGPL;
-maintainers = with lib.maintainers; [ sander urkud ];
+maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }

Modified: nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix
===
--- nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix 
2010-06-21 16:06:18 UTC (rev 22359)
+++ nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix 
2010-06-21 17:06:08 UTC (rev 22360)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib
+{ stdenv, fetchurl
 , alsaLib, gstreamer, gstPluginsBase, pulseaudio
 , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, 
libXcursor, libXmu
 , libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, 
fontconfig
@@ -100,8 +100,8 @@
 homepage = http://qt.nokia.com/products;
 description = A cross-platform application framework for C++;
 license = GPL/LGPL;
-maintainers = with lib.maintainers; [ urkud sander ];
-platforms = stdenv.lib.platforms.linux;
+maintainers = with stdenv.lib.maintainers; [ urkud sander ];
+platforms = stdenv.lib.platforms.mesaPlatforms;
 priority = 10;
   };
 }

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
===
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   2010-06-21 16:06:18 UTC 
(rev 22359)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   2010-06-21 17:06:08 UTC 
(rev 22360)
@@ -5150,7 +5150,7 @@
   qt4 = qt46;
 
   qt45 = import ../development/libraries/qt-4.x/4.5 {
-inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl 
cups dbus
+inherit fetchurl stdenv zlib libjpeg libpng which mysql mesa openssl cups 
dbus
   fontconfig freetype pkgconfig libtiff;
 inherit

[Nix-dev] Hydra impurity reminder

Hi!

I think that it would be nice if hydra will send output of `grep -ir /usr 
$buildDir` to the maintainers to remind about impure paths. What do you 
think about it?

Another nice feature would be sending the output of the configure phase. I 
see that sometimes nix people upgrade packages without local rebuilds (e.g., 
big fat KDE upgrade). Sometimes a package fails to find an optional 
dependency, and nobody notices this untill someone needs the feature.

P.S.: I've just found a few impure paths in kdesdk. I'll try to fix it and 
send merge-request upstream.

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

[Nix-dev] Re: Hydra impurity reminder

Michael Raskin wrote:

 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA1
 
 Another nice feature would be sending the output of the configure phase.
 I see that sometimes nix people upgrade packages without local rebuilds
 (e.g., big fat KDE upgrade). Sometimes a package fails to find an
 optional dependency, and nobody notices this untill someone needs the
 feature.
 
 If only it weren't a ton of not-so-useful spam... Most of the time
 missing optional dependency message is not in the last 10 lines (even
 more so - not in the first 10 lines). So it is impossible to see this at
 glance; and if you are going to read carefully, you can just click the
 Hydra build log link.
What about replacing all /nix/store/* with /nix/store/name-only, and sending 
diff of two logs?
 
 What can be a nice idea, though, is sending out disappeared run-time
 dependencies, checking by name (without hash and version)...
Or checking for buildInput is neither a runtime dependency nor a build 
system.

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

[Nix-dev] Re: [PATCH 1/2] gimp git snapshot. New feature: layer groups. gimp git requires newer gtk thus using deepOverride to pass same gtk to all dependencies.

Marc Weber wrote:

 ---
  pkgs/development/libraries/glib/2.24.x.nix |   37 +
I've tried glib-2.24, and some configure test in gtk results in segmentation 
fault. I'll give more details tomorrow.

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

[Nix-commits] SVN commit: nix - 22426 - urkud - in nixpkgs/trunk/pkgs/desktops/kde-4.4: . extragear/koffice

2010-06-28 Thread Yury G Kudryashov

Author: urkud
Date: 2010-06-28 20:56:16 + (Mon, 28 Jun 2010)
New Revision: 22426

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22426view=rev

Added:
   nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch
Modified:
   nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix
   nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/default.nix

Log:
koffice: add fftw and fix FindWPD.cmake

Changes:

Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix
===
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix 2010-06-28 18:36:37 UTC 
(rev 22425)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix 2010-06-28 20:56:16 UTC 
(rev 22426)
@@ -283,7 +283,7 @@
   
   koffice = import ./extragear/koffice {
 inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 giflib 
libxml2 libxslt boost glew;
-inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd libgsf;
+inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd libgsf fftw;
 inherit kdelibs kdepimlibs;
 inherit automoc4 phonon qimageblitz qca2 eigen soprano;
 poppler = pkgs.popplerQt4;

Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
===
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/default.nix   
2010-06-28 18:36:37 UTC (rev 22425)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/default.nix   
2010-06-28 20:56:16 UTC (rev 22426)
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, 
boost, glew
-, shared_mime_info, poppler, gsl, gmm, wv2, libwpd, giflib, libgsf
+, shared_mime_info, poppler, gsl, gmm, wv2, libwpd, giflib, libgsf, fftw
 , kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen, soprano}:
 
 stdenv.mkDerivation {
@@ -9,8 +9,9 @@
 sha256 = 0qa73grmn4c2d7zs5p0sxg6dws8hpg8v2vgp6frhj55l0sk3kqba;
   }; 
   buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew 
shared_mime_info 
-  poppler gsl gmm wv2 libwpd giflib libgsf stdenv.gcc.libc
+  poppler gsl gmm wv2 libwpd giflib libgsf stdenv.gcc.libc fftw
   kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen 
soprano ];
+  patches = [ ./wpd.patch ];
   meta = {
 description = KDE integrated Office Suite;
 license = GPL;

Added: nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch
===
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch 
(rev 0)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch 
2010-06-28 20:56:16 UTC (rev 22426)
@@ -0,0 +1,24 @@
+diff --git a/cmake/modules/FindWPD.cmake b/cmake/modules/FindWPD.cmake
+index 9bd788c..927785a 100644
+--- a/cmake/modules/FindWPD.cmake
 b/cmake/modules/FindWPD.cmake
+@@ -19,14 +19,17 @@ if (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
+ else (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
+ if(NOT WIN32)
+   INCLUDE(FindPkgConfig)
+-  pkg_check_modules(WPD libwpd-0.8)
++  pkg_check_modules(PKG_WPD libwpd-0.8)
+ endif(NOT WIN32)
+ 
+   FIND_PATH(WPD_INCLUDE_DIR libwpd/libwpd.h
+-${WPD_INCLUDE_DIR}
++${PKG_WPD_INCLUDE_DIRS}
+ /usr/include/libwpd-0.8
+   )
+ 
++  FIND_LIBRARY(WPD_LIBRARIES wpd-0.8
++${PKG_WPD_LIBRARY_DIRS}
++  )
+ 
+   include(FindPackageHandleStandardArgs)
+   FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPD DEFAULT_MSG WPD_INCLUDE_DIR 
WPD_LIBRARIES )

___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-dev] Re: Re: [PATCH 1/2] gimp git snapshot. New feature: layer groups. gimp git requires newer gtk thus using deepOverride to pass same gtk to all dependencies.

Marc Weber wrote:

 I only tried this on x86_64
Me too. gtk+ builds but one of configure feature test fails with segfault.
 
 About all updates in this commit: It should only affect the dev
 versions of gimp because only there deepOverride is used actually using
 the newer gtk* packages. If anything else is rebuild as well I missed
 something.
This was just to say we have a problem with glib-2.24 upgrade, and I 
didn't managed to debug this problem.
 
 I don't expect you to like or use this patch. Neither am I going to
 commit it.  My intention was to share these diffs only this time because
 the new layer group feature helps me a lot.
I just saw glib-2.24, and written that there is a problem.
 
 cu
 Marc Weber


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

[Nix-dev] Re: What about official git mirrors? Proposal

2010-06-29 Thread Yury G. Kudryashov

Marc Weber wrote:

 Hi list,
 
 Because my goals may differ slightly from those of others I'm looking
 for an easy way to continue sharing my work while following Nix upstream
 changes. Because I already know git very well I'd like to use git doing
 so.

 I CC'd Yury G Kudryashov because he has been maintaining the existing
 git mirror on github (which only mirrored nixos/master and
 nixpkgs/{trunk,stdenv-updates} in the past)
On gitorious. I read the list, so you don't have to CC me. I have only very 
bad GPRS connection till 9 of July. Even git svn rebase takes too much 
time.
 
 I CC'd Eelco Dolstra because I want him to offer an SSH account so that
 we can maintain this mirror as (official?) mirror and provide download
 links which are hosted on www.nixos.org.
Do you have ssh account somewhere? If yes, you don't need nixos.org account.
 [remote gitorious]
   push = refs/remotes/*:refs/heads/*
 
 So all which is left to be done for the cron-job is:
 
   git svn fetch  git push gitorious 
   create-tar-for-users-who-want-to-commit-using-svn
I can give you commit access to svn-mirror repo and send my authors.txt 
file, and you'll setup this cron job.

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

[Nix-commits] SVN commit: nix - 22431 - urkud - in nixpkgs/trunk/pkgs/desktops/kde-4.4: . support/akonadi

2010-06-30 Thread Yury G Kudryashov

Author: urkud
Date: 2010-06-30 15:52:24 + (Wed, 30 Jun 2010)
New Revision: 22431

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22431view=rev

Modified:
   nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix
   nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/default.nix

Log:
Upgrade akonadi to 1.3.85

Changes:

Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix
===
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix 2010-06-30 05:44:33 UTC 
(rev 22430)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix 2010-06-30 15:52:24 UTC 
(rev 22431)
@@ -41,7 +41,7 @@
   };
   
   akonadi = import ./support/akonadi {
-inherit (pkgs) stdenv fetchurl lib cmake qt4 shared_mime_info libxslt 
boost mysql;
+inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost 
mysql;
 inherit automoc4 soprano;
   };
   

Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/default.nix
===
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/default.nix 
2010-06-30 05:44:33 UTC (rev 22430)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/default.nix 
2010-06-30 15:52:24 UTC (rev 22431)
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, lib, cmake, qt4, shared_mime_info, libxslt, boost, mysql, 
automoc4, soprano}:
+{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, 
automoc4, soprano}:
 
-stdenv.mkDerivation {
-  name = akonadi-1.3.1;
+stdenv.mkDerivation rec {
+  name = akonadi-1.3.85;
   src = fetchurl {
-url = http://download.akonadi-project.org/akonadi-1.3.1.tar.bz2;
-sha256 = 1pbn6sviipxxpx80cspncfc3nlz047nryfbv8xzfz5811p19k7jb;
+url = http://download.akonadi-project.org/${name}.tar.bz2;;
+sha256 = 1d2ancspavp4qg717hj56j1likb0ifdr65q1awbc2ghqqgd9znck;
   };
-  includeAllQtDirs=true;
   buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 
soprano ];
-  meta = {
+  meta = with stdenv.lib; {
 description = KDE PIM Storage Service;
 license = LGPL;
 homepage = http://pim.kde.org/akonadi;
-maintainers = [ lib.maintainers.sander ];
+maintainers = [ maintainers.sander maintainers.urkud ];
+platforms = platforms.linux;
   };
 }

___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - 22432 - urkud - in nixpkgs/trunk/pkgs: development/libraries development/libraries/hunspell top-level

2010-06-30 Thread Yury G Kudryashov

Author: urkud
Date: 2010-06-30 15:53:28 + (Wed, 30 Jun 2010)
New Revision: 22432

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22432view=rev

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

Log:
Add hunspell

TODO: make it work (export DICTDIR)

Changes:

Added: nixpkgs/trunk/pkgs/development/libraries/hunspell/default.nix
===
--- nixpkgs/trunk/pkgs/development/libraries/hunspell/default.nix   
(rev 0)
+++ nixpkgs/trunk/pkgs/development/libraries/hunspell/default.nix   
2010-06-30 15:53:28 UTC (rev 22432)
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, ncurses, readline }:
+
+stdenv.mkDerivation rec {
+  name = hunspell-1.2.11;
+
+  src = fetchurl {
+url = mirror://sf/hunspell/${name}.tar.gz;
+sha256 = 14vfs1qb01hq30ss1bsiv6lkx673695g0xdyisrq720fdq2mr5rz;
+  };
+
+  propagatedBuildInputs = [ ncurses readline ];
+  configureFlags = --with-ui --with-readline;
+
+  meta = with stdenv.lib; {
+homepage = http://hunspell.sourceforge.net;
+description = The spell checker of OpenOffice.org and Mozilla Firefox 3  
Thunderbird, Google Chrome etc.;
+longDescription = ''
+  Main features:
+  * Extended support for language peculiarities; Unicode character 
encoding, compounding and complex morphology.
+  * Improved suggestion using n-gram similarity, rule and dictionary based 
pronounciation data.
+  * Morphological analysis, stemming and generation.
+  * Hunspell is based on MySpell and works also with MySpell dictionaries.
+  * C++ library under GPL/LGPL/MPL tri-license.
+  * Interfaces and ports:
+* Enchant (Generic spelling library from the Abiword project),
+* XSpell (Mac OS X port, but Hunspell is part of the OS X from version 
10.6 (Snow Leopard), and
+now it is enough to place Hunspell dictionary files into
+~/Library/Spelling or /Library/Spelling for spell checking),
+* Delphi, Java (JNA, JNI), Perl, .NET, Python, Ruby ([1], [2]), UNO.
+'';
+platforms = platforms.all;
+maintainers = [ maintainers.urkud ];
+  };
+}

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
===
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   2010-06-30 15:52:24 UTC 
(rev 22431)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   2010-06-30 15:53:28 UTC 
(rev 22432)
@@ -4253,6 +4253,10 @@
 inherit stdenv fetchurl unzip;
   };
 
+  hunspell = makeOverridable (import ../development/libraries/hunspell) {
+inherit fetchurl stdenv ncurses readline;
+  };
+
   hwloc = import ../development/libraries/hwloc {
 inherit fetchurl stdenv pkgconfig cairo expat ncurses;
   };

___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - 22433 - urkud - in nixpkgs/trunk/pkgs/desktops/kde-4.4: . sdk

2010-06-30 Thread Yury G Kudryashov

Author: urkud
Date: 2010-06-30 15:54:40 + (Wed, 30 Jun 2010)
New Revision: 22433

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22433view=rev

Modified:
   nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix
   nixpkgs/trunk/pkgs/desktops/kde-4.4/sdk/default.nix

Log:
kdesdk: add hunspell to make lokalize compile

Changes:

Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix
===
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix 2010-06-30 15:53:28 UTC 
(rev 22432)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix 2010-06-30 15:54:40 UTC 
(rev 22433)
@@ -200,7 +200,8 @@
   };
   
   kdesdk = import ./sdk {
-inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt boost 
subversion apr aprutil shared_mime_info;
+inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt boost
+  subversion apr aprutil shared_mime_info hunspell;
 inherit kdelibs kdepimlibs;
 inherit automoc4 phonon strigi;
   };

Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/sdk/default.nix
===
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/sdk/default.nix 2010-06-30 15:53:28 UTC 
(rev 22432)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/sdk/default.nix 2010-06-30 15:54:40 UTC 
(rev 22433)
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, boost, 
subversion, apr, aprutil
-, shared_mime_info
+{ stdenv, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, subversion, 
apr, aprutil
+, shared_mime_info, hunspell
 , kdelibs, kdepimlibs, automoc4, phonon, strigi}:
 
 stdenv.mkDerivation {
@@ -11,12 +11,13 @@
   builder=./builder.sh;
   inherit aprutil;
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion apr aprutil 
shared_mime_info
-  kdelibs kdepimlibs automoc4 phonon strigi ];
-  meta = {
+  kdelibs kdepimlibs automoc4 phonon strigi hunspell];
+  meta = with stdenv.lib; {
 description = KDE SDK;
 longDescription = Contains various development utilities such as the 
Umbrello UML modeler and Cerivisia CVS front-end;
 license = GPL;
 homepage = http://www.kde.org;
-maintainers = [ lib.maintainers.sander ];
+maintainers = [ maintainers.sander maintainers.urkud ];
+platforms = platforms.linux;
   };
 }

___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - 22444 - urkud - in nixpkgs/trunk/pkgs: tools/misc tools/misc/convmv top-level

2010-07-03 Thread Yury G Kudryashov

Author: urkud
Date: 2010-07-03 08:06:01 + (Sat, 03 Jul 2010)
New Revision: 22444

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22444view=rev

Added:
   nixpkgs/trunk/pkgs/tools/misc/convmv/
   nixpkgs/trunk/pkgs/tools/misc/convmv/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Log:
Add convmv

Changes:

Added: nixpkgs/trunk/pkgs/tools/misc/convmv/default.nix
===
--- nixpkgs/trunk/pkgs/tools/misc/convmv/default.nix
(rev 0)
+++ nixpkgs/trunk/pkgs/tools/misc/convmv/default.nix2010-07-03 08:06:01 UTC 
(rev 22444)
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = convmv-1.14;
+
+  src = fetchurl {
+url = http://www.j3e.de/linux/convmv/${name}.tar.gz;;
+sha256 = 1vvwrbys5kkfpn6kvn0sj3hls5v03d6gr7j7d5phbj8p9bigb5cn;
+  };
+
+  preBuild=''
+makeFlags=PREFIX=$out
+  '';
+
+  patchPhase=''
+tar -xf testsuite.tar
+patchShebangs .
+  '';
+
+  doCheck = true;
+  checkTarget = test;
+
+  buildInputs = [ perl ];
+
+  meta = with stdenv.lib; {
+platforms = platforms.all;
+maintainers = [ maintainers.urkud ];
+  };
+}

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
===
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   2010-07-02 21:44:36 UTC 
(rev 22443)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   2010-07-03 08:06:01 UTC 
(rev 22444)
@@ -555,6 +555,10 @@
 inherit fetchurl stdenv ppl;
   };
 
+  convmv = import ../tools/misc/convmv {
+inherit stdenv fetchurl perl;
+  };
+
   coreutils_real = makeOverridable (if stdenv ? isDietLibC
   then import ../tools/misc/coreutils-5
   else import ../tools/misc/coreutils)

___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - 22445 - urkud - in nixpkgs/trunk/pkgs/desktops/kde-4.4/support: attica soprano

2010-07-03 Thread Yury G Kudryashov

Author: urkud
Date: 2010-07-03 09:18:55 + (Sat, 03 Jul 2010)
New Revision: 22445

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22445view=rev

Modified:
   nixpkgs/trunk/pkgs/desktops/kde-4.4/support/attica/default.nix
   nixpkgs/trunk/pkgs/desktops/kde-4.4/support/soprano/default.nix

Log:
Upgrade attica and soprano

Changes:

Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/support/attica/default.nix
===
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/support/attica/default.nix  
2010-07-03 08:06:01 UTC (rev 22444)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/support/attica/default.nix  
2010-07-03 09:18:55 UTC (rev 22445)
@@ -1,15 +1,16 @@
 {stdenv, fetchurl, cmake, qt4}:
 
-stdenv.mkDerivation {
-  name = attica-0.1.2;
+stdenv.mkDerivation rec {
+  name = attica-0.1.4;
   src = fetchurl {
-url = mirror://kde/stable/attica/attica-0.1.2.tar.bz2;
-sha256 = 09k7ghphqzfdlnsj61396sgmyzjqz9l6a8703y29292yc4h7qmxh;
+url = mirror://kde/stable/attica/${name}.tar.bz2;
+sha256 = 0frarnrnbli3f5ji90swgw05g88w1f5777ais345wc8lkvqg9ix1;
   };
   buildInputs = [ cmake qt4 ];
-  meta = {
+  meta = with stdenv.lib; {
 description = A library to access Open Collaboration Service providers;
 license = LGPL;
-maintainers = [ stdenv.lib.maintainers.sander ];
+maintainers = [ maintainers.sander maintainers.urkud ];
+platforms = qt4.meta.platforms;
   };
-}
\ No newline at end of file
+}

Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/support/soprano/default.nix
===
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/support/soprano/default.nix 
2010-07-03 08:06:01 UTC (rev 22444)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/support/soprano/default.nix 
2010-07-03 09:18:55 UTC (rev 22445)
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, lib, cmake, qt4, cluceneCore, redland, libiodbc}:
 
 stdenv.mkDerivation rec {
-  name = soprano-2.4.1;
+  name = soprano-2.4.4;
   
   src = fetchurl {
 url = mirror://sf/soprano/${name}.tar.bz2;
-sha256 = 1ghwjbcrbwhq0in61a47iaxcja50r9axsg9cv97x2myprrqa43bj;
+sha256 = 02qi616w6kli75ibkrvjc88spx6hi8ahlf3c926bi4lh5h73pjkq;
   };
   
   # We disable the Java backends, since we do not need them and they make the 
closure size much bigger
@@ -16,5 +16,6 @@
 description = An object-oriented C++/Qt4 framework for RDF data;
 license = LGPL;
 maintainers = with lib.maintainers; [ sander urkud ];
+platforms = qt4.meta.platforms;
   };
 }

___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-dev] two docbook_xml_dtd in one environment

2010-07-03 Thread Yury G. Kudryashov

Hi!

We unpack all docbook_xml_dtd_* to $out/xml/dtd/docbook/, so one cannot 
install both in one environment. Are there any objections against moving it 
to some version-aware directory?

For example, gentoo uses /usr/share/sgml/docbook/xml-dtd-version.

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

[Nix-commits] SVN commit: nix - 22450 - urkud - in nixpkgs/trunk/pkgs: development/libraries development/libraries/libdbusmenu-qt top-level

2010-07-04 Thread Yury G Kudryashov

Author: urkud
Date: 2010-07-04 20:55:50 + (Sun, 04 Jul 2010)
New Revision: 22450

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22450view=rev

Added:
   nixpkgs/trunk/pkgs/development/libraries/libdbusmenu-qt/
   nixpkgs/trunk/pkgs/development/libraries/libdbusmenu-qt/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Log:
Add libdbusmenu-qt

Changes:

Added: nixpkgs/trunk/pkgs/development/libraries/libdbusmenu-qt/default.nix
===
--- nixpkgs/trunk/pkgs/development/libraries/libdbusmenu-qt/default.nix 
(rev 0)
+++ nixpkgs/trunk/pkgs/development/libraries/libdbusmenu-qt/default.nix 
2010-07-04 20:55:50 UTC (rev 22450)
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, qt4, cmake }:
+
+let
+  baseName = libdbusmenu-qt;
+  v = 0.5.1;
+in
+stdenv.mkDerivation rec {
+  name = ${baseName}-${v};
+
+  src = fetchurl {
+url = 
http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2;;
+sha256 = 0ipz1f08d2wgg18l12wssv9lhm66xhj31a1dbikg2rzw7c6bvjvk;
+  };
+
+  buildInputs = [ cmake qt4 ];
+  
+  meta = with stdenv.lib; {
+description = Provides a Qt implementation of the DBusMenu spec;
+homepage = http://people.canonical.com/~agateau/dbusmenu/;
+maintainers = [ maintainers.urkud ];
+inherit (qt4.meta) platforms;
+  };
+}

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
===
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   2010-07-04 11:10:58 UTC 
(rev 22449)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   2010-07-04 20:55:50 UTC 
(rev 22450)
@@ -4003,6 +4003,10 @@
 
   libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
 
+  libdbusmenu_qt = makeOverridable (import 
../development/libraries/libdbusmenu-qt) {
+inherit stdenv fetchurl qt4 cmake;
+  };
+
   libdwg = import ../development/libraries/libdwg {
 inherit stdenv fetchurl;
   };

___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - 22451 - urkud - in nixpkgs/trunk/pkgs: development/libraries development/libraries/qjson top-level

2010-07-04 Thread Yury G Kudryashov

Author: urkud
Date: 2010-07-04 20:59:47 + (Sun, 04 Jul 2010)
New Revision: 22451

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22451view=rev

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

Log:
Add qjson

Changes:

Added: nixpkgs/trunk/pkgs/development/libraries/qjson/default.nix
===
--- nixpkgs/trunk/pkgs/development/libraries/qjson/default.nix  
(rev 0)
+++ nixpkgs/trunk/pkgs/development/libraries/qjson/default.nix  2010-07-04 
20:59:47 UTC (rev 22451)
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, cmake, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = qjson-0.7.1;
+
+  src = fetchurl {
+url = mirror://sf/qjson/${name}.tar.bz2;
+sha256 = 155r7nypgnsvjc6w3q51zmjchpqxi4c3azad9cf1fip8bws993iv;
+  };
+
+  buildInputs = [ cmake qt4 ];
+
+  meta = {
+maintainers = [ stdenv.lib.maintainers.urkud ];
+inherit (qt4.meta) platforms;
+  };
+}

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
===
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   2010-07-04 20:55:50 UTC 
(rev 22450)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   2010-07-04 20:59:47 UTC 
(rev 22451)
@@ -5162,6 +5162,10 @@
 inherit fetchurl stdenv;
   };
 
+  qjson = makeOverridable (import ../development/libraries/qjson) {
+inherit stdenv fetchurl qt4 cmake;
+  };
+
   qt3 = makeOverridable (import ../development/libraries/qt-3) {
 inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa;
 inherit (xlibs) xextproto libXft libXrender libXrandr randrproto

___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - 22474 - urkud - in nixpkgs/trunk/pkgs/applications: graphics/djview misc/djvulibre

2010-07-05 Thread Yury G Kudryashov

Author: urkud
Date: 2010-07-05 11:09:38 + (Mon, 05 Jul 2010)
New Revision: 22474

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22474view=rev

Modified:
   nixpkgs/trunk/pkgs/applications/graphics/djview/default.nix
   nixpkgs/trunk/pkgs/applications/misc/djvulibre/default.nix

Log:
Don't build djview3 by default, let hydra build djview4

Changes:

Modified: nixpkgs/trunk/pkgs/applications/graphics/djview/default.nix
===
--- nixpkgs/trunk/pkgs/applications/graphics/djview/default.nix 2010-07-05 
09:28:22 UTC (rev 22473)
+++ nixpkgs/trunk/pkgs/applications/graphics/djview/default.nix 2010-07-05 
11:09:38 UTC (rev 22474)
@@ -1,4 +1,4 @@
-args: with args;
+{stdenv, fetchurl, djvulibre, qt4 }:
 
 stdenv.mkDerivation {
name = djview4-4.1-2;
@@ -13,5 +13,7 @@
homepage = http://djvu.sourceforge.net/djview4.html;
description = A new portable DjVu viewer and browser plugin;
license = GPL2;
+inherit (qt4.meta) platforms;
+maintainers = [ stdenv.lib.maintainers.urkud ];
};
 }

Modified: nixpkgs/trunk/pkgs/applications/misc/djvulibre/default.nix
===
--- nixpkgs/trunk/pkgs/applications/misc/djvulibre/default.nix  2010-07-05 
09:28:22 UTC (rev 22473)
+++ nixpkgs/trunk/pkgs/applications/misc/djvulibre/default.nix  2010-07-05 
11:09:38 UTC (rev 22474)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, useQt3 ? true, libjpeg, libtiff, libpng, ghostscript
+{ stdenv, fetchurl, lib, useQt3 ? false, libjpeg, libtiff, libpng, ghostscript
 , libungif, zlib, x11, libX11, mesa, qt3 }:
 
 stdenv.mkDerivation {

___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-dev] Re: [PATCH] * SUBJECT HERE *

2010-07-10 Thread Yury G. Kudryashov

Marc Weber wrote:

 Take it or don't. I updated the gimpGit patch using the new style
 Reminder: Yuri told he had a problem with this glib version (I don't):
Could you please paste configure log of your gtk+?

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

[Nix-dev] Re: Re: [PATCH] * SUBJECT HERE *

2010-07-11 Thread Yury G. Kudryashov

Marc Weber wrote:

 Excerpts from Yury G. Kudryashov's message of Sat Jul 10 22:47:02 +0200
 2010:
 Marc Weber wrote:
  Take it or don't. I updated the gimpGit patch using the new style
  Reminder: Yuri told he had a problem with this glib version (I don't):
 Could you please paste configure log of your gtk+?
 Sorry for the delay. I noticed that I had trouble building gimpGit. See
 other thread.
 
 http://mawercer.de/~marc/gtk+.log.gz
 log of store path /nix/store/sp0c50sfzislm0yyag7jaakd26mvmg7x-gtk+-2.21.1,
 /nix/store/b26s2cbpl5dipbhiv2azl1fjfqsb3rbc-gtk+-2.21.1.drv
 x86_64 system
I was talking about this line:

checking if gio can sniff png... no

It should be yes with glib-2.24.x. Test program segfaults, and I haven't 
managed to debug this problem.


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

[Nix-dev] Re: Re: Re: [PATCH] * SUBJECT HERE *

2010-07-11 Thread Yury G. Kudryashov

Marc Weber wrote:

 Hi Yuri,
 
 I was talking about this line:
 
 checking if gio can sniff png... no
 
 It should be yes with glib-2.24.x. Test program segfaults, and I
 haven't managed to debug this problem.
 
 How to catch this in the future? Apply regex on configure output?
 
 configureCheck = configureCheck (it: [
   (it.shouldDetect yes) # using BDD style here - for fun
 ]);
 
 Then make it fail when that line is no or not present?
The real problem is to understand *why* the test program segfaults.


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

[Nix-commits] SVN commit: nix - r22621 - nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies

2010-07-17 Thread Yury G. Kudryashov

Author: urkud
Date: Sat Jul 17 22:11:59 2010
New Revision: 22621
URL: https://svn.nixos.org/websvn/nix/?rev=22621sc=1

Log:
SDO-0.5

Modified:
   nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix

Modified: nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix
==
--- nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix  Sat Jul 
17 13:23:48 2010(r22620)
+++ nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix  Sat Jul 
17 22:11:59 2010(r22621)
@@ -1,14 +1,27 @@
-{stdenv, fetchurl, cmake}:
+{stdenv, fetchurl, cmake, v ? 0.2}:
 
-stdenv.mkDerivation {
-  name = shared-desktop-ontologies-0.2;
+stdenv.mkDerivation rec {
+  name = shared-desktop-ontologies-${v};
   src = fetchurl {
-url = mirror://sourceforge/oscaf/shared-desktop-ontologies-0.2.tar.bz2;
-sha256 = 1w9gfprrp518hb7nm5wspxjd7xx0h08bph6asrx5vrx7j7fzg4m7;
+url = mirror://sf/oscaf/${name}.tar.bz2;
+sha256 =
+  if v == 0.2 then
+1w9gfprrp518hb7nm5wspxjd7xx0h08bph6asrx5vrx7j7fzg4m7
+  else if v == 0.5 then
+1a1gs2b314133rg7vzwvnqbxchf7xgs0jpkydid5l2wz98m7j17r
+  else throw Unknown version;
   };
   buildInputs = [ cmake ];
-  meta = {
+  meta = with stdenv.lib; {
 description = Ontologies necessary for the Nepomuk semantic desktop;
-maintainers = [ stdenv.lib.maintainers.sander ];
+longDescription = ''
+  The shared-desktop-ontologies package brings the semantic web to the
+  desktop in terms of vocabulary. It contains the well known core
+  ontologies such as RDF and RDFS as well as the Nepomuk ontologies which
+  are used by projects like KDE or Strigi.
+'';
+platforms = platforms.all;
+maintainers = [ maintainers.sander maintainers.urkud ];
   };
 }
+
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r22622 - in nixpkgs/trunk/pkgs/desktops/kde-4.5: . support support/akonadi support/attica support/automoc4 support/eigen support/phonon support/qca2 support/soprano

2010-07-17 Thread Yury G. Kudryashov

Author: urkud
Date: Sat Jul 17 22:14:54 2010
New Revision: 22622
URL: https://svn.nixos.org/websvn/nix/?rev=22622sc=1

Log:
kdesupport for kde-4.5

Added:
   nixpkgs/trunk/pkgs/desktops/kde-4.5/
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/default.nix
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/attica/
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/attica/default.nix
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/automoc4/
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/automoc4/default.nix
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/eigen/
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/eigen/default.nix
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/phonon/
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/phonon/default.nix
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/default.nix
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/ossl-remove-whirlpool.patch
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/ossl.nix
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/soprano/
   nixpkgs/trunk/pkgs/desktops/kde-4.5/support/soprano/default.nix

Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/default.nix Sat Jul 
17 22:14:54 2010(r22622)
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, 
automoc4, soprano}:
+
+stdenv.mkDerivation rec {
+  name = akonadi-1.3.85;
+  src = fetchurl {
+url = http://download.akonadi-project.org/${name}.tar.bz2;;
+sha256 = 1d2ancspavp4qg717hj56j1likb0ifdr65q1awbc2ghqqgd9znck;
+  };
+  buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 
soprano ];
+  meta = with stdenv.lib; {
+description = KDE PIM Storage Service;
+license = LGPL;
+homepage = http://pim.kde.org/akonadi;
+maintainers = [ maintainers.sander maintainers.urkud ];
+platforms = platforms.linux;
+  };
+}

Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/attica/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/attica/default.nix  Sat Jul 
17 22:14:54 2010(r22622)
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, cmake, qt4}:
+
+stdenv.mkDerivation rec {
+  name = attica-0.1.4;
+  src = fetchurl {
+url = mirror://kde/stable/attica/${name}.tar.bz2;
+sha256 = 0frarnrnbli3f5ji90swgw05g88w1f5777ais345wc8lkvqg9ix1;
+  };
+  buildInputs = [ cmake qt4 ];
+  meta = with stdenv.lib; {
+description = A library to access Open Collaboration Service providers;
+license = LGPL;
+maintainers = [ maintainers.sander maintainers.urkud ];
+platforms = qt4.meta.platforms;
+  };
+}

Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/automoc4/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/automoc4/default.nixSat Jul 
17 22:14:54 2010(r22622)
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, lib, cmake, qt4}:
+
+stdenv.mkDerivation {
+  name = automoc4-0.9.88;
+  src = fetchurl {
+url = mirror://kde/stable/automoc4/0.9.88/automoc4-0.9.88.tar.bz2;
+md5 = 91bf517cb940109180ecd07bc90c69ec;
+  };
+  buildInputs = [ cmake qt4 ];
+  meta = {
+description = KDE Meta Object Compiler;
+license = BSD;
+maintainers = [ lib.maintainers.sander ];
+  };
+}

Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/eigen/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/eigen/default.nix   Sat Jul 
17 22:14:54 2010(r22622)
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, lib, cmake}:
+
+let
+  v = 2.0.14;
+in
+stdenv.mkDerivation {
+  name = eigen-${v};
+  src = fetchurl {
+url = http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2;;
+name = eigen-${v}.tar.bz2;
+sha256 = 01xkdqs6hqkwcq5yzpdz79da0i512s818pbg8fl9w3m2vvndzs6p;
+  };
+  buildInputs = [ cmake ];
+  meta = {
+description = C++ template library for linear algebra: vectors, matrices, 
and related algorithms;
+license = LGPL;
+homepage = http://eigen.tuxfamily.org ;
+maintainers = [ lib.maintainers.sander ];
+  };
+}

Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/phonon/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++

[Nix-commits] SVN commit: nix - r22623 - nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/yakuake

2010-07-17 Thread Yury G. Kudryashov

Author: urkud
Date: Sat Jul 17 22:15:28 2010
New Revision: 22623
URL: https://svn.nixos.org/websvn/nix/?rev=22623sc=1

Log:
bump yakuake to 2.9.7

Modified:
   nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/yakuake/default.nix

Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/yakuake/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/yakuake/default.nix   Sat Jul 
17 22:14:54 2010(r22622)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/yakuake/default.nix   Sat Jul 
17 22:15:28 2010(r22623)
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, kdelibs, cmake, gettext, perl, automoc4, qt4, phonon }:
 
 stdenv.mkDerivation rec {
-  name = yakuake-2.9.6;
+  name = yakuake-2.9.7;
 
   src = fetchurl {
 url = http://download.berlios.de/yakuake/${name}.tar.bz2;;
-sha256 = 08n6kdzk205rq1bs4yx5f2qawz6xigdhn9air0pbjsi1j630yfzq;
+sha256 = 0azzvbh3jwz8yhn6gqd46ya7589sadfjyysw230vlf0zlfipdlvd;
   };
 
   buildInputs = [ kdelibs cmake gettext perl automoc4 qt4 phonon 
stdenv.gcc.libc ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-dev] Re: Hello, Nix project

2010-07-27 Thread Yury G. Kudryashov

Magdalena Bugajska wrote:

 I wanted to set up my own collection of packages made up of things
 I've been working on, but all the directions point to setting up a
 package within the nixpkgs collection which didn't really make much
 sense to me.  Is there really supposed to be one tree?  Or can
 somebody point me to a simple project that shows a basic configuration
 of nix files for deployment of a collection of just couple packages?
 The all-packages.nix from nixpkgs is slightly on the the confusing side.
 
 Is it possible to have the separate package collection to use fetchurl
 and stdenv functions from nixpkgs?  The best I can figure out, I would
 have to copy the relevant functions calls and definitions and the
 builders into my own collection, i.e. redefine them in my own
 namespace.  But in case of more substantial libraries or compilers
 wouldn't that result in installing the package multiple times once for
 each collection/namespace?  I must be missing something ...
Something like
let pkgs = import /etc/nixos/nixpkgs; in ...
Look how /etc/nixos/nixos calls /etc/nixos/nixpkgs.
 
 I've also been looking for examples of channel setup and a farm, but I
 don't think I'm ready for those.
 
 Appreciate any the help.
 
 -- Magda


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

[Nix-dev] kde-4.5

2010-07-28 Thread Yury G. Kudryashov

Hi!

KDE SC 4.5 RC 3 is released. I'm packaging it for NixOS. I'll commit my work 
tomorrow (I want to check that my expression for RC2 works for RC3). Please, 
don't commit blind upgrades for KDE 4.5.

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

[Nix-dev] RE: Nix expression writing conventions

2010-07-30 Thread Yury G. Kudryashov

Sander van der Burg - EWI wrote:

 Yes, this is probably best, but we'll have to teach nix-env about the
 version
 attribute.  A big advantage is that we get rid of the ambiguity between
 the name part and the version part in names such foo-cvs.
 
 Ok +1,
 
 I'm in favour for this solution, but to implement this you have to make
 some major changes, right? Maybe this is a nice little hobby project in
 case you're bored, hehe.

What about this:

mkDerivation = a : if a ? version then mkDerivation (removeAttrs a version 
// { name = ${a.name}-${a.version}; }) else old_expr


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

[Nix-commits] SVN commit: nix - r22830 - in nixpkgs/trunk/pkgs: development/libraries/qt-4.x/4.7 top-level

2010-07-30 Thread Yury G. Kudryashov

Author: urkud
Date: Fri Jul 30 19:45:07 2010
New Revision: 22830
URL: https://svn.nixos.org/websvn/nix/?rev=22830sc=1

Log:
Add qt-4.7.0-beta2

Modified:
   nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix Fri Jul 
30 17:42:52 2010(r22829)
+++ nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix Fri Jul 
30 19:45:07 2010(r22830)
@@ -2,17 +2,21 @@
 , alsaLib, gstreamer, gstPluginsBase, pulseaudio
 , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, 
libXcursor, libXmu
 , libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, 
fontconfig
-, zlib, libjpeg, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, 
glib
+, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig, 
libtiff, glib
 , mysql, postgresql, sqlite
 , perl, coreutils, libXi
 , buildDemos ? false, buildExamples ? false, useDocs ? true}:
 
+let
+  v = 4.7.0-beta2;
+in
+
 stdenv.mkDerivation rec {
-  name = qt-4.7.0-beta1;
+  name = qt-${v};
   
   src = fetchurl {
-url = 
ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.0-beta1.tar.gz;
-sha256 = 0ac9dk2xdcbwjmh9hgmnp60df9shv2ss78lls2apgnjddscdw1qi;
+url = 
ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz;;
+sha256 = 1gxckb5pxybnj5413dxk7dm8hm945ymm4ppqwg14wfk83zhnw6g0;
   };
   
   preConfigure = '' 
@@ -20,6 +24,7 @@
 configureFlags+=
   -docdir $out/share/doc/${name}
   -plugindir $out/lib/qt4/plugins
+  -importdir $out/lib/qt4/imports
   -examplesdir $out/share/doc/${name}/examples
   -demosdir $out/share/doc/${name}/demos
   -datadir $out/share/qt4
@@ -40,6 +45,7 @@
 libXcursor 
 zlib 
 libjpeg 
+libmng
 mysql 
 postgresql
 libpng 
@@ -75,18 +81,18 @@
 
   configureFlags = ''
 -v -no-separate-debug-info -release -fast -confirm-license -opensource
--system-zlib -system-libpng -system-libjpeg -qt-gif
+-system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng
 -opengl -xrender -xrandr -xinerama -xcursor
 -plugin-sql-mysql -system-sqlite
 -qdbus -cups -glib -xfixes -dbus-linked
 -fontconfig -I${freetype}/include/freetype2
 -exceptions -xmlpatterns
--multimedia -mediaservices
+-multimedia -audio-backend
+-phonon -phonon-backend -svg
 -javascript-jit
 ${if buildDemos == true then -make demos else -nomake demos}
 ${if buildExamples == true then -make examples else -nomake examples}
-${if useDocs then -make docs else -nomake docs}
-  '';
+${if useDocs then -make docs else -nomake docs}'';
 
   patchPhase = ''
 substituteInPlace configure --replace /bin/pwd pwd

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Fri Jul 30 17:42:52 
2010(r22829)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Fri Jul 30 19:45:07 
2010(r22830)
@@ -5298,9 +5298,9 @@
   };
 
   qt47 = makeOverridable (import ../development/libraries/qt-4.x/4.7) {
-inherit fetchurl stdenv zlib libjpeg libpng which mysql mesa openssl cups 
dbus
-  fontconfig freetype pkgconfig libtiff perl coreutils sqlite alsaLib
-  postgresql pulseaudio;
+inherit fetchurl stdenv zlib libjpeg libpng libmng which mysql mesa openssl
+  cups dbus fontconfig freetype pkgconfig libtiff perl coreutils sqlite
+  alsaLib postgresql pulseaudio;
 inherit (gst_all) gstreamer gstPluginsBase;
 inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
   libXmu libXinerama xineramaproto libXcursor libXext libXi
@@ -9568,7 +9568,7 @@
   kde4 = kde44;
 
   kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // {
-inherit openexr;
+qt4 = qt46;
 stdenv = stdenv2;
   });
 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r22831 - in nixpkgs/trunk/pkgs: development/libraries/libsamplerate top-level

2010-07-30 Thread Yury G. Kudryashov

Author: urkud
Date: Fri Jul 30 20:17:37 2010
New Revision: 22831
URL: https://svn.nixos.org/websvn/nix/?rev=22831sc=1

Log:
Add libsndfile and fftw support to libsamplerate

Modified:
   nixpkgs/trunk/pkgs/development/libraries/libsamplerate/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/libsamplerate/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/libsamplerate/default.nix  Fri Jul 
30 19:45:07 2010(r22830)
+++ nixpkgs/trunk/pkgs/development/libraries/libsamplerate/default.nix  Fri Jul 
30 20:17:37 2010(r22831)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, pkgconfig, fftw, libsndfile }:
 
 stdenv.mkDerivation rec {
   name = libsamplerate-0.1.7;
@@ -8,17 +8,13 @@
 sha256 = 1m1iwzpcny42kcqv5as2nyb0ggrb56wzckpximqpp2y74dipdf4q;
   };
 
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ fftw libsndfile ];
+
   # maybe interesting configure flags:
   #--disable-fftw  disable usage of FFTW
   #--disable-cpu-clip  disable tricky cpu specific clipper
 
-  configurePhase =
-''
-  export LIBSAMPLERATE_CFLAGS=-I $libsamplerate/include
-  export LIBSAMPLERATE_LIBS=-L $libsamplerate/libs
-  ./configure --prefix=$out
-'';
-
   meta = {
 description = Sample Rate Converter for audio;
 homepage = http://www.mega-nerd.com/SRC/index.html;

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Fri Jul 30 19:45:07 
2010(r22830)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Fri Jul 30 20:17:37 
2010(r22831)
@@ -4684,7 +4684,7 @@
   };
 
   libsamplerate = import ../development/libraries/libsamplerate {
-inherit fetchurl stdenv;
+inherit fetchurl stdenv libsndfile fftw pkgconfig;
   };
 
   libspectre = import ../development/libraries/libspectre {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r22832 - nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7

Author: urkud
Date: Sat Jul 31 13:05:22 2010
New Revision: 22832
URL: https://svn.nixos.org/websvn/nix/?rev=22832sc=1

Log:
trailing spaces

Modified:
   nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix Fri Jul 
30 20:17:37 2010(r22831)
+++ nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix Sat Jul 
31 13:05:22 2010(r22832)
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   name = qt-${v};
-  
+
   src = fetchurl {
 url = 
ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz;;
 sha256 = 1gxckb5pxybnj5413dxk7dm8hm945ymm4ppqwg14wfk83zhnw6g0;
   };
-  
-  preConfigure = '' 
+
+  preConfigure = ''
 export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
 configureFlags+=
   -docdir $out/share/doc/${name}
@@ -30,40 +30,40 @@
   -datadir $out/share/qt4
 
   '';
-  
+
   propagatedBuildInputs = [
 alsaLib
 sqlite
-libXft 
-libXrender 
-libXrandr 
+libXft
+libXrender
+libXrandr
 libXi
-randrproto 
+randrproto
 xextproto
-libXinerama 
-xineramaproto 
-libXcursor 
-zlib 
-libjpeg 
+libXinerama
+xineramaproto
+libXcursor
+zlib
+libjpeg
 libmng
-mysql 
+mysql
 postgresql
-libpng 
-which 
+libpng
+which
 mesa
-libXmu 
+libXmu
 libXv
-openssl 
-dbus.libs 
-cups 
-pkgconfig 
-libXext 
-freetype 
-fontconfig 
+openssl
+dbus.libs
+cups
+pkgconfig
+libXext
+freetype
+fontconfig
 inputproto
-fixesproto 
-libXfixes 
-glib 
+fixesproto
+libXfixes
+glib
 libtiff
 gstreamer
 gstPluginsBase
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r22833 - nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7

Author: urkud
Date: Sat Jul 31 13:05:46 2010
New Revision: 22833
URL: https://svn.nixos.org/websvn/nix/?rev=22833sc=1

Log:
qt-4.7.0-beta2: fool phonon version

Qt guys updated source files but not version number

Added:
   nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch
Modified:
   nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix Sat Jul 
31 13:05:22 2010(r22832)
+++ nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix Sat Jul 
31 13:05:46 2010(r22833)
@@ -72,11 +72,6 @@
 
   buildInputs = [ perl ];
 
-  # libQtNetwork will call libQtCore for it to dlopen openssl.
-  NIX_LDFLAGS = -rpath ${openssl}/lib;
-  # Don't shrink the rpath, to keep ${openssl} in it.
-  dontPatchELF = 1;
-  
   prefixKey = -prefix ;
 
   configureFlags = ''
@@ -84,17 +79,18 @@
 -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng
 -opengl -xrender -xrandr -xinerama -xcursor
 -plugin-sql-mysql -system-sqlite
--qdbus -cups -glib -xfixes -dbus-linked
+-qdbus -cups -glib -xfixes -dbus-linked -openssl-linked
 -fontconfig -I${freetype}/include/freetype2
 -exceptions -xmlpatterns
--multimedia -audio-backend
--phonon -phonon-backend -svg
--javascript-jit
+-multimedia -audio-backend -phonon -phonon-backend
+-webkit -javascript-jit
 ${if buildDemos == true then -make demos else -nomake demos}
 ${if buildExamples == true then -make examples else -nomake examples}
 ${if useDocs then -make docs else -nomake docs}'';
-
-  patchPhase = ''
+
+  patches = [ ./phonon-4.4.0.patch ];
+
+  postPatch = ''
 substituteInPlace configure --replace /bin/pwd pwd
 substituteInPlace src/corelib/global/global.pri --replace /bin/ls 
${coreutils}/bin/ls
 sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
@@ -102,12 +98,12 @@
 
   postInstall = if useDocs then rm -rf $out/share/doc/${name}/{html,src} 
else ;
 
-  meta = {
+  meta = with stdenv.lib; {
 homepage = http://qt.nokia.com/products;
 description = A cross-platform application framework for C++;
 license = GPL/LGPL;
-maintainers = with stdenv.lib.maintainers; [ urkud sander ];
-platforms = stdenv.lib.platforms.mesaPlatforms;
+maintainers = with maintainers; [ urkud sander ];
+platforms = platforms.mesaPlatforms;
 priority = 10;
   };
 }

Added: nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch  
Sat Jul 31 13:05:46 2010(r22833)
@@ -0,0 +1,19 @@
+diff --git a/src/3rdparty/phonon/phonon/phononnamespace.h 
b/src/3rdparty/phonon/phonon/phononnamespace.h
+index ec42d51..eb899de 100644
+--- a/src/3rdparty/phonon/phonon/phononnamespace.h
 b/src/3rdparty/phonon/phonon/phononnamespace.h
+@@ -41,12 +41,12 @@
+ /**
+  * PHONON_VERSION is (major  16) + (minor  8) + patch.
+  */
+-#define PHONON_VERSION PHONON_VERSION_CHECK(4, 3, 1)
++#define PHONON_VERSION PHONON_VERSION_CHECK(4, 4, 0)
+ 
+ /**
+  * PHONON_VERSION_STR is major.minor.patch. E.g. 4.2.1
+  */
+-#define PHONON_VERSION_STR 4.3.1
++#define PHONON_VERSION_STR 4.4.0
+ 
+ QT_BEGIN_HEADER
+ QT_BEGIN_NAMESPACE
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r22834 - in nixpkgs/trunk/pkgs: servers/pulseaudio top-level

Author: urkud
Date: Sat Jul 31 13:05:58 2010
New Revision: 22834
URL: https://svn.nixos.org/websvn/nix/?rev=22834sc=1

Log:
pulseaudio: udev and bluez support

Modified:
   nixpkgs/trunk/pkgs/servers/pulseaudio/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/servers/pulseaudio/default.nix
==
--- nixpkgs/trunk/pkgs/servers/pulseaudio/default.nix   Sat Jul 31 13:05:46 
2010(r22833)
+++ nixpkgs/trunk/pkgs/servers/pulseaudio/default.nix   Sat Jul 31 13:05:58 
2010(r22834)
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, hal, avahi
+{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
 , gconf, liboil, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
-, libcap, alsaLib, libsamplerate, libsndfile, speex
+, libcap, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
 , ...}:
 
 stdenv.mkDerivation rec {
@@ -15,10 +15,10 @@
   propagatedBuildInputs = [ gdbm ];
 
   buildInputs = [
-pkgconfig gnum4 libtool glib dbus hal avahi gconf liboil
+pkgconfig gnum4 libtool glib dbus avahi gconf liboil
 libsamplerate libsndfile speex alsaLib libcap
 gtk libX11 libICE libSM libXtst libXi
-intltool gettext
+intltool gettext bluez udev
   ];
 
   preConfigure = ''
@@ -33,7 +33,8 @@
   '';
 
   configureFlags = ''
---disable-solaris --disable-udev --disable-jack --disable-bluez 
--localstatedir=/var
+--disable-solaris --disable-hal --disable-jack --localstatedir=/var
+--disable-oss-output --disable-oss-wrapper
   '';
 
   meta = {

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Sat Jul 31 13:05:46 
2010(r22833)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Sat Jul 31 13:05:58 
2010(r22834)
@@ -6004,8 +6004,8 @@
 
   pulseaudio = makeOverridable (import ../servers/pulseaudio) {
 inherit fetchurl stdenv pkgconfig gnum4 gdbm
-  dbus hal avahi liboil libsamplerate libsndfile speex
-  intltool gettext libtool libcap;
+  dbus avahi liboil libsamplerate libsndfile speex
+  intltool gettext libtool libcap bluez udev;
 inherit (xlibs) libX11 libICE libSM libXtst libXi;
 inherit (gtkLibs) gtk glib;
 inherit alsaLib;# Needs ALSA = 1.0.17.
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r22835 - in nixpkgs/trunk/pkgs: applications/networking/browsers/rekonq top-level

Author: urkud
Date: Sat Jul 31 13:06:10 2010
New Revision: 22835
URL: https://svn.nixos.org/websvn/nix/?rev=22835sc=1

Log:
Upgrade rekonq

Deleted:
   nixpkgs/trunk/pkgs/applications/networking/browsers/rekonq/source.nix
Modified:
   nixpkgs/trunk/pkgs/applications/networking/browsers/rekonq/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/rekonq/default.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/browsers/rekonq/default.nix  
Sat Jul 31 13:05:58 2010(r22834)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/rekonq/default.nix  
Sat Jul 31 13:06:10 2010(r22835)
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, fetchgit, cmake, qt4, kdelibs, automoc4, phonon, perl
-, v ? 0.4.90 }:
+{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, perl
+, gtk, gettext, pixman}:
 
-stdenv.mkDerivation (
-  builtins.getAttr v (import ./source.nix { inherit fetchurl fetchgit; })
-  // {
-buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl ];
+stdenv.mkDerivation rec {
+  name = rekonq-0.5.0;
 
-meta = with stdenv.lib; {
-  platforms = platforms.linux;
-  maintainers = [ maintainers.urkud ];
-  description = KDE Webkit browser;
-  homepage = http://rekonq.sourceforge.net;
-};
-  }
-)
+  src = fetchurl {
+url = mirror://sf/rekonq/${name}.tar.bz2;
+sha256 = 0qm16ivxlh3pj7v39z3ajf90sgm5q5xq6a8s2x1a0ipsh7fgkp58;
+  };
+
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gtk gettext pixman ];
+
+  meta = with stdenv.lib; {
+platforms = platforms.linux;
+maintainers = [ maintainers.urkud ];
+description = KDE Webkit browser;
+homepage = http://rekonq.sourceforge.net;
+  };
+}

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Sat Jul 31 13:05:58 
2010(r22834)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Sat Jul 31 13:06:10 
2010(r22835)
@@ -8717,7 +8717,9 @@
 };
 
   rekonq = makeOverridable (import ../applications/networking/browsers/rekonq) 
{
-inherit fetchurl fetchgit stdenv cmake perl;
+inherit fetchurl stdenv cmake perl gettext;
+inherit (gtkLibs) gtk;
+inherit (xlibs) pixman;
 inherit (kde4) qt4 kdelibs automoc4 phonon;
   };
 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

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

Author: urkud
Date: Sat Jul 31 18:47:15 2010
New Revision: 22836
URL: https://svn.nixos.org/websvn/nix/?rev=22836sc=1

Log:
Fix nixpkgs evaluation

I've removed rekonqScm but forgotten to remove it from all-packages

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   Sat Jul 31 13:06:10 
2010(r22835)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Sat Jul 31 18:47:15 
2010(r22836)
@@ -8723,8 +8723,6 @@
 inherit (kde4) qt4 kdelibs automoc4 phonon;
   };
 
-  rekonqScm = rekonq.override { v = scm; };
-
   rsync = import ../applications/networking/sync/rsync {
 inherit fetchurl stdenv acl perl;
 enableACLs = !stdenv.isDarwin;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-dev] live builds proposal