From 634eaf80b22ea3e22e762f36488ff3eee686e94b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 25 Dec 2018 17:05:45 -0500
Subject: [PATCH] folks: rename from gnome3.folks

---
 pkgs/desktops/gnome-3/default.nix             |  4 +---
 .../libraries}/folks/default.nix              | 19 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 10 insertions(+), 15 deletions(-)
 rename pkgs/{desktops/gnome-3/core => development/libraries}/folks/default.nix (74%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 327c1750874..65507870dd8 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
     libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
     easytag meld orca rhythmbox shotwell gnome-usage
-    clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2;
+    clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks;
 
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@@ -114,8 +114,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   libgnomekbd = callPackage ./core/libgnomekbd { };
 
-  folks = callPackage ./core/folks { };
-
   gnome-online-accounts = callPackage ./core/gnome-online-accounts { };
 
   gnome-online-miners = callPackage ./core/gnome-online-miners { };
diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/development/libraries/folks/default.nix
similarity index 74%
rename from pkgs/desktops/gnome-3/core/folks/default.nix
rename to pkgs/development/libraries/folks/default.nix
index 2eb33cde975..2ce50a92ea3 100644
--- a/pkgs/desktops/gnome-3/core/folks/default.nix
+++ b/pkgs/development/libraries/folks/default.nix
@@ -1,20 +1,19 @@
 { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool, gobject-introspection
-, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus
+, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus, libgee
 , telepathy-glib, evolution-data-server, libsecret, db }:
 
 # TODO: enable more folks backends
 
-let
+stdenv.mkDerivation rec {
+  pname = "folks";
   version = "0.11.4";
-in stdenv.mkDerivation rec {
-  name = "folks-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/folks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57";
   };
 
-  propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
+  propagatedBuildInputs = [ glib libgee sqlite ];
   # dbus_daemon needed for tests
   buildInputs = [
     dbus-glib telepathy-glib evolution-data-server dbus
@@ -33,19 +32,15 @@ in stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome3.updateScript {
-      packageName = "folks";
-      attrPath = "gnome3.folks";
+      packageName = pname;
       versionPolicy = "none";
     };
   };
 
   meta = {
-    description = "Folks";
-
+    description = "A library that aggregates people from multiple sources to create metacontacts";
     homepage = https://wiki.gnome.org/Projects/Folks;
-
     license = stdenv.lib.licenses.lgpl2Plus;
-
     maintainers = gnome3.maintainers;
     platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1238a07d339..c4d3368fd91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9752,6 +9752,8 @@ in
 
   folly = callPackage ../development/libraries/folly { };
 
+  folks = callPackage ../development/libraries/folks { };
+
   makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:
     callPackage ../development/libraries/fontconfig/make-fonts-conf.nix {
       inherit fontconfig fontDirectories;