[Nix-dev] update/release new version of nix
I have a friend interested in installing nix under Ubuntu 10.04 and 11.10, however all the nix packages listed on the download page http://nixos.org/nix/download.html are for older version of Ubuntu. Is anyone willing to build packages for nix for newer releases of Ubuntu? It would go a long way for nix advocay. -- Russell O'Connor http://r6.ca/ ``All talk about `theft,''' the general counsel of the American Graphophone Company wrote, ``is the merest claptrap, for there exists no property in ideas musical, literary or artistic, except as defined by statute.'' ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] update/release new version of nix
On Mon, 6 Feb 2012 10:21:09 -0500 (EST), rocon...@theorem.ca wrote: I have a friend interested in installing nix under Ubuntu 10.04 and 11.10, however all the nix packages listed on the download page http://nixos.org/nix/download.html are for older version of Ubuntu. Is anyone willing to build packages for nix for newer releases of Ubuntu? It would go a long way for nix advocay. While it would be nice to have more currently named packages the latest ubuntu package works up to ubuntu 12.somthing. -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 Jabber/XMPP: f...@chaoflow.net IRC: chaoflow on freenode,ircnet,blafasel,OFTC pgpwDopZmSmUk.pgp Description: PGP signature ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Experiences with Nvidia Optimus?
On Sun, Feb 5, 2012 at 11:23 PM, Arie Middelkoop amidd...@gmail.com wrote: On 05-02-12 11:48, Mathijs Kwik wrote: I haven't seen (or needed) microcode related stuff since then, but I got curious after your commit. A quick look at archlinux gives: http://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/intel-ucode In other words: you are right, no tool is needed any longer, but you need to convert the .dat file into some more generic format. Tool is given there. Thanks. It should now work. After I 'modprobe microcode': [ 20.037726] microcode: CPU0 sig=0x206a7, pf=0x10, revision=0x23 [ 20.041392] microcode: CPU0 updated to revision 0x25, date = 2011-10-11 ... [ 20.065190] microcode: Microcode Update Driver: v2.00 tig...@aivazian.fsnet.co.uk, Peter Oruba Arie yes, that works for me too. However, if I load microcode during boot, the system fully hangs. But don't worry. For now I just have it load after 10s as it's probably hard to debug and probably very hardware specific. Now if only we knew what those updates are for :) Thanks, Mathijs ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] gnutls broken
Hi Ludo, We can revisit the default to be Guile-less if it really happens to make people lives brighter. ;-) my understanding is that the Guile-part of the test suite of GNUTLS assumes that certain local TCP ports are free, and that this assumption may fail for all kinds of reasons. In other words, the GNUTLS build may fail spuriously when guile support is enabled. Is that understanding correct? If it is, then I would prefer to Guile support disabled by default. Generally speaking, this choice also seems to be more in line with the way we configure other packages, i.e. many other packages (such as SVN) provide bindings for scripting languages but have those turned off by default. What do you think? Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] upgrades and new packages
Hi Mathijs, I have committed patches 1-9. Thanks! I see no reason why 10 and 11 should not be committed, too, but since you labeled them unsure yourself I was too much of a coward to make a decision. ;-) Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] security advisory check
Hi Florian, How can we get a list of all profiles with all their packages and versions? Something like a list of __profile__package-version lines, multi-line would also be ok. will this code help? for n in /nix/store/*-user-environment; do nix-env -p $n -q \* | sed -e s|^|$n: | done Take care, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] nixpkgs and external package databases
Hi Florian, We have hackage, pypi, marmalade, cpan, ctan and probably many more - all databases of packages for some language or tool. How do we want to handle them? I would love to provide helpful insights into that subject, but unfortunately I don't know much about the respective domains. We have a decent solution for Hackage, which is described here: https://github.com/haskell4nix/cabal2nix/blob/master/README.md I hope this helps, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] nixpkgs and external package databases
On Mon, 06 Feb 2012 20:36:22 +0100, Peter Simons sim...@cryp.to wrote: Hi Florian, We have hackage, pypi, marmalade, cpan, ctan and probably many more - all databases of packages for some language or tool. How do we want to handle them? I would love to provide helpful insights into that subject, but unfortunately I don't know much about the respective domains. We have a decent solution for Hackage, which is described here: https://github.com/haskell4nix/cabal2nix/blob/master/README.md I hope this helps, thx a lot! -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 Jabber/XMPP: f...@chaoflow.net IRC: chaoflow on freenode,ircnet,blafasel,OFTC pgprSVkj7xJbT.pgp Description: PGP signature ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] nixpkgs and external package databases
Excerpts from Florian Friesdorf's message of Mon Feb 06 04:10:03 +0100 2012:
the topic was brought already but I could not find a conclusive answer
to it - if I missed it, I would be glad if you could point me to it.
Let me keep the story short:
I've posted about it:
http://article.gmane.org/gmane.linux.distributions.nixos/6812/match=marc+eclipse+emacs+vim
Which is the best way? I don't know.
The approach 'create snapshots of hackage/rubyforge' once a day and
commit all data to git works for me - but also requires lots of disk
space and bandwidth.
Because nix is able to make derivations depend on the output of other
derivations you can even do crazy things like this:
pypi_dump = dump_Py { hash_of_last_mondey_will_be_invalid_due_to_many_updates
= xxx; };
plone = create_derivations_for pypi_dump [ plone ];
drawback: You do no longer know how many derivations have to build in
advance - to find out you have to build some packages first.
the pypi_dump is likely to be out of date etc.
pro: You can use python native tool to find out about dependencies (may
too slow though)
For hackage the current way create .nix files only succeeds by
accident. However this accident is very likely because most other
distributions such as debian can't install many different versions of a
package at the same time. And that was the main reason why I didn't even
try to create .nix files anymore. What am I talking about ?
:: means depends on.
( T depends on both B and D. B and D both depend on C)
T :: ( B :: C = 1.0)
T :: ( D :: C = 1.0)
Thus C must be version 1.0
T2 :: ( B :: C = 1.0)
T2 :: ( E :: C = 2.0)
Thus C must be = 2.0.
I think you agree that it makes sense to assume that B and E should
depend on the same version of C in both cases (Else you may get into
trouble when requiring files when PYTHONPATH is searched etc).
This this means that you require two version of B:
B' depnds on C-1.0
B'' depnds on C-2.0
And that's why the haskell approach may fail in such insane cases (which
are unlikely to happen).
Thus which version of B and C is required depends on whether B is a
dependency of T or T2.
But as I said: its not that likely to happen. But if that case happens I
want code to fail early (before starting to download anything).
That's why the design of my python and ruby overlays are the way they
are.
Why did nobody use such automatic dependency analysis for nixpkgs (c
libraries, gnome, kde, ...) ?
Because maintaining all sets of possible combinations is also a
nightmare. Worse: compilation time.
Eelco told me once he intentionally didn't try to apply
automatic dependency management on nixpkgs (eg the way Eclipse installs
plugins using equinox P2 using SAT solvers).
Think about the SAT solver choosing a different coreutils version by
accident because openoffice compiles with both ..
Summary: I don't know yet which is the best version. Also if you are
working on libraries all those layers in between get into your way.
Eg using ruby you can replace any library using a git version easily -
thus you can fix bugs and continue distributing your work easily.
For hack-nix I have such a patch layer: You can add git sources to the
pool - and you can patch dependencies. However when fixing dependencies
it always takes time to recreate the dump file.
Do you think there is something wrong with that approach
See the stupid case above. If you care about it - you may end up
creating a set of .nix files for each target package.
If it doesn't happen nothing is wrong with it (except redundancy in code
which is not that bad).
Also if I need a library I want it fast. And my attempts to generate
.nix derivations for ruby showed that it may take quite some time.
Also, if you think the way hackage is handleđ is good, a short note
would be great.
Well - Peter is happy - it seems to get the job done equally well as
hack-nix for the average case (except that hack-nix also creates tag
files for sources - but that is unrelated)
So IMHO without try and error there will be no success anyway.
Peter or Andres, would you mind to explain the workflow and technology
used to keep haskell packages up-to-date or if you've done so already
give us a pointer to it?
Have a look at the commit logs: there is a tool hackage2nix which reads
the dependencies of cabal files creating the .nix files.
However cabal is kind of nightmare because eg darcs (the version control
system) has more than 8 flags you can enable/disable. Thus the amount of
possible ways to build packages explodes. That's why hack-nix (probably
the same way as hackage2nix) chooses sensible defaults.
Maybe my mail is biased :) Maybe it also gives you an understanding that
the perfect solution may not even exist - it depends on what matters to
you most. (install time, dump time, being accurate, minimizing nixpkgs
noise , ...) there are many things you could think about - even worse:
Tools like Eclipse have their own package managers.. duplicating all
that
Re: [Nix-dev] gnutls broken
Hi, Peter Simons sim...@cryp.to skribis: We can revisit the default to be Guile-less if it really happens to make people lives brighter. ;-) my understanding is that the Guile-part of the test suite of GNUTLS assumes that certain local TCP ports are free, and that this assumption may fail for all kinds of reasons. In other words, the GNUTLS build may fail spuriously when guile support is enabled. Is that understanding correct? No, it’s the rest of its test suite (written in C) that has this problem. Thanks, Ludo’. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r32048 - in nixpkgs/trunk/pkgs: applications/networking/browsers/firefox top-level
Author: raskin
Date: Mon Feb 6 08:28:24 2012
New Revision: 32048
URL: https://nixos.org/websvn/nix/?rev=32048sc=1
Log:
Add Firefox 11beta
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/11.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/11.0.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/11.0.nix
Mon Feb 6 08:28:24 2012(r32048)
@@ -0,0 +1,180 @@
+{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
+, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
+, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
+, yasm, mesa, sqlite, unzip
+
+, # If you want the resulting program to call itself Firefox instead
+ # of Shiretoko or whatever, enable this option. However, those
+ # binaries may not be distributed without permission from the
+ # Mozilla Foundation, see
+ # http://www.mozilla.org/foundation/trademarks/.
+ enableOfficialBranding ? false
+}:
+
+assert stdenv.gcc ? libc stdenv.gcc.libc != null;
+
+rec {
+
+ firefoxVersion = 11.0b1;
+
+ xulVersion = 11.0; # this attribute is used by other packages
+
+
+ src = fetchurl {
+url =
http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2;;
+sha256 = 1f9p2jmjvhmb23wmvj84jj22wd9g803k6pdjm8glwmkzwnva8x1b;
+ };
+
+ commonConfigureFlags =
+[ --enable-optimize
+ --disable-debug
+ --enable-strip
+ --with-system-jpeg
+ --with-system-zlib
+ --with-system-bz2
+ #--with-system-nspr # -- There are links to nspr 4.9.0, but no file...
+ # --with-system-nss
+ # --with-system-png # -- --with-system-png won't work because the
system's libpng doesn't have APNG support
+ --enable-system-cairo
+ --enable-system-sqlite
+ --disable-crashreporter
+ --disable-tests
+ --disable-necko-wifi # maybe we want to enable this at some point
+ --disable-installer
+ --disable-updater
+];
+
+
+ xulrunner = stdenv.mkDerivation rec {
+name = xulrunner-${xulVersion};
+
+inherit src;
+
+buildInputs =
+ [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+python dbus dbus_glib pango freetype fontconfig xlibs.libXi
+xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
+alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
+xlibs.libXScrnSaver xlibs.scrnsaverproto
+xlibs.libXext xlibs.xextproto sqlite unzip
+ ];
+
+configureFlags =
+ [ --enable-application=xulrunner
+--disable-javaxpcom
+ ] ++ commonConfigureFlags;
+
+enableParallelBuilding = true;
+
+# Hack to work around make's idea of -lbz2 dependency
+preConfigure =
+ ''
+find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
+ stdenv.lib.concatStringsSep :
+(map (s : s + /lib) (buildInputs ++ [stdenv.gcc.libc]))
+}' ';'
+
+export NIX_LDFLAGS=$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}
+ '';
+
+# !!! Temporary hack.
+preBuild =
+ ''
+export NIX_ENFORCE_PURITY=
+ '';
+
+installFlags = SKIP_GRE_REGISTRATION=1;
+
+postInstall = ''
+ # Fix some references to /bin paths in the Xulrunner shell script.
+ substituteInPlace $out/bin/xulrunner \
+ --replace /bin/pwd $(type -tP pwd) \
+ --replace /bin/ls $(type -tP ls)
+
+ # Fix run-mozilla.sh search
+ libDir=$(cd $out/lib ls -d xulrunner-[0-9]*)
+ echo libDir: $libDir
+ test -n $libDir
+ cd $out/bin
+ mv xulrunner ../lib/$libDir/
+
+ for i in $out/lib/$libDir/*; do
+ file $i;
+ if file $i | grep executable /dev/null; then
+ echo -e '#! /bin/sh\n'$i' $@' $out/bin/$(basename
$i);
+ chmod a+x $out/bin/$(basename $i);
+ fi;
+ done;
+ for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do
+ patchelf --set-rpath $(patchelf --print-rpath
$i):$out/lib/$libDir $i || true
+ done;
+ rm -f $out/bin/run-mozilla.sh
+''; # */
+
+meta = {
+ description = Mozilla Firefox XUL runner;
+ homepage = http://www.mozilla.com/en-US/firefox/;
+};
+
+passthru = { inherit gtk; version = xulVersion; };
+ };
+
+
+ firefox = stdenv.mkDerivation rec {
+name = firefox-${firefoxVersion};
+
+inherit src;
+
+enableParallelBuilding = true;
+
+buildInputs =
+ [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
+dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
+xlibs.pixman yasm mesa sqlite file unzip
+ ];
+
+propagatedBuildInputs =
[Nix-commits] SVN commit: nix - r32049 - nixos/trunk/modules/services/web-servers
Author: sandervanderburg
Date: Mon Feb 6 13:03:56 2012
New Revision: 32049
URL: https://nixos.org/websvn/nix/?rev=32049sc=1
Log:
Remove ugly pkgs.tomcat6 references
Modified:
nixos/trunk/modules/services/web-servers/tomcat.nix
Modified: nixos/trunk/modules/services/web-servers/tomcat.nix
==
--- nixos/trunk/modules/services/web-servers/tomcat.nix Mon Feb 6 08:28:24
2012(r32048)
+++ nixos/trunk/modules/services/web-servers/tomcat.nix Mon Feb 6 13:03:56
2012(r32049)
@@ -5,7 +5,7 @@
let
cfg = config.services.tomcat;
-
+ tomcat = pkgs.tomcat6;
in
{
@@ -63,7 +63,7 @@
};
webapps = mkOption {
-default = [ pkgs.tomcat6 ];
+default = [ tomcat ];
description = List containing WAR files or directories with WAR files
which are web applications to be deployed on Tomcat;
};
@@ -127,16 +127,16 @@
mkdir -p ${cfg.baseDir}
# Create a symlink to the bin directory of the tomcat component
- ln -sfn ${pkgs.tomcat6}/bin ${cfg.baseDir}/bin
+ ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin
# Create a conf/ directory
mkdir -p ${cfg.baseDir}/conf
chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
# Symlink the config files in the conf/ directory (except for
catalina.properties and server.xml)
- for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties |
grep -v server.xml)
+ for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep
-v server.xml)
do
- ln -sfn ${pkgs.tomcat6}/conf/$i ${cfg.baseDir}/conf/`basename
$i`
+ ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
done
# Create subdirectory for virtual hosts
@@ -146,12 +146,12 @@
# Change all references from CATALINA_HOME to CATALINA_BASE and add
support for shared libraries
sed -e 's|''${catalina.home}|''${catalina.base}|g' \
-e
's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
- ${pkgs.tomcat6}/conf/catalina.properties
${cfg.baseDir}/conf/catalina.properties
+ ${tomcat}/conf/catalina.properties
${cfg.baseDir}/conf/catalina.properties
# Create a modified server.xml which also includes all virtual hosts
sed -e /Engine name=\Catalina\ defaultHost=\localhost\/a\ ${
toString (map (virtualHost: ''Host
name=\${virtualHost.name}\
appBase=\virtualhosts/${virtualHost.name}/webapps\ unpackWARs=\true\
autoDeploy=\true\ xmlValidation=\false\ xmlNamespaceAware=\false\ ${if
cfg.logPerVirtualHost then ''Valve
className=\org.apache.catalina.valves.AccessLogValve\
directory=\logs/${virtualHost.name}\
prefix=\${virtualHost.name}_access_log.\ pattern=\combined\
resolveHosts=\false\/'' else }/Host'') cfg.virtualHosts)} \
- ${pkgs.tomcat6}/conf/server.xml ${cfg.baseDir}/conf/server.xml
+ ${tomcat}/conf/server.xml ${cfg.baseDir}/conf/server.xml
# Create a logs/ directory
mkdir -p ${cfg.baseDir}/logs
@@ -179,7 +179,7 @@
chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps
# Symlink all the given common libs files or paths into the lib/
directory
- for i in ${pkgs.tomcat6} ${toString cfg.commonLibs}
+ for i in ${tomcat} ${toString cfg.commonLibs}
do
if [ -f $i ]
then
@@ -330,13 +330,13 @@
''
else }
-${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c
'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS=${cfg.javaOpts}
CATALINA_OPTS=${cfg.catalinaOpts} ${pkgs.tomcat6}/bin/startup.sh'
+${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c
'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS=${cfg.javaOpts}
CATALINA_OPTS=${cfg.catalinaOpts} ${tomcat}/bin/startup.sh'
'';
postStop =
''
echo Stopping tomcat...
-CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk}
${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c
${pkgs.tomcat6}/bin/shutdown.sh
+CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk}
${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c
${tomcat}/bin/shutdown.sh
'';
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32050 - nixos/trunk/modules/services/web-servers/apache-httpd
Author: sandervanderburg
Date: Mon Feb 6 13:11:48 2012
New Revision: 32050
URL: https://nixos.org/websvn/nix/?rev=32050sc=1
Log:
Added extraWorkersProperties parameter, so that custom tweaks can be added
Modified:
nixos/trunk/modules/services/web-servers/apache-httpd/tomcat-connector.nix
Modified:
nixos/trunk/modules/services/web-servers/apache-httpd/tomcat-connector.nix
==
--- nixos/trunk/modules/services/web-servers/apache-httpd/tomcat-connector.nix
Mon Feb 6 13:03:56 2012(r32049)
+++ nixos/trunk/modules/services/web-servers/apache-httpd/tomcat-connector.nix
Mon Feb 6 13:11:48 2012(r32050)
@@ -1,6 +1,8 @@
{ config, pkgs, serverInfo, ... }:
let
+ extraWorkersProperties = pkgs.lib.optionalString (config ?
extraWorkersProperties) config.extraWorkersProperties;
+
workersProperties = pkgs.writeText workers.properties ''
# Define list of workers that will be used
# for mapping requests
@@ -22,6 +24,8 @@
# Status worker for managing load balancer
worker.status.type=status
+
+${extraWorkersProperties}
'';
in
{
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32051 - nixos/trunk/modules/services/web-servers
Author: sandervanderburg
Date: Mon Feb 6 14:04:15 2012
New Revision: 32051
URL: https://nixos.org/websvn/nix/?rev=32051sc=1
Log:
Removed some tabs
Modified:
nixos/trunk/modules/services/web-servers/tomcat.nix
Modified: nixos/trunk/modules/services/web-servers/tomcat.nix
==
--- nixos/trunk/modules/services/web-servers/tomcat.nix Mon Feb 6 13:11:48
2012(r32050)
+++ nixos/trunk/modules/services/web-servers/tomcat.nix Mon Feb 6 14:04:15
2012(r32051)
@@ -28,8 +28,8 @@
extraGroups = mkOption {
default = [];
- example = [ users ];
- description = Defines extra groups to which the tomcat user belongs.;
+example = [ users ];
+description = Defines extra groups to which the tomcat user belongs.;
};
user = mkOption {
@@ -110,7 +110,7 @@
uid = config.ids.uids.tomcat;
description = Tomcat user;
home = /homeless-shelter;
- extraGroups = cfg.extraGroups;
+extraGroups = cfg.extraGroups;
};
jobs.tomcat =
@@ -123,212 +123,212 @@
preStart =
''
- # Create the base directory
- mkdir -p ${cfg.baseDir}
+# Create the base directory
+mkdir -p ${cfg.baseDir}
- # Create a symlink to the bin directory of the tomcat component
- ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin
+# Create a symlink to the bin directory of the tomcat component
+ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin
- # Create a conf/ directory
- mkdir -p ${cfg.baseDir}/conf
- chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
-
- # Symlink the config files in the conf/ directory (except for
catalina.properties and server.xml)
- for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep
-v server.xml)
- do
- ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
- done
+# Create a conf/ directory
+mkdir -p ${cfg.baseDir}/conf
+chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
+
+# Symlink the config files in the conf/ directory (except for
catalina.properties and server.xml)
+for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep
-v server.xml)
+do
+ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
+done
# Create subdirectory for virtual hosts
mkdir -p ${cfg.baseDir}/virtualhosts
- # Create a modified catalina.properties file
- # Change all references from CATALINA_HOME to CATALINA_BASE and add
support for shared libraries
- sed -e 's|''${catalina.home}|''${catalina.base}|g' \
+# Create a modified catalina.properties file
+# Change all references from CATALINA_HOME to CATALINA_BASE and
add support for shared libraries
+sed -e 's|''${catalina.home}|''${catalina.base}|g' \
-e
's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
- ${tomcat}/conf/catalina.properties
${cfg.baseDir}/conf/catalina.properties
+${tomcat}/conf/catalina.properties
${cfg.baseDir}/conf/catalina.properties
- # Create a modified server.xml which also includes all virtual hosts
- sed -e /Engine name=\Catalina\ defaultHost=\localhost\/a\ ${
+# Create a modified server.xml which also includes all virtual
hosts
+sed -e /Engine name=\Catalina\ defaultHost=\localhost\/a\
${
toString (map (virtualHost: ''Host
name=\${virtualHost.name}\
appBase=\virtualhosts/${virtualHost.name}/webapps\ unpackWARs=\true\
autoDeploy=\true\ xmlValidation=\false\ xmlNamespaceAware=\false\ ${if
cfg.logPerVirtualHost then ''Valve
className=\org.apache.catalina.valves.AccessLogValve\
directory=\logs/${virtualHost.name}\
prefix=\${virtualHost.name}_access_log.\ pattern=\combined\
resolveHosts=\false\/'' else }/Host'') cfg.virtualHosts)} \
- ${tomcat}/conf/server.xml ${cfg.baseDir}/conf/server.xml
+${tomcat}/conf/server.xml ${cfg.baseDir}/conf/server.xml
- # Create a logs/ directory
- mkdir -p ${cfg.baseDir}/logs
- chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
+# Create a logs/ directory
+mkdir -p ${cfg.baseDir}/logs
+chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
${if cfg.logPerVirtualHost then
toString (map (h: ''
mkdir -p ${cfg.baseDir}/logs/${h.name}
chown ${cfg.user}:${cfg.group}
${cfg.baseDir}/logs/${h.name}
'') cfg.virtualHosts) else }
- # Create a temp/ directory
- mkdir
[Nix-commits] SVN commit: nix - r32053 - nixpkgs/trunk/pkgs/development/libraries/haskell/http-conduit
Author: simons
Date: Mon Feb 6 14:27:21 2012
New Revision: 32053
URL: https://nixos.org/websvn/nix/?rev=32053sc=1
Log:
haskell-http-conduit: downgrade to version 1.2.0
The latest version has requirements version that we cannot fulfill
without duplicating a lot of packages.
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-conduit/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-conduit/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/http-conduit/default.nix
Mon Feb 6 14:27:18 2012(r32052)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/http-conduit/default.nix
Mon Feb 6 14:27:21 2012(r32053)
@@ -1,19 +1,19 @@
{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
, conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase
-, monadControl, network, socks, text, time, tls, tlsExtra
-, transformers, transformersBase, utf8String, zlibConduit
+, monadControl, network, text, time, tls, tlsExtra, transformers
+, transformersBase, utf8String, zlibConduit
}:
cabal.mkDerivation (self: {
pname = http-conduit;
- version = 1.2.3;
- sha256 = 0kygmbcvv0j020ml9jgmg3yzda3k066s2h8g3c135cmad6jc8hnd;
+ version = 1.2.0;
+ sha256 = 1s3qrvglhymwvr0cp32mi95dijic40lphhsfr4hm63qjphfc8dpi;
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cprngAes
-dataDefault failure httpTypes liftedBase monadControl network socks
-text time tls tlsExtra transformers transformersBase utf8String
+dataDefault failure httpTypes liftedBase monadControl network text
+time tls tlsExtra transformers transformersBase utf8String
zlibConduit
];
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32055 - nixpkgs/trunk/pkgs/top-level
Author: simons Date: Mon Feb 6 14:27:27 2012 New Revision: 32055 URL: https://nixos.org/websvn/nix/?rev=32055sc=1 Log: haskell-haskell-src: 7.4.1 build was fixed by happy update Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix == --- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Feb 6 14:27:24 2012(r32054) +++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Feb 6 14:27:27 2012(r32055) @@ -138,7 +138,7 @@ cgi = self.cgi_3001_1_7_4; # 7.4.1 ok fgl = self.fgl_5_4_2_4;# 7.4.1 ok GLUT = self.GLUT_2_3_0_0; # 7.4.1 ok -haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 fails +haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok html = self.html_1_0_1_2; # 7.4.1 ok HUnit= self.HUnit_1_2_2_3; # 7.4.1 ok network = self.network_2_3_0_10; # 7.4.1 ok ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32054 - in nixpkgs/trunk/pkgs: development/libraries/haskell/GLUT development/libraries/haskell/OpenGL top-level
Author: simons
Date: Mon Feb 6 14:27:24 2012
New Revision: 32054
URL: https://nixos.org/websvn/nix/?rev=32054sc=1
Log:
haskell: added OpenGL 5.0.0 and GLUT 2.3.0.0
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix Mon Feb
6 14:27:24 2012(r32054)
@@ -0,0 +1,21 @@
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
+, OpenGLRaw, StateVar, Tensor
+}:
+
+cabal.mkDerivation (self: {
+ pname = GLUT;
+ version = 2.3.0.0;
+ sha256 = 10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99;
+ buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ];
+ extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
+ meta = {
+homepage = http://www.haskell.org/haskellwiki/Opengl;;
+description = A binding for the OpenGL Utility Toolkit;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix Mon Feb
6 14:27:24 2012(r32054)
@@ -0,0 +1,21 @@
+{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar
+, Tensor
+}:
+
+cabal.mkDerivation (self: {
+ pname = OpenGL;
+ version = 2.5.0.0;
+ sha256 = 1kpakn5i4aka67mqcpfq9jpl38h409x63zd14y35abpm6h3x8m3j;
+ buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
+ extraLibraries = [ libX11 mesa ];
+ meta = {
+homepage = http://www.haskell.org/haskellwiki/Opengl;;
+description = A binding for the OpenGL graphics system;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Feb 6 14:27:21
2012(r32053)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Feb 6 14:27:24
2012(r32054)
@@ -137,12 +137,12 @@
inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_4; # 7.4.1 ok
fgl = self.fgl_5_4_2_4;# 7.4.1 ok
-GLUT = self.GLUT_2_1_2_1; # 7.4.1 fails
+GLUT = self.GLUT_2_3_0_0; # 7.4.1 ok
haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 fails
html = self.html_1_0_1_2; # 7.4.1 ok
HUnit= self.HUnit_1_2_2_3; # 7.4.1 ok
network = self.network_2_3_0_10; # 7.4.1 ok
-OpenGL = self.OpenGL_2_2_3_0; # 7.4.1 fails
+OpenGL = self.OpenGL_2_5_0_0; # 7.4.1 ok
parallel = self.parallel_3_2_0_2; # 7.4.1 ok
parsec = self.parsec_3_1_2; # 7.4.1 ok
QuickCheck = self.QuickCheck_2_4_2; # 7.4.1 ok
@@ -738,8 +738,11 @@
GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix
{
OpenGL = self.OpenGL_2_4_0_2;
};
+ GLUT_2_3_0_0 = callPackage ../development/libraries/haskell/GLUT/2.3.0.0.nix
{
+OpenGL = self.OpenGL_2_5_0_0;
+ };
GLUT22 = self.GLUT_2_2_2_1;
- GLUT = self.GLUT_2_1_1_2;
+ GLUT = self.GLUT_2_3_0_0;
gtk = callPackage ../development/libraries/haskell/gtk {
inherit (pkgs.gtkLibs) gtk;
@@ -1048,8 +1051,9 @@
OpenGL_2_2_1_1 = callPackage
../development/libraries/haskell/OpenGL/2.2.1.1.nix {};
OpenGL_2_2_3_0 = callPackage
../development/libraries/haskell/OpenGL/2.2.3.0.nix {};
OpenGL_2_4_0_2 = callPackage
../development/libraries/haskell/OpenGL/2.4.0.2.nix {};
+ OpenGL_2_5_0_0 = callPackage
../development/libraries/haskell/OpenGL/2.5.0.0.nix {};
OpenGL24 = self.OpenGL_2_4_0_2;
- OpenGL = self.OpenGL_2_2_1_1;
+ OpenGL = self.OpenGL_2_5_0_0;
OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32060 - nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGLRaw
Author: simons
Date: Mon Feb 6 14:27:40 2012
New Revision: 32060
URL: https://nixos.org/websvn/nix/?rev=32060sc=1
Log:
haskell-OpenGLRaw: updated to version 1.2.0.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
Mon Feb 6 14:27:37 2012(r32059)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
Mon Feb 6 14:27:40 2012(r32060)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = OpenGLRaw;
- version = 1.1.0.2;
- sha256 = 0d1rjh2vq0w1pzf3vz0mw6p0w43h3sf6034qsi89m4jkx3125fwf;
+ version = 1.2.0.0;
+ sha256 = 1nwk93wlwh7gz2lb1dc88frmwik71g61a7k8xfiib2q5a8a8kf9r;
extraLibraries = [ mesa ];
meta = {
homepage = http://www.haskell.org/haskellwiki/Opengl;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32061 - nixpkgs/trunk/pkgs/development/libraries/haskell/highlighting-kate
Author: simons
Date: Mon Feb 6 14:27:42 2012
New Revision: 32061
URL: https://nixos.org/websvn/nix/?rev=32061sc=1
Log:
haskell-highlighting-kate: updated to version 0.5.0.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/highlighting-kate/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/highlighting-kate/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/highlighting-kate/default.nix
Mon Feb 6 14:27:40 2012(r32060)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/highlighting-kate/default.nix
Mon Feb 6 14:27:42 2012(r32061)
@@ -1,12 +1,12 @@
-{ cabal, parsec, regexPcreBuiltin, xhtml }:
+{ cabal, blazeHtml, mtl, parsec, regexPcreBuiltin }:
cabal.mkDerivation (self: {
pname = highlighting-kate;
- version = 0.2.10;
- sha256 = 0cw89qsslrp4zh47ics7bg79fkqnxpnyz1a9xws0xzd9xmg3zrhh;
+ version = 0.5.0.1;
+ sha256 = 05r8w4366gi64l65k6vyda1cs96ld8i2dgch8r5fmxwiaa8dcs1l;
isLibrary = true;
isExecutable = true;
- buildDepends = [ parsec regexPcreBuiltin xhtml ];
+ buildDepends = [ blazeHtml mtl parsec regexPcreBuiltin ];
meta = {
homepage = http://github.com/jgm/highlighting-kate;;
description = Syntax highlighting;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32062 - nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc-types
Author: simons
Date: Mon Feb 6 14:27:44 2012
New Revision: 32062
URL: https://nixos.org/websvn/nix/?rev=32062sc=1
Log:
haskell-pandoc-types: updated to version 1.9.0.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc-types/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc-types/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc-types/default.nix
Mon Feb 6 14:27:42 2012(r32061)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc-types/default.nix
Mon Feb 6 14:27:44 2012(r32062)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = pandoc-types;
- version = 1.8.2;
- sha256 = 04whkqld2pnfz25i9rcq7d4pi9zkn6c1rpz95vdlg9r5xkhhnn3a;
+ version = 1.9.0.2;
+ sha256 = 1rqqchxinjk3njgkp73i92q4iz1cl84p56i2fmgj2zn221r0zhyl;
buildDepends = [ syb ];
meta = {
homepage = http://johnmacfarlane.net/pandoc;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32063 - nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc
Author: simons
Date: Mon Feb 6 14:27:47 2012
New Revision: 32063
URL: https://nixos.org/websvn/nix/?rev=32063sc=1
Log:
haskell-pandoc: updated to version 1.9.0.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix Mon Feb
6 14:27:44 2012(r32062)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix Mon Feb
6 14:27:47 2012(r32063)
@@ -1,18 +1,19 @@
-{ cabal, base64Bytestring, citeprocHs, dlist, extensibleExceptions
-, highlightingKate, HTTP, json, mtl, network, pandocTypes, parsec
-, random, syb, tagsoup, texmath, utf8String, xhtml, xml, zipArchive
+{ cabal, base64Bytestring, blazeHtml, citeprocHs
+, extensibleExceptions, highlightingKate, HTTP, json, mtl, network
+, pandocTypes, parsec, random, syb, tagsoup, temporary, texmath
+, time, utf8String, xml, zipArchive, zlib
}:
cabal.mkDerivation (self: {
pname = pandoc;
- version = 1.8.2.1;
- sha256 = 0cwly0j2rj46h654iwl04l6jkhk6rrhynqvrdnq47067n9vm60pi;
+ version = 1.9.0.2;
+ sha256 = 0p1haqya99r52k6c07zq89ifdjs1r5g1y4404pwsxwkmv43f;
isLibrary = true;
isExecutable = true;
buildDepends = [
-base64Bytestring citeprocHs dlist extensibleExceptions
+base64Bytestring blazeHtml citeprocHs extensibleExceptions
highlightingKate HTTP json mtl network pandocTypes parsec random
-syb tagsoup texmath utf8String xhtml xml zipArchive
+syb tagsoup temporary texmath time utf8String xml zipArchive zlib
];
configureFlags = -fhighlighting -fthreaded;
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32064 - nixpkgs/trunk/pkgs/development/libraries/haskell/parsimony
Author: simons
Date: Mon Feb 6 14:27:49 2012
New Revision: 32064
URL: https://nixos.org/websvn/nix/?rev=32064sc=1
Log:
haskell-parsimony: updated to version 1.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/parsimony/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/parsimony/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/parsimony/default.nix
Mon Feb 6 14:27:47 2012(r32063)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/parsimony/default.nix
Mon Feb 6 14:27:49 2012(r32064)
@@ -1,10 +1,10 @@
-{ cabal, utf8String }:
+{ cabal, text }:
cabal.mkDerivation (self: {
pname = parsimony;
- version = 1.1;
- sha256 = 0476zmsjyjf58lh85806baqblq8hjxcrrnqc6ddxxq17lmvsd5ic;
- buildDepends = [ utf8String ];
+ version = 1.3;
+ sha256 = 0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg;
+ buildDepends = [ text ];
meta = {
description = Monadic parser combinators derived from Parsec;
license = self.stdenv.lib.licenses.bsd3;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32065 - nixpkgs/trunk/pkgs/development/libraries/haskell/system-fileio
Author: simons
Date: Mon Feb 6 14:27:52 2012
New Revision: 32065
URL: https://nixos.org/websvn/nix/?rev=32065sc=1
Log:
haskell-system-fileio: updated to version 0.3.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/system-fileio/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/system-fileio/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/system-fileio/default.nix
Mon Feb 6 14:27:49 2012(r32064)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/system-fileio/default.nix
Mon Feb 6 14:27:52 2012(r32065)
@@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = system-fileio;
- version = 0.3.3;
- sha256 = 0z7y99g8ij9ykpxsgdb0addyibvpv2s95i0wpx4yc7mgi8cl50bx;
+ version = 0.3.4;
+ sha256 = 184f5bb3qhag6cwmk0zc2ldkwnkzbv82pv7hy541j8jqqi5wprih;
buildDepends = [ systemFilepath text time ];
meta = {
-homepage = https://john-millikin.com/software/hs-fileio/;;
-description = High-level filesystem interaction;
+homepage = https://john-millikin.com/software/haskell-filesystem/;;
+description = Consistent filesystem interaction across GHC versions;
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32066 - nixpkgs/trunk/pkgs/development/libraries/haskell/system-filepath
Author: simons
Date: Mon Feb 6 14:27:54 2012
New Revision: 32066
URL: https://nixos.org/websvn/nix/?rev=32066sc=1
Log:
haskell-system-filepath: updated to version 0.4.5
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/system-filepath/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/system-filepath/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/system-filepath/default.nix
Mon Feb 6 14:27:52 2012(r32065)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/system-filepath/default.nix
Mon Feb 6 14:27:54 2012(r32066)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = system-filepath;
- version = 0.4.4;
- sha256 = 16904xwbcy82ghf1bckw8h63pfj9jfbdlqrr8jf91jzl27lqlwxf;
+ version = 0.4.5;
+ sha256 = 18jpn3pyy6dh20xpdlwmhcjvbywjz4vr9fvwcwhylbicrw627ybs;
buildDepends = [ deepseq text ];
meta = {
homepage = https://john-millikin.com/software/haskell-filesystem/;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32069 - nixpkgs/trunk/pkgs/development/tools/haskell/hlint
Author: simons
Date: Mon Feb 6 14:28:02 2012
New Revision: 32069
URL: https://nixos.org/websvn/nix/?rev=32069sc=1
Log:
haskell-hlint: updated to version 1.8.23
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix Mon Feb
6 14:27:59 2012(r32068)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix Mon Feb
6 14:28:02 2012(r32069)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = hlint;
- version = 1.8.21;
- sha256 = 1vjl1qncxia9352469k9v28283f17xk0xhb28by6crchz596xln6;
+ version = 1.8.23;
+ sha256 = 0cbjnzs9ddk4z7kxh935x1kvr566afcvk98z3174f3xp5sbz79wr;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32068 - nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms
Author: simons
Date: Mon Feb 6 14:27:59 2012
New Revision: 32068
URL: https://nixos.org/websvn/nix/?rev=32068sc=1
Log:
haskell-vector-algorithms: updated to version 0.5.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/default.nix
Mon Feb 6 14:27:57 2012(r32067)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/default.nix
Mon Feb 6 14:27:59 2012(r32068)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = vector-algorithms;
- version = 0.5.3;
- sha256 = 14h2x3yrb4fji8bf84xbfp84pax6lzr8njc0c4061xpwcmair36j;
+ version = 0.5.4;
+ sha256 = 0j16jmnmgksbzsq2vvxjmciywi91clak77i6zjjghvn9dpmnsmv2;
buildDepends = [ primitive vector ];
meta = {
homepage = http://code.haskell.org/~dolio/;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32073 - nixpkgs/trunk/pkgs/development/libraries/haskell/temporary
Author: simons Date: Mon Feb 6 18:28:16 2012 New Revision: 32073 URL: https://nixos.org/websvn/nix/?rev=32073sc=1 Log: haskell-temporary: updated meta section Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/temporary/default.nix Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/temporary/default.nix == --- nixpkgs/trunk/pkgs/development/libraries/haskell/temporary/default.nix Mon Feb 6 18:28:12 2012(r32072) +++ nixpkgs/trunk/pkgs/development/libraries/haskell/temporary/default.nix Mon Feb 6 18:28:16 2012(r32073) @@ -9,5 +9,9 @@ description = Portable temporary file and directory support for Windows and Unix, based on code from Cabal; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; +maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons +]; }; }) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32072 - in nixpkgs/trunk/pkgs: development/libraries/haskell/test-framework top-level
Author: simons
Date: Mon Feb 6 18:28:12 2012
New Revision: 32072
URL: https://nixos.org/websvn/nix/?rev=32072sc=1
Log:
haskell-test-framework: added version 0.4.2.2 (required by pandoc)
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix
- copied, changed from r32069,
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/0.5.nix
- copied, changed from r32069,
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix
(from r32069,
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix
Mon Feb 6 14:28:02 2012(r32069, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix
Mon Feb 6 18:28:12 2012(r32072)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = test-framework;
- version = 0.5;
- sha256 = 19zm9xdhyjhqi2ryd2gkwi7m92s88mmiw1b6b91hjfhfw3c1qlzz;
+ version = 0.4.2.2;
+ sha256 = 1lwdx4z9j5wxbmmlakf6knirdhi0ic6xpmhrj9ipa5ybw2zszakr;
isLibrary = true;
isExecutable = true;
buildDepends = [
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/0.5.nix (from
r32069,
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix)
==
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Feb 6 16:14:39
2012(r32071)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Feb 6 18:28:12
2012(r32072)
@@ -1325,7 +1325,9 @@
terminfo = callPackage ../development/libraries/haskell/terminfo {};
- testFramework = callPackage ../development/libraries/haskell/test-framework
{};
+ testFramework_0_4_2_2 = callPackage
../development/libraries/haskell/test-framework/0.4.2.2.nix {};
+ testFramework_0_5 = callPackage
../development/libraries/haskell/test-framework/0.5.nix {};
+ testFramework = self.testFramework_0_5;
testFrameworkHunit = callPackage
../development/libraries/haskell/test-framework-hunit {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32074 - in nixpkgs/trunk/pkgs: development/libraries/haskell/pandoc top-level
Author: simons
Date: Mon Feb 6 18:28:19 2012
New Revision: 32074
URL: https://nixos.org/websvn/nix/?rev=32074sc=1
Log:
haskell-pandoc: updated to version 1.9.0.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix Mon Feb
6 18:28:16 2012(r32073)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix Mon Feb
6 18:28:19 2012(r32074)
@@ -1,19 +1,23 @@
-{ cabal, base64Bytestring, blazeHtml, citeprocHs
-, extensibleExceptions, highlightingKate, HTTP, json, mtl, network
-, pandocTypes, parsec, random, syb, tagsoup, temporary, texmath
-, time, utf8String, xml, zipArchive, zlib
+{ cabal, ansiTerminal, base64Bytestring, blazeHtml, citeprocHs
+, Diff, extensibleExceptions, highlightingKate, HTTP, HUnit, json
+, mtl, network, pandocTypes, parsec, QuickCheck, random, syb
+, tagsoup, temporary, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, texmath, time, utf8String, xml
+, zipArchive, zlib
}:
cabal.mkDerivation (self: {
pname = pandoc;
- version = 1.9.0.2;
- sha256 = 0p1haqya99r52k6c07zq89ifdjs1r5g1y4404pwsxwkmv43f;
+ version = 1.9.0.3;
+ sha256 = 1p5054sdvvgl38rr0ajfavr79rwr2l8jdrpzai329ksskkh1acdp;
isLibrary = true;
isExecutable = true;
buildDepends = [
-base64Bytestring blazeHtml citeprocHs extensibleExceptions
-highlightingKate HTTP json mtl network pandocTypes parsec random
-syb tagsoup temporary texmath time utf8String xml zipArchive zlib
+ansiTerminal base64Bytestring blazeHtml citeprocHs Diff
+extensibleExceptions highlightingKate HTTP HUnit json mtl network
+pandocTypes parsec QuickCheck random syb tagsoup temporary
+testFramework testFrameworkHunit testFrameworkQuickcheck2 texmath
+time utf8String xml zipArchive zlib
];
configureFlags = -fhighlighting -fthreaded;
meta = {
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Feb 6 18:28:16
2012(r32073)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Feb 6 18:28:19
2012(r32074)
@@ -1061,7 +1061,9 @@
pathPieces_0_1_0 = callPackage
../development/libraries/haskell/path-pieces/0.1.0.nix {};
pathPieces = self.pathPieces_0_1_0;
- pandoc = callPackage ../development/libraries/haskell/pandoc {};
+ pandoc = callPackage ../development/libraries/haskell/pandoc {
+testFramework = self.testFramework_0_4_2_2;
+ };
pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32075 - nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll
Author: simons
Date: Mon Feb 6 18:28:22 2012
New Revision: 32075
URL: https://nixos.org/websvn/nix/?rev=32075sc=1
Log:
haskell-hakyll: updated to version 3.2.6.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix Mon Feb
6 18:28:19 2012(r32074)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix Mon Feb
6 18:28:22 2012(r32075)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = hakyll;
- version = 3.2.5.1;
- sha256 = 1vb3jqasf6j10fk8afwrbd85dc4k9dx6zls5c6wn0wnh87r5987x;
+ version = 3.2.6.0;
+ sha256 = 1yg97kihfxb250vk9dm2v9sh197lc6qjil0j40zgcwpss96xynax;
buildDepends = [
binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec
regexBase regexPcre snapCore snapServer tagsoup time
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32076 - nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta
Author: vcunat Date: Mon Feb 6 19:06:47 2012 New Revision: 32076 URL: https://nixos.org/websvn/nix/?rev=32076sc=1 Log: Patched broadcom_sta with for kernels 2.6.39 and 3.2 Patches taken from Gentoo, builds OK now. Added: nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/linux-2.6.39.patch nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/linux-3.2.patch Modified: nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/default.nix Modified: nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/default.nix == --- nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/default.nix Mon Feb 6 18:28:22 2012(r32075) +++ nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/default.nix Mon Feb 6 19:06:47 2012(r32076) @@ -15,7 +15,7 @@ }; buildInputs = [ kernel ]; - patches = [ ./makefile.patch ]; + patches = [ ./makefile.patch ./linux-2.6.39.patch ./linux-3.2.patch ]; #++ stdenv.lib.optional #(! builtins.lessThan (builtins.compareVersions kernel.version 2.6.37) 0) #[ ./mutex-sema.patch ]; Added: nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/linux-2.6.39.patch == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/linux-2.6.39.patch Mon Feb 6 19:06:47 2012(r32076) @@ -0,0 +1,11 @@ +--- old/src/wl/sys/wl_cfg80211.c new/src/wl/sys/wl_cfg80211.c +@@ -1811,7 +1811,7 @@ + notif_bss_info-frame_len = offsetof(struct ieee80211_mgmt, u.beacon.variable) + + wl_get_ielen(wl); + freq = ieee80211_channel_to_frequency(notif_bss_info-channel +-#if LINUX_VERSION_CODE KERNEL_VERSION(2, 6, 39) ++#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 39) + ,(notif_bss_info-channel = CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ + #endif + ); Added: nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/linux-3.2.patch == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/linux-3.2.patch Mon Feb 6 19:06:47 2012(r32076) @@ -0,0 +1,13 @@ +diff -Naur broadcom-sta-5.100.82.112.orig/src/wl/sys/wl_linux.c broadcom-sta-5.100.82.112/src/wl/sys/wl_linux.c +--- broadcom-sta-5.100.82.112.orig/src/wl/sys/wl_linux.c 2011-10-23 01:56:55.0 +0900 broadcom-sta-5.100.82.112/src/wl/sys/wl_linux.c2011-11-22 00:56:07.021520421 +0900 +@@ -385,7 +385,9 @@ + #endif + .ndo_get_stats = wl_get_stats, + .ndo_set_mac_address = wl_set_mac_address, ++#if LINUX_VERSION_CODE KERNEL_VERSION(3, 2, 0) + .ndo_set_multicast_list = wl_set_multicast_list, ++#endif + .ndo_do_ioctl = wl_ioctl + }; + ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32079 - in nixpkgs/trunk/pkgs/development: libraries/v8 web/nodejs
Author: simons
Date: Mon Feb 6 19:08:56 2012
New Revision: 32079
URL: https://nixos.org/websvn/nix/?rev=32079sc=1
Log:
v8/nodejs: upgraded to 3.6.6.20 and 0.6.9
Modified:
nixpkgs/trunk/pkgs/development/libraries/v8/default.nix
nixpkgs/trunk/pkgs/development/web/nodejs/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/v8/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/v8/default.nix Mon Feb 6
19:08:52 2012(r32078)
+++ nixpkgs/trunk/pkgs/development/libraries/v8/default.nix Mon Feb 6
19:08:56 2012(r32079)
@@ -5,14 +5,14 @@
let
system = stdenv.system;
arch = if system == i686-linux then ia32 else if system ==
x86_64-linux then x64 else ;
- version = 3.6.6.17;
+ version = 3.6.6.20;
in
assert system == i686-linux || system == x86_64-linux;
stdenv.mkDerivation rec {
name = v8-${version};
src = fetchsvn {
url = http://v8.googlecode.com/svn/tags/${version};;
- sha256 =
7080d53b9d3aefc591c2e181dcf97d538ce36177284fc658eca6420ea36a926f;
+ sha256 =
68565086baa5a37a0fa15e1c0b7914210fa590b29a8196014cd83789da6a01ba;
};
buildInputs = [python scons readline makeWrapper];
Modified: nixpkgs/trunk/pkgs/development/web/nodejs/default.nix
==
--- nixpkgs/trunk/pkgs/development/web/nodejs/default.nix Mon Feb 6
19:08:52 2012(r32078)
+++ nixpkgs/trunk/pkgs/development/web/nodejs/default.nix Mon Feb 6
19:08:56 2012(r32079)
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, openssl, python, zlib, v8 }:
stdenv.mkDerivation rec {
- version = 0.6.6;
+ version = 0.6.9;
name = nodejs-${version};
src = fetchurl {
url = http://nodejs.org/dist/v${version}/node-v${version}.tar.gz;;
-sha256 = 00i14bjhyadxrh0df1ig4ndv1c0b7prnnhyar5lxcgxnn4cabgks;
+sha256 =
484ab6b3da6195339544c16aff17f747aa85d1dd15d765d6724aa8a4ecda03ca;
};
configureFlags = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32078 - in nixpkgs/trunk/pkgs: os-specific/linux/frandom top-level
Author: simons
Date: Mon Feb 6 19:08:52 2012
New Revision: 32078
URL: https://nixos.org/websvn/nix/?rev=32078sc=1
Log:
frandom: very fast random number generator kernel module
nixos support via services.frandom.enable
Added:
nixpkgs/trunk/pkgs/os-specific/linux/frandom/
nixpkgs/trunk/pkgs/os-specific/linux/frandom/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/os-specific/linux/frandom/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/frandom/default.nixMon Feb 6
19:08:52 2012(r32078)
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, kernel }:
+
+stdenv.mkDerivation rec {
+ name = frandom-1.1;
+
+ src = fetchurl {
+url = http://sourceforge.net/projects/frandom/files/${name}.tar.gz;;
+sha256 = 15rgyk4hfawqg7z1spk2xlk1nn6rcdls8gdhc70f91shrc9pvlls;
+ };
+
+ preBuild = ''
+kernelVersion=$(cd ${kernel}/lib/modules ls)
+substituteInPlace Makefile \
+ --replace \$(shell uname -r) $kernelVersion \
+ --replace /lib/modules ${kernel}/lib/modules
+ '';
+
+ installPhase = ''
+kernelVersion=$(cd ${kernel}/lib/modules ls)
+ensureDir $out/lib/modules/$kernelVersion/misc
+cp frandom.ko $out/lib/modules/$kernelVersion/misc
+
+ensureDir $out/lib/udev/rules.d
+tee $out/lib/udev/rules.d/10-frandom.rules -EOF
+#
+# These are the rules for the frandom devices. In theory, we could let
+# udev's catch-all rule create the /dev node based upon the kernel name,
+# which gives correct result, except that the default MODE set in
+# 50-udev.rules (0600) is too restrictive.
+#
+KERNEL==[ef]random, MODE=444, OPTIONS=last_rule
+EOF
+ '';
+
+ buildInputs = [];
+
+ meta = {
+description = A very fast random number generator kernel module.;
+homepage = http://frandom.sourceforge.net/;
+license = GPLv2;
+maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+ };
+}
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Feb 6 19:08:48
2012(r32077)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Feb 6 19:08:52
2012(r32078)
@@ -5871,6 +5871,8 @@
inherit (gtkLibs) gtkmm;
};
+frandom = callPackage ../os-specific/linux/frandom { };
+
iscsitarget = callPackage ../os-specific/linux/iscsitarget { };
iwlwifi = callPackage ../os-specific/linux/iwlwifi { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32080 - nixpkgs/trunk/pkgs/applications/editors/emacs-modes/emacs-w3m
Author: simons
Date: Mon Feb 6 19:08:58 2012
New Revision: 32080
URL: https://nixos.org/websvn/nix/?rev=32080sc=1
Log:
upgraded emacs-w3m
Modified:
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
==
--- nixpkgs/trunk/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
Mon Feb 6 19:08:56 2012(r32079)
+++ nixpkgs/trunk/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
Mon Feb 6 19:08:58 2012(r32080)
@@ -1,6 +1,6 @@
{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoconf }:
-let date = 2009-07-09; in
+let date = 2012-01-15; in
stdenv.mkDerivation rec {
name = emacs-w3m-cvs${date};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32082 - in nixpkgs/trunk/pkgs: os-specific/linux/i7z top-level
Author: simons
Date: Mon Feb 6 19:09:04 2012
New Revision: 32082
URL: https://nixos.org/websvn/nix/?rev=32082sc=1
Log:
i7z: better cpu frequency/turbo boost checker for intel core i{3,5,7}
Added:
nixpkgs/trunk/pkgs/os-specific/linux/i7z/
nixpkgs/trunk/pkgs/os-specific/linux/i7z/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/os-specific/linux/i7z/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/i7z/default.nixMon Feb 6
19:09:04 2012(r32082)
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, qt4, ncurses}:
+
+stdenv.mkDerivation rec {
+ name = i7z-0.27.1;
+
+ src = fetchurl {
+url = http://i7z.googlecode.com/files/${name}.tar.gz;;
+sha256 = 0n3pry1qmpq4basnny3gddls2zlwz0813ixnas87092rvlgjhbc6;
+ };
+
+ buildInputs = [qt4 ncurses];
+
+ patchPhase = ''
+substituteInPlace Makefile --replace /usr/sbin $out/sbin
+ '';
+
+ buildPhase = ''
+make
+cd GUI
+qmake
+make clean
+make
+cd ..
+ '';
+
+ installPhase = ''
+pwd
+ensureDir $out/sbin
+make install
+install -Dm755 GUI/i7z_GUI $out/sbin/i7z-gui
+ '';
+
+ meta = {
+description = A better i7 (and now i3, i5) reporting tool for Linux;
+homepage = http://code.google.com/p/i7z;
+license = GPLv2;
+maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+ };
+}
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Feb 6 19:09:01
2012(r32081)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Feb 6 19:09:04
2012(r32082)
@@ -5390,6 +5390,8 @@
hwdata = callPackage ../os-specific/linux/hwdata { };
+ i7z = callPackage ../os-specific/linux/i7z { };
+
ifplugd = callPackage ../os-specific/linux/ifplugd { };
iotop = callPackage ../os-specific/linux/iotop { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32081 - nixpkgs/trunk/pkgs/development/compilers/uhc
Author: simons
Date: Mon Feb 6 19:09:01 2012
New Revision: 32081
URL: https://nixos.org/websvn/nix/?rev=32081sc=1
Log:
uhc: upgraded to 1.1.3
Modified:
nixpkgs/trunk/pkgs/development/compilers/uhc/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/uhc/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/uhc/default.nixMon Feb 6
19:08:58 2012(r32080)
+++ nixpkgs/trunk/pkgs/development/compilers/uhc/default.nixMon Feb 6
19:09:01 2012(r32081)
@@ -3,7 +3,7 @@
}:
let
- revision = 2399;
+ revision = 2426;
in
stdenv.mkDerivation {
name = uhc-svn-${revision};
@@ -11,7 +11,7 @@
src = fetchsvn {
url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC;;
rev = revision;
- sha256 =
f4e87dbf95f90b021994b0840f27e042dd4e785df7efedcf567f3e2c7ce32621;
+ sha256 =
06963edb673697f3eac357eccdc6d4bf7fbe7b9b92a96e3e329a4caf53f85c4c;
};
propagatedBuildInputs = [mtl network binary fgl syb];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32083 - nixos/trunk/modules/services/databases
Author: simons
Date: Mon Feb 6 19:14:33 2012
New Revision: 32083
URL: https://nixos.org/websvn/nix/?rev=32083sc=1
Log:
mongodb: workaround for shutdown issues
Modified:
nixos/trunk/modules/services/databases/mongodb.nix
Modified: nixos/trunk/modules/services/databases/mongodb.nix
==
--- nixos/trunk/modules/services/databases/mongodb.nix Mon Feb 6 19:09:04
2012(r32082)
+++ nixos/trunk/modules/services/databases/mongodb.nix Mon Feb 6 19:14:33
2012(r32083)
@@ -96,9 +96,10 @@
jobs.mongodb =
{ description = MongoDB server;
+daemonType = none;
+respawn = false; # seems to interfere with normal stopping
startOn = filesystem;
-daemonType = daemon;
preStart =
''
@@ -108,8 +109,8 @@
fi
'';
-exec = ${pkgs.shadow}/bin/su ${cfg.user} -c \${mongodb}/bin/mongod
--config ${mongoCnf} --fork\;
-preStop = ${pkgs.shadow}/bin/su ${cfg.user} -c
\${mongodb}/bin/mongod --config ${mongoCnf} --shutdown\ ;
+exec = ${pkgs.shadow}/bin/su ${cfg.user} -c \${mongodb}/bin/mongod
--config ${mongoCnf}\;
+preStop = ${pkgs.shadow}/bin/su ${cfg.user} -c
\${mongodb}/bin/mongod --config ${mongoCnf} --shutdown\;
extraConfig = kill timeout 10;
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32084 - in nixos/trunk/modules: . services/security
Author: simons
Date: Mon Feb 6 19:14:37 2012
New Revision: 32084
URL: https://nixos.org/websvn/nix/?rev=32084sc=1
Log:
frandom: very fast kernel random number generator
Added:
nixos/trunk/modules/services/security/frandom.nix
Modified:
nixos/trunk/modules/module-list.nix
Modified: nixos/trunk/modules/module-list.nix
==
--- nixos/trunk/modules/module-list.nix Mon Feb 6 19:14:33 2012(r32083)
+++ nixos/trunk/modules/module-list.nix Mon Feb 6 19:14:37 2012(r32084)
@@ -149,6 +149,7 @@
./services/scheduling/atd.nix
./services/scheduling/cron.nix
./services/scheduling/fcron.nix
+ ./services/security/frandom.nix
./services/security/tor.nix
./services/security/torsocks.nix
./services/system/cgroups.nix
Added: nixos/trunk/modules/services/security/frandom.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/modules/services/security/frandom.nix Mon Feb 6 19:14:37
2012(r32084)
@@ -0,0 +1,31 @@
+{pkgs, config, ...}:
+
+let kernel = config.boot.kernelPackages;
+in
+
+{
+
+ ## interface
+
+ options = {
+
+services.frandom.enable = pkgs.lib.mkOption {
+ default = false;
+ type = pkgs.lib.types.bool;
+ description = ''
+enable the /dev/frandom device (a very fast random number generator)
+ '';
+};
+
+ };
+
+
+ ## implementation
+
+ config = pkgs.lib.mkIf config.services.frandom.enable {
+boot.kernelModules = [ frandom ];
+boot.extraModulePackages = [ kernel.frandom ];
+services.udev.packages = [ kernel.frandom ];
+ };
+
+}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32086 - nixpkgs/trunk/pkgs/tools/backup/duplicity
Author: simons
Date: Mon Feb 6 19:45:18 2012
New Revision: 32086
URL: https://nixos.org/websvn/nix/?rev=32086sc=1
Log:
duplicity: updated to version 0.6.17
Modified:
nixpkgs/trunk/pkgs/tools/backup/duplicity/default.nix
Modified: nixpkgs/trunk/pkgs/tools/backup/duplicity/default.nix
==
--- nixpkgs/trunk/pkgs/tools/backup/duplicity/default.nix Mon Feb 6
19:14:42 2012(r32085)
+++ nixpkgs/trunk/pkgs/tools/backup/duplicity/default.nix Mon Feb 6
19:45:18 2012(r32086)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python, librsync, gnupg, boto, makeWrapper }:
stdenv.mkDerivation {
- name = duplicity-0.6.16;
+ name = duplicity-0.6.17;
src = fetchurl {
-url =
http://code.launchpad.net/duplicity/0.6-series/0.6.16/+download/duplicity-0.6.16.tar.gz;
-sha256 = 0n63857swqnq7i697p615dp37bsd5bj0gvlj5ng41584zzjmv328;
+url =
http://code.launchpad.net/duplicity/0.6-series/0.6.17/+download/duplicity-0.6.17.tar.gz;;
+sha256 = 0n54fw55v4h0cjspgh9nhss5w18bfrib9fckgkk2fldi3835c7l9;
};
installPhase = ''
@@ -21,9 +21,9 @@
meta = {
description = Encrypted bandwidth-efficient backup using the rsync
algorithm;
-homepage = http://www.nongnu.org/duplicity;
+homepage = http://www.nongnu.org/duplicity;;
license = GPLv2+;
-maintainers = with stdenv.lib.maintainers; [viric];
+maintainers = with stdenv.lib.maintainers; [viric simons];
platforms = with stdenv.lib.platforms; linux;
};
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32087 - nixpkgs/trunk/pkgs/applications/networking/esniper
Author: simons
Date: Mon Feb 6 21:26:46 2012
New Revision: 32087
URL: https://nixos.org/websvn/nix/?rev=32087sc=1
Log:
esniper: updated to version 2.27.0
Deleted:
nixpkgs/trunk/pkgs/applications/networking/esniper/fix-build-with-latest-curl.patch
Modified:
nixpkgs/trunk/pkgs/applications/networking/esniper/default.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/esniper/default.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/esniper/default.nix Mon Feb
6 19:45:18 2012(r32086)
+++ nixpkgs/trunk/pkgs/applications/networking/esniper/default.nix Mon Feb
6 21:26:46 2012(r32087)
@@ -1,17 +1,15 @@
{ stdenv, fetchurl, openssl, curl }:
stdenv.mkDerivation {
- name = esniper-2.26.0;
+ name = esniper-2.27.0;
src = fetchurl {
-url = mirror://sourceforge/esniper/esniper-2-26-0.tgz;
-sha256 =
5fd9a0f4b27b98deca303cd3d16c1ed060e05a165a40b2f4a9f8546db5e3877d;
+url = mirror://sourceforge/esniper/esniper-2-27-0.tgz;
+sha256 =
0ca9946395be8958d3eb28c9abc4a1a4d4c9134e4b6b3c3816f4631e3be25c02;
};
buildInputs = [openssl curl];
- patches = [ ./fix-build-with-latest-curl.patch ];
-
postInstall = ''
sed -e 2i export PATH=\$out/bin:\$PATH\ frontends/snipe
$out/bin/snipe
chmod 555 $out/bin/snipe
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32088 - nixpkgs/trunk/pkgs/development/libraries/lcms2
Author: urkud
Date: Mon Feb 6 22:08:04 2012
New Revision: 32088
URL: https://nixos.org/websvn/nix/?rev=32088sc=1
Log:
lcms2-2.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/lcms2/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/lcms2/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/lcms2/default.nix Mon Feb 6
21:26:46 2012(r32087)
+++ nixpkgs/trunk/pkgs/development/libraries/lcms2/default.nix Mon Feb 6
22:08:04 2012(r32088)
@@ -1,11 +1,11 @@
{stdenv, fetchurl, libtiff, libjpeg, zlib}:
stdenv.mkDerivation rec {
- name = lcms2-2.0a;
+ name = lcms2-2.3;
src = fetchurl {
-url = mirror://sf/lcms/${name}.tar.gz;
-sha256 = 0kq5imagri0l964nnj06f7xny2q7rwvzqpm8ibsqz5zm263ggskd;
+url = mirror://sourceforge/lcms/${name}.tar.gz;
+sha256 = 1r5gmzhginzm90y70dcbamycdfcaz4f7v0bb4nwyaywlvsxpg89y;
};
propagatedBuildInputs = [ libtiff libjpeg zlib ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32089 - nixos/trunk/modules/services/misc
Author: sandervanderburg
Date: Mon Feb 6 22:49:41 2012
New Revision: 32089
URL: https://nixos.org/websvn/nix/?rev=32089sc=1
Log:
Implemented a very very dirty hack, which makes it possible to statically
determine which activation types are supported, instead of determining this by
the avahi service
Modified:
nixos/trunk/modules/services/misc/disnix.nix
Modified: nixos/trunk/modules/services/misc/disnix.nix
==
--- nixos/trunk/modules/services/misc/disnix.nixMon Feb 6 22:08:04
2012(r32088)
+++ nixos/trunk/modules/services/misc/disnix.nixMon Feb 6 22:49:41
2012(r32089)
@@ -33,29 +33,29 @@
useWebServiceInterface = mkOption {
default = false;
- description = Whether to enable the DisnixWebService interface running
on Apache Tomcat;
+description = Whether to enable the DisnixWebService interface
running on Apache Tomcat;
};
publishInfrastructure = {
enable = mkOption {
default = false;
- description = Whether to publish capabilities/properties of this
machine in as attributes in the infrastructure option;
- };
+ description = Whether to publish capabilities/properties of this
machine in as attributes in the infrastructure option;
+};
- enableAuthentication = mkOption {
- default = false;
- description = Whether to publish authentication credentials through
the infrastructure attribute (not recommended in combination with Avahi);
- };
+enableAuthentication = mkOption {
+ default = false;
+ description = Whether to publish authentication credentials through
the infrastructure attribute (not recommended in combination with Avahi);
+};
};
infrastructure = mkOption {
default = {};
- description = List of name value pairs containing properties for the
infrastructure model;
+description = List of name value pairs containing properties for the
infrastructure model;
};
publishAvahi = mkOption {
default = false;
- description = Whether to publish capabilities/properties as a Disnix
service through Avahi;
+description = Whether to publish capabilities/properties as a Disnix
service through Avahi;
};
};
@@ -77,7 +77,7 @@
services.tomcat.extraGroups = [ disnix ];
services.tomcat.javaOpts = ${optionalString cfg.useWebServiceInterface
-Djava.library.path=${pkgs.libmatthew_java}/lib/jni} ;
services.tomcat.sharedLibs = optional cfg.useWebServiceInterface
${pkgs.DisnixWebService}/share/java/DisnixConnection.jar
-++ optional cfg.useWebServiceInterface
${pkgs.dbus_java}/share/java/dbus.jar;
+ ++ optional cfg.useWebServiceInterface
${pkgs.dbus_java}/share/java/dbus.jar;
services.tomcat.webapps = optional cfg.useWebServiceInterface
pkgs.DisnixWebService;
users.extraGroups = singleton
@@ -89,16 +89,29 @@
optionalAttrs (cfg.publishInfrastructure.enable)
( { hostname = config.networking.hostName;
targetHost = config.deployment.targetHost;
- system = if config.nixpkgs.system == then builtins.currentSystem
else config.nixpkgs.system;
+ system = if config.nixpkgs.system == then builtins.currentSystem
else config.nixpkgs.system;
+
+ supportedTypes = (import ${pkgs.stdenv.mkDerivation {
+name = supportedtypes;
+buildCommand = ''
+ ( echo -n [
+cd
${disnix_activation_scripts}/libexec/disnix/activation-scripts
+for i in *
+do
+echo -n \$i\
+done
+echo -n ]) $out
+'';
+ }});
}
// optionalAttrs (cfg.useWebServiceInterface) { targetEPR =
http://${config.deployment.targetHost}:8080/DisnixWebService/services/DisnixWebService;;
}
// optionalAttrs (config.services.httpd.enable) { documentRoot =
config.services.httpd.documentRoot; }
// optionalAttrs (config.services.mysql.enable) { mysqlPort =
config.services.mysql.port; }
// optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; }
- // optionalAttrs (config.services.svnserve.enable) { svnBaseDir =
config.services.svnserve.svnBaseDir; }
- // optionalAttrs (cfg.publishInfrastructure.enableAuthentication) (
+// optionalAttrs (config.services.svnserve.enable) { svnBaseDir =
config.services.svnserve.svnBaseDir; }
+// optionalAttrs (cfg.publishInfrastructure.enableAuthentication) (
optionalAttrs (config.services.mysql.enable) { mysqlUsername =
root; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; })
- )
+)
;
services.disnix.publishInfrastructure.enable =
[Nix-commits] SVN commit: nix - r32090 - disnix/disnixos/trunk/data
Author: sandervanderburg
Date: Mon Feb 6 23:00:16 2012
New Revision: 32090
URL: https://nixos.org/websvn/nix/?rev=32090sc=1
Log:
Removed some obsolete hackery
Modified:
disnix/disnixos/trunk/data/testing.nix.in
Modified: disnix/disnixos/trunk/data/testing.nix.in
==
--- disnix/disnixos/trunk/data/testing.nix.in Mon Feb 6 22:49:41 2012
(r32089)
+++ disnix/disnixos/trunk/data/testing.nix.in Mon Feb 6 23:00:16 2012
(r32090)
@@ -72,9 +72,8 @@
};
infrastructure = import
${disnixos}/share/disnixos/generate-infrastructure.nix {
-networkFiles = [ ${manifestSrc}/${networkFile} ]
- ++ [ (generatePhysicalTestNetwork ${manifestSrc}/${networkFile}
modules/virtualisation/qemu-vm.nix ) ]
- ++ [ (generatePhysicalTestNetwork ${manifestSrc}/${networkFile}
modules/testing/test-instrumentation.nix ) ];
+networkFiles = [ ${manifestSrc}/${networkFile} ];
+useVMTesting = true;
useBackdoor = true;
inherit nixpkgs nixos;
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32092 - nixpkgs/trunk/maintainers/scripts
Author: urkud Date: Mon Feb 6 23:07:21 2012 New Revision: 32092 URL: https://nixos.org/websvn/nix/?rev=32092sc=1 Log: unset HOME and NIXPKGS_CONFIG in test-eval-release Modified: nixpkgs/trunk/maintainers/scripts/test-eval-release.sh Modified: nixpkgs/trunk/maintainers/scripts/test-eval-release.sh == --- nixpkgs/trunk/maintainers/scripts/test-eval-release.sh Mon Feb 6 23:03:12 2012(r32091) +++ nixpkgs/trunk/maintainers/scripts/test-eval-release.sh Mon Feb 6 23:07:21 2012(r32092) @@ -3,4 +3,5 @@ if [[ -z $VERBOSE ]]; then echo You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent fi +unset HOME NIXPKGS_CONFIG # Force empty config nix-instantiate --strict --eval-only --xml --show-trace $(dirname $0)/eval-release.nix 21 /dev/null ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r32094 - disnix/disnixos/trunk/data
Author: sandervanderburg
Date: Mon Feb 6 23:22:39 2012
New Revision: 32094
URL: https://nixos.org/websvn/nix/?rev=32094sc=1
Log:
You can now also refer to external distribution models
Modified:
disnix/disnixos/trunk/data/testing.nix.in
Modified: disnix/disnixos/trunk/data/testing.nix.in
==
--- disnix/disnixos/trunk/data/testing.nix.in Mon Feb 6 23:08:11 2012
(r32093)
+++ disnix/disnixos/trunk/data/testing.nix.in Mon Feb 6 23:22:39 2012
(r32094)
@@ -59,7 +59,7 @@
};
buildManifest =
-{name, version, tarball, servicesFile, networkFile, distributionFile}:
+{name, version, tarball, servicesFile, networkFile, distributionFile,
externalDistributionFile ? false}:
with import nixpkgs { inherit system; };
@@ -81,7 +81,7 @@
manifest = import ${disnix}/share/disnix/manifest.nix {
servicesFile = ${manifestSrc}/${servicesFile};
infrastructureFile = ${infrastructure};
-distributionFile = ${manifestSrc}/${distributionFile};
+distributionFile = if externalDistributionFile then distributionFile
else ${manifestSrc}/${distributionFile};
targetProperty = backdoor;
inherit nixpkgs;
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
