[Nix-commits] SVN commit: nix - r31197 - nixpkgs/trunk/pkgs/applications/misc/calibre
Author: urkud
Date: Mon Jan 2 10:42:36 2012
New Revision: 31197
URL: https://nixos.org/websvn/nix/?rev=31197sc=1
Log:
Explicitly add sqlite to calibre.buildInputs
The better way would be adding sqlite to
pythonPackages.sqlite3.propagatedBuildInputs but I don't want to touch this
code.
Modified:
nixpkgs/trunk/pkgs/applications/misc/calibre/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/calibre/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/calibre/default.nixMon Jan 2
10:42:25 2012(r31196)
+++ nixpkgs/trunk/pkgs/applications/misc/calibre/default.nixMon Jan 2
10:42:36 2012(r31197)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt4, icu
+, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite
, pil, makeWrapper, unrar, chmlib, pythonPackages, xz
}:
@@ -19,7 +19,8 @@
[ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
fontconfig podofo qt4 pil chmlib icu
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
- pythonPackages.cssutils pythonPackages.beautifulsoap
pythonPackages.sqlite3
+ pythonPackages.cssutils pythonPackages.beautifulsoap
+ pythonPackages.sqlite3 sqlite
];
installPhase = ''
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] gitorious mirror
I found a note in the wiki about nixos/nixpkgs mirror on the gitorios, but it looks abandoned - last commit is of May 2011. What is the prefereble way of maintaining up-to-date repo with local modifications? Is it possible to use git-svn'ed clone of svn trunk? Sergey ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r31198 - nixpkgs/trunk/pkgs/development/libraries/soprano
Author: urkud
Date: Mon Jan 2 11:12:27 2012
New Revision: 31198
URL: https://nixos.org/websvn/nix/?rev=31198sc=1
Log:
soprano-2.7.4, pass pkgconfig explicitly
Modified:
nixpkgs/trunk/pkgs/development/libraries/soprano/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/soprano/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/soprano/default.nixMon Jan
2 10:42:36 2012(r31197)
+++ nixpkgs/trunk/pkgs/development/libraries/soprano/default.nixMon Jan
2 11:12:27 2012(r31198)
@@ -1,26 +1,20 @@
-{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc }:
+{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc
+, pkgconfig }:
stdenv.mkDerivation rec {
- name = soprano-2.7.0;
+ name = soprano-2.7.4;
src = fetchurl {
url = mirror://sourceforge/soprano/${name}.tar.bz2;
-sha256 = 1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z;
+sha256 = 0f6kg39bi4h4iblfs9ny88cs951sigm50yr6w50afc3f1nqzdmhp;
};
- patches =
-[ (fetchurl { # Applied upstream, remove if upgrading
-url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
-name = soprano-virtuoso-restart.patch;
-sha256 = 0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y;
- })
- ./find-virtuoso.patch
-];
+ patches = [ ./find-virtuoso.patch ];
# We disable the Java backend, since we do not need them and they make the
closure size much bigger
buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
- buildNativeInputs = [ cmake ];
+ buildNativeInputs = [ cmake pkgconfig ];
meta = {
homepage = http://soprano.sourceforge.net/;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] nix-copy-closure error
Hi, Den 2011-12-26 17:52:40 skrev Lluís Batlle i Rossell vi...@viric.name: On Sun, Dec 25, 2011 at 10:46:04PM +0100, Rickard Nilsson wrote: I have run nix-store --verify --check-contents on both hosts, without any errors. I get the hash-error each time I try to copy the path above. I can copy other paths, though. How can I debug this? Quite a strange situation, yes. Read the nix-copy-closure script; you can check the raw steps --import and --export of nix-store manually, checking what happens. I discovered that the path in question actually had been corrupted on the source host. Now, how can I repair it? Since it is the active Linux kernel, I can't remove the path. Rather, I want to force a rebuild and reinstallation in some way. Can that be done? / Rickard ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] nix-copy-closure error
On Mon, Jan 02, 2012 at 12:19:47PM +0100, Rickard Nilsson wrote: I discovered that the path in question actually had been corrupted on the source host. Now, how can I repair it? Since it is the active Linux kernel, I can't remove the path. Rather, I want to force a rebuild and reinstallation in some way. Can that be done? This happens every now and then. Eelco should tell us what to do. The last time I was involved in a procedure, it was a mixture of removing the path, running nix-store --verify, creating the path without content (mkdir), and running again nix-store --verify. I think nix should start having test cases about this situation, because I think it always worked not as Eelco expected. :) But I may be wrong. Regards, Lluís. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r31200 - nixpkgs/trunk/pkgs/development/libraries/haskell/enumerator
Author: simons
Date: Mon Jan 2 11:22:58 2012
New Revision: 31200
URL: https://nixos.org/websvn/nix/?rev=31200sc=1
Log:
haskell-enumerator: updated to version 0.4.17
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/enumerator/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/enumerator/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/enumerator/default.nix
Mon Jan 2 11:16:48 2012(r31199)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/enumerator/default.nix
Mon Jan 2 11:22:58 2012(r31200)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = enumerator;
- version = 0.4.16;
- sha256 = 16556x3km4si7gvprf7xmsiqw1ygjwavhbgh32fmzf7709bpqnhs;
+ version = 0.4.17;
+ sha256 = 009h9phdgnkbvz5fri81b895y2hbmw5x7z67rnn31j87khbhnfz9;
buildDepends = [ text transformers ];
meta = {
homepage = https://john-millikin.com/software/enumerator/;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31201 - nixpkgs/trunk/pkgs/development/libraries/libdbusmenu-qt
Author: urkud
Date: Mon Jan 2 11:35:13 2012
New Revision: 31201
URL: https://nixos.org/websvn/nix/?rev=31201sc=1
Log:
libdbusmenu-qt-0.9.0, disable apidocs
Modified:
nixpkgs/trunk/pkgs/development/libraries/libdbusmenu-qt/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/libdbusmenu-qt/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/libdbusmenu-qt/default.nix Mon Jan
2 11:22:58 2012(r31200)
+++ nixpkgs/trunk/pkgs/development/libraries/libdbusmenu-qt/default.nix Mon Jan
2 11:35:13 2012(r31201)
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, qt4, cmake, doxygen }:
+{ stdenv, fetchurl, qt4, cmake }:
let
baseName = libdbusmenu-qt;
- v = 0.8.3;
+ v = 0.9.0;
in
stdenv.mkDerivation rec {
@@ -10,10 +10,13 @@
src = fetchurl {
url =
http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2;;
-sha256 = 1fkw6wpxjmmx4p8779z662qphip3pgdcsn6cyb0frryfj4sa32ka;
+sha256 = 0xdicb3fmwgbyhc6cpcmdkwysdg18m5rcqc3izpwv6brq4aq4787;
};
- buildInputs = [ cmake qt4 doxygen ];
+ buildInputs = [ qt4 ];
+ buildNativeInputs = [ cmake ];
+
+ cmakeFlags = -DWITH_DOC=OFF;
meta = with stdenv.lib; {
description = Provides a Qt implementation of the DBusMenu spec;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31202 - nixpkgs/trunk/pkgs/desktops/kde-4.7
Author: urkud
Date: Mon Jan 2 12:52:43 2012
New Revision: 31202
URL: https://nixos.org/websvn/nix/?rev=31202sc=1
Log:
kdelibs: depend on libjpeg
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdelibs.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdelibs.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdelibs.nix Mon Jan 2 11:35:13
2012(r31201)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdelibs.nix Mon Jan 2 12:52:43
2012(r31202)
@@ -3,7 +3,7 @@
, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies,
libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
-, getopt, udev, herqq, phonon
+, getopt, udev, herqq, phonon, libjpeg
}:
kde {
@@ -11,7 +11,7 @@
[
acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
- shared_desktop_ontologies udev xz libxml2
+ shared_desktop_ontologies udev xz libxml2 libjpeg
];
propagatedBuildInputs = [ qt4 soprano strigi phonon ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31203 - nixpkgs/trunk/pkgs/desktops/kde-4.7
Author: urkud
Date: Mon Jan 2 12:54:22 2012
New Revision: 31203
URL: https://nixos.org/websvn/nix/?rev=31203sc=1
Log:
Revert Use qt-4.8 by default
This reverts r31196. Will re-apply after fixing most packages broken by this
change.
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Mon Jan 2 12:52:43
2012(r31202)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Mon Jan 2 12:54:22
2012(r31203)
@@ -1,4 +1,4 @@
-{ callPackage, callPackageOrig, stdenv, qt48 }:
+{ callPackage, callPackageOrig, stdenv, qt47 }:
let
release = 4.7.4;
@@ -44,7 +44,7 @@
akonadi = callPackage ./support/akonadi { };
- qt4 = qt48;
+ qt4 = qt47;
kdebase_workspace = kde.modules.kde_workspace;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] gitorious mirror
Excerpts from Sergey Mironov's message of Mon Jan 02 12:01:36 +0100 2012: I found a note in the wiki about nixos/nixpkgs mirror on the gitorios, but it looks abandoned Give me your SSH pub key and you'll get access. It may be that the syncing stopped - because they introduced gitorious.(com/org) long time ago ? Marc Weber ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r31204 - nixpkgs/trunk/pkgs/applications/graphics/dia
Author: urkud
Date: Mon Jan 2 13:42:11 2012
New Revision: 31204
URL: https://nixos.org/websvn/nix/?rev=31204sc=1
Log:
Fix dia.name
Modified:
nixpkgs/trunk/pkgs/applications/graphics/dia/default.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/dia/default.nix
==
--- nixpkgs/trunk/pkgs/applications/graphics/dia/default.nixMon Jan 2
12:54:22 2012(r31203)
+++ nixpkgs/trunk/pkgs/applications/graphics/dia/default.nixMon Jan 2
13:42:11 2012(r31204)
@@ -3,7 +3,7 @@
, withGNOME ? false, libgnomeui }:
stdenv.mkDerivation rec {
- inherit (src) name;
+ name = src.pkgname;
src = fetchurl_gnome {
project = dia;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31209 - nixpkgs/trunk/pkgs/applications/graphics/panotools
Author: urkud
Date: Mon Jan 2 14:25:03 2012
New Revision: 31209
URL: https://nixos.org/websvn/nix/?rev=31209sc=1
Log:
libpano13-2.9.18
Modified:
nixpkgs/trunk/pkgs/applications/graphics/panotools/default.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/panotools/default.nix
==
--- nixpkgs/trunk/pkgs/applications/graphics/panotools/default.nix Mon Jan
2 14:13:03 2012(r31208)
+++ nixpkgs/trunk/pkgs/applications/graphics/panotools/default.nix Mon Jan
2 14:25:03 2012(r31209)
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, libjpeg, libpng, libtiff, perl }:
stdenv.mkDerivation rec {
- name = libpano13-2.9.17;
+ name = libpano13-2.9.18;
src = fetchurl {
-url = mirror://sourceforge/panotools/libpano13/${name}/${name}.tar.gz;
-sha256 = 1zcrkw0xw11170mlhh9r8562gafwx3hd92wahl9xxaah5z4v0am2;
+url = mirror://sourceforge/panotools/${name}.tar.gz;
+sha256 = 0wm1r9waa47n482yrl3hnphicdahr581rahgbklk0d2wy51lwpfy;
};
buildInputs = [ perl libjpeg libpng libtiff ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31212 - in nixpkgs/trunk/pkgs/applications/version-management/git-and-tools: . git-annex
Author: simons
Date: Mon Jan 2 14:51:26 2012
New Revision: 31212
URL: https://nixos.org/websvn/nix/?rev=31212sc=1
Log:
git-annex: updated to version 3.20111231
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
==
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Mon Jan 2 14:51:23 2012(r31211)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Mon Jan 2 14:51:26 2012(r31212)
@@ -46,11 +46,10 @@
};
gitAnnex = lib.makeOverridable (import ./git-annex) {
-inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki
which;
+inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki
which coreutils;
inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
- HTTP testpack hS3 mtl network hslogger hxt json;
+ HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl;
QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
-monadControl = haskellPackages.monadControl_OBSOLETE;
};
qgit = import ./qgit {
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
==
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Mon Jan 2 14:51:23 2012(r31211)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Mon Jan 2 14:51:26 2012(r31212)
@@ -1,23 +1,23 @@
{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP,
hxt
, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
-, QuickCheck2, rsync, SHA, testpack, utf8String, which
+, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
}:
let
- version = 3.20111203;
+ version = 3.20111231;
in
stdenv.mkDerivation {
name = git-annex-${version};
src = fetchurl {
url =
http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz;;
-sha256 =
236a8fa537be1738a16afcab8a7438dc567dce75a6b71b62780d31048428f74b;
+sha256 =
4f53e7fc9560838be7efd0c90543c93ce1c7d2ba36b7754200586d845ec114f5;
};
buildInputs = [
curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
-rsync SHA testpack utf8String which
+rsync SHA testpack utf8String which liftedBase
];
checkTarget = test;
@@ -26,6 +26,7 @@
preConfigure = ''
makeFlagsArray=( PREFIX=$out )
sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' mdwn2man
+sed -i -e 's|cp |${coreutils}/bin/cp |' -e 's|rm -f
|${coreutils}/bin/rm -f |' test.hs
'';
meta = {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31214 - nixpkgs/trunk/pkgs/games/naev
Author: urkud
Date: Mon Jan 2 17:37:53 2012
New Revision: 31214
URL: https://nixos.org/websvn/nix/?rev=31214sc=1
Log:
naev-0.5.0
Modified:
nixpkgs/trunk/pkgs/games/naev/default.nix
Modified: nixpkgs/trunk/pkgs/games/naev/default.nix
==
--- nixpkgs/trunk/pkgs/games/naev/default.nix Mon Jan 2 15:29:14 2012
(r31213)
+++ nixpkgs/trunk/pkgs/games/naev/default.nix Mon Jan 2 17:37:53 2012
(r31214)
@@ -1,25 +1,33 @@
-{ fetchurl, stdenv, lua5, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis
-, libpng, mesa, makeWrapper }:
+{ fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis
+, libpng, mesa, makeWrapper, zlib }:
+let
+ pname = naev;
+ version = 0.5.0;
+ name = ${pname}-${version};
+in
stdenv.mkDerivation {
- name = naev-0.5.0beta1;
+ inherit name;
srcData = fetchurl {
-url = http://naev.googlecode.com/files/ndata-0.5.0-beta1;
-sha256 = 0pqys1wdlxa336i9gjxfkgnq42xrbvq58ym66y0aa9xm92vr53f6;
+url = mirror://sourceforge/naev/ndata-${version};
+sha256 = 0l05xxbbys3j5h6anvann2vylhp6hnxnzwpcaydaff8fpbbyi6r6;
};
src = fetchurl {
-url = http://naev.googlecode.com/files/naev-0.5.0-beta1.tar.bz2;
-sha256 = 1nkwjclfjypgdcfbfqkiidsvi0zfjvkcj0dgnrbj1g11rr6kd3wm;
+url = mirror://sourceforge/naev/${name}.tar.bz2;
+sha256 = 0gahi91lmpra0wvxsz49zwwb28q9w2v1s3y7r70252hq6v80kanb;
};
- buildInputs = [ SDL lua5 SDL_mixer openal libxml2 pkgconfig libvorbis
-libpng mesa makeWrapper ];
+ buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib ];
+
+ buildNativeInputs = [ pkgconfig makeWrapper ];
+
+ NIX_CFLAGS_COMPILE=-include ${zlib}/include/zlib.h;
postInstall = ''
ensureDir $out/share/naev
-cp $srcData $out/share/naev/ndata
+cp -v $srcData $out/share/naev/ndata
wrapProgram $out/bin/naev --add-flags $out/share/naev/ndata
'';
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31216 - in nixpkgs/trunk/pkgs: applications/science/misc/tulip top-level
Author: urkud
Date: Mon Jan 2 18:36:04 2012
New Revision: 31216
URL: https://nixos.org/websvn/nix/?rev=31216sc=1
Log:
tulip-3.6.1
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 Mon Jan
2 18:18:04 2012(r31215)
+++ nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix Mon Jan
2 18:36:04 2012(r31216)
@@ -1,22 +1,18 @@
-{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt
-, autoconf, automake, libtool, cmake, makeWrapper }:
+{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4
+, cmake, makeWrapper }:
-let version = 3.5.0; in
+let version = 3.6.1; in
stdenv.mkDerivation rec {
name = tulip-${version};
src = fetchurl {
-url =
mirror://sourceforge/auber/tulip/tulip-${version}/${name}-src.tar.gz;
-sha256 = 0wl0wqjlifpay61pn7dxr3dl5r4a7v80f5g277p6s06ibvn2p3ln;
+url = mirror://sourceforge/auber/${name}-src.tar.gz;
+sha256 = 0d76zmp7gmid4lc91zz6sp4rzxlga6vfwfqhap04326r4zl4nx1q;
};
- buildInputs = [ libxml2 freetype glew ]
-++ [ autoconf automake libtool cmake qt makeWrapper ];
- propagagedBuildInputs = [ mesa qt ];
+ buildInputs = [ libxml2 freetype glew mesa qt4 ];
- postInstall=''
-wrapProgram $out/bin/tulip
- '';
+ buildNativeInputs = [ cmake makeWrapper ];
# 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 Mon Jan 2 18:18:04
2012(r31215)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Jan 2 18:36:04
2012(r31216)
@@ -8327,9 +8327,7 @@
simgrid = callPackage ../applications/science/misc/simgrid { };
- tulip = callPackage ../applications/science/misc/tulip {
-qt = qt46;
- };
+ tulip = callPackage ../applications/science/misc/tulip { };
vite = callPackage ../applications/science/misc/vite {
qt = qt4;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31217 - in nixpkgs/branches/libpng15: . pkgs/applications/graphics/dia pkgs/applications/graphics/panotools pkgs/applications/graphics/xfig pkgs/applications/graphics/
Author: urkud Date: Mon Jan 2 19:24:08 2012 New Revision: 31217 URL: https://nixos.org/websvn/nix/?rev=31217sc=1 Log: Merge trunk Added: nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/monad-control/0.3.1.nix - copied unchanged from r31216, nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.3.1.nix Deleted: nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/monad-control/default.nix Modified: nixpkgs/branches/libpng15/ (props changed) nixpkgs/branches/libpng15/pkgs/applications/graphics/dia/default.nix nixpkgs/branches/libpng15/pkgs/applications/graphics/panotools/default.nix nixpkgs/branches/libpng15/pkgs/applications/graphics/xfig/builder.sh nixpkgs/branches/libpng15/pkgs/applications/graphics/xfig/default.nix nixpkgs/branches/libpng15/pkgs/applications/graphics/xscreensaver/default.nix (props changed) nixpkgs/branches/libpng15/pkgs/applications/misc/ikiwiki/default.nix nixpkgs/branches/libpng15/pkgs/applications/misc/xneur/0.8.nix (props changed) nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/icecat-4/ (props changed) nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/ (props changed) nixpkgs/branches/libpng15/pkgs/applications/science/misc/tulip/default.nix nixpkgs/branches/libpng15/pkgs/applications/version-management/git-and-tools/default.nix nixpkgs/branches/libpng15/pkgs/applications/version-management/git-and-tools/git-annex/default.nix nixpkgs/branches/libpng15/pkgs/build-support/clang-wrapper/ (props changed) nixpkgs/branches/libpng15/pkgs/build-support/gcc-wrapper/ (props changed) nixpkgs/branches/libpng15/pkgs/build-support/release/debian-build.nix (props changed) nixpkgs/branches/libpng15/pkgs/build-support/release/nix-build.nix (props changed) nixpkgs/branches/libpng15/pkgs/build-support/release/rpm-build.nix (props changed) nixpkgs/branches/libpng15/pkgs/build-support/release/source-tarball.nix (props changed) nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.10.1.nix (props changed) nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.10.2.nix (props changed) nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.8.2.nix (props changed) nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.8.3.nix (props changed) nixpkgs/branches/libpng15/pkgs/development/libraries/aterm/2.8.nix (props changed) nixpkgs/branches/libpng15/pkgs/development/libraries/fltk/fltk11.nix (props changed) nixpkgs/branches/libpng15/pkgs/development/libraries/glibc-2.9/ (props changed) nixpkgs/branches/libpng15/pkgs/development/libraries/goocanvas/ (props changed) nixpkgs/branches/libpng15/pkgs/development/libraries/openssl/default.nix nixpkgs/branches/libpng15/pkgs/development/libraries/pcre/default.nix (props changed) nixpkgs/branches/libpng15/pkgs/development/libraries/readline/readline6.nix (props changed) nixpkgs/branches/libpng15/pkgs/development/tools/misc/autoconf/2.13.nix (props changed) nixpkgs/branches/libpng15/pkgs/development/tools/misc/gnum4/default.nix (props changed) nixpkgs/branches/libpng15/pkgs/games/naev/default.nix nixpkgs/branches/libpng15/pkgs/misc/tex/pgf/1.x.nix (props changed) nixpkgs/branches/libpng15/pkgs/misc/tex/pgf/2.x.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/atheros/r3867.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel-headers/2.6.28.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel-headers/2.6.32.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/generic.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.25.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.27.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.28.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.29.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.32.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.33.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/qemu-kvm/default.nix (props changed) nixpkgs/branches/libpng15/pkgs/os-specific/linux/util-linux-ng/ (props changed) nixpkgs/branches/libpng15/pkgs/servers/mail/dovecot/1.1.1.nix (props changed) nixpkgs/branches/libpng15/pkgs/shells/bash/4.1.nix (props changed) nixpkgs/branches/libpng15/pkgs/shells/bash/4.2.nix (props changed)
[Nix-commits] SVN commit: nix - r31218 - nixpkgs/branches/libpng15/pkgs/tools/graphics/pngcrush
Author: urkud
Date: Mon Jan 2 19:25:08 2012
New Revision: 31218
URL: https://nixos.org/websvn/nix/?rev=31218sc=1
Log:
pngcrush-1.7.22
Modified:
nixpkgs/branches/libpng15/pkgs/tools/graphics/pngcrush/default.nix
Modified: nixpkgs/branches/libpng15/pkgs/tools/graphics/pngcrush/default.nix
==
--- nixpkgs/branches/libpng15/pkgs/tools/graphics/pngcrush/default.nix Mon Jan
2 19:24:08 2012(r31217)
+++ nixpkgs/branches/libpng15/pkgs/tools/graphics/pngcrush/default.nix Mon Jan
2 19:25:08 2012(r31218)
@@ -1,18 +1,19 @@
{ stdenv, fetchurl, libpng, xz }:
stdenv.mkDerivation rec {
- name = pngcrush-1.7.17;
+ name = pngcrush-1.7.22;
src = fetchurl {
url = mirror://sourceforge/pmt/${name}-nolib.tar.xz;
-sha256 = 0lh6wl0ci2y9b690n2zggc1mk21xj6iv378gvxk6gksgjkdw2rj2;
+sha256 = 1sngz34cssni4j7hvqhq5ms6h4ydb3b0s5y7fidv3kjms9g1xcsp;
};
configurePhase = ''
sed -i s,/usr,$out, Makefile
'';
- buildInputs = [ xz libpng ];
+ buildInputs = [ libpng ];
+ buildNativeInputs = [ xz ];
meta = {
homepage = http://pmt.sourceforge.net/pngcrush;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31219 - in nix/trunk: corepkgs corepkgs/buildenv corepkgs/nar scripts src/nix-env tests tests/lang
Author: eelco
Date: Tue Jan 3 00:16:29 2012
New Revision: 31219
URL: https://nixos.org/websvn/nix/?rev=31219sc=1
Log:
* Refactoring: Get rid of a few subdirectories in corepkgs/, and some
other simplifications.
* Use nix/... to locate the corepkgs. This allows them to be
overriden through $NIX_PATH.
* Use bash's pipefail option in the NAR builder so that we don't need
to create a temporary file.
Added:
nix/trunk/corepkgs/buildenv.nix
- copied, changed from r31218,
nix/branches/multiple-outputs-sandbox/corepkgs/buildenv/default.nix
nix/trunk/corepkgs/buildenv.pl (contents, props changed)
- copied, changed from r31218,
nix/branches/multiple-outputs-sandbox/corepkgs/buildenv/builder.pl.in
nix/trunk/corepkgs/nar.nix
- copied, changed from r31218, nix/trunk/corepkgs/nar/nar.nix
Deleted:
nix/trunk/corepkgs/buildenv/
nix/trunk/corepkgs/nar/
Modified:
nix/trunk/corepkgs/Makefile.am
nix/trunk/scripts/nix-push.in
nix/trunk/src/nix-env/user-env.cc
nix/trunk/tests/common.sh.in
nix/trunk/tests/init.sh
nix/trunk/tests/lang.sh
nix/trunk/tests/lang/eval-okay-search-path.nix
nix/trunk/tests/user-envs.sh
Modified: nix/trunk/corepkgs/Makefile.am
==
--- nix/trunk/corepkgs/Makefile.am Mon Jan 2 19:25:08 2012(r31218)
+++ nix/trunk/corepkgs/Makefile.am Tue Jan 3 00:16:29 2012(r31219)
@@ -1 +1,11 @@
-SUBDIRS = nar buildenv channels
+SUBDIRS = channels
+
+all-local: config.nix
+
+install-exec-local:
+ $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs
+ $(INSTALL_DATA) config.nix $(srcdir)/nar.nix $(srcdir)/buildenv.nix
$(srcdir)/buildenv.pl $(DESTDIR)$(datadir)/nix/corepkgs
+
+include ../substitute.mk
+
+EXTRA_DIST = config.nix.in nar.nix buildenv.nix buildenv.pl
Copied and modified: nix/trunk/corepkgs/buildenv.nix (from r31218,
nix/branches/multiple-outputs-sandbox/corepkgs/buildenv/default.nix)
==
--- nix/branches/multiple-outputs-sandbox/corepkgs/buildenv/default.nix Mon Jan
2 19:25:08 2012(r31218, copy source)
+++ nix/trunk/corepkgs/buildenv.nix Tue Jan 3 00:16:29 2012(r31219)
@@ -1,9 +1,12 @@
-{system, derivations, manifest}:
+with import nix/config.nix;
+
+{ system, derivations, manifest }:
derivation {
name = user-environment;
system = system;
- builder = ./builder.pl;
+ builder = perl;
+ args = [ -w ./buildenv.pl ];
manifest = manifest;
Copied and modified: nix/trunk/corepkgs/buildenv.pl (from r31218,
nix/branches/multiple-outputs-sandbox/corepkgs/buildenv/builder.pl.in)
==
--- nix/branches/multiple-outputs-sandbox/corepkgs/buildenv/builder.pl.in
Mon Jan 2 19:25:08 2012(r31218, copy source)
+++ nix/trunk/corepkgs/buildenv.pl Tue Jan 3 00:16:29 2012(r31219)
@@ -1,5 +1,3 @@
-#! @perl@ -w
-
use strict;
use Cwd;
use IO::Handle;
Copied and modified: nix/trunk/corepkgs/nar.nix (from r31218,
nix/trunk/corepkgs/nar/nar.nix)
==
--- nix/trunk/corepkgs/nar/nar.nix Mon Jan 2 19:25:08 2012
(r31218, copy source)
+++ nix/trunk/corepkgs/nar.nix Tue Jan 3 00:16:29 2012(r31219)
@@ -1,7 +1,30 @@
+with import nix/config.nix;
+
+let
+
+ builder = builtins.toFile nar.sh
+''
+ export PATH=${nixBinDir}:${coreutils}
+
+ echo packing ‘$storePath’...
+ mkdir $out
+ dst=$out/tmp.nar.bz2
+
+ set -o pipefail
+ nix-store --dump $storePath | ${bzip2} $dst
+
+ nix-hash --flat --type $hashAlgo --base32 $dst $out/narbz2-hash
+
+ mv $out/tmp.nar.bz2 $out/$(cat $out/narbz2-hash).nar.bz2
+'';
+
+in
+
{ system, storePath, hashAlgo }:
derivation {
name = nar;
- builder = ./nar.sh;
+ builder = shell;
+ args = [ -e builder ];
inherit system storePath hashAlgo;
}
Modified: nix/trunk/scripts/nix-push.in
==
--- nix/trunk/scripts/nix-push.in Mon Jan 2 19:25:08 2012(r31218)
+++ nix/trunk/scripts/nix-push.in Tue Jan 3 00:16:29 2012(r31219)
@@ -20,9 +20,6 @@
my $binDir = $ENV{NIX_BIN_DIR} || @bindir@;
-my $dataDir = $ENV{NIX_DATA_DIR};
-$dataDir = @datadir@ unless defined $dataDir;
-
# Parse the command line.
my $localCopy;
@@ -107,7 +104,7 @@
# Construct a Nix expression that creates a Nix archive.
my $nixexpr =
-((import $dataDir/nix/corepkgs/nar/nar.nix) .
+(import nix/nar.nix .
{ storePath = builtins.storePath \$storePath\; system =
\@system@\; hashAlgo = \$hashAlgo\; }) ;
print NIX $nixexpr;
Modified: nix/trunk/src/nix-env/user-env.cc
==
---
[Nix-commits] SVN commit: nix - r31220 - nix/trunk/scripts
Author: eelco
Date: Tue Jan 3 00:47:27 2012
New Revision: 31220
URL: https://nixos.org/websvn/nix/?rev=31220sc=1
Log:
* Use Nix::Config.
Modified:
nix/trunk/scripts/nix-build.in
nix/trunk/scripts/nix-collect-garbage.in
nix/trunk/scripts/nix-pull.in
nix/trunk/scripts/nix-push.in
Modified: nix/trunk/scripts/nix-build.in
==
--- nix/trunk/scripts/nix-build.in Tue Jan 3 00:16:29 2012(r31219)
+++ nix/trunk/scripts/nix-build.in Tue Jan 3 00:47:27 2012(r31220)
@@ -1,8 +1,7 @@
#! @perl@ -w -I@libexecdir@/nix
use strict;
-
-my $binDir = $ENV{NIX_BIN_DIR} || @bindir@;
+use Nix::Config;
my $addDrvLink = 0;
@@ -156,7 +155,7 @@
# Instantiate.
my @drvPaths;
# !!! would prefer the perl 5.8.0 pipe open feature here.
-my $pid = open(DRVPATHS, -|) || exec $binDir/nix-instantiate,
--add-root, $drvLink, --indirect, @instArgs, $expr;
+my $pid = open(DRVPATHS, -|) || exec
$Nix::Config::binDir/nix-instantiate, --add-root, $drvLink, --indirect,
@instArgs, $expr;
while (DRVPATHS) {chomp; push @drvPaths, $_;}
if (!close DRVPATHS) {
die nix-instantiate killed by signal . ($? 127) . \n if ($?
127);
@@ -170,7 +169,7 @@
# Build.
my @outPaths;
-$pid = open(OUTPATHS, -|) || exec $binDir/nix-store, --add-root,
$outLink, --indirect, -r,
+$pid = open(OUTPATHS, -|) || exec $Nix::Config::binDir/nix-store,
--add-root, $outLink, --indirect, -r,
@buildArgs, @drvPaths;
while (OUTPATHS) {chomp; push @outPaths, $_;}
if (!close OUTPATHS) {
Modified: nix/trunk/scripts/nix-collect-garbage.in
==
--- nix/trunk/scripts/nix-collect-garbage.inTue Jan 3 00:16:29 2012
(r31219)
+++ nix/trunk/scripts/nix-collect-garbage.inTue Jan 3 00:47:27 2012
(r31220)
@@ -1,11 +1,10 @@
#! @perl@ -w
use strict;
+use Nix::Config;
my $profilesDir = @localstatedir@/nix/profiles;
-my $binDir = $ENV{NIX_BIN_DIR} || @bindir@;
-
# Process the command line arguments.
my @args = ();
@@ -36,7 +35,7 @@
$name = $dir . / . $name;
if (-l $name (readlink($name) =~ /link/)) {
print STDERR removing old generations of profile $name\n;
-system($binDir/nix-env, -p, $name, --delete-generations,
old);
+system($Nix::Config::binDir/nix-env, -p, $name,
--delete-generations, old);
}
elsif (! -l $name -d $name) {
removeOldGenerations $name;
@@ -50,4 +49,4 @@
# Run the actual garbage collector.
-exec $binDir/nix-store, --gc, @args;
+exec $Nix::Config::binDir/nix-store, --gc, @args;
Modified: nix/trunk/scripts/nix-pull.in
==
--- nix/trunk/scripts/nix-pull.in Tue Jan 3 00:16:29 2012(r31219)
+++ nix/trunk/scripts/nix-pull.in Tue Jan 3 00:47:27 2012(r31220)
@@ -8,9 +8,6 @@
my $tmpDir = tempdir(nix-pull.XX, CLEANUP = 1, TMPDIR = 1)
or die cannot create a temporary directory;
-my $libexecDir = ($ENV{NIX_LIBEXEC_DIR} or @libexecdir@);
-my $storeDir = ($ENV{NIX_STORE_DIR} or @storedir@);
-my $stateDir = ($ENV{NIX_STATE_DIR} or @localstatedir@/nix);
my $manifestDir = $Nix::Config::manifestDir;
@@ -25,7 +22,7 @@
# Make sure that the manifests directory is scanned for GC roots.
-my $gcRootsDir = $stateDir/gcroots;
+my $gcRootsDir = $Nix::Config::stateDir/gcroots;
my $manifestDirLink = $gcRootsDir/manifests;
if (! -l $manifestDirLink) {
symlink($manifestDir, $manifestDirLink) or die cannot create symlink
`$manifestDirLink';
Modified: nix/trunk/scripts/nix-push.in
==
--- nix/trunk/scripts/nix-push.in Tue Jan 3 00:16:29 2012(r31219)
+++ nix/trunk/scripts/nix-push.in Tue Jan 3 00:47:27 2012(r31220)
@@ -18,8 +18,6 @@
my $extraCurlFlags = ${ENV{'CURL_FLAGS'}};
$curl = $curl $extraCurlFlags if defined $extraCurlFlags;
-my $binDir = $ENV{NIX_BIN_DIR} || @bindir@;
-
# Parse the command line.
my $localCopy;
@@ -79,7 +77,7 @@
# Get all paths referenced by the normalisation of the given
# Nix expression.
my $pid = open(READ,
-$binDir/nix-store --query --requisites --force-realise .
+$Nix::Config::binDir/nix-store --query --requisites --force-realise
.
--include-outputs '$path'|) or die;
while (READ) {
@@ -117,7 +115,7 @@
# Instantiate store derivations from the Nix expression.
my @storeExprs;
print STDERR instantiating store derivations...\n;
-my $pid = open(READ, $binDir/nix-instantiate $nixExpr|)
+my $pid = open(READ, $Nix::Config::binDir/nix-instantiate $nixExpr|)
or die cannot run nix-instantiate;
while (READ) {
chomp;
@@ -139,7 +137,7 @@
my @tmp2 = @tmp[0..$n - 1];
@tmp =
[Nix-commits] SVN commit: nix - r31221 - in nix/trunk: . corepkgs corepkgs/channels perl/lib/Nix scripts tests
Author: eelco
Date: Tue Jan 3 01:51:38 2012
New Revision: 31221
URL: https://nixos.org/websvn/nix/?rev=31221sc=1
Log:
* Add a test for nix-channel.
* Refactor the nix-channel unpacker a bit.
Added:
nix/trunk/corepkgs/unpack-channel.nix
- copied, changed from r31219, nix/trunk/corepkgs/channels/unpack.nix
nix/trunk/corepkgs/unpack-channel.sh
- copied, changed from r31219, nix/trunk/corepkgs/channels/unpack.sh.in
nix/trunk/tests/nix-channel.sh
Deleted:
nix/trunk/corepkgs/channels/
Modified:
nix/trunk/configure.ac
nix/trunk/corepkgs/Makefile.am
nix/trunk/perl/lib/Nix/Config.pm.in
nix/trunk/scripts/nix-channel.in
nix/trunk/tests/Makefile.am
nix/trunk/tests/config.nix.in
nix/trunk/tests/dependencies.nix
Modified: nix/trunk/configure.ac
==
--- nix/trunk/configure.ac Tue Jan 3 00:47:27 2012(r31220)
+++ nix/trunk/configure.ac Tue Jan 3 01:51:38 2012(r31221)
@@ -346,9 +346,6 @@
perl/Makefile
scripts/Makefile
corepkgs/Makefile
- corepkgs/nar/Makefile
- corepkgs/buildenv/Makefile
- corepkgs/channels/Makefile
doc/Makefile
doc/manual/Makefile
misc/Makefile
Modified: nix/trunk/corepkgs/Makefile.am
==
--- nix/trunk/corepkgs/Makefile.am Tue Jan 3 00:47:27 2012(r31220)
+++ nix/trunk/corepkgs/Makefile.am Tue Jan 3 01:51:38 2012(r31221)
@@ -1,11 +1,11 @@
-SUBDIRS = channels
-
all-local: config.nix
+files = nar.nix buildenv.nix buildenv.pl unpack-channel.nix unpack-channel.sh
+
install-exec-local:
$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs
- $(INSTALL_DATA) config.nix $(srcdir)/nar.nix $(srcdir)/buildenv.nix
$(srcdir)/buildenv.pl $(DESTDIR)$(datadir)/nix/corepkgs
+ $(INSTALL_DATA) config.nix $(files) $(DESTDIR)$(datadir)/nix/corepkgs
include ../substitute.mk
-EXTRA_DIST = config.nix.in nar.nix buildenv.nix buildenv.pl
+EXTRA_DIST = config.nix.in $(files)
Copied and modified: nix/trunk/corepkgs/unpack-channel.nix (from r31219,
nix/trunk/corepkgs/channels/unpack.nix)
==
--- nix/trunk/corepkgs/channels/unpack.nix Tue Jan 3 00:16:29 2012
(r31219, copy source)
+++ nix/trunk/corepkgs/unpack-channel.nix Tue Jan 3 01:51:38 2012
(r31221)
@@ -1,7 +1,11 @@
-{system, inputs}:
+with import nix/config.nix;
+
+{ system, inputs }:
derivation {
name = channels;
- builder = ./unpack.sh;
- inherit system inputs;
-}
\ No newline at end of file
+ builder = shell;
+ args = [ -e ./unpack-channel.sh ];
+ inherit system inputs bzip2 tar tr;
+ PATH = ${nixBinDir}:${coreutils};
+}
Copied and modified: nix/trunk/corepkgs/unpack-channel.sh (from r31219,
nix/trunk/corepkgs/channels/unpack.sh.in)
==
--- nix/trunk/corepkgs/channels/unpack.sh.inTue Jan 3 00:16:29 2012
(r31219, copy source)
+++ nix/trunk/corepkgs/unpack-channel.shTue Jan 3 01:51:38 2012
(r31221)
@@ -1,10 +1,5 @@
-#! @shell@ -e
-
-# Cygwin compatibility hack: bunzip2 expects cygwin.dll in $PATH.
-export PATH=@coreutils@
-
-@coreutils@/mkdir $out
-@coreutils@/mkdir $out/tmp
+mkdir $out
+mkdir $out/tmp
cd $out/tmp
inputs=($inputs)
@@ -14,22 +9,22 @@
echo unpacking channel $channelName
-@bzip2@ -d $channelTarball | @tar@ xf -
+$bzip2 -d $channelTarball | $tar xf -
if test -e */channel-name; then
-channelName=$(@coreutils@/cat */channel-name)
+channelName=$(cat */channel-name)
fi
nr=1
-attrName=$(echo $channelName | @tr@ -- '- ' '__')
+attrName=$(echo $channelName | $tr -- '- ' '__')
dirName=$attrName
while test -e ../$dirName; do
nr=$((nr+1))
dirName=$attrName-$nr
done
-@coreutils@/mv * ../$dirName # !!! hacky
+mv * ../$dirName # !!! hacky
done
cd ..
-@coreutils@/rmdir tmp
+rmdir tmp
Modified: nix/trunk/perl/lib/Nix/Config.pm.in
==
--- nix/trunk/perl/lib/Nix/Config.pm.in Tue Jan 3 00:47:27 2012(r31220)
+++ nix/trunk/perl/lib/Nix/Config.pm.in Tue Jan 3 01:51:38 2012(r31221)
@@ -2,6 +2,7 @@
$binDir = $ENV{NIX_BIN_DIR} || @bindir@;
$libexecDir = $ENV{NIX_LIBEXEC_DIR} || @libexecdir@;
+$stateDir = $ENV{NIX_STATE_DIR} || @localstatedir@/nix;
$manifestDir = $ENV{NIX_MANIFESTS_DIR} || @localstatedir@/nix/manifests;
$logDir = $ENV{NIX_LOG_DIR} || @localstatedir@/log/nix;
$confDir = $ENV{NIX_CONF_DIR} || @sysconfdir@/nix;
Modified: nix/trunk/scripts/nix-channel.in
==
--- nix/trunk/scripts/nix-channel.inTue Jan 3 00:47:27 2012(r31220)
+++
