Author: NicolasPierron
Date: Mon Sep 5 08:32:55 2011
New Revision: 29017
URL: https://svn.nixos.org/websvn/nix/?rev=29017&sc=1
Log:
rdiff-backup: Fix nix expression.
Modified:
nixpkgs/trunk/pkgs/tools/backup/rdiff-backup/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/backup/rdiff-backup/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/backup/rdiff-backup/default.nix Mon Sep 5
08:31:49 2011 (r29016)
+++ nixpkgs/trunk/pkgs/tools/backup/rdiff-backup/default.nix Mon Sep 5
08:32:55 2011 (r29017)
@@ -1,4 +1,5 @@
-args: with args;
+{stdenv, fetchurl, python, librsync, gnused }:
+
stdenv.mkDerivation {
name = "rdiff-backup-1.1.14";
@@ -7,9 +8,9 @@
sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h";
};
- phases = "installPhase";
+ phases = "unpackPhase installPhase";
installPhase = ''
- python setup.py install --prefix=$out
+ python ./setup.py install --prefix=$out
sed -i $out/bin/rdiff-backup -e \
"/import sys/ asys.path += [ \"$out/lib/python2.4/site-packages/\" ]"
'';
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 5 08:31:49
2011 (r29016)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 5 08:32:55
2011 (r29017)
@@ -1227,10 +1227,7 @@
replace = callPackage ../tools/text/replace { };
- /*
- rdiff_backup = callPackage ../tools/backup/rdiff-backup {
- python=python; };
- */
+ rdiff_backup = callPackage ../tools/backup/rdiff-backup { };
ripmime = callPackage ../tools/networking/ripmime {};
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
