remove some upstreamed packages
This commit is contained in:
		
							parent
							
								
									4de4dd4492
								
							
						
					
					
						commit
						4f10ba96a2
					
				@ -13,7 +13,6 @@ let
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#  opencv-python-headless = pkgs.callPackage ./pkgs/python-modules/opencv-python-headless { buildPythonPackage = pkgs.python3Packages.buildPythonPackage; fetchPypi = pkgs.python3Packages.fetchPypi; };
 | 
			
		||||
#  python-mpv = pkgs.callPackage ./pkgs/python-modules/python-mpv { buildPythonPackage = pkgs.python3Packages.buildPythonPackage; fetchPypi = pkgs.python3Packages.fetchPypi; };
 | 
			
		||||
in 
 | 
			
		||||
rec {
 | 
			
		||||
  # The `lib`, `modules`, and `overlay` names are special
 | 
			
		||||
@ -46,9 +45,6 @@ rec {
 | 
			
		||||
  # radical-native = pkgs.callPackage ./pkgs/radical-native { };
 | 
			
		||||
  photini = pkgs.libsForQt5.callPackage ./pkgs/photini { };
 | 
			
		||||
 | 
			
		||||
  pylzma = pkgs.callPackage ./pkgs/python-modules/pylzma { buildPythonPackage = pkgs.python3Packages.buildPythonPackage; fetchPypi = pkgs.python3Packages.fetchPypi; };
 | 
			
		||||
  hydrus = pkgs.libsForQt5.callPackage ./pkgs/hydrus { inherit pylzma;};
 | 
			
		||||
 | 
			
		||||
  metapixel = pkgs.callPackage ./pkgs/metapixel { };
 | 
			
		||||
 | 
			
		||||
  plotbitrate = pkgs.callPackage ./pkgs/plotbitrate { };
 | 
			
		||||
 | 
			
		||||
@ -1,85 +0,0 @@
 | 
			
		||||
{ mkDerivation, fetchFromGitHub, python3, python3Packages, wrapGAppsHook, qt5, pylzma, ffmpeg, miniupnpc }:
 | 
			
		||||
let
 | 
			
		||||
  pythonEnv = python3.withPackages (pythonPackages: with pythonPackages; [
 | 
			
		||||
    beautifulsoup4
 | 
			
		||||
    chardet
 | 
			
		||||
    cloudscraper
 | 
			
		||||
    html5lib
 | 
			
		||||
    lxml
 | 
			
		||||
    lz4
 | 
			
		||||
    nose
 | 
			
		||||
    numpy
 | 
			
		||||
    pillow
 | 
			
		||||
    psutil
 | 
			
		||||
    pylzma
 | 
			
		||||
    pyopenssl
 | 
			
		||||
    pyside2
 | 
			
		||||
    pysocks
 | 
			
		||||
    pyyaml
 | 
			
		||||
    qtpy
 | 
			
		||||
    requests
 | 
			
		||||
    send2trash
 | 
			
		||||
    service-identity
 | 
			
		||||
    six
 | 
			
		||||
    twisted
 | 
			
		||||
 | 
			
		||||
    opencv4
 | 
			
		||||
  ]);
 | 
			
		||||
in
 | 
			
		||||
  mkDerivation rec {
 | 
			
		||||
    pname = "hydrus";
 | 
			
		||||
    version = "447";
 | 
			
		||||
 | 
			
		||||
    src = fetchFromGitHub {
 | 
			
		||||
      owner = "hydrusnetwork";
 | 
			
		||||
      repo = "hydrus";
 | 
			
		||||
      rev = "v${version}";
 | 
			
		||||
      sha256 = "sha256-nxLU190d63I26cRwNMYzed+5e/Sqg1RXEiLwwZfONik=";
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    format = "other";
 | 
			
		||||
    dontWrapQtApps = true;
 | 
			
		||||
    dontWrapGApps = true;
 | 
			
		||||
 | 
			
		||||
    
 | 
			
		||||
    makeWrapperArgs = [
 | 
			
		||||
      "\${gappsWrapperArgs[@]}"
 | 
			
		||||
      "\${qtWrapperArgs[@]}"
 | 
			
		||||
    ];
 | 
			
		||||
 | 
			
		||||
    preFixup = ''
 | 
			
		||||
      wrapPythonPrograms
 | 
			
		||||
    '';
 | 
			
		||||
 | 
			
		||||
    buildPhase = ''
 | 
			
		||||
      runHook preBuild
 | 
			
		||||
 | 
			
		||||
      python -OO -m compileall -f .
 | 
			
		||||
 | 
			
		||||
      runHook postBuild
 | 
			
		||||
    '';
 | 
			
		||||
 | 
			
		||||
    installPhase = ''
 | 
			
		||||
     runHook preInstall
 | 
			
		||||
 | 
			
		||||
      mkdir -p "$out/opt/hydrus"
 | 
			
		||||
      cp -r help hydrus static client.pyw server.py "$out/opt/hydrus/"
 | 
			
		||||
      chmod a+x "$out/opt/hydrus/server.py"
 | 
			
		||||
 | 
			
		||||
      mkdir -p $out/opt/hydrus/bin
 | 
			
		||||
      ln -s "${miniupnpc}/bin/upnpc" "$out/opt/hydrus/bin/upnpc_linux"
 | 
			
		||||
      ln -s "${ffmpeg}/bin/ffmpeg" "$out/opt/hydrus/bin/ffmpeg"
 | 
			
		||||
 | 
			
		||||
      mkdir -p "$out/bin"
 | 
			
		||||
 | 
			
		||||
      runHook postInstall
 | 
			
		||||
    '';
 | 
			
		||||
 | 
			
		||||
    nativeBuildInputs = [ qt5.wrapQtAppsHook python3Packages.wrapPython ];
 | 
			
		||||
    buildInputs = [ ffmpeg miniupnpc ];
 | 
			
		||||
    propagatedBuildInputs = [ pythonEnv ];    
 | 
			
		||||
 | 
			
		||||
    postInstall = ''
 | 
			
		||||
      makeQtWrapper $out/opt/hydrus/client.pyw $out/bin/hydrus-client  --prefix PYTHONPATH : $PYTHONPATH
 | 
			
		||||
    '';
 | 
			
		||||
  }
 | 
			
		||||
@ -1,21 +0,0 @@
 | 
			
		||||
{ lib, buildPythonPackage, fetchPypi }:
 | 
			
		||||
 | 
			
		||||
buildPythonPackage rec {
 | 
			
		||||
  pname = "pylzma";
 | 
			
		||||
  version = "0.5.0";
 | 
			
		||||
 | 
			
		||||
  src = fetchPypi {
 | 
			
		||||
    inherit pname version;
 | 
			
		||||
    sha256 = "074anvhyjgsv2iby2ql1ixfvjgmhnvcwjbdz8gk70xzkzcm1fx5q";
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  
 | 
			
		||||
  doCheck = false;
 | 
			
		||||
 | 
			
		||||
  meta = with lib; {
 | 
			
		||||
    homepage = "https://github.com/opencv/opencv-python";
 | 
			
		||||
    description = "Unofficial pre-built CPU-only OpenCV packages for Python";
 | 
			
		||||
    license = licenses.mit;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@ -1,21 +0,0 @@
 | 
			
		||||
{ lib, buildPythonPackage, fetchPypi }:
 | 
			
		||||
 | 
			
		||||
buildPythonPackage rec {
 | 
			
		||||
  pname = "python-mpv";
 | 
			
		||||
  version = "0.5.2";
 | 
			
		||||
 | 
			
		||||
  src = fetchPypi {
 | 
			
		||||
    inherit pname version;
 | 
			
		||||
    sha256 = "08v8kv5jn741v1r4fi8m7haxxphw74452nc8f4n60hglxxhsxiqh";
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  
 | 
			
		||||
  doCheck = false;
 | 
			
		||||
 | 
			
		||||
  meta = with lib; {
 | 
			
		||||
    homepage = "https://github.com/jaseg/python-mpv";
 | 
			
		||||
    description = "python-mpv is a ctypes-based python interface to the mpv media player. It gives you more or less full control of all features of the player, just as the lua interface does";
 | 
			
		||||
    license = licenses.agpl3Only;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user