Author: viric
Date: Wed Aug 24 07:48:02 2011
New Revision: 28788
URL: https://svn.nixos.org/websvn/nix/?rev=28788&sc=1
Log:
Updating dos2unix, that now includes also unix2dos.
Deleted:
nixpkgs/trunk/pkgs/tools/text/dos2unix/dos2unix-3.1-manpage-update-57507.patch
nixpkgs/trunk/pkgs/tools/text/dos2unix/dos2unix-3.1-preserve-file-modes.patch
nixpkgs/trunk/pkgs/tools/text/dos2unix/dos2unix-3.1-safeconv.patch
nixpkgs/trunk/pkgs/tools/text/dos2unix/dos2unix-3.1-segfault.patch
nixpkgs/trunk/pkgs/tools/text/dos2unix/dos2unix-3.1-tmppath.patch
nixpkgs/trunk/pkgs/tools/text/dos2unix/dos2unix-3.1.patch
nixpkgs/trunk/pkgs/tools/text/dos2unix/dos2unix-c-missing-arg.patch
nixpkgs/trunk/pkgs/tools/text/dos2unix/dos2unix-manpage.patch
nixpkgs/trunk/pkgs/tools/text/dos2unix/dos2unix-missing-proto.patch
nixpkgs/trunk/pkgs/tools/text/dos2unix/dos2unix-preserve-file-modes.patch
nixpkgs/trunk/pkgs/tools/text/unix2dos/
Modified:
nixpkgs/trunk/pkgs/tools/text/dos2unix/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
nixpkgs/trunk/pkgs/top-level/platforms.nix
Modified: nixpkgs/trunk/pkgs/tools/text/dos2unix/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/text/dos2unix/default.nix Tue Aug 23 17:52:05
2011 (r28787)
+++ nixpkgs/trunk/pkgs/tools/text/dos2unix/default.nix Wed Aug 24 07:48:02
2011 (r28788)
@@ -1,41 +1,24 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, perl, gettext }:
stdenv.mkDerivation {
- name = "dos2unix-2.2";
+ name = "dos2unix-5.3.1";
src = fetchurl {
- url =
http://cvs.fedoraproject.org/repo/pkgs/dos2unix/dos2unix-3.1.tar.bz2/f90026a397cf787083ec2e4892c6dcdd/dos2unix-3.1.tar.bz2;
- md5 = "f90026a397cf787083ec2e4892c6dcdd";
+ url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-5.3.1.tar.gz;
+ sha256 = "0bwqw3wi0j4f1x8d39xw5v57ac0bc58j41vjx8v2qm1smg9jyci1";
};
-
- patches = [
- ./dos2unix-3.1.patch
- ./dos2unix-3.1-segfault.patch
- ./dos2unix-3.1-safeconv.patch
- ./dos2unix-3.1-manpage-update-57507.patch
- ./dos2unix-3.1-preserve-file-modes.patch
- ./dos2unix-3.1-tmppath.patch
- ./dos2unix-c-missing-arg.patch
- ./dos2unix-missing-proto.patch
- ./dos2unix-manpage.patch
- ./dos2unix-preserve-file-modes.patch
- ];
- installPhase = ''
- ensureDir $out/bin
- ensureDir $out/share/man/man1
- install -p -m755 dos2unix $out/bin
- install -p -m644 dos2unix.1 $out/share/man/man1
- ln -s dos2unix $out/bin/mac2unix
+ configurePhase = ''
+ sed -i -e s,/usr,$out, Makefile
'';
- buildPhase = ''
- rm -f dos2unix
- make dos2unix
- '';
+ buildInputs = [ perl gettext ];
meta = {
- homepage = http://unknown/;
- description = "dos2unix tool";
+ homepage = http://waterlan.home.xs4all.nl/dos2unix.html;
+ description = "Tools to transform text files from dos to unix formats and
vicervesa";
+ license = "BSD";
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = with stdenv.lib.platforms; all;
};
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 23 17:52:05
2011 (r28787)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 24 07:48:02
2011 (r28788)
@@ -667,8 +667,6 @@
dos2unix = callPackage ../tools/text/dos2unix { };
- unix2dos = callPackage ../tools/text/unix2dos { };
-
uni2ascii = callPackage ../tools/text/uni2ascii { };
gawk = callPackage ../tools/text/gawk { };
Modified: nixpkgs/trunk/pkgs/top-level/platforms.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/platforms.nix Tue Aug 23 17:52:05 2011
(r28787)
+++ nixpkgs/trunk/pkgs/top-level/platforms.nix Wed Aug 24 07:48:02 2011
(r28788)
@@ -24,6 +24,10 @@
'';
};
+ pc_simplekernel = pc // {
+ kernelAutoModules = false;
+ };
+
sheevaplug = {
name = "sheevaplug";
kernelMajor = "2.6";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
