Merge pull request 'develop' (#5) from develop into release-25.11
All checks were successful
Deploy docs / build-and-deploy (push) Successful in 19s

Reviewed-on: #5
This commit is contained in:
sid 2026-03-07 14:10:10 +01:00
commit d093bc3dc6
4 changed files with 71 additions and 4 deletions

View file

@ -5,6 +5,8 @@ on: [pull_request]
jobs: jobs:
flake-check: flake-check:
runs-on: runner runs-on: runner
env:
NIXPKGS_ALLOW_UNFREE: 1
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4

View file

@ -22,11 +22,11 @@ in
settings = import ./settings.nix; settings = import ./settings.nix;
search = { search = {
force = true; force = true;
default = "Startpage"; default = "startpage";
privateDefault = "Startpage"; privateDefault = "startpage";
order = [ "Startpage" ]; order = [ "startpage" ];
engines = { engines = {
Startpage = { startpage = {
urls = [ { template = "https://www.startpage.com/do/dsearch?q={searchTerms}"; } ]; urls = [ { template = "https://www.startpage.com/do/dsearch?q={searchTerms}"; } ];
icon = "https://www.startpage.com/sp/cdn/favicons/favicon--default.ico"; icon = "https://www.startpage.com/sp/cdn/favicons/favicon--default.ico";
updateInterval = 24 * 60 * 60 * 1000; # every day updateInterval = 24 * 60 * 60 * 1000; # every day
@ -35,6 +35,7 @@ in
bing.metaData.hidden = true; bing.metaData.hidden = true;
ddg.metaData.hidden = true; ddg.metaData.hidden = true;
google.metaData.hidden = true; google.metaData.hidden = true;
perplexity.metaData.hidden = true;
}; };
}; };
}; };

View file

@ -19,6 +19,7 @@
synapse_change_display_name = pkgs.callPackage ./synapse_change_display_name { }; synapse_change_display_name = pkgs.callPackage ./synapse_change_display_name { };
synix-docs = pkgs.callPackage ./synix-docs { }; synix-docs = pkgs.callPackage ./synix-docs { };
trelis-gitingest-mcp = pkgs.callPackage ./trelis-gitingest-mcp { }; trelis-gitingest-mcp = pkgs.callPackage ./trelis-gitingest-mcp { };
tunerstudio = pkgs.callPackage ./tunerstudio { };
# marker-pdf = pkgs.callPackage ./marker-pdf { }; # FIXME # marker-pdf = pkgs.callPackage ./marker-pdf { }; # FIXME
} }

View file

@ -0,0 +1,63 @@
{
lib,
stdenv,
makeWrapper,
jdk8,
libGL,
xorg,
alsa-lib,
}:
stdenv.mkDerivation rec {
pname = "tunerstudio";
version = "3.3.01";
src = builtins.fetchTarball {
url = "http://tunerstudio.com/downloads2/TunerStudioMS_v${version}.tar.gz";
sha256 = "sha256:16xq4ylnlfjacpi9009l6l92zhy1c9sbxvmbkykilaipnflrhwsn";
};
nativeBuildInputs = [
makeWrapper
];
buildInputs = [
jdk8
libGL
xorg.libX11
alsa-lib
];
installPhase = ''
runHook preInstall
mkdir -p $out/share/tunerstudio
mkdir -p $out/bin
cp -r . $out/share/tunerstudio/
makeWrapper ${jdk8}/bin/java $out/bin/tunerstudio \
--run "cd $out/share/tunerstudio" \
--add-flags "-Dcom.ibm.crypto.provider.DoRSATypeChecking=false" \
--add-flags "-Djava.library.path=lib/alternateLinuxDrivers/x86_64-linux:lib" \
--add-flags "-Dfile.encoding=UTF8" \
--add-flags "-cp '.:lib:plugins'" \
--add-flags "-jar $out/share/tunerstudio/TunerStudioMS.jar" \
--prefix LD_LIBRARY_PATH : "${
lib.makeLibraryPath [
libGL
xorg.libX11
alsa-lib
]
}"
runHook postInstall
'';
meta = {
description = "MSTune / TunerStudio MS - ECU Tuning Software";
homepage = "https://www.tunerstudio.com/";
license = lib.licenses.unfree;
platforms = lib.platforms.linux;
};
}