diff --git a/pkgs/by-name/lemoa/package.nix b/pkgs/by-name/lemoa/package.nix index e15113dd3..da622cbbb 100644 --- a/pkgs/by-name/lemoa/package.nix +++ b/pkgs/by-name/lemoa/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lemmy-gtk"; - repo = pname; + repo = "lemoa"; rev = "v${version}"; hash = "sha256-XyVl0vreium83d6NqiMkdER3U0Ra0GeAgTq4pyrZyZE="; }; diff --git a/pkgs/by-name/mslicer/package.nix b/pkgs/by-name/mslicer/package.nix index 502dcfe1c..abdef1544 100644 --- a/pkgs/by-name/mslicer/package.nix +++ b/pkgs/by-name/mslicer/package.nix @@ -1,33 +1,21 @@ { - # cairo, fetchFromGitHub, - # gtk3, lib, libglvnd, - # libgbm, libxkbcommon, - # fontconfig, - # freetype, nix-update-script, - # pango, - pkg-config, rustPlatform, - # vulkan-headers, vulkan-loader, wayland, - wayland-scanner, - wayland-protocols, - # wrapGAppsHook3, - # xorg, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "mslicer"; version = "0.2.0-unstable-2025-04-05"; src = fetchFromGitHub { owner = "connorslade"; - repo = pname; + repo = "mslicer"; rev = "fe08ef5e1f2c17b0a80bb993b423f751d7ed3c8e"; hash = "sha256-PUIMy+SaqMgbTdFjA7tACoOkYw3qm7Yt4lZSZb+b7pQ="; }; @@ -36,24 +24,10 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; buildInputs = [ - # cairo - # gtk3 libglvnd - # libgbm libxkbcommon - # xorg.libX11 - # xorg.libXcursor - # xorg.libXi - # xorg.libxcb - # xorg.libXrender - # fontconfig - # freetype - # openssl - # pango - # vulkan-headers vulkan-loader wayland - # wayland-protocols ]; # from pkgs/by-name/al/alvr/package.nix, to get it to actually link against wayland diff --git a/pkgs/by-name/sublime-music-mobile/package.nix b/pkgs/by-name/sublime-music-mobile/package.nix index 78e3d2b04..0e263789b 100644 --- a/pkgs/by-name/sublime-music-mobile/package.nix +++ b/pkgs/by-name/sublime-music-mobile/package.nix @@ -2,7 +2,7 @@ # , lib # , libhandy # , ... }: -# +# # (pkgs.sublime-music.overrideAttrs (upstream: { # pname = "sublime-music-mobile"; # version = "0.11.10"; @@ -13,7 +13,7 @@ # rev = "4ce2f222f13020574d54110d90839f48d8689b9d"; # sha256 = "sha256-V6YyBbPKAfZb5FVOesNcC6TfJbO73WZ4DvlOSWSSZzU="; # }; -# +# # buildInputs = upstream.buildInputs ++ [ # # requires this PR that adds the drawtab: # # - @@ -33,33 +33,34 @@ # ]; # })) # ]; -# +# # # i think Benjamin didn't update the tests? # doCheck = false; # doInstallCheck = false; -# +# # meta.description = "A mobile-friendly sublime music fork"; # })) -{ fetchFromGitLab -, fetchFromGitea -, docbook_xml_dtd_43 -, docbook-xsl-nons -, gtk-doc -, lib -, libhandy -, fetchFromGitHub -, python3 -, gobject-introspection -, gtk3 -, pango -, wrapGAppsHook -, xvfb-run -, chromecastSupport ? false -, serverSupport ? false -, keyringSupport ? true -, notifySupport ? true, libnotify -, networkSupport ? true, networkmanager +{ + docbook-xsl-nons, + docbook_xml_dtd_43, + fetchFromGitHub, + fetchFromGitLab, + fetchFromGitea, + gobject-introspection, + gtk-doc, + gtk3, + lib, + libhandy, + pango, + python3, + wrapGAppsHook, + xvfb-run, + chromecastSupport ? false, + keyringSupport ? true, + networkSupport ? true, networkmanager, + notifySupport ? true, libnotify, + serverSupport ? false, }: let @@ -84,7 +85,7 @@ python.pkgs.buildPythonApplication rec { # src = fetchFromGitLab { # owner = "sublime-music"; - # repo = pname; + # repo = "sublime-music-mobile; # rev = "v${version}"; # sha256 = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg="; # }; @@ -102,13 +103,15 @@ python.pkgs.buildPythonApplication rec { sha256 = "sha256-jyC3Fh+b+MBLjHlFr3nOOM7eT/3PPF7dynHsPJaIzLU="; }; - nativeBuildInputs = [ - gobject-introspection - wrapGAppsHook - ] ++ (with python.pkgs; [ - poetry-core - pythonRelaxDepsHook - ]); + nativeBuildInputs = + [ + gobject-introspection + wrapGAppsHook + ] + ++ (with python.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]); # Can be removed in later versions (probably > 0.11.16) pythonRelaxDeps = [ @@ -116,46 +119,47 @@ python.pkgs.buildPythonApplication rec { "python-mpv" ]; - buildInputs = [ - gtk3 - pango - (libhandy.overrideAttrs (superhandy: { - version = "1.5.0"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "BenjaminSchaaf"; - repo = "libhandy"; - rev = "0557503278a099c1b9999ceebb7c21fa9c15a3a5"; - sha256 = "sha256-MwOnQ2h1ypSvxOSaXDdSFoMKOMr9DonTCMNT796kaQs="; - }; - nativeBuildInputs = superhandy.nativeBuildInputs ++ [ - docbook_xml_dtd_43 - docbook-xsl-nons - gtk-doc - ]; - })) - ] - ++ lib.optional notifySupport libnotify - ++ lib.optional networkSupport networkmanager - ; + buildInputs = + [ + gtk3 + pango + (libhandy.overrideAttrs (superhandy: { + version = "1.5.0"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "BenjaminSchaaf"; + repo = "libhandy"; + rev = "0557503278a099c1b9999ceebb7c21fa9c15a3a5"; + sha256 = "sha256-MwOnQ2h1ypSvxOSaXDdSFoMKOMr9DonTCMNT796kaQs="; + }; + nativeBuildInputs = superhandy.nativeBuildInputs ++ [ + docbook_xml_dtd_43 + docbook-xsl-nons + gtk-doc + ]; + })) + ] + ++ lib.optional notifySupport libnotify + ++ lib.optional networkSupport networkmanager; - propagatedBuildInputs = with python.pkgs; [ - bleach - dataclasses-json - deepdiff - fuzzywuzzy - levenshtein - mpv - peewee - pygobject3 - python-dateutil - requests - semver - ] - ++ lib.optional chromecastSupport pychromecast - ++ lib.optional keyringSupport keyring - ++ lib.optional serverSupport bottle - ; + propagatedBuildInputs = + with python.pkgs; + [ + bleach + dataclasses-json + deepdiff + fuzzywuzzy + levenshtein + mpv + peewee + pygobject3 + python-dateutil + requests + semver + ] + ++ lib.optional chromecastSupport pychromecast + ++ lib.optional keyringSupport keyring + ++ lib.optional serverSupport bottle; postPatch = '' sed -i "/--cov/d" setup.cfg @@ -199,6 +203,9 @@ python.pkgs.buildPythonApplication rec { description = "GTK3 Subsonic/Airsonic client"; homepage = "https://sublimemusic.app/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ albakham sumnerevans ]; + maintainers = with maintainers; [ + albakham + sumnerevans + ]; }; } diff --git a/pkgs/by-name/unftp/package.nix b/pkgs/by-name/unftp/package.nix index 336981c79..467df91fc 100644 --- a/pkgs/by-name/unftp/package.nix +++ b/pkgs/by-name/unftp/package.nix @@ -1,6 +1,7 @@ -{ lib -, rustPlatform -, fetchFromGitHub +{ + lib, + rustPlatform, + fetchFromGitHub, }: rustPlatform.buildRustPackage rec { @@ -9,7 +10,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "bolcom"; - repo = pname; + repo = "unftp"; rev = "v${version}"; hash = "sha256-+UL8xflnumOiWL5b9/azH9OW+X+6hRcxjiyWhCSWQRg="; }; diff --git a/pkgs/by-name/zecwallet-light-cli/package.nix b/pkgs/by-name/zecwallet-light-cli/package.nix index 44bf8a744..de870bb41 100644 --- a/pkgs/by-name/zecwallet-light-cli/package.nix +++ b/pkgs/by-name/zecwallet-light-cli/package.nix @@ -1,8 +1,9 @@ -{ lib -, buildPackages -, fetchFromGitHub -, rustfmt -, rustPlatform +{ + buildPackages, + fetchFromGitHub, + lib, + rustPlatform, + rustfmt, }: rustPlatform.buildRustPackage rec { @@ -11,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "adityapk00"; - repo = pname; + repo = "zecwallet-light-cli"; rev = "v${version}"; hash = "sha256-8qr6GIldJcybQwXbdZxFVGvFPJErLpqCEIuGJw1z0qQ="; }; diff --git a/templates/pkgs/make/default.nix b/templates/pkgs/make/default.nix index 6266c9109..3fddf8d27 100644 --- a/templates/pkgs/make/default.nix +++ b/templates/pkgs/make/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "TODO"; - repo = pname; + repo = "TODO"; rev = "v${version}"; hash = "sha256-TODO"; }; diff --git a/templates/pkgs/rust/default.nix b/templates/pkgs/rust/default.nix index 4639353b7..08db5e120 100644 --- a/templates/pkgs/rust/default.nix +++ b/templates/pkgs/rust/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "ruslashev"; - repo = pname; + repo = "elfcat"; rev = version; hash = "sha256-NzFKNCCPWBj/fhaEJF34nyeyvLMeQwIcQgTlYc6mgYo="; };