diff --git a/pkgs/development/compilers/zig/hook.nix b/pkgs/development/compilers/zig/hook.nix index 0c099a4c0d11..e01309b258b1 100644 --- a/pkgs/development/compilers/zig/hook.nix +++ b/pkgs/development/compilers/zig/hook.nix @@ -32,7 +32,9 @@ makeSetupHook { zig_default_flags = let releaseType = - if lib.versionAtLeast zig.version "0.11" then + if lib.versionAtLeast zig.version "0.12" then + "--release=safe" + else if lib.versionAtLeast zig.version "0.11" then "-Doptimize=ReleaseSafe" else "-Drelease-safe=true"; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 47a1365b5367..d4bdbeacc929 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses -, zig_0_11 +, zig , installShellFiles , testers , pie ? stdenv.isDarwin @@ -10,15 +10,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncdu"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz"; - hash = "sha256-u84dHHDxJHZxvk6iE12MUs0ppwivXtYs7Np9xqgACjw="; + hash = "sha256-Sj0AAjCc9qfOp5GTjayb7N7OTVKdDW3I2RtztOaFVQk="; }; nativeBuildInputs = [ - zig_0_11.hook + zig.hook installShellFiles ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://dev.yorhel.nl/ncdu/changes2"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pSub rodrgz ]; - inherit (zig_0_11.meta) platforms; + inherit (zig.meta) platforms; mainProgram = "ncdu"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 969c7003fd78..a2f49bd9d1f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33548,7 +33548,9 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; - ncdu = callPackage ../tools/misc/ncdu { }; + ncdu = callPackage ../tools/misc/ncdu { + zig = zig_0_12; + }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };