From 0f0179c2fa6ac404d2f54f159cd43716b22e5b07 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 25 Dec 2018 17:45:11 +0100
Subject: [PATCH] librest: rename from gnome3.rest

---
 pkgs/desktops/gnome-3/default.nix                   |  5 ++---
 .../libraries/librest}/default.nix                  | 13 ++++++-------
 pkgs/top-level/all-packages.nix                     |  2 ++
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename pkgs/{desktops/gnome-3/core/rest => development/libraries/librest}/default.nix (72%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index e040e38203bb..a9708f7b2e1a 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;
+    clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest;
 
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@@ -47,6 +47,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   gtkmm = gtkmm3;
   vala = pkgs.vala_0_42;
   gegl_0_4 = pkgs.gegl_0_4.override { inherit gtk; };
+  rest = librest;
 
 # Simplify the nixos module and gnome packages
   defaultIconTheme = adwaita-icon-theme;
@@ -198,8 +199,6 @@ lib.makeScope pkgs.newScope (self: with self; {
     withGnome = true;
   };
 
-  rest = callPackage ./core/rest { };
-
   rygel = callPackage ./core/rygel { };
 
   simple-scan = callPackage ./core/simple-scan { };
diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/development/libraries/librest/default.nix
similarity index 72%
rename from pkgs/desktops/gnome-3/core/rest/default.nix
rename to pkgs/development/libraries/librest/default.nix
index 70cc31cd706c..e70ac9a53626 100644
--- a/pkgs/desktops/gnome-3/core/rest/default.nix
+++ b/pkgs/development/libraries/librest/default.nix
@@ -1,29 +1,28 @@
 { stdenv, fetchurl, pkgconfig, glib, libsoup, gobject-introspection, gnome3 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "rest";
   version = "0.8.1";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib libsoup gobject-introspection];
+  nativeBuildInputs = [ pkgconfig gobject-introspection ];
+  buildInputs = [ glib libsoup ];
 
   configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];
 
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "librest";
     };
   };
 
   meta = with stdenv.lib; {
+    description = "Helper library for RESTful services";
     homepage = https://wiki.gnome.org/Projects/Librest;
     license = licenses.lgpl21;
     platforms = platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 442c2a787a83..9a6be7439d08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4003,6 +4003,8 @@ in
 
   libreswan = callPackage ../tools/networking/libreswan { };
 
+  librest = callPackage ../development/libraries/librest { };
+
   libwebsockets = callPackage ../development/libraries/libwebsockets { };
 
   lidarr = callPackage ../servers/lidarr { };