refactor: improve custom packages' versioning

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
devices

View file

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

View file

@ -1,13 +1,21 @@
{
config,
pkgs,
pocketsphinx-src,
subsync-src,
...
}: let
inherit (config.vars) mainUser;
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 {
systemd = {
services.subsync-job = {

View file

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

View file

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

View file

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