[Nix-commits] SVN commit: nix - r27460 - hydra-config/gnu/trunk/hurd
Author: ludo
Date: Wed Jun 15 07:23:40 2011
New Revision: 27460
URL: https://svn.nixos.org/websvn/nix/?rev=27460sc=1
Log:
hurd: Double the size of the QEMU partition.
Modified:
hydra-config/gnu/trunk/hurd/release.nix
Modified: hydra-config/gnu/trunk/hurd/release.nix
==
--- hydra-config/gnu/trunk/hurd/release.nix Tue Jun 14 17:09:19 2011
(r27459)
+++ hydra-config/gnu/trunk/hurd/release.nix Wed Jun 15 07:23:40 2011
(r27460)
@@ -186,7 +186,7 @@
# Command to build the disk image.
buildCommand = let hd = vda; dollar = \\\$; in ''
${pkgs.parted}/sbin/parted /dev/${hd} \
- mklabel msdos mkpart primary ext2 1MiB 100MiB
+ mklabel msdos mkpart primary ext2 1MiB 200MiB
mknod /dev/${hd}1 b 254 1
${pkgs.e2fsprogs}/sbin/mke2fs -o hurd -F /dev/${hd}1
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27461 - hydra-config/gnu/trunk/hurd
Author: ludo
Date: Wed Jun 15 07:23:44 2011
New Revision: 27461
URL: https://svn.nixos.org/websvn/nix/?rev=27461sc=1
Log:
hurd: Keep debugging symbols; don't patch interpreter paths.
Modified:
hydra-config/gnu/trunk/hurd/release.nix
Modified: hydra-config/gnu/trunk/hurd/release.nix
==
--- hydra-config/gnu/trunk/hurd/release.nix Wed Jun 15 07:23:40 2011
(r27460)
+++ hydra-config/gnu/trunk/hurd/release.nix Wed Jun 15 07:23:44 2011
(r27461)
@@ -40,7 +40,10 @@
maintainers = [ pkgs.stdenv.lib.maintainers.ludo ];
};
- succeedOnFailure = true;
+ dontStrip = true;
+ dontCrossStrip = true;
+ NIX_STRIP_DEBUG = false;
+
keepBuildDirectory = true;
jobs = {
@@ -82,7 +85,9 @@
propagatedBuildNativeInputs = [ pkgs.machHeaders ];
buildNativeInputs = [ pkgs.mig ];
buildInputs = [ parted pkgs.libuuid ];
- inherit meta succeedOnFailure keepBuildDirectory;
+ dontPatchShebangs = true;
+ inherit meta succeedOnFailure keepBuildDirectory
+dontStrip dontCrossStrip NIX_STRIP_DEBUG;
}).hostDrv;
# Same without dependency on Parted.
@@ -103,7 +108,9 @@
buildNativeInputs = [ pkgs.mig ];
buildInputs = [ pkgs.libuuid ];
configureFlags = [ --without-parted ];
- inherit meta;
+ dontPatchShebangs = true;
+ inherit meta succeedOnFailure keepBuildDirectory
+dontStrip dontCrossStrip NIX_STRIP_DEBUG;
}).hostDrv;
# Complete cross bootstrap of GNU from GNU/Linux.
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27462 - hydra-config/gnu/trunk/hurd
Author: ludo
Date: Wed Jun 15 07:23:47 2011
New Revision: 27462
URL: https://svn.nixos.org/websvn/nix/?rev=27462sc=1
Log:
hurd: Add /dev/console.
Modified:
hydra-config/gnu/trunk/hurd/release.nix
Modified: hydra-config/gnu/trunk/hurd/release.nix
==
--- hydra-config/gnu/trunk/hurd/release.nix Wed Jun 15 07:23:44 2011
(r27461)
+++ hydra-config/gnu/trunk/hurd/release.nix Wed Jun 15 07:23:47 2011
(r27462)
@@ -204,6 +204,7 @@
cp -rv /nix/store/*-gnu /mnt/nix/store
mkdir /mnt/bin /mnt/dev
+mknod /mnt/dev/console c 0 0
ln -sv ${xbuild}/hurd /mnt/hurd
ln -sv ${pkgs.bash.hostDrv}/bin/bash /mnt/bin/sh
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27463 - hydra-config/gnu/trunk/hurd
Author: ludo
Date: Wed Jun 15 07:53:28 2011
New Revision: 27463
URL: https://svn.nixos.org/websvn/nix/?rev=27463sc=1
Log:
hurd: Fix typo.
Modified:
hydra-config/gnu/trunk/hurd/release.nix
Modified: hydra-config/gnu/trunk/hurd/release.nix
==
--- hydra-config/gnu/trunk/hurd/release.nix Wed Jun 15 07:23:47 2011
(r27462)
+++ hydra-config/gnu/trunk/hurd/release.nix Wed Jun 15 07:53:28 2011
(r27463)
@@ -44,6 +44,7 @@
dontCrossStrip = true;
NIX_STRIP_DEBUG = false;
+ succeedOnFailure = true;
keepBuildDirectory = true;
jobs = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27464 - nixpkgs/trunk/pkgs/applications/graphics/feh
Author: viric
Date: Wed Jun 15 08:22:15 2011
New Revision: 27464
URL: https://svn.nixos.org/websvn/nix/?rev=27464sc=1
Log:
Updating feh
Modified:
nixpkgs/trunk/pkgs/applications/graphics/feh/default.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/feh/default.nix
==
--- nixpkgs/trunk/pkgs/applications/graphics/feh/default.nixWed Jun 15
07:53:28 2011(r27463)
+++ nixpkgs/trunk/pkgs/applications/graphics/feh/default.nixWed Jun 15
08:22:15 2011(r27464)
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib
-, libXinerama }:
+, libXinerama, curl }:
stdenv.mkDerivation {
- name = feh-1.11.2;
+ name = feh-1.14.1;
src = fetchurl {
-url = http://www.chaosdorf.de/~derf/feh/feh-1.11.1.tar.bz2;
-sha256 = 1rxi0hjp8w1rga48qvq3sgsbsgs4d5q1sq59ld1f7rih1knm2v45;
+url = http://www.chaosdorf.de/~derf/feh/feh-1.14.1.tar.bz2;
+sha256 = 1dask2pm7y2yjvxlwiyi0v4145alixp5lk8v68dcs0qxz8v1pqk1;
};
- buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama];
+ buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl];
preBuild = ''
makeFlags=PREFIX=$out
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27466 - nixpkgs/trunk/pkgs/applications/graphics/giv
Author: viric
Date: Wed Jun 15 08:59:02 2011
New Revision: 27466
URL: https://svn.nixos.org/websvn/nix/?rev=27466sc=1
Log:
Updating giv.
Modified:
nixpkgs/trunk/pkgs/applications/graphics/giv/build.patch
nixpkgs/trunk/pkgs/applications/graphics/giv/default.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/giv/build.patch
==
--- nixpkgs/trunk/pkgs/applications/graphics/giv/build.patchWed Jun 15
08:42:46 2011(r27465)
+++ nixpkgs/trunk/pkgs/applications/graphics/giv/build.patchWed Jun 15
08:59:02 2011(r27466)
@@ -42,15 +42,3 @@
variant = Debug
-diff --git a/src/plugins/dcmtk/config/include/dcmtk/config/cfunix.h
b/src/plugins/dcmtk/config/include/dcmtk/config/cfunix.h
-index 32dbcbb..c456604 100644
a/src/plugins/dcmtk/config/include/dcmtk/config/cfunix.h
-+++ b/src/plugins/dcmtk/config/include/dcmtk/config/cfunix.h
-@@ -332,7 +332,6 @@ typedef int pid_t;
- #endif
-
- /* Define `size_t' to `unsigned' if sys/types.h does not define. */
--#define HAVE_NO_TYPEDEF_SIZE_T 1
- #ifdef HAVE_NO_TYPEDEF_SIZE_T
- typedef unsigned size_t;
- #endif
Modified: nixpkgs/trunk/pkgs/applications/graphics/giv/default.nix
==
--- nixpkgs/trunk/pkgs/applications/graphics/giv/default.nixWed Jun 15
08:42:46 2011(r27465)
+++ nixpkgs/trunk/pkgs/applications/graphics/giv/default.nixWed Jun 15
08:59:02 2011(r27466)
@@ -2,11 +2,11 @@
pcre, cfitsio, perl, gob2, vala, libtiff }:
stdenv.mkDerivation rec {
- name = giv-0.9.18;
+ name = giv-0.9.19;
src = fetchurl {
url = mirror://sourceforge/giv/${name}.tar.gz;
-sha256 = 0w81cc56mq8qiv36jljgarycly3fnpr5i7cjnsprgfm79icdi8nl;
+sha256 = 07sgpp4k27417ymavcvil4waq6ac2mj08g42g1l52l435xm5mnh7;
};
# It built code to be put in a shared object without -fPIC
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27467 - nixpkgs/trunk/pkgs/development/libraries/imlib2
Author: viric
Date: Wed Jun 15 10:30:08 2011
New Revision: 27467
URL: https://svn.nixos.org/websvn/nix/?rev=27467sc=1
Log:
updating imlib2. This makes feh load tiffs correctly.
Modified:
nixpkgs/trunk/pkgs/development/libraries/imlib2/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/imlib2/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/imlib2/default.nix Wed Jun 15
08:59:02 2011(r27466)
+++ nixpkgs/trunk/pkgs/development/libraries/imlib2/default.nix Wed Jun 15
10:30:08 2011(r27467)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2 }:
stdenv.mkDerivation {
- name = imlib2-1.3.0;
+ name = imlib2-1.4.4;
src = fetchurl {
-url = mirror://sourceforge/enlightenment/imlib2-1.3.0.tar.gz;
-sha256 = 1lrg7haqhmzpdb14cgp9vny5fanlwlyhf5n017v130in297gv1qj;
+url = mirror://sourceforge/enlightenment/imlib2-1.4.4.tar.gz;
+sha256 = 163162aifak8ya17brzqwjlr8ywz40s2s3573js5blcc1g4m5pm4;
};
buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ];
___
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 - r27469 - nixpkgs/trunk/pkgs/development/tools/misc/ninka
Author: sandervanderburg
Date: Wed Jun 15 12:04:31 2011
New Revision: 27469
URL: https://svn.nixos.org/websvn/nix/?rev=27469sc=1
Log:
Fixed the comments tool
Modified:
nixpkgs/trunk/pkgs/development/tools/misc/ninka/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/misc/ninka/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/ninka/default.nix Wed Jun 15
10:35:18 2011(r27468)
+++ nixpkgs/trunk/pkgs/development/tools/misc/ninka/default.nix Wed Jun 15
12:04:31 2011(r27469)
@@ -15,21 +15,23 @@
buildInputs = [ perl ];
+ buildPhase = ''
+cd comments
+tar xfvz comments.tar.gz
+cd comments
+sed -i -e s|/usr/local/bin|$out/bin|g -e
s|/usr/local/man|$out/share/man|g Makefile
+make
+ '';
+
installPhase = ''
+cd ../..
ensureDir $out/bin
cp ninka.pl $out/bin
cp -av {extComments,splitter,filter,senttok,matcher} $out/bin
-cd comments
-tar xfvz comments.tar.gz
-cd comments
-sed -i -e s|/usr/local/bin|$out/bin| -e
s|/usr/local/man|$out/share/man| Makefile
+cd comments/comments
ensureDir $out/{bin,share/man/man1}
-make install
-
-# Dirty
-#patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2
$out/bin/comments
-#patchelf --set-rpath ${stdenv.glibc}/lib:${stdenv.gcc}/lib
$out/bin/comments
+make install
'';
meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27470 - nixpkgs/trunk/pkgs/misc/drivers/foomatic-filters
Author: eelco
Date: Wed Jun 15 12:40:58 2011
New Revision: 27470
URL: https://svn.nixos.org/websvn/nix/?rev=27470sc=1
Log:
* Clean up foomatic-filters.
Modified:
nixpkgs/trunk/pkgs/misc/drivers/foomatic-filters/default.nix
Modified: nixpkgs/trunk/pkgs/misc/drivers/foomatic-filters/default.nix
==
--- nixpkgs/trunk/pkgs/misc/drivers/foomatic-filters/default.nixWed Jun
15 12:04:31 2011(r27469)
+++ nixpkgs/trunk/pkgs/misc/drivers/foomatic-filters/default.nixWed Jun
15 12:40:58 2011(r27470)
@@ -1,54 +1,32 @@
-x@{builderDefsPackage
- , perl, cups
- , ...}:
-builderDefsPackage
-(a :
-let
- helperArgNames = [stdenv fetchurl builderDefsPackage] ++
-[];
-
- buildInputs = map (n: builtins.getAttr n x)
-(builtins.attrNames (builtins.removeAttrs x helperArgNames));
- sourceInfo = rec {
-baseName=foomatic-filters;
-version=4.0.6;
-name=${baseName}-${version};
-url=http://www.openprinting.org/download/foomatic/${name}.tar.gz;;
-hash=0wa9hlq7s99sh50kl6bj8j0vxrz7pcbwdnqs1yfjjhqshfh7hsav;
- };
-in
-rec {
- src = a.fetchurl {
-url = sourceInfo.url;
-sha256 = sourceInfo.hash;
+{ stdenv, fetchurl, perl, cups, coreutils, gnused }:
+
+stdenv.mkDerivation rec {
+ name = foomatic-filters-4.0.6;
+
+ src = fetchurl {
+url = http://www.openprinting.org/download/foomatic/${name}.tar.gz;;
+sha256 = 0wa9hlq7s99sh50kl6bj8j0vxrz7pcbwdnqs1yfjjhqshfh7hsav;
};
- inherit (sourceInfo) name version;
- inherit buildInputs;
+ buildInputs = [ perl cups ];
+
+ preConfigure =
+''
+ substituteInPlace foomaticrip.c --replace /bin/bash /bin/sh
+'';
- phaseNames = [doConfigure fixPaths doMakeInstall];
+ installTargets = install-cups;
+
+ installFlags =
+''
+ CUPS_FILTERS=$(out)/lib/cups/filter
+ CUPS_BACKENDS=$(out)/lib/cups/backend
+'';
- fixPaths = a.fullDepEntry ''
-sed -e s@= .*/store/[^/]\+/lib/cups/filter@= $out/lib/cups/filter@ -i
Makefile
-sed -e s@= .*/store/[^/]\+/lib/cups/backend@= $out/lib/cups/backend@ -i
Makefile
-sed -e s@= /usr/@= $out/@ -i Makefile
-sed -e s@/bin/bash@/bin/sh@g -i foomaticrip.c
- '' [doConfigure minInit];
-
meta = {
description = Foomatic printing filters;
-maintainers = with a.lib.maintainers;
-[
- raskin
-];
-platforms = with a.lib.platforms;
- linux;
-license = a.lib.licenses.gpl2Plus;
- };
- passthru = {
-updateInfo = {
- downloadPage = http://www.openprinting.org/download/foomatic/;;
-};
+maintainers = stdenv.lib.maintainers.raskin;
+platforms = stdenv.lib.platforms.linux;
+license = stdenv.lib.licenses.gpl2Plus;
};
-}) x
-
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27471 - nixos/trunk/modules/services/printing
Author: eelco
Date: Wed Jun 15 12:41:15 2011
New Revision: 27471
URL: https://svn.nixos.org/websvn/nix/?rev=27471sc=1
Log:
* Some hackery to get foomatic-filters to work.
Modified:
nixos/trunk/modules/services/printing/cupsd.nix
Modified: nixos/trunk/modules/services/printing/cupsd.nix
==
--- nixos/trunk/modules/services/printing/cupsd.nix Wed Jun 15 12:40:58
2011(r27470)
+++ nixos/trunk/modules/services/printing/cupsd.nix Wed Jun 15 12:41:15
2011(r27471)
@@ -27,6 +27,11 @@
mkdir -pv $out/lib/cups/backend
ln -sv ${pkgs.cups}/lib/cups/backend/ipp $out/lib/cups/backend/https
fi
+
+ # Awful hack to get programs needed by some PPDs in CUPS'
+ # hard-coded $PATH.
+ mkdir -p $out/lib/cups/filter
+ ln -s ${pkgs.coreutils}/bin/date ${pkgs.coreutils}/bin/cat
${pkgs.gnused}/bin/sed $out/lib/cups/filter/
'';
};
@@ -148,6 +153,7 @@
};
services.printing.drivers = [ pkgs.cups pkgs.cups_pdf_filter
pkgs.ghostscript additionalBackends ];
+
services.printing.cupsdConf =
''
LogLevel info
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27472 - configurations/trunk/misc/eelco
Author: eelco
Date: Wed Jun 15 12:41:42 2011
New Revision: 27472
URL: https://svn.nixos.org/websvn/nix/?rev=27472sc=1
Log:
Modified:
configurations/trunk/misc/eelco/disabn.nix
Modified: configurations/trunk/misc/eelco/disabn.nix
==
--- configurations/trunk/misc/eelco/disabn.nix Wed Jun 15 12:41:15 2011
(r27471)
+++ configurations/trunk/misc/eelco/disabn.nix Wed Jun 15 12:41:42 2011
(r27472)
@@ -5,6 +5,10 @@
[ ${modulesPath}/hardware/network/intel-6000.nix
];
+ nixpkgs.config.packageOverrides = pkgs: {
+firefox40Pkgs = pkgs.firefox40Pkgs.override { enableOfficialBranding =
true; };
+ };
+
boot.loader.grub.version = 2;
boot.loader.grub.device = /dev/sda;
boot.loader.grub.copyKernels = true;
@@ -29,7 +33,7 @@
#defaultMailServer.hostName = mail.xs4all.nl;
firewall.enable = true;
firewall.rejectPackets = true;
-#bridges.veth0.interfaces = [ eth0 ];
+bridges.veth0.interfaces = [ eth0 ];
};
environment.systemPackages =
@@ -38,7 +42,7 @@
pkgs.aefs
#pkgs.xlockmore
#config.boot.kernelPackages.virtualbox
- pkgs.firefoxWrapper
+ pkgs.firefox40Wrapper
pkgs.thunderbird3
pkgs.emacs
pkgs.chatzilla
@@ -57,6 +61,7 @@
pkgs.gnumake
pkgs.gcc
pkgs.glxinfo
+ pkgs.blueman
];
security.extraSetuidPrograms = [ fusermount xlock ];
@@ -138,6 +143,7 @@
};
printing.enable = true;
+printing.drivers = [ pkgs.foomatic_filters ];
#postgresql.enable = true;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27473 - nixpkgs/trunk/pkgs/development/tools/misc/strace
Author: eelco
Date: Wed Jun 15 13:28:04 2011
New Revision: 27473
URL: https://svn.nixos.org/websvn/nix/?rev=27473sc=1
Log:
* strace updated to 4.6.
Modified:
nixpkgs/trunk/pkgs/development/tools/misc/strace/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/misc/strace/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/strace/default.nixWed Jun
15 12:41:42 2011(r27472)
+++ nixpkgs/trunk/pkgs/development/tools/misc/strace/default.nixWed Jun
15 13:28:04 2011(r27473)
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, xz, perl }:
stdenv.mkDerivation rec {
- name = strace-4.5.20;
+ name = strace-4.6;
src = fetchurl {
-url = mirror://sourceforge/strace/${name}.tar.bz2;
-sha256 = 1gfakika8833373p09pfzn5y83kx4jmlxws6na8av9gad69hb37a;
+url = mirror://sourceforge/strace/${name}.tar.xz;
+sha256 = 12n2faqq7whmszpjhv2lcb06r7900j53p0zl7vipi18inr0smycy;
};
+ buildInputs = [ xz perl ];
+
meta = {
homepage = http://strace.sourceforge.net/;
description = A system call tracer for Linux;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27474 - nixos/trunk/doc/manual
Author: ludo Date: Wed Jun 15 14:12:45 2011 New Revision: 27474 URL: https://svn.nixos.org/websvn/nix/?rev=27474sc=1 Log: doc: Add more details on `lib/testing.nix'. Modified: nixos/trunk/doc/manual/development.xml Modified: nixos/trunk/doc/manual/development.xml == --- nixos/trunk/doc/manual/development.xml Wed Jun 15 13:28:04 2011 (r27473) +++ nixos/trunk/doc/manual/development.xml Wed Jun 15 14:12:45 2011 (r27474) @@ -480,6 +480,52 @@ a NixOS or Nixpkgs change. /para + para +The actual Nix programming interface to VM testing is in NixOS, +under link +xlink:href=https://svn.nixos.org/repos/nix/nixos/trunk/lib/testing.nix; +filenamelib/testing.nix/filename/link. This file defines a +function which takes an attribute set containing a +literalnixpkgs/literal attribute (the path to a Nixpkgs +checkout), and a literalsystem/literal attribute (the system +type). It returns an attribute set containing several utility +functions, among which the main entry point is +literalmakeTest/literal. + /para + + para +The literalmakeTest/literal function takes a function similar to +that found in link +xlink:href=https://svn.nixos.org/repos/nix/nixos/trunk/tests/nfs.nix; +filenametests/nfs.nix/filename/link (discussed above). It +returns an attribute set containing (among others): + +variablelist + + varlistentry + termvarnametest/varname/term + listitemA derivation containing the test log as an HTML file, + as seen above, suitable for presentation in the Hydra continuous + build system./listitem + /varlistentry + + varlistentry + termvarnamereport/varname/term + listitemA derivation containing a code coverage report, with + meta-data suitable for Hydra./listitem + /varlistentry + + varlistentry + termvarnamedriver/varname/term + listitemA derivation containing scripts to run the VM test or + interact with the VM network interactively, as seen above. + /listitem + /varlistentry + +/variablelist + /para + + /section /chapter ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27475 - nixpkgs/trunk/pkgs/applications/graphics/feh
Author: kkallio
Date: Wed Jun 15 14:25:50 2011
New Revision: 27475
URL: https://svn.nixos.org/websvn/nix/?rev=27475sc=1
Log:
Update the download URL for feh, which seems to have changed.
Modified:
nixpkgs/trunk/pkgs/applications/graphics/feh/default.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/feh/default.nix
==
--- nixpkgs/trunk/pkgs/applications/graphics/feh/default.nixWed Jun 15
14:12:45 2011(r27474)
+++ nixpkgs/trunk/pkgs/applications/graphics/feh/default.nixWed Jun 15
14:25:50 2011(r27475)
@@ -5,7 +5,7 @@
name = feh-1.14.1;
src = fetchurl {
-url = http://www.chaosdorf.de/~derf/feh/feh-1.14.1.tar.bz2;
+url = http://feh.finalrewind.org/feh-1.14.1.tar.bz2;
sha256 = 1dask2pm7y2yjvxlwiyi0v4145alixp5lk8v68dcs0qxz8v1pqk1;
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r27476 - nixos/trunk/doc/manual
Author: ludo Date: Wed Jun 15 14:46:06 2011 New Revision: 27476 URL: https://svn.nixos.org/websvn/nix/?rev=27476sc=1 Log: doc: Attempt to placate Docbook. Modified: nixos/trunk/doc/manual/development.xml Modified: nixos/trunk/doc/manual/development.xml == --- nixos/trunk/doc/manual/development.xml Wed Jun 15 14:25:50 2011 (r27475) +++ nixos/trunk/doc/manual/development.xml Wed Jun 15 14:46:06 2011 (r27476) @@ -504,21 +504,21 @@ varlistentry termvarnametest/varname/term - listitemA derivation containing the test log as an HTML file, + listitemparaA derivation containing the test log as an HTML file, as seen above, suitable for presentation in the Hydra continuous - build system./listitem + build system./para/listitem /varlistentry varlistentry termvarnamereport/varname/term - listitemA derivation containing a code coverage report, with - meta-data suitable for Hydra./listitem + listitemparaA derivation containing a code coverage report, with + meta-data suitable for Hydra./para/listitem /varlistentry varlistentry termvarnamedriver/varname/term - listitemA derivation containing scripts to run the VM test or - interact with the VM network interactively, as seen above. + listitemparaA derivation containing scripts to run the VM test or + interact with the VM network interactively, as seen above./para /listitem /varlistentry ___ 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
