diff --git a/pkgs/by-name/ed/edid-decode/package.nix b/pkgs/by-name/ed/edid-decode/package.nix deleted file mode 100644 index f5ac1176221e..000000000000 --- a/pkgs/by-name/ed/edid-decode/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - unstableGitUpdater, -}: - -stdenv.mkDerivation { - pname = "edid-decode"; - version = "0-unstable-2024-04-02"; - - outputs = [ - "out" - "man" - ]; - - src = fetchgit { - url = "https://git.linuxtv.org/edid-decode.git"; - rev = "3d635499e4aca3319f0796ba787213c981c5a770"; - hash = "sha256-bqzO39YM/3h9p37xaGJAw9xERgWOD+4yqO/XQiq/QqM="; - }; - - preBuild = '' - export DESTDIR=$out - export bindir=/bin - export mandir=/share/man - ''; - - enableParallelBuilding = true; - - passthru.updateScript = unstableGitUpdater { }; - - meta = with lib; { - description = "EDID decoder and conformance tester"; - homepage = "https://git.linuxtv.org/edid-decode.git"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; - platforms = platforms.all; - mainProgram = "edid-decode"; - }; -} diff --git a/pkgs/by-name/ed/edid-generator/package.nix b/pkgs/by-name/ed/edid-generator/package.nix index fd8735ff4226..30f74cb253e2 100644 --- a/pkgs/by-name/ed/edid-generator/package.nix +++ b/pkgs/by-name/ed/edid-generator/package.nix @@ -3,8 +3,8 @@ stdenv, fetchFromGitHub, dos2unix, - edid-decode, hexdump, + v4l-utils, zsh, }: @@ -34,8 +34,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ dos2unix - edid-decode hexdump + v4l-utils zsh ]; diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 0dc0354b3745..795701f89d5c 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -1,7 +1,7 @@ { stdenv, buildPackages, - edid-decode, + v4l-utils, fetchFromGitHub, fetchpatch, meson, @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { # For `libdisplay-info` python3 hwdata - edid-decode + v4l-utils # For OpenVR cmake diff --git a/pkgs/by-name/li/libdisplay-info/package.nix b/pkgs/by-name/li/libdisplay-info/package.nix index 241f09ebc190..97406754be65 100644 --- a/pkgs/by-name/li/libdisplay-info/package.nix +++ b/pkgs/by-name/li/libdisplay-info/package.nix @@ -7,7 +7,7 @@ ninja, python3, hwdata, - edid-decode, + v4l-utils, }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meson pkg-config ninja - edid-decode + v4l-utils hwdata python3 ]; diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix index e0f2b28c4dee..5dd06cf7fbb8 100644 --- a/pkgs/tools/system/hw-probe/default.nix +++ b/pkgs/tools/system/hw-probe/default.nix @@ -17,7 +17,6 @@ coreutils, curl, # Preferred to using the Perl HTTP libs - according to hw-probe. dmidecode, - edid-decode, gnugrep, gnutar, hwinfo, @@ -27,6 +26,7 @@ perl, smartmontools, usbutils, + v4l-utils, xz, # Conditionally recommended @@ -83,12 +83,12 @@ stdenv.mkDerivation rec { smartmontools pciutils usbutils - edid-decode iproute2 # (ip) coreutils # (sort) gnugrep curl gnutar + v4l-utils xz kmod # (lsmod) ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f413ccf8a2e2..de581c0431ef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -592,6 +592,7 @@ mapAliases { edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01 edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24 edge-runtime = throw "'edge-runtime' was removed as it was unused, unmaintained, likely insecure and failed to build"; # Added 2025-05-18 + edid-decode = v4l-utils; # Added 2025-06-20 eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28 eintopf = lauti; # Project was renamed, added 2025-05-01 elasticsearch7Plugins = elasticsearchPlugins;