From 5ae216558f568102b260666315d27de2e4cb4530 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Oct 2014 01:13:26 -0700
Subject: [PATCH] jfsrec: Remove derivation

---
 .../cd-dvd/system-tarball-fuloong2f.nix       |  1 -
 nixos/modules/profiles/base.nix               |  1 -
 pkgs/tools/filesystems/jfsrec/default.nix     | 23 ------------------
 .../filesystems/jfsrec/jfsrec-gcc-4.3.patch   | 24 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 pkgs/top-level/release.nix                    |  1 -
 6 files changed, 52 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/jfsrec/default.nix
 delete mode 100644 pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch

diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 7d3346e4ea1f..bbf0311c04d6 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -76,7 +76,6 @@ in
       pkgs.ntfsprogs # for resizing NTFS partitions
       pkgs.btrfsProgs
       pkgs.jfsutils
-      pkgs.jfsrec
 
       # Some compression/archiver tools.
       pkgs.unzip
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 7a6f76572058..3d1412b56859 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -34,7 +34,6 @@
     pkgs.xfsprogs
     pkgs.jfsutils
     pkgs.f2fs-tools
-    #pkgs.jfsrec # disabled because of Boost dependency
 
     # Some compression/archiver tools.
     pkgs.unzip
diff --git a/pkgs/tools/filesystems/jfsrec/default.nix b/pkgs/tools/filesystems/jfsrec/default.nix
deleted file mode 100644
index 5b5e7c8808e1..000000000000
--- a/pkgs/tools/filesystems/jfsrec/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, boost }:
-
-stdenv.mkDerivation {
-  name = "jfsrec-0-pre-svn-7";
-
-  src = fetchurl {
-    url = mirror://sourceforge/jfsrec/jfsrec-svn-7.tar.gz;
-    sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg";
-  };
-
-  patches = [ ./jfsrec-gcc-4.3.patch ];
-  buildInputs = [ boost ];
-
-  preConfigure =
-    ''
-      sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp
-    '';
-
-  meta = {
-    description = "JFS recovery tool";
-    homepage = http://jfsrec.sourceforge.net/;
-  };
-}
diff --git a/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch b/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch
deleted file mode 100644
index 063a7c24813b..000000000000
--- a/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Taken from Archlinux, although this solves the build in gcc 4.4, not 4.3.
-http://aur.archlinux.org/packages/jfsrec-svn/jfsrec-svn/jfsrec-gcc-4.3.patch
-diff -uBdr jfsrec/src/device.cpp jfsrec-build/src/device.cpp
---- jfsrec/src/device.cpp	2009-12-01 18:34:03.860437077 +0100
-+++ jfsrec-build/src/device.cpp	2009-12-01 18:39:48.297067088 +0100
-@@ -20,6 +20,7 @@
- //Parts of the code in this file was originally taken from JFS's xpeek (debugfs_jfs)
- 
- #include "device.h"
-+#include <stdio.h>
- #ifdef __linux__
-  #include <linux/fs.h>
-  #include <sys/ioctl.h>
-diff -uBdr jfsrec/src/unicode_to_utf8.cpp jfsrec-build/src/unicode_to_utf8.cpp
---- jfsrec/src/unicode_to_utf8.cpp	2009-12-01 18:34:03.860437077 +0100
-+++ jfsrec-build/src/unicode_to_utf8.cpp	2009-12-01 18:39:43.501626737 +0100
-@@ -8,6 +8,7 @@
-  */
- #include <config.h>
- #include "unicode_to_utf8.h"
-+#include <string.h>
- #define JFS_PATH_MAX 4096
- 
- /*
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ac356f524e0..d74d6dfb93f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1479,8 +1479,6 @@ let
 
   jdiskreport = callPackage ../tools/misc/jdiskreport { };
 
-  jfsrec = callPackage ../tools/filesystems/jfsrec { };
-
   jfsutils = callPackage ../tools/filesystems/jfsutils { };
 
   jhead = callPackage ../tools/graphics/jhead { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b07efec5c674..a788427aa20c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -129,7 +129,6 @@ let
       inkscape = linux;
       irssi = linux;
       jfsutils = linux;
-      jfsrec = linux;
       jnettop = linux;
       jwhois = linux;
       kbd = linux;