diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-20 18:01:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-20 18:01:51 +0000 |
| commit | 6ce03a2dbd383768be1b376e6229a32d38e1a6c0 (patch) | |
| tree | 4f78c97fbbb9082e1450cb3f9d90e684b77dc22b /pkgs/applications/terminal-emulators | |
| parent | af07eea2cd64694a74087606adac4c5d30abdb69 (diff) | |
| parent | da1f279ece6a5ac3fa01c9cc14c57207778f476c (diff) | |
| download | nixpkgs-6ce03a2dbd383768be1b376e6229a32d38e1a6c0.tar nixpkgs-6ce03a2dbd383768be1b376e6229a32d38e1a6c0.tar.gz nixpkgs-6ce03a2dbd383768be1b376e6229a32d38e1a6c0.tar.bz2 nixpkgs-6ce03a2dbd383768be1b376e6229a32d38e1a6c0.tar.lz nixpkgs-6ce03a2dbd383768be1b376e6229a32d38e1a6c0.tar.xz nixpkgs-6ce03a2dbd383768be1b376e6229a32d38e1a6c0.tar.zst nixpkgs-6ce03a2dbd383768be1b376e6229a32d38e1a6c0.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/terminal-emulators')
3 files changed, 31 insertions, 12 deletions
diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 9b0905d27ab..83cba0abc8d 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -27,14 +27,14 @@ let in stdenv.mkDerivation rec { pname = "blackbox"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "raggesilver"; repo = "blackbox"; rev = "v${version}"; - hash = "sha256-qz1805HLG/Yexilw0YCkTzed1wqonUtJ+QrbMyhKHh8="; + hash = "sha256-ebwh9WTooJuvYFIygDBn9lYC7+lx9P1HskvKU8EX9jw="; }; postPatch = '' @@ -64,6 +64,8 @@ stdenv.mkDerivation rec { libgee ]; + mesonFlags = [ "-Dblackbox_is_flatpak=false" ]; + meta = with lib; { description = "Beautiful GTK 4 terminal"; homepage = "https://gitlab.gnome.org/raggesilver/blackbox"; diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix index 6d100c0894e..e6c3850416f 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix @@ -13,15 +13,15 @@ stdenv.mkDerivation { pname = "marble"; - version = "unstable-2022-04-20"; + version = "unstable-2023-05-11"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "raggesilver"; repo = "marble"; - # Latest commit from the 'wip/gtk4' branch - rev = "6dcc6fefa35f0151b0549c01bd774750fe6bdef8"; - sha256 = "sha256-0VJ9nyjWOOdLBm3ufleS/xcAS5YsSedJ2NtBjyM3uaY="; + # the same used on flatpak + rev = "f240b2ec7d5cdacb8fdcc553703420dc5101ffdb"; + sha256 = "sha256-obtz7zOyEZPgi/NNjtLr6aFm/1UVTzjTdJpN3JQfpUs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 4243502e7fe..0e7c6a27e29 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -1,22 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget -, qtquickcontrols, qtgraphicaleffects, qmake, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, mkDerivation +, qtbase +, qtquick1 +, qmltermwidget +, qtquickcontrols2 +, qtgraphicaleffects +, qmake +, nixosTests +}: mkDerivation rec { - version = "1.1.1"; + version = "1.2.0"; pname = "cool-retro-term"; src = fetchFromGitHub { owner = "Swordfish90"; repo = "cool-retro-term"; - rev = version; - sha256 = "0mird4k88ml6y61hky2jynrjmnxl849fvhsr5jfdlnv0i7r5vwi5"; + rev = "refs/tags/${version}"; + hash = "sha256-PewHLVmo+RTBHIQ/y2FBkgXsIvujYd7u56JdFC10B4c="; }; patchPhase = '' sed -i -e '/qmltermwidget/d' cool-retro-term.pro ''; - buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ]; + buildInputs = [ + qtbase + qtquick1 + qmltermwidget + qtquickcontrols2 + qtgraphicaleffects + ]; + nativeBuildInputs = [ qmake ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; |