Merge staging-next into staging
This commit is contained in:
commit
b00700a4e4
|
@ -13,48 +13,60 @@ in
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
services.ollama = {
|
services.ollama = {
|
||||||
enable = lib.mkEnableOption (
|
enable = lib.mkEnableOption "ollama server for local large language models";
|
||||||
lib.mdDoc "Server for local large language models"
|
package = lib.mkPackageOption pkgs "ollama" { };
|
||||||
);
|
|
||||||
listenAddress = lib.mkOption {
|
listenAddress = lib.mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "127.0.0.1:11434";
|
default = "127.0.0.1:11434";
|
||||||
description = lib.mdDoc ''
|
example = "0.0.0.0:11111";
|
||||||
Specifies the bind address on which the ollama server HTTP interface listens.
|
description = ''
|
||||||
|
The address which the ollama server HTTP interface binds and listens to.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
acceleration = lib.mkOption {
|
acceleration = lib.mkOption {
|
||||||
type = types.nullOr (types.enum [ "rocm" "cuda" ]);
|
type = types.nullOr (types.enum [ "rocm" "cuda" ]);
|
||||||
default = null;
|
default = null;
|
||||||
example = "rocm";
|
example = "rocm";
|
||||||
description = lib.mdDoc ''
|
description = ''
|
||||||
Specifies the interface to use for hardware acceleration.
|
What interface to use for hardware acceleration.
|
||||||
|
|
||||||
- `rocm`: supported by modern AMD GPUs
|
- `rocm`: supported by modern AMD GPUs
|
||||||
- `cuda`: supported by modern NVIDIA GPUs
|
- `cuda`: supported by modern NVIDIA GPUs
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
package = lib.mkPackageOption pkgs "ollama" { };
|
environmentVariables = lib.mkOption {
|
||||||
|
type = types.attrsOf types.str;
|
||||||
|
default = { };
|
||||||
|
example = {
|
||||||
|
HOME = "/tmp";
|
||||||
|
OLLAMA_LLM_LIBRARY = "cpu";
|
||||||
|
};
|
||||||
|
description = ''
|
||||||
|
Set arbitrary environment variables for the ollama service.
|
||||||
|
|
||||||
|
Be aware that these are only seen by the ollama server (systemd service),
|
||||||
|
not normal invocations like `ollama run`.
|
||||||
|
Since `ollama run` is mostly a shell around the ollama server, this is usually sufficient.
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
systemd = {
|
systemd.services.ollama = {
|
||||||
services.ollama = {
|
description = "Server for local large language models";
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
description = "Server for local large language models";
|
after = [ "network.target" ];
|
||||||
after = [ "network.target" ];
|
environment = cfg.environmentVariables // {
|
||||||
environment = {
|
HOME = "%S/ollama";
|
||||||
HOME = "%S/ollama";
|
OLLAMA_MODELS = "%S/ollama/models";
|
||||||
OLLAMA_MODELS = "%S/ollama/models";
|
OLLAMA_HOST = cfg.listenAddress;
|
||||||
OLLAMA_HOST = cfg.listenAddress;
|
};
|
||||||
};
|
serviceConfig = {
|
||||||
serviceConfig = {
|
ExecStart = "${lib.getExe ollamaPackage} serve";
|
||||||
ExecStart = "${lib.getExe ollamaPackage} serve";
|
WorkingDirectory = "%S/ollama";
|
||||||
WorkingDirectory = "/var/lib/ollama";
|
StateDirectory = [ "ollama" ];
|
||||||
StateDirectory = [ "ollama" ];
|
DynamicUser = true;
|
||||||
DynamicUser = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||||
testScript = { nodes, ... }:
|
testScript = { nodes, ... }:
|
||||||
let
|
let
|
||||||
user = nodes.machine.users.users.alice;
|
user = nodes.machine.users.users.alice;
|
||||||
|
env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus DISPLAY=:0";
|
||||||
|
su = command: "su - ${user.name} -c '${env} ${command}'";
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
with subtest("Wait for login"):
|
with subtest("Wait for login"):
|
||||||
|
@ -47,21 +49,45 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||||
machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
|
machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
|
||||||
|
|
||||||
with subtest("Check if Budgie session components actually start"):
|
with subtest("Check if Budgie session components actually start"):
|
||||||
machine.wait_until_succeeds("pgrep budgie-daemon")
|
for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "budgie-desktop-view", "gsd-media-keys"]:
|
||||||
machine.wait_for_window("budgie-daemon")
|
machine.wait_until_succeeds(f"pgrep -f {i}")
|
||||||
machine.wait_until_succeeds("pgrep budgie-panel")
|
# We don't check xwininfo for budgie-wm.
|
||||||
machine.wait_for_window("budgie-panel")
|
|
||||||
# We don't check xwininfo for this one.
|
|
||||||
# See https://github.com/NixOS/nixpkgs/pull/216737#discussion_r1155312754
|
# See https://github.com/NixOS/nixpkgs/pull/216737#discussion_r1155312754
|
||||||
machine.wait_until_succeeds("pgrep budgie-wm")
|
machine.wait_for_window("budgie-daemon")
|
||||||
|
machine.wait_for_window("budgie-panel")
|
||||||
|
|
||||||
|
with subtest("Check if various environment variables are set"):
|
||||||
|
cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ"
|
||||||
|
machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'")
|
||||||
|
machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie.budgie-desktop-with-plugins.pname}'")
|
||||||
|
|
||||||
|
with subtest("Open Budgie Control Center"):
|
||||||
|
machine.send_key("alt-f2")
|
||||||
|
machine.wait_until_succeeds("pgrep -f budgie-run-dialog")
|
||||||
|
machine.wait_for_window("budgie-run-dialog")
|
||||||
|
machine.sleep(3)
|
||||||
|
machine.send_chars("Budgie Control Center", delay=0.5)
|
||||||
|
machine.screenshot("quick_search")
|
||||||
|
machine.send_chars("\n")
|
||||||
|
machine.wait_for_window("Budgie Control Center")
|
||||||
|
|
||||||
|
with subtest("Lock the screen"):
|
||||||
|
machine.succeed("${su "budgie-screensaver-command -l >&2 &"}")
|
||||||
|
machine.wait_until_succeeds("${su "budgie-screensaver-command -q"} | grep 'The screensaver is active'")
|
||||||
|
machine.sleep(2)
|
||||||
|
machine.send_chars("${user.password}", delay=0.5)
|
||||||
|
machine.screenshot("budgie_screensaver")
|
||||||
|
machine.send_chars("\n")
|
||||||
|
machine.wait_until_succeeds("${su "budgie-screensaver-command -q"} | grep 'The screensaver is inactive'")
|
||||||
|
machine.sleep(2)
|
||||||
|
|
||||||
with subtest("Open MATE terminal"):
|
with subtest("Open MATE terminal"):
|
||||||
machine.succeed("su - ${user.name} -c 'DISPLAY=:0 mate-terminal >&2 &'")
|
machine.succeed("${su "mate-terminal >&2 &"}")
|
||||||
machine.wait_for_window("Terminal")
|
machine.wait_for_window("Terminal")
|
||||||
|
|
||||||
with subtest("Check if budgie-wm has ever coredumped"):
|
with subtest("Check if Budgie has ever coredumped"):
|
||||||
machine.fail("coredumpctl --json=short | grep budgie-wm")
|
machine.fail("coredumpctl --json=short | grep budgie")
|
||||||
machine.sleep(20)
|
machine.sleep(10)
|
||||||
machine.screenshot("screen")
|
machine.screenshot("screen")
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "docker-compose";
|
pname = "docker-compose";
|
||||||
version = "2.24.7";
|
version = "2.25.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "docker";
|
owner = "docker";
|
||||||
repo = "compose";
|
repo = "compose";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-r7V9ZqUbtK4PG/NfDTbDljP+xaPJBXZSp1rGY/kgUTA=";
|
hash = "sha256-QfzFo6VqNK+4GvF2sSVLeDTcoBOG8Jtqs6K5o5bwddA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
||||||
rm -rf e2e/
|
rm -rf e2e/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
vendorHash = "sha256-Ec2JRCQvdC2VzkK29GyKS2DTrfHgv4wJc/50fbLVKEY=";
|
vendorHash = "sha256-zAIf5ljy9trJE27RpsK0atPoqNIDUdTn6ywRo0yk/18=";
|
||||||
|
|
||||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||||
|
|
||||||
|
|
|
@ -27,13 +27,13 @@
|
||||||
, dbusSupport ? true
|
, dbusSupport ? true
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "3.10.0";
|
version = "3.10.1";
|
||||||
pname = "baresip";
|
pname = "baresip";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "baresip";
|
owner = "baresip";
|
||||||
repo = "baresip";
|
repo = "baresip";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-cVPg8T9sLZd4fXBoI64TtlIBwF2lAXNth9fMiKnk9H4=";
|
hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo=";
|
||||||
};
|
};
|
||||||
prePatch = lib.optionalString (!dbusSupport) ''
|
prePatch = lib.optionalString (!dbusSupport) ''
|
||||||
substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' ""
|
substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' ""
|
||||||
|
|
|
@ -27,20 +27,20 @@ let
|
||||||
in
|
in
|
||||||
buildNpmPackage' rec {
|
buildNpmPackage' rec {
|
||||||
pname = "bruno";
|
pname = "bruno";
|
||||||
version = "1.10.0";
|
version = "1.11.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "usebruno";
|
owner = "usebruno";
|
||||||
repo = "bruno";
|
repo = "bruno";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-wxQaKewKIfN93Wvb7WmOSuflTgfk1XKvHAA1UIVyMqk=";
|
hash = "sha256-Urskhzs00OEucoR17NDXNtnrcXk9h75E806Re0HvYyw=";
|
||||||
|
|
||||||
postFetch = ''
|
postFetch = ''
|
||||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-IXFFOegzJbDcQejqQsAg11jDnhSKi27Olm8m3qr7bqw=";
|
npmDepsHash = "sha256-48xzx7dTalceXzjFBHIkkUS83pqP/OQ0L2tnMESpHII=";
|
||||||
npmFlags = [ "--legacy-peer-deps" ];
|
npmFlags = [ "--legacy-peer-deps" ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
58
pkgs/by-name/ja/jankyborders/package.nix
Normal file
58
pkgs/by-name/ja/jankyborders/package.nix
Normal file
|
@ -0,0 +1,58 @@
|
||||||
|
{ lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pkg-config
|
||||||
|
, pkgs
|
||||||
|
, overrideSDK
|
||||||
|
, darwin
|
||||||
|
, testers
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
stdenv = overrideSDK pkgs.stdenv "11.0";
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "JankyBorders";
|
||||||
|
version = "1.6.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "FelixKratz";
|
||||||
|
repo = "JankyBorders";
|
||||||
|
rev = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-DX1d228UCOI+JU+RxenhiGyn3AiqpsGe0aCtr091szs=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = with darwin.apple_sdk.frameworks; [
|
||||||
|
AppKit
|
||||||
|
ApplicationServices
|
||||||
|
CoreFoundation
|
||||||
|
CoreGraphics
|
||||||
|
SkyLight
|
||||||
|
];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp ./bin/borders $out/bin/borders
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.tests.version = testers.testVersion {
|
||||||
|
package = finalAttrs.finalPackage;
|
||||||
|
version = "borders-v${finalAttrs.version}";
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "JankyBorders is a lightweight tool designed to add colored borders to user windows on macOS 14.0+";
|
||||||
|
longDescription = "It enhances the user experience by visually highlighting the currently focused window without relying on the accessibility API, thereby being faster than comparable tools.";
|
||||||
|
homepage = "https://github.com/FelixKratz/JankyBorders";
|
||||||
|
license = lib.licenses.gpl3;
|
||||||
|
mainProgram = "borders";
|
||||||
|
maintainers = with lib.maintainers; [ khaneliman ];
|
||||||
|
platforms = lib.platforms.darwin;
|
||||||
|
};
|
||||||
|
})
|
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "labwc-menu-generator";
|
pname = "labwc-menu-generator";
|
||||||
version = "unstable-2024-03-11";
|
version = "unstable-2024-03-12";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "labwc";
|
owner = "labwc";
|
||||||
repo = "labwc-menu-generator";
|
repo = "labwc-menu-generator";
|
||||||
rev = "38d08a6695fe9d3176059dc5c57a9c84f9ef4981";
|
rev = "85a014db7214103c14c2bfbb5fc09a349ad64992";
|
||||||
hash = "sha256-wB5+VmtxjuWbeuDdtGt0f9u7bc3j1Bb6r5MfmMsmE0M=";
|
hash = "sha256-nt/K00cr1dKEk547J/6w1j6O3WSgGqVt1+Jdw95K28s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "lutgen";
|
pname = "lutgen";
|
||||||
version = "0.9.0";
|
version = "0.10.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ozwaldorf";
|
owner = "ozwaldorf";
|
||||||
repo = "lutgen-rs";
|
repo = "lutgen-rs";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-tKSPk0V11pnKFV4E08H4CUnjw9nAonTRI6W3mGipd9I=";
|
hash = "sha256-O2995+DLiCRDM/+oPTOBiM0L1x0jmbLTlR48+5IfOQw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-DiorrgTH9lIdmaZL7451uCXj9X7M6eHf4MQc85MpU7s=";
|
cargoHash = "sha256-ys4c/YUJJikDEUJjzagZBB+kSy+EFf+PqQdK/h+3gWU=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
installShellFiles
|
installShellFiles
|
||||||
|
|
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "openapi-tui";
|
pname = "openapi-tui";
|
||||||
version = "0.4.0";
|
version = "0.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zaghaghi";
|
owner = "zaghaghi";
|
||||||
repo = "openapi-tui";
|
repo = "openapi-tui";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-7xkjlX3+/hdVN2PXoiXbouSoMLy0Qe8uMRlPHWJO5Ts=";
|
hash = "sha256-flxQ5+nLacQAkrxJafw9D3iXYTFpHcmTshEySmFJ0Cc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-U8TOms8C7vV64OKKdJhMAoOha9s2lBqfBWU7pyZ0h/s=";
|
cargoHash = "sha256-vfEDbUrIXc498QnMJJlMGyTUDvlHgquB5GpWTe7yCvM=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Terminal UI to list, browse and run APIs defined with openapi spec";
|
description = "Terminal UI to list, browse and run APIs defined with openapi spec";
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "signal-export";
|
pname = "signal-export";
|
||||||
version = "1.8.1";
|
version = "1.8.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-v4civFGu+CLRTGicQAMSei+k6Iyz0GAznTLEr7ylx24=";
|
sha256 = "sha256-Hm0BVF2RUsxDacsAB3MJtk1t9FYmBPjeb5JzwaLkZ14=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = with python3.pkgs; [
|
nativeBuildInputs = with python3.pkgs; [
|
||||||
|
|
106
pkgs/by-name/sr/srb2kart/package.nix
Normal file
106
pkgs/by-name/sr/srb2kart/package.nix
Normal file
|
@ -0,0 +1,106 @@
|
||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchzip
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, curl
|
||||||
|
, nasm
|
||||||
|
, game-music-emu
|
||||||
|
, libpng
|
||||||
|
, SDL2
|
||||||
|
, SDL2_mixer
|
||||||
|
, zlib
|
||||||
|
, makeWrapper
|
||||||
|
, makeDesktopItem
|
||||||
|
, copyDesktopItems
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "srb2kart";
|
||||||
|
version = "1.6";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "STJr";
|
||||||
|
repo = "Kart-Public";
|
||||||
|
rev = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0=";
|
||||||
|
};
|
||||||
|
|
||||||
|
assets = stdenv.mkDerivation {
|
||||||
|
pname = "srb2kart-data";
|
||||||
|
version = finalAttrs.version;
|
||||||
|
|
||||||
|
src = fetchzip {
|
||||||
|
url = "https://github.com/STJr/Kart-Public/releases/download/v${finalAttrs.version}/AssetsLinuxOnly.zip";
|
||||||
|
hash = "sha256-yaVdsQUnyobjSbmemeBEyu35GeZCX1ylTRcjcbDuIu4=";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out/share/srb2kart
|
||||||
|
cp -r * $out/share/srb2kart
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
nasm
|
||||||
|
makeWrapper
|
||||||
|
copyDesktopItems
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
curl
|
||||||
|
game-music-emu
|
||||||
|
libpng
|
||||||
|
SDL2
|
||||||
|
SDL2_mixer
|
||||||
|
zlib
|
||||||
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}/share/srb2kart"
|
||||||
|
"-DGME_INCLUDE_DIR=${game-music-emu}/include"
|
||||||
|
"-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2"
|
||||||
|
"-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2"
|
||||||
|
];
|
||||||
|
|
||||||
|
desktopItems = [
|
||||||
|
(makeDesktopItem rec {
|
||||||
|
name = "Sonic Robo Blast 2 Kart";
|
||||||
|
exec = finalAttrs.pname;
|
||||||
|
icon = finalAttrs.pname;
|
||||||
|
comment = "Kart racing mod based on SRB2";
|
||||||
|
desktopName = name;
|
||||||
|
genericName = name;
|
||||||
|
startupWMClass = ".srb2kart-wrapped";
|
||||||
|
categories = [ "Game" ];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
install -Dm644 ../srb2.png $out/share/pixmaps/srb2kart.png
|
||||||
|
install -Dm644 ../srb2.png $out/share/icons/srb2kart.png
|
||||||
|
install -Dm755 bin/srb2kart $out/bin/srb2kart
|
||||||
|
|
||||||
|
wrapProgram $out/bin/srb2kart \
|
||||||
|
--set SRB2WADDIR "${finalAttrs.assets}/share/srb2kart"
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "SRB2Kart is a classic styled kart racer";
|
||||||
|
homepage = "https://mb.srb2.org/threads/srb2kart.25868/";
|
||||||
|
platforms = platforms.linux;
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
|
maintainers = with maintainers; [ viric donovanglover ];
|
||||||
|
mainProgram = "srb2kart";
|
||||||
|
};
|
||||||
|
})
|
|
@ -1,10 +1,10 @@
|
||||||
{
|
{
|
||||||
"darwin": {
|
"darwin": {
|
||||||
"hash": "sha256-VHyEE0SziwDAzlv8VLt08tMXb20sqxTSj64hC+FyjUw=",
|
"hash": "sha256-GgaRlROSWYZgFlH0bH6PTnRE3L/bb0kX0P6m7nmPlsY=",
|
||||||
"version": "0.2024.03.05.08.02.stable_01"
|
"version": "0.2024.03.12.08.02.stable_01"
|
||||||
},
|
},
|
||||||
"linux": {
|
"linux": {
|
||||||
"hash": "sha256-CI1bzdFles9XNvqmkyNq9zJBf4P6HF8QIo1FsSDydjQ=",
|
"hash": "sha256-9reFBIu32TzxE46c3PBVzkZYaMV4HVDASvTAVQltYN0=",
|
||||||
"version": "0.2024.03.05.08.02.stable_01"
|
"version": "0.2024.03.12.08.02.stable_01"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
|
url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
|
||||||
hash = "sha256-0IdW5PM7GJFsyKJJPTEfHL647UNXvUD6XBdErcCA6/8=";
|
hash = "sha256-L8C1BeYG1eHc3h8iNitvAjfZ6Ef8m2r1OPmbyavR/Ms=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ xapian perl pcre2 zlib libmagic ];
|
buildInputs = [ xapian perl pcre2 zlib libmagic ];
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aioshelly";
|
pname = "aioshelly";
|
||||||
version = "8.1.1";
|
version = "8.2.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.10";
|
disabled = pythonOlder "3.10";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "home-assistant-libs";
|
owner = "home-assistant-libs";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-i2dlcparDQlwM7Wk/HwlBz0mmI38ZRwxVM6jLY0rI+0=";
|
hash = "sha256-ZJ6lb3pd8DhNagaVq1uFwadtviuHCg44YZkh29ipu5U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -365,14 +365,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "boto3-stubs";
|
pname = "boto3-stubs";
|
||||||
version = "1.34.62";
|
version = "1.34.64";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-0ms6qz8xFWwDST6cMbf1SRVJyasMuqV+Cgnjifscipo=";
|
hash = "sha256-h/fZOx5z46enQ+553+aUXC/KkYaQ84JxfjJ8tESvlq0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "botocore-stubs";
|
pname = "botocore-stubs";
|
||||||
version = "1.34.62";
|
version = "1.34.64";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "botocore_stubs";
|
pname = "botocore_stubs";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-i0iPzIqL0zsA08frxJB65Eys6o/qk6Tf2sf6tfBlAMg=";
|
hash = "sha256-FcqR6qKL2AFL0xaoXt8J0WTpN5oSjLptpHLoNNct4u0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "garminconnect";
|
pname = "garminconnect";
|
||||||
version = "0.2.13";
|
version = "0.2.14";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.10";
|
disabled = pythonOlder "3.10";
|
||||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||||
owner = "cyberjunky";
|
owner = "cyberjunky";
|
||||||
repo = "python-garminconnect";
|
repo = "python-garminconnect";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-9At9v+7jOt43qPOhZpFYBEXA2zUfp8MAGO4/676kcBU=";
|
hash = "sha256-FytgckIu99ZKfmxJ0KU+fpbBEgszdp8iwK3SFCL9Ejs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -17,14 +17,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-pubsub";
|
pname = "google-cloud-pubsub";
|
||||||
version = "2.20.1";
|
version = "2.20.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-ttBvGCeWgnPEK1egn2QkYmSclQTcD4dW+Zdw9OPnVa0=";
|
hash = "sha256-I2BG6oYCMMeI5NTqLQ8SKZzfHZSscexC7RoM4boo1m8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, pythonAtLeast
|
, fetchpatch2
|
||||||
, poetry-core
|
, poetry-core
|
||||||
, snowballstemmer
|
, snowballstemmer
|
||||||
, tomli
|
, tomli
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pydocstyle";
|
pname = "pydocstyle";
|
||||||
version = "6.3.0";
|
version = "6.3.0";
|
||||||
format = "pyproject";
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
|
@ -23,6 +23,15 @@ buildPythonPackage rec {
|
||||||
hash = "sha256-MjRrnWu18f75OjsYIlOLJK437X3eXnlW8WkkX7vdS6k=";
|
hash = "sha256-MjRrnWu18f75OjsYIlOLJK437X3eXnlW8WkkX7vdS6k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# https://github.com/PyCQA/pydocstyle/pull/656
|
||||||
|
(fetchpatch2 {
|
||||||
|
name = "python312-compat.patch";
|
||||||
|
url = "https://github.com/PyCQA/pydocstyle/commit/306c7c8f2d863bdc098a65d2dadbd4703b9b16d5.patch";
|
||||||
|
hash = "sha256-bqnoLz1owzDpFqlZn8z4Z+RzKCYBsI0PqqeOtjLxnMo=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
poetry-core
|
poetry-core
|
||||||
];
|
];
|
||||||
|
@ -46,11 +55,6 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
] ++ passthru.optional-dependencies.toml;
|
] ++ passthru.optional-dependencies.toml;
|
||||||
|
|
||||||
disabledTests = lib.optionals (pythonAtLeast "3.12") [
|
|
||||||
"test_simple_fstring"
|
|
||||||
"test_fstring_with_args"
|
|
||||||
];
|
|
||||||
|
|
||||||
disabledTestPaths = [
|
disabledTestPaths = [
|
||||||
"src/tests/test_integration.py" # runs pip install
|
"src/tests/test_integration.py" # runs pip install
|
||||||
];
|
];
|
||||||
|
|
|
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz";
|
url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz";
|
||||||
hash = "sha256-UT1XhIgnkZis4TrUl1ENKyIgTV15S2QUPQW3vpdOts8=";
|
hash = "sha256-BoMU/KP1RSRwFJLfQy+lTEhf1OOWE8os0nXhNpZOgak=";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
*/
|
*/
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "rr-zen_workaround";
|
pname = "rr-zen_workaround";
|
||||||
version = "2020-09-22";
|
version = "2023-11-23";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://gist.github.com/glandium/01d54cefdb70561b5f6675e08f2990f2/archive/2f430f0c136a69b0886281d0c76708997d8878af.zip";
|
url = "https://gist.github.com/glandium/01d54cefdb70561b5f6675e08f2990f2/archive/f9d2070a7d87388da39acd157e0e53666a7d6ee0.zip";
|
||||||
sha256 = "1mbmbyymgl75wparv3rgnyxnc44rd6n935jziz9anl9apy031ryi";
|
sha256 = "sha256-VqqKYjd8J7Uh5ea+PjLT93cNdQFvGIwGu4bzx+weSvo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
hardeningDisable = [ "pic" ];
|
hardeningDisable = [ "pic" ];
|
||||||
|
|
|
@ -13,16 +13,16 @@
|
||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "deno";
|
pname = "deno";
|
||||||
version = "1.41.2";
|
version = "1.41.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "denoland";
|
owner = "denoland";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-l8He7EM9n8r7OTC6jN6F8ldf3INXxEeaUI1u6AfR7RI=";
|
hash = "sha256-Urcy3kvwBz5Ey0LnoT6/N7V/QJg2SIBHVmWa12WOTKw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-T+6b4bGx7y/7E0CIacKFQ32DCAiNFXFi15ibq7rDfI4=";
|
cargoHash = "sha256-NhJ3Uldncjx/KHAMVCd6U4Q0fbmc+u4E7JNZHcy/zQY=";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# upstream uses lld on aarch64-darwin for faster builds
|
# upstream uses lld on aarch64-darwin for faster builds
|
||||||
|
|
|
@ -10,11 +10,11 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
fetch_librusty_v8 {
|
fetch_librusty_v8 {
|
||||||
version = "0.83.2";
|
version = "0.85.0";
|
||||||
shas = {
|
shas = {
|
||||||
x86_64-linux = "sha256-RJNdy5jRZK3dTgrHsWuZZAHUyy1EogyNNuBekZ3Arrk=";
|
x86_64-linux = "sha256-Ma6JewYaHuPLihKnwwq8pAo+6sraXMghnl+wMvRfP1Y=";
|
||||||
aarch64-linux = "sha256-mpOmuqtd7ob6xvrgH4P/6GLa/hXTS/ok0WOYo7+7ZhI=";
|
aarch64-linux = "sha256-Y55ZXuyB2kq2a/cJwIo7DxClg2juAsGYpyTmwYE2W3Q=";
|
||||||
x86_64-darwin = "sha256-2o8CvJ3r5+4PLNGTySqPPDTqbU0piX4D1UtZMscMdHU=";
|
x86_64-darwin = "sha256-njP3obzJxr8I4G3jhDNbiVL8Cxa9D4KPGXW7VFrAZQY=";
|
||||||
aarch64-darwin = "sha256-WHeITWSHjZxfQJndxcjsp4yIERKrKXSHFZ0UBc43p8o=";
|
aarch64-darwin = "sha256-/8UFpUgdSKihxd4qsBoxYFrjEKUG3cDSkwJ5NSdmSQs=";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,87 +0,0 @@
|
||||||
{ lib
|
|
||||||
, stdenv
|
|
||||||
, fetchurl
|
|
||||||
, fetchFromGitHub
|
|
||||||
, substituteAll
|
|
||||||
, cmake
|
|
||||||
, curl
|
|
||||||
, nasm
|
|
||||||
, unzip
|
|
||||||
, game-music-emu
|
|
||||||
, libpng
|
|
||||||
, SDL2
|
|
||||||
, SDL2_mixer
|
|
||||||
, zlib
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
release_tag = "v1.6";
|
|
||||||
|
|
||||||
assets = fetchurl {
|
|
||||||
url = "https://github.com/STJr/Kart-Public/releases/download/${release_tag}/AssetsLinuxOnly.zip";
|
|
||||||
sha256 = "sha256-ejhPuZ1C8M9B0S4+2HN1T5pbormT1eVL3nlivqOszdE=";
|
|
||||||
};
|
|
||||||
|
|
||||||
in stdenv.mkDerivation {
|
|
||||||
pname = "srb2kart";
|
|
||||||
version = "1.6.0";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "STJr";
|
|
||||||
repo = "Kart-Public";
|
|
||||||
rev = release_tag;
|
|
||||||
sha256 = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
cmake
|
|
||||||
nasm
|
|
||||||
unzip
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
curl
|
|
||||||
game-music-emu
|
|
||||||
libpng
|
|
||||||
SDL2
|
|
||||||
SDL2_mixer
|
|
||||||
zlib
|
|
||||||
];
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DGME_INCLUDE_DIR=${game-music-emu}/include"
|
|
||||||
"-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2"
|
|
||||||
"-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2"
|
|
||||||
];
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
./wadlocation.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace src/sdl/i_system.c \
|
|
||||||
--replace '@wadlocation@' $out
|
|
||||||
'';
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
mkdir assets/installer
|
|
||||||
pushd assets/installer
|
|
||||||
unzip ${assets} "*.kart" srb2.srb
|
|
||||||
popd
|
|
||||||
'';
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mkdir -p $out/bin $out/share/games/SRB2Kart
|
|
||||||
mv $out/srb2kart* $out/bin/
|
|
||||||
mv $out/*.kart $out/share/games/SRB2Kart
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "SRB2Kart is a classic styled kart racer";
|
|
||||||
homepage = "https://mb.srb2.org/threads/srb2kart.25868/";
|
|
||||||
platforms = platforms.linux;
|
|
||||||
license = licenses.gpl2Plus;
|
|
||||||
maintainers = with maintainers; [ viric ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,61 +0,0 @@
|
||||||
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
|
|
||||||
index 51f708d0..c4d971f7 100644
|
|
||||||
--- a/src/sdl/i_system.c
|
|
||||||
+++ b/src/sdl/i_system.c
|
|
||||||
@@ -139,7 +139,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
|
|
||||||
|
|
||||||
// Locations for searching the srb2.srb
|
|
||||||
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
|
|
||||||
-#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart"
|
|
||||||
+#define DEFAULTWADLOCATION1 "@wadlocation@"
|
|
||||||
#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart"
|
|
||||||
#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart"
|
|
||||||
#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart"
|
|
||||||
@@ -3646,47 +3646,6 @@ static const char *locateWad(void)
|
|
||||||
if (((envstr = I_GetEnv("SRB2WADDIR")) != NULL) && isWadPathOk(envstr))
|
|
||||||
return envstr;
|
|
||||||
|
|
||||||
-#ifndef NOCWD
|
|
||||||
- I_OutputMsg(",.");
|
|
||||||
- // examine current dir
|
|
||||||
- strcpy(returnWadPath, ".");
|
|
||||||
- if (isWadPathOk(returnWadPath))
|
|
||||||
- return NULL;
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-#ifdef DEFAULTDIR
|
|
||||||
- I_OutputMsg(",HOME/" DEFAULTDIR);
|
|
||||||
- // examine user jart directory
|
|
||||||
- if ((envstr = I_GetEnv("HOME")) != NULL)
|
|
||||||
- {
|
|
||||||
- sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr);
|
|
||||||
- if (isWadPathOk(returnWadPath))
|
|
||||||
- return returnWadPath;
|
|
||||||
- }
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-#ifdef CMAKECONFIG
|
|
||||||
-#ifndef NDEBUG
|
|
||||||
- I_OutputMsg(","CMAKE_ASSETS_DIR);
|
|
||||||
- strcpy(returnWadPath, CMAKE_ASSETS_DIR);
|
|
||||||
- if (isWadPathOk(returnWadPath))
|
|
||||||
- {
|
|
||||||
- return returnWadPath;
|
|
||||||
- }
|
|
||||||
-#endif
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
-#ifdef __APPLE__
|
|
||||||
- OSX_GetResourcesPath(returnWadPath);
|
|
||||||
- I_OutputMsg(",%s", returnWadPath);
|
|
||||||
- if (isWadPathOk(returnWadPath))
|
|
||||||
- {
|
|
||||||
- return returnWadPath;
|
|
||||||
- }
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
// examine default dirs
|
|
||||||
#ifdef DEFAULTWADLOCATION1
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION1);
|
|
|
@ -132,8 +132,11 @@ goBuild ((lib.optionalAttrs enableRocm {
|
||||||
|
|
||||||
# ollama's patches of llama.cpp's example server
|
# ollama's patches of llama.cpp's example server
|
||||||
# `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream"
|
# `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream"
|
||||||
(preparePatch "01-cache.diff" "sha256-MTTln2G0G8dntihUzEjPM1ruTsApb4ZToBczJb8EG68=")
|
(preparePatch "01-cache.diff" "sha256-VDwu/iK6taBCyscpndQiOJ3eGqonnLVwmS2rJNMBVGU=")
|
||||||
(preparePatch "02-cudaleaks.diff" "sha256-Cu7E9iEcvddPL9mPPI5Z96qmwWigi3f0WgSpPRjGc88=")
|
(preparePatch "02-cudaleaks.diff" "sha256-nxsWgrePUMsZBWWQAjqVHWMJPzr1owH1zSJvUU7Q5pA=")
|
||||||
|
(preparePatch "03-load_exception.diff" "sha256-1DfNahFYYxqlx4E4pwMKQpL+XR0bibYnDFGt6dCL4TM=")
|
||||||
|
(preparePatch "04-locale.diff" "sha256-r5nHiP6yN/rQObRu2FZIPBKpKP9yByyZ6sSI2SKj6Do=")
|
||||||
|
(preparePatch "05-fix-clip-free.diff" "sha256-EFZ+QTtZCvstVxYgVdFKHsQqdkL98T0eXOEBOqCrlL4=")
|
||||||
];
|
];
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# use a patch from the nix store in the `go generate` script
|
# use a patch from the nix store in the `go generate` script
|
||||||
|
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cloudfox";
|
pname = "cloudfox";
|
||||||
version = "1.13.3";
|
version = "1.13.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "BishopFox";
|
owner = "BishopFox";
|
||||||
repo = pname;
|
repo = "cloudfox";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-Sq3ARcAK1EFbK6Y+pSCg8ayhVmnEmVQWF0eAiVhJNPs=";
|
hash = "sha256-nN/gSvAwKjfZulqH4caGoJmzlY0ik8JrFReuvYWwZTE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-qPIMmyKTmZEmxlLLftRMnBXvo22WFROYlCAAsAb7jDg=";
|
vendorHash = "sha256-aRbGBEci3QT1mH+yaOUVynPysJ1za6CaoLGppJaa94c=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-w"
|
"-w"
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "munge";
|
pname = "munge";
|
||||||
version = "0.5.15";
|
version = "0.5.16";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dun";
|
owner = "dun";
|
||||||
repo = "munge";
|
repo = "munge";
|
||||||
rev = "${pname}-${version}";
|
rev = "${pname}-${version}";
|
||||||
sha256 = "sha256-Ot/oH/RdfPAzoi3P7EYkxS0Fr24KRWfBJxBEWRF0ctI=";
|
sha256 = "sha256-fv42RMUAP8Os33/iHXr70i5Pt2JWZK71DN5vFI3q7Ak=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "trufflehog";
|
pname = "trufflehog";
|
||||||
version = "3.69.0";
|
version = "3.70.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "trufflesecurity";
|
owner = "trufflesecurity";
|
||||||
repo = "trufflehog";
|
repo = "trufflehog";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-1O1iwZQdC4Vf/mGRauZwg6U52bF28IqCUw8Ugt3USFI=";
|
hash = "sha256-KcJhnev2j4Y7jlIZe2cUgkiJEz5V+oG69SURs5tXCVU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-c9CkQMTH2mRpKjlyV7lnNyKQYgPxEP9adHcSh9qsWYk=";
|
vendorHash = "sha256-oJ5aPffmBDCJ6cD2nG1Q5w+R6LV6oDf4v9hIWN9jNdc=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
|
|
@ -37824,8 +37824,6 @@ with pkgs;
|
||||||
|
|
||||||
srb2 = callPackage ../games/srb2 { };
|
srb2 = callPackage ../games/srb2 { };
|
||||||
|
|
||||||
srb2kart = callPackage ../games/srb2kart { };
|
|
||||||
|
|
||||||
ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { };
|
ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { };
|
||||||
|
|
||||||
stardust = callPackage ../games/stardust { };
|
stardust = callPackage ../games/stardust { };
|
||||||
|
|
Loading…
Reference in New Issue
Block a user