Commit 64e6e3f2 authored by Guy Chronister's avatar Guy Chronister
Browse files

clight,clight-gui,clightd: migrate to pkgs/by-name, modernize 

- Moved clight, clight-gui, and clightd from pkgs/applications/misc/clight/
  into pkgs/by-name/cl/.
- Updated derivations to use `stdenv.mkDerivation (finalAttrs: { ... })`
  style instead of `rec`.
- Switched from `rev`/`sha256` to `tag`/`hash` in fetchFromGitHub.
- Applied `libsForQt5` consistently for clight-gui buildInputs and hooks.
- Added postPatch to clight-gui to require cmake >= 3.10.
- Adjusted `meta` blocks to avoid `with lib;` and use explicit `lib.*`.
- Removed old package references from all-packages.nix.
parent 6f9d82c9

pkgs/applications/misc/clight/clight-gui.nix→pkgs/by-name/cl/clight-gui/package.nix

+45 −0
Original line number Diff line number Diff line
@@ -3,14 +3,12 @@ 
  stdenv,

  fetchFromGitHub,

  cmake,

  qtbase,

  qtcharts,

  wrapQtAppsHook,

  libsForQt5,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "clight-gui";

  version = "unstable-2023-02-21";

  version = "0-unstable-2023-02-21";



  src = fetchFromGitHub {

    owner = "nullobsi";
@@ -19,23 +17,29 @@ stdenv.mkDerivation rec { 
    hash = "sha256-U4vaMwnVDZnYLc+K3/yD81Q1vyBL8uSrrhOHbjbox5U=";

  };



  buildInputs = [

  postPatch = ''

    substituteInPlace CMakeLists.txt \

      --replace-fail "cmake_minimum_required(VERSION 3.0)" \

                     "cmake_minimum_required(VERSION 3.10)"

  '';



  buildInputs = with libsForQt5; [

    qtbase

    qtcharts

  ];

  nativeBuildInputs = [

    cmake

    wrapQtAppsHook

    libsForQt5.wrapQtAppsHook

  ];



  sourceRoot = "${src.name}/src";

  sourceRoot = "${finalAttrs.src.name}/src";



  meta = with lib; {

  meta = {

    description = "Qt GUI for clight";

    homepage = "https://github.com/nullobsi/clight-gui";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ nickhu ];

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ nickhu ];

    mainProgram = "clight-gui";

    platforms = platforms.linux;

    platforms = lib.platforms.linux;

  };

}
 
})

pkgs/applications/misc/clight/default.nix→pkgs/by-name/cl/clight/package.nix

+8 −8
Original line number Diff line number Diff line
@@ -18,15 +18,15 @@ 
  upower,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "clight";

  version = "4.11";



  src = fetchFromGitHub {

    owner = "FedeDP";

    repo = "Clight";

    rev = version;

    sha256 = "sha256-Fu38HRP83Yn2jsq9xnCWOXNlV/0hJKD1/cOOp3EV45Q=";

    tag = finalAttrs.version;

    hash = "sha256-Fu38HRP83Yn2jsq9xnCWOXNlV/0hJKD1/cOOp3EV45Q=";

  };



  nativeBuildInputs = [
@@ -55,14 +55,14 @@ stdenv.mkDerivation rec { 
    "-DZSH_COMPLETIONS_DIR=${placeholder "out"}/share/zsh/site-functions"

  ];



  meta = with lib; {

  meta = {

    description = "C daemon that turns your webcam into a light sensor";

    homepage = "https://github.com/FedeDP/Clight";

    platforms = platforms.linux;

    license = licenses.gpl3;

    maintainers = with maintainers; [

    platforms = lib.platforms.linux;

    license = lib.licenses.gpl3;

    maintainers = with lib.maintainers; [

      eadwu

    ];

    mainProgram = "clight";

  };

}
 
})

pkgs/applications/misc/clight/clightd.nix→pkgs/by-name/cl/clightd/package.nix

+7 −7
Original line number Diff line number Diff line
@@ -28,14 +28,14 @@ 
  enableYoctolight ? true,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "clightd";

  version = "5.9";



  src = fetchFromGitHub {

    owner = "FedeDP";

    repo = "Clightd";

    rev = version;

    tag = finalAttrs.version;

    hash = "sha256-LOhBBd7QL5kH4TzMFgrh70C37WsFdsiKArP+tIEiPWo=";

  };
@@ -98,14 +98,14 @@ stdenv.mkDerivation rec { 
    ln -svT $out/libexec/clightd $out/bin/clightd

  '';



  meta = with lib; {

  meta = {

    description = "Linux bus interface that changes screen brightness/temperature";

    mainProgram = "clightd";

    homepage = "https://github.com/FedeDP/Clightd";

    platforms = platforms.linux;

    license = licenses.gpl3;

    maintainers = with maintainers; [

    platforms = lib.platforms.linux;

    license = lib.licenses.gpl3;

    maintainers = with lib.maintainers; [

      eadwu

    ];

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −6
Original line number Diff line number Diff line
@@ -10721,12 +10721,6 @@ with pkgs; 
    inherit (darwin) DarwinTools;

  };



  clight = callPackage ../applications/misc/clight { };



  clight-gui = libsForQt5.callPackage ../applications/misc/clight/clight-gui.nix { };



  clightd = callPackage ../applications/misc/clight/clightd.nix { };



  clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { };



  cmus = callPackage ../applications/audio/cmus {