From 8720d95e76294084fe6601ead70b73e61a582ac6 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sat, 22 Mar 2025 16:02:57 -0400
Subject: [PATCH] chore: clean up some packaging code
---
.../modules/comics/jdownloader2/default.nix | 1 +
packages/fcft/default.nix | 4 +-
packages/homepage/default.nix | 4 +-
packages/komf/default.nix | 4 +-
packages/nbted/default.nix | 43 ++++++++++---------
packages/subscleaner/default.nix | 1 +
packages/urllib3/default.nix | 4 +-
7 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/configurations/nos/modules/comics/jdownloader2/default.nix b/configurations/nos/modules/comics/jdownloader2/default.nix
index 0864bf04..9c2b3c92 100644
--- a/configurations/nos/modules/comics/jdownloader2/default.nix
+++ b/configurations/nos/modules/comics/jdownloader2/default.nix
@@ -12,6 +12,7 @@
USER_ID = toString config.users.users.${mainUser}.uid;
GROUP_ID = toString config.users.users.${mainUser}.uid;
KEEP_APP_RUNNING = 1;
+ DARK_MODE = 1;
TZ = "America/New_York";
};
diff --git a/packages/fcft/default.nix b/packages/fcft/default.nix
index 64e712f8..8b2a9878 100644
--- a/packages/fcft/default.nix
+++ b/packages/fcft/default.nix
@@ -1,6 +1,8 @@
{
- fcft,
+ # nix build inputs
fetchFromGitea,
+ # deps
+ fcft,
...
}:
fcft.overrideAttrs (o: rec {
diff --git a/packages/homepage/default.nix b/packages/homepage/default.nix
index a7bf374f..799ca77c 100644
--- a/packages/homepage/default.nix
+++ b/packages/homepage/default.nix
@@ -1,6 +1,4 @@
{
- # params
- enableLocalIcons ? true,
# nix build inputs
lib,
stdenv,
@@ -10,6 +8,8 @@
# deps
nodejs,
pnpm,
+ # params
+ enableLocalIcons ? true,
...
}: let
inherit (lib) getExe optionalString;
diff --git a/packages/komf/default.nix b/packages/komf/default.nix
index ce105ae9..963865a9 100644
--- a/packages/komf/default.nix
+++ b/packages/komf/default.nix
@@ -1,8 +1,10 @@
{
+ # nix build inputs
lib,
stdenv,
fetchurl,
makeWrapper,
+ # deps
jre,
...
}: let
@@ -43,7 +45,7 @@ in
homepage = "https://github.com/Snd-R/komf";
sourceProvenance = with lib.sourceTypes; [binaryBytecode];
description = ''
- komf is a tool that fetches metadata and thumbnails for your digital comic book library.
+ Komf is a tool that fetches metadata and thumbnails for your digital comic book library.
'';
};
}
diff --git a/packages/nbted/default.nix b/packages/nbted/default.nix
index 7b5f23ce..924ff9a2 100644
--- a/packages/nbted/default.nix
+++ b/packages/nbted/default.nix
@@ -1,10 +1,10 @@
{
+ # nix build inputs
lib,
rustPlatform,
fetchFromGitHub,
...
-}:
-rustPlatform.buildRustPackage rec {
+}: let
pname = "nbted";
version = "1.5.0";
@@ -14,26 +14,29 @@ rustPlatform.buildRustPackage rec {
tag = version;
hash = "sha256-5gCxTFjI3WDC9+F9i4I2g17+wHWnQHjC4Hurj5CMhB4=";
};
+in
+ rustPlatform.buildRustPackage {
+ inherit pname src version;
- cargoLock.lockFile = "${src}/Cargo.lock";
+ cargoLock.lockFile = "${src}/Cargo.lock";
- env.OUT_DIR = "$out";
+ env.OUT_DIR = "$out";
- patchPhase = ''
- export OUT_DIR=$(mktemp -d)
+ patchPhase = ''
+ export OUT_DIR=$(mktemp -d)
- rm ./build.rs
- echo '"${version}"' > $OUT_DIR/git-revision.txt
- substituteInPlace ./Cargo.toml --replace-fail "build = \"build.rs\"" ""
- '';
-
- meta = {
- mainProgram = pname;
- license = lib.licenses.cc0;
- homepage = "https://github.com/C4K3/nbted";
- description = ''
- Command-line NBT editor written in Rust. It does precisely one thing: convert NBT files to
- a pretty text format, and reverse the pretty text format back into NBT.
+ rm ./build.rs
+ echo '"${version}"' > $OUT_DIR/git-revision.txt
+ substituteInPlace ./Cargo.toml --replace-fail "build = \"build.rs\"" ""
'';
- };
-}
+
+ meta = {
+ mainProgram = pname;
+ license = lib.licenses.cc0;
+ homepage = "https://github.com/C4K3/nbted";
+ description = ''
+ Command-line NBT editor written in Rust. It does precisely one thing: convert NBT files to
+ a pretty text format, and reverse the pretty text format back into NBT.
+ '';
+ };
+ }
diff --git a/packages/subscleaner/default.nix b/packages/subscleaner/default.nix
index cb8441c0..0eb5b901 100644
--- a/packages/subscleaner/default.nix
+++ b/packages/subscleaner/default.nix
@@ -1,4 +1,5 @@
{
+ # nix build inputs
lib,
pkgs,
poetry2nix,
diff --git a/packages/urllib3/default.nix b/packages/urllib3/default.nix
index 362b3568..cb7d8289 100644
--- a/packages/urllib3/default.nix
+++ b/packages/urllib3/default.nix
@@ -2,9 +2,9 @@
{
# nix build inputs
lib,
- fetchPypi,
- # deps
python3Packages,
+ fetchPypi,
+ ...
}:
python3Packages.buildPythonPackage rec {
pname = "urllib3";