From 7f688ce99ccd5a9198f3e4d6393947a1775422c9 Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Thu, 20 Mar 2025 20:55:26 -0600 Subject: [PATCH] updating --- pkgs/python-pymatting/default.nix | 20 ++++++++-- pkgs/python-rembg/default.nix | 13 ++++--- pkgs/tokyo-night/default.nix | 45 +++++---------------- pkgs/vivid-icons/default.nix | 65 ++++++++++++++++++------------- 4 files changed, 71 insertions(+), 72 deletions(-) diff --git a/pkgs/python-pymatting/default.nix b/pkgs/python-pymatting/default.nix index 50bc125..ef85c43 100644 --- a/pkgs/python-pymatting/default.nix +++ b/pkgs/python-pymatting/default.nix @@ -1,15 +1,23 @@ -{ lib, python310Packages, fetchPypi }: - +{ + lib, + python310Packages, + fetchPypi, +}: python310Packages.buildPythonPackage rec { pname = "pymatting"; version = "1.1.13"; - format = "setuptools"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LNt8S++s3e9Netwt6ONKJy3mOdYIrlwKCGE9+kJTgQE="; + hash = "sha256-LNt8S++s3e9Netwt6ONKJy3mOdYIrlwKCGE9+kJTgQE="; }; + nativeBuildInputs = with python310Packages; [ + setuptools + poetry-core + ]; + propagatedBuildInputs = with python310Packages; [ numpy scipy @@ -17,6 +25,9 @@ python310Packages.buildPythonPackage rec { numba ]; + buildInputs = [ + ]; + doCheck = false; meta = with lib; { @@ -24,5 +35,6 @@ python310Packages.buildPythonPackage rec { homepage = "https://github.com/pymatting/pymatting"; license = licenses.mit; platforms = platforms.all; + maintainers = with maintainers; [ "Cobray" ]; }; } diff --git a/pkgs/python-rembg/default.nix b/pkgs/python-rembg/default.nix index 4ae68c6..d8f4a03 100644 --- a/pkgs/python-rembg/default.nix +++ b/pkgs/python-rembg/default.nix @@ -7,23 +7,23 @@ python310Packages.buildPythonPackage rec { pname = "rembg"; version = "2.0.50"; - format = "setuptools"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0dgq291bj4w6jkcyz7lvp1vba2nczfnmxa2acl2sqib5p8cpzjvc"; + hash = "sha256-kW0MBDvIpL2Yc2n8zZ7Luw2na0qAczfORz2o6Y5YfkM="; }; nativeBuildInputs = with python310Packages; [ - setuptools poetry-core + setuptools ]; propagatedBuildInputs = with python310Packages; [ numpy pillow onnxruntime - opencv4 + opencv-python requests aiohttp asynctest @@ -37,6 +37,9 @@ python310Packages.buildPythonPackage rec { tqdm ]; + buildInputs = [ + ]; + doCheck = false; meta = with lib; { @@ -44,6 +47,6 @@ python310Packages.buildPythonPackage rec { homepage = "https://github.com/danielgatis/rembg"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; ["Cobray"]; + maintainers = with maintainers; [ "Cobray" ]; }; } diff --git a/pkgs/tokyo-night/default.nix b/pkgs/tokyo-night/default.nix index 8c23f92..2278384 100644 --- a/pkgs/tokyo-night/default.nix +++ b/pkgs/tokyo-night/default.nix @@ -3,62 +3,37 @@ stdenv, fetchFromGitHub, gtk-engine-murrine, - gtk_engines, + gnome-themes-extra, bash, sassc, }: stdenv.mkDerivation { pname = "tokyo-night-gtk"; - version = "2025-03-16"; + version = "main"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; - repo = "Tokyo-Night-GTK-Theme"; + repo = "Tokyonight-GTK-Theme"; rev = "4dc45d60bf35f50ebd9ee41f16ab63783f80dd64"; sha256 = "0c7sp9n2pc70yy9msmbmcyhqbr63v1ssnsxk6vg10zwwc3wl19h0"; }; nativeBuildInputs = [bash sassc]; - buildInputs = [gtk-engine-murrine gtk_engines]; + buildInputs = [gtk-engine-murrine gnome-themes-extra]; propagatedUserEnvPkgs = [gtk-engine-murrine]; - patchPhase = '' - cd themes - substituteInPlace install.sh \ - --replace-fail 'if [ "$UID" -eq "$ROOT_UID" ]; then' 'if false; then' \ - --replace-fail 'DEST_DIR="/usr/share/themes"' 'DEST_DIR="$TMPDIR/.themes"' \ - --replace-fail 'DEST_DIR="$HOME/.themes"' 'DEST_DIR="$TMPDIR/.themes"' - substituteInPlace install.sh \ - --replace-fail 'if [[ "$(command -v gnome-shell)" ]]; then' 'if false; then' \ - --replace-fail 'if has_command xfce4-popup-whiskermen; then' 'if false; then' \ - --replace-fail 'if (pgrep xfce4-session &>/dev/null); then' 'if false; then' - ''; buildPhase = '' - export HOME=$TMPDIR - mkdir -p $TMPDIR/.themes - bash ./install.sh -n Tokyonight - bash ./install.sh -n Tokyonight --tweaks storm - bash ./install.sh -n Tokyonight --tweaks storm black - bash ./install.sh -n Tokyonight --tweaks storm black outline - echo "Created themes:" - ls -la $TMPDIR/.themes/ + bash ./install.sh --dest $out/share/themes -n Tokyonight + bash ./install.sh --dest $out/share/themes -n Tokyonight --tweaks storm + bash ./install.sh --dest $out/share/themes -n Tokyonight --tweaks storm black + bash ./install.sh --dest $out/share/themes -n Tokyonight --tweaks storm black outline ''; - installPhase = '' - mkdir -p $out/share/themes - for theme in $TMPDIR/.themes/*; do - if [ -d "$theme" ]; then - themeBase=$(basename "$theme") - cp -r "$theme" "$out/share/themes/" - fi - done - echo "Installed themes:" - ls -la $out/share/themes/ - ''; + installPhase = ""; meta = with lib; { description = "Tokyo Night GTK Theme"; - homepage = "https://github.com/Fausto-Korpsvart/Tokyo-Night-GTK-Theme"; + homepage = "https://github.com/Fausto-Korpsvart/Tokyonight-GTK-Theme"; license = licenses.gpl3; platforms = platforms.all; maintainers = ["Cobray"]; diff --git a/pkgs/vivid-icons/default.nix b/pkgs/vivid-icons/default.nix index d3b46ab..eddab99 100644 --- a/pkgs/vivid-icons/default.nix +++ b/pkgs/vivid-icons/default.nix @@ -6,47 +6,56 @@ }: stdenv.mkDerivation rec { pname = "vivid-icons"; - version = "2025-03-16"; + version = "unstable-${builtins.substring 0 7 "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67"}"; + src = fetchFromGitHub { owner = "L4ki"; repo = "Vivid-Plasma-Themes"; rev = "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67"; - sha256 = "1rcphy08r6337gbp98nz00mj780jn9kwm40ngd9pxnlvwp2n8mjj"; + hash = "sha256-X6NPEIhjYzf2mYOYnDADJ4A5nJ6T4HTRnF5Y9vKNIrw="; }; - buildInputs = [hicolor-icon-theme]; + + buildInputs = [ hicolor-icon-theme ]; + installPhase = '' - mkdir -p $out/share/icons - cp -r "Vivid Icons Themes/"* $out/share/icons/ - for theme in $out/share/icons/*; do - if [ -d "$theme" ]; then - echo "Processing theme: $theme" - cat > "$theme/index.theme" < "$dest_dir/index.theme" + echo "Name=$theme_name" >> "$dest_dir/index.theme" + echo "Comment=$theme_name icons" >> "$dest_dir/index.theme" + echo "Inherits=hicolor" >> "$dest_dir/index.theme" + directories="" + for size_dir in "$dest_dir"/*; do + if [ -d "$size_dir" ]; then + size=$(basename "$size_dir") + if [[ "$size" =~ ^[0-9]+x[0-9]+$ ]]; then + directories="$directories''${directories:+,}$size" + echo "[$size]" >> "$dest_dir/index.theme" + echo "Size=''${size%%x*}" >> "$dest_dir/index.theme" + echo "Context=Actions" >> "$dest_dir/index.theme" + echo "Type=Fixed" >> "$dest_dir/index.theme" + fi fi done + echo "Directories=$directories" >> "$dest_dir/index.theme" + fi + done + + echo "Installed themes:" + ls -la $out/share/icons/ ''; + meta = with lib; { description = "Vivid Icons Theme"; homepage = "https://github.com/L4ki/Vivid-Plasma-Themes"; license = licenses.gpl3; platforms = platforms.all; - maintainers = ["Cobray"]; + maintainers = with maintainers; [ "Cobray" ]; }; }