Unverified Commit 21d6d75f authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #307243 from azuwis/zig 

zig.hook: support zig 0.12; ncdu: 2.3 -> 2.4, bump zig to 0.12
parents cd083623 30b52132

pkgs/development/compilers/zig/hook.nix

+3 −1
Original line number Diff line number Diff line
@@ -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";

pkgs/tools/misc/ncdu/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -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";

  };

})

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 { };