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

folks: rename from gnome3.folks

Browse Source
This commit is contained in:
worldofpeace 2018-12-25 17:05:45 -05:00
parent 73f32e7e58
commit 634eaf80b2
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/default.nix
View File

@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage 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; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -114,8 +114,6 @@ lib.makeScope pkgs.newScope (self: with self; {
libgnomekbd = callPackage ./core/libgnomekbd { }; libgnomekbd = callPackage ./core/libgnomekbd { };
folks = callPackage ./core/folks { };
gnome-online-accounts = callPackage ./core/gnome-online-accounts { }; gnome-online-accounts = callPackage ./core/gnome-online-accounts { };
gnome-online-miners = callPackage ./core/gnome-online-miners { }; gnome-online-miners = callPackage ./core/gnome-online-miners { };

19
pkgs/desktops/gnome-3/core/folks/default.nix → pkgs/development/libraries/folks/default.nix
View File

@ -1,20 +1,19 @@
{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool, gobject-introspection { 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 }: , telepathy-glib, evolution-data-server, libsecret, db }:
# TODO: enable more folks backends # TODO: enable more folks backends
let stdenv.mkDerivation rec {
pname = "folks";
version = "0.11.4"; version = "0.11.4";
in stdenv.mkDerivation rec {
name = "folks-${version}";
src = fetchurl { 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"; sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57";
}; };
propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; propagatedBuildInputs = [ glib libgee sqlite ];
# dbus_daemon needed for tests # dbus_daemon needed for tests
buildInputs = [ buildInputs = [
dbus-glib telepathy-glib evolution-data-server dbus dbus-glib telepathy-glib evolution-data-server dbus
@ -33,19 +32,15 @@ in stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = "folks"; packageName = pname;
attrPath = "gnome3.folks";
versionPolicy = "none"; versionPolicy = "none";
}; };
}; };
meta = { meta = {
description = "Folks"; description = "A library that aggregates people from multiple sources to create metacontacts";
homepage = https://wiki.gnome.org/Projects/Folks; homepage = https://wiki.gnome.org/Projects/Folks;
license = stdenv.lib.licenses.lgpl2Plus; license = stdenv.lib.licenses.lgpl2Plus;
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
}; };

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

@ -9752,6 +9752,8 @@ in
folly = callPackage ../development/libraries/folly { }; folly = callPackage ../development/libraries/folly { };
folks = callPackage ../development/libraries/folks { };
makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:
callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { callPackage ../development/libraries/fontconfig/make-fonts-conf.nix {
inherit fontconfig fontDirectories; inherit fontconfig fontDirectories;