Unverified Commit d2e95d83 authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

zig: drop 0.11, use ninja (#397597)

parents 7f76f398 6b2f93bd
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  meta = with lib; {
    # Does not support zig 0.12 or newer, hasn't been updated in 2 years.
    broken = lib.versionAtLeast zig.version "0.12";
    description = "Automatically set screen brightness with a webcam";
    mainProgram = "backlight-auto";
    homepage = "https://len.falken.directory/backlight-auto.html";
+30 −5
Original line number Diff line number Diff line
@@ -7,22 +7,47 @@
  libGLU,
  libsndfile,
  openal,
  zig_0_11,
  zig_0_14,
  runCommand,
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "blackshades";
  version = "2.5.1";
  version = "2.5.2-unstable-2025-03-12";

  src = fetchFromSourcehut {
    owner = "~cnx";
    repo = "blackshades";
    rev = finalAttrs.version;
    rev = "a2fbe0e08bedbbbb1089dbb8f3e3cb4d76917bd0";
    fetchSubmodules = true;
    hash = "sha256-qdpXpuXHr9w2XMfgOVveWv3JoqdJHVB8TCqZdyaw/DM=";
    hash = "sha256-W6ltmWCw7jfiTiNlh60YVF7mz//8s+bgu4F9gy5cDgw=";
  };

  nativeBuildInputs = [ zig_0_11.hook ];
  postUnpack = ''
    ln -s ${
      runCommand "${finalAttrs.finalPackage.name}-zig-deps"
        {
          inherit (finalAttrs) src;

          nativeBuildInputs = [ zig_0_14 ];

          outputHashAlgo = null;
          outputHashMode = "recursive";
          outputHash = "sha256-wBIfLeaKtTow2Z7gjEgIFmqcTGWgpRWI+k0t294BslM=";
        }
        ''
          export ZIG_GLOBAL_CACHE_DIR=$(mktemp -d)

          runHook unpackPhase
          cd $sourceRoot

          zig build --fetch
          mv $ZIG_GLOBAL_CACHE_DIR/p $out
        ''
    } $ZIG_GLOBAL_CACHE_DIR/p
  '';

  nativeBuildInputs = [ zig_0_14.hook ];

  buildInputs = [
    glfw
+6 −6
Original line number Diff line number Diff line
@@ -2,22 +2,22 @@
  lib,
  stdenv,
  fetchFromGitHub,
  zig_0_11,
  zig_0_12,
}:

stdenv.mkDerivation rec {
  pname = "cyber";
  version = "unstable-2023-09-19";
  version = "0-unstable-2025-12-10";

  src = fetchFromGitHub {
    owner = "fubark";
    repo = "cyber";
    rev = "f95cd189cf090d26542a87b1d2ced461e75fa1a7";
    hash = "sha256-ctEd8doXMKq3L9/T+jOcWqlBQN0pVhsu9DjBXsg/u/4=";
    rev = "2a2298d6aa12f9136b18cd85965f4a58e484f506";
    hash = "sha256-d81z+wUIQ/KUVa+GyXbT+E8dsG8Mdt1hZW1Qe1mmAiw=";
  };

  nativeBuildInputs = [
    zig_0_11.hook
    zig_0_12.hook
  ];

  zigBuildFlags = [
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/fubark/cyber";
    license = licenses.mit;
    maintainers = with maintainers; [ figsoda ];
    inherit (zig_0_11.meta) platforms;
    inherit (zig_0_12.meta) platforms;
    broken = stdenv.hostPlatform.isDarwin;
  };
}
+7 −6
Original line number Diff line number Diff line
@@ -3,21 +3,21 @@
  stdenv,
  fetchFromGitHub,
  testers,
  zig_0_11,
  zig_0_12,
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "dt";
  version = "1.3.1";
  version = "1.3.1-unstable-2024-07-16";

  src = fetchFromGitHub {
    owner = "so-dang-cool";
    repo = "dt";
    rev = "v${finalAttrs.version}";
    hash = "sha256-qHfvHf4T0wWnzqp5FfLg7n7te24xc2aMEdTK3Iia8Q0=";
    rev = "0d16ca2867131e99a93a412231465cf68f2e594f";
    hash = "sha256-pfTlOMJpOPbXZaJJvOKDUyCZxFHNLRRUteJFWT9IKOU=";
  };

  nativeBuildInputs = [ zig_0_11.hook ];
  nativeBuildInputs = [ zig_0_12.hook ];

  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };

@@ -37,7 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
      In short, dt is intended to be generally useful, with zero pretense of
      elegance.
    '';
    changelog = "https://github.com/so-dang-cool/dt/releases/tag/v${finalAttrs.version}";
    # TODO: uncomment when dt pushes a new release
    # changelog = "https://github.com/so-dang-cool/dt/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ booniepepper ];
    platforms = lib.platforms.unix;
+3 −4
Original line number Diff line number Diff line
@@ -3,11 +3,8 @@
  stdenv,
  fetchFromGitHub,
  testers,
  zig_0_11,
  zig,
}:
let
  zig = zig_0_11;
in
stdenv.mkDerivation (finalAttrs: {
  pname = "findup";
  version = "1.1.2";
@@ -24,6 +21,8 @@ stdenv.mkDerivation (finalAttrs: {
  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };

  meta = {
    # Doesn't support zig 0.12 or newer, last commit was 2 years ago.
    broken = lib.versionAtLeast zig.version "0.12";
    homepage = "https://github.com/booniepepper/findup";
    description = "Search parent directories for sentinel files";
    license = lib.licenses.mit;
Loading