Unverified Commit c8ce709a authored by Ramses's avatar Ramses Committed by GitHub
Browse files

zellij: 0.40.1 -> 0.41.1 (#353630)

parents 9d4343b7 b00e0d4b

pkgs/tools/misc/zellij/default.nix→pkgs/by-name/ze/zellij/package.nix

+90 −0
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, rustPlatform

, stdenv

, installShellFiles

, pkg-config

, libiconv

, openssl

, DiskArbitration

, Foundation

, mandown

, zellij

, testers

{

  lib,

  fetchFromGitHub,

  rustPlatform,

  stdenv,

  installShellFiles,

  pkg-config,

  curl,

  openssl,

  mandown,

  zellij,

  testers,

}:



rustPlatform.buildRustPackage rec {

  pname = "zellij";

  version = "0.40.1";

  version = "0.41.1";



  src = fetchFromGitHub {

    owner = "zellij-org";

    repo = "zellij";

    rev = "v${version}";

    hash = "sha256-n8cwsCeKWzTw/psvLL3chBr8EcwGoeKB8JeiLSLna1k=";

    hash = "sha256-EUoJHM0Jm0uFKFeHhtzon/ZRC615SHfYa1gr4RnCNBw=";

  };



  cargoHash = "sha256-TyIQaovmpiu7USURA//+IQWNT95rrVk0x9TRspXYUNk=";

  cargoHash = "sha256-rI3pa0dvC/OVJz8gzD1bM0Q+8OWwvGj+jGDEMSbSb2I=";



  env.OPENSSL_NO_VENDOR = 1;



  # Workaround for https://github.com/zellij-org/zellij/issues/3720

  postPatch = ''

    substituteInPlace zellij-utils/Cargo.toml \

      --replace-fail 'isahc = "1.7.2"' 'isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] }'

  '';



  nativeBuildInputs = [

    mandown

    installShellFiles

    pkg-config

    (lib.getDev curl)

  ];



  OPENSSL_NO_VENDOR = 1;



  buildInputs = [

    curl

    openssl

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    libiconv

    DiskArbitration

    Foundation

  ];



  preCheck = ''

    HOME=$TMPDIR

  '';



  postInstall = ''

  # Ensure that we don't vendor curl, but instead link against the libcurl from nixpkgs

  doInstallCheck = stdenv.hostPlatform.libc == "glibc";

  installCheckPhase = ''

    runHook preInstallCheck



    ldd "$out/bin/zellij" | grep libcurl.so



    runHook postInstallCheck

  '';



  postInstall =

    ''

      mandown docs/MANPAGE.md > zellij.1

      installManPage zellij.1



  '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

    ''

    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

      installShellCompletion --cmd $pname \

        --bash <($out/bin/zellij setup --generate-completion bash) \

        --fish <($out/bin/zellij setup --generate-completion fish) \
@@ -64,7 +79,12 @@ rustPlatform.buildRustPackage rec { 
    homepage = "https://zellij.dev/";

    changelog = "https://github.com/zellij-org/zellij/blob/v${version}/CHANGELOG.md";

    license = with licenses; [ mit ];

    maintainers = with maintainers; [ therealansh _0x4A6F abbe pyrox0 ];

    maintainers = with maintainers; [

      therealansh

      _0x4A6F

      abbe

      pyrox0

    ];

    mainProgram = "zellij";

  };

}

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -13856,10 +13856,6 @@ with pkgs; 














  zed = callPackage ../development/tools/zed { };



























  zellij = callPackage ../tools/misc/zellij {













    inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;













  };



























  zenith = callPackage ../tools/system/zenith {















    inherit (darwin.apple_sdk.frameworks) IOKit;















  };