diff --git a/modules/i3-xfce.nix b/modules/i3-xfce.nix index 9e85de3..1e01783 100644 --- a/modules/i3-xfce.nix +++ b/modules/i3-xfce.nix @@ -47,7 +47,7 @@ in { greeters.gtk = { enable = true; theme = { - package = customPkgs.tokyo-night-gtk; + package = pkgs.tokyonight-gtk-theme; name = "Tokyonight-Storm"; }; iconTheme = { @@ -105,8 +105,9 @@ in { numix-icon-theme-circle candy-icons capitaine-cursors + tokyonight-gtk-theme + nix-prefetch-git ] ++ (with customPkgs; [ - tokyo-night-gtk vivid-icons ]); diff --git a/pkgs/default.nix b/pkgs/default.nix index b65e54e..305edcf 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,8 +2,8 @@ pkgs ? import {}, lib ? pkgs.lib, }: let - python-opencv-headless = pkgs.callPackage ./python-opencv-headless { - inherit (pkgs) lib fetchPypi; + python-opencv-headless = pkgs.callPackage ./python-opencv-headless { + inherit (pkgs) lib fetchurl; python310Packages = pkgs.python310.pkgs; }; diff --git a/pkgs/python-opencv-headless/default.nix b/pkgs/python-opencv-headless/default.nix index 2ac0c2c..dbbc5a4 100644 --- a/pkgs/python-opencv-headless/default.nix +++ b/pkgs/python-opencv-headless/default.nix @@ -1,19 +1,16 @@ { lib , python310Packages -, fetchPypi +, fetchurl }: python310Packages.buildPythonPackage rec { pname = "opencv-python-headless"; - version = "4.9.0.80"; + version = "4.11.0.86"; format = "wheel"; - src = fetchPypi { - inherit pname version format; - dist = "cp310"; - abi = "cp310"; - platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; - hash = "sha256-a1uEcgIUu7qxcJCyX+4umIOGa4bsRdfgSBn6jO0PnoM="; + src = fetchurl { + url = "https://files.pythonhosted.org/packages/dd/5c/c139a7876099916879609372bfa513b7f1257f7f1a908b0bdc1c2328241b/opencv_python_headless-4.11.0.86-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0yx58bpwl6bcsq3ikv5jzffvxyv663jcyxj9z7ghvx6ikp0jf2hf"; }; propagatedBuildInputs = with python310Packages; [ @@ -22,8 +19,6 @@ python310Packages.buildPythonPackage rec { doCheck = false; - pythonImportsCheck = [ "cv2" ]; - meta = with lib; { description = "Wrapper package for OpenCV python bindings"; homepage = "https://github.com/opencv/opencv-python";