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

This commit is contained in:
matt1432 2024-03-25 22:42:23 -04:00
parent 7c9af8ebdd
commit a7b7966d52
19 changed files with 47 additions and 40 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

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,21 +1,24 @@
{
cmake,
fetchFromGitHub,
pkg-config,
pocketsphinx-src,
sphinxbase,
stdenv,
...
}:
}: let
pyproject =
(
fromTOML (
builtins.readFile "${pocketsphinx-src}/pyproject.toml"
)
)
.project;
in
stdenv.mkDerivation rec {
name = "pocketsphinx";
version = "unstable";
inherit (pyproject) version;
src = fetchFromGitHub {
owner = "cmusphinx";
repo = "pocketsphinx";
rev = "7be89aae3e76568e02e4f3d41cf1adcb7654430c";
hash = "sha256-imrwUIpORpfInitVjU11SKPPpjvObKyfI8IB4f41hfY=";
};
src = pocketsphinx-src;
buildInputs = [pkg-config];
nativeBuildInputs = [cmake sphinxbase];

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

Binary file not shown.

BIN
flake.nix

Binary file not shown.

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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