Commit aa8e7907 authored by Jost Alemann's avatar Jost Alemann
Browse files

treewide: pin zig to zig_0_15 

targeting packages that depend on zig 0.15.x:
use zig_0_15 instead of zig to explicitly state required zig version
parent 8d47239b

pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  nix-update-script,

  openssl,

  perl,

  zig,

  zig_0_15,

  pkg-config,

  stdenv,

  vimUtils,
@@ -59,7 +59,7 @@ let 
      # Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime

      RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";



      ZIG = lib.getExe zig; # zlob requires zig

      ZIG = lib.getExe zig_0_15; # zlob requires zig

    };

  };

in

pkgs/by-name/at/attyx/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  callPackage,



  pkg-config,

  zig,

  zig_0_15,



  fontconfig,

  freetype,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { 


  nativeBuildInputs = [

    pkg-config

    zig

    zig_0_15

  ];



  buildInputs = [

pkgs/by-name/fa/fast-cli-zig/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  zig,

  zig_0_15,

}:

stdenv.mkDerivation (finalAttrs: {

  # fast-cli existed, was removed as noted in aliasses.nix on 2025-11-17. Consider to rename this package after 1 to 2 releases of nixos
@@ -16,12 +16,12 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-KKjxKQHiSYMaGCfX1+h6DQ809xHh9Yfv8B4PXvr3CwQ=";

  };



  zigDeps = zig.fetchDeps {

  zigDeps = zig_0_15.fetchDeps {

    inherit (finalAttrs) src pname version;

    hash = "sha256-89ig8lO5Yb9qFlJ1yL3NDDfKeZDl/CeM6qFxT40eOf8=";

  };



  nativeBuildInputs = [ zig.hook ];

  nativeBuildInputs = [ zig_0_15.hook ];



  postConfigure = ''

    ln -s ${finalAttrs.zigDeps} "$ZIG_GLOBAL_CACHE_DIR/p"
@@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: { 
    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ dwt ];

    mainProgram = "fast-cli";

    inherit (zig.meta) platforms;

    inherit (zig_0_15.meta) platforms;

  };

})

pkgs/by-name/ox/oxwm/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  zig,

  zig_0_15,

  pkg-config,

  libx11,

  libxft,
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { 
  };



  nativeBuildInputs = [

    zig.hook

    zig_0_15.hook

    pkg-config

  ];

pkgs/by-name/pk/pkl-lsp/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  makeBinaryWrapper,

  nix-update-script,

  versionCheckHook,

  zig,

  zig_0_15,

}:



let
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { 
      --replace-fail 'val jdkVersion: Int = 22' \

                     'val jdkVersion: Int = ${lib.versions.major jdk.version}' \

      --replace-fail 'val executable: Path get() = installDir.resolve(if (os.isWindows) "zig.exe" else "zig")' \

                     'val executable: Path get() = java.nio.file.Path.of("${lib.getExe zig}")' \

                     'val executable: Path get() = java.nio.file.Path.of("${lib.getExe zig_0_15}")' \



    substituteInPlace build.gradle.kts \

      --replace-fail 'dependsOn(setupTreeSitterRepo)' "" \
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [

    gradleOverlay

    makeBinaryWrapper

    zig

    zig_0_15

  ];



  mitmCache = gradle.fetchDeps {