From 7ce97cc443485c8d455312652dc0765f08107cf2 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 1 Apr 2013 18:12:32 +0200
Subject: udisks: split to udisks1 (stays default) and udisks2

---
 pkgs/os-specific/linux/udisks/1-default.nix | 38 +++++++++++++++++++++++++++++
 pkgs/os-specific/linux/udisks/2-default.nix | 38 +++++++++++++++++++++++++++++
 pkgs/os-specific/linux/udisks/default.nix   | 38 -----------------------------
 pkgs/top-level/all-packages.nix             |  4 ++-
 4 files changed, 79 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/os-specific/linux/udisks/1-default.nix
 create mode 100644 pkgs/os-specific/linux/udisks/2-default.nix
 delete mode 100644 pkgs/os-specific/linux/udisks/default.nix

diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix
new file mode 100644
index 000000000000..b53af52755fa
--- /dev/null
+++ b/pkgs/os-specific/linux/udisks/1-default.nix
@@ -0,0 +1,38 @@
+{ 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.4";
+
+  src = fetchurl {
+    url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
+    sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5";
+  };
+
+  patches = [ ./purity.patch ./no-pci-db.patch ];
+
+  postPatch =
+    ''
+      sed -e 's,/sbin/mdadm,${mdadm}&,g' -e "s,@slashlibdir@,$out/lib,g" -i data/80-udisks.rules
+
+      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"
+    '';
+
+  buildInputs =
+    [ sg3_utils udev glib dbus dbus_glib polkit parted
+      lvm2 libatasmart intltool libuuid libxslt docbook_xsl
+    ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  configureFlags = "--localstatedir=/var --enable-lvm2";
+
+  meta = {
+    homepage = http://www.freedesktop.org/wiki/Software/udisks;
+    description = "A daemon and command-line utility for querying and manipulating storage devices";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
new file mode 100644
index 000000000000..b7be51c56fcc
--- /dev/null
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, intltool
+, expat, acl, udev, glib, libatasmart, polkit
+, libxslt, docbook_xsl, utillinux, mdadm
+}:
+
+stdenv.mkDerivation rec {
+  name = "udisks-2.1.0";
+
+  src = fetchurl {
+    url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2";
+    sha256 = "1a0mipihilscv9jwy59xrqn2kkri9p12a09anpjdld83l7jhh0ii";
+  };
+
+  postPatch =
+    ''
+      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"
+    '';
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  propagatedBuildInputs = [ expat acl udev glib libatasmart polkit ]; # in closure anyway
+
+  buildInputs = [ libxslt docbook_xsl ];
+
+  configureFlags = [
+    "--localstatedir=/var"
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
+    "--with-udevdir=$(out)/lib/udev"
+  ];
+
+  meta = {
+    homepage = http://www.freedesktop.org/wiki/Software/udisks;
+    description = "A daemon and command-line utility for querying and manipulating storage devices";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix
deleted file mode 100644
index b53af52755fa..000000000000
--- a/pkgs/os-specific/linux/udisks/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ 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.4";
-
-  src = fetchurl {
-    url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5";
-  };
-
-  patches = [ ./purity.patch ./no-pci-db.patch ];
-
-  postPatch =
-    ''
-      sed -e 's,/sbin/mdadm,${mdadm}&,g' -e "s,@slashlibdir@,$out/lib,g" -i data/80-udisks.rules
-
-      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"
-    '';
-
-  buildInputs =
-    [ sg3_utils udev glib dbus dbus_glib polkit parted
-      lvm2 libatasmart intltool libuuid libxslt docbook_xsl
-    ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  configureFlags = "--localstatedir=/var --enable-lvm2";
-
-  meta = {
-    homepage = http://www.freedesktop.org/wiki/Software/udisks;
-    description = "A daemon and command-line utility for querying and manipulating storage devices";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c75a98a6f24d..3e0c04b035ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6254,7 +6254,9 @@ let
   udev145 = callPackage ../os-specific/linux/udev/145.nix { };
   udev = pkgs.systemd;
 
-  udisks = callPackage ../os-specific/linux/udisks { };
+  udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
+  udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
+  udisks = udisks1;
 
   untie = callPackage ../os-specific/linux/untie { };
 
-- 
cgit 1.4.1