From 7b1a32ed15e0f28b0648f00d8aad1c27cc3160d5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 24 Feb 2024 23:50:16 +0100 Subject: [PATCH 1/3] ueberzugpp: 2.9.2 -> 2.9.3 --- pkgs/tools/graphics/ueberzugpp/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index 815983126451..af9d00b861c3 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , cmake , pkg-config -, cli11 , openssl , zeromq , cppzmq @@ -16,6 +15,9 @@ , libsixel , microsoft-gsl , chafa +, cli11 +, libexif +, range-v3 , enableOpencv ? stdenv.isLinux , opencv , enableWayland ? stdenv.isLinux @@ -28,13 +30,13 @@ stdenv.mkDerivation rec { pname = "ueberzugpp"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; rev = "v${version}"; - hash = "sha256-yIohpJRytmwt+6DLCWpmBiuCm9GcCHsGmpTI64/3d8U="; + hash = "sha256-jNiDQy9el9fUK03Dt55wPb4LFB1iDiytUxg8zM4Bj6E="; }; strictDeps = true; @@ -58,6 +60,8 @@ stdenv.mkDerivation rec { microsoft-gsl chafa cli11 + libexif + range-v3 ] ++ lib.optionals enableOpencv [ opencv ] ++ lib.optionals enableWayland [ From be840e52ede33d07d3de8d62405ddf4023c1195b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 24 Feb 2024 23:56:57 +0100 Subject: [PATCH 2/3] ueberzugpp: move to pkgs/by-name --- .../default.nix => by-name/ue/ueberzugpp/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename pkgs/{tools/graphics/ueberzugpp/default.nix => by-name/ue/ueberzugpp/package.nix} (100%) diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/by-name/ue/ueberzugpp/package.nix similarity index 100% rename from pkgs/tools/graphics/ueberzugpp/default.nix rename to pkgs/by-name/ue/ueberzugpp/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afd7b9b2eb4b..d7f3a96113ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35777,7 +35777,9 @@ with pkgs; ueberzug = with python3Packages; toPythonApplication ueberzug; - ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { }; + ueberzugpp = callPackage ../by-name/ue/ueberzugpp/package.nix { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; uefi-run = callPackage ../tools/virtualization/uefi-run { }; From 026674af7623435b9a2a6ffee67fe02a3b3f364f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 26 Feb 2024 07:25:15 +0100 Subject: [PATCH 3/3] ueberzugpp: 2.9.3 -> 2.9.4 --- pkgs/by-name/ue/ueberzugpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index af9d00b861c3..a06923904d2f 100644 --- a/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/pkgs/by-name/ue/ueberzugpp/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "ueberzugpp"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; rev = "v${version}"; - hash = "sha256-jNiDQy9el9fUK03Dt55wPb4LFB1iDiytUxg8zM4Bj6E="; + hash = "sha256-D+7a+3Vxrt+XUq7c2F2eqi8ZGQ2eZd37aTqighWEKPs="; }; strictDeps = true;