summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-04-17 12:40:16 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2018-04-17 12:40:16 -0500
commit6c182dd14dea6a68dd80e780c763b76dfceae0a2 (patch)
treeda48ce9dbaa8718a6d5be5d0015da6978053cbda
parent88098d58f22431487722adf9c66ead0cf70f84e2 (diff)
downloadnixlib-6c182dd14dea6a68dd80e780c763b76dfceae0a2.tar
nixlib-6c182dd14dea6a68dd80e780c763b76dfceae0a2.tar.gz
nixlib-6c182dd14dea6a68dd80e780c763b76dfceae0a2.tar.bz2
nixlib-6c182dd14dea6a68dd80e780c763b76dfceae0a2.tar.lz
nixlib-6c182dd14dea6a68dd80e780c763b76dfceae0a2.tar.xz
nixlib-6c182dd14dea6a68dd80e780c763b76dfceae0a2.tar.zst
nixlib-6c182dd14dea6a68dd80e780c763b76dfceae0a2.zip
Revert "hfsprogs: init at 332.25"
This reverts commit d0dcad3b91212179a27987ad17b1cbbfceb71a9a.

diskdev_cmds is now packaged as darwin.diskdev_cmds. Linux support is
unknown right now (but PRs are accepted).
-rw-r--r--pkgs/tools/filesystems/hfsprogs/default.nix45
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 0 insertions, 47 deletions
diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix
deleted file mode 100644
index 25ec31ea698a..000000000000
--- a/pkgs/tools/filesystems/hfsprogs/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, openssl, libbsd }:
-
-let version = "332.25";
-    package_name = "hfsprogs"; in
-stdenv.mkDerivation rec {
-  name = "${package_name}-${version}";
-  srcs = [
-    (fetchurl {
-      url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/${package_name}_${version}-11.debian.tar.gz";
-      sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c";
-    })
-    (fetchurl {
-      url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz";
-      sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6";
-    })
-  ];
-
-  sourceRoot = "diskdev_cmds-" + version;
-  patches = [ "../debian/patches/*.patch" ];
-
-  buildInputs = [ openssl libbsd ];
-  makefile = "Makefile.lnx";
-
-  # Inspired by PKGBUILD of https://www.archlinux.org/packages/community/x86_64/hfsprogs/
-  installPhase = ''
-    # Create required package directories
-    install -m 755 -d "$out/bin"
-    install -m 755 -d "$out/share/${package_name}"
-    install -m 755 -d "$out/share/man/man8/"
-    # Copy executables
-    install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus"
-    install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus"
-    # Copy shared data
-    install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/${package_name}/hfsbootdata"
-    # Copy man pages
-    install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8"
-    install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8"
-  '';
-
-  meta = {
-    description = "HFS/HFS+ user space utils";
-    license = stdenv.lib.licenses.apsl20;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95a0b1ca9e33..4ce580e1589b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2888,8 +2888,6 @@ with pkgs;
 
   hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };
 
-  hfsprogs = callPackage ../tools/filesystems/hfsprogs { };
-
   highlight = callPackage ../tools/text/highlight ({
     lua = lua5;
   } // lib.optionalAttrs stdenv.isDarwin {