nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 01:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #307243 from azuwis/zig

Browse Source 
zig.hook: support zig 0.12; ncdu: 2.3 -> 2.4, bump zig to 0.12
This commit is contained in:
Weijia Wang 2024-04-28 05:50:23 +02:00 committed by GitHub
commit 21d6d75fe8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/zig/hook.nix
View File

@ -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";

10
pkgs/tools/misc/ncdu/default.nix
View File

@ -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";
};
})

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };