JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Added udisks, the replacement of the disk management bits of HAL

Browse Source 
(which is obsolete).
* lvm2: updated to 2.02.86.  Also install the pkgconfig files and
  build liblvm2app.
* Added libatasmart (udisks dependency for querying ATA SMART status).
* Updated sg3_utils to 1.31.

svn path=/nixpkgs/branches/kde-4.7/; revision=27908
This commit is contained in:
Eelco Dolstra 2011-07-23 01:29:51 +00:00
parent 012e221de9
commit 982a83aa2e
5 changed files with 62 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/os-specific/linux/libatasmart/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, fetchurl, pkgconfig, udev }:
stdenv.mkDerivation rec {
name = "libatasmart-0.17";
src = fetchurl {
url = "http://0pointer.de/public/${name}.tar.gz";
sha256 = "1zazxnqsirlv9gkzij6z31b21gv2nv7gkpja0wpxwb7kfh9a2qid";
};
buildInputs = [ pkgconfig udev ];
meta = {
homepage = http://0pointer.de/public/;
description = "Library for querying ATA SMART status";
platforms = stdenv.lib.platforms.linux;
};
}

11
pkgs/os-specific/linux/lvm2/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, udev }:
{ stdenv, fetchurl, pkgconfig, udev }:
let
v = "2.02.65";
v = "2.02.86";
in
stdenv.mkDerivation {
@ -9,12 +9,13 @@ stdenv.mkDerivation {
src = fetchurl {
url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz";
sha256 = "1lbskrj4pxbipq8f0qhql3p1nqa796v4i1cy6n2fmmbs3fwmfh9a";
sha256 = "0bam8ampdqn4xx2agrvh5vn4xdi0gb9lmfsm31fm302y52jsyz2m";
};
configureFlags = "--disable-readline --enable-udev_rules --enable-udev_sync";
configureFlags =
"--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib";
buildInputs = [ udev ];
buildInputs = [ pkgconfig udev ];
# To prevent make install from failing.
preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\"";

32
pkgs/os-specific/linux/udisks/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib
, polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm
, libxslt, docbook_xsl, utillinux }:
stdenv.mkDerivation rec {
name = "udisks-1.0.3";
src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
sha256 = "0jwavs2ag0cv46517j17943s16a8fw2lqk4k3cljgivh5aswwnyr";
};
buildInputs =
[ pkgconfig sg3_utils udev glib dbus dbus_glib polkit parted
lvm2 libatasmart intltool libuuid libxslt docbook_xsl
];
configureFlags = "--localstatedir=/var";
preConfigure =
''
# Ensure that udisks can find the necessary programs.
substituteInPlace src/main.c --replace \
"/sbin:/bin:/usr/sbin:/usr/bin" \
"${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"
'';
meta = {
homepage = http://www.freedesktop.org/wiki/Software/udisks;
description = "A daemon and command-line utility for querying and manipulating storage devices";
};
}

4
pkgs/tools/system/sg3_utils/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "sg3_utils-1.29";
name = "sg3_utils-1.31";
src = fetchurl {
url = "http://sg.danny.cz/sg/p/${name}.tgz";
sha256 = "0d1vlijp9y4n3c0sm0zzba38ad87b5v6nh3prgd8sfwvy79720fi";
sha256 = "190hhkhl096fxkspkr93lrq1n79xz5c5i2n4n4g998qc3yv3hjyq";
};
meta = {

4
pkgs/top-level/all-packages.nix
View File

@ -5019,6 +5019,8 @@ let
libaio = callPackage ../os-specific/linux/libaio { };
libatasmart = callPackage ../os-specific/linux/libatasmart { };
libcgroup = callPackage ../os-specific/linux/libcg { };
libnl = callPackage ../os-specific/linux/libnl { };
@ -5688,6 +5690,8 @@ let
udev172 = callPackage ../os-specific/linux/udev/172.nix { };
udev = udev172;
udisks = callPackage ../os-specific/linux/udisks { };
uml = import ../os-specific/linux/kernel/linux-2.6.29.nix {
inherit fetchurl stdenv perl mktemp module_init_tools;
userModeLinux = true;