From eee65657831ddf0fca1c01e6ea2e6b6759ae80c4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 29 Jun 2018 15:49:53 +0200 Subject: [PATCH] gspell: move to top-level --- pkgs/desktops/gnome-3/default.nix | 4 +--- .../gnome-3/misc => development/libraries}/gspell/default.nix | 1 - pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/{desktops/gnome-3/misc => development/libraries}/gspell/default.nix (96%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index d0c6558a611..c035dc408dc 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -52,7 +52,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) atk glib gobjectIntrospection webkitgtk gtk3 gtkmm3 + inherit (pkgs) atk glib gobjectIntrospection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle; @@ -375,8 +375,6 @@ let gitg = callPackage ./misc/gitg { }; - gspell = callPackage ./misc/gspell { }; - libgnome-games-support = callPackage ./misc/libgnome-games-support { }; libgda = callPackage ./misc/libgda { }; diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/misc/gspell/default.nix rename to pkgs/development/libraries/gspell/default.nix index ca1fc3724fc..42c5f88e7f3 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -22,7 +22,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b284bffef49..c477767d707 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16429,6 +16429,8 @@ with pkgs; gpxsee = libsForQt5.callPackage ../applications/misc/gpxsee { }; + gspell = callPackage ../development/libraries/gspell { }; + gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { inherit (gnome2) gtk; };