Merge pull request #324101 from hexchen/drop-hexchen
maintainers: remove myself
This commit is contained in:
Ryan Lahfa
GitHub
commit
d387fafe2f
@ -8038,12 +8038,6 @@
|
||||
githubId = 222664;
|
||||
name = "Matthew Leach";
|
||||
};
|
||||
hexchen = {
|
||||
email = "nix@lilwit.ch";
|
||||
github = "hexchen";
|
||||
githubId = 41522204;
|
||||
name = "hexchen";
|
||||
};
|
||||
hexclover = {
|
||||
email = "hexclover@outlook.com";
|
||||
github = "hexclover";
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.hardware.decklink;
|
||||
kernelPackages = config.boot.kernelPackages;
|
||||
in
|
||||
{
|
||||
options.hardware.decklink.enable = lib.mkEnableOption "hardware support for the Blackmagic Design Decklink audio/video interfaces";
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
boot.kernelModules = [ "blackmagic" "blackmagic-io" "snd_blackmagic-io" ];
|
||||
boot.extraModulePackages = [ kernelPackages.decklink ];
|
||||
systemd.packages = [ pkgs.blackmagic-desktop-video ];
|
||||
systemd.services.DesktopVideoHelper.wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
}
|
||||
@ -59,7 +59,6 @@
|
||||
./hardware/cpu/intel-microcode.nix
|
||||
./hardware/cpu/intel-sgx.nix
|
||||
./hardware/cpu/x86-msr.nix
|
||||
./hardware/decklink.nix
|
||||
./hardware/device-tree.nix
|
||||
./hardware/digitalbitbox.nix
|
||||
./hardware/flipperzero.nix
|
||||
|
||||
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://alfaview.com";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ hexchen ];
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "alfaview";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
@ -48,8 +48,6 @@
|
||||
, nlohmann_json
|
||||
, websocketpp
|
||||
, asio
|
||||
, decklinkSupport ? false
|
||||
, blackmagic-desktop-video
|
||||
, libdatachannel
|
||||
, libvpl
|
||||
, qrcodegencpp
|
||||
@ -167,8 +165,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
xorg.libX11
|
||||
libvlc
|
||||
libGL
|
||||
] ++ optionals decklinkSupport [
|
||||
blackmagic-desktop-video
|
||||
];
|
||||
in ''
|
||||
# Remove libcef before patchelf, otherwise it will fail
|
||||
|
||||
@ -33,6 +33,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://pypi.org/project/bundlewrap-keepass";
|
||||
description = "Use secrets from keepass in your BundleWrap repo";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ hexchen ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -33,6 +33,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://pypi.org/project/bundlewrap-pass";
|
||||
description = "Use secrets from pass in your BundleWrap repo";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ hexchen ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -35,6 +35,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/trehn/bundlewrap-teamvault";
|
||||
description = "Pull secrets from TeamVault into your BundleWrap repo";
|
||||
license = [ licenses.gpl3 ];
|
||||
maintainers = with maintainers; [ hexchen ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -37,6 +37,6 @@ buildPythonPackage rec {
|
||||
description = "Python parser for Apache/nginx-style HTML directory listing";
|
||||
mainProgram = "rehttpfs";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexchen ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -40,6 +40,6 @@ buildPythonPackage rec {
|
||||
description = "Python API client for ionoscloud";
|
||||
changelog = "https://github.com/ionos-cloud/sdk-python/blob/v${version}/docs/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ hexchen ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchpatch
|
||||
, blackmagic-desktop-video
|
||||
, kernel
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "decklink";
|
||||
|
||||
# the download is a horrible curl mess. we reuse it between the kernel module
|
||||
# and desktop service, since the version of the two have to match anyways.
|
||||
# See pkgs/tools/video/blackmagic-desktop-video/default.nix for more.
|
||||
inherit (blackmagic-desktop-video) src version;
|
||||
|
||||
KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
||||
INSTALL_MOD_PATH = placeholder "out";
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
patches = lib.optionals (lib.versionAtLeast kernel.version "6.8") [
|
||||
(fetchpatch {
|
||||
name = "decklink-addMutex.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/01-addMutex.patch?h=decklink&id=132ce45a76e230cbfec4a3daac237ffe9b8a377a";
|
||||
sha256 = "sha256-YLIjO3wMrMoEZwMX5Fs9W4uRu9Xo8klzsjfhxS2wRfQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "decklink-changeMaxOrder.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/02-changeMaxOrder.patch?h=decklink&id=132ce45a76e230cbfec4a3daac237ffe9b8a377a";
|
||||
sha256 = "sha256-/erUVYjpTuyaQaCSzSxwKgNocxijc1uNaUjnrJEMa6g=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
postUnpack = let
|
||||
arch = stdenv.hostPlatform.uname.processor;
|
||||
in ''
|
||||
tar xf Blackmagic_Desktop_Video_Linux_${lib.head (lib.splitString "a" version)}/other/${arch}/desktopvideo-${version}-${arch}.tar.gz
|
||||
moduleRoot=$NIX_BUILD_TOP/desktopvideo-${version}-${stdenv.hostPlatform.uname.processor}/usr/src
|
||||
sourceRoot=$moduleRoot
|
||||
'';
|
||||
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
make -C $moduleRoot/blackmagic-${version} -j$NIX_BUILD_CORES
|
||||
make -C $moduleRoot/blackmagic-io-${version} -j$NIX_BUILD_CORES
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
make -C $KERNELDIR M=$moduleRoot/blackmagic-${version} modules_install
|
||||
make -C $KERNELDIR M=$moduleRoot/blackmagic-io-${version} modules_install
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.blackmagicdesign.com/support/family/capture-and-playback";
|
||||
maintainers = [ maintainers.hexchen ];
|
||||
license = licenses.unfree;
|
||||
description = "Kernel module for the Blackmagic Design Decklink cards";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryFirmware ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,106 +0,0 @@
|
||||
{ stdenv
|
||||
, cacert
|
||||
, curl
|
||||
, runCommandLocal
|
||||
, lib
|
||||
, autoPatchelfHook
|
||||
, libcxx
|
||||
, libGL
|
||||
, gcc7
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackmagic-desktop-video";
|
||||
version = "12.9a3";
|
||||
|
||||
buildInputs = [
|
||||
autoPatchelfHook
|
||||
libcxx
|
||||
libGL
|
||||
gcc7.cc.lib
|
||||
];
|
||||
|
||||
# yes, the below download function is an absolute mess.
|
||||
# blame blackmagicdesign.
|
||||
src = runCommandLocal "${pname}-${lib.versions.majorMinor version}-src.tar.gz"
|
||||
rec {
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-H7AHD6u8KsJoL+ug3QCqxuPfMP4A0nHtIyKx5IaQkdQ=";
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
nativeBuildInputs = [ curl ];
|
||||
|
||||
# ENV VARS
|
||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
|
||||
# from the URL that the POST happens to, see browser console
|
||||
DOWNLOADID = "495ebc707969447598c2f1cf0ff8d7d8";
|
||||
# from the URL the download page where you click the "only download" button is at
|
||||
REFERID = "6e65a87d97bd49e1915c57f8df255f5c";
|
||||
SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}";
|
||||
|
||||
USERAGENT = builtins.concatStringsSep " " [
|
||||
"User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})"
|
||||
"AppleWebKit/537.36 (KHTML, like Gecko)"
|
||||
"Chrome/77.0.3865.75"
|
||||
"Safari/537.36"
|
||||
];
|
||||
|
||||
REQJSON = builtins.toJSON {
|
||||
"country" = "nl";
|
||||
"downloadOnly" = true;
|
||||
"platform" = "Linux";
|
||||
"policy" = true;
|
||||
};
|
||||
|
||||
} ''
|
||||
RESOLVEURL=$(curl \
|
||||
-s \
|
||||
-H "$USERAGENT" \
|
||||
-H 'Content-Type: application/json;charset=UTF-8' \
|
||||
-H "Referer: https://www.blackmagicdesign.com/support/download/$REFERID/Linux" \
|
||||
--data-ascii "$REQJSON" \
|
||||
--compressed \
|
||||
"$SITEURL")
|
||||
|
||||
curl \
|
||||
--retry 3 --retry-delay 3 \
|
||||
--compressed \
|
||||
"$RESOLVEURL" \
|
||||
> $out
|
||||
'';
|
||||
|
||||
postUnpack = let
|
||||
arch = stdenv.hostPlatform.uname.processor;
|
||||
in ''
|
||||
tar xf Blackmagic_Desktop_Video_Linux_${lib.head (lib.splitString "a" version)}/other/${arch}/desktopvideo-${version}-${arch}.tar.gz
|
||||
unpacked=$NIX_BUILD_TOP/desktopvideo-${version}-${stdenv.hostPlatform.uname.processor}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,share/doc,lib/systemd/system}
|
||||
cp -r $unpacked/usr/share/doc/desktopvideo $out/share/doc
|
||||
cp $unpacked/usr/lib/*.so $out/lib
|
||||
cp $unpacked/usr/lib/systemd/system/DesktopVideoHelper.service $out/lib/systemd/system
|
||||
cp $unpacked/usr/lib/blackmagic/DesktopVideo/DesktopVideoHelper $out/bin/
|
||||
|
||||
substituteInPlace $out/lib/systemd/system/DesktopVideoHelper.service --replace "/usr/lib/blackmagic/DesktopVideo/DesktopVideoHelper" "$out/bin/DesktopVideoHelper"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# need to tell the DesktopVideoHelper where to find its own library
|
||||
appendRunpaths = [ "${placeholder "out"}/lib" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.blackmagicdesign.com/support/family/capture-and-playback";
|
||||
maintainers = [ maintainers.hexchen ];
|
||||
license = licenses.unfree;
|
||||
description = "Supporting applications for Blackmagic Decklink. Doesn't include the desktop applications, only the helper required to make the driver work";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -133,6 +133,7 @@ mapAliases ({
|
||||
bitwarden = bitwarden-desktop; # Added 2024-02-25
|
||||
bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03
|
||||
bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03
|
||||
blackmagic-desktop-video = throw "blackmagic-desktop-video has been due to being unmaintained"; # Added 2024-07-02
|
||||
blender-with-packages = args:
|
||||
lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"
|
||||
(blender.withPackages (_: args.packages)).overrideAttrs
|
||||
|
||||
@ -3468,8 +3468,6 @@ with pkgs;
|
||||
|
||||
bkyml = callPackage ../tools/misc/bkyml { };
|
||||
|
||||
blackmagic-desktop-video = callPackage ../tools/video/blackmagic-desktop-video { };
|
||||
|
||||
blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
|
||||
|
||||
bmap-tools = callPackage ../tools/misc/bmap-tools { };
|
||||
|
||||
@ -343,7 +343,7 @@ in {
|
||||
|
||||
dddvb = callPackage ../os-specific/linux/dddvb { };
|
||||
|
||||
decklink = callPackage ../os-specific/linux/decklink { };
|
||||
decklink = throw "The decklink kernel module has been removed due to being unmaintained"; # Module removed on 2024-07-02
|
||||
|
||||
digimend = callPackage ../os-specific/linux/digimend { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user