[Nix-dev] BuilderDefs
Hi,
On 09/11/2011 06:45 PM, Michael Raskin wrote:
+x@{builderDefsPackage
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
(snip)
Could you stick to the standard way of writing packages? That is,
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = libmodplug-0.8.8.4;
src = fetchurl { ... };
meta = ...;
}
That style is easier to read, shorter, uses fewer strange idioms
(‘helperArgNames’?), is better documented, and easier to maintain by
helperArguments reduce code duplication: all standard packages list most
of their arguments twice - as buildInputs and as arguments. Substantially
editing this list becomes very annoying quickly.
others (because it is the standard notation).
It is also unpredictable w.r.t. shell variable expansion (a few packages
where I encountered it seemed impossible to write with setup.sh without
simply writing a big nice builder.sh), it lacks a few predefined things
that cannot be added without causing full rebuild..
The purported advantage of builderDefs (making it easier to customise
build phases etc.) I haven't really seen in practice — stdenv's
setup.sh has plenty of customisation mechanisms.
It has weak mechanisms of post-modification: when I commit a tarball version
and actually use VCS-trunk version I need to add something to preConfigure of
the package.
Of course, its use is usually in user configuration.
Also, there are a few expressions that use topic-specific buildPhases. The
simplest example is about fonts.
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29230 - nixpkgs/trunk/pkgs/misc/tex/disser
Author: raskin
Date: Mon Sep 12 20:50:07 2011
New Revision: 29230
URL: https://ssl.nixos.org/websvn/nix/?rev=29230sc=1
Log:
Fix disser build
Added:
nixpkgs/trunk/pkgs/misc/tex/disser/
nixpkgs/trunk/pkgs/misc/tex/disser/default.nix
Added: nixpkgs/trunk/pkgs/misc/tex/disser/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/misc/tex/disser/default.nix Mon Sep 12 20:50:07
2011(r29230)
@@ -0,0 +1,56 @@
+x@{builderDefsPackage
+ , unzip, texLive, texLiveCMSuper, texLiveAggregationFun
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[texLive texLiveCMSuper texLiveAggregationFun];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames))
+++ [(a.texLiveAggregationFun {paths=[a.texLive a.texLiveCMSuper];})];
+ sourceInfo = rec {
+baseName=disser;
+version=1.1.8;
+name=${baseName}-${version};
+project=${baseName};
+
url=mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.zip;
+hash=15509hfcvkk5kfcza149c74qpamwgw88dg0ra749axs8xj8qmlw8;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [setVars doMakeInstall];
+
+ setVars = a.noDepEntry ''
+export HOME=$TMPDIR
+ '';
+
+ makeFlags = [DESTDIR=$out/share/texmf-dist];
+
+ meta = {
+description = Russian PhD thesis LaTeX package;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux; # platform-independent
+license = free; # LaTeX Project Public License
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://sourceforge.net/projects/disser/files/disser/;;
+};
+ };
+}) x
+
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29231 - nixpkgs/trunk/pkgs/top-level
Author: raskin
Date: Mon Sep 12 20:50:32 2011
New Revision: 29231
URL: https://ssl.nixos.org/websvn/nix/?rev=29231sc=1
Log:
all-packages.nix entry for disser
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 12 20:50:07
2011(r29230)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 12 20:50:32
2011(r29231)
@@ -8389,6 +8389,8 @@
texLiveAggregationFun =
(builderDefsPackage (import ../misc/tex/texlive/aggregate.nix));
+ texDisser = callPackage ../misc/tex/disser {};
+
texLiveContext = builderDefsPackage (import ../misc/tex/texlive/context.nix)
{
inherit texLive;
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29187 - nixpkgs/trunk/pkgs/applications/version-management/veracity
Author: raskin
Date: Sun Sep 11 16:46:17 2011
New Revision: 29187
URL: https://ssl.nixos.org/websvn/nix/?rev=29187sc=1
Log:
Fixing some of Veracity tests
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
==
--- nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Sun Sep 11 16:45:42 2011(r29186)
+++ nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Sun Sep 11 16:46:17 2011(r29187)
@@ -31,7 +31,8 @@
mkdir pseudo-home
export HOME=$PWD/pseudo-home
export LC_ALL=en_US.UTF-8
-${if a.stdenv.isLinux then export
LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale-archive; else }
+export LANG=en_US.UTF-8
+${if a.stdenv.isLinux then export
LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale/locale-archive; else }
make test || true
'' else ) [doMake minInit];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29188 - in nixpkgs/trunk/pkgs: development/interpreters/love top-level
Author: raskin
Date: Sun Sep 11 17:05:48 2011
New Revision: 29188
URL: https://ssl.nixos.org/websvn/nix/?rev=29188sc=1
Log:
Adding LOVE Lua-based game framework/interpreter
Added:
nixpkgs/trunk/pkgs/development/interpreters/love/
nixpkgs/trunk/pkgs/development/interpreters/love/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/interpreters/love/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/interpreters/love/default.nixSun Sep
11 17:05:48 2011(r29188)
@@ -0,0 +1,58 @@
+x@{builderDefsPackage
+ , lua5, mpg123, physfs, freetype, libdevil, openal, SDL, libvorbis
+ , libogg, flac, mesa, libtiff, libpng, libjpeg, libmodplug
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=love;
+version=0.7.2;
+name=${baseName}-${version};
+url=https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz;;
+hash=0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [setVars fixSrc doConfigure doMakeInstall];
+
+ fixSrc =a.fullDepEntry ''
+sed -e '/typedef void (\*__GLXextFuncPtr)/d' -i
src/modules/graphics/opengl/GLee.h
+ '' [minInit doUnpack];
+
+ setVars = a.noDepEntry ''
+export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL
+export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE
-I${freetype}/include/freetype2
+ '';
+
+ meta = {
+description = A Lua-based 2D game engine/scripting language;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.zlib;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://love2d.org/;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Sep 11 16:46:17
2011(r29187)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Sep 11 17:05:48
2011(r29188)
@@ -2490,6 +2490,8 @@
kona = callPackage ../development/interpreters/kona {};
+ love = callPackage ../development/interpreters/love {};
+
lua4 = callPackage ../development/interpreters/lua-4 { };
lua5 = callPackage ../development/interpreters/lua-5 { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] CFQ I/O scheduler can't boot my system
4e64f7f0.5060...@shealevy.com) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 breaks my boot process. The linuxPackages_2_6_38_ati kernel hangs after probing the ata devices. I've reverted to an older version for now, but maybe I'm not the only one who's going to have that problem? This should be fixed now (r29027, tested with Linux 2.6.35). I still get this hang unless I set elevator=noop at boot. Using linuxPackages_2_6_39. I also ran into this issue today with both linuxPackages_2_6_39 and linuxPackages_2_6_38_ati My data point: Linux 3.0.4, broken before the fix, works now. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29001 - in nixpkgs/trunk/pkgs: tools/graphics/zbar top-level
Author: raskin
Date: Sun Sep 4 09:12:00 2011
New Revision: 29001
URL: https://svn.nixos.org/websvn/nix/?rev=29001sc=1
Log:
Adding ZBar
Added:
nixpkgs/trunk/pkgs/tools/graphics/zbar/
nixpkgs/trunk/pkgs/tools/graphics/zbar/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/tools/graphics/zbar/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/graphics/zbar/default.nix Sun Sep 4 09:12:00
2011(r29001)
@@ -0,0 +1,50 @@
+x@{builderDefsPackage
+ , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l
+ , qt4, lzma
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=zbar;
+version=0.10;
+name=${baseName}-${version};
+pName=${baseName};
+
url=mirror://sourceforge/project/${pName}/${baseName}/${version}/${name}.tar.bz2;
+hash=1imdvf5k34g1x2zr6975basczkz3zdxg6xnci50yyp5yvcwznki3;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doConfigure doMakeInstall];
+
+ meta = {
+description = Bar code toolset;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.lgpl21;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://zbar.sourceforge.net/;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Sep 4 08:54:19
2011(r29000)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Sep 4 09:12:00
2011(r29001)
@@ -1570,6 +1570,8 @@
xtreemfs = callPackage ../tools/filesystems/xtreemfs {};
+ zbar = callPackage ../tools/graphics/zbar {};
+
zdelta = callPackage ../tools/compression/zdelta { };
zile = callPackage ../applications/editors/zile { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28993 - nixpkgs/trunk/pkgs/applications/version-management/veracity
Author: raskin
Date: Sat Sep 3 10:21:55 2011
New Revision: 28993
URL: https://svn.nixos.org/websvn/nix/?rev=28993sc=1
Log:
Attempting to fix tests a bit..
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
==
--- nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Fri Sep 2 21:49:13 2011(r28992)
+++ nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Sat Sep 3 10:21:55 2011(r28993)
@@ -2,6 +2,7 @@
, cmake, curl, patch, zlib, icu, sqlite, libuuid
, readline, openssl, spidermonkey_1_8_0rc1
, nspr, nss
+ , unzip, glibcLocales
, runTests ? false
, ...}:
builderDefsPackage
@@ -20,16 +21,17 @@
inherit (s) name;
inherit buildInputs;
- phaseNames = [prepare_sgneeds dump0 prepareMakefiles doMake doTest
doDeploy];
+ phaseNames = [prepare_sgneeds dump0 prepareMakefiles fixPaths
doMake doTest doDeploy];
dump0 = (a.doDump 0);
runTests = a.stdenv.lib.attrByPath [runTests] false a;
doTest = a.fullDepEntry (if runTests then ''
-sed -e s@/bin/bash@${a.stdenv.shell}@ -i $(find .. -type f)
mkdir pseudo-home
export HOME=$PWD/pseudo-home
+export LC_ALL=en_US.UTF-8
+${if a.stdenv.isLinux then export
LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale-archive; else }
make test || true
'' else ) [doMake minInit];
@@ -73,6 +75,13 @@
cmake -G Unix Makefiles -D SGNEEDS_DIR=$SGNEEDS_DIR -D
VVTHIRDPARTY=$VVTHIRDPARTY -D
SPIDERMONKEY_INCDIR=${a.spidermonkey_1_8_0rc1}/include -D
SPIDERMONKEY_LIB=${a.spidermonkey_1_8_0rc1}/lib/libjs.so ../veracity*
'' [minInit addInputs doUnpack];
+ fixPaths = a.fullDepEntry ''
+sed -e s@/bin/bash@${a.stdenv.shell}@ -i $(find .. -type f)
+sed -e 's@/bin/ln@#{a.coreutils}/bin/ln@g' -i ../veracity/src/js_tests/*.js
+sed -e 's@/usr/bin/gdb@#{a.gdb}/bin/gdb@g' -i
../veracity/testsuite/c_test.sh
+sed -e 's@/bin/@@g' -i ../veracity/testsuite/u*.c
+ '' [minInit];
+
doDeploy = a.fullDepEntry ''
ensureDir $out/bin $out/share/veracity/
cp -r .. $out/share/veracity/build-dir
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] CFQ I/O scheduler can't boot my system
this commit * Use the CFQ I/O scheduler, rather than the ‘none’ scheduler. This was already the case on Linux 2.6.32, but in newer kernels the CFQ scheduler is built as a module, so all block devices got the ‘none’ scheduler instead. breaks my boot process. The linuxPackages_2_6_38_ati kernel hangs after probing the ata devices. I've reverted to an older version for now, but maybe I'm not the only one who's going to have that problem? I also see a booting problem starting with the time of the commit, so I confirm the problem. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28969 - in nixpkgs/trunk/pkgs: development/interpreters/regina top-level
Author: raskin
Date: Fri Sep 2 08:05:51 2011
New Revision: 28969
URL: https://svn.nixos.org/websvn/nix/?rev=28969sc=1
Log:
Adding Regina-REXX interpreter
Added:
nixpkgs/trunk/pkgs/development/interpreters/regina/
nixpkgs/trunk/pkgs/development/interpreters/regina/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/interpreters/regina/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/interpreters/regina/default.nix Fri Sep
2 08:05:51 2011(r28969)
@@ -0,0 +1,53 @@
+x@{builderDefsPackage
+ , ncurses
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=Regina-REXX;
+pname=regina-rexx;
+version=3.5;
+name=${baseName}-${version};
+url=mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz;
+hash=0gh0k6lbhfixs44adha7lxirl3a08jabdylzr6m7mh5q5fhzv5f8;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doConfigure doMakeInstall];
+
+ configureFlags = [
+--libdir=$out/lib
+ ];
+
+ meta = {
+description = REXX interpreter;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.lgpl2;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage =
http://sourceforge.net/projects/regina-rexx/files/regina-rexx/;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Sep 1 21:03:18
2011(r28968)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Sep 2 08:05:51
2011(r28969)
@@ -2576,6 +2576,8 @@
inherit (gtkLibs) pango glib gtk;
};
+ regina = callPackage ../development/interpreters/regina {};
+
ruby18 = callPackage ../development/interpreters/ruby { };
#ruby19 = import ../development/interpreters/ruby/ruby-19.nix { inherit
ruby18 fetchurl; };
ruby = ruby18;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28948 - nixpkgs/trunk/pkgs/applications/networking/instant-messengers/vacuum
Author: raskin
Date: Thu Sep 1 06:15:12 2011
New Revision: 28948
URL: https://svn.nixos.org/websvn/nix/?rev=28948sc=1
Log:
Update Vacuum
Modified:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/vacuum/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/vacuum/default.nix
==
---
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/vacuum/default.nix
Wed Aug 31 21:20:48 2011(r28947)
+++
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/vacuum/default.nix
Thu Sep 1 06:15:12 2011(r28948)
@@ -1,6 +1,7 @@
x@{builderDefsPackage
, qt4, openssl
, xproto, libX11, libXScrnSaver, scrnsaverproto
+ , xz
, ...}:
builderDefsPackage
(a :
@@ -11,11 +12,11 @@
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
-version=1.1.0;
-baseName=vacuum;
+version=1.1.1;
+baseName=vacuum-im;
name=${baseName}-${version};
-url=http://vacuum-im.googlecode.com/files/${name}.tar.gz;;
-hash=c956b0cf5cc0a1acee47a96f0b0e7ab5d716e48cac4a7fcbca496f901a219dcc;
+url=http://vacuum-im.googlecode.com/files/${name}.tar.xz;;
+hash=b4b3472bf83173f6be1bbe69520bf6cab97e24cf9fd8a7b60e4ffdc1cb43b1dc;
};
in
rec {
@@ -28,7 +29,7 @@
inherit buildInputs;
/* doConfigure should be removed if not needed */
- phaseNames = [preBuild doQMake doMakeInstall];
+ phaseNames = [addInputs preBuild doQMake doMakeInstall];
preBuild = a.fullDepEntry (''
echo Fixing a name collision with a function added in Qt 4.7
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] new possible movement to git (?)
4e5566e6.9050...@shealevy.com 4e5b97be.5030...@tudelft.nl) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 If I may add to the discussion, please check this workflow model for git, it could help deciding on the branching model for nix: http://nvie.com/posts/a-successful-git-branching-model/ I considered that the main argument is about the extent of feature branches and how to manage stable branch. I'd say that this diagram looks like active branching with fresh SVN with trunk called develop and all-releases branch called master. If someone thinks that this diagram can distinguish between our positions, this would be a nice clarification. Also, I think the `merge --no-ff` could help solve the issue of keeping branching information for the commits that Michael, Shea and Peter were discussing. It doesn't help unless all feature branches have strictly unique names, does it? ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28915 - in nixpkgs/trunk/pkgs: servers/squid tools/networking/tftp-hpa top-level
Author: raskin
Date: Tue Aug 30 07:02:01 2011
New Revision: 28915
URL: https://svn.nixos.org/websvn/nix/?rev=28915sc=1
Log:
Adding TFTP-HPA
Added:
nixpkgs/trunk/pkgs/tools/networking/tftp-hpa/
nixpkgs/trunk/pkgs/tools/networking/tftp-hpa/default.nix
Modified:
nixpkgs/trunk/pkgs/servers/squid/squids.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/servers/squid/squids.nix
==
--- nixpkgs/trunk/pkgs/servers/squid/squids.nix Tue Aug 30 05:51:49 2011
(r28914)
+++ nixpkgs/trunk/pkgs/servers/squid/squids.nix Tue Aug 30 07:02:01 2011
(r28915)
@@ -2,13 +2,13 @@
let edf = composableDerivation.edf; in
rec {
squid30 = composableDerivation.composableDerivation {} {
-name = squid-3.0-stable5;
+name = squid-3.0-stable26;
buildInputs = [perl];
src = args.fetchurl {
- url =
http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2;
- sha256 = 1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w;
+ url =
http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE26.tar.bz2;
+ sha256 =
3e54ae3ad09870203862f0856c7d0cca16a85f62d5012085009003ee3d5467b4;
};
configureFlags = [--enable-ipv6];
@@ -21,22 +21,25 @@
};
- squid3Beta = squid30.merge {
-name = squid-3.1-beta;
+ squid31 = squid30.merge {
+name = squid-3.1.15;
src = args.fetchurl {
- url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.16.tar.bz2;
- sha256 = 0pjz8dj04146hgdlfh0hbwdsdahsicdkafj5z9nkghbjavj1x5ny;
+ url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.15.tar.bz2;
+ sha256 =
1300f44dd4783697bacc262a7a9b32dbc9f550367fe82b70262864fdff715a35;
};
configureFlags = [--enable-ipv6];
};
- squid3Head = squid3Beta.merge {
-name = squid-3.1-HEAD;
+ squid32Beta = squid30.merge {
+name = squid-3.2.0.11;
src = args.fetchurl {
- url =
http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.3-20081221.tar.bz2;
- md5 = 345b50251dcc369e1be992d0a4a4c801;
+ url = http://www.squid-cache.org/Versions/v3/3.2/squid-3.2.0.11.tar.bz2;
+ sha256 =
aa5b9a85e1a90c4adb591c3e796c3fdfb166d8d2c814165d70692636321f69ae;
};
+configureFlags = [--enable-ipv6];
+buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2
+ libtool openssl];
};
- latest = squid3Beta;
+ latest = squid32Beta;
}
Added: nixpkgs/trunk/pkgs/tools/networking/tftp-hpa/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/networking/tftp-hpa/default.nixTue Aug 30
07:02:01 2011(r28915)
@@ -0,0 +1,48 @@
+x@{builderDefsPackage
+ , tcp_wrappers
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=tftp-hpa;
+version=5.1;
+name=${baseName}-${version};
+url=mirror://kernel/software/network/tftp/${name}.tar.bz2;
+hash=0k72s0c7wm4fyb6lqfypdkcy6rimanr49slimx8p0di69w394gzx;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doConfigure doMakeInstall];
+
+ meta = {
+description = TFTP tools - a lot of fixes on top of BSD TFTP;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.bsd3;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://www.kernel.org/pub/software/network/tftp/;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 30 05:51:49
2011(r28914)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 30 07:02:01
2011(r28915)
@@ -1422,6 +1422,8 @@
htmlTidy = callPackage ../tools/text/html-tidy { };
+ tftp_hpa = callPackage ../tools/networking/tftp-hpa {};
+
tigervnc = callPackage ../tools/admin/tigervnc {
fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc
xorg.fontcursormisc
xorg.fontbhlucidatypewriter75dpi ];
@@ -1566,6 +1568,8 @@
xsel = callPackage ../tools/misc/xsel { };
+ xtreemfs = callPackage ../tools/filesystems/xtreemfs {};
+
zdelta = callPackage ../tools/compression/zdelta { };
zile = callPackage ../applications/editors/zile { };
@@ -4920,9 +4924,11 @@
sipwitch = callPackage ../servers/sip/sipwitch { };
squids = recurseIntoAttrs( import
[Nix-dev] Re: new possible movement to git (?)
1e1d23499a69570914f03bc0a196953a.squir...@webmail.shealevy.com 87ei034yse@write-only.cryp.to 5833f9f3-bf70-4cae-9ad2-489170ad5...@email.android.com) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 But stdenv-updates isn't meant as a really big topic branch. It's meant as a place for changes that will require rebuilding the system, so we can minimize the number of times we require that. How does git help with that? Suppose that I modify GNU Make, for example, then that change ought to go into stdenv-updates. At the same time, you modify glibc, and that change goes into stdenv-updates, too. But those two changes are orthogonal. They don't depend on each other. So why should they be checked into the same branch? There is no conceptual reason to do that. Rather, there is a practical reason, namely the fact that creating two new branches for those two changes -- a.k.a. topic branches -- would be unfeasible with SVN. If it were, creating stdenv-updates per se would be infeasible. When using Git, that restriction no longer exists. I can create a branch stdenv/gnu-make, and you can create a branch stdenv/glibc, and Hydra could build both of them (in fact, Hydra would probably build all stdenv/* branches). In that scenario, other users are free to merge the No. The space required could grow too fast. It was stated many times that Hydra jobsets will only be created by people running Hydra. contents of either branch into their personal master; they can choose whether they want to have the latest gnu make or the latest glibc or both. When both changes are checked into one monolithic stdenv-updates branch, however, doing that is not so easy. The problem is a packaging problem, not version-management one. If you update Make, a lot of packages break. If you update glibc, a lot of packages break. Some packages break only when you update both at once (nobody knows how they manage this). Also, you want to minimize big rebuilds. Note how stdenv-updates really goes: we update _many_ things at once, and then fix the bugs that show up with all the latest things. If we create small topic branches, we have a large risk of spending duplicated effort fixing many things on many topic branches, then merging some of the topic branches together and fixing more things that depend on combinations of versions, finding out the old fixes make things worse, and so on. Eventually, you decide that the new glibc is stable, and then you run git merge stdenv-updates on whatever happens to be your equivalent of the official master branch, and then you push the changeset upstream, which effectively makes them stable for everyone. The merge commit would even record the fact that you worked on a topic branch prior to that, and the history of that branch would become visible in master, too. Right, and the make change keeps hanging. So we are worse off than now, because we get two stdenv rebuilds. The workflow is not completely different from what we are doing now, but the granularity is much higher. There isn't just one stdenv-updates branch. Rather, there are many of them. Any update will require lots of fixes. So, it is better to have one stdenv branch, not ten 50%-broken branches. And by the way, having all glibc-update branches called the same even keeps the problem with Git history. Basically, all branches except master are considered unstable, i.e. work in progress. When they have become stable, though, then they are pushed into the master branch. For packaging, notion of stable cannot be preserved across merges with any kind of confidence.. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[***SPAM***] [Nix-dev] Re: new possible movement to git (?)
1e1d23499a69570914f03bc0a196953a.squir...@webmail.shealevy.com 87ei034yse@write-only.cryp.to 5833f9f3-bf70-4cae-9ad2-489170ad5...@email.android.com 87ei03aw6p@write-only.cryp.to 894aedf1c3c6d28c2272e35ab266d932.squir...@webmail.shealevy.com) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 I don't think this accurately reflects the reasons we use stdenv-updates. We don't put it all in the same branch because more fine-grained branching is expensive, we put it all in the same branch because we want the eventual merge of the changes to happen at the same time. exactly who is we? Please speak for yourself. I, for one, do not want unrelated changes to be merged in one commit, because that habit breaks extremely useful tools such as git bisect. One commit and one branch are different things. Besides, having many different stdenv/* topic branches does not imply that each of them must be merged into master separately. You *can* merge them all at once, of course, if you want to. It just so happens that I wouldn't want to do that because the practice violates elementary principles software engineering. The problem is that actually merging them one-by-one is costly. Trunk should receive one rebuild. And it is established practice to reduce the count of stdenv rebuilds. Also, there is little happening in NixPkgs that should be classified as software engineering. Everything non-trivial in packaging is about finding out upstream quirks. To run NixOS, I need maximum amount of packages in stdenv-updates to be non-broken. Tracking what is broken where across five topic branches is insanity even without second-guessing what will start working on merge. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: new possible movement to git (?)
e1qy7ah-0002y4-00.7c6f434c-mail...@smtp6.mail.ru e1qyojz-0005ym-00.7c6f434c-mail...@smtp1.mail.ru) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 Eventually, you decide that the new glibc is stable, and then you run git merge stdenv/glibc on whatever happens to be your equivalent of the official master branch, and then you push the changeset upstream, which effectively makes them stable for everyone. Right, and the make change keeps hanging. So we are worse off than now, because we get two stdenv rebuilds. actually, it's exactly the opposite. We are better off because we have significantly reduced the amount of inference between changes to GNU Make and changes to GNU libc. When the glibc update has been pushed, those changes become stable or official or however you want to call it, meaning that those changes are going to be propagated into all active stdenv/* topic branches, where the people working on those branches can address problems the glibc update might cause locally. If all these changes were to occur in a single branch, then those changes would constantly interfere with each other, causing lots and lots of unnecessary re-builds and making everyone's live much harder. Everyone is using trunk on the computers which they expect to work. So two stdenv rebuilds where one would work is an annoyance. The changes from glibc and from make would interfere once. We would rebuild make, then learn to build glibc with new make (we have to do this anyway), then make and glibc are quite likely not to change. Solutions to many problems with updates often include updating the offending packages to get upstream fixes. Your way supposes trying to build them with just new glibc, and then trying to build them with new glibc and make. It doesn't look like this approach would reduce rebuilds. And, by the way, if updating a package to a new-and-shiny version which boasts fixed problems with fresh glibc also requires fresh gcc, won't it lead either to consiously breaking trunk or to making glibc-updates branch closer to stdenv-updates anyway? Updating GNU TLS to 3.0 seems to make need GTK+-3.0 packages for glib-networking to work. It is just a fresh example... ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: new possible movement to git (?)
87ei03aw6p@write-only.cryp.to e1qyq0p-0003fq-00.7c6f434c-mail...@smtp15.mail.ru) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 Two stdenv rebuilds where one would work is an annoyance. Your way supposes trying to build them with just new glibc, and then trying to build them with new glibc and make. It doesn't look like this approach would reduce rebuilds. my impression is that we approach the question at hand using different priorities. You seem to be concerned mostly with Hydra, i.e. you argue that policies should be designed so that Hydra is happy, whereas I am concerned with people, i.e. I argue for policies that simplify development -- even if this means that Hydra has to perform builds that could theoretically have been avoided. Well, I'd say that I care more about people using Nix, because usually I use way more packages than dependencies of any given package (which I would rebuild while developing a package). Also, not everything I use is built by Hydra... Also, looks like state of the affairs in the parts of Nixpkgs we work on is too different. I could look for some examples where updating sanely meant simply updating everything first and sorting things out later; there obviously are some updates where knowing whether new glibc or new gcc breaks the build helps. I guess getting any numbers would be hard. Under those circumstances, I don't see how we could agree, so I suggest we agree to disagree. Well, I am even more unconvinced - based on my experience with updates, I would prefer stdenv-updates to be unified branch even for the process of fixing the packages. Because easy things are just done and hard things are - in my experience with packaging - usually easy to trace back to single dependency and hard to fix anyway. But you are right, it's not likely that we could find any new arguments. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] maxima broken (was: SVN commit: nix - r28845 -nixpkgs/trunk/pkgs/development/compilers/sbcl)
fatal error encountered in SBCL pid 31679(tid 140737354098432): can't load .core for different runtime, sorry Looks like this version of Maxima has a prepared core file for SBCL 1.0.50 and is trying to load it in 1.0.51. I guessed that maybe the wrapper script used by Maxima is broken in some way, so I figured out the appropriate command line and ran it directly, but the result is the same: /nix/store/jylnl3mk4idzyw5zb78maprwsyxynv83-sbcl-1.0.51/bin/sbcl \ --core \ /nix/store/22gcg82x0787anzpaz0mjryaba5n1lag-maxima-5.25.0/lib/maxima/5.25.0/binary-sbcl/maxima.core \ --noinform --end-runtime-options --eval '(cl-user::run)' \ --end-toplevel-options fatal error encountered in SBCL pid 540(tid 140737354098432): can't load .core for different runtime, sorry Hm, very strange. I have the same Maxima hash, and it works... Even more, I run the same expanded command and it still works My lisp-fu is very weak, and I am at a loss how to debug let alone fix this issue. Do you have any idea what might be causing this failure? Note that the Maxima build itself worked fine: http://hydra.nixos.org/build/1283060 Fresh Maxima does work for me on x86-64 arch. So I assume that the problem lies in the way SBCL is called? Could you please search 1[.]0[.]..[.]nixos in the core file? I wonder what version it is for and how it got built.. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28871 - nixpkgs/trunk/pkgs/build-support/fetchgit
Author: raskin Date: Mon Aug 29 10:06:12 2011 New Revision: 28871 URL: https://svn.nixos.org/websvn/nix/?rev=28871sc=1 Log: Fix a typo Modified: nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Modified: nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git == --- nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Mon Aug 29 09:54:47 2011(r28870) +++ nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git Mon Aug 29 10:06:12 2011(r28871) @@ -210,7 +210,7 @@ # If the hash was given, a file with that hash may already be in the # store. - if -n $expHash; then + if test -n $expHash; then finalPath=$(nix-store --print-fixed-path --recursive $hashType $expHash git-export) if ! nix-store --check-validity $finalPath 2 /dev/null; then finalPath= @@ -251,4 +251,4 @@ if test -n $PRINT_PATH; then echo $finalPath fi -fi \ No newline at end of file +fi ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28872 - in nixpkgs/trunk/pkgs: tools/networking/netboot top-level
Author: raskin
Date: Mon Aug 29 10:16:36 2011
New Revision: 28872
URL: https://svn.nixos.org/websvn/nix/?rev=28872sc=1
Log:
Adding netboot
Added:
nixpkgs/trunk/pkgs/tools/networking/netboot/
nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix Mon Aug 29
10:16:36 2011(r28872)
@@ -0,0 +1,59 @@
+x@{builderDefsPackage
+ , fetchgit, ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[fetchgit];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=netboot;
+rev=19a955cd87b399a5b56;
+name=${baseName}-git-head;
+url=git://github.com/ITikhonov/netboot.git;
+hash=7610c734dc46183439c161d327e7ef6a3d5bc07b5173850b92f71ec047b109d6;
+ };
+in
+rec {
+ srcDrv = a.fetchgit {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+rev = sourceInfo.rev;
+ };
+
+ src=srcDrv + /;
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doBuild doDeploy];
+
+ doBuild = a.fullDepEntry ''
+gcc netboot.c -o netboot
+ '' [doUnpack addInputs];
+
+ doDeploy = a.fullDepEntry ''
+ensureDir $out/bin
+cp netboot $out/bin
+ '' [defEnsureDir minInit];
+
+ meta = {
+description = Mini PXE server;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = free-noncopyleft;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = https://github.com/ITikhonov/netboot;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 10:06:12
2011(r28871)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 10:16:36
2011(r28872)
@@ -1006,6 +1006,8 @@
ndisc6 = callPackage ../tools/networking/ndisc6 { };
+ netboot = callPackage ../tools/networking/netboot {};
+
netcat = callPackage ../tools/networking/netcat { };
netkittftp = callPackage ../tools/networking/netkit/tftp { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28873 - nixpkgs/trunk/pkgs/tools/networking/netboot
Author: raskin
Date: Mon Aug 29 10:31:10 2011
New Revision: 28873
URL: https://svn.nixos.org/websvn/nix/?rev=28873sc=1
Log:
Fixing tarball build
Modified:
nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix
==
--- nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix Mon Aug 29
10:16:36 2011(r28872)
+++ nixpkgs/trunk/pkgs/tools/networking/netboot/default.nix Mon Aug 29
10:31:10 2011(r28873)
@@ -9,6 +9,7 @@
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
+version=git-head-${rev};
baseName=netboot;
rev=19a955cd87b399a5b56;
name=${baseName}-git-head;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28875 - nixpkgs/trunk/pkgs/tools/networking/atftp
Author: raskin
Date: Mon Aug 29 13:17:44 2011
New Revision: 28875
URL: https://svn.nixos.org/websvn/nix/?rev=28875sc=1
Log:
Moving debian patch to fetchurl
Deleted:
nixpkgs/trunk/pkgs/tools/networking/atftp/debian.patch
Modified:
nixpkgs/trunk/pkgs/tools/networking/atftp/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/atftp/default.nix
==
--- nixpkgs/trunk/pkgs/tools/networking/atftp/default.nix Mon Aug 29
12:47:39 2011(r28874)
+++ nixpkgs/trunk/pkgs/tools/networking/atftp/default.nix Mon Aug 29
13:17:44 2011(r28875)
@@ -29,7 +29,12 @@
/* doConfigure should be removed if not needed */
phaseNames = [doPatch doConfigure doMakeInstall];
- patches = [./debian.patch];
+ debianPatch = a.fetchurl {
+url = http://patch-tracker.debian.org/patch/nondebian/dl/atftp/0.7.dfsg-10;
+sha256 = 0vannjp0wxvk10xxlr3hirgf0g57n9dr4vhmsyfd8x4cwgxwfgsa;
+ };
+
+ patches = [debianPatch];
meta = {
description = Advanced tftp tools;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] new possible movement to git (?)
4e5566e6.9050...@shealevy.com 4e5b97be.5030...@tudelft.nl) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 So it would be nice if we had a more stable tree that users can update from safely. For example, we could have these Nixpkgs/NixOS trees/branches: - An unstable tree which receives developer commits. It might be in a broken state, so end users shouldn't use it. Hydra continuously builds it. Of course, complicated changes should be done in a feature tree/branch and pulled in when they're done. - A tested tree that automatically gets updated from the unstable tree when some set of Nixpkgs and NixOS tests succeed *and* the Nixpkgs channel is up to date. This tree should be fairly safe to use. - A stable tree that gets updated manually and conservatively (e.g., only security or stability updates). Does this sound reasonable? 1. Would we still need stdenv-updates, or could we just use feature branches for the individual update we care about then merge it into Of course, we will have to name stdenv-updates something new each time to keep track of what got merged where afterwards. unstable (or probably master in keeping with git lingo)? This would put rebuild work onto developers but since users should be using tested It doesn't look like we have large user-to-developer ratio.. they'll never have to manually rebuild their system (though they will have to download it). Maybe we still want these feature branches to be relatively long-running... 2. How does hydra decide which builds to add to its queue? If it only adds based on the latest commit in unstable, couldn't a steady enough flow of commits mean it never has a completely built channel for any given commit? Would there be a way to force hydra to try building the whole channel for a fixed commit if the tests pass or something like that? Currently Hydra builds some commit until it is completely built; then fetches new head. I see no reason not to keep it this way. 3. I like the idea of stable, but given the current development environment I think might go stale unless there's some sort of automated way to tell us to think about merging from testing at a particular point (e.g. it has been 6 months since the last major update on stable and commit 123456 of testing has passed a full suite of tests, so send an email to the maintainers of stable to remind them to start the process of updating stable). The problem is that hydra-built will never be in the position of passing set-theoretically more tests than last time - some packages are broken by gcc updates... Anyway, currently average release seems less stable than average trunk revision. 4. I'm not really sure which would be considered better practice, but couldn't the testing branch be accomplished with tags instead of a separate branch? From my understanding of your explanation, testing will always be a fast-forwardable subset of unstable, so it doesn't need to be its own branch. This doesn't apply to stable, since it will receive cherry-picked security updates between merges. Well, if you would like to track what happenned in some convenient manner, it looks like you would need at least Mercurial-style tags (or, even better, Monotone certs or Veracity stamps; note also that if you'd like to keep set of testing revisions easily accessible for future reference, you could also do that via a Monotone-style where all commits coincidentally also belong to another branch) This seems just to be a trade-off: if you want to use the tools git has over Mercurial for creation of history, you get less tools for organizing history. About where to host the repositories: we could do it on nixos.org, but using Github is rather nice because then I don't have to manage users or set up a web interface, and the pull request management seems rather nice. I just assumed you'd want it on nixos.org, but I'd definitely prefer github. It does all the hard work for you. Maybe nixos.org could be a read-only mirror for github or bitbucket development repository. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] new possible movement to git (?)
4e5566e6.9050...@shealevy.com 4e5b97be.5030...@tudelft.nl) 1. Would we still need stdenv-updates, or could we just use feature branches for the individual update we care about then merge it into Of course, we will have to name stdenv-updates something new each time to keep track of what got merged where afterwards. Why would that be necessary? Given that branches are mere pointers, I don't see how to find out what was stdenv-updates before after it has been merged into trunk and re-created unstable (or probably master in keeping with git lingo)? This would put rebuild work onto developers but since users should be using tested It doesn't look like we have large user-to-developer ratio.. No, but as a developer I would have unstable checked out where I do my work, and as a user I would have testing checked out in /etc/nixos or be subscribed to testing as my channel. An easy way to update to last completed Hydra build would be nice, true. I guess small development would be easier to do against testing, with subsequent merging. 3. I like the idea of stable, but given the current development environment I think might go stale unless there's some sort of automated way to tell us to think about merging from testing at a particular point (e.g. it has been 6 months since the last major update on stable and commit 123456 of testing has passed a full suite of tests, so send an email to the maintainers of stable to remind them to start the process of updating stable). The problem is that hydra-built will never be in the position of passing set-theoretically more tests than last time - some packages are broken by gcc updates... Anyway, currently average release seems less stable than average trunk revision. So do you think there should be no stable branch at all? In a hypothetical future where we have hundreds of users who are not all also developers, would they be using the latest nixpkgs all the time? Maybe we should care about that when we have some new ideas on doing it right. Or when we have enough developers to have up-to-date notion of what works, what is easy to fix and what is broken fundamentally. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: new possible movement to git (?)
1e1d23499a69570914f03bc0a196953a.squir...@webmail.shealevy.com) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 Hi, Given that branches are mere pointers, I don't see how to find out what was stdenv-updates before after it has been merged into trunk and re-created Yeah, it would be nice if git had information in commits about which branch the commit was initially performed on. This seems like a really simple feature, not sure why it doesn't exist. personally, I don't see why that information is relevant. Branch names are a local affair in Git. It's quite possible for two repositories to So large projects model persistent branches with separate repositories, and still cannot keep track of what went where in the first place. track the same content using completely different branch names. So why bother recording the name if it doesn't have any significance outside of This is sometimes reverse thinking. What you say is Git doesn't provide nice tools to work with global branches, so they are useless. In Linux, separate feature branches are global and persistent. They use separate repositories to distribute load and because Git doesn't give them anything else. In Mozilla separate branches follow a naming system and live inside one repository. We do want long-lived global feature branches - if not, why not simply have SVN as the main repo and use whatever system you prefer for tracking local changes? Because SVN does allow global bracnhes? Mercurial used to have way of dealing with branches similar to what you described; they allowed keeping more data about intentions to fix the interface. Git makes complete format stability one of its ways to ensure overall reliability of the system, so it is unlikely Git will allow to store any new kinds of information about commits in-repo. the repository? Other DVCS make a lot of fuss about branch names, like monotone, but I don't see any gain in a distributed project. Monotone promotes a consistent culture of naming branches. The basic things that come from that is that I can sensibly manage one Monotone database and make checkouts of whatever project I need when I need them. The whole notion of having a stdenv-updates branch in the first place is obsolete in Git. Instead, we would have many small topic branches for specific features. Well, we could call our stdenv-updates branches add-glibc-2.7 etc. We didn't do it as a matter of development organization, not because of some VCS matter. It is impossible to make stdenv-updates branch small if you want anything to work after the merge - even GNU TLS updates often break some networking applications; gcc updates require rechecking most other packages. Sometimes it is prefereable to update many packages and then wait for upstream fixes in some more. So this branch will not be short-lived - most probably, neither in days nor in commits. Stdenv-updates has a few meanings conveying developer intent: first, it is a branch where full-rebuild updates go; second, Hydra has a task to build stdenv-updates branch; its static name means that the task is simply switched on and off, not changed every time. That way there is less place for mistakes - and so less burden for Hydra maintenance. Also, I'm not quite sure why there should be an extra stable branch. As far as I am concerned, master ought to be stable. You either shift the problem or understand it not in a way others do. There is some code line that is build by Hydra and that is hoped to be somewhat stable. Currently it is trunk. So people simply translate it as master. It is unlikely that every revision of it allows to build every package in some checklist including Firefox and OpenOffice. Simply because mistakes do happen and there is no way to ensure that a well-tested update of some package doesn't cause some part of dependent packages to fail. Next, there is a stream of commits which were actually built by Hydra. Git doesn't allow tracking it all inside VCS, but the latest can be the head of some auto-shifted branch or bear some tag. Next, there could be some way to get the latest commits that, say, make a few NixOS feature-tests pass. The stable branch discussed in this thread consists of hand-picked commits that pass all formal tests and do not cause noticeable problems in actual use. Once can want master to be that stable branch or one may want to have a separate stable branch - but the question of hand-picking stays. There is also a question of what formal criteria to set if we want Hydra-related branches, too. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[***SPAM***] [Nix-dev] Re: new possible movement to git (?)
1e1d23499a69570914f03bc0a196953a.squir...@webmail.shealevy.com 87ei034yse@write-only.cryp.to) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 The whole notion of having a stdenv-updates branch in the first place is obsolete in Git. Instead, we would have many small topic branches for specific features. if you want branch to show in history you would have to push that branch ti remote repo as well (using --no-ff option). but as Peter pointed, branches in git are matter of local higene. You name it however you want and make sure you merge them to remote branch. Git doesn't force to you specific branching policy localy while still playing nice with policy used on remote branch. Well, remote branches are just local branches for the remote repository. So the naming questions apply to them. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28913 - nixpkgs/trunk/pkgs/games/liquidwar
Author: raskin
Date: Tue Aug 30 05:26:39 2011
New Revision: 28913
URL: https://svn.nixos.org/websvn/nix/?rev=28913sc=1
Log:
Update LiquidWar
Modified:
nixpkgs/trunk/pkgs/games/liquidwar/src-for-default.nix
Modified: nixpkgs/trunk/pkgs/games/liquidwar/src-for-default.nix
==
--- nixpkgs/trunk/pkgs/games/liquidwar/src-for-default.nix Tue Aug 30
00:14:16 2011(r28912)
+++ nixpkgs/trunk/pkgs/games/liquidwar/src-for-default.nix Tue Aug 30
05:26:39 2011(r28913)
@@ -1,9 +1,9 @@
rec {
- version=0.0.9beta;
- name=liquidwar-0.0.9beta;
- hash=1a4yqh79y6s3f6dv5kkwjdqzi62y3qbwrx6420fqpvdn1694ycr9;
+ version=0.0.10beta;
+ name=liquidwar-0.0.10beta;
+ hash=1fc1qfl7p3669dj6dy1wxvf85hhwgbazm3rc365ahsikdgz1c5m0;
url=http://download.savannah.gnu.org/releases/liquidwar6/${version}/liquidwar6-${version}.tar.gz;;
-
advertisedUrl=http://download.savannah.gnu.org/releases/liquidwar6/0.0.9beta/liquidwar6-0.0.9beta.tar.gz;;
+
advertisedUrl=http://download.savannah.gnu.org/releases/liquidwar6/0.0.10beta/liquidwar6-0.0.10beta.tar.gz;;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28844 - nixpkgs/trunk/pkgs/misc/emulators/wine
Author: raskin
Date: Sat Aug 27 07:22:17 2011
New Revision: 28844
URL: https://svn.nixos.org/websvn/nix/?rev=28844sc=1
Log:
Update Wine
Modified:
nixpkgs/trunk/pkgs/misc/emulators/wine/src-for-default.nix
Modified: nixpkgs/trunk/pkgs/misc/emulators/wine/src-for-default.nix
==
--- nixpkgs/trunk/pkgs/misc/emulators/wine/src-for-default.nix Fri Aug 26
20:08:46 2011(r28843)
+++ nixpkgs/trunk/pkgs/misc/emulators/wine/src-for-default.nix Sat Aug 27
07:22:17 2011(r28844)
@@ -1,9 +1,9 @@
rec {
- version=1.3.26;
- name=wine-1.3.26;
- hash=0x2frnggg2nlva1qqx4ysdnhcq9gld0p0516z922rl8c1kcb5bbc;
+ version=1.3.27;
+ name=wine-1.3.27;
+ hash=1vdyxlsl2zlhlcl5npq59axlkvjmkp7yz5p9rvwkqia79xrs8qv1;
url=http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2;;
- advertisedUrl=http://prdownloads.sourceforge.net/wine/wine-1.3.26.tar.bz2;;
+ advertisedUrl=http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2;;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28845 - nixpkgs/trunk/pkgs/development/compilers/sbcl
Author: raskin
Date: Sat Aug 27 07:27:35 2011
New Revision: 28845
URL: https://svn.nixos.org/websvn/nix/?rev=28845sc=1
Log:
Update SBCL
Modified:
nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix Sat Aug
27 07:22:17 2011(r28844)
+++ nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix Sat Aug
27 07:27:35 2011(r28845)
@@ -1,9 +1,9 @@
rec {
- version=1.0.50;
- name=sbcl-1.0.50;
- hash=1asbb43rmrp87ia2kq66ymdlgdx3jvihlz3dlgwhlz7syd9z3wc3;
-
url=http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-source.tar.bz2;;
-
advertisedUrl=http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-source.tar.bz2;;
+ version=1.0.51;
+ name=sbcl-1.0.51;
+ hash=0kh7c7pgiv0k0rsm1iysbcp0hf2148fhpixi4d8kclryzqpzl9yj;
+
url=http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2;;
+
advertisedUrl=http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2;;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28853 - in nixpkgs/trunk/pkgs: desktops/gnome-2.28 desktops/gnome-2.28/platform/glib-networking development/libraries/gnutls top-level
Author: raskin
Date: Sat Aug 27 17:04:25 2011
New Revision: 28853
URL: https://svn.nixos.org/websvn/nix/?rev=28853sc=1
Log:
Re-add GNU TLS 2.12 - it does fix glib-networking
Added:
nixpkgs/trunk/pkgs/development/libraries/gnutls/2.12.nix
- copied, changed from r27583,
nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix
Modified:
nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix Sat Aug 27 16:59:32
2011(r28852)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix Sat Aug 27 17:04:25
2011(r28853)
@@ -143,7 +143,7 @@
};
glib_networking = import ./platform/glib-networking {
-inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls
+inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls2
libproxy libgcrypt libtasn1;
};
Modified:
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
Sat Aug 27 16:59:32 2011(r28852)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
Sat Aug 27 17:04:25 2011(r28853)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls, libproxy
+{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy
, libgcrypt, libtasn1
}:
@@ -19,6 +19,6 @@
'';
buildInputs = [ pkgconfig ];
- propagatedBuildInputs = [ glib libtool intltool gnutls libproxy libgcrypt
+ propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt
libtasn1];
}
Copied and modified: nixpkgs/trunk/pkgs/development/libraries/gnutls/2.12.nix
(from r27583, nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix Mon Jul 4
11:52:13 2011(r27583, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/gnutls/2.12.nixSat Aug 27
17:04:25 2011(r28853)
@@ -1,27 +1,28 @@
{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle
-, guileBindings, guile }:
+, guileBindings, guile, pkgconfig }:
assert guileBindings - guile != null;
stdenv.mkDerivation rec {
- name = gnutls-2.12.7;
+ name = gnutls-2.12.9;
src = fetchurl {
url = mirror://gnu/gnutls/${name}.tar.bz2;
-sha256 = 09vmm1b2iypwk5vh0adyqzra7sgx5hb9xyr1wjncv7947bk4zn3p;
+sha256 = 0ilfdyw6xr0w57aygmw1fvx56x2zh5la01y8bkx59crq927wk8bl;
};
configurePhase = ''
./configure --prefix=$out \
--disable-dependency-tracking --enable-fast-install \
--with-lzo --with-libtasn1-prefix=${libtasn1} \
+ --without-p11-kit \
${if guileBindings
then --enable-guile --with-guile-site-dir=\$out/share/guile/site\
else }
'';
- buildInputs = [ zlib lzo libtasn1 ]
+ buildInputs = [ zlib lzo libtasn1 pkgconfig ]
++ stdenv.lib.optional guileBindings guile;
propagatedBuildInputs = [ nettle ];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 27 16:59:32
2011(r28852)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 27 17:04:25
2011(r28853)
@@ -3438,6 +3438,10 @@
guileBindings = getConfig [gnutls guile] true;
};
+ gnutls2 = callPackage ../development/libraries/gnutls/2.12.nix {
+guileBindings = getConfig [gnutls guile] true;
+ };
+
gpgme = callPackage ../development/libraries/gpgme { };
grantlee = callPackage ../development/libraries/grantlee { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28830 - nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin
Author: raskin
Date: Fri Aug 26 11:21:56 2011
New Revision: 28830
URL: https://svn.nixos.org/websvn/nix/?rev=28830sc=1
Log:
Update Google Talk source. I wonder if there is a way to get it with a fixed
version..
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
==
---
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
Fri Aug 26 10:51:47 2011(r28829)
+++
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
Fri Aug 26 11:21:56 2011(r28830)
@@ -45,7 +45,7 @@
if stdenv.system == x86_64-linux then
fetchurl {
url =
http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm;;
-sha256 = 01c8w221azvmqvxf5lgb8l151086d72ll5wnjndwn50dvi6rphvx;
+sha256 =
14cf9bef6f70ff850b773dbb92833bbe45645db2636b7e17720fdc6b60e76d63;
}
else
throw Google Talk does not support your platform.;
@@ -89,4 +89,4 @@
homepage = http://www.google.com/chat/video/;
license = unfree;
};
-}
\ No newline at end of file
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Re: new possible movement to git (?)
j377eb$m52$1...@dough.gmane.org) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 From my thinking, the process would be cleanest if it took the following steps: 1. All the projects which contain references to the svn repos get updated to point to where the new git repos will be 2. The svn repo is rendered read-only or all committers have their write access revoked 3. Git repos are generated from the svn repos (each of the https://svn.nixos.org/repos/nix/*) using one of the many available tools for the purpose 4. The newly-generated git repos are put in the locations specified in step 1. Anyone can perform steps 1 and 3, while steps 2 and 4 require some sort of administrative access to complete, but are fairly straightforward in and of themselves. If we can get agreement about where the git repos should go, I'll be happy to perform steps 1 and 3 (and 4, if we decide to host the git repos somewhere public or on my servers for some reason) myself, but without agreement on step 1 any effort on this will just be wasted since everything will still default to the svn.nixos.org repos. I'm a bit tempted to just say If I get no objections by two weeks from now, I'll update the svn to point to a github repo until someone can set the repos up on the nixos servers, but I don't know whether the policy for a change this big is if nothing is said, do it or if nothing is said, don't do it. ~Shea We have if nothing is said, don't do it for far less intrusive changes than changes that include loss of access to some parts of data. With SVN I can easily look up which commits were initially done in stdenv branch and which were done in trunk. Ditto with Mercurial. But with git you seem to need some extra knowledge to do that after the proposed move. There are many arguments for hg/fossil/git, so just moving to git is not obviously the best solution. There are things that are better in SVN than in git, and we are not a kernel-sized project where we would be in the situation git is tuned for. So it is not a good idea to do any radical step without explicit support from TU Delft people. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Re: new possible movement to git (?)
4e5566e6.9050...@shealevy.com 4e576c9c.4010...@shealevy.com e1qwubl-0003wo-00.7c6f434c-mail...@smtp15.mail.ru) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 On Fri, Aug 26, 2011 at 13:36, Michael Raskin 7c6f4...@mail.ru wrote: With SVN I can easily look up which commits were initially done in stdenv branch and which were done in trunk. Ditto with Mercurial. But with git you seem to need some extra knowledge to do that after the proposed move. I agree, but only If you use rebase. git rebase is nice for local branches, but is a nightmare when you are working a large number of persons. Any change in the history is a nightmare when you have more than one repository that had the original history. That's fine In git cherry-picks are not tracking the patch history. Thus you cannot rely on cherry-pick with git as you do with subversion. The other mean is to use merges, which keep the history as it is. Thus you can see that this was a previous branch which has been merged into the master (trunk) As far as I remember, you need to keep old branch head at the position where it was merged for this to work. Unlike hg and monotone, commit doesn't remember its branch per se and you cannot store the branch where commit belongs automatically. This means that after conversion we will lose data, because we have multiple merges of branch stdenv to trunk. Also, if you have branches that later split in branches and are merged directly into master, you cannot automatically find out which of the branches was created only during split. Changing VCS also implies to change the workflow which is based on it. Having used git / hg / svn, I really love to be able to seek the history very fast, which is really slow in hg and svn. Frankly, I tried multiple DVCSes (I used hg, bzr and mtn for a lot of time and sent some patches to git-managed projects) and git makes most stress on managing huge projects and least stress on having a nice straightforward conceptual system that covers all operations (or on keeping all data it has now in future). ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] new possible movement to git (?)
4e5566e6.9050...@shealevy.com) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 I just want to add one more point in favor to git. (compared to svn) The history does not have to be clone entirely if you want to checkout the HEAD / a branch / a tag. Nix-prefect-git (already used by Hydra and Nixpkgs) is able to do a minimal checkout. Given that it has to do a search to find necessary depth, not exactly minimal - because shallow checkouts only work well with named revisions and names quickly become obsolete. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28767 - in nixpkgs/trunk/pkgs: development/misc/avr-gcc-with-avr-libc top-level
Author: raskin
Date: Tue Aug 23 07:56:34 2011
New Revision: 28767
URL: https://svn.nixos.org/websvn/nix/?rev=28767sc=1
Log:
Updating avr-gcc and avr-libc (old link is inaccessible)
Added:
nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/avr-libc-fix-gcc-4.6.0.patch
Modified:
nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added:
nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/avr-libc-fix-gcc-4.6.0.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/avr-libc-fix-gcc-4.6.0.patch
Tue Aug 23 07:56:34 2011(r28767)
@@ -0,0 +1,29 @@
+# Patch from Gentoo
+
+diff -ur 1/include/avr/pgmspace.h 2/include/avr/pgmspace.h
+--- 1/include/avr/pgmspace.h 2011-05-31 18:19:44.524000823 +0200
2/include/avr/pgmspace.h 2011-05-31 18:20:27.576000824 +0200
+@@ -252,7 +252,7 @@
+ # define PSTR(s) ((const PROGMEM char *)(s))
+ #else /* !DOXYGEN */
+ /* The real thing. */
+-# define PSTR(s) (__extension__({static char __c[] PROGMEM = (s); __c[0];}))
++# define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s);
__c[0];}))
+ #endif /* DOXYGEN */
+
+ #define __LPM_classic__(addr) \
+diff -ur 1/libc/stdlib/dtostre.c 2/libc/stdlib/dtostre.c
+--- 1/libc/stdlib/dtostre.c2011-05-31 18:19:44.639000823 +0200
2/libc/stdlib/dtostre.c2011-05-31 18:20:27.639000824 +0200
+@@ -37,9 +37,9 @@
+ char *
+ dtostre (double val, char *sbeg, unsigned char prec, unsigned char flags)
+ {
+-__attribute__((progmem)) static char str_nan[2][4] =
++__attribute__((progmem)) static const char str_nan[2][4] =
+ {nan, NAN};
+-__attribute__((progmem)) static char str_inf[2][sizeof(str_nan[0])] =
++__attribute__((progmem)) static const char str_inf[2][sizeof(str_nan[0])]
=
+ {inf, INF};
+ char *d; /* dst */
+ char *s; /* src */
Modified: nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
==
--- nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
Tue Aug 23 03:23:34 2011(r28766)
+++ nixpkgs/trunk/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
Tue Aug 23 07:56:34 2011(r28767)
@@ -1,21 +1,23 @@
-{ stdenv, fetchurl, writeTextFile, coreutils, gnumake, gcc, gnutar, bzip2,
gnugrep, gnused, gawk }:
+{ stdenv, fetchurl, writeTextFile, coreutils, gnumake, gcc, gnutar, bzip2
+ , gnugrep, gnused, gawk, diffutils, patch
+ , gmp, mpfr, mpc }:
stdenv.mkDerivation {
name = avr-gcc-libc;
srcBinutils = fetchurl {
-url = ftp://ftp.gnu.org/gnu/binutils/binutils-2.17.tar.bz2;
-sha256 = 0pm20n2l9ddgdpgzk3zhnbb8nbyb4rb2kvcw21pkd6iwybk3rhz2;
+url = mirror://gnu/binutils/binutils-2.21.tar.bz2;
+sha256 = 1iyhc42zfa0j2gaxy4zvpk47sdqj4rqvib0mb8597ss8yidyrav0;
};
srcGCC = fetchurl {
-url = ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.2/gcc-core-4.1.2.tar.bz2;
-sha256 = 07binc1hqlr0g387zrg5sp57i12yzd5ja2lgjb83bbh0h3gwbsbv;
+url = mirror://gcc/releases/gcc-4.6.1/gcc-core-4.6.1.tar.bz2;
+sha256 =
0bbb8f754a31f29013f6e9ad4c755d92bb0f154a665c4b623e86ae7174d98e33;
};
srcAVRLibc = fetchurl {
-url =
http://www.very-clever.com/download/nongnu/avr-libc/avr-libc-1.4.5.tar.bz2;
-sha256 = 058iv3vs6syy01pfkd5894xap9zakjx8ki1bpjdnihn6vk6fr80l;
+url =
http://download.savannah.gnu.org/releases/avr-libc/avr-libc-1.7.1.tar.bz2;
+sha256 = 1b1s4cf787izlm3r094vvkzrzb3w3bg6bwiz2wz71cg7q07kzzn6;
};
phases = doAll;
@@ -24,7 +26,7 @@
builder = writeTextFile {
name = avrbinutilsgccavrlibc-builder-script;
text = ''
-
PATH=${coreutils}/bin:${gnumake}/bin:${gcc}/bin:${gnutar}/bin:${bzip2}/bin:${gnugrep}/bin:${gnused}/bin:${gawk}/bin
+
PATH=${coreutils}/bin:${gnumake}/bin:${gcc}/bin:${gnutar}/bin:${bzip2}/bin:${gnugrep}/bin:${gnused}/bin:${gawk}/bin:${diffutils}/bin:${patch}/bin
# that's all a bit too hacky...!
for i in `cat ${gcc}/nix-support/propagated-user-env-packages`; do
echo adding $i
@@ -33,6 +35,11 @@
mkdir -p $out
export env-vars
+for i in ${gmp} ${mpfr} ${mpc}; do
+ export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE -I$i/include
+ export NIX_LDFLAGS=$NIX_LDFLAGS -L$i/lib
+done
+
# important, without this gcc won't find the binutils executables
PATH=$PATH:$out/bin
@@ -51,13 +58,14 @@
cd gcc-*
mkdir obj-avr
cd obj-avr
- ../configure --target=avr --prefix=$prefix --disable-nls
--enable-languages=c --disable-libssp
+ ../configure --target=avr --prefix=$prefix --disable-nls
--enable-languages=c --disable-libssp --with-dwarf2
make $MAKE_FLAGS
make install
cd $TMP
tar jxf $srcAVRLibc
[Nix-commits] SVN commit: nix - r28787 - nixpkgs/trunk/pkgs/tools/X11/xmacro
Author: raskin
Date: Tue Aug 23 17:52:05 2011
New Revision: 28787
URL: https://svn.nixos.org/websvn/nix/?rev=28787sc=1
Log:
Fix xmacro build
Modified:
nixpkgs/trunk/pkgs/tools/X11/xmacro/default.nix
Modified: nixpkgs/trunk/pkgs/tools/X11/xmacro/default.nix
==
--- nixpkgs/trunk/pkgs/tools/X11/xmacro/default.nix Tue Aug 23 17:45:40
2011(r28786)
+++ nixpkgs/trunk/pkgs/tools/X11/xmacro/default.nix Tue Aug 23 17:52:05
2011(r28787)
@@ -8,7 +8,12 @@
md5 = d2956b82f3d5380e58a75ccc721fb746;
};
- preBuild = sed -e 's/-pedantic//g' -i Makefile ;
+ preBuild = ''
+sed -e 's/-pedantic//g' -i Makefile
+sed -e 's/iostream[.]h/iostream/' -i *.cpp
+sed -e 's/iomanip[.]h/iomanip/' -i *.cpp
+sed -e '1iusing namespace std;' -i *.cpp
+ '';
preInstall = echo -e 'install:\nmkdir \${out}/bin;\ncp xmacrorec
xmacrorec2 xmacroplay \${out}/bin;' Makefile; ;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28755 - in configurations/trunk/misc/raskin: . lesser-expressions
Author: raskin
Date: Mon Aug 22 17:38:54 2011
New Revision: 28755
URL: https://svn.nixos.org/websvn/nix/?rev=28755sc=1
Log:
updates - moslty to package set
Modified:
configurations/trunk/misc/raskin/filesystems-asus-n53j.nix
configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/raskin-asus-n53j.nix
configurations/trunk/misc/raskin/services-main.nix
Modified: configurations/trunk/misc/raskin/filesystems-asus-n53j.nix
==
--- configurations/trunk/misc/raskin/filesystems-asus-n53j.nix Mon Aug 22
17:38:53 2011(r28754)
+++ configurations/trunk/misc/raskin/filesystems-asus-n53j.nix Mon Aug 22
17:38:54 2011(r28755)
@@ -64,10 +64,10 @@
device=debugfs;
fsType = debugfs;
}
-{ mountPoint = /dev/cgroup/cpu;
+{ mountPoint = /dev/cgroup/;
device = cgroup;
fsType = cgroup;
- options = cpu;
+ options = cpu,ns,cpuset,freezer,devices;
autocreate = true;
}
]
Modified: configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
==
--- configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Mon Aug
22 17:38:53 2011(r28754)
+++ configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Mon Aug
22 17:38:54 2011(r28755)
@@ -25,7 +25,6 @@
{name=xkill; path=xorg.xkill;}
{name=vim; path=customVim pkgs;}
{name=uzbl; path=uzbl.passthru.function { src = ( +
/var/repos/uzbl + /); };}
- {name=kdebindings; path=kde4.kdebindings;}
{name=ant+jdk-1.5; path=symlinkJoin ant+jdk-1.5 [jdk5
(apacheAnt.override {jdk=jdk5;})];}
] ++ (map justUse [mesa freeglut cairo nss gsl
libev libuuid pyxml libxml2 zlib rubygems
@@ -39,6 +38,7 @@
dejavu_fonts e2fsprogs dmtx qt4
#empathy
hicolor_icon_theme libfixposix plan9port
+ pygtk pygobject pycairo
])
++
[
Modified: configurations/trunk/misc/raskin/package-groups.nix
==
--- configurations/trunk/misc/raskin/package-groups.nix Mon Aug 22 17:38:53
2011(r28754)
+++ configurations/trunk/misc/raskin/package-groups.nix Mon Aug 22 17:38:54
2011(r28755)
@@ -38,11 +38,11 @@
xsane saneBackends saneFrontends gphoto2 gphoto2fs
- gpm setserial gnokii
+ gpm setserial gnokii v4l_utils
fbterm dd_rescue ddrescue baseKernel.kernelPackages.kernel
- blueman bluez
+ blueman bluez acpi acpitool
hplip foo2zjs foomatic_filters
@@ -81,7 +81,7 @@
sshfsFuse fuse fusesmb ntfs3g
glusterfs smbnetfs
- # (pkgs.linuxPackagesFor baseKernel).aufs2_util
+ #(pkgs.linuxPackagesFor baseKernel).aufs2_1_util
];
networkTools
@@ -89,15 +89,15 @@
iputils ncat wpa_supplicant iproute lftp
iptables samba wget telnet nmap ntp nc6
socat2pre msf dhcp gvpe bridge_utils mtr
- ndisc6 vlan wavemon openvpn iperf
+ ndisc6 vlan wavemon openvpn iperf vde2
];
browsers = [
opera chromeWrapper
- #firefox36Wrapper
- mozplugger firefox40Pkgs.xulrunner
- (wrapFirefox firefox40Pkgs.firefox firefox 4)
- (wrapFirefox firefox50Pkgs.firefox firefox )
+ mozplugger
+
+ (wrapFirefox firefox50Pkgs.firefox firefox 5)
+ (wrapFirefox firefox70b1Pkgs.firefox firefox )
];
graphicEdit = [
@@ -193,7 +193,7 @@
gst_all.gstPluginsBase
gst_all.gstPluginsGood
gst_all.gstFfmpeg
- xineUI espeak lame
+ xineUI espeak lame flite
];
buildSupport = [
@@ -232,12 +232,12 @@
# gdmap - disk usage and its accumulation through
# directory tree
- gdmap xfig gnuplot /*freemind*/ transfig xxdiff
- gqview pqiv webkit dia midori /*xawtv*/
+ gdmap xfig gnuplot freemind transfig xxdiff
+ gqview pqiv webkit dia midori
gnome.zenity xclip welkin
/*netsurfBrowser*/ geeqie
gosmore tulip merkaartor
- pp.uzbl sonicVisualiser
+ pp.uzbl /*sonic_visualiser*/
];
clientServer = [
@@ -269,7 +269,7 @@
inetutils netkittftp nodejs
/*(ikiwiki.override { extraUtils = [
[Nix-commits] SVN commit: nix - r28766 - nixpkgs/trunk/pkgs/development/tools/misc/avrdude
Author: raskin
Date: Tue Aug 23 03:23:34 2011
New Revision: 28766
URL: https://svn.nixos.org/websvn/nix/?rev=28766sc=1
Log:
Updating avrdude
Modified:
nixpkgs/trunk/pkgs/development/tools/misc/avrdude/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/misc/avrdude/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/avrdude/default.nix Tue Aug
23 02:34:21 2011(r28765)
+++ nixpkgs/trunk/pkgs/development/tools/misc/avrdude/default.nix Tue Aug
23 03:23:34 2011(r28766)
@@ -2,12 +2,12 @@
let edf = composableDerivation.edf; in
-composableDerivation.composableDerivation {} {
- name=avrdude-5.4;
+composableDerivation.composableDerivation {} rec {
+ name=avrdude-5.10;
src = fetchurl {
-url = http://mirror.switch.ch/mirror/gentoo/distfiles/avrdude-5.4.tar.gz;
-sha256 =
bee4148c51ec95999d803cb9f68f12ac2e9128b06f07afe307d38966c0833b30;
+url = http://download.savannah.gnu.org/releases/avrdude/${name}.tar.gz;;
+sha256 = 0pmy73777x8p7f2aj2w2q1dnk1bvhd1cm7hcs1s9hsdqsmiinl41;
};
configureFlags = [ --disable-dependency-tracking ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28719 - nixpkgs/trunk/pkgs/applications/misc/evince
Author: raskin
Date: Sun Aug 21 10:29:01 2011
New Revision: 28719
URL: https://svn.nixos.org/websvn/nix/?rev=28719sc=1
Log:
Fix typo
Modified:
nixpkgs/trunk/pkgs/applications/misc/evince/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/evince/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/evince/default.nix Sun Aug 21
08:41:22 2011(r28718)
+++ nixpkgs/trunk/pkgs/applications/misc/evince/default.nix Sun Aug 21
10:29:01 2011(r28719)
@@ -40,7 +40,7 @@
# Tell Glib/GIO about the MIME info directory, which is used
# by `g_file_info_get_content_type ()'.
wrapProgram $out/bin/evince \
- --prefix XDG_DATA_DIRS ${shared_mime_info}/share:$out/share
+ --prefix XDG_DATA_DIRS : ${shared_mime_info}/share:$out/share
'';
meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] What about introducing security.packages?
cag1v4pdmutrs3kkovujrs8ntkvye6ky9q2wszvyoebw9tbb...@mail.gmail.com)
Mime-Version: 1.0
Content-type: text/plain; charset=UTF-8
Another solution would be having a black/white list. If a package should
be added to DBUS but is contained in neither list tell the user to do
so. This way users have a choice but won't miss to make the decision.
Eg:
systemPackages = [ pkgProvidingDbusConfig pkg2ProvidingDbusConfig
pkg3ProvidingDbusConfig ];
dbus.whitelist= [pkgProvidingDbusConfig];
dbus.blacklist= [pkg2ProvidingDbusConfig];
Now nixos-rebuild will fail because pkg3ProvidingDbusConfig is not
contained in either list.
This is yet another take on it which would satisfy security to some
extend and make things work because users won't forget to whitelist some
packages. Thinking about it I'd prefer this one. Eg we could add
additional info then:
meta / passthru = {
providesDbusConfig = {
why = Without this XY won't work - however security risk might be
...;
}
}
Is complexity a bigger issue than the value this solution provides?
Don't know. It would minimize questions and debugging. That's why its
my favorite. The only downside is that users have to make a choice which
also is a feature.
The real downside is that one can end up having _multiple_ large
white/blacklists.
My system-path derivation lists more than 600 paths... I like this way
of managing package installation; your proposal would make it somewhat
harder...
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Re: What about introducing security.packages?
j2ol9i$hp6$1...@dough.gmane.org) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 * No more broken wrappers in /var/setuid-wrappers. E.g., I have no wodim in systemPackages but I have /var/setuid- wrappers/wodim. * If someone changes a package in nixpkgs so that the location of a binary is changes, he sees that he should change 'suid request' accordingly. Yes, this would be great. It could be done by creating a file $out/nix-support/setuid-binaries specifying a list of packages that need to be setuid/setgid whatever. Is there any rational reason for it not being a Nix-expression attribute? Say, passthru.securityWrappers = .. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28651 - nixpkgs/trunk/pkgs/applications/misc/evince
Author: raskin
Date: Thu Aug 18 09:07:31 2011
New Revision: 28651
URL: https://svn.nixos.org/websvn/nix/?rev=28651sc=1
Log:
fix evince
Modified:
nixpkgs/trunk/pkgs/applications/misc/evince/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/evince/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/evince/default.nix Wed Aug 17
22:48:14 2011(r28650)
+++ nixpkgs/trunk/pkgs/applications/misc/evince/default.nix Thu Aug 18
09:07:31 2011(r28651)
@@ -40,7 +40,7 @@
# Tell Glib/GIO about the MIME info directory, which is used
# by `g_file_info_get_content_type ()'.
wrapProgram $out/bin/evince \
- --set XDG_DATA_DIRS ${shared_mime_info}/share
+ --set XDG_DATA_DIRS ${shared_mime_info}/share:$out/share
'';
meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28662 - nixpkgs/trunk/pkgs/applications/misc/evince
Author: raskin
Date: Thu Aug 18 13:05:24 2011
New Revision: 28662
URL: https://svn.nixos.org/websvn/nix/?rev=28662sc=1
Log:
OK, OK, --prefix for evince
Modified:
nixpkgs/trunk/pkgs/applications/misc/evince/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/evince/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/evince/default.nix Thu Aug 18
13:05:03 2011(r28661)
+++ nixpkgs/trunk/pkgs/applications/misc/evince/default.nix Thu Aug 18
13:05:24 2011(r28662)
@@ -40,7 +40,7 @@
# Tell Glib/GIO about the MIME info directory, which is used
# by `g_file_info_get_content_type ()'.
wrapProgram $out/bin/evince \
- --set XDG_DATA_DIRS ${shared_mime_info}/share:$out/share
+ --prefix XDG_DATA_DIRS ${shared_mime_info}/share:$out/share
'';
meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28665 - nixpkgs/trunk/pkgs/tools/system/lxc
Author: raskin
Date: Thu Aug 18 15:01:53 2011
New Revision: 28665
URL: https://svn.nixos.org/websvn/nix/?rev=28665sc=1
Log:
Update Linux Containers userspace tools
Modified:
nixpkgs/trunk/pkgs/tools/system/lxc/default.nix
Modified: nixpkgs/trunk/pkgs/tools/system/lxc/default.nix
==
--- nixpkgs/trunk/pkgs/tools/system/lxc/default.nix Thu Aug 18 13:14:22
2011(r28664)
+++ nixpkgs/trunk/pkgs/tools/system/lxc/default.nix Thu Aug 18 15:01:53
2011(r28665)
@@ -1,11 +1,11 @@
{stdenv, fetchurl, libcap}:
stdenv.mkDerivation rec{
- name = lxc-0.7.4;
+ name = lxc-0.7.5;
src = fetchurl {
-url = mirror://sourceforge/lxc/${name}.tar.gz;
-sha256 =
a8237b2a42a05266a39aa9f9d64d7aa6f12b197cf1982d7764a0b0f9b940eef6;
+url = http://lxc.sf.net/download/lxc/${name}.tar.gz;;
+sha256 =
019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c;
};
patchPhase = ''
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28666 - nixpkgs/trunk/pkgs/os-specific/linux/kernel
Author: raskin
Date: Thu Aug 18 16:10:50 2011
New Revision: 28666
URL: https://svn.nixos.org/websvn/nix/?rev=28666sc=1
Log:
Enable options useful for lxc - linux containers. Changing only 3.0/3.1
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix Thu Aug 18
15:01:53 2011(r28665)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix Thu Aug 18
16:10:50 2011(r28666)
@@ -184,6 +184,13 @@
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
+ # Linux Containers
+ RT_GROUP_SCHED? y
+ CGROUP_DEVICE? y
+ CGROUP_MEM_RES_CTLR? y
+ CGROUP_MEM_RES_CTLR_SWAP? y
+ DEVPTS_MULTIPLE_INSTANCES? y
+
${if kernelPlatform ? kernelExtraConfig then
kernelPlatform.kernelExtraConfig else }
${extraConfig}
'';
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix Thu Aug 18
15:01:53 2011(r28665)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix Thu Aug 18
16:10:50 2011(r28666)
@@ -184,6 +184,13 @@
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
+ # Linux Containers
+ RT_GROUP_SCHED? y
+ CGROUP_DEVICE? y
+ CGROUP_MEM_RES_CTLR? y
+ CGROUP_MEM_RES_CTLR_SWAP? y
+ DEVPTS_MULTIPLE_INSTANCES? y
+
${if kernelPlatform ? kernelExtraConfig then
kernelPlatform.kernelExtraConfig else }
${extraConfig}
'';
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28667 - nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng
Author: raskin
Date: Thu Aug 18 19:35:24 2011
New Revision: 28667
URL: https://svn.nixos.org/websvn/nix/?rev=28667sc=1
Log:
Update util-linux-ng
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/default.nix Thu Aug
18 16:10:50 2011(r28666)
+++ nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/default.nix Thu Aug
18 19:35:24 2011(r28667)
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, ncurses ? null, perl ? null }:
stdenv.mkDerivation rec {
- name = util-linux-ng-2.18;
+ version = 2.19.1;
+ name = util-linux-ng-2.19.1;
src = fetchurl {
-url = mirror://kernel/linux/utils/util-linux-ng/v2.18/${name}.tar.bz2;
-sha256 = 1k1in1ba9kvh0kplri9765wh0yk68qrkk1a55dqsm21qfryc1idq;
+url =
mirror://kernel/linux/utils/util-linux-ng/v2.19/util-linux-${version}.tar.bz2;
+sha256 =
d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d;
};
# !!! It would be better to obtain the path to the mount helpers
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28668 - nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng
Author: raskin
Date: Thu Aug 18 19:50:18 2011
New Revision: 28668
URL: https://svn.nixos.org/websvn/nix/?rev=28668sc=1
Log:
Reverting update: strange things refuse to build with new util-linux
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/default.nix Thu Aug
18 19:35:24 2011(r28667)
+++ nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/default.nix Thu Aug
18 19:50:18 2011(r28668)
@@ -1,12 +1,11 @@
{ stdenv, fetchurl, ncurses ? null, perl ? null }:
stdenv.mkDerivation rec {
- version = 2.19.1;
- name = util-linux-ng-2.19.1;
+ name = util-linux-ng-2.18;
src = fetchurl {
-url =
mirror://kernel/linux/utils/util-linux-ng/v2.19/util-linux-${version}.tar.bz2;
-sha256 =
d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d;
+url = mirror://kernel/linux/utils/util-linux-ng/v2.18/${name}.tar.bz2;
+sha256 = 1k1in1ba9kvh0kplri9765wh0yk68qrkk1a55dqsm21qfryc1idq;
};
# !!! It would be better to obtain the path to the mount helpers
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Patching uname in stdenv?
Hi all, What would people think of a patch that made stdenv's uname return the same value on every linux? I've only just had the idea and haven't had time to think through the possible downsides, but my initial thought is that most packages shouldn't need to know the kernel version, and that those that have a reason to (e.g. packages that provide kernel modules) should be dependent on the kernel passed to the nix expression, rather than whatever the kernel happens to be in memory at a given time. Or am I wrong? Is there a reason a build should depend on which version of the I guess default uname should say version of kernel from kernelheaders used for glibc, and kernelPackages one should say the kernel version of the passed kernel? ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Patching uname in stdenv?
I assume you're referring to the kernel version returned by ‘uname -r’. Since ‘uname’ is also used outside of builders, this is not a good idea — it would change the behaviour that users expect from it. We already have distinct bash in stdenv and user's environment. How so? As I remember, stdenv bash has no ncurses. And user environment usually gets bashInteractive Anyway, this would be breaking a feature of uname, namely that ‘uname -r’ returns the kernel version. Users would find it very surprising if they're running a X.Y kernel and uname returns something different than X.Y. Of course, stdenv will have unameFakeVersions and simle uname will work as expected. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[***SPAM***] Re: [Nix-dev] Patching uname in stdenv?
Anyway, this would be breaking a feature of uname, namely that ‘uname -r’ returns the kernel version. Users would find it very surprising if they're running a X.Y kernel and uname returns something different than X.Y. Actually, maybe it is not worth the effort to have two unames - my point is only that it has benefits and the only obvious drawback is time to implement (so I wonder whether there are other) ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[***SPAM***] Re: [Nix-dev] Patching uname in stdenv?
16b0358b83ffeaf7d2876f231de4e64d.squir...@webmail.shealevy.com e1qtbry-0003pi-00.7c6f434c-mail...@smtp8.mail.ru) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 I guess default uname should say version of kernel from kernelheaders used for glibc, and kernelPackages one should say the kernel version of the passed kernel? I'd like a list of the problems this would solve. General idea is to forcibly remove one more impurity. FF6.0 release manages to trigger it. Is this impurity affecting the behaviour of FF6.0? If it is, I think they are doing something wrong. If they care about the API, they should check the kernel headers version.h, and not uname. They do something wrong, they admit it, but this wrong is in their 6.0 release tarball. They have a fix, maybe it will be in 6.0.1 - I have no idea. But Nix has a few tricks to stop builders from doing obviously wrong things. Or is it simply storing what kernel was it running at build time, and you care on getting always the same 'hash' on the result directory? Not really. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Nix on ubuntu 11.04
maggesi@bantu:~$ nix-env -i fossil installing `fossil-1.18' error: unable to fork: Cannot allocate memory maggesi@bantu:~$ ulimit -a output may help also, free -m I tried nix version 0.16, first with the deb package then I compiled the sources myself. I would like to try the svn trunk version of nix but I get the following compile error during the installation: make[3]: Entering directory `/home/maggesi/nix/src/libexpr' false -v -o parser-tab.cc ./parser.y -d make[3]: *** [parser-tab.hh] Error 1 You need to have flex and bison installed for parser regeneration Do you have them? Also the link http://hydra.nixos.org/view/nix/trunk/latest which is referenced from http://nixos.org/nix/download.html gives 404 page not found :( I guess current version is http://hydra.nixos.org/jobset/nix/trunk/channel/latest Is this correct? I do not think I can update Nix homepage.. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Patching uname in stdenv?
On 08/17/2011 06:20 AM, Lluís Batlle i Rossell wrote: On Wed, Aug 17, 2011 at 12:59:22PM +0400, Michael Raskin wrote: e1qtafh-0003g2-00.7c6f434c-mail...@smtp4.mail.ru) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 What would people think of a patch that made stdenv's uname return the same value on every linux? I've only just had the idea and haven't had time to think through the possible downsides, but my initial thought is that most packages shouldn't need to know the kernel version, and that those that have a reason to (e.g. packages that provide kernel modules) should be dependent on the kernel passed to the nix expression, rather than whatever the kernel happens to be in memory at a given time. Or am I wrong? Is there a reason a build should depend on which version of the I guess default uname should say version of kernel from kernelheaders used for glibc, and kernelPackages one should say the kernel version of the passed kernel? I'd like a list of the problems this would solve. General idea is to forcibly remove one more impurity. FF6.0 release manages to trigger it. Is this impurity affecting the behaviour of FF6.0? If it is, I think they are doing something wrong. If they care about the API, they should check the kernel headers version.h, and not uname. Or is it simply storing what kernel was it running at build time, and you care on getting always the same 'hash' on the result directory? In the FF6.0 case, the build actually fails. While I'd like to get the same hash on the result directory every time (I've been thinking of starting a stdenv-pure branch to root out as many impurities as possible), there are definitely noticeable changes in some packages beyond just a hash. Technically, it fails even without it. But in a significantly different way. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Patching uname in stdenv?
On 08/17/2011 03:16 AM, Michael Raskin wrote: Hi all, What would people think of a patch that made stdenv's uname return the same value on every linux? I've only just had the idea and haven't had time to think through the possible downsides, but my initial thought is that most packages shouldn't need to know the kernel version, and that those that have a reason to (e.g. packages that provide kernel modules) should be dependent on the kernel passed to the nix expression, rather than whatever the kernel happens to be in memory at a given time. Or am I wrong? Is there a reason a build should depend on which version of the I guess default uname should say version of kernel from kernelheaders used for glibc, and kernelPackages one should say the kernel version of the passed kernel? Default being the version of kernelheaders seems like the way to do it. Not sure how stdenv is supposed to find out which version of the kernel was passed for kernelPackages, though. # nix-instantiate --eval-only /etc/nixos/nixpkgs/ -A linuxPackages.kernel.version 2.6.32.44 kernelHeaders currently do not put version in an attribute, but put it in a file. This can be changed easily. kernelPackages could replace uname with its own one - dependent on kernel.version. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Toward a Purer stdenv
I've been thinking about creating a nixpkgs branch to find and eliminate some of the remaining impurities in the Linux stdenv. Before I get started, I wanted to poll the list with a few questions that will shape how I go about things. 1. What impurities does the current stdenv have? I can think of three off of the top of my head: timestamps in files, kernel version (e.g. via uname), and /bin/sh. Obviously, we should only care about builds with all paranoid options (like chroot) on. I am not sure that on non-NixOS systems we don't get entire /bin/ in chroot... Fortunately, most of things fail because of missing /lib/. Something that checks existence of /bin/rm still can fail. Processor having or not having some features (think MPlayer MMX hand-optimized loops in assembler language) - no idea if it is possible to fight that. We have _deliberate_ optional impurity about parallelBuilds. You didn't notice it because it is a secret feature with double opt-in (you need to enable it on command line, and then for individual packages). If something tries to do a networking test, it can be in for a lot of fun - for example, a random port can be occupied or not on host. This seems to require something on the level of lxc to prevent. CLisp has network module tests by default. We pass /dev/ inside chroot as-is. There are many readable sources of disaster there. I am not sure foozjs doesn't have a mode where it tries to detect your printer during installation. Of course, resource exhaustion is another set of questions... 2. What kind of testing should I set up to see that my changes actually remove impurities? For most of impurities it is trivial to implement special builder It could get the information you want to be inaccessible and write it to output. 3. When might it be desirable to have impurities? I can think of three cases: When knowledge of the performance of the system could potentially speed up a build (e.g. knowing how many cores the CPU has for parallel building), when knowledge of the performance of the system is necessary for a test (e.g. checking that running a certain tool completes its task in the right amount of time), and when a build would otherwise fail. My current view is that the first two cases are OK as long as the impurities (preferably provably) don't affect the output (think unsafePerformIO), and that the for the third case we should attempt to fix the build system in question if possible and should explicitly include whatever system information is being accessed as a dependency if not. Ideally our build system would give us ways to purposely allow impurities when they are of the first two types, such as the enableParallelBuilding variable the generic builder currently recognizes. In the really really ideal world I would like first kind of impurity to be fully manageable from Nix command line and the second kind to be split off in a separate -tests package with fixed output (namely: empty). Fixed-output impurities are OK, I guess. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28649 - nixpkgs/trunk/pkgs/servers/http/redstore
Author: raskin
Date: Wed Aug 17 22:22:06 2011
New Revision: 28649
URL: https://svn.nixos.org/websvn/nix/?rev=28649sc=1
Log:
Update Redstore
Modified:
nixpkgs/trunk/pkgs/servers/http/redstore/default.nix
Modified: nixpkgs/trunk/pkgs/servers/http/redstore/default.nix
==
--- nixpkgs/trunk/pkgs/servers/http/redstore/default.nixWed Aug 17
22:06:59 2011(r28648)
+++ nixpkgs/trunk/pkgs/servers/http/redstore/default.nixWed Aug 17
22:22:06 2011(r28649)
@@ -1,15 +1,21 @@
-{ stdenv, fetchurl, redland, pkgconfig, gmp, zlib }:
+{ stdenv, fetchurl, redland, pkgconfig, gmp, zlib, librdf_raptor2
+ , librdf_rasqal }:
stdenv.mkDerivation rec {
- name = redstore-0.4;
+ name = redstore-0.5.2;
src = fetchurl {
-url = http://redstore.googlecode.com/files/${name}.tar.gz;;
-sha256 = 1fs54v0d0kkqaz9ajacabb8wifrglvg6kkhd5b0mxmnng352wpp7;
+url = http://www.aelius.com/njh/redstore/${name}.tar.gz;;
+sha256 =
fdbe499a7bbe8c8a756ecb738b83ea375e96af16a1d74245b75600d4d40adb7d;
};
- buildInputs = [ gmp pkgconfig redland zlib ];
-
+ buildInputs = [ gmp pkgconfig redland zlib librdf_raptor2 librdf_rasqal ];
+
+ preConfigure = ''
+export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE
-I${librdf_raptor2}/include/raptor2
+export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE
-I${librdf_rasqal}/include/rasqal
+ '';
+
meta = {
description = An HTTP interface to Redland RDF store;
maintainers = [ stdenv.lib.maintainers.raskin ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Disable build-use-chroot on command line
I have some odd hacks that do not work when the setting `build-use-chroot' is true. Is it possible to disable this setting with a command line switch on the nix-build invocation? Yes, nix-build --option build-use-chroot false. However this doesn't work when you're building through the Nix daemon. Ensuring you don't use Nix daemon is done from root as export NIX_REMOTE= By the way, isn't simply editing /etc/nix.conf build-chroot-dirs (non-NixOS) or nix.chrootDirs (NixOS) enough for your goals? ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28625 - in nixpkgs/trunk/pkgs: applications/networking/browsers/firefox top-level
Author: raskin
Date: Tue Aug 16 21:53:43 2011
New Revision: 28625
URL: https://svn.nixos.org/websvn/nix/?rev=28625sc=1
Log:
Adding Firefox 6.0. Mozilla says it is seamless upgrade from 5.0, so I am
trying not to change anything...
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix
- copied, changed from r28528,
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
nixpkgs/trunk/pkgs/top-level/release.nix
Copied and modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix (from
r28528, nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix)
==
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix Fri Aug
12 18:43:28 2011(r28528, copy source)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix Tue Aug
16 21:53:43 2011(r28625)
@@ -15,14 +15,14 @@
rec {
- firefoxVersion = 5.0.1;
+ firefoxVersion = 6.0;
- xulVersion = 5.0.1; # this attribute is used by other packages
+ xulVersion = 6.0; # this attribute is used by other packages
src = fetchurl {
url =
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2;;
-sha1 = c93b3513e160d87535a9d61c5e06a6a701e9cd3e;
+sha256 = 0ws96gc1mkmilgsikirhmqc6s7m0bcyh58820l08wd82r9abagyc;
};
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 16 21:32:48
2011(r28624)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 16 21:53:43
2011(r28625)
@@ -6474,6 +6474,13 @@
firefox50Wrapper = wrapFirefox firefox50Pkgs.firefox firefox ;
+ firefox60Pkgs = callPackage
../applications/networking/browsers/firefox/6.0.nix {
+inherit (gtkLibs) gtk pango;
+inherit (gnome) libIDL;
+ };
+
+ firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox firefox ;
+
flac = callPackage ../applications/audio/flac { };
flashplayer = flashplayer10;
Modified: nixpkgs/trunk/pkgs/top-level/release.nix
==
--- nixpkgs/trunk/pkgs/top-level/release.nixTue Aug 16 21:32:48 2011
(r28624)
+++ nixpkgs/trunk/pkgs/top-level/release.nixTue Aug 16 21:53:43 2011
(r28625)
@@ -387,6 +387,7 @@
firefox36Pkgs.firefox = linux;
firefox50Pkgs.firefox = linux;
+ firefox60Pkgs.firefox = linux;
gnome = {
gnome_panel = linux;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28529 - in nixpkgs/trunk/pkgs: os-specific/linux/v4l-utils top-level
Author: raskin
Date: Sat Aug 13 08:59:00 2011
New Revision: 28529
URL: https://svn.nixos.org/websvn/nix/?rev=28529sc=1
Log:
Adding v4l-utils
Added:
nixpkgs/trunk/pkgs/os-specific/linux/v4l-utils/
nixpkgs/trunk/pkgs/os-specific/linux/v4l-utils/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/os-specific/linux/v4l-utils/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/v4l-utils/default.nix Sat Aug 13
08:59:00 2011(r28529)
@@ -0,0 +1,50 @@
+x@{builderDefsPackage
+ , libv4l, libjpeg, qt4
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=v4l-utils;
+version=0.8.5;
+name=${baseName}-${version};
+url=http://www.linuxtv.org/downloads/v4l-utils/${name}.tar.bz2;;
+hash=0k2rkra8lyimj6bwm8khq6xrhjdy67d09blxa6brnj7kpa7q81f2;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doUnpack doMakeInstall];
+
+ makeFlags = [''PREFIX= DESTDIR=$out''];
+
+ meta = {
+description = Video-4-Linux utilities;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.gpl2;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://www.linuxtv.org/downloads/v4l-utils/;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 12 18:43:28
2011(r28528)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 13 08:59:00
2011(r28529)
@@ -5873,6 +5873,8 @@
inherit ncurses perl;
};
+ v4l_utils = callPackage ../os-specific/linux/v4l-utils {};
+
windows = rec {
w32api = callPackage ../os-specific/windows/w32api {
gccCross = gccCrossStageStatic;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28466 - in nixpkgs/trunk/pkgs: applications/misc/vifm top-level
Author: raskin
Date: Wed Aug 10 19:16:27 2011
New Revision: 28466
URL: https://svn.nixos.org/websvn/nix/?rev=28466sc=1
Log:
Adding vifm file manager
Added:
nixpkgs/trunk/pkgs/applications/misc/vifm/
nixpkgs/trunk/pkgs/applications/misc/vifm/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/applications/misc/vifm/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/misc/vifm/default.nix Wed Aug 10
19:16:27 2011(r28466)
@@ -0,0 +1,48 @@
+x@{builderDefsPackage
+ , ncurses
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=vifm;
+version=0.6.3;
+name=${baseName}-${version};
+url=mirror://sourceforge/project/${baseName}/${baseName}/${name}.tar.bz2;
+hash=1v5kiifjk7iyqrzjd94wn6a5dz4j3krl06pbp1ps9g3zdq2w2skv;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doConfigure doMakeInstall];
+
+ meta = {
+description = A vi-like file manager;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.gpl2;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://vifm.sf.net;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 10 16:59:40
2011(r28465)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 10 19:16:27
2011(r28466)
@@ -1395,6 +1395,8 @@
vfdecrypt = callPackage ../tools/misc/vfdecrypt { };
+ vifm = callPackage ../applications/misc/vifm {};
+
viking = callPackage ../applications/misc/viking { };
vncrec = builderDefsPackage ../tools/video/vncrec {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28169 - in nixpkgs/trunk/pkgs: development/libraries/opencv top-level
Author: raskin
Date: Fri Aug 5 16:13:20 2011
New Revision: 28169
URL: https://svn.nixos.org/websvn/nix/?rev=28169sc=1
Log:
Fixing libdecodeqr build by using previous OpenCV
Added:
nixpkgs/trunk/pkgs/development/libraries/opencv/2.1.nix
- copied, changed from r28157,
nixpkgs/trunk/pkgs/development/libraries/opencv/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/development/libraries/opencv/2.1.nix
(from r28157, nixpkgs/trunk/pkgs/development/libraries/opencv/default.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/opencv/default.nix Thu Aug 4
16:01:50 2011(r28157, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/opencv/2.1.nix Fri Aug 5
16:13:20 2011(r28169)
@@ -2,11 +2,11 @@
xineLib, gstreamer }:
stdenv.mkDerivation rec {
- name = opencv-2.3.0;
+ name = opencv-2.1.0;
src = fetchurl {
-url = mirror://sourceforge/opencvlibrary/OpenCV-2.3.0.tar.bz2;
-sha256 = 02wl56a87if84brrhd4wq59linyhbxx30ykh4cjwzw37yw7zzgxw;
+url = mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2;
+sha256 =
26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f;
};
buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
@@ -14,6 +14,10 @@
enableParallelBuilding = true;
+ preConfigure = ''
+export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS
+ '';
+
meta = {
description = Open Computer Vision Library with more than 500 algorithms;
homepage = http://opencv.willowgarage.com/;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 5 14:02:57
2011(r28168)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 5 16:13:20
2011(r28169)
@@ -4117,6 +4117,11 @@
inherit (gst_all) gstreamer;
};
+ opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
+ffmpeg = ffmpeg_0_6_90;
+inherit (gst_all) gstreamer;
+ };
+
# this ctl version is needed by openexr_viewers
openexr_ctl = callPackage ../development/libraries/openexr_ctl { };
@@ -6509,7 +6514,8 @@
};
qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
-inherit libpng opencv;
+inherit libpng;
+opencv = opencv_2_1;
};
qrencode = builderDefsPackage (import ../tools/graphics/qrencode) {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28171 - nixpkgs/trunk/pkgs/applications/misc/evince
Author: raskin
Date: Fri Aug 5 17:45:49 2011
New Revision: 28171
URL: https://svn.nixos.org/websvn/nix/?rev=28171sc=1
Log:
Update Evince - and make it build again
Modified:
nixpkgs/trunk/pkgs/applications/misc/evince/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/evince/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/evince/default.nix Fri Aug 5
17:03:14 2011(r28170)
+++ nixpkgs/trunk/pkgs/applications/misc/evince/default.nix Fri Aug 5
17:45:49 2011(r28171)
@@ -3,16 +3,16 @@
, libgnome, libgnomeui, scrollkeeper, libxslt
, libglade, gnome_keyring, dbus, dbus_glib
, poppler, libspectre, djvulibre, shared_mime_info
-, makeWrapper, which
+, makeWrapper, which, ghostscript
, recentListSize ? null # 5 is not enough, allow passing a different number
}:
stdenv.mkDerivation rec {
- name = evince-2.26.0;
+ name = evince-2.32.0;
src = fetchurl {
-url = http://ftp.gnome.org/pub/GNOME/sources/evince/2.26/${name}.tar.bz2;;
-sha256 = 1wsl5vdrj0829wq223dryq5p7izgzsz6mfl4igix7b5wga42zff1;
+url = http://ftp.gnome.org/pub/GNOME/sources/evince/2.32/${name}.tar.bz2;;
+sha256 =
2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7;
};
buildInputs = [
@@ -21,10 +21,13 @@
scrollkeeper gnome_keyring
libxslt # for `xsltproc'
dbus dbus_glib poppler libspectre djvulibre makeWrapper which
+ghostscript
];
configureFlags = --with-libgnome --enable-dbus --enable-pixbuf
+# Do not use nautilus
++ --disable-nautilus
# Do not update Scrollkeeper's database (GNOME's help system).
+ --disable-scrollkeeper;
@@ -53,4 +56,4 @@
license = GPLv2+;
};
-}
\ No newline at end of file
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28180 - nixpkgs/trunk/pkgs/applications/science/logic/leo2
Author: raskin
Date: Fri Aug 5 18:22:40 2011
New Revision: 28180
URL: https://svn.nixos.org/websvn/nix/?rev=28180sc=1
Log:
Update LEO-II
Modified:
nixpkgs/trunk/pkgs/applications/science/logic/leo2/default.nix
Modified: nixpkgs/trunk/pkgs/applications/science/logic/leo2/default.nix
==
--- nixpkgs/trunk/pkgs/applications/science/logic/leo2/default.nix Fri Aug
5 18:02:20 2011(r28179)
+++ nixpkgs/trunk/pkgs/applications/science/logic/leo2/default.nix Fri Aug
5 18:22:40 2011(r28180)
@@ -11,10 +11,10 @@
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName=leo2;
-version=1.2.6;
+version=1.2.8;
name=${baseName}_v${version};
url=http://www.ags.uni-sb.de/~leo/${name}.tgz;;
-hash=0gjgcm6nb9kzdl0y72sgvf2w2q92s1ix70lh6wjz9lj2qdf7gi1z;
+hash=d46a94f5991623386eb9061cfb0d748e258359a8c690fded173d45303e0e9e3a;
};
in
rec {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28181 - configurations/trunk/misc/raskin
Author: raskin Date: Fri Aug 5 18:23:32 2011 New Revision: 28181 URL: https://svn.nixos.org/websvn/nix/?rev=28181sc=1 Log: Some package additions Modified: configurations/trunk/misc/raskin/package-groups.nix Modified: configurations/trunk/misc/raskin/package-groups.nix == --- configurations/trunk/misc/raskin/package-groups.nix Fri Aug 5 18:22:40 2011(r28180) +++ configurations/trunk/misc/raskin/package-groups.nix Fri Aug 5 18:23:32 2011(r28181) @@ -25,7 +25,7 @@ gambit gcl jre jdk spidermonkey coq eprover isabelle leo2 cvc3 matita picolisp pure hol tptp - pythonPackages.setuptools + pythonPackages.setuptools satallax ]; nonNative = [ wine dosbox (hiPrio qemu_kvm) (lowPrio qemu)]; @@ -89,7 +89,7 @@ iputils ncat wpa_supplicant iproute lftp iptables samba wget telnet nmap ntp nc6 socat2pre msf dhcp gvpe bridge_utils mtr - ndisc6 vlan wavemon + ndisc6 vlan wavemon openvpn iperf ]; browsers = [ @@ -182,7 +182,7 @@ fsTools = [ jfsutils jfsrec xfsprogs dosfstools nilfs_utils - udftools pp.btrfsProgs + udftools pp.btrfsProgs sleuthkit ]; sound @@ -193,7 +193,7 @@ gst_all.gstPluginsBase gst_all.gstPluginsGood gst_all.gstFfmpeg - xineUI espeak + xineUI espeak lame ]; buildSupport = [ @@ -225,7 +225,7 @@ x2vnc xneur_0_8 xorg.xdpyinfo glxinfo xnee xorg.xprop /*xmacro*/ vncrec xorg.xinput xlsfonts xfontsel xorg.xinput xdaliclock - xdotool + xdotool /*vnc2flv*/ ]; widgets = [ @@ -318,7 +318,7 @@ confuse libxdg_basedir freetype fontconfig dbus dbus_glib gnome28.glib_networking - perlXMLParser + perlXMLParser ffmpeg gmp mpfr cminpack flann boehmgc libffi pythonDBus libusb ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28152 - nixpkgs/trunk/pkgs/applications/science/math/maxima
Author: raskin
Date: Thu Aug 4 15:13:15 2011
New Revision: 28152
URL: https://svn.nixos.org/websvn/nix/?rev=28152sc=1
Log:
Updating Maxima
Modified:
nixpkgs/trunk/pkgs/applications/science/math/maxima/default.nix
Modified: nixpkgs/trunk/pkgs/applications/science/math/maxima/default.nix
==
--- nixpkgs/trunk/pkgs/applications/science/math/maxima/default.nix Thu Aug
4 14:02:52 2011(r28151)
+++ nixpkgs/trunk/pkgs/applications/science/math/maxima/default.nix Thu Aug
4 15:13:15 2011(r28152)
@@ -2,7 +2,7 @@
let
name= maxima;
- version = 5.24.0;
+ version = 5.25.0;
searchPath =
stdenv.lib.makeSearchPath bin
@@ -13,7 +13,7 @@
src = fetchurl {
url = mirror://sourceforge/${name}/${name}-${version}.tar.gz;
-sha256 = 137crv2f6hxwqrv75m8679vrlbnqgg5ww755cs4kihs1cy03bssq;
+sha256 =
49c90fb809f5027787600050503476193db3620fd9517f620b82ad492ba30c0a;
};
buildInputs = [sbcl texinfo perl makeWrapper];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28157 - nixpkgs/trunk/pkgs/applications/version-management/veracity
Author: raskin Date: Thu Aug 4 16:01:50 2011 New Revision: 28157 URL: https://svn.nixos.org/websvn/nix/?rev=28157sc=1 Log: Fix Veracity build Modified: nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix Modified: nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix == --- nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix Thu Aug 4 15:59:21 2011(r28156) +++ nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix Thu Aug 4 16:01:50 2011(r28157) @@ -65,6 +65,7 @@ prepareMakefiles = a.fullDepEntry '' sed -e 's@ /bin/uname @ uname @g' -i CMakeLists.txt +sed -e 's@ /bin/uname @ uname @g' -i common-CMakeLists.txt cd .. mkdir build cd build ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28158 - nixpkgs/trunk/pkgs/servers/http/redstore
Author: raskin
Date: Thu Aug 4 17:42:45 2011
New Revision: 28158
URL: https://svn.nixos.org/websvn/nix/?rev=28158sc=1
Log:
Fixing Redstore build
Modified:
nixpkgs/trunk/pkgs/servers/http/redstore/default.nix
Modified: nixpkgs/trunk/pkgs/servers/http/redstore/default.nix
==
--- nixpkgs/trunk/pkgs/servers/http/redstore/default.nixThu Aug 4
16:01:50 2011(r28157)
+++ nixpkgs/trunk/pkgs/servers/http/redstore/default.nixThu Aug 4
17:42:45 2011(r28158)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, redland, pkgconfig, gmp }:
+{ stdenv, fetchurl, redland, pkgconfig, gmp, zlib }:
stdenv.mkDerivation rec {
name = redstore-0.4;
@@ -8,7 +8,7 @@
sha256 = 1fs54v0d0kkqaz9ajacabb8wifrglvg6kkhd5b0mxmnng352wpp7;
};
- buildInputs = [ gmp pkgconfig redland ];
+ buildInputs = [ gmp pkgconfig redland zlib ];
meta = {
description = An HTTP interface to Redland RDF store;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28133 - in nixpkgs/trunk/pkgs: development/compilers/llvm top-level
Author: raskin
Date: Wed Aug 3 08:38:34 2011
New Revision: 28133
URL: https://svn.nixos.org/websvn/nix/?rev=28133sc=1
Log:
Missing files
Added:
nixpkgs/trunk/pkgs/development/compilers/llvm/clang-include-paths-svn.patch
nixpkgs/trunk/pkgs/development/compilers/llvm/svn-head.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added:
nixpkgs/trunk/pkgs/development/compilers/llvm/clang-include-paths-svn.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/compilers/llvm/clang-include-paths-svn.patch
Wed Aug 3 08:38:34 2011(r28133)
@@ -0,0 +1,40 @@
+diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp
b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
+--- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp2010-09-03
18:45:53.0 +0200
b/tools/clang/lib/Frontend/InitHeaderSearch.cpp2011-02-05
14:59:08.669573190 +0100
+@@ -480,6 +480,7 @@
+ AddPath(*i, System, false, false, false);
+ return;
+ }
+
++#if 0
+ switch (os) {
+ case llvm::Triple::Win32: {
+@@ -593,7 +593,9 @@
+ }
+
+ if ( os != llvm::Triple::RTEMS )
+ AddPath(/usr/include, System, false, false, false);
++#endif
++ AddPath(C_INCLUDE_PATH, System, false, false, false);
+ }
+
+ void InitHeaderSearch::
+@@ -550,6 +553,7 @@
+ triple);
+ return;
+ }
++#if 0
+ // FIXME: temporary hack: hard-coded paths.
+
+ if (triple.isOSDarwin()) {
+@@ -769,6 +773,10 @@
+ default:
+ break;
+ }
++#endif
++ AddGnuCPlusPlusIncludePaths(
++ CPP_INCLUDE_PATH,
++ CPP_HOST, , , triple);
+ }
+
+ void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions Lang,
Added: nixpkgs/trunk/pkgs/development/compilers/llvm/svn-head.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/compilers/llvm/svn-head.nix Wed Aug 3
08:38:34 2011(r28133)
@@ -0,0 +1,66 @@
+{ stdenv, fetchurl, gcc, flex, perl, libtool, groff, fetchsvn
+, buildClang ? false }:
+
+let rev = 134309; in
+stdenv.mkDerivation ({
+ name = llvm-r${rev};
+
+ src = fetchsvn {
+url= http://llvm.org/svn/llvm-project/llvm/trunk;;
+inherit rev;
+sha256 = 136qwpcl22r5bl9y4kk94vgbha1m58xrggy7qw19lg7jkgxxj8s6;
+ };
+
+ buildInputs = [ gcc flex perl groff ];
+
+ configureFlags = [ --enable-optimized --enable-shared --disable-static
];
+
+ meta = {
+homepage = http://llvm.org/;
+description = Collection of modular and reusable compiler and toolchain
technologies;
+license = BSD;
+maintainers = with stdenv.lib.maintainers; [viric];
+platforms = with stdenv.lib.platforms; all;
+ };
+}
+// stdenv.lib.optionalAttrs buildClang (
+ # I write the assert because 'gcc.libc' will be evaluated although 'triplet'
would not
+ # evaluate properly (in the preConfigure below)
+ assert stdenv.system == i686-linux || stdenv.system == x86_64-linux;
+ let
+triplet = if (stdenv.system == i686-linux) then i686-unknown-linux-gnu
+ else if (stdenv.system == x86_64-linux) then
x86_64-unknown-linux-gnu
+ else throw System not supported;
+ in rec {
+name = clang-r${rev};
+
+srcClang = fetchsvn {
+ url = http://llvm.org/svn/llvm-project/cfe/trunk;
+ inherit rev;
+ sha256 = 0afbrjakfw6zgsplxblgzr2kwjndlnr2lnqjnbj16ggam5fcnhlr;
+};
+
+prePatch = ''
+ cp -r ${srcClang} tools/clang
+ chmod u+rwX -R tools/clang
+'';
+
+patches = [ ./clang-include-paths-svn.patch ];
+
+# Set up the header file paths
+preConfigure = ''
+ sed -i -e 's,C_INCLUDE_PATH,${gcc.libc}/include/,' \
+-e 's,CPP_HOST,${triplet},' \
+-e 's,CPP_INCLUDE_PATH,${gcc.gcc}/include/c++/${gcc.gcc.version},' \
+tools/clang/lib/Frontend/InitHeaderSearch.cpp
+'';
+
+meta = {
+ homepage = http://clang.llvm.org/;
+ description = A C language family frontend for LLVM;
+ license = BSD;
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = with stdenv.lib.platforms; linux;
+};
+ }
+))
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 3 07:49:21
2011(r28132)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 3 08:38:34
2011(r28133)
@@ -2170,6 +2170,8 @@
};
llvm = callPackage ../development/compilers/llvm { };
+
+ # Works partially
llvmSVN = callPackage ../development/compilers/llvm/svn-head.nix { };
mitscheme = callPackage ../development/compilers/mit-scheme { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
[Nix-dev] Re: SVN commit: nix - r28129 - in nixpkgs/trunk/pkgs:development/libraries/afflib top-level
Hi Michael,
+ llvmSVN = callPackage ../development/compilers/llvm/svn-head.nix { };
the file svn-head.nix doesn't seem to exist?
Thanks a lot for reminding. Somehow, I didn't get complaints from Hydra, so
missed the fact that I committed partial change along with another one
Sorry, fixed
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Hydra notifications in case of evaluation errors (was:SVN commit: nix - r28129 - innixpkgs/trunk/pkgs:development/libraries/afflib top-level)
20110802194628.bf010108c...@mx3.tudelft.nl e1qowyg-0003q5-00.7c6f434c-mail...@smtp2.mail.ru) Mime-Version: 1.0 Content-type: text/plain; charset=UTF-8 Hydra didn't build anything: | Cannot evaluate the Nix expression containing the jobs: | error: getting status of `/nix/store/jn59f9yddq4lpp3jhmkhav4f0ia7q6zx-nixpkgs-r28132/pkgs/development/compilers/llvm/svn-head.nix': No such file or directory | (use `--show-trace' to show detailed location information) This behavior should probably be improved. If a commit breaks evaluation altogether, a notification should be send out, say, to this list? That would ensure that developers notice these kind of oversights quickly. It does send notices that nixpkgs tarball check failed This time it probably sent the notice when I was only looking through my Nix-related email as I was away, and then my commit broke evaluation even more. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r28125 - nixpkgs/trunk/pkgs/development/compilers/sbcl
Author: raskin
Date: Tue Aug 2 18:52:00 2011
New Revision: 28125
URL: https://svn.nixos.org/websvn/nix/?rev=28125sc=1
Log:
Update SBCL
Modified:
nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix Tue Aug
2 16:02:53 2011(r28124)
+++ nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix Tue Aug
2 18:52:00 2011(r28125)
@@ -1,9 +1,9 @@
rec {
- version=1.0.49;
- name=sbcl-1.0.49;
- hash=1s3am56vh1rr91zkdc5ba4rirc8ydnla3sgk8yhh56sd101c7q0v;
-
url=http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.49/sbcl-1.0.49-source.tar.bz2;;
-
advertisedUrl=http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.49/sbcl-1.0.49-source.tar.bz2;;
+ version=1.0.50;
+ name=sbcl-1.0.50;
+ hash=1asbb43rmrp87ia2kq66ymdlgdx3jvihlz3dlgwhlz7syd9z3wc3;
+
url=http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-source.tar.bz2;;
+
advertisedUrl=http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-source.tar.bz2;;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28126 - nixpkgs/trunk/pkgs/misc/emulators/wine
Author: raskin
Date: Tue Aug 2 18:58:42 2011
New Revision: 28126
URL: https://svn.nixos.org/websvn/nix/?rev=28126sc=1
Log:
Update Wine
Modified:
nixpkgs/trunk/pkgs/misc/emulators/wine/src-for-default.nix
Modified: nixpkgs/trunk/pkgs/misc/emulators/wine/src-for-default.nix
==
--- nixpkgs/trunk/pkgs/misc/emulators/wine/src-for-default.nix Tue Aug 2
18:52:00 2011(r28125)
+++ nixpkgs/trunk/pkgs/misc/emulators/wine/src-for-default.nix Tue Aug 2
18:58:42 2011(r28126)
@@ -1,9 +1,9 @@
rec {
- version=1.3.22;
- name=wine-1.3.22;
- hash=11m5m6dc2hx3nhjwlcxy8z880612aa4qh7ph6fanycby1ha5rh47;
+ version=1.3.25;
+ name=wine-1.3.25;
+ hash=1ahwgq6j8js9gkj8ynar5r1ifn1y1lfkkmhgk8y9fbzxdsb5llpm;
url=http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2;;
- advertisedUrl=http://prdownloads.sourceforge.net/wine/wine-1.3.22.tar.bz2;;
+ advertisedUrl=http://prdownloads.sourceforge.net/wine/wine-1.3.25.tar.bz2;;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28127 - nixpkgs/trunk/pkgs/applications/version-management/veracity
Author: raskin
Date: Tue Aug 2 18:58:59 2011
New Revision: 28127
URL: https://svn.nixos.org/websvn/nix/?rev=28127sc=1
Log:
Update Veracity
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/src-for-default.nix
nixpkgs/trunk/pkgs/applications/version-management/veracity/src-info-for-default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/src-for-default.nix
==
---
nixpkgs/trunk/pkgs/applications/version-management/veracity/src-for-default.nix
Tue Aug 2 18:58:42 2011(r28126)
+++
nixpkgs/trunk/pkgs/applications/version-management/veracity/src-for-default.nix
Tue Aug 2 18:58:59 2011(r28127)
@@ -1,9 +1,9 @@
rec {
- version=0.9.0.10466;
- name=veracity-0.9.0.10466;
- hash=19mi6pw4cy4f0w7v7myx0i1ajy40i9pgkmgr9rvfilcyi9rlvj6q;
-
url=http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz;;
-
advertisedUrl=http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.9.0.10466.tar.gz;;
+ version=1.0.0.10517;
+ name=veracity-1.0.0.10517;
+ hash=08bka5zzn7i7c3dm3xp57n3szvm9msmi7mq1zynqb6i210qix79g;
+
url=http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-${version}.tar.gz;;
+
advertisedUrl=http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-1.0.0.10517.tar.gz;;
}
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/src-info-for-default.nix
==
---
nixpkgs/trunk/pkgs/applications/version-management/veracity/src-info-for-default.nix
Tue Aug 2 18:58:42 2011(r28126)
+++
nixpkgs/trunk/pkgs/applications/version-management/veracity/src-info-for-default.nix
Tue Aug 2 18:58:59 2011(r28127)
@@ -1,5 +1,5 @@
{
- #downloadPage = http://sourcegear.com/veracity/downloads.html;;
- downloadPage =
http://download-us.sourcegear.com/Veracity/nightly/index.html;;
+ downloadPage = http://veracity-scm.org/downloads.html;;
+ #downloadPage =
http://download-us.sourcegear.com/Veracity/nightly/index.html;;
baseName = veracity;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28128 - nixpkgs/trunk/pkgs/development/libraries/libewf
Author: raskin
Date: Tue Aug 2 19:40:07 2011
New Revision: 28128
URL: https://svn.nixos.org/websvn/nix/?rev=28128sc=1
Log:
Update libewf. Actually buildable now
Modified:
nixpkgs/trunk/pkgs/development/libraries/libewf/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/libewf/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/libewf/default.nix Tue Aug 2
18:58:59 2011(r28127)
+++ nixpkgs/trunk/pkgs/development/libraries/libewf/default.nix Tue Aug 2
19:40:07 2011(r28128)
@@ -1,12 +1,14 @@
-{ fetchurl, stdenv, zlib, openssl, libuuid }:
+{ fetchurl, stdenv, zlib, openssl, libuuid, file }:
stdenv.mkDerivation rec {
- name = libewf-20080501;
+ name = libewf-20100226;
src = fetchurl {
-url = mirror://sourceforge/libewf/libewf-20080501.tar.gz;
-sha256 = 0s8fp7kmpk0976zii0fbk8vhi8k1br2fjp510rmgr6q1ssqdbi36;
+url = mirror://sourceforge/libewf/${name}.tar.gz;
+sha256 =
aedd2a6b3df6525ff535ab95cd569ebb361a4022eb4163390f26257913c2941a;
};
+ preConfigure = ''sed -e 's@/usr/bin/file@file@g' -i configure'';
+
buildInputs = [ zlib openssl libuuid ];
meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28129 - in nixpkgs/trunk/pkgs: development/libraries/afflib top-level
Author: raskin
Date: Tue Aug 2 19:46:28 2011
New Revision: 28129
URL: https://svn.nixos.org/websvn/nix/?rev=28129sc=1
Log:
Adding afflib
Added:
nixpkgs/trunk/pkgs/development/libraries/afflib/
nixpkgs/trunk/pkgs/development/libraries/afflib/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/afflib/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/afflib/default.nix Tue Aug 2
19:46:28 2011(r28129)
@@ -0,0 +1,48 @@
+x@{builderDefsPackage
+ , libewf, zlib, curl, expat, fuse, openssl
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=afflib;
+version=3.6.12;
+name=${baseName}-${version};
+url=http://afflib.org/downloads/${name}.tar.gz;;
+hash=1l13nrqjlvad112543qbyvrzai5by43zl96d3miklrhn26q9rs07;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doConfigure doMakeInstall];
+
+ meta = {
+description = Advanced forensic format library;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.bsdOriginal;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://afflib.org/;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 2 19:40:07
2011(r28128)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 2 19:46:28
2011(r28129)
@@ -1612,6 +1612,10 @@
buildClang = true;
};
+ clangSVN = llvmSVN.override {
+buildClang = true;
+ };
+
clean = callPackage ../development/compilers/clean { };
cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
@@ -2164,6 +2168,7 @@
};
llvm = callPackage ../development/compilers/llvm { };
+ llvmSVN = callPackage ../development/compilers/llvm/svn-head.nix { };
mitscheme = callPackage ../development/compilers/mit-scheme { };
@@ -2268,6 +2273,8 @@
roadsend = callPackage ../development/compilers/roadsend { };
+ rust = pkgsi686Linux.callPackage ../development/compilers/rust {};
+
sbcl = builderDefsPackage (import ../development/compilers/sbcl) {
inherit makeWrapper clisp;
};
@@ -2893,6 +2900,8 @@
adns = callPackage ../development/libraries/adns { };
+ afflib = callPackage ../development/libraries/afflib {};
+
agg = callPackage ../development/libraries/agg { };
allegro = callPackage ../development/libraries/allegro {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28130 - in nixpkgs/trunk/pkgs: tools/system/sleuthkit top-level
Author: raskin
Date: Tue Aug 2 20:06:09 2011
New Revision: 28130
URL: https://svn.nixos.org/websvn/nix/?rev=28130sc=1
Log:
Adding The Sleuth Kit
Added:
nixpkgs/trunk/pkgs/tools/system/sleuthkit/
nixpkgs/trunk/pkgs/tools/system/sleuthkit/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/tools/system/sleuthkit/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/system/sleuthkit/default.nix Tue Aug 2
20:06:09 2011(r28130)
@@ -0,0 +1,48 @@
+x@{builderDefsPackage
+ , libewf, afflib, openssl, zlib
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=sleuthkit;
+version=3.2.2;
+name=${baseName}-${version};
+
url=mirror://sourceforge/project/${baseName}/${baseName}/${version}/${name}.tar.gz;
+hash=02hik5xvbgh1dpisvc3wlhhq1aprnlsk0spbw6h5khpbq9wqnmgj;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doConfigure doMakeInstall];
+
+ meta = {
+description = A forensic/data recovery tool;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = IBM Public License;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage =
http://sourceforge.net/projects/sleuthkit/files/sleuthkit;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 2 19:46:28
2011(r28129)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 2 20:06:09
2011(r28130)
@@ -1286,6 +1286,8 @@
siege = callPackage ../tools/networking/siege {};
+ sleuthkit = callPackage ../tools/system/sleuthkit {};
+
slimrat = callPackage ../tools/networking/slimrat {
inherit (perlPackages) WWWMechanize LWP;
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27570 - in nixpkgs/trunk/pkgs: applications/science/misc/tulip top-level
Author: raskin
Date: Fri Jul 1 09:53:11 2011
New Revision: 27570
URL: https://svn.nixos.org/websvn/nix/?rev=27570sc=1
Log:
Make tulip run without hassle. Unfortunately, some operations repeatably crash
tulip even when built vs Qt4.6
Deleted:
nixpkgs/trunk/pkgs/applications/science/misc/tulip/configure-opengl.patch
Modified:
nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix
==
--- nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix Fri Jul
1 09:50:34 2011(r27569)
+++ nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix Fri Jul
1 09:53:11 2011(r27570)
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt
-, autoconf, automake, libtool, cmake }:
+, autoconf, automake, libtool, cmake, makeWrapper }:
let version = 3.5.0; in
stdenv.mkDerivation rec {
@@ -11,9 +11,13 @@
};
buildInputs = [ libxml2 freetype glew ]
-++ [ autoconf automake libtool cmake qt ];
+++ [ autoconf automake libtool cmake qt makeWrapper ];
propagagedBuildInputs = [ mesa qt ];
+ postInstall=''
+wrapProgram $out/bin/tulip
+ '';
+
# FIXME: make check needs Docbook's DTD 4.4, among other things.
doCheck = false;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 1 09:50:34
2011(r27569)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 1 09:53:11
2011(r27570)
@@ -7821,7 +7821,7 @@
simgrid = callPackage ../applications/science/misc/simgrid { };
tulip = callPackage ../applications/science/misc/tulip {
-qt = qt4;
+qt = qt46;
};
vite = callPackage ../applications/science/misc/vite {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27574 - nixpkgs/trunk/pkgs/tools/graphics/graphviz
Author: raskin
Date: Fri Jul 1 13:39:02 2011
New Revision: 27574
URL: https://svn.nixos.org/websvn/nix/?rev=27574sc=1
Log:
Fix wrong attribute reference addition
Modified:
nixpkgs/trunk/pkgs/tools/graphics/graphviz/default.nix
Modified: nixpkgs/trunk/pkgs/tools/graphics/graphviz/default.nix
==
--- nixpkgs/trunk/pkgs/tools/graphics/graphviz/default.nix Fri Jul 1
13:29:42 2011(r27573)
+++ nixpkgs/trunk/pkgs/tools/graphics/graphviz/default.nix Fri Jul 1
13:39:02 2011(r27574)
@@ -12,9 +12,8 @@
buildInputs =
[ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
- pango gd zlib
-] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]
-++ stdenv.lib.optionals (gtk != null) [ gtk glib ];
+ pango gd
+] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ];
configureFlags =
[ --with-pngincludedir=${libpng}/include
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27576 - in configurations/trunk/misc/raskin: . lesser-expressions
Author: raskin
Date: Fri Jul 1 13:42:17 2011
New Revision: 27576
URL: https://svn.nixos.org/websvn/nix/?rev=27576sc=1
Log:
Package set updates
Modified:
configurations/trunk/misc/raskin/httpd.nix
configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/services-main.nix
Modified: configurations/trunk/misc/raskin/httpd.nix
==
--- configurations/trunk/misc/raskin/httpd.nix Fri Jul 1 13:40:45 2011
(r27575)
+++ configurations/trunk/misc/raskin/httpd.nix Fri Jul 1 13:42:17 2011
(r27576)
@@ -45,4 +45,6 @@
++ (optionalSSL (raskinSubDomain // homeDirTune // {hostName =
raskin;}))
++ (optionalSSL (raskinSubDomain // homeDirTune // {hostName =
raskin-ipv4;}))
;
+
+ extraSubservices = [ ];
}
Modified: configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
==
--- configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Fri Jul
1 13:40:45 2011(r27575)
+++ configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Fri Jul
1 13:42:17 2011(r27576)
@@ -7,6 +7,7 @@
linkFarm raskin-packages ([
{name=python; path=pythonFull;}
+ {name=libusb-32bit; path=pkgsi686Linux.libusb;}
{name=libxml2-python; path=libxml2Python;}
{name=libX11; path=xlibs.libX11;}
{name=xproto; path=xlibs.xproto;}
@@ -34,7 +35,7 @@
openssl postgresql mysql
intltool freetype jdkPlugin gajim
pkgconfig fontconfig boost SDL SDL_mixer
- SDL_ttf opencv expat graphviz_2_0
+ SDL_ttf opencv expat graphviz_2_0
graphviz_2_24
dejavu_fonts e2fsprogs dmtx qt4
#empathy
hicolor_icon_theme libfixposix plan9port
Modified: configurations/trunk/misc/raskin/package-groups.nix
==
--- configurations/trunk/misc/raskin/package-groups.nix Fri Jul 1 13:40:45
2011(r27575)
+++ configurations/trunk/misc/raskin/package-groups.nix Fri Jul 1 13:42:17
2011(r27576)
@@ -24,7 +24,8 @@
vala yap prover9 swiProlog
gambit gcl jre jdk spidermonkey
coq eprover isabelle leo2 cvc3
- matita picolisp pure hol
+ matita picolisp pure hol tptp
+ pythonPackages.setuptools
];
nonNative = [ wine dosbox (hiPrio qemu_kvm) (lowPrio qemu)];
@@ -88,14 +89,15 @@
iputils ncat wpa_supplicant iproute lftp
iptables samba wget telnet nmap ntp nc6
socat2pre msf dhcp gvpe bridge_utils mtr
- ndisc6 vlan
+ ndisc6 vlan wavemon
];
browsers = [
opera chromeWrapper
#firefox36Wrapper
mozplugger firefox40Pkgs.xulrunner
- (wrapFirefox firefox40Pkgs.firefox firefox )
+ (wrapFirefox firefox40Pkgs.firefox firefox 4)
+ (wrapFirefox firefox50Pkgs.firefox firefox )
];
graphicEdit = [
@@ -168,7 +170,7 @@
docutils dadadodo
suidChroot libxslt pmount fakeroot
dmraid netpbm parallel wdiff
- colordiff
+ colordiff libcap_progs
mdbtools_git ised remind
logrotate htop iotop untie iftop ioping
] ++ (with aspellDicts; [en fr ru]);
@@ -232,9 +234,9 @@
gdmap xfig gnuplot /*freemind*/ transfig xxdiff
gqview pqiv webkit dia midori /*xawtv*/
- gnome.zenity xclip
+ gnome.zenity xclip welkin
/*netsurfBrowser*/ geeqie
- gosmore /*tulip*/ merkaartor
+ gosmore tulip merkaartor
pp.uzbl sonicVisualiser
];
@@ -268,7 +270,7 @@
/*(ikiwiki.override { extraUtils = [
/var/run/current-system/sw ] ;})*/
redstore rdf4store joseki
ppp nssTools myKDE.kdenetwork
- tcpdump freeswitch
+ tcpdump freeswitch wvdial
];
misc = [
@@ -319,7 +321,7 @@
perlXMLParser
gmp mpfr cminpack flann
boehmgc libffi
- pythonDBus
+ pythonDBus libusb
(pkgsi686Linux.glibc)
];
Modified: configurations/trunk/misc/raskin/services-main.nix
==
--- configurations/trunk/misc/raskin/services-main.nix Fri Jul 1 13:40:45
2011(r27575)
+++ configurations/trunk/misc/raskin/services-main.nix Fri Jul 1 13:42:17
[Nix-commits] SVN commit: nix - r27557 - in nixpkgs/trunk/pkgs: tools/networking/wavemon top-level
Author: raskin
Date: Wed Jun 29 09:53:35 2011
New Revision: 27557
URL: https://svn.nixos.org/websvn/nix/?rev=27557sc=1
Log:
Adding wavemon
Added:
nixpkgs/trunk/pkgs/tools/networking/wavemon/
nixpkgs/trunk/pkgs/tools/networking/wavemon/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/tools/networking/wavemon/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/networking/wavemon/default.nix Wed Jun 29
09:53:35 2011(r27557)
@@ -0,0 +1,48 @@
+x@{builderDefsPackage
+ , ncurses
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=wavemon;
+version=0.7.2;
+name=${baseName}-${version};
+
url=http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${name}.tar.bz2;;
+hash=1w1nq082mpjkcj7q6qs80104vki9kddwqv1wch6nmwwh0l72dgma;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doConfigure doMakeInstall];
+
+ meta = {
+description = WiFi state monitor;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.gpl2Plus;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://eden-feed.erg.abdn.ac.uk/wavemon/;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jun 29 07:52:27
2011(r27556)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jun 29 09:53:35
2011(r27557)
@@ -1446,6 +1446,8 @@
wakelan = callPackage ../tools/networking/wakelan { };
+ wavemon = callPackage ../tools/networking/wavemon { };
+
w3cCSSValidator = callPackage ../tools/misc/w3c-css-validator {
tomcat = tomcat6;
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27553 - in nixpkgs/trunk/pkgs: applications/networking/instant-messengers/oneteam build-support/builder-defs top-level
Author: raskin
Date: Tue Jun 28 09:45:09 2011
New Revision: 27553
URL: https://svn.nixos.org/websvn/nix/?rev=27553sc=1
Log:
Adding OneTeam XMPP client
Added:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/oneteam/
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/oneteam/default.nix
Modified:
nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/oneteam/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/oneteam/default.nix
Tue Jun 28 09:45:09 2011(r27553)
@@ -0,0 +1,90 @@
+x@{builderDefsPackage
+ , fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
+ , pulseaudio, gtkLibs, pixman, nspr, nss, libXScrnSaver, scrnsaverproto
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[fetchgit perlPackages gtkLibs];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames)) ++ [
+ a.perlPackages.SubName a.gtkLibs.gtk a.gtkLibs.glib
+];
+ sourceInfo = rec {
+baseName=oneteam;
+version=git-head;
+name=${baseName}-${version};
+url=git://git.process-one.net/oneteam/oneteam.git;
+rev=066cd861ea4436bbe363f032c58a746a1cac7498;
+hash=972310d6ef20db7dc749d7d935aa50889afe2004db2a07409830e09ef639f30a;
+method=fetchgit;
+ };
+in
+rec {
+ srcDrv = a.fetchgit {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+rev = sourceInfo.rev;
+ };
+
+ src=srcDrv + /;
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [goComponents setVars fixComponents doCmake
+doMakeInstall goBack buildApp doDeploy];
+
+ fixComponents = a.fullDepEntry ''
+sed -e '1i#include netinet/in.h' -i src/rtp/otRTPDecoder.cpp
src/rtp/otRTPEncoder.cpp
+ '' [minInit doUnpack];
+
+ setVars=a.noDepEntry ''
+export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr
+ '';
+
+ cmakeBuildDir=cmake-build;
+ cmakeFlags=[-D
XPCOM_GECKO_SDK=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}];
+
+ goComponents=a.fullDepEntry cd src/components [doUnpack];
+ goBack=a.noDepEntry cd ../../..;
+
+ buildApp=a.fullDepEntry ''
+perl build.pl XULAPP 1
+ '' [addInputs];
+
+ doDeploy = a.fullDepEntry ''
+TARGET_DIR=$out/share/oneteam/app
+BUILD_DIR=$PWD
+ensureDir $TARGET_DIR
+cd $TARGET_DIR
+unzip $BUILD_DIR/oneteam.xulapp
+ensureDir $out/bin
+echo #! ${a.stdenv.shell} $out/bin/oneteam
+echo \${xulrunner}/bin/xulrunner\ \$TARGET_DIR/application.ini\
$out/bin/oneteam
+chmod a+x $out/bin/oneteam
+ensureDir $out/share/doc
+cp -r $BUILD_DIR/docs $out/share/doc/oneteam
+ '' [defEnsureDir];
+
+ meta = {
+description = An XMPP client;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.gpl2;
+homepage=http://oneteam.im;;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = git://git.process-one.net/oneteam/oneteam.git;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
==
--- nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Mon Jun
27 21:43:06 2011(r27552)
+++ nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Tue Jun
28 09:45:09 2011(r27553)
@@ -396,9 +396,11 @@
cmakeRPathFlag = if (attrByPath [cmakeSkipRpath ] true args) then
-DCMAKE_SKIP_BUILD_RPATH=ON else ;
+cmakeBuildDir = attrByPath [cmakeBuildDir] build args;
+
doCmake = fullDepEntry (''
- mkdir build
- cd build
+ mkdir ${cmakeBuildDir}
+ cd ${cmakeBuildDir}
cmake -D CMAKE_INSTALL_PREFIX=$out ${cmakeRPathFlag}${toString
cmakeFlags} ..
'') [minInit addInputs doUnpack];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Jun 27 21:43:06
2011(r27552)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jun 28 09:45:09
2011(r27553)
@@ -6745,6 +6745,8 @@
offrss = callPackage ../applications/networking/offrss { };
+ oneteam = callPackage ../applications/networking/instant-messengers/oneteam
{};
+
openbox = callPackage ../applications/window-managers/openbox { };
openjump = callPackage ../applications/misc/openjump { };
___
nix-commits
[Nix-commits] SVN commit: nix - r27478 - in nixpkgs/trunk/pkgs: applications/networking/browsers/firefox top-level
Author: raskin
Date: Thu Jun 16 08:08:10 2011
New Revision: 27478
URL: https://svn.nixos.org/websvn/nix/?rev=27478sc=1
Log:
Adding Firefox 5.0 RC1
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix
- copied, changed from r27469,
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix (from
r27469, nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix)
==
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Wed Jun
15 12:04:31 2011(r27469, copy source)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix Thu Jun
16 08:08:10 2011(r27478)
@@ -15,14 +15,16 @@
rec {
- firefoxVersion = 4.0.1;
+ firefoxVersion = 5.0;
- xulVersion = 2.0.1; # this attribute is used by other packages
+ xulVersion = 5.0; # this attribute is used by other packages
+
+ versionSuffix = -rc1;
src = fetchurl {
-url =
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2;;
-sha1 = c89bc5106266aa0097a7be15be84555bd2649f03;
+url =
http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/5.0-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2;;
+sha256 = 0i6zxvhvf717bzz3mwlbvrk601k81r38fym0fv2nlvr9r207vybb;
};
@@ -50,7 +52,7 @@
xulrunner = stdenv.mkDerivation rec {
-name = xulrunner-${xulVersion};
+name = xulrunner-${xulVersion}${versionSuffix};
inherit src;
@@ -119,7 +121,7 @@
firefox = stdenv.mkDerivation rec {
-name = firefox-${firefoxVersion};
+name = firefox-${firefoxVersion}${versionSuffix};
inherit src;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Jun 16 05:55:47
2011(r27477)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Jun 16 08:08:10
2011(r27478)
@@ -6225,6 +6225,13 @@
firefox40Wrapper = wrapFirefox firefox40Pkgs.firefox firefox ;
+ firefox50Pkgs = callPackage
../applications/networking/browsers/firefox/5.0.nix {
+inherit (gtkLibs) gtk pango;
+inherit (gnome) libIDL;
+ };
+
+ firefox50Wrapper = wrapFirefox firefox50Pkgs.firefox firefox ;
+
flac = callPackage ../applications/audio/flac { };
flashplayer = flashplayer10;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27488 - nixpkgs/trunk/pkgs/development/libraries/wvstreams
Author: raskin
Date: Thu Jun 16 21:19:13 2011
New Revision: 27488
URL: https://svn.nixos.org/websvn/nix/?rev=27488sc=1
Log:
Fix build - add a patch from Debian
Added:
nixpkgs/trunk/pkgs/development/libraries/wvstreams/compile.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/wvstreams/default.nix
Added: nixpkgs/trunk/pkgs/development/libraries/wvstreams/compile.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/wvstreams/compile.patchThu Jun
16 21:19:13 2011(r27488)
@@ -0,0 +1,43 @@
+Debian's patch to build with fresher GCC
+
+Index: wvstreams-4.6.1/crypto/wvx509.cc
+===
+--- wvstreams-4.6.1.orig/crypto/wvx509.cc 2011-05-20 00:02:38.119136584
+0200
wvstreams-4.6.1/crypto/wvx509.cc 2011-05-20 00:02:26.035136589 +0200
+@@ -1157,7 +1157,7 @@
+
+ if (ext)
+ {
+-X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD
*)X509V3_EXT_get(ext);
+ if (!method)
+ {
+ WvDynBuf buf;
+Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc
+===
+--- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20
00:02:38.391136584 +0200
wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc2011-05-20
00:02:35.283136585 +0200
+@@ -1,8 +1,6 @@
+ #include wvunixdgsocket.h
+-#ifdef MACOS
+ #include sys/types.h
+ #include sys/stat.h
+-#endif
+
+ WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms)
+ : socketfile(filename)
+Index: wvstreams-4.6.1/streams/wvatomicfile.cc
+===
+--- wvstreams-4.6.1.orig/streams/wvatomicfile.cc 2011-05-20
00:02:38.223136584 +0200
wvstreams-4.6.1/streams/wvatomicfile.cc2011-05-20 00:02:31.619136587
+0200
+@@ -10,10 +10,7 @@
+ #include wvatomicfile.h
+ #include wvfileutils.h
+ #include wvstrutils.h
+-
+-#ifdef MACOS
+ #include sys/stat.h
+-#endif
+
+ WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t
create_mode)
+ : tmp_file(WvString::null)
Modified: nixpkgs/trunk/pkgs/development/libraries/wvstreams/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/wvstreams/default.nix Thu Jun
16 15:19:53 2011(r27487)
+++ nixpkgs/trunk/pkgs/development/libraries/wvstreams/default.nix Thu Jun
16 21:19:13 2011(r27488)
@@ -8,6 +8,8 @@
sha256 = 0cvnq3mvh886gmxh0km858aqhx30hpyrfpg1dh6ara9sz3xza0w4;
};
+ patches = [ ./compile.patch ];
+
preConfigure = ''
find -type f | xargs sed -i 's@/bin/bash@bash@g'
'';
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27468 - in nixpkgs/trunk/pkgs: applications/science/logic/tptp top-level
Author: raskin
Date: Wed Jun 15 10:35:18 2011
New Revision: 27468
URL: https://svn.nixos.org/websvn/nix/?rev=27468sc=1
Log:
Adding TPTP
Added:
nixpkgs/trunk/pkgs/applications/science/logic/tptp/
nixpkgs/trunk/pkgs/applications/science/logic/tptp/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/applications/science/logic/tptp/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/science/logic/tptp/default.nix Wed Jun
15 10:35:18 2011(r27468)
@@ -0,0 +1,87 @@
+x@{builderDefsPackage
+ , yap, tcsh, perl, patchelf, pkgsi686Linux
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[pkgsi686Linux];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=TPTP;
+version=5.1.0;
+name=${baseName}-${version};
+url=http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz;;
+hash=1wh2k575nn51ykg1jnwfwjqhg5x42k5vvn2spq09px26vhs4yksy;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [goTarget doUnpack fixPlace setVars installScripts
+patchBinaries makeLinks];
+
+ goTarget = a.fullDepEntry ''
+ensureDir $out/share/
+cd $out/share/
+ '' [defEnsureDir minInit];
+
+ fixPlace = a.fullDepEntry ''
+cd ..
+mv TPTP-* tptp
+cd tptp
+ '' [minInit doUnpack];
+
+ setVars = a.noDepEntry ''
+export TPTP=$PWD
+ '';
+
+ installScripts = a.fullDepEntry ''
+tcsh $out/share/tptp/Scripts/tptp2T_install -default
+
+sed -e 's@^ */bin/@@' -i TPTP2X/*
+
+tcsh $out/share/tptp/TPTP2X/tptp2X_install -default
+ '' [addInputs];
+
+ makeLinks = a.fullDepEntry ''
+ensureDir $out/bin
+ln -s ../share/tptp/TPTP2X/tptp2X $out/bin
+ln -s ../share/tptp/Scripts/tptp2T $out/bin
+ln -s ../share/tptp/Scripts/tptp4X $out/bin
+ '' [defEnsureDir minInit];
+
+ patchBinaries = a.fullDepEntry ''
+patchelf --set-interpreter ${pkgsi686Linux.glibc}/lib/ld-linux.so.* \
+ Scripts/tptp4X
+ '' [addInputs];
+
+ meta = {
+description = Thousands of problems for theorem provers and tools;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+# A GiB of data. Installation is unpacking and editing a few files.
+# No sense in letting Hydra build it.
+# Also, it is unclear what is covered by verbatim - we will edit configs
+platforms = with a.lib.platforms;
+ [];
+license = verbatim-redistribution;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://tptp.org/;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jun 15 10:30:08
2011(r27467)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jun 15 10:35:18
2011(r27468)
@@ -7722,6 +7722,8 @@
camlp5 = ocamlPackages.camlp5_transitional;
};
+ tptp = callPackage ../applications/science/logic/tptp {};
+
### SCIENCE / ELECTRONICS
caneda = callPackage ../applications/science/electronics/caneda {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27477 - nixpkgs/trunk/pkgs/development/compilers/yasm
Author: raskin
Date: Thu Jun 16 05:55:47 2011
New Revision: 27477
URL: https://svn.nixos.org/websvn/nix/?rev=27477sc=1
Log:
Update YASM
Modified:
nixpkgs/trunk/pkgs/development/compilers/yasm/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/yasm/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/yasm/default.nix Wed Jun 15
14:46:06 2011(r27476)
+++ nixpkgs/trunk/pkgs/development/compilers/yasm/default.nix Thu Jun 16
05:55:47 2011(r27477)
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = yasm-1.0.0;
+ name = yasm-1.1.0;
src = fetchurl {
-url = http://www.tortall.net/projects/yasm/releases/yasm-1.0.0.tar.gz;
-sha256 = 0nd95r9y5r3p9mvdyj1yhvlz9zjw0id1g470c7i1p3p0x0n6zc06;
+url = http://www.tortall.net/projects/yasm/releases/${name}.tar.gz;;
+sha256 =
e5d56b582f3d0c30ed5c4fc221063e4175602307ea645520889458133671c232;
};
meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27451 - nixpkgs/trunk/pkgs/development/compilers/sbcl
Author: raskin
Date: Tue Jun 14 04:31:30 2011
New Revision: 27451
URL: https://svn.nixos.org/websvn/nix/?rev=27451sc=1
Log:
Update SBCL
Modified:
nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix Tue Jun
14 02:41:28 2011(r27450)
+++ nixpkgs/trunk/pkgs/development/compilers/sbcl/src-for-default.nix Tue Jun
14 04:31:30 2011(r27451)
@@ -1,9 +1,9 @@
rec {
- version=1.0.47;
- name=sbcl-1.0.47;
- hash=1zpg77l2v1wg0502igxpd4g2fwj0rzch0zzgyylyj5ad53wcwxar;
-
url=http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.47/sbcl-1.0.47-source.tar.bz2;;
-
advertisedUrl=http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.47/sbcl-1.0.47-source.tar.bz2;;
+ version=1.0.49;
+ name=sbcl-1.0.49;
+ hash=1s3am56vh1rr91zkdc5ba4rirc8ydnla3sgk8yhh56sd101c7q0v;
+
url=http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.49/sbcl-1.0.49-source.tar.bz2;;
+
advertisedUrl=http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.49/sbcl-1.0.49-source.tar.bz2;;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27416 - nixpkgs/trunk/pkgs/misc/emulators/wine
Author: raskin
Date: Sat Jun 11 07:26:37 2011
New Revision: 27416
URL: https://svn.nixos.org/websvn/nix/?rev=27416sc=1
Log:
Update Wine
Modified:
nixpkgs/trunk/pkgs/misc/emulators/wine/src-for-default.nix
Modified: nixpkgs/trunk/pkgs/misc/emulators/wine/src-for-default.nix
==
--- nixpkgs/trunk/pkgs/misc/emulators/wine/src-for-default.nix Fri Jun 10
12:56:49 2011(r27415)
+++ nixpkgs/trunk/pkgs/misc/emulators/wine/src-for-default.nix Sat Jun 11
07:26:37 2011(r27416)
@@ -1,9 +1,9 @@
rec {
- version=1.3.19;
- name=wine-1.3.19;
- hash=13g7wk4xx5vxr5hq3jn69iyrscvvbz5r58l9y11ffsyp11y7g1l6;
+ version=1.3.22;
+ name=wine-1.3.22;
+ hash=11m5m6dc2hx3nhjwlcxy8z880612aa4qh7ph6fanycby1ha5rh47;
url=http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2;;
- advertisedUrl=http://prdownloads.sourceforge.net/wine/wine-1.3.19.tar.bz2;;
+ advertisedUrl=http://prdownloads.sourceforge.net/wine/wine-1.3.22.tar.bz2;;
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27417 - configurations/trunk/misc/raskin
Author: raskin
Date: Sat Jun 11 07:28:17 2011
New Revision: 27417
URL: https://svn.nixos.org/websvn/nix/?rev=27417sc=1
Log:
Some more packages
Modified:
configurations/trunk/misc/raskin/fonts.nix
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/private-packages.nix
Modified: configurations/trunk/misc/raskin/fonts.nix
==
--- configurations/trunk/misc/raskin/fonts.nix Sat Jun 11 07:26:37 2011
(r27416)
+++ configurations/trunk/misc/raskin/fonts.nix Sat Jun 11 07:28:17 2011
(r27417)
@@ -33,6 +33,11 @@
pkgs.andagii
pkgs.anonymousPro
pkgs.inconsolata
+ pkgs.theano
+ pkgs.oldstandard
+ pkgs.tempora_lgc
+ pkgs.gentium
+ pkgs.cm_unicode
]);
enableCoreFonts = false;
Modified: configurations/trunk/misc/raskin/package-groups.nix
==
--- configurations/trunk/misc/raskin/package-groups.nix Sat Jun 11 07:26:37
2011(r27416)
+++ configurations/trunk/misc/raskin/package-groups.nix Sat Jun 11 07:28:17
2011(r27417)
@@ -67,7 +67,7 @@
liquidwar myKDE.kdegames
extremetuxracer torcs simutrans
ultimatestunts teeworlds globulation2
- pp.warmux pp.tbe
+ pp.warmux pp.tbe xconq
];
filesystems
@@ -170,7 +170,7 @@
dmraid netpbm parallel wdiff
colordiff
mdbtools_git ised remind
- logrotate htop iotop untie iftop
+ logrotate htop iotop untie iftop ioping
] ++ (with aspellDicts; [en fr ru]);
encryption = [
@@ -191,7 +191,7 @@
gst_all.gstPluginsBase
gst_all.gstPluginsGood
gst_all.gstFfmpeg
- xineUI
+ xineUI espeak
];
buildSupport = [
@@ -260,9 +260,9 @@
mueller_enru_names
];
})
- squid dovecot_1_1_1
+ squid dovecot_1_1_1 siege
bitlbee mutt xinetd
- lighttpd openssl
+ lighttpd openssl ekiga
nginx /*mldonkey*/ bind postfix axel /*aria*/
inetutils netkittftp nodejs
/*(ikiwiki.override { extraUtils = [
/var/run/current-system/sw ] ;})*/
Modified: configurations/trunk/misc/raskin/private-packages.nix
==
--- configurations/trunk/misc/raskin/private-packages.nix Sat Jun 11
07:26:37 2011(r27416)
+++ configurations/trunk/misc/raskin/private-packages.nix Sat Jun 11
07:28:17 2011(r27417)
@@ -17,8 +17,8 @@
JustStamp = x.noDepEntry ''
echo ${builtins.readFile /var/repos/tbe/.svn/all-wcprops}
/dev/null
'';
- qt4 = qt47;
- buildInputs = [qt47] ++ (lib.filter (y : y.outPath !=
qt47.outPath) x.buildInputs);
+ qt4 = qt46;
+ buildInputs = [qt46] ++ (lib.filter (y : y.outPath !=
qt47.outPath) x.buildInputs);
}));
drgeo = (drgeo.override {src= + /var/repos/drgeo-1.1.0 + /;});
btrfsProgs = (btrfsProgs.override {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] NixOS issue: Passwords and Nix store
Hi list, I think most of you are aware of the problem. The problem is that the content of the nix store is public. So if password are part of derivations or parts of the build result, they would appear in as readable inside the nix store. In NixOS, to work around this issue, we have to either pass filenames with double quotes, to escape from the copy of the file into the nix store. This has 2 disadvantages. The first one is that most of the options do not ensure that you cannot give a path to them. The second one is that this prevent us for creating abstractions over the content of the configuration file in order to ensure consistence of configuration files. We have multiple solutions to handle this problem. n+1/ encryption. See gw6c service. On launch, you access properly secured private key, optionally check that the public key in store matches, and write real config with sane permissions by decrypting what is in store. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r27402 - nixpkgs/trunk/pkgs/tools/graphics/cuneiform
Author: raskin
Date: Thu Jun 9 08:23:58 2011
New Revision: 27402
URL: https://svn.nixos.org/websvn/nix/?rev=27402sc=1
Log:
Fix 64-bit cuneiform build
Modified:
nixpkgs/trunk/pkgs/tools/graphics/cuneiform/default.nix
Modified: nixpkgs/trunk/pkgs/tools/graphics/cuneiform/default.nix
==
--- nixpkgs/trunk/pkgs/tools/graphics/cuneiform/default.nix Thu Jun 9
07:48:54 2011(r27401)
+++ nixpkgs/trunk/pkgs/tools/graphics/cuneiform/default.nix Thu Jun 9
08:23:58 2011(r27402)
@@ -28,8 +28,10 @@
cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out
-DDL_LIB=${libc}/lib
'') [minInit addInputs doUnpack defEnsureDir];
+ needLib64 = a.stdenv.system == x86_64-linux;
+
postInstall = a.fullDepEntry(''
-patchelf --set-rpath $out/lib${if a.stdenv.gcc.gcc != null then
:${a.stdenv.gcc.gcc}/lib else }:${a.imagemagick}/lib $out/bin/cuneiform
+patchelf --set-rpath $out/lib${if needLib64 then 64 else }${if
a.stdenv.gcc.gcc != null then :${a.stdenv.gcc.gcc}/lib else }${if
a.stdenv.gcc.gcc != null needLib64 then :${a.stdenv.gcc.gcc}/lib64 else
}:${a.imagemagick}/lib $out/bin/cuneiform
'') [minInit addInputs doMakeInstall];
name = cuneiform- + version;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27391 - in nixpkgs/trunk/pkgs: tools/graphics/dmtx top-level
Author: raskin
Date: Wed Jun 8 08:11:24 2011
New Revision: 27391
URL: https://svn.nixos.org/websvn/nix/?rev=27391sc=1
Log:
Fix DMTX build
Modified:
nixpkgs/trunk/pkgs/tools/graphics/dmtx/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/graphics/dmtx/default.nix
==
--- nixpkgs/trunk/pkgs/tools/graphics/dmtx/default.nix Tue Jun 7 21:51:13
2011(r27390)
+++ nixpkgs/trunk/pkgs/tools/graphics/dmtx/default.nix Wed Jun 8 08:11:24
2011(r27391)
@@ -7,7 +7,7 @@
buildInputs = with args; [
libpng libtiff libjpeg librsvg imagemagick pkgconfig
zlib libX11 bzip2 libtool freetype fontconfig
-ghostscript jasper
+ghostscript jasper xz
];
in
rec {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jun 7 21:51:13
2011(r27390)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jun 8 08:11:24
2011(r27391)
@@ -6025,7 +6025,7 @@
dmtx = builderDefsPackage (import ../tools/graphics/dmtx) {
inherit libpng libtiff libjpeg imagemagick librsvg
pkgconfig bzip2 zlib libtool freetype fontconfig
- ghostscript jasper;
+ ghostscript jasper xz;
inherit (xlibs) libX11;
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27364 - in nixpkgs/trunk/pkgs: development/libraries/celt development/libraries/gsm top-level
Author: raskin
Date: Tue Jun 7 14:42:24 2011
New Revision: 27364
URL: https://svn.nixos.org/websvn/nix/?rev=27364sc=1
Log:
Adding GSM and CELT codecs; dependencies of sflphone - failed to buuild itself
Added:
nixpkgs/trunk/pkgs/development/libraries/celt/
nixpkgs/trunk/pkgs/development/libraries/celt/0.7.nix
nixpkgs/trunk/pkgs/development/libraries/celt/default.nix
nixpkgs/trunk/pkgs/development/libraries/gsm/
nixpkgs/trunk/pkgs/development/libraries/gsm/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/celt/0.7.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/celt/0.7.nix Tue Jun 7
14:42:24 2011(r27364)
@@ -0,0 +1,47 @@
+x@{builderDefsPackage
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=celt;
+version=0.7.1;
+name=${baseName}-${version};
+url=http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz;;
+hash=93f0e2dfb59021b19e69dc0dee855eb89f19397db1dea0d0d6f9329cff933066;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doConfigure doMakeInstall];
+
+ meta = {
+description = CELT - low-delay audio codec;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = free;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://www.celt-codec.org/downloads/;;
+};
+ };
+}) x
+
Added: nixpkgs/trunk/pkgs/development/libraries/celt/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/celt/default.nix Tue Jun 7
14:42:24 2011(r27364)
@@ -0,0 +1,47 @@
+x@{builderDefsPackage
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=celt;
+version=0.11.1;
+name=${baseName}-${version};
+url=http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz;;
+hash=1gsc3pxydyzzra8w0r6hrrsalm76lrq4lw6bd283qa4bpagmghh1;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doConfigure doMakeInstall];
+
+ meta = {
+description = CELT - low-delay audio codec;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = free;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://www.celt-codec.org/downloads/;;
+};
+ };
+}) x
+
Added: nixpkgs/trunk/pkgs/development/libraries/gsm/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/gsm/default.nixTue Jun 7
14:42:24 2011(r27364)
@@ -0,0 +1,60 @@
+x@{builderDefsPackage
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=gsm;
+version=1.0.13;
+name=${baseName}-${version};
+url=http://www.quut.com/gsm/${name}.tar.gz;;
+hash=1bcjl2h60gvr1dc5a963h3vnz9zl6n8qrfa3qmb2x3229lj1iiaj;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [createDirs setVars doMakeInstall];
+
+ createDirs = a.fullDepEntry ''
+ensureDir $out/{bin,lib,share/man,share/info,include/gsm}
+ '' [minInit defEnsureDir];
+
+ setVars = a.noDepEntry ''
+export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE -fPIC
+ '';
+
+ makeFlags = [
+''INSTALL_ROOT=$out''
+''GSM_INSTALL_INC=$out/include/gsm''
+ ];
+
+ meta = {
+description = A GSM codec library;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+
[Nix-commits] SVN commit: nix - r27367 - in nixpkgs/trunk/pkgs: tools/system/ioping top-level
Author: raskin
Date: Tue Jun 7 15:56:50 2011
New Revision: 27367
URL: https://svn.nixos.org/websvn/nix/?rev=27367sc=1
Log:
Adding IOping
Added:
nixpkgs/trunk/pkgs/tools/system/ioping/
nixpkgs/trunk/pkgs/tools/system/ioping/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/tools/system/ioping/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/system/ioping/default.nix Tue Jun 7 15:56:50
2011(r27367)
@@ -0,0 +1,50 @@
+x@{builderDefsPackage
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=ioping;
+version=0.4;
+name=${baseName}-${version};
+url=http://ioping.googlecode.com/files/${name}.tar.gz;;
+hash=064pfjhg2a4hj6ly0wc9z85awiqry55n6wpx8kxzl9qasls0q447;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doMakeInstall];
+ makeFlags = [
+''PREFIX=$out''
+ ];
+
+ meta = {
+description = Filesystem IO delay time measurer;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.gpl3Plus;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://code.google.com/p/ioping/downloads/list;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jun 7 15:03:12
2011(r27366)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jun 7 15:56:50
2011(r27367)
@@ -818,6 +818,8 @@
inetutils = callPackage ../tools/networking/inetutils { };
+ ioping = callPackage ../tools/system/ioping {};
+
iodine = callPackage ../tools/networking/iodine { };
iperf = callPackage ../tools/networking/iperf { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27368 - in nixpkgs/trunk/pkgs: tools/networking/siege top-level
Author: raskin
Date: Tue Jun 7 16:15:05 2011
New Revision: 27368
URL: https://svn.nixos.org/websvn/nix/?rev=27368sc=1
Log:
Adding siege HTTP load tester
Added:
nixpkgs/trunk/pkgs/tools/networking/siege/
nixpkgs/trunk/pkgs/tools/networking/siege/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/tools/networking/siege/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/networking/siege/default.nix Tue Jun 7
16:15:05 2011(r27368)
@@ -0,0 +1,51 @@
+x@{builderDefsPackage
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=siege;
+version=2.70;
+name=${baseName}-${version};
+url=ftp://ftp.joedog.org/pub/siege/${name}.tar.gz;;
+hash=14fxfmfsqwyahc91w4vn3n8hvclf78n4k1xllqsrpvjb5asvrd1w;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [doConfigure createDirs doMakeInstall];
+
+ createDirs = a.fullDepEntry ''
+ensureDir $out/{bin,lib,share/man,etc}
+ '' [defEnsureDir];
+
+ meta = {
+description = HTTP load tester;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.gpl2Plus;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://www.joedog.org/index/siege-home;;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jun 7 15:56:50
2011(r27367)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jun 7 16:15:05
2011(r27368)
@@ -1264,6 +1264,8 @@
shebangfix = callPackage ../tools/misc/shebangfix { };
+ siege = callPackage ../tools/networking/siege {};
+
slimrat = callPackage ../tools/networking/slimrat {
inherit (perlPackages) WWWMechanize LWP;
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27333 - in nixpkgs/trunk/pkgs: development/libraries/ccrtp development/libraries/libzrtpcpp top-level
Author: raskin
Date: Tue May 31 09:09:35 2011
New Revision: 27333
URL: https://svn.nixos.org/websvn/nix/?rev=27333sc=1
Log:
Twinkle needs an older version of ccrtp
Added:
nixpkgs/trunk/pkgs/development/libraries/ccrtp/1.8.nix
nixpkgs/trunk/pkgs/development/libraries/libzrtpcpp/1.6.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/ccrtp/1.8.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/ccrtp/1.8.nix Tue May 31
09:09:35 2011(r27333)
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, commoncpp2 }:
+
+stdenv.mkDerivation {
+ name = ccrtp-1.8.0;
+
+ src = fetchurl {
+url = mirror://gnu/ccrtp/ccrtp-1.8.0.tar.gz;
+sha256 = 0wr4dandlfajhmg90nqyvwv61ikn9vdycji001310y3c4zfysprn;
+ };
+
+ buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ];
+
+ meta = {
+description = GNU ccRTP is an implementation of RTP, the real-time
transport protocol from the IETF;
+homepage = http://www.gnu.org/software/ccrtp/;;
+license = GPLv2;
+maintainers = [ stdenv.lib.maintainers.marcweber ];
+platforms = stdenv.lib.platforms.linux;
+ };
+}
Added: nixpkgs/trunk/pkgs/development/libraries/libzrtpcpp/1.6.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/libzrtpcpp/1.6.nix Tue May 31
09:09:35 2011(r27333)
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, commoncpp2, openssl, pkgconfig, ccrtp }:
+
+stdenv.mkDerivation rec {
+ name = libzrtpcpp-1.6.0;
+
+ src = fetchurl {
+url = mirror://gnu/ccrtp/${name}.tar.gz;
+sha256 = 17aayr4f27rp4fvminxn6jx7kq56kkk341l7ypqb9h0k6kns27kb;
+ };
+
+ buildInputs = [ commoncpp2 openssl pkgconfig ccrtp ];
+
+ meta = {
+description = GNU RTP stack for the zrtp protocol developed by Phil
Zimmermann;
+homepage = http://www.gnutelephony.org/index.php/GNU_ZRTP;;
+license = GPLv2;
+maintainers = [ stdenv.lib.maintainers.marcweber ];
+platforms = stdenv.lib.platforms.linux;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 31 07:44:17
2011(r27332)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 31 09:09:35
2011(r27333)
@@ -2902,6 +2902,7 @@
scmccid = callPackage ../development/libraries/scmccid { };
ccrtp = callPackage ../development/libraries/ccrtp { };
+ ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { };
cgui = callPackage ../development/libraries/cgui {};
@@ -3881,6 +3882,9 @@
libzip = callPackage ../development/libraries/libzip { };
libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { };
+ libzrtpcpp_1_6 = callPackage ../development/libraries/libzrtpcpp/1.6.nix {
+ccrtp = ccrtp_1_8;
+ };
lightning = callPackage ../development/libraries/lightning { };
@@ -6976,6 +6980,8 @@
twinkle = callPackage ../applications/networking/twinkle {
qt = qt3;
boost = boostFull;
+ccrtp = ccrtp_1_8;
+libzrtpcpp = libzrtpcpp_1_6;
};
unison = callPackage ../applications/networking/sync/unison {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27338 - nixpkgs/trunk/pkgs/build-support/builder-defs
Author: raskin
Date: Tue May 31 19:30:10 2011
New Revision: 27338
URL: https://svn.nixos.org/websvn/nix/?rev=27338sc=1
Log:
A phase that simply saves current exported vars for debugging use
Modified:
nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
Modified: nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
==
--- nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Tue May
31 15:09:56 2011(r27337)
+++ nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Tue May
31 19:30:10 2011(r27338)
@@ -335,6 +335,8 @@
doDump = n: noDepEntry echo Dump number ${n}; set;
+ saveEnv = noDepEntry ''export $TMP/env-vars'';
+
doDumpBuildInputs = noDepEntry (''
echo ${toString realBuildInputs}
'');
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27339 - nixpkgs/trunk/pkgs/games/xconq
Author: raskin Date: Tue May 31 19:34:06 2011 New Revision: 27339 URL: https://svn.nixos.org/websvn/nix/?rev=27339sc=1 Log: Fix for an annoying crash Modified: nixpkgs/trunk/pkgs/games/xconq/default.nix Modified: nixpkgs/trunk/pkgs/games/xconq/default.nix == --- nixpkgs/trunk/pkgs/games/xconq/default.nix Tue May 31 19:30:10 2011 (r27338) +++ nixpkgs/trunk/pkgs/games/xconq/default.nix Tue May 31 19:34:06 2011 (r27339) @@ -43,6 +43,7 @@ fixCfiles = a.fullDepEntry '' sed -re 's@[(]int[)]color@(long)color@' -i tcltk/tkmap.c +sed -re '/unitp = view_unit[(]uview[)]/aelse *unitp = NULL\;' -i tcltk/tkmap.c '' [minInit doUnpack]; configureFlags = [ ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27340 - nixpkgs/trunk/pkgs/games/xconq
Author: raskin
Date: Tue May 31 20:18:40 2011
New Revision: 27340
URL: https://svn.nixos.org/websvn/nix/?rev=27340sc=1
Log:
MediumBlue is currently too dark to be background for black checkmark, correct
to Light
Modified:
nixpkgs/trunk/pkgs/games/xconq/default.nix
Modified: nixpkgs/trunk/pkgs/games/xconq/default.nix
==
--- nixpkgs/trunk/pkgs/games/xconq/default.nix Tue May 31 19:34:06 2011
(r27339)
+++ nixpkgs/trunk/pkgs/games/xconq/default.nix Tue May 31 20:18:40 2011
(r27340)
@@ -30,8 +30,8 @@
inherit buildInputs;
/* doConfigure should be removed if not needed */
- phaseNames = [addInputs doUnpack fixMakefiles fixCfiles doConfigure
-doMakeInstall doWrap];
+ phaseNames = [addInputs doUnpack fixMakefiles fixCfiles
fixTCLfiles
+doConfigure doMakeInstall doWrap];
doWrap = a.makeManyWrappers ''$out/bin/*'' ''--prefix TCLLIBPATH :
${tk}/lib'';
@@ -46,6 +46,10 @@
sed -re '/unitp = view_unit[(]uview[)]/aelse *unitp = NULL\;' -i
tcltk/tkmap.c
'' [minInit doUnpack];
+ fixTCLfiles = a.fullDepEntry ''
+sed -re 's@MediumBlue@LightBlue@g' -i tcltk/tkconq.tcl
+ '' [minInit doUnpack];
+
configureFlags = [
--enable-alternate-scoresdir=scores
--with-tclconfig=${tcl}/lib
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27315 - nixpkgs/trunk/pkgs/tools/security/nmap
Author: raskin
Date: Mon May 30 06:25:38 2011
New Revision: 27315
URL: https://svn.nixos.org/websvn/nix/?rev=27315sc=1
Log:
Update nmap
Modified:
nixpkgs/trunk/pkgs/tools/security/nmap/default.nix
Modified: nixpkgs/trunk/pkgs/tools/security/nmap/default.nix
==
--- nixpkgs/trunk/pkgs/tools/security/nmap/default.nix Sun May 29 12:27:56
2011(r27314)
+++ nixpkgs/trunk/pkgs/tools/security/nmap/default.nix Mon May 30 06:25:38
2011(r27315)
@@ -4,22 +4,13 @@
}:
stdenv.mkDerivation rec {
- name = nmap-5.21;
+ name = nmap-5.50;
src = fetchurl {
url = http://nmap.org/dist/${name}.tar.bz2;;
-sha256 = 1fmh05iamynmr8zic3bja6dr0pfiwp0hr2nc2wpiqm2pc7w29jwz;
+sha256 =
aa044113caa47e172c154daed73afc70ffa18d359eb47c22a9ea85ffcb14ffb8;
};
- patches =
-[ (fetchurl {
-url =
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-analyzer/nmap/files/nmap-5.21-openssl-1.patch?revision=1.1;;
-sha256 = 0q0kgwvg5b770xpp31a5a3lxh8d5ik6d5bv11nlh3syd78q6f08y;
- })
-];
-
- patchFlags = -p0;
-
postInstall =
''
wrapProgram $out/bin/zenmap --prefix PYTHONPATH : $(toPythonPath $out)
--prefix PYTHONPATH : $PYTHONPATH --prefix PYTHONPATH : $(toPythonPath
${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0
--prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27306 - in nixpkgs/trunk/pkgs: build-support/builder-defs games/xconq top-level
Author: raskin
Date: Sat May 28 15:36:56 2011
New Revision: 27306
URL: https://svn.nixos.org/websvn/nix/?rev=27306sc=1
Log:
Adding Xconq turn-based strategy
Added:
nixpkgs/trunk/pkgs/games/xconq/
nixpkgs/trunk/pkgs/games/xconq/default.nix
Modified:
nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
==
--- nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Fri May
27 05:39:44 2011(r27305)
+++ nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Sat May
28 15:36:56 2011(r27306)
@@ -26,6 +26,7 @@
else if (hasSuffixHack .zip s) || (hasSuffixHack .ZIP s)
then zip
else if (hasSuffixHack -cvs-export s) then cvs-dir
else if (hasSuffixHack .nar.bz2 s) then narbz2
+else if (hasSuffixHack .rpm s) then rpm
# Mostly for manually specified directories..
else if (hasSuffixHack / s) then dir
@@ -234,7 +235,12 @@
else if (archiveType s) == narbz2 then
bzip2 ${s} | nix-store --restore \$PWD/\$(basename ${s}
.nar.bz2)
cd \$(basename ${s} .nar.bz2)
- else if (archiveType s) == plain-bz2 then
+ else if (archiveType s) == rpm then ''
+rpm2cpio ${s} ${s}.cpio
+cpio -iv ${s}.cpio
+ test -f *.tar.* tar -xvf *.tar.*
+ test -d */ cd */
+'' else if (archiveType s) == plain-bz2 then
mkdir \$PWD/\$(basename ${s} .bz2)
NAME=\$(basename ${s} .bz2)
bzip2 -d ${s} \$PWD/\$(basename ${s} .bz2)/\${NAME#*-}
Added: nixpkgs/trunk/pkgs/games/xconq/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/games/xconq/default.nix Sat May 28 15:36:56 2011
(r27306)
@@ -0,0 +1,67 @@
+x@{builderDefsPackage
+ , rpm, cpio, xproto, libX11, libXmu, libXaw, libXt, tcl, tk, libXext
+ , makeWrapper
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName=xconq;
+version=7.5.0-0pre.0.20050612;
+name=${baseName}-${version};
+extension=src.rpm;
+project=${baseName};
+
url=mirror://sourceforge/project/${project}/${baseName}/${name}/${baseName}-${version}.${extension};
+hash=0i41dz95af2pzmmjz0sc1n0wdxy7gjqlfcl503hw1xd5zza2lw2j;
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = [addInputs doUnpack fixMakefiles fixCfiles doConfigure
+doMakeInstall doWrap];
+
+ doWrap = a.makeManyWrappers ''$out/bin/*'' ''--prefix TCLLIBPATH :
${tk}/lib'';
+
+ fixMakefiles = a.fullDepEntry ''
+find . -name 'Makefile.in' -exec sed -re 's@^( *)(cd|[][])@
\1\2@' -i '{}' ';'
+find . -name 'Makefile.in' -exec sed -e '/chown/d; /chgrp/d' -i '{}' ';'
+sed -e '/^ * *[$][(]tcltkdir[)]\/[*][.][*]/d' -i
tcltk/Makefile.in
+ '' [minInit doUnpack];
+
+ fixCfiles = a.fullDepEntry ''
+sed -re 's@[(]int[)]color@(long)color@' -i tcltk/tkmap.c
+ '' [minInit doUnpack];
+
+ configureFlags = [
+--enable-alternate-scoresdir=scores
+--with-tclconfig=${tcl}/lib
+--with-tkconfig=${tk}/lib
+ ];
+
+ meta = {
+description = A programmable turn-based strategy game;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.gpl2;
+ };
+ passthru = {
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri May 27 05:39:44
2011(r27305)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat May 28 15:36:56
2011(r27306)
@@ -7456,6 +7456,8 @@
inherit gnuchess texinfo;
};
+ xconq = callPackage ../games/xconq {};
+
xsokoban = builderDefsPackage (import ../games/xsokoban) {
inherit (xlibs) libX11 xproto libXpm libXt;
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
