From c8aed4202dd7ba1beb7ccaf94991f96783b92ded Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 17:25:59 +0100 Subject: [PATCH] eject: Remove This command is part of util-linux now. --- pkgs/os-specific/linux/eject/default.nix | 14 -------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 pkgs/os-specific/linux/eject/default.nix diff --git a/pkgs/os-specific/linux/eject/default.nix b/pkgs/os-specific/linux/eject/default.nix deleted file mode 100644 index eec1ec5342c..00000000000 --- a/pkgs/os-specific/linux/eject/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, gettext}: - -stdenv.mkDerivation { - name = "eject-2.1.5"; - #builder = ./builder.sh; - src = fetchurl { - url = http://ca.geocities.com/jefftranter@rogers.com/eject-2.1.5.tar.gz; - sha256 = "0mgy5wp40rsalfkxs6mvsg3s7yaqf2iq49iv4axf9zac9037k7zg"; - }; - buildInputs = [gettext]; - preBuild = " - makeFlagsArray=(PREFIX=$out) - "; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2832abc5d3b..f747716d105 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5643,7 +5643,7 @@ let ebtables = callPackage ../os-specific/linux/ebtables { }; - eject = callPackage ../os-specific/linux/eject { }; + eject = utillinux; ffado = callPackage ../os-specific/linux/ffado { };