From d04df75f40a526596d67335dbed65a9190f22694 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 4 Nov 2024 12:02:20 +0100 Subject: [PATCH 1/5] zellij: 0.40.1 -> 0.41.1 https://github.com/zellij-org/zellij/releases/tag/v0.41.0 https://github.com/zellij-org/zellij/releases/tag/v0.41.1 --- pkgs/tools/misc/zellij/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 2097787f4855..4559d83d41e3 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,18 @@ 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; nativeBuildInputs = [ mandown @@ -32,8 +34,6 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ From 4833d9711d947d2997f58196e056b81301fa6fc2 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 7 Nov 2024 13:43:54 +0100 Subject: [PATCH 2/5] zellij: adapt to new darwin SDK pattern --- pkgs/tools/misc/zellij/default.nix | 7 ------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 4559d83d41e3..5aa3aabf8afb 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -4,10 +4,7 @@ , stdenv , installShellFiles , pkg-config -, libiconv , openssl -, DiskArbitration -, Foundation , mandown , zellij , testers @@ -36,10 +33,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - DiskArbitration - Foundation ]; preCheck = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdf056feef01..b0c8e2f6b1a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13877,9 +13877,7 @@ with pkgs; zed = callPackage ../development/tools/zed { }; - zellij = callPackage ../tools/misc/zellij { - inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; - }; + zellij = callPackage ../tools/misc/zellij { }; zenith = callPackage ../tools/system/zenith { inherit (darwin.apple_sdk.frameworks) IOKit; From 21de802c9f23bb75a02a737aaf928200c10fba3d Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 7 Nov 2024 10:06:13 +0100 Subject: [PATCH 3/5] zellij: make sure to link to our provided curl --- pkgs/tools/misc/zellij/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 5aa3aabf8afb..adc720ec3f66 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -4,6 +4,7 @@ , stdenv , installShellFiles , pkg-config +, curl , openssl , mandown , zellij @@ -25,13 +26,21 @@ rustPlatform.buildRustPackage rec { 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) ]; buildInputs = [ + curl openssl ]; @@ -39,6 +48,16 @@ rustPlatform.buildRustPackage rec { HOME=$TMPDIR ''; + # 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 From 10c96e20677472ec3851d3c2ef1ac3ceb136d1d9 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 7 Nov 2024 10:10:08 +0100 Subject: [PATCH 4/5] zellij: move to by-name --- .../misc/zellij/default.nix => by-name/ze/zellij/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/zellij/default.nix => by-name/ze/zellij/package.nix} (100%) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/by-name/ze/zellij/package.nix similarity index 100% rename from pkgs/tools/misc/zellij/default.nix rename to pkgs/by-name/ze/zellij/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0c8e2f6b1a3..eaa654e80121 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13877,8 +13877,6 @@ with pkgs; zed = callPackage ../development/tools/zed { }; - zellij = callPackage ../tools/misc/zellij { }; - zenith = callPackage ../tools/system/zenith { inherit (darwin.apple_sdk.frameworks) IOKit; }; From b00e0d4b1d2793a1b73734116adeee2660144d53 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 7 Nov 2024 10:10:38 +0100 Subject: [PATCH 5/5] zellij: format --- pkgs/by-name/ze/zellij/package.nix | 50 +++++++++++++++++------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index adc720ec3f66..5d7b348bc1f8 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -1,14 +1,15 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, stdenv -, installShellFiles -, pkg-config -, curl -, openssl -, mandown -, zellij -, testers +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + installShellFiles, + pkg-config, + curl, + openssl, + mandown, + zellij, + testers, }: rustPlatform.buildRustPackage rec { @@ -58,16 +59,18 @@ rustPlatform.buildRustPackage rec { runHook postInstallCheck ''; - postInstall = '' - mandown docs/MANPAGE.md > zellij.1 - installManPage zellij.1 + postInstall = + '' + mandown docs/MANPAGE.md > zellij.1 + installManPage zellij.1 - '' + 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) \ - --zsh <($out/bin/zellij setup --generate-completion zsh) - ''; + '' + + 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) \ + --zsh <($out/bin/zellij setup --generate-completion zsh) + ''; passthru.tests.version = testers.testVersion { package = zellij; }; @@ -76,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"; }; }