Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions pkgs/by-name/nc/ncdu/1.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
pkg-config,
autoreconfHook,
ncurses,
versionCheckHook,
}:
Expand All @@ -11,12 +12,20 @@ stdenv.mkDerivation (finalAttrs: {
pname = "ncdu";
version = "1.22";

src = fetchurl {
url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
sha256 = "sha256-CtbAltwE1RIFgRBHYMAbj06X1BkdbJ73llT6PGkaF2s=";
src = fetchFromGitHub {
owner = "BratishkaErik";
repo = "ncdu";
tag = "v${finalAttrs.version}";
hash = "sha256-KcI3sXyD/gt+n8JbSdzdoQYNmjKMPLlIPpZSPAHGb40=";
};

nativeBuildInputs = [ pkg-config ];
__structuredAttrs = true;
strictDeps = true;

nativeBuildInputs = [
pkg-config
autoreconfHook
];

buildInputs = [ ncurses ];

Expand All @@ -25,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {

meta = {
description = "Disk usage analyzer with an ncurses interface";
homepage = "https://dev.yorhel.nl/ncdu";
homepage = "https://github.com/BratishkaErik/ncdu";
license = lib.licenses.mit;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ pSub ];
Expand Down
55 changes: 42 additions & 13 deletions pkgs/by-name/nc/ncdu/package.nix
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
{
lib,
stdenv,
fetchurl,
ncurses,
fetchFromGitHub,
pkg-config,
zig_0_15,
zig_0_16,
nix-update-script,
zstd,
installShellFiles,
versionCheckHook,
pie ? stdenv.hostPlatform.isDarwin,
}:

let
zig = zig_0_16;
in
stdenv.mkDerivation (finalAttrs: {
Comment thread
tree-sapii marked this conversation as resolved.
pname = "ncdu";
version = "2.9.2";
version = "2.10.0";

src = fetchurl {
url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
hash = "sha256-6RE1KBy2ZWnyykwLrCdyRpkeflJSTAyoy6PeXI6Bzsk=";
src = fetchFromGitHub {
owner = "BratishkaErik";
repo = "ncdu";
tag = "v${finalAttrs.version}";
hash = "sha256-YfvuXW0IaRaUNReLe/hMgYA2geDLvt1bprJAbOCFCQk=";
};

__structuredAttrs = true;
strictDeps = true;

nativeBuildInputs = [
zig_0_15
zig.hook
installShellFiles
pkg-config
];
Expand All @@ -31,7 +39,28 @@ stdenv.mkDerivation (finalAttrs: {
zstd
];

zigBuildFlags = lib.optional pie "-Dpie=true";
deps = zig.fetchDeps {
inherit (finalAttrs) pname version src;
fetchAll = true;
hash = "sha256-vk4wMIpKEQObFXuNd5szQQU6z0NyVJKInOMDiEn4A5k=";
};

postPatch = ''
mkdir -p zig-system-dir

for file in ${finalAttrs.deps}/*; do
dir="zig-system-dir/$(basename "$file" .tar.gz)"
mkdir -p "$dir"

tar -xzf "$file" -C "$dir" --strip-components=1
done
'';

zigBuildFlags = [
"--system"
"zig-system-dir"
]
++ lib.optional pie "-Dpie=true";

postInstall = ''
installManPage ncdu.1
Expand All @@ -40,20 +69,20 @@ stdenv.mkDerivation (finalAttrs: {
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;

passthru.updateScript = ./update.sh;
passthru.updateScript = nix-update-script { };

meta = {
homepage = "https://dev.yorhel.nl/ncdu";
homepage = "https://github.com/BratishkaErik/ncdu";
description = "Disk usage analyzer with an ncurses interface";
changelog = "https://dev.yorhel.nl/ncdu/changes2";
changelog = "https://github.com/BratishkaErik/ncdu/releases";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
pSub
rodrgz
defelo
ryan4yin
];
inherit (zig_0_15.meta) platforms;
inherit (zig.meta) platforms;
mainProgram = "ncdu";
};
})
5 changes: 0 additions & 5 deletions pkgs/by-name/nc/ncdu/update.sh

This file was deleted.

Loading