jawz/scripts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Nix package definitions for improved clarity and consistency, including updates to overlays, dependencies, and build inputs across multiple packages.

Browse Source
This commit is contained in:
Danilo Reyes 2025-10-02 14:45:13 -06:00
parent 38959dc37b
commit e9fc085de1
14 changed files with 188 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.nix
View File

@ -28,8 +28,8 @@
|> builtins.listToAttrs;
in
{
overlays.default = final: prev: {
scrapy = prev.scrapy.overrideAttrs (old: rec {
overlays.default = _final: prev: {
scrapy = prev.scrapy.overrideAttrs (_old: rec {
version = "2.11.2";
src = prev.fetchFromGitHub {
owner = "scrapy";
@ -42,7 +42,7 @@
packages.x86_64-linux =
let
scriptBin = path: name: pkgs.writeScriptBin name (builtins.readFile path);
pkgsBin = path: name: pkgs.callPackage path { };
pkgsBin = path: _name: pkgs.callPackage path { };
in
{
citra = pkgs.callPackage ./pkgs/citra/default.nix { branch = "nightly"; };

9
pkgs/citra/generic.nix
View File

@ -45,10 +45,10 @@ stdenv.mkDerivation {
glslang
pkg-config
python3
] ++ lib.optionals enableQt [ wrapQtAppsHook ];
]
++ lib.optionals enableQt [ wrapQtAppsHook ];
buildInputs =
[
buildInputs = [
boost
libusb1
]
@ -63,8 +63,7 @@ stdenv.mkDerivation {
++ lib.optional useDiscordRichPresence rapidjson
++ lib.optional enableFdk fdk_aac;
cmakeFlags =
[
cmakeFlags = [
"-DUSE_SYSTEM_BOOST=ON"
"-DCITRA_WARNINGS_AS_ERRORS=OFF"
"-DCITRA_USE_BUNDLED_FFMPEG=OFF"

4
pkgs/download.nix
View File

@ -2,7 +2,6 @@
python3Packages,
gallery-dl,
ffmpeg,
callPackage,
...
}:
let
@ -21,8 +20,7 @@ python3Packages.buildPythonApplication {
build-system = [ python3Packages.setuptools ];
dependencies =
[
dependencies = [
ffmpeg
gallery-dl
# (callPackage ../pkgs_pr/webcomix.nix { })

3
pkgs/polymc.nix
View File

@ -95,7 +95,8 @@ let
cmakeFlags = [
"-GNinja"
"-DLauncher_QT_VERSION_MAJOR=${lib.versions.major qt6.qtbase.version}"
] ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
]
++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
postPatch = ''
# hardcode jdk paths

2
pkgs/torzu/package.nix
View File

@ -22,7 +22,6 @@
lz4,
python3,
unzip,
nix-update-script,
nlohmann_json,
nv-codec-headers-12,
pkg-config,
@ -30,7 +29,6 @@
vulkan-headers,
vulkan-loader,
yasm,
simpleini,
zlib,
vulkan-memory-allocator,
zstd,

3
pkgs/tuh-activity-logger.nix
View File

@ -10,8 +10,7 @@ python3Packages.buildPythonApplication {
name = "${pname}-${version}";
};
build-system = [ python3Packages.setuptools ];
dependencies =
[
dependencies = [
sqlite
]
++ builtins.attrValues {

6
pkgs_pr/rmlint.nix
View File

@ -44,8 +44,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs =
[
nativeBuildInputs = [
pkg-config
sphinx
scons
@ -56,8 +55,7 @@ stdenv.mkDerivation rec {
gobject-introspection
];
buildInputs =
[
buildInputs = [
glib
json-glib
util-linux

3
pkgs_pr/talk.nix
View File

@ -44,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
copyDesktopItems
];
buildInputs =
[
buildInputs = [
nss
cairo
alsa-lib

2
pkgs_wip/aviator.nix
View File

@ -16,7 +16,7 @@
gtk4,
}:
stdenv.mkDerivation (finaAttrs: rec {
stdenv.mkDerivation (_finaAttrs: rec {
pname = "aviator";
version = "0.6.0";
pyproject = true;

3
pkgs_wip/hiit.nix
View File

@ -49,8 +49,7 @@ stdenv.mkDerivation rec {
desktop-file-utils
];
buildInputs =
[
buildInputs = [
cairo
gdk-pixbuf
glib

43
pkgs_wip/qbit-manage.nix
View File

@ -2,57 +2,48 @@
lib,
python3,
fetchFromGitHub,
callPackage,
}:
python3.pkgs.buildPythonApplication rec {
pname = "qbit-manage";
version = "4.3.0";
version = "4.6.3";
pyproject = true;
src = fetchFromGitHub {
owner = "StuffAnThings";
repo = "qbit_manage";
rev = "v${version}";
hash = "sha256-Wj1s11PwHfH4hDGEn0jW/REO2gI7+AGyb2B/QKUhlyk=";
hash = "sha256-cTxM3nHQQto7lpoNjShYcCbJCSYiwS9bKqw0DWAjw6A=";
};
postPatch = ''
rm LICENSE
'';
build-system = [
python3.pkgs.setuptools
python3.pkgs.wheel
];
build-system = builtins.attrValues {
inherit (python3.pkgs)
setuptools
wheel
;
};
dependencies = with python3.pkgs; [
propagatedBuildInputs = builtins.attrValues {
inherit (python3.pkgs)
argon2-cffi
bencode-py
croniter
fastapi
gitpython
humanize
pytimeparse2
bencode-py
qbittorrent-api
requests
retrying
ruamel-yaml
schedule
(callPackage ./qbittorrent-api.nix {
inherit lib;
inherit (python3.pkgs)
buildPythonPackage
fetchPypi
# build-system
setuptools
setuptools-scm
# dependencies
packaging
requests
urllib3
slowapi
uvicorn
;
})
];
};
meta = {
description = "This tool will help manage tedious tasks in qBittorrent and automate them. Tag, categorize, remove Orphaned data, remove unregistered torrents and much much more";

3
src/download/shell.nix
View File

@ -3,8 +3,7 @@
}:
pkgs.mkShell {
packages =
[
packages = [
(pkgs.python3.withPackages (
ps:
builtins.attrValues {

16
src/not flake/download_hs/default.nix
View File

@ -1,12 +1,18 @@
let pkgs = import <nixpkgs> { };
in pkgs.haskellPackages.developPackage {
let
pkgs = import <nixpkgs> { };
in
pkgs.haskellPackages.developPackage {
root = ./.;
modifier = drv:
pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages; [
modifier =
drv:
pkgs.haskell.lib.addBuildTools drv (
with pkgs.haskellPackages;
[
cabal-install
ghcid
haskell-language-server
fourmolu
regex
]);
]
);
}

11
src/not flake/find_tweet_user/shell.nix
View File

@ -1,18 +1,21 @@
{ pkgs ? import <nixpkgs> { } }:
{
pkgs ? import <nixpkgs> { },
}:
with pkgs;
mkShell {
packages = [
geckodriver
(python3.withPackages (ps:
with ps; [
(python3.withPackages (
ps: with ps; [
tweepy
requests
beautifulsoup4
selenium
webdriver-manager
]))
]
))
];
buildInputs = [ ];
}