From 9d8984e5c991281234c960781e43366b69c79174 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 1 Aug 2019 11:25:30 +0200 Subject: [PATCH 1/2] gnomeExtensions.pidgin-im-integration: move from gnome3.pidgin-im-gnome-shell-extension --- pkgs/desktops/gnome-3/default.nix | 4 ++-- .../pidgin-im-integration}/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/desktops/gnome-3/{misc/pidgin => extensions/pidgin-im-integration}/default.nix (85%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 742babf721a..87b7be5bdd2 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -345,8 +345,6 @@ lib.makeScope pkgs.newScope (self: with self; { nautilus-python = callPackage ./misc/nautilus-python { }; - pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; - gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; }; pomodoro = callPackage ./misc/pomodoro { }; @@ -398,4 +396,6 @@ lib.makeScope pkgs.newScope (self: with self; { gtk = gtk3; gtkmm = gtkmm3; rest = librest; + + pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01 }) diff --git a/pkgs/desktops/gnome-3/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix similarity index 85% rename from pkgs/desktops/gnome-3/misc/pidgin/default.nix rename to pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix index c11fdfa6099..4bff9175deb 100644 --- a/pkgs/desktops/gnome-3/misc/pidgin/default.nix +++ b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { + pname = "gnome-shell-extension-pidgin-im-integration"; version = "1.0.1"; - basename = "pidgin-im-gnome-shell-extension"; - name = "${basename}-${version}"; src = fetchFromGitHub { owner = "muffinmad"; - repo = "${basename}"; + repo = "pidgin-im-gnome-shell-extension"; rev = "v${version}"; sha256 = "1567s2sfqig4jw0nrn134f5vkx0yq31q044grv3xk4vpl1f3z2lr"; }; @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { mkdir -p "$extensions_dir" mv *.js metadata.json dbus.xml gnome-shell-extension-pidgin.pot "$extensions_dir" - schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas" + schemas_dir="$share_dir/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" mkdir -p "$schemas_dir" mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */ glib-compile-schemas "$schemas_dir" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6903fc15ef1..4c03030b606 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22372,6 +22372,7 @@ in mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { }; no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; + pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { }; remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; sound-output-device-chooser = callPackage ../desktops/gnome-3/extensions/sound-output-device-chooser { }; system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { }; From 82061dedaaf29b6e8542ce411858e99f5a094e10 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 1 Jul 2019 23:56:01 -0700 Subject: [PATCH 2/2] gnomeExtensions.pidgin-im-integration: 1.0.1 -> 32 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pidgin-im-gnome-shell-extension/versions --- .../pidgin-im-integration/default.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix index 4bff9175deb..6f1cc3df409 100644 --- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix @@ -2,33 +2,23 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-pidgin-im-integration"; - version = "1.0.1"; + version = "32"; src = fetchFromGitHub { owner = "muffinmad"; repo = "pidgin-im-gnome-shell-extension"; rev = "v${version}"; - sha256 = "1567s2sfqig4jw0nrn134f5vkx0yq31q044grv3xk4vpl1f3z2lr"; + sha256 = "1jyg8r0s1v83sgg6y0jbsj2v37mglh8rvd8vi27fxnjq9xmg8kpc"; }; - buildInputs = [ glib ]; + dontConfigure = true; + dontBuild = true; - configurePhase = ""; - buildPhase = ""; installPhase = '' share_dir="$prefix/share" extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad" mkdir -p "$extensions_dir" - mv *.js metadata.json dbus.xml gnome-shell-extension-pidgin.pot "$extensions_dir" - - schemas_dir="$share_dir/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" - mkdir -p "$schemas_dir" - mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */ - glib-compile-schemas "$schemas_dir" - - locale_dir="$share_dir/locale" - mkdir -p "$locale_dir" - mv locale/* $locale_dir # fix Emacs syntax highlighting: */ + mv *.js metadata.json dbus.xml schemas locale "$extensions_dir" ''; meta = with stdenv.lib; {