Merge branch 'master' into staging

4 files changed, 126 insertions, 10 deletions

diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix
new file mode 100644
index 0000000000000..67a719d011701
--- /dev/null
+++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix
@@ -0,0 +1,72 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, fetchurl
+, meson
+, ninja
+, pkg-config
+, vala
+, gtk4
+, vte-gtk4
+, json-glib
+, sassc
+, libadwaita
+, pcre2
+, libxml2
+, librsvg
+, callPackage
+, python3
+, gtk3
+, desktop-file-utils
+, wrapGAppsHook
+}:
+
+let
+  marble = callPackage ./marble.nix { };
+in
+stdenv.mkDerivation rec {
+  pname = "blackbox";
+  version = "0.12.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "raggesilver";
+    repo = "blackbox";
+    rev = "v${version}";
+    sha256 = "sha256-8u4qHC8+3rKDFNdg5kI48dBgAm3d6ESXN5H9aT/nIBY=";
+  };
+
+  postPatch = ''
+    patchShebangs build-aux/meson/postinstall.py
+  '';
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    vala
+    sassc
+    wrapGAppsHook
+    python3
+    gtk3 # For gtk-update-icon-cache
+    desktop-file-utils # For update-desktop-database
+  ];
+  buildInputs = [
+    gtk4
+    vte-gtk4
+    json-glib
+    marble
+    libadwaita
+    pcre2
+    libxml2
+    librsvg
+  ];
+
+  meta = with lib; {
+    description = "Beautiful GTK 4 terminal";
+    homepage = "https://gitlab.gnome.org/raggesilver/blackbox";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ chuangzhu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix
new file mode 100644
index 0000000000000..6d100c0894e48
--- /dev/null
+++ b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix
@@ -0,0 +1,45 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, pkg-config
+, vala
+, gobject-introspection
+, gtk4
+, gtk3
+, desktop-file-utils
+}:
+
+stdenv.mkDerivation {
+  pname = "marble";
+  version = "unstable-2022-04-20";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "raggesilver";
+    repo = "marble";
+    # Latest commit from the 'wip/gtk4' branch
+    rev = "6dcc6fefa35f0151b0549c01bd774750fe6bdef8";
+    sha256 = "sha256-0VJ9nyjWOOdLBm3ufleS/xcAS5YsSedJ2NtBjyM3uaY=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    vala
+    gtk3 # For gtk-update-icon-cache
+    desktop-file-utils # For update-desktop-database
+    gobject-introspection # For g-ir-compiler
+  ];
+  buildInputs = [ gtk4 ];
+
+  meta = with lib; {
+    description = "Raggesilver's GTK library";
+    homepage = "https://gitlab.gnome.org/raggesilver/marble";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ chuangzhu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix
index 790aa17259237..85ee654a989a0 100644
--- a/pkgs/applications/terminal-emulators/gnome-console/default.nix
+++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix
@@ -23,6 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-console";
+  # Do not upgrade until https://gitlab.gnome.org/GNOME/vte/-/issues/2584 is resolved!
   version = "42.2";
 
   src = fetchurl {
@@ -45,8 +46,6 @@ stdenv.mkDerivation rec {
     libhandy
     pcre2
     vte
-  ] ++ lib.optionals stdenv.isLinux [
-    gnome.nautilus
   ];
 
   nativeBuildInputs = [
@@ -61,7 +60,7 @@ stdenv.mkDerivation rec {
     wrapGAppsHook
   ];
 
-  mesonFlags = lib.optionals (!stdenv.isLinux) [
+  mesonFlags = [
     "-Dnautilus=disabled"
   ];
 
diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix
index cc2dc5c55d617..ee28a25047815 100644
--- a/pkgs/applications/terminal-emulators/guake/default.nix
+++ b/pkgs/applications/terminal-emulators/guake/default.nix
@@ -15,15 +15,15 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "guake";
-  version = "3.6.3";
+  version = "3.9.0";
 
   format = "other";
 
   src = fetchFromGitHub {
     owner = "Guake";
     repo = "guake";
-    rev = version;
-    sha256 = "13ipnmqcyixpa6qv83m0f91za4kar14s5jpib68b32z65x1h0j3b";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU=";
   };
 
   # Strict deps breaks guake
@@ -51,16 +51,16 @@ python3.pkgs.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3.pkgs; [
     dbus-python
-    pbr
     pycairo
     pygobject3
-    setuptools
+    setuptools-scm
+    pyyaml
   ];
 
-  PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   makeFlags = [
-    "prefix=${placeholder "out"}"
+    "PREFIX=${placeholder "out"}"
   ];
 
   preFixup = ''