[Nix-commits] SVN commit: nix - r31926 - in nixpkgs/trunk/pkgs/os-specific/windows: mingwrt w32api

2012-01-30 Thread Ludovic Courtès
Author: ludo
Date: Mon Jan 30 09:53:39 2012
New Revision: 31926
URL: https://nixos.org/websvn/nix/?rev=31926sc=1

Log:
MinGW 3.20, and w32api 3.17-2.

Modified:
   nixpkgs/trunk/pkgs/os-specific/windows/mingwrt/default.nix
   nixpkgs/trunk/pkgs/os-specific/windows/w32api/default.nix

Modified: nixpkgs/trunk/pkgs/os-specific/windows/mingwrt/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/windows/mingwrt/default.nix  Sun Jan 29 
22:44:49 2012(r31925)
+++ nixpkgs/trunk/pkgs/os-specific/windows/mingwrt/default.nix  Mon Jan 30 
09:53:39 2012(r31926)
@@ -1,14 +1,14 @@
 {stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}:
 
 let
-  name = mingwrt-3.18;
+  name = mingwrt-3.20;
 in
 stdenv.mkDerivation (rec {
   inherit name;
 
   src = fetchurl {
-url = mirror://sourceforge/mingw/${name}-mingw32-src.tar.gz;
-sha256 = 0hmxgkxnf6an70g07gmyik46sw1qm204izh6sp923szddvypjjfy;
+url = 
mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz;
+sha256 = 02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91pi;
   };
 
 } //

Modified: nixpkgs/trunk/pkgs/os-specific/windows/w32api/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/windows/w32api/default.nix   Sun Jan 29 
22:44:49 2012(r31925)
+++ nixpkgs/trunk/pkgs/os-specific/windows/w32api/default.nix   Mon Jan 30 
09:53:39 2012(r31926)
@@ -1,16 +1,19 @@
-{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}:
+{ stdenv, fetchurl, xz, binutilsCross ? null
+, gccCross ? null, onlyHeaders ? false }:
 
 let
-  name = w32api-3.14;
+  name = w32api-3.17-2;
 in
 stdenv.mkDerivation ({
   inherit name;
- 
+
   src = fetchurl {
-url = mirror://sourceforge/mingw/${name}-mingw32-src.tar.gz;
-sha256 = 128ax8a4dlspxsi5fi7bi1aslppqx3kczr1ibzj1z1az48bvwp21;
+url = 
mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma;
+sha256 = 09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb;
   };
 
+  buildNativeInputs = [ xz ];
+
 } //
 (if onlyHeaders then {
   name = name + -headers;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r31927 - in nixpkgs/trunk/pkgs: os-specific/windows/pthread-w32 top-level

2012-01-30 Thread Ludovic Courtès
Author: ludo
Date: Mon Jan 30 09:53:45 2012
New Revision: 31927
URL: https://nixos.org/websvn/nix/?rev=31927sc=1

Log:
Add pthreads-w32.

Added:
   nixpkgs/trunk/pkgs/os-specific/windows/pthread-w32/
   nixpkgs/trunk/pkgs/os-specific/windows/pthread-w32/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Added: nixpkgs/trunk/pkgs/os-specific/windows/pthread-w32/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/windows/pthread-w32/default.nix  Mon Jan 
30 09:53:45 2012(r31927)
@@ -0,0 +1,53 @@
+{ fetchurl, stdenv, mingw_headers }:
+
+# This file is tweaked for cross-compilation only.
+assert stdenv ? cross;
+
+stdenv.mkDerivation {
+  name = pthread-w32-1.10.0;
+
+  src = fetchurl {
+url = 
ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-1-10-0-release.tar.gz;;
+sha256 = 1vllxxfa9a7mssb1x98a2r736vsv5ll3sjizbr7a8hw8j9p18j7n;
+  };
+
+  configurePhase =
+'' sed -i GNUmakefile \
+   -e 's/CC=gcc/CC=i686-pc-mingw32-gcc/g ;
+   s/windres/i686-pc-mingw32-windres/g ;
+   s/dlltool/i686-pc-mingw32-dlltool/g'
+'';
+
+  buildInputs = [ mingw_headers ];
+
+  buildPhase = make GC;# to build the GNU C dll with C cleanup code
+
+  installPhase =
+'' mkdir -p $out $out/include $out/lib
+   cp -v *pthread*{dll,a} $out/lib
+   cp -v pthread.h semaphore.h sched.h $out/include
+'';
+
+  meta = {
+description = POSIX threads for Woe32;
+
+longDescription =
+  '' The POSIX 1003.1-2001 standard defines an application programming
+ interface (API) for writing multithreaded applications.  This
+ interface is known more commonly as pthreads.  A good number of
+ modern operating systems include a threading library of some kind:
+ Solaris (UI) threads, Win32 threads, DCE threads, DECthreads, or any
+ of the draft revisions of the pthreads standard.  The trend is that
+ most of these systems are slowly adopting the pthreads standard API,
+ with application developers following suit to reduce porting woes.
+
+ Woe32 does not, and is unlikely to ever, support pthreads natively.
+ This project seeks to provide a freely available and high-quality
+ solution to this problem.
+  '';
+
+homepage = http://sourceware.org/pthreads-win32/;
+
+license = LGPLv2.1+;
+  };
+}

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Jan 30 09:53:39 
2012(r31926)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Jan 30 09:53:45 
2012(r31927)
@@ -6253,6 +6253,10 @@
   paths = [ w32api mingw_runtime ];
 };
 
+pthreads = callPackage ../os-specific/windows/pthread-w32 {
+  mingw_headers = mingw_headers2;
+};
+
 wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { };
   };
 
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r31930 - nixpkgs/trunk/pkgs/development/libraries/haskell/Chart

2012-01-30 Thread Peter Simons
Author: simons
Date: Mon Jan 30 10:52:07 2012
New Revision: 31930
URL: https://nixos.org/websvn/nix/?rev=31930sc=1

Log:
haskell-Chart: updated to version 0.15

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/Chart/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/Chart/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/Chart/default.nix  Mon Jan 
30 10:52:04 2012(r31929)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/Chart/default.nix  Mon Jan 
30 10:52:07 2012(r31930)
@@ -1,13 +1,13 @@
-{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, gtk
-, mtl, time
+{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, mtl
+, time
 }:
 
 cabal.mkDerivation (self: {
   pname = Chart;
-  version = 0.14;
-  sha256 = 0ji81j4c2by5zyrdhx1s17j6kqsi3ngr9y1zh7hr9wv7jsrj3rf2;
+  version = 0.15;
+  sha256 = 1357gqn2ifalknl85n2z9ysf195dnaxm175rp0kmmzbf4vik9gc4;
   buildDepends = [
-cairo colour dataAccessor dataAccessorTemplate gtk mtl time
+cairo colour dataAccessor dataAccessorTemplate mtl time
   ];
   meta = {
 homepage = http://www.dockerz.net/software/chart.html;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r31931 - nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart

2012-01-30 Thread Peter Simons
Author: simons
Date: Mon Jan 30 10:52:10 2012
New Revision: 31931
URL: https://nixos.org/websvn/nix/?rev=31931sc=1

Log:
haskell-hledger-chart: updated to version 0.16.1

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix  
Mon Jan 30 10:52:07 2012(r31930)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hledger-chart/default.nix  
Mon Jan 30 10:52:10 2012(r31931)
@@ -11,6 +11,9 @@
   buildDepends = [
 Chart cmdargs colour hledger hledgerLib HUnit safe time
   ];
+  patchPhase = ''
+sed -i hledger-chart.cabal -e 's|Chart = 0.11   0.15|Chart|g'
+  '';
   meta = {
 homepage = http://hledger.org;;
 description = A pie chart image generator for the hledger accounting 
tool;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] SVN commit: nix - r31934 - in nixpkgs/trunk/pkgs: tools/system/hardlink top-level

2012-01-30 Thread Peter Simons
Author: simons
Date: Mon Jan 30 11:40:20 2012
New Revision: 31934
URL: https://nixos.org/websvn/nix/?rev=31934sc=1

Log:
hardlink: initial version

Hardlink consolidates duplicate files in a directory hierarchy with hardlinks,
similar to nix-store --optimise.

IHMO, this program should be run by the default builder after $out has been set
up, to remove redundancy in the generated closures.

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

Added: nixpkgs/trunk/pkgs/tools/system/hardlink/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/system/hardlink/default.nixMon Jan 30 
11:40:20 2012(r31934)
@@ -0,0 +1,37 @@
+{ fetchurl, stdenv }:
+
+let
+  rev = 269cc6;
+
+  src = fetchurl {
+url = 
http://pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=blob_plain;f=hardlink.c;hb=${rev};;
+sha256 = 
721c54e653772e11bf0d30fb02aa21b96b147a1b68c0acb4f05cb87e7718bc12;
+name = hardlink.c;
+  };
+
+  man =  fetchurl {
+url = 
pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=blob_plain;f=hardlink.1;hb=${rev};
+sha256 = 
2f7e18a0259a2ceae316592e8b18bee525eb7e83fe3bb6b881e5dafa24747f2d;
+name = hardlink.1;
+  };
+in
+stdenv.mkDerivation {
+  name = hardlink-2010.1.${rev};
+
+  phases = [buildPhase];
+
+  buildPhase = ''
+mkdir -p $out/bin $out/share/man/man1
+gcc -O2 ${src} -o $out/bin/hardlink
+install -m 444 ${man} $out/share/man/man1/hardlink.1
+  '';
+
+  meta = {
+homepage = 
http://pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=summary;;
+description = consolidate duplicate files via hardlinks;
+license = stdenv.lib.licenses.gpl2Plus;
+
+platforms = stdenv.lib.platforms.unix;
+maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Jan 30 11:40:16 
2012(r31933)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Jan 30 11:40:20 
2012(r31934)
@@ -830,6 +830,8 @@
 
   pigz = callPackage ../tools/compression/pigz { };
 
+  hardlink = callPackage ../tools/system/hardlink { };
+
   halibut = callPackage ../tools/typesetting/halibut { };
 
   hddtemp = callPackage ../tools/misc/hddtemp { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] cleaning /tmp

2012-01-30 Thread Eelco Dolstra
Hi,

On 30/01/12 12:54, Florian Friesdorf wrote:

 services.cleanTmp.paths = [ '/tmp' '/var/tmp' ] (default)
 services.cleanTmp.onBoot = true;

The FHS says:

  Files and directories located in /var/tmp must not be deleted when the
  system is booted. Although data stored in /var/tmp is typically deleted
  in a site-specific manner, it is recommended that deletions occur at
  a less frequent interval than /tmp.

http://www.pathname.com/fhs/2.2/fhs-5.15.html

-- 
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] [Nix-commits] SVN commit: nix - r31934 - in nixpkgs/trunk/pkgs: tools/system/hardlink top-level

2012-01-30 Thread Eelco Dolstra
Hi,

On 30/01/12 12:40, Peter Simons wrote:

 IHMO, this program should be run by the default builder after $out has been 
 set
 up, to remove redundancy in the generated closures.

No, Nix should do that after the build has completed.  If the Nix DB were to
store the cryptographic hash of every regular file in the store (with an index
from hashes to paths), it would be very easy to do this on the fly.  And
nix-store --optimise would become a no-op.

-- 
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] cleaning /tmp

2012-01-30 Thread Florian Friesdorf
On Mon, 30 Jan 2012 13:08:28 +0100, Eelco Dolstra e.dols...@tudelft.nl wrote:
 Hi,
 
 On 30/01/12 12:54, Florian Friesdorf wrote:
 
  services.cleanTmp.paths = [ '/tmp' '/var/tmp' ] (default)

service.cleanTmp.paths = [ '/tmp' ] (default)

  services.cleanTmp.onBoot = true;
 
 The FHS says:
 
   Files and directories located in /var/tmp must not be deleted when the
   system is booted. Although data stored in /var/tmp is typically deleted
   in a site-specific manner, it is recommended that deletions occur at
   a less frequent interval than /tmp.
 
 http://www.pathname.com/fhs/2.2/fhs-5.15.html
 
 -- 
 Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
 ___
 nix-dev mailing list
 nix-dev@lists.science.uu.nl
 http://lists.science.uu.nl/mailman/listinfo/nix-dev

-- 
Florian Friesdorf f...@chaoflow.net
  GPG FPR: 7A13 5EEE 1421 9FC2 108D  BAAF 38F8 99A3 0C45 F083
Jabber/XMPP: f...@chaoflow.net
IRC: chaoflow on freenode,ircnet,blafasel,OFTC


pgpR3Godl3nre.pgp
Description: PGP signature
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] cleaning /tmp

2012-01-30 Thread Marc Weber
Can we compare the solution add nixos option to adding a recipes wiki
page adding such one liners as samples?

Marc Weber
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] udisks, autoreconf, r31679

2012-01-30 Thread Yury G. Kudryashov
Ludovic Courtès wrote:

 Hi,
 
 Yury G.  Kudryashov urkud.ur...@gmail.com skribis:
 
 Why `automake` was not enough for udisks? Why do we need full autoreconf?
 
 It’s rarely a good idea to run just ‘automake’, or ‘autoreconf’, or
 ‘libtoolize’, etc.  There are inter-dependencies among these things.
We're talking about one particular change in one particular file, not about 
a general situation.

P.S.: I'll try to push this change upstream once more. If I'll fail, I'll 
rewrite the patch in the form that (a) cannot be submitted upstream; but (b) 
doesn't need autoreconf.
-- 
Yury G. Kudryashov,
mailto: ur...@mccme.ru

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] SVN commit: nix - r31937 - in nixpkgs/trunk/pkgs/development/libraries: ffmpeg libvpx x264

2012-01-30 Thread Lluís Batlle
Author: viric
Date: Mon Jan 30 21:02:08 2012
New Revision: 31937
URL: https://nixos.org/websvn/nix/?rev=31937sc=1

Log:
Updating ffmpeg/x264/vpx

Modified:
   nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix
   nixpkgs/trunk/pkgs/development/libraries/libvpx/default.nix
   nixpkgs/trunk/pkgs/development/libraries/x264/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix Mon Jan 30 
19:05:24 2012(r31936)
+++ nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix Mon Jan 30 
21:02:08 2012(r31937)
@@ -18,11 +18,11 @@
 assert faacSupport - faac != null;
 
 stdenv.mkDerivation rec {
-  name = ffmpeg-0.8.1;
+  name = ffmpeg-0.10;
   
   src = fetchurl {
 url = http://www.ffmpeg.org/releases/${name}.tar.bz2;;
-sha256 = 0vdq6bmrsi55p1l3dddiwyqsspb3l5dgqb87lysf5cz3sjxcfw2v;
+sha256 = 1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3;
   };
   
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that

Modified: nixpkgs/trunk/pkgs/development/libraries/libvpx/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/libvpx/default.nix Mon Jan 30 
19:05:24 2012(r31936)
+++ nixpkgs/trunk/pkgs/development/libraries/libvpx/default.nix Mon Jan 30 
21:02:08 2012(r31937)
@@ -1,16 +1,16 @@
-{stdenv, fetchurl, bash, yasm, which}:
+{stdenv, fetchurl, bash, yasm, which, perl}:
 
 stdenv.mkDerivation rec {
-  name = libvpx-0.9.6;
+  name = libvpx-1.0.0;
   
   src = fetchurl {
-url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2;
-sha256 = 0wxay9wss4lawrcmnwqkpy0rdnaih1k7ilzh284mgyqnya78mg98;
+url = http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2;
+sha256 = 08gyx90ndv0v8dhbhp3jdh6g37pmcjlfwljzsy0nskm4345dpkh7;
   };
 
   patchPhase = ''
 sed -e 's,/bin/bash,${bash}/bin/bash,' -i configure build/make/version.sh \
-  examples/gen_example_code.sh
+  examples/gen_example_code.sh build/make/gen_asm_deps.sh
 sed -e '/enable linux/d' -i configure
   '';
 
@@ -34,7 +34,7 @@
 make quiet=false DIST_DIR=$out install
   '';
 
-  buildInputs = [ yasm which ];
+  buildInputs = [ yasm which perl ];
 
   meta = {
 description = VP8 video encoder;

Modified: nixpkgs/trunk/pkgs/development/libraries/x264/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/x264/default.nix   Mon Jan 30 
19:05:24 2012(r31936)
+++ nixpkgs/trunk/pkgs/development/libraries/x264/default.nix   Mon Jan 30 
21:02:08 2012(r31937)
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, yasm}:
 
 stdenv.mkDerivation rec {
-  version = snapshot-20110724-2245-stable;
+  version = snapshot-20120129-2245-stable;
   name = x264-${version};
 
   src = fetchurl {
 url = 
ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2;;
-sha256 = 07bylkh8cwcmj01sr41hhrvfbciyixhw1irdpj01kz9d0h8dhhpz;
+sha256 = 1i63xsa46a5l0ys3mqbcqr4gr5kpaf9fs05cbf0782iir5k07pcr;
   };
 
   patchPhase = ''
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] udisks, autoreconf, r31679

2012-01-30 Thread Ludovic Courtès
Hi Yury,

Yury G.  Kudryashov urkud.ur...@gmail.com skribis:

 P.S.: I'll try to push this change upstream once more. If I'll fail, I'll 
 rewrite the patch in the form that (a) cannot be submitted upstream; but (b) 
 doesn't need autoreconf.

I’m all for this actually.  I think I was just answering to a “your
Automake update broke that” kind of query, and tried to do that in a
timely fashion.  ;-)

Thanks,
Ludo’.

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] [Nix-commits] SVN commit: nix - r31936 - in nixpkgs/trunk/pkgs: tools/misc/cowsay top-level

2012-01-30 Thread Eelco Dolstra
Hi,

On 01/30/2012 08:05 PM, Rob Vermaas wrote:

 +  name = cowsay-3.03;

Could you add a meta.description attribute please?  I'm intrigued by 
things that have warez in the URL :-)

-- 
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] [Nix-commits] SVN commit: nix - r31934 - in nixpkgs/trunk/pkgs: tools/system/hardlink top-level

2012-01-30 Thread Shea Levy
On 1/30/12 7:10 AM, Eelco Dolstra wrote:
 Hi,

 On 30/01/12 12:40, Peter Simons wrote:

 IHMO, this program should be run by the default builder after $out has been 
 set
 up, to remove redundancy in the generated closures.
 No, Nix should do that after the build has completed.  If the Nix DB were to
 store the cryptographic hash of every regular file in the store (with an index
 from hashes to paths), it would be very easy to do this on the fly.  And
 nix-store --optimise would become a no-op.


As long as there's an actual file comparison after hashes match... I'd 
hate for a collision to cause a file to be completely wrong!
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] SVN commit: nix - r31938 - nixpkgs/trunk/pkgs/tools/misc/cowsay

2012-01-30 Thread Rob Vermaas
Author: rob
Date: Tue Jan 31 06:59:02 2012
New Revision: 31938
URL: https://nixos.org/websvn/nix/?rev=31938sc=1

Log:
add meta attribute for cowsay

Modified:
   nixpkgs/trunk/pkgs/tools/misc/cowsay/default.nix

Modified: nixpkgs/trunk/pkgs/tools/misc/cowsay/default.nix
==
--- nixpkgs/trunk/pkgs/tools/misc/cowsay/default.nixMon Jan 30 21:02:08 
2012(r31937)
+++ nixpkgs/trunk/pkgs/tools/misc/cowsay/default.nixTue Jan 31 06:59:02 
2012(r31938)
@@ -10,4 +10,9 @@
   installPhase = ''
 bash ./install.sh $out
   '';
+
+  meta = {
+description = cowsay is a program which generates ASCII pictures of a cow 
with a message.;
+homepage = http://www.nog.net/~tony/warez/cowsay.shtml;
+  };
 }
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] [Nix-commits] SVN commit: nix - r31934 - in nixpkgs/trunk/pkgs: tools/system/hardlink top-level

2012-01-30 Thread Yury G. Kudryashov
Eelco Dolstra wrote:

 Hi,
 
 On 30/01/12 12:40, Peter Simons wrote:
 
 IHMO, this program should be run by the default builder after $out has
 been set up, to remove redundancy in the generated closures.
 
 No, Nix should do that after the build has completed.  If the Nix DB were
 to store the cryptographic hash of every regular file in the store
Just create /nix/store/by-hash/first-5-digits/next-5-digits/remaining-
digits/number and hardlink every file to this path. Here number will be 0 
for most files, and increase only in case of file collisions.
-- 
Yury G. Kudryashov,
mailto: ur...@mccme.ru

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev