Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zellij: init at 0.5.1 #120101

Merged
merged 2 commits into from Apr 26, 2021
Merged

zellij: init at 0.5.1 #120101

merged 2 commits into from Apr 26, 2021

Conversation

therealansh
Copy link
Member

@therealansh therealansh commented Apr 21, 2021

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@therealansh therealansh force-pushed the zellij branch 2 times, most recently from 7c96f66 to 2cced50 Compare April 21, 2021 19:59
Comment on lines 16 to 17

buildPhase = "cargo make";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
buildPhase = "cargo make";

That will most likely not work and break the build in nix. @danieldk any idea how to build using cargo make?

@@ -9716,6 +9716,11 @@ in

zdelta = callPackage ../tools/compression/zdelta { };

zellij = callPackage ../tools/misc/zellij {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
inherit (darwin) libiconv;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
inherit (darwin) libiconv;

@marsam
Copy link
Contributor

marsam commented Apr 22, 2021

I think you can write this expression as

{ lib, fetchFromGitHub, rustPlatform, stdenv, installShellFiles, libiconv }:

rustPlatform.buildRustPackage rec {
  pname = "zellij";
  version = "0.5.0-beta";

  src = fetchFromGitHub {
    owner = "zellij-org";
    repo = pname;
    rev = "v${version}";
    sha256 = "0mhxq0pr87lz36wfn3g9yvgx5k6xwf69yvvjvrm3vf1l6hwm9nf6";
  };

  cargoSha256 = "19465z1yv480hsx153nb7qz4hw1zp9wzqfm90sqsvp06zlpxps8g";

  nativeBuildInputs = [ installShellFiles ];

  buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

  preCheck = ''
    HOME=$TMPDIR
  '';

  postInstall = ''
    installShellCompletion assets/completions/zellij.{bash,fish} --zsh assets/completions/_zellij
  '';

  meta = with lib; {
    description = "A terminal workspace with batteries included";
    homepage = "https://zellij.dev/";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ therealansh ];
  };
}

@therealansh therealansh changed the title [WIP] zellij: init at 0.5.0-beta zellij: init at 0.5.1 Apr 23, 2021
@marsam
Copy link
Contributor

marsam commented Apr 25, 2021

@GrahamcOfBorg build zellij

@happysalada
Copy link
Contributor

Result of nixpkgs-review pr 120101 run on x86_64-darwin 1

1 package built:
  • zellij

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants