matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactor: improve custom packages' versioning
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-03-25 22:42:23 -04:00
parent 7c9af8ebdd
commit a7b7966d52
19 changed files with 95 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/home/trash-d/trash-d.nix
View file

@ -8,7 +8,7 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "trash"; name = "trash";
version = trash-d-src.rev; version = trash-d-src.shortRev;
src = trash-d-src; src = trash-d-src;

1
common/overlays/dracula-theme/default.nix
View file

@ -9,6 +9,7 @@
plymouth = prev.callPackage ./plymouth.nix inputs; plymouth = prev.callPackage ./plymouth.nix inputs;
wallpaper = prev.fetchurl (import ./wallpaper.nix); wallpaper = prev.fetchurl (import ./wallpaper.nix);
in { in {
version = gtk-theme-src.shortRev;
src = gtk-theme-src; src = gtk-theme-src;
installPhase = '' installPhase = ''

2
common/overlays/dracula-theme/git.nix
View file

@ -5,7 +5,7 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "dracula-git"; name = "dracula-git";
version = git-theme-src.rev; version = git-theme-src.shortRev;
src = git-theme-src; src = git-theme-src;

2
common/overlays/dracula-theme/plymouth.nix
View file

@ -5,7 +5,7 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "dracula-plymouth"; name = "dracula-plymouth";
version = plymouth-theme-src.rev; version = plymouth-theme-src.shortRev;
src = plymouth-theme-src; src = plymouth-theme-src;

2
common/pkgs/pam-fprint-grosshack/default.nix
View file

@ -15,7 +15,7 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pam-fprint-grosshack"; name = "pam-fprint-grosshack";
version = pam-fprint-grosshack-src.rev; version = pam-fprint-grosshack-src.shortRev;
src = pam-fprint-grosshack-src; src = pam-fprint-grosshack-src;

2
common/pkgs/pokemon-colorscripts/default.nix
View file

@ -6,7 +6,7 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pokemon-colorscripts"; name = "pokemon-colorscripts";
version = pokemon-colorscripts-src.rev; version = pokemon-colorscripts-src.shortRev;
src = pokemon-colorscripts-src; src = pokemon-colorscripts-src;

2
devices/binto/modules/gpu-replay.nix
View file

@ -11,7 +11,7 @@
gsr = pkgs.stdenv.mkDerivation { gsr = pkgs.stdenv.mkDerivation {
name = "gpu-screen-recorder"; name = "gpu-screen-recorder";
version = gpu-screen-recorder-src.rev; version = gpu-screen-recorder-src.shortRev;
src = gpu-screen-recorder-src; src = gpu-screen-recorder-src;

12
devices/nos/modules/subtitles/subsync/default.nix
View file

@ -1,13 +1,21 @@
{ {
config, config,
pkgs, pkgs,
pocketsphinx-src,
subsync-src,
... ...
}: let }: let
inherit (config.vars) mainUser; inherit (config.vars) mainUser;
sphinxbase = pkgs.callPackage ./sphinxbase.nix {}; sphinxbase = pkgs.callPackage ./sphinxbase.nix {};
pocketsphinx = pkgs.callPackage ./pocketsphinx.nix {inherit sphinxbase;};
subsync = pkgs.callPackage ./subsync.nix {inherit sphinxbase pocketsphinx;}; pocketsphinx = pkgs.callPackage ./pocketsphinx.nix {
inherit sphinxbase pocketsphinx-src;
};
subsync = pkgs.callPackage ./subsync.nix {
inherit sphinxbase pocketsphinx subsync-src;
};
in { in {
systemd = { systemd = {
services.subsync-job = { services.subsync-job = {

37
devices/nos/modules/subtitles/subsync/pocketsphinx.nix
View file

@ -1,26 +1,29 @@
{ {
cmake, cmake,
fetchFromGitHub,
pkg-config, pkg-config,
pocketsphinx-src,
sphinxbase, sphinxbase,
stdenv, stdenv,
... ...
}: }: let
stdenv.mkDerivation rec { pyproject =
name = "pocketsphinx"; (
version = "unstable"; fromTOML (
builtins.readFile "${pocketsphinx-src}/pyproject.toml"
)
)
.project;
in
stdenv.mkDerivation rec {
name = "pocketsphinx";
inherit (pyproject) version;
src = fetchFromGitHub { src = pocketsphinx-src;
owner = "cmusphinx";
repo = "pocketsphinx";
rev = "7be89aae3e76568e02e4f3d41cf1adcb7654430c";
hash = "sha256-imrwUIpORpfInitVjU11SKPPpjvObKyfI8IB4f41hfY=";
};
buildInputs = [pkg-config]; buildInputs = [pkg-config];
nativeBuildInputs = [cmake sphinxbase]; nativeBuildInputs = [cmake sphinxbase];
postFixup = '' postFixup = ''
cp -ar ${src}/src/util $out/include cp -ar ${src}/src/util $out/include
''; '';
} }

2
devices/nos/modules/subtitles/subsync/sphinxbase.nix
View file

@ -10,7 +10,7 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "sphinxbase"; name = "sphinxbase";
version = "unstable"; version = "5prealpha"; # Deprecated
buildInputs = [bison pkg-config python3 swig2]; buildInputs = [bison pkg-config python3 swig2];
nativeBuildInputs = [autoreconfHook]; nativeBuildInputs = [autoreconfHook];

11
devices/nos/modules/subtitles/subsync/subsync.nix
View file

@ -1,24 +1,19 @@
{ {
fetchFromGitHub,
ffmpeg, ffmpeg,
pkg-config, pkg-config,
pocketsphinx, pocketsphinx,
python3Packages, python3Packages,
sphinxbase, sphinxbase,
subsync-src,
... ...
}: let }: let
inherit (builtins) concatStringsSep; inherit (builtins) concatStringsSep;
in in
python3Packages.buildPythonPackage { python3Packages.buildPythonPackage {
pname = "subsync"; pname = "subsync";
version = "unstable"; version = subsync-src.shortRev;
src = fetchFromGitHub { src = subsync-src;
owner = "sc0ty";
repo = "subsync";
rev = "8e0cf71960b9a5418acb60a1910cf3295d67e6bf";
hash = "sha256-jUur1U1yNShQx70/mj36+sGoVk8+E5hQUV/G79q2A2k=";
};
buildInputs = [ buildInputs = [
ffmpeg ffmpeg

34
flake.lock
View file

@ -1409,6 +1409,22 @@
"type": "github" "type": "github"
} }
}, },
"pocketsphinx-src": {
"flake": false,
"locked": {
"lastModified": 1707149455,
"narHash": "sha256-imrwUIpORpfInitVjU11SKPPpjvObKyfI8IB4f41hfY=",
"owner": "cmusphinx",
"repo": "pocketsphinx",
"rev": "7be89aae3e76568e02e4f3d41cf1adcb7654430c",
"type": "github"
},
"original": {
"owner": "cmusphinx",
"repo": "pocketsphinx",
"type": "github"
}
},
"pointer-event-src": { "pointer-event-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1497,9 +1513,11 @@
"pcsd": "pcsd", "pcsd": "pcsd",
"persist-properties-src": "persist-properties-src", "persist-properties-src": "persist-properties-src",
"plymouth-theme-src": "plymouth-theme-src", "plymouth-theme-src": "plymouth-theme-src",
"pocketsphinx-src": "pocketsphinx-src",
"pointer-event-src": "pointer-event-src", "pointer-event-src": "pointer-event-src",
"pokemon-colorscripts-src": "pokemon-colorscripts-src", "pokemon-colorscripts-src": "pokemon-colorscripts-src",
"secrets": "secrets", "secrets": "secrets",
"subsync-src": "subsync-src",
"touch-gestures-src": "touch-gestures-src", "touch-gestures-src": "touch-gestures-src",
"trash-d-src": "trash-d-src", "trash-d-src": "trash-d-src",
"vimplugin-riscv-src": "vimplugin-riscv-src", "vimplugin-riscv-src": "vimplugin-riscv-src",
@ -1565,6 +1583,22 @@
"type": "github" "type": "github"
} }
}, },
"subsync-src": {
"flake": false,
"locked": {
"lastModified": 1681249928,
"narHash": "sha256-jUur1U1yNShQx70/mj36+sGoVk8+E5hQUV/G79q2A2k=",
"owner": "sc0ty",
"repo": "subsync",
"rev": "8e0cf71960b9a5418acb60a1910cf3295d67e6bf",
"type": "github"
},
"original": {
"owner": "sc0ty",
"repo": "subsync",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

14
flake.nix
View file

@ -292,6 +292,20 @@
# -= Non-flake inputs =- # -= Non-flake inputs =-
## Custom packages ## Custom packages
pocketsphinx-src = {
type = "github";
owner = "cmusphinx";
repo = "pocketsphinx";
flake = false;
};
subsync-src = {
type = "github";
owner = "sc0ty";
repo = "subsync";
flake = false;
};
trash-d-src = { trash-d-src = {
type = "github"; type = "github";
owner = "rushsteve1"; owner = "rushsteve1";

2
home/firefox/firefox-gx/default.nix
View file

@ -5,7 +5,7 @@
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "firefox-gx"; pname = "firefox-gx";
version = firefox-gx-src.rev; version = firefox-gx-src.shortRev;
src = firefox-gx-src; src = firefox-gx-src;

2
home/mpv/scripts/modernx.nix
View file

@ -6,7 +6,7 @@
}: }:
buildLua (finalAttrs: { buildLua (finalAttrs: {
pname = "modernx"; pname = "modernx";
version = modernx-src.rev; version = modernx-src.shortRev;
src = modernx-src; src = modernx-src;

2
home/mpv/scripts/persist-properties.nix
View file

@ -5,7 +5,7 @@
}: }:
buildLua { buildLua {
pname = "persist-properties"; pname = "persist-properties";
version = persist-properties-src.rev; version = persist-properties-src.shortRev;
src = persist-properties-src; src = persist-properties-src;
} }

2
home/mpv/scripts/pointer-event.nix
View file

@ -5,7 +5,7 @@
}: }:
buildLua { buildLua {
pname = "pointer-event"; pname = "pointer-event";
version = pointer-event-src.rev; version = pointer-event-src.shortRev;
src = pointer-event-src; src = pointer-event-src;
} }

2
home/mpv/scripts/touch-gestures.nix
View file

@ -5,7 +5,7 @@
}: }:
buildLua { buildLua {
pname = "touch-gestures"; pname = "touch-gestures";
version = touch-gestures-src.rev; version = touch-gestures-src.shortRev;
src = touch-gestures-src; src = touch-gestures-src;
} }

2
home/mpv/scripts/undo-redo.nix
View file

@ -5,7 +5,7 @@
}: }:
buildLua rec { buildLua rec {
pname = "undo-redo"; pname = "undo-redo";
version = eisa-scripts-src.rev; version = eisa-scripts-src.shortRev;
src = eisa-scripts-src; src = eisa-scripts-src;
scriptPath = "${src}/scripts/UndoRedo.lua"; scriptPath = "${src}/scripts/UndoRedo.lua";