Unverified Commit 7dd3d6c1 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #290955 from sikmir/telescope 

telescope: 0.8.1 → 0.9
parents cac55c3d 62d5a059

pkgs/by-name/li/libgrapheme/package.nix

0 → 100644
+25 −0
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/applications/networking/browsers/telescope/default.nix→pkgs/by-name/te/telescope/package.nix

+9 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -13745,8 +13745,6 @@ with pkgs; 














  teler = callPackage ../tools/security/teler { };



























  telescope = callPackage ../applications/networking/browsers/telescope { };



























  termcolor = callPackage ../development/libraries/termcolor { };





























  termscp = callPackage ../tools/networking/termscp {