From 4af152de2db21ffc14d6be7224e15f9191083fb3 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 23 Feb 2024 23:08:38 +0400 Subject: [PATCH 1/3] libgrapheme: init at 2.0.2 --- pkgs/by-name/li/libgrapheme/package.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/by-name/li/libgrapheme/package.nix diff --git a/pkgs/by-name/li/libgrapheme/package.nix b/pkgs/by-name/li/libgrapheme/package.nix new file mode 100644 index 000000000000..1aaed5f1a604 --- /dev/null +++ b/pkgs/by-name/li/libgrapheme/package.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, buildPackages }: + +stdenv.mkDerivation rec { + pname = "libgrapheme"; + version = "2.0.2"; + + src = fetchurl { + url = "https://dl.suckless.org/libgrapheme/libgrapheme-${version}.tar.gz"; + hash = "sha256-pou93edr1Vul1kEWzl5CoT3wRcgcCFLemrYIlqoUMSU="; + }; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" "RANLIB:=$(RANLIB)" "BUILD_CC=$(CC_FOR_BUILD)" ]; + + installFlags = [ "PREFIX=$(out)" "LDCONFIG=" ]; + + meta = with lib; { + description = "Unicode string library"; + homepage = "https://libs.suckless.org/libgrapheme/"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} From 1436b102a8f6255afb349d1e7cbe344e9f07e3ab Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 23 Feb 2024 23:13:00 +0400 Subject: [PATCH 2/3] =?UTF-8?q?telescope:=200.8.1=20=E2=86=92=200.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/browsers/telescope/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/applications/networking/browsers/telescope/default.nix index 92124531691d..610a93ce84cc 100644 --- a/pkgs/applications/networking/browsers/telescope/default.nix +++ b/pkgs/applications/networking/browsers/telescope/default.nix @@ -4,6 +4,7 @@ , pkg-config , bison , libevent +, libgrapheme , libressl , ncurses , autoreconfHook @@ -13,15 +14,20 @@ stdenv.mkDerivation rec { pname = "telescope"; - version = "0.8.1"; + version = "0.9"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-9gZeBAC7AGU5vb+692npjKbbqFEAr9iGLu1u68EJ0W8="; + hash = "sha256-eGntAAaKSwusm3e0zDXZmV9D5uX/uThPvQ5OjPNsxZ8="; }; + postPatch = '' + # Remove bundled libraries + rm -r libgrapheme + ''; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -30,6 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ libevent + libgrapheme libressl ncurses ] ++ lib.optional stdenv.isDarwin memstreamHook; From 62d5a05922e1d017a555a8c34a16502ac5a2122e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 23 Feb 2024 23:15:38 +0400 Subject: [PATCH 3/3] telescope: migrate to by-name --- .../telescope/default.nix => by-name/te/telescope/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/browsers/telescope/default.nix => by-name/te/telescope/package.nix} (100%) diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/by-name/te/telescope/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/telescope/default.nix rename to pkgs/by-name/te/telescope/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac288e4d8f77..d1e742b11285 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13764,8 +13764,6 @@ with pkgs; teler = callPackage ../tools/security/teler { }; - telescope = callPackage ../applications/networking/browsers/telescope { }; - termcolor = callPackage ../development/libraries/termcolor { }; termscp = callPackage ../tools/networking/termscp {