diff options
Diffstat (limited to 'pkgs/os-specific/linux/reiserfsprogs')
-rw-r--r-- | pkgs/os-specific/linux/reiserfsprogs/default.nix | 14 | ||||
-rw-r--r-- | pkgs/os-specific/linux/reiserfsprogs/headers-fix.patch | 19 |
2 files changed, 7 insertions, 26 deletions
diff --git a/pkgs/os-specific/linux/reiserfsprogs/default.nix b/pkgs/os-specific/linux/reiserfsprogs/default.nix index 324ba28524c..1fc4fed12d5 100644 --- a/pkgs/os-specific/linux/reiserfsprogs/default.nix +++ b/pkgs/os-specific/linux/reiserfsprogs/default.nix @@ -2,15 +2,15 @@ args: with args; stdenv.mkDerivation { name = "reiserfsprogs-3.6.19"; + src = fetchurl { - url = ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-3.6.19.tar.gz; - sha256 = "1gv8gr0l5l2j52540y2wj9c9h7fn0r3vabykf95748ydmr9jr1n0"; - }; + url = http://chichkin_i.zelnet.ru/namesys/reiserfsprogs-3.6.19.tar.gz; + sha256 = "1gv8gr0l5l2j52540y2wj9c9h7fn0r3vabykf95748ydmr9jr1n0"; + }; - patches = [./headers-fix.patch]; meta = { - homepage=http://www.namesys.com/; - description="Reiserfs Utilities"; - license="GPL-2"; + homepage = http://www.namesys.com/; + description = "Reiserfs utilities"; + license = "GPL-2"; }; } diff --git a/pkgs/os-specific/linux/reiserfsprogs/headers-fix.patch b/pkgs/os-specific/linux/reiserfsprogs/headers-fix.patch deleted file mode 100644 index 2c6693dae75..00000000000 --- a/pkgs/os-specific/linux/reiserfsprogs/headers-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -pruN 1:3.6.19-4/include/reiserfs_fs.h 1:3.6.19-4ubuntu2/include/reiserfs_fs.h ---- 1:3.6.19-4/include/reiserfs_fs.h 2004-09-16 08:49:05.000000000 +0100 -+++ 1:3.6.19-4ubuntu2/include/reiserfs_fs.h 2006-12-14 18:08:28.000000000 +0000 -@@ -38,15 +38,10 @@ - # define extern_inline - #endif - --#include <asm/unaligned.h> -- - #ifndef get_unaligned --#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \ -- defined(__PPC) || defined(powerpc) || defined(__powerpc__) - # define get_unaligned(ptr) (*(ptr)) - # define put_unaligned(val,ptr) ((void)(*(ptr) = (val))) - #endif --#endif - - #define get_leXX(xx,p,field) (le##xx##_to_cpu ((p)->field)) - #define set_leXX(xx,p,field,val) do { (p)->field = cpu_to_le##xx(val); } while (0) |