From 1399e572f26244e7069af7749bcb25f6231154b0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 22 Jun 2024 14:59:06 +0200
Subject: gitg: Move from gnome scope to top-level

Uses gvfs from top-level now.
---
 pkgs/desktops/gnome/default.nix           |  3 +-
 pkgs/desktops/gnome/misc/gitg/default.nix | 99 -------------------------------
 2 files changed, 1 insertion(+), 101 deletions(-)
 delete mode 100644 pkgs/desktops/gnome/misc/gitg/default.nix

(limited to 'pkgs/desktops/gnome')

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 76f43497c4a07..5d4913feabddb 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -192,8 +192,6 @@ in
 
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
-  gitg = callPackage ./misc/gitg { };
-
   gnome-applets = callPackage ./misc/gnome-applets { };
 
   gnome-flashback = callPackage ./misc/gnome-flashback { };
@@ -229,6 +227,7 @@ in
   file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13.
   geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22.
   ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22.
+  gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22.
   gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13.
   gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22.
   gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22.
diff --git a/pkgs/desktops/gnome/misc/gitg/default.nix b/pkgs/desktops/gnome/misc/gitg/default.nix
deleted file mode 100644
index 923f1ccc28bfd..0000000000000
--- a/pkgs/desktops/gnome/misc/gitg/default.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, vala
-, pkg-config
-, gtk3
-, glib
-, gpgme
-, json-glib
-, wrapGAppsHook3
-, libpeas
-, bash
-, gobject-introspection
-, gtksourceview4
-, gsettings-desktop-schemas
-, gnome
-, gspell
-, gvfs
-, shared-mime-info
-, libgee
-, libgit2-glib
-, libhandy
-, libsecret
-, libxml2
-, meson
-, ninja
-, python3
-, libdazzle
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gitg";
-  version = "44";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-NCoxaE2rlnHNNBvT485mWtzuBGDCoIHdxJPNvAMTJTA=";
-  };
-
-  nativeBuildInputs = [
-    gobject-introspection
-    meson
-    ninja
-    pkg-config
-    python3
-    vala
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    glib
-    gpgme
-    gsettings-desktop-schemas
-    gtk3
-    gtksourceview4
-    gspell
-    gvfs
-    json-glib
-    libdazzle
-    libgee
-    libgit2-glib
-    libhandy
-    libpeas
-    libsecret
-    libxml2
-  ];
-
-  doCheck = true;
-
-  postPatch = ''
-    patchShebangs meson_post_install.py
-
-    substituteInPlace tests/libgitg/test-commit.vala --replace-fail "/bin/bash" "${bash}/bin/bash"
-  '';
-
-  preFixup = ''
-    gappsWrapperArgs+=(
-      # Thumbnailers
-      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
-    )
-  '';
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = pname;
-    };
-  };
-
-  strictDeps = true;
-
-  meta = with lib; {
-    homepage = "https://gitlab.gnome.org/GNOME/gitg";
-    description = "GNOME GUI client to view git repositories";
-    mainProgram = "gitg";
-    maintainers = with maintainers; [ domenkozar Luflosi ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}
-- 
cgit 1.4.1